updates

Author: RecursiveG

build.gradle

@@ -23,6 +23,7 @@ archivesBaseName = "UniSkinMod"
 
 minecraft {
     version = "1.7.10-10.13.2.1230"
+    mappings = 'stable_12'
     runDir = "eclipse"
 }
 

src/main/java/org/devinprogress/uniskinmod/ASMHelper.java

@@ -1,6 +1,7 @@
 package org.devinprogress.uniskinmod;
 
 
+import cpw.mods.fml.common.asm.transformers.deobf.FMLDeobfuscatingRemapper;
 import org.objectweb.asm.ClassReader;
 import org.objectweb.asm.ClassWriter;
 import org.objectweb.asm.Opcodes;
@@ -14,48 +15,46 @@
  */
 public class ASMHelper {
     private Object obj;
-    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(!SkinCore.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/uniskinmod/CoreContainer.java

@@ -16,7 +16,7 @@ public CoreContainer()
         meta.name = "Universal Skin Mod";
         meta.version = "1.1";
         meta.authorList = Arrays.asList("RecursiveG");
-        meta.description = "A Coremod provided the ability to access to many skin servers.\nView config/UniSkinMod.cfg for more information.";
+        meta.description = "A Coremod provided the ability to access to many skin servers.";
         meta.url = "https://github.com/RecursiveG/UniSkinMod";
     }
 

src/main/java/org/devinprogress/uniskinmod/CoreTransformer.java

@@ -38,18 +38,17 @@ public class CoreTransformer implements IClassTransformer {
 
     public CoreTransformer(){
         asm=new ASMHelper(this);
-        asm.add("net.minecraft.client.resources.SkinManager$3","run","run","()V","()V","injectCode");
-        asm.add("net.minecraft.client.renderer.ImageBufferDownload","b","setAreaOpaque","(IIII)V","(IIII)V","noOpaque");
-        asm.add("com.mojang.authlib.minecraft.MinecraftProfileTexture", "getHash", "getHash", "()Ljava/lang/String;", "()Ljava/lang/String;","newHash");
+        asm.hookMethod("net.minecraft.client.resources.SkinManager$3",        "run",         "run",          "()V",                 "injectCode");
+        asm.hookMethod("net.minecraft.client.renderer.ImageBufferDownload",   "func_78433_b","setAreaOpaque","(IIII)V",             "noOpaque");
+        asm.hookMethod("com.mojang.authlib.minecraft.MinecraftProfileTexture","getHash",     "getHash",      "()Ljava/lang/String;","newHash");
     }
 
     public static void injectCode(MethodNode mn){
         // Code to be inserted:
         // org.devinprogress.uniskinmod.SkinCore.injectTexture(hashmap,p_152790_1_);
         // load hashmap using ALOAD_1
-        SkinCore.log("ASMTransformer Invoked");
         AbstractInsnNode n=ASMHelper.getNthInsnNode(mn,Opcodes.GETFIELD,2);
-        FieldInsnNode loadGameProfileToStack=(FieldInsnNode) ((FieldInsnNode)n).clone(null);
+        FieldInsnNode loadGameProfileToStack=(FieldInsnNode)(n.clone(null));
         n=ASMHelper.getNthInsnNode(mn, Opcodes.IFEQ,1);
         n=ASMHelper.getLabel(n).getNext();
 
@@ -66,8 +65,6 @@ public static void noOpaque(MethodNode mn){
     }
 
     public static void newHash(MethodNode mn){
-        SkinCore.log("hash Transformer Hit");
-        if(SkinCore.useMojangStyledHash)return;
         mn.instructions.clear();
         mn.instructions.add(new VarInsnNode(Opcodes.ALOAD,0));
         mn.instructions.add(new FieldInsnNode(Opcodes.GETFIELD,"com/mojang/authlib/minecraft/MinecraftProfileTexture","url","Ljava/lang/String;"));
@@ -79,6 +76,6 @@ public static void newHash(MethodNode mn){
 
 	@Override
 	public byte[] transform(String name, String transformedName, byte[] bytes) {
-        return asm.transform(transformedName,bytes);
+        return asm.transform(name,transformedName,bytes);
 	}
 }