Logging and fixed user input getting stuck

app/src/main/java/org/toop/app/Server.java

@@ -11,7 +11,6 @@ import org.toop.app.widget.popup.ErrorPopup;
 import org.toop.app.widget.popup.SendChallengePopup;
 import org.toop.app.widget.view.ServerView;
 import org.toop.framework.eventbus.EventFlow;
-import org.toop.framework.game.players.ArtificialPlayer;
 import org.toop.framework.game.players.OnlinePlayer;
 import org.toop.framework.gameFramework.controller.GameController;
 import org.toop.framework.eventbus.GlobalEventBus;
@@ -20,8 +19,7 @@ import org.toop.framework.networking.connection.clients.TournamentNetworkingClie
 import org.toop.framework.networking.connection.events.NetworkEvents;
 import org.toop.framework.networking.connection.types.NetworkingConnector;
 import org.toop.framework.networking.server.gateway.NettyGatewayServer;
-import org.toop.game.players.LocalPlayer;
+import org.toop.framework.game.players.LocalPlayer;
-import org.toop.game.players.ai.RandomAI;
 import org.toop.local.AppContext;
 
 import java.util.List;
@@ -198,30 +196,21 @@ public final class Server {
                 return;
             }
 
-            final int myTurn = response.playerToMove().equalsIgnoreCase(response.opponent()) ? 1 : 0;
+            final String startingPlayer = response.playerToMove();
+            final int userStartingTurn = startingPlayer.equalsIgnoreCase(user) ? 0 : 1;
+            final int opponentStartingTurn = 1 - userStartingTurn;
 
             final GameInformation information = new GameInformation(type);
-            //information.players[0] = playerInformation;
+            information.players[userStartingTurn].name = user;
-            information.players[0].name = user;
+            information.players[opponentStartingTurn].name = response.opponent();
-            information.players[0].isHuman = true; // Make false and uncomment/comment code at lines HERE To make use of AI.
+
-//            information.players[0].computerDifficulty = 5; // HERE
+            Player[] players = new Player[2];
-//            information.players[0].computerThinkTime = 1; // HERE
+            players[userStartingTurn] = new LocalPlayer(user);
-            information.players[1].name = response.opponent();
+            players[opponentStartingTurn] = new OnlinePlayer(response.opponent());
 
             switch (type) {
-                case TICTACTOE -> {
+                case TICTACTOE -> gameController = new TicTacToeBitController(players);
-                    Player[] players = new Player[2];
+                case REVERSI -> gameController = new ReversiBitController(players);
-                    players[Math.abs(myTurn-1)] = new OnlinePlayer(response.opponent());
-                    //players[myTurn] = new LocalPlayer(user); // HERE
-                    players[myTurn] = new ArtificialPlayer(new RandomAI(), user); // HERE
-                    gameController = new TicTacToeBitController(players);
-                }
-                case REVERSI -> {
-                    Player[] players = new Player[2];
-                    players[Math.abs(myTurn-1)] = new OnlinePlayer(response.opponent());
-                    //players[myTurn] = new LocalPlayer(user); // HERE
-                    players[myTurn] = new ArtificialPlayer(new RandomAI(), user); // HERE
-                    gameController = new ReversiBitController(players);}
                 default -> new ErrorPopup("Unsupported game type.");
 
             }

app/src/main/java/org/toop/app/canvas/BitGameCanvas.java

@@ -78,6 +78,7 @@ public abstract class BitGameCanvas implements GameCanvas {
 		}
 
 		canvas.setOnMouseClicked(event -> {
+
 			if (event.getButton() != MouseButton.PRIMARY) {
 				return;
 			}
@@ -93,9 +94,6 @@ public abstract class BitGameCanvas implements GameCanvas {
 			}
 		});
 
-
-
-
 		render();
 	}
 

app/src/main/java/org/toop/app/gameControllers/GenericGameController.java

@@ -16,7 +16,7 @@ import org.toop.framework.gameFramework.model.game.threadBehaviour.ThreadBehavio
 import org.toop.framework.gameFramework.model.player.Player;
 import org.toop.framework.gameFramework.view.GUIEvents;
 import org.toop.framework.networking.connection.events.NetworkEvents;
-import org.toop.game.players.LocalPlayer;
+import org.toop.framework.game.players.LocalPlayer;
 
 public class GenericGameController implements GameController {
     protected final EventFlow eventFlow = new EventFlow();
@@ -35,14 +35,16 @@ public class GenericGameController implements GameController {
 
     // TODO: Change gameType to automatically happen with either dependency injection or something else.
     public GenericGameController(GameCanvas canvas, TurnBasedGame game, ThreadBehaviour gameThreadBehaviour, String gameType) {
-        logger.info("Creating: " + this.getClass());
+        logger.info("Creating: {}", this.getClass());
 
         this.canvas = canvas;
         this.game = game;
         this.gameThreadBehaviour = gameThreadBehaviour;
 
         // Tell thread how to send moves
-        this.gameThreadBehaviour.setOnSendMove((id, m) -> GlobalEventBus.get().post(new NetworkEvents.SendMove(id, (short)translateMove(m))));
+        this.gameThreadBehaviour.setOnSendMove(
+                (id, m) -> GlobalEventBus.get().post(new NetworkEvents.SendMove(id, (short)translateMove(m)))
+        );
 
         // Tell thread how to update UI
         this.gameThreadBehaviour.setOnUpdateUI(() -> Platform.runLater(this::updateUI));
@@ -53,21 +55,37 @@ public class GenericGameController implements GameController {
         WidgetContainer.getCurrentView().transitionNext(gameView, true);
 
         // Listen to updates
+        logger.info("Game controller started listening");
         eventFlow
                 .listen(GUIEvents.GameEnded.class, this::onGameFinish, false)
-                .listen(GUIEvents.PlayerAttemptedMove.class, event -> {if (getCurrentPlayer() instanceof LocalPlayer lp){lp.setLastMove(event.move());}}, false);
+                .listen(GUIEvents.PlayerAttemptedMove.class, event -> {
+                    logger.info("User attempting move {}", event.move());
+                    logger.info("Current player's turn {}", getCurrentPlayer().getName());
+                    logger.info("First player {}", game.getPlayer(0).getName());
+                    logger.info("Username {}", getCurrentPlayer().getName());
+                    logger.info("User is class {}, {}", getCurrentPlayer().getClass(), getCurrentPlayer() instanceof LocalPlayer);
+                    if (getCurrentPlayer() instanceof LocalPlayer lp) {
+                        try {
+                            lp.setLastMove(event.move());
+                        } catch (Exception e) {
+                            IO.println(e);
+                        }
+                    }
+                }, false);
     }
 
     public void start(){
         logger.info("Starting GameManager");
         updateUI();
         gameThreadBehaviour.start();
+        logger.info("GameManager started");
     }
 
     public void stop(){
         logger.info("Stopping GameManager");
         removeListeners();
         gameThreadBehaviour.stop();
+        logger.info("GameManager stopped");
     }
 
     public Player getCurrentPlayer(){
@@ -98,7 +116,7 @@ public class GenericGameController implements GameController {
     }
 
     public Player getPlayer(int player){
-        if (player < 0 || player >= 2){ // TODO: Make game turn player count
+        if (player < 0 || player > game.getPlayerCount()-1){ // TODO: Make game turn player count
             logger.error("Invalid player index");
             throw new IllegalArgumentException("player out of range");
         }

app/src/main/java/org/toop/app/gameControllers/TicTacToeBitController.java

@@ -7,7 +7,6 @@ import org.toop.framework.game.gameThreads.LocalThreadBehaviour;
 import org.toop.framework.game.gameThreads.OnlineThreadBehaviour;
 import org.toop.framework.game.games.tictactoe.BitboardTicTacToe;
 import org.toop.framework.game.players.OnlinePlayer;
-import org.toop.framework.networking.server.OnlineGame;
 
 import java.util.Arrays;
 

app/src/main/java/org/toop/app/widget/view/LocalMultiplayerView.java

@@ -12,7 +12,7 @@ import org.toop.app.widget.complex.PlayerInfoWidget;
 import org.toop.app.widget.complex.ViewWidget;
 import org.toop.app.widget.popup.ErrorPopup;
 import org.toop.app.widget.tutorial.*;
-import org.toop.game.players.LocalPlayer;
+import org.toop.framework.game.players.LocalPlayer;
 import org.toop.game.players.ai.MCTSAI;
 import org.toop.game.players.ai.MCTSAI2;
 import org.toop.game.players.ai.MCTSAI3;

framework/src/main/java/org/toop/framework/game/gameThreads/OnlineThreadBehaviour.java

@@ -8,6 +8,9 @@ import org.toop.framework.gameFramework.model.game.threadBehaviour.SupportsOnlin
 import org.toop.framework.gameFramework.model.player.Player;
 import org.toop.framework.game.players.OnlinePlayer;
 
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
+
 /**
  * Handles online multiplayer game logic.
  * <p>
@@ -15,6 +18,9 @@ import org.toop.framework.game.players.OnlinePlayer;
  * for the local player while receiving moves from other players.
  */
 public class OnlineThreadBehaviour extends AbstractThreadBehaviour implements SupportsOnlinePlay {
+
+    private ExecutorService moveExecutor = Executors.newSingleThreadExecutor();
+
     /**
      * Creates behaviour and sets the first local player
      * (non-online player) from the given array.
@@ -51,9 +57,33 @@ public class OnlineThreadBehaviour extends AbstractThreadBehaviour implements Su
      */
     @Override
     public void onYourTurn(long clientId) {
-        if (!isRunning.get()) return;
+        logger.info("Yourturn");
-        long move = game.getPlayer(game.getCurrentTurn()).getMove(game.deepCopy());
+        if (!isRunning.get()) {
+            logger.warn("Game is not running!");
+            return;
+        }
+
+        TurnBasedGame gameCopy = game.deepCopy();
+        if (gameCopy == null) {
+            logger.error("Could not deep copy game");
+            return;
+        }
+        logger.info("Successfully collected game copy");
+
+        Player player = gameCopy.getPlayer(game.getCurrentTurn());
+        if (player == null) {
+            logger.error("Could not find current turn's player");
+            return;
+        }
+        logger.info("Successfully collected current turn's player");
+
+        moveExecutor.submit(() -> {
+            long move = player.getMove(gameCopy);
+            logger.info("Move set: {}", move);
+            logger.info("Completed onYourTurn");
+
             sendMove(clientId, move);
+        });
     }
 
     /**

framework/src/main/java/org/toop/framework/game/players/LocalPlayer.java

@@ -1,4 +1,4 @@
-package org.toop.game.players;
+package org.toop.framework.game.players;
 
 import org.toop.framework.gameFramework.model.game.TurnBasedGame;
 import org.toop.framework.gameFramework.model.player.AbstractPlayer;
@@ -45,11 +45,16 @@ public class LocalPlayer extends AbstractPlayer {
         long legalMoves = gameCopy.getLegalMoves();
         long move;
 
+        try {
             do {
                 move = getLastMove();
+                IO.println("GETTING MOVE");
             } while ((legalMoves & move) == 0);
-
             return move;
+        } catch (Exception e) {
+            IO.println(e);
+        }
+        return -1;
     }
 
     /**

framework/src/main/java/org/toop/framework/networking/server/connectionHandler/NettyClientSession.java

@@ -11,8 +11,6 @@ import org.toop.framework.networking.server.Server;
 import org.toop.framework.networking.server.client.Client;
 import org.toop.framework.networking.server.parsing.Parser;
 
-import java.util.Arrays;
-
 public class NettyClientSession extends SimpleChannelInboundHandler<String> implements ClientSession<OnlineTurnBasedGame, ServerPlayer> {
 
     private final NettyClient client;
@@ -41,13 +39,9 @@ public class NettyClientSession extends SimpleChannelInboundHandler<String> impl
     @Override
     protected void channelRead0(ChannelHandlerContext ctx, String msg) {
 
-        IO.println(msg);
-
         ParsedMessage p = Parser.parse(msg);
         if (p == null) return;
 
-        IO.println(p.command() + " " + Arrays.toString(p.args()));
-
         handler.handle(p);
     }