ASM suggested by @brachy84

CleanroomMC · Aug 12, 2024 · c273d54 · c273d54
1 parent ee8f431
commit c273d54
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 5 deletions.
diff --git a/src/main/java/com/cleanroommc/fugue/common/FugueLoadingPlugin.java b/src/main/java/com/cleanroommc/fugue/common/FugueLoadingPlugin.java
@@ -123,7 +123,7 @@ public class FugueLoadingPlugin implements IFMLLoadingPlugin {
         if (FugueConfig.modPatchConfig.enableGroovyScript) {
             //TransformerDelegate.registerExplicitTransformerByInstance(new GroovyClassLoaderTransformer(), "groovy.lang.GroovyClassLoader");
 
-            //TransformerDelegate.registerExplicitTransformerByInstance(new GroovyClassLoaderTransformer(), "groovy.lang.GroovyClassLoader");
+            TransformerDelegate.registerExplicitTransformerByInstance(new GroovyClassLoaderTransformer(), "groovy.lang.GroovyClassLoader");
             //TransformerDelegate.registerExplicitTransformerByInstance(new ExceptionMessageTransformer(), "org.codehaus.groovy.control.messages.ExceptionMessage");
             TransformerDelegate.registerExplicitTransformerByInstance(new GroovyRunnerRegistryTransformer(), "org.apache.groovy.plugin.GroovyRunnerRegistry");
             TransformerDelegate.registerExplicitTransformerByInstance(new ASTTransformationCollectorCodeVisitorTransformer(), "org.codehaus.groovy.transform.ASTTransformationCollectorCodeVisitor");

diff --git a/...ain/java/com/cleanroommc/fugue/transformer/groovyscript/GroovyClassLoaderTransformer.java b/...ain/java/com/cleanroommc/fugue/transformer/groovyscript/GroovyClassLoaderTransformer.java
@@ -6,7 +6,6 @@
 import javassist.CtClass;
 import javassist.expr.ExprEditor;
 import javassist.expr.MethodCall;
-import net.minecraft.launchwrapper.Launch;
 import top.outlands.foundation.IExplicitTransformer;
 
 import java.io.ByteArrayInputStream;
@@ -16,12 +15,12 @@ public class GroovyClassLoaderTransformer implements IExplicitTransformer {
     public byte[] transform(byte[] bytes) {
         try {
             CtClass cc = ClassPool.getDefault().makeClass(new ByteArrayInputStream(bytes));
-            cc.getDeclaredMethod("access$400").instrument(new ExprEditor(){
+            cc.getDeclaredMethod("loadClass").instrument(new ExprEditor(){
                 @Override
                 public void edit(MethodCall m) throws CannotCompileException {
                     //Fugue.LOGGER.info("Transforming Groovy class method: {}", m.getMethodName());
-                    if (m.getMethodName().equals("defineClass")) {
-                        m.replace("$_ = com.cleanroommc.fugue.helper.HookHelper#defineClass($2, $3, $4, $5, $6);");
+                    if (m.getMethodName().equals("loadClass")) {
+                        m.replace("$_ = net.minecraft.launchwrapper.Launch#classLoader.loadClass($1);");
                     }
                 }
             });