Commit e0624ce9 authored by Skylot's avatar Skylot

fix: use '$' as separator for inner classes in .jobf file (#415)

parent 7e8435cc
...@@ -112,7 +112,7 @@ class DeobfPresets { ...@@ -112,7 +112,7 @@ class DeobfPresets {
for (DeobfClsInfo deobfClsInfo : deobfuscator.getClsMap().values()) { for (DeobfClsInfo deobfClsInfo : deobfuscator.getClsMap().values()) {
if (deobfClsInfo.getAlias() != null) { if (deobfClsInfo.getAlias() != null) {
list.add(String.format("c %s = %s", list.add(String.format("c %s = %s",
deobfClsInfo.getCls().getClassInfo().getFullName(), deobfClsInfo.getAlias())); deobfClsInfo.getCls().getClassInfo().makeRawFullName(), deobfClsInfo.getAlias()));
} }
} }
for (FieldInfo fld : deobfuscator.getFldMap().keySet()) { for (FieldInfo fld : deobfuscator.getFldMap().keySet()) {
...@@ -136,7 +136,7 @@ class DeobfPresets { ...@@ -136,7 +136,7 @@ class DeobfPresets {
} }
public String getForCls(ClassInfo cls) { public String getForCls(ClassInfo cls) {
return clsPresetMap.get(cls.getFullName()); return clsPresetMap.get(cls.makeRawFullName());
} }
public String getForFld(FieldInfo fld) { public String getForFld(FieldInfo fld) {
......
...@@ -111,6 +111,10 @@ public final class ClassInfo { ...@@ -111,6 +111,10 @@ public final class ClassInfo {
return pkg.isEmpty() ? shortName : pkg + "." + shortName; return pkg.isEmpty() ? shortName : pkg + "." + shortName;
} }
public String makeRawFullName() {
return makeFullClsName(this.name, true);
}
public String getFullPath() { public String getFullPath() {
ClassInfo usedAlias = getAlias(); ClassInfo usedAlias = getAlias();
return usedAlias.getPackage().replace('.', File.separatorChar) return usedAlias.getPackage().replace('.', File.separatorChar)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment