From a299df6ef3497b452e6890e74ee51422049387a8 Mon Sep 17 00:00:00 2001
From: JFronny <git@akbvopenfl1.hopto.org>
Date: Thu, 25 Apr 2024 11:23:46 +0200
Subject: [PATCH] chore: update to 1.20.5

---
 build.gradle.kts                              | 21 ++++++++++---------
 .../jfronny/slyde/mixin/GameOptionsMixin.java | 10 +++++----
 2 files changed, 17 insertions(+), 14 deletions(-)

diff --git a/build.gradle.kts b/build.gradle.kts
index a5fc2ec..3f5f03d 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -1,5 +1,5 @@
 plugins {
-    id("jfmod") version "1.5-SNAPSHOT"
+    id("jfmod") version "1.6-SNAPSHOT"
 }
 
 loom {
@@ -10,10 +10,11 @@ allprojects { group = "io.gitlab.jfronny" }
 base.archivesName = "slyde"
 
 jfMod {
-    minecraftVersion = "1.20.4"
+    minecraftVersion = "1.20.5"
     yarn("build.1")
-    loaderVersion = "0.15.0"
-    libJfVersion = "3.14.1"
+    loaderVersion = "0.15.10"
+    libJfVersion = "3.15.2"
+    fabricApiVersion = "0.97.6+1.20.5"
 
     modrinth {
         projectId = "slyde"
@@ -32,13 +33,13 @@ repositories {
 }
 
 dependencies {
-    modCompileOnly("maven.modrinth:sodium:mc1.20.3-0.5.4")
+    modCompileOnly("maven.modrinth:sodium:mc1.20.5-0.5.8")
 
-    modImplementation("io.gitlab.jfronny.libjf:libjf-config-core-v2:${jfMod.libJfVersion.get()}")
+    modImplementation("io.gitlab.jfronny.libjf:libjf-config-core-v2")
 
     // For testing in dev environment
-    modLocalRuntime("net.fabricmc.fabric-api:fabric-api:0.91.1+1.20.4")
-    modLocalRuntime("io.gitlab.jfronny.libjf:libjf-devutil:${jfMod.libJfVersion.get()}")
-    modLocalRuntime("io.gitlab.jfronny.libjf:libjf-config-ui-tiny:${jfMod.libJfVersion.get()}")
-    modLocalRuntime("com.terraformersmc:modmenu:9.0.0-pre.1")
+    modLocalRuntime("net.fabricmc.fabric-api:fabric-api")
+    modLocalRuntime("io.gitlab.jfronny.libjf:libjf-devutil")
+    modLocalRuntime("io.gitlab.jfronny.libjf:libjf-config-ui-tiny")
+    modLocalRuntime("com.terraformersmc:modmenu:10.0.0-beta.1")
 }
diff --git a/src/client/java/io/gitlab/jfronny/slyde/mixin/GameOptionsMixin.java b/src/client/java/io/gitlab/jfronny/slyde/mixin/GameOptionsMixin.java
index 2ec139a..b53b2df 100644
--- a/src/client/java/io/gitlab/jfronny/slyde/mixin/GameOptionsMixin.java
+++ b/src/client/java/io/gitlab/jfronny/slyde/mixin/GameOptionsMixin.java
@@ -1,5 +1,7 @@
 package io.gitlab.jfronny.slyde.mixin;
 
+import com.mojang.serialization.DataResult;
+import io.gitlab.jfronny.commons.ref.R;
 import net.minecraft.client.*;
 import net.minecraft.client.option.*;
 import org.spongepowered.asm.mixin.*;
@@ -10,9 +12,9 @@ import java.util.function.*;
 
 @Mixin(targets = "net.minecraft.client.option.GameOptions$2")
 public class GameOptionsMixin {
-    @Redirect(method = "accept", at = @At(value = "INVOKE", target = "Ljava/util/Optional;ifPresent(Ljava/util/function/Consumer;)V", ordinal = 1))
-    private <T> void slyde$replaceSetter(Optional<T> value, Consumer<T> originalSetter, String key, SimpleOption<T> option) {
-        value.ifPresent(realValue -> {
+    @Redirect(method = "accept", at = @At(value = "INVOKE", target = "Lcom/mojang/serialization/DataResult;ifSuccess(Ljava/util/function/Consumer;)Lcom/mojang/serialization/DataResult;", remap = false))
+    private <T> DataResult<T> slyde$replaceSetter(DataResult<T> instance, Consumer<T> consumer, String key, SimpleOption<T> option) {
+        return instance.ifSuccess(realValue -> {
             if (option.getCallbacks() instanceof SimpleOption.SliderCallbacks) {
                 if (!MinecraftClient.getInstance().isRunning()) {
                     option.value = realValue;
@@ -24,7 +26,7 @@ public class GameOptionsMixin {
                 }
                 return;
             }
-            originalSetter.accept(realValue);
+            consumer.accept(realValue);
         });
     }
 }