commit fd0309feacbe3689540679bb6f829f6104804ecb parent 722089c3ef37be53a1c778975bb9f41beb047484 Author: A Koens <[email protected]> Date: Tue, 7 Feb 2023 20:51:40 +0100 Junk Diffstat:
21 files changed, 0 insertions(+), 1149 deletions(-)
diff --git a/src/main/java/module-info.java b/src/main/java/module-info.java @@ -1,33 +0,0 @@ -module nl.isygameclient { - // JavaFX - FXMl - requires javafx.fxml; - requires javafx.controls; - requires org.controlsfx.controls; - - // Material Design - requires de.jensd.fx.glyphs.fontawesome; - requires de.jensd.fx.glyphs.materialicons; - requires de.jensd.fx.glyphs.commons; - requires com.jfoenix; - - // Json Class Data Saving - requires com.google.gson; - - // Data Access Generation - requires static lombok; - - exports nl.isygameclient; - // Controllers - exports nl.isygameclient.controllers.TicTacToeGame; - exports nl.isygameclient.controllers.GameSeletorMenu; - - // Models - exports nl.isygameclient.models; - exports nl.isygameclient.util; - - opens nl.isygameclient to javafx.fxml; - opens nl.isygameclient.util to com.google.gson; - - opens nl.isygameclient.controllers.GameSeletorMenu to javafx.fxml; - opens nl.isygameclient.controllers.TicTacToeGame to javafx.fxml; -} -\ 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,87 +0,0 @@ -package nl.isygameclient; - -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; - } -} -\ No newline at end of file diff --git a/src/main/java/nl/isygameclient/NetworkClient.java b/src/main/java/nl/isygameclient/NetworkClient.java @@ -1,4 +0,0 @@ -package nl.isygameclient; - -public interface NetworkClient { -} diff --git a/src/main/java/nl/isygameclient/controllers/GameSeletorMenu/GameCardController.java b/src/main/java/nl/isygameclient/controllers/GameSeletorMenu/GameCardController.java @@ -1,51 +0,0 @@ -package nl.isygameclient.controllers.GameSeletorMenu; - -import javafx.fxml.FXML; -import javafx.scene.control.Label; -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; - -public class GameCardController { - - private Settings.GameCard gameCard; - - @FXML - private ImageView gameImage; - - @FXML - private Label gameTitle; - - public void initializeCard(Settings.GameCard gameCard) { - this.gameCard = gameCard; - // Set Title - gameTitle.setText(gameCard.name); - loadImage(); - } - - public void loadImage() { - // Load Image - if (gameCard.imgSrc != null) { - var imageSrc = Application.class.getResource(gameCard.imgSrc); - if (imageSrc != null) { - gameImage.setImage(new Image(imageSrc.toExternalForm())); - } else { - System.err.printf("Image for: %s at %s, doen not exist\n", gameCard.name, gameCard.imgSrc); - } - } else { - System.err.printf("ImgSrc for: %s, not provided\n", gameCard.name); - } - } - - @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); - } - } -} diff --git a/src/main/java/nl/isygameclient/controllers/GameSeletorMenu/GameSelectorMenuController.java b/src/main/java/nl/isygameclient/controllers/GameSeletorMenu/GameSelectorMenuController.java @@ -1,94 +0,0 @@ -package nl.isygameclient.controllers.GameSeletorMenu; - -import javafx.collections.FXCollections; -import javafx.collections.ObservableList; -import javafx.fxml.FXML; -import javafx.fxml.FXMLLoader; -import javafx.scene.Node; -import javafx.scene.control.ListCell; -import javafx.scene.control.ListView; -import javafx.scene.control.TextField; -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 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; - - @FXML - public TextField searchBox; - @FXML - public ListView<Settings.GameCard> gamesList; - @FXML - public VBox gameDetail; - - @FXML - public FlowPane gameContainer; - - @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 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; - }); - } - - 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(); - } -} diff --git a/src/main/java/nl/isygameclient/controllers/TicTacToeGame/TicTacToeMainMenuController.java b/src/main/java/nl/isygameclient/controllers/TicTacToeGame/TicTacToeMainMenuController.java @@ -1,25 +0,0 @@ -package nl.isygameclient.controllers.TicTacToeGame; - -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 onMultiplayerButtonClick(ActionEvent event) { - //TODO Open multiplayer Scene - } - - @FXML - public void onExitButtonClick(ActionEvent event) 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,165 +0,0 @@ -package nl.isygameclient.controllers.TicTacToeGame; - -import com.jfoenix.controls.JFXButton; -import com.jfoenix.controls.JFXComboBox; -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; - -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(); - } -} diff --git a/src/main/java/nl/isygameclient/models/Difficulty.java b/src/main/java/nl/isygameclient/models/Difficulty.java @@ -1,8 +0,0 @@ -package nl.isygameclient.models; - -public enum Difficulty { - EASY("Easy"), MEDIUM("Medium"), HARD("Hard"); - - Difficulty(String difficulty) { - } -} diff --git a/src/main/java/nl/isygameclient/models/Game.java b/src/main/java/nl/isygameclient/models/Game.java @@ -1,45 +0,0 @@ -package nl.isygameclient.models; - -import lombok.Data; - -import java.util.Arrays; - - -@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/SimpleCalculator.java b/src/main/java/nl/isygameclient/models/SimpleCalculator.java @@ -1,8 +0,0 @@ -package nl.isygameclient.models; - -public class SimpleCalculator { - - public int add(int numberA, int numberB) { - return numberA + numberB; - } -} diff --git a/src/main/java/nl/isygameclient/models/TicTacToe.java b/src/main/java/nl/isygameclient/models/TicTacToe.java @@ -1,69 +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/network/Event.java b/src/main/java/nl/isygameclient/network/Event.java @@ -1,15 +0,0 @@ -package nl.isygameclient.network; - -public class Event { - public final EventType type; - public final Object data; - - public Event(EventType type, Object data) { - this.type = type; - this.data = data; - } - - public String toString() { - return String.format("Event.%s(%s)", type, data); - } -} -\ No newline at end of file diff --git a/src/main/java/nl/isygameclient/network/EventParser.java b/src/main/java/nl/isygameclient/network/EventParser.java @@ -1,81 +0,0 @@ -package nl.isygameclient.network; - -import java.util.HashMap; -import java.util.LinkedList; - -public class EventParser { - private final String str; - - private int index = 0; - - private void stripLeft() { - while (Character.isSpaceChar(str.charAt(index))) - index++; - } - - public EventParser(String str) { - this.str = str; - } - - public Object parseData() throws GameClientException { - try { - stripLeft(); - - if (index >= str.length()) - return null; - - switch (str.charAt(index)) { - case '"': - index++; - var string = str.substring(index, str.indexOf("\"", index)); - index = str.indexOf("\"", index) + 1; - return string; - case '[': - index++; - var array = new LinkedList<Object>(); - for (;;) { - array.add(parseData()); - stripLeft(); - if (str.charAt(index) == ']') { - index++; - return array; - } else if (str.charAt(index) == ',') { - index++; - } else { - throw new GameClientException(String.format("invalid server response: unexpected '%c' at %d in '%s'", str.charAt(index), index, str)); - } - } - case '{': - index++; - var map = new HashMap<String, Object>(); - for (;;) { - stripLeft(); - var key = str.substring(index, str.indexOf(":", index)).toLowerCase(); - - index = str.indexOf(":", index) + 1; - map.put(key, parseData()); - stripLeft(); - if (str.charAt(index) == '}') { - index++; - return map; - } else if (str.charAt(index) == ',') { - index++; - } else { - throw new GameClientException(String.format("invalid server response: unexpected '%c' at %d in '%s'", str.charAt(index), index, str)); - } - } - default: - if (index != 0) - throw new GameClientException(String.format("invalid server response: unexpected '%c' at %d in '%s'", str.charAt(index), index, str)); - index = str.length(); - return str; - } - } catch (Exception ext) { - throw new GameClientException(String.format("invalid server response: unexpected '%c' at %d in '%s'", str.charAt(index), index, str)); - } - } - - public void reset() { - index = 0; - } -} diff --git a/src/main/java/nl/isygameclient/network/EventType.java b/src/main/java/nl/isygameclient/network/EventType.java @@ -1,20 +0,0 @@ -package nl.isygameclient.network; - -public enum EventType { - PLAYERLIST("PLAYERLIST"), - GAMELIST("GAMELIST"), - MATCH("GAME MATCH"), - YOURTURN("GAME YOURTURN"), - MOVE("GAME MOVE"), - CHALLENGE_ACCEPTED("GAME CALLENGE ACCEPT"), - CHALLENGE("GAME CHALLENGE"), - WIN("GAME WIN"), - LOSS("GAME LOSS"), - DRAW("GAME DRAW"); - - public final String identifier; - - EventType(String identifier) { - this.identifier = identifier; - } -} -\ 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,87 +0,0 @@ -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; - - public GameClient(String host, int port, String name) throws UnknownHostException, IOException, InterruptedException { - super(host, port); - - this.name = name; - } - - - public String getName() { - return name; - } - - @SuppressWarnings("unchecked") - public List<String> games() throws IOException, GameClientException, InterruptedException { - send("get gamelist"); - - return (List<String>) event(EventType.GAMELIST).data; - } - - @SuppressWarnings("unchecked") - public List<String> players() throws IOException, GameClientException, InterruptedException { - send("get playerlist"); - - return (List<String>) event(EventType.GAMELIST).data; - } - - public void login() throws GameClientException, IOException { - send("login", name); - } - - public Match match(GameType game, String other) throws IOException, GameClientException, InterruptedException { - send("challenge", other, game.name); - - return new Match(this); - } - - public Match match(GameType game) throws IOException, GameClientException, InterruptedException { - send("subscribe", game.name); - - return new Match(this); - } - - public Match match() throws IOException, GameClientException, InterruptedException { - @SuppressWarnings("unchecked") - var challengeEvent = (Map<String, String>) event(-1, EventType.CHALLENGE).data; - var challengeID = challengeEvent.get("challengenumber"); - send("challenge", "accept", challengeID); - - return new Match(this); - } - - public static void main(String[] args) throws Exception { - var name = "testclient" + new Random().nextInt(100); - var client = new GameClient("localhost", 7789, name); // public: 145.33.225.170 - - client.login(); - System.out.println("connected as " + name); - - var current = client.match(GameType.TICTACTOE4); - for (;;) { - while (current.update()) { - int move; - do { - move = new Random().nextInt(current.getGame().maxMoves); - } while (current.getMove(move) != 0); - current.move(move); - } - System.out.printf("[%4s] %02d:%02d\n", current.getOutcome().type, current.getPointsSelf(), current.getPointsOther()); - if (current.getPointsSelf() >= 10 || current.getPointsOther() >= 10) - break; - - current.rematch(); - } - - client.close(); - } -} diff --git a/src/main/java/nl/isygameclient/network/GameClientBase.java b/src/main/java/nl/isygameclient/network/GameClientBase.java @@ -1,130 +0,0 @@ -package nl.isygameclient.network; - -import java.io.BufferedReader; -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; - 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())); - - Thread.sleep(100); - while (inputBuffer.ready()) { - inputBuffer.readLine(); - Thread.sleep(100); - } - } - - 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 { - var requestBuilder = new StringBuilder(command); - for (var argument : arguments) { - requestBuilder.append(' '); - requestBuilder.append(argument); - } - - requestBuilder.append('\n'); - outputStream.write(requestBuilder.toString().getBytes()); - - String response; - for (;;) { - response = inputBuffer.readLine(); - if (response.startsWith("ERR ")) - throw new GameClientException(response.substring(4)); - else if (response.startsWith("SVR ")) { - eventLineQueue.add(response); - continue; - } else if (response.equals("OK")) - break; - throw new GameClientException("invalid server response: '" + response + "'"); - } - } - - protected Event event(EventType... target) throws GameClientException, IOException, InterruptedException { - return event(1, true, target); - } - - protected Event event(double timeout, EventType... target) throws GameClientException, IOException, InterruptedException { - return event(timeout, true, target); - } - - protected Event event(double timeout, boolean consume, EventType... target) throws GameClientException, IOException, InterruptedException { - var targetList = Arrays.asList(target); - if (!eventQueue.isEmpty()) { - if (target == null) - return eventQueue.poll(); - - for (int i = 0; i < eventQueue.size(); i++) { - if (targetList.contains(eventQueue.get(i).type)) - return consume ? eventQueue.remove(i) : eventQueue.get(i); - } - } - - long start = System.currentTimeMillis(); - Event result; - String line; - - do { - if (eventLineQueue.isEmpty()) { - Thread.sleep(100); - if (!inputBuffer.ready()) - continue; - line = inputBuffer.readLine(); - } else { - line = eventLineQueue.poll(); - } - - if (!line.startsWith("SVR ")) - throw new GameClientException("invalid server response: '" + line + "'"); - - - result = null; - for (var evt : EventType.values()) { - if (line.startsWith(evt.identifier, 4)) { - result = new Event(evt, new EventParser(line.substring(evt.identifier.length() + 4)).parseData()); - break; - } - } - - if (result == null) - throw new GameClientException("invalid server response: unknown event '" + line + "'"); - - - if (target.length == 0 || target.length > 0 && targetList.contains(result.type)) { - if (!consume) - eventQueue.push(result); - return result; - } - - eventQueue.push(result); - } while (timeout == -1 || System.currentTimeMillis() - start < timeout * 1000); - - return null; - } - - protected void close() throws IOException { - outputStream.write("logout\n".getBytes()); - socket.close(); - } -} diff --git a/src/main/java/nl/isygameclient/network/GameClientException.java b/src/main/java/nl/isygameclient/network/GameClientException.java @@ -1,7 +0,0 @@ -package nl.isygameclient.network; - -public class GameClientException extends Exception { - public GameClientException(String reason) { - super(reason); - } -} -\ No newline at end of file diff --git a/src/main/java/nl/isygameclient/network/GameType.java b/src/main/java/nl/isygameclient/network/GameType.java @@ -1,24 +0,0 @@ -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); - - public final String name; - public final int maxMoves; - public final int[] reserved; - - private GameType(String name, int maxMoves, int... reserved) { - this.name = name; - this.maxMoves = maxMoves; - this.reserved = reserved; - } - - public static GameType byName(String name) { - for (GameType game : GameType.values()) - if (game.name.equals(name)) - return game; - return null; - } -} -\ No newline at end of file diff --git a/src/main/java/nl/isygameclient/network/Match.java b/src/main/java/nl/isygameclient/network/Match.java @@ -1,110 +0,0 @@ -package nl.isygameclient.network; - -import java.io.IOException; -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; - - public Match(GameClient client) throws GameClientException, IOException, InterruptedException { - 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 { - 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; - } - } - } - - public int getMove(int move) { - return moves[move]; - } - - public void abort() throws GameClientException, IOException { - if (outcome == null) - client.send("forfeit"); - } - - public void rematch() throws IOException, GameClientException, InterruptedException { - if (outcome == null) - return; - - Event evt; - if ((evt = client.event(0.5, EventType.CHALLENGE)) != null) { - @SuppressWarnings("unchecked") - var id = ((Map<String, String>) evt.data).get("challengenumber"); - client.send("challenge", "accept", id); - } else { - client.send("challenge", opponent, game.name); - client.event(-1, EventType.MATCH); - } - - for (int i = 0; i < moves.length; i++) - moves[i] = 0; - outcome = null; - } - - public Event getOutcome() { - return outcome; - } - - public int getPointsSelf() { - return pointsSelf; - } - - public int getPointsOther() { - return pointsOther; - } - - public void move(int move) throws IOException, GameClientException { - if (outcome != null) - return; - client.send("move " + move); - } -} -\ 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/SettingsHandler.java b/src/main/java/nl/isygameclient/util/SettingsHandler.java @@ -1,44 +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; - } - } -}