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 0c8333ce08..f2638fc3c2 100644 --- a/common/cpw/mods/fml/common/asm/transformers/deobf/FMLDeobfuscatingRemapper.java +++ b/common/cpw/mods/fml/common/asm/transformers/deobf/FMLDeobfuscatingRemapper.java @@ -17,12 +17,15 @@ import java.util.zip.ZipFile; import org.objectweb.asm.ClassReader; import org.objectweb.asm.commons.Remapper; +import com.google.common.base.CharMatcher; import com.google.common.base.Charsets; +import com.google.common.base.Splitter; import com.google.common.collect.BiMap; import com.google.common.collect.HashBiMap; import com.google.common.collect.ImmutableBiMap; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; +import com.google.common.collect.Iterables; import com.google.common.collect.Lists; import com.google.common.collect.Maps; import com.google.common.collect.Sets; @@ -58,40 +61,34 @@ public class FMLDeobfuscatingRemapper extends Remapper { File libDir = new File(mcDir, "lib"); File mapData = new File(libDir, "deobfuscation_data.zip"); ZipFile mapZip = new ZipFile(mapData); - ZipEntry classData = mapZip.getEntry("class_data.csv"); + ZipEntry classData = mapZip.getEntry("joined.srg"); ZipInputSupplier zis = new ZipInputSupplier(mapZip, classData); - InputSupplier classNameSupplier = CharStreams.newReaderSupplier(zis,Charsets.UTF_8); - List classList = CharStreams.readLines(classNameSupplier); + InputSupplier srgSupplier = CharStreams.newReaderSupplier(zis,Charsets.UTF_8); + List srgList = CharStreams.readLines(srgSupplier); + rawMethodMaps = Maps.newHashMap(); + rawFieldMaps = Maps.newHashMap(); Builder builder = ImmutableBiMap.builder(); - for (String line : classList) + Splitter splitter = Splitter.on(CharMatcher.anyOf(": ")).omitEmptyStrings().trimResults(); + for (String line : srgList) { - String[] parts = line.split(","); - builder.put(parts[0],parts[1]); + 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); + } + else if ("MD".equals(typ)) + { + parseMethod(parts); + } + else if ("FD".equals(typ)) + { + parseField(parts); + } } classNameBiMap = builder.build(); - ZipEntry methodData = mapZip.getEntry("method_data.csv"); - zis = new ZipInputSupplier(mapZip, methodData); - InputSupplier methodNameSupplier = CharStreams.newReaderSupplier(zis,Charsets.UTF_8); - List methodList = CharStreams.readLines(methodNameSupplier); - rawMethodMaps = Maps.newHashMap(); - for (String line : methodList) - { - String[] parts = line.split(","); - String oldSrg = parts[0]; - int lastOld = oldSrg.lastIndexOf('/'); - String cl = oldSrg.substring(0,lastOld); - String oldName = oldSrg.substring(lastOld+1); - String sig = parts[1]; - String newSrg = parts[2]; - int lastNew = newSrg.lastIndexOf('/'); - String newName = newSrg.substring(lastNew+1); - if (!rawMethodMaps.containsKey(cl)) - { - rawMethodMaps.put(cl, Maps.newHashMap()); - } - rawMethodMaps.get(cl).put(oldName+sig, newName); - } } catch (IOException ioe) { @@ -99,6 +96,33 @@ public class FMLDeobfuscatingRemapper extends Remapper { } methodNameMaps = Maps.newHashMapWithExpectedSize(rawMethodMaps.size()); } + private void parseField(String[] parts) + { + // + } + + private void parseClass(Builder builder, String[] parts) + { + builder.put(parts[1],parts[2]); + } + + private void parseMethod(String[] parts) + { + String oldSrg = parts[1]; + int lastOld = oldSrg.lastIndexOf('/'); + String cl = oldSrg.substring(0,lastOld); + String oldName = oldSrg.substring(lastOld+1); + String sig = parts[2]; + String newSrg = parts[3]; + int lastNew = newSrg.lastIndexOf('/'); + String newName = newSrg.substring(lastNew+1); + if (!rawMethodMaps.containsKey(cl)) + { + rawMethodMaps.put(cl, Maps.newHashMap()); + } + rawMethodMaps.get(cl).put(oldName+sig, newName); + } + @Override public String mapFieldName(String owner, String name, String desc) { diff --git a/common/cpw/mods/fml/relauncher/RelaunchClassLoader.java b/common/cpw/mods/fml/relauncher/RelaunchClassLoader.java index 865c051f8c..9e5dbc155d 100644 --- a/common/cpw/mods/fml/relauncher/RelaunchClassLoader.java +++ b/common/cpw/mods/fml/relauncher/RelaunchClassLoader.java @@ -67,6 +67,7 @@ public class RelaunchClassLoader extends URLClassLoader // standard transformer exclusions addTransformerExclusion("javax."); + addTransformerExclusion("argo."); addTransformerExclusion("org.objectweb.asm."); addTransformerExclusion("com.google.common."); addTransformerExclusion("org.bouncycastle.");