diff --git a/src/main/java/de/hdm_stuttgart/battlearena/Controller/CommunityMapController.java b/src/main/java/de/hdm_stuttgart/battlearena/Controller/CommunityMapController.java index bd6eefe70c1357775b1918338305c388ca2ff3ec..3dc79401a4a89941e5bcffa4b07dacbb45c14817 100644 --- a/src/main/java/de/hdm_stuttgart/battlearena/Controller/CommunityMapController.java +++ b/src/main/java/de/hdm_stuttgart/battlearena/Controller/CommunityMapController.java @@ -1,5 +1,6 @@ package de.hdm_stuttgart.battlearena.Controller; +import de.hdm_stuttgart.battlearena.Controller.Utilities.SceneLoader; import javafx.beans.property.SimpleStringProperty; import javafx.collections.FXCollections; import javafx.collections.ObservableList; diff --git a/src/main/java/de/hdm_stuttgart/battlearena/Controller/CreditsController.java b/src/main/java/de/hdm_stuttgart/battlearena/Controller/CreditsController.java index 2e6f99aaef2f073547f2625eb8634dbf66906d50..bd8d67fc8262984ee946d5890286b10d08f2c77f 100644 --- a/src/main/java/de/hdm_stuttgart/battlearena/Controller/CreditsController.java +++ b/src/main/java/de/hdm_stuttgart/battlearena/Controller/CreditsController.java @@ -1,5 +1,7 @@ package de.hdm_stuttgart.battlearena.Controller; +import de.hdm_stuttgart.battlearena.Controller.Utilities.CreateMediaPlayer; +import de.hdm_stuttgart.battlearena.Controller.Utilities.MusicPlayerSingleton; import javafx.fxml.FXML; import javafx.fxml.FXMLLoader; import javafx.fxml.Initializable; diff --git a/src/main/java/de/hdm_stuttgart/battlearena/Controller/IntroController.java b/src/main/java/de/hdm_stuttgart/battlearena/Controller/IntroController.java index e75dbd9862c8129638992b5d4281d4f7e132894d..2c4472104e35751cedb56601d0b5f6b13f72e278 100644 --- a/src/main/java/de/hdm_stuttgart/battlearena/Controller/IntroController.java +++ b/src/main/java/de/hdm_stuttgart/battlearena/Controller/IntroController.java @@ -1,5 +1,6 @@ package de.hdm_stuttgart.battlearena.Controller; +import de.hdm_stuttgart.battlearena.Controller.Utilities.CreateMediaPlayer; import javafx.fxml.FXML; import javafx.fxml.FXMLLoader; import javafx.fxml.Initializable; diff --git a/src/main/java/de/hdm_stuttgart/battlearena/Controller/LocalCreateController.java b/src/main/java/de/hdm_stuttgart/battlearena/Controller/LocalCreateController.java index 6fde6329e4983a0c18aca314e39b7efd90a8695b..69b2cb5b336306ffa11e72ad169745d1c83c9cd4 100644 --- a/src/main/java/de/hdm_stuttgart/battlearena/Controller/LocalCreateController.java +++ b/src/main/java/de/hdm_stuttgart/battlearena/Controller/LocalCreateController.java @@ -1,5 +1,6 @@ package de.hdm_stuttgart.battlearena.Controller; +import de.hdm_stuttgart.battlearena.Controller.Utilities.SceneLoader; import javafx.fxml.FXML; import javafx.fxml.Initializable; import javafx.scene.control.TitledPane; diff --git a/src/main/java/de/hdm_stuttgart/battlearena/Controller/MainMenuController.java b/src/main/java/de/hdm_stuttgart/battlearena/Controller/MainMenuController.java index 21fb05958755de0e9c837e5f90ac6e76d61a1c5a..c71e7fc4804f06df9f0249a24e102b057c55ba7a 100644 --- a/src/main/java/de/hdm_stuttgart/battlearena/Controller/MainMenuController.java +++ b/src/main/java/de/hdm_stuttgart/battlearena/Controller/MainMenuController.java @@ -1,5 +1,6 @@ package de.hdm_stuttgart.battlearena.Controller; +import de.hdm_stuttgart.battlearena.Controller.Utilities.SceneLoader; import javafx.fxml.FXML; import javafx.fxml.Initializable; import javafx.scene.control.Button; diff --git a/src/main/java/de/hdm_stuttgart/battlearena/Controller/MapForgeController.java b/src/main/java/de/hdm_stuttgart/battlearena/Controller/MapForgeController.java index 8bd1c8931f575747df3d8c316483fef5b7090b01..7f57a6dd566a493f12e2c9ffdea4772df823f130 100644 --- a/src/main/java/de/hdm_stuttgart/battlearena/Controller/MapForgeController.java +++ b/src/main/java/de/hdm_stuttgart/battlearena/Controller/MapForgeController.java @@ -1,5 +1,7 @@ package de.hdm_stuttgart.battlearena.Controller; +import de.hdm_stuttgart.battlearena.Controller.Utilities.MusicPlayerSingleton; +import de.hdm_stuttgart.battlearena.Controller.Utilities.SceneLoader; import javafx.fxml.FXML; import javafx.fxml.FXMLLoader; import javafx.scene.layout.VBox; diff --git a/src/main/java/de/hdm_stuttgart/battlearena/Controller/MenuBorderPaneController.java b/src/main/java/de/hdm_stuttgart/battlearena/Controller/MenuBorderPaneController.java index 236b82f5e388a20a67b7ed33e5dd06c8586eb20e..47fa1988d8563ef57198d22de1ddc62e8a73ce27 100644 --- a/src/main/java/de/hdm_stuttgart/battlearena/Controller/MenuBorderPaneController.java +++ b/src/main/java/de/hdm_stuttgart/battlearena/Controller/MenuBorderPaneController.java @@ -1,5 +1,8 @@ package de.hdm_stuttgart.battlearena.Controller; +import de.hdm_stuttgart.battlearena.Controller.Utilities.CreateMediaPlayer; +import de.hdm_stuttgart.battlearena.Controller.Utilities.MusicPlayerSingleton; +import de.hdm_stuttgart.battlearena.Controller.Utilities.SceneLoader; import javafx.fxml.FXML; import javafx.fxml.Initializable; import javafx.geometry.Rectangle2D; diff --git a/src/main/java/de/hdm_stuttgart/battlearena/Controller/MultiplayerController.java b/src/main/java/de/hdm_stuttgart/battlearena/Controller/MultiplayerController.java index 7c4d231bdccd07e80988fa0eaed18dae09d9536c..181688fec0dda599c2b0f7e6b08177dc93913e80 100644 --- a/src/main/java/de/hdm_stuttgart/battlearena/Controller/MultiplayerController.java +++ b/src/main/java/de/hdm_stuttgart/battlearena/Controller/MultiplayerController.java @@ -1,5 +1,6 @@ package de.hdm_stuttgart.battlearena.Controller; +import de.hdm_stuttgart.battlearena.Controller.Utilities.SceneLoader; import javafx.fxml.FXML; import javafx.scene.layout.VBox; diff --git a/src/main/java/de/hdm_stuttgart/battlearena/Controller/MultiplayerCreateController.java b/src/main/java/de/hdm_stuttgart/battlearena/Controller/MultiplayerCreateController.java index b0f80278980a0f626d1a8db47dd93bbf33632bcc..6db97dfe730df0204ee53741f896e596fce5ebfe 100644 --- a/src/main/java/de/hdm_stuttgart/battlearena/Controller/MultiplayerCreateController.java +++ b/src/main/java/de/hdm_stuttgart/battlearena/Controller/MultiplayerCreateController.java @@ -1,5 +1,6 @@ package de.hdm_stuttgart.battlearena.Controller; +import de.hdm_stuttgart.battlearena.Controller.Utilities.SceneLoader; import javafx.fxml.FXML; import javafx.scene.layout.VBox; diff --git a/src/main/java/de/hdm_stuttgart/battlearena/Controller/MultiplayerJoinController.java b/src/main/java/de/hdm_stuttgart/battlearena/Controller/MultiplayerJoinController.java index f9879317bf9c574e3ab9a86ac8e3a1da0f7aa508..0aefd1003845e6971d2a025ba5d13c48cf257a33 100644 --- a/src/main/java/de/hdm_stuttgart/battlearena/Controller/MultiplayerJoinController.java +++ b/src/main/java/de/hdm_stuttgart/battlearena/Controller/MultiplayerJoinController.java @@ -1,5 +1,6 @@ package de.hdm_stuttgart.battlearena.Controller; +import de.hdm_stuttgart.battlearena.Controller.Utilities.SceneLoader; import javafx.fxml.FXML; import javafx.scene.layout.VBox; diff --git a/src/main/java/de/hdm_stuttgart/battlearena/Controller/PlayController.java b/src/main/java/de/hdm_stuttgart/battlearena/Controller/PlayController.java index 15904da7f6ac029ec0680933b1c733bec6451bc9..eae49e623cc42da45d01a9e19f7d0432c920ae59 100644 --- a/src/main/java/de/hdm_stuttgart/battlearena/Controller/PlayController.java +++ b/src/main/java/de/hdm_stuttgart/battlearena/Controller/PlayController.java @@ -1,5 +1,6 @@ package de.hdm_stuttgart.battlearena.Controller; +import de.hdm_stuttgart.battlearena.Controller.Utilities.SceneLoader; import javafx.fxml.FXML; import javafx.scene.layout.VBox; diff --git a/src/main/java/de/hdm_stuttgart/battlearena/Controller/PlayerCreateController.java b/src/main/java/de/hdm_stuttgart/battlearena/Controller/PlayerCreateController.java index 60715d6f2fa01082a283d1a38723b42e89e9734d..68dfd4029aad7452c5d19d82fdfcaec3f0e8435e 100644 --- a/src/main/java/de/hdm_stuttgart/battlearena/Controller/PlayerCreateController.java +++ b/src/main/java/de/hdm_stuttgart/battlearena/Controller/PlayerCreateController.java @@ -1,5 +1,6 @@ package de.hdm_stuttgart.battlearena.Controller; +import de.hdm_stuttgart.battlearena.Controller.Utilities.CreateMediaPlayer; import javafx.fxml.FXML; import javafx.fxml.FXMLLoader; import javafx.fxml.Initializable; diff --git a/src/main/java/de/hdm_stuttgart/battlearena/Controller/SettingsController.java b/src/main/java/de/hdm_stuttgart/battlearena/Controller/SettingsController.java index 0004cc21f788dc08f802fbf28d960e1e2030b562..a3c7526665111d073af465d5c74599952442b63b 100644 --- a/src/main/java/de/hdm_stuttgart/battlearena/Controller/SettingsController.java +++ b/src/main/java/de/hdm_stuttgart/battlearena/Controller/SettingsController.java @@ -1,5 +1,7 @@ package de.hdm_stuttgart.battlearena.Controller; +import de.hdm_stuttgart.battlearena.Controller.Utilities.MusicPlayerSingleton; +import de.hdm_stuttgart.battlearena.Controller.Utilities.SceneLoader; import javafx.fxml.FXML; import javafx.fxml.FXMLLoader; import javafx.fxml.Initializable; diff --git a/src/main/java/de/hdm_stuttgart/battlearena/Controller/SkinSelectionController.java b/src/main/java/de/hdm_stuttgart/battlearena/Controller/SkinSelectionController.java index 1f3eb7b862d4fdd0ea82ad4cbf912110cc19fe4a..226c55739e694653d84fc674d240ff5667a5e980 100644 --- a/src/main/java/de/hdm_stuttgart/battlearena/Controller/SkinSelectionController.java +++ b/src/main/java/de/hdm_stuttgart/battlearena/Controller/SkinSelectionController.java @@ -1,5 +1,6 @@ package de.hdm_stuttgart.battlearena.Controller; +import de.hdm_stuttgart.battlearena.Controller.Utilities.SceneLoader; import javafx.fxml.FXML; import javafx.fxml.FXMLLoader; import javafx.fxml.Initializable; diff --git a/src/main/java/de/hdm_stuttgart/battlearena/Controller/StatisticsController.java b/src/main/java/de/hdm_stuttgart/battlearena/Controller/StatisticsController.java index e5a6196af7672f681b40368721a12755853db140..009c8a94b5f4a68c3c1b21ddcf194621be698a9c 100644 --- a/src/main/java/de/hdm_stuttgart/battlearena/Controller/StatisticsController.java +++ b/src/main/java/de/hdm_stuttgart/battlearena/Controller/StatisticsController.java @@ -1,5 +1,6 @@ package de.hdm_stuttgart.battlearena.Controller; +import de.hdm_stuttgart.battlearena.Controller.Utilities.SceneLoader; import javafx.beans.binding.Bindings; import javafx.collections.FXCollections; import javafx.collections.ObservableList; diff --git a/src/main/java/de/hdm_stuttgart/battlearena/Controller/ButtonTransition.java b/src/main/java/de/hdm_stuttgart/battlearena/Controller/Utilities/ButtonTransition.java similarity index 94% rename from src/main/java/de/hdm_stuttgart/battlearena/Controller/ButtonTransition.java rename to src/main/java/de/hdm_stuttgart/battlearena/Controller/Utilities/ButtonTransition.java index 2af6c6d63c35c91301dfd68eab22027ced9fdcbc..b129d469320cdd8549e234a3a5d6fae8901187ea 100644 --- a/src/main/java/de/hdm_stuttgart/battlearena/Controller/ButtonTransition.java +++ b/src/main/java/de/hdm_stuttgart/battlearena/Controller/Utilities/ButtonTransition.java @@ -1,4 +1,4 @@ -package de.hdm_stuttgart.battlearena.Controller; +package de.hdm_stuttgart.battlearena.Controller.Utilities; import javafx.animation.ScaleTransition; import javafx.scene.control.Button; diff --git a/src/main/java/de/hdm_stuttgart/battlearena/Controller/CreateMediaPlayer.java b/src/main/java/de/hdm_stuttgart/battlearena/Controller/Utilities/CreateMediaPlayer.java similarity index 93% rename from src/main/java/de/hdm_stuttgart/battlearena/Controller/CreateMediaPlayer.java rename to src/main/java/de/hdm_stuttgart/battlearena/Controller/Utilities/CreateMediaPlayer.java index f924d633dc0f7c135a921a7efee08e85dce04d29..4bf6c165db835d9908078118b40628cbfbc2350a 100644 --- a/src/main/java/de/hdm_stuttgart/battlearena/Controller/CreateMediaPlayer.java +++ b/src/main/java/de/hdm_stuttgart/battlearena/Controller/Utilities/CreateMediaPlayer.java @@ -1,4 +1,4 @@ -package de.hdm_stuttgart.battlearena.Controller; +package de.hdm_stuttgart.battlearena.Controller.Utilities; import javafx.scene.layout.BorderPane; import javafx.scene.media.Media; diff --git a/src/main/java/de/hdm_stuttgart/battlearena/Controller/MusicPlayerSingleton.java b/src/main/java/de/hdm_stuttgart/battlearena/Controller/Utilities/MusicPlayerSingleton.java similarity index 90% rename from src/main/java/de/hdm_stuttgart/battlearena/Controller/MusicPlayerSingleton.java rename to src/main/java/de/hdm_stuttgart/battlearena/Controller/Utilities/MusicPlayerSingleton.java index 5653a7c8cbca3e0278568d08fcda7dc7e1712c17..df8991982ff1b19ed4442b9e541b85b1d27397a4 100644 --- a/src/main/java/de/hdm_stuttgart/battlearena/Controller/MusicPlayerSingleton.java +++ b/src/main/java/de/hdm_stuttgart/battlearena/Controller/Utilities/MusicPlayerSingleton.java @@ -1,4 +1,4 @@ -package de.hdm_stuttgart.battlearena.Controller; +package de.hdm_stuttgart.battlearena.Controller.Utilities; import javafx.scene.media.MediaPlayer; public class MusicPlayerSingleton { diff --git a/src/main/java/de/hdm_stuttgart/battlearena/Controller/SceneLoader.java b/src/main/java/de/hdm_stuttgart/battlearena/Controller/Utilities/SceneLoader.java similarity index 93% rename from src/main/java/de/hdm_stuttgart/battlearena/Controller/SceneLoader.java rename to src/main/java/de/hdm_stuttgart/battlearena/Controller/Utilities/SceneLoader.java index 0d5a04ef5789505821f173c05997a43313b8b33d..8c0e8b4a9487316777dd42b0823e07b737386208 100644 --- a/src/main/java/de/hdm_stuttgart/battlearena/Controller/SceneLoader.java +++ b/src/main/java/de/hdm_stuttgart/battlearena/Controller/Utilities/SceneLoader.java @@ -1,4 +1,4 @@ -package de.hdm_stuttgart.battlearena.Controller; +package de.hdm_stuttgart.battlearena.Controller.Utilities; import javafx.fxml.FXMLLoader; import javafx.scene.layout.Pane; diff --git a/src/main/java/de/hdm_stuttgart/battlearena/Controller/ToggleButtonTransition.java b/src/main/java/de/hdm_stuttgart/battlearena/Controller/Utilities/ToggleButtonTransition.java similarity index 96% rename from src/main/java/de/hdm_stuttgart/battlearena/Controller/ToggleButtonTransition.java rename to src/main/java/de/hdm_stuttgart/battlearena/Controller/Utilities/ToggleButtonTransition.java index 6ee839dddf70e1a34ac776b9343e068234b391ab..94d51e4b2524cc0428678adadcf57b01e61dd643 100644 --- a/src/main/java/de/hdm_stuttgart/battlearena/Controller/ToggleButtonTransition.java +++ b/src/main/java/de/hdm_stuttgart/battlearena/Controller/Utilities/ToggleButtonTransition.java @@ -1,4 +1,4 @@ -package de.hdm_stuttgart.battlearena.Controller; +package de.hdm_stuttgart.battlearena.Controller.Utilities; import javafx.animation.FadeTransition; import javafx.scene.control.ToggleButton; diff --git a/src/main/resources/styles/style.css b/src/main/resources/styles/style.css index c93623dc7f5d9b05f623907495755badd233bc46..1f2a2030a2e67b98cb0869b5cf205d74b8cc9bca 100644 --- a/src/main/resources/styles/style.css +++ b/src/main/resources/styles/style.css @@ -30,7 +30,7 @@ .button { -fx-text-fill: -fx-brown; -fx-background-color: none; - -fx-skin: "de.hdm_stuttgart.battlearena.Controller.ButtonTransition"; + -fx-skin: "de.hdm_stuttgart.battlearena.Controller.Utilities.ButtonTransition"; } #btnLeft { @@ -129,7 +129,7 @@ } .toggle-button { - -fx-skin: "de.hdm_stuttgart.battlearena.Controller.ToggleButtonTransition"; + -fx-skin: "de.hdm_stuttgart.battlearena.Controller.Utilities.ToggleButtonTransition"; -fx-background-color: none; }