Patch mod identifier

CleanroomMC · Jun 6, 2024 · e675241 · e675241
1 parent 3911466
commit e675241
Show file tree

Hide file tree

Showing 3 changed files with 32 additions and 3 deletions.
diff --git a/src/main/java/com/cleanroommc/fugue/common/FugueLoadingPlugin.java b/src/main/java/com/cleanroommc/fugue/common/FugueLoadingPlugin.java
@@ -8,6 +8,7 @@
 import com.cleanroommc.fugue.transformer.loliasm.JavaFixesTransformer;
 import com.cleanroommc.fugue.transformer.loliasm.LoliFMLCallHookTransformer;
 import com.cleanroommc.fugue.transformer.loliasm.LoliReflectorTransformer;
+import com.cleanroommc.fugue.transformer.loliasm.ModIdentifierTransformer;
 import com.cleanroommc.fugue.transformer.nothirium.BufferBuilderTransformer;
 import com.cleanroommc.fugue.transformer.nothirium.FreeSectorManagerTransformer;
 import com.cleanroommc.fugue.transformer.nothirium.MixinBufferBuilderTransformer;
@@ -87,6 +88,7 @@ public class FugueLoadingPlugin implements IFMLLoadingPlugin {
             TransformerDelegate.registerExplicitTransformerByInstance(new LoliReflectorTransformer(), "zone.rong.loliasm.LoliReflector");
             TransformerDelegate.registerExplicitTransformerByInstance(new JavaFixesTransformer(), "zone.rong.loliasm.common.java.JavaFixes");
             TransformerDelegate.registerExplicitTransformerByInstance(new LoliFMLCallHookTransformer(), "zone.rong.loliasm.core.LoliFMLCallHook");
+            TransformerDelegate.registerExplicitTransformerByInstance(new ModIdentifierTransformer(), "zone.rong.loliasm.common.crashes.ModIdentifier");
         }
         if (FugueConfig.modPatchConfig.enableZeroCore) {
             TransformerDelegate.registerExplicitTransformerByInstance(new DisplayListTransformer(), "it.zerono.mods.zerocore.lib.client.render.DisplayList");

diff --git a/src/main/java/com/cleanroommc/fugue/helper/HookHelper.java b/src/main/java/com/cleanroommc/fugue/helper/HookHelper.java
@@ -1,14 +1,11 @@
 package com.cleanroommc.fugue.helper;
 
-import com.cleanroommc.fugue.common.Fugue;
 import net.minecraft.launchwrapper.IClassTransformer;
 import net.minecraft.launchwrapper.Launch;
 import net.minecraft.launchwrapper.LaunchClassLoader;
 import org.objectweb.asm.Opcodes;
 import top.outlands.foundation.TransformerDelegate;
 import top.outlands.foundation.boot.ActualClassLoader;
-import top.outlands.foundation.boot.JVMDriverHolder;
-import top.outlands.foundation.boot.UnsafeHolder;
 
 import java.io.IOException;
 import java.io.InputStream;

diff --git a/src/main/java/com/cleanroommc/fugue/transformer/loliasm/ModIdentifierTransformer.java b/src/main/java/com/cleanroommc/fugue/transformer/loliasm/ModIdentifierTransformer.java
@@ -0,0 +1,30 @@
+package com.cleanroommc.fugue.transformer.loliasm;
+
+import com.cleanroommc.fugue.common.Fugue;
+import javassist.ClassPool;
+import javassist.CtClass;
+import top.outlands.foundation.IExplicitTransformer;
+
+import java.io.ByteArrayInputStream;
+
+public class ModIdentifierTransformer implements IExplicitTransformer {
+    @Override
+    public byte[] transform(byte[] bytes) {
+        try {
+            var cp = ClassPool.getDefault();
+            CtClass cc = cp.makeClass(new ByteArrayInputStream(bytes));
+            var ifc = cc.getMethod("identifyFromClass", "(Ljava/lang/String;Ljava/util/Map;)Ljava/util/Set;");
+            ifc.insertAt(64, """
+                    {
+                        if (url.getProtocol().equals("jrt")) {
+                            return java.util.Collections#emptySet();
+                        }
+                    }
+                    """);
+            bytes = cc.toBytecode();
+        } catch (Throwable t) {
+            Fugue.LOGGER.error(t);
+        }
+        return bytes;
+    }
+}