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

5 files changed, 29 insertions, 26 deletions

diff --git a/src/devmenu/DebugMenu.java b/src/main/java/net/sowgro/npehero/devmenu/DebugMenu.java
index 0d55e69..aecd438 100644..100755
--- a/src/devmenu/DebugMenu.java
+++ b/src/main/java/net/sowgro/npehero/devmenu/DebugMenu.java
@@ -1,6 +1,6 @@
-package devmenu;
+package net.sowgro.npehero.devmenu;
 
-import gui.Driver;
+import net.sowgro.npehero.Driver;
 import javafx.scene.Scene;
 import javafx.scene.control.Button;
 import javafx.scene.layout.VBox;
diff --git a/src/devmenu/DiffEditor.java b/src/main/java/net/sowgro/npehero/devmenu/DiffEditor.java
index 0991fb0..d4ebb02 100644..100755
--- a/src/devmenu/DiffEditor.java
+++ b/src/main/java/net/sowgro/npehero/devmenu/DiffEditor.java
@@ -1,18 +1,18 @@
-package devmenu;
+package net.sowgro.npehero.devmenu;
 
 import java.io.FileNotFoundException;
 import java.io.UnsupportedEncodingException;
 
-import gui.Driver;
-import gui.LevelSurround;
-import gui.MainMenu;
+import net.sowgro.npehero.Driver;
+import net.sowgro.npehero.gui.LevelSurround;
+import net.sowgro.npehero.gui.MainMenu;
 import javafx.scene.Scene;
 import javafx.scene.control.Button;
 import javafx.scene.control.TextField;
 import javafx.scene.layout.VBox;
 import javafx.scene.text.Text;
 import javafx.stage.Stage;
-import main.Difficulty;
+import net.sowgro.npehero.main.Difficulty;
 
 public class DiffEditor
 {
diff --git a/src/devmenu/LevelEditor.java b/src/main/java/net/sowgro/npehero/devmenu/LevelEditor.java
index b8a6532..94fcc16 100644..100755
--- a/src/devmenu/LevelEditor.java
+++ b/src/main/java/net/sowgro/npehero/devmenu/LevelEditor.java
@@ -1,21 +1,23 @@
-package devmenu;
+package net.sowgro.npehero.devmenu;
 
 import java.io.File;
+
+import javafx.beans.property.ReadOnlyBooleanWrapper;
+import javafx.beans.property.ReadOnlyStringWrapper;
 import javafx.scene.Scene;
 import javafx.scene.control.Button;
 import javafx.scene.control.ColorPicker;
 import javafx.scene.control.TableColumn;
 import javafx.scene.control.TableView;
 import javafx.scene.control.TextField;
-import javafx.scene.control.cell.PropertyValueFactory;
 import javafx.scene.layout.HBox;
 import javafx.scene.layout.VBox;
 import javafx.scene.text.Text;
 import javafx.stage.FileChooser;
 import javafx.stage.Stage;
 import javafx.stage.FileChooser.ExtensionFilter;
-import main.Difficulty;
-import main.Level;
+import net.sowgro.npehero.main.Difficulty;
+import net.sowgro.npehero.main.Level;
 
 public class LevelEditor
 { 
@@ -79,8 +81,8 @@ public class LevelEditor
         diffList.getColumns().add(diffCol);
         diffList.getColumns().add(validCol);
 
-        diffCol.setCellValueFactory(new PropertyValueFactory<Difficulty,String>("title"));
-        validCol.setCellValueFactory(new PropertyValueFactory<Difficulty,Boolean>("valid"));
+        diffCol.setCellValueFactory(data -> new ReadOnlyStringWrapper(data.getValue().title));
+        validCol.setCellValueFactory(data -> new ReadOnlyBooleanWrapper(data.getValue().isValid));
 
         diffList.setItems(level.getDiffList());
         
diff --git a/src/devmenu/LevelList.java b/src/main/java/net/sowgro/npehero/devmenu/LevelList.java
index f9b4207..8d5e0cb 100644..100755
--- a/src/devmenu/LevelList.java
+++ b/src/main/java/net/sowgro/npehero/devmenu/LevelList.java
@@ -1,17 +1,18 @@
-package devmenu;
+package net.sowgro.npehero.devmenu;
 
-import gui.Driver;
+import javafx.beans.property.ReadOnlyBooleanWrapper;
+import javafx.beans.property.ReadOnlyStringWrapper;
+import net.sowgro.npehero.Driver;
 import javafx.scene.Scene;
 import javafx.scene.control.Button;
 import javafx.scene.control.TableColumn;
 import javafx.scene.control.TableView;
 import javafx.scene.control.TextField;
-import javafx.scene.control.cell.PropertyValueFactory;
 import javafx.scene.layout.HBox;
 import javafx.scene.layout.VBox;
 import javafx.stage.Stage;
-import main.Level;
-import main.LevelController;
+import net.sowgro.npehero.main.Level;
+import net.sowgro.npehero.main.LevelController;
 
 public class LevelList 
 {
@@ -33,9 +34,9 @@ public class LevelList
         levels.getColumns().add(artistCol);
         levels.getColumns().add(validCol);
 
-        titleCol.setCellValueFactory(new PropertyValueFactory<Level, String>("title"));
-        artistCol.setCellValueFactory(new PropertyValueFactory<Level, String>("artist"));
-        validCol.setCellValueFactory(new PropertyValueFactory<Level, Boolean>("valid"));
+        titleCol.setCellValueFactory(data -> new ReadOnlyStringWrapper(data.getValue().getTitle()));
+        artistCol.setCellValueFactory(data -> new ReadOnlyStringWrapper(data.getValue().getArtist()));
+        validCol.setCellValueFactory(data -> new ReadOnlyBooleanWrapper(data.getValue().isValid()));
 
         levels.setItems(LevelController.getLevelList());
 
@@ -44,7 +45,7 @@ public class LevelList
         edit.setOnAction(e -> new LevelEditor(levels.getSelectionModel().getSelectedItem()));
 
         Button remove = new Button("Delete");
-        remove.setOnAction(e -> gui.Driver.levelController.removeLevel(levels.getSelectionModel().getSelectedItem()));
+        remove.setOnAction(e -> Driver.levelController.removeLevel(levels.getSelectionModel().getSelectedItem()));
 
         Button refresh = new Button("Refresh");
         refresh.setOnAction(e -> {
diff --git a/src/devmenu/NotesEditor.java b/src/main/java/net/sowgro/npehero/devmenu/NotesEditor.java
index 0893446..25b21f1 100644..100755
--- a/src/devmenu/NotesEditor.java
+++ b/src/main/java/net/sowgro/npehero/devmenu/NotesEditor.java
@@ -1,17 +1,17 @@
-package devmenu;
+package net.sowgro.npehero.devmenu;
 
 import java.io.FileNotFoundException;
 import java.io.PrintWriter;
 import java.io.UnsupportedEncodingException;
-import gameplay.Timer;
-import gui.Driver;
+import net.sowgro.npehero.gameplay.Timer;
+import net.sowgro.npehero.Driver;
 import javafx.scene.Scene;
 import javafx.scene.control.Button;
 import javafx.scene.input.KeyCode;
 import javafx.scene.layout.VBox;
 import javafx.scene.text.Text;
 import javafx.stage.Stage;
-import main.Difficulty;
+import net.sowgro.npehero.main.Difficulty;
 
 public class NotesEditor
 {