fixed inner class renaming bug

also added smarter sorting to class mappings

1 files changed, 3 insertions, 8 deletions

diff --git a/src/cuchaz/enigma/mapping/MappingsRenamer.java b/src/cuchaz/enigma/mapping/MappingsRenamer.java
index 24ec731..3e5f1a4 100644
--- a/src/cuchaz/enigma/mapping/MappingsRenamer.java
+++ b/src/cuchaz/enigma/mapping/MappingsRenamer.java
@@ -121,11 +121,11 @@ public class MappingsRenamer
                 deobfName = NameValidator.validateMethodName( deobfName );
                 for( MethodEntry entry : implementations )
                 {
-                        String deobfSignature = getTranslator( TranslationDirection.Deobfuscating ).translateSignature( obf.getSignature() );
+                        String deobfSignature = m_mappings.getTranslator( TranslationDirection.Deobfuscating ).translateSignature( obf.getSignature() );
                         MethodEntry targetEntry = new MethodEntry( entry.getClassEntry(), deobfName, deobfSignature );
                         if( m_mappings.containsDeobfMethod( entry.getClassEntry(), deobfName, entry.getSignature() ) || m_index.containsObfBehavior( targetEntry ) )
                         {
-                                String deobfClassName = getTranslator( TranslationDirection.Deobfuscating ).translateClass( entry.getClassName() );
+                                String deobfClassName = m_mappings.getTranslator( TranslationDirection.Deobfuscating ).translateClass( entry.getClassName() );
                                 throw new IllegalNameException( deobfName, "There is already a method with that name and signature in class " + deobfClassName );
                         }
                 }
@@ -142,7 +142,7 @@ public class MappingsRenamer
                 MethodEntry targetEntry = new MethodEntry( obf.getClassEntry(), deobfName, obf.getSignature() );
                 if( m_mappings.containsDeobfMethod( obf.getClassEntry(), deobfName, obf.getSignature() ) || m_index.containsObfBehavior( targetEntry ) )
                 {
-                        String deobfClassName = getTranslator( TranslationDirection.Deobfuscating ).translateClass( obf.getClassName() );
+                        String deobfClassName = m_mappings.getTranslator( TranslationDirection.Deobfuscating ).translateClass( obf.getClassName() );
                         throw new IllegalNameException( deobfName, "There is already a method with that name and signature in class " + deobfClassName );
                 }
                 
@@ -288,9 +288,4 @@ public class MappingsRenamer
                 }
                 return classMapping;
         }
-        
-        private Translator getTranslator( TranslationDirection direction )
-        {
-                return m_mappings.getTranslator( m_index.getTranslationIndex(), direction );
-        }
 }