Improve GameOver and other fixes

3 files changed, 17 insertions, 11 deletions

diff --git a/src/main/java/net/sowgro/npehero/levelapi/Difficulty.java b/src/main/java/net/sowgro/npehero/levelapi/Difficulty.java
index 27f025a..94517cf 100755
--- a/src/main/java/net/sowgro/npehero/levelapi/Difficulty.java
+++ b/src/main/java/net/sowgro/npehero/levelapi/Difficulty.java
@@ -53,7 +53,7 @@ public class Difficulty implements Comparable<Difficulty>
         @SuppressWarnings("unchecked")
         Map<String, Object> data = jsonParser.fromJson(new FileReader(jsonFile), Map.class);
         if (data == null) {
-            data = new HashMap<>();
+            return;
         }
 
         title = (String) data.getOrDefault("title", title);
diff --git a/src/main/java/net/sowgro/npehero/levelapi/Leaderboard.java b/src/main/java/net/sowgro/npehero/levelapi/Leaderboard.java
index 82f9aed..395e2c1 100644
--- a/src/main/java/net/sowgro/npehero/levelapi/Leaderboard.java
+++ b/src/main/java/net/sowgro/npehero/levelapi/Leaderboard.java
@@ -10,6 +10,7 @@ import java.io.FileReader;
 import java.io.FileWriter;
 import java.io.IOException;
 import java.time.LocalDate;
+import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -18,10 +19,10 @@ public class Leaderboard {
 
     public final ObservableList<LeaderboardEntry> entries = FXCollections.observableArrayList();
     private final Gson json = new GsonBuilder().serializeNulls().setPrettyPrinting().create();
-    private final File file;
+    private final File jsonFile;
 
     public Leaderboard(File file) throws IOException{
-        this.file = file;
+        this.jsonFile = file;
         read();
     }
 
@@ -33,17 +34,22 @@ public class Leaderboard {
      */
     public void add(String name, int score) throws IOException {
         entries.add(new LeaderboardEntry(name, score, LocalDate.now().toString()));
-        save();
+        write();
     }
 
     /**
      * Writes leaderboard to json file
      * @throws IOException If there are problems writing to the file.
      */
-    public void save() throws IOException {
-        file.createNewFile();
+    public void write() throws IOException {
+        if (!jsonFile.exists() && !jsonFile.createNewFile()) {
+            throw new IOException("Could not create file " + jsonFile.getAbsolutePath());
+        }
         @SuppressWarnings("unchecked")
-        List<Map<String, Object>> data = json.fromJson(new FileReader(file), List.class);
+        List<Map<String, Object>> data = json.fromJson(new FileReader(jsonFile), List.class);
+        if (data == null) {
+            data = new ArrayList<>();
+        }
         for (LeaderboardEntry cur : entries) {
             Map<String, Object> obj = new HashMap<>();
             obj.put("name", cur.name);
@@ -51,7 +57,7 @@ public class Leaderboard {
             obj.put("date", cur.date);
             data.add(obj);
         }
-        FileWriter fileWriter = new FileWriter(file);
+        FileWriter fileWriter = new FileWriter(jsonFile);
         json.toJson(data, fileWriter);
         fileWriter.close();
     }
@@ -61,11 +67,11 @@ public class Leaderboard {
      * @throws IOException If there are problems reading the file
      */
     public void read() throws IOException {
-        if (!file.exists()) {
+        if (!jsonFile.exists()) {
             return;
         }
         @SuppressWarnings("unchecked")
-        List<Map<String, Object>> data = json.fromJson(new FileReader(file), List.class);
+        List<Map<String, Object>> data = json.fromJson(new FileReader(jsonFile), List.class);
         if (data == null) {
             return;
         }
diff --git a/src/main/java/net/sowgro/npehero/levelapi/Level.java b/src/main/java/net/sowgro/npehero/levelapi/Level.java
index c9d9c41..0e25445 100755
--- a/src/main/java/net/sowgro/npehero/levelapi/Level.java
+++ b/src/main/java/net/sowgro/npehero/levelapi/Level.java
@@ -96,7 +96,7 @@ public class Level implements Comparable<Level>{
         @SuppressWarnings("unchecked")
         Map<String, Object> data = jsonParser.fromJson(new FileReader(jsonFile), Map.class);
         if (data == null) {
-            data = new HashMap<>();
+            return;
         }
         title = (String) data.getOrDefault("title", title);
         artist = (String) data.getOrDefault("artist", artist);