Merge pull request #53 from tildejustin/1.15.2

1.15.2 - srapi removals and customizable chunk builder threads

Author: tildejustin

.github/workflows/build.yml

@@ -14,7 +14,7 @@ jobs:
       - name: checkout repository
         uses: actions/checkout@v4
       - name: validate gradle wrapper
-        uses: gradle/wrapper-validation-action@v1
+        uses: gradle/actions/wrapper-validation@v4
       - name: setup java
         uses: actions/setup-java@v4
         with:

.gitignore

@@ -22,4 +22,4 @@ bin/
 
 # fabric
 
-run/
+run/

build.gradle

@@ -1,5 +1,5 @@
 plugins {
-    id "fabric-loom" version "1.5-SNAPSHOT"
+    id "fabric-loom" version "1.9-SNAPSHOT"
     id "maven-publish"
 }
 
@@ -14,10 +14,17 @@ loom {
     accessWidenerPath = file("src/main/resources/sodium.accesswidener")
 }
 
+repositories {
+    maven { url "https://jitpack.io" }
+}
+
 dependencies {
     minecraft "com.mojang:minecraft:$minecraft_version"
     mappings "net.fabricmc:yarn:$yarn_mappings:v2"
     modImplementation "net.fabricmc:fabric-loader:$loader_version"
+    modImplementation ("com.github.contariaa:speedrunapi:$speedrunapi_version") {
+        transitive = false
+    }
 }
 
 processResources {
@@ -28,6 +35,7 @@ processResources {
 
 tasks.withType(JavaCompile).configureEach {
     options.encoding = "UTF-8"
+    options.compilerArgs << "-XDenableSunApiLintControl" << "-Xlint:-sunapi"
 }
 
 java {

gradle.properties

@@ -2,11 +2,13 @@ org.gradle.jvmargs = -Xmx2G
 org.gradle.parallel = true
 org.gradle.caching = true
 
-mod_version = 1.3.1
+mod_version = 1.5.0
 
 minecraft_version = 1.15.2
 yarn_mappings = 1.15.2+build.17
-loader_version = 0.15.6
+loader_version = 0.16.9
 target_version = 1.15.2
+# https://jitpack.io/#kingcontaria/speedrunapi
+speedrunapi_version = 45fa51d142
 archives_name = sodium
 maven_group = me.jellysquid.mods

gradle/wrapper/gradle-wrapper.jar

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

gradle/wrapper/gradle-wrapper.properties

@@ -11,7 +11,7 @@
 import java.io.File;
 
 public class SodiumClientMod implements ClientModInitializer {
-    private static SodiumGameOptions CONFIG;
+    public static SodiumGameOptions CONFIG;
     private static Logger LOGGER;
 
     private static String MOD_VERSION;
@@ -24,14 +24,11 @@ public void onInitializeClient() {
 
         MOD_VERSION = mod.getMetadata()
                 .getVersion()
-                .getFriendlyString();
+                .getFriendlyString()
+                .split("\\+")[0];
     }
 
     public static SodiumGameOptions options() {
-        if (CONFIG == null) {
-            CONFIG = loadConfig();
-        }
-
         return CONFIG;
     }
 
@@ -43,13 +40,6 @@ public static Logger logger() {
         return LOGGER;
     }
 
-    private static SodiumGameOptions loadConfig() {
-        SodiumGameOptions config = SodiumGameOptions.load(new File("config/sodium-options.json"));
-        onConfigChanged(config);
-
-        return config;
-    }
-
     public static void onConfigChanged(SodiumGameOptions options) {
         UnsafeUtil.setEnabled(options.advanced.useMemoryIntrinsics);
     }