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

35 files changed, 36 insertions, 54 deletions

diff --git a/src/assets/levels/test level/background.png b/levels/testLevel/background.png
index 0113819..0113819 100644
--- a/src/assets/levels/test level/background.png
+++ b/levels/testLevel/background.png
diff --git a/src/assets/levels/test level/easy/leaderboard.txt b/levels/testLevel/easy/leaderboard.json
index e69de29..e69de29 100644
--- a/src/assets/levels/test level/easy/leaderboard.txt
+++ b/levels/testLevel/easy/leaderboard.json
diff --git a/src/assets/levels/test level/easy/notes.txt b/levels/testLevel/easy/metadata.json
index e69de29..e69de29 100644
--- a/src/assets/levels/test level/easy/notes.txt
+++ b/levels/testLevel/easy/metadata.json
diff --git a/src/assets/levels/test level/hard/notes.txt b/levels/testLevel/easy/notes.txt
index e69de29..e69de29 100644
--- a/src/assets/levels/test level/hard/notes.txt
+++ b/levels/testLevel/easy/notes.txt
diff --git a/src/assets/levels/test level/hard/leaderboard.txt b/levels/testLevel/hard/leaderboard.json
index e69de29..e69de29 100644
--- a/src/assets/levels/test level/hard/leaderboard.txt
+++ b/levels/testLevel/hard/leaderboard.json
diff --git a/src/assets/levels/test level/medium/leaderboard.txt b/levels/testLevel/hard/metadata.json
index e69de29..e69de29 100644
--- a/src/assets/levels/test level/medium/leaderboard.txt
+++ b/levels/testLevel/hard/metadata.json
diff --git a/src/assets/levels/test level/medium/notes.txt b/levels/testLevel/hard/notes.txt
index e69de29..e69de29 100644
--- a/src/assets/levels/test level/medium/notes.txt
+++ b/levels/testLevel/hard/notes.txt
diff --git a/src/assets/levels/test level2/easy/leaderboard.txt b/levels/testLevel/medium/leaderboard.json
index e69de29..e69de29 100644
--- a/src/assets/levels/test level2/easy/leaderboard.txt
+++ b/levels/testLevel/medium/leaderboard.json
diff --git a/src/assets/levels/test level2/easy/notes.txt b/levels/testLevel/medium/metadata.json
index e69de29..e69de29 100644
--- a/src/assets/levels/test level2/easy/notes.txt
+++ b/levels/testLevel/medium/metadata.json
diff --git a/src/assets/levels/test level2/hard/notes.txt b/levels/testLevel/medium/notes.txt
index e69de29..e69de29 100644
--- a/src/assets/levels/test level2/hard/notes.txt
+++ b/levels/testLevel/medium/notes.txt
diff --git a/src/assets/levels/test level/metadata.json b/levels/testLevel/metadata.json
index eff28b2..eff28b2 100644
--- a/src/assets/levels/test level/metadata.json
+++ b/levels/testLevel/metadata.json
diff --git a/src/assets/levels/test level/preview.png b/levels/testLevel/preview.png
index 002ad9e..002ad9e 100644
--- a/src/assets/levels/test level/preview.png
+++ b/levels/testLevel/preview.png
diff --git a/src/assets/levels/test level2/background.png b/levels/testLevel2/background.png
index 0113819..0113819 100644
--- a/src/assets/levels/test level2/background.png
+++ b/levels/testLevel2/background.png
diff --git a/src/assets/levels/test level2/hard/leaderboard.txt b/levels/testLevel2/easy/leaderboard.json
index e69de29..e69de29 100644
--- a/src/assets/levels/test level2/hard/leaderboard.txt
+++ b/levels/testLevel2/easy/leaderboard.json
diff --git a/src/assets/levels/test level2/medium/leaderboard.txt b/levels/testLevel2/easy/metadata.json
index e69de29..e69de29 100644
--- a/src/assets/levels/test level2/medium/leaderboard.txt
+++ b/levels/testLevel2/easy/metadata.json
diff --git a/src/assets/levels/test level2/medium/notes.txt b/levels/testLevel2/easy/notes.txt
index e69de29..e69de29 100644
--- a/src/assets/levels/test level2/medium/notes.txt
+++ b/levels/testLevel2/easy/notes.txt
diff --git a/levels/testLevel2/hard/leaderboard.json b/levels/testLevel2/hard/leaderboard.json
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/levels/testLevel2/hard/leaderboard.json
diff --git a/levels/testLevel2/hard/metadata.json b/levels/testLevel2/hard/metadata.json
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/levels/testLevel2/hard/metadata.json
diff --git a/levels/testLevel2/hard/notes.txt b/levels/testLevel2/hard/notes.txt
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/levels/testLevel2/hard/notes.txt
diff --git a/levels/testLevel2/medium/leaderboard.json b/levels/testLevel2/medium/leaderboard.json
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/levels/testLevel2/medium/leaderboard.json
diff --git a/levels/testLevel2/medium/metadata.json b/levels/testLevel2/medium/metadata.json
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/levels/testLevel2/medium/metadata.json
diff --git a/levels/testLevel2/medium/notes.txt b/levels/testLevel2/medium/notes.txt
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/levels/testLevel2/medium/notes.txt
diff --git a/src/assets/levels/test level2/metadata.json b/levels/testLevel2/metadata.json
index 4058afd..4058afd 100644
--- a/src/assets/levels/test level2/metadata.json
+++ b/levels/testLevel2/metadata.json
diff --git a/src/assets/levels/test level2/preview.png b/levels/testLevel2/preview.png
index 002ad9e..002ad9e 100644
--- a/src/assets/levels/test level2/preview.png
+++ b/levels/testLevel2/preview.png
diff --git a/src/gameplay/SongPlayer.java b/src/gameplay/SongPlayer.java
index 496a4b0..aaaf266 100644
--- a/src/gameplay/SongPlayer.java
+++ b/src/gameplay/SongPlayer.java
@@ -22,6 +22,16 @@ import javafx.util.*;
 import main.Difficulty;
 import main.ScoreController;
 
+
+
+//hi aidan here are some objects you can use
+// cntrl.setScore(0) - pass in int
+// cntrl.getScore() - returns int
+// d.bpm - int, defined in difficulty metadata
+// lvl.colors - array of colors (size 5) for the block colors
+// d.notes - File, notes.txt in the difficulty folder
+
+
 public class SongPlayer extends Pane {
 	private int bpm = 83;
 	Timer timer = new Timer(bpm);
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
 {
diff --git a/src/main/Difficulty.java b/src/main/Difficulty.java
index 926d8d6..7955698 100644
--- a/src/main/Difficulty.java
+++ b/src/main/Difficulty.java
@@ -1,17 +1,19 @@
 package main;
 
 import java.io.File;
-
+import java.time.LocalDate;
 import javafx.collections.FXCollections;
 import javafx.collections.ObservableList;
 
 public class Difficulty 
 {
     public String title;
-    public ObservableList<LeaderboardEntry> leaderboard = FXCollections.observableArrayList();
+    private ObservableList<LeaderboardEntry> leaderboard = FXCollections.observableArrayList();
     public File notes;
+    public int bpm;
 
     public void parseMetadata(File file) {
+        //hi zach put json reader stuff here
         title = "placeholderDiff";
     }
 
@@ -19,4 +21,13 @@ public class Difficulty
         //and here
         leaderboard.add(new LeaderboardEntry("placeholderScore", 0, "0/0/0"));
     }
+
+    public void addToLeaderboard(String name, int score) {
+        leaderboard.add(new LeaderboardEntry(name, score, ""+LocalDate.now())); //do not delete this tho its not a placeholder
+        //and make this write to the json also
+    }
+
+    public ObservableList<LeaderboardEntry> getLeaderboard() {
+        return leaderboard;
+    }
 }
diff --git a/src/main/LeaderboardEntry.java b/src/main/LeaderboardEntry.java
index 673ca11..9a298b6 100644
--- a/src/main/LeaderboardEntry.java
+++ b/src/main/LeaderboardEntry.java
@@ -1,45 +1,28 @@
 package main;
 
-import javafx.beans.property.SimpleIntegerProperty;
-import javafx.beans.property.SimpleStringProperty;
-
 public class LeaderboardEntry 
 {
-    private SimpleIntegerProperty score;
-    private SimpleStringProperty name;
-    private SimpleStringProperty date;
+    private int score;
+    private String name;
+    private String date;
 
-    //all below is required for table view
     public LeaderboardEntry(String name, int score, String date)
     {
-        this.name = new SimpleStringProperty(name);
-        this.score = new SimpleIntegerProperty(score);
-        this.date = new SimpleStringProperty(date);
+        this.name = name;
+        this.score = score;
+        this.date = date;
     }
 
     public int getScore() {
-        return score.get();
-    }
-
-    public void setScore(int score) {
-        this.score.set(score);
+        return score;
     }
 
     public String getName() {
-        return name.get();
-    }
-
-    public void setName(String name) {
-        this.name.set(name);
+        return name;
     }
 
     public String getDate()
     {
-        return date.get();
-    }
-
-    public void setDate(String date)
-    {
-        this.date = new SimpleStringProperty(date);
+        return date;
     }
 }
diff --git a/src/main/Level.java b/src/main/Level.java
index a9b5c48..4110d4f 100644
--- a/src/main/Level.java
+++ b/src/main/Level.java
@@ -2,17 +2,12 @@ package main;
 
 import java.io.File;
 import java.util.ArrayList;
-
-import javafx.beans.*;
-import javafx.beans.property.SimpleStringProperty;
 import javafx.scene.image.Image;
 import javafx.scene.paint.Color;
-
 import java.io.FileWriter;
 import java.io.FileNotFoundException;
 import java.io.FileReader;
 import java.io.IOException;
-
 import org.json.simple.JSONObject;
 import org.json.simple.parser.JSONParser;
 import org.json.simple.parser.ParseException;
diff --git a/src/main/LevelController.java b/src/main/LevelController.java
index c364962..f4d7587 100644
--- a/src/main/LevelController.java
+++ b/src/main/LevelController.java
@@ -11,7 +11,7 @@ public class LevelController
 
     public LevelController()
     {
-        for (File curFileInLevels: new File("src/assets/levels").listFiles()) //iterates through all files/folders in src/assets/levels
+        for (File curFileInLevels: new File("levels").listFiles()) //iterates through all files/folders in src/assets/levels
         {
             Level level = new Level();
             for(File curFileInCurLevel: curFileInLevels.listFiles()) //iterates through all files/folders in src/assets/levels/LEVEL