diff options
| author | 2018-06-21 11:16:04 +0100 | |
|---|---|---|
| committer | 2018-06-21 11:16:04 +0100 | |
| commit | 32290667217000d9008ba667ba801a25e9ec061f (patch) | |
| tree | c9a8fa9c9bbf541f43e816992d086b2d50de9215 /src/main/java/cuchaz/enigma/Deobfuscator.java | |
| parent | Fix method parameter info sometimes causing the exported class to become inva... (diff) | |
| download | enigma-fork-32290667217000d9008ba667ba801a25e9ec061f.tar.gz enigma-fork-32290667217000d9008ba667ba801a25e9ec061f.tar.xz enigma-fork-32290667217000d9008ba667ba801a25e9ec061f.zip | |
Recursively rebuild method names
Before it was only doing the first level of inner classes, this works on "inner inner classes"
Diffstat (limited to 'src/main/java/cuchaz/enigma/Deobfuscator.java')
| -rw-r--r-- | src/main/java/cuchaz/enigma/Deobfuscator.java | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/src/main/java/cuchaz/enigma/Deobfuscator.java b/src/main/java/cuchaz/enigma/Deobfuscator.java index 1e99af2..6ef020c 100644 --- a/src/main/java/cuchaz/enigma/Deobfuscator.java +++ b/src/main/java/cuchaz/enigma/Deobfuscator.java | |||
| @@ -332,9 +332,6 @@ public class Deobfuscator { | |||
| 332 | for (ClassMapping classMapping : Lists.newArrayList(getMappings().classes())) { | 332 | for (ClassMapping classMapping : Lists.newArrayList(getMappings().classes())) { |
| 333 | progress.onProgress(i++, classMapping.getDeobfName()); | 333 | progress.onProgress(i++, classMapping.getDeobfName()); |
| 334 | rebuildMethodNames(classMapping, renameClassMap); | 334 | rebuildMethodNames(classMapping, renameClassMap); |
| 335 | for(ClassMapping innerClass : classMapping.innerClasses()){ | ||
| 336 | rebuildMethodNames(innerClass, renameClassMap); | ||
| 337 | } | ||
| 338 | } | 335 | } |
| 339 | 336 | ||
| 340 | for (Map.Entry<ClassMapping, Map<Entry, String>> renameClassMapEntry : renameClassMap.entrySet()) { | 337 | for (Map.Entry<ClassMapping, Map<Entry, String>> renameClassMapEntry : renameClassMap.entrySet()) { |
| @@ -386,7 +383,12 @@ public class Deobfuscator { | |||
| 386 | } | 383 | } |
| 387 | } | 384 | } |
| 388 | 385 | ||
| 386 | classMapping.markDirty(); | ||
| 389 | renameClassMap.put(classMapping, renameEntries); | 387 | renameClassMap.put(classMapping, renameEntries); |
| 388 | |||
| 389 | for(ClassMapping innerClass : classMapping.innerClasses()){ | ||
| 390 | rebuildMethodNames(innerClass, renameClassMap); | ||
| 391 | } | ||
| 390 | } | 392 | } |
| 391 | 393 | ||
| 392 | 394 | ||