commit 22ebaf0493e023307c139afacf39f49b3034569c parent 69da8d6f74e1c38104b08b050125ee20f98afc7c Author: A Koens <[email protected]> Date: Wed, 30 Nov 2022 13:49:36 +0100 Squashed commit of the following: commit cc3d1f25660ce9a229a30903ba94312e0b168341 Author: A Koens <[email protected]> Date: Fri Nov 11 18:37:57 2022 +0100 Resource loading Changes resource loading to src instead of from Application class. commit 6bd60278050e193dd495359270d4fc4267bc643b Author: A Koens <[email protected]> Date: Tue Nov 8 15:34:21 2022 +0100 Stage Settings Settings for different stages can now be saved to settings.. Lot of Project restructuring still needs to be done. commit 82eb5f6eb7dca710baabff5896655fdc8ac893f0 Author: A Koens <[email protected]> Date: Fri Nov 4 19:51:11 2022 +0100 Temp Changes Settings Changing Stage handling Diffstat:
30 files changed, 1340 insertions(+), 1199 deletions(-)
diff --git a/src/main/java/module-info.java b/src/main/java/module-info.java @@ -19,16 +19,23 @@ module nl.isygameclient { exports nl.isygameclient; // Controllers - exports nl.isygameclient.controllers.TicTacToeGame; + exports nl.isygameclient.controllers.Games.TicTacToe; exports nl.isygameclient.controllers.GameSeletorMenu; // Models exports nl.isygameclient.models; exports nl.isygameclient.util; + exports nl.isygameclient.models.Settings; - opens nl.isygameclient to javafx.fxml; opens nl.isygameclient.util to com.google.gson; + opens nl.isygameclient to javafx.fxml; + opens nl.isygameclient.controllers.Games to javafx.fxml; opens nl.isygameclient.controllers.GameSeletorMenu to javafx.fxml; - opens nl.isygameclient.controllers.TicTacToeGame to javafx.fxml; + opens nl.isygameclient.controllers.Games.TicTacToe to javafx.fxml; + + opens nl.isygameclient.models to com.google.gson; + opens nl.isygameclient.models.Settings to com.google.gson; + exports nl.isygameclient.models.Games; + opens nl.isygameclient.models.Games to com.google.gson; } \ No newline at end of file diff --git a/src/main/java/nl/isygameclient/Application.java b/src/main/java/nl/isygameclient/Application.java @@ -1,86 +1,40 @@ package nl.isygameclient; -import java.io.IOException; -import javafx.fxml.FXMLLoader; -import javafx.scene.Scene; import javafx.stage.Stage; -import nl.isygameclient.util.Settings; -import nl.isygameclient.util.SettingsHandler; - - +import nl.isygameclient.util.StageHandler; + +/** + * This class is the start of the javafx application. + * It holds the main function that launches this class. + * As well as the start function that handles the application initialization. + * + * @author Niels Jager + * @author Arend Koens + * @author Johs Mulder + * @author Friedel Schön + */ public class Application extends javafx.application.Application { - public static Stage primaryStage; - public static Stage gameStage; - - public static void changeGameScene(String viewSrc) throws IOException { - FXMLLoader fxmlSceneLoader = new FXMLLoader(Application.class.getResource(viewSrc)); - Scene scene = new Scene(fxmlSceneLoader.load()); - gameStage.setScene(scene); - gameStage.show(); - primaryStage.setIconified(true); - } - - public static void closeGameScene() { - gameStage.hide(); - primaryStage.setIconified(false); - } - - public static void openMainMenu() throws IOException { - FXMLLoader fxmlSceneLoader = new FXMLLoader(Application.class.getResource("views/GameSelectorMenu/GameSelectorMenu.fxml")); - Scene scene = new Scene(fxmlSceneLoader.load()); - primaryStage.setScene(scene); - } - - public static void main(String[] args) { - launch(); - } - - @Override - public void start(Stage stage) throws IOException { - primaryStage = stage; - gameStage = new Stage(); - - openMainMenu(); - loadSettings(); - - // Save Values on Close - primaryStage.setOnCloseRequest((windowEvent) -> saveSettings()); - - gameStage.setOnCloseRequest((windowEvent -> closeGameScene())); - - primaryStage.show(); - } - - private void loadSettings() { - // Load Settings from file - Settings settings = SettingsHandler.load(); - - // Set Initial Values - primaryStage.setTitle(settings.title); - primaryStage.setFullScreen(settings.isFullScreen); - primaryStage.setMaximized(settings.isMaximized); - primaryStage.setWidth(settings.screenWidth); - primaryStage.setHeight(settings.screenHeight); - primaryStage.setX(settings.screenX); - primaryStage.setY(settings.screenY); - } - private void saveSettings() { - // Load Settings from file - Settings settings = SettingsHandler.load(); + public static void main(String[] args) { + launch(); + } - settings.screenWidth = primaryStage.getWidth(); - settings.screenHeight = primaryStage.getHeight(); - settings.isFullScreen = primaryStage.isFullScreen(); - settings.isMaximized = primaryStage.isMaximized(); - settings.screenX = primaryStage.getX(); - settings.screenY = primaryStage.getY(); + /** + * The start preforms the initialization of the stage. + * @param stage a javafx stage. + */ + @Override + public void start(Stage stage) { + StageHandler stageHandler = StageHandler.get(); + stageHandler.loadStages(); - SettingsHandler.save(settings); - } + String stageName = "GameSelectorMenu"; + stageHandler.changeSceneOfStage(stageName, "views/GameSelectorMenu/GameSelectorMenu.fxml"); + stageHandler.focusStage(stageName); - public Stage getPrimaryStage() { - return primaryStage; - } + stageHandler.getStage(stageName).setOnCloseRequest((e) -> { + stageHandler.saveStages(); + }); + } } \ No newline at end of file diff --git a/src/main/java/nl/isygameclient/controllers/GameSeletorMenu/GameCardController.java b/src/main/java/nl/isygameclient/controllers/GameSeletorMenu/GameCardController.java @@ -6,13 +6,11 @@ import javafx.scene.image.Image; import javafx.scene.image.ImageView; import javafx.scene.input.MouseEvent; import nl.isygameclient.Application; -import nl.isygameclient.util.Settings; - -import java.io.IOException; +import nl.isygameclient.models.GameCard; public class GameCardController { - private Settings.GameCard gameCard; + private GameCard gameCard; @FXML private ImageView gameImage; @@ -20,7 +18,7 @@ public class GameCardController { @FXML private Label gameTitle; - public void initializeCard(Settings.GameCard gameCard) { + public void initializeCard(GameCard gameCard) { this.gameCard = gameCard; // Set Title gameTitle.setText(gameCard.name); @@ -42,10 +40,7 @@ public class GameCardController { } @FXML - protected void onCardMouseClick(MouseEvent event) throws IOException { - if (event.getClickCount() == 2 && gameCard.viewSrc != null && !Application.gameStage.isShowing()) { - Application.changeGameScene(gameCard.viewSrc); - Application.gameStage.setTitle(gameCard.name); - } + protected void onCardMouseClick(MouseEvent event) { + GameSelectorMenuController.onGameClick(event, gameCard); } } diff --git a/src/main/java/nl/isygameclient/controllers/GameSeletorMenu/GameSelectorMenuController.java b/src/main/java/nl/isygameclient/controllers/GameSeletorMenu/GameSelectorMenuController.java @@ -1,93 +1,110 @@ package nl.isygameclient.controllers.GameSeletorMenu; -import java.io.IOException; -import java.util.ArrayList; -import java.util.List; -import java.util.stream.Collectors; import javafx.collections.FXCollections; -import javafx.collections.ObservableList; import javafx.fxml.FXML; import javafx.fxml.FXMLLoader; +import javafx.fxml.Initializable; import javafx.scene.Node; import javafx.scene.control.ListCell; import javafx.scene.control.ListView; import javafx.scene.control.TextField; +import javafx.scene.input.MouseEvent; import javafx.scene.layout.FlowPane; import javafx.scene.layout.VBox; import nl.isygameclient.Application; -import nl.isygameclient.util.Settings; -import nl.isygameclient.util.SettingsHandler; +import nl.isygameclient.models.GameCard; +import nl.isygameclient.util.SettingsFileHandler; +import nl.isygameclient.util.StageHandler; + +import java.io.IOException; +import java.net.URL; +import java.util.List; +import java.util.ResourceBundle; +import java.util.stream.Collectors; + +public class GameSelectorMenuController implements Initializable { + + private final List<GameCard> gameCards = SettingsFileHandler.load().gameCards; -public class GameSelectorMenuController { + @FXML + public TextField searchBox; + @FXML + public ListView<GameCard> gamesList; + @FXML + public VBox gameDetail; - private final List<Settings.GameCard> gameCards = SettingsHandler.load().gameCards; + @FXML + public FlowPane gameContainer; - @FXML - public TextField searchBox; - @FXML - public ListView<Settings.GameCard> gamesList; - @FXML - public VBox gameDetail; + public static void onGameClick(MouseEvent event, GameCard gameCard) { + var stageHandler = StageHandler.get(); + var stageName = "Game"; + if (event.getClickCount() == 2 && gameCard.viewSrc != null && !stageHandler.getStage(stageName).isShowing()) { + stageHandler.changeSceneOfStage(stageName, gameCard.viewSrc); + var stage = stageHandler.getStage(stageName); + stage.setTitle(gameCard.name); + stage.show(); + stageHandler.iconifyStage("GameSelectorMenu"); + } + } - @FXML - public FlowPane gameContainer; + @Override + public void initialize(URL url, ResourceBundle resourceBundle) { + initializeGamesListView(); + initializeGamesListCells(); + initializeGameCards(); + } - @FXML - protected void initialize() throws IOException { - initializeGamesListView(); - initializeGamesListCells(); - initializeGameCards(); - } + private void initializeGamesListView() { + gamesList.setItems(FXCollections.observableList(gameCards)); + searchBox.textProperty().addListener((observable, oldValue, newValue) -> { + var filteredList = FXCollections.observableList(filterGameCards(newValue)); + gamesList.setItems(filteredList); + }); + } - private void initializeGamesListView() { - gamesList.setItems(FXCollections.observableList(gameCards)); - searchBox.textProperty().addListener((observable, oldValue, newValue) -> { - var filteredList = FXCollections.observableList(gameCards.stream().filter(gameCard -> gameCard.name.contains(newValue)).collect(Collectors.toList())); - gamesList.setItems(filteredList); - }); - } + private void initializeGamesListCells() { + gamesList.setCellFactory(lv -> { + ListCell<GameCard> listCell = new ListCell<>() { + @Override + protected void updateItem(GameCard item, boolean empty) { + super.updateItem(item, empty); - private void initializeGamesListCells() { - gamesList.setCellFactory(lv -> { - ListCell<Settings.GameCard> listCell = new ListCell<>() { - @Override - protected void updateItem(Settings.GameCard item, boolean empty) { - super.updateItem(item, empty); + if (empty || item == null || item.name == null) { + setText(null); + } else { + setText(item.name); + } + } + }; + listCell.setOnMouseClicked((event) -> { + GameCard gameCard = listCell.getItem(); + onGameClick(event, gameCard); + }); + return listCell; + }); + } - if (empty || item == null || item.name == null) { - setText(null); - } else { - setText(item.name); - } - } - }; - listCell.setOnMouseClicked((event) -> { - if (event.getClickCount() == 2 && !gamesList.getItems().isEmpty() && listCell.getItem().viewSrc != null && !Application.gameStage.isShowing()) { - try { - Settings.GameCard gameCard = listCell.getItem(); - Application.changeGameScene(gameCard.viewSrc); - Application.gameStage.setTitle(gameCard.name); - } catch (IOException e) { - e.printStackTrace(); - } - } - }); - return listCell; - }); - } + private void initializeGameCards() { + try { + for (GameCard gameCard : gameCards) { + FXMLLoader fxmlLoader = new FXMLLoader(Application.class.getResource("views/GameSelectorMenu/GameCard.fxml")); + Node node = fxmlLoader.load(); + GameCardController controller = fxmlLoader.getController(); + controller.initializeCard(gameCard); + gameContainer.getChildren().add(node); + } + } catch (IOException e) { + e.printStackTrace(); + } + } - private void initializeGameCards() throws IOException { - for (Settings.GameCard gameCard : gameCards) { - FXMLLoader fxmlLoader = new FXMLLoader(Application.class.getResource("views/GameSelectorMenu/GameCard.fxml")); - Node node = fxmlLoader.load(); - GameCardController controller = fxmlLoader.getController(); - controller.initializeCard(gameCard); - gameContainer.getChildren().add(node); - } - } + private List<GameCard> filterGameCards(String value) { + return gameCards.stream().filter(gameCard -> gameCard.name.contains(value)).collect(Collectors.toList()); + } - @FXML - protected void onClearSearchButtonClick() { - searchBox.clear(); - } + @FXML + protected void onClearSearchButtonClick() { + searchBox.clear(); + } } diff --git a/src/main/java/nl/isygameclient/controllers/Games/GameController.java b/src/main/java/nl/isygameclient/controllers/Games/GameController.java @@ -0,0 +1,14 @@ +package nl.isygameclient.controllers.Games; + +import javafx.fxml.FXML; +import nl.isygameclient.util.StageHandler; + +public abstract class GameController { + + @FXML + protected void onExitButtonClick() { + var settingsHandler = StageHandler.get(); + settingsHandler.getStage("Game").hide(); + settingsHandler.focusStage("GameSelectorMenu"); + } +} diff --git a/src/main/java/nl/isygameclient/controllers/Games/TicTacToe/TicTacToeMainMenuController.java b/src/main/java/nl/isygameclient/controllers/Games/TicTacToe/TicTacToeMainMenuController.java @@ -0,0 +1,18 @@ +package nl.isygameclient.controllers.Games.TicTacToe; + +import javafx.fxml.FXML; +import nl.isygameclient.controllers.Games.GameController; +import nl.isygameclient.util.StageHandler; + +public class TicTacToeMainMenuController extends GameController { + @FXML + public void onSinglePlayerButtonClick() { + StageHandler.get().changeSceneOfStage("Game", "views/Games/TicTacToe/TicTacToeSinglePlayer.fxml"); + } + + @FXML + public void onMultiplayerButtonClick() { + StageHandler.get().changeSceneOfStage("Game","views/Games/TicTacToe/TicTacToeMultiPlayer.fxml"); + } + +} diff --git a/src/main/java/nl/isygameclient/controllers/Games/TicTacToe/TicTacToeMultiPlayerController.java b/src/main/java/nl/isygameclient/controllers/Games/TicTacToe/TicTacToeMultiPlayerController.java @@ -0,0 +1,203 @@ +package nl.isygameclient.controllers.Games.TicTacToe; + +import com.jfoenix.controls.JFXButton; +import com.jfoenix.controls.JFXComboBox; +import java.io.IOException; +import java.net.URL; +import java.util.ResourceBundle; + +import javafx.application.Platform; +import javafx.event.ActionEvent; +import javafx.fxml.FXML; +import javafx.fxml.Initializable; +import javafx.scene.control.Label; +import javafx.scene.control.TextField; +import javafx.scene.layout.GridPane; +import nl.isygameclient.controllers.Games.GameController; +import nl.isygameclient.models.Games.TicTacToe; +import nl.isygameclient.network.GameClient; +import nl.isygameclient.network.GameClientException; +import nl.isygameclient.network.GameType; +import nl.isygameclient.network.Match; +import nl.isygameclient.util.StageHandler; + +public class TicTacToeMultiPlayerController extends GameController implements Runnable, Initializable { + private final JFXButton[] boardButtons = new JFXButton[TicTacToe.BOARD_SIZE * TicTacToe.BOARD_SIZE]; + private final String[] players = { "X", "O" }; + + @FXML + private Label playingAgainstLabel; + @FXML + private TextField hostField; + @FXML + private TextField portField; + @FXML + private TextField nameField; + @FXML + private TextField opponentField; + @FXML + private JFXComboBox<String> playingAsCombo; + @FXML + private Label currentPlayer; + @FXML + private Label gameOverText; + @FXML + private GridPane grid; + + private GameClient client; + private Match match; + private String playerSelf = "X", playerOther = "O"; + private boolean running; + + private Thread gameThread; + + @Override + public void initialize(URL url, ResourceBundle resourceBundle) { + for (int i = 0; i < TicTacToe.BOARD_SIZE * TicTacToe.BOARD_SIZE; i++) { + JFXButton button = new JFXButton(); + button.setId(Integer.toString(i)); + button.setMinSize(200.0, 200.0); + var styleClass = button.getStyleClass(); + styleClass.add("ttt-button"); + styleClass.add("display-large"); + button.setOnAction((ActionEvent event) -> onMoveButtonClick(button)); + boardButtons[i] = button; + grid.add(button, i / TicTacToe.BOARD_SIZE, i % TicTacToe.BOARD_SIZE); + } + + playingAsCombo.getItems().setAll(players); + playingAsCombo.getSelectionModel().selectFirst(); + + disableBoardButtons(); + // currentPlayer.setText(); + } + + public void run() { + running = true; + try { + client = new GameClient(hostField.getText(), Integer.parseInt(portField.getText())); + client.login(nameField.getText()); + + if (opponentField.getText().length() == 0) + match = client.match(GameType.TICTACTOE); + else + match = client.match(GameType.TICTACTOE, opponentField.getText()); + + while (running) { + match.update(); + + if (!match.isStarted()) + continue; + + // game.setCurrentPlayer(match.isYourTurn() ? playerSelf : playerOther); + // game.move(Integer.parseInt(moveMap.get("move"))); + Platform.runLater(() -> { + playingAgainstLabel.setText(match.getOpponent()); + + if (match.isYourTurn()) { + currentPlayer.setText(playerSelf); + enableBoardButtons(); + } else { + currentPlayer.setText(playerOther); + disableBoardButtons(); + } + for (int i = 0; i < TicTacToe.BOARD_SIZE * TicTacToe.BOARD_SIZE; i++) { + switch (match.getMove(i)) { + case -1 -> boardButtons[i].setText(playerOther); + case 0 -> boardButtons[i].setText(""); + case 1 -> boardButtons[i].setText(playerSelf); + } + } + }); + + if (match.getOutcome() == null) + continue; + + running = false; + + Platform.runLater(() -> { + switch (match.getOutcome().type) { + case DRAW: + System.out.println("Draw!"); + gameOverText.setText("Draw!"); + gameOverText.setVisible(true); + break; + case LOSS: + System.out.printf("%s, Is the Winner!\n\n", playerOther); + gameOverText.setText(String.format("%s, is the Winner!\n\n", playerOther)); + gameOverText.setVisible(true); + break; + case WIN: + System.out.printf("%s, Is the Winner!\n\n", playerSelf); + gameOverText.setText(String.format("%s, is the Winner!\n\n", playerSelf)); + gameOverText.setVisible(true); + default: + } + }); + } + match.abort(); + client.close(); + } catch (IOException e) { + e.printStackTrace(); + } + } + + @FXML + private void onNewGameButtonClick() throws NumberFormatException, InterruptedException { + gameOverText.setVisible(false); + + if (gameThread != null && running) { + running = false; + gameThread.join(); + } + gameThread = new Thread(this); + gameThread.start(); + } + + private void onMoveButtonClick(JFXButton button) { + try { + // Move + int pos = Integer.parseInt(button.getId()); + // if (game.isMoveValid(pos)) + match.move(pos); + // currentPlayer.setText(playerOther); + + // updateBoard(); + // currentPlayer.setText(playerSelf); + } catch (Exception exc) { + throw new RuntimeException(exc); + } + } + + private void disableBoardButtons() { + for (JFXButton button : boardButtons) { + button.setDisable(true); + } + } + + private void enableBoardButtons() { + for (JFXButton button : boardButtons) { + button.setDisable(false); + } + } + + @FXML + protected void onPlayingAsComboSelect() { + System.out.printf("Now playing As: %s\n", playingAsCombo.getValue()); + switch (playingAsCombo.getValue()) { + case "X" -> { + playerSelf = "X"; + playerOther = "O"; + } + case "O" -> { + playerSelf = "O"; + playerOther = "X"; + } + } + } + + @FXML + protected void onMainMenuButtonClick() { + StageHandler.get().changeSceneOfStage("Game","views/Games/TicTacToe/TicTacToeMainMenu.fxml"); + } +} diff --git a/src/main/java/nl/isygameclient/controllers/Games/TicTacToe/TicTacToeSinglePlayerController.java b/src/main/java/nl/isygameclient/controllers/Games/TicTacToe/TicTacToeSinglePlayerController.java @@ -0,0 +1,157 @@ +package nl.isygameclient.controllers.Games.TicTacToe; + +import com.jfoenix.controls.JFXButton; +import com.jfoenix.controls.JFXComboBox; + +import java.util.ArrayList; +import javafx.event.ActionEvent; +import javafx.fxml.FXML; +import javafx.scene.control.Label; +import javafx.scene.layout.GridPane; +import nl.isygameclient.controllers.Games.GameController; +import nl.isygameclient.models.Games.TicTacToe; +import nl.isygameclient.util.StageHandler; + +public class TicTacToeSinglePlayerController extends GameController { + private final ArrayList<JFXButton> boardButtons = new ArrayList<>(); + + @FXML + public JFXComboBox<String> difficultyCombo; + @FXML + public JFXComboBox<String> playingAsCombo; + @FXML + public JFXComboBox<String> opponentCombo; + + @FXML + protected Label currentPlayer; + @FXML + public Label gameOverText; + + @FXML + protected GridPane grid; + + private TicTacToe ttt = new TicTacToe(); + + @FXML + protected void initialize() { + initializeBoard(); + initializeDifficultyCombo(); + initializePlayingAsCombo(); + initializeOpponentCombo(); + updateCurrentPlayerLabel(); + } + + private void initializeDifficultyCombo() { + difficultyCombo.getItems().setAll("Easy", "Medium", "Hard"); + difficultyCombo.getSelectionModel().selectFirst(); + } + + private void initializePlayingAsCombo() { + playingAsCombo.getItems().setAll(ttt.getPlayers()); + playingAsCombo.getSelectionModel().selectFirst(); + } + + private void initializeOpponentCombo() { + opponentCombo.getItems().setAll("Human", "AI"); + opponentCombo.getSelectionModel().selectFirst(); + } + + private void initializeBoard() { + for (int i = 0; i < TicTacToe.BOARD_SIZE; i++) { + for (int j = 0; j < TicTacToe.BOARD_SIZE; j++) { + JFXButton button = new JFXButton(); + button.setId(String.valueOf(i + j * TicTacToe.BOARD_SIZE)); + button.setMinSize(200.0, 200.0); + var styleClass = button.getStyleClass(); + styleClass.add("ttt-button"); + styleClass.add("display-large"); + button.setOnAction((ActionEvent event) -> onMoveButtonClick(button)); + boardButtons.add(button); + grid.add(button, i, j); + } + } + } + + private void updateCurrentPlayerLabel() { + currentPlayer.setText(ttt.getCurrentPlayer()); + } + + private void onMoveButtonClick(JFXButton button) { + // Move + int pos = Integer.parseInt(button.getId()); + if (ttt.isMoveValid(pos)) { + ttt.move(pos); + button.setText(ttt.getCurrentPlayer()); + ttt.nextPlayer(); + updateCurrentPlayerLabel(); + } + + // Game Over + if (ttt.isGameOver()) { + onGameOver(); + } + } + + // TODO Create Game-over Modal + private void onGameOver() { + disableBoardButtons(); + System.out.println("Game Over"); + if (ttt.isDraw()) { + System.out.println("Draw!"); + gameOverText.setText("Draw!"); + gameOverText.setVisible(true); + } else { + System.out.printf("%s, Is the Winner!\n\n", ttt.getWinner()); + gameOverText.setText(String.format("%s, is the Winner!\n\n", ttt.getWinner())); + gameOverText.setVisible(true); + } + } + + private void clearBoardButtons() { + for (JFXButton button : boardButtons) { + button.setText(""); + } + } + + private void disableBoardButtons() { + for (JFXButton button : boardButtons) { + button.setDisable(true); + } + } + + private void enableBoardButtons() { + for (JFXButton button : boardButtons) { + button.setDisable(false); + } + } + + @FXML + protected void onDifficultyComboSelect() { + System.out.printf("Difficulty Changed to: %s\n", difficultyCombo.getValue()); + } + + @FXML + protected void onPlayingAsComboSelect() { + System.out.printf("Now playing As: %s\n", playingAsCombo.getValue()); + } + + @FXML + protected void onOpponentComboSelect() { + System.out.printf("Opponent Changed to: %s\n", opponentCombo.getValue()); + } + + @FXML + protected void onNewGameButtonClick() { + // Make new Game + ttt = new TicTacToe(); + + clearBoardButtons(); + enableBoardButtons(); + gameOverText.setVisible(false); + } + + @FXML + protected void onMainMenuButtonClick() { + StageHandler.get().changeSceneOfStage("Game","views/Games/TicTacToe/TicTacToeMainMenu.fxml"); + } +} diff --git a/src/main/java/nl/isygameclient/controllers/TicTacToeGame/TicTacToeMainMenuController.java b/src/main/java/nl/isygameclient/controllers/TicTacToeGame/TicTacToeMainMenuController.java @@ -1,23 +0,0 @@ -package nl.isygameclient.controllers.TicTacToeGame; - -import java.io.IOException; -import javafx.event.ActionEvent; -import javafx.fxml.FXML; -import nl.isygameclient.Application; - -public class TicTacToeMainMenuController { - @FXML - public void onSinglePlayerButtonClick(ActionEvent event) throws IOException { - Application.changeGameScene("views/TicTacToe/TicTacToeSinglePlayer.fxml"); - } - - @FXML - public void onMultiplayerButtonClick(ActionEvent event) throws IOException { - Application.changeGameScene("views/TicTacToe/TicTacToeMultiPlayer.fxml"); - } - - @FXML - public void onExitButtonClick(ActionEvent event) throws IOException { - Application.closeGameScene(); - } -} diff --git a/src/main/java/nl/isygameclient/controllers/TicTacToeGame/TicTacToeMultiPlayerController.java b/src/main/java/nl/isygameclient/controllers/TicTacToeGame/TicTacToeMultiPlayerController.java @@ -1,210 +0,0 @@ -package nl.isygameclient.controllers.TicTacToeGame; - -import com.jfoenix.controls.JFXButton; -import com.jfoenix.controls.JFXComboBox; -import java.io.IOException; -import java.net.UnknownHostException; -import java.util.Map; -import javafx.application.Platform; -import javafx.event.ActionEvent; -import javafx.fxml.FXML; -import javafx.scene.control.Label; -import javafx.scene.control.TextField; -import javafx.scene.layout.GridPane; -import nl.isygameclient.Application; -import nl.isygameclient.models.TicTacToe; -import nl.isygameclient.network.GameClient; -import nl.isygameclient.network.GameClientException; -import nl.isygameclient.network.GameType; -import nl.isygameclient.network.Match; - -public class TicTacToeMultiPlayerController implements Runnable { - private final JFXButton[] boardButtons = new JFXButton[TicTacToe.BOARD_SIZE * TicTacToe.BOARD_SIZE]; - private final String[] players = { "X", "O" }; - - @FXML - private Label playingAgainstLabel; - @FXML - private TextField hostField; - @FXML - private TextField portField; - @FXML - private TextField nameField; - @FXML - private TextField opponentField; - @FXML - private JFXComboBox<String> playingAsCombo; - @FXML - private Label currentPlayer; - @FXML - private Label gameOverText; - @FXML - private GridPane grid; - - private GameClient client; - private Match match; - private String playerSelf = "X", playerOther = "O"; - private boolean running; - - private Thread gameThread; - - @FXML - protected void initialize() { - for (int i = 0; i < TicTacToe.BOARD_SIZE * TicTacToe.BOARD_SIZE; i++) { - JFXButton button = new JFXButton(); - button.setId(Integer.toString(i)); - button.setMinSize(200.0, 200.0); - var styleClass = button.getStyleClass(); - styleClass.add("ttt-button"); - styleClass.add("display-large"); - button.setOnAction((ActionEvent event) -> onMoveButtonClick(button)); - boardButtons[i] = button; - grid.add(button, i / TicTacToe.BOARD_SIZE, i % TicTacToe.BOARD_SIZE); - } - - playingAsCombo.getItems().setAll(players); - playingAsCombo.getSelectionModel().selectFirst(); - - disableBoardButtons(); - // currentPlayer.setText(); - } - - public void run() { - running = true; - try { - client = new GameClient(hostField.getText(), Integer.parseInt(portField.getText())); - client.login(nameField.getText()); - - if (opponentField.getText().length() == 0) - match = client.match(GameType.TICTACTOE); - else - match = client.match(GameType.TICTACTOE, opponentField.getText()); - - while (running) { - match.update(); - - if (!match.isStarted()) - continue; - - // game.setCurrentPlayer(match.isYourTurn() ? playerSelf : playerOther); - // game.move(Integer.parseInt(moveMap.get("move"))); - Platform.runLater(() -> { - playingAgainstLabel.setText(match.getOpponent()); - - if (match.isYourTurn()) { - currentPlayer.setText(playerSelf); - enableBoardButtons(); - } else { - currentPlayer.setText(playerOther); - disableBoardButtons(); - } - for (int i = 0; i < TicTacToe.BOARD_SIZE * TicTacToe.BOARD_SIZE; i++) { - switch (match.getMove(i)) { - case -1: - boardButtons[i].setText(playerOther); - break; - case 0: - boardButtons[i].setText(""); - break; - case 1: - boardButtons[i].setText(playerSelf); - break; - } - } - }); - - if (match.getOutcome() == null) - continue; - - running = false; - - Platform.runLater(() -> { - switch (match.getOutcome().type) { - case DRAW: - System.out.println("Draw!"); - gameOverText.setText("Draw!"); - gameOverText.setVisible(true); - break; - case LOSS: - System.out.printf("%s, Is the Winner!\n\n", playerOther); - gameOverText.setText(String.format("%s, is the Winner!\n\n", playerOther)); - gameOverText.setVisible(true); - break; - case WIN: - System.out.printf("%s, Is the Winner!\n\n", playerSelf); - gameOverText.setText(String.format("%s, is the Winner!\n\n", playerSelf)); - gameOverText.setVisible(true); - default: - } - }); - } - match.abort(); - client.close(); - } catch (IOException e) { - e.printStackTrace(); - } - } - - @FXML - private void onNewGameButtonClick() throws NumberFormatException, GameClientException, InterruptedException { - gameOverText.setVisible(false); - - if (gameThread != null || running) { - running = false; - gameThread.join(); - } - gameThread = new Thread(this); - gameThread.start(); - } - - private void onMoveButtonClick(JFXButton button) { - try { - // Move - int pos = Integer.parseInt(button.getId()); - // if (game.isMoveValid(pos)) - match.move(pos); - // currentPlayer.setText(playerOther); - - // updateBoard(); - // currentPlayer.setText(playerSelf); - } catch (Exception exc) { - throw new RuntimeException(exc); - } - } - - private void disableBoardButtons() { - for (JFXButton button : boardButtons) { - button.setDisable(true); - } - } - - private void enableBoardButtons() { - for (JFXButton button : boardButtons) { - button.setDisable(false); - } - } - - @FXML - protected void onPlayingAsComboSelect() { - System.out.printf("Now playing As: %s\n", playingAsCombo.getValue()); - switch (playingAsCombo.getValue()) { - case "X": - playerSelf = "X"; - playerOther = "O"; - break; - case "O": - playerSelf = "O"; - playerOther = "X"; - } - } - - @FXML - protected void onMainMenuButtonClick() throws IOException { - Application.changeGameScene("views/TicTacToe/TicTacToeMainMenu.fxml"); - } - - @FXML - protected void onExitButtonClick() throws IOException { - Application.closeGameScene(); - } -} diff --git a/src/main/java/nl/isygameclient/controllers/TicTacToeGame/TicTacToeSinglePlayerController.java b/src/main/java/nl/isygameclient/controllers/TicTacToeGame/TicTacToeSinglePlayerController.java @@ -1,161 +0,0 @@ -package nl.isygameclient.controllers.TicTacToeGame; - -import com.jfoenix.controls.JFXButton; -import com.jfoenix.controls.JFXComboBox; -import java.io.IOException; -import java.util.ArrayList; -import javafx.event.ActionEvent; -import javafx.fxml.FXML; -import javafx.scene.control.Label; -import javafx.scene.layout.GridPane; -import nl.isygameclient.Application; -import nl.isygameclient.models.TicTacToe; - -public class TicTacToeSinglePlayerController { - private final ArrayList<JFXButton> boardButtons = new ArrayList<>(); - - @FXML - public JFXComboBox<String> difficultyCombo; - @FXML - public JFXComboBox<String> playingAsCombo; - @FXML - public JFXComboBox<String> opponentCombo; - - @FXML - protected Label currentPlayer; - @FXML - public Label gameOverText; - - @FXML - protected GridPane grid; - - private TicTacToe ttt = new TicTacToe(); - - @FXML - protected void initialize() { - initializeBoard(); - initializeDifficultyCombo(); - initializePlayingAsCombo(); - initializeOpponentCombo(); - updateCurrentPlayerLabel(); - } - - private void initializeDifficultyCombo() { - difficultyCombo.getItems().setAll("Easy", "Medium", "Hard"); - difficultyCombo.getSelectionModel().selectFirst(); - } - - private void initializePlayingAsCombo() { - playingAsCombo.getItems().setAll(ttt.getPlayers()); - playingAsCombo.getSelectionModel().selectFirst(); - } - - private void initializeOpponentCombo() { - opponentCombo.getItems().setAll("Human", "AI"); - opponentCombo.getSelectionModel().selectFirst(); - } - - private void initializeBoard() { - for (int i = 0; i < TicTacToe.BOARD_SIZE; i++) { - for (int j = 0; j < TicTacToe.BOARD_SIZE; j++) { - JFXButton button = new JFXButton(); - button.setId(String.valueOf(i + j * TicTacToe.BOARD_SIZE)); - button.setMinSize(200.0, 200.0); - var styleClass = button.getStyleClass(); - styleClass.add("ttt-button"); - styleClass.add("display-large"); - button.setOnAction((ActionEvent event) -> onMoveButtonClick(button)); - boardButtons.add(button); - grid.add(button, i, j); - } - } - } - - private void updateCurrentPlayerLabel() { - currentPlayer.setText(ttt.getCurrentPlayer()); - } - - private void onMoveButtonClick(JFXButton button) { - // Move - int pos = Integer.parseInt(button.getId()); - if (ttt.isMoveValid(pos)) { - ttt.move(pos); - button.setText(ttt.getCurrentPlayer()); - ttt.nextPlayer(); - updateCurrentPlayerLabel(); - } - - // Game Over - if (ttt.isGameOver()) { - onGameOver(); - } - } - - // TODO Create Game-over Modal - private void onGameOver() { - disableBoardButtons(); - System.out.println("Game Over"); - if (ttt.isDraw()) { - System.out.println("Draw!"); - gameOverText.setText("Draw!"); - gameOverText.setVisible(true); - } else { - System.out.printf("%s, Is the Winner!\n\n", ttt.getWinner()); - gameOverText.setText(String.format("%s, is the Winner!\n\n", ttt.getWinner())); - gameOverText.setVisible(true); - } - } - - private void clearBoardButtons() { - for (JFXButton button : boardButtons) { - button.setText(""); - } - } - - private void disableBoardButtons() { - for (JFXButton button : boardButtons) { - button.setDisable(true); - } - } - - private void enableBoardButtons() { - for (JFXButton button : boardButtons) { - button.setDisable(false); - } - } - - @FXML - protected void onDifficultyComboSelect() { - System.out.printf("Difficulty Changed to: %s\n", difficultyCombo.getValue()); - } - - @FXML - protected void onPlayingAsComboSelect() { - System.out.printf("Now playing As: %s\n", playingAsCombo.getValue()); - } - - @FXML - protected void onOpponentComboSelect() { - System.out.printf("Opponent Changed to: %s\n", opponentCombo.getValue()); - } - - @FXML - protected void onNewGameButtonClick() { - // Make new Game - ttt = new TicTacToe(); - - clearBoardButtons(); - enableBoardButtons(); - gameOverText.setVisible(false); - } - - @FXML - protected void onMainMenuButtonClick() throws IOException { - Application.changeGameScene("views/TicTacToe/TicTacToeMainMenu.fxml"); - } - - @FXML - protected void onExitButtonClick() throws IOException { - Application.closeGameScene(); - } -} diff --git a/src/main/java/nl/isygameclient/models/Difficulty.java b/src/main/java/nl/isygameclient/models/Difficulty.java @@ -1,13 +0,0 @@ -package nl.isygameclient.models; - -public enum Difficulty { - EASY("Easy"), - MEDIUM("Medium"), - HARD("Hard"); - - public final String name; - - private Difficulty(String name_) { - name = name_; - } -} diff --git a/src/main/java/nl/isygameclient/models/Game.java b/src/main/java/nl/isygameclient/models/Game.java @@ -1,44 +0,0 @@ -package nl.isygameclient.models; - -import java.util.Arrays; -import lombok.Data; - - -@Data -public abstract class Game { - int currentPlayerIndex; - String[] players; - - public Game(int currentPlayer, String[] players) { - this.currentPlayerIndex = currentPlayer; - this.players = players; - } - - - public abstract void move(int pos); - - public abstract boolean isMoveValid(int pos); - - public abstract boolean isGameOver(); - - public abstract String getWinner(); - - public void nextPlayer() { - currentPlayerIndex += 1; - if (currentPlayerIndex >= players.length) { - currentPlayerIndex = 0; - } - } - - public String getCurrentPlayer() { - return players[currentPlayerIndex]; - } - - public void setCurrentPlayerIndex(int playerIndex) { - this.currentPlayerIndex = playerIndex; - } - - public void setCurrentPlayer(String player) { - currentPlayerIndex = Arrays.asList(players).indexOf(player); - } -} diff --git a/src/main/java/nl/isygameclient/models/GameCard.java b/src/main/java/nl/isygameclient/models/GameCard.java @@ -0,0 +1,13 @@ +package nl.isygameclient.models; + +public class GameCard { + public String name; + public String viewSrc; + public String imgSrc; + + public GameCard(String name, String viewSrc, String imgSrc) { + this.name = name; + this.viewSrc = viewSrc; + this.imgSrc = imgSrc; + } +} diff --git a/src/main/java/nl/isygameclient/models/Games/Difficulty.java b/src/main/java/nl/isygameclient/models/Games/Difficulty.java @@ -0,0 +1,13 @@ +package nl.isygameclient.models.Games; + +public enum Difficulty { + EASY("Easy"), + MEDIUM("Medium"), + HARD("Hard"); + + public final String name; + + private Difficulty(String name_) { + name = name_; + } +} diff --git a/src/main/java/nl/isygameclient/models/Games/Game.java b/src/main/java/nl/isygameclient/models/Games/Game.java @@ -0,0 +1,47 @@ +package nl.isygameclient.models.Games; + +import java.util.Arrays; +import java.util.List; + +import lombok.Data; + + +@Data +public abstract class Game { + int currentPlayerIndex; + String[] players; + + public Game(int currentPlayer, String[] players) { + this.currentPlayerIndex = currentPlayer; + this.players = players; + } + + public abstract void move(int pos); + + public abstract boolean isMoveValid(int pos); + + public abstract List<Integer> getPossibleMoves(); + + public abstract boolean isGameOver(); + + public abstract String getWinner(); + + public void nextPlayer() { + currentPlayerIndex += 1; + if (currentPlayerIndex >= players.length) { + currentPlayerIndex = 0; + } + } + + public String getCurrentPlayer() { + return players[currentPlayerIndex]; + } + + public void setCurrentPlayerIndex(int playerIndex) { + this.currentPlayerIndex = playerIndex; + } + + public void setCurrentPlayer(String player) { + currentPlayerIndex = Arrays.asList(players).indexOf(player); + } +} diff --git a/src/main/java/nl/isygameclient/models/Games/TicTacToe.java b/src/main/java/nl/isygameclient/models/Games/TicTacToe.java @@ -0,0 +1,74 @@ +package nl.isygameclient.models.Games; + +import java.util.ArrayList; +import java.util.Arrays; +import java.util.List; + +public class TicTacToe extends Game { + public static final int BOARD_SIZE = 3; + + String[] board = new String[BOARD_SIZE * BOARD_SIZE]; + + public TicTacToe() { + super(0, new String[] { "X", "O" }); + } + + public boolean isMoveValid(int pos) { + return (pos >= 0 && pos < (BOARD_SIZE * BOARD_SIZE)) && board[pos] == null; + } + + public void move(int pos) { + board[pos] = players[currentPlayerIndex]; + } + + public List<Integer> getPossibleMoves() { + List<Integer> possibleMoves = new ArrayList<>(); + for (int i = 0; i < board.length; i++) { + if (isMoveValid(i)) possibleMoves.add(i); + } + return possibleMoves; + } + + public boolean isDraw() { + return !Arrays.asList(board).contains(null); + } + + public boolean isGameOver() { + return getWinner() != null || isDraw(); + } + + public String getWinner() { + for (String player : players) { + boolean topRow = player.equals(board[0]) && player.equals(board[1]) && player.equals(board[2]); + boolean midRow = player.equals(board[3]) && player.equals(board[4]) && player.equals(board[5]); + boolean botRow = player.equals(board[6]) && player.equals(board[7]) && player.equals(board[8]); + + boolean leftCol = player.equals(board[0]) && player.equals(board[3]) && player.equals(board[6]); + boolean midCol = player.equals(board[1]) && player.equals(board[4]) && player.equals(board[7]); + boolean rightCol = player.equals(board[2]) && player.equals(board[5]) && player.equals(board[8]); + + boolean lrCross = player.equals(board[0]) && player.equals(board[4]) && player.equals(board[8]); + boolean rlCross = player.equals(board[2]) && player.equals(board[4]) && player.equals(board[6]); + + if (topRow || midRow || botRow || leftCol || midCol || rightCol || lrCross || rlCross) { + return player; + } + } + return null; + } + + public TicTacToe clone() throws CloneNotSupportedException { + TicTacToe cloneBoard = (TicTacToe) super.clone(); + cloneBoard.board = board.clone(); + return cloneBoard; + } + + public void printGameBoard() { + for (int i = 0; i < board.length; i++) { + System.out.print(board[i] == null ? " " : board[i]); + if (i % BOARD_SIZE < BOARD_SIZE - 1) System.out.print("|"); + if (i % BOARD_SIZE == BOARD_SIZE - 1 && i < board.length - 1) System.out.println("\n-+-+-"); + } + System.out.println(); + } +} +\ No newline at end of file diff --git a/src/main/java/nl/isygameclient/models/Settings/Settings.java b/src/main/java/nl/isygameclient/models/Settings/Settings.java @@ -0,0 +1,29 @@ +package nl.isygameclient.models.Settings; + + +import nl.isygameclient.models.GameCard; + +import java.util.ArrayList; +import java.util.Arrays; +import java.util.HashMap; +import java.util.Map; + + +/** + * This Class holds default settings for the application. + * It also provides the format of the settings that are saved to a file. + * + * @author A F Koens + */ +public class Settings { + public Map<String, StageSettings> stages = new HashMap<>(Map.of( + "GameSelectorMenu", new StageSettings())); + + public boolean tournamentMode = false; + + public ArrayList<GameCard> gameCards = new ArrayList<>(Arrays.asList( + new GameCard("TicTacToe", "views/Games/TicTacToe/TicTacToeMainMenu.fxml", "images/tictactoe_logo.png"), + new GameCard("Othello", null, "images/othello_logo.png"), + new GameCard("Starvation", null, null)) + ); +} diff --git a/src/main/java/nl/isygameclient/models/Settings/StageSettings.java b/src/main/java/nl/isygameclient/models/Settings/StageSettings.java @@ -0,0 +1,61 @@ +package nl.isygameclient.models.Settings; + +import javafx.stage.Stage; + +public class StageSettings { + public String Title = "ISYGameClient"; + public double x = 0; + public double y = 0; + public double width = 680; + public double height = 480; + public double minWidth = 0; + public double minHeight = 0; + public double maxWidth = 1.7976931348623157E308; + public double maxHeight = 1.7976931348623157E308; + public boolean isIconified = false; + public boolean isAlwaysOnTop = false; + public boolean isFullScreen = true; + public boolean isResizable = true; + public boolean isMaximized = false; + public boolean isShowing = false; + + + public static StageSettings createSettingsFromStage(Stage stage) { + var stageSettings = new StageSettings(); + stageSettings.Title = stage.getTitle(); + stageSettings.x = stage.getX(); + stageSettings.y = stage.getY(); + stageSettings.width = stage.getWidth(); + stageSettings.height = stage.getHeight(); + stageSettings.minWidth = stage.getMinWidth(); + stageSettings.minHeight = stage.getMinHeight(); + stageSettings.maxWidth = stage.getMaxWidth(); + stageSettings.maxHeight = stage.getMaxHeight(); + stageSettings.isIconified = stage.isIconified(); + stageSettings.isAlwaysOnTop = stage.isAlwaysOnTop(); + stageSettings.isFullScreen = stage.isFullScreen(); + stageSettings.isResizable = stage.isResizable(); + stageSettings.isMaximized = stage.isMaximized(); + stageSettings.isShowing = stage.isShowing(); + return stageSettings; + } + + public static Stage configureStageFromSettings(StageSettings stageSettings) { + Stage stage = new Stage(); + stage.setTitle(stageSettings.Title); + stage.setX(stageSettings.x); + stage.setY(stageSettings.y); + stage.setWidth(stageSettings.width); + stage.setHeight(stageSettings.height); + stage.setMinWidth(stageSettings.minWidth); + stage.setMinHeight(stageSettings.minHeight); + stage.setMaxWidth(stageSettings.maxWidth); + stage.setMaxHeight(stageSettings.maxHeight); + stage.setIconified(stageSettings.isIconified); + stage.setAlwaysOnTop(stageSettings.isAlwaysOnTop); + stage.setFullScreen(stageSettings.isFullScreen); + stage.setResizable(stageSettings.isResizable); + stage.setMaximized(stageSettings.isMaximized); + return stage; + } +} diff --git a/src/main/java/nl/isygameclient/models/TicTacToe.java b/src/main/java/nl/isygameclient/models/TicTacToe.java @@ -1,67 +0,0 @@ -package nl.isygameclient.models; - -import java.util.ArrayList; -import java.util.Arrays; - -public class TicTacToe extends Game { - public static final int BOARD_SIZE = 3; - - String[] board = new String[BOARD_SIZE * BOARD_SIZE]; - - public TicTacToe() { - super(0, new String[] { "X", "O" }); - } - - public boolean isMoveValid(int pos) { - return (pos >= 0 && pos < (BOARD_SIZE * BOARD_SIZE)) && board[pos] == null; - } - - public void move(int pos) { - board[pos] = players[currentPlayerIndex]; - } - - public ArrayList<Integer> getPossibleMoves() { - ArrayList<Integer> possibleMoves = new ArrayList<>(); - for (int i = 0; i < board.length; i++) { - if (isMoveValid(i)) possibleMoves.add(i); - } - return possibleMoves; - } - - public boolean isDraw() { - return !Arrays.asList(board).contains(null); - } - - public boolean isGameOver() { - return getWinner() != null || isDraw(); - } - - public String getWinner() { - for (String player : players) { - boolean topRow = player.equals(board[0]) && player.equals(board[1]) && player.equals(board[2]); - boolean midRow = player.equals(board[3]) && player.equals(board[4]) && player.equals(board[5]); - boolean botRow = player.equals(board[6]) && player.equals(board[7]) && player.equals(board[8]); - - boolean leftCol = player.equals(board[0]) && player.equals(board[3]) && player.equals(board[6]); - boolean midCol = player.equals(board[1]) && player.equals(board[4]) && player.equals(board[7]); - boolean rightCol = player.equals(board[2]) && player.equals(board[5]) && player.equals(board[8]); - - boolean lrCross = player.equals(board[0]) && player.equals(board[4]) && player.equals(board[8]); - boolean rlCross = player.equals(board[2]) && player.equals(board[4]) && player.equals(board[6]); - - if (topRow || midRow || botRow || leftCol || midCol || rightCol || lrCross || rlCross) { - return player; - } - } - return null; - } - - public void printGameBoard() { - for (int i = 0; i < board.length; i++) { - System.out.print(board[i] == null ? " " : board[i]); - if (i % BOARD_SIZE < BOARD_SIZE - 1) System.out.print("|"); - if (i % BOARD_SIZE == BOARD_SIZE - 1 && i < board.length - 1) System.out.println("\n-+-+-"); - } - System.out.println(); - } -} -\ No newline at end of file diff --git a/src/main/java/nl/isygameclient/util/Settings.java b/src/main/java/nl/isygameclient/util/Settings.java @@ -1,34 +0,0 @@ -package nl.isygameclient.util; - - -import java.util.ArrayList; -import java.util.Arrays; - -public class Settings { - public String title = "ISY Game Client"; - public boolean isFullScreen = true; - public boolean isMaximized = false; - public double screenHeight = 680.0; - public double screenWidth = 770.0; - public double screenX = 0; - public double screenY = 0; - - public boolean tournamentMode = false; - - public ArrayList<GameCard> gameCards = new ArrayList<>(Arrays.asList( - new GameCard("TicTacToe", "views/TicTacToe/TicTacToeMainMenu.fxml", "images/tictactoe_logo.png"), - new GameCard("Othello", null, "images/othello_logo.png"), - new GameCard("Starvation", null, null))); - - public static class GameCard { - public String name; - public String viewSrc; - public String imgSrc; - - public GameCard(String name, String viewSrc, String imgSrc) { - this.name = name; - this.viewSrc = viewSrc; - this.imgSrc = imgSrc; - } - } -} diff --git a/src/main/java/nl/isygameclient/util/SettingsFileHandler.java b/src/main/java/nl/isygameclient/util/SettingsFileHandler.java @@ -0,0 +1,60 @@ +package nl.isygameclient.util; + +import com.google.gson.Gson; +import com.google.gson.GsonBuilder; +import nl.isygameclient.models.Settings.Settings; + +import java.io.FileWriter; +import java.io.IOException; +import java.nio.file.Files; +import java.nio.file.Paths; + + +/** + * This Class is for accessing and manipulating settings files. + * This class handles the loading and saving of settings data. + * @author A F Koens + */ +public abstract class SettingsFileHandler { + public static final String SETTINGS_FILENAME = "settings.json"; + + + /** + * Save a settings object to a json file. + * @param settings a Settings object. + * */ + public static void save(Settings settings) { + try { + Gson gson = new GsonBuilder() + .setPrettyPrinting() + .create(); + + FileWriter writer = new FileWriter(SETTINGS_FILENAME); + writer.write(gson.toJson(settings)); + writer.close(); + } catch (IOException e) { + e.printStackTrace(); + } + } + + /** + * Read a json file and loads its values into a Settings object. + * @return a Settings object. + * */ + public static Settings load() { + try { + Gson gson = new GsonBuilder() + .setPrettyPrinting() + .create(); + + String inFile = new String(Files.readAllBytes(Paths.get(SETTINGS_FILENAME))); + return gson.fromJson(inFile, Settings.class); + } catch (IOException e) { + System.err.println("Could Not Load Settings File, Using Defaults Instead"); + var defaults = new Settings(); + save(defaults); + return defaults; + } + } +} + diff --git a/src/main/java/nl/isygameclient/util/SettingsHandler.java b/src/main/java/nl/isygameclient/util/SettingsHandler.java @@ -1,45 +0,0 @@ -package nl.isygameclient.util; - -import com.google.gson.Gson; -import com.google.gson.GsonBuilder; - -import java.io.FileWriter; -import java.io.IOException; -import java.nio.file.Files; -import java.nio.file.Paths; - - -public abstract class SettingsHandler { - public static final String SETTINGS_FILENAME = "settings.json"; - - public static void save(Settings settings) { - try { - Gson gson = new GsonBuilder() - .setPrettyPrinting() - .create(); - - FileWriter writer = new FileWriter(SETTINGS_FILENAME); - writer.write(gson.toJson(settings)); - writer.close(); - } catch (IOException e) { - e.printStackTrace(); - } - } - - public static Settings load() { - try { - Gson gson = new GsonBuilder() - .setPrettyPrinting() - .create(); - - String inFile = new String(Files.readAllBytes(Paths.get(SETTINGS_FILENAME))); - return gson.fromJson(inFile, Settings.class); - } catch (IOException e) { - System.err.println("Could Not Load Settings File, Using Defaults Instead"); - var defaults = new Settings(); - save(defaults); - return defaults; - } - } -} - diff --git a/src/main/java/nl/isygameclient/util/StageHandler.java b/src/main/java/nl/isygameclient/util/StageHandler.java @@ -0,0 +1,76 @@ +package nl.isygameclient.util; + +import javafx.fxml.FXMLLoader; +import javafx.scene.Scene; +import javafx.stage.Stage; +import nl.isygameclient.Application; +import nl.isygameclient.models.Settings.Settings; +import nl.isygameclient.models.Settings.StageSettings; + +import java.io.IOException; +import java.util.HashMap; +import java.util.Map; + +import static nl.isygameclient.models.Settings.StageSettings.configureStageFromSettings; +import static nl.isygameclient.models.Settings.StageSettings.createSettingsFromStage; + +public class StageHandler { + private static StageHandler instance; + private final Map<String, Stage> stages = new HashMap<>(); + + private StageHandler() { + } + + public static StageHandler get() { + if (instance == null) { + instance = new StageHandler(); + } + return instance; + } + + public Stage getStage(String stageName) { + Stage stage = stages.get(stageName); + if (stage == null) stage = new Stage(); + stages.put(stageName, stage); + return stage; + } + + public void iconifyStage(String stageName) { + stages.get(stageName).setIconified(true); + } + + public void focusStage(String stageName) { + Stage stage = stages.get(stageName); + stage.setIconified(false); + stage.show(); + stage.requestFocus(); + } + + public void changeSceneOfStage(String stageName, String viewSource) { + Stage stage = getStage(stageName); + try { + FXMLLoader fxmlSceneLoader = new FXMLLoader(getClass().getResource("/nl/isygameclient/" + viewSource)); + Scene scene = new Scene(fxmlSceneLoader.load()); + stage.setScene(scene); + } catch (IOException e) { + e.printStackTrace(); + } + } + + public void loadStages() { + Settings settings = SettingsFileHandler.load(); + for (Map.Entry<String, StageSettings> entry : settings.stages.entrySet()) { + stages.put(entry.getKey(), configureStageFromSettings(entry.getValue())); + } + } + + public void saveStages() { + Settings settings = SettingsFileHandler.load(); + for (Map.Entry<String, Stage> entry : stages.entrySet()) { + settings.stages.put(entry.getKey(), createSettingsFromStage(entry.getValue())); + } + SettingsFileHandler.save(settings); + } + + +} diff --git a/src/main/resources/nl/isygameclient/views/Games/TicTacToe/TicTacToeMainMenu.fxml b/src/main/resources/nl/isygameclient/views/Games/TicTacToe/TicTacToeMainMenu.fxml @@ -0,0 +1,50 @@ +<?xml version="1.0" encoding="UTF-8"?> + + +<?import com.jfoenix.controls.JFXButton?> +<?import javafx.geometry.Insets?> +<?import javafx.scene.control.Label?> +<?import javafx.scene.layout.AnchorPane?> +<?import javafx.scene.layout.VBox?> +<?import java.lang.*?> +<AnchorPane stylesheets="@../../../css/theme.css" xmlns="http://javafx.com/javafx" xmlns:fx="http://javafx.com/fxml" + fx:controller="nl.isygameclient.controllers.Games.TicTacToe.TicTacToeMainMenuController" + prefWidth="680" prefHeight="480"> + <VBox alignment="CENTER" AnchorPane.rightAnchor="0" AnchorPane.leftAnchor="0" AnchorPane.bottomAnchor="0" AnchorPane.topAnchor="0"> + <styleClass> + <String fx:value="surface"/> + </styleClass> + <Label text="Tic Tac Toe"> + <styleClass> + <String fx:value="display-large"/> + <String fx:value="on-surface-text"/> + </styleClass> + <padding> + <Insets topRightBottomLeft="50"/> + </padding> + </Label> + <VBox spacing="10" alignment="CENTER" maxWidth="200"> + <JFXButton text="Single Player" onAction="#onSinglePlayerButtonClick" prefWidth="Infinity"> + <styleClass> + <String fx:value="primary"/> + <String fx:value="on-primary-text"/> + <String fx:value="title-medium"/> + </styleClass> + </JFXButton> + <JFXButton text="Multiplayer" onAction="#onMultiplayerButtonClick" prefWidth="Infinity"> + <styleClass> + <String fx:value="primary"/> + <String fx:value="on-primary-text"/> + <String fx:value="title-medium"/> + </styleClass> + </JFXButton> + <JFXButton text="Exit" onAction="#onExitButtonClick" prefWidth="Infinity"> + <styleClass> + <String fx:value="primary"/> + <String fx:value="on-primary-text"/> + <String fx:value="title-medium"/> + </styleClass> + </JFXButton> + </VBox> + </VBox> +</AnchorPane> diff --git a/src/main/resources/nl/isygameclient/views/Games/TicTacToe/TicTacToeMultiPlayer.fxml b/src/main/resources/nl/isygameclient/views/Games/TicTacToe/TicTacToeMultiPlayer.fxml @@ -0,0 +1,195 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<?import com.jfoenix.controls.*?> +<?import javafx.geometry.*?> +<?import javafx.scene.control.*?> +<?import javafx.scene.layout.*?> +<?import java.lang.*?> + +<BorderPane stylesheets="@../../../css/theme.css" xmlns="http://javafx.com/javafx/19" xmlns:fx="http://javafx.com/fxml/1" fx:controller="nl.isygameclient.controllers.Games.TicTacToe.TicTacToeMultiPlayerController"> + <styleClass> + <String fx:value="surface" /> + </styleClass> + <left> + <VBox prefWidth="200" spacing="20" styleClass="surface-variant"> + <padding> + <Insets topRightBottomLeft="20" /> + </padding> + + <!-- Playing As Controls --> + <VBox> + <Label text="Playing As"> + <styleClass> + <String fx:value="headline-small" /> + <String fx:value="on-surface-variant-text" /> + </styleClass> + </Label> + <Separator styleClass="on-surface-variant-text" /> + <JFXComboBox fx:id="playingAsCombo" onAction="#onPlayingAsComboSelect" prefWidth="Infinity"> + <styleClass> + <String fx:value="primary" /> + --> + <String fx:value="on-primary-text" /> + <String fx:value="body-large" /> + </styleClass> + </JFXComboBox> + </VBox> + <VBox> + <Label text="Opponent"> + <styleClass> + <String fx:value="headline-small" /> + <String fx:value="on-surface-variant-text" /> + </styleClass> + </Label> + <Separator styleClass="on-surface-variant-text" /> + <Label fx:id="playingAgainstLabel" prefWidth="Infinity"> + <styleClass> + <String fx:value="headline-small" /> + <String fx:value="on-surface-variant-text" /> + </styleClass> + </Label> + </VBox> + <VBox> + <children> + <Label text="Player"> + <styleClass> + <String fx:value="headline-small" /> + <String fx:value="on-surface-variant-text" /> + </styleClass> + </Label> + <Separator styleClass="on-surface-variant-text" /> + <TextField fx:id="nameField" promptText="Your Name" /> + <TextField fx:id="opponentField" promptText="Opponent (optional)" /> + </children> + </VBox> + + <!-- Best of Controls --> + <VBox> + <Label text="Server"> + <styleClass> + <String fx:value="headline-small" /> + <String fx:value="on-surface-variant-text" /> + </styleClass> + </Label> + <Separator styleClass="on-surface-variant-text" /> + <HBox prefHeight="100.0" prefWidth="200.0"> + <children> + <TextField fx:id="hostField" promptText="Host" /> + <TextField fx:id="portField" alignment="CENTER_RIGHT" promptText="Port" text="7789" /> + </children> + </HBox> + </VBox> + + <!-- Window Controls --> + <Pane VBox.vgrow="ALWAYS" /> + <VBox alignment="CENTER" spacing="10"> + <JFXButton onAction="#onNewGameButtonClick" prefWidth="Infinity" text="New Game"> + <styleClass> + <String fx:value="primary" /> + <String fx:value="on-primary-text" /> + <String fx:value="title-medium" /> + </styleClass> + </JFXButton> + <JFXButton onAction="#onMainMenuButtonClick" prefWidth="Infinity" text="Main Menu"> + <styleClass> + <String fx:value="primary" /> + <String fx:value="on-primary-text" /> + <String fx:value="title-medium" /> + </styleClass> + </JFXButton> + <JFXButton onAction="#onExitButtonClick" prefWidth="Infinity" text="Exit"> + <styleClass> + <String fx:value="primary" /> + <String fx:value="on-primary-text" /> + <String fx:value="title-medium" /> + </styleClass> + </JFXButton> + </VBox> + </VBox> + </left> + <!-- Game Field --> + <center> + <HBox alignment="CENTER"> + <padding> + <Insets topRightBottomLeft="20" /> + </padding> + + <!-- Left --> + <VBox alignment="TOP_CENTER" maxHeight="800" minWidth="150"> + <Label text="Score Player"> + <styleClass> + <String fx:value="headline-medium" /> + <String fx:value="on-surface-text" /> + </styleClass> + </Label> + <Label text="0"> + <styleClass> + <String fx:value="headline-medium" /> + <String fx:value="on-surface-text" /> + </styleClass> + </Label> + <Separator maxWidth="100" /> + </VBox> + + <!-- Center --> + <VBox alignment="CENTER" minWidth="640"> + <HBox alignment="CENTER"> + <padding> + <Insets topRightBottomLeft="5" /> + </padding> + <Label text="Current Player: "> + <styleClass> + <String fx:value="on-surface-text" /> + <String fx:value="headline-small" /> + </styleClass> + </Label> + <Label fx:id="currentPlayer"> + <styleClass> + <String fx:value="on-surface-text" /> + <String fx:value="headline-small" /> + </styleClass> + </Label> + </HBox> + <Separator maxWidth="100" /> + + <StackPane> + <VBox.margin> + <Insets left="20" right="20" top="20" /> + </VBox.margin> + <GridPane fx:id="grid" hgap="10" maxHeight="640" maxWidth="640" styleClass="ttt-grid" vgap="10"> + <padding> + <Insets topRightBottomLeft="10" /> + </padding> + </GridPane> + <Label fx:id="gameOverText" visible="false"> + <padding> + <Insets bottom="10" left="20" right="20" top="10" /> + </padding> + <styleClass> + <String fx:value="surface" /> + <String fx:value="display-large" /> + <String fx:value="on-surface-text" /> + </styleClass> + </Label> + </StackPane> + </VBox> + + <!-- Right --> + <VBox alignment="TOP_CENTER" maxHeight="800" minWidth="150"> + <Label text="Score Opponent"> + <styleClass> + <String fx:value="headline-medium" /> + <String fx:value="on-surface-text" /> + </styleClass> + </Label> + <Label text="0"> + <styleClass> + <String fx:value="headline-medium" /> + <String fx:value="on-surface-text" /> + </styleClass> + </Label> + <Separator maxWidth="100" /> + </VBox> + </HBox> + </center> +</BorderPane> +\ No newline at end of file diff --git a/src/main/resources/nl/isygameclient/views/Games/TicTacToe/TicTacToeSinglePlayer.fxml b/src/main/resources/nl/isygameclient/views/Games/TicTacToe/TicTacToeSinglePlayer.fxml @@ -0,0 +1,196 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<?import com.jfoenix.controls.*?> +<?import javafx.geometry.*?> +<?import javafx.scene.control.*?> +<?import javafx.scene.layout.*?> +<?import java.lang.*?> +<BorderPane stylesheets="@../../../css/theme.css" xmlns="http://javafx.com/javafx/16" xmlns:fx="http://javafx.com/fxml/1" + fx:controller="nl.isygameclient.controllers.Games.TicTacToe.TicTacToeSinglePlayerController"> + <styleClass> + <String fx:value="surface"/> + </styleClass> + <left> + <VBox prefWidth="200" styleClass="surface-variant" spacing="20" > + <padding> + <Insets topRightBottomLeft="20"/> + </padding> + + <!-- Difficulty Controls --> + <VBox> + <Label text="Difficulty"> + <styleClass> + <String fx:value="headline-small"/> + <String fx:value="on-surface-variant-text"/> + </styleClass> + </Label> + <Separator styleClass="on-surface-variant-text"/> + <JFXComboBox fx:id="difficultyCombo" prefWidth="Infinity" onAction="#onDifficultyComboSelect"> + <styleClass> + <String fx:value="primary"/> + <String fx:value="on-primary-text"/> + <String fx:value="body-large"/> + </styleClass> + </JFXComboBox> + </VBox> + + <!-- Playing As Controls --> + <VBox> + <Label text="Playing As"> + <styleClass> + <String fx:value="headline-small"/> + <String fx:value="on-surface-variant-text"/> + </styleClass> + </Label> + <Separator styleClass="on-surface-variant-text"/> + <JFXComboBox fx:id="playingAsCombo" prefWidth="Infinity" onAction="#onPlayingAsComboSelect"> + <styleClass> + <String fx:value="primary"/>--> + <String fx:value="on-primary-text"/> + <String fx:value="body-large"/> + </styleClass> + </JFXComboBox> + </VBox> + + <!-- Opponents Controls --> + <VBox> + <Label text="Opponent"> + <styleClass> + <String fx:value="headline-small"/> + <String fx:value="on-surface-variant-text"/> + </styleClass> + </Label> + <Separator styleClass="on-surface-variant-text"/> + <JFXComboBox fx:id="opponentCombo" prefWidth="Infinity" onAction="#onOpponentComboSelect"> + <styleClass> + <String fx:value="primary"/>--> + <String fx:value="on-primary-text"/> + <String fx:value="body-large"/> + </styleClass> + </JFXComboBox> + </VBox> + + <!-- Best of Controls --> + <VBox> + <Label text="Best Of"> + <styleClass> + <String fx:value="headline-small"/> + <String fx:value="on-surface-variant-text"/> + </styleClass> + </Label> + <Separator styleClass="on-surface-variant-text"/> + </VBox> + + <!-- Window Controls --> + <Pane VBox.vgrow="ALWAYS"/> + <VBox spacing="10" alignment="CENTER"> + <JFXButton text="New Game" onAction="#onNewGameButtonClick" prefWidth="Infinity"> + <styleClass> + <String fx:value="primary"/> + <String fx:value="on-primary-text"/> + <String fx:value="title-medium"/> + </styleClass> + </JFXButton> + <JFXButton text="Main Menu" onAction="#onMainMenuButtonClick" prefWidth="Infinity"> + <styleClass> + <String fx:value="primary"/> + <String fx:value="on-primary-text"/> + <String fx:value="title-medium"/> + </styleClass> + </JFXButton> + <JFXButton text="Exit" onAction="#onExitButtonClick" prefWidth="Infinity"> + <styleClass> + <String fx:value="primary"/> + <String fx:value="on-primary-text"/> + <String fx:value="title-medium"/> + </styleClass> + </JFXButton> + </VBox> + </VBox> + </left> + <!-- Game Field --> + <center> + <HBox alignment="CENTER"> + <padding> + <Insets topRightBottomLeft="20"/> + </padding> + + <!-- Left --> + <VBox minWidth="150" maxHeight="800" alignment="TOP_CENTER"> + <Label text="Score Player"> + <styleClass> + <String fx:value="headline-medium"/> + <String fx:value="on-surface-text"/> + </styleClass> + </Label> + <Label text="0"> + <styleClass> + <String fx:value="headline-medium"/> + <String fx:value="on-surface-text"/> + </styleClass> + </Label> + <Separator maxWidth="100"/> + </VBox> + + <!-- Center --> + <VBox alignment="CENTER" minWidth="640"> + <HBox alignment="CENTER"> + <padding> + <Insets topRightBottomLeft="5"/> + </padding> + <Label text="Current Player: "> + <styleClass> + <String fx:value="on-surface-text"/> + <String fx:value="headline-small"/> + </styleClass> + </Label> + <Label fx:id="currentPlayer"> + <styleClass> + <String fx:value="on-surface-text"/> + <String fx:value="headline-small"/> + </styleClass> + </Label> + </HBox> + <Separator maxWidth="100"/> + + <StackPane> + <VBox.margin> + <Insets left="20" right="20" top="20"/> + </VBox.margin> + <GridPane fx:id="grid" styleClass="ttt-grid" vgap="10" hgap="10" maxWidth="640" maxHeight="640"> + <padding> + <Insets topRightBottomLeft="10"/> + </padding> + </GridPane> + <Label fx:id="gameOverText" visible="false"> + <padding> + <Insets top="10" bottom="10" left="20" right="20"/> + </padding> + <styleClass> + <String fx:value="surface"/> + <String fx:value="display-large"/> + <String fx:value="on-surface-text"/> + </styleClass> + </Label> + </StackPane> + </VBox> + + <!-- Right --> + <VBox minWidth="150" maxHeight="800" alignment="TOP_CENTER"> + <Label text="Score Opponent"> + <styleClass> + <String fx:value="headline-medium"/> + <String fx:value="on-surface-text"/> + </styleClass> + </Label> + <Label text="0"> + <styleClass> + <String fx:value="headline-medium"/> + <String fx:value="on-surface-text"/> + </styleClass> + </Label> + <Separator maxWidth="100"/> + </VBox> + </HBox> + </center> +</BorderPane> diff --git a/src/main/resources/nl/isygameclient/views/TicTacToe/TicTacToeMainMenu.fxml b/src/main/resources/nl/isygameclient/views/TicTacToe/TicTacToeMainMenu.fxml @@ -1,50 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - - -<?import com.jfoenix.controls.JFXButton?> -<?import javafx.geometry.Insets?> -<?import javafx.scene.control.Label?> -<?import javafx.scene.layout.AnchorPane?> -<?import javafx.scene.layout.VBox?> -<?import java.lang.*?> -<AnchorPane stylesheets="@../../css/theme.css" xmlns="http://javafx.com/javafx" xmlns:fx="http://javafx.com/fxml" - fx:controller="nl.isygameclient.controllers.TicTacToeGame.TicTacToeMainMenuController" - prefWidth="680" prefHeight="480"> - <VBox alignment="CENTER" AnchorPane.rightAnchor="0" AnchorPane.leftAnchor="0" AnchorPane.bottomAnchor="0" AnchorPane.topAnchor="0"> - <styleClass> - <String fx:value="surface"/> - </styleClass> - <Label text="Tic Tac Toe"> - <styleClass> - <String fx:value="display-large"/> - <String fx:value="on-surface-text"/> - </styleClass> - <padding> - <Insets topRightBottomLeft="50"/> - </padding> - </Label> - <VBox spacing="10" alignment="CENTER" maxWidth="200"> - <JFXButton text="Single Player" onAction="#onSinglePlayerButtonClick" prefWidth="Infinity"> - <styleClass> - <String fx:value="primary"/> - <String fx:value="on-primary-text"/> - <String fx:value="title-medium"/> - </styleClass> - </JFXButton> - <JFXButton text="Multiplayer" onAction="#onMultiplayerButtonClick" prefWidth="Infinity"> - <styleClass> - <String fx:value="primary"/> - <String fx:value="on-primary-text"/> - <String fx:value="title-medium"/> - </styleClass> - </JFXButton> - <JFXButton text="Exit" onAction="#onExitButtonClick" prefWidth="Infinity"> - <styleClass> - <String fx:value="primary"/> - <String fx:value="on-primary-text"/> - <String fx:value="title-medium"/> - </styleClass> - </JFXButton> - </VBox> - </VBox> -</AnchorPane> diff --git a/src/main/resources/nl/isygameclient/views/TicTacToe/TicTacToeMultiPlayer.fxml b/src/main/resources/nl/isygameclient/views/TicTacToe/TicTacToeMultiPlayer.fxml @@ -1,195 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - -<?import com.jfoenix.controls.*?> -<?import javafx.geometry.*?> -<?import javafx.scene.control.*?> -<?import javafx.scene.layout.*?> -<?import java.lang.*?> - -<BorderPane stylesheets="@../../css/theme.css" xmlns="http://javafx.com/javafx/19" xmlns:fx="http://javafx.com/fxml/1" fx:controller="nl.isygameclient.controllers.TicTacToeGame.TicTacToeMultiPlayerController"> - <styleClass> - <String fx:value="surface" /> - </styleClass> - <left> - <VBox prefWidth="200" spacing="20" styleClass="surface-variant"> - <padding> - <Insets topRightBottomLeft="20" /> - </padding> - - <!-- Playing As Controls --> - <VBox> - <Label text="Playing As"> - <styleClass> - <String fx:value="headline-small" /> - <String fx:value="on-surface-variant-text" /> - </styleClass> - </Label> - <Separator styleClass="on-surface-variant-text" /> - <JFXComboBox fx:id="playingAsCombo" onAction="#onPlayingAsComboSelect" prefWidth="Infinity"> - <styleClass> - <String fx:value="primary" /> - --> - <String fx:value="on-primary-text" /> - <String fx:value="body-large" /> - </styleClass> - </JFXComboBox> - </VBox> - <VBox> - <Label text="Opponent"> - <styleClass> - <String fx:value="headline-small" /> - <String fx:value="on-surface-variant-text" /> - </styleClass> - </Label> - <Separator styleClass="on-surface-variant-text" /> - <Label fx:id="playingAgainstLabel" prefWidth="Infinity"> - <styleClass> - <String fx:value="headline-small" /> - <String fx:value="on-surface-variant-text" /> - </styleClass> - </Label> - </VBox> - <VBox> - <children> - <Label text="Player"> - <styleClass> - <String fx:value="headline-small" /> - <String fx:value="on-surface-variant-text" /> - </styleClass> - </Label> - <Separator styleClass="on-surface-variant-text" /> - <TextField fx:id="nameField" promptText="Your Name" /> - <TextField fx:id="opponentField" promptText="Opponent (optional)" /> - </children> - </VBox> - - <!-- Best of Controls --> - <VBox> - <Label text="Server"> - <styleClass> - <String fx:value="headline-small" /> - <String fx:value="on-surface-variant-text" /> - </styleClass> - </Label> - <Separator styleClass="on-surface-variant-text" /> - <HBox prefHeight="100.0" prefWidth="200.0"> - <children> - <TextField fx:id="hostField" promptText="Host" /> - <TextField fx:id="portField" alignment="CENTER_RIGHT" promptText="Port" text="7789" /> - </children> - </HBox> - </VBox> - - <!-- Window Controls --> - <Pane VBox.vgrow="ALWAYS" /> - <VBox alignment="CENTER" spacing="10"> - <JFXButton onAction="#onNewGameButtonClick" prefWidth="Infinity" text="New Game"> - <styleClass> - <String fx:value="primary" /> - <String fx:value="on-primary-text" /> - <String fx:value="title-medium" /> - </styleClass> - </JFXButton> - <JFXButton onAction="#onMainMenuButtonClick" prefWidth="Infinity" text="Main Menu"> - <styleClass> - <String fx:value="primary" /> - <String fx:value="on-primary-text" /> - <String fx:value="title-medium" /> - </styleClass> - </JFXButton> - <JFXButton onAction="#onExitButtonClick" prefWidth="Infinity" text="Exit"> - <styleClass> - <String fx:value="primary" /> - <String fx:value="on-primary-text" /> - <String fx:value="title-medium" /> - </styleClass> - </JFXButton> - </VBox> - </VBox> - </left> - <!-- Game Field --> - <center> - <HBox alignment="CENTER"> - <padding> - <Insets topRightBottomLeft="20" /> - </padding> - - <!-- Left --> - <VBox alignment="TOP_CENTER" maxHeight="800" minWidth="150"> - <Label text="Score Player"> - <styleClass> - <String fx:value="headline-medium" /> - <String fx:value="on-surface-text" /> - </styleClass> - </Label> - <Label text="0"> - <styleClass> - <String fx:value="headline-medium" /> - <String fx:value="on-surface-text" /> - </styleClass> - </Label> - <Separator maxWidth="100" /> - </VBox> - - <!-- Center --> - <VBox alignment="CENTER" minWidth="640"> - <HBox alignment="CENTER"> - <padding> - <Insets topRightBottomLeft="5" /> - </padding> - <Label text="Current Player: "> - <styleClass> - <String fx:value="on-surface-text" /> - <String fx:value="headline-small" /> - </styleClass> - </Label> - <Label fx:id="currentPlayer"> - <styleClass> - <String fx:value="on-surface-text" /> - <String fx:value="headline-small" /> - </styleClass> - </Label> - </HBox> - <Separator maxWidth="100" /> - - <StackPane> - <VBox.margin> - <Insets left="20" right="20" top="20" /> - </VBox.margin> - <GridPane fx:id="grid" hgap="10" maxHeight="640" maxWidth="640" styleClass="ttt-grid" vgap="10"> - <padding> - <Insets topRightBottomLeft="10" /> - </padding> - </GridPane> - <Label fx:id="gameOverText" visible="false"> - <padding> - <Insets bottom="10" left="20" right="20" top="10" /> - </padding> - <styleClass> - <String fx:value="surface" /> - <String fx:value="display-large" /> - <String fx:value="on-surface-text" /> - </styleClass> - </Label> - </StackPane> - </VBox> - - <!-- Right --> - <VBox alignment="TOP_CENTER" maxHeight="800" minWidth="150"> - <Label text="Score Opponent"> - <styleClass> - <String fx:value="headline-medium" /> - <String fx:value="on-surface-text" /> - </styleClass> - </Label> - <Label text="0"> - <styleClass> - <String fx:value="headline-medium" /> - <String fx:value="on-surface-text" /> - </styleClass> - </Label> - <Separator maxWidth="100" /> - </VBox> - </HBox> - </center> -</BorderPane> -\ No newline at end of file diff --git a/src/main/resources/nl/isygameclient/views/TicTacToe/TicTacToeSinglePlayer.fxml b/src/main/resources/nl/isygameclient/views/TicTacToe/TicTacToeSinglePlayer.fxml @@ -1,196 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - -<?import com.jfoenix.controls.*?> -<?import javafx.geometry.*?> -<?import javafx.scene.control.*?> -<?import javafx.scene.layout.*?> -<?import java.lang.*?> -<BorderPane stylesheets="@../../css/theme.css" xmlns="http://javafx.com/javafx/16" xmlns:fx="http://javafx.com/fxml/1" - fx:controller="nl.isygameclient.controllers.TicTacToeGame.TicTacToeSinglePlayerController"> - <styleClass> - <String fx:value="surface"/> - </styleClass> - <left> - <VBox prefWidth="200" styleClass="surface-variant" spacing="20" > - <padding> - <Insets topRightBottomLeft="20"/> - </padding> - - <!-- Difficulty Controls --> - <VBox> - <Label text="Difficulty"> - <styleClass> - <String fx:value="headline-small"/> - <String fx:value="on-surface-variant-text"/> - </styleClass> - </Label> - <Separator styleClass="on-surface-variant-text"/> - <JFXComboBox fx:id="difficultyCombo" prefWidth="Infinity" onAction="#onDifficultyComboSelect"> - <styleClass> - <String fx:value="primary"/> - <String fx:value="on-primary-text"/> - <String fx:value="body-large"/> - </styleClass> - </JFXComboBox> - </VBox> - - <!-- Playing As Controls --> - <VBox> - <Label text="Playing As"> - <styleClass> - <String fx:value="headline-small"/> - <String fx:value="on-surface-variant-text"/> - </styleClass> - </Label> - <Separator styleClass="on-surface-variant-text"/> - <JFXComboBox fx:id="playingAsCombo" prefWidth="Infinity" onAction="#onPlayingAsComboSelect"> - <styleClass> - <String fx:value="primary"/>--> - <String fx:value="on-primary-text"/> - <String fx:value="body-large"/> - </styleClass> - </JFXComboBox> - </VBox> - - <!-- Opponents Controls --> - <VBox> - <Label text="Opponent"> - <styleClass> - <String fx:value="headline-small"/> - <String fx:value="on-surface-variant-text"/> - </styleClass> - </Label> - <Separator styleClass="on-surface-variant-text"/> - <JFXComboBox fx:id="opponentCombo" prefWidth="Infinity" onAction="#onOpponentComboSelect"> - <styleClass> - <String fx:value="primary"/>--> - <String fx:value="on-primary-text"/> - <String fx:value="body-large"/> - </styleClass> - </JFXComboBox> - </VBox> - - <!-- Best of Controls --> - <VBox> - <Label text="Best Of"> - <styleClass> - <String fx:value="headline-small"/> - <String fx:value="on-surface-variant-text"/> - </styleClass> - </Label> - <Separator styleClass="on-surface-variant-text"/> - </VBox> - - <!-- Window Controls --> - <Pane VBox.vgrow="ALWAYS"/> - <VBox spacing="10" alignment="CENTER"> - <JFXButton text="New Game" onAction="#onNewGameButtonClick" prefWidth="Infinity"> - <styleClass> - <String fx:value="primary"/> - <String fx:value="on-primary-text"/> - <String fx:value="title-medium"/> - </styleClass> - </JFXButton> - <JFXButton text="Main Menu" onAction="#onMainMenuButtonClick" prefWidth="Infinity"> - <styleClass> - <String fx:value="primary"/> - <String fx:value="on-primary-text"/> - <String fx:value="title-medium"/> - </styleClass> - </JFXButton> - <JFXButton text="Exit" onAction="#onExitButtonClick" prefWidth="Infinity"> - <styleClass> - <String fx:value="primary"/> - <String fx:value="on-primary-text"/> - <String fx:value="title-medium"/> - </styleClass> - </JFXButton> - </VBox> - </VBox> - </left> - <!-- Game Field --> - <center> - <HBox alignment="CENTER"> - <padding> - <Insets topRightBottomLeft="20"/> - </padding> - - <!-- Left --> - <VBox minWidth="150" maxHeight="800" alignment="TOP_CENTER"> - <Label text="Score Player"> - <styleClass> - <String fx:value="headline-medium"/> - <String fx:value="on-surface-text"/> - </styleClass> - </Label> - <Label text="0"> - <styleClass> - <String fx:value="headline-medium"/> - <String fx:value="on-surface-text"/> - </styleClass> - </Label> - <Separator maxWidth="100"/> - </VBox> - - <!-- Center --> - <VBox alignment="CENTER" minWidth="640"> - <HBox alignment="CENTER"> - <padding> - <Insets topRightBottomLeft="5"/> - </padding> - <Label text="Current Player: "> - <styleClass> - <String fx:value="on-surface-text"/> - <String fx:value="headline-small"/> - </styleClass> - </Label> - <Label fx:id="currentPlayer"> - <styleClass> - <String fx:value="on-surface-text"/> - <String fx:value="headline-small"/> - </styleClass> - </Label> - </HBox> - <Separator maxWidth="100"/> - - <StackPane> - <VBox.margin> - <Insets left="20" right="20" top="20"/> - </VBox.margin> - <GridPane fx:id="grid" styleClass="ttt-grid" vgap="10" hgap="10" maxWidth="640" maxHeight="640"> - <padding> - <Insets topRightBottomLeft="10"/> - </padding> - </GridPane> - <Label fx:id="gameOverText" visible="false"> - <padding> - <Insets top="10" bottom="10" left="20" right="20"/> - </padding> - <styleClass> - <String fx:value="surface"/> - <String fx:value="display-large"/> - <String fx:value="on-surface-text"/> - </styleClass> - </Label> - </StackPane> - </VBox> - - <!-- Right --> - <VBox minWidth="150" maxHeight="800" alignment="TOP_CENTER"> - <Label text="Score Opponent"> - <styleClass> - <String fx:value="headline-medium"/> - <String fx:value="on-surface-text"/> - </styleClass> - </Label> - <Label text="0"> - <styleClass> - <String fx:value="headline-medium"/> - <String fx:value="on-surface-text"/> - </styleClass> - </Label> - <Separator maxWidth="100"/> - </VBox> - </HBox> - </center> -</BorderPane>