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

289 server demo ready (#306)

Browse Source 
* Server update with new dev changes (#305)

* merge widgets with development

* readd previous game thread code

* Revert "readd previous game thread code"

This reverts commit d24feef73e.

* Revert "Merge remote-tracking branch 'origin/Development' into Development"

This reverts commit 59d46cb73c, reversing
changes made to 38681c5db0.

* Revert "merge widgets with development"

This reverts commit 38681c5db0.

* Merge 292 into development (#293)

Applied template method pattern to abstract player

* Added documentation to player classes and improved method names (#295)

* mcts v1

* bitboard optimization

* bitboard fix & mcts v2 & mcts v3. v3 still in progress and v4 coming soon

* main

* Hotfix for stuff

* Logging and fixed user input getting stuck

* Fixed merge mistakes
This commit is contained in:
Bas Antonius de Jong
2026-01-07 23:47:38 +01:00
committed by GitHub
parent 58a9ce78fe
commit 9aefcb9b7b
9 changed files with 87 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -19,7 +19,7 @@ import org.toop.framework.networking.connection.clients.TournamentNetworkingClie
import org.toop.framework.networking.connection.events.NetworkEvents;
import org.toop.framework.networking.connection.types.NetworkingConnector;
import org.toop.framework.networking.server.gateway.NettyGatewayServer;
import org.toop.game.players.LocalPlayer;
import org.toop.framework.game.players.LocalPlayer;
import org.toop.local.AppContext;
import java.util.List;
@@ -196,30 +196,21 @@ public final class Server {
return;
}
final int myTurn = response.playerToMove().equalsIgnoreCase(response.opponent()) ? 1 : 0;
final String startingPlayer = response.playerToMove();
final int userStartingTurn = startingPlayer.equalsIgnoreCase(user) ? 0 : 1;
final int opponentStartingTurn = 1 - userStartingTurn;
final GameInformation information = new GameInformation(type);
//information.players[0] = playerInformation;
information.players[0].name = user;
information.players[0].isHuman = true; // Make false and uncomment/comment code at lines HERE To make use of AI.
// information.players[0].computerDifficulty = 5; // HERE
// information.players[0].computerThinkTime = 1; // HERE
information.players[1].name = response.opponent();
information.players[userStartingTurn].name = user;
information.players[opponentStartingTurn].name = response.opponent();
Player[] players = new Player[2];
players[userStartingTurn] = new LocalPlayer(user);
players[opponentStartingTurn] = new OnlinePlayer(response.opponent());
switch (type) {
case TICTACTOE -> {
Player[] players = new Player[2];
players[Math.abs(myTurn-1)] = new OnlinePlayer(response.opponent());
players[myTurn] = new LocalPlayer(user); // HERE
// players[myTurn] = new ArtificialPlayer(new RandomAI(), user); // HERE
gameController = new TicTacToeBitController(players);
}
case REVERSI -> {
Player[] players = new Player[2];
players[Math.abs(myTurn-1)] = new OnlinePlayer(response.opponent());
players[myTurn] = new LocalPlayer(user); // HERE
// players[myTurn] = new ArtificialPlayer(new RandomAI(), user); // HERE
gameController = new ReversiBitController(players);}
case TICTACTOE -> gameController = new TicTacToeBitController(players);
case REVERSI -> gameController = new ReversiBitController(players);
default -> new ErrorPopup("Unsupported game type.");
}

4
app/src/main/java/org/toop/app/canvas/BitGameCanvas.java
View File

@@ -78,6 +78,7 @@ public abstract class BitGameCanvas implements GameCanvas {
}
canvas.setOnMouseClicked(event -> {
if (event.getButton() != MouseButton.PRIMARY) {
return;
}
@@ -93,9 +94,6 @@ public abstract class BitGameCanvas implements GameCanvas {
}
});
render();
}

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

@@ -16,7 +16,7 @@ import org.toop.framework.gameFramework.model.game.threadBehaviour.ThreadBehavio
import org.toop.framework.gameFramework.model.player.Player;
import org.toop.framework.gameFramework.view.GUIEvents;
import org.toop.framework.networking.connection.events.NetworkEvents;
import org.toop.game.players.LocalPlayer;
import org.toop.framework.game.players.LocalPlayer;
public class GenericGameController implements GameController {
protected final EventFlow eventFlow = new EventFlow();
@@ -35,14 +35,16 @@ public class GenericGameController implements GameController {
// TODO: Change gameType to automatically happen with either dependency injection or something else.
public GenericGameController(GameCanvas canvas, TurnBasedGame game, ThreadBehaviour gameThreadBehaviour, String gameType) {
logger.info("Creating: " + this.getClass());
logger.info("Creating: {}", this.getClass());
this.canvas = canvas;
this.game = game;
this.gameThreadBehaviour = gameThreadBehaviour;
// Tell thread how to send moves
this.gameThreadBehaviour.setOnSendMove((id, m) -> GlobalEventBus.get().post(new NetworkEvents.SendMove(id, (short)translateMove(m))));
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));
@@ -53,21 +55,37 @@ public class GenericGameController implements GameController {
WidgetContainer.getCurrentView().transitionNext(gameView, true);
// Listen to updates
logger.info("Game controller started listening");
eventFlow
.listen(GUIEvents.GameEnded.class, this::onGameFinish, false)
.listen(GUIEvents.PlayerAttemptedMove.class, event -> {if (getCurrentPlayer() instanceof LocalPlayer lp){lp.setLastMove(event.move());}}, false);
.listen(GUIEvents.PlayerAttemptedMove.class, event -> {
logger.info("User attempting move {}", event.move());
logger.info("Current player's turn {}", getCurrentPlayer().getName());
logger.info("First player {}", game.getPlayer(0).getName());
logger.info("Username {}", getCurrentPlayer().getName());
logger.info("User is class {}, {}", getCurrentPlayer().getClass(), getCurrentPlayer() instanceof LocalPlayer);
if (getCurrentPlayer() instanceof LocalPlayer lp) {
try {
lp.setLastMove(event.move());
} catch (Exception e) {
IO.println(e);
}
}
}, false);
}
public void start(){
logger.info("Starting GameManager");
updateUI();
gameThreadBehaviour.start();
logger.info("GameManager started");
}
public void stop(){
logger.info("Stopping GameManager");
removeListeners();
gameThreadBehaviour.stop();
logger.info("GameManager stopped");
}
public Player getCurrentPlayer(){
@@ -98,7 +116,7 @@ public class GenericGameController implements GameController {
}
public Player getPlayer(int player){
if (player < 0 || player >= 2){ // TODO: Make game turn player count
if (player < 0 || player > game.getPlayerCount()-1){ // TODO: Make game turn player count
logger.error("Invalid player index");
throw new IllegalArgumentException("player out of range");
}

3
app/src/main/java/org/toop/app/gameControllers/TicTacToeBitController.java
View File

@@ -7,7 +7,6 @@ import org.toop.framework.game.gameThreads.LocalThreadBehaviour;
import org.toop.framework.game.gameThreads.OnlineThreadBehaviour;
import org.toop.framework.game.games.tictactoe.BitboardTicTacToe;
import org.toop.framework.game.players.OnlinePlayer;
import org.toop.framework.networking.server.OnlineGame;
import java.util.Arrays;
@@ -19,6 +18,6 @@ public class TicTacToeBitController extends GenericGameController {
ThreadBehaviour thread = Arrays.stream(players).anyMatch(e -> e instanceof OnlinePlayer) ?
new OnlineThreadBehaviour(game) : new LocalThreadBehaviour(game);
super(new TicTacToeBitCanvas(), game, thread , "TicTacToe");
super(new TicTacToeBitCanvas(), game, thread, "TicTacToe");
}
}

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

@@ -12,7 +12,7 @@ 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.LocalPlayer;
import org.toop.framework.game.players.LocalPlayer;
import org.toop.game.players.ai.MCTSAI;
import org.toop.game.players.ai.MCTSAI2;
import org.toop.game.players.ai.MCTSAI3;