diff --git a/framework/src/main/java/org/toop/framework/gameFramework/controller/GameController.java b/framework/src/main/java/org/toop/framework/gameFramework/controller/GameController.java index 5591d25..2364c5e 100644 --- a/framework/src/main/java/org/toop/framework/gameFramework/controller/GameController.java +++ b/framework/src/main/java/org/toop/framework/gameFramework/controller/GameController.java @@ -1,9 +1,8 @@ package org.toop.framework.gameFramework.controller; -import org.toop.framework.gameFramework.model.game.threadBehaviour.Controllable; import org.toop.framework.networking.connection.events.NetworkEvents; -public interface GameController extends Controllable, UpdatesGameUI { +public interface GameController { /** Called when it is this player's turn to make a move. */ void onYourTurn(NetworkEvents.YourTurnResponse event); @@ -13,5 +12,12 @@ public interface GameController extends Controllable, UpdatesGameUI { /** Called when the game has finished, with the final result. */ void gameFinished(NetworkEvents.GameResultResponse event); + void start(); + + void stop(); + + /** Called to refresh or update the game UI. */ + void updateUI(); + void sendMove(long clientId, long move); } diff --git a/framework/src/main/java/org/toop/framework/gameFramework/controller/UpdatesGameUI.java b/framework/src/main/java/org/toop/framework/gameFramework/controller/UpdatesGameUI.java deleted file mode 100644 index ce32bb7..0000000 --- a/framework/src/main/java/org/toop/framework/gameFramework/controller/UpdatesGameUI.java +++ /dev/null @@ -1,10 +0,0 @@ -package org.toop.framework.gameFramework.controller; - -/** - * Interface for classes that can trigger a UI update. - */ -public interface UpdatesGameUI { - - /** Called to refresh or update the game UI. */ - void updateUI(); -} diff --git a/framework/src/main/java/org/toop/framework/gameFramework/model/game/threadBehaviour/Controllable.java b/framework/src/main/java/org/toop/framework/gameFramework/model/game/threadBehaviour/Controllable.java deleted file mode 100644 index cefbbd4..0000000 --- a/framework/src/main/java/org/toop/framework/gameFramework/model/game/threadBehaviour/Controllable.java +++ /dev/null @@ -1,7 +0,0 @@ -package org.toop.framework.gameFramework.model.game.threadBehaviour; - -public interface Controllable { - void start(); - - void stop(); -} diff --git 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 index 7b1bc35..25d769e 100644 --- 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 @@ -11,8 +11,11 @@ import java.util.function.Consumer; *
* Defines how a game's execution is started, stopped, and which player is active. */ -public interface ThreadBehaviour extends Controllable { +public interface ThreadBehaviour { void setOnUpdateUI(Runnable onUpdateUI); void setOnSendMove(LongPairConsumer onSendMove); + void start(); + void stop(); + }