From 4a8ecd32ac27b559d324ab7dc940f9ff57deaf0f Mon Sep 17 00:00:00 2001 From: Jeddunk Date: Wed, 14 Oct 2020 14:02:46 +0200 Subject: [PATCH] updated resources location --- .../java/xyz/jeddunk/autocreamapi/Controller.java | 2 +- src/main/java/xyz/jeddunk/autocreamapi/Main.java | 2 +- .../fonts/roboto-condensed/LICENSE.txt | 0 .../fonts/roboto-condensed/RobotoCondensed-Bold.ttf | Bin .../roboto-condensed/RobotoCondensed-BoldItalic.ttf | Bin .../roboto-condensed/RobotoCondensed-Italic.ttf | Bin .../roboto-condensed/RobotoCondensed-Light.ttf | Bin .../RobotoCondensed-LightItalic.ttf | Bin .../roboto-condensed/RobotoCondensed-Regular.ttf | Bin .../fonts/roboto-mono/RobotoMono-Bold.ttf | Bin .../fonts/roboto-mono/RobotoMono-BoldItalic.ttf | Bin .../fonts/roboto-mono/RobotoMono-ExtraLight.ttf | Bin .../roboto-mono/RobotoMono-ExtraLightItalic.ttf | Bin .../fonts/roboto-mono/RobotoMono-Italic.ttf | Bin .../fonts/roboto-mono/RobotoMono-Light.ttf | Bin .../fonts/roboto-mono/RobotoMono-LightItalic.ttf | Bin .../fonts/roboto-mono/RobotoMono-Medium.ttf | Bin .../fonts/roboto-mono/RobotoMono-MediumItalic.ttf | Bin .../fonts/roboto-mono/RobotoMono-Regular.ttf | Bin .../fonts/roboto-mono/RobotoMono-SemiBold.ttf | Bin .../fonts/roboto-mono/RobotoMono-SemiBoldItalic.ttf | Bin .../fonts/roboto-mono/RobotoMono-Thin.ttf | Bin .../fonts/roboto-mono/RobotoMono-ThinItalic.ttf | Bin .../{ => xyz/jeddunk/autocreamapi}/mainWindow.fxml | 0 .../jeddunk/autocreamapi}/searchResultWindow.fxml | 0 .../{ => xyz/jeddunk/autocreamapi}/stylesheet.css | 2 +- 26 files changed, 3 insertions(+), 3 deletions(-) rename src/main/resources/{ => xyz/jeddunk/autocreamapi}/fonts/roboto-condensed/LICENSE.txt (100%) rename src/main/resources/{ => xyz/jeddunk/autocreamapi}/fonts/roboto-condensed/RobotoCondensed-Bold.ttf (100%) rename src/main/resources/{ => xyz/jeddunk/autocreamapi}/fonts/roboto-condensed/RobotoCondensed-BoldItalic.ttf (100%) rename src/main/resources/{ => xyz/jeddunk/autocreamapi}/fonts/roboto-condensed/RobotoCondensed-Italic.ttf (100%) rename src/main/resources/{ => xyz/jeddunk/autocreamapi}/fonts/roboto-condensed/RobotoCondensed-Light.ttf (100%) rename src/main/resources/{ => xyz/jeddunk/autocreamapi}/fonts/roboto-condensed/RobotoCondensed-LightItalic.ttf (100%) rename src/main/resources/{ => xyz/jeddunk/autocreamapi}/fonts/roboto-condensed/RobotoCondensed-Regular.ttf (100%) rename src/main/resources/{ => xyz/jeddunk/autocreamapi}/fonts/roboto-mono/RobotoMono-Bold.ttf (100%) rename src/main/resources/{ => xyz/jeddunk/autocreamapi}/fonts/roboto-mono/RobotoMono-BoldItalic.ttf (100%) rename src/main/resources/{ => xyz/jeddunk/autocreamapi}/fonts/roboto-mono/RobotoMono-ExtraLight.ttf (100%) rename src/main/resources/{ => xyz/jeddunk/autocreamapi}/fonts/roboto-mono/RobotoMono-ExtraLightItalic.ttf (100%) rename src/main/resources/{ => xyz/jeddunk/autocreamapi}/fonts/roboto-mono/RobotoMono-Italic.ttf (100%) rename src/main/resources/{ => xyz/jeddunk/autocreamapi}/fonts/roboto-mono/RobotoMono-Light.ttf (100%) rename src/main/resources/{ => xyz/jeddunk/autocreamapi}/fonts/roboto-mono/RobotoMono-LightItalic.ttf (100%) rename src/main/resources/{ => xyz/jeddunk/autocreamapi}/fonts/roboto-mono/RobotoMono-Medium.ttf (100%) rename src/main/resources/{ => xyz/jeddunk/autocreamapi}/fonts/roboto-mono/RobotoMono-MediumItalic.ttf (100%) rename src/main/resources/{ => xyz/jeddunk/autocreamapi}/fonts/roboto-mono/RobotoMono-Regular.ttf (100%) rename src/main/resources/{ => xyz/jeddunk/autocreamapi}/fonts/roboto-mono/RobotoMono-SemiBold.ttf (100%) rename src/main/resources/{ => xyz/jeddunk/autocreamapi}/fonts/roboto-mono/RobotoMono-SemiBoldItalic.ttf (100%) rename src/main/resources/{ => xyz/jeddunk/autocreamapi}/fonts/roboto-mono/RobotoMono-Thin.ttf (100%) rename src/main/resources/{ => xyz/jeddunk/autocreamapi}/fonts/roboto-mono/RobotoMono-ThinItalic.ttf (100%) rename src/main/resources/{ => xyz/jeddunk/autocreamapi}/mainWindow.fxml (100%) rename src/main/resources/{ => xyz/jeddunk/autocreamapi}/searchResultWindow.fxml (100%) rename src/main/resources/{ => xyz/jeddunk/autocreamapi}/stylesheet.css (98%) diff --git a/src/main/java/xyz/jeddunk/autocreamapi/Controller.java b/src/main/java/xyz/jeddunk/autocreamapi/Controller.java index 2046fb3..8bfb0ef 100644 --- a/src/main/java/xyz/jeddunk/autocreamapi/Controller.java +++ b/src/main/java/xyz/jeddunk/autocreamapi/Controller.java @@ -323,7 +323,7 @@ public class Controller implements Initializable { } else { logger.info("Multiple results found, opening search result window!"); try { - URL resource = ClassLoader.getSystemResource("searchResultWindow.fxml"); + URL resource = ClassLoader.getSystemResource("xyz/jeddunk/autocreamapi/searchResultWindow.fxml"); FXMLLoader fxmlLoader = new FXMLLoader(resource); Parent root1 = fxmlLoader.load(); diff --git a/src/main/java/xyz/jeddunk/autocreamapi/Main.java b/src/main/java/xyz/jeddunk/autocreamapi/Main.java index 207708a..ce3ddfa 100644 --- a/src/main/java/xyz/jeddunk/autocreamapi/Main.java +++ b/src/main/java/xyz/jeddunk/autocreamapi/Main.java @@ -30,7 +30,7 @@ public class Main extends Application { @Override public void start(Stage primaryStage) throws Exception { - Parent root = FXMLLoader.load(ClassLoader.getSystemResource("mainWindow.fxml")); + Parent root = FXMLLoader.load(ClassLoader.getSystemResource("xyz/jeddunk/autocreamapi/mainWindow.fxml")); primaryStage.setTitle("Auto CreamAPI"); primaryStage.setMinWidth(MIN_WIDTH + 25); primaryStage.setMinHeight(MIN_HEIGHT + 50); diff --git a/src/main/resources/fonts/roboto-condensed/LICENSE.txt b/src/main/resources/xyz/jeddunk/autocreamapi/fonts/roboto-condensed/LICENSE.txt similarity index 100% rename from src/main/resources/fonts/roboto-condensed/LICENSE.txt rename to src/main/resources/xyz/jeddunk/autocreamapi/fonts/roboto-condensed/LICENSE.txt diff --git a/src/main/resources/fonts/roboto-condensed/RobotoCondensed-Bold.ttf b/src/main/resources/xyz/jeddunk/autocreamapi/fonts/roboto-condensed/RobotoCondensed-Bold.ttf similarity index 100% rename from src/main/resources/fonts/roboto-condensed/RobotoCondensed-Bold.ttf rename to src/main/resources/xyz/jeddunk/autocreamapi/fonts/roboto-condensed/RobotoCondensed-Bold.ttf diff --git a/src/main/resources/fonts/roboto-condensed/RobotoCondensed-BoldItalic.ttf b/src/main/resources/xyz/jeddunk/autocreamapi/fonts/roboto-condensed/RobotoCondensed-BoldItalic.ttf similarity index 100% rename from src/main/resources/fonts/roboto-condensed/RobotoCondensed-BoldItalic.ttf rename to src/main/resources/xyz/jeddunk/autocreamapi/fonts/roboto-condensed/RobotoCondensed-BoldItalic.ttf diff --git a/src/main/resources/fonts/roboto-condensed/RobotoCondensed-Italic.ttf b/src/main/resources/xyz/jeddunk/autocreamapi/fonts/roboto-condensed/RobotoCondensed-Italic.ttf similarity index 100% rename from src/main/resources/fonts/roboto-condensed/RobotoCondensed-Italic.ttf rename to src/main/resources/xyz/jeddunk/autocreamapi/fonts/roboto-condensed/RobotoCondensed-Italic.ttf diff --git a/src/main/resources/fonts/roboto-condensed/RobotoCondensed-Light.ttf b/src/main/resources/xyz/jeddunk/autocreamapi/fonts/roboto-condensed/RobotoCondensed-Light.ttf similarity index 100% rename from src/main/resources/fonts/roboto-condensed/RobotoCondensed-Light.ttf rename to src/main/resources/xyz/jeddunk/autocreamapi/fonts/roboto-condensed/RobotoCondensed-Light.ttf diff --git a/src/main/resources/fonts/roboto-condensed/RobotoCondensed-LightItalic.ttf b/src/main/resources/xyz/jeddunk/autocreamapi/fonts/roboto-condensed/RobotoCondensed-LightItalic.ttf similarity index 100% rename from src/main/resources/fonts/roboto-condensed/RobotoCondensed-LightItalic.ttf rename to src/main/resources/xyz/jeddunk/autocreamapi/fonts/roboto-condensed/RobotoCondensed-LightItalic.ttf diff --git a/src/main/resources/fonts/roboto-condensed/RobotoCondensed-Regular.ttf b/src/main/resources/xyz/jeddunk/autocreamapi/fonts/roboto-condensed/RobotoCondensed-Regular.ttf similarity index 100% rename from src/main/resources/fonts/roboto-condensed/RobotoCondensed-Regular.ttf rename to src/main/resources/xyz/jeddunk/autocreamapi/fonts/roboto-condensed/RobotoCondensed-Regular.ttf diff --git a/src/main/resources/fonts/roboto-mono/RobotoMono-Bold.ttf b/src/main/resources/xyz/jeddunk/autocreamapi/fonts/roboto-mono/RobotoMono-Bold.ttf similarity index 100% rename from src/main/resources/fonts/roboto-mono/RobotoMono-Bold.ttf rename to src/main/resources/xyz/jeddunk/autocreamapi/fonts/roboto-mono/RobotoMono-Bold.ttf diff --git a/src/main/resources/fonts/roboto-mono/RobotoMono-BoldItalic.ttf b/src/main/resources/xyz/jeddunk/autocreamapi/fonts/roboto-mono/RobotoMono-BoldItalic.ttf similarity index 100% rename from src/main/resources/fonts/roboto-mono/RobotoMono-BoldItalic.ttf rename to src/main/resources/xyz/jeddunk/autocreamapi/fonts/roboto-mono/RobotoMono-BoldItalic.ttf diff --git a/src/main/resources/fonts/roboto-mono/RobotoMono-ExtraLight.ttf b/src/main/resources/xyz/jeddunk/autocreamapi/fonts/roboto-mono/RobotoMono-ExtraLight.ttf similarity index 100% rename from src/main/resources/fonts/roboto-mono/RobotoMono-ExtraLight.ttf rename to src/main/resources/xyz/jeddunk/autocreamapi/fonts/roboto-mono/RobotoMono-ExtraLight.ttf diff --git a/src/main/resources/fonts/roboto-mono/RobotoMono-ExtraLightItalic.ttf b/src/main/resources/xyz/jeddunk/autocreamapi/fonts/roboto-mono/RobotoMono-ExtraLightItalic.ttf similarity index 100% rename from src/main/resources/fonts/roboto-mono/RobotoMono-ExtraLightItalic.ttf rename to src/main/resources/xyz/jeddunk/autocreamapi/fonts/roboto-mono/RobotoMono-ExtraLightItalic.ttf diff --git a/src/main/resources/fonts/roboto-mono/RobotoMono-Italic.ttf b/src/main/resources/xyz/jeddunk/autocreamapi/fonts/roboto-mono/RobotoMono-Italic.ttf similarity index 100% rename from src/main/resources/fonts/roboto-mono/RobotoMono-Italic.ttf rename to src/main/resources/xyz/jeddunk/autocreamapi/fonts/roboto-mono/RobotoMono-Italic.ttf diff --git a/src/main/resources/fonts/roboto-mono/RobotoMono-Light.ttf b/src/main/resources/xyz/jeddunk/autocreamapi/fonts/roboto-mono/RobotoMono-Light.ttf similarity index 100% rename from src/main/resources/fonts/roboto-mono/RobotoMono-Light.ttf rename to src/main/resources/xyz/jeddunk/autocreamapi/fonts/roboto-mono/RobotoMono-Light.ttf diff --git a/src/main/resources/fonts/roboto-mono/RobotoMono-LightItalic.ttf b/src/main/resources/xyz/jeddunk/autocreamapi/fonts/roboto-mono/RobotoMono-LightItalic.ttf similarity index 100% rename from src/main/resources/fonts/roboto-mono/RobotoMono-LightItalic.ttf rename to src/main/resources/xyz/jeddunk/autocreamapi/fonts/roboto-mono/RobotoMono-LightItalic.ttf diff --git a/src/main/resources/fonts/roboto-mono/RobotoMono-Medium.ttf b/src/main/resources/xyz/jeddunk/autocreamapi/fonts/roboto-mono/RobotoMono-Medium.ttf similarity index 100% rename from src/main/resources/fonts/roboto-mono/RobotoMono-Medium.ttf rename to src/main/resources/xyz/jeddunk/autocreamapi/fonts/roboto-mono/RobotoMono-Medium.ttf diff --git a/src/main/resources/fonts/roboto-mono/RobotoMono-MediumItalic.ttf b/src/main/resources/xyz/jeddunk/autocreamapi/fonts/roboto-mono/RobotoMono-MediumItalic.ttf similarity index 100% rename from src/main/resources/fonts/roboto-mono/RobotoMono-MediumItalic.ttf rename to src/main/resources/xyz/jeddunk/autocreamapi/fonts/roboto-mono/RobotoMono-MediumItalic.ttf diff --git a/src/main/resources/fonts/roboto-mono/RobotoMono-Regular.ttf b/src/main/resources/xyz/jeddunk/autocreamapi/fonts/roboto-mono/RobotoMono-Regular.ttf similarity index 100% rename from src/main/resources/fonts/roboto-mono/RobotoMono-Regular.ttf rename to src/main/resources/xyz/jeddunk/autocreamapi/fonts/roboto-mono/RobotoMono-Regular.ttf diff --git a/src/main/resources/fonts/roboto-mono/RobotoMono-SemiBold.ttf b/src/main/resources/xyz/jeddunk/autocreamapi/fonts/roboto-mono/RobotoMono-SemiBold.ttf similarity index 100% rename from src/main/resources/fonts/roboto-mono/RobotoMono-SemiBold.ttf rename to src/main/resources/xyz/jeddunk/autocreamapi/fonts/roboto-mono/RobotoMono-SemiBold.ttf diff --git a/src/main/resources/fonts/roboto-mono/RobotoMono-SemiBoldItalic.ttf b/src/main/resources/xyz/jeddunk/autocreamapi/fonts/roboto-mono/RobotoMono-SemiBoldItalic.ttf similarity index 100% rename from src/main/resources/fonts/roboto-mono/RobotoMono-SemiBoldItalic.ttf rename to src/main/resources/xyz/jeddunk/autocreamapi/fonts/roboto-mono/RobotoMono-SemiBoldItalic.ttf diff --git a/src/main/resources/fonts/roboto-mono/RobotoMono-Thin.ttf b/src/main/resources/xyz/jeddunk/autocreamapi/fonts/roboto-mono/RobotoMono-Thin.ttf similarity index 100% rename from src/main/resources/fonts/roboto-mono/RobotoMono-Thin.ttf rename to src/main/resources/xyz/jeddunk/autocreamapi/fonts/roboto-mono/RobotoMono-Thin.ttf diff --git a/src/main/resources/fonts/roboto-mono/RobotoMono-ThinItalic.ttf b/src/main/resources/xyz/jeddunk/autocreamapi/fonts/roboto-mono/RobotoMono-ThinItalic.ttf similarity index 100% rename from src/main/resources/fonts/roboto-mono/RobotoMono-ThinItalic.ttf rename to src/main/resources/xyz/jeddunk/autocreamapi/fonts/roboto-mono/RobotoMono-ThinItalic.ttf diff --git a/src/main/resources/mainWindow.fxml b/src/main/resources/xyz/jeddunk/autocreamapi/mainWindow.fxml similarity index 100% rename from src/main/resources/mainWindow.fxml rename to src/main/resources/xyz/jeddunk/autocreamapi/mainWindow.fxml diff --git a/src/main/resources/searchResultWindow.fxml b/src/main/resources/xyz/jeddunk/autocreamapi/searchResultWindow.fxml similarity index 100% rename from src/main/resources/searchResultWindow.fxml rename to src/main/resources/xyz/jeddunk/autocreamapi/searchResultWindow.fxml diff --git a/src/main/resources/stylesheet.css b/src/main/resources/xyz/jeddunk/autocreamapi/stylesheet.css similarity index 98% rename from src/main/resources/stylesheet.css rename to src/main/resources/xyz/jeddunk/autocreamapi/stylesheet.css index c08505d..cb16371 100644 --- a/src/main/resources/stylesheet.css +++ b/src/main/resources/xyz/jeddunk/autocreamapi/stylesheet.css @@ -49,8 +49,8 @@ } * { + -fx-font-size: 14; -fx-font-family: 'Roboto Condensed', sans-serif; - -fx-font-size: 14px; } JFXButton {