Fix Aqua Acrobatics in a tricky way

CleanroomMC · Jan 8, 2024 · e3539e6 · e3539e6
1 parent 83a8695
commit e3539e6
Show file tree

Hide file tree

Showing 11 changed files with 157 additions and 8 deletions.
diff --git a/README.md b/README.md
@@ -16,6 +16,7 @@ Also check [The Fugue Plane](https://forgottenrealms.fandom.com/wiki/Fugue_Plane
 * Lag Goggles
 * Snow! Real Magic
 * Botania Tweaks
+* Aqua Acrobatics
 
 ## Note
 Add ! to start of the file name to fix Lag Goggles.
diff --git a/gradle.properties b/gradle.properties
@@ -16,7 +16,7 @@ mappings_version=39-1.12
 mod_id=fugue
 mod_name=Fugue
 mod_main_class=Fugue
-mod_version=0.2.0
+mod_version=0.3.0
 mod_base_package=com.cleanroommc.fugue
 mod_authors=kappa_maintainer
 mod_description=A mod that patch dead mods for Cleanroom
diff --git a/src/main/java/com/cleanroommc/FugueLoadingPlugin.java b/src/main/java/com/cleanroommc/FugueLoadingPlugin.java
@@ -2,12 +2,15 @@
 
 import net.minecraft.launchwrapper.Launch;
 import net.minecraftforge.fml.relauncher.IFMLLoadingPlugin;
+import zone.rong.mixinbooter.IEarlyMixinLoader;
 
 import javax.annotation.Nullable;
+import java.util.Collections;
+import java.util.List;
 import java.util.Map;
 
 @IFMLLoadingPlugin.MCVersion("1.12.2")
-public class FugueLoadingPlugin implements IFMLLoadingPlugin {
+public class FugueLoadingPlugin implements IFMLLoadingPlugin, IEarlyMixinLoader {
     static {
         Launch.classLoader.addTransformerExclusionFilter("com.github.terminatornl.laggoggles.");
         Launch.classLoader.addTransformerExclusionFilter("quaternary.botaniatweaks.");
@@ -44,4 +47,8 @@ public String getAccessTransformerClass() {
         return null;
     }
 
+    @Override
+    public List<String> getMixinConfigs() {
+        return Collections.singletonList("fugue.mixin.aquaacrobatics.json");
+    }
 }
diff --git a/src/main/java/com/cleanroommc/PostApplyMixinPlugin.java b/src/main/java/com/cleanroommc/PostApplyMixinPlugin.java
@@ -0,0 +1,80 @@
+package com.cleanroommc;
+
+import net.minecraftforge.fml.common.ObfuscationReflectionHelper;
+import org.objectweb.asm.Opcodes;
+import org.objectweb.asm.tree.*;
+import org.spongepowered.asm.mixin.extensibility.IMixinConfigPlugin;
+import org.spongepowered.asm.mixin.extensibility.IMixinInfo;
+
+import java.util.List;
+import java.util.Set;
+
+public class PostApplyMixinPlugin implements IMixinConfigPlugin {
+    private static boolean hit = false;
+    @Override
+    public void onLoad(String mixinPackage) {
+
+    }
+
+    @Override
+    public String getRefMapperConfig() {
+        return null;
+    }
+
+    @Override
+    public boolean shouldApplyMixin(String targetClassName, String mixinClassName) {
+        return true;
+    }
+
+    @Override
+    public void acceptTargets(Set<String> myTargets, Set<String> otherTargets) {
+
+    }
+
+    @Override
+    public List<String> getMixins() {
+        return null;
+    }
+
+    @Override
+    public void preApply(String targetClassName, ClassNode targetClass, String mixinClassName, IMixinInfo mixinInfo) {
+
+    }
+
+    @Override
+    public void postApply(String targetClassName, ClassNode targetClass, String mixinClassName, IMixinInfo mixinInfo) {
+        if (hit || !targetClassName.equals("net.minecraft.client.renderer.BlockFluidRenderer")) {
+            return;
+        }
+        for (MethodNode methodNode : targetClass.methods) {
+            if (methodNode != null) {
+                InsnList insnList = methodNode.instructions;
+                if (insnList != null)
+                    for (AbstractInsnNode abstractInsnNode : insnList) {
+                        if (abstractInsnNode instanceof MethodInsnNode methodInsnNode) {
+                            if (methodInsnNode.owner.startsWith("org/spongepowered/asm/synthetic/args/Args$")) {
+                                if (methodInsnNode.name.equals("of")) {
+                                    methodInsnNode.owner = "com/cleanroommc/helper/ArgsHelper";
+                                    methodInsnNode.desc = "(FFFF)Lcom/cleanroommc/helper/ArgsHelper;";
+                                }
+                                if (methodInsnNode.name.startsWith("$")) {
+                                    int index = Integer.parseInt(methodInsnNode.name.substring(1));
+                                    if (index < 6) {
+                                        insnList.insertBefore(methodInsnNode, new InsnNode(Opcodes.ICONST_0 + index));
+                                    } else {
+                                        insnList.insertBefore(methodInsnNode, new LdcInsnNode(index));
+                                    }
+                                    insnList.insert(methodInsnNode, new MethodInsnNode(Opcodes.INVOKEVIRTUAL, "java/lang/Float", "floatValue", "()F"));
+                                    insnList.insert(methodInsnNode, new TypeInsnNode(Opcodes.CHECKCAST, "java/lang/Float"));
+                                    methodInsnNode.owner = "com/cleanroommc/helper/ArgsHelper";
+                                    methodInsnNode.desc = "(I)Ljava/lang/Object;";
+                                    methodInsnNode.name = "get";
+                                    hit = true;
+                                }
+                            }
+                        }
+                    }
+            }
+        }
+    }
+}
diff --git a/src/main/java/com/cleanroommc/helper/ArgsHelper.java b/src/main/java/com/cleanroommc/helper/ArgsHelper.java
@@ -0,0 +1,41 @@
+package com.cleanroommc.helper;
+
+import org.spongepowered.asm.mixin.injection.invoke.arg.Args;
+
+public class ArgsHelper extends Args {
+    private Object[] args;
+    /**
+     * Ctor.
+     *
+     * @param values argument values
+     */
+    protected ArgsHelper(Object[] values) {
+        super(values);
+        args = values;
+    }
+
+    @Override
+    public <T> void set(int index, T value) {
+        args[index] = value;
+    }
+
+    @Override
+    public void setAll(Object... values) {
+        args = values;
+    }
+
+    @Override
+    public int size() {
+        return this.args.length;
+    }
+
+    @Override
+    @SuppressWarnings("unchecked")
+    public <T> T get(int index) {
+        return (T)this.args[index];
+    }
+
+    public static ArgsHelper of(float a, float b, float c, float d) {
+        return new ArgsHelper(new Object[]{a,b,c,d});
+    }
+}
diff --git a/...main/java/com/cleanroommc/HookHelper.java → ...va/com/cleanroommc/helper/HookHelper.java b/...main/java/com/cleanroommc/HookHelper.java → ...va/com/cleanroommc/helper/HookHelper.java
@@ -1,4 +1,4 @@
-package com.cleanroommc;
+package com.cleanroommc.helper;
 
 import scala.tools.asm.Opcodes;
 

diff --git a/src/main/java/com/cleanroommc/mixin/aquaacrobatics/BlockFluidRendererMixin.java b/src/main/java/com/cleanroommc/mixin/aquaacrobatics/BlockFluidRendererMixin.java
@@ -0,0 +1,8 @@
+package com.cleanroommc.mixin.aquaacrobatics;
+
+import net.minecraft.client.renderer.BlockFluidRenderer;
+import org.spongepowered.asm.mixin.Mixin;
+
+@Mixin(value = BlockFluidRenderer.class, priority = 0)
+public class BlockFluidRendererMixin {
+}
diff --git a/src/main/java/com/cleanroommc/mixin/charset/ColorspacesMixin.java b/src/main/java/com/cleanroommc/mixin/charset/ColorspacesMixin.java
@@ -18,6 +18,7 @@
 import java.util.function.Function;
 
 @Mixin(value = Colorspaces.class, remap = false)
+@SuppressWarnings("unchecked")
 public class ColorspacesMixin {
     @Shadow private static Table<Colorspace, Colorspace, Function<float[], float[]>> conversionTable;
 

diff --git a/src/main/java/com/cleanroommc/transformer/EnderCoreTransformerTransformer.java b/src/main/java/com/cleanroommc/transformer/EnderCoreTransformerTransformer.java
@@ -15,7 +15,7 @@ public byte[] transform(String s, String s1, byte[] bytes) {
             return null;
         }
 
-        if (!s1.equals("com.enderio.core.common.transform.EnderCoreTransformer") || hit)
+        if (hit || !s1.equals("com.enderio.core.common.transform.EnderCoreTransformer"))
         {
             return bytes;
         }

diff --git a/src/main/java/com/cleanroommc/transformer/InitializerTransformer.java b/src/main/java/com/cleanroommc/transformer/InitializerTransformer.java
@@ -1,7 +1,5 @@
 package com.cleanroommc.transformer;
 
-import com.cleanroommc.Fugue;
-import com.cleanroommc.HookHelper;
 import net.minecraft.launchwrapper.IClassTransformer;
 import org.objectweb.asm.ClassReader;
 import org.objectweb.asm.ClassWriter;
@@ -18,7 +16,7 @@ public byte[] transform(String s, String s1, byte[] bytes) {
             return null;
         }
 
-        if (!s1.equals("com.github.terminatornl.laggoggles.tickcentral.Initializer") || hit)
+        if (hit || !s1.equals("com.github.terminatornl.laggoggles.tickcentral.Initializer"))
         {
             return bytes;
         }
@@ -43,7 +41,7 @@ public byte[] transform(String s, String s1, byte[] bytes) {
                                     InsnList toInsert = new InsnList();
                                     toInsert.add(new VarInsnNode(Opcodes.ALOAD, 10));
                                     toInsert.add(new VarInsnNode(Opcodes.ILOAD, 6));
-                                    toInsert.add(new MethodInsnNode(Opcodes.INVOKESTATIC, "com/cleanroommc/HookHelper", "isInterface", "(I)Z"));
+                                    toInsert.add(new MethodInsnNode(Opcodes.INVOKESTATIC, "com/cleanroommc/helper/HookHelper", "isInterface", "(I)Z"));
                                     toInsert.add(new FieldInsnNode(Opcodes.PUTFIELD, "org/objectweb/asm/tree/MethodInsnNode", "itf", "Z"));
                                     instructions.insert(fieldInsnNode, toInsert);
                                     modified = true;

diff --git a/src/main/resources/fugue.mixin.aquaacrobatics.json b/src/main/resources/fugue.mixin.aquaacrobatics.json
@@ -0,0 +1,13 @@
+{
+  "required": true,
+  "package": "com.cleanroommc.mixin.aquaacrobatics",
+  "compatibilityLevel": "JAVA_8",
+  "refmap": "fugue.mixin.refmap.json",
+  "plugin": "com.cleanroommc.PostApplyMixinPlugin",
+  "mixins": [
+    "BlockFluidRendererMixin"
+  ],
+  "client": [
+  ],
+  "minVersion": "0.8"
+}