using FMLDeobfuscateRemapper

Author: RecursiveG

build.gradle

@@ -22,8 +22,9 @@ group= "org.devinprogress.YAIF" // http://maven.apache.org/guides/mini/guide-nam
 archivesBaseName = "YetAnotherInputFix"
 
 minecraft {
-    version = "1.7.2-10.12.2.1147"
-    assetDir = "eclipse/assets"
+    version = "1.7.10-10.13.2.1230"
+    mappings = 'stable_12'
+    runDir = "eclipse"
 }
 
 

src/main/java/org/devinprogress/YAIF/Transformer/ASMHelper.java

@@ -1,5 +1,6 @@
 package org.devinprogress.YAIF.Transformer;
 
+import cpw.mods.fml.common.asm.transformers.deobf.FMLDeobfuscatingRemapper;
 import org.devinprogress.YAIF.YetAnotherInputFix;
 import org.objectweb.asm.ClassReader;
 import org.objectweb.asm.ClassWriter;
@@ -14,50 +15,46 @@
  */
 public class ASMHelper {
     private Object obj;
-    //private Map<String,List<String[]>> map;
-    //public static Boolean DEOBF_ENV;
-    //Map<DeobfuscatedClassName,[DeobfMethodName,ObfedMethodName,Description,ProcessMethod]>
-    private List<MethodRecord> map=null;
-    private Set<String> classMap=null;
+    //Map<DeobfuscatedClassName,Map<methodName+Desc,processMethod>>
+    private Map<String,Map<String,Method>> map;
+
     public ASMHelper(Object o){
         obj=o;
-        map=new ArrayList<MethodRecord>();
-        classMap=new HashSet<String>();
+        map=new HashMap<String, Map<String,Method>>();
     }
 
-    public void add(String className,String methodName,String methodNameDeobf,String Descripton,String DescriptionDeobf,String targetTransformer){
-        map.add(new MethodRecord(
-                className,
-                methodName,
-                methodNameDeobf,
-                Descripton,
-                DescriptionDeobf,
-                targetTransformer
-                ));
-        classMap.add(className);
+    public void hookMethod(String className,String srgName,String mcpName,String desc,String targetTransformer){
+        if(!map.containsKey(className))
+            map.put(className,new HashMap<String, Method>());
+        Method m=null;
+        try{
+            m= obj.getClass().getDeclaredMethod(targetTransformer,MethodNode.class);
+        }catch(Exception e){
+            e.printStackTrace();
+        }
+        map.get(className).put(srgName + desc, m);
+        map.get(className).put(mcpName + desc, m);
     }
 
-    public byte[] transform(String className,byte[] bytes){
+    public byte[] transform(String obfClassName,String className,byte[] bytes){
+        if(!map.containsKey(className))return bytes;
+        Map<String,Method> transMap=map.get(className);
 
-        if(!classMap.contains(className))return bytes;
-        //System.out.println("Examing Class:"+className);
         ClassReader cr=new ClassReader(bytes);
         ClassNode cn=new ClassNode();
         cr.accept(cn, 0);
 
         for(MethodNode mn:cn.methods){
             //System.out.println(String.format("Examing Method: %s%s",mn.name,mn.desc));
-            for(MethodRecord r:map){
-                r.preProcess(!YetAnotherInputFix.ObfuscatedEnv,obj);
-                if(mn.name.equals(r.MethodName)&&mn.desc.equals(r.Desc)&&className.equals(r.ClassName)){
-                    try{
-                        //System.out.println(String.format("Invoking Method: %s%s",mn.name,mn.desc));
-                        r.ProcessMethod.invoke(obj,mn);
-                    }catch(Exception e){
-                        e.printStackTrace();
-                        return bytes;
-                    }
-                    break;
+            String methodName=FMLDeobfuscatingRemapper.INSTANCE.mapMethodName(obfClassName,mn.name,mn.desc);
+            String methodDesc=FMLDeobfuscatingRemapper.INSTANCE.mapMethodDesc(mn.desc);
+            if(transMap.containsKey(methodName+methodDesc)){
+                try{
+                    //System.out.println(String.format("Invoking Method: %s%s",mn.name,mn.desc));
+                    transMap.get(methodName+methodDesc).invoke(obj,mn);
+                }catch(Exception e){
+                    e.printStackTrace();
+                    return bytes;
                 }
             }
         }

src/main/java/org/devinprogress/YAIF/Transformer/ASMTransformer.java

@@ -12,22 +12,19 @@
  */
 public class ASMTransformer implements IClassTransformer {
     private ASMHelper asm=null;
-    //private static boolean obf;
     private static String obfedClassName=null;
 
     public ASMTransformer(){
-        //obf=YetAnotherInputFix.ObfuscatedEnv;
         asm=new ASMHelper(this);
-        asm.add("net.minecraft.client.Minecraft",                    "Z","startGame", "()V", "()V", "insertWrapperStartup");
-        asm.add("net.minecraft.client.gui.GuiTextField",             "b","setFocused","(Z)V","(Z)V","hookGuiTextFocusChange");
-        asm.add("net.minecraft.client.network.NetHandlerPlayClient", "a","handleTabComplete","(Lfz;)V","(Lnet/minecraft/network/play/server/S3APacketTabComplete;)V","hookPostTabComplete");
-        //asm.preProcess(!YetAnotherInputFix.ObfuscatedEnv);
+        asm.hookMethod("net.minecraft.client.Minecraft",                    "func_71384_a",   "startGame",          "()V",                                                         "insertWrapperStartup");
+        asm.hookMethod("net.minecraft.client.gui.GuiTextField",             "func_146195_b",  "setFocused",         "(Z)V",                                                        "hookGuiTextFocusChange");
+        asm.hookMethod("net.minecraft.client.network.NetHandlerPlayClient", "func_147274_a",  "handleTabComplete",  "(Lnet/minecraft/network/play/server/S3APacketTabComplete;)V", "hookPostTabComplete");
     }
 
     @Override
     public byte[] transform(String name, String transformedName, byte[] bytes) {
         obfedClassName=name;
-        return asm.transform(transformedName,bytes);
+        return asm.transform(name,transformedName,bytes);
     }
 
     /* These Transformers are designed for Minecraft version 1.7.2 */

src/main/java/org/devinprogress/YAIF/Transformer/Loader.java

@@ -13,7 +13,7 @@ public class Loader implements IFMLLoadingPlugin {
 
     @Override
     public String[] getASMTransformerClass() {
-        return new String[] {"org.devinprogress.YAIF.Transformer.ASMTransformer"};
+        return new String[] {ASMTransformer.class.getName()};
     }
 
     @Override
@@ -33,6 +33,6 @@ public void injectData(Map<String, Object> data) {
 
     @Override
     public String getAccessTransformerClass() {
-        return "org.devinprogress.YAIF.Transformer.AccessTransformer";
+        return AccessTransformer.class.getName();
     }
 }