more tweaks, improvements, and bug fixes

6 files changed, 74 insertions, 2 deletions

diff --git a/src/cuchaz/enigma/mapping/ArgumentMapping.java b/src/cuchaz/enigma/mapping/ArgumentMapping.java
index f4d8e77..9f366a0 100644
--- a/src/cuchaz/enigma/mapping/ArgumentMapping.java
+++ b/src/cuchaz/enigma/mapping/ArgumentMapping.java
@@ -25,6 +25,11 @@ public class ArgumentMapping implements Serializable, Comparable<ArgumentMapping
                 m_name = NameValidator.validateArgumentName(name);
         }
         
+        public ArgumentMapping(ArgumentMapping other) {
+                m_index = other.m_index;
+                m_name = other.m_name;
+        }
+
         public int getIndex() {
                 return m_index;
         }
diff --git a/src/cuchaz/enigma/mapping/ClassMapping.java b/src/cuchaz/enigma/mapping/ClassMapping.java
index 3610e33..43605e5 100644
--- a/src/cuchaz/enigma/mapping/ClassMapping.java
+++ b/src/cuchaz/enigma/mapping/ClassMapping.java
@@ -393,6 +393,17 @@ public class ClassMapping implements Serializable, Comparable<ClassMapping> {
                         }
                 }
                 
+                // rename field types
+                for (FieldMapping fieldMapping : new ArrayList<FieldMapping>(m_fieldsByObf.values())) {
+                        String oldFieldKey = getFieldKey(fieldMapping.getObfName(), fieldMapping.getObfType());
+                        if (fieldMapping.renameObfClass(oldObfClassName, newObfClassName)) {
+                                boolean wasRemoved = m_fieldsByObf.remove(oldFieldKey) != null;
+                                assert (wasRemoved);
+                                boolean wasAdded = m_fieldsByObf.put(getFieldKey(fieldMapping.getObfName(), fieldMapping.getObfType()), fieldMapping) == null;
+                                assert (wasAdded);
+                        }
+                }
+                
                 // rename method signatures
                 for (MethodMapping methodMapping : new ArrayList<MethodMapping>(m_methodsByObf.values())) {
                         String oldMethodKey = getMethodKey(methodMapping.getObfName(), methodMapping.getObfSignature());
diff --git a/src/cuchaz/enigma/mapping/FieldMapping.java b/src/cuchaz/enigma/mapping/FieldMapping.java
index 14b20dd..55b0a19 100644
--- a/src/cuchaz/enigma/mapping/FieldMapping.java
+++ b/src/cuchaz/enigma/mapping/FieldMapping.java
@@ -26,6 +26,12 @@ public class FieldMapping implements Serializable, Comparable<FieldMapping> {
                 m_obfType = obfType;
         }
         
+        public FieldMapping(FieldMapping other, ClassNameReplacer obfClassNameReplacer) {
+                m_obfName = other.m_obfName;
+                m_deobfName = other.m_deobfName;
+                m_obfType = new Type(other.m_obfType, obfClassNameReplacer);
+        }
+
         public String getObfName() {
                 return m_obfName;
         }
@@ -46,4 +52,24 @@ public class FieldMapping implements Serializable, Comparable<FieldMapping> {
         public int compareTo(FieldMapping other) {
                 return (m_obfName + m_obfType).compareTo(other.m_obfName + other.m_obfType);
         }
+
+        public boolean renameObfClass(final String oldObfClassName, final String newObfClassName) {
+                
+                // rename obf classes in the type
+                Type newType = new Type(m_obfType, new ClassNameReplacer() {
+                        @Override
+                        public String replace(String className) {
+                                if (className.equals(oldObfClassName)) {
+                                        return newObfClassName;
+                                }
+                                return null;
+                        }
+                });
+                
+                if (!newType.equals(m_obfType)) {
+                        m_obfType = newType;
+                        return true;
+                }
+                return false;
+        }
 }
diff --git a/src/cuchaz/enigma/mapping/MethodMapping.java b/src/cuchaz/enigma/mapping/MethodMapping.java
index 1704428..bf8a94f 100644
--- a/src/cuchaz/enigma/mapping/MethodMapping.java
+++ b/src/cuchaz/enigma/mapping/MethodMapping.java
@@ -12,7 +12,9 @@ package cuchaz.enigma.mapping;
 
 import java.io.Serializable;
 import java.util.Map;
-import java.util.TreeMap;
+import java.util.Map.Entry;
+
+import com.google.common.collect.Maps;
 
 public class MethodMapping implements Serializable, Comparable<MethodMapping> {
         
@@ -37,9 +39,19 @@ public class MethodMapping implements Serializable, Comparable<MethodMapping> {
                 m_obfName = obfName;
                 m_deobfName = NameValidator.validateMethodName(deobfName);
                 m_obfSignature = obfSignature;
-                m_arguments = new TreeMap<Integer,ArgumentMapping>();
+                m_arguments = Maps.newTreeMap();
         }
         
+        public MethodMapping(MethodMapping other, ClassNameReplacer obfClassNameReplacer) {
+                m_obfName = other.m_obfName;
+                m_deobfName = other.m_deobfName;
+                m_obfSignature = new Signature(other.m_obfSignature, obfClassNameReplacer);
+                m_arguments = Maps.newTreeMap();
+                for (Entry<Integer,ArgumentMapping> entry : other.m_arguments.entrySet()) {
+                        m_arguments.put(entry.getKey(), new ArgumentMapping(entry.getValue()));
+                }
+        }
+
         public String getObfName() {
                 return m_obfName;
         }
diff --git a/src/cuchaz/enigma/mapping/Signature.java b/src/cuchaz/enigma/mapping/Signature.java
index 273a77b..ea83e40 100644
--- a/src/cuchaz/enigma/mapping/Signature.java
+++ b/src/cuchaz/enigma/mapping/Signature.java
@@ -39,6 +39,11 @@ public class Signature implements Serializable {
                 }
         }
         
+        public Signature(Signature other) {
+                m_argumentTypes = Lists.newArrayList(other.m_argumentTypes);
+                m_returnType = new Type(other.m_returnType);
+        }
+        
         public Signature(Signature other, ClassNameReplacer replacer) {
                 m_argumentTypes = Lists.newArrayList(other.m_argumentTypes);
                 for (int i=0; i<m_argumentTypes.size(); i++) {
diff --git a/src/cuchaz/enigma/mapping/Type.java b/src/cuchaz/enigma/mapping/Type.java
index d8c073e..72118b0 100644
--- a/src/cuchaz/enigma/mapping/Type.java
+++ b/src/cuchaz/enigma/mapping/Type.java
@@ -68,6 +68,11 @@ public class Type implements Serializable {
                 if (c == 'L') {
                         return readClass(in);
                 }
+                
+                // then check for templates
+                if (c == 'T') {
+                        return readClass(in);
+                }
 
                 // then check for arrays
                 int dim = countArrayDimension(in);
@@ -85,6 +90,10 @@ public class Type implements Serializable {
                 m_name = name;
         }
         
+        public Type(Type other) {
+                m_name = other.m_name;
+        }
+        
         public Type(ClassEntry classEntry) {
                 m_name = "L" + classEntry.getClassName() + ";";
         }
@@ -128,6 +137,10 @@ public class Type implements Serializable {
                 return m_name.charAt(0) == 'L' && m_name.charAt(m_name.length() - 1) == ';';
         }
         
+        public boolean isTemplate() {
+                return m_name.charAt(0) == 'T' && m_name.charAt(m_name.length() - 1) == ';';
+        }
+        
         public ClassEntry getClassEntry() {
                 if (isClass()) {
                         String name = m_name.substring(1, m_name.length() - 1);