commit d7c243df120906b3689fe6228afdff1532e1c31b parent ce75f3a397a8c9e05481a93923945a2c1b608db3 Author: Friedel Schoen <[email protected]> Date: Fri, 28 Oct 2022 00:59:30 +0200 formatting (auto-format) + online tic-tac-toe Diffstat:
14 files changed, 907 insertions(+), 497 deletions(-)
diff --git a/src/main/java/nl/isygameclient/Application.java b/src/main/java/nl/isygameclient/Application.java @@ -1,87 +1,86 @@ 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 java.io.IOException; - 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(); - - settings.screenWidth = primaryStage.getWidth(); - settings.screenHeight = primaryStage.getHeight(); - settings.isFullScreen = primaryStage.isFullScreen(); - settings.isMaximized = primaryStage.isMaximized(); - settings.screenX = primaryStage.getX(); - settings.screenY = primaryStage.getY(); - - SettingsHandler.save(settings); - } - - public Stage getPrimaryStage() { - return primaryStage; - } + 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(); + + settings.screenWidth = primaryStage.getWidth(); + settings.screenHeight = primaryStage.getHeight(); + settings.isFullScreen = primaryStage.isFullScreen(); + settings.isMaximized = primaryStage.isMaximized(); + settings.screenX = primaryStage.getX(); + settings.screenY = primaryStage.getY(); + + SettingsHandler.save(settings); + } + + public Stage getPrimaryStage() { + return primaryStage; + } } \ No newline at end of file diff --git a/src/main/java/nl/isygameclient/controllers/GameSeletorMenu/GameSelectorMenuController.java b/src/main/java/nl/isygameclient/controllers/GameSeletorMenu/GameSelectorMenuController.java @@ -1,5 +1,9 @@ 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; @@ -14,81 +18,76 @@ import nl.isygameclient.Application; import nl.isygameclient.util.Settings; import nl.isygameclient.util.SettingsHandler; -import java.io.IOException; -import java.util.ArrayList; -import java.util.List; -import java.util.stream.Collectors; - public class GameSelectorMenuController { - private final List<Settings.GameCard> gameCards = SettingsHandler.load().gameCards; + private final List<Settings.GameCard> gameCards = SettingsHandler.load().gameCards; - @FXML - public TextField searchBox; - @FXML - public ListView<Settings.GameCard> gamesList; - @FXML - public VBox gameDetail; + @FXML + public TextField searchBox; + @FXML + public ListView<Settings.GameCard> gamesList; + @FXML + public VBox gameDetail; - @FXML - public FlowPane gameContainer; + @FXML + public FlowPane gameContainer; - @FXML - protected void initialize() throws IOException { - 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(gameCards.stream().filter(gameCard -> gameCard.name.contains(newValue)).collect(Collectors.toList())); - 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<Settings.GameCard> listCell = new ListCell<>() { - @Override - protected void updateItem(Settings.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) -> { - 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; - }); - } + 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() 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 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); + } + } - @FXML - protected void onClearSearchButtonClick() { - searchBox.clear(); - } + @FXML + protected void onClearSearchButtonClick() { + searchBox.clear(); + } } diff --git a/src/main/java/nl/isygameclient/controllers/TicTacToeGame/TicTacToeMainMenuController.java b/src/main/java/nl/isygameclient/controllers/TicTacToeGame/TicTacToeMainMenuController.java @@ -1,25 +1,23 @@ package nl.isygameclient.controllers.TicTacToeGame; +import java.io.IOException; import javafx.event.ActionEvent; import javafx.fxml.FXML; import nl.isygameclient.Application; -import java.io.IOException; - public class TicTacToeMainMenuController { + @FXML + public void onSinglePlayerButtonClick(ActionEvent event) throws IOException { + Application.changeGameScene("views/TicTacToe/TicTacToeSinglePlayer.fxml"); + } - @FXML - public void onSinglePlayerButtonClick(ActionEvent event) throws IOException { - Application.changeGameScene("views/TicTacToe/TicTacToeSinglePlayer.fxml"); - } - - @FXML - public void onMultiplayerButtonClick(ActionEvent event) { - //TODO Open multiplayer Scene - } + @FXML + public void onMultiplayerButtonClick(ActionEvent event) throws IOException { + Application.changeGameScene("views/TicTacToe/TicTacToeMultiPlayer.fxml"); + } - @FXML - public void onExitButtonClick(ActionEvent event) throws IOException { - Application.closeGameScene(); - } + @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 @@ -0,0 +1,210 @@ +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 @@ -2,6 +2,8 @@ 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; @@ -9,157 +11,151 @@ import javafx.scene.layout.GridPane; import nl.isygameclient.Application; import nl.isygameclient.models.TicTacToe; -import java.io.IOException; -import java.util.ArrayList; - 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(); - } + 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,8 +1,13 @@ package nl.isygameclient.models; public enum Difficulty { - EASY("Easy"), MEDIUM("Medium"), HARD("Hard"); + EASY("Easy"), + MEDIUM("Medium"), + HARD("Hard"); - Difficulty(String difficulty) { - } + 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,45 +1,44 @@ package nl.isygameclient.models; -import lombok.Data; - import java.util.Arrays; +import lombok.Data; @Data public abstract class Game { - int currentPlayerIndex; - String[] players; + int currentPlayerIndex; + String[] players; - public Game(int currentPlayer, String[] players) { - this.currentPlayerIndex = currentPlayer; - this.players = players; - } + public Game(int currentPlayer, String[] players) { + this.currentPlayerIndex = currentPlayer; + this.players = players; + } - public abstract void move(int pos); + public abstract void move(int pos); - public abstract boolean isMoveValid(int pos); + public abstract boolean isMoveValid(int pos); - public abstract boolean isGameOver(); + public abstract boolean isGameOver(); - public abstract String getWinner(); + public abstract String getWinner(); - public void nextPlayer() { - currentPlayerIndex += 1; - if (currentPlayerIndex >= players.length) { - currentPlayerIndex = 0; - } - } + public void nextPlayer() { + currentPlayerIndex += 1; + if (currentPlayerIndex >= players.length) { + currentPlayerIndex = 0; + } + } - public String getCurrentPlayer() { - return players[currentPlayerIndex]; - } + public String getCurrentPlayer() { + return players[currentPlayerIndex]; + } - public void setCurrentPlayerIndex(int playerIndex) { - this.currentPlayerIndex = playerIndex; - } + public void setCurrentPlayerIndex(int playerIndex) { + this.currentPlayerIndex = playerIndex; + } - public void setCurrentPlayer(String player) { - currentPlayerIndex = Arrays.asList(players).indexOf(player); - } + public void setCurrentPlayer(String player) { + currentPlayerIndex = Arrays.asList(players).indexOf(player); + } } diff --git a/src/main/java/nl/isygameclient/models/TicTacToe.java b/src/main/java/nl/isygameclient/models/TicTacToe.java @@ -1,69 +1,67 @@ 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(); - } + 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/network/GameClient.java b/src/main/java/nl/isygameclient/network/GameClient.java @@ -1,56 +1,54 @@ package nl.isygameclient.network; import java.io.IOException; -import java.net.UnknownHostException; import java.util.List; import java.util.Map; import java.util.Random; public class GameClient extends GameClientBase { - private final String name; + private String name; - public GameClient(String host, int port, String name) throws UnknownHostException, IOException, InterruptedException { + public GameClient(String host, int port) throws IOException { super(host, port); - - this.name = name; } - public String getName() { return name; } @SuppressWarnings("unchecked") - public List<String> games() throws IOException, GameClientException, InterruptedException { + public List<String> games() throws IOException { send("get gamelist"); return (List<String>) event(EventType.GAMELIST).data; } @SuppressWarnings("unchecked") - public List<String> players() throws IOException, GameClientException, InterruptedException { + public List<String> players() throws IOException { send("get playerlist"); return (List<String>) event(EventType.GAMELIST).data; } - public void login() throws GameClientException, IOException { + public void login(String name) throws IOException { + this.name = name; + send("login", name); } - public Match match(GameType game, String other) throws IOException, GameClientException, InterruptedException { + public Match match(GameType game, String other) throws IOException { send("challenge", other, game.name); return new Match(this); } - public Match match(GameType game) throws IOException, GameClientException, InterruptedException { + public Match match(GameType game) throws IOException { send("subscribe", game.name); return new Match(this); } - public Match match() throws IOException, GameClientException, InterruptedException { + public Match match() throws IOException { @SuppressWarnings("unchecked") var challengeEvent = (Map<String, String>) event(-1, EventType.CHALLENGE).data; var challengeID = challengeEvent.get("challengenumber"); @@ -59,11 +57,11 @@ public class GameClient extends GameClientBase { return new Match(this); } - public static void main(String[] args) throws Exception { + public static void main(String[] args) throws IOException { var name = "testclient" + new Random().nextInt(100); - var client = new GameClient("localhost", 7789, name); // public: 145.33.225.170 + var client = new GameClient("localhost", 7789); // public: 145.33.225.170 - client.login(); + client.login(name); System.out.println("connected as " + name); var current = client.match(GameType.TICTACTOE4); diff --git a/src/main/java/nl/isygameclient/network/GameClientBase.java b/src/main/java/nl/isygameclient/network/GameClientBase.java @@ -5,39 +5,33 @@ import java.io.IOException; import java.io.InputStreamReader; import java.io.OutputStream; import java.net.Socket; -import java.net.UnknownHostException; import java.util.Arrays; import java.util.LinkedList; -public abstract class GameClientBase { - private final Socket socket; +public abstract class GameClientBase extends Socket { private final OutputStream outputStream; private final BufferedReader inputBuffer; private LinkedList<Event> eventQueue = new LinkedList<>(); private LinkedList<String> eventLineQueue = new LinkedList<>(); - public GameClientBase(String host, int port) throws UnknownHostException, IOException, InterruptedException { - socket = new Socket(host, port); - outputStream = socket.getOutputStream(); - inputBuffer = new BufferedReader(new InputStreamReader(socket.getInputStream())); + public GameClientBase(String host, int port) throws IOException { + super(host, port); + outputStream = getOutputStream(); + inputBuffer = new BufferedReader(new InputStreamReader(getInputStream())); - Thread.sleep(100); - while (inputBuffer.ready()) { - inputBuffer.readLine(); + try { Thread.sleep(100); + while (inputBuffer.ready()) { + inputBuffer.readLine(); + Thread.sleep(100); + } + } catch (InterruptedException exc) { + throw new GameClientException("socket initiation failed: " + exc.getMessage()); } } - protected void sendQuoted(String command, String... arguments) throws IOException, GameClientException { - for (int i = 0; i < arguments.length; i++) - arguments[i] = '"' + arguments[i] + '"'; - - send(command, arguments); - } - - - protected void send(String command, String... arguments) throws IOException, GameClientException { + public void send(String command, String... arguments) throws IOException { var requestBuilder = new StringBuilder(command); for (var argument : arguments) { requestBuilder.append(' '); @@ -61,15 +55,15 @@ public abstract class GameClientBase { } } - protected Event event(EventType... target) throws GameClientException, IOException, InterruptedException { + public Event event(EventType... target) throws IOException { return event(1, true, target); } - protected Event event(double timeout, EventType... target) throws GameClientException, IOException, InterruptedException { + public Event event(double timeout, EventType... target) throws IOException { return event(timeout, true, target); } - protected Event event(double timeout, boolean consume, EventType... target) throws GameClientException, IOException, InterruptedException { + public Event event(double timeout, boolean consume, EventType... target) throws IOException { var targetList = Arrays.asList(target); if (!eventQueue.isEmpty()) { if (target == null) @@ -87,10 +81,14 @@ public abstract class GameClientBase { do { if (eventLineQueue.isEmpty()) { - Thread.sleep(100); - if (!inputBuffer.ready()) - continue; - line = inputBuffer.readLine(); + try { + Thread.sleep(100); + if (!inputBuffer.ready()) + continue; + line = inputBuffer.readLine(); + } catch (InterruptedException exc) { + throw new GameClientException("event-pulling interrupted"); + } } else { line = eventLineQueue.poll(); } @@ -123,8 +121,9 @@ public abstract class GameClientBase { return null; } - protected void close() throws IOException { + @Override + public void close() throws IOException { outputStream.write("logout\n".getBytes()); - socket.close(); + super.close(); } } diff --git a/src/main/java/nl/isygameclient/network/GameClientException.java b/src/main/java/nl/isygameclient/network/GameClientException.java @@ -1,6 +1,8 @@ package nl.isygameclient.network; -public class GameClientException extends Exception { +import java.io.IOException; + +public class GameClientException extends IOException { public GameClientException(String reason) { super(reason); } diff --git a/src/main/java/nl/isygameclient/network/GameType.java b/src/main/java/nl/isygameclient/network/GameType.java @@ -3,16 +3,14 @@ package nl.isygameclient.network; public enum GameType { TICTACTOE("tic-tac-toe", 9), TICTACTOE4("tic-tac-toe-4", 16), - REVERSI("reversi", 64, 27, 28, 35, 36); + REVERSI("reversi", 64); public final String name; public final int maxMoves; - public final int[] reserved; - private GameType(String name, int maxMoves, int... reserved) { + private GameType(String name, int maxMoves) { this.name = name; this.maxMoves = maxMoves; - this.reserved = reserved; } public static GameType byName(String name) { diff --git a/src/main/java/nl/isygameclient/network/Match.java b/src/main/java/nl/isygameclient/network/Match.java @@ -5,74 +5,82 @@ import java.util.Map; public class Match { private final GameClient client; - private final GameType game; - private final String opponent; - private Event outcome = null; - private final int[] moves; - private int pointsSelf = 0; - private int pointsOther = 0; + private GameType game; + private Event outcome; + private String opponent; + private int[] moves; + private int pointsSelf; + private int pointsOther; + private boolean yourTurn; - public Match(GameClient client) throws GameClientException, IOException, InterruptedException { + public Match(GameClient client) throws IOException { this.client = client; - - @SuppressWarnings("unchecked") - var data = (Map<String, String>) client.event(-1, EventType.MATCH).data; - - game = GameType.byName(data.get("gametype").toLowerCase()); - opponent = data.get("opponent"); - moves = new int[game.maxMoves]; - for (int reserved : game.reserved) - moves[reserved] = 2; } public GameType getGame() { return game; } - public boolean update() throws GameClientException, IOException, InterruptedException { + public boolean isYourTurn() { + return yourTurn; + } + + public boolean update() throws IOException { if (outcome != null) return false; - Event event; - for (;;) { - event = client.event(-1, EventType.MOVE, EventType.YOURTURN, EventType.WIN, EventType.DRAW, EventType.LOSS); - - switch (event.type) { - case YOURTURN: - return true; - case MOVE: - @SuppressWarnings("unchecked") - var moveMap = (Map<String, String>) event.data; - - moves[Integer.parseInt(moveMap.get("move"))] = moveMap.get("player").equals(client.getName()) ? 1 : -1; - break; - case WIN: - pointsSelf++; - outcome = event; - return false; - case LOSS: - pointsOther++; - outcome = event; - return false; - default: // loss - outcome = event; - return false; - } + Event event = client.event(EventType.MATCH, EventType.MOVE, EventType.YOURTURN, EventType.WIN, EventType.DRAW, EventType.LOSS); + if (event == null) + return true; + + switch (event.type) { + case MATCH: + @SuppressWarnings("unchecked") + var data = (Map<String, String>) event.data; + + game = GameType.byName(data.get("gametype").toLowerCase()); + moves = new int[game.maxMoves]; + opponent = data.get("opponent"); + return true; + case YOURTURN: + yourTurn = true; + return true; + case MOVE: + @SuppressWarnings("unchecked") + var moveMap = (Map<String, String>) event.data; + + moves[Integer.parseInt(moveMap.get("move"))] = moveMap.get("player").equals(client.getName()) ? 1 : -1; + return true; + case WIN: + pointsSelf++; + outcome = event; + return false; + case LOSS: + pointsOther++; + outcome = event; + return false; + default: // loss + outcome = event; + return false; } } + public boolean isStarted() { + return game != null; + } + public int getMove(int move) { return moves[move]; } - public void abort() throws GameClientException, IOException { - if (outcome == null) + public void abort() throws IOException { + if (outcome == null && !isStarted()) client.send("forfeit"); } - public void rematch() throws IOException, GameClientException, InterruptedException { - if (outcome == null) + public void rematch() throws IOException { + if (outcome == null && !isStarted()) return; Event evt; @@ -102,9 +110,14 @@ public class Match { return pointsOther; } - public void move(int move) throws IOException, GameClientException { - if (outcome != null) + public String getOpponent() { + return opponent; + } + + public void move(int move) throws IOException { + if (outcome != null && !isStarted()) return; client.send("move " + move); + yourTurn = false; } } \ No newline at end of file diff --git a/src/main/resources/nl/isygameclient/views/TicTacToe/TicTacToeMultiPlayer.fxml b/src/main/resources/nl/isygameclient/views/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.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