Change project structure, embed resources into jar and remove libraries from source control

1 files changed, 19 insertions, 12 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);
+    }
 }