Added find functionality

.github/workflows/checks.yaml

@@ -1,42 +1,42 @@
-#name: Checks
+name: Checks
 
-#on:
+on:
-#  push:
+  push:
-#    branches:
+    branches:
-#      - 'main'
+      - 'main'
-#  pull_request:
+  pull_request:
-#    branches:
+    branches:
-#      - 'main'
+      - 'main'
-#
-#jobs:
-#  formatting-check:
-#    name: Follow Google Formatting Guidelines
-#    runs-on: ubuntu-latest
-#    steps:
-#      - uses: actions/checkout@v5
-#        with:
-#          fetch-depth: 0 # Fix for incremental formatting
-#      - uses: actions/setup-java@v5
-#        with:
-#          java-version: '25'
-#          distribution: 'temurin'
-#          cache: maven
-#      - name: Run Format Check
-#        run: mvn spotless:check
 
-#  tests:
+jobs:
-#    name: Unittests
+  formatting-check:
-#    runs-on: ${{ matrix.os }}
+    name: Follow Google Formatting Guidelines
-#    needs: formatting-check
+    runs-on: ubuntu-latest
-#    strategy:
+    steps:
-#      matrix:
+      - uses: actions/checkout@v5
-#        os: [ubuntu-latest] #windows-latest, macos-latest
+        with:
-#    steps:
+          fetch-depth: 0 # Fix for incremental formatting
-#      - uses: actions/checkout@v5
+      - uses: actions/setup-java@v5
-#      - uses: actions/setup-java@v5
+        with:
-#        with:
+          java-version: '25'
-#          java-version: '25'
+          distribution: 'temurin'
-#          distribution: 'temurin'
+          cache: maven
-#          cache: maven
+      - name: Run Format Check
-#      - name: Run Unittests
+        run: mvn spotless:check
-#        run: mvn -B test
+
+  tests:
+    name: Unittests
+    runs-on: ${{ matrix.os }}
+    needs: formatting-check
+    strategy:
+      matrix:
+        os: [ubuntu-latest] #windows-latest, macos-latest
+    steps:
+      - uses: actions/checkout@v5
+      - uses: actions/setup-java@v5
+        with:
+          java-version: '25'
+          distribution: 'temurin'
+          cache: maven
+      - name: Run Unittests
+        run: mvn -B test

.idea/inspectionProfiles/Project_Default.xml

@@ -2,7 +2,7 @@
   <profile version="1.0">
     <option name="myName" value="Project Default" />
     <inspection_tool class="AutoCloseableResource" enabled="true" level="WARNING" enabled_by_default="true">
-      <option name="METHOD_MATCHER_CONFIG" value="java.util.Formatter,format,java.io.Writer,append,com.google.common.base.Preconditions,checkNotNull,org.hibernate.Session,close,java.io.PrintWriter,printf,java.io.PrintStream,printf,java.lang.foreign.Arena,ofAuto,java.lang.foreign.Arena,global,org.toop.framework.audio.AudioPlayer,play,java.util.Map,remove,java.util.concurrent.Executors,newSingleThreadScheduledExecutor|newFixedThreadPool|newSingleThreadExecutor" />
+      <option name="METHOD_MATCHER_CONFIG" value="java.util.Formatter,format,java.io.Writer,append,com.google.common.base.Preconditions,checkNotNull,org.hibernate.Session,close,java.io.PrintWriter,printf,java.io.PrintStream,printf,java.lang.foreign.Arena,ofAuto,java.lang.foreign.Arena,global,org.toop.framework.audio.AudioPlayer,play,java.util.Map,remove,java.util.concurrent.Executors,newSingleThreadScheduledExecutor" />
     </inspection_tool>
     <inspection_tool class="WriteOnlyObject" enabled="false" level="WARNING" enabled_by_default="false" />
   </profile>

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

@@ -1,6 +1,13 @@
 package org.toop;
 
 import org.toop.app.App;
+import org.toop.framework.audio.*;
+import org.toop.framework.networking.NetworkingClientEventListener;
+import org.toop.framework.networking.NetworkingClientManager;
+import org.toop.framework.resource.ResourceLoader;
+import org.toop.framework.resource.ResourceManager;
+import org.toop.framework.resource.resources.MusicAsset;
+import org.toop.framework.resource.resources.SoundEffectAsset;
 
 public final class Main {
     static void main(String[] args) {

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

@@ -1,14 +1,9 @@
 package org.toop.app;
 
-import javafx.application.Application;
 import javafx.application.Platform;
-import javafx.geometry.Pos;
-import javafx.scene.Scene;
 import javafx.scene.input.KeyCode;
-import javafx.scene.input.KeyCodeCombination;
 import javafx.scene.input.KeyEvent;
-import javafx.scene.layout.StackPane;
+
-import javafx.stage.Stage;
 import org.toop.app.widget.Primitive;
 import org.toop.app.widget.WidgetContainer;
 import org.toop.app.widget.complex.LoadingWidget;
@@ -19,9 +14,8 @@ import org.toop.app.widget.view.MainView;
 import org.toop.framework.audio.*;
 import org.toop.framework.audio.events.AudioEvents;
 import org.toop.framework.eventbus.EventFlow;
-import org.toop.framework.eventbus.GlobalEventBus;
+import org.toop.framework.networking.NetworkingClientEventListener;
-import org.toop.framework.networking.connection.NetworkingClientEventListener;
+import org.toop.framework.networking.NetworkingClientManager;
-import org.toop.framework.networking.connection.NetworkingClientManager;
 import org.toop.framework.resource.ResourceLoader;
 import org.toop.framework.resource.ResourceManager;
 import org.toop.framework.resource.events.AssetLoaderEvents;
@@ -31,10 +25,13 @@ import org.toop.framework.resource.resources.SoundEffectAsset;
 import org.toop.local.AppContext;
 import org.toop.local.AppSettings;
 
+import javafx.application.Application;
+import javafx.geometry.Pos;
+import javafx.scene.Scene;
+import javafx.scene.layout.StackPane;
+import javafx.stage.Stage;
+
 import java.util.Objects;
-import java.util.concurrent.CountDownLatch;
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.Executors;
 
 public final class App extends Application {
 	private static Stage stage;
@@ -48,7 +45,7 @@ public final class App extends Application {
 	}
 
 	@Override
-	public void start(Stage stage) {
+	public void start(Stage stage) throws Exception {
 		// Start loading localization
 		ResourceManager.loadAssets(new ResourceLoader("app/src/main/resources/localization"));
 		ResourceManager.loadAssets(new ResourceLoader("app/src/main/resources/style"));
@@ -66,8 +63,8 @@ public final class App extends Application {
 
 		scene.getRoot();
 
-        stage.setMinWidth(1200);
+        stage.setMinWidth(1080);
-        stage.setMinHeight(800);
+        stage.setMinHeight(720);
 		stage.setOnCloseRequest(event -> {
 			event.consume();
 			quit();
@@ -84,7 +81,7 @@ public final class App extends Application {
 
 		AppSettings.applySettings();
 
-        setKeybinds(root);
+		setKeybinds(root);
 
         LoadingWidget loading = new LoadingWidget(Primitive.text(
                 "Loading...", false), 0, 0, Integer.MAX_VALUE, false, false // Just set a high default
@@ -92,7 +89,7 @@ public final class App extends Application {
 
 		WidgetContainer.setCurrentView(loading);
 
-        setOnLoadingSuccess(loading);
+		setOnLoadingSuccess(loading);
 
         EventFlow loadingFlow = new EventFlow();
 
@@ -109,54 +106,40 @@ public final class App extends Application {
 						Platform.runLater(() -> stage.setOpacity(1.0));
 					}
 
+					Platform.runLater(() -> loading.setMaxAmount(e.isLoadingAmount()));
+
 					Platform.runLater(() -> {
-                        loading.setMaxAmount(e.isLoadingAmount());
 						try {
 							loading.setAmount(e.hasLoadedAmount());
 						} catch (Exception ex) {
 							throw new RuntimeException(ex);
 						}
-                        if (e.hasLoadedAmount() >= e.isLoadingAmount()-1) {
-                            Platform.runLater(loading::triggerSuccess);
-                            loadingFlow.unsubscribe("init_loading");
-                        }
 					});
 
+                    if (e.hasLoadedAmount() >= e.isLoadingAmount()) {
+                        Platform.runLater(loading::triggerSuccess);
+                        loadingFlow.unsubscribe("init_loading");
+                    }
 
                 }, false, "init_loading");
 
-		ExecutorService executor = Executors.newSingleThreadExecutor();
+		// Start loading assets
-		try {
+		new Thread(() -> ResourceManager.loadAssets(new ResourceLoader("app/src/main/resources/assets")))
-			executor.submit(
+				.start();
-				() -> ResourceManager.loadAssets(new ResourceLoader("app/src/main/resources/assets")
-			));
-		} finally {
-			executor.shutdown();
-		}
 
 		stage.show();
-    }
+
+	}
 
 	private void setKeybinds(StackPane root) {
 		root.addEventHandler(KeyEvent.KEY_PRESSED,event -> {
 			if (event.getCode() == KeyCode.ESCAPE) {
-				escapePopup();	
+				escapePopup();
 			}
 		});
-        stage.setFullScreenExitKeyCombination(
-                new KeyCodeCombination(
-                        KeyCode.F11
-                )
-        );
 	}
 
 	public void escapePopup() {
-
-		if (   WidgetContainer.getCurrentView() == null
-			|| WidgetContainer.getCurrentView() instanceof MainView) {
-			return;
-		}
-
 		if (!Objects.requireNonNull(
 				WidgetContainer.find(widget -> widget instanceof QuitPopup || widget instanceof EscapePopup)
 		).isEmpty()) {
@@ -171,14 +154,8 @@ public final class App extends Application {
 
 	private void setOnLoadingSuccess(LoadingWidget loading) {
 		loading.setOnSuccess(() -> {
-
+			initSystems();
-            try {
+			AppSettings.applyMusicVolumeSettings();
-                initSystems();
-            } catch (InterruptedException e) {
-                throw new RuntimeException(e);
-            }
-
-            AppSettings.applyMusicVolumeSettings();
 			new EventFlow().addPostEvent(new AudioEvents.StartBackgroundMusic()).postEvent();
             loading.hide();
 			WidgetContainer.add(Pos.CENTER, new MainView());
@@ -195,55 +172,36 @@ public final class App extends Application {
 		});
 	}
 
-	private void initSystems() throws InterruptedException { // TODO Move to better place
+	private void initSystems() { // TODO Move to better place
+		new Thread(() -> new NetworkingClientEventListener(new NetworkingClientManager())).start();
 
-		final int THREAD_COUNT = 2;
+		new Thread(() -> {
-		CountDownLatch latch = new CountDownLatch(THREAD_COUNT);
+			MusicManager<MusicAsset> musicManager =
+					new MusicManager<>(ResourceManager.getAllOfTypeAndRemoveWrapper(MusicAsset.class), true);
 
-		@SuppressWarnings("resource")
+			SoundEffectManager<SoundEffectAsset> soundEffectManager =
-		ExecutorService threads = Executors.newFixedThreadPool(THREAD_COUNT);
+					new SoundEffectManager<>(ResourceManager.getAllOfType(SoundEffectAsset.class));
 
-		try {
+			AudioVolumeManager audioVolumeManager = new AudioVolumeManager()
+					.registerManager(VolumeControl.MASTERVOLUME, musicManager)
+					.registerManager(VolumeControl.MASTERVOLUME, soundEffectManager)
+					.registerManager(VolumeControl.FX, soundEffectManager)
+					.registerManager(VolumeControl.MUSIC, musicManager);
 
-			threads.submit(() -> {
+			new AudioEventListener<>(
-				new NetworkingClientEventListener(
+					musicManager,
-						GlobalEventBus.get(),
+					soundEffectManager,
-						new NetworkingClientManager(GlobalEventBus.get()));
+					audioVolumeManager
+			).initListeners("medium-button-click.wav");
 
-				latch.countDown();
+		}).start();
-			});
 
-			threads.submit(() -> {
+		// Threads must be ready, before continue, TODO use latch instead
-				MusicManager<MusicAsset> musicManager =
+        try {
-						new MusicManager<>(
+            Thread.sleep(200);
-								GlobalEventBus.get(),
+        } catch (InterruptedException e) {
-								ResourceManager.getAllOfTypeAndRemoveWrapper(MusicAsset.class),
+            throw new RuntimeException(e);
-								true
+        }
-						);
-
-				SoundEffectManager<SoundEffectAsset> soundEffectManager =
-						new SoundEffectManager<>(ResourceManager.getAllOfType(SoundEffectAsset.class));
-
-				AudioVolumeManager audioVolumeManager = new AudioVolumeManager()
-						.registerManager(VolumeControl.MASTERVOLUME, musicManager)
-						.registerManager(VolumeControl.MASTERVOLUME, soundEffectManager)
-						.registerManager(VolumeControl.FX, soundEffectManager)
-						.registerManager(VolumeControl.MUSIC, musicManager);
-
-				new AudioEventListener<>(
-						GlobalEventBus.get(),
-						musicManager,
-						soundEffectManager,
-						audioVolumeManager
-				).initListeners("medium-button-click.wav");
-
-				latch.countDown();
-			});
-
-		} finally {
-			latch.await();
-			threads.shutdown();
-		}
     }
 
 	public static void quit() {

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

@@ -2,7 +2,9 @@ package org.toop.app;
 
 import javafx.application.Platform;
 import javafx.geometry.Pos;
-import org.toop.app.gameControllers.*;
+import org.toop.app.gameControllers.AbstractGameController;
+import org.toop.app.gameControllers.ReversiController;
+import org.toop.app.gameControllers.TicTacToeController;
 import org.toop.app.widget.Primitive;
 import org.toop.app.widget.WidgetContainer;
 import org.toop.app.widget.complex.LoadingWidget;
@@ -11,19 +13,17 @@ 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;
 import org.toop.framework.gameFramework.model.player.Player;
-import org.toop.framework.networking.connection.clients.TournamentNetworkingClient;
+import org.toop.framework.networking.clients.TournamentNetworkingClient;
-import org.toop.framework.networking.connection.events.NetworkEvents;
+import org.toop.framework.networking.events.NetworkEvents;
-import org.toop.framework.networking.connection.types.NetworkingConnector;
+import org.toop.framework.networking.types.NetworkingConnector;
-import org.toop.framework.networking.server.gateway.NettyGatewayServer;
+import org.toop.game.players.ArtificialPlayer;
-import org.toop.game.players.ai.mcts.MCTSAI3;
+import org.toop.game.players.OnlinePlayer;
+import org.toop.game.games.reversi.ReversiAIR;
+import org.toop.game.games.reversi.ReversiR;
+import org.toop.game.games.tictactoe.TicTacToeAIR;
 import org.toop.local.AppContext;
 
-import java.util.Arrays;
 import java.util.List;
 import java.util.concurrent.CopyOnWriteArrayList;
 import java.util.concurrent.Executors;
@@ -32,8 +32,6 @@ import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicBoolean;
 
 public final class Server {
-	private NettyGatewayServer nettyGatewayServer;
-
 	private String user = "";
 	private long clientId = -1;
 
@@ -43,7 +41,7 @@ public final class Server {
 	private ServerView primary;
 	private boolean isPolling = true;
 
-    private GameController gameController;
+    private AbstractGameController<?> gameController;
 
     private final AtomicBoolean isSingleGame = new AtomicBoolean(false);
 
@@ -61,13 +59,10 @@ public final class Server {
 		return null;
 	}
 
-	public Server(String ip, String port, String user) {
-		this(ip, port, user, null);
-	}
 
     // Server has to deal with ALL network related listen events. This "server" can then interact with the manager to make stuff happen.
     // This prevents data races where events get sent to the game manager but the manager isn't ready yet.
-	public Server(String ip, String port, String user, NettyGatewayServer nettyGatewayServer) {
+	public Server(String ip, String port, String user) {
 		if (ip.split("\\.").length < 4) {
 			new ErrorPopup("\"" + ip + "\" " + AppContext.getString("is-not-a-valid-ip-address"));
 			return;
@@ -87,19 +82,17 @@ public final class Server {
 			return;
 		}
 
-		this.nettyGatewayServer = nettyGatewayServer;
-
 		final int reconnectAttempts = 10;
 
 		LoadingWidget loading = new LoadingWidget(
                 Primitive.text("connecting"), 0, 0, reconnectAttempts, true, true
         );
 
-		WidgetContainer.getCurrentView().transitionNextCustom(loading, "disconnect", this::disconnect);
+		WidgetContainer.getCurrentView().transitionNext(loading);
 
 		var a = new EventFlow()
 			.addPostEvent(NetworkEvents.StartClient.class,
-				new TournamentNetworkingClient(GlobalEventBus.get()),
+				new TournamentNetworkingClient(),
 				new NetworkingConnector(ip, parsedPort, reconnectAttempts, 1, TimeUnit.SECONDS)
 			);
 
@@ -112,21 +105,20 @@ public final class Server {
             );
         });
 
-		a.onResponse(NetworkEvents.CreatedIdForClient.class, e -> clientId = e.clientId(), true);
-
 		a.onResponse(NetworkEvents.StartClientResponse.class, e -> {
+
 			if (!e.successful()) {
 				return;
 			}
 
-			primary = new ServerView(user, this::sendChallenge, user, clientId);
+			primary = new ServerView(user, this::sendChallenge);
-
 			WidgetContainer.getCurrentView().transitionNextCustom(primary, "disconnect", this::disconnect);
 
 			a.unsubscribe("connecting");
 			a.unsubscribe("startclient");
 
 			this.user = user;
+			clientId = e.clientId();
 
 			new EventFlow().addPostEvent(new NetworkEvents.SendLogin(clientId, user)).postEvent();
 
@@ -137,33 +129,28 @@ public final class Server {
 
 		}, false, "startclient")
 				.listen(
-						NetworkEvents.ConnectTry.class,
+                        NetworkEvents.ConnectTry.class,
-						e -> {
+                        e -> Platform.runLater(
-							if (clientId != e.clientId()) return;
+                                () -> {
-							Platform.runLater(
+                                    try {
-									() -> {
+                                        loading.setAmount(e.amount());
-										try {
+                                        if (e.amount() >= loading.getMaxAmount()) {
-											loading.setAmount(e.amount());
+                                            loading.triggerFailure();
-											if (e.amount() >= loading.getMaxAmount()) {
+                                        }
-												loading.triggerFailure();
+                                    } catch (Exception ex) {
-											}
+                                        throw new RuntimeException(ex);
-										} catch (Exception ex) {
+                                    }
-											throw new RuntimeException(ex);
+                                }
-										}
+                        ),
-									}
+                        false, "connecting"
-							);
+                )
-						},
-						false, "connecting"
-				)
 				.postEvent();
 
 		a.listen(NetworkEvents.ChallengeResponse.class, this::handleReceivedChallenge, false, "challenge")
                 .listen(NetworkEvents.GameMatchResponse.class, this::handleMatchResponse, false, "match-response")
                 .listen(NetworkEvents.GameResultResponse.class, this::handleGameResult, false, "game-result")
                 .listen(NetworkEvents.GameMoveResponse.class, this::handleReceivedMove, false, "game-move")
-                .listen(NetworkEvents.YourTurnResponse.class, this::handleYourTurn, false, "your-turn")
+                .listen(NetworkEvents.YourTurnResponse.class, this::handleYourTurn, false, "your-turn");
-				.listen(NetworkEvents.ClosedConnection.class, this::closedConnection, false, "closed-connection")
-                .listen(NetworkEvents.TournamentResultResponse.class, this::handleTournamentResult, false, "tournament-result");
 
 		connectFlow = a;
 	}
@@ -187,7 +174,7 @@ public final class Server {
 
         gameController = null;
 
-//        if (!isPolling) return;
+        //if (!isPolling) return;
 
         String gameType = extractQuotedValue(response.gameType());
         if (response.clientId() == clientId) {
@@ -200,30 +187,40 @@ public final class Server {
                 return;
             }
 
-            final String startingPlayer = response.playerToMove();
+            final int myTurn = response.playerToMove().equalsIgnoreCase(response.opponent()) ? 1 : 0;
-            final int userStartingTurn = startingPlayer.equalsIgnoreCase(user) ? 0 : 1;
-            final int opponentStartingTurn = 1 - userStartingTurn;
 
             final GameInformation information = new GameInformation(type);
-            information.players[userStartingTurn].name = user;
+            //information.players[0] = playerInformation;
-            information.players[opponentStartingTurn].name = response.opponent();
+            information.players[0].name = user;
+            information.players[0].isHuman = false;
+            information.players[0].computerDifficulty = 5;
+            information.players[0].computerThinkTime = 1;
+            information.players[1].name = response.opponent();
 
             Player[] players = new Player[2];
 
-            players[userStartingTurn] = new ArtificialPlayer(new MCTSAI3(1000, 8), user);
+            players[(myTurn + 1) % 2] = new OnlinePlayer<ReversiR>(response.opponent());
-            players[opponentStartingTurn] = new OnlinePlayer(response.opponent());
-
-            switch (type) {
-                case TICTACTOE -> gameController = new TicTacToeBitController(players);
-                case REVERSI -> gameController = new ReversiBitController(players);
-                default -> new ErrorPopup("Unsupported game type.");
 
+            switch (type){
+                case TICTACTOE ->{
+                    players[myTurn] = new ArtificialPlayer<>(new TicTacToeAIR(9), user);
+                }
+                case REVERSI ->{
+                    players[myTurn] = new ArtificialPlayer<>(new ReversiAIR(), user);
+                }
             }
 
-            if (gameController != null) {
+            switch (type) {
-				primary.reEnableButton(); // Re enable subscribe button
+                case TICTACTOE ->{
+                        gameController = new TicTacToeController(players, false);
+                }
+                case REVERSI ->
+                        gameController = new ReversiController(players, false);
+                default -> new ErrorPopup("Unsupported game type.");
+            }
+
+            if (gameController != null){
                 gameController.start();
-				isPolling = true; // Fixes server getting stuck
             }
         }
     }
@@ -243,13 +240,6 @@ public final class Server {
         gameController.gameFinished(response);
     }
 
-    private void handleTournamentResult(NetworkEvents.TournamentResultResponse response) {
-        IO.println(response.gameType());
-        IO.println(Arrays.toString(response.names()));
-		IO.println(Arrays.toString(response.scoreTypes()));
-        IO.println(Arrays.toString(response.scores().toArray()));
-    }
-
     private void handleReceivedMove(NetworkEvents.GameMoveResponse response) {
         if (gameController == null) {
             return;
@@ -264,7 +254,7 @@ public final class Server {
 		String gameType = extractQuotedValue(response.gameType());
 		final String finalGameType = gameType;
 		var a = new ChallengePopup(challengerName, gameType, (playerInformation) -> {
-			final long challengeId = Long.parseLong(response.challengeId().replaceAll("\\D", ""));
+			final int challengeId = Integer.parseInt(response.challengeId().replaceAll("\\D", ""));
 			new EventFlow().addPostEvent(new NetworkEvents.SendAcceptChallenge(clientId, challengeId)).postEvent();
             isSingleGame.set(true);
 		});
@@ -282,27 +272,9 @@ public final class Server {
 		stopScheduler();
 		connectFlow.unsubscribeAll();
 
-		if (nettyGatewayServer != null) {
-			nettyGatewayServer.stop();
-		}
-
 		WidgetContainer.getCurrentView().transitionPrevious();
 	}
 
-	private void closedConnection(NetworkEvents.ClosedConnection e) {
-		new EventFlow().addPostEvent(new NetworkEvents.CloseClient(clientId)).postEvent();
-		isPolling = false;
-		stopScheduler();
-		connectFlow.unsubscribeAll();
-
-		if (nettyGatewayServer != null) {
-			nettyGatewayServer.stop();
-		}
-
-		WidgetContainer.getCurrentView().transitionPrevious();
-		WidgetContainer.add(Pos.CENTER, new ErrorPopup("Server closed connection."));
-	}
-
 	private void forfeitGame() {
 		new EventFlow().addPostEvent(new NetworkEvents.SendForfeit(clientId)).postEvent();
 	}
@@ -349,10 +321,7 @@ public final class Server {
 
 	private void gamesListFromServerHandler(NetworkEvents.GamelistResponse event) {
 		gameList.clear();
-		var gl = new java.util.ArrayList<>(List.of(event.gamelist()));
+		gameList.addAll(List.of(event.gamelist()));
-        gl.sort(String::compareTo);
-		gameList.addAll(gl);
-		primary.updateGameList(gl);
 	}
 
 	public void populateGameList() {

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

@@ -1,245 +0,0 @@
-package org.toop.app.canvas;
-
-import javafx.animation.KeyFrame;
-import javafx.animation.Timeline;
-import javafx.scene.canvas.Canvas;
-import javafx.scene.canvas.GraphicsContext;
-import javafx.scene.input.MouseButton;
-import javafx.scene.paint.Color;
-import javafx.scene.text.Font;
-import javafx.util.Duration;
-import org.toop.framework.eventbus.EventFlow;
-import org.toop.framework.gameFramework.model.game.TurnBasedGame;
-import org.toop.framework.gameFramework.view.GUIEvents;
-
-import java.util.function.Consumer;
-
-public abstract class BitGameCanvas implements GameCanvas {
-	protected record Cell(float x, float y, float width, float height) {
-		public boolean isInside(double x, double y) {
-			return x >= this.x && x <= this.x + width &&
-				y >= this.y && y <= this.y + height;
-		}
-	}
-
-	protected final Canvas canvas;
-	protected final GraphicsContext graphics;
-
-	protected final Color color;
-	protected final Color backgroundColor;
-
-	protected final int width;
-	protected final int height;
-
-	protected final int rowSize;
-	protected final int columnSize;
-
-	protected final int gapSize;
-	protected final boolean edges;
-
-	protected final Cell[] cells;
-
-    private Consumer<Long> onCellCLicked;
-
-    public void setOnCellClicked(Consumer<Long> onClick) {
-        this.onCellCLicked = onClick;
-    }
-
-	protected BitGameCanvas(Color color, Color backgroundColor, int width, int height, int rowSize, int columnSize, int gapSize, boolean edges) {
-		canvas = new Canvas(width, height);
-		graphics = canvas.getGraphicsContext2D();
-
-        this.onCellCLicked = (c) -> new EventFlow().addPostEvent(GUIEvents.PlayerAttemptedMove.class, c).postEvent();
-
-		this.color = color;
-		this.backgroundColor = backgroundColor;
-
-		this.width = width;
-		this.height = height;
-
-		this.rowSize = rowSize;
-		this.columnSize = columnSize;
-
-		this.gapSize = gapSize;
-		this.edges = edges;
-
-		cells = new Cell[rowSize * columnSize];
-
-		final float cellWidth = ((float) width - gapSize * rowSize - gapSize) / rowSize;
-		final float cellHeight = ((float) height - gapSize * columnSize - gapSize) / columnSize;
-
-		for (int y = 0; y < columnSize; y++) {
-			final float startY = y * cellHeight + y * gapSize + gapSize;
-
-			for (int x = 0; x < rowSize; x++) {
-				final float startX = x * cellWidth + x * gapSize + gapSize;
-				cells[x + y * rowSize] = new Cell(startX, startY, cellWidth, cellHeight);
-			}
-		}
-
-		canvas.setOnMouseClicked(event -> {
-
-			if (event.getButton() != MouseButton.PRIMARY) {
-				return;
-			}
-
-			final int column = (int) ((event.getX() / this.width) * rowSize);
-			final int row = (int) ((event.getY() / this.height) * columnSize);
-
-			final Cell cell = cells[column + row * rowSize];
-
-			if (cell.isInside(event.getX(), event.getY())) {
-				event.consume();
-				this.onCellCLicked.accept(1L << (column + row * rowSize));
-			}
-		});
-
-		render();
-	}
-
-    public void loopOverBoard(long bb, Consumer<Integer> onCell){
-        while (bb != 0) {
-            int idx = Long.numberOfTrailingZeros(bb); // index of least-significant 1-bit
-            onCell.accept(idx);
-
-            bb &= bb - 1; // clear LSB 1-bit
-        }
-    }
-
-	private void render() {
-		graphics.setFill(backgroundColor);
-		graphics.fillRect(0, 0, width, height);
-
-		graphics.setFill(color);
-
-		for (int x = 0; x < rowSize - 1; x++) {
-			final float start = cells[x].x + cells[x].width;
-			graphics.fillRect(start, gapSize, gapSize, height - gapSize * 2);
-		}
-
-		for (int y = 0; y < columnSize - 1; y++) {
-			final float start = cells[y * rowSize].y + cells[y * rowSize].height;
-			graphics.fillRect(gapSize, start, width - gapSize * 2, gapSize);
-		}
-
-		if (edges) {
-			graphics.fillRect(0, 0, width, gapSize);
-			graphics.fillRect(0, 0, gapSize, height);
-
-			graphics.fillRect(width - gapSize, 0, gapSize, height);
-			graphics.fillRect(0, height - gapSize, width, gapSize);
-		}
-	}
-
-	public void fill(Color color, int cell) {
-		final float x = cells[cell].x();
-		final float y = cells[cell].y();
-
-		final float width = cells[cell].width();
-		final float height = cells[cell].height();
-
-		graphics.setFill(color);
-		graphics.fillRect(x, y, width, height);
-	}
-
-	public void clear(int cell) {
-		final float x = cells[cell].x();
-		final float y = cells[cell].y();
-
-		final float width = cells[cell].width();
-		final float height = cells[cell].height();
-
-		graphics.clearRect(x, y, width, height);
-
-		graphics.setFill(backgroundColor);
-		graphics.fillRect(x, y, width, height);
-	}
-
-	public void clearAll() {
-		for (int i = 0; i < cells.length; i++) {
-			clear(i);
-		}
-	}
-
-    public void drawPlayerMove(int player, int move) {
-        final float x = cells[move].x() + gapSize;
-        final float y = cells[move].y() + gapSize;
-
-        final float width = cells[move].width() - gapSize * 2;
-        final float height = cells[move].height() - gapSize * 2;
-
-        graphics.setFill(color);
-        graphics.setFont(Font.font("Arial", 40)); // TODO different font and size
-        graphics.fillText(String.valueOf(player), x + width, y + height);
-    }
-
-	public void drawDot(Color color, int cell) {
-		final float x = cells[cell].x() + gapSize;
-		final float y = cells[cell].y() + gapSize;
-
-		final float width = cells[cell].width() - gapSize * 2;
-		final float height = cells[cell].height() - gapSize * 2;
-
-		graphics.setFill(color);
-		graphics.fillOval(x, y, width, height);
-	}
-
-    public void drawInnerDot(Color color, int cell, boolean slightlyBigger) {
-        final float x = cells[cell].x() + gapSize;
-        final float y = cells[cell].y() + gapSize;
-
-        float multiplier = slightlyBigger?1.4f:1.5f;
-
-        final float width = (cells[cell].width() - gapSize * 2)/multiplier;
-        final float height = (cells[cell].height() - gapSize * 2)/multiplier;
-
-        float offset = slightlyBigger?5f:4f;
-
-        graphics.setFill(color);
-        graphics.fillOval(x + width/offset, y + height/offset, width, height);
-    }
-
-	private void drawDotScaled(Color color, int cell, double scale) {
-		final float cx = cells[cell].x() + gapSize;
-		final float cy = cells[cell].y() + gapSize;
-
-		final float fullWidth = cells[cell].width() - gapSize * 2;
-		final float height = cells[cell].height() - gapSize * 2;
-
-		final float scaledWidth = (float)(fullWidth * scale);
-		final float offsetX = (fullWidth - scaledWidth) / 2;
-
-		graphics.setFill(color);
-		graphics.fillOval(cx + offsetX, cy, scaledWidth, height);
-	}
-
-	public Timeline flipDot(Color fromColor, Color toColor, int cell) {
-		final int steps = 60;
-		final long duration = 250;
-		final double interval = duration / (double) steps;
-
-		final Timeline timeline = new Timeline();
-
-		for (int i = 0; i <= steps; i++) {
-			final double t = i / (double) steps;
-			final KeyFrame keyFrame = new KeyFrame(Duration.millis(i * interval),
-				_ -> {
-					clear(cell);
-
-					final double scale = t <= 0.5 ? 1 - 2 * t : 2 * t - 1;
-					final Color currentColor = t < 0.5 ? fromColor : toColor;
-
-					drawDotScaled(currentColor, cell, scale);
-				}
-			);
-
-			timeline.getKeyFrames().add(keyFrame);
-		}
-
-		return timeline;
-	}
-
-	public Canvas getCanvas() {
-		return canvas;
-	}
-}

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

@@ -0,0 +1,17 @@
+package org.toop.app.canvas;
+
+import javafx.scene.paint.Color;
+import org.toop.framework.gameFramework.model.game.AbstractGame;
+
+import java.util.function.Consumer;
+
+public class Connect4Canvas extends GameCanvas {
+    public Connect4Canvas(Color color, int width, int height, Consumer<Integer> onCellClicked) {
+        super(color, Color.TRANSPARENT, width, height, 7, 6, 10, true, onCellClicked,null);
+    }
+
+    @Override
+    public void drawPlayerHover(int player, int move, AbstractGame game) {
+
+    }
+}

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

@@ -1,7 +1,7 @@
 package org.toop.app.canvas;
 
-import org.toop.framework.gameFramework.model.game.TurnBasedGame;
+import org.toop.framework.gameFramework.model.game.AbstractGame;
 
 public interface DrawPlayerHover {
-    void drawPlayerHover(int player, int move, TurnBasedGame game);
+    void drawPlayerHover(int player, int move, AbstractGame game);
 }

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

@@ -1,9 +1,237 @@
 package org.toop.app.canvas;
 
+import javafx.animation.KeyFrame;
+import javafx.animation.Timeline;
 import javafx.scene.canvas.Canvas;
-import org.toop.framework.gameFramework.model.game.TurnBasedGame;
+import javafx.scene.canvas.GraphicsContext;
+import javafx.scene.input.MouseButton;
+import javafx.scene.paint.Color;
+import javafx.scene.text.Font;
+import javafx.util.Duration;
+import org.toop.framework.gameFramework.model.game.AbstractGame;
 
-public interface GameCanvas {
+import java.util.function.Consumer;
-    Canvas getCanvas();
+
-    void redraw(TurnBasedGame gameCopy);
+public abstract class GameCanvas<T extends AbstractGame> implements DrawPlayerMove, DrawPlayerHover {
-}
+	protected record Cell(float x, float y, float width, float height) {
+		public boolean isInside(double x, double y) {
+			return x >= this.x && x <= this.x + width &&
+				y >= this.y && y <= this.y + height;
+		}
+	}
+
+	protected final Canvas canvas;
+	protected final GraphicsContext graphics;
+
+	protected final Color color;
+	protected final Color backgroundColor;
+
+	protected final int width;
+	protected final int height;
+
+	protected final int rowSize;
+	protected final int columnSize;
+
+	protected final int gapSize;
+	protected final boolean edges;
+
+	protected final Cell[] cells;
+
+    private Consumer<Integer> onCellCLicked;
+
+    public void setOnCellClicked(Consumer<Integer> onClick) {
+        this.onCellCLicked = onClick;
+    }
+
+	protected GameCanvas(Color color, Color backgroundColor, int width, int height, int rowSize, int columnSize, int gapSize, boolean edges, Consumer<Integer> onCellClicked, Consumer<Integer> newCellEntered) {
+		canvas = new Canvas(width, height);
+		graphics = canvas.getGraphicsContext2D();
+
+        this.onCellCLicked = onCellClicked;
+
+		this.color = color;
+		this.backgroundColor = backgroundColor;
+
+		this.width = width;
+		this.height = height;
+
+		this.rowSize = rowSize;
+		this.columnSize = columnSize;
+
+		this.gapSize = gapSize;
+		this.edges = edges;
+
+		cells = new Cell[rowSize * columnSize];
+
+		final float cellWidth = ((float) width - gapSize * rowSize - gapSize) / rowSize;
+		final float cellHeight = ((float) height - gapSize * columnSize - gapSize) / columnSize;
+
+		for (int y = 0; y < columnSize; y++) {
+			final float startY = y * cellHeight + y * gapSize + gapSize;
+
+			for (int x = 0; x < rowSize; x++) {
+				final float startX = x * cellWidth + x * gapSize + gapSize;
+				cells[x + y * rowSize] = new Cell(startX, startY, cellWidth, cellHeight);
+			}
+		}
+
+		canvas.setOnMouseClicked(event -> {
+			if (event.getButton() != MouseButton.PRIMARY) {
+				return;
+			}
+
+			final int column = (int) ((event.getX() / this.width) * rowSize);
+			final int row = (int) ((event.getY() / this.height) * columnSize);
+
+			final Cell cell = cells[column + row * rowSize];
+
+			if (cell.isInside(event.getX(), event.getY())) {
+				event.consume();
+				this.onCellCLicked.accept(column + row * rowSize);
+			}
+		});
+
+
+
+
+		render();
+	}
+
+	private void render() {
+		graphics.setFill(backgroundColor);
+		graphics.fillRect(0, 0, width, height);
+
+		graphics.setFill(color);
+
+		for (int x = 0; x < rowSize - 1; x++) {
+			final float start = cells[x].x + cells[x].width;
+			graphics.fillRect(start, gapSize, gapSize, height - gapSize * 2);
+		}
+
+		for (int y = 0; y < columnSize - 1; y++) {
+			final float start = cells[y * rowSize].y + cells[y * rowSize].height;
+			graphics.fillRect(gapSize, start, width - gapSize * 2, gapSize);
+		}
+
+		if (edges) {
+			graphics.fillRect(0, 0, width, gapSize);
+			graphics.fillRect(0, 0, gapSize, height);
+
+			graphics.fillRect(width - gapSize, 0, gapSize, height);
+			graphics.fillRect(0, height - gapSize, width, gapSize);
+		}
+	}
+
+	public void fill(Color color, int cell) {
+		final float x = cells[cell].x();
+		final float y = cells[cell].y();
+
+		final float width = cells[cell].width();
+		final float height = cells[cell].height();
+
+		graphics.setFill(color);
+		graphics.fillRect(x, y, width, height);
+	}
+
+	public void clear(int cell) {
+		final float x = cells[cell].x();
+		final float y = cells[cell].y();
+
+		final float width = cells[cell].width();
+		final float height = cells[cell].height();
+
+		graphics.clearRect(x, y, width, height);
+
+		graphics.setFill(backgroundColor);
+		graphics.fillRect(x, y, width, height);
+	}
+
+	public void clearAll() {
+		for (int i = 0; i < cells.length; i++) {
+			clear(i);
+		}
+	}
+
+    @Override
+    public void drawPlayerMove(int player, int move) {
+        final float x = cells[move].x() + gapSize;
+        final float y = cells[move].y() + gapSize;
+
+        final float width = cells[move].width() - gapSize * 2;
+        final float height = cells[move].height() - gapSize * 2;
+
+        graphics.setFill(color);
+        graphics.setFont(Font.font("Arial", 40)); // TODO different font and size
+        graphics.fillText(String.valueOf(player), x + width, y + height);
+    }
+
+	public void drawDot(Color color, int cell) {
+		final float x = cells[cell].x() + gapSize;
+		final float y = cells[cell].y() + gapSize;
+
+		final float width = cells[cell].width() - gapSize * 2;
+		final float height = cells[cell].height() - gapSize * 2;
+
+		graphics.setFill(color);
+		graphics.fillOval(x, y, width, height);
+	}
+
+    public void drawInnerDot(Color color, int cell, boolean slightlyBigger) {
+        final float x = cells[cell].x() + gapSize;
+        final float y = cells[cell].y() + gapSize;
+
+        float multiplier = slightlyBigger?1.4f:1.5f;
+
+        final float width = (cells[cell].width() - gapSize * 2)/multiplier;
+        final float height = (cells[cell].height() - gapSize * 2)/multiplier;
+
+        float offset = slightlyBigger?5f:4f;
+
+        graphics.setFill(color);
+        graphics.fillOval(x + width/offset, y + height/offset, width, height);
+    }
+
+	private void drawDotScaled(Color color, int cell, double scale) {
+		final float cx = cells[cell].x() + gapSize;
+		final float cy = cells[cell].y() + gapSize;
+
+		final float fullWidth = cells[cell].width() - gapSize * 2;
+		final float height = cells[cell].height() - gapSize * 2;
+
+		final float scaledWidth = (float)(fullWidth * scale);
+		final float offsetX = (fullWidth - scaledWidth) / 2;
+
+		graphics.setFill(color);
+		graphics.fillOval(cx + offsetX, cy, scaledWidth, height);
+	}
+
+	public Timeline flipDot(Color fromColor, Color toColor, int cell) {
+		final int steps = 60;
+		final long duration = 250;
+		final double interval = duration / (double) steps;
+
+		final Timeline timeline = new Timeline();
+
+		for (int i = 0; i <= steps; i++) {
+			final double t = i / (double) steps;
+			final KeyFrame keyFrame = new KeyFrame(Duration.millis(i * interval),
+				_ -> {
+					clear(cell);
+
+					final double scale = t <= 0.5 ? 1 - 2 * t : 2 * t - 1;
+					final Color currentColor = t < 0.5 ? fromColor : toColor;
+
+					drawDotScaled(currentColor, cell, scale);
+				}
+			);
+
+			timeline.getKeyFrames().add(keyFrame);
+		}
+
+		return timeline;
+	}
+
+	public Canvas getCanvas() {
+		return canvas;
+	}
+}

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

@@ -1,68 +0,0 @@
-package org.toop.app.canvas;
-
-import javafx.scene.paint.Color;
-import org.toop.app.App;
-import org.toop.framework.game.games.reversi.BitboardReversi;
-import org.toop.framework.game.players.LocalPlayer;
-import org.toop.framework.gameFramework.model.game.TurnBasedGame;
-
-public class ReversiBitCanvas extends BitGameCanvas {
-    private TurnBasedGame gameCopy;
-    private int previousCell;
-    public ReversiBitCanvas() {
-        super(Color.GRAY, new Color(0f, 0.4f, 0.2f, 1f), (App.getHeight() / 4) * 3, (App.getHeight() / 4) * 3, 8, 8, 5, true);
-        canvas.setOnMouseMoved(event -> {
-            double mouseX = event.getX();
-            double mouseY = event.getY();
-            int cellId = -1;
-
-            BitGameCanvas.Cell hovered = null;
-            for (BitGameCanvas.Cell cell : cells) {
-                if (cell.isInside(mouseX, mouseY)) {
-                    hovered = cell;
-                    cellId = turnCoordsIntoCellId(mouseX, mouseY);
-                    break;
-                }
-            }
-            if (hovered != null) {
-                checkHoverDots(hovered, cellId);
-            }
-        });
-    }
-
-    private int turnCoordsIntoCellId(double x, double y) {
-        final int column = (int) ((x / this.width) * rowSize);
-        final int row = (int) ((y / this.height) * columnSize);
-        return column + row * rowSize;
-    }
-
-    @Override
-    public void redraw(TurnBasedGame gameCopy) {
-        this.gameCopy = gameCopy;
-        clearAll();
-        long[] board = gameCopy.getBoard();
-        loopOverBoard(board[0], (i) -> drawDot(Color.WHITE, i));
-        loopOverBoard(board[1], (i) -> drawDot(Color.BLACK, i));
-    }
-
-    public void drawLegalDots(TurnBasedGame gameCopy){
-        long legal = gameCopy.getLegalMoves();
-        loopOverBoard(legal, (i) -> drawInnerDot(gameCopy.getCurrentTurn()==0?new Color(1f,1f,1f,0.65f) :new Color(0f,0f,0f,0.65f), i,false));
-    }
-
-    private void checkHoverDots(BitGameCanvas.Cell hovered, int cellId){
-        if (previousCell == cellId){
-            return;
-        }
-        long backflips = ((BitboardReversi)gameCopy).getFlips(1L << previousCell);
-        loopOverBoard(backflips, (i) -> drawInnerDot(gameCopy.getCurrentTurn()==1?Color.WHITE:Color.BLACK, i,true));
-        previousCell = cellId;
-        if (gameCopy.getPlayer(gameCopy.getCurrentTurn()) instanceof LocalPlayer) {
-            long legal = gameCopy.getLegalMoves();
-            if ((legal & (1L << cellId)) != 0) {
-                long flips = ((BitboardReversi) gameCopy).getFlips(1L << cellId);
-                loopOverBoard(flips, (i) -> drawInnerDot(gameCopy.getCurrentTurn() == 0 ? Color.WHITE : Color.BLACK, i, false));
-            }
-        }
-    }
-}

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

@@ -0,0 +1,96 @@
+package org.toop.app.canvas;
+
+import javafx.scene.paint.Color;
+import org.toop.framework.gameFramework.model.game.AbstractGame;
+import org.toop.game.Move;
+import org.toop.game.games.reversi.ReversiR;
+
+import java.util.concurrent.atomic.AtomicReference;
+import java.util.function.Consumer;
+
+public final class ReversiCanvas extends GameCanvas<ReversiR> {
+    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();
+
+        final AtomicReference<Cell> lastHoveredCell = new AtomicReference<>(null);
+
+        canvas.setOnMouseMoved(event -> {
+            double mouseX = event.getX();
+            double mouseY = event.getY();
+            int cellId = -1;
+
+            Cell hovered = null;
+            for (Cell cell : cells) {
+                if (cell.isInside(mouseX, mouseY)) {
+                    hovered = cell;
+                    cellId = turnCoordsIntoCellId(mouseX, mouseY);
+                    break;
+                }
+            }
+
+            Cell previous = lastHoveredCell.get();
+
+            if (hovered != previous) {
+                lastHoveredCell.set(hovered);
+                newCellEntered.accept(cellId);
+            }
+        });
+	}
+
+    public void setCurrentlyHighlightedMovesNull() {
+        currentlyHighlightedMoves = null;
+    }
+
+    public void drawHighlightDots(Move[] moves){
+        if (currentlyHighlightedMoves != null){
+            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 (Move move : moves) {
+                Color color = move.value() == 'B' ? Color.BLACK : Color.WHITE;
+                drawInnerDot(color, move.position(), false);
+            }
+        }
+    }
+
+    private int turnCoordsIntoCellId(double x, double y) {
+        final int column = (int) ((x / this.width) * rowSize);
+        final int row = (int) ((y / this.height) * columnSize);
+        return column + row * rowSize;
+    }
+
+	public void drawStartingDots() {
+		drawDot(Color.BLACK, 28);
+		drawDot(Color.WHITE, 36);
+		drawDot(Color.BLACK, 35);
+		drawDot(Color.WHITE, 27);
+	}
+
+	public void drawLegalPosition(int cell, char player) {
+
+        Color innerColor;
+        if (player == 'B') {
+            innerColor = new Color(0.0f, 0.0f, 0.0f, 0.6f);
+        }
+        else {
+            innerColor = new Color(1.0f, 1.0f, 1.0f, 0.75f);
+        }
+        drawInnerDot(innerColor, cell,false);
+	}
+
+    @Override
+    public void drawPlayerMove(int player ,int move){
+        super.drawPlayerMove(player, move);
+    }
+
+    @Override
+    public void drawPlayerHover(int player, int move, AbstractGame game) {
+
+    }
+}

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

@@ -1,60 +0,0 @@
-package org.toop.app.canvas;
-
-import javafx.scene.paint.Color;
-import org.toop.app.App;
-import org.toop.framework.gameFramework.model.game.TurnBasedGame;
-
-public class TicTacToeBitCanvas extends BitGameCanvas{
-    public TicTacToeBitCanvas() {
-        super(
-                Color.GRAY,
-                Color.TRANSPARENT,
-                (App.getHeight() / 4) * 3,
-                (App.getHeight() / 4) * 3,
-                3,
-                3,
-                30,
-                false
-        );
-    }
-
-    @Override
-    public void redraw(TurnBasedGame gameCopy) {
-        clearAll();
-        drawMoves(gameCopy.getBoard());
-    }
-
-    private void drawMoves(long[] gameBoard){
-        loopOverBoard(gameBoard[0], (i) -> drawX(Color.RED, i));
-        loopOverBoard(gameBoard[1], (i) -> drawO(Color.BLUE, i));
-
-    }
-
-
-    public void drawX(Color color, int cell) {
-        graphics.setStroke(color);
-        graphics.setLineWidth(gapSize);
-
-        final float x = cells[cell].x() + gapSize;
-        final float y = cells[cell].y() + gapSize;
-
-        final float width = cells[cell].width() - gapSize * 2;
-        final float height = cells[cell].height() - gapSize * 2;
-
-        graphics.strokeLine(x, y, x + width, y + height);
-        graphics.strokeLine(x + width, y, x, y + height);
-    }
-
-    public void drawO(Color color, int cell) {
-        graphics.setStroke(color);
-        graphics.setLineWidth(gapSize);
-
-        final float x = cells[cell].x() + gapSize;
-        final float y = cells[cell].y() + gapSize;
-
-        final float width = cells[cell].width() - gapSize * 2;
-        final float height = cells[cell].height() - gapSize * 2;
-
-        graphics.strokeOval(x, y, width, height);
-    }
-}

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

@@ -0,0 +1,54 @@
+package org.toop.app.canvas;
+
+import javafx.scene.paint.Color;
+import org.toop.framework.gameFramework.model.game.AbstractGame;
+import org.toop.game.games.tictactoe.TicTacToeR;
+
+import java.util.function.Consumer;
+
+public final class TicTacToeCanvas extends GameCanvas<TicTacToeR> {
+	public TicTacToeCanvas(Color color, int width, int height, Consumer<Integer> onCellClicked) {
+		super(color, Color.TRANSPARENT, width, height, 3, 3, 30, false, onCellClicked,null);
+	}
+
+    @Override
+    public void drawPlayerMove(int player, int move) {
+        switch (player) {
+            case 0 -> drawX(Color.RED, move);
+            case 1 -> drawO(Color.BLUE, move);
+            default -> super.drawPlayerMove(player, move);
+        }
+    }
+
+	public void drawX(Color color, int cell) {
+		graphics.setStroke(color);
+		graphics.setLineWidth(gapSize);
+
+		final float x = cells[cell].x() + gapSize;
+		final float y = cells[cell].y() + gapSize;
+
+		final float width = cells[cell].width() - gapSize * 2;
+		final float height = cells[cell].height() - gapSize * 2;
+
+		graphics.strokeLine(x, y, x + width, y + height);
+		graphics.strokeLine(x + width, y, x, y + height);
+	}
+
+	public void drawO(Color color, int cell) {
+		graphics.setStroke(color);
+		graphics.setLineWidth(gapSize);
+
+		final float x = cells[cell].x() + gapSize;
+		final float y = cells[cell].y() + gapSize;
+
+		final float width = cells[cell].width() - gapSize * 2;
+		final float height = cells[cell].height() - gapSize * 2;
+
+		graphics.strokeOval(x, y, width, height);
+	}
+
+    @Override
+    public void drawPlayerHover(int player, int move, AbstractGame game) {
+
+    }
+}

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

@@ -0,0 +1,127 @@
+package org.toop.app.gameControllers;
+
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
+import org.toop.framework.gameFramework.controller.UpdatesGameUI;
+import org.toop.framework.gameFramework.view.GUIEvents;
+import org.toop.app.canvas.GameCanvas;
+import org.toop.framework.networking.events.NetworkEvents;
+import org.toop.framework.gameFramework.model.game.threadBehaviour.ThreadBehaviour;
+import org.toop.app.widget.view.GameView;
+import org.toop.framework.eventbus.EventFlow;
+import org.toop.game.gameThreads.OnlineThreadBehaviour;
+import org.toop.framework.gameFramework.model.game.AbstractGame;
+import org.toop.framework.gameFramework.model.game.SupportsOnlinePlay;
+import org.toop.framework.gameFramework.model.player.Player;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.function.Consumer;
+
+public abstract class AbstractGameController<T extends AbstractGame<T>> implements UpdatesGameUI, ThreadBehaviour<T> {
+    protected final EventFlow eventFlow = new EventFlow();
+
+    protected final List<Consumer<?>> listeners = new ArrayList<>();
+
+    // Logger for logging ofcourse
+    protected final Logger logger = LogManager.getLogger(this.getClass());
+
+    // Reference to primary view
+    protected final GameView primary;
+
+    // Reference to game canvas
+    protected final GameCanvas<T> canvas;
+
+    private final Player<T>[] players;         // List of players, can't be changed.
+    protected final T game;       // Reference to game instance
+    private final ThreadBehaviour<T> gameThreadBehaviour;
+
+    // TODO: Change gameType to automatically happen with either dependency injection or something else.
+    // TODO: Make visualisation of moves a behaviour.
+    protected AbstractGameController(GameCanvas<T> canvas, Player<T>[] players, T game, ThreadBehaviour<T> gameThreadBehaviour, String gameType) {
+        logger.info("Creating AbstractGameController");
+        // Make sure player list matches expected size
+        if (players.length != game.getPlayerCount()){
+            logger.error("Player count mismatch");
+            throw new IllegalArgumentException("players and game's players must have same length");
+        }
+
+        this.canvas = canvas;
+        this.players = players;
+        this.game = game;
+        this.gameThreadBehaviour = gameThreadBehaviour;
+
+        primary = new GameView(null, null, null, gameType);
+        addListeners();
+    }
+
+    public void start(){
+        logger.info("Starting GameManager");
+        gameThreadBehaviour.start();;
+    }
+
+    public void stop(){
+        logger.info("Stopping GameManager");
+        removeListeners();
+        gameThreadBehaviour.stop();
+    }
+
+    public Player<T> getCurrentPlayer(){
+        return game.getPlayer(getCurrentPlayerIndex());
+    };
+
+    public int getCurrentPlayerIndex(){
+        return game.getCurrentTurn();
+    }
+
+    private void addListeners(){
+        eventFlow
+                .listen(GUIEvents.RefreshGameCanvas.class, this::onUpdateGameUI, false)
+                .listen(GUIEvents.GameEnded.class, this::onGameFinish, false);
+    }
+
+    private void removeListeners(){
+        eventFlow.unsubscribeAll();
+    }
+
+    private void onUpdateGameUI(GUIEvents.RefreshGameCanvas event){
+        this.updateUI();
+    }
+
+    private void onGameFinish(GUIEvents.GameEnded event){
+        logger.info("Game Finished");
+        String name = event.winner() == -1 ? null : getPlayer(event.winner()).getName();
+        primary.gameOver(event.winOrTie(), name);
+        stop();
+    }
+
+    public Player<T> getPlayer(int player){
+        if (player < 0 || player >= players.length){
+            logger.error("Invalid player index");
+            throw new IllegalArgumentException("player out of range");
+        }
+        return players[player];
+    }
+
+    private boolean isOnline(){
+        return this.gameThreadBehaviour instanceof SupportsOnlinePlay;
+    }
+
+    public void onYourTurn(NetworkEvents.YourTurnResponse event){
+        if (isOnline()){
+            ((OnlineThreadBehaviour<T>) this.gameThreadBehaviour).onYourTurn(event);
+        }
+    }
+
+    public void onMoveReceived(NetworkEvents.GameMoveResponse event){
+        if (isOnline()){
+            ((OnlineThreadBehaviour<T>) this.gameThreadBehaviour).onMoveReceived(event);
+        }
+    }
+
+    public void gameFinished(NetworkEvents.GameResultResponse event){
+        if (isOnline()){
+            ((OnlineThreadBehaviour<T>) this.gameThreadBehaviour).gameFinished(event);
+        }
+    }
+}

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

@@ -1,172 +0,0 @@
-package org.toop.app.gameControllers;
-
-import javafx.application.Platform;
-import javafx.geometry.Pos;
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
-import org.toop.app.canvas.GameCanvas;
-import org.toop.app.canvas.ReversiBitCanvas;
-import org.toop.app.widget.WidgetContainer;
-import org.toop.app.widget.view.GameView;
-import org.toop.framework.eventbus.EventFlow;
-import org.toop.framework.eventbus.GlobalEventBus;
-import org.toop.framework.game.games.reversi.BitboardReversi;
-import org.toop.framework.gameFramework.controller.GameController;
-import org.toop.framework.gameFramework.model.game.threadBehaviour.SupportsOnlinePlay;
-import org.toop.framework.gameFramework.model.game.TurnBasedGame;
-import org.toop.framework.gameFramework.model.game.threadBehaviour.ThreadBehaviour;
-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.framework.game.players.LocalPlayer;
-
-public class GenericGameController implements GameController {
-    protected final EventFlow eventFlow = new EventFlow();
-
-    // Logger for logging
-    protected final Logger logger = LogManager.getLogger(this.getClass());
-
-    // Reference to gameView view
-    protected final GameView gameView;
-
-    // Reference to game canvas
-    protected final GameCanvas canvas;
-
-    protected final TurnBasedGame game;       // Reference to game instance
-    private final ThreadBehaviour gameThreadBehaviour;
-
-    // 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());
-
-        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)))
-        );
-
-        // Tell thread how to update UI
-        this.gameThreadBehaviour.setOnUpdateUI(() -> Platform.runLater(this::updateUI));
-
-        // Change scene to game view
-        gameView = new GameView(null, null, null, gameType);
-        gameView.add(Pos.CENTER, canvas.getCanvas());
-        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 -> {
-                    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(){
-        return game.getPlayer(getCurrentPlayerIndex());
-    }
-
-    public int getCurrentPlayerIndex(){
-        return game.getCurrentTurn();
-    }
-
-    protected long translateMove(int move){
-        return 1L << move;
-    }
-
-    protected int translateMove(long move){
-        return Long.numberOfTrailingZeros(move);
-    }
-
-    private void removeListeners(){
-        eventFlow.unsubscribeAll();
-    }
-
-    private void onGameFinish(GUIEvents.GameEnded event){
-        logger.info("OnlineTurnBasedGame Finished");
-        String name = event.winner() == -1 ? null : getPlayer(event.winner()).getName();
-        gameView.gameOver(event.winOrTie(), name);
-        stop();
-    }
-
-    public Player getPlayer(int player){
-        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");
-        }
-        return game.getPlayer(player);
-    }
-
-    private boolean isOnline(){
-        return this.gameThreadBehaviour instanceof SupportsOnlinePlay;
-    }
-
-    public void onYourTurn(NetworkEvents.YourTurnResponse event){
-        if (isOnline()){
-            ((SupportsOnlinePlay) this.gameThreadBehaviour).onYourTurn(event.clientId());
-        }
-    }
-
-    public void onMoveReceived(NetworkEvents.GameMoveResponse event){
-        if (isOnline()){
-            ((SupportsOnlinePlay) this.gameThreadBehaviour).onMoveReceived(
-                    translateMove(Integer.parseInt(event.move())));
-        }
-    }
-
-    public void gameFinished(NetworkEvents.GameResultResponse event){
-        if (isOnline()){
-            ((SupportsOnlinePlay) this.gameThreadBehaviour).gameFinished(event.condition());
-        }
-    }
-
-    @Override
-    public void sendMove(long clientId, long move) {
-        new EventFlow().addPostEvent(NetworkEvents.SendMove.class, clientId, (short) Long.numberOfTrailingZeros(move)).asyncPostEvent();
-    }
-
-    @Override
-    public void updateUI() {
-        TurnBasedGame gameCopy = game.deepCopy();
-        canvas.redraw(gameCopy);
-        String gameType = game.getClass().getSimpleName().replace("Bitboard","");
-        gameView.nextPlayer(true, getCurrentPlayer().getName(), game.getPlayer(1-getCurrentPlayerIndex()).getName(),gameType);
-        if (gameType.equals("Reversi")) {
-            BitboardReversi reversiGame = (BitboardReversi) game;
-            BitboardReversi.Score reversiScore = reversiGame.getScore();
-            gameView.setPlayer1Score(reversiScore.black());
-            gameView.setPlayer2Score(reversiScore.white());
-            if (getCurrentPlayer() instanceof LocalPlayer) {
-                ((ReversiBitCanvas)canvas).drawLegalDots(gameCopy);
-            }
-        }
-    }
-}

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

@@ -1,29 +0,0 @@
-package org.toop.app.gameControllers;
-
-import org.toop.app.canvas.ReversiBitCanvas;
-import org.toop.framework.gameFramework.model.game.threadBehaviour.ThreadBehaviour;
-import org.toop.framework.gameFramework.model.player.Player;
-import org.toop.framework.game.gameThreads.LocalThreadBehaviour;
-import org.toop.framework.game.gameThreads.OnlineThreadBehaviour;
-import org.toop.framework.game.games.reversi.BitboardReversi;
-import org.toop.framework.game.players.OnlinePlayer;
-
-import java.util.Arrays;
-
-public class ReversiBitController extends GenericGameController {
-
-    private BitboardReversi game;
-
-    public ReversiBitController(Player[] players) {
-        BitboardReversi game = new BitboardReversi();
-        game.init(players);
-        ThreadBehaviour thread = Arrays.stream(players).anyMatch(e -> e instanceof OnlinePlayer) ?
-                new OnlineThreadBehaviour(game) : new LocalThreadBehaviour(game);
-
-        super(new ReversiBitCanvas(), game, thread, "Reversi");
-    }
-
-    public BitboardReversi.Score getScore() {
-        return game.getScore();
-    }
-}

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

@@ -0,0 +1,138 @@
+package org.toop.app.gameControllers;
+
+import javafx.animation.SequentialTransition;
+import javafx.geometry.Pos;
+import javafx.scene.paint.Color;
+import org.toop.app.App;
+import org.toop.app.canvas.ReversiCanvas;
+import org.toop.app.widget.WidgetContainer;
+import org.toop.framework.eventbus.EventFlow;
+import org.toop.framework.gameFramework.model.game.AbstractGame;
+import org.toop.framework.gameFramework.view.GUIEvents;
+import org.toop.game.gameThreads.LocalFixedRateThreadBehaviour;
+import org.toop.game.gameThreads.OnlineThreadBehaviour;
+import org.toop.game.players.LocalPlayer;
+import org.toop.framework.gameFramework.model.player.Player;
+import org.toop.game.games.reversi.ReversiR;
+
+public class ReversiController extends AbstractGameController<ReversiR> {
+    // TODO: Refactor GUI update methods to follow designed system
+    public ReversiController(Player<ReversiR>[] players, boolean local) {
+        ReversiR ReversiR = new ReversiR(players);
+        super(
+                new ReversiCanvas(Color.GRAY, (App.getHeight() / 4) * 3, (App.getHeight() / 4) * 3,(c) -> {new EventFlow().addPostEvent(GUIEvents.PlayerAttemptedMove.class, c).postEvent();}, (c) -> {new EventFlow().addPostEvent(GUIEvents.PlayerMoveHovered.class, c).postEvent();}),
+                players,
+                ReversiR,
+                local ? new LocalFixedRateThreadBehaviour<>(ReversiR, players) : new OnlineThreadBehaviour<>(ReversiR, players), // TODO: Player order matters here, this won't work atm
+                "Reversi");
+        eventFlow.listen(GUIEvents.PlayerAttemptedMove.class, event -> {if (getCurrentPlayer() instanceof LocalPlayer lp){lp.setMove(event.move());}}, false);
+        eventFlow.listen(GUIEvents.PlayerMoveHovered.class, this::onHoverMove, false);
+        initUI();
+    }
+
+
+    private void onHoverMove(GUIEvents.PlayerMoveHovered event){
+        int cellEntered = event.move();
+        canvas.drawPlayerHover(-1, cellEntered, game);
+        /*// (information.players[game.getCurrentTurn()].isHuman) {
+            int[] legalMoves = game.getLegalMoves();
+            boolean isLegalMove = false;
+            for (int move : legalMoves) {
+                if (move == cellEntered){
+                    isLegalMove = true;
+                    break;
+                }
+            }
+
+            if (cellEntered >= 0){
+                int[] moves = null;
+                if (isLegalMove) {
+                    moves = game.getFlipsForPotentialMove(
+                            new Point(cellEntered%game.getColumnSize(),cellEntered/game.getRowSize()),
+                            game.getCurrentPlayer());
+                }
+                canvas.drawHighlightDots(moves);
+            }
+        //}*/
+    }
+
+    public ReversiController(Player<ReversiR>[] players) {
+        this(players, true);
+    }
+
+    private void updateCanvas(boolean animate) {
+        // Todo: this is very inefficient. still very fast but if the grid is bigger it might cause issues. improve.
+        canvas.clearAll();
+
+        for (int i = 0; i < game.getBoard().length; i++) {
+            if (game.getBoard()[i] == 0) {
+                canvas.drawDot(Color.WHITE, i);
+            } else if (game.getBoard()[i] == 1) {
+                canvas.drawDot(Color.BLACK, i);
+            }
+        }
+
+        final int[] flipped = game.getMostRecentlyFlippedPieces();
+
+        final SequentialTransition animation = new SequentialTransition();
+
+        final Color fromColor = getCurrentPlayerIndex() == 0? Color.WHITE : Color.BLACK;
+        final Color toColor = getCurrentPlayerIndex() == 0? Color.BLACK : Color.WHITE;
+
+        if (animate && flipped != null) {
+            for (final int flip : flipped) {
+                canvas.clear(flip);
+                canvas.drawDot(fromColor, flip);
+                animation.getChildren().addFirst(canvas.flipDot(fromColor, toColor, flip));
+            }
+        }
+
+        animation.setOnFinished(_ -> {
+
+            if (getCurrentPlayer() instanceof LocalPlayer) {
+                final int[] legalMoves = game.getLegalMoves();
+
+                for (final int legalMove : legalMoves) {
+                    drawLegalPosition(legalMove, getCurrentPlayerIndex());
+                }
+            }
+        });
+
+        animation.play();
+        primary.nextPlayer(true, getCurrentPlayer().getName(), game.getCurrentTurn() == 0 ? "X" : "O", getPlayer((game.getCurrentTurn() + 1) % 2).getName(), 'R');
+    }
+
+    @Override
+    public void updateUI() {
+        updateCanvas(false);
+    }
+
+    public void drawLegalPosition(int cell, int player) {
+        Color innerColor;
+        if (player == 1) {
+            innerColor = new Color(0.0f, 0.0f, 0.0f, 0.6f);
+        }
+        else {
+            innerColor = new Color(1.0f, 1.0f, 1.0f, 0.75f);
+        }
+        canvas.drawInnerDot(innerColor, cell,false);
+    }
+
+    private void initUI(){
+        primary.add(Pos.CENTER, canvas.getCanvas());
+        WidgetContainer.getCurrentView().transitionNext(primary, true);
+        updateCanvas(false);
+    }
+
+    private void drawMoves(){
+        int[] board = game.getBoard();
+
+        // Draw each square
+        for (int i = 0; i < board.length; i++){
+            // If square isn't empty, draw player move
+            if (board[i] != AbstractGame.EMPTY){
+                canvas.drawPlayerMove(board[i], i);
+            }
+        }
+    }
+}

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

@@ -1,23 +0,0 @@
-package org.toop.app.gameControllers;
-
-import org.toop.app.canvas.TicTacToeBitCanvas;
-import org.toop.framework.gameFramework.model.game.threadBehaviour.ThreadBehaviour;
-import org.toop.framework.gameFramework.model.player.Player;
-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 java.util.Arrays;
-
-public class TicTacToeBitController extends GenericGameController {
-    public TicTacToeBitController(Player[] players) {
-        BitboardTicTacToe game = new BitboardTicTacToe();
-        game.init(players);
-
-        ThreadBehaviour thread = Arrays.stream(players).anyMatch(e -> e instanceof OnlinePlayer) ?
-                new OnlineThreadBehaviour(game) : new LocalThreadBehaviour(game);
-
-        super(new TicTacToeBitCanvas(), game, thread, "TicTacToe");
-    }
-}

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

@@ -0,0 +1,63 @@
+package org.toop.app.gameControllers;
+
+import javafx.geometry.Pos;
+import javafx.scene.paint.Color;
+import org.toop.app.App;
+import org.toop.app.canvas.TicTacToeCanvas;
+import org.toop.framework.eventbus.EventFlow;
+import org.toop.framework.gameFramework.model.player.Player;
+import org.toop.framework.gameFramework.view.GUIEvents;
+import org.toop.framework.gameFramework.model.game.AbstractGame;
+import org.toop.game.gameThreads.LocalThreadBehaviour;
+import org.toop.game.gameThreads.OnlineThreadBehaviour;
+import org.toop.game.players.LocalPlayer;
+import org.toop.app.widget.WidgetContainer;
+import org.toop.game.games.tictactoe.TicTacToeR;
+
+public class TicTacToeController extends AbstractGameController<TicTacToeR> {
+
+    public TicTacToeController(Player<TicTacToeR>[] players, boolean local) {
+        TicTacToeR ticTacToeR = new TicTacToeR(players);
+        super(
+                new TicTacToeCanvas(Color.GRAY, (App.getHeight() / 4) * 3, (App.getHeight() / 4) * 3,(c) -> {new EventFlow().addPostEvent(GUIEvents.PlayerAttemptedMove.class, c).postEvent();}),
+                players,
+                ticTacToeR,
+                local ? new LocalThreadBehaviour(ticTacToeR, players) : new OnlineThreadBehaviour<>(ticTacToeR, players), // TODO: Player order matters here, this won't work atm
+                "TicTacToe");
+
+        initUI();
+        eventFlow.listen(GUIEvents.PlayerAttemptedMove.class, event -> {if (getCurrentPlayer() instanceof LocalPlayer lp){lp.setMove(event.move());}}, false);
+        //addListener(GlobalEventBus.subscribe(GUIEvents.PlayerAttemptedMove.class, event -> {if (getCurrentPlayer() instanceof LocalPlayer lp){lp.setMove(event.move());}}));
+        //new EventFlow().listen(GUIEvents.PlayerAttemptedMove.class, event -> {if (getCurrentPlayer() instanceof LocalPlayer lp){lp.setMove(event.move());}});
+    }
+
+    public TicTacToeController(Player<TicTacToeR>[] players) {
+        this(players, true);
+    }
+
+    @Override
+    public void updateUI() {
+        canvas.clearAll();
+        // TODO: wtf is even this pile of poop temp fix
+        primary.nextPlayer(true, getCurrentPlayer().getName(), game.getCurrentTurn() == 0 ? "X" : "O", getPlayer((game.getCurrentTurn() + 1) % 2).getName(), 'T');
+        drawMoves();
+    }
+
+    private void initUI(){
+        primary.add(Pos.CENTER, canvas.getCanvas());
+        WidgetContainer.getCurrentView().transitionNext(primary, true);
+        updateUI();
+    }
+
+    private void drawMoves(){
+        int[] board = game.getBoard();
+
+        // Draw each square
+        for (int i = 0; i < board.length; i++){
+            // If square isn't empty, draw player move
+            if (board[i] != AbstractGame.EMPTY){
+                canvas.drawPlayerMove(board[i], i);
+            }
+        }
+    }
+}

app/src/main/java/org/toop/app/widget/Primitive.java

@@ -6,6 +6,7 @@ import org.toop.framework.eventbus.EventFlow;
 import org.toop.framework.resource.resources.ImageAsset;
 import org.toop.local.AppContext;
 
+import java.io.File;
 import java.util.function.Consumer;
 
 import javafx.collections.FXCollections;
@@ -64,7 +65,7 @@ public final class Primitive {
         return imageView;
     }
 
-	public static Button button(String key, Runnable onAction, boolean localize, boolean disableOnClick) {
+	public static Button button(String key, Runnable onAction, boolean localize) {
 		var button = new Button();
 		button.getStyleClass().add("button");
 
@@ -75,7 +76,6 @@ public final class Primitive {
 
 		if (onAction != null) {
 			button.setOnAction(_ -> {
-				if (disableOnClick) button.setDisable(true);
                 onAction.run();
                 playButtonSound();
             });
@@ -84,8 +84,8 @@ public final class Primitive {
 		return button;
 	}
 
-	public static Button button(String key, Runnable onAction, boolean disableOnClick) {
+	public static Button button(String key, Runnable onAction) {
-		return button(key, onAction, true, disableOnClick);
+		return button(key, onAction, true);
 	}
 
 	public static TextField input(String promptKey, String text, Consumer<String> onValueChanged, boolean localize) {

app/src/main/java/org/toop/app/widget/WidgetContainer.java

@@ -1,5 +1,6 @@
 package org.toop.app.widget;
 
+import javafx.collections.ObservableList;
 import javafx.scene.Node;
 import org.toop.app.widget.complex.PopupWidget;
 import org.toop.app.widget.complex.ViewWidget;

app/src/main/java/org/toop/app/widget/complex/ConfirmWidget.java

@@ -26,7 +26,7 @@ public class ConfirmWidget implements Widget {
 
 	public void addButton(String key, Runnable onClick) {
 		Platform.runLater(() -> {
-			var button = Primitive.button(key, onClick, false);
+			var button = Primitive.button(key, onClick);
 			buttonsContainer.getChildren().add(button);
 		});
 	}

app/src/main/java/org/toop/app/widget/complex/LoadingWidget.java

@@ -3,6 +3,7 @@ package org.toop.app.widget.complex;
 import javafx.application.Platform;
 import javafx.geometry.Pos;
 import javafx.scene.Node;
+import javafx.scene.control.Control;
 import javafx.scene.control.ProgressBar;
 import javafx.scene.control.ProgressIndicator;
 import javafx.scene.layout.VBox;

app/src/main/java/org/toop/app/widget/complex/PlayerInfoWidget.java

@@ -23,7 +23,7 @@ public class PlayerInfoWidget {
 	}
 
 	private ToggleWidget buildToggle() {
-        return new ToggleWidget(
+		return new ToggleWidget(
 			"computer", "player",
 			information.isHuman,
 			isHuman -> {
@@ -37,14 +37,7 @@ public class PlayerInfoWidget {
 	}
 
 	private Node buildContent() {
-
         if (information.isHuman) {
-            var spacer = Primitive.vbox(
-                    makeAIButton(0, 0, "zwartepiet"),
-                    makeAIButton(0, 0, "sinterklaas"),
-                    makeAIButton(0, 0, "santa")
-            );                                                                  //todo make a better solution
-            spacer.setVisible(false);
             var nameInput = new LabeledInputWidget(
                     "name",
                     "enter-your-name",
@@ -52,7 +45,7 @@ public class PlayerInfoWidget {
                     newName -> information.name = newName
             );
 
-            return Primitive.vbox(spacer,nameInput.getNode());
+            return nameInput.getNode();
         } else {
             var AIBox = Primitive.vbox(
                     makeAIButton(0, 1, "zwartepiet"),
@@ -91,7 +84,7 @@ public class PlayerInfoWidget {
             information.computerDifficulty = depth;
             information.computerThinkTime = thinktime;
             this.playerName.setText(getName(name));
-        }, false);
+        });
     }
 
     private String getName(String name) {

app/src/main/java/org/toop/app/widget/complex/TableWidget.java

@@ -1,61 +0,0 @@
-package org.toop.app.widget.complex;
-
-import javafx.collections.FXCollections;
-import javafx.collections.ObservableList;
-import javafx.geometry.Pos;
-import javafx.scene.control.TableColumn;
-import javafx.scene.control.TableView;
-import javafx.scene.control.cell.PropertyValueFactory;
-
-import java.util.ArrayList;
-import java.util.List;
-
-public class TableWidget<DATATYPE> extends PopupWidget {
-    private ObservableList<DATATYPE> serverList = FXCollections.observableArrayList();
-    private TableView<DATATYPE> table = new TableView<>();
-
-
-    public TableWidget(String... columns) {
-        var cols = new ArrayList<TableColumn<DATATYPE, String>>();
-
-        for (String column : columns) {
-            TableColumn<DATATYPE, String> col = new TableColumn<>(column.toUpperCase());
-            col.setCellValueFactory(new PropertyValueFactory<>(column));
-            cols.add(col);
-        }
-
-        table.getColumns().addAll(cols);
-        update();
-        onColumnClicked();
-
-        add(Pos.CENTER, table);
-    }
-
-    public void add(DATATYPE serverFound) {
-        serverList.add(serverFound);
-        update();
-    }
-
-    public void add(List<DATATYPE> serverFound) {
-        serverList.addAll(serverFound);
-    }
-
-    public void remove(DATATYPE serverFound) {
-        serverList.remove(serverFound);
-        update();
-    }
-
-    public void onColumnClicked() {
-        table.setOnMouseClicked(event -> {
-            DATATYPE selected = table.getSelectionModel().getSelectedItem();
-            if (selected == null) return;
-            IO.println(selected.toString());
-        });
-    }
-
-    private void update() {
-        table.setItems(serverList);
-    }
-
-
-}

app/src/main/java/org/toop/app/widget/complex/ViewWidget.java

@@ -32,7 +32,7 @@ public abstract class ViewWidget extends StackWidget {
 
 		var backButton = Primitive.button("back", () -> {
 			view.transitionPrevious();
-		}, false);
+		});
 
 		view.add(Pos.BOTTOM_LEFT, Primitive.vbox(backButton));
 	}
@@ -45,7 +45,7 @@ public abstract class ViewWidget extends StackWidget {
 		var customButton = Primitive.button(key, () -> {
 			runnable.run();
 			view.transitionPrevious();
-		}, false);
+		});
 
 		view.add(Pos.BOTTOM_LEFT, Primitive.vbox(customButton));
 	}
@@ -97,7 +97,7 @@ public abstract class ViewWidget extends StackWidget {
 
 		var backButton = Primitive.button("back", () -> {
 			view.transitionPrevious();
-		}, false);
+		});
 
 		view.add(Pos.BOTTOM_LEFT, Primitive.vbox(backButton));
 	}

app/src/main/java/org/toop/app/widget/display/SongDisplay.java

@@ -49,11 +49,11 @@ public class SongDisplay extends VBox implements Widget {
 		previousButton.getStyleClass().setAll("previous-button");
 
 		skipButton.setOnAction( event -> {
-			GlobalEventBus.get().post(new AudioEvents.SkipMusic());
+			GlobalEventBus.post(new AudioEvents.SkipMusic());
 		});
 
 		pauseButton.setOnAction(event -> {
-			GlobalEventBus.get().post(new AudioEvents.PauseMusic());
+			GlobalEventBus.post(new AudioEvents.PauseMusic());
 			if (pauseButton.getText().equals("⏸")) {
 				pauseButton.setText("▶");
 			}
@@ -63,7 +63,7 @@ public class SongDisplay extends VBox implements Widget {
 		});
 
 		previousButton.setOnAction( event -> {
-			GlobalEventBus.get().post(new AudioEvents.PreviousMusic());
+			GlobalEventBus.post(new AudioEvents.PreviousMusic());
 		});
 
 		HBox control = new HBox(10, previousButton, pauseButton, skipButton);

app/src/main/java/org/toop/app/widget/popup/ChallengePopup.java

@@ -37,8 +37,8 @@ public final class ChallengePopup extends PopupWidget {
 		var acceptButton = Primitive.button("accept", () -> {
 			onAccept.accept(playerInformation);
 			this.hide();
-		}, false);
+		});
-		var denyButton = Primitive.button("deny", () -> hide(), false);
+		var denyButton = Primitive.button("deny", () -> hide());
 
 		var leftSection = Primitive.vbox(
 			challengeText,

app/src/main/java/org/toop/app/widget/popup/EscapePopup.java

@@ -1,48 +1,31 @@
 package org.toop.app.widget.popup;
 
 import javafx.geometry.Pos;
-import javafx.scene.Node;
+import org.toop.app.App;
 import org.toop.app.widget.Primitive;
-import org.toop.app.widget.Widget;
 import org.toop.app.widget.WidgetContainer;
+import org.toop.app.widget.complex.ConfirmWidget;
 import org.toop.app.widget.complex.PopupWidget;
-import org.toop.app.widget.complex.ViewWidget;
-import org.toop.app.widget.view.GameView;
 import org.toop.app.widget.view.OptionsView;
-import org.toop.local.AppContext;
-
-import java.util.ArrayList;
 
 public class EscapePopup extends PopupWidget {
     public EscapePopup() {
-        ViewWidget currentView = WidgetContainer.getCurrentView();
+        var con = Primitive.button("Continue", this::hide, false); // TODO, localize
-        ArrayList<Node> nodes = new ArrayList<>();
 
-        nodes.add(Primitive.button("Continue", this::hide, false, false)); // TODO, localize
+        var qui = Primitive.button("quit", () -> {
+            hide();
+            WidgetContainer.add(Pos.CENTER, new QuitPopup());
+        });
 
-        if (!(currentView.getClass().isAssignableFrom(OptionsView.class))) {
+        if (!(WidgetContainer.getCurrentView().getClass().isAssignableFrom(OptionsView.class))) {
             var opt = Primitive.button("options", () -> {
                 hide();
                 WidgetContainer.getCurrentView().transitionNext(new OptionsView());
-            }, false);
+            });
-            nodes.add(opt);
+            add(Pos.CENTER, Primitive.vbox(con, opt, qui));
+        } else {
+            add(Pos.CENTER, Primitive.vbox(con, qui));
         }
 
-        if (currentView.getClass().isAssignableFrom(GameView.class)) {
-            Widget tut = AppContext.currentTutorial();
-            if (tut != null) {
-                nodes.add(Primitive.button("tutorialstring", () -> {
-                    WidgetContainer.getCurrentView().add(Pos.CENTER, tut);
-                }, false));
-            }
-        }
-
-        nodes.add(Primitive.button("quit", () -> {
-            hide();
-            WidgetContainer.add(Pos.CENTER, new QuitPopup());
-        }, false));
-
-        add(Pos.CENTER, Primitive.vbox(nodes.toArray(new Node[0])));
-
     }
 }

app/src/main/java/org/toop/app/widget/popup/GameOverPopup.java

@@ -2,9 +2,9 @@ package org.toop.app.widget.popup;
 
 import org.toop.app.widget.complex.ConfirmWidget;
 import org.toop.app.widget.complex.PopupWidget;
+import org.toop.local.AppContext;
 
 import javafx.geometry.Pos;
-import org.toop.framework.game.games.reversi.BitboardReversi;
 
 public final class GameOverPopup extends PopupWidget {
 	public GameOverPopup(boolean winOrTie, String winner) {
@@ -16,6 +16,7 @@ public final class GameOverPopup extends PopupWidget {
         else{
             confirmWidget.setMessage("It was a tie!");
         }
+
 		confirmWidget.addButton("ok", this::hide);
 
 		add(Pos.CENTER, confirmWidget);

app/src/main/java/org/toop/app/widget/popup/SendChallengePopup.java

@@ -62,9 +62,9 @@ public final class SendChallengePopup extends PopupWidget {
 		var sendButton = Primitive.button(
 			"send",
 			() -> { onSend.accept(playerInformation, gameChoice.getValue()); this.hide(); }
-		, false);
+		);
 
-		var cancelButton = Primitive.button("cancel", () -> hide(), false);
+		var cancelButton = Primitive.button("cancel", () -> hide());
 
 		var leftSection = Primitive.vbox(
 			challengeText,

app/src/main/java/org/toop/app/widget/tutorial/BaseTutorialWidget.java

@@ -7,6 +7,7 @@ import javafx.scene.text.Text;
 import org.apache.maven.surefire.shared.lang3.tuple.ImmutablePair;
 import org.toop.app.widget.Primitive;
 import org.toop.app.widget.Updatable;
+import org.toop.app.widget.WidgetContainer;
 import org.toop.app.widget.complex.PopupWidget;
 
 import org.toop.framework.resource.resources.ImageAsset;
@@ -47,8 +48,8 @@ public class BaseTutorialWidget extends PopupWidget implements Updatable {
         this.pages = pages;
         this.nextScreen = nextScreen;
 
-        previousButton = Primitive.button("goback", () -> { update(false); this.hide(); }, false);
+        previousButton = Primitive.button("goback", () -> { update(false); this.hide(); });
-        nextButton = Primitive.button(">", () -> update(true), false);
+        nextButton = Primitive.button(">", () -> update(true));
 
         var w = Primitive.hbox(
                 previousButton,
@@ -58,6 +59,8 @@ public class BaseTutorialWidget extends PopupWidget implements Updatable {
         var x = Primitive.vbox(imagery, tutorialText);
 
         add(Pos.CENTER, Primitive.vbox(x, w));
+
+        WidgetContainer.add(Pos.CENTER, this);
     }
 
     @Override

app/src/main/java/org/toop/app/widget/tutorial/ShowEnableTutorialWidget.java

@@ -10,9 +10,9 @@ public class ShowEnableTutorialWidget extends PopupWidget {
 
     public ShowEnableTutorialWidget(Runnable tutorial, Runnable nextScreen, Runnable appSettingsSetter) {
         var a = Primitive.hbox(
-                Primitive.button("ok", () -> { appSettingsSetter.run(); tutorial.run(); this.hide(); }, false),
+                Primitive.button("ok", () -> { appSettingsSetter.run(); tutorial.run(); this.hide(); }),
-                Primitive.button("no", () -> { appSettingsSetter.run(); nextScreen.run(); this.hide(); }, false),
+                Primitive.button("no", () -> { appSettingsSetter.run(); nextScreen.run(); this.hide(); }),
-                Primitive.button("never", () -> { AppSettings.getSettings().setTutorialFlag(false); nextScreen.run(); this.hide(); }, false)
+                Primitive.button("never", () -> { AppSettings.getSettings().setTutorialFlag(false); nextScreen.run(); this.hide(); })
         );
 
         var txt = Primitive.text("tutorial");

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

@@ -6,8 +6,6 @@ import javafx.scene.text.Font;
 import org.toop.app.widget.Primitive;
 import org.toop.app.widget.complex.ViewWidget;
 import org.toop.app.widget.popup.GameOverPopup;
-
-import java.util.Objects;
 import java.util.function.Consumer;
 import javafx.application.Platform;
 import javafx.geometry.Pos;
@@ -26,10 +24,9 @@ public final class GameView extends ViewWidget {
     private final Text player2Header;
     private Circle player1Icon;
     private Circle player2Icon;
-    private final Text player1Score;
-    private final Text player2Score;
 	private final Button forfeitButton;
 	private final Button exitButton;
+    private final Button tutorialButton;
     private final TextField chatInput;
     private final Text keyThingy;
     private boolean hasSet = false;
@@ -42,11 +39,9 @@ public final class GameView extends ViewWidget {
         player2Header = Primitive.header("");
         player1Icon = new Circle();
         player2Icon = new Circle();
-        player1Score = Primitive.header("");
-        player2Score = Primitive.header("");
 
 		if (onForfeit != null) {
-			forfeitButton = Primitive.button("forfeit", () -> onForfeit.run(), false);
+			forfeitButton = Primitive.button("forfeit", () -> onForfeit.run());
 		} else {
 			forfeitButton = null;
 		}
@@ -54,7 +49,7 @@ public final class GameView extends ViewWidget {
 		exitButton = Primitive.button("exit", () -> {
 			onExit.run();
 			transitionPrevious();
-		}, false);
+		});
 
 		if (onMessage != null) {
 			chatInput = Primitive.input("enter-your-message", "", null);
@@ -66,16 +61,15 @@ public final class GameView extends ViewWidget {
 			chatInput = null;
 		}
 
-        switch (gameType) {
+        switch(gameType) {
             case "TicTacToe":
-                AppContext.setCurrentTutorial(new TicTacToeTutorialWidget(() -> {}));
+                this.tutorialButton = Primitive.button("tutorialstring", () -> new TicTacToeTutorialWidget(() -> {})); break;
-                break;
             case "Reversi":
-                AppContext.setCurrentTutorial(new ReversiTutorialWidget(() -> {}));
+                this.tutorialButton = Primitive.button("tutorialstring", () -> new ReversiTutorialWidget(() -> {})); break;
-                break;
             case "Connect4":
-                AppContext.setCurrentTutorial(new Connect4TutorialWidget(() -> {}));
+                this.tutorialButton = Primitive.button("tutorialstring", () -> new Connect4TutorialWidget(() -> {})); break;
-                break;
+            default:
+                this.tutorialButton = null; break;
         }
 
 		setupLayout();
@@ -98,9 +92,13 @@ public final class GameView extends ViewWidget {
 		if (chatInput != null) {
 			add(Pos.BOTTOM_RIGHT, Primitive.vbox(chatInput));
 		}
+
+        if (tutorialButton != null) {
+            add(Pos.TOP_LEFT, tutorialButton);
+        }
 	}
 
-	public void nextPlayer(boolean isMe, String currentPlayer, String nextPlayer, String GameType) {
+	public void nextPlayer(boolean isMe, String currentPlayer, String currentMove, String nextPlayer, char GameType) {
 		Platform.runLater(() -> {
             if (!(hasSet)) {
                 playerHeader.setText(currentPlayer + " vs. " + nextPlayer);
@@ -118,8 +116,8 @@ public final class GameView extends ViewWidget {
 		new GameOverPopup(iWon, winner).show(Pos.CENTER);
 	}
 
-    private void setPlayerHeaders(boolean isMe, String currentPlayer, String nextPlayer, String GameType) {
+    private void setPlayerHeaders(boolean isMe, String currentPlayer, String nextPlayer, char GameType) {
-        if (Objects.equals(GameType, "TicTacToe")) {
+        if (GameType == 'T') {
             if (isMe) {
                 player1Header.setText("X: " + currentPlayer);
                 player2Header.setText("O: " + nextPlayer);
@@ -130,7 +128,7 @@ public final class GameView extends ViewWidget {
             }
             setPlayerInfoTTT();
         }
-        else if (Objects.equals(GameType, "Reversi")) {
+        else if (GameType == 'R') {
             if (isMe) {
                 player1Header.setText(currentPlayer);
                 player2Header.setText(nextPlayer);
@@ -157,16 +155,14 @@ public final class GameView extends ViewWidget {
     private void setPlayerInfoReversi() {
         var player1box = Primitive.hbox(
                 player1Icon,
-                player1Header,
+                player1Header
-                player1Score
         );
 
         player1box.getStyleClass().add("hboxspacing");
 
         var player2box = Primitive.hbox(
                 player2Icon,
-                player2Header,
+                player2Header
-                player2Score
         );
 
         player2box.getStyleClass().add("hboxspacing");
@@ -180,16 +176,8 @@ public final class GameView extends ViewWidget {
 
         player1Icon.setRadius(player1Header.fontProperty().map(Font::getSize).getValue());
         player2Icon.setRadius(player2Header.fontProperty().map(Font::getSize).getValue());
-        player1Icon.setFill(Color.WHITE);
+        player1Icon.setFill(Color.BLACK);
-        player2Icon.setFill(Color.BLACK);
+        player2Icon.setFill(Color.WHITE);
         add(Pos.TOP_RIGHT, playerInfo);
     }
-
-    public void setPlayer1Score(int score) {
-        player1Score.setText("(" + Integer.toString(score) + ")");
-    }
-
-    public void setPlayer2Score(int score) {
-        player2Score.setText("(" + Integer.toString(score) + ")");
-    }
 }

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

@@ -2,21 +2,20 @@ package org.toop.app.widget.view;
 
 import javafx.application.Platform;
 import org.toop.app.GameInformation;
-import org.toop.app.gameControllers.ReversiBitController;
+import org.toop.app.gameControllers.AbstractGameController;
-import org.toop.app.gameControllers.TicTacToeBitController;
+import org.toop.app.gameControllers.ReversiController;
-import org.toop.framework.game.players.LocalPlayer;
+import org.toop.app.gameControllers.TicTacToeController;
-import org.toop.framework.gameFramework.controller.GameController;
 import org.toop.framework.gameFramework.model.player.Player;
-import org.toop.framework.game.players.ArtificialPlayer;
+import org.toop.game.games.tictactoe.TicTacToeAIRSleep;
+import org.toop.game.players.ArtificialPlayer;
+import org.toop.game.players.LocalPlayer;
 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.games.reversi.ReversiAIR;
+import org.toop.game.games.tictactoe.TicTacToeAIR;
 import org.toop.app.widget.tutorial.*;
-import org.toop.game.players.ai.MiniMaxAI;
-import org.toop.game.players.ai.mcts.MCTSAI1;
-import org.toop.game.players.ai.mcts.MCTSAI3;
-import org.toop.game.players.ai.mcts.MCTSAI4;
 import org.toop.local.AppContext;
 
 import javafx.geometry.Pos;
@@ -27,7 +26,7 @@ import org.toop.local.AppSettings;
 public class LocalMultiplayerView extends ViewWidget {
 	private final GameInformation information;
 
-    private GameController gameController;
+    private AbstractGameController<?> gameController;
 
 	public LocalMultiplayerView(GameInformation.Type type) {
 		this(new GameInformation(type));
@@ -46,69 +45,68 @@ public class LocalMultiplayerView extends ViewWidget {
 				}
 			}
 
-            // TODO: Fix this temporary ass way of setting the players
+            // TODO: Fix this temporary ass way of setting the players (Only works for TicTacToe)
             Player[] players = new Player[2];
 
 			switch (information.type) {
                 case TICTACTOE:
                     if (information.players[0].isHuman) {
-                        players[0] = new LocalPlayer(information.players[0].name);
+                        players[0] = new LocalPlayer<>(information.players[0].name);
                     } else {
-                        players[0] = new ArtificialPlayer(new MCTSAI1(100), "MCTS AI");
+                        players[0] = new ArtificialPlayer<>(new TicTacToeAIRSleep(information.players[0].computerDifficulty, information.players[1].computerThinkTime), information.players[0].name);
                     }
                     if (information.players[1].isHuman) {
-                        players[1] = new LocalPlayer(information.players[1].name);
+                        players[1] = new LocalPlayer<>(information.players[1].name);
                     } else {
-                        players[1] = new ArtificialPlayer(new MiniMaxAI(9), "MiniMax AI");
+                        players[1] = new ArtificialPlayer<>(new TicTacToeAIRSleep(information.players[1].computerDifficulty, information.players[1].computerThinkTime), information.players[1].name);
                     }
                     if (AppSettings.getSettings().getTutorialFlag() && AppSettings.getSettings().getFirstTTT()) {
                         new ShowEnableTutorialWidget(
                                 () -> new TicTacToeTutorialWidget(() -> {
-                                    gameController = new TicTacToeBitController(players);
+                                    gameController = new TicTacToeController(players);
                                     gameController.start();
                                 }),
                                 () -> Platform.runLater(() -> {
-                                    gameController = new TicTacToeBitController(players);
+                                    gameController = new TicTacToeController(players);
                                     gameController.start();
                                 }),
                                 () -> AppSettings.getSettings().setFirstTTT(false)
                         );
                     } else {
-                        gameController = new TicTacToeBitController(players);
+                        gameController = new TicTacToeController(players);
                         gameController.start();
                     }
                     break;
                 case REVERSI:
                     if (information.players[0].isHuman) {
-                        players[0] = new LocalPlayer(information.players[0].name);
+                        players[0] = new LocalPlayer<>(information.players[0].name);
                     } else {
-						// players[0] = new ArtificialPlayer(new RandomAI(), "Random AI");
+                        players[0] = new ArtificialPlayer<>(new ReversiAIR(), information.players[0].name);
-						players[0] = new ArtificialPlayer(new MCTSAI1(100), "MCTS V1 AI");
                     }
                     if (information.players[1].isHuman) {
-                        players[1] = new LocalPlayer(information.players[1].name);
+                        players[1] = new LocalPlayer<>(information.players[1].name);
                     } else {
-						players[1] = new ArtificialPlayer(new MCTSAI4(100, 8), "MCTS V4 AI");
+                        players[1] = new ArtificialPlayer<>(new ReversiAIR(), information.players[1].name);
                     }
                     if (AppSettings.getSettings().getTutorialFlag() && AppSettings.getSettings().getFirstReversi()) {
                         new ShowEnableTutorialWidget(
                                 () -> new ReversiTutorialWidget(() -> {
-                                    gameController = new ReversiBitController(players);
+                                    gameController = new ReversiController(players);
                                     gameController.start();
                                 }),
                                 () -> Platform.runLater(() -> {
-                                    gameController = new ReversiBitController(players);
+                                    gameController = new ReversiController(players);
                                     gameController.start();
                                 }),
                                 () -> AppSettings.getSettings().setFirstReversi(false)
                         );
                     } else {
-                        gameController = new ReversiBitController(players);
+                        gameController = new ReversiController(players);
                         gameController.start();
                     }
                     break;
             }
-        }, false);
+        });
 
 		var playerSection = setupPlayerSections();
 

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

@@ -10,11 +10,11 @@ public class LocalView extends ViewWidget {
 	public LocalView() {
 		var ticTacToeButton = Primitive.button("tic-tac-toe", () -> {
 			transitionNext(new LocalMultiplayerView(GameInformation.Type.TICTACTOE));
-		}, false);
+		});
 
 		var reversiButton = Primitive.button("reversi", () -> {
 			transitionNext(new LocalMultiplayerView(GameInformation.Type.REVERSI));
-		}, false);
+		});
 
 		add(Pos.CENTER, Primitive.vbox(
 			ticTacToeButton,

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

@@ -1,5 +1,6 @@
 package org.toop.app.widget.view;
 
+import org.toop.app.App;
 import org.toop.app.widget.Primitive;
 import org.toop.app.widget.complex.ViewWidget;
 import javafx.geometry.Pos;
@@ -9,24 +10,24 @@ public class MainView extends ViewWidget {
 	public MainView() {
 		var localButton = Primitive.button("local", () -> {
 			transitionNext(new LocalView());
-		}, false);
+		});
 
 		var onlineButton = Primitive.button("online", () -> {
 			transitionNext(new OnlineView());
-		}, false);
+		});
 
 		var creditsButton = Primitive.button("credits", () -> {
 			transitionNext(new CreditsView());
-		}, false);
+		});
 
 		var optionsButton = Primitive.button("options", () -> {
 			transitionNext(new OptionsView());
-		}, false);
+		});
 
 		var quitButton = Primitive.button("quit", () -> {
 			var a = new QuitPopup();
 			a.show(Pos.CENTER);
-		}, false);
+		});
 
 		add(Pos.CENTER, Primitive.vbox(
 			localButton,

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

@@ -3,17 +3,10 @@ package org.toop.app.widget.view;
 import org.toop.app.Server;
 import org.toop.app.widget.Primitive;
 import org.toop.app.widget.complex.LabeledInputWidget;
+import org.toop.app.widget.complex.LoadingWidget;
 import org.toop.app.widget.complex.ViewWidget;
 
 import javafx.geometry.Pos;
-import org.toop.framework.game.games.reversi.BitboardReversi;
-import org.toop.framework.game.games.tictactoe.BitboardTicTacToe;
-import org.toop.framework.gameFramework.model.game.TurnBasedGame;
-import org.toop.framework.networking.server.gateway.NettyGatewayServer;
-import org.toop.framework.networking.server.stores.TurnBasedGameTypeStore;
-
-import java.time.Duration;
-import java.util.concurrent.ConcurrentHashMap;
 
 public class OnlineView extends ViewWidget {
 	public OnlineView() {
@@ -29,31 +22,7 @@ public class OnlineView extends ViewWidget {
 				serverPortInput.getValue(),
 				playerNameInput.getValue()
 			);
-		}, false);
+		});
-
-		var localHostButton = Primitive.button("host!", () -> {
-
-			var tps = new TurnBasedGameTypeStore();
-			tps.register("tic-tac-toe", BitboardTicTacToe::new);
-			tps.register("reversi", BitboardReversi::new);
-
-			var a = new NettyGatewayServer(6666, tps, Duration.ofSeconds(10));
-
-			new Thread(() -> {
-				try {
-					a.start();
-				} catch (InterruptedException e) {
-					throw new RuntimeException(e);
-				}
-			}).start();
-
-			new Server(
-					"127.0.0.1",
-					"6666",
-					"host",
-					a
-			);
-		}, false, false);
 
 		add(Pos.CENTER, Primitive.vbox(
 			serverInformationHeader,
@@ -64,9 +33,7 @@ public class OnlineView extends ViewWidget {
 			playerNameInput.getNode(),
 			Primitive.separator(),
 
-			connectButton,
+			connectButton
-			Primitive.separator(),
-			localHostButton
 		));
 	}
 }

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

@@ -74,7 +74,7 @@ public class OptionsView extends ViewWidget {
 				AppSettings.getSettings().setVolume(val);
 				new EventFlow()
 					.addPostEvent(new AudioEvents.ChangeVolume(val, VolumeControl.MASTERVOLUME))
-					.postEvent();
+					.asyncPostEvent();
 			}
 		);
 
@@ -86,7 +86,7 @@ public class OptionsView extends ViewWidget {
 				AppSettings.getSettings().setFxVolume(val);
 				new EventFlow()
 					.addPostEvent(new AudioEvents.ChangeVolume(val, VolumeControl.FX))
-					.postEvent();
+					.asyncPostEvent();
 			}
 		);
 
@@ -98,7 +98,7 @@ public class OptionsView extends ViewWidget {
 				AppSettings.getSettings().setMusicVolume(val);
 				new EventFlow()
 					.addPostEvent(new AudioEvents.ChangeVolume(val, VolumeControl.MUSIC))
-					.postEvent();
+					.asyncPostEvent();
 			}
 		);
 

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

@@ -1,89 +1,47 @@
 package org.toop.app.widget.view;
 
-import javafx.collections.FXCollections;
-import javafx.css.converter.StringConverter;
-import javafx.scene.control.ComboBox;
 import org.toop.app.widget.Primitive;
 import org.toop.app.widget.complex.ViewWidget;
 
-import java.io.Reader;
-import java.util.ArrayList;
 import java.util.List;
-import java.util.Locale;
 import java.util.function.Consumer;
 
 import javafx.application.Platform;
 import javafx.geometry.Pos;
 import javafx.scene.control.Button;
 import javafx.scene.control.ListView;
-import org.toop.framework.eventbus.EventFlow;
-import org.toop.framework.eventbus.GlobalEventBus;
-import org.toop.framework.networking.connection.events.NetworkEvents;
 
 public final class ServerView extends ViewWidget {
 	private final String user;
 	private final Consumer<String> onPlayerClicked;
-	private final long clientId;
 
-	private final ComboBox<String> gameListSub;
-    private final ComboBox<String> gameListTour;
 	private final ListView<Button> listView;
-	private Button subscribeButton;
 
-	public ServerView(String user, Consumer<String> onPlayerClicked, String userName, long clientId) {
+	public ServerView(String user, Consumer<String> onPlayerClicked) {
 		this.user = user;
 		this.onPlayerClicked = onPlayerClicked;
-		this.clientId = clientId;
 
-		this.gameListSub = new ComboBox<>();
-        this.gameListTour = new ComboBox<>();
 		this.listView = new ListView<>();
 
-		setupLayout(userName);
+		setupLayout();
 	}
 
-	private void setupLayout(String userName) {
+	private void setupLayout() {
 		var playerHeader = Primitive.header(user, false);
 
-        if (userName.equals("host")) { // TODO is fragile
+		var playerListSection = Primitive.vbox(
-            var tournamentButton = Primitive.hbox(
+			playerHeader,
-                    gameListTour,
+			Primitive.separator(),
-                    Primitive.button(
+			listView
-                            "tournament",
+		);
-                            () -> GlobalEventBus.get().post(new NetworkEvents.SendCommand(clientId, "tournament", "start", gameListTour.getValue())),
-                            false,
-                            false
-                    )
-            );
 
-            add(Pos.BOTTOM_CENTER, tournamentButton);
+		add(Pos.CENTER, playerListSection);
-        } else {
-            subscribeButton = Primitive.button(
-                    "subscribe",
-                    () -> new EventFlow().addPostEvent(new NetworkEvents.SendSubscribe(clientId, gameListSub.getValue())).postEvent(),
-                    false,
-                    true
-            ); // TODO localize
 
-            var subscribe = Primitive.hbox(gameListSub, subscribeButton);
+		var disconnectButton = Primitive.button("disconnect", () -> {
+			transitionPrevious();
+		});
 
-            var playerListSection = Primitive.vbox(
+		add(Pos.BOTTOM_LEFT, Primitive.vbox(disconnectButton));
-                    playerHeader,
-                    Primitive.separator(),
-                    subscribe,
-                    listView
-            );
-
-            add(Pos.CENTER, playerListSection);
-
-            var disconnectButton = Primitive.button(
-                    "disconnect",
-					this::transitionPrevious,
-					false
-			);
-
-            add(Pos.BOTTOM_LEFT, Primitive.vbox(disconnectButton));
-        }
 	}
 
 	public void update(List<String> players) {
@@ -91,25 +49,9 @@ public final class ServerView extends ViewWidget {
 			listView.getItems().clear();
 
 			for (String player : players) {
-				var playerButton = Primitive.button(player, () -> onPlayerClicked.accept(player), false, false);
+				var playerButton = Primitive.button(player, () -> onPlayerClicked.accept(player), false);
 				listView.getItems().add(playerButton);
 			}
 		});
 	}
-
-	public void updateGameList(List<String> games) {
-		Platform.runLater(() -> {
-			gameListSub.getItems().clear();
-			gameListSub.setItems(FXCollections.observableArrayList(games));
-			gameListSub.getSelectionModel().select(0);
-
-            gameListTour.getItems().clear();
-            gameListTour.setItems(FXCollections.observableArrayList(games));
-            gameListTour.getSelectionModel().select(0);
-		});
-	}
-
-	public void reEnableButton() {
-		subscribeButton.setDisable(false);
-	}
 }

app/src/main/java/org/toop/local/AppContext.java

@@ -1,10 +1,10 @@
 package org.toop.local;
 
+import java.util.Locale;
 import java.util.MissingResourceException;
 
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
-import org.toop.app.widget.tutorial.BaseTutorialWidget;
 import org.toop.framework.resource.ResourceManager;
 import org.toop.framework.resource.resources.LocalizationAsset;
 
@@ -16,13 +16,11 @@ import javafx.beans.property.ObjectProperty;
 import javafx.beans.property.SimpleObjectProperty;
 
 public class AppContext {
-    private static final Logger logger = LogManager.getLogger(AppContext.class);
-
     private static final LocalizationAsset localization = ResourceManager.get("localization");
     private static Locale locale = Locale.forLanguageTag("en");
 
 	private static final ObjectProperty<Locale> localeProperty = new SimpleObjectProperty<>(locale);
-    private static BaseTutorialWidget tutorialWidget;
+    private static final Logger logger = LogManager.getLogger(AppContext.class);
 
     public static LocalizationAsset getLocalization() {
         return localization;
@@ -75,12 +73,4 @@ public class AppContext {
     public static StringBinding bindToKey(String key) {
         return bindToKey(key, true);
     }
-
-    public static void setCurrentTutorial(BaseTutorialWidget tutorial) {
-        AppContext.tutorialWidget = tutorial;
-    }
-
-    public static BaseTutorialWidget currentTutorial() {
-        return AppContext.tutorialWidget;
-    }
 }

app/src/main/java/org/toop/local/AppSettings.java

@@ -36,13 +36,13 @@ public class AppSettings {
 
 		new EventFlow()
 				.addPostEvent(new AudioEvents.ChangeVolume(settingsData.volume, VolumeControl.MASTERVOLUME))
-				.postEvent();
+				.asyncPostEvent();
 		new EventFlow()
 				.addPostEvent(new AudioEvents.ChangeVolume(settingsData.fxVolume, VolumeControl.FX))
-				.postEvent();
+				.asyncPostEvent();
 		new EventFlow()
 				.addPostEvent(new AudioEvents.ChangeVolume(settingsData.musicVolume, VolumeControl.MUSIC))
-				.postEvent();
+				.asyncPostEvent();
 	}
 
 	public static SettingsAsset getPath() {

framework/pom.xml

@@ -147,6 +147,7 @@
             <version>2.42.0</version>
         </dependency>
 	</dependencies>
+
 	<build>
 		<plugins>
 			<plugin>

framework/src/main/java/org/toop/framework/audio/AudioEventListener.java

@@ -5,29 +5,26 @@ import org.toop.framework.audio.interfaces.MusicManager;
 import org.toop.framework.audio.interfaces.SoundEffectManager;
 import org.toop.framework.audio.interfaces.VolumeManager;
 import org.toop.framework.eventbus.EventFlow;
-import org.toop.framework.eventbus.bus.EventBus;
+import org.toop.framework.eventbus.GlobalEventBus;
 import org.toop.framework.resource.types.AudioResource;
 
 public class AudioEventListener<T extends AudioResource, K extends AudioResource> {
-    private final EventBus eventBus;
     private final MusicManager<T> musicManager;
     private final SoundEffectManager<K> soundEffectManager;
     private final VolumeManager audioVolumeManager;
 
     public AudioEventListener(
-            EventBus eventBus,
             MusicManager<T> musicManager,
             SoundEffectManager<K> soundEffectManager,
             VolumeManager audioVolumeManager
     ) {
-        this.eventBus = eventBus;
         this.musicManager = musicManager;
         this.soundEffectManager = soundEffectManager;
         this.audioVolumeManager = audioVolumeManager;
     }
 
     public AudioEventListener<?, ?> initListeners(String buttonSoundToPlay) {
-        new EventFlow(eventBus)
+        new EventFlow()
                 .listen(AudioEvents.StopAudioManager.class, this::handleStopMusicManager, false)
                 .listen(AudioEvents.PlayEffect.class, this::handlePlaySound, false)
                 .listen(AudioEvents.SkipMusic.class, this::handleSkipSong, false)
@@ -76,7 +73,7 @@ public class AudioEventListener<T extends AudioResource, K extends AudioResource
     }
 
     private void handleGetVolume(AudioEvents.GetVolume event) {
-        eventBus.post(new AudioEvents.GetVolumeResponse(
+        GlobalEventBus.postAsync(new AudioEvents.GetVolumeResponse(
                 audioVolumeManager.getVolume(event.controlType()),
                 event.identifier()));
     }

framework/src/main/java/org/toop/framework/audio/MusicManager.java

@@ -6,7 +6,8 @@ import org.toop.framework.audio.events.AudioEvents;
 import org.toop.framework.dispatch.interfaces.Dispatcher;
 import org.toop.framework.dispatch.JavaFXDispatcher;
 import org.toop.annotations.TestsOnly;
-import org.toop.framework.eventbus.bus.EventBus;
+import org.toop.framework.eventbus.EventFlow;
+import org.toop.framework.eventbus.GlobalEventBus;
 import org.toop.framework.resource.types.AudioResource;
 
 import java.util.*;
@@ -17,7 +18,6 @@ import java.util.concurrent.TimeUnit;
 public class MusicManager<T extends AudioResource> implements org.toop.framework.audio.interfaces.MusicManager<T> {
     private static final Logger logger = LogManager.getLogger(MusicManager.class);
 
-    private final EventBus eventBus;
     private final List<T> backgroundMusic = new ArrayList<>();
     private final Dispatcher dispatcher;
     private final List<T> resources;
@@ -27,8 +27,7 @@ public class MusicManager<T extends AudioResource> implements org.toop.framework
     private ScheduledExecutorService scheduler;
 
 
-    public MusicManager(EventBus eventbus, List<T> resources, boolean shuffleMusic) {
+    public MusicManager(List<T> resources, boolean shuffleMusic) {
-        this.eventBus = eventbus;
         this.dispatcher = new JavaFXDispatcher();
         this.resources = resources;
         // Shuffle if wanting to shuffle
@@ -41,8 +40,7 @@ public class MusicManager<T extends AudioResource> implements org.toop.framework
      * {@code @TestsOnly} DO NOT USE
      */
     @TestsOnly
-    public MusicManager(EventBus eventBus, List<T> resources, Dispatcher dispatcher) {
+    public MusicManager(List<T> resources, Dispatcher dispatcher) {
-        this.eventBus = eventBus;
         this.dispatcher = dispatcher;
         this.resources = new ArrayList<>(resources);
         backgroundMusic.addAll(resources);
@@ -126,7 +124,7 @@ public class MusicManager<T extends AudioResource> implements org.toop.framework
         Runnable currentMusicTask = new Runnable() {
             @Override
             public void run() {
-                eventBus.post(new AudioEvents.PlayingMusic(track.getName(), track.currentPosition(), track.duration()));
+                GlobalEventBus.post(new AudioEvents.PlayingMusic(track.getName(), track.currentPosition(), track.duration()));
                 scheduler.schedule(this, 1, TimeUnit.SECONDS);
             }
         };

framework/src/main/java/org/toop/framework/audio/SoundEffectManager.java

@@ -2,10 +2,18 @@ package org.toop.framework.audio;
 
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
+import org.toop.framework.resource.ResourceManager;
 import org.toop.framework.resource.ResourceMeta;
 import org.toop.framework.resource.resources.BaseResource;
+import org.toop.framework.resource.resources.MusicAsset;
+import org.toop.framework.resource.resources.SoundEffectAsset;
 import org.toop.framework.resource.types.AudioResource;
 
+import javax.sound.sampled.Clip;
+import javax.sound.sampled.LineEvent;
+import javax.sound.sampled.LineUnavailableException;
+import javax.sound.sampled.UnsupportedAudioFileException;
+import java.io.IOException;
 import java.util.*;
 import java.util.stream.Collectors;
 

framework/src/main/java/org/toop/framework/audio/events/AudioEvents.java

@@ -2,6 +2,8 @@ package org.toop.framework.audio.events;
 
 import org.toop.framework.audio.VolumeControl;
 import org.toop.framework.eventbus.events.*;
+import org.toop.framework.eventbus.events.ResponseToUniqueEvent;
+import org.toop.framework.eventbus.events.UniqueEvent;
 
 public class AudioEvents extends EventsBase {
     /** Stops the audio manager. */

framework/src/main/java/org/toop/framework/audio/interfaces/SoundEffectManager.java

@@ -1,7 +1,12 @@
 package org.toop.framework.audio.interfaces;
 
+import org.toop.framework.resource.resources.SoundEffectAsset;
 import org.toop.framework.resource.types.AudioResource;
 
+import javax.sound.sampled.LineUnavailableException;
+import javax.sound.sampled.UnsupportedAudioFileException;
+import java.io.IOException;
+
 public interface SoundEffectManager<T extends AudioResource> extends AudioManager<T> {
     void play(String name, boolean loop);
     void stop(String name);

framework/src/main/java/org/toop/framework/eventbus/EventFlow.java

@@ -13,14 +13,10 @@ import org.toop.framework.SnowflakeGenerator;
 import org.toop.framework.eventbus.events.EventType;
 import org.toop.framework.eventbus.events.ResponseToUniqueEvent;
 import org.toop.framework.eventbus.events.UniqueEvent;
-import org.toop.framework.eventbus.bus.EventBus;
-import org.toop.framework.eventbus.subscriber.DefaultNamedSubscriber;
-import org.toop.framework.eventbus.subscriber.NamedSubscriber;
-import org.toop.framework.eventbus.subscriber.Subscriber;
 
 /**
  * EventFlow is a utility class for creating, posting, and optionally subscribing to events in a
- * type-safe and chainable manner. It is designed to work with the {@link EventBus}.
+ * type-safe and chainable manner. It is designed to work with the {@link GlobalEventBus}.
  *
  * <p>This class supports automatic UUID assignment for {@link UniqueEvent} events, and
  * allows filtering subscribers so they only respond to events with a specific UUID. All
@@ -35,8 +31,6 @@ public class EventFlow {
     /** Cache of constructor handles for event classes to avoid repeated reflection lookups. */
     private static final Map<Class<?>, MethodHandle> CONSTRUCTOR_CACHE = new ConcurrentHashMap<>();
 
-    private final EventBus eventBus;
-
     /** Automatically assigned UUID for {@link UniqueEvent} events. */
     private long eventSnowflake = -1;
 
@@ -44,19 +38,13 @@ public class EventFlow {
     private EventType event = null;
 
     /** The listener returned by GlobalEventBus subscription. Used for unsubscription. */
-    private final List<NamedSubscriber<?>> listeners = new ArrayList<>();
+    private final List<ListenerHandler<?>> listeners = new ArrayList<>();
 
     /** Holds the results returned from the subscribed event, if any. */
     private Map<String, ?> result = null;
 
     /** Empty constructor (event must be added via {@link #addPostEvent(Class, Object...)}). */
-    public EventFlow(EventBus eventBus) {
+    public EventFlow() {}
-        this.eventBus = eventBus;
-    }
-
-    public EventFlow() {
-        this.eventBus = GlobalEventBus.get();
-    }
 
     /**
      *
@@ -157,19 +145,21 @@ public class EventFlow {
 
             action.accept(eventClass);
 
-            if (unsubscribeAfterSuccess) unsubscribe(String.valueOf(id));
+            if (unsubscribeAfterSuccess) unsubscribe(id);
 
             this.result = eventClass.result();
         };
 
-        var subscriber = new DefaultNamedSubscriber<>(
+        // TODO Remove casts
+        var listener = new ListenerHandler<>(
+                id,
                 name,
-                event,
+                (Class<ResponseToUniqueEvent>) event,
-                newAction
+                (Consumer<ResponseToUniqueEvent>) newAction
         );
 
-        eventBus.subscribe(subscriber);
+        GlobalEventBus.subscribe(listener);
-        this.listeners.add(subscriber);
+        this.listeners.add(listener);
         return this;
     }
 
@@ -237,7 +227,7 @@ public class EventFlow {
                     TT typedEvent = (TT) uuidEvent;
                     action.accept(typedEvent);
 
-                    if (unsubscribeAfterSuccess) unsubscribe(String.valueOf(id));
+                    if (unsubscribeAfterSuccess) unsubscribe(id);
 
                     this.result = typedEvent.result();
                 } catch (ClassCastException _) {
@@ -249,13 +239,14 @@ public class EventFlow {
             }
         };
 
-        var listener = new DefaultNamedSubscriber<>(
+        var listener = new ListenerHandler<>(
+                id,
                 name,
                 (Class<TT>) action.getClass().getDeclaredMethods()[0].getParameterTypes()[0],
                 newAction
         );
 
-        eventBus.subscribe(listener);
+        GlobalEventBus.subscribe(listener);
         this.listeners.add(listener);
         return this;
     }
@@ -293,16 +284,17 @@ public class EventFlow {
         Consumer<TT> newAction = eventc -> {
             action.accept(eventc);
 
-            if (unsubscribeAfterSuccess) unsubscribe(String.valueOf(id));
+            if (unsubscribeAfterSuccess) unsubscribe(id);
         };
 
-        var listener = new DefaultNamedSubscriber<>(
+        var listener = new ListenerHandler<>(
+                        id,
                         name,
                         event,
                         newAction
                 );
 
-        eventBus.subscribe(listener);
+        GlobalEventBus.subscribe(listener);
         this.listeners.add(listener);
         return this;
     }
@@ -370,7 +362,7 @@ public class EventFlow {
             try {
                 TT typedEvent = (TT) nonUuidEvent;
                 action.accept(typedEvent);
-                if (unsubscribeAfterSuccess) unsubscribe(String.valueOf(id));
+                if (unsubscribeAfterSuccess) unsubscribe(id);
             } catch (ClassCastException _) {
                 throw new ClassCastException(
                         "Cannot cast "
@@ -379,13 +371,14 @@ public class EventFlow {
             }
         };
 
-        var listener = new DefaultNamedSubscriber<>(
+        var listener = new ListenerHandler<>(
+                id,
                 name,
                 eventClass,
                 newAction
         );
 
-        eventBus.subscribe(listener);
+        GlobalEventBus.subscribe(listener);
         this.listeners.add(listener);
         return this;
     }
@@ -408,16 +401,15 @@ public class EventFlow {
      * Posts the event added through {@link #addPostEvent}.
      */
     public EventFlow postEvent() {
-        eventBus.post(this.event);
+        GlobalEventBus.post(this.event);
         return this;
     }
 
     /**
      * Posts the event added through {@link #addPostEvent} asynchronously.
-     *
      */
     public EventFlow asyncPostEvent() {
-        GlobalEventBus.get().post(this.event);
+        GlobalEventBus.postAsync(this.event);
         return this;
     }
 
@@ -425,12 +417,28 @@ public class EventFlow {
      *
      * Unsubscribe from an event.
      *
-     * @param action The listener object to remove and unsubscribe.
+     * @param listenerObject The listener object to remove and unsubscribe.
      */
-    public void unsubscribe(Consumer<?> action) {
+    public void unsubscribe(Object listenerObject) {
         this.listeners.removeIf(handler -> {
-            if (handler.handler().equals(action)) {
+            if (handler.getListener() == listenerObject) {
-                eventBus.unsubscribe(handler);
+                GlobalEventBus.unsubscribe(handler);
+                return true;
+            }
+            return false;
+        });
+    }
+
+    /**
+     *
+     * Unsubscribe from an event.
+     *
+     * @param listenerId The id given to the {@link ListenerHandler}.
+     */
+    public void unsubscribe(long listenerId) {
+        this.listeners.removeIf(handler -> {
+            if (handler.getId() == listenerId) {
+                GlobalEventBus.unsubscribe(handler);
                 return true;
             }
             return false;
@@ -444,8 +452,8 @@ public class EventFlow {
      */
     public void unsubscribe(String name) {
         this.listeners.removeIf(handler -> {
-            if (handler.id().equals(name)) {
+            if (handler.getName().equals(name)) {
-                eventBus.unsubscribe(handler);
+                GlobalEventBus.unsubscribe(handler);
                 return true;
             }
             return false;
@@ -457,7 +465,7 @@ public class EventFlow {
      */
     public void unsubscribeAll() {
         listeners.removeIf(handler -> {
-            eventBus.unsubscribe(handler);
+            GlobalEventBus.unsubscribe(handler);
             return true;
         });
     }
@@ -495,8 +503,8 @@ public class EventFlow {
      *
      * @return Copy of the list of listeners.
      */
-    public Subscriber<?>[] getListeners() {
+    public ListenerHandler[] getListeners() {
-        return listeners.toArray(new Subscriber[0]);
+        return listeners.toArray(new ListenerHandler[0]);
     }
 
     /**

framework/src/main/java/org/toop/framework/eventbus/GlobalEventBus.java

@@ -1,57 +1,193 @@
 package org.toop.framework.eventbus;
 
+import com.lmax.disruptor.*;
+import com.lmax.disruptor.dsl.Disruptor;
+import com.lmax.disruptor.dsl.ProducerType;
+import java.util.Map;
+import java.util.concurrent.*;
+import java.util.function.Consumer;
+
 import org.apache.logging.log4j.LogManager;
-import org.toop.framework.eventbus.bus.AsyncEventBus;
+import org.apache.logging.log4j.Logger;
-import org.toop.framework.eventbus.bus.DefaultEventBus;
-import org.toop.framework.eventbus.bus.DisruptorEventBus;
-import org.toop.framework.eventbus.bus.EventBus;
 import org.toop.framework.eventbus.events.EventType;
-import org.toop.framework.eventbus.store.DefaultSubscriberStore;
+import org.toop.framework.eventbus.events.UniqueEvent;
-import org.toop.framework.eventbus.subscriber.Subscriber;
 
-import java.util.concurrent.ExecutorService;
+/**
-import java.util.concurrent.Executors;
+ * GlobalEventBus backed by the LMAX Disruptor for ultra-low latency, high-throughput event
+ * publishing.
+ */
+public final class GlobalEventBus {
+    private static final Logger logger = LogManager.getLogger(GlobalEventBus.class);
 
-public class GlobalEventBus implements AsyncEventBus {
+    /** Map of event class to type-specific listeners. */
-    private static final AsyncEventBus INSTANCE = new DefaultEventBus(
+    private static final Map<Class<?>, CopyOnWriteArrayList<ListenerHandler<?>>>
-            LogManager.getLogger(DefaultEventBus.class),
+            LISTENERS = new ConcurrentHashMap<>();
-            new DefaultSubscriberStore()
-    );
 
+    /** Map of event class to Snowflake-ID-specific listeners. */
+    private static final Map<
+                    Class<?>, ConcurrentHashMap<Long, Consumer<? extends UniqueEvent>>>
+            UUID_LISTENERS = new ConcurrentHashMap<>();
+
+    /** Disruptor ring buffer size (must be power of two). */
+    private static final int RING_BUFFER_SIZE = 1024 * 64;
+
+    /** Disruptor instance. */
+    private static final Disruptor<EventHolder> DISRUPTOR;
+
+    /** Ring buffer used for publishing events. */
+    private static final RingBuffer<EventHolder> RING_BUFFER;
+
+    static {
+        ThreadFactory threadFactory =
+                r -> {
+                    Thread t = new Thread(r, "EventBus-Disruptor");
+                    t.setDaemon(true);
+                    return t;
+                };
+
+        DISRUPTOR =
+                new Disruptor<>(
+                        EventHolder::new,
+                        RING_BUFFER_SIZE,
+                        threadFactory,
+                        ProducerType.MULTI,
+                        new BusySpinWaitStrategy());
+
+        DISRUPTOR.handleEventsWith(
+                (holder, seq, endOfBatch) -> {
+                    if (holder.event != null) {
+                        dispatchEvent(holder.event);
+                        holder.event = null;
+                    }
+                });
+
+        DISRUPTOR.start();
+        RING_BUFFER = DISRUPTOR.getRingBuffer();
+    }
+
+    /** Prevent instantiation. */
     private GlobalEventBus() {}
 
-    public static EventBus get() {
+    /** Wrapper used inside the ring buffer. */
-        return INSTANCE;
+    private static class EventHolder {
+        EventType event;
     }
 
-    @Override
+    // ------------------------------------------------------------------------
-    public void subscribe(Subscriber<? extends EventType> listener) {
+    // Subscription
-        INSTANCE.subscribe(listener);
+    // ------------------------------------------------------------------------
+    public static <T extends EventType> void subscribe(ListenerHandler<T> listener) {
+        logger.debug("Subscribing to {}: {}", listener.getListenerClass().getSimpleName(), listener.getListener().getClass().getSimpleName());
+        LISTENERS.computeIfAbsent(listener.getListenerClass(), _ -> new CopyOnWriteArrayList<>()).add(listener);
     }
 
-    @Override
+    // TODO
-    public void unsubscribe(Subscriber<? extends EventType> listener) {
+    public static <T extends UniqueEvent> void subscribeById(
-        INSTANCE.unsubscribe(listener);
+            Class<T> eventClass, long eventId, Consumer<T> listener) {
+        UUID_LISTENERS
+                .computeIfAbsent(eventClass, _ -> new ConcurrentHashMap<>())
+                .put(eventId, listener);
     }
 
-    @Override
+    public static void unsubscribe(ListenerHandler<?> listener) {
-    public <T extends EventType> void post(T event) {
+        logger.debug("Unsubscribing from {}: {}", listener.getListenerClass().getSimpleName(), listener.getListener().getClass().getSimpleName());
-        INSTANCE.post(event);
+        LISTENERS.getOrDefault(listener.getListenerClass(), new CopyOnWriteArrayList<>())
+                .remove(listener);
+        LISTENERS.entrySet().removeIf(entry -> entry.getValue().isEmpty());
     }
 
-    @Override
+    // TODO
-    public <T extends EventType> void asyncPost(T event) {
+    public static <T extends UniqueEvent> void unsubscribeById(
-        INSTANCE.asyncPost(event);
+            Class<T> eventClass, long eventId) {
+        Map<Long, Consumer<? extends UniqueEvent>> map = UUID_LISTENERS.get(eventClass);
+        if (map != null) map.remove(eventId);
     }
 
-    @Override
+    // ------------------------------------------------------------------------
-    public void shutdown() {
+    // Posting
-        INSTANCE.shutdown();
+    // ------------------------------------------------------------------------
+    public static <T extends EventType> void post(T event) {
+        dispatchEvent(event); // synchronous
     }
 
-    @Override
+    public static <T extends EventType> void postAsync(T event) {
-    public void reset() {
+        long seq = RING_BUFFER.next();
-        INSTANCE.reset();
+        try {
+            EventHolder holder = RING_BUFFER.get(seq);
+            holder.event = event;
+        } finally {
+            RING_BUFFER.publish(seq);
+        }
     }
 
+    @SuppressWarnings("unchecked")
+    private static <T extends EventType> void callListener(ListenerHandler<?> raw, EventType event) {
+        ListenerHandler<T> handler = (ListenerHandler<T>) raw;
+        Consumer<T> listener = handler.getListener();
+
+        T casted = (T) event;
+
+        listener.accept(casted);
+    }
+
+    @SuppressWarnings("unchecked")
+    private static void dispatchEvent(EventType event) {
+        Class<?> clazz = event.getClass();
+
+        logger.debug("Triggered event: {}", event.getClass().getSimpleName());
+
+        CopyOnWriteArrayList<ListenerHandler<?>> classListeners = LISTENERS.get(clazz);
+        if (classListeners != null) {
+            for (ListenerHandler<?> listener : classListeners) {
+                try {
+                    callListener(listener, event);
+                } catch (Throwable e) {
+                    e.printStackTrace();
+                }
+            }
+        }
+
+        CopyOnWriteArrayList<ListenerHandler<?>> genericListeners = LISTENERS.get(Object.class);
+        if (genericListeners != null) {
+            for (ListenerHandler<?> listener : genericListeners) {
+                try {
+                    callListener(listener, event);
+                } catch (Throwable e) {
+                     e.printStackTrace();
+                }
+            }
+        }
+
+        if (event instanceof UniqueEvent snowflakeEvent) {
+            Map<Long, Consumer<? extends UniqueEvent>> map = UUID_LISTENERS.get(clazz);
+            if (map != null) {
+                Consumer<UniqueEvent> listener =
+                        (Consumer<UniqueEvent>) map.remove(snowflakeEvent.getIdentifier());
+                if (listener != null) {
+                    try {
+                        listener.accept(snowflakeEvent);
+                    } catch (Throwable ignored) {
+                    }
+                }
+            }
+        }
+    }
+
+    // ------------------------------------------------------------------------
+    // Lifecycle
+    // ------------------------------------------------------------------------
+    public static void shutdown() {
+        DISRUPTOR.shutdown();
+        LISTENERS.clear();
+        UUID_LISTENERS.clear();
+    }
+
+    public static void reset() {
+        LISTENERS.clear();
+        UUID_LISTENERS.clear();
+    }
+
+    public static Map<Class<?>, CopyOnWriteArrayList<ListenerHandler<?>>> getAllListeners() {
+        return LISTENERS;
+    }
 }

framework/src/main/java/org/toop/framework/eventbus/ListenerHandler.java

@@ -0,0 +1,48 @@
+package org.toop.framework.eventbus;
+
+import org.toop.framework.SnowflakeGenerator;
+import org.toop.framework.eventbus.events.EventType;
+
+import java.util.function.Consumer;
+
+public class ListenerHandler<T extends EventType> {
+    private final long id;
+    private final String name;
+    private final Class<T> clazz;
+    private final Consumer<T> listener;
+
+    public ListenerHandler(long id, String name, Class<T> clazz, Consumer<T> listener) {
+        this.id = id;
+        this.name = name;
+        this.clazz = clazz;
+        this.listener = listener;
+    }
+
+    public ListenerHandler(String name, Class<T> clazz, Consumer<T> listener) {
+        this(SnowflakeGenerator.nextId(), name, clazz, listener);
+    }
+
+    public ListenerHandler(long id, Class<T> clazz, Consumer<T> listener) {
+        this(id, String.valueOf(id), clazz, listener);
+    }
+
+    public ListenerHandler(Class<T> clazz, Consumer<T> listener) {
+        this(SnowflakeGenerator.nextId(), clazz, listener);
+    }
+
+    public long getId() {
+        return id;
+    }
+
+    public Consumer<T> getListener() {
+        return listener;
+    }
+
+    public Class<T> getListenerClass() {
+        return clazz;
+    }
+
+    public String getName() {
+        return name;
+    }
+}

framework/src/main/java/org/toop/framework/eventbus/bus/AsyncEventBus.java

@@ -1,7 +0,0 @@
-package org.toop.framework.eventbus.bus;
-
-import org.toop.framework.eventbus.events.EventType;
-
-public interface AsyncEventBus extends EventBus {
-    <T extends EventType> void asyncPost(T event);
-}

framework/src/main/java/org/toop/framework/eventbus/bus/DefaultEventBus.java

@@ -1,63 +0,0 @@
-package org.toop.framework.eventbus.bus;
-
-import org.apache.logging.log4j.Logger;
-import org.toop.framework.eventbus.events.EventType;
-import org.toop.framework.eventbus.store.SubscriberStore;
-import org.toop.framework.eventbus.subscriber.Subscriber;
-
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.Executors;
-import java.util.function.Consumer;
-
-public class DefaultEventBus implements AsyncEventBus {
-    private final Logger logger;
-    private final SubscriberStore eventsHolder;
-
-    private final ExecutorService asyncExecutor = Executors.newCachedThreadPool();
-
-    public DefaultEventBus(Logger logger, SubscriberStore eventsHolder) {
-        this.logger = logger;
-        this.eventsHolder = eventsHolder;
-    }
-
-    @Override
-    public void subscribe(Subscriber<? extends EventType> subscriber) {
-        eventsHolder.add(subscriber);
-    }
-
-    @Override
-    public void unsubscribe(Subscriber<? extends EventType> subscriber) {
-        eventsHolder.remove(subscriber);
-    }
-
-    @Override
-    @SuppressWarnings("unchecked")
-    public <T extends EventType> void post(T event) {
-        Class<T> eventType = (Class<T>) event.getClass();
-        var subs = eventsHolder.get(eventType);
-        if (subs != null) {
-            for (Subscriber<?> subscriber : subs) {
-                Class<T> eventClass = (Class<T>) subscriber.event();
-                Consumer<EventType> action = (Consumer<EventType>) subscriber.handler();
-
-                action.accept(eventClass.cast(event));
-            }
-        }
-    }
-
-    @Override
-    public <T extends EventType> void asyncPost(T event) {
-        asyncExecutor.submit(() -> post(event));
-    }
-
-    @Override
-    public void shutdown() {
-        eventsHolder.reset();
-    }
-
-    @Override
-    public void reset() {
-        eventsHolder.reset();
-    }
-
-}

framework/src/main/java/org/toop/framework/eventbus/bus/DisruptorEventBus.java

@@ -1,117 +0,0 @@
-package org.toop.framework.eventbus.bus;
-
-import com.lmax.disruptor.BusySpinWaitStrategy;
-import com.lmax.disruptor.RingBuffer;
-import com.lmax.disruptor.dsl.Disruptor;
-import com.lmax.disruptor.dsl.ProducerType;
-import org.apache.logging.log4j.Logger;
-import org.toop.framework.eventbus.subscriber.Subscriber;
-import org.toop.framework.eventbus.events.EventType;
-import org.toop.framework.eventbus.store.SubscriberStore;
-
-import java.util.concurrent.ThreadFactory;
-import java.util.function.Consumer;
-
-public class DisruptorEventBus implements EventBus {
-    /** Wrapper used inside the ring buffer. */
-    private static class EventHolder<T> {
-        T event;
-    }
-
-    private final Logger logger;
-    private final SubscriberStore eventsHolder;
-
-    private final Disruptor<EventHolder<? extends EventType>> disruptor;
-    private final RingBuffer<EventHolder<? extends EventType>> ringBuffer;
-
-    public DisruptorEventBus(Logger logger, SubscriberStore eventsHolder) {
-        this.logger = logger;
-        this.eventsHolder = eventsHolder;
-
-        ThreadFactory threadFactory =
-                r -> {
-                    Thread t = new Thread(r, "EventBus-Disruptor");
-                    t.setDaemon(true);
-                    return t;
-                };
-
-        disruptor = getEventHolderDisruptor(threadFactory);
-
-        disruptor.start();
-        this.ringBuffer = disruptor.getRingBuffer();
-    }
-
-    private Disruptor<EventHolder<? extends EventType>> getEventHolderDisruptor(ThreadFactory threadFactory) {
-        int RING_BUFFER_SIZE = 1024 * 64;
-        Disruptor<EventHolder<? extends EventType>> disruptor = new Disruptor<>(
-                EventHolder::new,
-                RING_BUFFER_SIZE,
-                threadFactory,
-                ProducerType.MULTI,
-                new BusySpinWaitStrategy());
-
-        disruptor.handleEventsWith(
-                (holder, _, _) -> {
-                    if (holder.event != null) {
-                        dispatchEvent(holder.event);
-                        holder.event = null;
-                    }
-                });
-        return disruptor;
-    }
-
-    @Override
-    public void subscribe(Subscriber<? extends EventType> listener) {
-        eventsHolder.add(listener);
-    }
-
-    @Override
-    public void unsubscribe(Subscriber<? extends EventType> listener) {
-        eventsHolder.remove(listener);
-    }
-
-    @Override
-    public <T extends EventType> void post(T event) {
-        long seq = ringBuffer.next();
-        try {
-            @SuppressWarnings("unchecked")
-            EventHolder<T> holder = (EventHolder<T>) ringBuffer.get(seq);
-            holder.event = event;
-        } finally {
-            ringBuffer.publish(seq);
-        }
-    }
-
-    @Override
-    public void shutdown() {
-        disruptor.shutdown();
-        eventsHolder.reset();
-    }
-
-    @Override
-    public void reset() {
-        eventsHolder.reset();
-    }
-
-    private <T extends EventType> void dispatchEvent(T event) {
-        var classListeners = eventsHolder.get(event.getClass());
-        if (classListeners != null) {
-            for (Subscriber<?> listener : classListeners) {
-                try {
-                    callListener(listener, event);
-                } catch (Throwable e) {
-                    logger.warn("Exception while handling event: {}", event, e);
-                }
-            }
-        }
-    }
-
-
-    @SuppressWarnings("unchecked")
-    private <T> void callListener(Subscriber<?> subscriber, T event) {
-        Class<T> eventClass = (Class<T>) subscriber.event();
-        Consumer<EventType> action = (Consumer<EventType>) subscriber.handler();
-
-        action.accept((EventType) eventClass.cast(event));
-    }
-}

framework/src/main/java/org/toop/framework/eventbus/bus/EventBus.java

@@ -1,12 +0,0 @@
-package org.toop.framework.eventbus.bus;
-
-import org.toop.framework.eventbus.events.EventType;
-import org.toop.framework.eventbus.subscriber.Subscriber;
-
-public interface EventBus {
-    void subscribe(Subscriber<? extends EventType> subscriber);
-    void unsubscribe(Subscriber<? extends EventType> subscriber);
-    <T extends EventType> void post(T event);
-    void shutdown();
-    void reset();
-}

framework/src/main/java/org/toop/framework/eventbus/store/AsyncSubscriberStore.java

@@ -1,47 +0,0 @@
-package org.toop.framework.eventbus.store;
-
-import org.toop.framework.eventbus.events.EventType;
-import org.toop.framework.eventbus.subscriber.Subscriber;
-
-import java.util.concurrent.ConcurrentHashMap;
-import java.util.concurrent.ConcurrentLinkedQueue;
-
-public class AsyncSubscriberStore implements SubscriberStore {
-    private final ConcurrentHashMap<Class<? extends EventType>, ConcurrentLinkedQueue<Subscriber<? extends EventType>>> queues = new ConcurrentHashMap<>();
-    private final ConcurrentHashMap<Class<? extends EventType>, Subscriber<? extends EventType>[]> snapshots = new ConcurrentHashMap<>();
-
-    @Override
-    public void add(Subscriber<? extends EventType> sub) {
-        queues.computeIfAbsent(sub.event(), _ -> new ConcurrentLinkedQueue<>()).add(sub);
-        rebuildSnapshot(sub.event());
-    }
-
-    @Override
-    public void remove(Subscriber<? extends EventType> sub) {
-        ConcurrentLinkedQueue<Subscriber<?>> queue = queues.get(sub.event());
-        if (queue != null) {
-            queue.remove(sub);
-            rebuildSnapshot(sub.event());
-        }
-    }
-
-    @Override
-    public Subscriber<? extends EventType>[] get(Class<? extends EventType> event) {
-        return snapshots.getOrDefault(event, new Subscriber<?>[0]);
-    }
-
-    @Override
-    public void reset() {
-        queues.clear();
-        snapshots.clear();
-    }
-
-    private void rebuildSnapshot(Class<? extends EventType> event) {
-        ConcurrentLinkedQueue<Subscriber<?>> queue = queues.get(event);
-        if (queue != null) {
-            snapshots.put(event, queue.toArray(new Subscriber<?>[0]));
-        } else {
-            snapshots.put(event, new Subscriber<?>[0]);
-        }
-    }
-}

framework/src/main/java/org/toop/framework/eventbus/store/DefaultSubscriberStore.java

@@ -1,73 +0,0 @@
-package org.toop.framework.eventbus.store;
-
-import org.toop.framework.eventbus.events.EventType;
-import org.toop.framework.eventbus.subscriber.NamedSubscriber;
-import org.toop.framework.eventbus.subscriber.Subscriber;
-
-import java.util.concurrent.ConcurrentHashMap;
-
-public class DefaultSubscriberStore implements SubscriberStore {
-
-    private static final Subscriber<? extends EventType>[] EMPTY = new Subscriber<?>[0];
-
-    private final ConcurrentHashMap<Class<? extends EventType>, Subscriber<? extends EventType>[]>
-            listeners = new ConcurrentHashMap<>();
-
-    @Override
-    public void add(Subscriber<? extends EventType> sub) {
-        listeners.compute(sub.event(), (_, arr) -> {
-            if (arr == null || arr.length == 0) {
-                return new Subscriber<?>[]{sub};
-            }
-
-            int len = arr.length;
-            Subscriber<?>[] newArr = new Subscriber[len + 1];
-            System.arraycopy(arr, 0, newArr, 0, len);
-            newArr[len] = sub;
-            return newArr;
-        });
-    }
-
-    @Override
-    public void remove(Subscriber<? extends EventType> sub) {
-        listeners.computeIfPresent(sub.event(), (_, arr) -> {
-            int len = arr.length;
-
-            if (len == 1) {
-                return arr[0].equals(sub) ? null : arr;
-            }
-
-            int keep = 0;
-            for (Subscriber<?> s : arr) {
-                if (!s.equals(sub)) keep++;
-            }
-
-            if (keep == len) {
-                return arr;
-            }
-            if (keep == 0) {
-                return null;
-            }
-
-            Subscriber<?>[] newArr = new Subscriber[keep];
-            int i = 0;
-            for (Subscriber<?> s : arr) {
-                if (!s.equals(sub)) {
-                    newArr[i++] = s;
-                }
-            }
-
-            return newArr;
-        });
-    }
-
-    @Override
-    public Subscriber<? extends EventType>[] get(Class<? extends EventType> event) {
-        return listeners.getOrDefault(event, EMPTY);
-    }
-
-    @Override
-    public void reset() {
-        listeners.clear();
-    }
-}

framework/src/main/java/org/toop/framework/eventbus/store/SubscriberStore.java

@@ -1,11 +0,0 @@
-package org.toop.framework.eventbus.store;
-
-import org.toop.framework.eventbus.events.EventType;
-import org.toop.framework.eventbus.subscriber.Subscriber;
-
-public interface SubscriberStore {
-    void add(Subscriber<? extends EventType> subscriber);
-    void remove(Subscriber<? extends EventType> subscriber);
-    Subscriber<? extends EventType>[] get(Class<? extends EventType> event);
-    void reset();
-}

framework/src/main/java/org/toop/framework/eventbus/store/SyncSubscriberStore.java

@@ -1,37 +0,0 @@
-package org.toop.framework.eventbus.store;
-
-import org.toop.framework.eventbus.events.EventType;
-import org.toop.framework.eventbus.subscriber.Subscriber;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-import java.util.concurrent.ConcurrentHashMap;
-
-public class SyncSubscriberStore implements SubscriberStore {
-    private final Map<Class<? extends EventType>, List<Subscriber<? extends EventType>>> LISTENERS = new ConcurrentHashMap<>();
-    private static final Subscriber<? extends EventType>[] EMPTY = new Subscriber<?>[0];
-
-    @Override
-    public void add(Subscriber<? extends EventType> sub) {
-        LISTENERS.computeIfAbsent(sub.event(), _ -> new ArrayList<>()).add(sub);
-    }
-
-    @Override
-    public void remove(Subscriber<? extends EventType> sub) {
-        LISTENERS.getOrDefault(sub.event(), new ArrayList<>()).remove(sub);
-        LISTENERS.entrySet().removeIf(entry -> entry.getValue().isEmpty());
-    }
-
-    @Override
-    public Subscriber<? extends EventType>[] get(Class<? extends EventType> event) {
-        List<Subscriber<? extends EventType>> list = LISTENERS.get(event);
-        if (list == null || list.isEmpty()) return EMPTY;
-        return list.toArray(EMPTY);
-    }
-
-    @Override
-    public void reset() {
-        LISTENERS.clear();
-    }
-}

framework/src/main/java/org/toop/framework/eventbus/subscriber/DefaultNamedSubscriber.java

@@ -1,8 +0,0 @@
-package org.toop.framework.eventbus.subscriber;
-
-import org.toop.framework.eventbus.events.EventType;
-
-import java.util.function.Consumer;
-
-public record DefaultNamedSubscriber<K extends EventType>(String id, Class<K> event, Consumer<K> handler)
-        implements NamedSubscriber<K> {}

framework/src/main/java/org/toop/framework/eventbus/subscriber/DefaultSubscriber.java

@@ -1,8 +0,0 @@
-package org.toop.framework.eventbus.subscriber;
-
-import org.toop.framework.eventbus.events.EventType;
-
-import java.util.function.Consumer;
-
-public record DefaultSubscriber<K extends EventType>(Class<K> event, Consumer<K> handler) implements Subscriber<K> {}
-

framework/src/main/java/org/toop/framework/eventbus/subscriber/HasId.java

@@ -1,5 +0,0 @@
-package org.toop.framework.eventbus.subscriber;
-
-public interface HasId<ID> {
-    ID id();
-}

framework/src/main/java/org/toop/framework/eventbus/subscriber/IdSubscriber.java

@@ -1,5 +0,0 @@
-package org.toop.framework.eventbus.subscriber;
-
-import org.toop.framework.eventbus.events.EventType;
-
-public interface IdSubscriber<K extends EventType> extends Subscriber<K>, HasId<Long> {}

framework/src/main/java/org/toop/framework/eventbus/subscriber/LongIdSubscriber.java

@@ -1,8 +0,0 @@
-package org.toop.framework.eventbus.subscriber;
-
-import org.toop.framework.eventbus.events.EventType;
-
-import java.util.function.Consumer;
-
-public record LongIdSubscriber<K extends EventType>(Long id, Class<K> event, Consumer<K> handler)
-        implements IdSubscriber<K> {}

framework/src/main/java/org/toop/framework/eventbus/subscriber/NamedSubscriber.java

@@ -1,5 +0,0 @@
-package org.toop.framework.eventbus.subscriber;
-
-import org.toop.framework.eventbus.events.EventType;
-
-public interface NamedSubscriber<K extends EventType> extends Subscriber<K>, HasId<String> {}

framework/src/main/java/org/toop/framework/eventbus/subscriber/Subscriber.java

@@ -1,10 +0,0 @@
-package org.toop.framework.eventbus.subscriber;
-
-import org.toop.framework.eventbus.events.EventType;
-
-import java.util.function.Consumer;
-
-public interface Subscriber<K extends EventType> {
-    Class<K> event();
-    Consumer<K> handler();
-}

framework/src/main/java/org/toop/framework/game/BitboardGame.java

@@ -1,113 +0,0 @@
-package org.toop.framework.game;
-
-import org.toop.framework.gameFramework.GameState;
-import org.toop.framework.gameFramework.model.game.PlayResult;
-import org.toop.framework.gameFramework.model.game.TurnBasedGame;
-import org.toop.framework.gameFramework.model.player.Player;
-
-import java.util.Arrays;
-
-// There is AI performance to be gained by getting rid of non-primitives and thus speeding up deepCopy
-public abstract class BitboardGame implements TurnBasedGame {
-	private final int columnSize;
-	private final int rowSize;
-
-	protected PlayResult state;
-
-    private Player[] players;
-
-	// long is 64 bits. Every game has a limit of 64 cells maximum.
-	protected final long[] playerBitboard;
-	protected int currentTurn = 0;
-	private final int playerCount;
-
-	public BitboardGame(int columnSize, int rowSize, int playerCount) {
-		this.columnSize = columnSize;
-		this.rowSize = rowSize;
-        this.playerCount = playerCount;
-		this.state = new PlayResult(GameState.NORMAL, -1);
-
-		this.playerBitboard = new long[playerCount];
-
-		Arrays.fill(playerBitboard, 0L);
-	}
-
-    @Override
-    public void init(Player[] players) {
-        this.players = players;
-
-        Arrays.fill(playerBitboard, 0L);
-    }
-
-	public BitboardGame(BitboardGame other) {
-		this.columnSize = other.columnSize;
-		this.rowSize = other.rowSize;
-        this.playerCount = other.playerCount;
-		this.state = other.state;
-
-		this.playerBitboard = other.playerBitboard.clone();
-		this.currentTurn = other.currentTurn;
-        this.players = other.players;
-        // TODO: Players are not deep copied, which is bad. I don't know why but deepcopying breaks it. Fix it
-        //this.players = Arrays.stream(other.players)
-        //        .map(Player::deepCopy)
-        //        .toArray(Player[]::new);
-	}
-
-	public int getColumnSize() {
-		return this.columnSize;
-	}
-
-	public int getRowSize() {
-		return this.rowSize;
-	}
-
-	public long getPlayerBitboard(int player) {
-		return this.playerBitboard[player];
-	}
-
-	public void setPlayerBitboard(int player, long bitboard) {
-		this.playerBitboard[player] = bitboard;
-	}
-
-	public int getPlayerCount() {
-		return playerBitboard.length;
-	}
-
-    public int getAmountOfTurns() { return currentTurn; }
-
-	public int getCurrentTurn() {
-		return getCurrentPlayerIndex();
-	}
-
-    public Player getPlayer(int index) {return players[index];}
-
-	public int getCurrentPlayerIndex() {
-        return currentTurn % playerBitboard.length;
-	}
-
-	public int getNextPlayer() {
-		return (currentTurn + 1) % playerBitboard.length;
-	}
-
-    public Player getCurrentPlayer(){
-        return players[getCurrentPlayerIndex()];
-    }
-
-	@Override
-	public PlayResult getState() {
-		return state;
-	}
-
-	@Override
-	public boolean isTerminal() {
-		return state.state() == GameState.WIN || state.state() == GameState.DRAW;
-	}
-
-	@Override
-    public long[] getBoard() {return this.playerBitboard;}
-
-	public void nextTurn() {
-        currentTurn++;
-	}
-}

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

@@ -1,109 +0,0 @@
-package org.toop.framework.game.gameThreads;
-
-import org.toop.framework.gameFramework.GameState;
-import org.toop.framework.gameFramework.model.game.PlayResult;
-import org.toop.framework.gameFramework.model.game.TurnBasedGame;
-import org.toop.framework.gameFramework.model.game.threadBehaviour.AbstractThreadBehaviour;
-import org.toop.framework.gameFramework.model.player.Player;
-import org.toop.framework.utils.ImmutablePair;
-import org.toop.framework.utils.Pair;
-
-import java.time.Duration;
-import java.util.concurrent.*;
-import java.util.function.Consumer;
-
-public class ServerThreadBehaviour extends AbstractThreadBehaviour implements Runnable {
-    private final Consumer<ImmutablePair<String, Integer>> onPlayerMove;
-    private final Consumer<Pair<GameState, Integer>> onGameEnd;
-
-    private final ExecutorService moveExecutor = Executors.newSingleThreadExecutor();
-
-    private final Duration timeOut;
-    /**
-     * Creates a new base behaviour for the specified game.
-     *
-     * @param game the turn-based game to control
-     */
-    public ServerThreadBehaviour(
-            TurnBasedGame game,
-            Consumer<ImmutablePair<String,
-                    Integer>> onPlayerMove,
-            Consumer<Pair<GameState, Integer>> onGameEnd,
-            Duration timeOut
-    ) {
-        this.onPlayerMove = onPlayerMove;
-        this.onGameEnd = onGameEnd;
-        this.timeOut = timeOut;
-        super(game);
-    }
-
-    private void notifyPlayerMove(ImmutablePair<String, Integer> pair) {
-        if (onPlayerMove != null) {
-            onPlayerMove.accept(pair);
-        }
-    }
-
-    private void notifyGameEnd(ImmutablePair<GameState, Integer> pair) {
-        if (onGameEnd != null) {
-            onGameEnd.accept(pair);
-        }
-    }
-
-    /** Starts the game loop in a new thread. */
-    @Override
-    public void start() {
-        if (isRunning.compareAndSet(false, true)) {
-            new Thread(this).start();
-        }
-    }
-
-    /** Stops the game loop after the current iteration. */
-    @Override
-    public void stop() {
-        isRunning.set(false);
-    }
-
-    @Override
-    public void run() {
-        while (isRunning.get()) {
-            Player currentPlayer = game.getPlayer(game.getCurrentTurn());
-
-            Future<Long> move = moveExecutor.submit(() -> currentPlayer.getMove(game.deepCopy()));
-
-            PlayResult result;
-            try {
-                long moveResult = move.get(timeOut.toMillis(), TimeUnit.MILLISECONDS);
-                result = game.play(moveResult);
-
-                GameState state = result.state();
-                notifyPlayerMove(new ImmutablePair<>(currentPlayer.getName(), Long.numberOfTrailingZeros(moveResult)));
-
-                switch (state) {
-                    case WIN, DRAW -> {
-                        isRunning.set(false);
-                        moveExecutor.shutdown();
-                        notifyGameEnd(new ImmutablePair<>(state, game.getWinner()));
-                    }
-                    case NORMAL, TURN_SKIPPED -> { /* continue normally */ }
-                    default -> {
-                        logger.error("Unexpected state {}", state);
-                        isRunning.set(false);
-                        moveExecutor.shutdown();
-                        throw new RuntimeException("Unknown state: " + state);
-                    }
-                }
-
-            } catch (InterruptedException | ExecutionException e) {
-                isRunning.set(false);
-                notifyGameEnd(new ImmutablePair<>(GameState.DRAW, 0));
-                moveExecutor.shutdown();
-                return;
-            } catch (TimeoutException e) {
-                isRunning.set(false);
-                notifyGameEnd(new ImmutablePair<>(GameState.WIN, 1+game.getWinner()%2));
-                moveExecutor.shutdown();
-                return;
-            }
-        }
-    }
-}

framework/src/main/java/org/toop/framework/game/games/reversi/BitboardReversi.java

@@ -1,377 +0,0 @@
-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;
-
-public class BitboardReversi extends BitboardGame {
-
-    public record Score(int black, int white) {}
-
-	private final long notAFile = 0xfefefefefefefefeL;
-	private final long notHFile = 0x7f7f7f7f7f7f7f7fL;
-
-	public BitboardReversi() {
-		super(8, 8, 2);
-	}
-
-	@Override
-	public void init(Player[] players) {
-		super.init(players);
-        // Black (player 0)
-        setPlayerBitboard(0, (1L << (3 + 4 * 8)) | (1L << (4 + 3 * 8)));
-
-        // White (player 1)
-        setPlayerBitboard(1, (1L << (3 + 3 * 8)) | (1L << (4 + 4 * 8)));
-	}
-
-    public BitboardReversi(BitboardReversi other) {
-        super(other);
-    }
-
-	public long getLegalMoves() {
-		long legalMoves = 0L;
-
-		final long player = getPlayerBitboard(getCurrentPlayerIndex());
-		final long opponent = getPlayerBitboard(getNextPlayer());
-
-		final long empty = ~(player | opponent);
-
-		long mask;
-		long direction;
-
-		// north
-		mask = opponent;
-		direction = (player << 8) & mask;
-
-		direction |= (direction << 8) & mask;
-		direction |= (direction << 8) & mask;
-		direction |= (direction << 8) & mask;
-		direction |= (direction << 8) & mask;
-		direction |= (direction << 8) & mask;
-		legalMoves |= (direction << 8) & empty;
-
-		// south
-		mask = opponent;
-		direction = (player >>> 8) & mask;
-
-		direction |= (direction >>> 8) & mask;
-		direction |= (direction >>> 8) & mask;
-		direction |= (direction >>> 8) & mask;
-		direction |= (direction >>> 8) & mask;
-		direction |= (direction >>> 8) & mask;
-		legalMoves |= (direction >>> 8) & empty;
-
-		// east
-		mask = opponent & notAFile;
-		direction = (player << 1) & mask;
-
-		direction |= (direction << 1) & mask;
-		direction |= (direction << 1) & mask;
-		direction |= (direction << 1) & mask;
-		direction |= (direction << 1) & mask;
-		direction |= (direction << 1) & mask;
-		legalMoves |= (direction << 1) & empty & notAFile;
-
-		// west
-		mask = opponent & notHFile;
-		direction = (player >>> 1) & mask;
-
-		direction |= (direction >>> 1) & mask;
-		direction |= (direction >>> 1) & mask;
-		direction |= (direction >>> 1) & mask;
-		direction |= (direction >>> 1) & mask;
-		direction |= (direction >>> 1) & mask;
-		legalMoves |= (direction >>> 1) & empty & notHFile;
-
-		// north-east
-		mask = opponent & notAFile;
-		direction = (player << 9) & mask;
-
-		direction |= (direction << 9) & mask;
-		direction |= (direction << 9) & mask;
-		direction |= (direction << 9) & mask;
-		direction |= (direction << 9) & mask;
-		direction |= (direction << 9) & mask;
-		legalMoves |= (direction << 9) & empty & notAFile;
-
-		// north-west
-		mask = opponent & notHFile;
-		direction = (player << 7) & mask;
-
-		direction |= (direction << 7) & mask;
-		direction |= (direction << 7) & mask;
-		direction |= (direction << 7) & mask;
-		direction |= (direction << 7) & mask;
-		direction |= (direction << 7) & mask;
-		legalMoves |= (direction << 7) & empty & notHFile;
-
-		// south-east
-		mask = opponent & notAFile;
-		direction = (player >>> 7) & mask;
-
-		direction |= (direction >>> 7) & mask;
-		direction |= (direction >>> 7) & mask;
-		direction |= (direction >>> 7) & mask;
-		direction |= (direction >>> 7) & mask;
-		direction |= (direction >>> 7) & mask;
-		legalMoves |= (direction >>> 7) & empty & notAFile;
-
-		// south-west
-		mask = opponent & notHFile;
-		direction = (player >>> 9) & mask;
-
-		direction |= (direction >>> 9) & mask;
-		direction |= (direction >>> 9) & mask;
-		direction |= (direction >>> 9) & mask;
-		direction |= (direction >>> 9) & mask;
-		direction |= (direction >>> 9) & mask;
-		legalMoves |= (direction >>> 9) & empty & notHFile;
-
-		return legalMoves;
-	}
-
-	public long getFlips(long move) {
-		long flips = 0L;
-
-		final long player = getPlayerBitboard(getCurrentPlayerIndex());
-		final long opponent = getPlayerBitboard(getNextPlayer());
-
-		long mask;
-		long direction;
-
-		// north
-		mask = opponent;
-		direction = (move << 8) & mask;
-
-		direction |= (direction << 8) & mask;
-		direction |= (direction << 8) & mask;
-		direction |= (direction << 8) & mask;
-		direction |= (direction << 8) & mask;
-		direction |= (direction << 8) & mask;
-
-		if (((direction << 8) & player) != 0) {
-			flips |= direction;
-		}
-
-		// south
-		mask = opponent;
-		direction = (move >>> 8) & mask;
-
-		direction |= (direction >>> 8) & mask;
-		direction |= (direction >>> 8) & mask;
-		direction |= (direction >>> 8) & mask;
-		direction |= (direction >>> 8) & mask;
-		direction |= (direction >>> 8) & mask;
-
-		if (((direction >>> 8) & player) != 0) {
-			flips |= direction;
-		}
-
-		// east
-		mask = opponent & notAFile;
-		direction = (move << 1) & mask;
-
-		direction |= (direction << 1) & mask;
-		direction |= (direction << 1) & mask;
-		direction |= (direction << 1) & mask;
-		direction |= (direction << 1) & mask;
-		direction |= (direction << 1) & mask;
-
-		if (((direction << 1) & player & notAFile) != 0) {
-			flips |= direction;
-		}
-
-		// west
-		mask = opponent & notHFile;
-		direction = (move >>> 1) & mask;
-
-		direction |= (direction >>> 1) & mask;
-		direction |= (direction >>> 1) & mask;
-		direction |= (direction >>> 1) & mask;
-		direction |= (direction >>> 1) & mask;
-		direction |= (direction >>> 1) & mask;
-
-		if (((direction >>> 1) & player & notHFile) != 0) {
-			flips |= direction;
-		}
-
-		// north-east
-		mask = opponent & notAFile;
-		direction = (move << 9) & mask;
-
-		direction |= (direction << 9) & mask;
-		direction |= (direction << 9) & mask;
-		direction |= (direction << 9) & mask;
-		direction |= (direction << 9) & mask;
-		direction |= (direction << 9) & mask;
-
-		if (((direction << 9) & player & notAFile) != 0) {
-			flips |= direction;
-		}
-
-		// north-west
-		mask = opponent & notHFile;
-		direction = (move << 7) & mask;
-
-		direction |= (direction << 7) & mask;
-		direction |= (direction << 7) & mask;
-		direction |= (direction << 7) & mask;
-		direction |= (direction << 7) & mask;
-		direction |= (direction << 7) & mask;
-
-		if (((direction << 7) & player & notHFile) != 0) {
-			flips |= direction;
-		}
-
-		// south-east
-		mask = opponent & notAFile;
-		direction = (move >>> 7) & mask;
-
-		direction |= (direction >>> 7) & mask;
-		direction |= (direction >>> 7) & mask;
-		direction |= (direction >>> 7) & mask;
-		direction |= (direction >>> 7) & mask;
-		direction |= (direction >>> 7) & mask;
-
-		if (((direction >>> 7) & player & notAFile) != 0) {
-			flips |= direction;
-		}
-
-		// south-west
-		mask = opponent & notHFile;
-		direction = (move >>> 9) & mask;
-
-		direction |= (direction >>> 9) & mask;
-		direction |= (direction >>> 9) & mask;
-		direction |= (direction >>> 9) & mask;
-		direction |= (direction >>> 9) & mask;
-		direction |= (direction >>> 9) & mask;
-
-		if (((direction >>> 9) & player & notHFile) != 0) {
-			flips |= direction;
-		}
-
-		return flips;
-	}
-
-    @Override
-    public BitboardReversi deepCopy() {return new BitboardReversi(this);}
-
-	public PlayResult play(long move) {
-		final long flips = getFlips(move);
-
-		long player = getPlayerBitboard(getCurrentPlayerIndex());
-		long opponent = getPlayerBitboard(getNextPlayer());
-
-		player |= move | flips;
-		opponent &= ~flips;
-
-		setPlayerBitboard(getCurrentPlayerIndex(), player);
-		setPlayerBitboard(getNextPlayer(), opponent);
-
-		nextTurn();
-
-		final long nextLegalMoves = getLegalMoves();
-
-		if (nextLegalMoves == 0) {
-			nextTurn();
-
-			final long skippedLegalMoves = getLegalMoves();
-
-			if (skippedLegalMoves == 0) {
-				int winner = getWinner();
-
-				if (winner == -1) {
-					state = new PlayResult(GameState.DRAW, -1);
-					return state;
-				}
-
-				state = new PlayResult(GameState.WIN, winner);
-				return state;
-			}
-
-			state = new PlayResult(GameState.TURN_SKIPPED, getCurrentPlayerIndex());
-			return state;
-		}
-
-		state = new PlayResult(GameState.NORMAL, getCurrentPlayerIndex());
-		return state;
-	}
-
-	public Score getScore() {
-		return new Score(
-			Long.bitCount(getPlayerBitboard(0)),
-			Long.bitCount(getPlayerBitboard(1))
-		);
-	}
-
-    public int getWinner(){
-        final long black = getPlayerBitboard(0);
-        final long white = getPlayerBitboard(1);
-
-        final int blackCount = Long.bitCount(black);
-        final int whiteCount = Long.bitCount(white);
-
-        if (blackCount == whiteCount){
-            return -1;
-        }
-        else if (blackCount > whiteCount){
-            return 0;
-        }
-        else {
-            return 1;
-        }
-    }
-
-	@Override
-	public float rateMove(long move) {
-		final long corners = 0x8100000000000081L;
-
-		if ((move & corners) != 0L) {
-			return 0.4f;
-		}
-
-		final long xSquares = 0x0042000000004200L;
-
-		if ((move & xSquares) != 0) {
-			return -0.4f;
-		}
-
-		final long cSquares = 0x4281000000008142L;
-
-		if ((move & cSquares) != 0) {
-			return -0.1f;
-		}
-
-		return 0.0f;
-	}
-
-	@Override
-	public long heuristicMove(long legalMoves) {
-		long bestMove = 0L;
-		float bestMoveRate = Float.NEGATIVE_INFINITY;
-
-		while (legalMoves != 0L) {
-			final long move = legalMoves & -legalMoves;
-			final float moveRate = rateMove(move);
-
-			if (moveRate > bestMoveRate) {
-				bestMove = move;
-				bestMoveRate = moveRate;
-			}
-
-			legalMoves &= ~move;
-		}
-
-		return bestMove;
-	}
-
-	@Override
-	public void setFrom(long player1, long player2, int turn) {
-		this.playerBitboard[0] = player1;
-		this.playerBitboard[1] = player2;
-		this.currentTurn = turn;
-	}
-}

framework/src/main/java/org/toop/framework/game/games/tictactoe/BitboardTicTacToe.java

@@ -1,128 +0,0 @@
-package org.toop.framework.game.games.tictactoe;
-
-import org.toop.framework.gameFramework.GameState;
-import org.toop.framework.gameFramework.model.game.PlayResult;
-import org.toop.framework.gameFramework.model.game.TurnBasedGame;
-import org.toop.framework.gameFramework.model.player.Player;
-import org.toop.framework.game.BitboardGame;
-
-public class BitboardTicTacToe extends BitboardGame {
-	private final long[] winningLines = {
-		0b111000000L, // top row
-		0b000111000L, // middle row
-		0b000000111L, // bottom row
-		0b100100100L, // left column
-		0b010010010L, // middle column
-		0b001001001L, // right column
-		0b100010001L, // diagonal
-		0b001010100L  // anti-diagonal
-	};
-
-	public BitboardTicTacToe() {
-		super(3, 3, 2);
-	}
-
-	@Override
-	public void init(Player[] players) {
-		super.init(players);
-	}
-
-    public BitboardTicTacToe(BitboardTicTacToe other) {
-        super(other);
-    }
-
-    public long getLegalMoves() {
-		final long xBitboard = getPlayerBitboard(0);
-		final long oBitboard = getPlayerBitboard(1);
-
-		final long taken = (xBitboard | oBitboard);
-		return (~taken) & 0x1ffL;
-	}
-
-    public int getWinner(){
-        return getCurrentPlayerIndex();
-    }
-
-	public PlayResult play(long move) {
-        // Player loses if move is invalid
-        if ((move & getLegalMoves()) == 0 || Long.bitCount(move) != 1){
-            state = new PlayResult(GameState.WIN, getNextPlayer());
-			return state;
-        }
-
-        // Move is legal, make move
-		long playerBitboard = getPlayerBitboard(getCurrentPlayerIndex());
-		playerBitboard |= move;
-
-		setPlayerBitboard(getCurrentPlayerIndex(), playerBitboard);
-
-        // Check if current player won
-        if (checkWin(playerBitboard)) {
-			state = new PlayResult(GameState.WIN, getCurrentPlayerIndex());
-            return state;
-        }
-
-        // Proceed to next turn
-        nextTurn();
-
-
-        // Check for early draw
-		if (getLegalMoves() == 0L || checkEarlyDraw()) {
-			state = new PlayResult(GameState.DRAW, -1);
-			return state;
-		}
-
-        // Nothing weird happened, continue on as normal
-		state = new PlayResult(GameState.NORMAL, -1);
-		return state;
-	}
-
-	private boolean checkWin(long board) {
-		for (final long line : winningLines) {
-			if ((board & line) == line) {
-				return true;
-			}
-		}
-
-		return false;
-	}
-
-	private boolean checkEarlyDraw() {
-		final long xBitboard = getPlayerBitboard(0);
-		final long oBitboard = getPlayerBitboard(1);
-
-		final long taken = (xBitboard | oBitboard);
-		final long empty = (~taken) & 0x1FFL;
-
-		for (final long line : winningLines) {
-			if (((line & xBitboard) != 0 && (line & oBitboard) != 0)) {
-				continue;
-			}
-
-			if ((line & empty) != 0) {
-				return false;
-			}
-		}
-
-		return true;
-	}
-
-    @Override
-    public BitboardTicTacToe deepCopy() {
-        return new BitboardTicTacToe(this);
-    }
-
-	@Override
-	public float rateMove(long move) {
-		return 0.0f;
-	}
-
-	@Override
-	public long heuristicMove(long legalMoves) {
-		return legalMoves;
-	}
-
-	@Override
-	public void setFrom(long player1, long player2, int turn) {
-	}
-}

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

@@ -1,108 +0,0 @@
-package org.toop.framework.game.players;
-
-import org.toop.framework.gameFramework.model.game.TurnBasedGame;
-import org.toop.framework.gameFramework.model.player.AbstractPlayer;
-
-import java.util.concurrent.CompletableFuture;
-import java.util.concurrent.ExecutionException;
-
-/**
- * Represents a local player who provides moves manually.
- *
- * @param <T> the type of turn-based game
- */
-public class LocalPlayer extends AbstractPlayer {
-
-    private CompletableFuture<Long> LastMove = new CompletableFuture<>();
-
-    /**
-     * Creates a new local player with the given name.
-     *
-     * @param name the player's name
-     */
-    public LocalPlayer(String name) {
-        super(name);
-    }
-
-    /**
-     * Creates a copy of another local player.
-     *
-     * @param other the player to copy
-     */
-    public LocalPlayer(LocalPlayer other) {
-        super(other);
-        this.LastMove = other.LastMove;
-    }
-
-    /**
-     * Waits for and returns the player's next legal move.
-     *
-     * @param gameCopy a copy of the current game
-     * @return the chosen move
-     */
-    @Override
-    protected long determineMove(TurnBasedGame gameCopy) {
-        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;
-    }
-
-    /**
-     * Sets the player's last move.
-     *
-     * @param move the move to set
-     */
-    public void setLastMove(long move) {
-        LastMove.complete(move);
-    }
-
-    /**
-     * Waits for the next move from the player.
-     *
-     * @return the chosen move or 0 if interrupted
-     */
-    private long getLastMove() {
-        LastMove = new CompletableFuture<>(); // Reset the future
-        try {
-            return LastMove.get();
-        } catch (ExecutionException | InterruptedException e) {
-            return 0;
-        }
-    }
-
-    /**
-     * Creates a deep copy of this local player.
-     *
-     * @return a copy of this player
-     */
-    @Override
-    public LocalPlayer deepCopy() {
-        return new LocalPlayer(this);
-    }
-
-    /*public void register() {
-        // Listening to PlayerAttemptedMove
-        new EventFlow().listen(GUIEvents.PlayerAttemptedMove.class, event -> {
-            if (!LastMove.isDone()) {
-                LastMove.complete(event.move()); // complete the future
-            }
-        }, true); // auto-unsubscribe
-    }
-
-    // This blocks until the next move arrives
-    public int take() throws ExecutionException, InterruptedException {
-        int move = LastMove.get(); // blocking
-        LastMove = new CompletableFuture<>(); // reset for next move
-        return move;
-    }*/
-}

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

@@ -1,51 +0,0 @@
-package org.toop.framework.game.players;
-
-import org.toop.framework.gameFramework.model.game.TurnBasedGame;
-import org.toop.framework.gameFramework.model.player.AbstractPlayer;
-import org.toop.framework.gameFramework.model.player.Player;
-
-/**
- * Represents a player that participates online.
- *
- * @param <T> the type of turn-based game
- */
-public class OnlinePlayer extends AbstractPlayer {
-
-    /**
-     * Creates a new online player with the given name.
-     *
-     * @param name the name of the player
-     */
-    public OnlinePlayer(String name) {
-        super(name);
-    }
-
-    /**
-     * Creates a copy of another online player.
-     *
-     * @param other the player to copy
-     */
-    public OnlinePlayer(OnlinePlayer other) {
-        super(other);
-    }
-
-    /**
-     * {@inheritDoc}
-     * <p>
-     * This method is not supported for online players.
-     *
-     * @throws UnsupportedOperationException always
-     */
-    @Override
-    protected long determineMove(TurnBasedGame gameCopy) {
-        throw new UnsupportedOperationException("An online player does not support determining move");
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    public Player deepCopy() {
-        return new OnlinePlayer(this);
-    }
-}

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

@@ -1,36 +0,0 @@
-package org.toop.framework.game.players;
-
-import org.toop.framework.gameFramework.model.game.TurnBasedGame;
-import org.toop.framework.gameFramework.model.player.AbstractPlayer;
-import org.toop.framework.gameFramework.model.player.Player;
-import org.toop.framework.networking.server.client.NettyClient;
-
-import java.util.concurrent.CompletableFuture;
-import java.util.concurrent.ExecutionException;
-
-public class ServerPlayer extends AbstractPlayer {
-    private NettyClient client;
-    private CompletableFuture<Long> lastMove;
-
-    public ServerPlayer(NettyClient client) {
-        super(client.name());
-        this.client = client;
-    }
-
-    public void setMove(long move) {
-        lastMove.complete(move);
-    }
-
-    @Override
-    public Player deepCopy() {
-        return null;
-    }
-
-    @Override
-    public long determineMove(TurnBasedGame game) {
-        lastMove = new CompletableFuture<>();
-
-        client.send("SVR GAME YOURTURN {TURNMESSAGE: \"<bericht voor deze beurt>\"}");
-        return lastMove.join();
-    }
-}

framework/src/main/java/org/toop/framework/gameFramework/GameState.java

@@ -4,13 +4,13 @@ package org.toop.framework.gameFramework;
  * Represents the current state of a turn-based game.
  */
 public enum GameState {
-    /** OnlineTurnBasedGame is ongoing and no special condition applies. */
+    /** Game is ongoing and no special condition applies. */
     NORMAL,
 
-    /** OnlineTurnBasedGame ended in a draw. */
+    /** Game ended in a draw. */
     DRAW,
 
-    /** OnlineTurnBasedGame ended with a win for a player. */
+    /** Game ended with a win for a player. */
     WIN,
 
     /** Next player's turn was skipped. */

framework/src/main/java/org/toop/framework/gameFramework/LongPairConsumer.java

@@ -1,6 +0,0 @@
-package org.toop.framework.gameFramework;
-
-@FunctionalInterface
-public interface LongPairConsumer {
-    void accept(long a, long b);
-}

framework/src/main/java/org/toop/framework/gameFramework/controller/GameController.java

@@ -1,23 +0,0 @@
-package org.toop.framework.gameFramework.controller;
-
-import org.toop.framework.networking.connection.events.NetworkEvents;
-
-public interface GameController {
-    /** Called when it is this player's turn to make a move. */
-    void onYourTurn(NetworkEvents.YourTurnResponse event);
-
-    /** Called when a move from another player is received. */
-    void onMoveReceived(NetworkEvents.GameMoveResponse event);
-
-    /** Called when the game has finished, with the final result. */
-    void gameFinished(NetworkEvents.GameResultResponse event);
-
-    void start();
-
-    void stop();
-
-    /** Called to refresh or update the game UI. */
-    void updateUI();
-
-    void sendMove(long clientId, long move);
-}

framework/src/main/java/org/toop/framework/gameFramework/controller/UpdatesGameUI.java

@@ -0,0 +1,10 @@
+package org.toop.framework.gameFramework.controller;
+
+/**
+ * Interface for classes that can trigger a UI update.
+ */
+public interface UpdatesGameUI {
+
+    /** Called to refresh or update the game UI. */
+    void updateUI();
+}

framework/src/main/java/org/toop/framework/gameFramework/model/game/AbstractGame.java

@@ -0,0 +1,108 @@
+package org.toop.framework.gameFramework.model.game;
+
+import org.toop.framework.gameFramework.model.player.Player;
+
+import java.util.Arrays;
+
+public abstract class AbstractGame<T extends TurnBasedGame<T>> implements TurnBasedGame<T> {
+    private final int playerCount;  // How many players are playing
+    private final Player<T>[] players;
+    private int turn = 0;           // What turn it is in the game
+
+    /** Constant representing an empty position on the board. */
+    public static final int EMPTY = -1;
+
+    /** Number of rows in the game board. */
+    private final int rowSize;
+
+    /** Number of columns in the game board. */
+    private final int columnSize;
+
+    /** The game board stored as a one-dimensional array. */
+    private final int[] board;
+
+
+
+    protected AbstractGame(int rowSize, int columnSize, int playerCount, Player<T>[] players) {
+        assert rowSize > 0 && columnSize > 0;
+
+        this.rowSize = rowSize;
+        this.columnSize = columnSize;
+
+        this.players = players;
+
+        board = new int[rowSize * columnSize];
+        Arrays.fill(board, EMPTY);
+
+        this.playerCount = playerCount;
+    }
+
+    protected AbstractGame(AbstractGame<T> other){
+        this.rowSize = other.rowSize;
+        this.columnSize = other.columnSize;
+        this.board = other.board.clone();
+        this.playerCount = other.playerCount;
+        this.turn = other.turn;
+        // TODO: Make this a deep copy, add deep copy interface to Player
+        this.players = other.players;
+
+    }
+
+    public static boolean contains(int[] array, int value) {
+        // O(n)
+        for (int element : array){
+            if (element == value) return true;
+        }
+        return false;
+    }
+
+    public Player<T> getPlayer(int index) {
+        return players[index];
+    }
+
+    public int getPlayerCount(){return this.playerCount;}
+
+    protected void nextTurn() {
+        turn += 1;
+    }
+
+    public int getCurrentTurn() {
+        return turn % playerCount;
+    }
+
+    protected void setBoard(int position) {
+        setBoard(position, getCurrentTurn());
+    }
+
+    protected void setBoard(int position, int player) {
+        this.board[position] = player;
+    }
+
+    /**
+     * Returns the number of rows in the board.
+     *
+     * @return number of rows
+     */
+    public int getRowSize() {
+        return this.rowSize;
+    }
+
+    /**
+     * Returns the number of columns in the board.
+     *
+     * @return number of columns
+     */
+    public int getColumnSize() {
+        return this.columnSize;
+    }
+
+    /**
+     * Returns a copy of the current board state.
+     *
+     * @return a cloned array representing the board
+     */
+    public int[] getBoard() {
+        return this.board.clone();
+    }
+
+}

framework/src/main/java/org/toop/framework/gameFramework/model/game/DeepCopyable.java

@@ -1,5 +1,5 @@
 package org.toop.framework.gameFramework.model.game;
 
-public interface DeepCopyable<T> {
+public interface DeepCopyable<T extends TurnBasedGame<T>> {
     T deepCopy();
 }

framework/src/main/java/org/toop/framework/gameFramework/model/game/Playable.java

@@ -0,0 +1,24 @@
+package org.toop.framework.gameFramework.model.game;
+
+import org.toop.framework.gameFramework.GameState;
+
+/**
+ * Interface for turn-based games that can be played and queried for legal moves.
+ */
+public interface Playable {
+
+    /**
+     * Returns the moves that are currently valid in the game.
+     *
+     * @return an array of integers representing legal moves
+     */
+    int[] getLegalMoves();
+
+    /**
+     * Plays the given move and returns the resulting game state.
+     *
+     * @param move the move to apply
+     * @return the {@link GameState} and additional info after the move
+     */
+    PlayResult play(int move);
+}

framework/src/main/java/org/toop/framework/gameFramework/model/game/PlayerProvider.java

@@ -0,0 +1,7 @@
+package org.toop.framework.gameFramework.model.game;
+
+import org.toop.framework.gameFramework.model.player.Player;
+
+public interface PlayerProvider<T extends TurnBasedGame<T>> {
+    Player<T> getPlayer(int index);
+}

framework/src/main/java/org/toop/framework/gameFramework/model/game/SupportsOnlinePlay.java

@@ -1,4 +1,6 @@
-package org.toop.framework.gameFramework.model.game.threadBehaviour;
+package org.toop.framework.gameFramework.model.game;
+
+import org.toop.framework.networking.events.NetworkEvents;
 
 /**
  * Interface for games that support online multiplayer play.
@@ -8,11 +10,11 @@ package org.toop.framework.gameFramework.model.game.threadBehaviour;
 public interface SupportsOnlinePlay {
 
     /** Called when it is this player's turn to make a move. */
-    void onYourTurn(long clientId);
+    void onYourTurn(NetworkEvents.YourTurnResponse event);
 
     /** Called when a move from another player is received. */
-    void onMoveReceived(long move);
+    void onMoveReceived(NetworkEvents.GameMoveResponse event);
 
     /** Called when the game has finished, with the final result. */
-    void gameFinished(String condition);
+    void gameFinished(NetworkEvents.GameResultResponse event);
 }

framework/src/main/java/org/toop/framework/gameFramework/model/game/TurnBasedGame.java

@@ -1,21 +1,5 @@
 package org.toop.framework.gameFramework.model.game;
 
-import org.toop.framework.gameFramework.model.player.Player;
+public interface TurnBasedGame<T extends TurnBasedGame<T>> extends Playable, DeepCopyable<T>, PlayerProvider<T> {
-
-public interface TurnBasedGame extends DeepCopyable<TurnBasedGame> {
-    void init(Player[] players);
-    long[] getBoard();
     int getCurrentTurn();
-    int getPlayerCount();
-    Player getPlayer(int index);
-    int getWinner();
-    long getLegalMoves();
-    PlayResult play(long move);
-	PlayResult getState();
-	boolean isTerminal();
-
-	float rateMove(long move);
-	long heuristicMove(long legalMoves);
-
-	void setFrom(long player1, long player2, int turn);
 }

framework/src/main/java/org/toop/framework/gameFramework/model/game/threadBehaviour/AbstractThreadBehaviour.java

@@ -2,11 +2,10 @@ package org.toop.framework.gameFramework.model.game.threadBehaviour;
 
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
-import org.toop.framework.gameFramework.LongPairConsumer;
 import org.toop.framework.gameFramework.model.game.TurnBasedGame;
+import org.toop.framework.gameFramework.model.player.Player;
 
 import java.util.concurrent.atomic.AtomicBoolean;
-import java.util.function.Consumer;
 
 /**
  * Base class for thread-based game behaviours.
@@ -15,14 +14,13 @@ import java.util.function.Consumer;
  * a running flag, a game reference, and a logger.
  * Subclasses implement the actual game-loop logic.
  */
-public abstract class AbstractThreadBehaviour implements ThreadBehaviour {
+public abstract class AbstractThreadBehaviour<T extends TurnBasedGame<T>> implements ThreadBehaviour<T> {
-    private LongPairConsumer onSendMove;
+
-    private Runnable onUpdateUI;
     /** Indicates whether the game loop or event processing is active. */
     protected final AtomicBoolean isRunning = new AtomicBoolean();
 
     /** The game instance controlled by this behaviour. */
-    protected final TurnBasedGame game;
+    protected final T game;
 
     /** Logger for the subclass to report errors or debug info. */
     protected final Logger logger = LogManager.getLogger(this.getClass());
@@ -32,29 +30,7 @@ public abstract class AbstractThreadBehaviour implements ThreadBehaviour {
      *
      * @param game the turn-based game to control
      */
-    public AbstractThreadBehaviour(TurnBasedGame game) {
+    public AbstractThreadBehaviour(T game) {
         this.game = game;
     }
-
-    protected void updateUI(){
-        if (onUpdateUI != null) {
-            onUpdateUI.run();
-        }
-    }
-
-    protected void sendMove(long clientId, long move){
-        if (onSendMove != null) {
-            onSendMove.accept(clientId, move);
-        }
-    }
-
-    @Override
-    public void setOnUpdateUI(Runnable onUpdateUI) {
-        this.onUpdateUI = onUpdateUI;
-    }
-
-    @Override
-    public void setOnSendMove(LongPairConsumer onSendMove) {
-        this.onSendMove = onSendMove;
-    }
 }

framework/src/main/java/org/toop/framework/gameFramework/model/game/threadBehaviour/Controllable.java

@@ -0,0 +1,7 @@
+package org.toop.framework.gameFramework.model.game.threadBehaviour;
+
+public interface Controllable {
+    void start();
+
+    void stop();
+}

framework/src/main/java/org/toop/framework/gameFramework/model/game/threadBehaviour/ThreadBehaviour.java

@@ -1,21 +1,13 @@
 package org.toop.framework.gameFramework.model.game.threadBehaviour;
 
-import org.toop.framework.gameFramework.LongPairConsumer;
-import org.toop.framework.gameFramework.controller.GameController;
 import org.toop.framework.gameFramework.model.game.TurnBasedGame;
-
+import org.toop.framework.gameFramework.model.player.AbstractPlayer;
-import java.util.function.Consumer;
+import org.toop.framework.gameFramework.model.player.Player;
 
 /**
  * Strategy interface for controlling game thread behavior.
  * <p>
  * Defines how a game's execution is started, stopped, and which player is active.
  */
-public interface ThreadBehaviour {
+public interface ThreadBehaviour<T extends TurnBasedGame<T>> extends Controllable {
-    void setOnUpdateUI(Runnable onUpdateUI);
-    void setOnSendMove(LongPairConsumer onSendMove);
-    void start();
-    void stop();
-
 }
-

framework/src/main/java/org/toop/framework/gameFramework/model/player/AI.java

@@ -1,8 +0,0 @@
-package org.toop.framework.gameFramework.model.player;
-
-import org.toop.framework.gameFramework.model.game.DeepCopyable;
-import org.toop.framework.gameFramework.model.game.TurnBasedGame;
-
-public interface AI extends DeepCopyable<AI> {
-    long getMove(TurnBasedGame game);
-}

framework/src/main/java/org/toop/framework/gameFramework/model/player/AbstractAI.java

@@ -12,6 +12,6 @@ import org.toop.framework.gameFramework.model.game.TurnBasedGame;
  *
  * @param <T> the specific type of game this AI can play, extending {@link GameR}
  */
-public abstract class AbstractAI implements AI {
+public abstract class AbstractAI<T extends TurnBasedGame> implements MoveProvider<T> {
     // Concrete AI implementations should override findBestMove(T game, int depth)
 }

framework/src/main/java/org/toop/framework/gameFramework/model/player/AbstractPlayer.java

@@ -15,19 +15,16 @@ import org.toop.framework.gameFramework.model.game.TurnBasedGame;
  * specific move logic.
  * </p>
  */
-public abstract class AbstractPlayer implements Player {
+public abstract class AbstractPlayer<T extends TurnBasedGame<T>> implements Player<T> {
-    private final Logger logger = LogManager.getLogger(this.getClass());
+    private int playerIndex = -1;
+
+    private Logger logger = LogManager.getLogger(this.getClass());
 
     private final String name;
 
     protected AbstractPlayer(String name) {
-        System.out.println("Player " + name + " has been created");
         this.name = name;
     }
-
-    protected AbstractPlayer(AbstractPlayer other) {
-        this.name = other.name;
-    }
     /**
      * Determines the next move based on the provided game state.
      * <p>
@@ -40,29 +37,12 @@ public abstract class AbstractPlayer implements Player {
      * @return an integer representing the chosen move
      * @throws UnsupportedOperationException if the method is not overridden
      */
-    public final long getMove(TurnBasedGame game) {
+    public int getMove(T gameCopy) {
-        return determineMove(game.deepCopy());
+        logger.error("Method getMove not implemented.");
+        throw new UnsupportedOperationException("Not supported yet.");
     }
 
-
+    public String getName(){
-    /**
-     * Determines the player's move using a safe copy of the game.
-     * <p>
-     * This method is called by {@link #getMove(T)} and should contain
-     * the player's strategy for choosing a move.
-     *
-     * @param gameCopy a deep copy of the game
-     * @return the chosen move
-     */
-    protected abstract long determineMove(TurnBasedGame gameCopy);
-
-
-    /**
-     * Returns the player's name.
-     *
-     * @return the name
-     */
-    public String getName() {
         return this.name;
     }
 }

framework/src/main/java/org/toop/framework/gameFramework/model/player/MoveProvider.java

@@ -0,0 +1,7 @@
+package org.toop.framework.gameFramework.model.player;
+
+import org.toop.framework.gameFramework.model.game.TurnBasedGame;
+
+public interface MoveProvider<T extends TurnBasedGame> {
+    int getMove(T game);
+}

framework/src/main/java/org/toop/framework/gameFramework/model/player/NameProvider.java

@@ -0,0 +1,5 @@
+package org.toop.framework.gameFramework.model.player;
+
+public interface NameProvider {
+    String getName();
+}

framework/src/main/java/org/toop/framework/gameFramework/model/player/Player.java

@@ -1,9 +1,6 @@
 package org.toop.framework.gameFramework.model.player;
 
-import org.toop.framework.gameFramework.model.game.DeepCopyable;
 import org.toop.framework.gameFramework.model.game.TurnBasedGame;
 
-public interface Player extends DeepCopyable<Player> {
+public interface Player<T extends TurnBasedGame<T>> extends NameProvider, MoveProvider<T> {
-    String getName();
-    long getMove(TurnBasedGame game);
 }

framework/src/main/java/org/toop/framework/gameFramework/view/GUIEvents.java

@@ -10,6 +10,10 @@ import org.toop.framework.eventbus.events.GenericEvent;
  * player actions, and game completion.
  */
 public class GUIEvents extends EventsBase {
+
+    /** Event to refresh or redraw the game canvas. */
+    public record RefreshGameCanvas() implements GenericEvent {}
+
     /**
      * Event indicating the game has ended.
      *
@@ -19,8 +23,8 @@ public class GUIEvents extends EventsBase {
     public record GameEnded(boolean winOrTie, int winner) implements GenericEvent {}
 
     /** Event indicating a player has attempted a move. */
-    public record PlayerAttemptedMove(long move) implements GenericEvent {}
+    public record PlayerAttemptedMove(int move) implements GenericEvent {}
 
     /** Event indicating a player is hovering over a move (for UI feedback). */
-    public record PlayerMoveHovered(long move) implements GenericEvent {}
+    public record PlayerMoveHovered(int move) implements GenericEvent {}
 }

framework/src/main/java/org/toop/framework/networking/NetworkingClientEventListener.java

@@ -1,23 +1,22 @@
-package org.toop.framework.networking.connection;
+package org.toop.framework.networking;
 
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 import org.toop.framework.SnowflakeGenerator;
 import org.toop.framework.eventbus.EventFlow;
-import org.toop.framework.eventbus.bus.EventBus;
+import org.toop.framework.networking.events.NetworkEvents;
-import org.toop.framework.networking.connection.events.NetworkEvents;
+import org.toop.framework.networking.exceptions.ClientNotFoundException;
-import org.toop.framework.networking.connection.exceptions.ClientNotFoundException;
+import org.toop.framework.networking.interfaces.NetworkingClientManager;
-import org.toop.framework.networking.connection.interfaces.NetworkingClientManager;
 
 public class NetworkingClientEventListener {
-    private static final Logger logger = LogManager.getLogger(NetworkingClientEventListener.class);
 
+    private static final Logger logger = LogManager.getLogger(NetworkingClientEventListener.class);
     private final NetworkingClientManager clientManager;
 
     /** Starts a connection manager, to manage, connections. */
-    public NetworkingClientEventListener(EventBus eventBus, NetworkingClientManager clientManager) {
+    public NetworkingClientEventListener(NetworkingClientManager clientManager) {
         this.clientManager = clientManager;
-        new EventFlow(eventBus)
+        new EventFlow()
                 .listen(NetworkEvents.StartClient.class, this::handleStartClient, false)
                 .listen(NetworkEvents.SendCommand.class, this::handleCommand, false)
                 .listen(NetworkEvents.SendLogin.class, this::handleSendLogin, false)
@@ -41,7 +40,6 @@ public class NetworkingClientEventListener {
 
     void handleStartClient(NetworkEvents.StartClient event) {
         long clientId = SnowflakeGenerator.nextId();
-        new EventFlow().addPostEvent(new NetworkEvents.CreatedIdForClient(clientId, event.identifier())).postEvent();
         clientManager.startClient(
                 clientId,
                 event.networkingClient(),

framework/src/main/java/org/toop/framework/networking/NetworkingClientManager.java

@@ -1,4 +1,4 @@
-package org.toop.framework.networking.connection;
+package org.toop.framework.networking;
 
 import java.util.*;
 import java.util.concurrent.ConcurrentHashMap;
@@ -8,23 +8,18 @@ import java.util.concurrent.TimeUnit;
 
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
-import org.toop.framework.eventbus.EventFlow;
+import org.toop.framework.eventbus.GlobalEventBus;
-import org.toop.framework.eventbus.bus.EventBus;
+import org.toop.framework.networking.events.NetworkEvents;
-import org.toop.framework.networking.connection.events.NetworkEvents;
+import org.toop.framework.networking.exceptions.ClientNotFoundException;
-import org.toop.framework.networking.connection.exceptions.ClientNotFoundException;
+import org.toop.framework.networking.exceptions.CouldNotConnectException;
-import org.toop.framework.networking.connection.exceptions.CouldNotConnectException;
+import org.toop.framework.networking.interfaces.NetworkingClient;
-import org.toop.framework.networking.connection.interfaces.NetworkingClient;
+import org.toop.framework.networking.types.NetworkingConnector;
-import org.toop.framework.networking.connection.types.NetworkingConnector;
 
-public class NetworkingClientManager implements org.toop.framework.networking.connection.interfaces.NetworkingClientManager {
+public class NetworkingClientManager implements org.toop.framework.networking.interfaces.NetworkingClientManager {
     private static final Logger logger = LogManager.getLogger(NetworkingClientManager.class);
-
-    private final EventBus eventBus;
     private final Map<Long, NetworkingClient> networkClients = new ConcurrentHashMap<>();
 
-    public NetworkingClientManager(EventBus eventBus) {
+    public NetworkingClientManager() {}
-        this.eventBus = eventBus;
-    }
 
     private void connectHelper(
             long id,
@@ -33,16 +28,8 @@ public class NetworkingClientManager implements org.toop.framework.networking.co
             Runnable onSuccess,
             Runnable onFailure
     ) {
-
         ScheduledExecutorService scheduler = Executors.newSingleThreadScheduledExecutor();
 
-        EventFlow closeEvent = new EventFlow()
-                .listen(
-                    NetworkEvents.CloseClient.class,
-                    e -> {
-                            if (e.clientId() == id) scheduler.shutdownNow();
-                        }, "close");
-
         Runnable connectTask = new Runnable() {
             int attempts = 0;
 
@@ -59,7 +46,7 @@ public class NetworkingClientManager implements org.toop.framework.networking.co
                     nClient.connect(id, nConnector.host(), nConnector.port());
                     networkClients.put(id, nClient);
                     logger.info("New client started successfully for {}:{}", nConnector.host(), nConnector.port());
-                    eventBus.post(new NetworkEvents.ConnectTry(id, attempts, nConnector.reconnectAttempts(), true));
+                    GlobalEventBus.post(new NetworkEvents.ConnectTry(id, attempts, nConnector.reconnectAttempts(), true));
                     onSuccess.run();
                     scheduler.shutdown();
                 } catch (CouldNotConnectException e) {
@@ -67,17 +54,17 @@ public class NetworkingClientManager implements org.toop.framework.networking.co
                     if (attempts < nConnector.reconnectAttempts()) {
                         logger.warn("Could not connect to {}:{}. Retrying in {} {}",
                                 nConnector.host(), nConnector.port(), nConnector.timeout(), nConnector.timeUnit());
-                        eventBus.post(new NetworkEvents.ConnectTry(id, attempts, nConnector.reconnectAttempts(), false));
+                        GlobalEventBus.post(new NetworkEvents.ConnectTry(id, attempts, nConnector.reconnectAttempts(), false));
                         scheduler.schedule(this, nConnector.timeout(), nConnector.timeUnit());
                     } else {
                         logger.error("Failed to start client for {}:{} after {} attempts", nConnector.host(), nConnector.port(), attempts);
-                        eventBus.post(new NetworkEvents.ConnectTry(id, -1, nConnector.reconnectAttempts(), false));
+                        GlobalEventBus.post(new NetworkEvents.ConnectTry(id, -1, nConnector.reconnectAttempts(), false));
                         onFailure.run();
                         scheduler.shutdown();
                     }
                 } catch (Exception e) {
                     logger.error("Unexpected exception during startClient", e);
-                    eventBus.post(new NetworkEvents.ConnectTry(id, -1, nConnector.reconnectAttempts(), false));
+                    GlobalEventBus.post(new NetworkEvents.ConnectTry(id, -1, nConnector.reconnectAttempts(), false));
                     onFailure.run();
                     scheduler.shutdown();
                 }
@@ -85,8 +72,6 @@ public class NetworkingClientManager implements org.toop.framework.networking.co
         };
 
         scheduler.schedule(connectTask, 0, TimeUnit.MILLISECONDS);
-//
-//        closeEvent.unsubscribe("close");
     }
 
     @Override

framework/src/main/java/org/toop/framework/networking/clients/TournamentNetworkingClient.java

@@ -1,4 +1,4 @@
-package org.toop.framework.networking.connection.clients;
+package org.toop.framework.networking.clients;
 
 import io.netty.bootstrap.Bootstrap;
 import io.netty.channel.*;
@@ -11,24 +11,17 @@ import io.netty.handler.codec.string.StringEncoder;
 import io.netty.util.CharsetUtil;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
-import org.toop.framework.eventbus.bus.EventBus;
+import org.toop.framework.networking.exceptions.CouldNotConnectException;
-import org.toop.framework.networking.connection.events.NetworkEvents;
+import org.toop.framework.networking.handlers.NetworkingGameClientHandler;
-import org.toop.framework.networking.connection.exceptions.CouldNotConnectException;
+import org.toop.framework.networking.interfaces.NetworkingClient;
-import org.toop.framework.networking.connection.handlers.NetworkingGameClientHandler;
-import org.toop.framework.networking.connection.interfaces.NetworkingClient;
 
 import java.net.InetSocketAddress;
 
 public class TournamentNetworkingClient implements NetworkingClient {
     private static final Logger logger = LogManager.getLogger(TournamentNetworkingClient.class);
-
-    private final EventBus eventBus;
     private Channel channel;
-    private long clientId;
 
-    public TournamentNetworkingClient(EventBus eventBus) {
+    public TournamentNetworkingClient() {}
-        this.eventBus = eventBus;
-    }
 
     @Override
     public InetSocketAddress getAddress() {
@@ -37,7 +30,6 @@ public class TournamentNetworkingClient implements NetworkingClient {
 
     @Override
     public void connect(long clientId, String host, int port) throws CouldNotConnectException {
-        this.clientId = clientId;
         try {
             Bootstrap bootstrap = new Bootstrap();
             EventLoopGroup workerGroup = new MultiThreadIoEventLoopGroup(NioIoHandler.newFactory());
@@ -48,7 +40,7 @@ public class TournamentNetworkingClient implements NetworkingClient {
                     new ChannelInitializer<SocketChannel>() {
                         @Override
                         public void initChannel(SocketChannel ch) {
-                            NetworkingGameClientHandler handler = new NetworkingGameClientHandler(eventBus, clientId);
+                            NetworkingGameClientHandler handler = new NetworkingGameClientHandler(clientId);
 
                             ChannelPipeline pipeline = ch.pipeline();
                             pipeline.addLast(new LineBasedFrameDecoder(1024)); // split at \n
@@ -78,7 +70,6 @@ public class TournamentNetworkingClient implements NetworkingClient {
             logger.info("Connection {} sent message: '{}' ", this.channel.remoteAddress(), literalMsg);
         } else {
             logger.warn("Cannot send message: '{}', connection inactive. ", literalMsg);
-            eventBus.post(new NetworkEvents.ClosedConnection(clientId));
         }
     }
 

framework/src/main/java/org/toop/framework/networking/connection/types/ServerMessage.java

@@ -1,3 +0,0 @@
-package org.toop.framework.networking.connection.types;
-
-public record ServerMessage(String message) {}

framework/src/main/java/org/toop/framework/networking/events/NetworkEvents.java

@@ -1,18 +1,17 @@
-package org.toop.framework.networking.connection.events;
+package org.toop.framework.networking.events;
 
 import java.util.*;
 import java.util.concurrent.CompletableFuture;
 
 import org.toop.annotations.AutoResponseResult;
-import org.toop.framework.eventbus.GlobalEventBus;
 import org.toop.framework.eventbus.events.*;
-import org.toop.framework.networking.connection.interfaces.NetworkingClient;
+import org.toop.framework.networking.interfaces.NetworkingClient;
-import org.toop.framework.networking.connection.types.NetworkingConnector;
+import org.toop.framework.networking.types.NetworkingConnector;
 
 /**
  * Defines all event types related to the networking subsystem.
  * <p>
- * These events are used in conjunction with the {@link GlobalEventBus}
+ * These events are used in conjunction with the {@link org.toop.framework.eventbus.GlobalEventBus}
  * and {@link org.toop.framework.eventbus.EventFlow} to communicate between components
  * such as networking clients, managers, and listeners.
  * </p>
@@ -65,9 +64,6 @@ public class NetworkEvents extends EventsBase {
     public record GameResultResponse(long clientId, String condition)
             implements GenericEvent {}
 
-    public record TournamentResultResponse(long clientId, String gameType, String[] names, String[] scoreTypes, List<Integer[]> scores)
-            implements GenericEvent {}
-
     /** Indicates that a game move has been processed or received. */
     public record GameMoveResponse(long clientId, String player, String move, String details)
             implements GenericEvent {}
@@ -105,7 +101,7 @@ public class NetworkEvents extends EventsBase {
             implements GenericEvent {}
 
     /** Requests to accept an existing challenge. */
-    public record SendAcceptChallenge(long clientId, long challengeId)
+    public record SendAcceptChallenge(long clientId, int challengeId)
             implements GenericEvent {}
 
     /** Requests to forfeit the current game. */
@@ -170,10 +166,6 @@ public class NetworkEvents extends EventsBase {
             long identifier)
             implements UniqueEvent {}
 
-    public record CreatedIdForClient(long clientId, long identifier) implements ResponseToUniqueEvent {}
-
-    public record ConnectTry(long clientId, int amount, int maxAmount, boolean success) implements GenericEvent {}
-
     /**
      * Response confirming that a client has been successfully started.
      * <p>
@@ -189,6 +181,8 @@ public class NetworkEvents extends EventsBase {
     public record StartClientResponse(long clientId, boolean successful, long identifier)
             implements ResponseToUniqueEvent {}
 
+    public record ConnectTry(long clientId, int amount, int maxAmount, boolean success) implements GenericEvent {}
+
     /**
      * Requests reconnection of an existing client using its previous configuration.
      * <p>
@@ -222,5 +216,4 @@ public class NetworkEvents extends EventsBase {
     /** Response to a {@link ChangeAddress} event, carrying the success result. */
     public record ChangeAddressResponse(boolean successful, long identifier)
             implements ResponseToUniqueEvent {}
-
 }

framework/src/main/java/org/toop/framework/networking/exceptions/ClientNotFoundException.java

@@ -1,4 +1,4 @@
-package org.toop.framework.networking.connection.exceptions;
+package org.toop.framework.networking.exceptions;
 
 /**
  * Thrown when an operation is attempted on a networking client