From a88175ffc95792b88a8724f66db6dda2b8cc32ee Mon Sep 17 00:00:00 2001 From: gegy1000 Date: Tue, 17 Jul 2018 19:14:08 +0200 Subject: ASM Based Class Translator (#1) * Initial port to ASM * Package updates * Annotation + inner class translation * Fix inner class mapping * More bytecode translation * Signature refactoring * Fix highlighting of mapped names * Fix parameter name offset * Fix anonymous class generation * Fix issues with inner class signature transformation * Fix bridged method detection * Fix compile issues * Resolve all failed tests * Apply deobfuscated name to transformed classes * Fix class signatures not being translated * Fix frame array type translation * Fix frame array type translation * Fix array translation in method calls * Fix method reference and bridge detection * Fix handling of null deobf mappings * Parameter translation in interfaces * Fix enum parameter index offset * Fix parsed local variable indexing * Fix stackoverflow on rebuilding method names * Ignore invalid decompiled variable indices * basic source jar * Output directly to file on source export * Make decompile parallel * fix incorrect super calls * Use previous save state to delete old mapping files * Fix old mappings not properly being removed * Fix old mappings not properly being removed * make isMethodProvider public (cherry picked from commit ebad6a9) * speed up Deobfuscator's getSources by using a single TranslatingTypeloader and caching the ClassLoaderTypeloader * ignore .idea project folders * move SynchronizedTypeLoader to a non-inner * fix signature remap of inners for now * index & resolve method/field references for usages view * Allow reader/writer subclasses to provide the underlying file operations * fix giving obf classes a name not removing them from the panel * buffer the ParsedJar class entry inputstream, allow use with a jarinputstream * make CachingClasspathTypeLoader public * make CachingClasspathTypeLoader public * support enum switches with obfuscated SwitchMaps --- src/test/java/cuchaz/enigma/TestDeobfed.java | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'src/test/java/cuchaz/enigma/TestDeobfed.java') diff --git a/src/test/java/cuchaz/enigma/TestDeobfed.java b/src/test/java/cuchaz/enigma/TestDeobfed.java index e6c1b74..9babf1e 100644 --- a/src/test/java/cuchaz/enigma/TestDeobfed.java +++ b/src/test/java/cuchaz/enigma/TestDeobfed.java @@ -12,6 +12,8 @@ package cuchaz.enigma; import cuchaz.enigma.analysis.JarIndex; +import cuchaz.enigma.analysis.ParsedJar; +import cuchaz.enigma.mapping.entry.ReferencedEntryPool; import org.junit.BeforeClass; import org.junit.Test; @@ -23,14 +25,14 @@ import static org.hamcrest.Matchers.containsInAnyOrder; public class TestDeobfed { - private static JarFile jar; + private static ParsedJar jar; private static JarIndex index; @BeforeClass public static void beforeClass() throws Exception { - jar = new JarFile("build/test-deobf/translation.jar"); - index = new JarIndex(); + jar = new ParsedJar(new JarFile("build/test-deobf/translation.jar")); + index = new JarIndex(new ReferencedEntryPool()); index.indexJar(jar, true); } -- cgit v1.2.3