From b9ccadb2f1e7087e6726eca49f586d0bc0bc371a Mon Sep 17 00:00:00 2001 From: Christian Date: Mon, 28 Jan 2013 17:48:44 -0500 Subject: [PATCH] Final part of the deobfuscation data setup- fields are now deobfuscated as well. All that remains, is to figure out what and how to distribute the deobfuscation data itself. --- .../asm/transformers/AccessTransformer.java | 1 - .../DeobfuscationTransformer.java | 1 - .../deobf/FMLDeobfuscatingRemapper.java | 42 +++++++++++++++++-- 3 files changed, 38 insertions(+), 6 deletions(-) diff --git a/common/cpw/mods/fml/common/asm/transformers/AccessTransformer.java b/common/cpw/mods/fml/common/asm/transformers/AccessTransformer.java index 062d343812..2d4944313f 100644 --- a/common/cpw/mods/fml/common/asm/transformers/AccessTransformer.java +++ b/common/cpw/mods/fml/common/asm/transformers/AccessTransformer.java @@ -145,7 +145,6 @@ public class AccessTransformer implements IClassTransformer @Override public byte[] transform(String name, String transformedName, byte[] bytes) { - System.out.printf("AT transforming %s : %s\n",name,transformedName); if (bytes == null) { return null; } if (!modifiers.containsKey(name)) { return bytes; } diff --git a/common/cpw/mods/fml/common/asm/transformers/DeobfuscationTransformer.java b/common/cpw/mods/fml/common/asm/transformers/DeobfuscationTransformer.java index 6e0c0a426f..f0ddefe212 100644 --- a/common/cpw/mods/fml/common/asm/transformers/DeobfuscationTransformer.java +++ b/common/cpw/mods/fml/common/asm/transformers/DeobfuscationTransformer.java @@ -16,7 +16,6 @@ public class DeobfuscationTransformer implements IClassTransformer, IClassNameTr @Override public byte[] transform(String name, String transformedName, byte[] bytes) { - System.out.println("***" + name + ":"+transformedName); if (bytes == null) { return null; diff --git a/common/cpw/mods/fml/common/asm/transformers/deobf/FMLDeobfuscatingRemapper.java b/common/cpw/mods/fml/common/asm/transformers/deobf/FMLDeobfuscatingRemapper.java index f2638fc3c2..8eb2c23cb8 100644 --- a/common/cpw/mods/fml/common/asm/transformers/deobf/FMLDeobfuscatingRemapper.java +++ b/common/cpw/mods/fml/common/asm/transformers/deobf/FMLDeobfuscatingRemapper.java @@ -73,7 +73,6 @@ public class FMLDeobfuscatingRemapper extends Remapper { { String[] parts = Iterables.toArray(splitter.split(line),String.class); String typ = parts[0]; - System.out.printf("PARTS: %s\n", Arrays.asList(parts)); if ("CL".equals(typ)) { parseClass(builder, parts); @@ -95,10 +94,22 @@ public class FMLDeobfuscatingRemapper extends Remapper { FMLRelaunchLog.log(Level.SEVERE, ioe, "An error occurred loading the deobfuscation map data"); } methodNameMaps = Maps.newHashMapWithExpectedSize(rawMethodMaps.size()); + fieldNameMaps = Maps.newHashMapWithExpectedSize(rawFieldMaps.size()); } private void parseField(String[] parts) { - // + String oldSrg = parts[1]; + int lastOld = oldSrg.lastIndexOf('/'); + String cl = oldSrg.substring(0,lastOld); + String oldName = oldSrg.substring(lastOld+1); + String newSrg = parts[2]; + int lastNew = newSrg.lastIndexOf('/'); + String newName = newSrg.substring(lastNew+1); + if (!rawFieldMaps.containsKey(cl)) + { + rawFieldMaps.put(cl, Maps.newHashMap()); + } + rawFieldMaps.get(cl).put(oldName, newName); } private void parseClass(Builder builder, String[] parts) @@ -126,7 +137,12 @@ public class FMLDeobfuscatingRemapper extends Remapper { @Override public String mapFieldName(String owner, String name, String desc) { - return name; + if (classNameBiMap == null) + { + return name; + } + Map fieldMap = getFieldMap(owner); + return fieldMap!=null && fieldMap.containsKey(name) ? fieldMap.get(name) : name; } @Override @@ -163,6 +179,15 @@ public class FMLDeobfuscatingRemapper extends Remapper { return methodMap!=null && methodMap.containsKey(methodDescriptor) ? methodMap.get(methodDescriptor) : name; } + private Map getFieldMap(String className) + { + if (!fieldNameMaps.containsKey(className)) + { + findAndMergeSuperMaps(className); + } + return fieldNameMaps.get(className); + } + private Map getMethodMap(String className) { if (!methodNameMaps.containsKey(className)) @@ -209,19 +234,28 @@ public class FMLDeobfuscatingRemapper extends Remapper { findAndMergeSuperMaps(superName); } } - System.out.printf("Merging maps for %s (%s , %s)\n", name, superName, Arrays.asList(interfaces)); Map methodMap = Maps.newHashMap(); + Map fieldMap = Maps.newHashMap(); for (String parentThing : allParents) { if (methodNameMaps.containsKey(parentThing)) { methodMap.putAll(methodNameMaps.get(parentThing)); } + if (fieldNameMaps.containsKey(parentThing)) + { + fieldMap.putAll(fieldNameMaps.get(parentThing)); + } } if (rawMethodMaps.containsKey(name)) { methodMap.putAll(rawMethodMaps.get(name)); } + if (rawFieldMaps.containsKey(name)) + { + fieldMap.putAll(rawFieldMaps.get(name)); + } methodNameMaps.put(name, ImmutableMap.copyOf(methodMap)); + fieldNameMaps.put(name, ImmutableMap.copyOf(fieldMap)); } }