New json api wrapper, refactor of non-gui classes.

6 files changed, 43 insertions, 51 deletions

diff --git a/src/main/java/net/sowgro/npehero/devmenu/DiffEditor.java b/src/main/java/net/sowgro/npehero/devmenu/DiffEditor.java
index 84abf6f..4d2fc4e 100755
--- a/src/main/java/net/sowgro/npehero/devmenu/DiffEditor.java
+++ b/src/main/java/net/sowgro/npehero/devmenu/DiffEditor.java
@@ -15,7 +15,7 @@ import javafx.scene.layout.VBox;
 import javafx.scene.text.Text;
 import net.sowgro.npehero.main.Difficulty;
 import net.sowgro.npehero.main.Note;
-import net.sowgro.npehero.main.SoundController;
+import net.sowgro.npehero.main.Sound;
 
 public class DiffEditor extends Pane
 {
@@ -58,7 +58,7 @@ public class DiffEditor extends Pane
         });
 
         Button editScores = new Button("Clear leaderboard");
-        editScores.setOnAction(e -> diff.getLeaderboard().clear());
+        editScores.setOnAction(e -> diff.leaderboard.entries.clear());
 
         Button playLevel = new Button("Play level");
         playLevel.setOnAction(e -> Driver.setMenu(new LevelSurround(diff.level, diff, this)));
@@ -69,7 +69,7 @@ public class DiffEditor extends Pane
 //            diff.bpm = Double.parseDouble(bpm.getText());
 //            diff.numBeats = Integer.parseInt(numBeats.getText());
             diff.priority = Integer.parseInt(priority.getText());
-            diff.writeMetadata();
+            diff.write();
         });
 
         HBox content = new HBox();
@@ -103,7 +103,7 @@ public class DiffEditor extends Pane
         Button exit = new Button();
         exit.setText("Back");
         exit.setOnAction(e -> {
-            SoundController.playSfx(SoundController.BACKWARD);
+            Sound.playSfx(Sound.BACKWARD);
             Driver.setMenu(prev);
         });
 
diff --git a/src/main/java/net/sowgro/npehero/devmenu/DiffList.java b/src/main/java/net/sowgro/npehero/devmenu/DiffList.java
index 6345c2b..7c5a435 100755
--- a/src/main/java/net/sowgro/npehero/devmenu/DiffList.java
+++ b/src/main/java/net/sowgro/npehero/devmenu/DiffList.java
@@ -11,7 +11,7 @@ import javafx.scene.layout.VBox;
 import net.sowgro.npehero.Driver;
 import net.sowgro.npehero.main.Difficulty;
 import net.sowgro.npehero.main.Level;
-import net.sowgro.npehero.main.SoundController;
+import net.sowgro.npehero.main.Sound;
 
 public class DiffList extends Pane
 {
@@ -31,10 +31,10 @@ public class DiffList extends Pane
         diffs.getColumns().add(titleCol);
         diffs.getColumns().add(validCol);
 
-        titleCol.setCellValueFactory(data -> new ReadOnlyStringWrapper(data.getValue().getTitle()));
-        validCol.setCellValueFactory(data -> new ReadOnlyBooleanWrapper(data.getValue().isValid()));
+        titleCol.setCellValueFactory(data -> new ReadOnlyStringWrapper(data.getValue().title));
+        validCol.setCellValueFactory(data -> new ReadOnlyBooleanWrapper(data.getValue().isValid));
 
-        diffs.setItems(level.getDiffList());
+        diffs.setItems(level.difficulties.list);
 
         diffs.setRowFactory( _ -> {
             TableRow<Difficulty> row = new TableRow<>();
@@ -57,14 +57,14 @@ public class DiffList extends Pane
         edit.disableProperty().bind(diffs.getSelectionModel().selectedItemProperty().isNull());
 
         Button remove = new Button("Delete");
-        remove.setOnAction(e -> level.removeDiff(diffs.getSelectionModel().getSelectedItem()));
+        remove.setOnAction(e -> level.difficulties.remove(diffs.getSelectionModel().getSelectedItem()));
         remove.setDisable(true);
         remove.disableProperty().bind(diffs.getSelectionModel().selectedItemProperty().isNull());
 
         Button refresh = new Button("Refresh");
         refresh.setOnAction(e -> {
             level.readData();
-            diffs.setItems(level.getDiffList());
+            diffs.setItems(level.difficulties.list);
         });
 
         ToggleButton create = new ToggleButton("Create");
@@ -92,7 +92,7 @@ public class DiffList extends Pane
         Button exit = new Button();
         exit.setText("Back");
         exit.setOnAction(e -> {
-            SoundController.playSfx(SoundController.BACKWARD);
+            Sound.playSfx(Sound.BACKWARD);
             Driver.setMenu(prev);
         });
 
@@ -117,7 +117,7 @@ public class DiffList extends Pane
         });
 
         newLevelButton.setOnAction(_ -> {
-            level.addDiff(newLevelEntry.getText());
+            level.difficulties.add(newLevelEntry.getText());
             newLevelEntry.clear();
             refresh.fire();
             sidebar.getChildren().clear();
diff --git a/src/main/java/net/sowgro/npehero/devmenu/LevelEditor.java b/src/main/java/net/sowgro/npehero/devmenu/LevelEditor.java
index 411c15d..3a7561e 100755
--- a/src/main/java/net/sowgro/npehero/devmenu/LevelEditor.java
+++ b/src/main/java/net/sowgro/npehero/devmenu/LevelEditor.java
@@ -15,7 +15,7 @@ import javafx.stage.FileChooser.ExtensionFilter;
 import net.sowgro.npehero.Driver;
 import net.sowgro.npehero.main.Difficulty;
 import net.sowgro.npehero.main.Level;
-import net.sowgro.npehero.main.SoundController;
+import net.sowgro.npehero.main.Sound;
 
 public class LevelEditor extends Pane
 { 
@@ -32,16 +32,16 @@ public class LevelEditor extends Pane
     {
         Text folderNameLabel = new Text("Folder name");
         TextField folderName = new TextField();
-        if (level.thisDir != null) {
-            folderName.setText(level.thisDir.getName());
+        if (level.dir != null) {
+            folderName.setText(level.dir.getName());
             folderName.setDisable(true);
         }
 
         Text titleLabel = new Text("Title");
-        TextField title = new TextField(level.getTitle());
+        TextField title = new TextField(level.title);
 
         Text artistLabel = new Text("Artist");
-        TextField artist = new TextField(level.getArtist());
+        TextField artist = new TextField(level.title);
 
         Text descLabel = new Text("Description");
         TextField desc = new TextField(level.desc);
@@ -93,7 +93,7 @@ public class LevelEditor extends Pane
         diffCol.setCellValueFactory(data -> new ReadOnlyStringWrapper(data.getValue().title));
         validCol.setCellValueFactory(data -> new ReadOnlyBooleanWrapper(data.getValue().isValid));
 
-        diffList.setItems(level.getDiffList());
+        diffList.setItems(level.difficulties.list);
 
         diffList.setRowFactory( _ -> {
             TableRow<Difficulty> row = new TableRow<>();
@@ -106,12 +106,6 @@ public class LevelEditor extends Pane
             return row ;
         });
 
-        TextField newDiff = new TextField("new");
-        Button newDiffButton = new Button("add");
-        newDiffButton.setOnAction(e -> level.addDiff(newDiff.getText()));
-        HBox newDiffBox = new HBox();
-        newDiffBox.getChildren().addAll(newDiff,newDiffButton);
-
         Button newDiffs = new Button("Edit difficulties");
         newDiffs.setOnAction(_ -> Driver.setMenu(new DiffList(level, this)));
 
@@ -119,8 +113,8 @@ public class LevelEditor extends Pane
 
         Button save = new Button("Save");
         save.setOnAction(e -> { //assigns fields to values
-            level.setTitle(title.getText());
-            level.setArtist(artist.getText());
+            level.title = title.getText();
+            level.artist = artist.getText();
             level.desc = desc.getText();
             level.colors[0] = colorsPickers[0].getValue();
             level.colors[1] = colorsPickers[1].getValue();
@@ -158,7 +152,7 @@ public class LevelEditor extends Pane
         Button exit = new Button();
         exit.setText("Back");
         exit.setOnAction(e -> {
-            SoundController.playSfx(SoundController.BACKWARD);
+            Sound.playSfx(Sound.BACKWARD);
             Driver.setMenu(prev);
         });
 
diff --git a/src/main/java/net/sowgro/npehero/devmenu/LevelList.java b/src/main/java/net/sowgro/npehero/devmenu/LevelList.java
index 61b9d47..92ede43 100755
--- a/src/main/java/net/sowgro/npehero/devmenu/LevelList.java
+++ b/src/main/java/net/sowgro/npehero/devmenu/LevelList.java
@@ -11,8 +11,8 @@ import javafx.scene.layout.HBox;
 import javafx.scene.layout.VBox;
 import net.sowgro.npehero.gui.MainMenu;
 import net.sowgro.npehero.main.Level;
-import net.sowgro.npehero.main.LevelController;
-import net.sowgro.npehero.main.SoundController;
+import net.sowgro.npehero.main.Levels;
+import net.sowgro.npehero.main.Sound;
 
 public class LevelList extends Pane
 {
@@ -34,11 +34,11 @@ public class LevelList extends Pane
         levels.getColumns().add(artistCol);
         levels.getColumns().add(validCol);
 
-        titleCol.setCellValueFactory(data -> new ReadOnlyStringWrapper(data.getValue().getTitle()));
-        artistCol.setCellValueFactory(data -> new ReadOnlyStringWrapper(data.getValue().getArtist()));
-        validCol.setCellValueFactory(data -> new ReadOnlyBooleanWrapper(data.getValue().isValid()));
+        titleCol.setCellValueFactory(data -> new ReadOnlyStringWrapper(data.getValue().title));
+        artistCol.setCellValueFactory(data -> new ReadOnlyStringWrapper(data.getValue().artist));
+        validCol.setCellValueFactory(data -> new ReadOnlyBooleanWrapper(data.getValue().isValid));
 
-        levels.setItems(LevelController.getLevelList());
+        levels.setItems(Levels.list);
 
         levels.setRowFactory( _ -> {
             TableRow<Level> row = new TableRow<>();
@@ -50,9 +50,7 @@ public class LevelList extends Pane
             });
             return row ;
         });
-
-        levels.prefWidthProperty().bind(super.prefWidthProperty().multiply(0.35));
-        levels.setMinWidth(400);
+        levels.setPrefWidth(600);
         levels.prefHeightProperty().bind(super.prefHeightProperty().multiply(0.75));
 
         Button edit = new Button("Edit");
@@ -61,14 +59,14 @@ public class LevelList extends Pane
         edit.disableProperty().bind(levels.getSelectionModel().selectedItemProperty().isNull());
 
         Button remove = new Button("Delete");
-        remove.setOnAction(e -> LevelController.removeLevel(levels.getSelectionModel().getSelectedItem()));
+        remove.setOnAction(e -> Levels.remove(levels.getSelectionModel().getSelectedItem()));
         remove.setDisable(true);
         remove.disableProperty().bind(levels.getSelectionModel().selectedItemProperty().isNull());
 
         Button refresh = new Button("Refresh");
         refresh.setOnAction(e -> {
-            LevelController.readData();
-            levels.setItems(LevelController.getLevelList());
+            Levels.readData();
+            levels.setItems(Levels.list);
         });
 
         ToggleButton create = new ToggleButton("Create");
@@ -96,7 +94,7 @@ public class LevelList extends Pane
         Button exit = new Button();
         exit.setText("Back");
         exit.setOnAction(e -> {
-            SoundController.playSfx(SoundController.BACKWARD);
+            Sound.playSfx(Sound.BACKWARD);
             Driver.setMenu(new MainMenu());
         });
 
@@ -122,7 +120,7 @@ public class LevelList extends Pane
         });
 
         newLevelButton.setOnAction(_ -> {
-            LevelController.addLevel(newLevelEntry.getText());
+            Levels.add(newLevelEntry.getText());
             newLevelEntry.clear();
             refresh.fire();
             sidebar.getChildren().clear();
diff --git a/src/main/java/net/sowgro/npehero/devmenu/NotesEditor.java b/src/main/java/net/sowgro/npehero/devmenu/NotesEditor.java
index 985b2d0..5a606dc 100755
--- a/src/main/java/net/sowgro/npehero/devmenu/NotesEditor.java
+++ b/src/main/java/net/sowgro/npehero/devmenu/NotesEditor.java
@@ -17,7 +17,7 @@ import javafx.scene.layout.VBox;
 import javafx.scene.text.Text;
 import net.sowgro.npehero.main.Control;
 import net.sowgro.npehero.main.Difficulty;
-import net.sowgro.npehero.main.SoundController;
+import net.sowgro.npehero.main.Sound;
 
 public class NotesEditor extends Pane
 {
@@ -48,7 +48,7 @@ public class NotesEditor extends Pane
         Button exit = new Button();
         exit.setText("Back");
         exit.setOnAction(e -> {
-            SoundController.playSfx(SoundController.BACKWARD);
+            Sound.playSfx(Sound.BACKWARD);
             Driver.setMenu(prev);
         });
 
@@ -102,7 +102,7 @@ public class NotesEditor extends Pane
 
     private void start()
     {
-        SoundController.playSong(new Media(diff.level.song.toString()));
+        Sound.playSong(new Media(diff.level.song.toString()));
         timer = new Timer(diff.bpm);
         help.setText(t2);
     }
@@ -111,7 +111,7 @@ public class NotesEditor extends Pane
     {
         try 
         {
-            SoundController.endSong();
+            Sound.stopSong();
             diff.numBeats = (int)Double.parseDouble(timer.toString());
             timer = null;
             writer.close();
diff --git a/src/main/java/net/sowgro/npehero/devmenu/NotesEditor2.java b/src/main/java/net/sowgro/npehero/devmenu/NotesEditor2.java
index cd76801..1e2874d 100644
--- a/src/main/java/net/sowgro/npehero/devmenu/NotesEditor2.java
+++ b/src/main/java/net/sowgro/npehero/devmenu/NotesEditor2.java
@@ -25,7 +25,7 @@ import net.sowgro.npehero.gameplay.Block;
 import net.sowgro.npehero.gameplay.Target;
 import net.sowgro.npehero.main.Difficulty;
 import net.sowgro.npehero.main.Note;
-import net.sowgro.npehero.main.SoundController;
+import net.sowgro.npehero.main.Sound;
 import net.sowgro.npehero.main.Control;
 
 import java.util.concurrent.atomic.AtomicInteger;
@@ -45,7 +45,7 @@ public class NotesEditor2 extends Pane {
         noteList = diff.notes.deepCopyList();
 
         m = new MediaPlayer(new Media(diff.level.song.toURI().toString()));
-        SoundController.endSong();
+        Sound.stopSong();
 
         // Buttons
         VBox actionBox = new VBox();
@@ -140,9 +140,9 @@ public class NotesEditor2 extends Pane {
         exit.setText("Cancel");
         exit.setOnAction(_ -> {
             m.stop();
-            SoundController.playSfx(SoundController.BACKWARD);
+            Sound.playSfx(Sound.BACKWARD);
             Driver.setMenu(prev);
-            SoundController.playSong(SoundController.MENUSONG);
+            Sound.playSong(Sound.MENU_SONG);
         });
 
         Button save = new Button();
@@ -151,9 +151,9 @@ public class NotesEditor2 extends Pane {
             diff.notes.list = noteList;
             diff.notes.writeFile();
             m.stop();
-            SoundController.playSfx(SoundController.BACKWARD);
+            Sound.playSfx(Sound.BACKWARD);
             Driver.setMenu(new DiffEditor(diff, prev.prev));
-            SoundController.playSong(SoundController.MENUSONG);
+            Sound.playSong(Sound.MENU_SONG);
         });
 
         HBox buttons = new HBox(save, exit);