Fix the exc file. Fix the deobfremapper for handling inner classes.

This commit is contained in:
Christian 2013-12-11 22:54:51 -05:00
parent fb7913f583
commit 1533d88ef8
2 changed files with 12 additions and 1 deletions

View file

@ -57,6 +57,9 @@
{
"name": "net.sf.jopt-simple:jopt-simple:4.5"
},
{
"name": "lzma:lzma:0.0.1"
},
{
"name": "com.paulscode:codecjorbis:20101023"
},

View file

@ -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) : "";