From 2159692908274edcb121d345bff08673ba66ddb4 Mon Sep 17 00:00:00 2001
From: FalsePattern <30945458+FalsePattern@users.noreply.github.com>
Date: Thu, 17 Mar 2022 16:20:08 +0100
Subject: [PATCH] RenderGlobal

---
 .../endlessids/asm/ClassEdit.java             |  3 +--
 .../asm/transformer/VanillaRenderGlobal.java  | 21 ---------------
 .../mixins/client/RenderGlobalMixin.java      | 26 +++++++++++++++++++
 .../endlessids/mixin/plugin/Mixin.java        |  1 +
 4 files changed, 28 insertions(+), 23 deletions(-)
 delete mode 100644 src/main/java/com/falsepattern/endlessids/asm/transformer/VanillaRenderGlobal.java
 create mode 100644 src/main/java/com/falsepattern/endlessids/mixin/mixins/client/RenderGlobalMixin.java

diff --git a/src/main/java/com/falsepattern/endlessids/asm/ClassEdit.java b/src/main/java/com/falsepattern/endlessids/asm/ClassEdit.java
index cb5ea05..633703f 100644
--- a/src/main/java/com/falsepattern/endlessids/asm/ClassEdit.java
+++ b/src/main/java/com/falsepattern/endlessids/asm/ClassEdit.java
@@ -9,7 +9,6 @@ import com.falsepattern.endlessids.asm.transformer.CofhBlockHelper;
 import com.falsepattern.endlessids.asm.transformer.FmlRegistry;
 import com.falsepattern.endlessids.asm.transformer.VanillaItemInWorldManager;
 import com.falsepattern.endlessids.asm.transformer.VanillaPlayerControllerMP;
-import com.falsepattern.endlessids.asm.transformer.VanillaRenderGlobal;
 import com.falsepattern.endlessids.asm.transformer.VanillaS26PacketMapChunkBulk;
 import com.falsepattern.endlessids.asm.transformer.VanillaS24PacketBlockActivation;
 import com.falsepattern.endlessids.asm.transformer.VanillaS22PacketMultiBlockChange;
@@ -29,7 +28,7 @@ public enum ClassEdit
     VanillaS22PacketMultiBlockChange(new VanillaS22PacketMultiBlockChange(), new String[] { "net.minecraft.network.play.server.S22PacketMultiBlockChange" }), 
     VanillaS24PacketBlockActivation(new VanillaS24PacketBlockActivation(), new String[] { "net.minecraft.network.play.server.S24PacketBlockAction" }), 
     VanillaS26PacketMapChunkBulk(new VanillaS26PacketMapChunkBulk(), new String[] { "net.minecraft.network.play.server.S26PacketMapChunkBulk" }), 
-    VanillaRenderGlobal(new VanillaRenderGlobal(), new String[] { "net.minecraft.client.renderer.RenderGlobal" }), 
+    //VanillaRenderGlobal(new VanillaRenderGlobal(), new String[] { "net.minecraft.client.renderer.RenderGlobal" }),
     VanillaPlayerControllerMP(new VanillaPlayerControllerMP(), new String[] { "net.minecraft.client.multiplayer.PlayerControllerMP" }), 
     VanillaItemInWorldManager(new VanillaItemInWorldManager(), new String[] { "net.minecraft.server.management.ItemInWorldManager" }), 
     //VanillaWorld(new VanillaWorld(), new String[] { "net.minecraft.world.World" }),
diff --git a/src/main/java/com/falsepattern/endlessids/asm/transformer/VanillaRenderGlobal.java b/src/main/java/com/falsepattern/endlessids/asm/transformer/VanillaRenderGlobal.java
deleted file mode 100644
index 2741e8c..0000000
--- a/src/main/java/com/falsepattern/endlessids/asm/transformer/VanillaRenderGlobal.java
+++ /dev/null
@@ -1,21 +0,0 @@
-package com.falsepattern.endlessids.asm.transformer;
-
-import org.objectweb.asm.tree.MethodNode;
-import com.falsepattern.endlessids.asm.AsmUtil;
-import com.falsepattern.endlessids.asm.Name;
-import org.objectweb.asm.tree.ClassNode;
-import com.falsepattern.endlessids.asm.IClassNodeTransformer;
-
-public class VanillaRenderGlobal implements IClassNodeTransformer
-{
-    public VanillaRenderGlobal() {
-        super();
-    }
-    
-    @Override
-    public void transform(final ClassNode cn, final boolean obfuscated) {
-        final MethodNode method = AsmUtil.findMethod(cn, Name.renderGlobal_playAuxSFX);
-        AsmUtil.transformInlinedSizeMethod(cn, method, 4095, 65535);
-        AsmUtil.transformInlinedSizeMethod(cn, method, 12, 16);
-    }
-}
diff --git a/src/main/java/com/falsepattern/endlessids/mixin/mixins/client/RenderGlobalMixin.java b/src/main/java/com/falsepattern/endlessids/mixin/mixins/client/RenderGlobalMixin.java
new file mode 100644
index 0000000..7940f59
--- /dev/null
+++ b/src/main/java/com/falsepattern/endlessids/mixin/mixins/client/RenderGlobalMixin.java
@@ -0,0 +1,26 @@
+package com.falsepattern.endlessids.mixin.mixins.client;
+
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
+import net.minecraft.client.renderer.RenderGlobal;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.injection.Constant;
+import org.spongepowered.asm.mixin.injection.ModifyConstant;
+
+@SideOnly(Side.CLIENT)
+@Mixin(RenderGlobal.class)
+public abstract class RenderGlobalMixin {
+    @ModifyConstant(method = "playAuxSFX",
+                    constant = @Constant(intValue = 4095),
+                    require = 1)
+    private int extend1(int constant) {
+        return 65535;
+    }
+
+    @ModifyConstant(method = "playAuxSFX",
+                    constant = @Constant(intValue = 12),
+                    require = 1)
+    private int extend2(int constant) {
+        return 16;
+    }
+}
diff --git a/src/main/java/com/falsepattern/endlessids/mixin/plugin/Mixin.java b/src/main/java/com/falsepattern/endlessids/mixin/plugin/Mixin.java
index 4ed30cd..b1159a1 100644
--- a/src/main/java/com/falsepattern/endlessids/mixin/plugin/Mixin.java
+++ b/src/main/java/com/falsepattern/endlessids/mixin/plugin/Mixin.java
@@ -18,6 +18,7 @@ public enum Mixin {
     ExtendedBlockStorageMixin(builder(Side.COMMON).mixin("ExtendedBlockStorageMixin")),
     S21PacketChunkDataMixin(builder(Side.COMMON).mixin("S21PacketChunkDataMixin")),
     NetHandlerPlayClientMixin(builder(Side.CLIENT).mixin("NetHandlerPlayClientMixin")),
+    RenderGlobalMixin(builder(Side.CLIENT).mixin("RenderGlobalMixin")),
     ;
 
     public final String mixin;