These are zachs changes to level controller

4 files changed, 17 insertions, 9 deletions

diff --git a/src/gameplay/SongPlayer.java b/src/gameplay/SongPlayer.java
index d97dbd2..e8d6c7b 100644
--- a/src/gameplay/SongPlayer.java
+++ b/src/gameplay/SongPlayer.java
@@ -18,7 +18,8 @@ import main.Difficulty;
 import main.ScoreController;
 
 public class SongPlayer extends Pane {
-	Timer timer = new Timer(60);
+	private int bpm = 83;
+	Timer timer = new Timer(bpm);
 	final int TIME = 1500; // delay for notes falling down the screen
 
 	Score scoreCounter = new Score();
@@ -159,7 +160,7 @@ public class SongPlayer extends Pane {
 	 * @param c     the color of the sent note
 	 */
 	public void sendNote(Queue<NoteInfo> sends, ArrayList<Block> lane, double pos, Color c) {
-		if (sends.peek() != null && timer.time() > sends.peek().getTime()) {
+		if (sends.peek() != null && timer.time() > sends.peek().getTime()-(TIME*bpm/60000)) {
 			TranslateTransition anim = new TranslateTransition(Duration.millis(TIME));
 
 			lane.add(new Block(c, 50, 50, 5));
@@ -191,7 +192,7 @@ public class SongPlayer extends Pane {
 	 * 
 	 * @param button
 	 */
-	public void genButton(TButton button) {
+	private void genButton(TButton button) {
 		button.heightProperty().bind(super.widthProperty().divide(8));
 		button.widthProperty().bind(super.widthProperty().divide(8));
 		button.arcHeightProperty().bind(super.widthProperty().divide(25));
diff --git a/src/gui/Driver.java b/src/gui/Driver.java
index 020d75d..68a703a 100644
--- a/src/gui/Driver.java
+++ b/src/gui/Driver.java
@@ -23,6 +23,8 @@ import javafx.scene.layout.Pane;
 import javafx.stage.Stage;
 import main.LevelController;
 import main.SettingsController;
+import org.json.simple.parser.ParseException;
+
 
 public class Driver extends Application 
 {
diff --git a/src/main/Level.java b/src/main/Level.java
index ee60d47..8909e5b 100644
--- a/src/main/Level.java
+++ b/src/main/Level.java
@@ -35,11 +35,11 @@ public class Level
     }
 
     //all below is required for table view
-    public Level() throws ParseException
+    public Level()
     {
         JSONParser jsonParser = new JSONParser(); //parser to read the file
 		
-		try(FileReader reader = new FileReader(".json"))
+		try(FileReader reader = new FileReader("metadata.json"))
 		{
 			Object obj = jsonParser.parse(reader); 
 			
@@ -61,7 +61,10 @@ public class Level
 		catch (IOException e) 
 		{
 			e.printStackTrace();
-		}
+		} catch (ParseException e) {
+            // TODO Auto-generated catch block
+            e.printStackTrace();
+        }
     }
 
     public String getTitle() {
diff --git a/src/main/LevelController.java b/src/main/LevelController.java
index 3e10ed3..4ba34e1 100644
--- a/src/main/LevelController.java
+++ b/src/main/LevelController.java
@@ -1,5 +1,7 @@
 package main;
 
+import org.json.simple.parser.ParseException;
+
 import javafx.collections.FXCollections;
 import javafx.collections.ObservableList;
 import javafx.scene.image.Image;
@@ -28,16 +30,16 @@ public class LevelController
         Difficulty d5 = new Difficulty();
         d5.title = "Impossible";
 
-        Level testLevel = new Level("test level class","testArtist");
+        Level testLevel = new Level();
         //testLevel.setTitle("test level class");
         testLevel.desc = "this level is being used to test the LevelController class";
-        //testLevel.setAritst("testArtist");
+        //testLevel.setArtist("testArtist");
         testLevel.setColors(Color.RED, Color.BLUE, Color.GREEN, Color.ORANGE, Color.PURPLE);
         testLevel.diffList.add(d1);
         testLevel.diffList.add(d2);
         levelList.add(testLevel);
 
-        Level testLevel2 = new Level("another one", "testArtist2");
+        Level testLevel2 = new Level();
         //testLevel2.setTitle("another one");
         testLevel2.desc = "it can say something else too";
         //testLevel2.setAritst("testArtist2");