Merge branch 'main' of https://gitlab.sowgro.net/guitarheros/guitarhero

13 files changed, 53 insertions, 21 deletions

diff --git a/src/assets/levels/test level/metadata.json b/src/assets/levels/test level/metadata.json
index 17f5611..ae1ddba 100644
--- a/src/assets/levels/test level/metadata.json
+++ b/src/assets/levels/test level/metadata.json
@@ -1,5 +1,5 @@
 {
-    "diff1": "Easy",
-    "diff2": "Medium",
-    "diff3": "Hard"
+    "title": "testSong",
+    "artist": "ed sheeran",
+    "desc": "this is a test level. lalalala testing testing",
 }
\ No newline at end of file
diff --git a/src/GamePlay/Block.java b/src/gameplay/Block.java
index c8940ec..68e52b6 100644
--- a/src/GamePlay/Block.java
+++ b/src/gameplay/Block.java
@@ -1,6 +1,6 @@
 //glowing block of color c (jfx node)
 
-package GamePlay;
+package gameplay;
 
 import javafx.scene.effect.BlurType;
 import javafx.scene.effect.DropShadow;
diff --git a/src/GamePlay/Driver.java b/src/gameplay/Driver.java
index 8825426..df11c31 100644
--- a/src/GamePlay/Driver.java
+++ b/src/gameplay/Driver.java
@@ -4,7 +4,7 @@
  *Teacher:
  *Description:
  */
-package GamePlay;
+package gameplay;
 
 import javafx.application.*;
 import javafx.geometry.Side;
diff --git a/src/GamePlay/Level.java b/src/gameplay/Level.java
index 25be35c..1d5ff1b 100644
--- a/src/GamePlay/Level.java
+++ b/src/gameplay/Level.java
@@ -1,4 +1,4 @@
-package GamePlay;
+package gameplay;
 
 import javafx.application.Application;
 import javafx.event.ActionEvent;
diff --git a/src/GamePlay/NoteField.java b/src/gameplay/NoteField.java
index 4713ece..a954a2c 100644
--- a/src/GamePlay/NoteField.java
+++ b/src/gameplay/NoteField.java
@@ -1,7 +1,7 @@
 /*Name:	Guitar Hero Project
  *Description: Contains the information for a single note on the field
  */
-package GamePlay;
+package gameplay;
 
 import javafx.animation.TranslateTransition;
 
diff --git a/src/GamePlay/NoteInfo.java b/src/gameplay/NoteInfo.java
index f6b1018..6428066 100644
--- a/src/GamePlay/NoteInfo.java
+++ b/src/gameplay/NoteInfo.java
@@ -1,7 +1,7 @@
 /*Name:	Guitar Hero Project
  *Description: Contains the info for when to send a note
  */
-package GamePlay;
+package gameplay;
 
 import javafx.scene.paint.Color;
 
diff --git a/src/GamePlay/Score.java b/src/gameplay/Score.java
index af3af25..8bba48a 100644
--- a/src/GamePlay/Score.java
+++ b/src/gameplay/Score.java
@@ -1,7 +1,7 @@
 /*Name:	Guitar Hero Project
  *Description: Handles all the scoring for playing songs
  */
-package GamePlay;
+package gameplay;
 
 
 public class Score
diff --git a/src/GamePlay/SongPlayer.java b/src/gameplay/SongPlayer.java
index 8ddde3a..d97dbd2 100644
--- a/src/GamePlay/SongPlayer.java
+++ b/src/gameplay/SongPlayer.java
@@ -1,4 +1,4 @@
-package GamePlay;
+package gameplay;
 
 import java.util.ArrayList;
 import java.util.LinkedList;
@@ -105,8 +105,7 @@ public class SongPlayer extends Pane {
 		genButton(jButton);
 		genButton(kButton);
 		
-		super.requestFocus();
-		super.setOnKeyPressed(e -> {
+		gui.Driver.primaryStage.getScene().setOnKeyPressed(e -> {
 			if (e.getCode() == KeyCode.D) {
 				checkNote(dLane, dButton);
 			}
diff --git a/src/GamePlay/TButton.java b/src/gameplay/TButton.java
index a8ae338..98f954c 100644
--- a/src/GamePlay/TButton.java
+++ b/src/gameplay/TButton.java
@@ -1,6 +1,6 @@
 //glowing block of color c (jfx node)
 
-package GamePlay;
+package gameplay;
 
 import javafx.scene.paint.Color;
 import javafx.scene.shape.Rectangle;
diff --git a/src/GamePlay/Timer.java b/src/gameplay/Timer.java
index 5d1ddae..1de576b 100644
--- a/src/GamePlay/Timer.java
+++ b/src/gameplay/Timer.java
@@ -2,7 +2,7 @@
  *Description: Contains the method used to determine how long the user has been playing, 
  *             used to determine when to send notes
  */
-package GamePlay;
+package gameplay;
 
 
 public class Timer
diff --git a/src/GamePlay/newSongPlayer.java b/src/gameplay/newSongPlayer.java
index 6460dcf..5bb4e9f 100644
--- a/src/GamePlay/newSongPlayer.java
+++ b/src/gameplay/newSongPlayer.java
@@ -1,4 +1,4 @@
-package GamePlay;
+package gameplay;
 
 import java.util.ArrayList;
 import java.util.LinkedList;
diff --git a/src/gui/Driver.java b/src/gui/Driver.java
index d6dc742..020d75d 100644
--- a/src/gui/Driver.java
+++ b/src/gui/Driver.java
@@ -26,8 +26,7 @@ import main.SettingsController;
 
 public class Driver extends Application 
 {
-
-    static Stage primaryStage;
+    public static Stage primaryStage;
     static Pane primaryPane = new Pane();
 
     public static SettingsController settingsController = new SettingsController();
diff --git a/src/main/Level.java b/src/main/Level.java
index d492c88..ee60d47 100644
--- a/src/main/Level.java
+++ b/src/main/Level.java
@@ -7,6 +7,15 @@ 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;
+
 public class Level 
 {
     public Image preview; //optional
@@ -16,7 +25,9 @@ public class Level
     public ArrayList<Difficulty> diffList = new ArrayList<Difficulty>();
 
     public Image background; //optional
-    public Color[] colors; //optional, have default colors
+    public Color[] colors = new Color[5];//optional, have default colors
+
+    private JSONObject levelStuff;
 
     public void setColors(Color... newColors) 
     {
@@ -24,10 +35,33 @@ public class Level
     }
 
     //all below is required for table view
-    public Level(String title, String artist)
+    public Level() throws ParseException
     {
-        this.title = new SimpleStringProperty(title);
-        this.artist = new SimpleStringProperty(artist);
+        JSONParser jsonParser = new JSONParser(); //parser to read the file
+		
+		try(FileReader reader = new FileReader(".json"))
+		{
+			Object obj = jsonParser.parse(reader); 
+			
+			levelStuff = (JSONObject)(obj); //converts read object to a JSONObject
+
+            title = (SimpleStringProperty)(levelStuff.get("title"));
+            artist = (SimpleStringProperty)(levelStuff.get("title"));
+            desc = (String)(levelStuff.get("title"));
+
+            if(( levelStuff).containsKey("color1"))
+            {
+                
+            }
+		}
+		catch (FileNotFoundException e) 
+		{
+			e.printStackTrace();
+		} 
+		catch (IOException e) 
+		{
+			e.printStackTrace();
+		}
     }
 
     public String getTitle() {