From a42c027b6f3ae4125d4bf5d70ed80ecda9c9f8c4 Mon Sep 17 00:00:00 2001 From: PepperCode1 <44146161+PepperCode1@users.noreply.github.com> Date: Fri, 15 Jul 2022 00:00:54 -0700 Subject: [PATCH] Scheme-a-version - Fix Resources not being closed properly - Change versioning scheme to match Create - Add LICENSE to built jar - Fix mods.toml version sync - Move JOML code to non-src directory - Update Gradle - Organize imports --- build.gradle | 67 ++++++++++-------- gradle.properties | 3 +- gradle/wrapper/gradle-wrapper.jar | Bin 59536 -> 59821 bytes gradle/wrapper/gradle-wrapper.properties | 2 +- gradlew | 10 +-- .../repack/joml => joml}/AxisAngle4d.java | 0 .../repack/joml => joml}/AxisAngle4f.java | 0 .../joml => joml}/ConfigurationException.java | 0 .../joml => joml}/FrustumIntersection.java | 0 .../joml => joml}/FrustumRayBuilder.java | 0 .../repack/joml => joml}/GeometryUtils.java | 0 .../repack/joml => joml}/Interpolationd.java | 0 .../repack/joml => joml}/Interpolationf.java | 0 .../repack/joml => joml}/Intersectiond.java | 0 .../repack/joml => joml}/Intersectionf.java | 0 .../flywheel/repack/joml => joml}/Math.java | 0 .../repack/joml => joml}/Matrix2d.java | 0 .../repack/joml => joml}/Matrix2dc.java | 0 .../repack/joml => joml}/Matrix2f.java | 0 .../repack/joml => joml}/Matrix2fc.java | 0 .../repack/joml => joml}/Matrix3d.java | 0 .../repack/joml => joml}/Matrix3dStack.java | 0 .../repack/joml => joml}/Matrix3dc.java | 0 .../repack/joml => joml}/Matrix3f.java | 0 .../repack/joml => joml}/Matrix3fStack.java | 0 .../repack/joml => joml}/Matrix3fc.java | 0 .../repack/joml => joml}/Matrix3x2d.java | 0 .../repack/joml => joml}/Matrix3x2dStack.java | 0 .../repack/joml => joml}/Matrix3x2dc.java | 0 .../repack/joml => joml}/Matrix3x2f.java | 0 .../repack/joml => joml}/Matrix3x2fStack.java | 0 .../repack/joml => joml}/Matrix3x2fc.java | 0 .../repack/joml => joml}/Matrix4d.java | 0 .../repack/joml => joml}/Matrix4dStack.java | 0 .../repack/joml => joml}/Matrix4dc.java | 0 .../repack/joml => joml}/Matrix4f.java | 0 .../repack/joml => joml}/Matrix4fStack.java | 0 .../repack/joml => joml}/Matrix4fc.java | 0 .../repack/joml => joml}/Matrix4x3d.java | 0 .../repack/joml => joml}/Matrix4x3dStack.java | 0 .../repack/joml => joml}/Matrix4x3dc.java | 0 .../repack/joml => joml}/Matrix4x3f.java | 0 .../repack/joml => joml}/Matrix4x3fStack.java | 0 .../repack/joml => joml}/Matrix4x3fc.java | 0 .../repack/joml => joml}/MemUtil.java | 0 .../repack/joml => joml}/Options.java | 0 .../joml => joml}/PolygonsIntersection.java | 0 .../repack/joml => joml}/Quaterniond.java | 0 .../QuaterniondInterpolator.java | 0 .../repack/joml => joml}/Quaterniondc.java | 0 .../repack/joml => joml}/Quaternionf.java | 0 .../QuaternionfInterpolator.java | 0 .../repack/joml => joml}/Quaternionfc.java | 0 .../flywheel/repack/joml => joml}/Random.java | 0 .../joml => joml}/RayAabIntersection.java | 0 .../repack/joml => joml}/RoundingMode.java | 0 .../repack/joml => joml}/Runtime.java | 0 .../repack/joml => joml}/SimplexNoise.java | 0 .../repack/joml => joml}/Vector2d.java | 0 .../repack/joml => joml}/Vector2dc.java | 0 .../repack/joml => joml}/Vector2f.java | 0 .../repack/joml => joml}/Vector2fc.java | 0 .../repack/joml => joml}/Vector2i.java | 0 .../repack/joml => joml}/Vector2ic.java | 0 .../repack/joml => joml}/Vector3d.java | 0 .../repack/joml => joml}/Vector3dc.java | 0 .../repack/joml => joml}/Vector3f.java | 0 .../repack/joml => joml}/Vector3fc.java | 0 .../repack/joml => joml}/Vector3i.java | 0 .../repack/joml => joml}/Vector3ic.java | 0 .../repack/joml => joml}/Vector4d.java | 0 .../repack/joml => joml}/Vector4dc.java | 0 .../repack/joml => joml}/Vector4f.java | 0 .../repack/joml => joml}/Vector4fc.java | 0 .../repack/joml => joml}/Vector4i.java | 0 .../repack/joml => joml}/Vector4ic.java | 0 .../repack/joml => joml}/package.html | 0 .../sampling/BestCandidateSampling.java | 0 .../joml => joml}/sampling/Callback2d.java | 0 .../joml => joml}/sampling/Callback3d.java | 0 .../joml => joml}/sampling/Convolution.java | 0 .../repack/joml => joml}/sampling/Math.java | 0 .../sampling/PoissonSampling.java | 0 .../sampling/SpiralSampling.java | 0 .../sampling/StratifiedSampling.java | 0 .../sampling/UniformSampling.java | 0 .../joml => joml}/sampling/package.html | 0 .../jozufozu/flywheel/backend/Backend.java | 2 +- .../com/jozufozu/flywheel/backend/Loader.java | 6 +- .../jozufozu/flywheel/config/FlwCommands.java | 1 - .../flywheel/core/source/ShaderSources.java | 6 +- .../core/vertex/BlockVertexListUnsafe.java | 3 - .../vertex/PosTexNormalVertexListUnsafe.java | 3 - .../jozufozu/flywheel/util/WorldAttached.java | 1 - src/main/resources/META-INF/mods.toml | 2 +- 95 files changed, 50 insertions(+), 56 deletions(-) rename {src/main/java/com/jozufozu/flywheel/repack/joml => joml}/AxisAngle4d.java (100%) rename {src/main/java/com/jozufozu/flywheel/repack/joml => joml}/AxisAngle4f.java (100%) rename {src/main/java/com/jozufozu/flywheel/repack/joml => joml}/ConfigurationException.java (100%) rename {src/main/java/com/jozufozu/flywheel/repack/joml => joml}/FrustumIntersection.java (100%) rename {src/main/java/com/jozufozu/flywheel/repack/joml => joml}/FrustumRayBuilder.java (100%) rename {src/main/java/com/jozufozu/flywheel/repack/joml => joml}/GeometryUtils.java (100%) rename {src/main/java/com/jozufozu/flywheel/repack/joml => joml}/Interpolationd.java (100%) rename {src/main/java/com/jozufozu/flywheel/repack/joml => joml}/Interpolationf.java (100%) rename {src/main/java/com/jozufozu/flywheel/repack/joml => joml}/Intersectiond.java (100%) rename {src/main/java/com/jozufozu/flywheel/repack/joml => joml}/Intersectionf.java (100%) rename {src/main/java/com/jozufozu/flywheel/repack/joml => joml}/Math.java (100%) rename {src/main/java/com/jozufozu/flywheel/repack/joml => joml}/Matrix2d.java (100%) rename {src/main/java/com/jozufozu/flywheel/repack/joml => joml}/Matrix2dc.java (100%) rename {src/main/java/com/jozufozu/flywheel/repack/joml => joml}/Matrix2f.java (100%) rename {src/main/java/com/jozufozu/flywheel/repack/joml => joml}/Matrix2fc.java (100%) rename {src/main/java/com/jozufozu/flywheel/repack/joml => joml}/Matrix3d.java (100%) rename {src/main/java/com/jozufozu/flywheel/repack/joml => joml}/Matrix3dStack.java (100%) rename {src/main/java/com/jozufozu/flywheel/repack/joml => joml}/Matrix3dc.java (100%) rename {src/main/java/com/jozufozu/flywheel/repack/joml => joml}/Matrix3f.java (100%) rename {src/main/java/com/jozufozu/flywheel/repack/joml => joml}/Matrix3fStack.java (100%) rename {src/main/java/com/jozufozu/flywheel/repack/joml => joml}/Matrix3fc.java (100%) rename {src/main/java/com/jozufozu/flywheel/repack/joml => joml}/Matrix3x2d.java (100%) rename {src/main/java/com/jozufozu/flywheel/repack/joml => joml}/Matrix3x2dStack.java (100%) rename {src/main/java/com/jozufozu/flywheel/repack/joml => joml}/Matrix3x2dc.java (100%) rename {src/main/java/com/jozufozu/flywheel/repack/joml => joml}/Matrix3x2f.java (100%) rename {src/main/java/com/jozufozu/flywheel/repack/joml => joml}/Matrix3x2fStack.java (100%) rename {src/main/java/com/jozufozu/flywheel/repack/joml => joml}/Matrix3x2fc.java (100%) rename {src/main/java/com/jozufozu/flywheel/repack/joml => joml}/Matrix4d.java (100%) rename {src/main/java/com/jozufozu/flywheel/repack/joml => joml}/Matrix4dStack.java (100%) rename {src/main/java/com/jozufozu/flywheel/repack/joml => joml}/Matrix4dc.java (100%) rename {src/main/java/com/jozufozu/flywheel/repack/joml => joml}/Matrix4f.java (100%) rename {src/main/java/com/jozufozu/flywheel/repack/joml => joml}/Matrix4fStack.java (100%) rename {src/main/java/com/jozufozu/flywheel/repack/joml => joml}/Matrix4fc.java (100%) rename {src/main/java/com/jozufozu/flywheel/repack/joml => joml}/Matrix4x3d.java (100%) rename {src/main/java/com/jozufozu/flywheel/repack/joml => joml}/Matrix4x3dStack.java (100%) rename {src/main/java/com/jozufozu/flywheel/repack/joml => joml}/Matrix4x3dc.java (100%) rename {src/main/java/com/jozufozu/flywheel/repack/joml => joml}/Matrix4x3f.java (100%) rename {src/main/java/com/jozufozu/flywheel/repack/joml => joml}/Matrix4x3fStack.java (100%) rename {src/main/java/com/jozufozu/flywheel/repack/joml => joml}/Matrix4x3fc.java (100%) rename {src/main/java/com/jozufozu/flywheel/repack/joml => joml}/MemUtil.java (100%) rename {src/main/java/com/jozufozu/flywheel/repack/joml => joml}/Options.java (100%) rename {src/main/java/com/jozufozu/flywheel/repack/joml => joml}/PolygonsIntersection.java (100%) rename {src/main/java/com/jozufozu/flywheel/repack/joml => joml}/Quaterniond.java (100%) rename {src/main/java/com/jozufozu/flywheel/repack/joml => joml}/QuaterniondInterpolator.java (100%) rename {src/main/java/com/jozufozu/flywheel/repack/joml => joml}/Quaterniondc.java (100%) rename {src/main/java/com/jozufozu/flywheel/repack/joml => joml}/Quaternionf.java (100%) rename {src/main/java/com/jozufozu/flywheel/repack/joml => joml}/QuaternionfInterpolator.java (100%) rename {src/main/java/com/jozufozu/flywheel/repack/joml => joml}/Quaternionfc.java (100%) rename {src/main/java/com/jozufozu/flywheel/repack/joml => joml}/Random.java (100%) rename {src/main/java/com/jozufozu/flywheel/repack/joml => joml}/RayAabIntersection.java (100%) rename {src/main/java/com/jozufozu/flywheel/repack/joml => joml}/RoundingMode.java (100%) rename {src/main/java/com/jozufozu/flywheel/repack/joml => joml}/Runtime.java (100%) rename {src/main/java/com/jozufozu/flywheel/repack/joml => joml}/SimplexNoise.java (100%) rename {src/main/java/com/jozufozu/flywheel/repack/joml => joml}/Vector2d.java (100%) rename {src/main/java/com/jozufozu/flywheel/repack/joml => joml}/Vector2dc.java (100%) rename {src/main/java/com/jozufozu/flywheel/repack/joml => joml}/Vector2f.java (100%) rename {src/main/java/com/jozufozu/flywheel/repack/joml => joml}/Vector2fc.java (100%) rename {src/main/java/com/jozufozu/flywheel/repack/joml => joml}/Vector2i.java (100%) rename {src/main/java/com/jozufozu/flywheel/repack/joml => joml}/Vector2ic.java (100%) rename {src/main/java/com/jozufozu/flywheel/repack/joml => joml}/Vector3d.java (100%) rename {src/main/java/com/jozufozu/flywheel/repack/joml => joml}/Vector3dc.java (100%) rename {src/main/java/com/jozufozu/flywheel/repack/joml => joml}/Vector3f.java (100%) rename {src/main/java/com/jozufozu/flywheel/repack/joml => joml}/Vector3fc.java (100%) rename {src/main/java/com/jozufozu/flywheel/repack/joml => joml}/Vector3i.java (100%) rename {src/main/java/com/jozufozu/flywheel/repack/joml => joml}/Vector3ic.java (100%) rename {src/main/java/com/jozufozu/flywheel/repack/joml => joml}/Vector4d.java (100%) rename {src/main/java/com/jozufozu/flywheel/repack/joml => joml}/Vector4dc.java (100%) rename {src/main/java/com/jozufozu/flywheel/repack/joml => joml}/Vector4f.java (100%) rename {src/main/java/com/jozufozu/flywheel/repack/joml => joml}/Vector4fc.java (100%) rename {src/main/java/com/jozufozu/flywheel/repack/joml => joml}/Vector4i.java (100%) rename {src/main/java/com/jozufozu/flywheel/repack/joml => joml}/Vector4ic.java (100%) rename {src/main/java/com/jozufozu/flywheel/repack/joml => joml}/package.html (100%) rename {src/main/java/com/jozufozu/flywheel/repack/joml => joml}/sampling/BestCandidateSampling.java (100%) rename {src/main/java/com/jozufozu/flywheel/repack/joml => joml}/sampling/Callback2d.java (100%) rename {src/main/java/com/jozufozu/flywheel/repack/joml => joml}/sampling/Callback3d.java (100%) rename {src/main/java/com/jozufozu/flywheel/repack/joml => joml}/sampling/Convolution.java (100%) rename {src/main/java/com/jozufozu/flywheel/repack/joml => joml}/sampling/Math.java (100%) rename {src/main/java/com/jozufozu/flywheel/repack/joml => joml}/sampling/PoissonSampling.java (100%) rename {src/main/java/com/jozufozu/flywheel/repack/joml => joml}/sampling/SpiralSampling.java (100%) rename {src/main/java/com/jozufozu/flywheel/repack/joml => joml}/sampling/StratifiedSampling.java (100%) rename {src/main/java/com/jozufozu/flywheel/repack/joml => joml}/sampling/UniformSampling.java (100%) rename {src/main/java/com/jozufozu/flywheel/repack/joml => joml}/sampling/package.html (100%) diff --git a/build.gradle b/build.gradle index 341b6b0e2..438422d9a 100644 --- a/build.gradle +++ b/build.gradle @@ -11,10 +11,10 @@ buildscript { classpath "org.parchmentmc:librarian:${librarian_version}" } } + plugins { id 'com.matthewprenger.cursegradle' version "${cursegradle_version}" } - apply plugin: 'net.minecraftforge.gradle' apply plugin: 'org.parchmentmc.librarian.forgegradle' apply plugin: 'eclipse' @@ -24,11 +24,10 @@ apply plugin: 'org.spongepowered.mixin' boolean dev = System.getenv('RELEASE') == null || System.getenv('RELEASE').equalsIgnoreCase('false'); ext.buildNumber = System.getenv('BUILD_NUMBER') -if (buildNumber == null) buildNumber = 'custom' -version = "${mc_update_version}-${mod_version}" + (dev ? ".${buildNumber}" : '') group = 'com.jozufozu.flywheel' -archivesBaseName = 'flywheel-forge' +archivesBaseName = "flywheel-forge-${artifact_minecraft_version}" +version = mod_version + (dev && buildNumber != null ? "-${buildNumber}" : '') java.toolchain.languageVersion = JavaLanguageVersion.of(17) @@ -36,7 +35,6 @@ println('Java: ' + System.getProperty('java.version') + ' JVM: ' + System.getPro minecraft { mappings channel: 'parchment', version: "${parchment_version}-${minecraft_version}" - runs { client { workingDirectory project.file('run') @@ -89,10 +87,6 @@ minecraft { } } -mixin { - add sourceSets.main, 'flywheel.refmap.json' -} - repositories { maven { url 'https://www.cursemaven.com' @@ -130,53 +124,64 @@ dependencies { } } -// Example for how to get properties into the manifest for reading by the runtime.. +processResources { + inputs.property 'version', mod_version + + filesMatching('META-INF/mods.toml') { + expand 'version': mod_version + } +} + +mixin { + add sourceSets.main, 'flywheel.refmap.json' +} + +tasks.withType(JavaCompile).configureEach { + options.encoding = 'UTF-8' // Use the UTF-8 charset for Java compilation +} + jar { manifest { attributes([ 'Specification-Title' : 'flywheel', //'Specification-Vendor': 'flywheel authors', 'Specification-Version' : '1', // We are version 1 of ourselves - 'Implementation-Title' : project.name, - 'Implementation-Version' : project.version, + 'Implementation-Title' : project.jar.baseName, + 'Implementation-Version' : project.jar.archiveVersion, //'Implementation-Vendor': 'flywheel authors', - 'MixinConfigs' : 'flywheel.mixins.json', - 'Implementation-Timestamp': new Date().format("yyyy-MM-dd'T'HH:mm:ssZ") + 'Implementation-Timestamp': new Date().format("yyyy-MM-dd'T'HH:mm:ssZ"), + 'MixinConfigs' : 'flywheel.mixins.json' ]) } } -jar.finalizedBy('reobfJar') - javadoc { source = [sourceSets.main.allJava] // prevent java 8's strict doclint for javadocs from failing builds options.addStringOption('Xdoclint:none', '-quiet') } -task sourcesJar(type: Jar) { - from sourceSets.main.allSource - archiveBaseName.set(project.archivesBaseName) - archiveVersion.set("${project.version}") - archiveClassifier.set('sources') +java { + withSourcesJar() + withJavadocJar() } -task javadocJar(type: Jar, dependsOn: javadoc) { - from javadoc.destinationDir - archiveClassifier.set('javadoc') +void addLicense(jarTask) { + jarTask.from('LICENSE') { + rename { "${it}_${project.archivesBaseName}" } + } } -artifacts { - archives jar, sourcesJar, javadocJar -} +jar.finalizedBy('reobfJar') +addLicense(jar) publishing { - tasks.publish.dependsOn 'build' publications { mavenJava(MavenPublication) { - artifact jar - artifact sourcesJar - artifact javadocJar + artifactId = archivesBaseName + + from components.java + fg.component(it) } } diff --git a/gradle.properties b/gradle.properties index 42e95d776..67b6f3ee8 100644 --- a/gradle.properties +++ b/gradle.properties @@ -3,7 +3,8 @@ org.gradle.daemon = false # mod version info mod_version = 0.6.4 -mc_update_version = 1.18 +artifact_minecraft_version = 1.18.2 + minecraft_version = 1.18.2 forge_version = 40.1.60 diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index 7454180f2ae8848c63b8b4dea2cb829da983f2fa..41d9927a4d4fb3f96a785543079b8df6723c946b 100644 GIT binary patch delta 8958 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 diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 84d1f85fd..aa991fcea 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.1-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-7.4.2-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/gradlew b/gradlew index c53aefaa5..1b6c78733 100755 --- a/gradlew +++ b/gradlew @@ -1,7 +1,7 @@ #!/bin/sh # -# Copyright © 2015-2021 the original authors. +# Copyright © 2015-2021 the original authors. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -32,10 +32,10 @@ # Busybox and similar reduced shells will NOT work, because this script # requires all of these POSIX shell features: # * functions; -# * expansions «$var», «${var}», «${var:-default}», «${var+SET}», -# «${var#prefix}», «${var%suffix}», and «$( cmd )»; -# * compound commands having a testable exit status, especially «case»; -# * various built-in commands including «command», «set», and «ulimit». +# * expansions «$var», «${var}», «${var:-default}», «${var+SET}», +# «${var#prefix}», «${var%suffix}», and «$( cmd )»; +# * compound commands having a testable exit status, especially «case»; +# * various built-in commands including «command», «set», and «ulimit». # # Important for patching: # diff --git a/src/main/java/com/jozufozu/flywheel/repack/joml/AxisAngle4d.java b/joml/AxisAngle4d.java similarity index 100% rename from src/main/java/com/jozufozu/flywheel/repack/joml/AxisAngle4d.java rename to joml/AxisAngle4d.java diff --git a/src/main/java/com/jozufozu/flywheel/repack/joml/AxisAngle4f.java b/joml/AxisAngle4f.java similarity index 100% rename from src/main/java/com/jozufozu/flywheel/repack/joml/AxisAngle4f.java rename to joml/AxisAngle4f.java diff --git a/src/main/java/com/jozufozu/flywheel/repack/joml/ConfigurationException.java b/joml/ConfigurationException.java similarity index 100% rename from src/main/java/com/jozufozu/flywheel/repack/joml/ConfigurationException.java rename to joml/ConfigurationException.java diff --git a/src/main/java/com/jozufozu/flywheel/repack/joml/FrustumIntersection.java b/joml/FrustumIntersection.java similarity index 100% rename from src/main/java/com/jozufozu/flywheel/repack/joml/FrustumIntersection.java rename to joml/FrustumIntersection.java diff --git a/src/main/java/com/jozufozu/flywheel/repack/joml/FrustumRayBuilder.java b/joml/FrustumRayBuilder.java similarity index 100% rename from src/main/java/com/jozufozu/flywheel/repack/joml/FrustumRayBuilder.java rename to joml/FrustumRayBuilder.java diff --git a/src/main/java/com/jozufozu/flywheel/repack/joml/GeometryUtils.java b/joml/GeometryUtils.java similarity index 100% rename from src/main/java/com/jozufozu/flywheel/repack/joml/GeometryUtils.java rename to joml/GeometryUtils.java diff --git a/src/main/java/com/jozufozu/flywheel/repack/joml/Interpolationd.java b/joml/Interpolationd.java similarity index 100% rename from src/main/java/com/jozufozu/flywheel/repack/joml/Interpolationd.java rename to joml/Interpolationd.java diff --git a/src/main/java/com/jozufozu/flywheel/repack/joml/Interpolationf.java b/joml/Interpolationf.java similarity index 100% rename from src/main/java/com/jozufozu/flywheel/repack/joml/Interpolationf.java rename to joml/Interpolationf.java diff --git a/src/main/java/com/jozufozu/flywheel/repack/joml/Intersectiond.java b/joml/Intersectiond.java similarity index 100% rename from src/main/java/com/jozufozu/flywheel/repack/joml/Intersectiond.java rename to joml/Intersectiond.java diff --git a/src/main/java/com/jozufozu/flywheel/repack/joml/Intersectionf.java b/joml/Intersectionf.java similarity index 100% rename from src/main/java/com/jozufozu/flywheel/repack/joml/Intersectionf.java rename to joml/Intersectionf.java diff --git a/src/main/java/com/jozufozu/flywheel/repack/joml/Math.java b/joml/Math.java similarity index 100% rename from src/main/java/com/jozufozu/flywheel/repack/joml/Math.java rename to joml/Math.java diff --git a/src/main/java/com/jozufozu/flywheel/repack/joml/Matrix2d.java b/joml/Matrix2d.java similarity index 100% rename from src/main/java/com/jozufozu/flywheel/repack/joml/Matrix2d.java rename to joml/Matrix2d.java diff --git a/src/main/java/com/jozufozu/flywheel/repack/joml/Matrix2dc.java b/joml/Matrix2dc.java similarity index 100% rename from src/main/java/com/jozufozu/flywheel/repack/joml/Matrix2dc.java rename to joml/Matrix2dc.java diff --git a/src/main/java/com/jozufozu/flywheel/repack/joml/Matrix2f.java b/joml/Matrix2f.java similarity index 100% rename from src/main/java/com/jozufozu/flywheel/repack/joml/Matrix2f.java rename to joml/Matrix2f.java diff --git a/src/main/java/com/jozufozu/flywheel/repack/joml/Matrix2fc.java b/joml/Matrix2fc.java similarity index 100% rename from src/main/java/com/jozufozu/flywheel/repack/joml/Matrix2fc.java rename to joml/Matrix2fc.java diff --git a/src/main/java/com/jozufozu/flywheel/repack/joml/Matrix3d.java b/joml/Matrix3d.java similarity index 100% rename from src/main/java/com/jozufozu/flywheel/repack/joml/Matrix3d.java rename to joml/Matrix3d.java diff --git a/src/main/java/com/jozufozu/flywheel/repack/joml/Matrix3dStack.java b/joml/Matrix3dStack.java similarity index 100% rename from src/main/java/com/jozufozu/flywheel/repack/joml/Matrix3dStack.java rename to joml/Matrix3dStack.java diff --git a/src/main/java/com/jozufozu/flywheel/repack/joml/Matrix3dc.java b/joml/Matrix3dc.java similarity index 100% rename from src/main/java/com/jozufozu/flywheel/repack/joml/Matrix3dc.java rename to joml/Matrix3dc.java diff --git a/src/main/java/com/jozufozu/flywheel/repack/joml/Matrix3f.java b/joml/Matrix3f.java similarity index 100% rename from src/main/java/com/jozufozu/flywheel/repack/joml/Matrix3f.java rename to joml/Matrix3f.java diff --git a/src/main/java/com/jozufozu/flywheel/repack/joml/Matrix3fStack.java b/joml/Matrix3fStack.java similarity index 100% rename from src/main/java/com/jozufozu/flywheel/repack/joml/Matrix3fStack.java rename to joml/Matrix3fStack.java diff --git a/src/main/java/com/jozufozu/flywheel/repack/joml/Matrix3fc.java b/joml/Matrix3fc.java similarity index 100% rename from src/main/java/com/jozufozu/flywheel/repack/joml/Matrix3fc.java rename to joml/Matrix3fc.java diff --git a/src/main/java/com/jozufozu/flywheel/repack/joml/Matrix3x2d.java b/joml/Matrix3x2d.java similarity index 100% rename from src/main/java/com/jozufozu/flywheel/repack/joml/Matrix3x2d.java rename to joml/Matrix3x2d.java diff --git a/src/main/java/com/jozufozu/flywheel/repack/joml/Matrix3x2dStack.java b/joml/Matrix3x2dStack.java similarity index 100% rename from src/main/java/com/jozufozu/flywheel/repack/joml/Matrix3x2dStack.java rename to joml/Matrix3x2dStack.java diff --git a/src/main/java/com/jozufozu/flywheel/repack/joml/Matrix3x2dc.java b/joml/Matrix3x2dc.java similarity index 100% rename from src/main/java/com/jozufozu/flywheel/repack/joml/Matrix3x2dc.java rename to joml/Matrix3x2dc.java diff --git a/src/main/java/com/jozufozu/flywheel/repack/joml/Matrix3x2f.java b/joml/Matrix3x2f.java similarity index 100% rename from src/main/java/com/jozufozu/flywheel/repack/joml/Matrix3x2f.java rename to joml/Matrix3x2f.java diff --git a/src/main/java/com/jozufozu/flywheel/repack/joml/Matrix3x2fStack.java b/joml/Matrix3x2fStack.java similarity index 100% rename from src/main/java/com/jozufozu/flywheel/repack/joml/Matrix3x2fStack.java rename to joml/Matrix3x2fStack.java diff --git a/src/main/java/com/jozufozu/flywheel/repack/joml/Matrix3x2fc.java b/joml/Matrix3x2fc.java similarity index 100% rename from src/main/java/com/jozufozu/flywheel/repack/joml/Matrix3x2fc.java rename to joml/Matrix3x2fc.java diff --git a/src/main/java/com/jozufozu/flywheel/repack/joml/Matrix4d.java b/joml/Matrix4d.java similarity index 100% rename from src/main/java/com/jozufozu/flywheel/repack/joml/Matrix4d.java rename to joml/Matrix4d.java diff --git a/src/main/java/com/jozufozu/flywheel/repack/joml/Matrix4dStack.java b/joml/Matrix4dStack.java similarity index 100% rename from src/main/java/com/jozufozu/flywheel/repack/joml/Matrix4dStack.java rename to joml/Matrix4dStack.java diff --git a/src/main/java/com/jozufozu/flywheel/repack/joml/Matrix4dc.java b/joml/Matrix4dc.java similarity index 100% rename from src/main/java/com/jozufozu/flywheel/repack/joml/Matrix4dc.java rename to joml/Matrix4dc.java diff --git a/src/main/java/com/jozufozu/flywheel/repack/joml/Matrix4f.java b/joml/Matrix4f.java similarity index 100% rename from src/main/java/com/jozufozu/flywheel/repack/joml/Matrix4f.java rename to joml/Matrix4f.java diff --git a/src/main/java/com/jozufozu/flywheel/repack/joml/Matrix4fStack.java b/joml/Matrix4fStack.java similarity index 100% rename from src/main/java/com/jozufozu/flywheel/repack/joml/Matrix4fStack.java rename to joml/Matrix4fStack.java diff --git a/src/main/java/com/jozufozu/flywheel/repack/joml/Matrix4fc.java b/joml/Matrix4fc.java similarity index 100% rename from src/main/java/com/jozufozu/flywheel/repack/joml/Matrix4fc.java rename to joml/Matrix4fc.java diff --git a/src/main/java/com/jozufozu/flywheel/repack/joml/Matrix4x3d.java b/joml/Matrix4x3d.java similarity index 100% rename from src/main/java/com/jozufozu/flywheel/repack/joml/Matrix4x3d.java rename to joml/Matrix4x3d.java diff --git a/src/main/java/com/jozufozu/flywheel/repack/joml/Matrix4x3dStack.java b/joml/Matrix4x3dStack.java similarity index 100% rename from src/main/java/com/jozufozu/flywheel/repack/joml/Matrix4x3dStack.java rename to joml/Matrix4x3dStack.java diff --git a/src/main/java/com/jozufozu/flywheel/repack/joml/Matrix4x3dc.java b/joml/Matrix4x3dc.java similarity index 100% rename from src/main/java/com/jozufozu/flywheel/repack/joml/Matrix4x3dc.java rename to joml/Matrix4x3dc.java diff --git a/src/main/java/com/jozufozu/flywheel/repack/joml/Matrix4x3f.java b/joml/Matrix4x3f.java similarity index 100% rename from src/main/java/com/jozufozu/flywheel/repack/joml/Matrix4x3f.java rename to joml/Matrix4x3f.java diff --git a/src/main/java/com/jozufozu/flywheel/repack/joml/Matrix4x3fStack.java b/joml/Matrix4x3fStack.java similarity index 100% rename from src/main/java/com/jozufozu/flywheel/repack/joml/Matrix4x3fStack.java rename to joml/Matrix4x3fStack.java diff --git a/src/main/java/com/jozufozu/flywheel/repack/joml/Matrix4x3fc.java b/joml/Matrix4x3fc.java similarity index 100% rename from src/main/java/com/jozufozu/flywheel/repack/joml/Matrix4x3fc.java rename to joml/Matrix4x3fc.java diff --git a/src/main/java/com/jozufozu/flywheel/repack/joml/MemUtil.java b/joml/MemUtil.java similarity index 100% rename from src/main/java/com/jozufozu/flywheel/repack/joml/MemUtil.java rename to joml/MemUtil.java diff --git a/src/main/java/com/jozufozu/flywheel/repack/joml/Options.java b/joml/Options.java similarity index 100% rename from src/main/java/com/jozufozu/flywheel/repack/joml/Options.java rename to joml/Options.java diff --git a/src/main/java/com/jozufozu/flywheel/repack/joml/PolygonsIntersection.java b/joml/PolygonsIntersection.java similarity index 100% rename from src/main/java/com/jozufozu/flywheel/repack/joml/PolygonsIntersection.java rename to joml/PolygonsIntersection.java diff --git a/src/main/java/com/jozufozu/flywheel/repack/joml/Quaterniond.java b/joml/Quaterniond.java similarity index 100% rename from src/main/java/com/jozufozu/flywheel/repack/joml/Quaterniond.java rename to joml/Quaterniond.java diff --git a/src/main/java/com/jozufozu/flywheel/repack/joml/QuaterniondInterpolator.java b/joml/QuaterniondInterpolator.java similarity index 100% rename from src/main/java/com/jozufozu/flywheel/repack/joml/QuaterniondInterpolator.java rename to joml/QuaterniondInterpolator.java diff --git a/src/main/java/com/jozufozu/flywheel/repack/joml/Quaterniondc.java b/joml/Quaterniondc.java similarity index 100% rename from src/main/java/com/jozufozu/flywheel/repack/joml/Quaterniondc.java rename to joml/Quaterniondc.java diff --git a/src/main/java/com/jozufozu/flywheel/repack/joml/Quaternionf.java b/joml/Quaternionf.java similarity index 100% rename from src/main/java/com/jozufozu/flywheel/repack/joml/Quaternionf.java rename to joml/Quaternionf.java diff --git a/src/main/java/com/jozufozu/flywheel/repack/joml/QuaternionfInterpolator.java b/joml/QuaternionfInterpolator.java similarity index 100% rename from src/main/java/com/jozufozu/flywheel/repack/joml/QuaternionfInterpolator.java rename to joml/QuaternionfInterpolator.java diff --git a/src/main/java/com/jozufozu/flywheel/repack/joml/Quaternionfc.java b/joml/Quaternionfc.java similarity index 100% rename from src/main/java/com/jozufozu/flywheel/repack/joml/Quaternionfc.java rename to joml/Quaternionfc.java diff --git a/src/main/java/com/jozufozu/flywheel/repack/joml/Random.java b/joml/Random.java similarity index 100% rename from src/main/java/com/jozufozu/flywheel/repack/joml/Random.java rename to joml/Random.java diff --git a/src/main/java/com/jozufozu/flywheel/repack/joml/RayAabIntersection.java b/joml/RayAabIntersection.java similarity index 100% rename from src/main/java/com/jozufozu/flywheel/repack/joml/RayAabIntersection.java rename to joml/RayAabIntersection.java diff --git a/src/main/java/com/jozufozu/flywheel/repack/joml/RoundingMode.java b/joml/RoundingMode.java similarity index 100% rename from src/main/java/com/jozufozu/flywheel/repack/joml/RoundingMode.java rename to joml/RoundingMode.java diff --git a/src/main/java/com/jozufozu/flywheel/repack/joml/Runtime.java b/joml/Runtime.java similarity index 100% rename from src/main/java/com/jozufozu/flywheel/repack/joml/Runtime.java rename to joml/Runtime.java diff --git a/src/main/java/com/jozufozu/flywheel/repack/joml/SimplexNoise.java b/joml/SimplexNoise.java similarity index 100% rename from src/main/java/com/jozufozu/flywheel/repack/joml/SimplexNoise.java rename to joml/SimplexNoise.java diff --git a/src/main/java/com/jozufozu/flywheel/repack/joml/Vector2d.java b/joml/Vector2d.java similarity index 100% rename from src/main/java/com/jozufozu/flywheel/repack/joml/Vector2d.java rename to joml/Vector2d.java diff --git a/src/main/java/com/jozufozu/flywheel/repack/joml/Vector2dc.java b/joml/Vector2dc.java similarity index 100% rename from src/main/java/com/jozufozu/flywheel/repack/joml/Vector2dc.java rename to joml/Vector2dc.java diff --git a/src/main/java/com/jozufozu/flywheel/repack/joml/Vector2f.java b/joml/Vector2f.java similarity index 100% rename from src/main/java/com/jozufozu/flywheel/repack/joml/Vector2f.java rename to joml/Vector2f.java diff --git a/src/main/java/com/jozufozu/flywheel/repack/joml/Vector2fc.java b/joml/Vector2fc.java similarity index 100% rename from src/main/java/com/jozufozu/flywheel/repack/joml/Vector2fc.java rename to joml/Vector2fc.java diff --git a/src/main/java/com/jozufozu/flywheel/repack/joml/Vector2i.java b/joml/Vector2i.java similarity index 100% rename from src/main/java/com/jozufozu/flywheel/repack/joml/Vector2i.java rename to joml/Vector2i.java diff --git a/src/main/java/com/jozufozu/flywheel/repack/joml/Vector2ic.java b/joml/Vector2ic.java similarity index 100% rename from src/main/java/com/jozufozu/flywheel/repack/joml/Vector2ic.java rename to joml/Vector2ic.java diff --git a/src/main/java/com/jozufozu/flywheel/repack/joml/Vector3d.java b/joml/Vector3d.java similarity index 100% rename from src/main/java/com/jozufozu/flywheel/repack/joml/Vector3d.java rename to joml/Vector3d.java diff --git a/src/main/java/com/jozufozu/flywheel/repack/joml/Vector3dc.java b/joml/Vector3dc.java similarity index 100% rename from src/main/java/com/jozufozu/flywheel/repack/joml/Vector3dc.java rename to joml/Vector3dc.java diff --git a/src/main/java/com/jozufozu/flywheel/repack/joml/Vector3f.java b/joml/Vector3f.java similarity index 100% rename from src/main/java/com/jozufozu/flywheel/repack/joml/Vector3f.java rename to joml/Vector3f.java diff --git a/src/main/java/com/jozufozu/flywheel/repack/joml/Vector3fc.java b/joml/Vector3fc.java similarity index 100% rename from src/main/java/com/jozufozu/flywheel/repack/joml/Vector3fc.java rename to joml/Vector3fc.java diff --git a/src/main/java/com/jozufozu/flywheel/repack/joml/Vector3i.java b/joml/Vector3i.java similarity index 100% rename from src/main/java/com/jozufozu/flywheel/repack/joml/Vector3i.java rename to joml/Vector3i.java diff --git a/src/main/java/com/jozufozu/flywheel/repack/joml/Vector3ic.java b/joml/Vector3ic.java similarity index 100% rename from src/main/java/com/jozufozu/flywheel/repack/joml/Vector3ic.java rename to joml/Vector3ic.java diff --git a/src/main/java/com/jozufozu/flywheel/repack/joml/Vector4d.java b/joml/Vector4d.java similarity index 100% rename from src/main/java/com/jozufozu/flywheel/repack/joml/Vector4d.java rename to joml/Vector4d.java diff --git a/src/main/java/com/jozufozu/flywheel/repack/joml/Vector4dc.java b/joml/Vector4dc.java similarity index 100% rename from src/main/java/com/jozufozu/flywheel/repack/joml/Vector4dc.java rename to joml/Vector4dc.java diff --git a/src/main/java/com/jozufozu/flywheel/repack/joml/Vector4f.java b/joml/Vector4f.java similarity index 100% rename from src/main/java/com/jozufozu/flywheel/repack/joml/Vector4f.java rename to joml/Vector4f.java diff --git a/src/main/java/com/jozufozu/flywheel/repack/joml/Vector4fc.java b/joml/Vector4fc.java similarity index 100% rename from src/main/java/com/jozufozu/flywheel/repack/joml/Vector4fc.java rename to joml/Vector4fc.java diff --git a/src/main/java/com/jozufozu/flywheel/repack/joml/Vector4i.java b/joml/Vector4i.java similarity index 100% rename from src/main/java/com/jozufozu/flywheel/repack/joml/Vector4i.java rename to joml/Vector4i.java diff --git a/src/main/java/com/jozufozu/flywheel/repack/joml/Vector4ic.java b/joml/Vector4ic.java similarity index 100% rename from src/main/java/com/jozufozu/flywheel/repack/joml/Vector4ic.java rename to joml/Vector4ic.java diff --git a/src/main/java/com/jozufozu/flywheel/repack/joml/package.html b/joml/package.html similarity index 100% rename from src/main/java/com/jozufozu/flywheel/repack/joml/package.html rename to joml/package.html diff --git a/src/main/java/com/jozufozu/flywheel/repack/joml/sampling/BestCandidateSampling.java b/joml/sampling/BestCandidateSampling.java similarity index 100% rename from src/main/java/com/jozufozu/flywheel/repack/joml/sampling/BestCandidateSampling.java rename to joml/sampling/BestCandidateSampling.java diff --git a/src/main/java/com/jozufozu/flywheel/repack/joml/sampling/Callback2d.java b/joml/sampling/Callback2d.java similarity index 100% rename from src/main/java/com/jozufozu/flywheel/repack/joml/sampling/Callback2d.java rename to joml/sampling/Callback2d.java diff --git a/src/main/java/com/jozufozu/flywheel/repack/joml/sampling/Callback3d.java b/joml/sampling/Callback3d.java similarity index 100% rename from src/main/java/com/jozufozu/flywheel/repack/joml/sampling/Callback3d.java rename to joml/sampling/Callback3d.java diff --git a/src/main/java/com/jozufozu/flywheel/repack/joml/sampling/Convolution.java b/joml/sampling/Convolution.java similarity index 100% rename from src/main/java/com/jozufozu/flywheel/repack/joml/sampling/Convolution.java rename to joml/sampling/Convolution.java diff --git a/src/main/java/com/jozufozu/flywheel/repack/joml/sampling/Math.java b/joml/sampling/Math.java similarity index 100% rename from src/main/java/com/jozufozu/flywheel/repack/joml/sampling/Math.java rename to joml/sampling/Math.java diff --git a/src/main/java/com/jozufozu/flywheel/repack/joml/sampling/PoissonSampling.java b/joml/sampling/PoissonSampling.java similarity index 100% rename from src/main/java/com/jozufozu/flywheel/repack/joml/sampling/PoissonSampling.java rename to joml/sampling/PoissonSampling.java diff --git a/src/main/java/com/jozufozu/flywheel/repack/joml/sampling/SpiralSampling.java b/joml/sampling/SpiralSampling.java similarity index 100% rename from src/main/java/com/jozufozu/flywheel/repack/joml/sampling/SpiralSampling.java rename to joml/sampling/SpiralSampling.java diff --git a/src/main/java/com/jozufozu/flywheel/repack/joml/sampling/StratifiedSampling.java b/joml/sampling/StratifiedSampling.java similarity index 100% rename from src/main/java/com/jozufozu/flywheel/repack/joml/sampling/StratifiedSampling.java rename to joml/sampling/StratifiedSampling.java diff --git a/src/main/java/com/jozufozu/flywheel/repack/joml/sampling/UniformSampling.java b/joml/sampling/UniformSampling.java similarity index 100% rename from src/main/java/com/jozufozu/flywheel/repack/joml/sampling/UniformSampling.java rename to joml/sampling/UniformSampling.java diff --git a/src/main/java/com/jozufozu/flywheel/repack/joml/sampling/package.html b/joml/sampling/package.html similarity index 100% rename from src/main/java/com/jozufozu/flywheel/repack/joml/sampling/package.html rename to joml/sampling/package.html diff --git a/src/main/java/com/jozufozu/flywheel/backend/Backend.java b/src/main/java/com/jozufozu/flywheel/backend/Backend.java index 77528cb30..977ac0162 100644 --- a/src/main/java/com/jozufozu/flywheel/backend/Backend.java +++ b/src/main/java/com/jozufozu/flywheel/backend/Backend.java @@ -7,8 +7,8 @@ import org.slf4j.Logger; import com.jozufozu.flywheel.api.FlywheelWorld; import com.jozufozu.flywheel.backend.gl.versioned.GlCompat; import com.jozufozu.flywheel.backend.instancing.ParallelTaskEngine; -import com.jozufozu.flywheel.config.FlwConfig; import com.jozufozu.flywheel.config.BackendType; +import com.jozufozu.flywheel.config.FlwConfig; import com.jozufozu.flywheel.core.shader.ProgramSpec; import com.mojang.logging.LogUtils; diff --git a/src/main/java/com/jozufozu/flywheel/backend/Loader.java b/src/main/java/com/jozufozu/flywheel/backend/Loader.java index 94c3628cf..203c2660c 100644 --- a/src/main/java/com/jozufozu/flywheel/backend/Loader.java +++ b/src/main/java/com/jozufozu/flywheel/backend/Loader.java @@ -96,10 +96,8 @@ public class Loader implements ResourceManagerReloadListener { Collection programSpecs = manager.listResources(PROGRAM_DIR, s -> s.endsWith(".json")); for (ResourceLocation location : programSpecs) { - try { - Resource file = manager.getResource(location); - - String s = StringUtil.readToString(file.getInputStream()); + try (Resource resource = manager.getResource(location)) { + String s = StringUtil.readToString(resource.getInputStream()); ResourceLocation specName = ResourceUtil.trim(location, PROGRAM_DIR, ".json"); diff --git a/src/main/java/com/jozufozu/flywheel/config/FlwCommands.java b/src/main/java/com/jozufozu/flywheel/config/FlwCommands.java index ce0ea95d7..12b775205 100644 --- a/src/main/java/com/jozufozu/flywheel/config/FlwCommands.java +++ b/src/main/java/com/jozufozu/flywheel/config/FlwCommands.java @@ -19,7 +19,6 @@ import net.minecraft.network.chat.MutableComponent; import net.minecraft.network.chat.TextComponent; import net.minecraftforge.client.event.RegisterClientCommandsEvent; import net.minecraftforge.common.ForgeConfigSpec.ConfigValue; -import net.minecraftforge.fml.ModList; public class FlwCommands { public static void registerClientCommands(RegisterClientCommandsEvent event) { diff --git a/src/main/java/com/jozufozu/flywheel/core/source/ShaderSources.java b/src/main/java/com/jozufozu/flywheel/core/source/ShaderSources.java index b7e29c2a4..c4b42ec10 100644 --- a/src/main/java/com/jozufozu/flywheel/core/source/ShaderSources.java +++ b/src/main/java/com/jozufozu/flywheel/core/source/ShaderSources.java @@ -36,16 +36,14 @@ public class ShaderSources implements SourceFinder { }); for (ResourceLocation location : allShaders) { - try { - Resource resource = manager.getResource(location); - + try (Resource resource = manager.getResource(location)) { String source = StringUtil.readToString(resource.getInputStream()); ResourceLocation name = ResourceUtil.removePrefixUnchecked(location, SHADER_DIR); shaderSources.put(name, new SourceFile(this, name, source)); } catch (IOException e) { - + // } } diff --git a/src/main/java/com/jozufozu/flywheel/core/vertex/BlockVertexListUnsafe.java b/src/main/java/com/jozufozu/flywheel/core/vertex/BlockVertexListUnsafe.java index 959b90ef3..07dbdeb4d 100644 --- a/src/main/java/com/jozufozu/flywheel/core/vertex/BlockVertexListUnsafe.java +++ b/src/main/java/com/jozufozu/flywheel/core/vertex/BlockVertexListUnsafe.java @@ -1,14 +1,11 @@ package com.jozufozu.flywheel.core.vertex; -import java.nio.Buffer; import java.nio.ByteBuffer; import org.lwjgl.system.MemoryUtil; import com.jozufozu.flywheel.api.vertex.ShadedVertexList; -import com.jozufozu.flywheel.api.vertex.VertexList; import com.jozufozu.flywheel.util.RenderMath; -import com.mojang.blaze3d.platform.MemoryTracker; public class BlockVertexListUnsafe extends AbstractVertexList { diff --git a/src/main/java/com/jozufozu/flywheel/core/vertex/PosTexNormalVertexListUnsafe.java b/src/main/java/com/jozufozu/flywheel/core/vertex/PosTexNormalVertexListUnsafe.java index 79baf8e00..6b5a99305 100644 --- a/src/main/java/com/jozufozu/flywheel/core/vertex/PosTexNormalVertexListUnsafe.java +++ b/src/main/java/com/jozufozu/flywheel/core/vertex/PosTexNormalVertexListUnsafe.java @@ -1,13 +1,10 @@ package com.jozufozu.flywheel.core.vertex; -import java.nio.Buffer; import java.nio.ByteBuffer; import org.lwjgl.system.MemoryUtil; -import com.jozufozu.flywheel.api.vertex.VertexList; import com.jozufozu.flywheel.util.RenderMath; -import com.mojang.blaze3d.platform.MemoryTracker; public class PosTexNormalVertexListUnsafe extends AbstractVertexList { diff --git a/src/main/java/com/jozufozu/flywheel/util/WorldAttached.java b/src/main/java/com/jozufozu/flywheel/util/WorldAttached.java index 45b989f2f..2573a9a52 100644 --- a/src/main/java/com/jozufozu/flywheel/util/WorldAttached.java +++ b/src/main/java/com/jozufozu/flywheel/util/WorldAttached.java @@ -3,7 +3,6 @@ package com.jozufozu.flywheel.util; import java.lang.ref.WeakReference; import java.util.ArrayList; import java.util.HashMap; -import java.util.Iterator; import java.util.List; import java.util.Map; import java.util.function.BiConsumer; diff --git a/src/main/resources/META-INF/mods.toml b/src/main/resources/META-INF/mods.toml index 2f6649f40..347fb6482 100644 --- a/src/main/resources/META-INF/mods.toml +++ b/src/main/resources/META-INF/mods.toml @@ -5,7 +5,7 @@ license = "MIT" [[mods]] modId = "flywheel" -version = "${file.jarVersion}" +version = "${version}" displayName = "Flywheel" logoFile = "logo.png" displayURL = "https://www.curseforge.com/minecraft/mc-mods/flywheel"