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

Logging and fixed user input getting stuck

Browse Source
This commit is contained in:
Bas de Jong
2026-01-07 23:38:53 +01:00
parent 65220d9649
commit 56a8d12e46
8 changed files with 82 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -8,6 +8,9 @@ import org.toop.framework.gameFramework.model.game.threadBehaviour.SupportsOnlin
import org.toop.framework.gameFramework.model.player.Player;
import org.toop.framework.game.players.OnlinePlayer;
import java.util.concurrent.ExecutorService;
import java.util.concurrent.Executors;
/**
* Handles online multiplayer game logic.
* <p>
@@ -15,6 +18,9 @@ import org.toop.framework.game.players.OnlinePlayer;
* for the local player while receiving moves from other players.
*/
public class OnlineThreadBehaviour extends AbstractThreadBehaviour implements SupportsOnlinePlay {
private ExecutorService moveExecutor = Executors.newSingleThreadExecutor();
/**
* Creates behaviour and sets the first local player
* (non-online player) from the given array.
@@ -51,9 +57,33 @@ public class OnlineThreadBehaviour extends AbstractThreadBehaviour implements Su
*/
@Override
public void onYourTurn(long clientId) {
if (!isRunning.get()) return;
long move = game.getPlayer(game.getCurrentTurn()).getMove(game.deepCopy());
sendMove(clientId, move);
logger.info("Yourturn");
if (!isRunning.get()) {
logger.warn("Game is not running!");
return;
}
TurnBasedGame gameCopy = game.deepCopy();
if (gameCopy == null) {
logger.error("Could not deep copy game");
return;
}
logger.info("Successfully collected game copy");
Player player = gameCopy.getPlayer(game.getCurrentTurn());
if (player == null) {
logger.error("Could not find current turn's player");
return;
}
logger.info("Successfully collected current turn's player");
moveExecutor.submit(() -> {
long move = player.getMove(gameCopy);
logger.info("Move set: {}", move);
logger.info("Completed onYourTurn");
sendMove(clientId, move);
});
}
/**

17
framework/src/main/java/org/toop/framework/game/players/LocalPlayer.java
View File

@@ -1,4 +1,4 @@
package org.toop.game.players;
package org.toop.framework.game.players;
import org.toop.framework.gameFramework.model.game.TurnBasedGame;
import org.toop.framework.gameFramework.model.player.AbstractPlayer;
@@ -45,11 +45,16 @@ public class LocalPlayer extends AbstractPlayer {
long legalMoves = gameCopy.getLegalMoves();
long move;
do {
move = getLastMove();
} while ((legalMoves & move) == 0);
return move;
try {
do {
move = getLastMove();
IO.println("GETTING MOVE");
} while ((legalMoves & move) == 0);
return move;
} catch (Exception e) {
IO.println(e);
}
return -1;
}
/**

6
framework/src/main/java/org/toop/framework/networking/server/connectionHandler/NettyClientSession.java
View File

@@ -11,8 +11,6 @@ import org.toop.framework.networking.server.Server;
import org.toop.framework.networking.server.client.Client;
import org.toop.framework.networking.server.parsing.Parser;
import java.util.Arrays;
public class NettyClientSession extends SimpleChannelInboundHandler<String> implements ClientSession<OnlineTurnBasedGame, ServerPlayer> {
private final NettyClient client;
@@ -41,13 +39,9 @@ public class NettyClientSession extends SimpleChannelInboundHandler<String> impl
@Override
protected void channelRead0(ChannelHandlerContext ctx, String msg) {
IO.println(msg);
ParsedMessage p = Parser.parse(msg);
if (p == null) return;
IO.println(p.command() + " " + Arrays.toString(p.args()));
handler.handle(p);
}