Switch mainProject to 1.20.4

Signed-off-by: Hendrix-Shen <[email protected]>
Hendrix-Shen · Dec 23, 2023 · a05e7bf · a05e7bf
1 parent 845b148
commit a05e7bf
Show file tree

Hide file tree

Showing 8 changed files with 15 additions and 15 deletions.
diff --git a/README.md b/README.md
@@ -32,7 +32,7 @@ The default hotkey to open the in-game config GUI is **T + C**.
 
 ### Support
 
-Current main development for Minecraft version: 1.20.1
+Current main development for Minecraft version: 1.20.4
 
 And use `preprocess` to be compatible with all versions.
 

diff --git a/README_ZH_CN.md b/README_ZH_CN.md
@@ -32,7 +32,7 @@
 
 ### 支持
 
-当前主开发版本：1.20.1
+当前主开发版本：1.20.4
 
 并且使用 `预处理` 来兼容各版本。
 

diff --git a/src/main/java/top/hendrixshen/tweakmyclient/gui/autoReconnect/PatchedDisconnectedScreen.java b/src/main/java/top/hendrixshen/tweakmyclient/gui/autoReconnect/PatchedDisconnectedScreen.java
@@ -122,9 +122,9 @@ public void render(GuiGraphics guiGraphics, int mouseX, int mouseY, float delta)
         } else {
             this.renderBackground(
                     //#if MC > 12001
-                    //$$ guiGraphics, mouseX, mouseY, delta
+                    guiGraphics, mouseX, mouseY, delta
                     //#else
-                    guiGraphics
+                    //$$ guiGraphics
                     //#endif
             );
         }

diff --git a/...n/java/top/hendrixshen/tweakmyclient/mixin/disable/disableGuiShadowLayer/MixinScreen.java b/...n/java/top/hendrixshen/tweakmyclient/mixin/disable/disableGuiShadowLayer/MixinScreen.java
@@ -27,9 +27,9 @@ public abstract class MixinScreen extends AbstractContainerEventHandler {
             at = @At(
                     value = "INVOKE",
                     //#if MC > 12001
-                    //$$ target = "Lnet/minecraft/client/gui/screens/Screen;renderTransparentBackground(Lnet/minecraft/client/gui/GuiGraphics;)V"
+                    target = "Lnet/minecraft/client/gui/screens/Screen;renderTransparentBackground(Lnet/minecraft/client/gui/GuiGraphics;)V"
                     //#elseif MC > 11904
-                    target = "Lnet/minecraft/client/gui/GuiGraphics;fillGradient(IIIIII)V"
+                    //$$ target = "Lnet/minecraft/client/gui/GuiGraphics;fillGradient(IIIIII)V"
                     //#elseif MC > 11502
                     //$$ target = "Lnet/minecraft/client/gui/screens/Screen;fillGradient(Lcom/mojang/blaze3d/vertex/PoseStack;IIIIII)V"
                     //#else
@@ -46,9 +46,9 @@ private void onFillGradient(
             //$$ PoseStack poseStack,
             //#endif
             //#if MC > 12001
-            //$$ int i,
-            //$$ int j,
-            //$$ float f,
+            int i,
+            int j,
+            float f,
             //#endif
             //#if MC < 11904
             //$$ int i,

diff --git a/.../hendrixshen/tweakmyclient/mixin/feature/featureCustomGuiBackgroundColor/MixinScreen.java b/.../hendrixshen/tweakmyclient/mixin/feature/featureCustomGuiBackgroundColor/MixinScreen.java
@@ -25,9 +25,9 @@ public abstract class MixinScreen extends AbstractContainerEventHandler {
      */
     @ModifyArgs(
             //#if MC > 12001
-            //$$ method = "renderTransparentBackground",
+            method = "renderTransparentBackground",
             //#elseif MC > 11903
-            method = "renderBackground",
+            //$$ method = "renderBackground",
             //#elseif MC > 11502
             //$$ method = "renderBackground(Lcom/mojang/blaze3d/vertex/PoseStack;I)V",
             //#else

diff --git a/src/main/java/top/hendrixshen/tweakmyclient/util/CustomWindowUtil.java b/src/main/java/top/hendrixshen/tweakmyclient/util/CustomWindowUtil.java
@@ -74,9 +74,9 @@ public static String getWindowTitle() {
             return I18n.get("title.singleplayer");
         } else if (
                 //#if MC > 12001
-                //$$ mc.getCurrentServer() != null && mc.getCurrentServer().isRealm()
+                mc.getCurrentServer() != null && mc.getCurrentServer().isRealm()
                 //#else
-                mc.isConnectedToRealms()
+                //$$ mc.isConnectedToRealms()
                 //#endif
         ) {
             return I18n.get("title.multiplayer.realms");

diff --git a/src/main/java/top/hendrixshen/tweakmyclient/util/notenoughcrashes/BlueScreen.java b/src/main/java/top/hendrixshen/tweakmyclient/util/notenoughcrashes/BlueScreen.java
@@ -14,7 +14,7 @@
 
 //#if MC < 12000
 //#if MC > 11605
-import net.minecraft.client.renderer.GameRenderer;
+//$$ import net.minecraft.client.renderer.GameRenderer;
 //#else
 //$$ import org.lwjgl.opengl.GL11;
 //#endif

diff --git a/versions/mainProject b/versions/mainProject
@@ -1 +1 @@
-1.20.1
+1.20.4