Merge pull request #43 from tildejustin/mac/1.16.1

3.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 = 3.3.1
+mod_version = 3.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 = sodiummac
 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/MixinWorldRenderer.java

@@ -39,7 +39,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;

src/main/resources/assets/sodiummac/lang/en_us.json

@@ -4,21 +4,21 @@
     "speedrunapi.config.sodiummac.category.speedrun": "Speedrun",
     "speedrunapi.config.sodiummac.option.quality:enableVignette": "Vignette",
     "speedrunapi.config.sodiummac.option.quality:enableVignette.description": "If enabled, a vignette effect will be rendered on the player's view. This is very unlikely to make a difference to frame rates unless you are fill-rate limited.",
-    "speedrunapi.config.sodium.option.advanced:initialChunkThreads": "Initial Chunk Threads",
-    "speedrunapi.config.sodium.option.advanced:initialChunkThreads.description": "How many chunk building threads to create instantly when reloading (lower = less F3 + F lag). Cannot be more than Target Chunk Threads.",
-    "speedrunapi.config.sodium.option.advanced:initialChunkThreads.value.0": "Auto",
-    "speedrunapi.config.sodium.option.advanced:targetChunkThreads": "Target Chunk Threads",
-    "speedrunapi.config.sodium.option.advanced:targetChunkThreads.description": "How many chunk building threads to create quickly after reloading (ideal: Number of hardware threads). Cannot be more than Maximum Chunk Threads.",
-    "speedrunapi.config.sodium.option.advanced:targetChunkThreads.value.0": "Auto",
-    "speedrunapi.config.sodium.option.advanced:maxChunkThreads": "Maximum Chunk Threads",
-    "speedrunapi.config.sodium.option.advanced:maxChunkThreads.description": "How many chunk building threads to create in total (may help long-term chunk loading)",
-    "speedrunapi.config.sodium.option.advanced:maxChunkThreads.value.0": "Auto",
-    "speedrunapi.config.sodium.option.advanced:quickThreadCreationInterval": "Fast Thread Creation Interval",
-    "speedrunapi.config.sodium.option.advanced:quickThreadCreationInterval.description": "Interval between each chunk builder thread being created, up to targetChunkThreads.",
-    "speedrunapi.config.sodium.option.advanced:quickThreadCreationInterval.value": "%sms",
-    "speedrunapi.config.sodium.option.advanced:slowThreadCreationInterval": "Slow Thread Creation Interval",
-    "speedrunapi.config.sodium.option.advanced:slowThreadCreationInterval.description": "Interval between each chunk builder thread being created, up to maxChunkThreads.",
-    "speedrunapi.config.sodium.option.advanced:slowThreadCreationInterval.value": "%sms",
+    "speedrunapi.config.sodiummac.option.advanced:initialChunkThreads": "Initial Chunk Threads",
+    "speedrunapi.config.sodiummac.option.advanced:initialChunkThreads.description": "How many chunk building threads to create instantly when reloading (lower = less F3 + F lag). Cannot be more than Target Chunk Threads.",
+    "speedrunapi.config.sodiummac.option.advanced:initialChunkThreads.value.0": "Auto",
+    "speedrunapi.config.sodiummac.option.advanced:targetChunkThreads": "Target Chunk Threads",
+    "speedrunapi.config.sodiummac.option.advanced:targetChunkThreads.description": "How many chunk building threads to create quickly after reloading (ideal: Number of hardware threads). Cannot be more than Maximum Chunk Threads.",
+    "speedrunapi.config.sodiummac.option.advanced:targetChunkThreads.value.0": "Auto",
+    "speedrunapi.config.sodiummac.option.advanced:maxChunkThreads": "Maximum Chunk Threads",
+    "speedrunapi.config.sodiummac.option.advanced:maxChunkThreads.description": "How many chunk building threads to create in total (may help long-term chunk loading)",
+    "speedrunapi.config.sodiummac.option.advanced:maxChunkThreads.value.0": "Auto",
+    "speedrunapi.config.sodiummac.option.advanced:quickThreadCreationInterval": "Fast Thread Creation Interval",
+    "speedrunapi.config.sodiummac.option.advanced:quickThreadCreationInterval.description": "Interval between each chunk builder thread being created, up to targetChunkThreads.",
+    "speedrunapi.config.sodiummac.option.advanced:quickThreadCreationInterval.value": "%sms",
+    "speedrunapi.config.sodiummac.option.advanced:slowThreadCreationInterval": "Slow Thread Creation Interval",
+    "speedrunapi.config.sodiummac.option.advanced:slowThreadCreationInterval.description": "Interval between each chunk builder thread being created, up to maxChunkThreads.",
+    "speedrunapi.config.sodiummac.option.advanced:slowThreadCreationInterval.value": "%sms",
     "speedrunapi.config.sodiummac.option.advanced:chunkRendererBackend": "Chunk Renderer",
     "speedrunapi.config.sodiummac.option.advanced:chunkRendererBackend.description": "Modern versions of OpenGL provide features which can be used to greatly reduce driver overhead when rendering chunks. You should use the latest feature set allowed by Sodium for optimal performance. If you're experiencing chunk rendering issues or driver crashes, try using the older (and possibly more stable) feature sets.",
     "speedrunapi.config.sodiummac.option.advanced:chunkRendererBackend.value.GL43": "Multidraw (GL 4.3)",