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

1 files changed, 9 insertions, 22 deletions

diff --git a/src/test/java/cuchaz/enigma/TestEntryFactory.java b/src/test/java/cuchaz/enigma/TestEntryFactory.java
index 1c527f5..4f52609 100644
--- a/src/test/java/cuchaz/enigma/TestEntryFactory.java
+++ b/src/test/java/cuchaz/enigma/TestEntryFactory.java
@@ -13,6 +13,9 @@ package cuchaz.enigma;
 
 import cuchaz.enigma.analysis.EntryReference;
 import cuchaz.enigma.mapping.*;
+import cuchaz.enigma.mapping.entry.ClassEntry;
+import cuchaz.enigma.mapping.entry.FieldEntry;
+import cuchaz.enigma.mapping.entry.MethodEntry;
 
 public class TestEntryFactory {
 
@@ -25,7 +28,7 @@ public class TestEntryFactory {
         }
 
         public static FieldEntry newField(ClassEntry classEntry, String fieldName, String fieldType) {
-                return new FieldEntry(classEntry, fieldName, new Type(fieldType));
+                return new FieldEntry(classEntry, fieldName, new TypeDescriptor(fieldType));
         }
 
         public static MethodEntry newMethod(String className, String methodName, String methodSignature) {
@@ -33,30 +36,14 @@ public class TestEntryFactory {
         }
 
         public static MethodEntry newMethod(ClassEntry classEntry, String methodName, String methodSignature) {
-                return new MethodEntry(classEntry, methodName, new Signature(methodSignature));
+                return new MethodEntry(classEntry, methodName, new MethodDescriptor(methodSignature));
         }
 
-        public static ConstructorEntry newConstructor(String className, String signature) {
-                return newConstructor(newClass(className), signature);
+        public static EntryReference<FieldEntry, MethodEntry> newFieldReferenceByMethod(FieldEntry fieldEntry, String callerClassName, String callerName, String callerSignature) {
+                return new EntryReference<>(fieldEntry, "", newMethod(callerClassName, callerName, callerSignature));
         }
 
-        public static ConstructorEntry newConstructor(ClassEntry classEntry, String signature) {
-                return new ConstructorEntry(classEntry, new Signature(signature));
-        }
-
-        public static EntryReference<FieldEntry, BehaviorEntry> newFieldReferenceByMethod(FieldEntry fieldEntry, String callerClassName, String callerName, String callerSignature) {
-                return new EntryReference<FieldEntry, BehaviorEntry>(fieldEntry, "", newMethod(callerClassName, callerName, callerSignature));
-        }
-
-        public static EntryReference<FieldEntry, BehaviorEntry> newFieldReferenceByConstructor(FieldEntry fieldEntry, String callerClassName, String callerSignature) {
-                return new EntryReference<FieldEntry, BehaviorEntry>(fieldEntry, "", newConstructor(callerClassName, callerSignature));
-        }
-
-        public static EntryReference<BehaviorEntry, BehaviorEntry> newBehaviorReferenceByMethod(BehaviorEntry behaviorEntry, String callerClassName, String callerName, String callerSignature) {
-                return new EntryReference<BehaviorEntry, BehaviorEntry>(behaviorEntry, "", newMethod(callerClassName, callerName, callerSignature));
-        }
-
-        public static EntryReference<BehaviorEntry, BehaviorEntry> newBehaviorReferenceByConstructor(BehaviorEntry behaviorEntry, String callerClassName, String callerSignature) {
-                return new EntryReference<BehaviorEntry, BehaviorEntry>(behaviorEntry, "", newConstructor(callerClassName, callerSignature));
+        public static EntryReference<MethodEntry, MethodEntry> newBehaviorReferenceByMethod(MethodEntry methodEntry, String callerClassName, String callerName, String callerSignature) {
+                return new EntryReference<>(methodEntry, "", newMethod(callerClassName, callerName, callerSignature));
         }
 }