diff options
| -rw-r--r-- | .classpath | 16 | ||||
| -rw-r--r-- | resources/backward.wav (renamed from src/assets/backward.wav) | bin | 34684 -> 34684 bytes | |||
| -rw-r--r-- | resources/fairyfountain.wav (renamed from src/assets/fairyfountain.wav) | bin | 31539988 -> 31539988 bytes | |||
| -rw-r--r-- | resources/forward.wav (renamed from src/assets/forward.wav) | bin | 54992 -> 54992 bytes | |||
| -rw-r--r-- | resources/hit.wav (renamed from src/assets/hit.wav) | bin | 34820 -> 34820 bytes | |||
| -rw-r--r-- | resources/miss.wav (renamed from src/assets/miss.wav) | bin | 44144 -> 44144 bytes | |||
| -rw-r--r-- | resources/mountains.png (renamed from src/assets/mountains.png) | bin | 1115601 -> 1115601 bytes | |||
| -rw-r--r-- | src/gui/Driver.java | 7 | ||||
| -rw-r--r-- | src/gui/style.css (renamed from src/assets/style.css) | 0 | ||||
| -rw-r--r-- | src/main/Level.java | 2 | ||||
| -rw-r--r-- | src/main/SoundController.java | 12 |
11 files changed, 20 insertions, 17 deletions
@@ -6,14 +6,14 @@ <attribute name="module" value="true"/> </attributes> </classpathentry> - <classpathentry kind="lib" path="lib/linux/javafx.base.jar"/> - <classpathentry kind="lib" path="lib/linux/javafx.controls.jar"/> - <classpathentry kind="lib" path="lib/linux/javafx.fxml.jar"/> - <classpathentry kind="lib" path="lib/linux/javafx.graphics.jar"/> - <classpathentry kind="lib" path="lib/linux/javafx.media.jar"/> - <classpathentry kind="lib" path="lib/linux/javafx.swing.jar"/> - <classpathentry kind="lib" path="lib/linux/javafx.web.jar"/> - <classpathentry kind="lib" path="lib/linux/javafx-swt.jar"/> + <classpathentry kind="lib" path="lib/windows/lib/javafx.base.jar"/> + <classpathentry kind="lib" path="lib/windows/lib/javafx.controls.jar"/> + <classpathentry kind="lib" path="lib/windows/lib/javafx.fxml.jar"/> + <classpathentry kind="lib" path="lib/windows/lib/javafx.graphics.jar"/> + <classpathentry kind="lib" path="lib/windows/lib/javafx.media.jar"/> + <classpathentry kind="lib" path="lib/windows/lib/javafx.swing.jar"/> + <classpathentry kind="lib" path="lib/windows/lib/javafx.web.jar"/> + <classpathentry kind="lib" path="lib/windows/lib/javafx-swt.jar"/> <classpathentry kind="lib" path="lib/json-simple-1.1.1.jar"/> <classpathentry kind="output" path="bin"/> </classpath> diff --git a/src/assets/backward.wav b/resources/backward.wav Binary files differindex e88f58d..e88f58d 100644 --- a/src/assets/backward.wav +++ b/resources/backward.wav diff --git a/src/assets/fairyfountain.wav b/resources/fairyfountain.wav Binary files differindex b6fea56..b6fea56 100644 --- a/src/assets/fairyfountain.wav +++ b/resources/fairyfountain.wav diff --git a/src/assets/forward.wav b/resources/forward.wav Binary files differindex c7b1a77..c7b1a77 100644 --- a/src/assets/forward.wav +++ b/resources/forward.wav diff --git a/src/assets/hit.wav b/resources/hit.wav Binary files differindex b9463a2..b9463a2 100644 --- a/src/assets/hit.wav +++ b/resources/hit.wav diff --git a/src/assets/miss.wav b/resources/miss.wav Binary files differindex d91a987..d91a987 100644 --- a/src/assets/miss.wav +++ b/resources/miss.wav diff --git a/src/assets/mountains.png b/resources/mountains.png Binary files differindex 39d560e..39d560e 100644 --- a/src/assets/mountains.png +++ b/resources/mountains.png diff --git a/src/gui/Driver.java b/src/gui/Driver.java index 4f840e8..b46f4c9 100644 --- a/src/gui/Driver.java +++ b/src/gui/Driver.java @@ -18,7 +18,8 @@ import javafx.stage.Stage; import main.LevelController; import main.SettingsController; import main.SoundController; -import java.io.File; +import java.nio.file.Paths; + import devmenu.DebugMenu; @@ -50,7 +51,7 @@ public class Driver extends Application primaryStage = newPrimaryStage; Scene primaryScene = new Scene(primaryPane, 800,600); - primaryScene.getStylesheets().add("assets/style.css"); + primaryScene.getStylesheets().add("gui/style.css"); primaryStage.setScene(primaryScene); primaryStage.setTitle("NPE Hero"); @@ -109,7 +110,7 @@ public class Driver extends Application public static void setMenuBackground() { - setBackground(new Image(new File("src/assets/mountains.png").toURI().toString())); + setBackground(new Image(Paths.get("resources/mountains.png").toUri().toString())); } /** diff --git a/src/assets/style.css b/src/gui/style.css index dd1de55..dd1de55 100644 --- a/src/assets/style.css +++ b/src/gui/style.css diff --git a/src/main/Level.java b/src/main/Level.java index 79f70e1..313b1fa 100644 --- a/src/main/Level.java +++ b/src/main/Level.java @@ -80,7 +80,7 @@ public class Level diffList = FXCollections.observableArrayList(); validDiffList = FXCollections.observableArrayList(); - for(File cur: thisDir.listFiles()) //iterates through all files/folders in src/assets/levels/LEVEL + for(File cur: thisDir.listFiles()) //iterates through all files/folders in /levels/LEVEL { if (cur.isDirectory()) //all subfolders within a level folder are difficulties { diff --git a/src/main/SoundController.java b/src/main/SoundController.java index 8f255da..0d7527e 100644 --- a/src/main/SoundController.java +++ b/src/main/SoundController.java @@ -1,6 +1,7 @@ package main; import java.io.File; +import java.nio.file.Paths; import java.util.HashMap; import gui.Driver; @@ -13,17 +14,18 @@ public class SoundController public MediaPlayer songMediaPlayer; public MediaPlayer sfxMediaPlayer; private HashMap<String,MediaPlayer> effects = new HashMap<>(); - private File mainMenuSong = new File("src/assets/fairyfountain.wav"); + private File mainMenuSong = Paths.get("resources/fairyfountain.wav").toFile(); + /** * creates a new sound controller and starts playing the main menu music */ public SoundController() { - effects.put("hit", new MediaPlayer(new Media(new File("src/assets/hit.wav").toURI().toString()))); - effects.put("miss", new MediaPlayer(new Media(new File("src/assets/miss.wav").toURI().toString()))); - effects.put("forward", new MediaPlayer(new Media(new File("src/assets/forward.wav").toURI().toString()))); - effects.put("backward", new MediaPlayer(new Media(new File("src/assets/backward.wav").toURI().toString()))); + effects.put("hit", new MediaPlayer(new Media(Paths.get("resources/hit.wav").toUri().toString()))); + effects.put("miss", new MediaPlayer(new Media(Paths.get("resources/miss.wav").toUri().toString()))); + effects.put("forward", new MediaPlayer(new Media(Paths.get("resources/forward.wav").toUri().toString()))); + effects.put("backward", new MediaPlayer(new Media(Paths.get("resources/backward.wav").toUri().toString()))); effects.forEach((key,value) -> { value.volumeProperty().bind(Driver.settingsController.effectsVol); }); |
