stef_buwalda/pism
1
0
Fork 0
mirror of https://github.com/2OOP/pism.git synced 2026-02-04 10:54:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

Collapsed interfaces from model portion

Browse Source
This commit is contained in:
Stef
2026-01-07 12:41:25 +01:00
parent a7d1a964c2
commit e72d888d84
16 changed files with 20 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/main/java/org/toop/app/Server.java
View File

@@ -19,7 +19,7 @@ import org.toop.framework.networking.connection.events.NetworkEvents;
import org.toop.framework.networking.connection.types.NetworkingConnector;
import org.toop.framework.game.players.ArtificialPlayer;
import org.toop.framework.game.players.OnlinePlayer;
import org.toop.framework.game.players.RandomAI;
import org.toop.framework.game.players.ai.RandomAI;
import org.toop.framework.networking.server.gateway.NettyGatewayServer;
import org.toop.local.AppContext;

2
app/src/main/java/org/toop/app/gameControllers/GenericGameController.java
View File

@@ -10,7 +10,7 @@ import org.toop.app.widget.view.GameView;
import org.toop.framework.eventbus.EventFlow;
import org.toop.framework.eventbus.GlobalEventBus;
import org.toop.framework.gameFramework.controller.GameController;
import org.toop.framework.gameFramework.model.game.SupportsOnlinePlay;
import org.toop.framework.gameFramework.model.game.threadBehaviour.SupportsOnlinePlay;
import org.toop.framework.gameFramework.model.game.TurnBasedGame;
import org.toop.framework.gameFramework.model.game.threadBehaviour.ThreadBehaviour;
import org.toop.framework.gameFramework.model.player.Player;

6
app/src/main/java/org/toop/app/widget/view/LocalMultiplayerView.java
View File

@@ -6,8 +6,6 @@ import org.toop.app.gameControllers.ReversiBitController;
import org.toop.app.gameControllers.TicTacToeBitController;
import org.toop.framework.gameFramework.controller.GameController;
import org.toop.framework.gameFramework.model.player.Player;
import org.toop.framework.game.games.reversi.BitboardReversi;
import org.toop.framework.game.games.tictactoe.BitboardTicTacToe;
import org.toop.framework.game.players.ArtificialPlayer;
import org.toop.framework.game.players.LocalPlayer;
import org.toop.app.widget.Primitive;
@@ -15,8 +13,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.framework.game.players.MiniMaxAI;
import org.toop.framework.game.players.RandomAI;
import org.toop.framework.game.players.ai.MiniMaxAI;
import org.toop.framework.game.players.ai.RandomAI;
import org.toop.local.AppContext;
import javafx.geometry.Pos;

2
framework/src/main/java/org/toop/framework/game/gameThreads/OnlineThreadBehaviour.java
View File

@@ -4,7 +4,7 @@ import org.toop.framework.eventbus.EventFlow;
import org.toop.framework.gameFramework.model.game.threadBehaviour.AbstractThreadBehaviour;
import org.toop.framework.gameFramework.view.GUIEvents;
import org.toop.framework.gameFramework.model.game.TurnBasedGame;
import org.toop.framework.gameFramework.model.game.SupportsOnlinePlay;
import org.toop.framework.gameFramework.model.game.threadBehaviour.SupportsOnlinePlay;
import org.toop.framework.gameFramework.model.player.Player;
import org.toop.framework.game.players.OnlinePlayer;

2
framework/src/main/java/org/toop/framework/game/players/MiniMaxAI.java → framework/src/main/java/org/toop/framework/game/players/ai/MiniMaxAI.java
View File

@@ -1,4 +1,4 @@
package org.toop.framework.game.players;
package org.toop.framework.game.players.ai;
import org.toop.framework.gameFramework.GameState;
import org.toop.framework.gameFramework.model.game.PlayResult;

2
framework/src/main/java/org/toop/framework/game/players/RandomAI.java → framework/src/main/java/org/toop/framework/game/players/ai/RandomAI.java
View File

@@ -1,4 +1,4 @@
package org.toop.framework.game.players;
package org.toop.framework.game.players.ai;
import org.toop.framework.gameFramework.model.game.TurnBasedGame;
import org.toop.framework.gameFramework.model.player.AbstractAI;

5
framework/src/main/java/org/toop/framework/gameFramework/model/game/BoardProvider.java
View File

@@ -1,5 +0,0 @@
package org.toop.framework.gameFramework.model.game;
public interface BoardProvider {
long[] getBoard();
}

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

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

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

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

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

@@ -2,9 +2,12 @@ package org.toop.framework.gameFramework.model.game;
import org.toop.framework.gameFramework.model.player.Player;
public interface TurnBasedGame extends Playable, PlayerProvider, BoardProvider, DeepCopyable<TurnBasedGame> {
public interface TurnBasedGame extends DeepCopyable<TurnBasedGame> {
void init(Player[] players);
long[] getBoard();
int getCurrentTurn();
int getPlayerCount();
int getWinner();
long getLegalMoves();
PlayResult play(long move);
}

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

@@ -4,6 +4,7 @@ import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import org.toop.framework.gameFramework.LongPairConsumer;
import org.toop.framework.gameFramework.controller.GameController;
import org.toop.framework.gameFramework.controller.SupportsOnlinePlay;
import org.toop.framework.gameFramework.model.game.TurnBasedGame;
import java.util.concurrent.atomic.AtomicBoolean;

2
framework/src/main/java/org/toop/framework/gameFramework/model/game/SupportsOnlinePlay.java → framework/src/main/java/org/toop/framework/gameFramework/model/game/threadBehaviour/SupportsOnlinePlay.java
View File

@@ -1,4 +1,4 @@
package org.toop.framework.gameFramework.model.game;
package org.toop.framework.gameFramework.model.game.threadBehaviour;
/**
* Interface for games that support online multiplayer play.

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

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

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

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

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

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

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

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