Merge branch 'hotfix-1.1.1'

LapisBlue · Feb 9, 2018 · 8cc0eea · 8cc0eea
2 parents 21a6694 + 85c3a68
commit 8cc0eea
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 5 deletions.
diff --git a/.gitignore b/.gitignore
@@ -261,6 +261,7 @@ gradle-app.setting
 !test.jar
 
 #################
-## Git submodules
+## Nocturne
 #################
 FernFlower/
+run/
diff --git a/build.gradle b/build.gradle
@@ -16,7 +16,7 @@ defaultTasks 'clean', 'licenseFormat', 'build'
 // Project information
 allprojects {
     group = 'blue.lapis.nocturne'
-    version = '1.1.0'
+    version = '1.1.1'
 
     sourceCompatibility = '1.8'
     targetCompatibility = '1.8'

diff --git a/src/main/java/blue/lapis/nocturne/gui/io/mappings/MappingsOpenDialogHelper.java b/src/main/java/blue/lapis/nocturne/gui/io/mappings/MappingsOpenDialogHelper.java
@@ -30,8 +30,8 @@
 import blue.lapis.nocturne.mapping.MappingContext;
 import blue.lapis.nocturne.mapping.io.reader.MappingReaderType;
 import blue.lapis.nocturne.mapping.io.reader.MappingsReader;
+import blue.lapis.nocturne.mapping.io.writer.MappingWriterType;
 import blue.lapis.nocturne.util.helper.PropertiesHelper;
-
 import javafx.stage.FileChooser;
 
 import java.io.BufferedReader;
@@ -90,6 +90,7 @@ public static void openMappings(boolean merge) throws IOException {
         }
 
         Main.setCurrentMappingsPath(selectedPath);
+        Main.setCurrentWriterType(MappingWriterType.fromFormatType(type.getFormatType()));
     }
 
 }
diff --git a/src/main/java/blue/lapis/nocturne/mapping/io/reader/MappingReaderType.java b/src/main/java/blue/lapis/nocturne/mapping/io/reader/MappingReaderType.java
@@ -45,10 +45,12 @@ public enum MappingReaderType {
 
     private final MappingFormatType type;
 
-    public static final Map<FileChooser.ExtensionFilter, MappingReaderType> filterToType = Maps.newHashMap();
+    private static final Map<FileChooser.ExtensionFilter, MappingReaderType> filterToType = Maps.newHashMap();
+    private static final Map<MappingFormatType, MappingReaderType> formatToType = Maps.newHashMap();
 
     static {
         Arrays.asList(values()).forEach(t -> filterToType.put(t.getExtensionFilter(), t));
+        Arrays.asList(values()).forEach(t -> formatToType.put(t.getFormatType(), t));
     }
 
     private final FileChooser.ExtensionFilter extensionFilter;
@@ -86,4 +88,8 @@ public MappingsReader constructReader(BufferedReader reader) {
     public static MappingReaderType fromExtensionFilter(FileChooser.ExtensionFilter filter) {
         return filterToType.get(filter);
     }
+
+    public static MappingReaderType fromFormatType(final MappingFormatType formatType) {
+        return formatToType.get(formatType);
+    }
 }
diff --git a/src/main/java/blue/lapis/nocturne/mapping/io/writer/MappingWriterType.java b/src/main/java/blue/lapis/nocturne/mapping/io/writer/MappingWriterType.java
@@ -27,7 +27,6 @@
 
 import blue.lapis.nocturne.Main;
 import blue.lapis.nocturne.mapping.io.MappingFormatType;
-
 import com.google.common.collect.Maps;
 import javafx.stage.FileChooser;
 
@@ -46,9 +45,11 @@ public enum MappingWriterType {
     private final MappingFormatType type;
 
     private static final Map<FileChooser.ExtensionFilter, MappingWriterType> filterToType = Maps.newHashMap();
+    private static final Map<MappingFormatType, MappingWriterType> formatToType = Maps.newHashMap();
 
     static {
         Arrays.asList(values()).forEach(t -> filterToType.put(t.getExtensionFilter(), t));
+        Arrays.asList(values()).forEach(t -> formatToType.put(t.getFormatType(), t));
     }
 
     private final FileChooser.ExtensionFilter extensionFilter;
@@ -86,4 +87,8 @@ public MappingsWriter constructWriter(PrintWriter writer) {
     public static MappingWriterType fromExtensionFilter(FileChooser.ExtensionFilter filter) {
         return filterToType.get(filter);
     }
+
+    public static MappingWriterType fromFormatType(final MappingFormatType formatType) {
+        return formatToType.get(formatType);
+    }
 }