Merge pull request #31 from tildejustin/experimental/speedrunapi

speedrunapi integration

Author: tildejustin

.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.7-SNAPSHOT"
     id "maven-publish"
 }
 
@@ -22,6 +22,7 @@ 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"
 }
 
 processResources {

gradle.properties

@@ -2,11 +2,14 @@ org.gradle.jvmargs = -Xmx2G
 org.gradle.parallel = true
 org.gradle.caching = true
 
-mod_version = 2.2.1
+mod_version = 2.3.0
 
 minecraft_version = 1.16.1
-yarn_mappings = 1.16.1-build.22
+# https://github.com/tildejustin/yarn/tags
+yarn_mappings = 1.16.1-build.27
 loader_version = 0.15.6
 target_version = 1.16.1
+# https://jitpack.io/#kingcontaria/speedrunapi
+speedrunapi_version = 8c2a7c1f8a
 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.9-all.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

gradle/wrapper/gradle-wrapper.properties

@@ -9,7 +9,7 @@
 import org.apache.logging.log4j.Logger;
 
 public class SodiumClientMod implements ClientModInitializer {
-    private static SodiumGameOptions CONFIG;
+    public static SodiumGameOptions CONFIG;
     private static Logger LOGGER;
 
     private static String MOD_VERSION;
@@ -22,14 +22,11 @@ public void onInitializeClient() {
 
         MOD_VERSION = mod.getMetadata()
                 .getVersion()
-                .getFriendlyString();
+                .getFriendlyString()
+                .split("\\+")[0];
     }
 
     public static SodiumGameOptions options() {
-        if (CONFIG == null) {
-            CONFIG = loadConfig();
-        }
-
         return CONFIG;
     }
 
@@ -41,13 +38,6 @@ public static Logger logger() {
         return LOGGER;
     }
 
-    private static SodiumGameOptions loadConfig() {
-        SodiumGameOptions config = SodiumGameOptions.load(FabricLoader.getInstance().getConfigDir().resolve("sodium-options.json"));
-        onConfigChanged(config);
-
-        return config;
-    }
-
     public static void onConfigChanged(SodiumGameOptions options) {
         UnsafeUtil.setEnabled(options.advanced.allowDirectMemoryAccess);
     }