From a11ba7141711ab9af18798f2521b2f3016afe650 Mon Sep 17 00:00:00 2001
From: Stef <stbuwalda@gmail.com>
Date: Fri, 28 Nov 2025 22:29:55 +0100
Subject: [PATCH] Fixed dependency issues

---
 .../main/java/org/toop/app}/game/TurnBasedGameThread.java   | 3 ++-
 .../java/org/toop/app/widget/view/LocalMultiplayerView.java | 2 +-
 game/pom.xml                                                | 6 ------
 game/src/main/java/org/toop/game/GameController.java        | 2 +-
 game/src/main/java/org/toop/game/TicTacToeController.java   | 2 +-
 game/src/main/java/org/toop/game/tictactoe/TicTacToeR.java  | 3 ---
 6 files changed, 5 insertions(+), 13 deletions(-)
 rename {game/src/main/java/org/toop => app/src/main/java/org/toop/app}/game/TurnBasedGameThread.java (98%)

diff --git a/game/src/main/java/org/toop/game/TurnBasedGameThread.java b/app/src/main/java/org/toop/app/game/TurnBasedGameThread.java
similarity index 98%
rename from game/src/main/java/org/toop/game/TurnBasedGameThread.java
rename to app/src/main/java/org/toop/app/game/TurnBasedGameThread.java
index a89ad71..f2506bd 100644
--- a/game/src/main/java/org/toop/game/TurnBasedGameThread.java
+++ b/app/src/main/java/org/toop/app/game/TurnBasedGameThread.java
@@ -1,4 +1,4 @@
-package org.toop.game;
+package org.toop.app.game;
 
 import javafx.geometry.Pos;
 import javafx.scene.paint.Color;
@@ -9,6 +9,7 @@ import org.toop.app.game.Players.LocalPlayer;
 import org.toop.app.game.Players.Player;
 import org.toop.app.widget.WidgetContainer;
 import org.toop.app.widget.view.GameView;
+import org.toop.game.TurnBasedGameR;
 import org.toop.game.enumerators.GameState;
 
 import java.util.Arrays;
diff --git a/app/src/main/java/org/toop/app/widget/view/LocalMultiplayerView.java b/app/src/main/java/org/toop/app/widget/view/LocalMultiplayerView.java
index 5cd593f..68cd088 100644
--- a/app/src/main/java/org/toop/app/widget/view/LocalMultiplayerView.java
+++ b/app/src/main/java/org/toop/app/widget/view/LocalMultiplayerView.java
@@ -9,7 +9,7 @@ import org.toop.app.widget.Primitive;
 import org.toop.app.widget.complex.PlayerInfoWidget;
 import org.toop.app.widget.complex.ViewWidget;
 import org.toop.app.widget.popup.ErrorPopup;
-import org.toop.game.TurnBasedGameThread;
+import org.toop.app.game.TurnBasedGameThread;
 import org.toop.game.tictactoe.TicTacToeAIR;
 import org.toop.game.tictactoe.TicTacToeR;
 import org.toop.local.AppContext;
diff --git a/game/pom.xml b/game/pom.xml
index 61bc2e4..9f56cd5 100644
--- a/game/pom.xml
+++ b/game/pom.xml
@@ -99,12 +99,6 @@
             <artifactId>error_prone_annotations</artifactId>
             <version>2.42.0</version>
         </dependency>
-        <dependency>
-            <groupId>org.toop</groupId>
-            <artifactId>app</artifactId>
-            <version>0.1</version>
-            <scope>compile</scope>
-        </dependency>
 
     </dependencies>
 
diff --git a/game/src/main/java/org/toop/game/GameController.java b/game/src/main/java/org/toop/game/GameController.java
index 484f59e..ff24bb2 100644
--- a/game/src/main/java/org/toop/game/GameController.java
+++ b/game/src/main/java/org/toop/game/GameController.java
@@ -1,7 +1,7 @@
 /*package org.toop.game;
 
 import org.toop.app.canvas.GameCanvas;
-import org.toop.game.TurnBasedGameThread;
+import org.toop.app.game.TurnBasedGameThread;
 import org.toop.app.widget.view.GameView;
 
 public abstract class GameController implements UpdatesGameUI {
diff --git a/game/src/main/java/org/toop/game/TicTacToeController.java b/game/src/main/java/org/toop/game/TicTacToeController.java
index 6143c05..c09e53a 100644
--- a/game/src/main/java/org/toop/game/TicTacToeController.java
+++ b/game/src/main/java/org/toop/game/TicTacToeController.java
@@ -5,7 +5,7 @@ import javafx.scene.paint.Color;
 import org.toop.app.App;
 import org.toop.app.canvas.TicTacToeCanvas;
 import org.toop.app.game.Players.LocalPlayer;
-import org.toop.game.TurnBasedGameThread;
+import org.toop.app.game.TurnBasedGameThread;
 import org.toop.app.widget.WidgetContainer;
 
 public class TicTacToeController extends GameController {
diff --git a/game/src/main/java/org/toop/game/tictactoe/TicTacToeR.java b/game/src/main/java/org/toop/game/tictactoe/TicTacToeR.java
index 9acabf4..6f58645 100644
--- a/game/src/main/java/org/toop/game/tictactoe/TicTacToeR.java
+++ b/game/src/main/java/org/toop/game/tictactoe/TicTacToeR.java
@@ -1,10 +1,7 @@
 package org.toop.game.tictactoe;
 
-import org.toop.game.GameR;
-import org.toop.game.TurnBasedGame;
 import org.toop.game.TurnBasedGameR;
 import org.toop.game.enumerators.GameState;
-import org.toop.game.records.Move;
 
 import java.util.ArrayList;
 import java.util.Arrays;