From e7ac4227e084e797c5877b2a77f4f3ee9b2519de Mon Sep 17 00:00:00 2001 From: contaria Date: Tue, 11 Feb 2025 23:52:47 +0100 Subject: [PATCH 1/3] update to speedrunapi 2.0 --- gradle.properties | 2 +- .../mods/sodium/client/gui/SodiumGameOptions.java | 15 +++++++-------- src/main/resources/fabric.mod.json | 2 +- 3 files changed, 9 insertions(+), 10 deletions(-) diff --git a/gradle.properties b/gradle.properties index bd1f1292..592ab98f 100644 --- a/gradle.properties +++ b/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 = 8497ae7479 archives_name = sodiummac maven_group = me.jellysquid.mods diff --git a/src/main/java/me/jellysquid/mods/sodium/client/gui/SodiumGameOptions.java b/src/main/java/me/jellysquid/mods/sodium/client/gui/SodiumGameOptions.java index 981ea088..7fc52d44 100644 --- a/src/main/java/me/jellysquid/mods/sodium/client/gui/SodiumGameOptions.java +++ b/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(); diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json index 9d65f0f0..a31cef3c 100644 --- a/src/main/resources/fabric.mod.json +++ b/src/main/resources/fabric.mod.json @@ -44,7 +44,7 @@ ], "depends": { "fabricloader": ">=0.8.0", - "speedrunapi": "*" + "speedrunapi": ">=2.0" }, "breaks": { "optifabric": "*", From 2ccd0fc1087181e26041ed812ee461f9029d8af6 Mon Sep 17 00:00:00 2001 From: contaria Date: Thu, 12 Jun 2025 18:55:52 +0200 Subject: [PATCH 2/3] update speedrunapi repo link --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index 2e49cdb2..ea8fc5b3 100644 --- a/build.gradle +++ b/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 } } From 53487c74842b11148cd51b5a96b45eef2d08ef9e Mon Sep 17 00:00:00 2001 From: contaria Date: Thu, 12 Jun 2025 19:38:01 +0200 Subject: [PATCH 3/3] update speedrunapi again --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index 592ab98f..876e4f91 100644 --- a/gradle.properties +++ b/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 = 8497ae7479 +speedrunapi_version = 96811e85e8 archives_name = sodiummac maven_group = me.jellysquid.mods