From 8bb7799ae0abee76e14a96512c27d5c2acf96aeb Mon Sep 17 00:00:00 2001 From: Scott Stamp Date: Sun, 14 Oct 2018 21:31:28 -0230 Subject: [PATCH] Broke all resource files out into the resources folder Maven's happier this way --- Extensions/AdminOnConnect/pom.xml | 2 +- Extensions/BlockReplacePackets/pom.xml | 2 +- .../BlockAndReplacePackets.java | 2 +- Extensions/SpeechColorizer/pom.xml | 2 +- G-Earth-UI/pom.xml | 19 +++--------------- G-Earth-UI/src/main/java/gearth/Main.java | 4 ++-- .../java/gearth/ui/buttons/BoxButton.java | 4 ++-- .../gearth/ui/buttons/PauseResumeButton.java | 9 ++++----- .../ui/logger/loggerdisplays/UiLogger.java | 2 +- .../gearth/ui/G-Earth.fxml | 0 .../gearth/ui/UiLogger.fxml} | 0 .../gearth/ui/bootstrap3.css | 0 .../gearth/ui/buttons/files/ButtonDelete.png | Bin .../ui/buttons/files/ButtonDeleteHover.png | Bin .../gearth/ui/buttons/files/ButtonEdit.png | Bin .../ui/buttons/files/ButtonEditHover.png | Bin .../gearth/ui/buttons/files/ButtonExit.png | Bin .../ui/buttons/files/ButtonExitHover.png | Bin .../gearth/ui/buttons/files/ButtonFire.png | Bin .../ui/buttons/files/ButtonFireHover.png | Bin .../gearth/ui/buttons/files/ButtonPause.png | Bin .../ui/buttons/files/ButtonPauseHover.png | Bin .../gearth/ui/buttons/files/ButtonReload.png | Bin .../ui/buttons/files/ButtonReloadHover.png | Bin .../gearth/ui/buttons/files/ButtonResume.png | Bin .../ui/buttons/files/ButtonResumeHover.png | Bin .../gearth/ui/connection/Connection.fxml | 0 .../gearth/ui/extensions/Extensions.fxml | 0 .../gearth/ui/info/Info.fxml | 0 .../gearth/ui/injection/Injection.fxml | 0 .../{java => resources}/gearth/ui/logger.css | 0 .../gearth/ui/logger/Logger.fxml | 0 .../gearth/ui/scheduler/Scheduler.fxml | 0 .../gearth/ui/settings/Settings.fxml | 0 .../gearth/ui/tools/Tools.fxml | 0 35 files changed, 16 insertions(+), 30 deletions(-) rename G-Earth-UI/src/main/{java => resources}/gearth/ui/G-Earth.fxml (100%) rename G-Earth-UI/src/main/{java/gearth/ui/Logger.fxml => resources/gearth/ui/UiLogger.fxml} (100%) rename G-Earth-UI/src/main/{java => resources}/gearth/ui/bootstrap3.css (100%) rename G-Earth-UI/src/main/{java => resources}/gearth/ui/buttons/files/ButtonDelete.png (100%) rename G-Earth-UI/src/main/{java => resources}/gearth/ui/buttons/files/ButtonDeleteHover.png (100%) rename G-Earth-UI/src/main/{java => resources}/gearth/ui/buttons/files/ButtonEdit.png (100%) rename G-Earth-UI/src/main/{java => resources}/gearth/ui/buttons/files/ButtonEditHover.png (100%) rename G-Earth-UI/src/main/{java => resources}/gearth/ui/buttons/files/ButtonExit.png (100%) rename G-Earth-UI/src/main/{java => resources}/gearth/ui/buttons/files/ButtonExitHover.png (100%) rename G-Earth-UI/src/main/{java => resources}/gearth/ui/buttons/files/ButtonFire.png (100%) rename G-Earth-UI/src/main/{java => resources}/gearth/ui/buttons/files/ButtonFireHover.png (100%) rename G-Earth-UI/src/main/{java => resources}/gearth/ui/buttons/files/ButtonPause.png (100%) rename G-Earth-UI/src/main/{java => resources}/gearth/ui/buttons/files/ButtonPauseHover.png (100%) rename G-Earth-UI/src/main/{java => resources}/gearth/ui/buttons/files/ButtonReload.png (100%) rename G-Earth-UI/src/main/{java => resources}/gearth/ui/buttons/files/ButtonReloadHover.png (100%) rename G-Earth-UI/src/main/{java => resources}/gearth/ui/buttons/files/ButtonResume.png (100%) rename G-Earth-UI/src/main/{java => resources}/gearth/ui/buttons/files/ButtonResumeHover.png (100%) rename G-Earth-UI/src/main/{java => resources}/gearth/ui/connection/Connection.fxml (100%) rename G-Earth-UI/src/main/{java => resources}/gearth/ui/extensions/Extensions.fxml (100%) rename G-Earth-UI/src/main/{java => resources}/gearth/ui/info/Info.fxml (100%) rename G-Earth-UI/src/main/{java => resources}/gearth/ui/injection/Injection.fxml (100%) rename G-Earth-UI/src/main/{java => resources}/gearth/ui/logger.css (100%) rename G-Earth-UI/src/main/{java => resources}/gearth/ui/logger/Logger.fxml (100%) rename G-Earth-UI/src/main/{java => resources}/gearth/ui/scheduler/Scheduler.fxml (100%) rename G-Earth-UI/src/main/{java => resources}/gearth/ui/settings/Settings.fxml (100%) rename G-Earth-UI/src/main/{java => resources}/gearth/ui/tools/Tools.fxml (100%) diff --git a/Extensions/AdminOnConnect/pom.xml b/Extensions/AdminOnConnect/pom.xml index 7a5eab6..dafe978 100644 --- a/Extensions/AdminOnConnect/pom.xml +++ b/Extensions/AdminOnConnect/pom.xml @@ -103,7 +103,7 @@ G-Earth G-Earth-UI - 0.0.1-beta + 0.1.2-beta diff --git a/Extensions/BlockReplacePackets/pom.xml b/Extensions/BlockReplacePackets/pom.xml index 1eb4c34..f4874a4 100644 --- a/Extensions/BlockReplacePackets/pom.xml +++ b/Extensions/BlockReplacePackets/pom.xml @@ -128,7 +128,7 @@ G-Earth G-Earth-UI - 0.0.1-beta + 0.1.2-beta diff --git a/Extensions/BlockReplacePackets/src/main/java/extensions/blockreplacepackets/BlockAndReplacePackets.java b/Extensions/BlockReplacePackets/src/main/java/extensions/blockreplacepackets/BlockAndReplacePackets.java index fb0361e..623d485 100644 --- a/Extensions/BlockReplacePackets/src/main/java/extensions/blockreplacepackets/BlockAndReplacePackets.java +++ b/Extensions/BlockReplacePackets/src/main/java/extensions/blockreplacepackets/BlockAndReplacePackets.java @@ -52,6 +52,6 @@ public class BlockAndReplacePackets extends ExtensionForm { primaryStage.setTitle("Packet blocker &/ replacer"); primaryStage.setScene(new Scene(root, 580, 262)); - primaryStage.getScene().getStylesheets().add(GEarthController.class.getResource("bootstrap3.css").toExternalForm()); + primaryStage.getScene().getStylesheets().add(GEarthController.class.getResource("/gearth/ui/bootstrap3.css").toExternalForm()); } } diff --git a/Extensions/SpeechColorizer/pom.xml b/Extensions/SpeechColorizer/pom.xml index 54ae551..0d67718 100644 --- a/Extensions/SpeechColorizer/pom.xml +++ b/Extensions/SpeechColorizer/pom.xml @@ -126,7 +126,7 @@ G-Earth G-Earth-UI - 0.0.1-beta + 0.1.2-beta diff --git a/G-Earth-UI/pom.xml b/G-Earth-UI/pom.xml index 2643b90..af2ede1 100644 --- a/G-Earth-UI/pom.xml +++ b/G-Earth-UI/pom.xml @@ -8,28 +8,15 @@ jar - 0.0.1-beta + 0.1.2-beta G-Earth G-Earth-Parent - 0.0.1-beta + 0.1.2-beta - - - - false - src/main/java - - **/*.fxml - **/*.css - **/*.png - - - - org.apache.maven.plugins @@ -109,7 +96,7 @@ - ${project.parent.basedir}/bin + ${project.build.directory}/bin gearth.Main diff --git a/G-Earth-UI/src/main/java/gearth/Main.java b/G-Earth-UI/src/main/java/gearth/Main.java index d12c66b..ee1b8df 100644 --- a/G-Earth-UI/src/main/java/gearth/Main.java +++ b/G-Earth-UI/src/main/java/gearth/Main.java @@ -14,7 +14,7 @@ public class Main extends Application { @Override public void start(Stage primaryStage) throws Exception{ - FXMLLoader loader = new FXMLLoader(GEarthController.class.getResource("G-Earth.fxml")); + FXMLLoader loader = new FXMLLoader(getClass().getResource("/gearth/ui/G-Earth.fxml")); Parent root = loader.load(); GEarthController companion = loader.getController(); @@ -25,7 +25,7 @@ public class Main extends Application { primaryStage.setTitle("G-Earth"); primaryStage.setScene(new Scene(root, 620, 295)); primaryStage.show(); - primaryStage.getScene().getStylesheets().add(GEarthController.class.getResource("bootstrap3.css").toExternalForm()); + primaryStage.getScene().getStylesheets().add(getClass().getResource("/gearth/ui/bootstrap3.css").toExternalForm()); primaryStage.setOnCloseRequest( event -> { companion.abort(); diff --git a/G-Earth-UI/src/main/java/gearth/ui/buttons/BoxButton.java b/G-Earth-UI/src/main/java/gearth/ui/buttons/BoxButton.java index 0afd90c..d7f69a9 100644 --- a/G-Earth-UI/src/main/java/gearth/ui/buttons/BoxButton.java +++ b/G-Earth-UI/src/main/java/gearth/ui/buttons/BoxButton.java @@ -18,8 +18,8 @@ public class BoxButton extends StackPane { //paths zijn relatief aan deze classpath public BoxButton(String imageName, String imageOnHoverName) { - this.image = new Image(getClass().getResourceAsStream("files/" + imageName)); - this.imageOnHover = new Image(getClass().getResourceAsStream("files/" + imageOnHoverName)); + this.image = new Image(getClass().getResourceAsStream("/gearth/ui/buttons/files/" + imageName)); + this.imageOnHover = new Image(getClass().getResourceAsStream("/gearth/ui/buttons/files/" + imageOnHoverName)); this.imageView = new ImageView(); setCursor(Cursor.DEFAULT); diff --git a/G-Earth-UI/src/main/java/gearth/ui/buttons/PauseResumeButton.java b/G-Earth-UI/src/main/java/gearth/ui/buttons/PauseResumeButton.java index 9f50777..4416aed 100644 --- a/G-Earth-UI/src/main/java/gearth/ui/buttons/PauseResumeButton.java +++ b/G-Earth-UI/src/main/java/gearth/ui/buttons/PauseResumeButton.java @@ -8,7 +8,6 @@ import javafx.scene.image.ImageView; import javafx.scene.input.MouseEvent; import javafx.scene.layout.StackPane; -import java.io.File; import java.util.ArrayList; import java.util.List; @@ -32,10 +31,10 @@ public class PauseResumeButton extends StackPane{ public PauseResumeButton(boolean isPaused) { this.isPaused[0] = isPaused; - this.imagePause = new Image(getClass().getResourceAsStream("files/ButtonPause.png")); - this.imagePauseOnHover = new Image(getClass().getResourceAsStream("files/ButtonPauseHover.png")); - this.imageResume = new Image(getClass().getResourceAsStream("files/ButtonResume.png")); - this.imageResumeOnHover = new Image(getClass().getResourceAsStream("files/ButtonResumeHover.png")); + this.imagePause = new Image(getClass().getResourceAsStream("/gearth/ui/buttons/files/ButtonPause.png")); + this.imagePauseOnHover = new Image(getClass().getResourceAsStream("/gearth/ui/buttons/files/ButtonPauseHover.png")); + this.imageResume = new Image(getClass().getResourceAsStream("/gearth/ui/buttons/files/ButtonResume.png")); + this.imageResumeOnHover = new Image(getClass().getResourceAsStream("/gearth/ui/buttons/files/ButtonResumeHover.png")); this.imageView = new ImageView(); setCursor(Cursor.DEFAULT); diff --git a/G-Earth-UI/src/main/java/gearth/ui/logger/loggerdisplays/UiLogger.java b/G-Earth-UI/src/main/java/gearth/ui/logger/loggerdisplays/UiLogger.java index 1c54569..68b33cb 100644 --- a/G-Earth-UI/src/main/java/gearth/ui/logger/loggerdisplays/UiLogger.java +++ b/G-Earth-UI/src/main/java/gearth/ui/logger/loggerdisplays/UiLogger.java @@ -23,7 +23,7 @@ public class UiLogger implements PacketLogger { @Override public void start() { - FXMLLoader loader = new FXMLLoader(getClass().getResource("/gearth/ui/Logger.fxml")); + FXMLLoader loader = new FXMLLoader(getClass().getResource("/gearth/ui/UiLogger.fxml")); try { Parent root = loader.load(); diff --git a/G-Earth-UI/src/main/java/gearth/ui/G-Earth.fxml b/G-Earth-UI/src/main/resources/gearth/ui/G-Earth.fxml similarity index 100% rename from G-Earth-UI/src/main/java/gearth/ui/G-Earth.fxml rename to G-Earth-UI/src/main/resources/gearth/ui/G-Earth.fxml diff --git a/G-Earth-UI/src/main/java/gearth/ui/Logger.fxml b/G-Earth-UI/src/main/resources/gearth/ui/UiLogger.fxml similarity index 100% rename from G-Earth-UI/src/main/java/gearth/ui/Logger.fxml rename to G-Earth-UI/src/main/resources/gearth/ui/UiLogger.fxml diff --git a/G-Earth-UI/src/main/java/gearth/ui/bootstrap3.css b/G-Earth-UI/src/main/resources/gearth/ui/bootstrap3.css similarity index 100% rename from G-Earth-UI/src/main/java/gearth/ui/bootstrap3.css rename to G-Earth-UI/src/main/resources/gearth/ui/bootstrap3.css diff --git a/G-Earth-UI/src/main/java/gearth/ui/buttons/files/ButtonDelete.png b/G-Earth-UI/src/main/resources/gearth/ui/buttons/files/ButtonDelete.png similarity index 100% rename from G-Earth-UI/src/main/java/gearth/ui/buttons/files/ButtonDelete.png rename to G-Earth-UI/src/main/resources/gearth/ui/buttons/files/ButtonDelete.png diff --git a/G-Earth-UI/src/main/java/gearth/ui/buttons/files/ButtonDeleteHover.png b/G-Earth-UI/src/main/resources/gearth/ui/buttons/files/ButtonDeleteHover.png similarity index 100% rename from G-Earth-UI/src/main/java/gearth/ui/buttons/files/ButtonDeleteHover.png rename to G-Earth-UI/src/main/resources/gearth/ui/buttons/files/ButtonDeleteHover.png diff --git a/G-Earth-UI/src/main/java/gearth/ui/buttons/files/ButtonEdit.png b/G-Earth-UI/src/main/resources/gearth/ui/buttons/files/ButtonEdit.png similarity index 100% rename from G-Earth-UI/src/main/java/gearth/ui/buttons/files/ButtonEdit.png rename to G-Earth-UI/src/main/resources/gearth/ui/buttons/files/ButtonEdit.png diff --git a/G-Earth-UI/src/main/java/gearth/ui/buttons/files/ButtonEditHover.png b/G-Earth-UI/src/main/resources/gearth/ui/buttons/files/ButtonEditHover.png similarity index 100% rename from G-Earth-UI/src/main/java/gearth/ui/buttons/files/ButtonEditHover.png rename to G-Earth-UI/src/main/resources/gearth/ui/buttons/files/ButtonEditHover.png diff --git a/G-Earth-UI/src/main/java/gearth/ui/buttons/files/ButtonExit.png b/G-Earth-UI/src/main/resources/gearth/ui/buttons/files/ButtonExit.png similarity index 100% rename from G-Earth-UI/src/main/java/gearth/ui/buttons/files/ButtonExit.png rename to G-Earth-UI/src/main/resources/gearth/ui/buttons/files/ButtonExit.png diff --git a/G-Earth-UI/src/main/java/gearth/ui/buttons/files/ButtonExitHover.png b/G-Earth-UI/src/main/resources/gearth/ui/buttons/files/ButtonExitHover.png similarity index 100% rename from G-Earth-UI/src/main/java/gearth/ui/buttons/files/ButtonExitHover.png rename to G-Earth-UI/src/main/resources/gearth/ui/buttons/files/ButtonExitHover.png diff --git a/G-Earth-UI/src/main/java/gearth/ui/buttons/files/ButtonFire.png b/G-Earth-UI/src/main/resources/gearth/ui/buttons/files/ButtonFire.png similarity index 100% rename from G-Earth-UI/src/main/java/gearth/ui/buttons/files/ButtonFire.png rename to G-Earth-UI/src/main/resources/gearth/ui/buttons/files/ButtonFire.png diff --git a/G-Earth-UI/src/main/java/gearth/ui/buttons/files/ButtonFireHover.png b/G-Earth-UI/src/main/resources/gearth/ui/buttons/files/ButtonFireHover.png similarity index 100% rename from G-Earth-UI/src/main/java/gearth/ui/buttons/files/ButtonFireHover.png rename to G-Earth-UI/src/main/resources/gearth/ui/buttons/files/ButtonFireHover.png diff --git a/G-Earth-UI/src/main/java/gearth/ui/buttons/files/ButtonPause.png b/G-Earth-UI/src/main/resources/gearth/ui/buttons/files/ButtonPause.png similarity index 100% rename from G-Earth-UI/src/main/java/gearth/ui/buttons/files/ButtonPause.png rename to G-Earth-UI/src/main/resources/gearth/ui/buttons/files/ButtonPause.png diff --git a/G-Earth-UI/src/main/java/gearth/ui/buttons/files/ButtonPauseHover.png b/G-Earth-UI/src/main/resources/gearth/ui/buttons/files/ButtonPauseHover.png similarity index 100% rename from G-Earth-UI/src/main/java/gearth/ui/buttons/files/ButtonPauseHover.png rename to G-Earth-UI/src/main/resources/gearth/ui/buttons/files/ButtonPauseHover.png diff --git a/G-Earth-UI/src/main/java/gearth/ui/buttons/files/ButtonReload.png b/G-Earth-UI/src/main/resources/gearth/ui/buttons/files/ButtonReload.png similarity index 100% rename from G-Earth-UI/src/main/java/gearth/ui/buttons/files/ButtonReload.png rename to G-Earth-UI/src/main/resources/gearth/ui/buttons/files/ButtonReload.png diff --git a/G-Earth-UI/src/main/java/gearth/ui/buttons/files/ButtonReloadHover.png b/G-Earth-UI/src/main/resources/gearth/ui/buttons/files/ButtonReloadHover.png similarity index 100% rename from G-Earth-UI/src/main/java/gearth/ui/buttons/files/ButtonReloadHover.png rename to G-Earth-UI/src/main/resources/gearth/ui/buttons/files/ButtonReloadHover.png diff --git a/G-Earth-UI/src/main/java/gearth/ui/buttons/files/ButtonResume.png b/G-Earth-UI/src/main/resources/gearth/ui/buttons/files/ButtonResume.png similarity index 100% rename from G-Earth-UI/src/main/java/gearth/ui/buttons/files/ButtonResume.png rename to G-Earth-UI/src/main/resources/gearth/ui/buttons/files/ButtonResume.png diff --git a/G-Earth-UI/src/main/java/gearth/ui/buttons/files/ButtonResumeHover.png b/G-Earth-UI/src/main/resources/gearth/ui/buttons/files/ButtonResumeHover.png similarity index 100% rename from G-Earth-UI/src/main/java/gearth/ui/buttons/files/ButtonResumeHover.png rename to G-Earth-UI/src/main/resources/gearth/ui/buttons/files/ButtonResumeHover.png diff --git a/G-Earth-UI/src/main/java/gearth/ui/connection/Connection.fxml b/G-Earth-UI/src/main/resources/gearth/ui/connection/Connection.fxml similarity index 100% rename from G-Earth-UI/src/main/java/gearth/ui/connection/Connection.fxml rename to G-Earth-UI/src/main/resources/gearth/ui/connection/Connection.fxml diff --git a/G-Earth-UI/src/main/java/gearth/ui/extensions/Extensions.fxml b/G-Earth-UI/src/main/resources/gearth/ui/extensions/Extensions.fxml similarity index 100% rename from G-Earth-UI/src/main/java/gearth/ui/extensions/Extensions.fxml rename to G-Earth-UI/src/main/resources/gearth/ui/extensions/Extensions.fxml diff --git a/G-Earth-UI/src/main/java/gearth/ui/info/Info.fxml b/G-Earth-UI/src/main/resources/gearth/ui/info/Info.fxml similarity index 100% rename from G-Earth-UI/src/main/java/gearth/ui/info/Info.fxml rename to G-Earth-UI/src/main/resources/gearth/ui/info/Info.fxml diff --git a/G-Earth-UI/src/main/java/gearth/ui/injection/Injection.fxml b/G-Earth-UI/src/main/resources/gearth/ui/injection/Injection.fxml similarity index 100% rename from G-Earth-UI/src/main/java/gearth/ui/injection/Injection.fxml rename to G-Earth-UI/src/main/resources/gearth/ui/injection/Injection.fxml diff --git a/G-Earth-UI/src/main/java/gearth/ui/logger.css b/G-Earth-UI/src/main/resources/gearth/ui/logger.css similarity index 100% rename from G-Earth-UI/src/main/java/gearth/ui/logger.css rename to G-Earth-UI/src/main/resources/gearth/ui/logger.css diff --git a/G-Earth-UI/src/main/java/gearth/ui/logger/Logger.fxml b/G-Earth-UI/src/main/resources/gearth/ui/logger/Logger.fxml similarity index 100% rename from G-Earth-UI/src/main/java/gearth/ui/logger/Logger.fxml rename to G-Earth-UI/src/main/resources/gearth/ui/logger/Logger.fxml diff --git a/G-Earth-UI/src/main/java/gearth/ui/scheduler/Scheduler.fxml b/G-Earth-UI/src/main/resources/gearth/ui/scheduler/Scheduler.fxml similarity index 100% rename from G-Earth-UI/src/main/java/gearth/ui/scheduler/Scheduler.fxml rename to G-Earth-UI/src/main/resources/gearth/ui/scheduler/Scheduler.fxml diff --git a/G-Earth-UI/src/main/java/gearth/ui/settings/Settings.fxml b/G-Earth-UI/src/main/resources/gearth/ui/settings/Settings.fxml similarity index 100% rename from G-Earth-UI/src/main/java/gearth/ui/settings/Settings.fxml rename to G-Earth-UI/src/main/resources/gearth/ui/settings/Settings.fxml diff --git a/G-Earth-UI/src/main/java/gearth/ui/tools/Tools.fxml b/G-Earth-UI/src/main/resources/gearth/ui/tools/Tools.fxml similarity index 100% rename from G-Earth-UI/src/main/java/gearth/ui/tools/Tools.fxml rename to G-Earth-UI/src/main/resources/gearth/ui/tools/Tools.fxml