Implement Enigma directory format (#1)

Others changes:
~ Rework File menu
~ Force UTF-8 for all I/O operations
~ Enigma now detect the original file format and use the correct one when you save a mapping

15 files changed, 238 insertions, 109 deletions

diff --git a/src/main/java/cuchaz/enigma/CommandMain.java b/src/main/java/cuchaz/enigma/CommandMain.java
index d7967b46..4e3f4479 100644
--- a/src/main/java/cuchaz/enigma/CommandMain.java
+++ b/src/main/java/cuchaz/enigma/CommandMain.java
@@ -15,7 +15,7 @@ import java.util.jar.JarFile;
 
 import cuchaz.enigma.Deobfuscator.ProgressListener;
 import cuchaz.enigma.mapping.Mappings;
-import cuchaz.enigma.mapping.MappingsReader;
+import cuchaz.enigma.mapping.MappingsJsonReader;
 
 public class CommandMain {
 
@@ -119,7 +119,7 @@ public class CommandMain {
         Deobfuscator deobfuscator = new Deobfuscator(jar);
         if (fileMappings != null) {
             System.out.println("Reading mappings...");
-            Mappings mappings = new MappingsReader().read(fileMappings);
+            Mappings mappings = new MappingsJsonReader().read(fileMappings);
             deobfuscator.setMappings(mappings);
         }
         return deobfuscator;
diff --git a/src/main/java/cuchaz/enigma/Deobfuscator.java b/src/main/java/cuchaz/enigma/Deobfuscator.java
index d22260fb..8cd80bef 100644
--- a/src/main/java/cuchaz/enigma/Deobfuscator.java
+++ b/src/main/java/cuchaz/enigma/Deobfuscator.java
@@ -10,6 +10,7 @@
  ******************************************************************************/
 package cuchaz.enigma;
 
+import com.google.common.base.Charsets;
 import com.google.common.collect.Maps;
 import com.google.common.collect.Sets;
 
@@ -277,7 +278,7 @@ public class Deobfuscator {
                 // write the file
                 File file = new File(dirOut, deobfClassEntry.getName().replace('.', '/') + ".java");
                 file.getParentFile().mkdirs();
-                try (FileWriter out = new FileWriter(file)) {
+                try (OutputStreamWriter out = new OutputStreamWriter(new FileOutputStream(file), Charsets.UTF_8)) {
                     out.write(source);
                 }
             } catch (Throwable t) {
diff --git a/src/main/java/cuchaz/enigma/Main.java b/src/main/java/cuchaz/enigma/Main.java
index d52e390a..0be1d90c 100644
--- a/src/main/java/cuchaz/enigma/Main.java
+++ b/src/main/java/cuchaz/enigma/Main.java
@@ -28,7 +28,7 @@ public class Main {
             gui.getController().openJar(new JarFile(getFile(args[0])));
         }
         if (args.length >= 2) {
-            gui.getController().openMappings(getFile(args[1]));
+            gui.getController().openJsonMappings(getFile(args[1]));
         }
 
         // DEBUG
diff --git a/src/main/java/cuchaz/enigma/bytecode/accessors/ConstInfoAccessor.java b/src/main/java/cuchaz/enigma/bytecode/accessors/ConstInfoAccessor.java
index 0ea2d02b..474a3ef0 100644
--- a/src/main/java/cuchaz/enigma/bytecode/accessors/ConstInfoAccessor.java
+++ b/src/main/java/cuchaz/enigma/bytecode/accessors/ConstInfoAccessor.java
@@ -11,10 +11,13 @@
 package cuchaz.enigma.bytecode.accessors;
 
 import java.io.ByteArrayOutputStream;
+import java.io.FileOutputStream;
+import java.io.OutputStreamWriter;
 import java.io.PrintWriter;
 import java.lang.reflect.Field;
 import java.lang.reflect.Method;
 
+import com.google.common.base.Charsets;
 import cuchaz.enigma.bytecode.InfoType;
 
 public class ConstInfoAccessor {
@@ -56,12 +59,12 @@ public class ConstInfoAccessor {
     public String toString() {
         try {
             ByteArrayOutputStream buf = new ByteArrayOutputStream();
-            PrintWriter out = new PrintWriter(buf);
+            PrintWriter out = new PrintWriter(new OutputStreamWriter(buf, Charsets.UTF_8));
             Method print = this.item.getClass().getMethod("print", PrintWriter.class);
             print.setAccessible(true);
             print.invoke(this.item, out);
             out.close();
-            return buf.toString().replace("\n", "");
+            return buf.toString("UTF-8").replace("\n", "");
         } catch (Exception ex) {
             throw new Error(ex);
         }
diff --git a/src/main/java/cuchaz/enigma/gui/Gui.java b/src/main/java/cuchaz/enigma/gui/Gui.java
index 5b0b599f..22694760 100644
--- a/src/main/java/cuchaz/enigma/gui/Gui.java
+++ b/src/main/java/cuchaz/enigma/gui/Gui.java
@@ -34,6 +34,7 @@ import cuchaz.enigma.analysis.*;
 import cuchaz.enigma.gui.dialog.CrashDialog;
 import cuchaz.enigma.gui.elements.MenuBar;
 import cuchaz.enigma.gui.elements.PopupMenuBar;
+import cuchaz.enigma.gui.filechooser.FileChooserAny;
 import cuchaz.enigma.gui.filechooser.FileChooserFile;
 import cuchaz.enigma.gui.filechooser.FileChooserFolder;
 import cuchaz.enigma.gui.highlight.DeobfuscatedHighlightPainter;
@@ -78,8 +79,8 @@ public class Gui {
     public EntryReference<Entry, Entry> m_reference;
 
     public JFileChooser jarFileChooser;
-    public JFileChooser mappingsFileChooser;
-    public JFileChooser oldMappingsFileChooser;
+    public JFileChooser jsonMappingsFileChooser;
+    public JFileChooser enigmaMappingsFileChooser;
 
     public JFileChooser exportSourceFileChooser;
     public JFileChooser exportJarFileChooser;
@@ -106,10 +107,10 @@ public class Gui {
 
         // init file choosers
         this.jarFileChooser = new FileChooserFile();
-        this.mappingsFileChooser = new FileChooserFolder();
+        this.jsonMappingsFileChooser = new FileChooserFolder();
 
 
-        this.oldMappingsFileChooser = new FileChooserFile();
+        this.enigmaMappingsFileChooser = new FileChooserAny();
         this.exportSourceFileChooser = new FileChooserFolder();
         this.exportJarFileChooser = new FileChooserFile();
 
@@ -315,11 +316,12 @@ public class Gui {
 
         // update menu
         this.menuBar.closeJarMenu.setEnabled(true);
-        this.menuBar.openOldMappingsMenu.setEnabled(true);
-        this.menuBar.openMappingsMenu.setEnabled(true);
+        this.menuBar.openEnigmaMappingsMenu.setEnabled(true);
+        this.menuBar.openMappingsJsonMenu.setEnabled(true);
         this.menuBar.saveMappingsMenu.setEnabled(false);
-        this.menuBar.saveMappingsAsMenu.setEnabled(true);
-        this.menuBar.saveMappingsOldMenu.setEnabled(true);
+        this.menuBar.saveMappingsJsonMenu.setEnabled(true);
+        this.menuBar.saveMappingEnigmaFileMenu.setEnabled(true);
+        this.menuBar.saveMappingEnigmaDirectoryMenu.setEnabled(true);
         this.menuBar.saveMappingsSrgMenu.setEnabled(true);
         this.menuBar.closeMappingsMenu.setEnabled(true);
         this.menuBar.exportSourceMenu.setEnabled(true);
@@ -338,11 +340,12 @@ public class Gui {
 
         // update menu
         this.menuBar.closeJarMenu.setEnabled(false);
-        this.menuBar.openOldMappingsMenu.setEnabled(false);
-        this.menuBar.openMappingsMenu.setEnabled(false);
+        this.menuBar.openEnigmaMappingsMenu.setEnabled(false);
+        this.menuBar.openMappingsJsonMenu.setEnabled(false);
         this.menuBar.saveMappingsMenu.setEnabled(false);
-        this.menuBar.saveMappingsAsMenu.setEnabled(false);
-        this.menuBar.saveMappingsOldMenu.setEnabled(false);
+        this.menuBar.saveMappingsJsonMenu.setEnabled(false);
+        this.menuBar.saveMappingEnigmaFileMenu.setEnabled(false);
+        this.menuBar.saveMappingEnigmaDirectoryMenu.setEnabled(false);
         this.menuBar.saveMappingsSrgMenu.setEnabled(false);
         this.menuBar.closeMappingsMenu.setEnabled(false);
         this.menuBar.exportSourceMenu.setEnabled(false);
@@ -360,7 +363,7 @@ public class Gui {
     }
 
     public void setMappingsFile(File file) {
-        this.mappingsFileChooser.setSelectedFile(file);
+        this.jsonMappingsFileChooser.setSelectedFile(file);
         this.menuBar.saveMappingsMenu.setEnabled(file != null);
     }
 
@@ -721,9 +724,9 @@ public class Gui {
                     JOptionPane.QUESTION_MESSAGE, null, options, options[2]);
             switch (response) {
                 case JOptionPane.YES_OPTION: // save and exit
-                    if (this.mappingsFileChooser.getSelectedFile() != null || this.mappingsFileChooser.showSaveDialog(this.frame) == JFileChooser.APPROVE_OPTION) {
+                    if (this.jsonMappingsFileChooser.getSelectedFile() != null || this.jsonMappingsFileChooser.showSaveDialog(this.frame) == JFileChooser.APPROVE_OPTION) {
                         try {
-                            this.controller.saveMappings(this.mappingsFileChooser.getCurrentDirectory());
+                            this.controller.saveMappings(this.jsonMappingsFileChooser.getCurrentDirectory());
                             this.frame.dispose();
                         } catch (IOException ex) {
                             throw new Error(ex);
diff --git a/src/main/java/cuchaz/enigma/gui/GuiController.java b/src/main/java/cuchaz/enigma/gui/GuiController.java
index fe7d0978..d416345b 100644
--- a/src/main/java/cuchaz/enigma/gui/GuiController.java
+++ b/src/main/java/cuchaz/enigma/gui/GuiController.java
@@ -16,7 +16,6 @@ import com.google.common.collect.Queues;
 import com.strobel.decompiler.languages.java.ast.CompilationUnit;
 
 import java.io.File;
-import java.io.FileReader;
 import java.io.FileWriter;
 import java.io.IOException;
 import java.util.Collection;
@@ -65,18 +64,16 @@ public class GuiController {
         this.gui.onCloseJar();
     }
 
-    public void openOldMappings(File file) throws IOException, MappingParseException {
-        FileReader in = new FileReader(file);
-        this.deobfuscator.setMappings(new MappingsReaderOld().read(in));
-        in.close();
+    public void openEnigmaMappings(File file) throws IOException, MappingParseException {
+        this.deobfuscator.setMappings(new MappingsEnigmaReader().read(file));
         this.isDirty = false;
         this.gui.setMappingsFile(file);
         refreshClasses();
         refreshCurrentClass();
     }
 
-    public void openMappings(File file) throws IOException {
-        this.deobfuscator.setMappings(new MappingsReader().read(file));
+    public void openJsonMappings(File file) throws IOException {
+        this.deobfuscator.setMappings(new MappingsJsonReader().read(file));
         this.isDirty = false;
         this.gui.setMappingsFile(file);
         refreshClasses();
@@ -84,13 +81,29 @@ public class GuiController {
     }
 
     public void saveMappings(File file) throws IOException {
-        new MappingsWriter().write(file, this.deobfuscator.getMappings());
+        Mappings mappings = this.deobfuscator.getMappings();
+        switch (mappings.getOriginMappingFormat())
+        {
+            case SRG_FILE:
+                saveSRGMappings(file);
+                break;
+            case JSON_DIRECTORY:
+                saveJsonMappings(file);
+                break;
+            default:
+                saveEnigmaMappings(file, Mappings.FormatType.ENIGMA_FILE != mappings.getOriginMappingFormat());
+                break;
+        }
+
+    }
+
+    public void saveJsonMappings(File file) throws IOException {
+        new MappingsJsonWriter().write(file, this.deobfuscator.getMappings());
         this.isDirty = false;
     }
 
-    public void saveOldMappings(File file) throws IOException {
-        FileWriter out = new FileWriter(file);
-        new MappingsOldWriter().write(out, this.deobfuscator.getMappings());
+    public void saveEnigmaMappings(File file, boolean isDirectoryFormat) throws IOException {
+        new MappingsEnigmaWriter().write(file, this.deobfuscator.getMappings(), isDirectoryFormat);
         this.isDirty = false;
     }
 
diff --git a/src/main/java/cuchaz/enigma/gui/elements/MenuBar.java b/src/main/java/cuchaz/enigma/gui/elements/MenuBar.java
index e79476bb..e988d74c 100644
--- a/src/main/java/cuchaz/enigma/gui/elements/MenuBar.java
+++ b/src/main/java/cuchaz/enigma/gui/elements/MenuBar.java
@@ -17,12 +17,13 @@ public class MenuBar extends JMenuBar {
 
     public final JMenuItem closeJarMenu;
 
-    public final JMenuItem openMappingsMenu;
-    public final JMenuItem openOldMappingsMenu;
+    public final JMenuItem openMappingsJsonMenu;
+    public final JMenuItem openEnigmaMappingsMenu;
 
     public final JMenuItem saveMappingsMenu;
-    public final JMenuItem saveMappingsAsMenu;
-    public final JMenuItem saveMappingsOldMenu;
+    public final JMenuItem saveMappingsJsonMenu;
+    public final JMenuItem saveMappingEnigmaFileMenu;
+    public final JMenuItem saveMappingEnigmaDirectoryMenu;
     public final JMenuItem saveMappingsSrgMenu;
     public final JMenuItem closeMappingsMenu;
 
@@ -62,43 +63,44 @@ public class MenuBar extends JMenuBar {
                 this.closeJarMenu = item;
             }
             menu.addSeparator();
+            JMenu openMenu = new JMenu("Open Mappings...");
             {
-                JMenuItem item = new JMenuItem("Open Mappings...");
-                menu.add(item);
+                JMenuItem item = new JMenuItem("Enigma");
+                openMenu.add(item);
                 item.addActionListener(event -> {
-                    if (this.gui.mappingsFileChooser.showOpenDialog(this.gui.getFrame()) == JFileChooser.APPROVE_OPTION) {
+                    if (this.gui.enigmaMappingsFileChooser.showOpenDialog(this.gui.getFrame()) == JFileChooser.APPROVE_OPTION) {
                         try {
-                            this.gui.getController().openMappings(this.gui.mappingsFileChooser.getSelectedFile());
+                            this.gui.getController().openEnigmaMappings(this.gui.enigmaMappingsFileChooser.getSelectedFile());
                         } catch (IOException ex) {
                             throw new Error(ex);
+                        } catch (MappingParseException ex) {
+                            JOptionPane.showMessageDialog(this.gui.getFrame(), ex.getMessage());
                         }
                     }
                 });
-                this.openMappingsMenu = item;
+                this.openEnigmaMappingsMenu = item;
             }
+            menu.add(openMenu);
             {
-                JMenuItem item = new JMenuItem("Open Old Mappings...");
-                menu.add(item);
+                JMenuItem item = new JMenuItem("JSON (directory)");
+                openMenu.add(item);
                 item.addActionListener(event -> {
-                    if (this.gui.oldMappingsFileChooser.showOpenDialog(this.gui.getFrame()) == JFileChooser.APPROVE_OPTION) {
+                    if (this.gui.jsonMappingsFileChooser.showOpenDialog(this.gui.getFrame()) == JFileChooser.APPROVE_OPTION) {
                         try {
-                            this.gui.getController().openOldMappings(this.gui.oldMappingsFileChooser.getSelectedFile());
+                            this.gui.getController().openJsonMappings(this.gui.jsonMappingsFileChooser.getSelectedFile());
                         } catch (IOException ex) {
                             throw new Error(ex);
-                        } catch (MappingParseException ex) {
-                            JOptionPane.showMessageDialog(this.gui.getFrame(), ex.getMessage());
                         }
                     }
                 });
-                this.openOldMappingsMenu = item;
+                this.openMappingsJsonMenu = item;
             }
-            menu.addSeparator();
             {
                 JMenuItem item = new JMenuItem("Save Mappings");
                 menu.add(item);
                 item.addActionListener(event -> {
                     try {
-                        this.gui.getController().saveMappings(this.gui.mappingsFileChooser.getSelectedFile());
+                        this.gui.getController().saveMappings(this.gui.jsonMappingsFileChooser.getSelectedFile());
                     } catch (IOException ex) {
                         throw new Error(ex);
                     }
@@ -106,29 +108,29 @@ public class MenuBar extends JMenuBar {
                 item.setAccelerator(KeyStroke.getKeyStroke(KeyEvent.VK_S, InputEvent.CTRL_DOWN_MASK));
                 this.saveMappingsMenu = item;
             }
+            JMenu saveMenu = new JMenu("Save Mappings As...");
             {
-                JMenuItem item = new JMenuItem("Save Mappings As...");
-                menu.add(item);
+                JMenuItem item = new JMenuItem("Enigma (single file)");
+                saveMenu.add(item);
                 item.addActionListener(event -> {
-                    if (this.gui.mappingsFileChooser.showSaveDialog(this.gui.getFrame()) == JFileChooser.APPROVE_OPTION) {
+                    if (this.gui.jsonMappingsFileChooser.showSaveDialog(this.gui.getFrame()) == JFileChooser.APPROVE_OPTION) {
                         try {
-                            this.gui.getController().saveMappings(this.gui.mappingsFileChooser.getSelectedFile());
+                            this.gui.getController().saveEnigmaMappings(this.gui.jsonMappingsFileChooser.getSelectedFile(), false);
                             this.saveMappingsMenu.setEnabled(true);
                         } catch (IOException ex) {
                             throw new Error(ex);
                         }
                     }
                 });
-                item.setAccelerator(KeyStroke.getKeyStroke(KeyEvent.VK_S, InputEvent.CTRL_DOWN_MASK | InputEvent.SHIFT_DOWN_MASK));
-                this.saveMappingsAsMenu = item;
+                this.saveMappingEnigmaFileMenu = item;
             }
             {
-                JMenuItem item = new JMenuItem("Save Mappings as Enigma");
-                menu.add(item);
+                JMenuItem item = new JMenuItem("Enigma (directory)");
+                saveMenu.add(item);
                 item.addActionListener(event -> {
-                    if (this.gui.mappingsFileChooser.showSaveDialog(this.gui.getFrame()) == JFileChooser.APPROVE_OPTION) {
+                    if (this.gui.jsonMappingsFileChooser.showSaveDialog(this.gui.getFrame()) == JFileChooser.APPROVE_OPTION) {
                         try {
-                            this.gui.getController().saveOldMappings(this.gui.mappingsFileChooser.getSelectedFile());
+                            this.gui.getController().saveEnigmaMappings(this.gui.jsonMappingsFileChooser.getSelectedFile(), true);
                             this.saveMappingsMenu.setEnabled(true);
                         } catch (IOException ex) {
                             throw new Error(ex);
@@ -136,22 +138,37 @@ public class MenuBar extends JMenuBar {
                     }
                 });
                 item.setAccelerator(KeyStroke.getKeyStroke(KeyEvent.VK_S, InputEvent.CTRL_DOWN_MASK | InputEvent.SHIFT_DOWN_MASK));
-                this.saveMappingsOldMenu = item;
+                this.saveMappingEnigmaDirectoryMenu = item;
             }
+            menu.add(saveMenu);
             {
-                JMenuItem item = new JMenuItem("Save Mappings as SRG");
-                menu.add(item);
+                JMenuItem item = new JMenuItem("JSON (directory)");
+                saveMenu.add(item);
                 item.addActionListener(event -> {
-                    if (this.gui.mappingsFileChooser.showSaveDialog(this.gui.getFrame()) == JFileChooser.APPROVE_OPTION) {
+                    if (this.gui.jsonMappingsFileChooser.showSaveDialog(this.gui.getFrame()) == JFileChooser.APPROVE_OPTION) {
                         try {
-                            this.gui.getController().saveSRGMappings(this.gui.mappingsFileChooser.getSelectedFile());
+                            this.gui.getController().saveJsonMappings(this.gui.jsonMappingsFileChooser.getSelectedFile());
+                            this.saveMappingsMenu.setEnabled(true);
+                        } catch (IOException ex) {
+                            throw new Error(ex);
+                        }
+                    }
+                });
+                this.saveMappingsJsonMenu = item;
+            }
+            {
+                JMenuItem item = new JMenuItem("SRG");
+                saveMenu.add(item);
+                item.addActionListener(event -> {
+                    if (this.gui.jsonMappingsFileChooser.showSaveDialog(this.gui.getFrame()) == JFileChooser.APPROVE_OPTION) {
+                        try {
+                            this.gui.getController().saveSRGMappings(this.gui.jsonMappingsFileChooser.getSelectedFile());
                             this.saveMappingsMenu.setEnabled(true);
                         } catch (IOException ex) {
                             throw new Error(ex);
                         }
                     }
                 });
-                item.setAccelerator(KeyStroke.getKeyStroke(KeyEvent.VK_S, InputEvent.CTRL_DOWN_MASK | InputEvent.SHIFT_DOWN_MASK));
                 this.saveMappingsSrgMenu = item;
             }
             {
diff --git a/src/main/java/cuchaz/enigma/gui/filechooser/FileChooserAny.java b/src/main/java/cuchaz/enigma/gui/filechooser/FileChooserAny.java
new file mode 100644
index 00000000..23393347
--- /dev/null
+++ b/src/main/java/cuchaz/enigma/gui/filechooser/FileChooserAny.java
@@ -0,0 +1,11 @@
+package cuchaz.enigma.gui.filechooser;
+
+import javax.swing.*;
+
+public class FileChooserAny extends JFileChooser
+{
+    public FileChooserAny() {
+        this.setFileSelectionMode(JFileChooser.FILES_AND_DIRECTORIES);
+        this.setAcceptAllFileFilterUsed(false);
+    }
+}
\ No newline at end of file
diff --git a/src/main/java/cuchaz/enigma/mapping/Mappings.java b/src/main/java/cuchaz/enigma/mapping/Mappings.java
index b51e1a4c..1f4ca02c 100644
--- a/src/main/java/cuchaz/enigma/mapping/Mappings.java
+++ b/src/main/java/cuchaz/enigma/mapping/Mappings.java
@@ -24,8 +24,15 @@ public class Mappings {
 
     protected Map<String, ClassMapping> classesByObf;
     protected Map<String, ClassMapping> classesByDeobf;
+    private final FormatType originMapping;
 
-    public Mappings() {
+    public Mappings()
+    {
+        this(FormatType.ENIGMA_DIRECTORY);
+    }
+
+    public Mappings(FormatType originMapping) {
+        this.originMapping = originMapping;
         this.classesByObf = Maps.newHashMap();
         this.classesByDeobf = Maps.newHashMap();
     }
@@ -145,4 +152,14 @@ public class Mappings {
         }
         return mappingChain;
     }
+
+    public FormatType getOriginMappingFormat()
+    {
+        return originMapping;
+    }
+
+    public enum FormatType
+    {
+        JSON_DIRECTORY, ENIGMA_FILE, ENIGMA_DIRECTORY, SRG_FILE
+    }
 }
diff --git a/src/main/java/cuchaz/enigma/mapping/MappingsReaderOld.java b/src/main/java/cuchaz/enigma/mapping/MappingsEnigmaReader.java
index 776d9083..70f3f184 100644
--- a/src/main/java/cuchaz/enigma/mapping/MappingsReaderOld.java
+++ b/src/main/java/cuchaz/enigma/mapping/MappingsEnigmaReader.java
@@ -1,23 +1,49 @@
 package cuchaz.enigma.mapping;
 
+import com.google.common.base.Charsets;
 import com.google.common.collect.Queues;
+import cuchaz.enigma.throwables.MappingConflict;
+import cuchaz.enigma.throwables.MappingParseException;
 
-import java.io.BufferedReader;
-import java.io.IOException;
-import java.io.Reader;
+import java.io.*;
 import java.util.Deque;
 
-import cuchaz.enigma.throwables.MappingConflict;
-import cuchaz.enigma.throwables.MappingParseException;
+public class MappingsEnigmaReader
+{
 
-public class MappingsReaderOld {
+    public Mappings read(File file) throws IOException, MappingParseException {
+        Mappings mappings;
 
-    public Mappings read(Reader in) throws IOException, MappingParseException {
-        return read(new BufferedReader(in));
+        // Multiple file
+        if (file.isDirectory())
+        {
+            mappings = new Mappings(Mappings.FormatType.ENIGMA_DIRECTORY);
+            readDirectory(mappings, file);
+        }
+        else
+        {
+            mappings = new Mappings();
+            readFile(mappings, new BufferedReader(new InputStreamReader(new FileInputStream(file), Charsets.UTF_8)));
+        }
+        return mappings;
     }
 
-    public Mappings read(BufferedReader in) throws IOException, MappingParseException {
-        Mappings mappings = new Mappings();
+    public void readDirectory(Mappings mappings, File directory) throws IOException, MappingParseException {
+        File[] files = directory.listFiles();
+        if (files != null) {
+            for (File file : files) {
+                if (file.isFile())
+                    readFile(mappings, new BufferedReader(new InputStreamReader(new FileInputStream(file), Charsets.UTF_8)));
+                else if (file.isDirectory())
+                    readDirectory(mappings, file.getAbsoluteFile());
+            }
+        }
+        else
+            throw new IOException("Cannot access directory" + directory.getAbsolutePath());
+    }
+
+    public Mappings readFile(Mappings mappings, BufferedReader in) throws IOException, MappingParseException {
+
         Deque<Object> mappingStack = Queues.newArrayDeque();
 
         int lineNumber = 0;
@@ -96,7 +122,7 @@ public class MappingsReaderOld {
                 e.printStackTrace();
             }
         }
-
+        in.close();
         return mappings;
     }
 
diff --git a/src/main/java/cuchaz/enigma/mapping/MappingsOldWriter.java b/src/main/java/cuchaz/enigma/mapping/MappingsEnigmaWriter.java
index 8b766a31..a3b0616e 100644
--- a/src/main/java/cuchaz/enigma/mapping/MappingsOldWriter.java
+++ b/src/main/java/cuchaz/enigma/mapping/MappingsEnigmaWriter.java
@@ -10,17 +10,66 @@
  ******************************************************************************/
 package cuchaz.enigma.mapping;
 
-import java.io.IOException;
-import java.io.PrintWriter;
-import java.io.Writer;
+import com.google.common.base.Charsets;
+
+import java.io.*;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
 
-public class MappingsOldWriter {
+public class MappingsEnigmaWriter {
         
-        public void write(Writer out, Mappings mappings) throws IOException {
-                write(new PrintWriter(out), mappings);
+        public void write(File out, Mappings mappings, boolean isDirectoryFormat) throws IOException {
+                if (!isDirectoryFormat)
+                {
+                        PrintWriter outputWriter = new PrintWriter(new OutputStreamWriter(new FileOutputStream(out), Charsets.UTF_8));
+                        write(outputWriter, mappings);
+                        outputWriter.close();
+                }
+                else
+                        writeAsDirectory(out, mappings);
+        }
+
+        public void writeAsDirectory(File target, Mappings mappings) throws IOException {
+                if (!target.exists() && !target.mkdirs())
+                        throw  new IOException("Cannot create mapping directory!");
+
+                for (ClassMapping classMapping : sorted(mappings.classes())) {
+                        File obFile = new File(target, classMapping.getObfFullName() + ".mapping");
+                        File result;
+                        if (classMapping.getDeobfName() == null)
+                                result = obFile;
+                        else
+                        {
+                                // Make sure that old version of the file doesn't exist
+                                if (obFile.exists())
+                                        obFile.delete();
+                                result = new File(target, classMapping.getDeobfName() + ".mapping");
+                        }
+
+                        if (!result.getParentFile().exists())
+                                result.getParentFile().mkdirs();
+                        result.createNewFile();
+                        PrintWriter outputWriter = new PrintWriter(new OutputStreamWriter(new FileOutputStream(result), Charsets.UTF_8));
+                        write(outputWriter, classMapping, 0);
+                        outputWriter.close();
+                }
+
+                // Remove empty directories
+                File[] fileList = target.listFiles();
+                if (fileList != null)
+                {
+                        for (File file : fileList)
+                        {
+                                if (file.isDirectory())
+                                {
+                                        File[] childFiles = file.listFiles();
+                                        if (childFiles != null && childFiles.length == 0)
+                                                file.delete();
+                                }
+                        }
+                }
+
         }
         
         public void write(PrintWriter out, Mappings mappings) throws IOException {
diff --git a/src/main/java/cuchaz/enigma/mapping/MappingsReader.java b/src/main/java/cuchaz/enigma/mapping/MappingsJsonReader.java
index b2b6d09c..8f5bde33 100644
--- a/src/main/java/cuchaz/enigma/mapping/MappingsReader.java
+++ b/src/main/java/cuchaz/enigma/mapping/MappingsJsonReader.java
@@ -10,22 +10,20 @@
  ******************************************************************************/
 package cuchaz.enigma.mapping;
 
+import com.google.common.base.Charsets;
 import com.google.common.io.Files;
 import com.google.gson.Gson;
 import com.google.gson.GsonBuilder;
 
-import java.io.BufferedReader;
-import java.io.File;
-import java.io.FileReader;
-import java.io.IOException;
+import java.io.*;
 
 import cuchaz.enigma.json.JsonClass;
 import cuchaz.enigma.throwables.MappingConflict;
 
-public class MappingsReader {
+public class MappingsJsonReader {
 
     public Mappings read(File in) throws IOException {
-        Mappings mappings = new Mappings();
+        Mappings mappings = new Mappings(Mappings.FormatType.JSON_DIRECTORY);
         readDirectory(mappings, in);
         return mappings;
     }
@@ -35,7 +33,8 @@ public class MappingsReader {
         if (fList != null) {
             for (File file : fList) {
                 if (file.isFile() && Files.getFileExtension(file.getName()).equalsIgnoreCase("json")) {
-                    readFile(mappings, new BufferedReader(new FileReader(file)));
+                    readFile(mappings, new BufferedReader(new InputStreamReader(new FileInputStream(file),
+                            Charsets.UTF_8)));
                 } else if (file.isDirectory()) {
                     readDirectory(mappings, file.getAbsoluteFile());
                 }
diff --git a/src/main/java/cuchaz/enigma/mapping/MappingsWriter.java b/src/main/java/cuchaz/enigma/mapping/MappingsJsonWriter.java
index 47931662..db95322b 100644
--- a/src/main/java/cuchaz/enigma/mapping/MappingsWriter.java
+++ b/src/main/java/cuchaz/enigma/mapping/MappingsJsonWriter.java
@@ -10,19 +10,18 @@
  ******************************************************************************/
 package cuchaz.enigma.mapping;
 
+import com.google.common.base.Charsets;
 import com.google.gson.Gson;
 import com.google.gson.GsonBuilder;
 
-import java.io.File;
-import java.io.FileWriter;
-import java.io.IOException;
+import java.io.*;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
 
 import cuchaz.enigma.json.*;
 
-public class MappingsWriter {
+public class MappingsJsonWriter {
 
     public void write(File file, Mappings mappings) throws IOException {
         if (!file.isDirectory()) {
@@ -44,7 +43,7 @@ public class MappingsWriter {
                 File f = new File(file, jsonClass.getName() + ".json");
                 f.getParentFile().mkdirs();
                 f.createNewFile();
-                FileWriter writer = new FileWriter(f);
+                PrintWriter writer = new PrintWriter(new OutputStreamWriter(new FileOutputStream(f), Charsets.UTF_8));
                 writer.write(gson.toJson(jsonClass));
                 writer.close();
             }
diff --git a/src/main/java/cuchaz/enigma/mapping/MappingsSRGWriter.java b/src/main/java/cuchaz/enigma/mapping/MappingsSRGWriter.java
index 64da7091..a05b9158 100644
--- a/src/main/java/cuchaz/enigma/mapping/MappingsSRGWriter.java
+++ b/src/main/java/cuchaz/enigma/mapping/MappingsSRGWriter.java
@@ -1,10 +1,9 @@
 package cuchaz.enigma.mapping;
 
+import com.google.common.base.Charsets;
 import cuchaz.enigma.Deobfuscator;
 
-import java.io.File;
-import java.io.FileWriter;
-import java.io.IOException;
+import java.io.*;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
@@ -22,7 +21,7 @@ public class MappingsSRGWriter {
 
         Mappings mappings = deobfuscator.getMappings();
 
-        FileWriter writer = new FileWriter(file);
+        PrintWriter writer = new PrintWriter(new OutputStreamWriter(new FileOutputStream(file), Charsets.UTF_8));
         List<String> fieldMappings = new ArrayList<>();
         List<String> methodMappings = new ArrayList<>();
         for (ClassMapping classMapping : sorted(mappings.classes())) {
diff --git a/src/test/java/cuchaz/enigma/TestTranslator.java b/src/test/java/cuchaz/enigma/TestTranslator.java
index dcdced01..dddfb704 100644
--- a/src/test/java/cuchaz/enigma/TestTranslator.java
+++ b/src/test/java/cuchaz/enigma/TestTranslator.java
@@ -11,20 +11,12 @@
 package cuchaz.enigma;
 
 import static cuchaz.enigma.TestEntryFactory.*;
-import static org.hamcrest.MatcherAssert.*;
-import static org.hamcrest.Matchers.*;
-
-import java.io.InputStream;
-import java.io.InputStreamReader;
-import java.util.jar.JarFile;
 
 import org.junit.BeforeClass;
 import org.junit.Test;
 
 import cuchaz.enigma.mapping.Entry;
 import cuchaz.enigma.mapping.Mappings;
-import cuchaz.enigma.mapping.MappingsReader;
-import cuchaz.enigma.mapping.TranslationDirection;
 import cuchaz.enigma.mapping.Translator;
 
 
@@ -41,7 +33,7 @@ public class TestTranslator {
                 //TODO FIx
                 //m_deobfuscator = new Deobfuscator(new JarFile("build/test-obf/translation.jar"));
                 //try (InputStream in = TestTranslator.class.getResourceAsStream("/cuchaz/enigma/resources/translation.mappings")) {
-                //      m_mappings = new MappingsReader().read(new InputStreamReader(in));
+                //      m_mappings = new MappingsJsonReader().read(new InputStreamReader(in));
                 //      m_deobfuscator.setMappings(m_mappings);
                 //      m_deobfTranslator = m_deobfuscator.getTranslator(TranslationDirection.Deobfuscating);
                 //      m_obfTranslator = m_deobfuscator.getTranslator(TranslationDirection.Obfuscating);