From 84e411fa38ec08ac5c192f9e875e3cce1a34a10e Mon Sep 17 00:00:00 2001
From: Bas de Jong <basdejong2002@live.nl>
Date: Fri, 12 Dec 2025 15:17:12 +0100
Subject: [PATCH] Moves

---
 .../main/java/org/toop/framework}/game/BitboardGame.java   | 3 +--
 .../framework}/game/games/reversi/BitboardReversi.java     | 7 ++++---
 .../framework}/game/games/tictactoe/BitboardTicTacToe.java | 7 ++++---
 .../org/toop/framework}/game/players/ArtificialPlayer.java | 2 +-
 4 files changed, 10 insertions(+), 9 deletions(-)
 rename {game/src/main/java/org/toop => framework/src/main/java/org/toop/framework}/game/BitboardGame.java (96%)
 rename {game/src/main/java/org/toop => framework/src/main/java/org/toop/framework}/game/games/reversi/BitboardReversi.java (96%)
 rename {game/src/main/java/org/toop => framework/src/main/java/org/toop/framework}/game/games/tictactoe/BitboardTicTacToe.java (93%)
 rename {game/src/main/java/org/toop => framework/src/main/java/org/toop/framework}/game/players/ArtificialPlayer.java (97%)

diff --git a/game/src/main/java/org/toop/game/BitboardGame.java b/framework/src/main/java/org/toop/framework/game/BitboardGame.java
similarity index 96%
rename from game/src/main/java/org/toop/game/BitboardGame.java
rename to framework/src/main/java/org/toop/framework/game/BitboardGame.java
index 4ebdb95..2090e95 100644
--- a/game/src/main/java/org/toop/game/BitboardGame.java
+++ b/framework/src/main/java/org/toop/framework/game/BitboardGame.java
@@ -1,10 +1,9 @@
-package org.toop.game;
+package org.toop.framework.game;
 
 import org.toop.framework.gameFramework.model.game.TurnBasedGame;
 import org.toop.framework.gameFramework.model.player.Player;
 
 import java.util.Arrays;
-import java.util.concurrent.atomic.AtomicInteger;
 
 // There is AI performance to be gained by getting rid of non-primitives and thus speeding up deepCopy
 public abstract class BitboardGame<T extends BitboardGame<T>> implements TurnBasedGame<T> {
diff --git a/game/src/main/java/org/toop/game/games/reversi/BitboardReversi.java b/framework/src/main/java/org/toop/framework/game/games/reversi/BitboardReversi.java
similarity index 96%
rename from game/src/main/java/org/toop/game/games/reversi/BitboardReversi.java
rename to framework/src/main/java/org/toop/framework/game/games/reversi/BitboardReversi.java
index f380bef..0ea4346 100644
--- a/game/src/main/java/org/toop/game/games/reversi/BitboardReversi.java
+++ b/framework/src/main/java/org/toop/framework/game/games/reversi/BitboardReversi.java
@@ -1,11 +1,12 @@
-package org.toop.game.games.reversi;
+package org.toop.framework.game.games.reversi;
 
+import org.toop.framework.game.BitboardGame;
 import org.toop.framework.gameFramework.GameState;
 import org.toop.framework.gameFramework.model.game.PlayResult;
 import org.toop.framework.gameFramework.model.player.Player;
-import org.toop.game.BitboardGame;
+import org.toop.framework.networking.server.ServableGame;
 
-public class BitboardReversi extends BitboardGame<BitboardReversi> {
+public class BitboardReversi extends BitboardGame<BitboardReversi> implements ServableGame {
 
     public record Score(int black, int white) {}
 
diff --git a/game/src/main/java/org/toop/game/games/tictactoe/BitboardTicTacToe.java b/framework/src/main/java/org/toop/framework/game/games/tictactoe/BitboardTicTacToe.java
similarity index 93%
rename from game/src/main/java/org/toop/game/games/tictactoe/BitboardTicTacToe.java
rename to framework/src/main/java/org/toop/framework/game/games/tictactoe/BitboardTicTacToe.java
index 0927431..2d77a9f 100644
--- a/game/src/main/java/org/toop/game/games/tictactoe/BitboardTicTacToe.java
+++ b/framework/src/main/java/org/toop/framework/game/games/tictactoe/BitboardTicTacToe.java
@@ -1,11 +1,12 @@
-package org.toop.game.games.tictactoe;
+package org.toop.framework.game.games.tictactoe;
 
+import org.toop.framework.game.BitboardGame;
 import org.toop.framework.gameFramework.GameState;
 import org.toop.framework.gameFramework.model.game.PlayResult;
 import org.toop.framework.gameFramework.model.player.Player;
-import org.toop.game.BitboardGame;
+import org.toop.framework.networking.server.ServableGame;
 
-public class BitboardTicTacToe extends BitboardGame<BitboardTicTacToe> {
+public class BitboardTicTacToe extends BitboardGame<BitboardTicTacToe> implements ServableGame {
 	private final long[] winningLines = {
 		0b111000000L, // top row
 		0b000111000L, // middle row
diff --git a/game/src/main/java/org/toop/game/players/ArtificialPlayer.java b/framework/src/main/java/org/toop/framework/game/players/ArtificialPlayer.java
similarity index 97%
rename from game/src/main/java/org/toop/game/players/ArtificialPlayer.java
rename to framework/src/main/java/org/toop/framework/game/players/ArtificialPlayer.java
index 418cbed..75e4078 100644
--- a/game/src/main/java/org/toop/game/players/ArtificialPlayer.java
+++ b/framework/src/main/java/org/toop/framework/game/players/ArtificialPlayer.java
@@ -1,4 +1,4 @@
-package org.toop.game.players;
+package org.toop.framework.game.players;
 
 import org.toop.framework.gameFramework.model.player.*;
 import org.toop.framework.gameFramework.model.game.TurnBasedGame;