moved all classes from the default package into a package called "default" so they can be properly imported by other classes

3 files changed, 124 insertions, 61 deletions

diff --git a/src/cuchaz/enigma/bytecode/ClassRenamer.java b/src/cuchaz/enigma/bytecode/ClassRenamer.java
new file mode 100644
index 0000000..cba5861
--- /dev/null
+++ b/src/cuchaz/enigma/bytecode/ClassRenamer.java
@@ -0,0 +1,115 @@
+/*******************************************************************************
+ * Copyright (c) 2014 Jeff Martin.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the GNU Public License v3.0
+ * which accompanies this distribution, and is available at
+ * http://www.gnu.org/licenses/gpl.html
+ * 
+ * Contributors:
+ *     Jeff Martin - initial API and implementation
+ ******************************************************************************/
+package cuchaz.enigma.bytecode;
+
+import java.util.Map;
+import java.util.Set;
+
+import javassist.ClassMap;
+import javassist.CtClass;
+import javassist.bytecode.ConstPool;
+import javassist.bytecode.Descriptor;
+import javassist.bytecode.InnerClassesAttribute;
+
+import com.beust.jcommander.internal.Sets;
+import com.google.common.collect.Maps;
+
+import cuchaz.enigma.mapping.ClassEntry;
+
+public class ClassRenamer
+{
+        public static void renameClasses( CtClass c, Map<ClassEntry,ClassEntry> map )
+        {
+                // build the map used by javassist
+                ClassMap nameMap = new ClassMap();
+                for( Map.Entry<ClassEntry,ClassEntry> entry : map.entrySet() )
+                {
+                        nameMap.put( entry.getKey().getName(), entry.getValue().getName() );
+                }
+                c.replaceClassName( nameMap );
+                
+                // translate the names in the InnerClasses attribute
+                ConstPool constants = c.getClassFile().getConstPool();
+                InnerClassesAttribute attr = (InnerClassesAttribute)c.getClassFile().getAttribute( InnerClassesAttribute.tag );
+                if( attr != null )
+                {
+                        for( int i=0; i<attr.tableLength(); i++ )
+                        {
+                                ClassEntry inClassEntry = new ClassEntry( Descriptor.toJvmName( attr.innerClass( i ) ) );
+                                ClassEntry outClassEntry = map.get( inClassEntry );
+                                attr.setInnerClassIndex( i, constants.addClassInfo( outClassEntry.getName() ) );
+                                if( attr.outerClassIndex( i ) != 0 )
+                                {
+                                        attr.setOuterClassIndex( i, constants.addClassInfo( outClassEntry.getOuterClassName() ) );
+                                }
+                                if( attr.innerNameIndex( i ) != 0 )
+                                {
+                                        attr.setInnerNameIndex( i, constants.addUtf8Info( outClassEntry.getInnerClassName() ) );
+                                }
+                                
+                                /* DEBUG
+                                System.out.println( String.format( "\tOBF: %s DEOBF: %s-> ATTR: %s,%s,%s",
+                                        obfClassEntry, deobfClassEntry,
+                                        attr.outerClass( i ),
+                                        attr.innerClass( i ),
+                                        attr.innerName( i )
+                                ) );
+                                */
+                        }
+                }
+        }
+        
+        public static Set<ClassEntry> getAllClassEntries( CtClass c )
+        {
+                // get the classes that javassist knows about
+                final Set<ClassEntry> entries = Sets.newHashSet();
+                ClassMap map = new ClassMap( )
+                {
+                        @Override
+                        public Object get( Object obj )
+                        {
+                                if( obj instanceof String )
+                                {
+                                        entries.add( new ClassEntry( (String)obj ) );
+                                }
+                                return null;
+                        }
+                        private static final long serialVersionUID = -202160293602070641L;
+                };
+                c.replaceClassName( map );
+                
+                // also check InnerClassesAttribute
+                InnerClassesAttribute attr = (InnerClassesAttribute)c.getClassFile().getAttribute( InnerClassesAttribute.tag );
+                if( attr != null )
+                {
+                        for( int i=0; i<attr.tableLength(); i++ )
+                        {
+                                entries.add( new ClassEntry( Descriptor.toJvmName( attr.innerClass( i ) ) ) );
+                        }
+                }
+                
+                return entries;
+        }
+        
+        public static void moveAllClassesOutOfDefaultPackage( CtClass c, String newPackageName )
+        {
+                // rename all classes
+                Map<ClassEntry,ClassEntry> map = Maps.newHashMap();
+                for( ClassEntry classEntry : ClassRenamer.getAllClassEntries( c ) )
+                {
+                        if( classEntry.isInDefaultPackage() )
+                        {
+                                map.put( classEntry, new ClassEntry( newPackageName + "/" + classEntry.getName() ) );
+                        }
+                }
+                ClassRenamer.renameClasses( c, map );
+        }
+}
diff --git a/src/cuchaz/enigma/bytecode/ClassTranslator.java b/src/cuchaz/enigma/bytecode/ClassTranslator.java
index 9ce06a5..885b45f 100644
--- a/src/cuchaz/enigma/bytecode/ClassTranslator.java
+++ b/src/cuchaz/enigma/bytecode/ClassTranslator.java
@@ -10,18 +10,16 @@
  ******************************************************************************/
 package cuchaz.enigma.bytecode;
 
-import java.util.Set;
+import java.util.Map;
 
-import javassist.ClassMap;
 import javassist.CtBehavior;
 import javassist.CtClass;
 import javassist.CtField;
 import javassist.CtMethod;
 import javassist.bytecode.ConstPool;
 import javassist.bytecode.Descriptor;
-import javassist.bytecode.InnerClassesAttribute;
 
-import com.beust.jcommander.internal.Sets;
+import com.beust.jcommander.internal.Maps;
 
 import cuchaz.enigma.mapping.ClassEntry;
 import cuchaz.enigma.mapping.FieldEntry;
@@ -136,61 +134,11 @@ 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 class names themselves
-                Set<ClassEntry> classEntries = getAllClassEntries( c );
-                ClassMap map = new ClassMap();
-                for( ClassEntry obfClassEntry : classEntries )
+                Map<ClassEntry,ClassEntry> map = Maps.newHashMap();
+                for( ClassEntry obfClassEntry : ClassRenamer.getAllClassEntries( c ) )
                 {
-                        map.put( obfClassEntry.getName(), m_translator.translateEntry( obfClassEntry ).getName() );
+                        map.put( obfClassEntry, m_translator.translateEntry( obfClassEntry ) );
                 }
-                c.replaceClassName( map );
-                
-                // translate the names in the InnerClasses attribute
-                InnerClassesAttribute attr = (InnerClassesAttribute)c.getClassFile().getAttribute( InnerClassesAttribute.tag );
-                if( attr != null )
-                {
-                        for( int i=0; i<attr.tableLength(); i++ )
-                        {
-                                ClassEntry obfClassEntry = new ClassEntry( Descriptor.toJvmName( attr.innerClass( i ) ) );
-                                ClassEntry deobfClassEntry = m_translator.translateEntry( obfClassEntry );
-                                attr.setInnerClassIndex( i, constants.addClassInfo( deobfClassEntry.getName() ) );
-                                if( attr.outerClassIndex( i ) != 0 )
-                                {
-                                        attr.setOuterClassIndex( i, constants.addClassInfo( deobfClassEntry.getOuterClassName() ) );
-                                }
-                                if( attr.innerNameIndex( i ) != 0 )
-                                {
-                                        attr.setInnerNameIndex( i, constants.addUtf8Info( deobfClassEntry.getInnerClassName() ) );
-                                }
-                                
-                                /* DEBUG
-                                System.out.println( String.format( "\tOBF: %s DEOBF: %s-> ATTR: %s,%s,%s",
-                                        obfClassEntry, deobfClassEntry,
-                                        attr.outerClass( i ),
-                                        attr.innerClass( i ),
-                                        attr.innerName( i )
-                                ) );
-                                */
-                        }
-                }
-        }
-        
-        private Set<ClassEntry> getAllClassEntries( CtClass c )
-        {
-                final Set<ClassEntry> entries = Sets.newHashSet();
-                ClassMap map = new ClassMap( )
-                {
-                        @Override
-                        public Object get( Object obj )
-                        {
-                                if( obj instanceof String )
-                                {
-                                        entries.add( new ClassEntry( (String)obj ) );
-                                }
-                                return null;
-                        }
-                        private static final long serialVersionUID = -202160293602070641L;
-                };
-                c.replaceClassName( map );
-                return entries;
+                ClassRenamer.renameClasses( c, map );
         }
 }
diff --git a/src/cuchaz/enigma/bytecode/InnerClassWriter.java b/src/cuchaz/enigma/bytecode/InnerClassWriter.java
index c412b1a..2fb5fe0 100644
--- a/src/cuchaz/enigma/bytecode/InnerClassWriter.java
+++ b/src/cuchaz/enigma/bytecode/InnerClassWriter.java
@@ -42,7 +42,7 @@ public class InnerClassWriter
                 else
                 {
                         // this is an inner class, rename it to outer$inner
-                        ClassEntry obfClassEntry = new ClassEntry( obfOuterClassName + "$" + obfClassName );
+                        ClassEntry obfClassEntry = new ClassEntry( obfOuterClassName + "$" + new ClassEntry( obfClassName ).getSimpleName() );
                         c.setName( obfClassEntry.getName() );
                 }
                 
@@ -60,8 +60,8 @@ public class InnerClassWriter
                 c.getClassFile().addAttribute( attr );
                 for( String obfInnerClassName : obfInnerClassNames )
                 {
-                        // deobfuscate the class names
-                        ClassEntry obfClassEntry = new ClassEntry( obfOuterClassName + "$" + obfInnerClassName );
+                        // get the new inner class name
+                        ClassEntry obfClassEntry = new ClassEntry( obfOuterClassName + "$" + new ClassEntry( obfInnerClassName ).getSimpleName() );
                         
                         // here's what the JVM spec says about the InnerClasses attribute
                         // append( inner, outer of inner if inner is member of outer 0 ow, name after $ if inner not anonymous 0 ow, flags );