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

1 files changed, 5 insertions, 26 deletions

diff --git a/src/main/java/net/sowgro/npehero/gui/LevelSurround.java b/src/main/java/net/sowgro/npehero/gui/LevelSurround.java
index aca93bc..b864c08 100755
--- a/src/main/java/net/sowgro/npehero/gui/LevelSurround.java
+++ b/src/main/java/net/sowgro/npehero/gui/LevelSurround.java
@@ -13,8 +13,8 @@ import javafx.scene.layout.VBox;
 import javafx.scene.text.Text;
 import net.sowgro.npehero.main.Difficulty;
 import net.sowgro.npehero.main.Level;
-import net.sowgro.npehero.main.ScoreController;
-import net.sowgro.npehero.main.SoundController;
+import net.sowgro.npehero.gameplay.ScoreController;
+import net.sowgro.npehero.main.Sound;
 
 public class LevelSurround extends Pane
 {   
@@ -32,7 +32,7 @@ public class LevelSurround extends Pane
         exit.setText("Back");
         exit.setOnAction(e -> {
             Driver.setMenu(prev);
-            SoundController.playSfx(SoundController.BACKWARD);
+            Sound.playSfx(Sound.BACKWARD);
             game.cancel();
         });
 
@@ -42,11 +42,11 @@ public class LevelSurround extends Pane
         buttonBox.setSpacing(10);
 
         Text title = new Text();
-        title.setText(level.getTitle());
+        title.setText(level.title);
         title.getStyleClass().add("t2");
 
         Text artist = new Text();
-        artist.setText(level.getArtist()+" - "+difficulty.title);
+        artist.setText(level.artist+" - "+difficulty.title);
         artist.getStyleClass().add("t3");
 
         VBox titleTextBox = new VBox();
@@ -125,27 +125,6 @@ public class LevelSurround extends Pane
         root.prefWidthProperty().bind(super.prefWidthProperty());
         root.prefHeightProperty().bind(super.prefHeightProperty());
 
-        //for debug menu
-        Button addScore = new Button();
-        addScore.setText(level.getTitle() + " addscore");
-        addScore.setOnAction(e -> sc.setScore(sc.getScore()+1));
-//        Driver.debug.addButton(addScore);
-
-        Button addCombo = new Button();
-        addCombo.setText(level.getTitle() + " addcombo");
-        addCombo.setOnAction(e -> sc.setCombo(sc.getCombo()+1));
-//        Driver.debug.addButton(addCombo);
-
-        Button printD = new Button();
-        printD.setText(level.getTitle() + " print debug");
-        printD.setOnAction(e -> sc.print());
-//        Driver.debug.addButton(printD);
-
-        Button testfinish = new Button();
-        testfinish.setText(level.getTitle() + "launch game end");
-        testfinish.setOnAction(e -> Driver.setMenu(new GameOver(level, difficulty, prev, sc.getScore())));
-//        Driver.debug.addButton(testfinish);
-
         game.start();
     }
 }
\ No newline at end of file