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 5c55a372f4426ce94f9a35494cb47be24feb082c..bd6eefe70c1357775b1918338305c388ca2ff3ec 100644
--- a/src/main/java/de/hdm_stuttgart/battlearena/Controller/CommunityMapController.java
+++ b/src/main/java/de/hdm_stuttgart/battlearena/Controller/CommunityMapController.java
@@ -48,7 +48,7 @@ public class CommunityMapController implements Initializable {
// TODO: create map preview
@FXML
- private void back() {
+ private void backButton() { // for some reason compiler doesn't recognize method usage when 'back' is used as method name. Any other method name works however
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 ded22cff0ec7b8e028e0e7ea3b5dec2e5b6e6214..6fde6329e4983a0c18aca314e39b7efd90a8695b 100644
--- a/src/main/java/de/hdm_stuttgart/battlearena/Controller/LocalCreateController.java
+++ b/src/main/java/de/hdm_stuttgart/battlearena/Controller/LocalCreateController.java
@@ -29,7 +29,7 @@ public class LocalCreateController implements Initializable {
});
}
@FXML
- private void playScene() {
+ private void backButton() {
parent.getChildren().clear();
parent.getChildren().add(sceneLoader.loadScene("Play"));
}
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 db5ef303f738acab9317fa693f96b396a3a4b7c2..8bd1c8931f575747df3d8c316483fef5b7090b01 100644
--- a/src/main/java/de/hdm_stuttgart/battlearena/Controller/MapForgeController.java
+++ b/src/main/java/de/hdm_stuttgart/battlearena/Controller/MapForgeController.java
@@ -38,7 +38,7 @@ public class MapForgeController {
}
@FXML
- private void back() {
+ private void backButton() {
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 529c90c4a3339af3a6d62a66d06967385dafb3f1..7c4d231bdccd07e80988fa0eaed18dae09d9536c 100644
--- a/src/main/java/de/hdm_stuttgart/battlearena/Controller/MultiplayerController.java
+++ b/src/main/java/de/hdm_stuttgart/battlearena/Controller/MultiplayerController.java
@@ -19,7 +19,7 @@ public class MultiplayerController {
}
@FXML
- private void playScene() {
+ private void backButton() {
switchScene("Play");
}
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 36432bb3bb1fe992de8e491623325f64c4c03be6..b0f80278980a0f626d1a8db47dd93bbf33632bcc 100644
--- a/src/main/java/de/hdm_stuttgart/battlearena/Controller/MultiplayerCreateController.java
+++ b/src/main/java/de/hdm_stuttgart/battlearena/Controller/MultiplayerCreateController.java
@@ -9,7 +9,7 @@ public class MultiplayerCreateController {
private final SceneLoader sceneLoader = new SceneLoader();
@FXML
- private void multiplayerScene() {
+ private void backButton() {
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 d5492991c1f0b4e4932ac3bac133431ad6d144da..f9879317bf9c574e3ab9a86ac8e3a1da0f7aa508 100644
--- a/src/main/java/de/hdm_stuttgart/battlearena/Controller/MultiplayerJoinController.java
+++ b/src/main/java/de/hdm_stuttgart/battlearena/Controller/MultiplayerJoinController.java
@@ -9,7 +9,7 @@ public class MultiplayerJoinController {
private final SceneLoader sceneLoader = new SceneLoader();
@FXML
- private void multiplayerScene() {
+ private void backButton() {
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 24356b5ce5c12a297bdbb4bb55812b905d0389d2..15904da7f6ac029ec0680933b1c733bec6451bc9 100644
--- a/src/main/java/de/hdm_stuttgart/battlearena/Controller/PlayController.java
+++ b/src/main/java/de/hdm_stuttgart/battlearena/Controller/PlayController.java
@@ -9,7 +9,7 @@ public class PlayController {
private final SceneLoader sceneLoader = new SceneLoader();
@FXML
- private void mainMenuScene() {
+ private void backButton() {
switchScene("MainMenu");
}
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 d394ddc1054f887764e3aa6cb95090f576bf0139..0004cc21f788dc08f802fbf28d960e1e2030b562 100644
--- a/src/main/java/de/hdm_stuttgart/battlearena/Controller/SettingsController.java
+++ b/src/main/java/de/hdm_stuttgart/battlearena/Controller/SettingsController.java
@@ -32,7 +32,7 @@ public class SettingsController implements Initializable {
}
@FXML
- private void mainMenuScene() {
+ private void backButton() {
parent.getChildren().clear();
parent.getChildren().add(sceneLoader.loadScene("MainMenu"));
}
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 e753abddb9441be986c24beabfe5b7996e27b57a..770239688d18c726ff042acb64507df7ba207812 100644
--- a/src/main/java/de/hdm_stuttgart/battlearena/Controller/SkinSelectionController.java
+++ b/src/main/java/de/hdm_stuttgart/battlearena/Controller/SkinSelectionController.java
@@ -45,7 +45,7 @@ public class SkinSelectionController implements Initializable {
}
@FXML
- private void back() {
+ private void backButton() {
parent.getChildren().clear();
parent.getChildren().add(new SceneLoader().loadScene("LocalCreate"));
}
diff --git a/src/main/resources/fxml/CommunityMaps.fxml b/src/main/resources/fxml/CommunityMaps.fxml
index d1fcad13d17d45f663362527f4144f1a8c626ae9..4c421873024cca71de548b0cf6ba3498472f6594 100644
--- a/src/main/resources/fxml/CommunityMaps.fxml
+++ b/src/main/resources/fxml/CommunityMaps.fxml
@@ -6,7 +6,6 @@
<?import javafx.scene.layout.HBox?>
<?import javafx.scene.layout.VBox?>
-
<VBox fx:id="parent" alignment="CENTER" prefHeight="400.0" prefWidth="600.0" stylesheets="@../styles/style.css" xmlns="http://javafx.com/javafx/21" xmlns:fx="http://javafx.com/fxml/1" fx:controller="de.hdm_stuttgart.battlearena.Controller.CommunityMapController">
<children>
<TableView fx:id="tableView" editable="true" maxHeight="1.7976931348623157E308" maxWidth="1.7976931348623157E308" minHeight="-Infinity" minWidth="-Infinity" VBox.vgrow="ALWAYS">
@@ -23,7 +22,7 @@
</TableView>
<HBox alignment="CENTER" prefHeight="100.0" prefWidth="200.0" spacing="20.0" VBox.vgrow="ALWAYS">
<children>
- <Button mnemonicParsing="false" onAction="#back" text="Back" />
+ <Button mnemonicParsing="false" onAction="#backButton" text="Back" />
<Button mnemonicParsing="false" text="Load" />
</children>
</HBox>
diff --git a/src/main/resources/fxml/LocalCreate.fxml b/src/main/resources/fxml/LocalCreate.fxml
index 775687f34628a791dff27bf9cd48973757f3dd3a..f100d9b68a8eab3fc0d6554e02f8cbd29cd16373 100644
--- a/src/main/resources/fxml/LocalCreate.fxml
+++ b/src/main/resources/fxml/LocalCreate.fxml
@@ -111,7 +111,7 @@
</children>
</HBox>
<Button mnemonicParsing="false" onAction="#skinSelectionScene" text="Start" />
- <Button mnemonicParsing="false" onAction="#playScene" text="Back">
+ <Button mnemonicParsing="false" onAction="#backButton" text="Back">
<VBox.margin>
<Insets bottom="50.0" />
</VBox.margin>
diff --git a/src/main/resources/fxml/MapForge.fxml b/src/main/resources/fxml/MapForge.fxml
index 7c8074438295b18ec3d2b85bf44db12deafd071d..3c5265a067cce738ee950498e6b592adee6cb6d8 100644
--- a/src/main/resources/fxml/MapForge.fxml
+++ b/src/main/resources/fxml/MapForge.fxml
@@ -10,7 +10,7 @@
<Button mnemonicParsing="false" onAction="#mapEditorScene" text="Map Editor" />
<Button mnemonicParsing="false" onAction="#communityMapScene" text="Community Maps" />
<Button mnemonicParsing="false" onAction="#updateMapScene" text="Update Core Maps" />
- <Button mnemonicParsing="false" onAction="#back" text="Back" />
+ <Button mnemonicParsing="false" onAction="#backButton" text="Back" />
<Pane VBox.vgrow="ALWAYS" />
<Pane VBox.vgrow="ALWAYS" />
</children>
diff --git a/src/main/resources/fxml/Multiplayer.fxml b/src/main/resources/fxml/Multiplayer.fxml
index 58084aaf7c7a25fe3c1090606d195111eac2e025..6746b48025b1335c72d967e59be21c3a22fd70fb 100644
--- a/src/main/resources/fxml/Multiplayer.fxml
+++ b/src/main/resources/fxml/Multiplayer.fxml
@@ -18,7 +18,7 @@
<Insets />
</VBox.margin>
</Button>
- <Button alignment="CENTER" mnemonicParsing="false" onAction="#playScene" text="Back">
+ <Button alignment="CENTER" mnemonicParsing="false" onAction="#backButton" text="Back">
<VBox.margin>
<Insets />
</VBox.margin>
diff --git a/src/main/resources/fxml/MultiplayerCreate.fxml b/src/main/resources/fxml/MultiplayerCreate.fxml
index b0909c0079e798d74543c95dfcb6c6f19d6cf72e..3cf21a91e290fca2da1b2516320c1feb50a99cee 100644
--- a/src/main/resources/fxml/MultiplayerCreate.fxml
+++ b/src/main/resources/fxml/MultiplayerCreate.fxml
@@ -10,7 +10,6 @@
<?import javafx.scene.layout.VBox?>
<?import javafx.scene.text.Text?>
-
<VBox fx:id="parent" alignment="CENTER" prefHeight="400.0" prefWidth="600.0" spacing="20.0" xmlns="http://javafx.com/javafx/21" xmlns:fx="http://javafx.com/fxml/1" fx:controller="de.hdm_stuttgart.battlearena.Controller.MultiplayerCreateController">
<children>
<Pane VBox.vgrow="ALWAYS" />
@@ -49,7 +48,7 @@
</VBox.margin>
</AnchorPane>
<Button mnemonicParsing="false" text="Start" />
- <Button mnemonicParsing="false" onAction="#multiplayerScene" text="Back" />
+ <Button mnemonicParsing="false" onAction="#backButton" text="Back" />
<Pane VBox.vgrow="ALWAYS" />
<Pane VBox.vgrow="ALWAYS" />
</children>
diff --git a/src/main/resources/fxml/MultiplayerJoin.fxml b/src/main/resources/fxml/MultiplayerJoin.fxml
index e8a48e621d53819dee9b9bf53b9440b4bbd1bb9a..117cf38cd7ba79fb3f41209f4a4b869e4a11e889 100644
--- a/src/main/resources/fxml/MultiplayerJoin.fxml
+++ b/src/main/resources/fxml/MultiplayerJoin.fxml
@@ -6,7 +6,6 @@
<?import javafx.scene.layout.VBox?>
<?import javafx.scene.text.Text?>
-
<VBox fx:id="parent" alignment="CENTER" prefHeight="400.0" prefWidth="600.0" spacing="50.0" xmlns="http://javafx.com/javafx/21" xmlns:fx="http://javafx.com/fxml/1" fx:controller="de.hdm_stuttgart.battlearena.Controller.MultiplayerJoinController">
<children>
<Pane maxHeight="1.7976931348623157E308" prefHeight="200.0" prefWidth="200.0" />
@@ -15,7 +14,7 @@
<Button mnemonicParsing="false" text="Connect" VBox.vgrow="ALWAYS" />
<Text strokeType="OUTSIDE" strokeWidth="0.0" text="[Error Message]" />
<Pane maxHeight="1.7976931348623157E308" prefHeight="200.0" prefWidth="200.0" VBox.vgrow="ALWAYS" />
- <Button alignment="CENTER" mnemonicParsing="false" onAction="#multiplayerScene" text="Back" />
+ <Button alignment="CENTER" mnemonicParsing="false" onAction="#backButton" text="Back" />
<Pane maxHeight="1.7976931348623157E308" maxWidth="1.7976931348623157E308" prefHeight="20.0" VBox.vgrow="ALWAYS" />
</children>
</VBox>
diff --git a/src/main/resources/fxml/Play.fxml b/src/main/resources/fxml/Play.fxml
index 1cdd69e375cc8a700854d3e66b5caa1a8b9d6ad7..a4cbce23e49949a94521f25dd1b898423ae67e2a 100644
--- a/src/main/resources/fxml/Play.fxml
+++ b/src/main/resources/fxml/Play.fxml
@@ -4,13 +4,12 @@
<?import javafx.scene.layout.Pane?>
<?import javafx.scene.layout.VBox?>
-
<VBox fx:id="parent" alignment="CENTER" prefHeight="400.0" prefWidth="600.0" spacing="20.0" xmlns="http://javafx.com/javafx/21" xmlns:fx="http://javafx.com/fxml/1" fx:controller="de.hdm_stuttgart.battlearena.Controller.PlayController">
<children>
<Pane VBox.vgrow="ALWAYS" />
<Button mnemonicParsing="false" onAction="#localScene" text="Local" />
<Button mnemonicParsing="false" onAction="#multiplayerScene" text="Multiplayer" />
- <Button alignment="CENTER" mnemonicParsing="false" onAction="#mainMenuScene" text="Back" />
+ <Button alignment="CENTER" mnemonicParsing="false" onAction="#backButton" text="Back" />
<Pane VBox.vgrow="ALWAYS" />
<Pane VBox.vgrow="ALWAYS" />
</children>
diff --git a/src/main/resources/fxml/Settings.fxml b/src/main/resources/fxml/Settings.fxml
index 83c4b187df0184dcba9fa2991170c39ee2721bc7..6cab6585ef8f19e015fc3645684934a599ee9aec 100644
--- a/src/main/resources/fxml/Settings.fxml
+++ b/src/main/resources/fxml/Settings.fxml
@@ -29,6 +29,6 @@
</children>
</HBox>
<Button mnemonicParsing="false" onAction="#creditScene" text="Credits" />
- <Button mnemonicParsing="false" onAction="#mainMenuScene" text="Back" />
+ <Button mnemonicParsing="false" onAction="#backButton" text="Back" />
</children>
</VBox>
diff --git a/src/main/resources/fxml/SkinSelection.fxml b/src/main/resources/fxml/SkinSelection.fxml
index 9e6db7b5a2a07119bd19f16c429a6d7d5c283dea..b98b91af38434be6169c8cdfead739ef20587460 100644
--- a/src/main/resources/fxml/SkinSelection.fxml
+++ b/src/main/resources/fxml/SkinSelection.fxml
@@ -45,6 +45,6 @@
</children>
</HBox>
<Button mnemonicParsing="false" onAction="#gameScene" text="Start" />
- <Button mnemonicParsing="false" onAction="#back" text="Back" />
+ <Button mnemonicParsing="false" onAction="#backButton" text="Back" />
</children>
</VBox>