Fix anonymous class generation

3 files changed, 6 insertions, 4 deletions

diff --git a/src/main/java/cuchaz/enigma/Deobfuscator.java b/src/main/java/cuchaz/enigma/Deobfuscator.java
index cb03d45b..cf5d0617 100644
--- a/src/main/java/cuchaz/enigma/Deobfuscator.java
+++ b/src/main/java/cuchaz/enigma/Deobfuscator.java
@@ -284,7 +284,7 @@ public class Deobfuscator {
                                 // write the file
                                 File file = new File(dirOut, deobfClassEntry.getName().replace('.', '/') + ".java");
                                 file.getParentFile().mkdirs();
-                                try (OutputStreamWriter out = new OutputStreamWriter(new FileOutputStream(file), Charsets.UTF_8)) {
+                                try (OutputStreamWriter out = new OutputStreamWriter(new BufferedOutputStream(new FileOutputStream(file)), Charsets.UTF_8)) {
                                         out.write(source);
                                 }
                         } catch (Throwable t) {
diff --git a/src/main/java/cuchaz/enigma/bytecode/translators/TranslationClassVisitor.java b/src/main/java/cuchaz/enigma/bytecode/translators/TranslationClassVisitor.java
index 25d523fc..b0d17b3e 100644
--- a/src/main/java/cuchaz/enigma/bytecode/translators/TranslationClassVisitor.java
+++ b/src/main/java/cuchaz/enigma/bytecode/translators/TranslationClassVisitor.java
@@ -80,7 +80,11 @@ public class TranslationClassVisitor extends ClassVisitor {
                 String childName = translatedName.substring(separatorIndex + 1);
 
                 ClassEntry outerEntry = translator.getTranslatedClass(entryPool.getClass(parentName));
-                super.visitInnerClass(translatedName, outerEntry.getName(), childName, translatedEntry.getAccess().getFlags());
+
+                // Anonymous classes do not specify an outer or inner name. As we do not translate from the given parameter, ignore if the input is null
+                String translatedOuterName = outerName != null ? outerEntry.getName() : null;
+                String translatedInnerName = innerName != null ? childName : null;
+                super.visitInnerClass(translatedName, translatedOuterName, translatedInnerName, translatedEntry.getAccess().getFlags());
         }
 
         @Override
diff --git a/src/main/java/cuchaz/enigma/bytecode/translators/TranslationMethodVisitor.java b/src/main/java/cuchaz/enigma/bytecode/translators/TranslationMethodVisitor.java
index 09c106d2..f3f7c486 100644
--- a/src/main/java/cuchaz/enigma/bytecode/translators/TranslationMethodVisitor.java
+++ b/src/main/java/cuchaz/enigma/bytecode/translators/TranslationMethodVisitor.java
@@ -108,8 +108,6 @@ public class TranslationMethodVisitor extends MethodVisitor {
                                         nameBuilder.append(nameIndex);
                                 }
                                 translatedName = nameBuilder.toString();
-                        } else {
-                                System.out.println();
                         }
 
                         super.visitLocalVariable(translatedName, translatedEntry.getDesc().toString(), translatedSignature, start, end, index);