From 5951f6b55f20981f411a06d98fb686acc4da394e Mon Sep 17 00:00:00 2001 From: sowgro Date: Thu, 8 Jun 2023 02:50:36 -0400 Subject: move resources out of src so they can be read from a jar --- .classpath | 16 +-- resources/backward.wav | Bin 0 -> 34684 bytes resources/fairyfountain.wav | Bin 0 -> 31539988 bytes resources/forward.wav | Bin 0 -> 54992 bytes resources/hit.wav | Bin 0 -> 34820 bytes resources/miss.wav | Bin 0 -> 44144 bytes resources/mountains.png | Bin 0 -> 1115601 bytes src/assets/backward.wav | Bin 34684 -> 0 bytes src/assets/fairyfountain.wav | Bin 31539988 -> 0 bytes src/assets/forward.wav | Bin 54992 -> 0 bytes src/assets/hit.wav | Bin 34820 -> 0 bytes src/assets/miss.wav | Bin 44144 -> 0 bytes src/assets/mountains.png | Bin 1115601 -> 0 bytes src/assets/style.css | 236 ------------------------------------------ src/gui/Driver.java | 7 +- src/gui/style.css | 236 ++++++++++++++++++++++++++++++++++++++++++ src/main/Level.java | 2 +- src/main/SoundController.java | 12 ++- 18 files changed, 256 insertions(+), 253 deletions(-) create mode 100644 resources/backward.wav create mode 100644 resources/fairyfountain.wav create mode 100644 resources/forward.wav create mode 100644 resources/hit.wav create mode 100644 resources/miss.wav create mode 100644 resources/mountains.png delete mode 100644 src/assets/backward.wav delete mode 100644 src/assets/fairyfountain.wav delete mode 100644 src/assets/forward.wav delete mode 100644 src/assets/hit.wav delete mode 100644 src/assets/miss.wav delete mode 100644 src/assets/mountains.png delete mode 100644 src/assets/style.css create mode 100644 src/gui/style.css diff --git a/.classpath b/.classpath index 162c77b..4d50168 100644 --- a/.classpath +++ b/.classpath @@ -6,14 +6,14 @@ - - - - - - - - + + + + + + + + diff --git a/resources/backward.wav b/resources/backward.wav new file mode 100644 index 0000000..e88f58d Binary files /dev/null and b/resources/backward.wav differ diff --git a/resources/fairyfountain.wav b/resources/fairyfountain.wav new file mode 100644 index 0000000..b6fea56 Binary files /dev/null and b/resources/fairyfountain.wav differ diff --git a/resources/forward.wav b/resources/forward.wav new file mode 100644 index 0000000..c7b1a77 Binary files /dev/null and b/resources/forward.wav differ diff --git a/resources/hit.wav b/resources/hit.wav new file mode 100644 index 0000000..b9463a2 Binary files /dev/null and b/resources/hit.wav differ diff --git a/resources/miss.wav b/resources/miss.wav new file mode 100644 index 0000000..d91a987 Binary files /dev/null and b/resources/miss.wav differ diff --git a/resources/mountains.png b/resources/mountains.png new file mode 100644 index 0000000..39d560e Binary files /dev/null and b/resources/mountains.png differ diff --git a/src/assets/backward.wav b/src/assets/backward.wav deleted file mode 100644 index e88f58d..0000000 Binary files a/src/assets/backward.wav and /dev/null differ diff --git a/src/assets/fairyfountain.wav b/src/assets/fairyfountain.wav deleted file mode 100644 index b6fea56..0000000 Binary files a/src/assets/fairyfountain.wav and /dev/null differ diff --git a/src/assets/forward.wav b/src/assets/forward.wav deleted file mode 100644 index c7b1a77..0000000 Binary files a/src/assets/forward.wav and /dev/null differ diff --git a/src/assets/hit.wav b/src/assets/hit.wav deleted file mode 100644 index b9463a2..0000000 Binary files a/src/assets/hit.wav and /dev/null differ diff --git a/src/assets/miss.wav b/src/assets/miss.wav deleted file mode 100644 index d91a987..0000000 Binary files a/src/assets/miss.wav and /dev/null differ diff --git a/src/assets/mountains.png b/src/assets/mountains.png deleted file mode 100644 index 39d560e..0000000 Binary files a/src/assets/mountains.png and /dev/null differ diff --git a/src/assets/style.css b/src/assets/style.css deleted file mode 100644 index dd1de55..0000000 --- a/src/assets/style.css +++ /dev/null @@ -1,236 +0,0 @@ -@import url('https://fonts.googleapis.com/css2?family=Space+Mono&display=swap'); - -/* global */ - -.root{ - -fx-font-family: "space mono"; -} - -/* button */ - -.button { - -fx-background-color: rgba(0, 0, 0, 0.5); - -fx-text-fill: white; - -fx-border-color: transparent; - -fx-border-width: 3; - -fx-border-radius: 5; - -fx-font-size: 25; - -fx-background-radius: 5; -} - -.button:hover { - -fx-background-color: rgb(50, 50, 50, 0.5); -} - -.button:focused { - -fx-background-color: rgb(50, 50, 50, 0.5); - -fx-border-color: rgb(255, 255, 255); -} - -.button:selected { - -fx-background-color: rgb(255, 255, 255); - -fx-text-fill: rgb(0, 0, 0); - -} - -.button:pressed{ - -fx-background-color: rgb(231, 231, 231); - -fx-border-color: transparent; - -fx-text-fill: rgb(0, 0, 0); -} - -/* table */ - -TableView { - -fx-background-color: rgba(0, 0, 0, 0.5); - -fx-background-radius: 5; - -fx-padding: 5; -} - -.table-view .column-header-background .filler { - -fx-background-color: transparent; -} - -.table-view .table-cell{ - -fx-border-color: transparent; -} - -.table-view .column-header-background{ - -fx-background-color: transparent; -} - -.table-cell { - -fx-padding: .5em; -} - -.table-view .column-header { - -fx-text-background-color: rgb(168, 168, 168); - -fx-background-color: transparent; -} - -.table-row-cell { - -fx-cell-size: 40; - -fx-background-color: transparent; - -fx-background-radius: 3; - -fx-text-background-color: rgb(255, 255, 255); - /* -fx-border-width: 3; */ - /* -fx-border-radius: 5; */ - /* -fx-border-color: transparent; */ -} - -.table-row-cell:hover { - -fx-background-color: rgba(100, 100, 100, 0.5); - -} - -TableView:focused { - -fx-effect: null; -} - -TableView:focused .list-cell:focused { - -fx-background-color: rgb(50, 50, 50, 0.5); - /* -fx-border-color: rgb(255, 255, 255); */ -} - -.table-view .corner { - -fx-background-color: transparent; - -fx-border-color: transparent; -} - -.table-row-cell:selected { - -fx-background-color: rgb(255, 255, 255); - -fx-text-background-color: rgb(0, 0, 0); -} - -.table-row-cell:pressed { - -fx-background-color: rgb(231, 231, 231); - /* -fx-border-color: transparent; */ -} - -.table-row-cell:empty { - -fx-background-color: transparent; - /* -fx-border-color: transparent; */ - -fx-text-background-color: white; -} - -.unselectable .table-row-cell{ - -fx-background-color: transparent; - /* -fx-border-color: transparent; */ - -fx-text-background-color: white; -} - -/* slider */ - -Slider { - -fx-padding: 1em; -} - -.track { - - -fx-padding: 3; - -fx-background-color: rgba(0, 0, 0, 0.5); - -fx-background-radius: 5; -} - -.thumb { - -fx-pref-height: 30; - -fx-prefer-width: 30; - -fx-background-color: rgba(0, 0, 0, 0.5); - -fx-size: 25; - -fx-border-radius: 5; - -fx-border-color: rgb(231, 231, 231); - -fx-border-width: 3; -} - -.thumb:hover { - -fx-background-color: rgb(50, 50, 50, 0.5); -} - -Slider:focused .thumb{ - -fx-background-color: rgb(255,255,255); - -fx-border-color: white; -} - -.thumb:pressed { - -fx-background-color: rgb(231, 231, 231); - -fx-border-color: rgb(231, 231, 231); -} - -/* scroll bars */ - -.scroll-bar:horizontal , -.scroll-bar:vertical{ - -fx-font-size: 5px; - -fx-background-color :transparent; - -fx-border-color :transparent; - -fx-background-radius : 0.0em; - -fx-border-radius :2.0em; -} - -.increment-button ,.decrement-button { - -fx-background-color:transparent; - -fx-border-color:transparent; -} - -.scroll-bar:horizontal .track , -.scroll-bar:vertical .track{ - -fx-background-color: rgba(0, 0, 0, 0.5); - -fx-background-radius: 5em; -} - -.scroll-bar:horizontal .thumb, -.scroll-bar:vertical .thumb { - -fx-background-color:white; - -fx-background-radius: 5em; - -fx-border-width: 0; - -} - -.scroll-bar .thumb:pressed { - -fx-background-color: rgb(231, 231, 231); -} - -/* text */ - -.t0 { - -fx-font-size: 125; - -fx-fill: black; -} - -.t1 { - -fx-font-size: 50; - -fx-fill: white; -} - -.t11 { - -fx-font-size: 50; - -fx-fill: black; -} - -.t2 { - -fx-font-size: 30; - -fx-fill: white; -} - -.t3 { - -fx-fill: white; -} - -/* text box */ - -.box { - -fx-background-radius: 5; - -fx-background-color: rgba(0, 0, 0, 0.5); - -fx-text-fill: white; -} - -/* debug */ - -.debug { - /* -fx-background-radius: 5; */ - -fx-background-color: rgb(255, 0, 0); - /* -fx-border-color: red; */ - /* -fx-text-fill: white; */ - /* -fx-border-width: 20; */ -} - 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/gui/style.css b/src/gui/style.css new file mode 100644 index 0000000..dd1de55 --- /dev/null +++ b/src/gui/style.css @@ -0,0 +1,236 @@ +@import url('https://fonts.googleapis.com/css2?family=Space+Mono&display=swap'); + +/* global */ + +.root{ + -fx-font-family: "space mono"; +} + +/* button */ + +.button { + -fx-background-color: rgba(0, 0, 0, 0.5); + -fx-text-fill: white; + -fx-border-color: transparent; + -fx-border-width: 3; + -fx-border-radius: 5; + -fx-font-size: 25; + -fx-background-radius: 5; +} + +.button:hover { + -fx-background-color: rgb(50, 50, 50, 0.5); +} + +.button:focused { + -fx-background-color: rgb(50, 50, 50, 0.5); + -fx-border-color: rgb(255, 255, 255); +} + +.button:selected { + -fx-background-color: rgb(255, 255, 255); + -fx-text-fill: rgb(0, 0, 0); + +} + +.button:pressed{ + -fx-background-color: rgb(231, 231, 231); + -fx-border-color: transparent; + -fx-text-fill: rgb(0, 0, 0); +} + +/* table */ + +TableView { + -fx-background-color: rgba(0, 0, 0, 0.5); + -fx-background-radius: 5; + -fx-padding: 5; +} + +.table-view .column-header-background .filler { + -fx-background-color: transparent; +} + +.table-view .table-cell{ + -fx-border-color: transparent; +} + +.table-view .column-header-background{ + -fx-background-color: transparent; +} + +.table-cell { + -fx-padding: .5em; +} + +.table-view .column-header { + -fx-text-background-color: rgb(168, 168, 168); + -fx-background-color: transparent; +} + +.table-row-cell { + -fx-cell-size: 40; + -fx-background-color: transparent; + -fx-background-radius: 3; + -fx-text-background-color: rgb(255, 255, 255); + /* -fx-border-width: 3; */ + /* -fx-border-radius: 5; */ + /* -fx-border-color: transparent; */ +} + +.table-row-cell:hover { + -fx-background-color: rgba(100, 100, 100, 0.5); + +} + +TableView:focused { + -fx-effect: null; +} + +TableView:focused .list-cell:focused { + -fx-background-color: rgb(50, 50, 50, 0.5); + /* -fx-border-color: rgb(255, 255, 255); */ +} + +.table-view .corner { + -fx-background-color: transparent; + -fx-border-color: transparent; +} + +.table-row-cell:selected { + -fx-background-color: rgb(255, 255, 255); + -fx-text-background-color: rgb(0, 0, 0); +} + +.table-row-cell:pressed { + -fx-background-color: rgb(231, 231, 231); + /* -fx-border-color: transparent; */ +} + +.table-row-cell:empty { + -fx-background-color: transparent; + /* -fx-border-color: transparent; */ + -fx-text-background-color: white; +} + +.unselectable .table-row-cell{ + -fx-background-color: transparent; + /* -fx-border-color: transparent; */ + -fx-text-background-color: white; +} + +/* slider */ + +Slider { + -fx-padding: 1em; +} + +.track { + + -fx-padding: 3; + -fx-background-color: rgba(0, 0, 0, 0.5); + -fx-background-radius: 5; +} + +.thumb { + -fx-pref-height: 30; + -fx-prefer-width: 30; + -fx-background-color: rgba(0, 0, 0, 0.5); + -fx-size: 25; + -fx-border-radius: 5; + -fx-border-color: rgb(231, 231, 231); + -fx-border-width: 3; +} + +.thumb:hover { + -fx-background-color: rgb(50, 50, 50, 0.5); +} + +Slider:focused .thumb{ + -fx-background-color: rgb(255,255,255); + -fx-border-color: white; +} + +.thumb:pressed { + -fx-background-color: rgb(231, 231, 231); + -fx-border-color: rgb(231, 231, 231); +} + +/* scroll bars */ + +.scroll-bar:horizontal , +.scroll-bar:vertical{ + -fx-font-size: 5px; + -fx-background-color :transparent; + -fx-border-color :transparent; + -fx-background-radius : 0.0em; + -fx-border-radius :2.0em; +} + +.increment-button ,.decrement-button { + -fx-background-color:transparent; + -fx-border-color:transparent; +} + +.scroll-bar:horizontal .track , +.scroll-bar:vertical .track{ + -fx-background-color: rgba(0, 0, 0, 0.5); + -fx-background-radius: 5em; +} + +.scroll-bar:horizontal .thumb, +.scroll-bar:vertical .thumb { + -fx-background-color:white; + -fx-background-radius: 5em; + -fx-border-width: 0; + +} + +.scroll-bar .thumb:pressed { + -fx-background-color: rgb(231, 231, 231); +} + +/* text */ + +.t0 { + -fx-font-size: 125; + -fx-fill: black; +} + +.t1 { + -fx-font-size: 50; + -fx-fill: white; +} + +.t11 { + -fx-font-size: 50; + -fx-fill: black; +} + +.t2 { + -fx-font-size: 30; + -fx-fill: white; +} + +.t3 { + -fx-fill: white; +} + +/* text box */ + +.box { + -fx-background-radius: 5; + -fx-background-color: rgba(0, 0, 0, 0.5); + -fx-text-fill: white; +} + +/* debug */ + +.debug { + /* -fx-background-radius: 5; */ + -fx-background-color: rgb(255, 0, 0); + /* -fx-border-color: red; */ + /* -fx-text-fill: white; */ + /* -fx-border-width: 20; */ +} + 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 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); }); -- cgit v1.2.3