Move levels outside of src, prepare for leaderboard writing and other small changes

6 files changed, 3 insertions, 20 deletions

diff --git a/src/gui/DebugMenu.java b/src/gui/DebugMenu.java
index a2ef761..1ee85c0 100644
--- a/src/gui/DebugMenu.java
+++ b/src/gui/DebugMenu.java
@@ -4,8 +4,6 @@ import javafx.scene.Scene;
 import javafx.scene.control.Button;
 import javafx.scene.layout.VBox;
 import javafx.stage.Stage;
-import main.Difficulty;
-import main.Level;
 
 public class DebugMenu 
 {
diff --git a/src/gui/GameOver.java b/src/gui/GameOver.java
index c76ccdf..aceae2a 100644
--- a/src/gui/GameOver.java
+++ b/src/gui/GameOver.java
@@ -12,12 +12,8 @@ import javafx.scene.layout.Pane;
 import javafx.scene.layout.VBox;
 import javafx.scene.text.Text;
 import main.Difficulty;
-import main.LeaderboardEntry;
 import main.Level;
 
-import java.sql.Time;
-import java.time.LocalDate;
-
 public class GameOver extends Pane
 {
     /*
@@ -76,7 +72,7 @@ public class GameOver extends Pane
             public void handle(ActionEvent event) {
                 save.setDisable(true);
                 name.setDisable(true);
-                diff.leaderboard.add(new LeaderboardEntry(name.getText(), score2, ""+LocalDate.now()));
+                diff.addToLeaderboard(name.getText(), score2);
             }
         });
 
diff --git a/src/gui/Leaderboard.java b/src/gui/Leaderboard.java
index 64687fa..3ddf4d1 100644
--- a/src/gui/Leaderboard.java
+++ b/src/gui/Leaderboard.java
@@ -1,11 +1,7 @@
 package gui;
 
-
-import javafx.collections.FXCollections;
-import javafx.collections.ObservableList;
 import javafx.geometry.Pos;
 import javafx.scene.control.Button;
-import javafx.scene.control.ListView;
 import javafx.scene.control.TableColumn;
 import javafx.scene.control.TableView;
 import javafx.scene.control.cell.PropertyValueFactory;
@@ -41,7 +37,7 @@ public class Leaderboard extends Pane
         scoreCol.setCellValueFactory(new PropertyValueFactory<LeaderboardEntry, String>("score"));
         dateCol.setCellValueFactory(new PropertyValueFactory<LeaderboardEntry, String>("date"));
 
-        scores.setItems(diff.leaderboard);
+        scores.setItems(diff.getLeaderboard());
 
         scores.getStyleClass().add("unselectable");
 
diff --git a/src/gui/LevelSelector.java b/src/gui/LevelSelector.java
index 4c91325..9a5c6df 100644
--- a/src/gui/LevelSelector.java
+++ b/src/gui/LevelSelector.java
@@ -4,16 +4,13 @@ import javafx.beans.value.ChangeListener;
 import javafx.beans.value.ObservableValue;
 import javafx.geometry.Pos;
 import javafx.scene.control.Button;
-import javafx.scene.control.ListView;
 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.Difficulty;
 import main.Level;
-import main.LevelController;
 
 public class LevelSelector extends Pane
 {   
diff --git a/src/gui/LevelSurround.java b/src/gui/LevelSurround.java
index a94f890..e84071e 100644
--- a/src/gui/LevelSurround.java
+++ b/src/gui/LevelSurround.java
@@ -43,7 +43,7 @@ public class LevelSurround extends Pane
         title.getStyleClass().add("t2");
 
         Text artist = new Text();
-        artist.setText(level.getArtist()+" - "+difficulty);
+        artist.setText(level.getArtist()+" - "+difficulty.title);
         artist.getStyleClass().add("t3");
 
         VBox titleTextBox = new VBox();
diff --git a/src/gui/Settings.java b/src/gui/Settings.java
index f16eb71..0d757f5 100644
--- a/src/gui/Settings.java
+++ b/src/gui/Settings.java
@@ -4,15 +4,11 @@ import javafx.geometry.Insets;
 import javafx.geometry.Pos;
 import javafx.scene.control.Button;
 import javafx.scene.control.Slider;
-import javafx.scene.control.Toggle;
-import javafx.scene.control.ToggleButton;
 import javafx.scene.layout.BorderPane;
 import javafx.scene.layout.HBox;
 import javafx.scene.layout.Pane;
 import javafx.scene.layout.VBox;
-import javafx.scene.paint.Color;
 import javafx.scene.text.Text;
-import main.SettingsController;
 
 public class Settings extends Pane
 {