aboutsummaryrefslogtreecommitdiff
path: root/src/main/java
diff options
context:
space:
mode:
Diffstat (limited to 'src/main/java')
-rw-r--r--src/main/java/net/sowgro/npehero/editor/NotesEditor2.java5
-rwxr-xr-xsrc/main/java/net/sowgro/npehero/levelapi/Level.java3
2 files changed, 5 insertions, 3 deletions
diff --git a/src/main/java/net/sowgro/npehero/editor/NotesEditor2.java b/src/main/java/net/sowgro/npehero/editor/NotesEditor2.java
index 6e58ae6..483ad81 100644
--- a/src/main/java/net/sowgro/npehero/editor/NotesEditor2.java
+++ b/src/main/java/net/sowgro/npehero/editor/NotesEditor2.java
@@ -221,7 +221,6 @@ public class NotesEditor2 extends Page {
e.printStackTrace();
// TODO
}
- Sound.playSfx(Sound.BACKWARD);
Driver.setMenu(prev);
});
@@ -423,8 +422,8 @@ public class NotesEditor2 extends Page {
var sb = getScrollBar(scroll);
if (sb != null) {
sb.prefWidthProperty().bind(scaleBind.multiply(1 / 17.0));
- } else {
- System.out.println("No scrollbar :(");
+ } else { // TODO
+// System.out.println("No scrollbar :(");
}
Sound.stopSong();
m.play();
diff --git a/src/main/java/net/sowgro/npehero/levelapi/Level.java b/src/main/java/net/sowgro/npehero/levelapi/Level.java
index 7830c16..c9d9c41 100755
--- a/src/main/java/net/sowgro/npehero/levelapi/Level.java
+++ b/src/main/java/net/sowgro/npehero/levelapi/Level.java
@@ -95,6 +95,9 @@ 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<>();
+ }
title = (String) data.getOrDefault("title", title);
artist = (String) data.getOrDefault("artist", artist);
desc = (String) data.getOrDefault("desc", desc);