From 6bbc2a0bd9a382e72d30f64dedeca698ea282c4f Mon Sep 17 00:00:00 2001 From: Bas de Jong Date: Tue, 16 Sep 2025 12:49:43 +0200 Subject: [PATCH] IDK --- .../java/org/toop/eventbus/EventRegistry.java | 2 +- .../backend/tictactoe/TicTacToeServer.java | 41 +++++++++++++++---- .../tictactoe/game/MinMaxTicTacToe.java | 2 +- .../backend/tictactoe/game/TicTacToe.java | 2 +- 4 files changed, 36 insertions(+), 11 deletions(-) diff --git a/src/main/java/org/toop/eventbus/EventRegistry.java b/src/main/java/org/toop/eventbus/EventRegistry.java index 29643da..23ca257 100644 --- a/src/main/java/org/toop/eventbus/EventRegistry.java +++ b/src/main/java/org/toop/eventbus/EventRegistry.java @@ -14,7 +14,7 @@ import java.util.concurrent.CopyOnWriteArrayList; */ public class EventRegistry { - private static final Logger logger = LogManager.getLogger(Main.class); + private static final Logger logger = LogManager.getLogger(EventRegistry.class); private static final Map, CopyOnWriteArrayList>> eventHistory = new ConcurrentHashMap<>(); diff --git a/src/main/java/org/toop/server/backend/tictactoe/TicTacToeServer.java b/src/main/java/org/toop/server/backend/tictactoe/TicTacToeServer.java index e7f24ec..ae7c72d 100644 --- a/src/main/java/org/toop/server/backend/tictactoe/TicTacToeServer.java +++ b/src/main/java/org/toop/server/backend/tictactoe/TicTacToeServer.java @@ -72,7 +72,7 @@ public class TicTacToeServer extends TcpServer { case MOVE -> { if (segments.length == 2 && !segments[1].isEmpty()) { this.command = commandEnum; - this.arguments = new ArrayList(); + this.arguments = new ArrayList(1); this.arguments.add(segments[1]); this.returnMessage = TicTacToeServerMessage.OK; this.isValidCommand = true; @@ -81,17 +81,44 @@ public class TicTacToeServer extends TcpServer { return; } } - case + case FORFEIT -> { + this.command = commandEnum; + this.arguments = null; + this.returnMessage = TicTacToeServerMessage.OK; + this.isValidCommand = true; + this.errorMessage = null; + this.originalCommand = receivedCommand; + return; + } + case MESSAGE -> { + if (segments.length == 3 && !segments[2].isEmpty()) { + this.command = commandEnum; + this.arguments = new ArrayList(2); + this.arguments.add(segments[2]); + this.returnMessage = TicTacToeServerMessage.OK; + this.isValidCommand = true; + this.errorMessage = null; + this.originalCommand = receivedCommand; + return; + } + } + case BYE, DISCONNECT, LOGOUT, QUIT, EXIT -> { + this.command = commandEnum; + this.arguments = null; + this.returnMessage = TicTacToeServerMessage.OK; + this.isValidCommand = true; + this.errorMessage = null; + this.originalCommand = receivedCommand; + return; + } } - this.command = command; this.arguments = arguments; } - } private ParsedCommand parseCommand(String command) { - + return null; } private void gameThread() { @@ -99,11 +126,9 @@ public class TicTacToeServer extends TcpServer { while (true) { String command = getNewestCommand(); - command = this.parseCommand(command); + command = this.parseCommand(command).toString(); if (command == null) { continue; } - - // TODO: Game } diff --git a/src/main/java/org/toop/server/backend/tictactoe/game/MinMaxTicTacToe.java b/src/main/java/org/toop/server/backend/tictactoe/game/MinMaxTicTacToe.java index 6630d88..3e2c87d 100644 --- a/src/main/java/org/toop/server/backend/tictactoe/game/MinMaxTicTacToe.java +++ b/src/main/java/org/toop/server/backend/tictactoe/game/MinMaxTicTacToe.java @@ -6,7 +6,7 @@ import org.toop.Main; public class MinMaxTicTacToe { - private static final Logger logger = LogManager.getLogger(Main.class); + private static final Logger logger = LogManager.getLogger(MinMaxTicTacToe.class); public int findBestMove(TicTacToe game) { /** diff --git a/src/main/java/org/toop/server/backend/tictactoe/game/TicTacToe.java b/src/main/java/org/toop/server/backend/tictactoe/game/TicTacToe.java index 489bd8e..ae9aa1b 100644 --- a/src/main/java/org/toop/server/backend/tictactoe/game/TicTacToe.java +++ b/src/main/java/org/toop/server/backend/tictactoe/game/TicTacToe.java @@ -6,7 +6,7 @@ import org.toop.Main; public class TicTacToe extends GameBase { public int moveCount; - private static final Logger logger = LogManager.getLogger(Main.class); + private static final Logger logger = LogManager.getLogger(TicTacToe.class); public TicTacToe(String player1, String player2) { super(3); // 3x3 Grid