Merge pull request #5 from albus12138/master

Fix compatibility with ResourceLoader
GTNewHorizons · Feb 11, 2021 · db728e7 · db728e7
2 parents 527d103 + 9c8358e
commit db728e7
Showing 1 changed file with 0 additions and 26 deletions.
diff --git a/src/main/java/alexiil/mods/load/coremod/BetterLoadingScreenTransformer.java b/src/main/java/alexiil/mods/load/coremod/BetterLoadingScreenTransformer.java
@@ -10,7 +10,6 @@
 import org.objectweb.asm.Type;
 import org.objectweb.asm.tree.AbstractInsnNode;
 import org.objectweb.asm.tree.ClassNode;
-import org.objectweb.asm.tree.FieldNode;
 import org.objectweb.asm.tree.InsnNode;
 import org.objectweb.asm.tree.MethodInsnNode;
 import org.objectweb.asm.tree.MethodNode;
@@ -27,8 +26,6 @@ public byte[] transform(String name, String transformedName, byte[] basicClass)
                 return transformMinecraft(basicClass);
             if (name.equals("com.mumfrey.liteloader.client.api.ObjectFactoryClient"))
                 return transformObjectFactoryClient(basicClass);
-            if (name.equals("lumien.resourceloader.ResourceLoader"))
-                return transformResourceLoader(basicClass);
         }
         catch (Throwable t) {
             System.out.println("An issue occoured while transforming " + transformedName);
@@ -119,27 +116,4 @@ private byte[] transformMinecraft(byte[] before) {
         System.out.println("Transformed Minecraft");
         return cw.toByteArray();
     }
-
-    private byte[] transformResourceLoader(byte[] before) {
-        ClassNode classNode = new ClassNode();
-        ClassReader reader = new ClassReader(before);
-        reader.accept(classNode, 0);
-
-        for (MethodNode m : classNode.methods) {
-            if (m.name.equals("preInit")) {
-                m.visibleAnnotations.remove(0);// Remove @Mod.EventHandler
-            }
-        }
-
-        for (FieldNode f : classNode.fields) {
-            if (f.name.equals("INSTANCE"))
-                f.visibleAnnotations.remove(0);// Remove @Mod.Instance("ResourceLoader")
-        }
-
-        ClassWriter cw = new ClassWriter(ClassWriter.COMPUTE_FRAMES | ClassWriter.COMPUTE_MAXS);
-        classNode.accept(cw);
-        byte[] arr = cw.toByteArray();
-        System.out.println("Transformed ResourceLoader!");
-        return arr;
-    }
 }