diff --git a/jsons/1.7.2-rel.json b/jsons/1.7.2-rel.json index 3af7050611..c3e3cec979 100644 --- a/jsons/1.7.2-rel.json +++ b/jsons/1.7.2-rel.json @@ -57,6 +57,9 @@ { "name": "net.sf.jopt-simple:jopt-simple:4.5" }, + { + "name": "lzma:lzma:0.0.1" + }, { "name": "com.paulscode:codecjorbis:20101023" }, diff --git a/src/main/java/cpw/mods/fml/common/asm/transformers/deobf/FMLDeobfuscatingRemapper.java b/src/main/java/cpw/mods/fml/common/asm/transformers/deobf/FMLDeobfuscatingRemapper.java index 253aa26ff7..ebc7a8dbfa 100644 --- a/src/main/java/cpw/mods/fml/common/asm/transformers/deobf/FMLDeobfuscatingRemapper.java +++ b/src/main/java/cpw/mods/fml/common/asm/transformers/deobf/FMLDeobfuscatingRemapper.java @@ -278,7 +278,10 @@ public class FMLDeobfuscatingRemapper extends Remapper { { return typeName; } - + if (classNameBiMap.containsKey(typeName)) + { + return classNameBiMap.get(typeName); + } int dollarIdx = typeName.indexOf('$'); String realType = dollarIdx > -1 ? typeName.substring(0, dollarIdx) : typeName; String subType = dollarIdx > -1 ? typeName.substring(dollarIdx+1) : ""; @@ -294,6 +297,11 @@ public class FMLDeobfuscatingRemapper extends Remapper { { return typeName; } + + if (classNameBiMap.containsValue(typeName)) + { + return classNameBiMap.inverse().get(typeName); + } int dollarIdx = typeName.indexOf('$'); String realType = dollarIdx > -1 ? typeName.substring(0, dollarIdx) : typeName; String subType = dollarIdx > -1 ? typeName.substring(dollarIdx+1) : "";