From fa7bda42300596482c0205dea91609e3ab80a779 Mon Sep 17 00:00:00 2001 From: Simon Bussmann Date: Fri, 19 Mar 2021 11:15:22 +0100 Subject: [PATCH] Implemented GUI side of resetting the board --- Client/src/TicTacToe_Client.java | 5 +++++ Client/src/networking/Client.java | 4 ++++ Client/src/render/Engine.java | 4 +++- Server/src/networking/SinglePlayerServer.java | 12 ++---------- 4 files changed, 14 insertions(+), 11 deletions(-) diff --git a/Client/src/TicTacToe_Client.java b/Client/src/TicTacToe_Client.java index bde53bc..a67c58a 100644 --- a/Client/src/TicTacToe_Client.java +++ b/Client/src/TicTacToe_Client.java @@ -82,6 +82,11 @@ public class TicTacToe_Client { } //this.drawWinningLine(winCoordinates); //client.exitProcess(); + try { + Thread.sleep(1000); + } catch (InterruptedException e) { + e.printStackTrace(); + } client.resetBoard(); } } else { diff --git a/Client/src/networking/Client.java b/Client/src/networking/Client.java index b04e79c..815eeac 100644 --- a/Client/src/networking/Client.java +++ b/Client/src/networking/Client.java @@ -152,6 +152,10 @@ public class Client { } } + public void printLog(String message, boolean success){ + clientLogger.printLog(message, success, LogType.Log); + } + public String getName() { return name; } diff --git a/Client/src/render/Engine.java b/Client/src/render/Engine.java index d9e02c4..64afd8c 100644 --- a/Client/src/render/Engine.java +++ b/Client/src/render/Engine.java @@ -23,7 +23,6 @@ public class Engine extends Application { private boolean mouseClicked = false; private Point coordinates = new Point(); private Stage primaryStage; - private MouseEvent mouseEvent; public Engine() { setEngine(this); @@ -91,6 +90,9 @@ public class Engine extends Application { System.err.println("Wrong length of gameState string"); return; } + if (gameState.equals("---------")){ + grid.getChildren().clear(); + } for (int i = 0; i < gameState.length(); i++) { int column = i / 3; int row = i % 3; diff --git a/Server/src/networking/SinglePlayerServer.java b/Server/src/networking/SinglePlayerServer.java index b26a003..c2e4fa6 100644 --- a/Server/src/networking/SinglePlayerServer.java +++ b/Server/src/networking/SinglePlayerServer.java @@ -208,8 +208,6 @@ public class SinglePlayerServer { case "exit": try { - outstreams.get(client).writeInt(200); - outstreams.get(client).flush(); outstreams.get(client).close(); instreams.get(client).close(); client.close(); @@ -220,14 +218,8 @@ public class SinglePlayerServer { break; case "reset": - try { - outstreams.get(client).writeInt(200); - outstreams.get(client).flush(); - ticTacToe_server.resetGameState(); - this.gameFlow("gameState", client); - } catch (IOException e) { - e.printStackTrace(); - } + ticTacToe_server.resetGameState(); + this.sendGameState(client); break; } }