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

serverThread added. cant test cus server doesnt allow "MOVE <int>"

Browse Source
This commit is contained in:
Ticho Hidding
2025-10-06 01:36:58 +02:00
parent 33255d5ee6
commit 20a7fd7a3e
4 changed files with 110 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
app/src/main/java/org/toop/app/Match.java
View File

@@ -48,10 +48,7 @@ public class Match {
private void handleYourTurn(NetworkEvents.YourTurnResponse response) {
//System.out.println(response.toString());
//new EventFlow().addPostEvent(NetworkEvents.SendMove.class, clientId,(short)1).asyncPostEvent();
try{
sleep(2000);
}
catch (InterruptedException e){}
new EventFlow().addPostEvent(NetworkEvents.SendCommand.class, clientId,"MOVE 2").asyncPostEvent();
}

7
app/src/main/java/org/toop/app/layer/layers/MultiplayerLayer.java
View File

@@ -11,6 +11,9 @@ import org.toop.local.AppContext;
import javafx.geometry.Pos;
import java.time.LocalDateTime;
import java.time.format.DateTimeFormatter;
public final class MultiplayerLayer extends Layer {
private boolean isConnectionLocal = true;
@@ -60,7 +63,8 @@ public final class MultiplayerLayer extends Layer {
new String[] { player1Name, player2Name },
new boolean[] { isPlayer1Human, isPlayer2Human },
new int[] { computer1Difficulty, computer2Difficulty },
isConnectionLocal, serverIP, serverPort)));
isConnectionLocal, "127.0.0.1", "7789")));
// serverIP, serverPort)));
});
player1Container.addToggle(AppContext.getString("human"), AppContext.getString("computer"), !isPlayer1Human, (computer) -> {
@@ -74,6 +78,7 @@ public final class MultiplayerLayer extends Layer {
player1Name = name;
});
} else {
player1Name = "PismBot" + LocalDateTime.now().getSecond();
player1Container.addText(AppContext.getString("computerDifficulty"), true);
player1Container.addSlider(10, computer1Difficulty, (difficulty) ->
computer1Difficulty = difficulty);

104
app/src/main/java/org/toop/app/layer/layers/game/TicTacToeLayer.java
View File

@@ -19,6 +19,8 @@ import javafx.scene.paint.Color;
import java.util.concurrent.BlockingQueue;
import java.util.concurrent.LinkedBlockingQueue;
import java.util.concurrent.atomic.AtomicBoolean;
import java.util.regex.Pattern;
public final class TicTacToeLayer extends Layer {
private TicTacToeCanvas canvas;
@@ -165,8 +167,10 @@ public final class TicTacToeLayer extends Layer {
class OnlineGameState {
public long clientId = -1;
public long receivedMove = -1;
public boolean firstPlayerIsMe = true;
}
AtomicBoolean firstPlayerIsMe = new AtomicBoolean(true);
AtomicBoolean gameHasStarted = new AtomicBoolean(false);
private void serverGameThread(NetworkEvents.StartClientResponse event) {
boolean running = true;
final long clientId = event.clientId();
@@ -176,20 +180,116 @@ public final class TicTacToeLayer extends Layer {
new EventFlow()
.listen(NetworkEvents.GameMoveResponse.class,respEvent -> onMoveResponse(onlineGameState, respEvent));
new EventFlow()
.listen(this::yourTurnResponse)
.listen(this::handleChallengeResponse)
.listen(this::handleServerGameStart)
.listen(this::handleReceivedMessage);
new EventFlow().addPostEvent(new NetworkEvents.SendLogin(clientId, information.playerName()[0]))
.postEvent();
new EventFlow().addPostEvent(new NetworkEvents.SendSubscribe(clientId, "tic-tac-toe"))
.postEvent();
new EventFlow().addPostEvent(new NetworkEvents.SendCommand(clientId, "message hello-world"))
.postEvent();
while (running) {
final int currentPlayer = ticTacToe.getCurrentTurn();
boolean hasStarted = gameHasStarted.get();
if (hasStarted) {
onlineGameState.firstPlayerIsMe = firstPlayerIsMe.get();
if (onlineGameState.firstPlayerIsMe) {
currentPlayerMove = 'X';
}
else {
currentPlayerMove = 'O';
}
if(!information.isPlayerHuman()[0]){
if (onlineGameState.firstPlayerIsMe && ticTacToe.getCurrentTurn()%2 == 0 || !onlineGameState.firstPlayerIsMe && ticTacToe.getCurrentTurn()%2 == 1) {
Game.Move move;
move = ticTacToeAI.findBestMove(ticTacToe, compurterDifficultyToDepth(10, 10));
new EventFlow().addPostEvent(new NetworkEvents.SendMove(clientId, (short) move.position()))
.postEvent();
final Game.State state = ticTacToe.play(move);
drawSymbol(move);
if (Game.State.NORMAL != state) {
System.out.println("Win Or Draw");//todo
running = false;
}
}
}
else {
try {
final Game.Move wants = playerMoveQueue.take();
final Game.Move[] legalMoves = ticTacToe.getLegalMoves();
Game.State state = Game.State.NORMAL;
for (final Game.Move legalMove : legalMoves) {
if (legalMove.position() == wants.position() && legalMove.value() == wants.value()) {
state = ticTacToe.play(wants);
new EventFlow().addPostEvent(new NetworkEvents.SendMove(clientId, (short) wants.position()))
.postEvent();
drawSymbol(wants);
break;
}
}
if(Game.State.NORMAL != state){
System.out.println("Win Or Draw");
running = false;
}
} catch (InterruptedException exception) {
return;
}
}
}
}
}
private void drawSymbol(Game.Move move){
if (move.value() == 'X') {
canvas.drawX(Color.RED, move.position());
} else if (move.value() == 'O') {
canvas.drawO(Color.BLUE, move.position());
}
}
private void handleServerGameStart(NetworkEvents.GameMatchResponse resp) {
if(resp.playerToMove().equals(resp.opponent())){
firstPlayerIsMe.set(false);
}
else{
firstPlayerIsMe.set(true);
}
gameHasStarted.set(true);
}
private void onMoveResponse(OnlineGameState ogs, NetworkEvents.GameMoveResponse resp) {
ogs.receivedMove = Long.parseLong(resp.move());
char opponentChar;
if (firstPlayerIsMe.get()) {
opponentChar = 'O';
}
else {
opponentChar = 'X';
}
ticTacToe.play(new Game.Move(Integer.parseInt(resp.move()),opponentChar));
}
private void handleChallengeResponse(NetworkEvents.ChallengeResponse resp) {
new EventFlow().addPostEvent(new NetworkEvents.SendAcceptChallenge(resp.clientId(),Integer.parseInt(resp.challengeId())))
.postEvent();
}
private void yourTurnResponse(NetworkEvents.YourTurnResponse response) {
//new EventFlow().addPostEvent(new NetworkEvents.SendCommand(response.clientId(),"CHALLENGE banaan tic-tac-toe")).postEvent();
//new EventFlow().addPostEvent(new NetworkEvents.SendMove(response.clientId(),(short)2))
// .postEvent();
}
private void handleReceivedMessage(NetworkEvents.ReceivedMessage msg) {
System.out.println("Received Message: " + msg.message()); //todo add chat window
}
private void serverGameThreadResponseHandler(OnlineGameState ogs, NetworkEvents.ChallengeResponse msg) {
if (msg.clientId() != ogs.clientId) return;
IO.println("Client ID: " + ogs.clientId + " Received Message: " + msg);

2
framework/src/main/java/org/toop/framework/networking/events/NetworkEvents.java
View File

@@ -41,7 +41,7 @@ public class NetworkEvents extends EventsBase {
/** Response indicating a challenge was received. */
public record ChallengeResponse(
long clientId, String challengerName, String gameType, String challengeId)
long clientId, String challengerName, String challengeId, String gameType)
implements EventWithoutSnowflake {}
/** Response containing a list of players for a client. */