Fix transformers not working

CleanroomMC · Jul 13, 2024 · 517c573 · 517c573
1 parent a97a4ee
commit 517c573
Show file tree

Hide file tree

Showing 4 changed files with 38 additions and 20 deletions.
diff --git a/src/main/java/com/cleanroommc/fugue/helper/HookHelper.java b/src/main/java/com/cleanroommc/fugue/helper/HookHelper.java
@@ -45,7 +45,12 @@ private static String byGetResource() {
     }
 
     public static URI toURI(URL url) throws IOException, URISyntaxException {
-        return ((JarURLConnection) url.openConnection()).getJarFileURL().toURI();
+        URLConnection connection = url.openConnection();
+        if (connection instanceof JarURLConnection jarURLConnection) {
+            return jarURLConnection.getJarFileURL().toURI();
+        } else  {
+            return url.toURI();
+        }
     }
 
     public static List<IClassTransformer> getTransformers() {

diff --git a/src/main/java/com/cleanroommc/fugue/transformer/loliasm/ModIdentifierTransformer.java b/src/main/java/com/cleanroommc/fugue/transformer/loliasm/ModIdentifierTransformer.java
@@ -13,6 +13,7 @@ public byte[] transform(byte[] bytes) {
         try {
             var cp = ClassPool.getDefault();
             CtClass cc = cp.makeClass(new ByteArrayInputStream(bytes));
+            cc.defrost();
             var ifc = cc.getMethod("identifyFromClass", "(Ljava/lang/String;Ljava/util/Map;)Ljava/util/Set;");
             ifc.insertAt(64, """
                     {

diff --git a/src/main/java/com/cleanroommc/fugue/transformer/universal/FinalStripperTransformer.java b/src/main/java/com/cleanroommc/fugue/transformer/universal/FinalStripperTransformer.java
@@ -19,6 +19,7 @@ public FinalStripperTransformer(Map<String, String> targets) {
     public byte[] transform(byte[] bytes) {
         try {
             CtClass cc = ClassPool.getDefault().makeClass(new ByteArrayInputStream(bytes));
+            cc.defrost();
             String[] fields = targets.get(cc.getName()).split("\\|");
             Arrays.stream(cc.getFields()).filter(ctField ->
                     Arrays.stream(fields).anyMatch(f ->
@@ -29,6 +30,7 @@ public byte[] transform(byte[] bytes) {
                 ctField2.setModifiers(ctField2.getModifiers() & ~Modifier.FINAL);
                 Fugue.LOGGER.debug("Stripping final modifier of {} from {}", ctField2.getName(), ctField2.getDeclaringClass().getName());
             });
+            cc.defrost();
             bytes = cc.toBytecode();
         } catch (Throwable t) {
             Fugue.LOGGER.error("Exception {} on {}", t, this.getClass().getSimpleName());

diff --git a/src/main/java/com/cleanroommc/fugue/transformer/universal/ITweakerTransformer.java b/src/main/java/com/cleanroommc/fugue/transformer/universal/ITweakerTransformer.java
@@ -4,34 +4,44 @@
 import javassist.*;
 import javassist.expr.ExprEditor;
 import javassist.expr.MethodCall;
+import org.objectweb.asm.ClassReader;
+import org.objectweb.asm.ClassWriter;
+import org.objectweb.asm.Opcodes;
+import org.objectweb.asm.tree.*;
 import top.outlands.foundation.IExplicitTransformer;
 
 import java.io.ByteArrayInputStream;
 
 public class ITweakerTransformer implements IExplicitTransformer {
     @Override
     public byte[] transform(byte[] bytes) {
-        try {
-            CtClass cc = ClassPool.getDefault().makeClass(new ByteArrayInputStream(bytes));
-            ExprEditor editor = new ExprEditor() {
-                @Override
-                public void edit(MethodCall m) throws CannotCompileException {
-                    if (m.getMethodName().equals("toURI")) {
-                        m.replace(
-                                """
-                                        {
-                                            $_ = com.cleanroommc.fugue.helper.HookHelper#toURI($0);
-                                        }
-                                        """
-                        );
+        ClassNode classNode = new ClassNode();
+        ClassReader classReader = new ClassReader(bytes);
+        classReader.accept(classNode, 0);
+        if (classNode.methods != null)
+        {
+            for (MethodNode methodNode : classNode.methods)
+            {
+                InsnList instructions = methodNode.instructions;
+                if (instructions != null)
+                {
+                    for (AbstractInsnNode insnNode : instructions)
+                    {
+                        if (insnNode.getOpcode() == Opcodes.INVOKEVIRTUAL && insnNode instanceof MethodInsnNode methodInsnNode)
+                        {
+                            if ("java/net/URL".equals(methodInsnNode.owner) && "toURI".equalsIgnoreCase(methodInsnNode.name))
+                            {
+                                instructions.insertBefore(methodInsnNode, new MethodInsnNode(Opcodes.INVOKESTATIC, "com/cleanroommc/fugue/helper/HookHelper", "toURI", "(Ljava/net/URL;)Ljava/net/URI;", false));
+                                instructions.remove(methodInsnNode);
+                            }
+                        }
                     }
                 }
-            };
-            cc.instrument(editor);
-            bytes = cc.toBytecode();
-        } catch (Throwable t) {
-            Fugue.LOGGER.error("Exception {} on {}", t, this.getClass().getSimpleName());
+            }
         }
-        return bytes;
+        ClassWriter classWriter = new ClassWriter(0);
+
+        classNode.accept(classWriter);
+        return classWriter.toByteArray();
     }
 }