Make sure to use UTF-8 in any case for I/O, change "Mark as deobfuscated" key and clean up

3 files changed, 24 insertions, 27 deletions

diff --git a/src/main/java/cuchaz/enigma/convert/ClassIdentity.java b/src/main/java/cuchaz/enigma/convert/ClassIdentity.java
index 57cbc06..0960c86 100644
--- a/src/main/java/cuchaz/enigma/convert/ClassIdentity.java
+++ b/src/main/java/cuchaz/enigma/convert/ClassIdentity.java
@@ -273,20 +273,20 @@ public class ClassIdentity {
                 // update the hash with the opcode
                 int opcode = iter.byteAt(pos);
                 digest.update((byte) opcode);
-
+                int constIndex;
                 switch (opcode) {
-                    case Opcode.LDC: {
-                        int constIndex = iter.byteAt(pos + 1);
+                    case Opcode.LDC:
+                        constIndex = iter.byteAt(pos + 1);
                         updateHashWithConstant(digest, constants, constIndex);
-                    }
-                    break;
+                        break;
 
                     case Opcode.LDC_W:
-                    case Opcode.LDC2_W: {
-                        int constIndex = (iter.byteAt(pos + 1) << 8) | iter.byteAt(pos + 2);
+                    case Opcode.LDC2_W:
+                        constIndex = (iter.byteAt(pos + 1) << 8) | iter.byteAt(pos + 2);
                         updateHashWithConstant(digest, constants, constIndex);
-                    }
-                    break;
+                        break;
+                    default:
+                        break;
                 }
             }
 
diff --git a/src/main/java/cuchaz/enigma/convert/MatchesReader.java b/src/main/java/cuchaz/enigma/convert/MatchesReader.java
index ee5e482..550da49 100644
--- a/src/main/java/cuchaz/enigma/convert/MatchesReader.java
+++ b/src/main/java/cuchaz/enigma/convert/MatchesReader.java
@@ -12,10 +12,8 @@ package cuchaz.enigma.convert;
 
 import com.google.common.collect.Lists;
 
-import java.io.BufferedReader;
-import java.io.File;
-import java.io.FileReader;
-import java.io.IOException;
+import java.io.*;
+import java.nio.charset.Charset;
 import java.util.Collection;
 import java.util.List;
 
@@ -26,7 +24,7 @@ public class MatchesReader {
 
     public static ClassMatches readClasses(File file)
             throws IOException {
-        try (BufferedReader in = new BufferedReader(new FileReader(file))) {
+        try (BufferedReader in = new BufferedReader(new InputStreamReader(new FileInputStream(file), Charset.forName("UTF-8")))) {
             ClassMatches matches = new ClassMatches();
             String line;
             while ((line = in.readLine()) != null) {
@@ -55,7 +53,7 @@ public class MatchesReader {
 
     public static <T extends Entry> MemberMatches<T> readMembers(File file)
             throws IOException {
-        try (BufferedReader in = new BufferedReader(new FileReader(file))) {
+        try (BufferedReader in = new BufferedReader(new InputStreamReader(new FileInputStream(file), Charset.forName("UTF-8")))) {
             MemberMatches<T> matches = new MemberMatches<T>();
             String line;
             while ((line = in.readLine()) != null) {
diff --git a/src/main/java/cuchaz/enigma/convert/MatchesWriter.java b/src/main/java/cuchaz/enigma/convert/MatchesWriter.java
index baf7929..dccbf6f 100644
--- a/src/main/java/cuchaz/enigma/convert/MatchesWriter.java
+++ b/src/main/java/cuchaz/enigma/convert/MatchesWriter.java
@@ -10,9 +10,8 @@
  ******************************************************************************/
 package cuchaz.enigma.convert;
 
-import java.io.File;
-import java.io.FileWriter;
-import java.io.IOException;
+import java.io.*;
+import java.nio.charset.Charset;
 import java.util.Map;
 
 import cuchaz.enigma.mapping.BehaviorEntry;
@@ -25,14 +24,14 @@ public class MatchesWriter {
 
     public static void writeClasses(ClassMatches matches, File file)
             throws IOException {
-        try (FileWriter out = new FileWriter(file)) {
+        try (OutputStreamWriter out = new OutputStreamWriter(new FileOutputStream(file), Charset.forName("UTF-8"))) {
             for (ClassMatch match : matches) {
                 writeClassMatch(out, match);
             }
         }
     }
 
-    private static void writeClassMatch(FileWriter out, ClassMatch match)
+    private static void writeClassMatch(OutputStreamWriter out, ClassMatch match)
             throws IOException {
         writeClasses(out, match.sourceClasses);
         out.write(":");
@@ -40,7 +39,7 @@ public class MatchesWriter {
         out.write("\n");
     }
 
-    private static void writeClasses(FileWriter out, Iterable<ClassEntry> classes)
+    private static void writeClasses(OutputStreamWriter out, Iterable<ClassEntry> classes)
             throws IOException {
         boolean isFirst = true;
         for (ClassEntry entry : classes) {
@@ -55,7 +54,7 @@ public class MatchesWriter {
 
     public static <T extends Entry> void writeMembers(MemberMatches<T> matches, File file)
             throws IOException {
-        try (FileWriter out = new FileWriter(file)) {
+        try (OutputStreamWriter out = new OutputStreamWriter(new FileOutputStream(file), Charset.forName("UTF-8"))) {
             for (Map.Entry<T, T> match : matches.matches().entrySet()) {
                 writeMemberMatch(out, match.getKey(), match.getValue());
             }
@@ -71,7 +70,7 @@ public class MatchesWriter {
         }
     }
 
-    private static <T extends Entry> void writeMemberMatch(FileWriter out, T source, T dest)
+    private static <T extends Entry> void writeMemberMatch(OutputStreamWriter out, T source, T dest)
             throws IOException {
         if (source != null) {
             writeEntry(out, source);
@@ -83,14 +82,14 @@ public class MatchesWriter {
         out.write("\n");
     }
 
-    private static <T extends Entry> void writeUnmatchableEntry(FileWriter out, T entry)
+    private static <T extends Entry> void writeUnmatchableEntry(OutputStreamWriter out, T entry)
             throws IOException {
         out.write("!");
         writeEntry(out, entry);
         out.write("\n");
     }
 
-    private static <T extends Entry> void writeEntry(FileWriter out, T entry)
+    private static <T extends Entry> void writeEntry(OutputStreamWriter out, T entry)
             throws IOException {
         if (entry instanceof FieldEntry) {
             writeField(out, (FieldEntry) entry);
@@ -99,7 +98,7 @@ public class MatchesWriter {
         }
     }
 
-    private static void writeField(FileWriter out, FieldEntry fieldEntry)
+    private static void writeField(OutputStreamWriter out, FieldEntry fieldEntry)
             throws IOException {
         out.write(fieldEntry.getClassName());
         out.write(" ");
@@ -108,7 +107,7 @@ public class MatchesWriter {
         out.write(fieldEntry.getType().toString());
     }
 
-    private static void writeBehavior(FileWriter out, BehaviorEntry behaviorEntry)
+    private static void writeBehavior(OutputStreamWriter out, BehaviorEntry behaviorEntry)
             throws IOException {
         out.write(behaviorEntry.getClassName());
         out.write(" ");