MappingsReader will convert old classnames in the default package to the "default" package

1 files changed, 14 insertions, 1 deletions

diff --git a/src/cuchaz/enigma/mapping/MappingsReader.java b/src/cuchaz/enigma/mapping/MappingsReader.java
index 4cebb3a..d64bcaa 100644
--- a/src/cuchaz/enigma/mapping/MappingsReader.java
+++ b/src/cuchaz/enigma/mapping/MappingsReader.java
@@ -150,9 +150,22 @@ public class MappingsReader
 
         private ClassMapping readClass( Scanner scanner )
         {
-                return new ClassMapping( scanner.next(), scanner.next() );
+                return new ClassMapping(
+                        moveOutOfDefaultPackage( scanner.next(), "default" ),
+                        moveOutOfDefaultPackage( scanner.next(), "default" )
+                );
         }
         
+        private String moveOutOfDefaultPackage( String className, String newPackageName )
+        {
+                ClassEntry classEntry = new ClassEntry( className );
+                if( classEntry.isInDefaultPackage() )
+                {
+                        return newPackageName + "/" + classEntry.getName();
+                }
+                return className;
+        }
+
         private FieldMapping readField( Scanner scanner )
         {
                 return new FieldMapping( scanner.next(), scanner.next() );