More small tweaks

3 files changed, 13 insertions, 4 deletions

diff --git a/src/main/java/net/sowgro/npehero/editor/DiffEditor.java b/src/main/java/net/sowgro/npehero/editor/DiffEditor.java
index 8f2df76..c08350d 100755
--- a/src/main/java/net/sowgro/npehero/editor/DiffEditor.java
+++ b/src/main/java/net/sowgro/npehero/editor/DiffEditor.java
@@ -66,7 +66,7 @@ public class DiffEditor extends Page
                 Driver.setMenu(new LevelSurround(diff, this));
             }
             else {
-                Driver.setMenu(new ErrorDisplay("This Level is not valid!\nCheck that all required fields\nare populated.", this));
+                Driver.setMenu(new ErrorDisplay("This Level is not valid!\nCheck that all required fields are populated.", this));
             }
         });
 
diff --git a/src/main/java/net/sowgro/npehero/main/Control.java b/src/main/java/net/sowgro/npehero/main/Control.java
index df6e3ef..0051090 100644
--- a/src/main/java/net/sowgro/npehero/main/Control.java
+++ b/src/main/java/net/sowgro/npehero/main/Control.java
@@ -45,7 +45,7 @@ public enum Control {
     };
 
     private static final File file = new File(Driver.BASE_DIR, "controls.json");
-    private static final Gson json = new GsonBuilder().serializeNulls().setPrettyPrinting().create();
+    private static final Gson jsonParser = new GsonBuilder().serializeNulls().setPrettyPrinting().create();
 
     public static void writeToFile() throws IOException {
         Map<String, Object> data = new HashMap<>();
@@ -53,13 +53,19 @@ public enum Control {
             data.put(control.toString(), control.getKey().toString());
         }
         FileWriter fileWriter = new FileWriter(file);
-        json.toJson(data, fileWriter);
+        jsonParser.toJson(data, fileWriter);
         fileWriter.close();
     }
 
     public static void readFromFile() throws Exception {
+        if (!file.exists()) {
+            return;
+        }
         @SuppressWarnings("unchecked")
-        Map<String, Object> data = json.fromJson(new FileReader(file), Map.class);
+        Map<String, Object> data = jsonParser.fromJson(new FileReader(file), Map.class);
+        if (data == null) {
+            data = new HashMap<>();
+        }
         for (Control control : Control.values()) {
             if (data.containsKey(control.toString())) {
                 control.setKey(KeyCode.valueOf((String) data.getOrDefault(control.toString(), null)));
diff --git a/src/main/java/net/sowgro/npehero/main/Settings.java b/src/main/java/net/sowgro/npehero/main/Settings.java
index cee7680..6cd1888 100755
--- a/src/main/java/net/sowgro/npehero/main/Settings.java
+++ b/src/main/java/net/sowgro/npehero/main/Settings.java
@@ -29,6 +29,9 @@ public class Settings
 	public static void read() throws Exception {
 		@SuppressWarnings("unchecked")
 		Map<String, Object> data = jsonParser.fromJson(new FileReader(jsonFile), Map.class);
+		if (data == null) {
+			data = new HashMap<>();
+		}
         effectsVol.set((Double) data.getOrDefault("effectsVol", 1.0));
 		musicVol.set((Double) data.getOrDefault("musicVol", 1.0));
 		enableMenuMusic.set((Boolean) data.getOrDefault("enableMenuMusic", true));