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

refactored game

Browse Source
This commit is contained in:
ramollia
2025-09-25 15:50:10 +02:00
parent 7431d1b03f
commit 27e7166ac7
20 changed files with 429 additions and 725 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
app/src/main/java/org/toop/Main.java
View File

@@ -1,16 +1,16 @@
package org.toop;
import org.toop.app.gui.LocalServerSelector;
import org.toop.framework.networking.NetworkingClientManager;
import org.toop.framework.networking.NetworkingInitializationException;
public class Main {
public static void main(String[] args) {
static void main(String[] args) {
initSystems();
javax.swing.SwingUtilities.invokeLater(LocalServerSelector::new);
}
private static void initSystems() throws NetworkingInitializationException {
new NetworkingClientManager();
}
}

13
app/src/main/java/org/toop/events/WindowEvents.java
View File

@@ -4,22 +4,9 @@ import org.toop.framework.eventbus.events.EventWithoutSnowflake;
import org.toop.framework.eventbus.events.EventsBase;
public class WindowEvents extends EventsBase {
/** Triggers when a cell is clicked in one of the game boards. */
public record CellClicked(int cell) implements EventWithoutSnowflake {}
/** Triggers when the window wants to quit. */
public record OnQuitRequested() implements EventWithoutSnowflake {}
/** Triggers when the window is resized. */
// public record OnResize(Window.Size size) implements EventWithoutSnowflake {}
/** Triggers when the mouse is moved within the window. */
public record OnMouseMove(int x, int y) implements EventWithoutSnowflake {}
/** Triggers when the mouse is clicked within the window. */
public record OnMouseClick(int button) implements EventWithoutSnowflake {}
/** Triggers when the mouse is released within the window. */
public record OnMouseRelease(int button) implements EventWithoutSnowflake {}
}

53
app/src/main/java/org/toop/tictactoe/LocalTicTacToe.java
View File

@@ -6,7 +6,9 @@ import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import org.toop.framework.eventbus.EventFlow;
import org.toop.framework.networking.events.NetworkEvents;
import org.toop.game.GameBase;
import org.toop.game.Game;
import org.toop.game.tictactoe.TicTacToe;
import org.toop.game.tictactoe.TicTacToeAI;
import org.toop.tictactoe.gui.UIGameBoard;
import org.toop.framework.networking.NetworkingGameClientHandler;
@@ -24,8 +26,8 @@ public class LocalTicTacToe { // TODO: Implement runnable
private final ExecutorService executor = Executors.newFixedThreadPool(3);
private final BlockingQueue<String> receivedQueue = new LinkedBlockingQueue<>();
private final BlockingQueue<Integer> moveQueuePlayerA = new LinkedBlockingQueue<>();
private final BlockingQueue<Integer> moveQueuePlayerB = new LinkedBlockingQueue<>();
private final BlockingQueue<Game.Move> moveQueuePlayerA = new LinkedBlockingQueue<>();
private final BlockingQueue<Game.Move> moveQueuePlayerB = new LinkedBlockingQueue<>();
private Object receivedMessageListener = null;
@@ -34,8 +36,8 @@ public class LocalTicTacToe { // TODO: Implement runnable
private String connectionId = null;
private String serverId = null;
private boolean isAiPlayer[] = new boolean[2];
private TicTacToeAI[] aiPlayers = new TicTacToeAI[2];
private boolean[] isAiPlayer = new boolean[2];
private TicTacToeAI ai = new TicTacToeAI();
private TicTacToe ticTacToe;
private UIGameBoard ui;
@@ -80,15 +82,6 @@ public class LocalTicTacToe { // TODO: Implement runnable
private LocalTicTacToe(boolean[] aiFlags) {
this.isAiPlayer = aiFlags; // store who is AI
for (int i = 0; i < aiFlags.length && i < this.aiPlayers.length; i++) {
if (aiFlags[i]) {
this.aiPlayers[i] = new TicTacToeAI(); // create AI for that player
} else {
this.aiPlayers[i] = null; // not an AI player
}
}
this.isLocal = true;
//this.executor.submit(this::localGameThread);
}
@@ -139,17 +132,17 @@ public class LocalTicTacToe { // TODO: Implement runnable
this.ticTacToe = new TicTacToe("X", "O");
while (running) {
try {
GameBase.State state;
Game.State state;
if (!isAiPlayer[0]) {
state = this.ticTacToe.play(this.moveQueuePlayerA.take());
} else {
int bestMove = aiPlayers[0].findBestMove(this.ticTacToe);
state = this.ticTacToe.play(bestMove);
if (state != GameBase.State.INVALID) {
ui.setCell(bestMove, "X");
}
Game.Move bestMove = ai.findBestMove(this.ticTacToe, 9);
assert bestMove != null;
state = this.ticTacToe.play(bestMove);
ui.setCell(bestMove.position(), "X");
}
if (state == GameBase.State.WIN || state == GameBase.State.DRAW) {
if (state == Game.State.WIN || state == Game.State.DRAW) {
ui.setState(state, "X");
running = false;
}
@@ -157,13 +150,12 @@ public class LocalTicTacToe { // TODO: Implement runnable
if (!isAiPlayer[1]) {
state = this.ticTacToe.play(this.moveQueuePlayerB.take());
} else {
int bestMove = aiPlayers[1].findBestMove(this.ticTacToe);
state = this.ticTacToe.play(bestMove);
if (state != GameBase.State.INVALID) {
ui.setCell(bestMove, "O");
}
Game.Move bestMove = ai.findBestMove(this.ticTacToe, 9);
assert bestMove != null;
state = this.ticTacToe.play(bestMove);
ui.setCell(bestMove.position(), "O");
}
if (state == GameBase.State.WIN || state == GameBase.State.DRAW) {
if (state == Game.State.WIN || state == Game.State.DRAW) {
ui.setState(state, "O");
running = false;
}
@@ -187,7 +179,8 @@ public class LocalTicTacToe { // TODO: Implement runnable
}
public char[] getCurrentBoard() {
return ticTacToe.getGrid();
//return ticTacToe.getGrid();
return new char[2];
}
/** End the current game. */
@@ -203,13 +196,13 @@ public class LocalTicTacToe { // TODO: Implement runnable
() -> {
try {
if (this.playersTurn == 0 && !isAiPlayer[0]) {
this.moveQueuePlayerA.put(moveIndex);
this.moveQueuePlayerA.put(new Game.Move(moveIndex, 'X'));
logger.info(
"Adding player's {}, move: {} to queue A",
this.playersTurn,
moveIndex);
} else if (this.playersTurn == 1 && !isAiPlayer[1]) {
this.moveQueuePlayerB.put(moveIndex);
this.moveQueuePlayerB.put(new Game.Move(moveIndex, 'O'));
logger.info(
"Adding player's {}, move: {} to queue B",
this.playersTurn,

14
app/src/main/java/org/toop/tictactoe/gui/UIGameBoard.java
View File

@@ -2,13 +2,14 @@ package org.toop.tictactoe.gui;
import java.awt.*;
import java.awt.event.ActionEvent;
import java.util.Locale;
import javax.swing.*;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import org.toop.app.gui.LocalGameSelector;
import org.toop.app.gui.RemoteGameSelector;
import org.toop.game.Game;
import org.toop.tictactoe.LocalTicTacToe;
import org.toop.game.GameBase;
public class UIGameBoard {
private static final int TICTACTOE_SIZE = 3;
@@ -44,6 +45,7 @@ public class UIGameBoard {
// Back button
backToMainMenuButton = new JButton("Back to Main Menu");
tttPanel.add(backToMainMenuButton, BorderLayout.SOUTH);
backToMainMenuButton.addActionListener(
_ -> {
@@ -117,13 +119,13 @@ public class UIGameBoard {
cells[index].setText(move);
}
public void setState(GameBase.State state, String playerMove) {
public void setState(Game.State state, String playerMove) {
Color color;
if (state == GameBase.State.WIN && playerMove.equals(currentPlayer)) {
if (state == Game.State.WIN && playerMove.equals(currentPlayer)) {
color = new Color(160, 220, 160);
} else if (state == GameBase.State.WIN) {
} else if (state == Game.State.WIN) {
color = new Color(220, 160, 160);
} else if (state == GameBase.State.DRAW) {
} else if (state == Game.State.DRAW) {
color = new Color(220, 220, 160);
} else {
color = new Color(220, 220, 220);
@@ -131,7 +133,7 @@ public class UIGameBoard {
for (JButton cell : cells) {
cell.setBackground(color);
}
if (state == GameBase.State.DRAW || state == GameBase.State.WIN) {
if (state == Game.State.DRAW || state == Game.State.WIN) {
gameOver = true;
}
}