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

1 files changed, 9 insertions, 8 deletions

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());