sync with sakura-ryoko/tweakeroo

ThinkingStudios · Jul 10, 2024 · 3cd0e78 · 3cd0e78
1 parent 5456fb7
commit 3cd0e78
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 7 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,2 +1,2 @@
 ## Change
-- port to 1.20.6
+- sync with `sakura-ryoko/tweakeroo`
diff --git a/build.gradle b/build.gradle
@@ -23,6 +23,7 @@ dependencies {
     neoForge "net.neoforged:neoforge:${project.neoforge_version}"
 
     modImplementation "maven.modrinth:mafglib:${project.malilib_version}"
+    modImplementation("maven.modrinth:neonetwork:${project.neonetwork_version}")
 
     implementation "com.google.code.findbugs:jsr305:3.0.2"
 }

diff --git a/gradle.properties b/gradle.properties
@@ -5,12 +5,12 @@ loom.platform=neoforge
 
 # Base properties
     minecraft_version=1.20.6
-    neoforge_version=20.6.113-beta
+    neoforge_version=20.6.119
     yarn_mappings=1.20.6+build.3
-    yarn_patch=1.20.5+build.3
+    yarn_patch=1.20.6+build.4
 
 # Mod Properties
-    mod_version=0.1.2
+    mod_version=0.1.3
     maven_group=org.thinkingstudio.tweakerge
     archives_base_name=Tweakerge
     mod_id=tweakerge
@@ -19,4 +19,5 @@ loom.platform=neoforge
     curseforge_id=915857
 
 # Dependencies
-    malilib_version=0.1.8-mc1.20.6
+    malilib_version=0.1.12-mc1.20.6
+    neonetwork_version=0.1.5+mc1.20.6
diff --git a/src/main/java/fi/dy/masa/tweakeroo/mixin/MixinBackgroundRenderer.java b/src/main/java/fi/dy/masa/tweakeroo/mixin/MixinBackgroundRenderer.java
@@ -67,8 +67,10 @@ private static float overrideFogStart(float original)
         {
             return Math.max(512, MinecraftClient.getInstance().gameRenderer.getViewDistance()) * 1.6f;
         }
+        
         return original;
     }
+    
     @ModifyVariable(
             method = "applyFog(Lnet/minecraft/client/render/Camera;Lnet/minecraft/client/render/BackgroundRenderer$FogType;FZ)V",
             slice = @Slice(
@@ -80,6 +82,7 @@ private static float overrideFogEnd(float original)
         {
             return Math.max(512, MinecraftClient.getInstance().gameRenderer.getViewDistance()) * 2.0f;
         }
+        
         return original;
     }
     */

diff --git a/src/main/java/org/thinkingstudio/tweakerge/Tweakerge.java b/src/main/java/org/thinkingstudio/tweakerge/Tweakerge.java
@@ -6,14 +6,15 @@
 import net.neoforged.api.distmarker.Dist;
 import net.neoforged.fml.common.Mod;
 import net.neoforged.fml.loading.FMLLoader;
-import org.thinkingstudio.mafglib.util.ForgePlatformUtils;
+import org.thinkingstudio.mafglib.util.NeoUtils;
 
 @Mod(value = Reference.MOD_ID, dist = Dist.CLIENT)
 public class Tweakerge {
     public Tweakerge() {
         if (FMLLoader.getDist().isClient()) {
             Tweakeroo.onInitialize();
-            ForgePlatformUtils.getInstance().registerModConfigScreen(Reference.MOD_ID, (screen) -> {
+
+            NeoUtils.getInstance().registerModConfigScreen(Reference.MOD_ID, (screen) -> {
                 GuiConfigs gui = new GuiConfigs();
                 gui.setParent(screen);
                 return gui;