summaryrefslogtreecommitdiff
path: root/src/main/java/cuchaz/enigma/Deobfuscator.java
diff options
context:
space:
mode:
authorGravatar Thog2016-11-18 11:18:03 +0100
committerGravatar Thog2016-11-18 11:18:03 +0100
commit500094527ab9d515d2b15b599801472d162fe5b5 (patch)
treec3d176753a2efba0a4a3e8d7c58d9c38a2792bb6 /src/main/java/cuchaz/enigma/Deobfuscator.java
parentFix crash with ClassSelector (diff)
parentMethod Converter: Add bytecode matching to match what is identical (diff)
downloadenigma-fork-500094527ab9d515d2b15b599801472d162fe5b5.tar.gz
enigma-fork-500094527ab9d515d2b15b599801472d162fe5b5.tar.xz
enigma-fork-500094527ab9d515d2b15b599801472d162fe5b5.zip
Merge branch 'feature/method-converter'
Diffstat (limited to 'src/main/java/cuchaz/enigma/Deobfuscator.java')
-rw-r--r--src/main/java/cuchaz/enigma/Deobfuscator.java25
1 files changed, 12 insertions, 13 deletions
diff --git a/src/main/java/cuchaz/enigma/Deobfuscator.java b/src/main/java/cuchaz/enigma/Deobfuscator.java
index fe0e31d..2766380 100644
--- a/src/main/java/cuchaz/enigma/Deobfuscator.java
+++ b/src/main/java/cuchaz/enigma/Deobfuscator.java
@@ -156,6 +156,16 @@ public class Deobfuscator {
156 } 156 }
157 } 157 }
158 158
159 public TranslatingTypeLoader createTypeLoader()
160 {
161 return new TranslatingTypeLoader(
162 this.jar,
163 this.jarIndex,
164 getTranslator(TranslationDirection.Obfuscating),
165 getTranslator(TranslationDirection.Deobfuscating)
166 );
167 }
168
159 public CompilationUnit getSourceTree(String className) { 169 public CompilationUnit getSourceTree(String className) {
160 170
161 // we don't know if this class name is obfuscated or deobfuscated 171 // we don't know if this class name is obfuscated or deobfuscated
@@ -172,12 +182,7 @@ public class Deobfuscator {
172 } 182 }
173 183
174 // set the type loader 184 // set the type loader
175 TranslatingTypeLoader loader = new TranslatingTypeLoader( 185 TranslatingTypeLoader loader = createTypeLoader();
176 this.jar,
177 this.jarIndex,
178 getTranslator(TranslationDirection.Obfuscating),
179 getTranslator(TranslationDirection.Deobfuscating)
180 );
181 this.settings.setTypeLoader(loader); 186 this.settings.setTypeLoader(loader);
182 187
183 // see if procyon can find the type 188 // see if procyon can find the type
@@ -383,13 +388,7 @@ public class Deobfuscator {
383 } 388 }
384 389
385 public void writeJar(File out, ProgressListener progress) { 390 public void writeJar(File out, ProgressListener progress) {
386 final TranslatingTypeLoader loader = new TranslatingTypeLoader( 391 transformJar(out, progress, createTypeLoader()::transformClass);
387 this.jar,
388 this.jarIndex,
389 getTranslator(TranslationDirection.Obfuscating),
390 getTranslator(TranslationDirection.Deobfuscating)
391 );
392 transformJar(out, progress, loader::transformClass);
393 } 392 }
394 393
395 public void protectifyJar(File out, ProgressListener progress) { 394 public void protectifyJar(File out, ProgressListener progress) {