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 f8788b077f..f0eb578dee 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 @@ -53,7 +53,6 @@ public class FMLDeobfuscatingRemapper extends Remapper { public static final FMLDeobfuscatingRemapper INSTANCE = new FMLDeobfuscatingRemapper(); private BiMap classNameBiMap; - private BiMap mcpNameBiMap; private Map> rawFieldMaps; private Map> rawMethodMaps; @@ -71,7 +70,6 @@ public class FMLDeobfuscatingRemapper extends Remapper { private FMLDeobfuscatingRemapper() { classNameBiMap=ImmutableBiMap.of(); - mcpNameBiMap=ImmutableBiMap.of(); } public void setupLoadOnly(String deobfFileName, boolean loadAll) @@ -85,7 +83,6 @@ public class FMLDeobfuscatingRemapper extends Remapper { rawMethodMaps = Maps.newHashMap(); rawFieldMaps = Maps.newHashMap(); Builder builder = ImmutableBiMap.builder(); - Builder mcpBuilder = ImmutableBiMap.builder(); Splitter splitter = Splitter.on(CharMatcher.anyOf(": ")).omitEmptyStrings().trimResults(); for (String line : srgList) { @@ -94,7 +91,6 @@ public class FMLDeobfuscatingRemapper extends Remapper { if ("CL".equals(typ)) { parseClass(builder, parts); - parseMCPClass(mcpBuilder,parts); } else if ("MD".equals(typ) && loadAll) { @@ -106,7 +102,6 @@ public class FMLDeobfuscatingRemapper extends Remapper { } } classNameBiMap = builder.build(); - mcpNameBiMap = mcpBuilder.build(); } catch (IOException ioe) { @@ -128,7 +123,6 @@ public class FMLDeobfuscatingRemapper extends Remapper { rawMethodMaps = Maps.newHashMap(); rawFieldMaps = Maps.newHashMap(); Builder builder = ImmutableBiMap.builder(); - Builder mcpBuilder = ImmutableBiMap.builder(); Splitter splitter = Splitter.on(CharMatcher.anyOf(": ")).omitEmptyStrings().trimResults(); for (String line : srgList) { @@ -137,7 +131,6 @@ public class FMLDeobfuscatingRemapper extends Remapper { if ("CL".equals(typ)) { parseClass(builder, parts); - parseMCPClass(mcpBuilder,parts); } else if ("MD".equals(typ)) { @@ -149,13 +142,6 @@ public class FMLDeobfuscatingRemapper extends Remapper { } } classNameBiMap = builder.build(); - // Special case some mappings for modloader mods - mcpBuilder.put("BaseMod","net/minecraft/src/BaseMod"); - mcpBuilder.put("ModLoader","net/minecraft/src/ModLoader"); - mcpBuilder.put("EntityRendererProxy","net/minecraft/src/EntityRendererProxy"); - mcpBuilder.put("MLProp","net/minecraft/src/MLProp"); - mcpBuilder.put("TradeEntry","net/minecraft/src/TradeEntry"); - mcpNameBiMap = mcpBuilder.build(); } catch (IOException ioe) { @@ -235,12 +221,6 @@ public class FMLDeobfuscatingRemapper extends Remapper { builder.put(parts[1],parts[2]); } - private void parseMCPClass(Builder builder, String[] parts) - { - int clIdx = parts[2].lastIndexOf('/'); - builder.put("net/minecraft/src/"+parts[2].substring(clIdx+1),parts[2]); - } - private void parseMethod(String[] parts) { String oldSrg = parts[1]; @@ -280,13 +260,12 @@ public class FMLDeobfuscatingRemapper extends Remapper { { 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) : ""; - - String result = classNameBiMap.containsKey(realType) ? classNameBiMap.get(realType) : mcpNameBiMap.containsKey(realType) ? mcpNameBiMap.get(realType) : realType; - result = dollarIdx > -1 ? result+"$"+subType : result; - return result; + int dollarIdx = typeName.lastIndexOf('$'); + if (dollarIdx > -1) + { + return map(typeName.substring(0, dollarIdx)) + "$" + typeName.substring(dollarIdx + 1); + } + return typeName; } public String unmap(String typeName) @@ -301,13 +280,11 @@ public class FMLDeobfuscatingRemapper extends Remapper { 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) : ""; - - - String result = classNameBiMap.containsValue(realType) ? classNameBiMap.inverse().get(realType) : mcpNameBiMap.containsValue(realType) ? mcpNameBiMap.inverse().get(realType) : realType; - result = dollarIdx > -1 ? result+"$"+subType : result; - return result; + if (dollarIdx > -1) + { + return unmap(typeName.substring(0, dollarIdx)) + "$" + typeName.substring(dollarIdx + 1); + } + return typeName; }