kleine fuckup gefixd

added color swaps
Changed back to white starting + updated UI for it
2026-02-04 19:04:49 +00:00 · 2025-12-11 17:00:35 +01:00 · 2025-12-11 16:59:04 +01:00 · 2025-12-11 14:17:11 +01:00 · 2025-12-11 14:03:38 +01:00 · 2025-12-11 12:58:52 +01:00
81 changed files with 1239 additions and 707 deletions
--- a/.github/workflows/checks.yaml
+++ b/.github/workflows/checks.yaml
@@ -1,42 +1,42 @@
-name: Checks
+#name: Checks

-on:
-  push:
-    branches:
-      - 'main'
-  pull_request:
-    branches:
-      - 'main'
+#on:
+#  push:
+#    branches:
+#      - 'main'
+#  pull_request:
+#    branches:
+#      - '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

-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:
-    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
+#  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
--- a/app/src/main/java/org/toop/Main.java
+++ b/app/src/main/java/org/toop/Main.java
@@ -1,13 +1,6 @@
 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) {
--- a/app/src/main/java/org/toop/app/App.java
+++ b/app/src/main/java/org/toop/app/App.java
@@ -2,6 +2,7 @@ package org.toop.app;

 import javafx.application.Platform;
 import javafx.scene.input.KeyCode;
+import javafx.scene.input.KeyCodeCombination;
 import javafx.scene.input.KeyEvent;

 import org.toop.app.widget.Primitive;
@@ -14,6 +15,7 @@ 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.NetworkingClientManager;
 import org.toop.framework.resource.ResourceLoader;
@@ -32,6 +34,9 @@ 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;
@@ -45,7 +50,7 @@ public final class App extends Application {
 	}

 	@Override
-	public void start(Stage stage) throws Exception {
+	public void start(Stage stage) {
 		// Start loading localization
 		ResourceManager.loadAssets(new ResourceLoader("app/src/main/resources/localization"));
 		ResourceManager.loadAssets(new ResourceLoader("app/src/main/resources/style"));
@@ -63,8 +68,8 @@ public final class App extends Application {

 		scene.getRoot();

-        stage.setMinWidth(1080);
-        stage.setMinHeight(720);
+        stage.setMinWidth(1200);
+        stage.setMinHeight(800);
 		stage.setOnCloseRequest(event -> {
 			event.consume();
 			quit();
@@ -106,26 +111,30 @@ 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");

-		// Start loading assets
-		new Thread(() -> ResourceManager.loadAssets(new ResourceLoader("app/src/main/resources/assets")))
-				.start();
+		ExecutorService executor = Executors.newSingleThreadExecutor();
+		try {
+			executor.submit(
+				() -> ResourceManager.loadAssets(new ResourceLoader("app/src/main/resources/assets")
+			));
+		} finally {
+			executor.shutdown();
+		}

 		stage.show();

@@ -137,9 +146,20 @@ public final class App extends Application {
 				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()) {
@@ -154,8 +174,14 @@ public final class App extends Application {

 	private void setOnLoadingSuccess(LoadingWidget loading) {
 		loading.setOnSuccess(() -> {
-			initSystems();
-			AppSettings.applyMusicVolumeSettings();
+
+            try {
+                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());
@@ -172,36 +198,55 @@ public final class App extends Application {
 		});
 	}

-	private void initSystems() { // TODO Move to better place
-		new Thread(() -> new NetworkingClientEventListener(new NetworkingClientManager())).start();
+	private void initSystems() throws InterruptedException { // TODO Move to better place

-		new Thread(() -> {
-			MusicManager<MusicAsset> musicManager =
-					new MusicManager<>(ResourceManager.getAllOfTypeAndRemoveWrapper(MusicAsset.class), true);
+		final int THREAD_COUNT = 2;
+		CountDownLatch latch = new CountDownLatch(THREAD_COUNT);

-			SoundEffectManager<SoundEffectAsset> soundEffectManager =
-					new SoundEffectManager<>(ResourceManager.getAllOfType(SoundEffectAsset.class));
+		@SuppressWarnings("resource")
+		ExecutorService threads = Executors.newFixedThreadPool(THREAD_COUNT);

-			AudioVolumeManager audioVolumeManager = new AudioVolumeManager()
-					.registerManager(VolumeControl.MASTERVOLUME, musicManager)
-					.registerManager(VolumeControl.MASTERVOLUME, soundEffectManager)
-					.registerManager(VolumeControl.FX, soundEffectManager)
-					.registerManager(VolumeControl.MUSIC, musicManager);
+		try {

-			new AudioEventListener<>(
-					musicManager,
-					soundEffectManager,
-					audioVolumeManager
-			).initListeners("medium-button-click.wav");
+			threads.submit(() -> {
+				new NetworkingClientEventListener(
+						GlobalEventBus.get(),
+						new NetworkingClientManager(GlobalEventBus.get()));

-		}).start();
+				latch.countDown();
+			});

-		// Threads must be ready, before continue, TODO use latch instead
-        try {
-            Thread.sleep(200);
-        } catch (InterruptedException e) {
-            throw new RuntimeException(e);
-        }
+			threads.submit(() -> {
+				MusicManager<MusicAsset> musicManager =
+						new MusicManager<>(
+								GlobalEventBus.get(),
+								ResourceManager.getAllOfTypeAndRemoveWrapper(MusicAsset.class),
+								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() {
--- a/app/src/main/java/org/toop/app/Server.java
+++ b/app/src/main/java/org/toop/app/Server.java
@@ -12,6 +12,7 @@ import org.toop.app.widget.popup.SendChallengePopup;
 import org.toop.app.widget.view.ServerView;
 import org.toop.framework.eventbus.EventFlow;
 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.clients.TournamentNetworkingClient;
 import org.toop.framework.networking.events.NetworkEvents;
@@ -20,7 +21,7 @@ import org.toop.game.games.reversi.BitboardReversi;
 import org.toop.game.games.tictactoe.BitboardTicTacToe;
 import org.toop.game.players.ArtificialPlayer;
 import org.toop.game.players.OnlinePlayer;
-import org.toop.game.players.RandomAI;
+import org.toop.game.players.ai.RandomAI;
 import org.toop.local.AppContext;

 import java.util.List;
@@ -31,6 +32,7 @@ import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicBoolean;

 public final class Server {
+    // TODO: Keep track of listeners. Remove them on Server connection close so reference is deleted.
 	private String user = "";
 	private long clientId = -1;

@@ -87,11 +89,11 @@ public final class Server {
                Primitive.text("connecting"), 0, 0, reconnectAttempts, true, true
        );

-		WidgetContainer.getCurrentView().transitionNext(loading);
+		WidgetContainer.getCurrentView().transitionNextCustom(loading, "disconnect", this::disconnect);

 		var a = new EventFlow()
 			.addPostEvent(NetworkEvents.StartClient.class,
-				new TournamentNetworkingClient(),
+				new TournamentNetworkingClient(GlobalEventBus.get()),
 				new NetworkingConnector(ip, parsedPort, reconnectAttempts, 1, TimeUnit.SECONDS)
 			);

@@ -104,8 +106,9 @@ public final class Server {
            );
        });

-		a.onResponse(NetworkEvents.StartClientResponse.class, e -> {
+		a.onResponse(NetworkEvents.CreatedIdForClient.class, e -> clientId = e.clientId(), true);

+		a.onResponse(NetworkEvents.StartClientResponse.class, e -> {
 			if (!e.successful()) {
 				return;
 			}
@@ -117,7 +120,6 @@ public final class Server {
 			a.unsubscribe("startclient");

 			this.user = user;
-			clientId = e.clientId();

 			new EventFlow().addPostEvent(new NetworkEvents.SendLogin(clientId, user)).postEvent();

@@ -128,21 +130,24 @@ public final class Server {

 		}, false, "startclient")
 				.listen(
-                        NetworkEvents.ConnectTry.class,
-                        e -> Platform.runLater(
-                                () -> {
-                                    try {
-                                        loading.setAmount(e.amount());
-                                        if (e.amount() >= loading.getMaxAmount()) {
-                                            loading.triggerFailure();
-                                        }
-                                    } catch (Exception ex) {
-                                        throw new RuntimeException(ex);
-                                    }
-                                }
-                        ),
-                        false, "connecting"
-                )
+						NetworkEvents.ConnectTry.class,
+						e -> {
+							if (clientId != e.clientId()) return;
+							Platform.runLater(
+									() -> {
+										try {
+											loading.setAmount(e.amount());
+											if (e.amount() >= loading.getMaxAmount()) {
+												loading.triggerFailure();
+											}
+										} catch (Exception ex) {
+											throw new RuntimeException(ex);
+										}
+									}
+							);
+						},
+						false, "connecting"
+				)
 				.postEvent();

 		a.listen(NetworkEvents.ChallengeResponse.class, this::handleReceivedChallenge, false, "challenge")
@@ -218,7 +223,7 @@ public final class Server {
                    Player<BitboardReversi>[] players = new Player[2];
                    players[(myTurn + 1) % 2] = new OnlinePlayer<>(response.opponent());
                    players[myTurn] = new ArtificialPlayer<>(new RandomAI<BitboardReversi>(), user);
-                    gameController = new ReversiBitController(players);}
+                    gameController = new ReversiBitController(players, false);}
                default -> new ErrorPopup("Unsupported game type.");

            }
--- a/app/src/main/java/org/toop/app/canvas/BitGameCanvas.java
+++ b/app/src/main/java/org/toop/app/canvas/BitGameCanvas.java
@@ -108,6 +108,7 @@ public abstract class BitGameCanvas<T extends TurnBasedGame<T>> implements GameC
        }
    }

+
 	private void render() {
 		graphics.setFill(backgroundColor);
 		graphics.fillRect(0, 0, width, height);
--- a/app/src/main/java/org/toop/app/canvas/BitLegalMoveDrawer.java
+++ b/app/src/main/java/org/toop/app/canvas/BitLegalMoveDrawer.java
@@ -0,0 +1,5 @@
+package org.toop.app.canvas;
+
+public interface BitLegalMoveDrawer {
+    void showLegalMove(long move, int currentPlayerIndex);
+}
--- a/app/src/main/java/org/toop/app/canvas/ReversiBitCanvas.java
+++ b/app/src/main/java/org/toop/app/canvas/ReversiBitCanvas.java
@@ -4,12 +4,15 @@ import javafx.scene.paint.Color;
 import org.toop.app.App;
 import org.toop.game.games.reversi.BitboardReversi;

-import java.util.Arrays;
-import java.util.function.Consumer;
+public class ReversiBitCanvas extends BitGameCanvas<BitboardReversi> implements BitLegalMoveDrawer {

-public class ReversiBitCanvas extends BitGameCanvas<BitboardReversi> {
-    public ReversiBitCanvas() {
+    private final boolean switchColors;
+    private final boolean local;
+
+    public ReversiBitCanvas(boolean switchColors, boolean local) {
        super(Color.GRAY, new Color(0f, 0.4f, 0.2f, 1f), (App.getHeight() / 4) * 3, (App.getHeight() / 4) * 3, 8, 8, 5, true);
+        this.switchColors = switchColors;
+        this.local = local;
        canvas.setOnMouseMoved(event -> {
            double mouseX = event.getX();
            double mouseY = event.getY();
@@ -36,7 +39,39 @@ public class ReversiBitCanvas extends BitGameCanvas<BitboardReversi> {
    public void redraw(BitboardReversi gameCopy) {
        clearAll();
        long[] board = gameCopy.getBoard();
-        loopOverBoard(board[0], (i) -> drawDot(Color.WHITE, i));
-        loopOverBoard(board[1], (i) -> drawDot(Color.BLACK, i));
+        if (switchColors && local) {
+            loopOverBoard(board[0], (i) -> drawDot(Color.BLACK, i));
+            loopOverBoard(board[1], (i) -> drawDot(Color.WHITE, i));
+        } else {
+            loopOverBoard(board[0], (i) -> drawDot(Color.WHITE, i));
+            loopOverBoard(board[1], (i) -> drawDot(Color.BLACK, i));
+        }
+    }
+
+    @Override
+    public void showLegalMove(long move, int currentPlayerIndex) {
+        int idx = Long.numberOfTrailingZeros(move);
+        drawLegalMove(idx, currentPlayerIndex);
+    }
+
+    public void drawLegalMove(int cell, int player) {
+        Color innerColor;
+        if (switchColors) {
+            if (player == 0) {
+                innerColor = new Color(0.0f, 0.0f, 0.0f, 0.6f);
+            }
+            else {
+                innerColor = new Color(1.0f, 1.0f, 1.0f, 0.75f);
+            }
+            this.drawInnerDot(innerColor, cell, false);
+        } else {
+        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);
+        }
+        this.drawInnerDot(innerColor, cell, false);
+        }
    }
 }
--- a/app/src/main/java/org/toop/app/canvas/TicTacToeBitCanvas.java
+++ b/app/src/main/java/org/toop/app/canvas/TicTacToeBitCanvas.java
@@ -30,7 +30,6 @@ public class TicTacToeBitCanvas extends BitGameCanvas<BitboardTicTacToe>{
    private void drawMoves(long[] gameBoard){
        loopOverBoard(gameBoard[0], (i) -> drawX(Color.RED, i));
        loopOverBoard(gameBoard[1], (i) -> drawO(Color.BLUE, i));
-
    }


--- a/app/src/main/java/org/toop/app/gameControllers/GenericGameController.java
+++ b/app/src/main/java/org/toop/app/gameControllers/GenericGameController.java
@@ -5,6 +5,7 @@ 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.BitLegalMoveDrawer;
 import org.toop.app.widget.WidgetContainer;
 import org.toop.app.widget.view.GameView;
 import org.toop.framework.eventbus.EventFlow;
@@ -18,11 +19,7 @@ import org.toop.framework.gameFramework.view.GUIEvents;
 import org.toop.framework.networking.events.NetworkEvents;
 import org.toop.game.players.LocalPlayer;

-import java.util.ArrayList;
-import java.util.List;
-import java.util.function.Consumer;
-
-public class GenericGameController<T extends TurnBasedGame<T>> implements GameController {
+public class GenericGameController<T extends TurnBasedGame<T>, C extends GameCanvas<T>> implements GameController {
    protected final EventFlow eventFlow = new EventFlow();

    // Logger for logging
@@ -31,22 +28,26 @@ public class GenericGameController<T extends TurnBasedGame<T>> implements GameCo
    // Reference to gameView view
    protected final GameView gameView;

+    // Reference to String gametype
+    protected final String gameType;
+
    // Reference to game canvas
-    protected final GameCanvas<T> canvas;
+    protected final C canvas;

    protected final TurnBasedGame<T> 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<T> canvas, T game, ThreadBehaviour gameThreadBehaviour, String gameType) {
+    public GenericGameController(C canvas, T game, ThreadBehaviour gameThreadBehaviour, String gameType) {
        logger.info("Creating: " + this.getClass());

        this.canvas = canvas;
        this.game = game;
+        this.gameType = gameType;
        this.gameThreadBehaviour = gameThreadBehaviour;

        // Tell thread how to send moves
-        this.gameThreadBehaviour.setOnSendMove((id, m) -> GlobalEventBus.postAsync(new NetworkEvents.SendMove(id, (short)translateMove(m))));
+        this.gameThreadBehaviour.setOnSendMove((id, m) -> GlobalEventBus.get().post(new NetworkEvents.SendMove(id, (short)translateMove(m))));

        // Tell thread how to update UI
        this.gameThreadBehaviour.setOnUpdateUI(() -> Platform.runLater(this::updateUI));
@@ -59,7 +60,7 @@ public class GenericGameController<T extends TurnBasedGame<T>> implements GameCo
        // Listen to updates
        eventFlow
                .listen(GUIEvents.GameEnded.class, this::onGameFinish, false)
-                .listen(GUIEvents.PlayerAttemptedMove.class, event -> {if (getCurrentPlayer() instanceof LocalPlayer<T> lp){lp.setMove(event.move());}}, false);
+                .listen(GUIEvents.PlayerAttemptedMove.class, event -> {if (getCurrentPlayer() instanceof LocalPlayer<T> lp){lp.setLastMove(event.move());}}, false);
    }

    public void start(){
@@ -76,7 +77,7 @@ public class GenericGameController<T extends TurnBasedGame<T>> implements GameCo

    public Player<T> getCurrentPlayer(){
        return game.getPlayer(getCurrentPlayerIndex());
-    };
+    }

    public int getCurrentPlayerIndex(){
        return game.getCurrentTurn();
@@ -140,5 +141,21 @@ public class GenericGameController<T extends TurnBasedGame<T>> implements GameCo
    @Override
    public void updateUI() {
        canvas.redraw(game.deepCopy());
+        gameView.updatePlayerInfo(
+               true,
+               getCurrentPlayer().getName(),
+               game.getCurrentTurn() == 0 ? "X" : "O",
+               getPlayer((game.getCurrentTurn() + 1 ) % 2).getName(),
+               this.gameType
+       );
+        // draw legal moves for bit canvasses
+        if (canvas instanceof BitLegalMoveDrawer) {
+            long movesLoop = game.getLegalMoves();
+            while (movesLoop != 0) {
+                long move = 1L << Long.numberOfTrailingZeros(movesLoop);
+                ((BitLegalMoveDrawer) canvas).showLegalMove(move, getCurrentPlayerIndex());
+                movesLoop &= movesLoop - 1;
+            }
+        }
    }
 }
--- a/app/src/main/java/org/toop/app/gameControllers/ReversiBitController.java
+++ b/app/src/main/java/org/toop/app/gameControllers/ReversiBitController.java
@@ -1,22 +1,24 @@
 package org.toop.app.gameControllers;

+import javafx.scene.paint.Color;
 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.game.gameThreads.LocalThreadBehaviour;
 import org.toop.game.gameThreads.OnlineThreadBehaviour;
 import org.toop.game.games.reversi.BitboardReversi;
+import org.toop.game.players.LocalPlayer;
 import org.toop.game.players.OnlinePlayer;

-public class ReversiBitController extends GenericGameController<BitboardReversi> {
-    public ReversiBitController(Player<BitboardReversi>[] players) {
+public class ReversiBitController extends GenericGameController<BitboardReversi, ReversiBitCanvas> {
+    public ReversiBitController(Player<BitboardReversi>[] players, boolean switchColors) {
        BitboardReversi game = new BitboardReversi(players);
        ThreadBehaviour thread = new LocalThreadBehaviour<>(game);
        for (Player<BitboardReversi> player : players) {
-            if (player instanceof OnlinePlayer<BitboardReversi>){
+            if (player instanceof OnlinePlayer<BitboardReversi>) {
                thread = new OnlineThreadBehaviour<>(game);
            }
        }
-        super(new ReversiBitCanvas(), game, thread, "Reversi");
+        super(new ReversiBitCanvas(switchColors, players[0] instanceof LocalPlayer<BitboardReversi> || players[1] instanceof LocalPlayer<BitboardReversi>), game, thread, "Reversi");
    }
 }
--- a/app/src/main/java/org/toop/app/gameControllers/TicTacToeBitController.java
+++ b/app/src/main/java/org/toop/app/gameControllers/TicTacToeBitController.java
@@ -9,7 +9,7 @@ import org.toop.game.gameThreads.OnlineThreadBehaviour;
 import org.toop.game.games.tictactoe.BitboardTicTacToe;
 import org.toop.game.players.OnlinePlayer;

-public class TicTacToeBitController extends GenericGameController<BitboardTicTacToe> {
+public class TicTacToeBitController extends GenericGameController<BitboardTicTacToe, TicTacToeBitCanvas > {
    public TicTacToeBitController(Player<BitboardTicTacToe>[] players) {
        BitboardTicTacToe game = new BitboardTicTacToe(players);
        ThreadBehaviour thread = new LocalThreadBehaviour<>(game);
--- a/app/src/main/java/org/toop/app/widget/Primitive.java
+++ b/app/src/main/java/org/toop/app/widget/Primitive.java
@@ -6,7 +6,6 @@ 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;
--- a/app/src/main/java/org/toop/app/widget/WidgetContainer.java
+++ b/app/src/main/java/org/toop/app/widget/WidgetContainer.java
@@ -1,6 +1,5 @@
 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;
--- a/app/src/main/java/org/toop/app/widget/complex/LoadingWidget.java
+++ b/app/src/main/java/org/toop/app/widget/complex/LoadingWidget.java
@@ -3,7 +3,6 @@ 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;
--- a/app/src/main/java/org/toop/app/widget/complex/PlayerInfoWidget.java
+++ b/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,7 +37,14 @@ 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",
@@ -45,7 +52,7 @@ public class PlayerInfoWidget {
                    newName -> information.name = newName
            );

-            return nameInput.getNode();
+            return Primitive.vbox(spacer,nameInput.getNode());
        } else {
            var AIBox = Primitive.vbox(
                    makeAIButton(0, 1, "zwartepiet"),
--- a/app/src/main/java/org/toop/app/widget/display/SongDisplay.java
+++ b/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.post(new AudioEvents.SkipMusic());
+			GlobalEventBus.get().post(new AudioEvents.SkipMusic());
 		});

 		pauseButton.setOnAction(event -> {
-			GlobalEventBus.post(new AudioEvents.PauseMusic());
+			GlobalEventBus.get().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.post(new AudioEvents.PreviousMusic());
+			GlobalEventBus.get().post(new AudioEvents.PreviousMusic());
 		});

 		HBox control = new HBox(10, previousButton, pauseButton, skipButton);
--- a/app/src/main/java/org/toop/app/widget/popup/EscapePopup.java
+++ b/app/src/main/java/org/toop/app/widget/popup/EscapePopup.java
@@ -1,31 +1,48 @@
 package org.toop.app.widget.popup;

 import javafx.geometry.Pos;
-import org.toop.app.App;
+import javafx.scene.Node;
 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() {
-        var con = Primitive.button("Continue", this::hide, false); // TODO, localize
+        ViewWidget currentView = WidgetContainer.getCurrentView();
+        ArrayList<Node> nodes = new ArrayList<>();

-        var qui = Primitive.button("quit", () -> {
-            hide();
-            WidgetContainer.add(Pos.CENTER, new QuitPopup());
-        });
+        nodes.add(Primitive.button("Continue", this::hide, false)); // TODO, localize

-        if (!(WidgetContainer.getCurrentView().getClass().isAssignableFrom(OptionsView.class))) {
+        if (!(currentView.getClass().isAssignableFrom(OptionsView.class))) {
            var opt = Primitive.button("options", () -> {
                hide();
                WidgetContainer.getCurrentView().transitionNext(new OptionsView());
            });
-            add(Pos.CENTER, Primitive.vbox(con, opt, qui));
-        } else {
-            add(Pos.CENTER, Primitive.vbox(con, qui));
+            nodes.add(opt);
        }

+        if (currentView.getClass().isAssignableFrom(GameView.class)) {
+            Widget tut = AppContext.currentTutorial();
+            if (tut != null) {
+                nodes.add(Primitive.button("tutorialstring", () -> {
+                    WidgetContainer.getCurrentView().add(Pos.CENTER, tut);
+                }));
+            }
+        }
+
+        nodes.add(Primitive.button("quit", () -> {
+            hide();
+            WidgetContainer.add(Pos.CENTER, new QuitPopup());
+        }));
+
+        add(Pos.CENTER, Primitive.vbox(nodes.toArray(new Node[0])));
+
    }
 }
--- a/app/src/main/java/org/toop/app/widget/popup/GameOverPopup.java
+++ b/app/src/main/java/org/toop/app/widget/popup/GameOverPopup.java
@@ -2,7 +2,6 @@ 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;

--- a/app/src/main/java/org/toop/app/widget/tutorial/BaseTutorialWidget.java
+++ b/app/src/main/java/org/toop/app/widget/tutorial/BaseTutorialWidget.java
@@ -7,7 +7,6 @@ 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;
@@ -59,8 +58,6 @@ 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
--- a/app/src/main/java/org/toop/app/widget/view/GameView.java
+++ b/app/src/main/java/org/toop/app/widget/view/GameView.java
@@ -16,17 +16,17 @@ import org.toop.app.widget.tutorial.Connect4TutorialWidget;
 import org.toop.app.widget.tutorial.ReversiTutorialWidget;
 import org.toop.app.widget.tutorial.TicTacToeTutorialWidget;
 import org.toop.local.AppContext;
+import org.toop.local.AppSettings;

 public final class GameView extends ViewWidget {
 	private final Text playerHeader;
 	private final Text turnHeader;
    private final Text player1Header;
    private final Text player2Header;
-    private Circle player1Icon;
-    private Circle player2Icon;
+    private final Circle player1Icon;
+    private final Circle player2Icon;
 	private final Button forfeitButton;
 	private final Button exitButton;
-    private final Button tutorialButton;
    private final TextField chatInput;
    private final Text keyThingy;
    private boolean hasSet = false;
@@ -61,15 +61,16 @@ public final class GameView extends ViewWidget {
 			chatInput = null;
 		}

-        switch(gameType) {
+        switch (gameType) {
            case "TicTacToe":
-                this.tutorialButton = Primitive.button("tutorialstring", () -> new TicTacToeTutorialWidget(() -> {})); break;
+                AppContext.setCurrentTutorial(new TicTacToeTutorialWidget(() -> {}));
+                break;
            case "Reversi":
-                this.tutorialButton = Primitive.button("tutorialstring", () -> new ReversiTutorialWidget(() -> {})); break;
+                AppContext.setCurrentTutorial(new ReversiTutorialWidget(() -> {}));
+                break;
            case "Connect4":
-                this.tutorialButton = Primitive.button("tutorialstring", () -> new Connect4TutorialWidget(() -> {})); break;
-            default:
-                this.tutorialButton = null; break;
+                AppContext.setCurrentTutorial(new Connect4TutorialWidget(() -> {}));
+                break;
        }

 		setupLayout();
@@ -92,13 +93,9 @@ 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 currentMove, String nextPlayer, char GameType) {
+	public void updatePlayerInfo(boolean isMe, String currentPlayer, String currentMove, String nextPlayer, String GameType) {
 		Platform.runLater(() -> {
            if (!(hasSet)) {
                playerHeader.setText(currentPlayer + " vs. " + nextPlayer);
@@ -116,8 +113,8 @@ public final class GameView extends ViewWidget {
 		new GameOverPopup(iWon, winner).show(Pos.CENTER);
 	}

-    private void setPlayerHeaders(boolean isMe, String currentPlayer, String nextPlayer, char GameType) {
-        if (GameType == 'T') {
+    private void setPlayerHeaders(boolean isMe, String currentPlayer, String nextPlayer, String GameType) {
+        if (GameType.equals("TicTacToe")) {
            if (isMe) {
                player1Header.setText("X: " + currentPlayer);
                player2Header.setText("O: " + nextPlayer);
@@ -128,15 +125,16 @@ public final class GameView extends ViewWidget {
            }
            setPlayerInfoTTT();
        }
-        else if (GameType == 'R') {
-            if (isMe) {
-                player1Header.setText(currentPlayer);
-                player2Header.setText(nextPlayer);
-            }
-            else {
+        else if (GameType.equals("Reversi")) {
+            boolean swap = AppSettings.getSettings().getSwitchReversi();
+            if (!swap) {
                player1Header.setText(nextPlayer);
                player2Header.setText(currentPlayer);
            }
+            else {
+                player1Header.setText(currentPlayer);
+                player2Header.setText(nextPlayer);
+            }
            setPlayerInfoReversi();
        }
    }
@@ -170,8 +168,8 @@ public final class GameView extends ViewWidget {
        var playerInfo = Primitive.vbox(
                playerHeader,
                Primitive.separator(),
-                player1box,
-                player2box
+                player2box,
+                player1box
        );

        player1Icon.setRadius(player1Header.fontProperty().map(Font::getSize).getValue());
--- a/app/src/main/java/org/toop/app/widget/view/LocalMultiplayerView.java
+++ b/app/src/main/java/org/toop/app/widget/view/LocalMultiplayerView.java
@@ -2,9 +2,6 @@ package org.toop.app.widget.view;

 import javafx.application.Platform;
 import org.toop.app.GameInformation;
-import org.toop.app.canvas.ReversiBitCanvas;
-import org.toop.app.canvas.TicTacToeBitCanvas;
-import org.toop.app.gameControllers.GenericGameController;
 import org.toop.app.gameControllers.ReversiBitController;
 import org.toop.app.gameControllers.TicTacToeBitController;
 import org.toop.framework.gameFramework.controller.GameController;
@@ -18,8 +15,8 @@ import org.toop.app.widget.complex.PlayerInfoWidget;
 import org.toop.app.widget.complex.ViewWidget;
 import org.toop.app.widget.popup.ErrorPopup;
 import org.toop.app.widget.tutorial.*;
-import org.toop.game.players.MiniMaxAI;
-import org.toop.game.players.RandomAI;
+import org.toop.game.players.ai.MiniMaxAI;
+import org.toop.game.players.ai.RandomAI;
 import org.toop.local.AppContext;

 import javafx.geometry.Pos;
@@ -27,9 +24,6 @@ import javafx.scene.control.ScrollPane;
 import javafx.scene.layout.VBox;
 import org.toop.local.AppSettings;

-import java.util.Arrays;
-import java.util.Random;
-
 public class LocalMultiplayerView extends ViewWidget {
 	private final GameInformation information;

@@ -85,6 +79,7 @@ public class LocalMultiplayerView extends ViewWidget {
                    }
                    break;
                case REVERSI:
+                    boolean swap = AppSettings.getSettings().getSwitchReversi();
                    if (information.players[0].isHuman) {
                        players[0] = new LocalPlayer<>(information.players[0].name);
                    } else {
@@ -98,17 +93,17 @@ public class LocalMultiplayerView extends ViewWidget {
                    if (AppSettings.getSettings().getTutorialFlag() && AppSettings.getSettings().getFirstReversi()) {
                        new ShowEnableTutorialWidget(
                                () -> new ReversiTutorialWidget(() -> {
-                                    gameController = new ReversiBitController(players);
+                                    gameController = new ReversiBitController(players, swap);
                                    gameController.start();
                                }),
                                () -> Platform.runLater(() -> {
-                                    gameController = new ReversiBitController(players);
+                                    gameController = new ReversiBitController(players, swap);
                                    gameController.start();
                                }),
                                () -> AppSettings.getSettings().setFirstReversi(false)
                        );
                    } else {
-                        gameController = new ReversiBitController(players);
+                        gameController = new ReversiBitController(players, swap);
                        gameController.start();
                    }
                    break;
--- a/app/src/main/java/org/toop/app/widget/view/MainView.java
+++ b/app/src/main/java/org/toop/app/widget/view/MainView.java
@@ -1,6 +1,5 @@
 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;
--- a/app/src/main/java/org/toop/app/widget/view/OnlineView.java
+++ b/app/src/main/java/org/toop/app/widget/view/OnlineView.java
@@ -3,7 +3,6 @@ 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;
--- a/app/src/main/java/org/toop/app/widget/view/OptionsView.java
+++ b/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))
-					.asyncPostEvent();
+					.postEvent();
 			}
 		);

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

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

@@ -149,13 +149,22 @@ public class OptionsView extends ViewWidget {
 			"small", "medium", "large"
 		);

+        var swapReversiColors = new ToggleWidget(
+                "reversinotswapped", "reversiswapped",
+                AppSettings.getSettings().getSwitchReversi(),
+                swap -> {
+                    AppSettings.getSettings().setSwitchReversi(swap);
+                }
+        );

 		return Primitive.vbox(
 			Primitive.header("style"),
 			Primitive.separator(),

 			themeWidget.getNode(),
-			layoutWidget.getNode()
+			layoutWidget.getNode(),
+            Primitive.text("reversiswap"),
+            swapReversiColors.getNode()
 		);
 	}
 }
--- a/app/src/main/java/org/toop/local/AppContext.java
+++ b/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,11 +16,13 @@ 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 final Logger logger = LogManager.getLogger(AppContext.class);
+    private static BaseTutorialWidget tutorialWidget;

    public static LocalizationAsset getLocalization() {
        return localization;
@@ -73,4 +75,12 @@ 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;
+    }
 }
--- a/app/src/main/java/org/toop/local/AppSettings.java
+++ b/app/src/main/java/org/toop/local/AppSettings.java
@@ -5,18 +5,16 @@ import org.toop.framework.audio.VolumeControl;
 import org.toop.framework.audio.events.AudioEvents;
 import org.toop.framework.eventbus.EventFlow;
 import org.toop.framework.resource.ResourceManager;
-import org.toop.framework.resource.ResourceMeta;
 import org.toop.framework.resource.resources.SettingsAsset;
 import org.toop.framework.settings.Settings;

-import java.io.File;
 import java.util.Locale;

 public class AppSettings {
 	private static SettingsAsset settingsAsset;

 	public static void applySettings() {
-		settingsAsset = getPath();
+		settingsAsset = getSettingsAsset();
 		if (!settingsAsset.isLoaded()) {
 			settingsAsset.load();
 		}
@@ -36,35 +34,18 @@ public class AppSettings {

 		new EventFlow()
 				.addPostEvent(new AudioEvents.ChangeVolume(settingsData.volume, VolumeControl.MASTERVOLUME))
-				.asyncPostEvent();
+				.postEvent();
 		new EventFlow()
 				.addPostEvent(new AudioEvents.ChangeVolume(settingsData.fxVolume, VolumeControl.FX))
-				.asyncPostEvent();
+				.postEvent();
 		new EventFlow()
 				.addPostEvent(new AudioEvents.ChangeVolume(settingsData.musicVolume, VolumeControl.MUSIC))
-				.asyncPostEvent();
+				.postEvent();
 	}

-	public static SettingsAsset getPath() {
+	public static SettingsAsset getSettingsAsset() {
 		if (settingsAsset == null) {
-			String os = System.getProperty("os.name").toLowerCase();
-			String basePath;
-
-			if (os.contains("win")) {
-				basePath = System.getenv("APPDATA");
-				if (basePath == null) {
-					basePath = System.getProperty("user.home");
-				}
-			} else if (os.contains("mac")) {
-				basePath = System.getProperty("user.home") + "/Library/Application Support";
-			} else {
-				basePath = System.getProperty("user.home") + "/.config";
-			}
-
-			File settingsFile =
-				new File(basePath + File.separator + "ISY1" + File.separator + "settings.json");
-//            this.settingsAsset = new SettingsAsset(settingsFile);
-			ResourceManager.addAsset(new ResourceMeta<>("settings.json", new SettingsAsset(settingsFile)));
+			settingsAsset = SettingsAsset.getPath();
 		}
 		return ResourceManager.get("settings.json");
 	}
@@ -110,5 +91,6 @@ public class AppSettings {
        settingsAsset.setMusicVolume(15);
        settingsAsset.setTutorialFlag(true);
        settingsAsset.setLayoutSize("medium");
+        settingsAsset.setSwitchReversi(false);
    }
 }
--- a/app/src/main/resources/localization/localization_ar.properties
+++ b/app/src/main/resources/localization/localization_ar.properties
@@ -89,6 +89,9 @@ turnof=\u062F\u0648\u0631\u0647
 zwartepiet=\u0633\u0647\u0644: Zwarte Piet
 sinterklaas=\u0645\u062a\u0648\u0633\u0637: Sint R. Klaas
 santa=\u0635\u0639\u0628: Santa
+reversiswapped=\u0645\u0628\u062F\u0651\u064E\u0644
+reversinotswapped=\u063A\u064A\u0631\u0020\u0645\u0628\u062F\u0651\u064E\u0644
+reversiswap=\u0647\u0644\u0020\u062A\u0631\u064A\u062F\u0020\u062A\u0628\u062F\u064A\u0644\u0020\u0623\u0644\u0648\u0627\u0646\u0020\u0627\u0644\u0631\u064A\u0641\u064E\u0631\u0633\u064A\u061F\u0020\u0645\u062D\u0644\u064A\u0020\u0641\u0642\u0637\u002E


 arabic=\u0627\u0644\u0639\u0631\u0628\u064a\u0629
--- a/app/src/main/resources/localization/localization_de.properties
+++ b/app/src/main/resources/localization/localization_de.properties
@@ -91,6 +91,9 @@ turnof=ist dran
 zwartepiet=Leicht: Zwarte Piet
 sinterklaas=Mittel: Sint R. Klaas
 santa=Schwer: Santa
+reversiswapped=Getauscht
+reversinotswapped=Nicht getauscht
+reversiswap=M\u00F6chten Sie die Reversi-Farben tauschen? Nur lokal.

 arabic=\u0627\u0644\u0639\u0631\u0628\u064a\u0629 (Arabisch)
 chinese=\u4e2d\u6587 (Chinesisch)
--- a/app/src/main/resources/localization/localization_en.properties
+++ b/app/src/main/resources/localization/localization_en.properties
@@ -93,6 +93,9 @@ turnof='s turn
 zwartepiet=Easy: Zwarte Piet
 sinterklaas=Medium: Sint R. Klaas
 santa=Hard:Santa
+reversiswapped=Swapped
+reversinotswapped=Not Swapped
+reversiswap=Do you want to swap the Reversi colors? Local only.

 arabic=\u0627\u0644\u0639\u0631\u0628\u064a\u0629 (Arabic)
 chinese=\u4e2d\u6587 (Chinese)
--- a/app/src/main/resources/localization/localization_es.properties
+++ b/app/src/main/resources/localization/localization_es.properties
@@ -90,6 +90,9 @@ turnof=le toca
 zwartepiet=F\u00e1cil: Zwarte Piet
 sinterklaas=Medio: Sint R. Klaas
 santa=Dif\u00edcil: Santa
+reversiswapped=Cambiado
+reversinotswapped=No cambiado
+reversiswap=\u00BFDeseas intercambiar los colores de Reversi? Solo local.

 arabic=\u0627\u0644\u0639\u0631\u0628\u064a\u0629 (Ar\u00e1bigo)
 chinese=\u4e2d\u6587 (Chino)
--- a/app/src/main/resources/localization/localization_fr.properties
+++ b/app/src/main/resources/localization/localization_fr.properties
@@ -90,6 +90,9 @@ turnof=\u00E0 son tour
 zwartepiet=Facile: Zwarte Piet
 sinterklaas=Moyen : Sint R. Klaas
 santa=Difficile: Santa
+reversiswapped=\u00C9chang\u00E9
+reversinotswapped=Non \u00E9chang\u00E9
+reversiswap=Voulez-vous \u00E9changer les couleurs de Reversi ? Local uniquement.

 arabic=\u0627\u0644\u0639\u0631\u0628\u064a\u0629 (Arabe)
 chinese=\u4e2d\u6587 (Chinois)
--- a/app/src/main/resources/localization/localization_hi.properties
+++ b/app/src/main/resources/localization/localization_hi.properties
@@ -90,6 +90,9 @@ turnof=\u0915\u0940 \u092C\u093E\u0930\u0940
 zwartepiet=\u0905\u0938\u093e\u0928: Zwarte Piet
 sinterklaas=\u092e\u0927\u094d\u092f\u092e: Sint R. Klaas
 santa=\u0915\u0924\u093f\u0928: Santa
+reversiswapped=\u092C\u0926\u0932\u093E\u0020\u0939\u0941\u0906
+reversinotswapped=\u0928\u0939\u0940\u0902\u0020\u092C\u0926\u0932\u093E\u0020\u0939\u0941\u0906
+reversiswap=\u0915\u094D\u092F\u093E\u0020\u0906\u092A\u0020\u0930\u093F\u0935\u0930\u094D\u0938\u0940\u0020\u0915\u0947\u0020\u0930\u0902\u0917\u0020\u092C\u0926\u0932\u0928\u093E\u0020\u091A\u093E\u0939\u0924\u0947\u0020\u0939\u0948\u0902?\u0020\u0915\u0947\u0935\u0932\u0020\u0938\u094D\u0925\u093E\u0928\u0940\u092F\u002E

 arabic=\u0627\u0644\u0639\u0631\u0628\u064a\u0629 (\u0905\u0930\u092c\u0940)
 chinese=\u4e2d\u6587 (\u091a\u0940\u0928\u0940)
--- a/app/src/main/resources/localization/localization_it.properties
+++ b/app/src/main/resources/localization/localization_it.properties
@@ -89,6 +89,9 @@ turnof=\u00E8 il suo turno
 zwartepiet=Facile: Zwarte Piet
 sinterklaas=Medio: Sint R. Klaas
 santa=Difficile: Santa
+reversiswapped=Scambiato
+reversinotswapped=Non scambiato
+reversiswap=Vuoi scambiare i colori di Reversi? Solo locale.

 arabic=\u0627\u0644\u0639\u0631\u0628\u064a\u0629 (Arabo)
 chinese=\u4e2d\u6587 (Cinese)
--- a/app/src/main/resources/localization/localization_ja.properties
+++ b/app/src/main/resources/localization/localization_ja.properties
@@ -89,6 +89,10 @@ turnof=\u306E\u756A
 zwartepiet=\u7c21\u5358: Zwarte Piet
 sinterklaas=\u4e2d\u7d1a: Sint R. Klaas
 santa=\u96e3\u3057\u3044: Santa
+reversiswapped=\u5165\u308C\u66FF\u3048\u6E08\u307F
+reversinotswapped=\u672A\u5165\u308C\u66FF\u3048
+reversiswap=\u30EA\u30D0\u30FC\u30B7\u306E\u8272\u3092\u5165\u308C\u66FF\u3048\u307E\u3059\u304B?\u0020\u30ED\u30FC\u30AB\u30EB\u306E\u307F\u3067\u3059\u002E
+

 arabic=\u0627\u0644\u0639\u0631\u0628\u064a\u0629 (\u30a2\u30e9\u30d3\u30a2\u8a9e)
 chinese=\u4e2d\u6587 (\u4e2d\u6587)
--- a/app/src/main/resources/localization/localization_ko.properties
+++ b/app/src/main/resources/localization/localization_ko.properties
@@ -89,6 +89,9 @@ turnof=\uC758 \uCC28\uB840
 zwartepiet=\uc218\uc601: Zwarte Piet
 sinterklaas=\ubcf4\ud1b5: Sint R. Klaas
 santa=\uc5d0\uc18c: Santa
+reversiswapped=\uAD50\uCCB4\uB428
+reversinotswapped=\uAD50\uCCB4\uB418\uC9C0 \uC54A\uC74C
+reversiswap=\uB9AC\uBC84\uC2DC \uC0C9\uC0C1\uC744 \uBC14\uAFB8\uC2DC\uACA0\uC2B5\uB2C8\uAE4C?\u0020\uB85C\uCEEC \uC804\uC6A9\u0020\uC785\uB2C8\uB2E4\u002E

 arabic=\u0627\u0644\u0639\u0631\u0628\u064a\u0629 (\u0639\u0631\u0628\u064a\u0629)
 chinese=\u4e2d\u6587 (\u4e2d\u6587)
--- a/app/src/main/resources/localization/localization_nl.properties
+++ b/app/src/main/resources/localization/localization_nl.properties
@@ -89,6 +89,9 @@ turnof=is aan de beurt
 zwartepiet=Makkelijk: Zwarte Piet
 sinterklaas=Gemiddeld: Sint R. Klaas
 santa=Moeilijk: Santa
+reversiswapped=Gewisseld
+reversinotswapped=Niet gewisseld
+reversiswap=Wil je de Reversi-kleuren wisselen? Alleen lokaal.

 arabic=\u0627\u0644\u0639\u0631\u0628\u064a\u0629 (Arabisch)
 chinese=\u4e2d\u6587 (Chinees)
--- a/app/src/main/resources/localization/localization_ru.properties
+++ b/app/src/main/resources/localization/localization_ru.properties
@@ -89,6 +89,9 @@ turnof=\u0445\u043E\u0434\u0438\u0442
 zwartepiet=\u041b\u0435\u0433\u043a\u043e: Zwarte Piet
 sinterklaas=\u0421\u0440\u0435\u0434\u043d\u0438\u0439: Sint R. Klaas
 santa=\u0421\u043b\u043e\u0436\u043d\u043e: Santa
+reversiswapped=\u041F\u043E\u043C\u0435\u043D\u044F\u043D\u043E
+reversinotswapped=\u041D\u0435 \u043F\u043E\u043C\u0435\u043D\u044F\u043D\u043E
+reversiswap=\u0425\u043E\u0442\u0438\u0442\u0435 \u043F\u043E\u043C\u0435\u043D\u044F\u0442\u044C \u0446\u0432\u0435\u0442\u0430 \u0420\u0435\u0432\u0435\u0440\u0441\u0438?\u0020\u0422\u043E\u043B\u044C\u043A\u043E \u043B\u043E\u043A\u0430\u043B\u044C\u043D\u043E\u002E

 arabic=\u0627\u0644\u0639\u0631\u0628\u064a\u0629 (\u0410\u0440\u0430\u0431\u0441\u043a\u0438\u0439)
 chinese=\u4e2d\u6587 (\u041a\u0438\u0442\u0430\u0439\u0441\u043a\u0438\u0439)
--- a/app/src/main/resources/localization/localization_zh.properties
+++ b/app/src/main/resources/localization/localization_zh.properties
@@ -89,6 +89,9 @@ turnof=\u7684\u56DE\u5408
 zwartepiet=\u7b80\u5355: Zwarte Piet
 sinterklaas=\u4e2d\u7b49: Sint R. Klaas
 santa=\u56f0\u96be: Santa
+reversiswapped=\u5DF2\u4EA4\u6362
+reversinotswapped=\u672A\u4EA4\u6362
+reversiswap=\u662F\u5426\u8981\u4EA4\u6362\u9ED1\u767D\u68CB\u7684\u989C\u8272\uFF1F\u4EC5\u9650\u672C\u5730\u002E

 arabic=\u0627\u0644\u0639\u0631\u0628\u064a\u0629 (\u963f\u62c9\u4f2f\u8bed)
 chinese=\u4e2d\u6587
--- a/framework/src/main/java/org/toop/framework/audio/AudioEventListener.java
+++ b/framework/src/main/java/org/toop/framework/audio/AudioEventListener.java
@@ -5,26 +5,29 @@ 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.GlobalEventBus;
+import org.toop.framework.eventbus.bus.EventBus;
 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()
+        new EventFlow(eventBus)
                .listen(AudioEvents.StopAudioManager.class, this::handleStopMusicManager, false)
                .listen(AudioEvents.PlayEffect.class, this::handlePlaySound, false)
                .listen(AudioEvents.SkipMusic.class, this::handleSkipSong, false)
@@ -73,7 +76,7 @@ public class AudioEventListener<T extends AudioResource, K extends AudioResource
    }

    private void handleGetVolume(AudioEvents.GetVolume event) {
-        GlobalEventBus.postAsync(new AudioEvents.GetVolumeResponse(
+        eventBus.post(new AudioEvents.GetVolumeResponse(
                audioVolumeManager.getVolume(event.controlType()),
                event.identifier()));
    }
--- a/framework/src/main/java/org/toop/framework/audio/MusicManager.java
+++ b/framework/src/main/java/org/toop/framework/audio/MusicManager.java
@@ -6,8 +6,7 @@ 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.EventFlow;
-import org.toop.framework.eventbus.GlobalEventBus;
+import org.toop.framework.eventbus.bus.EventBus;
 import org.toop.framework.resource.types.AudioResource;

 import java.util.*;
@@ -18,6 +17,7 @@ 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,7 +27,8 @@ public class MusicManager<T extends AudioResource> implements org.toop.framework
    private ScheduledExecutorService scheduler;


-    public MusicManager(List<T> resources, boolean shuffleMusic) {
+    public MusicManager(EventBus eventbus, List<T> resources, boolean shuffleMusic) {
+        this.eventBus = eventbus;
        this.dispatcher = new JavaFXDispatcher();
        this.resources = resources;
        // Shuffle if wanting to shuffle
@@ -40,7 +41,8 @@ public class MusicManager<T extends AudioResource> implements org.toop.framework
     * {@code @TestsOnly} DO NOT USE
     */
    @TestsOnly
-    public MusicManager(List<T> resources, Dispatcher dispatcher) {
+    public MusicManager(EventBus eventBus, List<T> resources, Dispatcher dispatcher) {
+        this.eventBus = eventBus;
        this.dispatcher = dispatcher;
        this.resources = new ArrayList<>(resources);
        backgroundMusic.addAll(resources);
@@ -124,7 +126,7 @@ public class MusicManager<T extends AudioResource> implements org.toop.framework
        Runnable currentMusicTask = new Runnable() {
            @Override
            public void run() {
-                GlobalEventBus.post(new AudioEvents.PlayingMusic(track.getName(), track.currentPosition(), track.duration()));
+                eventBus.post(new AudioEvents.PlayingMusic(track.getName(), track.currentPosition(), track.duration()));
                scheduler.schedule(this, 1, TimeUnit.SECONDS);
            }
        };
--- a/framework/src/main/java/org/toop/framework/audio/SoundEffectManager.java
+++ b/framework/src/main/java/org/toop/framework/audio/SoundEffectManager.java
@@ -2,18 +2,10 @@ 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;

--- a/framework/src/main/java/org/toop/framework/audio/events/AudioEvents.java
+++ b/framework/src/main/java/org/toop/framework/audio/events/AudioEvents.java
@@ -2,8 +2,6 @@ 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. */
--- a/framework/src/main/java/org/toop/framework/audio/interfaces/SoundEffectManager.java
+++ b/framework/src/main/java/org/toop/framework/audio/interfaces/SoundEffectManager.java
@@ -1,12 +1,7 @@
 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);
--- a/framework/src/main/java/org/toop/framework/eventbus/EventFlow.java
+++ b/framework/src/main/java/org/toop/framework/eventbus/EventFlow.java
@@ -13,10 +13,14 @@ 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 GlobalEventBus}.
+ * type-safe and chainable manner. It is designed to work with the {@link EventBus}.
 *
 * <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
@@ -31,6 +35,8 @@ 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;

@@ -38,13 +44,19 @@ public class EventFlow {
    private EventType event = null;

    /** The listener returned by GlobalEventBus subscription. Used for unsubscription. */
-    private final List<ListenerHandler<?>> listeners = new ArrayList<>();
+    private final List<NamedSubscriber<?>> 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() {}
+    public EventFlow(EventBus eventBus) {
+        this.eventBus = eventBus;
+    }
+
+    public EventFlow() {
+        this.eventBus = GlobalEventBus.get();
+    }

    /**
     *
@@ -145,21 +157,19 @@ public class EventFlow {

            action.accept(eventClass);

-            if (unsubscribeAfterSuccess) unsubscribe(id);
+            if (unsubscribeAfterSuccess) unsubscribe(String.valueOf(id));

            this.result = eventClass.result();
        };

-        // TODO Remove casts
-        var listener = new ListenerHandler<>(
-                id,
+        var subscriber = new DefaultNamedSubscriber<>(
                name,
-                (Class<ResponseToUniqueEvent>) event,
-                (Consumer<ResponseToUniqueEvent>) newAction
+                event,
+                newAction
        );

-        GlobalEventBus.subscribe(listener);
-        this.listeners.add(listener);
+        eventBus.subscribe(subscriber);
+        this.listeners.add(subscriber);
        return this;
    }

@@ -227,7 +237,7 @@ public class EventFlow {
                    TT typedEvent = (TT) uuidEvent;
                    action.accept(typedEvent);

-                    if (unsubscribeAfterSuccess) unsubscribe(id);
+                    if (unsubscribeAfterSuccess) unsubscribe(String.valueOf(id));

                    this.result = typedEvent.result();
                } catch (ClassCastException _) {
@@ -239,14 +249,13 @@ public class EventFlow {
            }
        };

-        var listener = new ListenerHandler<>(
-                id,
+        var listener = new DefaultNamedSubscriber<>(
                name,
                (Class<TT>) action.getClass().getDeclaredMethods()[0].getParameterTypes()[0],
                newAction
        );

-        GlobalEventBus.subscribe(listener);
+        eventBus.subscribe(listener);
        this.listeners.add(listener);
        return this;
    }
@@ -284,17 +293,16 @@ public class EventFlow {
        Consumer<TT> newAction = eventc -> {
            action.accept(eventc);

-            if (unsubscribeAfterSuccess) unsubscribe(id);
+            if (unsubscribeAfterSuccess) unsubscribe(String.valueOf(id));
        };

-        var listener = new ListenerHandler<>(
-                        id,
+        var listener = new DefaultNamedSubscriber<>(
                        name,
                        event,
                        newAction
                );

-        GlobalEventBus.subscribe(listener);
+        eventBus.subscribe(listener);
        this.listeners.add(listener);
        return this;
    }
@@ -362,7 +370,7 @@ public class EventFlow {
            try {
                TT typedEvent = (TT) nonUuidEvent;
                action.accept(typedEvent);
-                if (unsubscribeAfterSuccess) unsubscribe(id);
+                if (unsubscribeAfterSuccess) unsubscribe(String.valueOf(id));
            } catch (ClassCastException _) {
                throw new ClassCastException(
                        "Cannot cast "
@@ -371,14 +379,13 @@ public class EventFlow {
            }
        };

-        var listener = new ListenerHandler<>(
-                id,
+        var listener = new DefaultNamedSubscriber<>(
                name,
                eventClass,
                newAction
        );

-        GlobalEventBus.subscribe(listener);
+        eventBus.subscribe(listener);
        this.listeners.add(listener);
        return this;
    }
@@ -401,15 +408,18 @@ public class EventFlow {
     * Posts the event added through {@link #addPostEvent}.
     */
    public EventFlow postEvent() {
-        GlobalEventBus.post(this.event);
+        eventBus.post(this.event);
        return this;
    }

    /**
     * Posts the event added through {@link #addPostEvent} asynchronously.
+     *
+     * @deprecated use {@link #postEvent()} instead.
     */
+    @Deprecated
    public EventFlow asyncPostEvent() {
-        GlobalEventBus.postAsync(this.event);
+        eventBus.post(this.event);
        return this;
    }

@@ -417,28 +427,12 @@ public class EventFlow {
     *
     * Unsubscribe from an event.
     *
-     * @param listenerObject The listener object to remove and unsubscribe.
+     * @param action The listener object to remove and unsubscribe.
     */
-    public void unsubscribe(Object listenerObject) {
+    public void unsubscribe(Consumer<?> action) {
        this.listeners.removeIf(handler -> {
-            if (handler.getListener() == listenerObject) {
-                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);
+            if (handler.handler().equals(action)) {
+                eventBus.unsubscribe(handler);
                return true;
            }
            return false;
@@ -452,8 +446,8 @@ public class EventFlow {
     */
    public void unsubscribe(String name) {
        this.listeners.removeIf(handler -> {
-            if (handler.getName().equals(name)) {
-                GlobalEventBus.unsubscribe(handler);
+            if (handler.id().equals(name)) {
+                eventBus.unsubscribe(handler);
                return true;
            }
            return false;
@@ -465,7 +459,7 @@ public class EventFlow {
     */
    public void unsubscribeAll() {
        listeners.removeIf(handler -> {
-            GlobalEventBus.unsubscribe(handler);
+            eventBus.unsubscribe(handler);
            return true;
        });
    }
@@ -503,8 +497,8 @@ public class EventFlow {
     *
     * @return Copy of the list of listeners.
     */
-    public ListenerHandler[] getListeners() {
-        return listeners.toArray(new ListenerHandler[0]);
+    public Subscriber<?>[] getListeners() {
+        return listeners.toArray(new Subscriber[0]);
    }

    /**
--- a/framework/src/main/java/org/toop/framework/eventbus/GlobalEventBus.java
+++ b/framework/src/main/java/org/toop/framework/eventbus/GlobalEventBus.java
@@ -1,193 +1,46 @@
 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.apache.logging.log4j.Logger;
+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.events.UniqueEvent;
+import org.toop.framework.eventbus.store.DefaultSubscriberStore;
+import org.toop.framework.eventbus.subscriber.Subscriber;

-/**
- * 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 EventBus {
+    private static final EventBus INSTANCE = new DisruptorEventBus(
+            LogManager.getLogger(DisruptorEventBus.class),
+            new DefaultSubscriberStore()
+    );

-    /** Map of event class to type-specific listeners. */
-    private static final Map<Class<?>, CopyOnWriteArrayList<ListenerHandler<?>>>
-            LISTENERS = new ConcurrentHashMap<>();
-
-    /** 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() {}

-    /** Wrapper used inside the ring buffer. */
-    private static class EventHolder {
-        EventType event;
+    public static EventBus get() {
+        return INSTANCE;
    }

-    // ------------------------------------------------------------------------
-    // Subscription
-    // ------------------------------------------------------------------------
-    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
+    public void subscribe(Subscriber<? extends EventType> listener) {
+        INSTANCE.subscribe(listener);
    }

-    // TODO
-    public static <T extends UniqueEvent> void subscribeById(
-            Class<T> eventClass, long eventId, Consumer<T> listener) {
-        UUID_LISTENERS
-                .computeIfAbsent(eventClass, _ -> new ConcurrentHashMap<>())
-                .put(eventId, listener);
+    @Override
+    public void unsubscribe(Subscriber<? extends EventType> listener) {
+        INSTANCE.unsubscribe(listener);
    }

-    public static void unsubscribe(ListenerHandler<?> listener) {
-        logger.debug("Unsubscribing from {}: {}", listener.getListenerClass().getSimpleName(), listener.getListener().getClass().getSimpleName());
-        LISTENERS.getOrDefault(listener.getListenerClass(), new CopyOnWriteArrayList<>())
-                .remove(listener);
-        LISTENERS.entrySet().removeIf(entry -> entry.getValue().isEmpty());
+    @Override
+    public <T extends EventType> void post(T event) {
+        INSTANCE.post(event);
    }

-    // TODO
-    public static <T extends UniqueEvent> void unsubscribeById(
-            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() {
+        INSTANCE.shutdown();
    }

-    // ------------------------------------------------------------------------
-    // Posting
-    // ------------------------------------------------------------------------
-    public static <T extends EventType> void post(T event) {
-        dispatchEvent(event); // synchronous
-    }
-
-    public static <T extends EventType> void postAsync(T event) {
-        long seq = RING_BUFFER.next();
-        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;
+    @Override
+    public void reset() {
+        INSTANCE.reset();
    }
 }
--- a/framework/src/main/java/org/toop/framework/eventbus/ListenerHandler.java
+++ b/framework/src/main/java/org/toop/framework/eventbus/ListenerHandler.java
@@ -1,48 +0,0 @@
-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;
-    }
-}
--- a/framework/src/main/java/org/toop/framework/eventbus/bus/DefaultEventBus.java
+++ b/framework/src/main/java/org/toop/framework/eventbus/bus/DefaultEventBus.java
@@ -0,0 +1,53 @@
+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.function.Consumer;
+
+public class DefaultEventBus implements EventBus {
+    private final Logger logger;
+    private final SubscriberStore eventsHolder;
+
+    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((EventType) eventClass.cast(event));
+            }
+        }
+    }
+
+    @Override
+    public void shutdown() {
+        eventsHolder.reset();
+    }
+
+    @Override
+    public void reset() {
+        eventsHolder.reset();
+    }
+}
--- a/framework/src/main/java/org/toop/framework/eventbus/bus/DisruptorEventBus.java
+++ b/framework/src/main/java/org/toop/framework/eventbus/bus/DisruptorEventBus.java
@@ -0,0 +1,117 @@
+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));
+    }
+}
--- a/framework/src/main/java/org/toop/framework/eventbus/bus/EventBus.java
+++ b/framework/src/main/java/org/toop/framework/eventbus/bus/EventBus.java
@@ -0,0 +1,12 @@
+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();
+}
--- a/framework/src/main/java/org/toop/framework/eventbus/store/AsyncSubscriberStore.java
+++ b/framework/src/main/java/org/toop/framework/eventbus/store/AsyncSubscriberStore.java
@@ -0,0 +1,47 @@
+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]);
+        }
+    }
+}
--- a/framework/src/main/java/org/toop/framework/eventbus/store/DefaultSubscriberStore.java
+++ b/framework/src/main/java/org/toop/framework/eventbus/store/DefaultSubscriberStore.java
@@ -0,0 +1,73 @@
+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();
+    }
+}
--- a/framework/src/main/java/org/toop/framework/eventbus/store/SubscriberStore.java
+++ b/framework/src/main/java/org/toop/framework/eventbus/store/SubscriberStore.java
@@ -0,0 +1,11 @@
+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();
+}
--- a/framework/src/main/java/org/toop/framework/eventbus/store/SyncSubscriberStore.java
+++ b/framework/src/main/java/org/toop/framework/eventbus/store/SyncSubscriberStore.java
@@ -0,0 +1,37 @@
+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();
+    }
+}
--- a/framework/src/main/java/org/toop/framework/eventbus/subscriber/DefaultNamedSubscriber.java
+++ b/framework/src/main/java/org/toop/framework/eventbus/subscriber/DefaultNamedSubscriber.java
@@ -0,0 +1,8 @@
+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> {}
--- a/framework/src/main/java/org/toop/framework/eventbus/subscriber/DefaultSubscriber.java
+++ b/framework/src/main/java/org/toop/framework/eventbus/subscriber/DefaultSubscriber.java
@@ -0,0 +1,8 @@
+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> {}
+
--- a/framework/src/main/java/org/toop/framework/eventbus/subscriber/HasId.java
+++ b/framework/src/main/java/org/toop/framework/eventbus/subscriber/HasId.java
@@ -0,0 +1,5 @@
+package org.toop.framework.eventbus.subscriber;
+
+public interface HasId<ID> {
+    ID id();
+}
--- a/framework/src/main/java/org/toop/framework/eventbus/subscriber/IdSubscriber.java
+++ b/framework/src/main/java/org/toop/framework/eventbus/subscriber/IdSubscriber.java
@@ -0,0 +1,5 @@
+package org.toop.framework.eventbus.subscriber;
+
+import org.toop.framework.eventbus.events.EventType;
+
+public interface IdSubscriber<K extends EventType> extends Subscriber<K>, HasId<Long> {}
--- a/framework/src/main/java/org/toop/framework/eventbus/subscriber/LongIdSubscriber.java
+++ b/framework/src/main/java/org/toop/framework/eventbus/subscriber/LongIdSubscriber.java
@@ -0,0 +1,8 @@
+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> {}
--- a/framework/src/main/java/org/toop/framework/eventbus/subscriber/NamedSubscriber.java
+++ b/framework/src/main/java/org/toop/framework/eventbus/subscriber/NamedSubscriber.java
@@ -0,0 +1,5 @@
+package org.toop.framework.eventbus.subscriber;
+
+import org.toop.framework.eventbus.events.EventType;
+
+public interface NamedSubscriber<K extends EventType> extends Subscriber<K>, HasId<String> {}
--- a/framework/src/main/java/org/toop/framework/eventbus/subscriber/Subscriber.java
+++ b/framework/src/main/java/org/toop/framework/eventbus/subscriber/Subscriber.java
@@ -0,0 +1,10 @@
+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();
+}
--- a/framework/src/main/java/org/toop/framework/gameFramework/model/game/threadBehaviour/AbstractThreadBehaviour.java
+++ b/framework/src/main/java/org/toop/framework/gameFramework/model/game/threadBehaviour/AbstractThreadBehaviour.java
@@ -5,7 +5,6 @@ import org.apache.logging.log4j.Logger;
 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.Player;

 import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.function.Consumer;
--- a/framework/src/main/java/org/toop/framework/gameFramework/model/game/threadBehaviour/ThreadBehaviour.java
+++ b/framework/src/main/java/org/toop/framework/gameFramework/model/game/threadBehaviour/ThreadBehaviour.java
@@ -3,8 +3,6 @@ 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 org.toop.framework.gameFramework.model.player.Player;

 import java.util.function.Consumer;

--- a/framework/src/main/java/org/toop/framework/gameFramework/model/player/AbstractPlayer.java
+++ b/framework/src/main/java/org/toop/framework/gameFramework/model/player/AbstractPlayer.java
@@ -5,46 +5,66 @@ import org.apache.logging.log4j.Logger;
 import org.toop.framework.gameFramework.model.game.TurnBasedGame;

 /**
- * Abstract class representing a player in a game.
- * <p>
- * Players are entities that can make moves based on the current state of a game.
- * player types, such as human players or AI players.
- * </p>
- * <p>
- * Subclasses should override the {@link #getMove(GameR)} method to provide
- * specific move logic.
- * </p>
+ * Base class for players in a turn-based game.
+ *
+ * @param <T> the game type
 */
 public abstract class AbstractPlayer<T extends TurnBasedGame<T>> implements Player<T> {
-    private final Logger logger = LogManager.getLogger(this.getClass());

+    private final Logger logger = LogManager.getLogger(this.getClass());
    private final String name;

+    /**
+     * Creates a new player with the given name.
+     *
+     * @param name the player name
+     */
    protected AbstractPlayer(String name) {
        this.name = name;
    }

+    /**
+     * Creates a copy of another player.
+     *
+     * @param other the player to copy
+     */
    protected AbstractPlayer(AbstractPlayer<T> other) {
        this.name = other.name;
    }
+
    /**
-     * Determines the next move based on the provided game state.
+     * Gets the player's move for the given game state.
+     * A deep copy is provided so the player cannot modify the real state.
     * <p>
-     * The default implementation throws an {@link UnsupportedOperationException},
-     * indicating that concrete subclasses must override this method to provide
-     * actual move logic.
-     * </p>
+     * This method uses the Template Method Pattern: it defines the fixed
+     * algorithm and delegates the variable part to {@link #determineMove(T)}.
     *
-     * @param gameCopy a snapshot of the current game state
-     * @return an integer representing the chosen move
-     * @throws UnsupportedOperationException if the method is not overridden
+     * @param game the current game
+     * @return the chosen move
     */
-    public long getMove(T gameCopy) {
-        logger.error("Method getMove not implemented.");
-        throw new UnsupportedOperationException("Not supported yet.");
+    public final long getMove(T game) {
+        return determineMove(game.deepCopy());
    }

-    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(T gameCopy);
+
+
+    /**
+     * Returns the player's name.
+     *
+     * @return the name
+     */
+    public String getName() {
        return this.name;
    }
 }
--- a/framework/src/main/java/org/toop/framework/networking/NetworkingClientEventListener.java
+++ b/framework/src/main/java/org/toop/framework/networking/NetworkingClientEventListener.java
@@ -4,19 +4,20 @@ 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.exceptions.ClientNotFoundException;
 import org.toop.framework.networking.interfaces.NetworkingClientManager;

 public class NetworkingClientEventListener {
-
    private static final Logger logger = LogManager.getLogger(NetworkingClientEventListener.class);
+
    private final NetworkingClientManager clientManager;

    /** Starts a connection manager, to manage, connections. */
-    public NetworkingClientEventListener(NetworkingClientManager clientManager) {
+    public NetworkingClientEventListener(EventBus eventBus, NetworkingClientManager clientManager) {
        this.clientManager = clientManager;
-        new EventFlow()
+        new EventFlow(eventBus)
                .listen(NetworkEvents.StartClient.class, this::handleStartClient, false)
                .listen(NetworkEvents.SendCommand.class, this::handleCommand, false)
                .listen(NetworkEvents.SendLogin.class, this::handleSendLogin, false)
@@ -40,6 +41,7 @@ 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(),
--- a/framework/src/main/java/org/toop/framework/networking/NetworkingClientManager.java
+++ b/framework/src/main/java/org/toop/framework/networking/NetworkingClientManager.java
@@ -8,7 +8,8 @@ import java.util.concurrent.TimeUnit;

 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
-import org.toop.framework.eventbus.GlobalEventBus;
+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.exceptions.ClientNotFoundException;
 import org.toop.framework.networking.exceptions.CouldNotConnectException;
@@ -17,9 +18,13 @@ import org.toop.framework.networking.types.NetworkingConnector;

 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() {}
+    public NetworkingClientManager(EventBus eventBus) {
+        this.eventBus = eventBus;
+    }

    private void connectHelper(
            long id,
@@ -28,8 +33,16 @@ public class NetworkingClientManager implements org.toop.framework.networking.in
            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;

@@ -46,7 +59,7 @@ public class NetworkingClientManager implements org.toop.framework.networking.in
                    nClient.connect(id, nConnector.host(), nConnector.port());
                    networkClients.put(id, nClient);
                    logger.info("New client started successfully for {}:{}", nConnector.host(), nConnector.port());
-                    GlobalEventBus.post(new NetworkEvents.ConnectTry(id, attempts, nConnector.reconnectAttempts(), true));
+                    eventBus.post(new NetworkEvents.ConnectTry(id, attempts, nConnector.reconnectAttempts(), true));
                    onSuccess.run();
                    scheduler.shutdown();
                } catch (CouldNotConnectException e) {
@@ -54,17 +67,17 @@ public class NetworkingClientManager implements org.toop.framework.networking.in
                    if (attempts < nConnector.reconnectAttempts()) {
                        logger.warn("Could not connect to {}:{}. Retrying in {} {}",
                                nConnector.host(), nConnector.port(), nConnector.timeout(), nConnector.timeUnit());
-                        GlobalEventBus.post(new NetworkEvents.ConnectTry(id, attempts, nConnector.reconnectAttempts(), false));
+                        eventBus.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);
-                        GlobalEventBus.post(new NetworkEvents.ConnectTry(id, -1, nConnector.reconnectAttempts(), false));
+                        eventBus.post(new NetworkEvents.ConnectTry(id, -1, nConnector.reconnectAttempts(), false));
                        onFailure.run();
                        scheduler.shutdown();
                    }
                } catch (Exception e) {
                    logger.error("Unexpected exception during startClient", e);
-                    GlobalEventBus.post(new NetworkEvents.ConnectTry(id, -1, nConnector.reconnectAttempts(), false));
+                    eventBus.post(new NetworkEvents.ConnectTry(id, -1, nConnector.reconnectAttempts(), false));
                    onFailure.run();
                    scheduler.shutdown();
                }
@@ -72,6 +85,8 @@ public class NetworkingClientManager implements org.toop.framework.networking.in
        };

        scheduler.schedule(connectTask, 0, TimeUnit.MILLISECONDS);
+//
+//        closeEvent.unsubscribe("close");
    }

    @Override
--- a/framework/src/main/java/org/toop/framework/networking/clients/TournamentNetworkingClient.java
+++ b/framework/src/main/java/org/toop/framework/networking/clients/TournamentNetworkingClient.java
@@ -11,6 +11,7 @@ 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.handlers.NetworkingGameClientHandler;
 import org.toop.framework.networking.interfaces.NetworkingClient;
@@ -19,9 +20,13 @@ 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;

-    public TournamentNetworkingClient() {}
+    public TournamentNetworkingClient(EventBus eventBus) {
+        this.eventBus = eventBus;
+    }

    @Override
    public InetSocketAddress getAddress() {
@@ -40,7 +45,7 @@ public class TournamentNetworkingClient implements NetworkingClient {
                    new ChannelInitializer<SocketChannel>() {
                        @Override
                        public void initChannel(SocketChannel ch) {
-                            NetworkingGameClientHandler handler = new NetworkingGameClientHandler(clientId);
+                            NetworkingGameClientHandler handler = new NetworkingGameClientHandler(eventBus, clientId);

                            ChannelPipeline pipeline = ch.pipeline();
                            pipeline.addLast(new LineBasedFrameDecoder(1024)); // split at \n
--- a/framework/src/main/java/org/toop/framework/networking/events/NetworkEvents.java
+++ b/framework/src/main/java/org/toop/framework/networking/events/NetworkEvents.java
@@ -4,6 +4,7 @@ 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.interfaces.NetworkingClient;
 import org.toop.framework.networking.types.NetworkingConnector;
@@ -11,7 +12,7 @@ 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 org.toop.framework.eventbus.GlobalEventBus}
+ * These events are used in conjunction with the {@link GlobalEventBus}
 * and {@link org.toop.framework.eventbus.EventFlow} to communicate between components
 * such as networking clients, managers, and listeners.
 * </p>
@@ -166,6 +167,10 @@ 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>
@@ -181,8 +186,6 @@ 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>
--- a/framework/src/main/java/org/toop/framework/networking/handlers/NetworkingGameClientHandler.java
+++ b/framework/src/main/java/org/toop/framework/networking/handlers/NetworkingGameClientHandler.java
@@ -8,15 +8,17 @@ import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
-import org.toop.framework.eventbus.EventFlow;
+import org.toop.framework.eventbus.bus.EventBus;
 import org.toop.framework.networking.events.NetworkEvents;

 public class NetworkingGameClientHandler extends ChannelInboundHandlerAdapter {
    private static final Logger logger = LogManager.getLogger(NetworkingGameClientHandler.class);

+    private final EventBus eventBus;
    private final long connectionId;

-    public NetworkingGameClientHandler(long connectionId) {
+    public NetworkingGameClientHandler(EventBus eventBus, long connectionId) {
+        this.eventBus = eventBus;
        this.connectionId = connectionId;
    }

@@ -40,9 +42,7 @@ public class NetworkingGameClientHandler extends ChannelInboundHandlerAdapter {
                    "Received SVR message from server-{}, data: {}",
                    ctx.channel().remoteAddress(),
                    msg);
-            new EventFlow()
-                    .addPostEvent(new NetworkEvents.ServerResponse(this.connectionId))
-                    .asyncPostEvent();
+            eventBus.post(new NetworkEvents.ServerResponse(this.connectionId));
            parseServerReturn(rec);
            return;
        }
@@ -113,11 +113,7 @@ public class NetworkingGameClientHandler extends ChannelInboundHandlerAdapter {
                        .map(m -> m.group(1).trim())
                        .toArray(String[]::new);

-        new EventFlow()
-                .addPostEvent(
-                        new NetworkEvents.GameMoveResponse(
-                                this.connectionId, msg[0], msg[1], msg[2]))
-                .asyncPostEvent();
+        eventBus.post(new NetworkEvents.GameMoveResponse(this.connectionId, msg[0], msg[1], msg[2]));
    }

    private void gameWinConditionHandler(String rec) {
@@ -128,9 +124,7 @@ public class NetworkingGameClientHandler extends ChannelInboundHandlerAdapter {
                .findFirst()
                .orElse("");

-        new EventFlow()
-                .addPostEvent(new NetworkEvents.GameResultResponse(this.connectionId, condition))
-                .asyncPostEvent();
+        eventBus.post(new NetworkEvents.GameResultResponse(this.connectionId, condition));
    }

    private void gameChallengeHandler(String rec) {
@@ -145,17 +139,9 @@ public class NetworkingGameClientHandler extends ChannelInboundHandlerAdapter {
                            .toArray(String[]::new);

            if (isCancelled)
-                new EventFlow()
-                        .addPostEvent(
-                                new NetworkEvents.ChallengeCancelledResponse(
-                                        this.connectionId, msg[0]))
-                        .asyncPostEvent();
+                eventBus.post(new NetworkEvents.GameResultResponse(this.connectionId, msg[0]));
            else
-                new EventFlow()
-                        .addPostEvent(
-                                new NetworkEvents.ChallengeResponse(
-                                        this.connectionId, msg[0], msg[1], msg[2]))
-                        .asyncPostEvent();
+                eventBus.post(new NetworkEvents.ChallengeResponse(this.connectionId, msg[0], msg[1], msg[2]));
        } catch (ArrayIndexOutOfBoundsException e) {
            logger.error("Array out of bounds for: {}", rec, e);
        }
@@ -171,11 +157,7 @@ public class NetworkingGameClientHandler extends ChannelInboundHandlerAdapter {
                            .toArray(String[]::new);

            // [0] playerToMove, [1] gameType, [2] opponent
-            new EventFlow()
-                    .addPostEvent(
-                            new NetworkEvents.GameMatchResponse(
-                                    this.connectionId, msg[0], msg[1], msg[2]))
-                    .asyncPostEvent();
+            eventBus.post(new NetworkEvents.GameMatchResponse(this.connectionId, msg[0], msg[1], msg[2]));
        } catch (ArrayIndexOutOfBoundsException e) {
            logger.error("Array out of bounds for: {}", rec, e);
        }
@@ -190,9 +172,7 @@ public class NetworkingGameClientHandler extends ChannelInboundHandlerAdapter {
                        .toString()
                        .trim();

-        new EventFlow()
-                .addPostEvent(new NetworkEvents.YourTurnResponse(this.connectionId, msg))
-                .asyncPostEvent();
+        eventBus.post(new NetworkEvents.YourTurnResponse(this.connectionId, msg));
    }

    private void playerlistHandler(String rec) {
@@ -203,9 +183,7 @@ public class NetworkingGameClientHandler extends ChannelInboundHandlerAdapter {
                        .map(m -> m.group(1).trim())
                        .toArray(String[]::new);

-        new EventFlow()
-                .addPostEvent(new NetworkEvents.PlayerlistResponse(this.connectionId, players))
-                .asyncPostEvent();
+        eventBus.post(new NetworkEvents.PlayerlistResponse(this.connectionId, players));
    }

    private void gamelistHandler(String rec) {
@@ -216,9 +194,7 @@ public class NetworkingGameClientHandler extends ChannelInboundHandlerAdapter {
                        .map(m -> m.group(1).trim())
                        .toArray(String[]::new);

-        new EventFlow()
-                .addPostEvent(new NetworkEvents.GamelistResponse(this.connectionId, gameTypes))
-                .asyncPostEvent();
+        eventBus.post(new NetworkEvents.GamelistResponse(this.connectionId, gameTypes));
    }

    private void helpHandler(String rec) {
--- a/framework/src/main/java/org/toop/framework/resource/ResourceManager.java
+++ b/framework/src/main/java/org/toop/framework/resource/ResourceManager.java
@@ -92,11 +92,6 @@ public class ResourceManager {
        return asset.getResource();
    }

-    //    @SuppressWarnings("unchecked")
-    //    public static <T extends BaseResource> ArrayList<ResourceMeta<T>> getAllOfType() {
-    //        return (ArrayList<ResourceMeta<T>>) (ArrayList<?>) new ArrayList<>(assets.values());
-    //    }
-
    /**
     * Retrieve all assets of a specific resource type.
     *
--- a/framework/src/main/java/org/toop/framework/resource/resources/LocalizationAsset.java
+++ b/framework/src/main/java/org/toop/framework/resource/resources/LocalizationAsset.java
@@ -147,24 +147,6 @@ public class LocalizationAsset extends BaseResource implements LoadableResource,
        return this.baseName;
    }

-    //    /**
-    //     * Extracts the base name from a file name.
-    //     *
-    //     * @param fileName the file name
-    //     * @return base name without locale or extension
-    //     */
-    //    private String getBaseName(String fileName) {
-    //        int dotIndex = fileName.lastIndexOf('.');
-    //        String nameWithoutExtension = (dotIndex > 0) ? fileName.substring(0, dotIndex) :
-    // fileName;
-    //
-    //        int underscoreIndex = nameWithoutExtension.indexOf('_');
-    //        if (underscoreIndex > 0) {
-    //            return nameWithoutExtension.substring(0, underscoreIndex);
-    //        }
-    //        return nameWithoutExtension;
-    //    }
-
    /**
     * Extracts a locale from a file name based on the pattern "base_LOCALE.properties".
     *
--- a/framework/src/main/java/org/toop/framework/resource/resources/SettingsAsset.java
+++ b/framework/src/main/java/org/toop/framework/resource/resources/SettingsAsset.java
@@ -2,6 +2,9 @@ package org.toop.framework.resource.resources;

 import java.io.File;
 import java.util.Locale;
+
+import org.toop.framework.resource.ResourceManager;
+import org.toop.framework.resource.ResourceMeta;
 import org.toop.framework.settings.Settings;

 public class SettingsAsset extends JsonAsset<Settings> {
@@ -54,6 +57,10 @@ public class SettingsAsset extends JsonAsset<Settings> {
        return getContent().firstReversi;
    }

+    public boolean getSwitchReversi() {
+        return getContent().switchReversi;
+    }
+
    public void setVolume(int volume) {
        getContent().volume = volume;
        save();
@@ -108,4 +115,51 @@ public class SettingsAsset extends JsonAsset<Settings> {
        getContent().firstReversi = firstReversi;
        save();
    }
+
+    public void setSwitchReversi(boolean switchReversi) {
+        getContent().switchReversi = switchReversi;
+        save();
+    }
+
+    public void setContent(Settings settings) {
+        setVolume(settings.volume);
+        setFxVolume(settings.fxVolume);
+        setMusicVolume(settings.musicVolume);
+        setLocale(settings.locale);
+        setFullscreen(settings.fullScreen);
+        setTheme(settings.theme);
+        setLayoutSize(settings.layoutSize);
+        setTutorialFlag(settings.showTutorials);
+        setFirstTTT(settings.firstTTT);
+        setFirstConnect4(settings.firstConnect4);
+        setFirstReversi(settings.firstReversi);
+        setSwitchReversi(settings.switchReversi);
+    }
+
+    public static SettingsAsset getPath() {
+        SettingsAsset settingsAsset;
+        try {
+            settingsAsset = ResourceManager.get("settings.json");
+        } catch (Exception e) {
+        String os = System.getProperty("os.name").toLowerCase();
+        String basePath;
+
+        if (os.contains("win")) {
+            basePath = System.getenv("APPDATA");
+            if (basePath == null) {
+                basePath = System.getProperty("user.home");
+            }
+        } else if (os.contains("mac")) {
+            basePath = System.getProperty("user.home") + "/Library/Application Support";
+        } else {
+            basePath = System.getProperty("user.home") + "/.config";
+        }
+
+        File settingsFile =
+                new File(basePath + File.separator + "ISY1" + File.separator + "settings.json");
+        settingsAsset = new SettingsAsset(settingsFile);
+        ResourceManager.addAsset(new ResourceMeta<>("settings.json", settingsAsset));
+        }
+        return settingsAsset;
+    }
 }
--- a/framework/src/main/java/org/toop/framework/resource/types/BundledResource.java
+++ b/framework/src/main/java/org/toop/framework/resource/types/BundledResource.java
@@ -69,9 +69,4 @@ public interface BundledResource {
     * @return the base name used to identify this bundled resource
     */
    String getBaseName();
-
-    //    /**
-    //    Returns the name
-    //    */
-    //    String getDefaultName();
 }
--- a/framework/src/main/java/org/toop/framework/settings/Settings.java
+++ b/framework/src/main/java/org/toop/framework/settings/Settings.java
@@ -12,5 +12,5 @@ public class Settings {
    public Boolean firstReversi;
    public Boolean firstTTT;
    public Boolean firstConnect4;
-
+    public boolean switchReversi = false;
 }
--- a/framework/src/test/java/org/toop/framework/audio/MusicManagerTest.java
+++ b/framework/src/test/java/org/toop/framework/audio/MusicManagerTest.java
@@ -3,6 +3,7 @@ package org.toop.framework.audio;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.toop.framework.dispatch.interfaces.Dispatcher;
+import org.toop.framework.eventbus.GlobalEventBus;
 import org.toop.framework.resource.resources.BaseResource;
 import org.toop.framework.resource.types.AudioResource;

@@ -94,7 +95,7 @@ public class MusicManagerTest {

        List<MockAudioResource> resources = List.of(track1, track2, track3);

-        manager = new MusicManager<>(resources, dispatcher);
+        manager = new MusicManager<>(GlobalEventBus.get(), resources, dispatcher);
    }

    @Test
@@ -188,7 +189,7 @@ public class MusicManagerTest {
            manyTracks.add(new MockAudioResource("track" + i));
        }

-        MusicManager<MockAudioResource> multiManager = new MusicManager<>(manyTracks, dispatcher);
+        MusicManager<MockAudioResource> multiManager = new MusicManager<>(GlobalEventBus.get(), manyTracks, dispatcher);

        for (int i = 0; i < manyTracks.size() - 1; i++) {
            multiManager.play();
--- a/framework/src/test/java/org/toop/framework/eventbus/EventFlowStressTest.java
+++ b/framework/src/test/java/org/toop/framework/eventbus/EventFlowStressTest.java
@@ -79,7 +79,7 @@
            executor.submit(() -> {
                for (int i = 0; i < EVENTS_PER_THREAD; i++) {
                    var _ = new EventFlow().addPostEvent(HeavyEvent.class, "payload-" + i)
-                            .asyncPostEvent();
+                            .postEvent();
                }
            });
        }
--- a/framework/src/test/java/org/toop/framework/settings/SettingsAssetTest.java
+++ b/framework/src/test/java/org/toop/framework/settings/SettingsAssetTest.java
@@ -0,0 +1,135 @@
+package org.toop.framework.settings;
+
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.toop.framework.resource.resources.SettingsAsset;
+
+import java.util.Locale;
+
+import static org.junit.jupiter.api.Assertions.*;
+
+public class SettingsAssetTest {
+
+    private Settings copySettings;
+    private SettingsAsset settingsAsset;
+
+    @BeforeEach
+    void setup() {
+       this.settingsAsset = SettingsAsset.getPath();
+        Settings original = settingsAsset.getContent();
+        this.copySettings = new Settings();
+        this.copySettings.volume = original.volume;
+        this.copySettings.fxVolume = original.fxVolume;
+        this.copySettings.musicVolume = original.musicVolume;
+        this.copySettings.locale = original.locale;
+        this.copySettings.fullScreen = original.fullScreen;
+        this.copySettings.theme = original.theme;
+        this.copySettings.layoutSize = original.layoutSize;
+        this.copySettings.showTutorials = original.showTutorials;
+        this.copySettings.firstTTT = original.firstTTT;
+        this.copySettings.firstConnect4 = original.firstConnect4;
+        this.copySettings.firstReversi = original.firstReversi;
+    }
+
+
+    @AfterEach
+    void teardown() {
+        settingsAsset.setContent(copySettings);
+    }
+
+    @Test
+    void testVolume() {
+        settingsAsset.setVolume(55);
+        assertEquals(55, settingsAsset.getVolume());
+    }
+
+    @Test
+    void testFxVolume() {
+        settingsAsset.setFxVolume(33);
+        assertEquals(33, settingsAsset.getFxVolume());
+    }
+
+    @Test
+    void testMusicVolume() {
+        settingsAsset.setMusicVolume(77);
+        assertEquals(77, settingsAsset.getMusicVolume());
+    }
+
+    @Test
+    void testLocale() {
+        settingsAsset.setLocale("es-ES");
+        assertEquals(Locale.forLanguageTag("es-ES"), settingsAsset.getLocale());
+    }
+
+    @Test
+    void testFullscreen() {
+        settingsAsset.setFullscreen(true);
+        assertTrue(settingsAsset.getFullscreen());
+    }
+
+    @Test
+    void testTheme() {
+        settingsAsset.setTheme("dark");
+        assertEquals("dark", settingsAsset.getTheme());
+    }
+
+    @Test
+    void testLayoutsize() {
+        settingsAsset.setLayoutSize("large");
+        assertEquals("large", settingsAsset.getLayoutSize());
+    }
+
+    @Test
+    void testTutorialflag() {
+        settingsAsset.setTutorialFlag(false);
+        assertFalse(settingsAsset.getTutorialFlag());
+    }
+
+    @Test
+    void testTTT() {
+        settingsAsset.setFirstTTT(true);
+        assertTrue(settingsAsset.getFirstTTT());
+    }
+
+    @Test
+    void testConnect4() {
+        settingsAsset.setFirstConnect4(false);
+        assertFalse(settingsAsset.getFirstConnect4());
+    }
+
+    @Test
+    void testReversi() {
+        settingsAsset.setFirstReversi(true);
+        assertTrue(settingsAsset.getFirstReversi());
+    }
+
+    @Test
+    void testReplaceFields() {
+        Settings newSettings = new Settings();
+        newSettings.volume = 10;
+        newSettings.fxVolume = 20;
+        newSettings.musicVolume = 30;
+        newSettings.locale = "fr-FR";
+        newSettings.fullScreen = true;
+        newSettings.theme = "light";
+        newSettings.layoutSize = "medium";
+        newSettings.showTutorials = false;
+        newSettings.firstTTT = false;
+        newSettings.firstConnect4 = true;
+        newSettings.firstReversi = false;
+        settingsAsset.setContent(newSettings);
+        assertEquals(10, settingsAsset.getVolume());
+        assertEquals(20, settingsAsset.getFxVolume());
+        assertEquals(30, settingsAsset.getMusicVolume());
+        assertEquals(Locale.forLanguageTag("fr-FR"), settingsAsset.getLocale());
+        assertTrue(settingsAsset.getFullscreen());
+        assertEquals("light", settingsAsset.getTheme());
+        assertEquals("medium", settingsAsset.getLayoutSize());
+        assertFalse(settingsAsset.getTutorialFlag());
+        assertFalse(settingsAsset.getFirstTTT());
+        assertTrue(settingsAsset.getFirstConnect4());
+        assertFalse(settingsAsset.getFirstReversi());
+    }
+}
+
--- a/game/src/main/java/org/toop/game/players/ArtificialPlayer.java
+++ b/game/src/main/java/org/toop/game/players/ArtificialPlayer.java
@@ -4,52 +4,52 @@ import org.toop.framework.gameFramework.model.player.*;
 import org.toop.framework.gameFramework.model.game.TurnBasedGame;

 /**
- * Represents a player controlled by an AI in a game.
- * <p>
- * This player uses an {@link AbstractAI} instance to determine its moves. The generic
- * parameter {@code T} specifies the type of {@link GameR} the AI can handle.
- * </p>
+ * Represents a player controlled by an AI.
 *
- * @param <T> the specific type of game this AI player can play
+ * @param <T> the type of turn-based game
 */
 public class ArtificialPlayer<T extends TurnBasedGame<T>> extends AbstractPlayer<T> {

-    /** The AI instance used to calculate moves. */
    private final AI<T> ai;

    /**
-     * Constructs a new ArtificialPlayer using the specified AI.
+     * Creates a new AI-controlled player.
     *
-     * @param ai the AI instance that determines moves for this player
+     * @param ai the AI controlling this player
+     * @param name the player's name
     */
    public ArtificialPlayer(AI<T> ai, String name) {
        super(name);
        this.ai = ai;
    }

+    /**
+     * Creates a copy of another AI-controlled player.
+     *
+     * @param other the player to copy
+     */
    public ArtificialPlayer(ArtificialPlayer<T> other) {
        super(other);
        this.ai = other.ai.deepCopy();
    }

    /**
-     * Determines the next move for this player using its AI.
-     * <p>
-     * This method overrides {@link AbstractPlayer#getMove(GameR)}. Because the AI is
-     * typed to {@code T}, a runtime cast is required. It is the caller's
-     * responsibility to ensure that {@code gameCopy} is of type {@code T}.
-     * </p>
+     * Determines the player's move using the AI.
     *
-     * @param gameCopy a copy of the current game state
-     * @return the integer representing the chosen move
-     * @throws ClassCastException if {@code gameCopy} is not of type {@code T}
+     * @param gameCopy a copy of the current game
+     * @return the move chosen by the AI
     */
-    public long getMove(T gameCopy) {
+    protected long determineMove(T gameCopy) {
        return ai.getMove(gameCopy);
    }

+    /**
+     * Creates a deep copy of this AI player.
+     *
+     * @return a copy of this player
+     */
    @Override
    public ArtificialPlayer<T> deepCopy() {
-        return new ArtificialPlayer<T>(this);
+        return new ArtificialPlayer<>(this);
    }
 }
--- a/game/src/main/java/org/toop/game/players/LocalPlayer.java
+++ b/game/src/main/java/org/toop/game/players/LocalPlayer.java
@@ -2,85 +2,86 @@ package org.toop.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 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<T extends TurnBasedGame<T>> extends AbstractPlayer<T> {
-    // Future can be used with event system, IF unsubscribeAfterSuccess works...
-    // private CompletableFuture<Integer> LastMove = new CompletableFuture<>();

-    private CompletableFuture<Long> LastMove;
+    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<T> 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
-    public long getMove(T gameCopy) {
-        return getValidMove(gameCopy);
+    protected long determineMove(T gameCopy) {
+        long legalMoves = gameCopy.getLegalMoves();
+        long move;
+
+        do {
+            move = getLastMove();
+        } while ((legalMoves & move) == 0);
+
+        return move;
    }

-    public void setMove(long move) {
+    /**
+     * Sets the player's last move.
+     *
+     * @param move the move to set
+     */
+    public void setLastMove(long move) {
        LastMove.complete(move);
    }

-    // TODO: helper function, would like to replace to get rid of this method
-    public static boolean contains(int[] array, int value){
-        for (int i : array) if (i == value) return true;
-        return false;
-    }
-
-    private long getMove2(T gameCopy) {
-        LastMove = new CompletableFuture<>();
-        long move = 0;
+    /**
+     * 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 {
-            move = LastMove.get();
-            System.out.println(Long.toBinaryString(move));
-        } catch (InterruptedException | ExecutionException e) {
-            // TODO: Add proper logging.
-            e.printStackTrace();
+            return LastMove.get();
+        } catch (ExecutionException | InterruptedException e) {
+            return 0;
        }
-        return move;
-    }
-
-    protected long getValidMove(T gameCopy){
-        // Get this player's valid moves
-        long validMoves = gameCopy.getLegalMoves();
-        // Make sure provided move is valid
-        // TODO: Limit amount of retries?
-        // TODO: Stop copying game so many times
-        long move = getMove2(gameCopy.deepCopy());
-        while ((validMoves & move) == 0) {
-            System.out.println("Not a valid move, try again");
-            move = getMove2(gameCopy.deepCopy());
-        }
-        return move;
    }

+    /**
+     * Creates a deep copy of this local player.
+     *
+     * @return a copy of this player
+     */
    @Override
    public LocalPlayer<T> deepCopy() {
-        return new LocalPlayer<T>(this.getName());
+        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;
-    }*/
 }
--- a/game/src/main/java/org/toop/game/players/OnlinePlayer.java
+++ b/game/src/main/java/org/toop/game/players/OnlinePlayer.java
@@ -5,30 +5,45 @@ import org.toop.framework.gameFramework.model.player.AbstractPlayer;
 import org.toop.framework.gameFramework.model.player.Player;

 /**
- * Represents a player controlled remotely or over a network.
- * <p>
- * This class extends {@link AbstractPlayer} and can be used to implement game logic
- * where moves are provided by an external source (e.g., another user or a server).
- * Currently, this class is a placeholder and does not implement move logic.
- * </p>
+ * Represents a player that participates online.
+ *
+ * @param <T> the type of turn-based game
 */
 public class OnlinePlayer<T extends TurnBasedGame<T>> extends AbstractPlayer<T> {

    /**
-     * Constructs a new OnlinePlayer.
-     * <p>
-     * Currently, no additional initialization is performed. Subclasses or
-     * future implementations should provide mechanisms to receive moves from
-     * an external source.
+     * 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<T> other) {
        super(other);
    }

+    /**
+     * {@inheritDoc}
+     * <p>
+     * This method is not supported for online players.
+     *
+     * @throws UnsupportedOperationException always
+     */
+    @Override
+    protected long determineMove(T gameCopy) {
+        throw new UnsupportedOperationException("An online player does not support determining move");
+    }
+
+    /**
+     * {@inheritDoc}
+     */
    @Override
    public Player<T> deepCopy() {
        return new OnlinePlayer<>(this);
--- a/game/src/main/java/org/toop/game/players/ai/MiniMaxAI.java
+++ b/game/src/main/java/org/toop/game/players/ai/MiniMaxAI.java
@@ -1,4 +1,4 @@
-package org.toop.game.players;
+package org.toop.game.players.ai;

 import org.toop.framework.gameFramework.GameState;
 import org.toop.framework.gameFramework.model.game.PlayResult;
--- a/game/src/main/java/org/toop/game/players/ai/RandomAI.java
+++ b/game/src/main/java/org/toop/game/players/ai/RandomAI.java
@@ -1,4 +1,4 @@
-package org.toop.game.players;
+package org.toop.game.players.ai;

 import org.toop.framework.gameFramework.model.game.TurnBasedGame;
 import org.toop.framework.gameFramework.model.player.AbstractAI;
Author	SHA1	Message	Date
michiel301b	e5e79bb9b0	kleine fuckup gefixd	2025-12-11 17:00:35 +01:00
michiel301b	a982345791	added color swaps	2025-12-11 16:59:04 +01:00
michiel	d1176f2151	Changed back to white starting + updated UI for it	2025-12-11 14:17:11 +01:00
michiel	39df1be6ee	SettingsTest added	2025-12-11 14:03:38 +01:00
michiel	4b80072042	made black start again cuz it was annoying me that white was starting	2025-12-11 12:58:52 +01:00
michiel	e6e931b565	generic game controller now draws legal moves for instances of bitlegalmovedrawer (reversi),	2025-12-11 12:38:40 +01:00
michiel301b	e5ad144783	temp commit, adding legalmoves to reversi part1	2025-12-11 10:50:05 +01:00
michiel301b	550ee5874b	player info weer teruggestopt	2025-12-11 10:23:27 +01:00
Stef	1ae79daef0	Added documentation to player classes and improved method names (#295 )	2025-12-10 13:17:01 +01:00
Stef	cd8eb99559	Merge 292 into development (#293 ) Applied template method pattern to abstract player	2025-12-10 12:39:40 +01:00
Bas Antonius de Jong	0132981d94	Merge branch 'main' into Development	2025-12-09 21:20:08 +01:00
Bas de Jong	322197494c	Will fix tests etc later	2025-12-09 21:19:30 +01:00
Bas de Jong	a9c99df5d2	Better limits to generic acceptance	2025-12-09 21:07:30 +01:00
Stef	912d25c01f	Merge bitboards into development (#285 ) * added new classes for the games that use bitboards instead. also combined game with turnbasedgame * (DOES NOT COMPILE) In-between commit * turn updates * smalle fixes aan turn updates * Bitboard implemented with scuffed TicTacToe translation done by game. This should be done by the view. * Almost done with implementing bitboards. Reversi is broken and artifical players don't work yet. * better human/ai selector with bot selection and depth on TicTacToeAIR * fixed getLegalMoves * depth + thinktime back to AIs, along with a a specific TicTacToeAIRSleep * fixed overlapping back and disconnect buttons * Changed to debug instead of info * changed the transitionNextCustom to be easier to use * added getAllWidgets to WidgetContainer * Correct back view * added replacePrevious in ViewWidget * added removeIndexFromPreviousChain * fixed incorrect index counting * Fixt wrong view order * fixed? getLegalMoves * Everything is broken * Removed todo * fixed getLegalMoves & getFlips * Challenge popups "Fixed" * Fixed local and online play for both games * Popups now remove themselves * Removed souts for debugging * localize the ChallengePopup text * made the game text a header instead * made more classes deepClonable. * fixed getAllWidgets * Added comment * Escape popup * fixed redundant container * Made all network events async again * Escape remove popup * Working escape menu * Removed old AI and old files. Added a new generic random AI. game no longer deals with translation. * Drawing of board on canvas is now done from bitboards rather than translating. * Added a method getWinner() to game interface.Controller now tells gameThreads how to deal with drawing UI and sending a move to server. * Added find functionality * Added a ChatGPT generated MiniMaxAI based on the old MiniMaxAI but with alpha-beta pruning and heuristics for Reversi * Removed System-Outs to clean up console * Update BitGameCanvas.java * Merge fixes * Removed unused imports --------- Co-authored-by: ramollia <> Co-authored-by: michiel301b <m.brands.3@st.hanze.nl> Co-authored-by: lieght <49651652+BAFGdeJong@users.noreply.github.com>	2025-12-08 18:23:06 +01:00
Ticho Hidding	adc7b1a8f3	fixed reversi colors being switched, causing multiple issues	2025-12-08 17:14:31 +01:00
Ticho Hidding	3a8b1c2454	shitty fix for player selector spacing issue v2	2025-12-08 16:12:42 +01:00
Ticho Hidding	846898988f	shitty fix for player selector spacing issue	2025-12-08 15:59:11 +01:00
Ticho Hidding	ecd0fd26be	changed "fullscreen exit key combination" from esc to F11	2025-12-08 15:11:17 +01:00
lieght	a838973e67	Code cleanup	2025-12-07 20:43:56 +01:00
lieght	a4f2a67d9c	Deleted unnecessary imports	2025-12-07 20:39:29 +01:00
lieght	12bccb8854	Safety	2025-12-07 20:33:27 +01:00
lieght	80d3e47ad9	initSystems now uses latch instead of timer. Moved single threads to Executor	2025-12-07 18:59:19 +01:00
Bas Antonius de Jong	38f50cc16d	Event bus now testable, improved UI (#284 ) * turn updates * smalle fixes aan turn updates * better human/ai selector with bot selection and depth on TicTacToeAIR * depth + thinktime back to AIs, along with a a specific TicTacToeAIRSleep * fixed overlapping back and disconnect buttons * Changed to debug instead of info * changed the transitionNextCustom to be easier to use * added getAllWidgets to WidgetContainer * Correct back view * added replacePrevious in ViewWidget * added removeIndexFromPreviousChain * fixed incorrect index counting * Fixt wrong view order * Removed todo * Challenge popups "Fixed" * Popups now remove themselves * localize the ChallengePopup text * made the game text a header instead * fixed getAllWidgets * Escape popup * fixed redundant container * Escape remove popup * Working escape menu * Added find functionality * Tutorials moved to escape menu * Escape can't be opened in mainview now * Can now test the event bus, created testable interfaces * Logging errors * Made events and handlers more generic * Suppress * Managers now have changeable eventbus * Tutorials fixed * Removed import * Single threaded eventbus * Fixed wrong eventbus * Removed get * Removed old code * Renaming * Optimization * Removed useless comment * Removed unnecessary imports * Rename * Renaming, refactor and type safety * Rename * Removed import --------- Co-authored-by: michiel301b <m.brands.3@st.hanze.nl> Co-authored-by: ramollia <>	2025-12-07 17:38:34 +01:00
Bas Antonius de Jong	afb4844084	Merge pull request #164 from 2OOP/Development Development update, demo 2	2025-10-07 19:57:50 +02:00