From 7c04d2753e21b3b9b7dea53a7511494e8a2804aa Mon Sep 17 00:00:00 2001 From: jeff Date: Sun, 24 Aug 2014 00:08:37 -0400 Subject: duh! We can't put classes in a package called "default" "default" is a java reserved word use "none" instead --- src/cuchaz/enigma/Constants.java | 1 + src/cuchaz/enigma/Deobfuscator.java | 6 +++--- src/cuchaz/enigma/Main.java | 2 +- src/cuchaz/enigma/TranslatingTypeLoader.java | 8 ++++---- src/cuchaz/enigma/analysis/JarIndex.java | 7 ++++--- src/cuchaz/enigma/mapping/MappingsReader.java | 5 +++-- 6 files changed, 16 insertions(+), 13 deletions(-) (limited to 'src/cuchaz') diff --git a/src/cuchaz/enigma/Constants.java b/src/cuchaz/enigma/Constants.java index 7ae778dd..1aa9e146 100644 --- a/src/cuchaz/enigma/Constants.java +++ b/src/cuchaz/enigma/Constants.java @@ -18,4 +18,5 @@ public class Constants public static final String Url = "http://www.cuchazinteractive.com/enigma"; public static final int MiB = 1024*1024; // 1 mebibyte public static final int KiB = 1024; // 1 kebibyte + public static final String NonePackage = "none"; } diff --git a/src/cuchaz/enigma/Deobfuscator.java b/src/cuchaz/enigma/Deobfuscator.java index ee414fa2..cfd28429 100644 --- a/src/cuchaz/enigma/Deobfuscator.java +++ b/src/cuchaz/enigma/Deobfuscator.java @@ -135,9 +135,9 @@ public class Deobfuscator // if the class has a mapping, clearly it's deobfuscated deobfClasses.add( deobfClassEntry.getName() ); } - else if( !obfClassEntry.getPackageName().equals( "default" ) ) + else if( !obfClassEntry.getPackageName().equals( Constants.NonePackage ) ) { - // also call it deobufscated if it's not in the "default" package + // also call it deobufscated if it's not in the none package deobfClasses.add( obfClassEntry.getName() ); } else @@ -213,7 +213,7 @@ public class Deobfuscator for( ClassEntry obfClassEntry : m_jarIndex.getObfClassEntries() ) { // skip inner classes - if( obfClassEntry.isInnerClass() ) + if( m_jarIndex.getOuterClass( obfClassEntry.getName() ) != null ) { continue; } diff --git a/src/cuchaz/enigma/Main.java b/src/cuchaz/enigma/Main.java index 7d38bd62..c1547193 100644 --- a/src/cuchaz/enigma/Main.java +++ b/src/cuchaz/enigma/Main.java @@ -32,7 +32,7 @@ public class Main } // DEBUG - //gui.getController().openEntry( new ClassEntry( "bah$bag" ) ); // bah,bag + //gui.getController().openDeclaration( new ClassEntry( "none/aay" ) ); } private static File getFile( String path ) diff --git a/src/cuchaz/enigma/TranslatingTypeLoader.java b/src/cuchaz/enigma/TranslatingTypeLoader.java index e7e941a9..162858de 100644 --- a/src/cuchaz/enigma/TranslatingTypeLoader.java +++ b/src/cuchaz/enigma/TranslatingTypeLoader.java @@ -115,9 +115,9 @@ public class TranslatingTypeLoader implements ITypeLoader // use just the inner class simple name for inner classes classFileName = obfClassEntry.getInnerClassName(); } - else if( obfClassEntry.getPackageName().equals( "default" ) ) + else if( obfClassEntry.getPackageName().equals( Constants.NonePackage ) ) { - // use the outer class simple name for classes in the "default" package + // use the outer class simple name for classes in the none package classFileName = obfClassEntry.getSimpleName(); } else @@ -156,9 +156,9 @@ public class TranslatingTypeLoader implements ITypeLoader classPool.insertClassPath( new ByteArrayClassPath( javaClassFileName, buf ) ); CtClass c = classPool.get( javaClassFileName ); - // we moved a lot of classes out of the default package into the "default" package + // we moved a lot of classes out of the default package into the none package // make sure all the class references are consistent - ClassRenamer.moveAllClassesOutOfDefaultPackage( c, "default" ); + ClassRenamer.moveAllClassesOutOfDefaultPackage( c, Constants.NonePackage ); // reconstruct inner classes new InnerClassWriter( m_jarIndex ).write( c ); diff --git a/src/cuchaz/enigma/analysis/JarIndex.java b/src/cuchaz/enigma/analysis/JarIndex.java index cdaca372..2c4dec48 100644 --- a/src/cuchaz/enigma/analysis/JarIndex.java +++ b/src/cuchaz/enigma/analysis/JarIndex.java @@ -39,6 +39,7 @@ import com.google.common.collect.Maps; import com.google.common.collect.Multimap; import com.google.common.collect.Sets; +import cuchaz.enigma.Constants; import cuchaz.enigma.bytecode.ClassRenamer; import cuchaz.enigma.mapping.ArgumentEntry; import cuchaz.enigma.mapping.BehaviorEntry; @@ -80,7 +81,7 @@ public class JarIndex if( classEntry.isInDefaultPackage() ) { // move out of default package - classEntry = new ClassEntry( "default/" + classEntry.getName() ); + classEntry = new ClassEntry( Constants.NonePackage + "/" + classEntry.getName() ); } m_obfClassEntries.add( classEntry ); } @@ -138,8 +139,8 @@ public class JarIndex if( classEntry.isInDefaultPackage() ) { // move class out of default package - classEntry = new ClassEntry( "default/" + classEntry.getName() ); - ClassRenamer.moveAllClassesOutOfDefaultPackage( c, "default" ); + classEntry = new ClassEntry( Constants.NonePackage + "/" + classEntry.getName() ); + ClassRenamer.moveAllClassesOutOfDefaultPackage( c, Constants.NonePackage ); } } diff --git a/src/cuchaz/enigma/mapping/MappingsReader.java b/src/cuchaz/enigma/mapping/MappingsReader.java index d64bcaae..5570721f 100644 --- a/src/cuchaz/enigma/mapping/MappingsReader.java +++ b/src/cuchaz/enigma/mapping/MappingsReader.java @@ -19,6 +19,7 @@ import java.util.Scanner; import com.google.common.collect.Queues; +import cuchaz.enigma.Constants; import cuchaz.enigma.Util; public class MappingsReader @@ -151,8 +152,8 @@ public class MappingsReader private ClassMapping readClass( Scanner scanner ) { return new ClassMapping( - moveOutOfDefaultPackage( scanner.next(), "default" ), - moveOutOfDefaultPackage( scanner.next(), "default" ) + moveOutOfDefaultPackage( scanner.next(), Constants.NonePackage ), + moveOutOfDefaultPackage( scanner.next(), Constants.NonePackage ) ); } -- cgit v1.2.3