4 files changed, 43 insertions, 67 deletions

diff --git a/src/main/java/cuchaz/enigma/bytecode/ClassTranslator.java b/src/main/java/cuchaz/enigma/bytecode/translators/ClassTranslator.java
index 1ebf656..4ac5a8b 100644
--- a/src/main/java/cuchaz/enigma/bytecode/ClassTranslator.java
+++ b/src/main/java/cuchaz/enigma/bytecode/translators/ClassTranslator.java
@@ -9,8 +9,10 @@
  * Jeff Martin - initial API and implementation
  ******************************************************************************/
 
-package cuchaz.enigma.bytecode;
+package cuchaz.enigma.bytecode.translators;
 
+import cuchaz.enigma.bytecode.ClassRenamer;
+import cuchaz.enigma.bytecode.ConstPoolEditor;
 import cuchaz.enigma.mapping.*;
 import javassist.CtBehavior;
 import javassist.CtClass;
@@ -20,13 +22,7 @@ import javassist.bytecode.*;
 
 public class ClassTranslator {
 
-        private Translator translator;
-
-        public ClassTranslator(Translator translator) {
-                this.translator = translator;
-        }
-
-        public void translate(CtClass c) {
+        public static void translate(Translator translator, CtClass c) {
 
                 // NOTE: the order of these translations is very important
 
@@ -44,7 +40,7 @@ public class ClassTranslator {
                                                 constants.getFieldrefName(i),
                                                 constants.getFieldrefType(i)
                                         );
-                                        FieldEntry translatedEntry = this.translator.translateEntry(entry);
+                                        FieldEntry translatedEntry = translator.translateEntry(entry);
                                         if (!entry.equals(translatedEntry)) {
                                                 editor.changeMemberrefNameAndType(i, translatedEntry.getName(), translatedEntry.getType().toString());
                                         }
@@ -60,7 +56,7 @@ public class ClassTranslator {
                                                 editor.getMemberrefName(i),
                                                 editor.getMemberrefType(i)
                                         );
-                                        BehaviorEntry translatedEntry = this.translator.translateEntry(entry);
+                                        BehaviorEntry translatedEntry = translator.translateEntry(entry);
                                         if (!entry.equals(translatedEntry)) {
                                                 editor.changeMemberrefNameAndType(i, translatedEntry.getName(), translatedEntry.getSignature().toString());
                                         }
@@ -72,7 +68,7 @@ public class ClassTranslator {
                 }
 
                 ClassEntry classEntry = new ClassEntry(Descriptor.toJvmName(c.getName()));
-                Mappings.EntryModifier modifier = this.translator.getModifier(classEntry);
+                Mappings.EntryModifier modifier = translator.getModifier(classEntry);
                 if (modifier != null && modifier != Mappings.EntryModifier.UNCHANGED)
                         ClassRenamer.applyModifier(c, modifier);
 
@@ -81,8 +77,8 @@ public class ClassTranslator {
 
                         // translate the name
                         FieldEntry entry = EntryFactory.getFieldEntry(field);
-                        String translatedName = this.translator.translate(entry);
-                        modifier = this.translator.getModifier(entry);
+                        String translatedName = translator.translate(entry);
+                        modifier = translator.getModifier(entry);
                         if (modifier != null && modifier != Mappings.EntryModifier.UNCHANGED)
                                 ClassRenamer.applyModifier(field, modifier);
 
@@ -91,7 +87,7 @@ public class ClassTranslator {
                         }
 
                         // translate the type
-                        Type translatedType = this.translator.translateType(entry.getType());
+                        Type translatedType = translator.translateType(entry.getType());
                         field.getFieldInfo().setDescriptor(translatedType.toString());
                 }
 
@@ -100,7 +96,7 @@ public class ClassTranslator {
 
                         BehaviorEntry entry = EntryFactory.getBehaviorEntry(behavior);
 
-                        modifier = this.translator.getModifier(entry);
+                        modifier = translator.getModifier(entry);
                         if (modifier != null && modifier != Mappings.EntryModifier.UNCHANGED)
                                 ClassRenamer.applyModifier(behavior, modifier);
 
@@ -108,7 +104,7 @@ public class ClassTranslator {
                                 CtMethod method = (CtMethod) behavior;
 
                                 // translate the name
-                                String translatedName = this.translator.translate(entry);
+                                String translatedName = translator.translate(entry);
                                 if (translatedName != null) {
                                         method.setName(translatedName);
                                 }
@@ -116,7 +112,7 @@ public class ClassTranslator {
 
                         if (entry.getSignature() != null) {
                                 // translate the signature
-                                Signature translatedSignature = this.translator.translateSignature(entry.getSignature());
+                                Signature translatedSignature = translator.translateSignature(entry.getSignature());
                                 behavior.getMethodInfo().setDescriptor(translatedSignature.toString());
                         }
                 }
@@ -127,7 +123,7 @@ public class ClassTranslator {
 
                         if (enclosingMethodAttr.methodIndex() == 0) {
                                 BehaviorEntry obfBehaviorEntry = EntryFactory.getBehaviorEntry(Descriptor.toJvmName(enclosingMethodAttr.className()));
-                                BehaviorEntry deobfBehaviorEntry = this.translator.translateEntry(obfBehaviorEntry);
+                                BehaviorEntry deobfBehaviorEntry = translator.translateEntry(obfBehaviorEntry);
                                 c.getClassFile().addAttribute(new EnclosingMethodAttribute(
                                         constants,
                                         deobfBehaviorEntry.getClassName()
@@ -138,7 +134,7 @@ public class ClassTranslator {
                                         enclosingMethodAttr.methodName(),
                                         enclosingMethodAttr.methodDescriptor()
                                 );
-                                BehaviorEntry deobfBehaviorEntry = this.translator.translateEntry(obfBehaviorEntry);
+                                BehaviorEntry deobfBehaviorEntry = translator.translateEntry(obfBehaviorEntry);
                                 c.getClassFile().addAttribute(new EnclosingMethodAttribute(
                                         constants,
                                         deobfBehaviorEntry.getClassName(),
@@ -150,10 +146,10 @@ public class ClassTranslator {
 
                 // translate all the class names referenced in the code
                 // the above code only changed method/field/reference names and types, but not the rest of the class references
-                ClassRenamer.renameClasses(c, this.translator);
+                ClassRenamer.renameClasses(c, translator);
 
                 // translate the source file attribute too
-                ClassEntry deobfClassEntry = this.translator.translateEntry(classEntry);
+                ClassEntry deobfClassEntry = translator.translateEntry(classEntry);
                 if (deobfClassEntry != null) {
                         String sourceFile = Descriptor.toJvmName(deobfClassEntry.getOutermostClassEntry().getSimpleName()) + ".java";
                         c.getClassFile().addAttribute(new SourceFileAttribute(constants, sourceFile));
diff --git a/src/main/java/cuchaz/enigma/bytecode/InnerClassWriter.java b/src/main/java/cuchaz/enigma/bytecode/translators/InnerClassWriter.java
index f1c3dd7..0e35938 100644
--- a/src/main/java/cuchaz/enigma/bytecode/InnerClassWriter.java
+++ b/src/main/java/cuchaz/enigma/bytecode/translators/InnerClassWriter.java
@@ -9,10 +9,11 @@
  * Jeff Martin - initial API and implementation
  ******************************************************************************/
 
-package cuchaz.enigma.bytecode;
+package cuchaz.enigma.bytecode.translators;
 
 import com.google.common.collect.Lists;
 import cuchaz.enigma.analysis.JarIndex;
+import cuchaz.enigma.bytecode.ClassRenamer;
 import cuchaz.enigma.mapping.*;
 import javassist.ClassPool;
 import javassist.CtClass;
@@ -24,14 +25,6 @@ import java.util.List;
 
 public class InnerClassWriter {
 
-        private JarIndex index;
-        private Translator deobfuscatorTranslator;
-
-        public InnerClassWriter(JarIndex index, Translator deobfuscatorTranslator) {
-                this.index = index;
-                this.deobfuscatorTranslator = deobfuscatorTranslator;
-        }
-
         // FIXME: modifier is not applied to inner class
         public static void changeModifier(CtClass c, InnerClassesAttribute attr, Translator translator) {
                 ClassPool pool = c.getClassPool();
@@ -52,7 +45,7 @@ public class InnerClassWriter {
                 }
         }
 
-        public void write(CtClass c) {
+        public static void write(JarIndex index, CtClass c) {
 
                 // don't change anything if there's already an attribute there
                 InnerClassesAttribute oldAttr = (InnerClassesAttribute) c.getClassFile().getAttribute(InnerClassesAttribute.tag);
@@ -62,7 +55,7 @@ public class InnerClassWriter {
                 }
 
                 ClassEntry obfClassEntry = EntryFactory.getClassEntry(c);
-                List<ClassEntry> obfClassChain = this.index.getObfClassChain(obfClassEntry);
+                List<ClassEntry> obfClassChain = index.getObfClassChain(obfClassEntry);
 
                 boolean isInnerClass = obfClassChain.size() > 1;
                 if (isInnerClass) {
@@ -70,7 +63,7 @@ public class InnerClassWriter {
                         // it's an inner class, rename it to the fully qualified name
                         c.setName(obfClassEntry.buildClassEntry(obfClassChain).getName());
 
-                        BehaviorEntry caller = this.index.getAnonymousClassCaller(obfClassEntry);
+                        BehaviorEntry caller = index.getAnonymousClassCaller(obfClassEntry);
                         if (caller != null) {
 
                                 // write the enclosing method attribute
@@ -83,7 +76,7 @@ public class InnerClassWriter {
                 }
 
                 // does this class have any inner classes?
-                Collection<ClassEntry> obfInnerClassEntries = this.index.getInnerClasses(obfClassEntry);
+                Collection<ClassEntry> obfInnerClassEntries = index.getInnerClasses(obfClassEntry);
 
                 if (isInnerClass || !obfInnerClassEntries.isEmpty()) {
 
@@ -94,7 +87,7 @@ public class InnerClassWriter {
                         // write the ancestry, but not the outermost class
                         for (int i = 1; i < obfClassChain.size(); i++) {
                                 ClassEntry obfInnerClassEntry = obfClassChain.get(i);
-                                writeInnerClass(attr, obfClassChain, obfInnerClassEntry);
+                                writeInnerClass(index, attr, obfClassChain, obfInnerClassEntry);
 
                                 // update references to use the fully qualified inner class name
                                 c.replaceClassName(obfInnerClassEntry.getName(), obfInnerClassEntry.buildClassEntry(obfClassChain).getName());
@@ -107,7 +100,7 @@ public class InnerClassWriter {
                                 List<ClassEntry> extendedObfClassChain = Lists.newArrayList(obfClassChain);
                                 extendedObfClassChain.add(obfInnerClassEntry);
 
-                                writeInnerClass(attr, extendedObfClassChain, obfInnerClassEntry);
+                                writeInnerClass(index, attr, extendedObfClassChain, obfInnerClassEntry);
 
                                 // update references to use the fully qualified inner class name
                                 c.replaceClassName(obfInnerClassEntry.getName(), obfInnerClassEntry.buildClassEntry(extendedObfClassChain).getName());
@@ -115,7 +108,7 @@ public class InnerClassWriter {
                 }
         }
 
-        private void writeInnerClass(InnerClassesAttribute attr, List<ClassEntry> obfClassChain, ClassEntry obfClassEntry) {
+        private static void writeInnerClass(JarIndex index, InnerClassesAttribute attr, List<ClassEntry> obfClassChain, ClassEntry obfClassEntry) {
 
                 // get the new inner class name
                 ClassEntry obfInnerClassEntry = obfClassEntry.buildClassEntry(obfClassChain);
@@ -131,7 +124,7 @@ public class InnerClassWriter {
                 int innerClassNameIndex = 0;
                 int accessFlags = AccessFlag.PUBLIC;
                 // TODO: need to figure out if we can put static or not
-                if (!this.index.isAnonymousClass(obfClassEntry)) {
+                if (!index.isAnonymousClass(obfClassEntry)) {
                         innerClassNameIndex = constPool.addUtf8Info(obfInnerClassEntry.getInnermostClassName());
                 }
 
diff --git a/src/main/java/cuchaz/enigma/bytecode/LocalVariableRenamer.java b/src/main/java/cuchaz/enigma/bytecode/translators/LocalVariableTranslator.java
index 878e30a..51b3d2d 100644
--- a/src/main/java/cuchaz/enigma/bytecode/LocalVariableRenamer.java
+++ b/src/main/java/cuchaz/enigma/bytecode/translators/LocalVariableTranslator.java
@@ -9,22 +9,16 @@
  * Jeff Martin - initial API and implementation
  ******************************************************************************/
 
-package cuchaz.enigma.bytecode;
+package cuchaz.enigma.bytecode.translators;
 
 import cuchaz.enigma.mapping.*;
 import javassist.CtBehavior;
 import javassist.CtClass;
 import javassist.bytecode.*;
 
-public class LocalVariableRenamer {
+public class LocalVariableTranslator {
 
-        private Translator translator;
-
-        public LocalVariableRenamer(Translator translator) {
-                this.translator = translator;
-        }
-
-        public void rename(CtClass c) {
+        public static void translate(Translator translator, CtClass c) {
                 for (CtBehavior behavior : c.getDeclaredBehaviors()) {
 
                         // if there's a local variable table, just rename everything to v1, v2, v3, ... for now
@@ -38,7 +32,7 @@ public class LocalVariableRenamer {
 
                         LocalVariableAttribute table = (LocalVariableAttribute) codeAttribute.getAttribute(LocalVariableAttribute.tag);
                         if (table != null) {
-                                renameLVT(behaviorEntry, constants, table, c);
+                                renameLVT(translator, behaviorEntry, constants, table, c);
                         }
 
                         LocalVariableTypeAttribute typeTable = (LocalVariableTypeAttribute) codeAttribute.getAttribute(LocalVariableAttribute.typeTag);
@@ -50,7 +44,7 @@ public class LocalVariableRenamer {
 
         // DEBUG
         @SuppressWarnings("unused")
-        private void dumpTable(LocalVariableAttribute table) {
+        private static void dumpTable(LocalVariableAttribute table) {
                 for (int i = 0; i < table.tableLength(); i++) {
                         System.out.println(String.format("\t%d (%d): %s %s",
                                 i, table.index(i), table.variableName(i), table.descriptor(i)
@@ -58,7 +52,7 @@ public class LocalVariableRenamer {
                 }
         }
 
-        private void renameLVT(BehaviorEntry behaviorEntry, ConstPool constants, LocalVariableAttribute table, CtClass ctClass) {
+        private static void renameLVT(Translator translator, BehaviorEntry behaviorEntry, ConstPool constants, LocalVariableAttribute table, CtClass ctClass) {
 
                 // skip empty tables
                 if (table.tableLength() <= 0) {
@@ -94,9 +88,7 @@ public class LocalVariableRenamer {
                                 int argi = i - starti;
                                 if (ctClass.isEnum())
                                         argi += 2;
-                                if (behaviorEntry.getClassEntry().getName().contains("ahd") && behaviorEntry instanceof ConstructorEntry)
-                                        System.out.println(behaviorEntry.getClassEntry() + " " + i);
-                                String argName = this.translator.translate(new ArgumentEntry(behaviorEntry, argi, ""));
+                                String argName = translator.translate(new ArgumentEntry(behaviorEntry, argi, ""));
                                 if (argName == null) {
                                         int argIndex = isNestedClassConstructor ? argi + 1 : argi;
                                         if (ctClass.isEnum())
@@ -110,7 +102,7 @@ public class LocalVariableRenamer {
                                                 // List types would require this whole block again, so just go with aListx
                                                 argName = "aList" + (argIndex + 1);
                                         } else if (argType.isClass()) {
-                                                ClassEntry argClsTrans = this.translator.translateEntry(argType.getClassEntry());
+                                                ClassEntry argClsTrans = translator.translateEntry(argType.getClassEntry());
                                                 argName = "a" + argClsTrans.getSimpleName().replace("$", "") + (argIndex + 1);
                                         } else {
                                                 argName = "a" + (argIndex + 1);
@@ -127,19 +119,19 @@ public class LocalVariableRenamer {
                 }
         }
 
-        private void renameLVTT(LocalVariableTypeAttribute typeTable, LocalVariableAttribute table) {
+        private static void renameLVTT(LocalVariableTypeAttribute typeTable, LocalVariableAttribute table) {
                 // rename args to the same names as in the LVT
                 for (int i = 0; i < typeTable.tableLength(); i++) {
                         renameVariable(typeTable, i, getNameIndex(table, typeTable.index(i)));
                 }
         }
 
-        private void renameVariable(LocalVariableAttribute table, int i, int stringId) {
+        private static void renameVariable(LocalVariableAttribute table, int i, int stringId) {
                 // based off of LocalVariableAttribute.nameIndex()
                 ByteArray.write16bit(stringId, table.get(), i * 10 + 6);
         }
 
-        private int getNameIndex(LocalVariableAttribute table, int index) {
+        private static int getNameIndex(LocalVariableAttribute table, int index) {
                 for (int i = 0; i < table.tableLength(); i++) {
                         if (table.index(i) == index) {
                                 return table.nameIndex(i);
diff --git a/src/main/java/cuchaz/enigma/bytecode/MethodParameterWriter.java b/src/main/java/cuchaz/enigma/bytecode/translators/MethodParameterTranslator.java
index d63572e..4e632b9 100644
--- a/src/main/java/cuchaz/enigma/bytecode/MethodParameterWriter.java
+++ b/src/main/java/cuchaz/enigma/bytecode/translators/MethodParameterTranslator.java
@@ -9,8 +9,9 @@
  * Jeff Martin - initial API and implementation
  ******************************************************************************/
 
-package cuchaz.enigma.bytecode;
+package cuchaz.enigma.bytecode.translators;
 
+import cuchaz.enigma.bytecode.MethodParametersAttribute;
 import cuchaz.enigma.mapping.*;
 import javassist.CtBehavior;
 import javassist.CtClass;
@@ -20,15 +21,9 @@ import javassist.bytecode.LocalVariableAttribute;
 import java.util.ArrayList;
 import java.util.List;
 
-public class MethodParameterWriter {
+public class MethodParameterTranslator {
 
-        private Translator translator;
-
-        public MethodParameterWriter(Translator translator) {
-                this.translator = translator;
-        }
-
-        public void writeMethodArguments(CtClass c) {
+        public static void translate(Translator translator, CtClass c) {
 
                 // Procyon will read method arguments from the "MethodParameters" attribute, so write those
                 for (CtBehavior behavior : c.getDeclaredBehaviors()) {
@@ -57,7 +52,7 @@ public class MethodParameterWriter {
                         // get the list of argument names
                         List<String> names = new ArrayList<>(numParams);
                         for (int i = 0; i < numParams; i++) {
-                                names.add(this.translator.translate(new ArgumentEntry(behaviorEntry, i, "")));
+                                names.add(translator.translate(new ArgumentEntry(behaviorEntry, i, "")));
                         }
 
                         // save the mappings to the class