Fix #110 and remap indices with matched bridge method names

10 files changed, 51 insertions, 1 deletions

diff --git a/src/main/java/cuchaz/enigma/translation/representation/entry/ClassDefEntry.java b/src/main/java/cuchaz/enigma/translation/representation/entry/ClassDefEntry.java
index b9391b0..c4df891 100644
--- a/src/main/java/cuchaz/enigma/translation/representation/entry/ClassDefEntry.java
+++ b/src/main/java/cuchaz/enigma/translation/representation/entry/ClassDefEntry.java
@@ -86,6 +86,11 @@ public class ClassDefEntry extends ClassEntry implements DefEntry<ClassEntry> {
         }
 
         @Override
+        public ClassDefEntry withName(String name) {
+                return new ClassDefEntry(parent, name, signature, access, superClass, interfaces);
+        }
+
+        @Override
         public ClassDefEntry withParent(ClassEntry parent) {
                 return new ClassDefEntry(parent, name, signature, access, superClass, interfaces);
         }
diff --git a/src/main/java/cuchaz/enigma/translation/representation/entry/ClassEntry.java b/src/main/java/cuchaz/enigma/translation/representation/entry/ClassEntry.java
index 644658f..9bfcd8a 100644
--- a/src/main/java/cuchaz/enigma/translation/representation/entry/ClassEntry.java
+++ b/src/main/java/cuchaz/enigma/translation/representation/entry/ClassEntry.java
@@ -96,6 +96,11 @@ public class ClassEntry extends ParentedEntry<ClassEntry> implements Comparable<
         }
 
         @Override
+        public ClassEntry withName(String name) {
+                return new ClassEntry(parent, name);
+        }
+
+        @Override
         public ClassEntry withParent(ClassEntry parent) {
                 return new ClassEntry(parent, name);
         }
@@ -193,6 +198,11 @@ public class ClassEntry extends ParentedEntry<ClassEntry> implements Comparable<
 
         @Override
         public int compareTo(ClassEntry entry) {
-                return name.compareTo(entry.name);
+                String fullName = getFullName();
+                String otherFullName = entry.getFullName();
+                if (fullName.length() != otherFullName.length()) {
+                        return fullName.length() - otherFullName.length();
+                }
+                return fullName.compareTo(otherFullName);
         }
 }
diff --git a/src/main/java/cuchaz/enigma/translation/representation/entry/Entry.java b/src/main/java/cuchaz/enigma/translation/representation/entry/Entry.java
index 227400e..29a55d8 100644
--- a/src/main/java/cuchaz/enigma/translation/representation/entry/Entry.java
+++ b/src/main/java/cuchaz/enigma/translation/representation/entry/Entry.java
@@ -31,6 +31,8 @@ public interface Entry<P extends Entry<?>> extends Translatable {
 
         Class<P> getParentType();
 
+        Entry<P> withName(String name);
+
         Entry<P> withParent(P parent);
 
         boolean canConflictWith(Entry<?> entry);
diff --git a/src/main/java/cuchaz/enigma/translation/representation/entry/FieldDefEntry.java b/src/main/java/cuchaz/enigma/translation/representation/entry/FieldDefEntry.java
index d487f71..2703301 100644
--- a/src/main/java/cuchaz/enigma/translation/representation/entry/FieldDefEntry.java
+++ b/src/main/java/cuchaz/enigma/translation/representation/entry/FieldDefEntry.java
@@ -55,6 +55,11 @@ public class FieldDefEntry extends FieldEntry implements DefEntry<ClassEntry> {
         }
 
         @Override
+        public FieldDefEntry withName(String name) {
+                return new FieldDefEntry(parent, name, desc, signature, access);
+        }
+
+        @Override
         public FieldDefEntry withParent(ClassEntry owner) {
                 return new FieldDefEntry(owner, this.name, this.desc, signature, access);
         }
diff --git a/src/main/java/cuchaz/enigma/translation/representation/entry/FieldEntry.java b/src/main/java/cuchaz/enigma/translation/representation/entry/FieldEntry.java
index 2ec2471..700512e 100644
--- a/src/main/java/cuchaz/enigma/translation/representation/entry/FieldEntry.java
+++ b/src/main/java/cuchaz/enigma/translation/representation/entry/FieldEntry.java
@@ -45,6 +45,11 @@ public class FieldEntry extends ParentedEntry<ClassEntry> implements Comparable<
         }
 
         @Override
+        public FieldEntry withName(String name) {
+                return new FieldEntry(parent, name, desc);
+        }
+
+        @Override
         public FieldEntry withParent(ClassEntry parent) {
                 return new FieldEntry(parent, this.name, this.desc);
         }
diff --git a/src/main/java/cuchaz/enigma/translation/representation/entry/LocalVariableDefEntry.java b/src/main/java/cuchaz/enigma/translation/representation/entry/LocalVariableDefEntry.java
index 86bdf61..c6f32b6 100644
--- a/src/main/java/cuchaz/enigma/translation/representation/entry/LocalVariableDefEntry.java
+++ b/src/main/java/cuchaz/enigma/translation/representation/entry/LocalVariableDefEntry.java
@@ -34,6 +34,11 @@ public class LocalVariableDefEntry extends LocalVariableEntry {
         }
 
         @Override
+        public LocalVariableDefEntry withName(String name) {
+                return new LocalVariableDefEntry(parent, index, name, parameter, desc);
+        }
+
+        @Override
         public LocalVariableDefEntry withParent(MethodEntry entry) {
                 return new LocalVariableDefEntry(entry, index, name, parameter, desc);
         }
diff --git a/src/main/java/cuchaz/enigma/translation/representation/entry/LocalVariableEntry.java b/src/main/java/cuchaz/enigma/translation/representation/entry/LocalVariableEntry.java
index 0c12f1c..6fdb79f 100644
--- a/src/main/java/cuchaz/enigma/translation/representation/entry/LocalVariableEntry.java
+++ b/src/main/java/cuchaz/enigma/translation/representation/entry/LocalVariableEntry.java
@@ -52,6 +52,11 @@ public class LocalVariableEntry extends ParentedEntry<MethodEntry> implements Co
         }
 
         @Override
+        public LocalVariableEntry withName(String name) {
+                return new LocalVariableEntry(parent, index, name, parameter);
+        }
+
+        @Override
         public LocalVariableEntry withParent(MethodEntry parent) {
                 return new LocalVariableEntry(parent, index, name, parameter);
         }
diff --git a/src/main/java/cuchaz/enigma/translation/representation/entry/MethodDefEntry.java b/src/main/java/cuchaz/enigma/translation/representation/entry/MethodDefEntry.java
index 3ecd470..5184244 100644
--- a/src/main/java/cuchaz/enigma/translation/representation/entry/MethodDefEntry.java
+++ b/src/main/java/cuchaz/enigma/translation/representation/entry/MethodDefEntry.java
@@ -55,6 +55,11 @@ public class MethodDefEntry extends MethodEntry implements DefEntry<ClassEntry>
         }
 
         @Override
+        public MethodDefEntry withName(String name) {
+                return new MethodDefEntry(parent, name, descriptor, signature, access);
+        }
+
+        @Override
         public MethodDefEntry withParent(ClassEntry parent) {
                 return new MethodDefEntry(new ClassEntry(parent.getFullName()), name, descriptor, signature, access);
         }
diff --git a/src/main/java/cuchaz/enigma/translation/representation/entry/MethodEntry.java b/src/main/java/cuchaz/enigma/translation/representation/entry/MethodEntry.java
index 3a1dbb3..f5d5c74 100644
--- a/src/main/java/cuchaz/enigma/translation/representation/entry/MethodEntry.java
+++ b/src/main/java/cuchaz/enigma/translation/representation/entry/MethodEntry.java
@@ -56,6 +56,11 @@ public class MethodEntry extends ParentedEntry<ClassEntry> implements Comparable
         }
 
         @Override
+        public MethodEntry withName(String name) {
+                return new MethodEntry(parent, name, descriptor);
+        }
+
+        @Override
         public MethodEntry withParent(ClassEntry parent) {
                 return new MethodEntry(new ClassEntry(parent.getFullName()), name, descriptor);
         }
diff --git a/src/main/java/cuchaz/enigma/translation/representation/entry/ParentedEntry.java b/src/main/java/cuchaz/enigma/translation/representation/entry/ParentedEntry.java
index 7ba7c19..834da8d 100644
--- a/src/main/java/cuchaz/enigma/translation/representation/entry/ParentedEntry.java
+++ b/src/main/java/cuchaz/enigma/translation/representation/entry/ParentedEntry.java
@@ -35,6 +35,9 @@ public abstract class ParentedEntry<P extends Entry<?>> implements Entry<P> {
         @Override
         public abstract ParentedEntry<P> withParent(P parent);
 
+        @Override
+        public abstract ParentedEntry<P> withName(String name);
+
         protected abstract ParentedEntry<P> translate(Translator translator, @Nullable EntryMapping mapping);
 
         @Override