Merge pull request #52 from contariaa/mac/1.16.1

Update to SpeedrunAPI 2.0 (mac)

Author: tildejustin

build.gradle

@@ -22,7 +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") {
+    modImplementation ("com.github.contariaa:speedrunapi:$speedrunapi_version") {
         transitive = false
     }
 }

gradle.properties

@@ -10,6 +10,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 = v1.1
+speedrunapi_version = 96811e85e8
 archives_name = sodiummac
 maven_group = me.jellysquid.mods

src/main/java/me/jellysquid/mods/sodium/client/gui/SodiumGameOptions.java

@@ -1,5 +1,10 @@
 package me.jellysquid.mods.sodium.client.gui;
 
+import me.contaria.speedrunapi.config.SpeedrunConfigAPI;
+import me.contaria.speedrunapi.config.api.SpeedrunConfig;
+import me.contaria.speedrunapi.config.api.SpeedrunConfigStorage;
+import me.contaria.speedrunapi.config.api.SpeedrunOption;
+import me.contaria.speedrunapi.config.api.annotations.Config;
 import me.jellysquid.mods.sodium.client.SodiumClientMod;
 import me.jellysquid.mods.sodium.client.render.chunk.backends.gl20.GL20ChunkRenderBackend;
 import me.jellysquid.mods.sodium.client.render.chunk.backends.gl30.GL30ChunkRenderBackend;
@@ -8,19 +13,13 @@
 import net.minecraft.client.gui.widget.ButtonWidget;
 import net.minecraft.client.render.WorldRenderer;
 import org.jetbrains.annotations.Nullable;
-import org.mcsr.speedrunapi.config.SpeedrunConfigAPI;
-import org.mcsr.speedrunapi.config.SpeedrunConfigContainer;
-import org.mcsr.speedrunapi.config.api.SpeedrunConfig;
-import org.mcsr.speedrunapi.config.api.SpeedrunConfigStorage;
-import org.mcsr.speedrunapi.config.api.SpeedrunOption;
-import org.mcsr.speedrunapi.config.api.annotations.Config;
-import org.mcsr.speedrunapi.config.api.annotations.InitializeOn;
 
 import java.lang.reflect.Field;
 import java.util.Arrays;
 import java.util.stream.Stream;
 
-@InitializeOn(InitializeOn.InitPoint.POSTLAUNCH)
+// ensure mac sodium is launched before StandardSettings with priority
+@Config(init = Config.InitPoint.POSTLAUNCH, priority = 500)
 public class SodiumGameOptions implements SpeedrunConfig {
     @Config.Category("quality")
     public final QualitySettings quality = new QualitySettings();

src/main/resources/fabric.mod.json

@@ -44,7 +44,7 @@
     ],
     "depends": {
         "fabricloader": ">=0.8.0",
-        "speedrunapi": "*"
+        "speedrunapi": ">=2.0"
     },
     "breaks": {
         "optifabric": "*",