Moved the Move record into it's own file, seperated from Game

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

@@ -2,12 +2,13 @@ package org.toop.app.canvas;
 
 import javafx.scene.paint.Color;
 import org.toop.game.Game;
+import org.toop.game.records.Move;
 
 import java.util.concurrent.atomic.AtomicReference;
 import java.util.function.Consumer;
 
 public final class ReversiCanvas extends GameCanvas {
-    private Game.Move[] currentlyHighlightedMoves = null;
+    private Move[] currentlyHighlightedMoves = null;
 	public ReversiCanvas(Color color, int width, int height, Consumer<Integer> onCellClicked,  Consumer<Integer> newCellEntered) {
 		super(color, new Color(0f,0.4f,0.2f,1f), width, height, 8, 8, 5, true, onCellClicked,  newCellEntered);
 		drawStartingDots();
@@ -41,16 +42,16 @@ public final class ReversiCanvas extends GameCanvas {
         currentlyHighlightedMoves = null;
     }
 
-    public void drawHighlightDots(Game.Move[] moves){
+    public void drawHighlightDots(Move[] moves){
         if (currentlyHighlightedMoves != null){
-            for (final Game.Move move : currentlyHighlightedMoves){
+            for (final Move move : currentlyHighlightedMoves){
                 Color color = move.value() == 'W'? Color.BLACK: Color.WHITE;
                 drawInnerDot(color, move.position(), true);
             }
         }
         currentlyHighlightedMoves = moves;
         if (moves != null) {
-            for (Game.Move move : moves) {
+            for (Move move : moves) {
                 Color color = move.value() == 'B' ? Color.BLACK : Color.WHITE;
                 drawInnerDot(color, move.position(), false);
             }

app/src/main/java/org/toop/app/game/Connect4Game.java

@@ -14,6 +14,7 @@ import org.toop.game.Connect4.Connect4;
 import org.toop.game.Connect4.Connect4AI;
 import org.toop.game.Game;
 import org.toop.game.enumerators.GameState;
+import org.toop.game.records.Move;
 
 import java.util.concurrent.BlockingQueue;
 import java.util.concurrent.LinkedBlockingQueue;
@@ -25,7 +26,7 @@ public class Connect4Game {
 
     private final int myTurn;
     private Runnable onGameOver;
-    private final BlockingQueue<Game.Move> moveQueue;
+    private final BlockingQueue<Move> moveQueue;
 
     private final Connect4 game;
     private final Connect4AI ai;
@@ -41,7 +42,7 @@ public class Connect4Game {
         this.information = information;
         this.myTurn = myTurn;
         this.onGameOver = onGameOver;
-        moveQueue = new LinkedBlockingQueue<Game.Move>();
+        moveQueue = new LinkedBlockingQueue<Move>();
 
 
         game = new Connect4();
@@ -69,7 +70,7 @@ public class Connect4Game {
                             final char value = game.getCurrentTurn() == 0? 'X' : 'O';
 
                             try {
-                                moveQueue.put(new Game.Move(cell%columnSize, value));
+                                moveQueue.put(new Move(cell%columnSize, value));
                             } catch (InterruptedException _) {}
                         }
                     } else {
@@ -77,7 +78,7 @@ public class Connect4Game {
                             final char value = myTurn == 0? 'X' : 'O';
 
                             try {
-                                moveQueue.put(new Game.Move(cell%columnSize, value));
+                                moveQueue.put(new Move(cell%columnSize, value));
                             } catch (InterruptedException _) {}
                         }
                     }
@@ -114,14 +115,14 @@ public class Connect4Game {
 				currentValue,
 				information.players[nextTurn].name);
 
-            Game.Move move = null;
+            Move move = null;
 
             if (information.players[currentTurn].isHuman) {
                 try {
-                    final Game.Move wants = moveQueue.take();
+                    final Move wants = moveQueue.take();
-                    final Game.Move[] legalMoves = game.getLegalMoves();
+                    final Move[] legalMoves = game.getLegalMoves();
 
-                    for (final Game.Move legalMove : legalMoves) {
+                    for (final Move legalMove : legalMoves) {
                         if (legalMove.position() == wants.position() &&
                                 legalMove.value() == wants.value()) {
                             move = wants;
@@ -182,7 +183,7 @@ public class Connect4Game {
             playerChar = myTurn == 0? 'O' : 'X';
         }
 
-        final Game.Move move = new Game.Move(Integer.parseInt(response.move()), playerChar);
+        final Move move = new Move(Integer.parseInt(response.move()), playerChar);
         final GameState state = game.play(move);
 
         if (state != GameState.NORMAL) {
@@ -233,7 +234,7 @@ public class Connect4Game {
                 position = moveQueue.take().position();
             } catch (InterruptedException _) {}
         } else {
-            final Game.Move move = ai.findBestMove(game, information.players[0].computerDifficulty);
+            final Move move = ai.findBestMove(game, information.players[0].computerDifficulty);
 
             assert move != null;
             position = move.position();

app/src/main/java/org/toop/app/game/ReversiGame.java

@@ -11,6 +11,7 @@ import org.toop.framework.eventbus.EventFlow;
 import org.toop.framework.networking.events.NetworkEvents;
 import org.toop.game.Game;
 import org.toop.game.enumerators.GameState;
+import org.toop.game.records.Move;
 import org.toop.game.reversi.Reversi;
 import org.toop.game.reversi.ReversiAI;
 
@@ -28,7 +29,7 @@ public final class ReversiGame {
 
 	private final int myTurn;
     private Runnable onGameOver;
-    private final BlockingQueue<Game.Move> moveQueue;
+    private final BlockingQueue<Move> moveQueue;
 
 	private final Reversi game;
 	private final ReversiAI ai;
@@ -44,7 +45,7 @@ public final class ReversiGame {
 
 		this.myTurn = myTurn;
         this.onGameOver = onGameOver;
-        moveQueue = new LinkedBlockingQueue<Game.Move>();
+        moveQueue = new LinkedBlockingQueue<Move>();
 
 		game = new Reversi();
 		ai = new ReversiAI();
@@ -72,7 +73,7 @@ public final class ReversiGame {
 						final char value = game.getCurrentTurn() == 0? 'B' : 'W';
 
 						try {
-							moveQueue.put(new Game.Move(cell, value));
+							moveQueue.put(new Move(cell, value));
 						} catch (InterruptedException _) {}
 					}
 				} else {
@@ -80,7 +81,7 @@ public final class ReversiGame {
 						final char value = myTurn == 0? 'B' : 'W';
 
 						try {
-							moveQueue.put(new Game.Move(cell, value));
+							moveQueue.put(new Move(cell, value));
 						} catch (InterruptedException _) {}
 					}
 				}
@@ -129,14 +130,14 @@ public final class ReversiGame {
 				currentValue,
 				information.players[nextTurn].name);
 
-			Game.Move move = null;
+			Move move = null;
 
 			if (information.players[currentTurn].isHuman) {
 				try {
-					final Game.Move wants = moveQueue.take();
+					final Move wants = moveQueue.take();
-					final Game.Move[] legalMoves = game.getLegalMoves();
+					final Move[] legalMoves = game.getLegalMoves();
 
-					for (final Game.Move legalMove : legalMoves) {
+					for (final Move legalMove : legalMoves) {
 						if (legalMove.position() == wants.position() &&
 							legalMove.value() == wants.value()) {
 							move = wants;
@@ -192,7 +193,7 @@ public final class ReversiGame {
 			playerChar = myTurn == 0? 'W' : 'B';
 		}
 
-		final Game.Move move = new Game.Move(Integer.parseInt(response.move()), playerChar);
+		final Move move = new Move(Integer.parseInt(response.move()), playerChar);
 		final GameState state = game.play(move);
 
 		if (state != GameState.NORMAL) {
@@ -236,7 +237,7 @@ public final class ReversiGame {
 				position = moveQueue.take().position();
 			} catch (InterruptedException _) {}
 		} else {
-			final Game.Move move = ai.findBestMove(game, information.players[0].computerDifficulty);
+			final Move move = ai.findBestMove(game, information.players[0].computerDifficulty);
 
 			assert move != null;
 			position = move.position();
@@ -266,13 +267,13 @@ public final class ReversiGame {
 			}
 		}
 
-		final Game.Move[] flipped = game.getMostRecentlyFlippedPieces();
+		final Move[] flipped = game.getMostRecentlyFlippedPieces();
 
 		final SequentialTransition animation = new SequentialTransition();
 		isPaused.set(true);
 
 		if (animate && flipped != null) {
-			for (final Game.Move flip : flipped) {
+			for (final Move flip : flipped) {
 				canvas.clear(flip.position());
 
 				final Color from = flip.value() == 'W' ? Color.BLACK : Color.WHITE;
@@ -287,9 +288,9 @@ public final class ReversiGame {
 		animation.setOnFinished(_ -> {
 			isPaused.set(false);
 
-			final Game.Move[] legalMoves = game.getLegalMoves();
+			final Move[] legalMoves = game.getLegalMoves();
 
-			for (final Game.Move legalMove : legalMoves) {
+			for (final Move legalMove : legalMoves) {
 				canvas.drawLegalPosition(legalMove.position(), game.getCurrentPlayer());
 			}
 		});
@@ -308,9 +309,9 @@ public final class ReversiGame {
 	}
 
     private void highlightCells(int cellEntered) {
-        Game.Move[] legalMoves = game.getLegalMoves();
+        Move[] legalMoves = game.getLegalMoves();
         boolean isLegalMove = false;
-        for (Game.Move move : legalMoves) {
+        for (Move move : legalMoves) {
             if (move.position() == cellEntered){
                 isLegalMove = true;
                 break;
@@ -318,7 +319,7 @@ public final class ReversiGame {
         }
 
         if (cellEntered >= 0){
-            Game.Move[] moves = null;
+            Move[] moves = null;
             if (isLegalMove) {
                 moves = game.getFlipsForPotentialMove(
                         new Point(cellEntered%game.columnSize,cellEntered/game.rowSize),

app/src/main/java/org/toop/app/game/TicTacToeGame.java

@@ -10,6 +10,7 @@ import org.toop.framework.eventbus.EventFlow;
 import org.toop.framework.networking.events.NetworkEvents;
 import org.toop.game.Game;
 import org.toop.game.enumerators.GameState;
+import org.toop.game.records.Move;
 import org.toop.game.tictactoe.TicTacToe;
 import org.toop.game.tictactoe.TicTacToeAI;
 
@@ -26,7 +27,7 @@ public final class TicTacToeGame {
 
 	private final int myTurn;
     private Runnable onGameOver;
-    private final BlockingQueue<Game.Move> moveQueue;
+    private final BlockingQueue<Move> moveQueue;
 
 	private final TicTacToe game;
 	private final TicTacToeAI ai;
@@ -41,7 +42,7 @@ public final class TicTacToeGame {
 
 		this.myTurn = myTurn;
         this.onGameOver = onGameOver;
-        moveQueue = new LinkedBlockingQueue<Game.Move>();
+        moveQueue = new LinkedBlockingQueue<Move>();
 
 		game = new TicTacToe();
 		ai = new TicTacToeAI();
@@ -68,7 +69,7 @@ public final class TicTacToeGame {
 						final char value = game.getCurrentTurn() == 0? 'X' : 'O';
 
 						try {
-							moveQueue.put(new Game.Move(cell, value));
+							moveQueue.put(new Move(cell, value));
 						} catch (InterruptedException _) {}
 					}
 				} else {
@@ -76,7 +77,7 @@ public final class TicTacToeGame {
 						final char value = myTurn == 0? 'X' : 'O';
 
 						try {
-							moveQueue.put(new Game.Move(cell, value));
+							moveQueue.put(new Move(cell, value));
 						} catch (InterruptedException _) {}
 					}
 				}
@@ -112,14 +113,14 @@ public final class TicTacToeGame {
 				currentValue,
 				information.players[nextTurn].name);
 
-			Game.Move move = null;
+			Move move = null;
 
 			if (information.players[currentTurn].isHuman) {
 				try {
-					final Game.Move wants = moveQueue.take();
+					final Move wants = moveQueue.take();
-					final Game.Move[] legalMoves = game.getLegalMoves();
+					final Move[] legalMoves = game.getLegalMoves();
 
-					for (final Game.Move legalMove : legalMoves) {
+					for (final Move legalMove : legalMoves) {
 						if (legalMove.position() == wants.position() &&
 							legalMove.value() == wants.value()) {
 							move = wants;
@@ -179,7 +180,7 @@ public final class TicTacToeGame {
 		    playerChar = myTurn == 0? 'O' : 'X';
 	    }
 
-	    final Game.Move move = new Game.Move(Integer.parseInt(response.move()), playerChar);
+	    final Move move = new Move(Integer.parseInt(response.move()), playerChar);
 	    final GameState state = game.play(move);
 
 	    if (state != GameState.NORMAL) {
@@ -230,7 +231,7 @@ public final class TicTacToeGame {
  				position = moveQueue.take().position();
  			} catch (InterruptedException _) {}
  		} else {
-             final Game.Move move;
+             final Move move;
              move = ai.findBestMove(game, information.players[0].computerDifficulty);
 			assert move != null;
  			position = move.position();

game/src/main/java/org/toop/game/AI.java

@@ -1,5 +1,7 @@
 package org.toop.game;
 
+import org.toop.game.records.Move;
+
 public abstract class AI<T extends Game> {
-	public abstract Game.Move findBestMove(T game, int depth);
+	public abstract Move findBestMove(T game, int depth);
 }

game/src/main/java/org/toop/game/Connect4/Connect4.java

@@ -2,6 +2,7 @@ package org.toop.game.Connect4;
 
 import org.toop.game.TurnBasedGame;
 import org.toop.game.enumerators.GameState;
+import org.toop.game.records.Move;
 
 import java.util.ArrayList;
 

game/src/main/java/org/toop/game/Connect4/Connect4AI.java

@@ -1,26 +1,26 @@
 package org.toop.game.Connect4;
 
 import org.toop.game.AI;
-import org.toop.game.Game;
 import org.toop.game.enumerators.GameState;
+import org.toop.game.records.Move;
 
 public class Connect4AI extends AI<Connect4> {
 
 
-    public Game.Move findBestMove(Connect4 game, int depth) {
+    public Move findBestMove(Connect4 game, int depth) {
         assert game != null;
         assert depth >= 0;
 
-        final Game.Move[] legalMoves = game.getLegalMoves();
+        final Move[] legalMoves = game.getLegalMoves();
 
         if (legalMoves.length <= 0) {
             return null;
         }
 
         int bestScore = -depth;
-        Game.Move bestMove = null;
+        Move bestMove = null;
 
-        for (final Game.Move move : legalMoves) {
+        for (final Move move : legalMoves) {
             final int score = getMoveScore(game, depth, move, true);
 
             if (score > bestScore) {
@@ -32,7 +32,7 @@ public class Connect4AI extends AI<Connect4> {
         return bestMove != null? bestMove : legalMoves[(int)(Math.random() * legalMoves.length)];
     }
 
-    private int getMoveScore(Connect4 game, int depth, Game.Move move, boolean maximizing) {
+    private int getMoveScore(Connect4 game, int depth, Move move, boolean maximizing) {
         final Connect4 copy = new Connect4(game);
         final GameState state = copy.play(move);
 
@@ -45,10 +45,10 @@ public class Connect4AI extends AI<Connect4> {
             return 0;
         }
 
-        final Game.Move[] legalMoves = copy.getLegalMoves();
+        final Move[] legalMoves = copy.getLegalMoves();
         int score = maximizing? depth + 1 : -depth - 1;
 
-        for (final Game.Move next : legalMoves) {
+        for (final Move next : legalMoves) {
             if (maximizing) {
                 score = Math.min(score, getMoveScore(copy, depth - 1, next, false));
             } else {

game/src/main/java/org/toop/game/Game.java

@@ -5,7 +5,6 @@ import org.toop.game.interfaces.Playable;
 import java.util.Arrays;
 
 public abstract class Game implements Playable {
-    public record Move(int position, char value) {}
 
 	public static final char EMPTY = (char)0;
 

game/src/main/java/org/toop/game/interfaces/Playable.java

@@ -1,9 +1,9 @@
 package org.toop.game.interfaces;
 
-import org.toop.game.Game;
 import org.toop.game.enumerators.GameState;
+import org.toop.game.records.Move;
 
 public interface Playable {
-    Game.Move[] getLegalMoves();
+    Move[] getLegalMoves();
-    GameState play(Game.Move move);
+    GameState play(Move move);
 }

game/src/main/java/org/toop/game/records/Move.java

@@ -0,0 +1,3 @@
+package org.toop.game.records;
+
+public record Move(int position, char value) {}

game/src/main/java/org/toop/game/reversi/Reversi.java

@@ -3,6 +3,7 @@ package org.toop.game.reversi;
 import org.toop.game.Game;
 import org.toop.game.TurnBasedGame;
 import org.toop.game.enumerators.GameState;
+import org.toop.game.records.Move;
 
 import java.awt.*;
 import java.util.ArrayList;

game/src/main/java/org/toop/game/reversi/ReversiAI.java

@@ -1,12 +1,12 @@
 package org.toop.game.reversi;
 
 import org.toop.game.AI;
-import org.toop.game.Game;
+import org.toop.game.records.Move;
 
 public final class ReversiAI extends AI<Reversi> {
 	@Override
-	public Game.Move findBestMove(Reversi game, int depth) {
+	public Move findBestMove(Reversi game, int depth) {
-        Game.Move[] moves = game.getLegalMoves();
+        Move[] moves = game.getLegalMoves();
         int inty = (int)(Math.random() * moves.length-.5f);
 		return moves[inty];
 	}

game/src/main/java/org/toop/game/tictactoe/TicTacToe.java

@@ -3,6 +3,7 @@ package org.toop.game.tictactoe;
 import java.util.ArrayList;
 import org.toop.game.TurnBasedGame;
 import org.toop.game.enumerators.GameState;
+import org.toop.game.records.Move;
 
 public final class TicTacToe extends TurnBasedGame {
     private int movesLeft;

game/src/main/java/org/toop/game/tictactoe/TicTacToeAI.java

@@ -1,16 +1,16 @@
 package org.toop.game.tictactoe;
 
 import org.toop.game.AI;
-import org.toop.game.Game;
 import org.toop.game.enumerators.GameState;
+import org.toop.game.records.Move;
 
 public final class TicTacToeAI extends AI<TicTacToe> {
 	@Override
-	public Game.Move findBestMove(TicTacToe game, int depth) {
+	public Move findBestMove(TicTacToe game, int depth) {
 		assert game != null;
 		assert depth >= 0;
 
-		final Game.Move[] legalMoves = game.getLegalMoves();
+		final Move[] legalMoves = game.getLegalMoves();
 
 		if (legalMoves.length == 0) {
 			return null;
@@ -26,9 +26,9 @@ public final class TicTacToeAI extends AI<TicTacToe> {
 		}
 
 		int bestScore = -depth;
-		Game.Move bestMove = null;
+		Move bestMove = null;
 
-		for (final Game.Move move : legalMoves) {
+		for (final Move move : legalMoves) {
 			final int score = getMoveScore(game, depth, move, true);
 
 			if (score > bestScore) {
@@ -39,15 +39,15 @@ public final class TicTacToeAI extends AI<TicTacToe> {
 
 		return bestMove != null? bestMove : legalMoves[(int)(Math.random() * legalMoves.length)];
 	}
-    public Game.Move findWorstMove(TicTacToe game, int depth){
+    public Move findWorstMove(TicTacToe game, int depth){
 
 
-        Game.Move[] legalMoves = game.getLegalMoves();
+        Move[] legalMoves = game.getLegalMoves();
 
         int bestScore = -depth;
-        Game.Move bestMove = null;
+        Move bestMove = null;
 
-        for (final Game.Move move : legalMoves) {
+        for (final Move move : legalMoves) {
             final int score = getMoveScore(game, depth, move, false);
 
             if (score > bestScore) {
@@ -58,7 +58,7 @@ public final class TicTacToeAI extends AI<TicTacToe> {
         return bestMove;
     }
 
-	private int getMoveScore(TicTacToe game, int depth, Game.Move move, boolean maximizing) {
+	private int getMoveScore(TicTacToe game, int depth, Move move, boolean maximizing) {
 		final TicTacToe copy = new TicTacToe(game);
 		final GameState state = copy.play(move);
 
@@ -71,10 +71,10 @@ public final class TicTacToeAI extends AI<TicTacToe> {
 			return 0;
 		}
 
-		final Game.Move[] legalMoves = copy.getLegalMoves();
+		final Move[] legalMoves = copy.getLegalMoves();
 		int score = maximizing? depth + 1 : -depth - 1;
 
-		for (final Game.Move next : legalMoves) {
+		for (final Move next : legalMoves) {
 			if (maximizing) {
 				score = Math.min(score, getMoveScore(copy, depth - 1, next, false));
 			} else {

game/src/test/java/org/toop/game/tictactoe/TicTacToeAITest.java

@@ -6,6 +6,7 @@ import java.util.Set;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.toop.game.Game;
+import org.toop.game.records.Move;
 
 class TicTacToeAITest {
     private TicTacToe game;
@@ -22,12 +23,12 @@ class TicTacToeAITest {
         // X X -
         // O O -
         // - - -
-        game.play(new Game.Move(0, 'X'));
+        game.play(new Move(0, 'X'));
-        game.play(new Game.Move(3, 'O'));
+        game.play(new Move(3, 'O'));
-        game.play(new Game.Move(1, 'X'));
+        game.play(new Move(1, 'X'));
-        game.play(new Game.Move(4, 'O'));
+        game.play(new Move(4, 'O'));
 
-        final Game.Move move = ai.findBestMove(game, 1);
+        final Move move = ai.findBestMove(game, 1);
 
         assertNotNull(move);
         assertEquals('X', move.value());
@@ -39,11 +40,11 @@ class TicTacToeAITest {
         // - - -
         // O - -
         // X X -
-        game.play(new Game.Move(6, 'X'));
+        game.play(new Move(6, 'X'));
-        game.play(new Game.Move(3, 'O'));
+        game.play(new Move(3, 'O'));
-        game.play(new Game.Move(7, 'X'));
+        game.play(new Move(7, 'X'));
 
-        final Game.Move move = ai.findBestMove(game, 1);
+        final Move move = ai.findBestMove(game, 1);
 
         assertNotNull(move);
         assertEquals('O', move.value());
@@ -52,7 +53,7 @@ class TicTacToeAITest {
 
     @Test
     void testBestMove_preferCornerOnEmpty() {
-        final Game.Move move = ai.findBestMove(game, 0);
+        final Move move = ai.findBestMove(game, 0);
 
         assertNotNull(move);
         assertEquals('X', move.value());
@@ -64,15 +65,15 @@ class TicTacToeAITest {
         // O X -
         // - O X
         // X O X
-        game.play(new Game.Move(1, 'X'));
+        game.play(new Move(1, 'X'));
-        game.play(new Game.Move(0, 'O'));
+        game.play(new Move(0, 'O'));
-        game.play(new Game.Move(5, 'X'));
+        game.play(new Move(5, 'X'));
-        game.play(new Game.Move(4, 'O'));
+        game.play(new Move(4, 'O'));
-        game.play(new Game.Move(6, 'X'));
+        game.play(new Move(6, 'X'));
-        game.play(new Game.Move(7, 'O'));
+        game.play(new Move(7, 'O'));
-        game.play(new Game.Move(8, 'X'));
+        game.play(new Move(8, 'X'));
 
-        final Game.Move move = ai.findBestMove(game, game.getLegalMoves().length);
+        final Move move = ai.findBestMove(game, game.getLegalMoves().length);
 
         assertNotNull(move);
         assertEquals('O', move.value());