diff --git a/.idea/workspace (conflicted copy 2023-12-23 155531).xml b/.idea/workspace (conflicted copy 2023-12-23 155531).xml
deleted file mode 100644
index 24902c0f58546cd954def2df78740438f023012a..0000000000000000000000000000000000000000
--- a/.idea/workspace (conflicted copy 2023-12-23 155531).xml
+++ /dev/null
@@ -1,74 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
- <component name="AutoImportSettings">
- <option name="autoReloadType" value="SELECTIVE" />
- </component>
- <component name="ChangeListManager">
- <list default="true" id="b0fb4bdd-29b1-4f86-bd7c-f8c039cc32f2" name="Changes" comment="">
- <change beforePath="$PROJECT_DIR$/src/main/java/de/hdm_stuttgart/battlearena/Controller/MainMenuController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/de/hdm_stuttgart/battlearena/Controller/MainMenuController.java" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/src/main/java/de/hdm_stuttgart/battlearena/Controller/MenuBorderPaneController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/de/hdm_stuttgart/battlearena/Controller/MenuBorderPaneController.java" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/src/main/resources/fxml/MainMenu.fxml" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/fxml/MainMenu.fxml" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/src/main/resources/fxml/MenuBorderPane.fxml" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/fxml/MenuBorderPane.fxml" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/src/main/resources/fxml/Multiplayer.fxml" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/fxml/Multiplayer.fxml" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/src/main/resources/styles/style.css" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/styles/style.css" afterDir="false" />
- </list>
- <option name="SHOW_DIALOG" value="false" />
- <option name="HIGHLIGHT_CONFLICTS" value="true" />
- <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
- <option name="LAST_RESOLUTION" value="IGNORE" />
- </component>
- <component name="Git.Settings">
- <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
- </component>
- <component name="MarkdownSettingsMigration">
- <option name="stateVersion" value="1" />
- </component>
- <component name="ProjectColorInfo">{
- "customColor": "",
- "associatedIndex": 5
-}</component>
- <component name="ProjectId" id="2Zs6XcL7ZlzU8xTNH2hOhkYjatb" />
- <component name="ProjectViewState">
- <option name="hideEmptyMiddlePackages" value="true" />
- <option name="showLibraryContents" value="true" />
- </component>
- <component name="PropertiesComponent">{
- "keyToString": {
- "RunOnceActivity.OpenProjectViewOnStart": "true",
- "RunOnceActivity.ShowReadmeOnStart": "true",
- "WebServerToolWindowFactoryState": "false",
- "git-widget-placeholder": "ui",
- "node.js.detected.package.eslint": "true",
- "node.js.detected.package.tslint": "true",
- "node.js.selected.package.eslint": "(autodetect)",
- "node.js.selected.package.tslint": "(autodetect)",
- "nodejs_package_manager_path": "npm",
- "vue.rearranger.settings.migration": "true"
- }
-}</component>
- <component name="RunManager">
- <configuration name="Main" type="Application" factoryName="Application">
- <option name="MAIN_CLASS_NAME" value="de.hdm_stuttgart.battlearena.Main.Main" />
- <module name="BattleArena" />
- <method v="2">
- <option name="Make" enabled="true" />
- </method>
- </configuration>
- </component>
- <component name="SpellCheckerSettings" RuntimeDictionaries="0" Folders="0" CustomDictionaries="0" DefaultDictionary="application-level" UseSingleDictionary="true" transferred="true" />
- <component name="TaskManager">
- <task active="true" id="Default" summary="Default task">
- <changelist id="b0fb4bdd-29b1-4f86-bd7c-f8c039cc32f2" name="Changes" comment="" />
- <created>1703198483742</created>
- <option name="number" value="Default" />
- <option name="presentableId" value="Default" />
- <updated>1703198483742</updated>
- <workItem from="1703198485662" duration="453000" />
- <workItem from="1703342937046" duration="2000" />
- </task>
- <servers />
- </component>
- <component name="TypeScriptGeneratedFilesManager">
- <option name="version" value="3" />
- </component>
-</project>
\ No newline at end of file
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 7bb395b249decad3606844c2b06cd34cb282deb6..5c55a372f4426ce94f9a35494cb47be24feb082c 100644
--- a/src/main/java/de/hdm_stuttgart/battlearena/Controller/CommunityMapController.java
+++ b/src/main/java/de/hdm_stuttgart/battlearena/Controller/CommunityMapController.java
@@ -47,7 +47,8 @@ public class CommunityMapController implements Initializable {
// TODO: create map preview
- public void back() {
+ @FXML
+ private void back() {
parent.getChildren().clear();
parent.getChildren().add(new SceneLoader().loadScene("MapForge"));
}
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 100c7ff1d5a22cfe58779c45895ee3db81fba40f..ded22cff0ec7b8e028e0e7ea3b5dec2e5b6e6214 100644
--- a/src/main/java/de/hdm_stuttgart/battlearena/Controller/LocalCreateController.java
+++ b/src/main/java/de/hdm_stuttgart/battlearena/Controller/LocalCreateController.java
@@ -28,13 +28,14 @@ public class LocalCreateController implements Initializable {
}
});
}
-
- public void playScene() {
+ @FXML
+ private void playScene() {
parent.getChildren().clear();
parent.getChildren().add(sceneLoader.loadScene("Play"));
}
- public void skinSelectionScene() {
+ @FXML
+ private void skinSelectionScene() {
parent.getChildren().clear();
parent.getChildren().add(sceneLoader.loadScene("SkinSelection"));
}
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 fb0530cc583c3f31cb7377f2b46fea51bd026740..21fb05958755de0e9c837e5f90ac6e76d61a1c5a 100644
--- a/src/main/java/de/hdm_stuttgart/battlearena/Controller/MainMenuController.java
+++ b/src/main/java/de/hdm_stuttgart/battlearena/Controller/MainMenuController.java
@@ -22,22 +22,28 @@ public class MainMenuController implements Initializable {
parent.getChildren().add(sceneLoader.loadScene(name));
}
- public void playScene() {
+ @FXML
+ private void playScene() {
switchScene("Play");
}
- public void mapScene() {
+
+ @FXML
+ private void mapScene() {
switchScene("MapForge");
}
- public void statisticsScene() {
+ @FXML
+ private void statisticsScene() {
switchScene("Statistics");
}
- public void settingsScene() {
+ @FXML
+ private void settingsScene() {
switchScene("Settings");
}
- public void exit() {
+ @FXML
+ private void exit() {
Stage stage = (Stage) exitButton.getScene().getWindow();
stage.close();
}
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 a8da173b5f38ee8f7353d8826b11f0cec113af0b..db5ef303f738acab9317fa693f96b396a3a4b7c2 100644
--- a/src/main/java/de/hdm_stuttgart/battlearena/Controller/MapForgeController.java
+++ b/src/main/java/de/hdm_stuttgart/battlearena/Controller/MapForgeController.java
@@ -12,7 +12,8 @@ public class MapForgeController {
private VBox parent;
SceneLoader sceneLoader = new SceneLoader();
- public void mapEditorScene() {
+ @FXML
+ private void mapEditorScene() {
try {
parent.getScene().setRoot(FXMLLoader.load(Objects.requireNonNull(getClass().getResource("/fxml/PlayerCreateScene.fxml"))));
MusicPlayerSingleton.getInstance().getMediaPlayer().dispose();
@@ -21,11 +22,13 @@ public class MapForgeController {
}
}
- public void communityMapScene() {
+ @FXML
+ private void communityMapScene() {
switchScene("CommunityMaps");
}
- public void updateMapScene() {
+ @FXML
+ private void updateMapScene() {
try {
parent.getScene().setRoot(FXMLLoader.load(Objects.requireNonNull(getClass().getResource("/fxml/PlayerCreateScene.fxml"))));
MusicPlayerSingleton.getInstance().getMediaPlayer().dispose();
@@ -34,7 +37,8 @@ public class MapForgeController {
}
}
- public void back() {
+ @FXML
+ private void back() {
switchScene("MainMenu");
}
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 50587cc225ee3ad4f217c39a9ad4f1b30234b057..529c90c4a3339af3a6d62a66d06967385dafb3f1 100644
--- a/src/main/java/de/hdm_stuttgart/battlearena/Controller/MultiplayerController.java
+++ b/src/main/java/de/hdm_stuttgart/battlearena/Controller/MultiplayerController.java
@@ -8,18 +8,23 @@ public class MultiplayerController {
private VBox parent;
private final SceneLoader sceneLoader = new SceneLoader();
- public void multiplayerCreateScene() {
- parent.getChildren().clear();
- parent.getChildren().add(sceneLoader.loadScene("MultiplayerCreate"));
+ @FXML
+ private void multiplayerCreateScene() {
+ switchScene("MultiplayerCreate");
}
- public void multiplayerJoinScene() {
- parent.getChildren().clear();
- parent.getChildren().add(sceneLoader.loadScene("MultiplayerJoin"));
+ @FXML
+ private void multiplayerJoinScene() {
+ switchScene("MultiplayerJoin");
+ }
+
+ @FXML
+ private void playScene() {
+ switchScene("Play");
}
- public void playScene() {
+ private void switchScene(String name) {
parent.getChildren().clear();
- parent.getChildren().add(sceneLoader.loadScene("Play"));
+ parent.getChildren().add(sceneLoader.loadScene(name));
}
}
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 1e8a58b76a3fc1d5bdb162d280e95a11d6d8bb24..36432bb3bb1fe992de8e491623325f64c4c03be6 100644
--- a/src/main/java/de/hdm_stuttgart/battlearena/Controller/MultiplayerCreateController.java
+++ b/src/main/java/de/hdm_stuttgart/battlearena/Controller/MultiplayerCreateController.java
@@ -8,7 +8,8 @@ public class MultiplayerCreateController {
private VBox parent;
private final SceneLoader sceneLoader = new SceneLoader();
- public void multiplayerScene() {
+ @FXML
+ private void multiplayerScene() {
parent.getChildren().clear();
parent.getChildren().add(sceneLoader.loadScene("Multiplayer"));
}
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 0e155a51488fd3ef13529f71c36aa5c1ff07c43c..d5492991c1f0b4e4932ac3bac133431ad6d144da 100644
--- a/src/main/java/de/hdm_stuttgart/battlearena/Controller/MultiplayerJoinController.java
+++ b/src/main/java/de/hdm_stuttgart/battlearena/Controller/MultiplayerJoinController.java
@@ -8,7 +8,8 @@ public class MultiplayerJoinController {
private VBox parent;
private final SceneLoader sceneLoader = new SceneLoader();
- public void multiplayerScene() {
+ @FXML
+ private void multiplayerScene() {
parent.getChildren().clear();
parent.getChildren().add(sceneLoader.loadScene("Multiplayer"));
}
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 965855379715ea6418f45b0742a2db1672c8075d..24356b5ce5c12a297bdbb4bb55812b905d0389d2 100644
--- a/src/main/java/de/hdm_stuttgart/battlearena/Controller/PlayController.java
+++ b/src/main/java/de/hdm_stuttgart/battlearena/Controller/PlayController.java
@@ -8,18 +8,23 @@ public class PlayController {
private VBox parent;
private final SceneLoader sceneLoader = new SceneLoader();
- public void mainMenuScene() {
- parent.getChildren().clear();
- parent.getChildren().add(sceneLoader.loadScene("MainMenu"));
+ @FXML
+ private void mainMenuScene() {
+ switchScene("MainMenu");
}
- public void localScene() {
- parent.getChildren().clear();
- parent.getChildren().add(sceneLoader.loadScene("LocalCreate"));
+ @FXML
+ private void localScene() {
+ switchScene("LocalCreate");
+ }
+
+ @FXML
+ private void multiplayerScene() {
+ switchScene("Multiplayer");
}
- public void multiplayerScene() {
+ private void switchScene(String name) {
parent.getChildren().clear();
- parent.getChildren().add(sceneLoader.loadScene("Multiplayer"));
+ parent.getChildren().add(sceneLoader.loadScene(name));
}
}
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 fb1ab4be997cb6a398ee47ca51190eae9a017f0f..d394ddc1054f887764e3aa6cb95090f576bf0139 100644
--- a/src/main/java/de/hdm_stuttgart/battlearena/Controller/SettingsController.java
+++ b/src/main/java/de/hdm_stuttgart/battlearena/Controller/SettingsController.java
@@ -20,21 +20,23 @@ public class SettingsController implements Initializable {
public double music;
MusicPlayerSingleton musicPlayer = MusicPlayerSingleton.getInstance();
- public void creditScene() throws IOException {
+ @Override
+ public void initialize(URL url, ResourceBundle resourceBundle) {
+ setMusicVolume();
+ }
+
+ @FXML
+ private void creditScene() throws IOException {
parent.getChildren().clear();
parent.getScene().setRoot(FXMLLoader.load(Objects.requireNonNull(getClass().getResource("/fxml/credits.fxml"))));
}
- public void mainMenuScene() {
+ @FXML
+ private void mainMenuScene() {
parent.getChildren().clear();
parent.getChildren().add(sceneLoader.loadScene("MainMenu"));
}
- @Override
- public void initialize(URL url, ResourceBundle resourceBundle) {
- setMusicVolume();
- }
-
private void setMusicVolume() {
// need a runtime database to save volume
musicVolume.valueProperty().addListener((observableValue, oldValue, newValue) -> {
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 89a93971c7e262f7fff2dd3922e85969694018f8..e753abddb9441be986c24beabfe5b7996e27b57a 100644
--- a/src/main/java/de/hdm_stuttgart/battlearena/Controller/SkinSelectionController.java
+++ b/src/main/java/de/hdm_stuttgart/battlearena/Controller/SkinSelectionController.java
@@ -44,7 +44,14 @@ public class SkinSelectionController implements Initializable {
}
}
- public void gameScene() {
+ @FXML
+ private void back() {
+ parent.getChildren().clear();
+ parent.getChildren().add(new SceneLoader().loadScene("LocalCreate"));
+ }
+
+ @FXML
+ private void gameScene() {
try {
MusicPlayerSingleton.getInstance().getMediaPlayer().dispose();
parent.getScene().setRoot(FXMLLoader.load(Objects.requireNonNull(getClass().getResource("/fxml/GameScene.fxml"))));
@@ -52,9 +59,4 @@ public class SkinSelectionController implements Initializable {
throw new RuntimeException();
}
}
-
- public void back() {
- parent.getChildren().clear();
- parent.getChildren().add(new SceneLoader().loadScene("LocalCreate"));
- }
}