commit ea1b80add41dc610634b3d700ea1afec56b44f08 parent 618b1d9371fa6236cc82a1527d9967b427932f6a Author: A Koens <[email protected]> Date: Sat, 4 Feb 2023 21:17:57 +0100 Change Game controller en menu controller Added a menu controller interface for game menu controllers and changed the game controller from an abstract class to an interface . Diffstat:
14 files changed, 149 insertions(+), 113 deletions(-)
diff --git a/src/main/java/nl/isygameclient/controllers/games/GameController.java b/src/main/java/nl/isygameclient/controllers/games/GameController.java @@ -1,18 +1,9 @@ package nl.isygameclient.controllers.games; -import javafx.fxml.FXML; -import nl.isygameclient.Window; -import nl.isygameclient.models.Game; -import nl.isygameclient.util.StageHandler; +import javafx.event.ActionEvent; -public abstract class GameController { +public interface GameController { - protected Game game; - - @FXML - protected void onExitButtonClick() { - var stageHandler = StageHandler.get(); - stageHandler.getStage(Window.GAME).hide(); - stageHandler.focusStage(Window.APP); - } + void onNewGameButtonClick(ActionEvent e) throws InterruptedException; + void onMainMenuButtonClick(ActionEvent e); } diff --git a/src/main/java/nl/isygameclient/controllers/games/GameMenuController.java b/src/main/java/nl/isygameclient/controllers/games/GameMenuController.java @@ -0,0 +1,15 @@ +package nl.isygameclient.controllers.games; + +import javafx.event.ActionEvent; +import javafx.fxml.FXML; + +public interface GameMenuController { + + @FXML + void onSinglePlayerButtonClick(ActionEvent e); + @FXML + void onMultiPlayerButtonClick(ActionEvent e); + + @FXML + void onExitGameButtonClick(ActionEvent e); +} diff --git a/src/main/java/nl/isygameclient/controllers/games/othello/OthelloMainMenuController.java b/src/main/java/nl/isygameclient/controllers/games/othello/OthelloMainMenuController.java @@ -1,19 +1,27 @@ package nl.isygameclient.controllers.games.othello; +import javafx.event.ActionEvent; import javafx.fxml.FXML; import nl.isygameclient.Window; import nl.isygameclient.controllers.games.GameController; +import nl.isygameclient.controllers.games.GameMenuController; import nl.isygameclient.util.StageHandler; -public class OthelloMainMenuController extends GameController { - @FXML - public void onSinglePlayerButtonClick() { +public class OthelloMainMenuController implements GameMenuController { + @Override + public void onSinglePlayerButtonClick(ActionEvent e) { StageHandler.get().changeSceneOfStage(Window.GAME, "/nl/isygameclient/views/games/othello/OthelloSinglePlayer.fxml"); } - @FXML - public void onMultiplayerButtonClick() { + @Override + public void onMultiPlayerButtonClick(ActionEvent e) { StageHandler.get().changeSceneOfStage(Window.GAME,"/nl/isygameclient/views/games/othello/OthelloMultiPlayer.fxml"); } + @Override + public void onExitGameButtonClick(ActionEvent e) { + var stageHandler = StageHandler.get(); + stageHandler.getStage(Window.GAME).hide(); + stageHandler.focusStage(Window.APP); + } } diff --git a/src/main/java/nl/isygameclient/controllers/games/othello/OthelloMultiPlayerController.java b/src/main/java/nl/isygameclient/controllers/games/othello/OthelloMultiPlayerController.java @@ -9,14 +9,17 @@ import javafx.scene.control.TextField; import javafx.scene.layout.GridPane; import javafx.scene.paint.Color; import javafx.scene.shape.Circle; +import nl.isygameclient.Window; import nl.isygameclient.controllers.games.GameController; import nl.isygameclient.models.Ai; +import nl.isygameclient.models.Game; import nl.isygameclient.models.Player; import nl.isygameclient.models.PlayerManager; import nl.isygameclient.models.games.Othello; import nl.isygameclient.network.GameClient; import nl.isygameclient.network.GameType; import nl.isygameclient.network.Match; +import nl.isygameclient.util.StageHandler; import nl.isygameclient.util.Vector2D; import java.io.IOException; @@ -27,8 +30,9 @@ import java.util.Objects; import java.util.ResourceBundle; import java.util.stream.Stream; -public class OthelloMultiPlayerController extends GameController implements Runnable, Initializable { +public class OthelloMultiPlayerController implements GameController, Initializable, Runnable { + private Game game; private Thread gameThread; private boolean running; @@ -238,7 +242,8 @@ public class OthelloMultiPlayerController extends GameController implements Runn } } - public void onNewGameButtonClick(ActionEvent actionEvent) throws NumberFormatException, InterruptedException{ + @FXML + public void onNewGameButtonClick(ActionEvent e) throws NumberFormatException, InterruptedException { game.restart(); // gameOverText.setVisible(false); @@ -253,6 +258,9 @@ public class OthelloMultiPlayerController extends GameController implements Runn enableBoardButtons(); } - public void onMainMenuButtonClick(ActionEvent actionEvent) { + @Override + public void onMainMenuButtonClick(ActionEvent e) { + StageHandler.get().changeSceneOfStage(Window.GAME, "/nl/isygameclient/views/games/othello/OthelloMainMenu.fxml"); + } } diff --git a/src/main/java/nl/isygameclient/controllers/games/othello/OthelloSinglePlayerController.java b/src/main/java/nl/isygameclient/controllers/games/othello/OthelloSinglePlayerController.java @@ -7,24 +7,28 @@ import javafx.fxml.Initializable; import javafx.scene.layout.GridPane; import javafx.scene.paint.Color; import javafx.scene.shape.Circle; +import nl.isygameclient.Window; import nl.isygameclient.controllers.games.GameController; import nl.isygameclient.models.Ai; +import nl.isygameclient.models.Game; import nl.isygameclient.models.Player; import nl.isygameclient.models.PlayerManager; import nl.isygameclient.models.games.Othello; +import nl.isygameclient.util.StageHandler; import nl.isygameclient.util.Vector2D; import java.net.URL; import java.util.*; import java.util.stream.Stream; -public class OthelloSinglePlayerController extends GameController implements Initializable { +public class OthelloSinglePlayerController implements GameController, Initializable { + private Game game; private JFXButton[][] boardButtons; @FXML private GridPane boardGrid; - + private int[][] heuristics = { {4, 3, 3, 3, 3, 3, 3, 4}, {3, 2, 2, 2, 2, 2, 2, 3}, @@ -34,10 +38,11 @@ public class OthelloSinglePlayerController extends GameController implements In {3, 2, 1, 1, 1, 1, 2, 3}, {3, 2, 2, 2, 2, 2, 2, 3}, {4, 3, 3, 3, 3, 3, 3, 4} - }; - + }; + private boolean hasClicked = false; private Vector2D<Integer, Integer> clickedPos; + private boolean againstAi = false; @Override public void initialize(URL url, ResourceBundle resourceBundle) { @@ -47,7 +52,7 @@ public class OthelloSinglePlayerController extends GameController implements In return clickedPos; } }; - var players = List.of( player, new Ai("player2", "black", heuristics)); + var players = List.of(player, new Ai("player2", "black", heuristics)); var manager = new PlayerManager(0, new ArrayList<>(players)); game = new Othello(manager); initializeBoard(); @@ -57,10 +62,10 @@ public class OthelloSinglePlayerController extends GameController implements In private void initializeBoard() { var board = game.getBoard(); boardButtons = new JFXButton[board.getHeight()][board.getWidth()]; - for (int i = 0; i < board.getHeight(); i++) { - for (int j = 0; j < board.getWidth(); j++) { + for (int x = 0; x < board.getHeight(); x++) { + for (int y = 0; y < board.getWidth(); y++) { JFXButton button = new JFXButton(); - var index = i + "," + j; + var index = x + "," + y; button.setId(index); button.setMinSize(60.0, 60.0); button.setMaxSize(60.0, 60.0); @@ -69,8 +74,8 @@ public class OthelloSinglePlayerController extends GameController implements In styleClass.add("othello-button"); styleClass.add("headline-small"); button.setOnAction((ActionEvent event) -> onMoveButtonClick(button)); - boardButtons[i][j] = button; - boardGrid.add(button, i, j); + boardButtons[y][x] = button; + boardGrid.add(button, x, y); } } } @@ -78,14 +83,14 @@ public class OthelloSinglePlayerController extends GameController implements In private void updateButtons() { clearBoardButtons(); var board = game.getBoard(); - for (int i = 0; i < board.getHeight(); i++) { - for (int j = 0; j < board.getWidth(); j++) { - var index = board.get(new Vector2D<>(i,j)); + for (int x = 0; x < board.getHeight(); x++) { + for (int y = 0; y < board.getWidth(); y++) { + var index = board.get(new Vector2D<>(x, y)); if (index == null) continue; - if (Objects.equals( "white", index.getPlayingAs())) { - addStone(boardButtons[i][j], Color.WHITE); - } else if(Objects.equals( "black", index.getPlayingAs())) { - addStone(boardButtons[i][j], Color.BLACK); + if (Objects.equals("white", index.getPlayingAs())) { + addStone(boardButtons[y][x], Color.WHITE); + } else if (Objects.equals("black", index.getPlayingAs())) { + addStone(boardButtons[y][x], Color.BLACK); } } } @@ -97,21 +102,33 @@ public class OthelloSinglePlayerController extends GameController implements In circle.setFill(color); button.setGraphic(circle); } - - private void onMoveButtonClick(JFXButton button) { - // Move - var id = button.getId().split(","); - var index = Stream.of(id).mapToInt(Integer::parseInt).toArray(); + private void doMove(Vector2D<Integer, Integer> move) { var manager = game.getPlayerManager(); var currentPlayer = manager.getCurrentPlayer(); + if (game.getValidMoves(currentPlayer).isEmpty()) { manager.nextPlayer(); return; } - if (game.isMoveValid(currentPlayer, new Vector2D<>(index[0], index[1]))) { - game.move(currentPlayer, new Vector2D<>(index[0], index[1])); + if (game.isMoveValid(currentPlayer, move)) { + game.move(currentPlayer, move); updateButtons(); } + } + + private void onMoveButtonClick(JFXButton button) { + // Move + var id = button.getId().split(","); + var index = Stream.of(id).mapToInt(Integer::parseInt).toArray(); + + var playerMove = new Vector2D<>(index[0], index[1]); + doMove(playerMove); + + if (againstAi) { + var manager = game.getPlayerManager(); + var move = manager.getCurrentPlayer().onPlayerTurn(); + doMove(move); + } if (game.isGameOver()) { disableBoardButtons(); @@ -142,11 +159,15 @@ public class OthelloSinglePlayerController extends GameController implements In } } + @Override public void onNewGameButtonClick(ActionEvent actionEvent) { game.restart(); updateButtons(); enableBoardButtons(); } + + @Override public void onMainMenuButtonClick(ActionEvent actionEvent) { + StageHandler.get().changeSceneOfStage(Window.GAME, "/nl/isygameclient/views/games/othello/OthelloMainMenu.fxml"); } } diff --git a/src/main/java/nl/isygameclient/controllers/games/tictactoe/TicTacToeMainMenuController.java b/src/main/java/nl/isygameclient/controllers/games/tictactoe/TicTacToeMainMenuController.java @@ -1,19 +1,27 @@ package nl.isygameclient.controllers.games.tictactoe; +import javafx.event.ActionEvent; import javafx.fxml.FXML; import nl.isygameclient.Window; -import nl.isygameclient.controllers.games.GameController; +import nl.isygameclient.controllers.games.GameMenuController; import nl.isygameclient.util.StageHandler; -public class TicTacToeMainMenuController extends GameController { +public class TicTacToeMainMenuController implements GameMenuController { @FXML - public void onSinglePlayerButtonClick() { + public void onSinglePlayerButtonClick(ActionEvent e) { StageHandler.get().changeSceneOfStage(Window.GAME, "/nl/isygameclient/views/games/tictactoe/TicTacToeSinglePlayer.fxml"); } @FXML - public void onMultiplayerButtonClick() { + public void onMultiPlayerButtonClick(ActionEvent e) { StageHandler.get().changeSceneOfStage(Window.GAME,"/nl/isygameclient/views/games/tictactoe/TicTacToeMultiPlayer.fxml"); } + @FXML + public void onExitGameButtonClick(ActionEvent e) { + var stageHandler = StageHandler.get(); + stageHandler.getStage(Window.GAME).hide(); + stageHandler.focusStage(Window.APP); + } + } diff --git a/src/main/java/nl/isygameclient/controllers/games/tictactoe/TicTacToeMultiPlayerController.java b/src/main/java/nl/isygameclient/controllers/games/tictactoe/TicTacToeMultiPlayerController.java @@ -16,14 +16,16 @@ import javafx.scene.control.TextField; import javafx.scene.layout.GridPane; import nl.isygameclient.Window; import nl.isygameclient.controllers.games.GameController; +import nl.isygameclient.models.Game; import nl.isygameclient.network.GameClient; import nl.isygameclient.network.GameType; import nl.isygameclient.network.Match; import nl.isygameclient.util.StageHandler; -public class TicTacToeMultiPlayerController extends GameController implements Runnable, Initializable { +public class TicTacToeMultiPlayerController implements GameController, Initializable, Runnable { private final ArrayList<JFXButton> boardButtons = new ArrayList<>(); - private final String[] players = { "X", "O" }; + private final String[] players = { "X", "O" }; + private Game game; @FXML private Label playingAgainstLabel; @@ -142,17 +144,7 @@ public class TicTacToeMultiPlayerController extends GameController implements Ru } } - @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 { @@ -196,8 +188,20 @@ public class TicTacToeMultiPlayerController extends GameController implements Ru } } - @FXML - protected void onMainMenuButtonClick() { - StageHandler.get().changeSceneOfStage(Window.GAME,"views/games/TicTacToe/OthelloMainMenu.fxml"); + @Override + public void onNewGameButtonClick(ActionEvent e) throws NumberFormatException, InterruptedException { + gameOverText.setVisible(false); + + if (gameThread != null && running) { + running = false; + gameThread.join(); + } + gameThread = new Thread(this); + gameThread.start(); + } + + @Override + public void onMainMenuButtonClick(ActionEvent e) { + StageHandler.get().changeSceneOfStage(Window.GAME,"/nl/isygameclient/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 @@ -4,6 +4,7 @@ import com.jfoenix.controls.JFXButton; import com.jfoenix.controls.JFXComboBox; import java.util.ArrayList; +import java.util.List; import java.util.stream.Stream; import javafx.event.ActionEvent; @@ -12,18 +13,17 @@ import javafx.scene.control.Label; import javafx.scene.layout.GridPane; import nl.isygameclient.Window; import nl.isygameclient.controllers.games.GameController; +import nl.isygameclient.models.Game; +import nl.isygameclient.models.Player; +import nl.isygameclient.models.PlayerManager; +import nl.isygameclient.models.games.TicTacToe; import nl.isygameclient.util.StageHandler; import nl.isygameclient.util.Vector2D; -public class TicTacToeSinglePlayerController extends GameController { - private final ArrayList<JFXButton> boardButtons = new ArrayList<>(); +public class TicTacToeSinglePlayerController implements GameController { - @FXML - public JFXComboBox<String> difficultyCombo; - @FXML - public JFXComboBox<String> playingAsCombo; - @FXML - public JFXComboBox<String> opponentCombo; + private Game game; + private final ArrayList<JFXButton> boardButtons = new ArrayList<>(); @FXML protected Label currentPlayer; @@ -33,7 +33,6 @@ public class TicTacToeSinglePlayerController extends GameController { @FXML protected GridPane grid; - private Thread gameThread; @FXML protected void initialize() { @@ -43,9 +42,19 @@ public class TicTacToeSinglePlayerController extends GameController { } private void initializeGame() { -// var players = new ArrayList<>(List.of(new Player("player1", "x"), new Player("player2", "o"))); -// var manager = new PlayerManager(0, players); -// game = new TicTacToe(manager); + var players = new ArrayList<>(List.of(new Player("player1", "x") { + @Override + public Vector2D<Integer, Integer> onPlayerTurn() { + return null; + } + }, new Player("player2", "o") { + @Override + public Vector2D<Integer, Integer> onPlayerTurn() { + return null; + } + })); + var manager = new PlayerManager(0, players); + game = new TicTacToe(manager); } @@ -124,8 +133,8 @@ public class TicTacToeSinglePlayerController extends GameController { } } - @FXML - protected void onNewGameButtonClick() { + @Override + public void onNewGameButtonClick(ActionEvent e) { // Make new Game game.restart(); @@ -134,8 +143,8 @@ public class TicTacToeSinglePlayerController extends GameController { gameOverText.setVisible(false); } - @FXML - protected void onMainMenuButtonClick() { - StageHandler.get().changeSceneOfStage(Window.GAME,"views/games/TicTacToe/OthelloMainMenu.fxml"); + @Override + public void onMainMenuButtonClick(ActionEvent e) { + StageHandler.get().changeSceneOfStage(Window.GAME,"/nl/isygameclient/views/games/tictactoe/TicTacToeMainMenu.fxml"); } } diff --git a/src/main/resources/nl/isygameclient/views/games/othello/OthelloMainMenu.fxml b/src/main/resources/nl/isygameclient/views/games/othello/OthelloMainMenu.fxml @@ -32,14 +32,14 @@ <String fx:value="title-medium"/> </styleClass> </JFXButton> - <JFXButton text="Multiplayer" onAction="#onMultiplayerButtonClick" prefWidth="Infinity"> + <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"> + <JFXButton text="Exit" onAction="#onExitGameButtonClick" prefWidth="Infinity"> <styleClass> <String fx:value="primary"/> <String fx:value="on-primary-text"/> diff --git a/src/main/resources/nl/isygameclient/views/games/othello/OthelloMultiPlayer.fxml b/src/main/resources/nl/isygameclient/views/games/othello/OthelloMultiPlayer.fxml @@ -46,13 +46,6 @@ <String fx:value="title-medium" /> </styleClass> </JFXButton> - <JFXButton onAction="#onExitButtonClick" prefWidth="Infinity" text="Exit"> - <styleClass> - <String fx:value="primary" /> - <String fx:value="primary-text" /> - <String fx:value="title-medium" /> - </styleClass> - </JFXButton> </VBox> </VBox> </left> diff --git a/src/main/resources/nl/isygameclient/views/games/othello/OthelloSinglePlayer.fxml b/src/main/resources/nl/isygameclient/views/games/othello/OthelloSinglePlayer.fxml @@ -35,13 +35,6 @@ <String fx:value="title-medium" /> </styleClass> </JFXButton> - <JFXButton onAction="#onExitButtonClick" prefWidth="Infinity" text="Exit"> - <styleClass> - <String fx:value="primary" /> - <String fx:value="primary-text" /> - <String fx:value="title-medium" /> - </styleClass> - </JFXButton> </VBox> </VBox> </left> diff --git a/src/main/resources/nl/isygameclient/views/games/tictactoe/TicTacToeMainMenu.fxml b/src/main/resources/nl/isygameclient/views/games/tictactoe/TicTacToeMainMenu.fxml @@ -32,14 +32,14 @@ <String fx:value="title-medium"/> </styleClass> </JFXButton> - <JFXButton text="Multiplayer" onAction="#onMultiplayerButtonClick" prefWidth="Infinity"> + <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"> + <JFXButton text="Exit" onAction="#onExitGameButtonClick" prefWidth="Infinity"> <styleClass> <String fx:value="primary"/> <String fx:value="on-primary-text"/> diff --git a/src/main/resources/nl/isygameclient/views/games/tictactoe/TicTacToeMultiPlayer.fxml b/src/main/resources/nl/isygameclient/views/games/tictactoe/TicTacToeMultiPlayer.fxml @@ -98,13 +98,6 @@ <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> diff --git a/src/main/resources/nl/isygameclient/views/games/tictactoe/TicTacToeSinglePlayer.fxml b/src/main/resources/nl/isygameclient/views/games/tictactoe/TicTacToeSinglePlayer.fxml @@ -99,13 +99,6 @@ <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>