Merge pull request #42 from tildejustin/1.16.1-2

2.4.0 version bump and misc updates

build.gradle

@@ -1,5 +1,5 @@
 plugins {
-    id "fabric-loom" version "1.7-SNAPSHOT"
+    id "fabric-loom" version "1.9-SNAPSHOT"
     id "maven-publish"
 }
 
@@ -22,7 +22,9 @@ dependencies {
     minecraft "com.mojang:minecraft:$minecraft_version"
     mappings "dev.tildejustin:yarn:$yarn_mappings:v2"
     modImplementation "net.fabricmc:fabric-loader:$loader_version"
-    modImplementation "com.github.kingcontaria:speedrunapi:$speedrunapi_version"
+    modImplementation ("com.github.kingcontaria:speedrunapi:$speedrunapi_version") {
+        transitive = false
+    }
 }
 
 processResources {
@@ -33,6 +35,7 @@ processResources {
 
 tasks.withType(JavaCompile).configureEach {
     options.encoding = "UTF-8"
+    options.compilerArgs << "-XDenableSunApiLintControl" << "-Xlint:-sunapi"
 }
 
 java {

gradle.properties

@@ -2,14 +2,14 @@ org.gradle.jvmargs = -Xmx2G
 org.gradle.parallel = true
 org.gradle.caching = true
 
-mod_version = 2.3.1
+mod_version = 2.4.0
 
 minecraft_version = 1.16.1
 # https://github.com/tildejustin/yarn/tags
-yarn_mappings = 1.16.1-build.27
-loader_version = 0.15.6
+yarn_mappings = 1.16.1-build.28
+loader_version = 0.16.9
 target_version = 1.16.1
 # https://jitpack.io/#kingcontaria/speedrunapi
-speedrunapi_version = 8c2a7c1f8a
+speedrunapi_version = v1.1
 archives_name = sodium
 maven_group = me.jellysquid.mods

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.12-all.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

gradlew

@@ -86,8 +86,7 @@ done
 # shellcheck disable=SC2034
 APP_BASE_NAME=${0##*/}
 # Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
-APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s
-' "$PWD" ) || exit
+APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s\n' "$PWD" ) || exit
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD=maximum

src/main/java/me/jellysquid/mods/sodium/mixin/features/chunk_rendering/MixinPackedIntegerArray.java

@@ -15,7 +15,7 @@ public class MixinPackedIntegerArray implements PackedIntegerArrayExtended {
 
     @Shadow
     @Final
-    private int field_24079;
+    private int elementsPerLong;
 
     @Shadow
     @Final
@@ -36,7 +36,7 @@ public <T> void copyUsingPalette(T[] out, ClonedPalette<T> palette) {
         for (long word : this.storage) {
             long l = word;
 
-            for (int j = 0; j < this.field_24079; ++j) {
+            for (int j = 0; j < this.elementsPerLong; ++j) {
                 out[idx] = palette.get((int) (l & this.maxValue));
                 l >>= this.elementBits;
 

src/main/java/me/jellysquid/mods/sodium/mixin/features/chunk_rendering/MixinWorldRenderer.java

@@ -40,7 +40,7 @@ public SodiumWorldRenderer getSodiumWorldRenderer() {
         return renderer;
     }
 
-    @ModifyArg(method = "<init>", at = @At(value = "INVOKE", target = "Lit/unimi/dsi/fastutil/objects/ObjectArrayList;<init>(I)V"))
+    @ModifyArg(method = "<init>", at = @At(value = "INVOKE", target = "Lit/unimi/dsi/fastutil/objects/ObjectArrayList;<init>(I)V", remap = false))
     private int nullifyVisibleChunksList(int capacity) {
         // Sodium doesn't use this list, so we prevent the initial capacity of 69696 to be allocated
         return 0;