Add methods to remap methods and fields, fixes #10, #12

Allow instantiation of InsnList, fixes #13
MinecraftForge · May 11, 2019 · 0651e55 · 0651e55
1 parent b96f039
commit 0651e55
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 9 deletions.
diff --git a/build.gradle b/build.gradle
@@ -57,7 +57,7 @@ dependencies {
     testImplementation("org.hamcrest:hamcrest-core:2.1")
     testImplementation("org.apache.logging.log4j:log4j-core:2.11.+")
     testRuntime("org.junit.jupiter:junit-jupiter-engine:5.4.+")
-    implementation("cpw.mods:modlauncher:0.10.+")
+    implementation("cpw.mods:modlauncher:1.0.+")
     implementation("org.apache.logging.log4j:log4j-api:2.11.+")
     implementation("org.ow2.asm:asm:6.2")
     implementation("org.ow2.asm:asm-commons:6.2")

diff --git a/src/main/java/net/minecraftforge/coremod/CoreModEngine.java b/src/main/java/net/minecraftforge/coremod/CoreModEngine.java
@@ -20,14 +20,14 @@ public class CoreModEngine {
             "org.objectweb.asm.tree.AbstractInsnNode","org.objectweb.asm.tree.FieldInsnNode",
             "org.objectweb.asm.tree.FrameNode","org.objectweb.asm.tree.IincInsnNode",
             "org.objectweb.asm.tree.InsnNode","org.objectweb.asm.tree.IntInsnNode",
-            "org.objectweb.asm.tree.InvokeDynamicInsnNode","org.objectweb.asm.tree.JumpInsnNode",
-            "org.objectweb.asm.tree.LabelNode","org.objectweb.asm.tree.LdcInsnNode",
-            "org.objectweb.asm.tree.LineNumberNode","org.objectweb.asm.tree.LocalVariableAnnotationNode",
-            "org.objectweb.asm.tree.LocalVariableNode","org.objectweb.asm.tree.LookupSwitchInsnNode",
-            "org.objectweb.asm.tree.MethodInsnNode","org.objectweb.asm.tree.MultiANewArrayInsnNode",
-            "org.objectweb.asm.tree.TableSwitchInsnNode","org.objectweb.asm.tree.TryCatchBlockNode",
-            "org.objectweb.asm.tree.TypeAnnotationNode","org.objectweb.asm.tree.TypeInsnNode",
-            "org.objectweb.asm.tree.VarInsnNode",
+            "org.objectweb.asm.tree.InsnList", "org.objectweb.asm.tree.InvokeDynamicInsnNode",
+            "org.objectweb.asm.tree.JumpInsnNode", "org.objectweb.asm.tree.LabelNode",
+            "org.objectweb.asm.tree.LdcInsnNode", "org.objectweb.asm.tree.LineNumberNode",
+            "org.objectweb.asm.tree.LocalVariableAnnotationNode", "org.objectweb.asm.tree.LocalVariableNode",
+            "org.objectweb.asm.tree.LookupSwitchInsnNode", "org.objectweb.asm.tree.MethodInsnNode",
+            "org.objectweb.asm.tree.MultiANewArrayInsnNode", "org.objectweb.asm.tree.TableSwitchInsnNode",
+            "org.objectweb.asm.tree.TryCatchBlockNode", "org.objectweb.asm.tree.TypeAnnotationNode",
+            "org.objectweb.asm.tree.TypeInsnNode", "org.objectweb.asm.tree.VarInsnNode",
 
             // Adding new fields to classes
             "org.objectweb.asm.tree.FieldNode",

diff --git a/src/main/java/net/minecraftforge/coremod/api/ASMAPI.java b/src/main/java/net/minecraftforge/coremod/api/ASMAPI.java
@@ -1,5 +1,7 @@
 package net.minecraftforge.coremod.api;
 
+import cpw.mods.modlauncher.Launcher;
+import cpw.mods.modlauncher.api.INameMappingService;
 import org.objectweb.asm.Opcodes;
 import org.objectweb.asm.tree.*;
 
@@ -19,4 +21,16 @@ public enum MethodType {
     public static MethodInsnNode buildMethodCall(final String ownerName, final String methodName, final String methodDescriptor, final MethodType type) {
         return new MethodInsnNode(type.ordinal()+Opcodes.INVOKEVIRTUAL, ownerName, methodName, methodDescriptor, type==MethodType.INTERFACE);
     }
+
+    public static String mapMethod(String name) {
+        return map(name, INameMappingService.Domain.METHOD);
+    }
+
+    public static String mapField(String name) {
+        return map(name, INameMappingService.Domain.FIELD);
+    }
+
+    private static String map(String name, INameMappingService.Domain domain) {
+        return Launcher.INSTANCE.environment().findNameMapping("srg").map(f -> f.apply(domain, name)).orElse(name);
+    }
 }