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

7 files changed, 52 insertions, 6 deletions

diff --git a/src/main/Level.java b/src/main/Level.java
new file mode 100644
index 0000000..52047fd
--- /dev/null
+++ b/src/main/Level.java
@@ -0,0 +1,25 @@
+package main;
+
+import java.io.File;
+import java.util.ArrayList;
+
+import javafx.scene.image.Image;
+import javafx.scene.paint.Color;
+
+public class Level 
+{
+    private Color[] colors;
+    private Image background;
+    private Image preview;
+    private String text;
+    private String desc;
+    //private ArrayList<String>();
+
+    //google "varargs" to see how this works
+    public void setColors(Color... newColors)
+    {
+        colors = newColors;
+    }
+
+    //INCOMPLETE
+}
diff --git a/src/main/LevelController.java b/src/main/LevelController.java
new file mode 100644
index 0000000..daf7ae3
--- /dev/null
+++ b/src/main/LevelController.java
@@ -0,0 +1 @@
+//coming soon
\ No newline at end of file
diff --git a/src/main/SettingsController.java b/src/main/SettingsController.java
new file mode 100644
index 0000000..79fb560
--- /dev/null
+++ b/src/main/SettingsController.java
@@ -0,0 +1,7 @@
+// coming soon
+// needs to have getters and setters for:
+// - sfx vol
+// - music vol
+// - full screen 
+//
+// perhaps use public variables instead of getters and setters
\ No newline at end of file
diff --git a/src/main/JFXaudioPlayer.java b/src/test/JFXaudioPlayer.java
index 0a2162d..2f12e20 100644
--- a/src/main/JFXaudioPlayer.java
+++ b/src/test/JFXaudioPlayer.java
@@ -1,16 +1,29 @@
-package main;
+package test;
 
 import java.io.File;
+import java.io.IOException;
+
+import javafx.application.Application;
+import javafx.fxml.FXMLLoader;
+import javafx.scene.Parent;
 import javafx.scene.media.Media;
 import javafx.scene.media.MediaPlayer;
+import javafx.stage.Stage;
 
-public class JFXaudioPlayer {
+public class JFXaudioPlayer extends Application{
+    
     public static void main(String[] args) 
     {
+        launch(args);
+    }
+        
+    @Override
+    public void start(Stage primaryStage) 
+    {
+        // primaryStage.show();
         String musicFile = "EXAMPLE.mp3";     // For example
         Media sound = new Media(new File(musicFile).toURI().toString());
         MediaPlayer mediaPlayer = new MediaPlayer(sound);
         mediaPlayer.play();
-        mediaPlayer.stop();
     }
 }
\ No newline at end of file
diff --git a/src/main/KeyDetection.java b/src/test/KeyDetection.java
index 7887405..447b101 100644
--- a/src/main/KeyDetection.java
+++ b/src/test/KeyDetection.java
@@ -4,7 +4,7 @@
  *Teacher:
  *Description:
  */
-package main;
+package test;
 
 import javax.swing.*;
 import java.awt.event.ActionEvent;
diff --git a/src/main/NoteTest.java b/src/test/NoteTest.java
index 34d9c8c..ce74d56 100644
--- a/src/main/NoteTest.java
+++ b/src/test/NoteTest.java
@@ -4,7 +4,7 @@
  *Teacher:
  *Description:
  */
-package main;
+package test;
 import java.awt.*;
 
 public class NoteTest
diff --git a/src/main/SongPlayer.java b/src/test/SongPlayer.java
index caf1ab7..48f859d 100644
--- a/src/main/SongPlayer.java
+++ b/src/test/SongPlayer.java
@@ -4,7 +4,7 @@
  *Teacher:
  *Description:
  */
-package main;
+package test;
 
 import java.awt.*;
 import java.awt.event.*;