9 files changed, 64 insertions, 47 deletions
diff --git a/src/gui/Driver.java b/src/main/java/net/sowgro/npehero/Driver.java
index b46f4c9..b5e226e 100644..100755
--- a/src/gui/Driver.java
+++ b/src/main/java/net/sowgro/npehero/Driver.java
@@ -1,4 +1,4 @@
-package gui;
+package net.sowgro.npehero;
 
 import javafx.application.Application;
 import javafx.application.Platform;
@@ -15,23 +15,25 @@ import javafx.scene.layout.BackgroundRepeat;
 import javafx.scene.layout.BackgroundSize;
 import javafx.scene.layout.Pane;
 import javafx.stage.Stage;
-import main.LevelController;
-import main.SettingsController;
-import main.SoundController;
-import java.nio.file.Paths;
+import net.sowgro.npehero.gui.MainMenu;
+import net.sowgro.npehero.main.LevelController;
+import net.sowgro.npehero.main.SettingsController;
+import net.sowgro.npehero.main.SoundController;
 
-import devmenu.DebugMenu;
+import java.net.URL;
+import java.util.Objects;
 
 
 public class Driver extends Application 
-{    
+{
+
     public static Stage primaryStage;
     static Pane primaryPane = new Pane();
 
     public static SettingsController settingsController = new SettingsController();
     public static SoundController soundController = new SoundController();
     public static LevelController levelController = new LevelController();
-    public static DebugMenu debug = new DebugMenu();
+//    public static DebugMenu debug = new DebugMenu();
 
     /*
      * starts javafx
@@ -47,11 +49,12 @@ public class Driver extends Application
      */
     @Override
     public void start(Stage newPrimaryStage)
-    {   
+    {
         primaryStage = newPrimaryStage;
 
         Scene primaryScene = new Scene(primaryPane, 800,600);
-        primaryScene.getStylesheets().add("gui/style.css");
+
+        primaryScene.getStylesheets().add(getClass().getResource("style.css").toExternalForm());
 
         primaryStage.setScene(primaryScene);
         primaryStage.setTitle("NPE Hero");
@@ -95,7 +98,7 @@ public class Driver extends Application
 
     /**
      * replaces the background image with a new one
-     * @param url   the url of the image to set
+     * @param image   the url of the image to set
      */
     public static void setBackground(Image image) //replaces background with a new one
     {
@@ -110,7 +113,7 @@ public class Driver extends Application
 
     public static void setMenuBackground()
     {
-        setBackground(new Image(Paths.get("resources/mountains.png").toUri().toString()));
+        setBackground(new Image(Driver.class.getResource("mountains.png").toExternalForm()));
     }
 
     /**
@@ -120,4 +123,8 @@ public class Driver extends Application
     {
         Platform.exit();
     }
+
+    public static URL getResource(String fileName) {
+        return Driver.class.getResource(fileName);
+    }
 }
diff --git a/src/gui/GameOver.java b/src/main/java/net/sowgro/npehero/gui/GameOver.java
index 8571d20..68ce3ea 100644..100755
--- a/src/gui/GameOver.java
+++ b/src/main/java/net/sowgro/npehero/gui/GameOver.java
@@ -1,4 +1,4 @@
-package gui;
+package net.sowgro.npehero.gui;
 
 import javafx.event.ActionEvent;
 import javafx.event.EventHandler;
@@ -11,8 +11,9 @@ import javafx.scene.layout.HBox;
 import javafx.scene.layout.Pane;
 import javafx.scene.layout.VBox;
 import javafx.scene.text.Text;
-import main.Difficulty;
-import main.Level;
+import net.sowgro.npehero.Driver;
+import net.sowgro.npehero.main.Difficulty;
+import net.sowgro.npehero.main.Level;
 
 public class GameOver extends Pane
 {
diff --git a/src/gui/Leaderboard.java b/src/main/java/net/sowgro/npehero/gui/Leaderboard.java
index 39df409..a8e54d1 100644..100755
--- a/src/gui/Leaderboard.java
+++ b/src/main/java/net/sowgro/npehero/gui/Leaderboard.java
@@ -1,17 +1,18 @@
-package gui;
+package net.sowgro.npehero.gui;
 
+import javafx.beans.property.ReadOnlyStringWrapper;
 import javafx.geometry.Pos;
 import javafx.scene.control.Button;
 import javafx.scene.control.TableColumn;
 import javafx.scene.control.TableView;
 import javafx.scene.control.TableColumn.SortType;
-import javafx.scene.control.cell.PropertyValueFactory;
 import javafx.scene.layout.HBox;
 import javafx.scene.layout.Pane;
 import javafx.scene.layout.VBox;
-import main.Difficulty;
-import main.LeaderboardEntry;
-import main.Level;
+import net.sowgro.npehero.Driver;
+import net.sowgro.npehero.main.Difficulty;
+import net.sowgro.npehero.main.LeaderboardEntry;
+import net.sowgro.npehero.main.Level;
 
 public class Leaderboard extends Pane
 {
@@ -33,9 +34,9 @@ public class Leaderboard extends Pane
         scores.getColumns().add(scoreCol);
         scores.getColumns().add(dateCol);
 
-        nameCol.setCellValueFactory(new PropertyValueFactory<LeaderboardEntry, String>("name"));
-        scoreCol.setCellValueFactory(new PropertyValueFactory<LeaderboardEntry, String>("score"));
-        dateCol.setCellValueFactory(new PropertyValueFactory<LeaderboardEntry, String>("date"));
+        nameCol.setCellValueFactory(data -> new ReadOnlyStringWrapper(data.getValue().getName()));
+        scoreCol.setCellValueFactory(data -> new ReadOnlyStringWrapper(data.getValue().getScore() + ""));
+        dateCol.setCellValueFactory(data -> new ReadOnlyStringWrapper(data.getValue().getDate()));
 
         scores.setItems(diff.getLeaderboard());
 
diff --git a/src/gui/LevelDetails.java b/src/main/java/net/sowgro/npehero/gui/LevelDetails.java
index af55b9c..25d96c8 100644..100755
--- a/src/gui/LevelDetails.java
+++ b/src/main/java/net/sowgro/npehero/gui/LevelDetails.java
@@ -1,4 +1,4 @@
-package gui;
+package net.sowgro.npehero.gui;
 
 import javafx.geometry.Insets;
 import javafx.geometry.Pos;
@@ -14,8 +14,9 @@ import javafx.scene.layout.VBox;
 import javafx.scene.text.Text;
 import javafx.scene.text.TextAlignment;
 import javafx.scene.text.TextFlow;
-import main.Difficulty;
-import main.Level;
+import net.sowgro.npehero.Driver;
+import net.sowgro.npehero.main.Difficulty;
+import net.sowgro.npehero.main.Level;
 
 public class LevelDetails extends VBox
 {
diff --git a/src/gui/LevelSelector.java b/src/main/java/net/sowgro/npehero/gui/LevelSelector.java
index 6fd6aca..6d3442e 100644..100755
--- a/src/gui/LevelSelector.java
+++ b/src/main/java/net/sowgro/npehero/gui/LevelSelector.java
@@ -1,17 +1,18 @@
-package gui;
+package net.sowgro.npehero.gui;
 
+import javafx.beans.property.ReadOnlyStringWrapper;
 import javafx.beans.value.ChangeListener;
 import javafx.beans.value.ObservableValue;
 import javafx.geometry.Pos;
 import javafx.scene.control.Button;
 import javafx.scene.control.TableColumn;
 import javafx.scene.control.TableView;
-import javafx.scene.control.cell.PropertyValueFactory;
 import javafx.scene.layout.HBox;
 import javafx.scene.layout.Pane;
 import javafx.scene.layout.VBox;
-import main.Level;
-import main.LevelController;
+import net.sowgro.npehero.Driver;
+import net.sowgro.npehero.main.Level;
+import net.sowgro.npehero.main.LevelController;
 
 public class LevelSelector extends Pane
 {   
@@ -31,8 +32,8 @@ public class LevelSelector extends Pane
         levels.getColumns().add(titleCol);
         levels.getColumns().add(artistCol);
 
-        titleCol.setCellValueFactory(new PropertyValueFactory<Level, String>("title"));
-        artistCol.setCellValueFactory(new PropertyValueFactory<Level, String>("artist"));
+        titleCol.setCellValueFactory(data -> new ReadOnlyStringWrapper(data.getValue().getTitle()));
+        artistCol.setCellValueFactory(data -> new ReadOnlyStringWrapper(data.getValue().getArtist()));
 
         levels.setItems(LevelController.getValidLevelList());
 
@@ -43,7 +44,8 @@ public class LevelSelector extends Pane
 
         Button exit = new Button();
         exit.setText("Back");
-        exit.setOnAction(e -> {Driver.setMenu(new MainMenu());
+        exit.setOnAction(e -> {
+            Driver.setMenu(new MainMenu());
             Driver.soundController.playSfx("backward");
         });
 
diff --git a/src/gui/LevelSurround.java b/src/main/java/net/sowgro/npehero/gui/LevelSurround.java
index dcf8a10..08baf9e 100644..100755
--- a/src/gui/LevelSurround.java
+++ b/src/main/java/net/sowgro/npehero/gui/LevelSurround.java
@@ -1,6 +1,7 @@
-package gui;
+package net.sowgro.npehero.gui;
 
-import gameplay.SongPlayer;
+import net.sowgro.npehero.Driver;
+import net.sowgro.npehero.gameplay.SongPlayer;
 import javafx.geometry.Insets;
 import javafx.geometry.Pos;
 import javafx.scene.control.Button;
@@ -10,9 +11,9 @@ import javafx.scene.layout.Pane;
 import javafx.scene.layout.StackPane;
 import javafx.scene.layout.VBox;
 import javafx.scene.text.Text;
-import main.Difficulty;
-import main.Level;
-import main.ScoreController;
+import net.sowgro.npehero.main.Difficulty;
+import net.sowgro.npehero.main.Level;
+import net.sowgro.npehero.main.ScoreController;
 
 public class LevelSurround extends Pane
 {   
@@ -127,22 +128,22 @@ public class LevelSurround extends Pane
         Button addScore = new Button();
         addScore.setText(level.getTitle() + " addscore");
         addScore.setOnAction(e -> sc.setScore(sc.getScore()+1));
-        Driver.debug.addButton(addScore);
+//        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);
+//        Driver.debug.addButton(addCombo);
 
         Button printD = new Button();
         printD.setText(level.getTitle() + " print debug");
         printD.setOnAction(e -> sc.print());
-        Driver.debug.addButton(printD);
+//        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);
+//        Driver.debug.addButton(testfinish);
 
         game.start();
     }
diff --git a/src/gui/MainMenu.java b/src/main/java/net/sowgro/npehero/gui/MainMenu.java
index 84a7508..bb1970f 100644..100755
--- a/src/gui/MainMenu.java
+++ b/src/main/java/net/sowgro/npehero/gui/MainMenu.java
@@ -1,4 +1,4 @@
-package gui;
+package net.sowgro.npehero.gui;
 
 import javafx.geometry.Pos;
 import javafx.scene.control.Button;
@@ -8,6 +8,7 @@ import javafx.scene.layout.Pane;
 import javafx.scene.layout.VBox;
 import javafx.scene.paint.Color;
 import javafx.scene.text.Text;
+import net.sowgro.npehero.Driver;
 
 
 public class MainMenu extends Pane
@@ -31,7 +32,8 @@ public class MainMenu extends Pane
 
         Button play = new Button();
         play.setText("Play");
-        play.setOnAction(e -> {Driver.setMenu(new LevelSelector());
+        play.setOnAction(e -> {
+            Driver.setMenu(new LevelSelector());
             Driver.soundController.playSfx("forward");
         });
 
diff --git a/src/gui/Settings.java b/src/main/java/net/sowgro/npehero/gui/Settings.java
index 663353a..882eb86 100644..100755
--- a/src/gui/Settings.java
+++ b/src/main/java/net/sowgro/npehero/gui/Settings.java
@@ -1,4 +1,4 @@
-package gui;
+package net.sowgro.npehero.gui;
 
 import javafx.geometry.Insets;
 import javafx.geometry.Pos;
@@ -10,6 +10,8 @@ import javafx.scene.layout.HBox;
 import javafx.scene.layout.Pane;
 import javafx.scene.layout.VBox;
 import javafx.scene.text.Text;
+import net.sowgro.npehero.Driver;
+import net.sowgro.npehero.devmenu.LevelList;
 
 public class Settings extends Pane
 {
@@ -75,14 +77,14 @@ public class Settings extends Pane
         Button levelEdit = new Button("Level Utility");
         levelEdit.setOnAction(e -> {
             Driver.soundController.playSfx("forward");
-            new devmenu.LevelList();
+            new LevelList();
         });
 
         Button devMenu = new Button();
         devMenu.setText("Debug Menu");
         devMenu.setOnAction(e -> {
             Driver.soundController.playSfx("forward");
-            Driver.debug.show();
+//            Driver.debug.show();
         });
 
         VBox devBox = new VBox();
diff --git a/src/gui/style.css b/src/main/resources/net/sowgro/npehero/style.css
index dd1de55..dd1de55 100644..100755
--- a/src/gui/style.css
+++ b/src/main/resources/net/sowgro/npehero/style.css