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

Partial server refactor

Browse Source
This commit is contained in:
lieght
2025-12-13 21:11:26 +01:00
parent 55de6b5b18
commit 0956286616
35 changed files with 511 additions and 349 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -17,12 +17,10 @@ import org.toop.framework.gameFramework.model.player.Player;
import org.toop.framework.networking.connection.clients.TournamentNetworkingClient;
import org.toop.framework.networking.connection.events.NetworkEvents;
import org.toop.framework.networking.connection.types.NetworkingConnector;
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.OnlinePlayer;
import org.toop.framework.game.players.RandomAI;
import org.toop.framework.networking.server.MasterServer;
import org.toop.framework.networking.server.gateway.NettyGatewayServer;
import org.toop.local.AppContext;
import java.util.List;
@@ -33,7 +31,7 @@ import java.util.concurrent.TimeUnit;
import java.util.concurrent.atomic.AtomicBoolean;
public final class Server {
private MasterServer masterServer;
private NettyGatewayServer nettyGatewayServer;
private String user = "";
private long clientId = -1;
@@ -68,7 +66,7 @@ public final class Server {
// Server has to deal with ALL network related listen events. This "server" can then interact with the manager to make stuff happen.
// This prevents data races where events get sent to the game manager but the manager isn't ready yet.
public Server(String ip, String port, String user, MasterServer masterServer) {
public Server(String ip, String port, String user, NettyGatewayServer nettyGatewayServer) {
if (ip.split("\\.").length < 4) {
new ErrorPopup("\"" + ip + "\" " + AppContext.getString("is-not-a-valid-ip-address"));
return;
@@ -88,7 +86,7 @@ public final class Server {
return;
}
this.masterServer = masterServer;
this.nettyGatewayServer = nettyGatewayServer;
final int reconnectAttempts = 10;
@@ -288,8 +286,8 @@ public final class Server {
stopScheduler();
connectFlow.unsubscribeAll();
if (masterServer != null) {
masterServer.stop();
if (nettyGatewayServer != null) {
nettyGatewayServer.stop();
}
WidgetContainer.getCurrentView().transitionPrevious();

12
app/src/main/java/org/toop/app/widget/view/OnlineView.java
View File

@@ -9,7 +9,8 @@ import javafx.geometry.Pos;
import org.toop.framework.game.games.reversi.BitboardReversi;
import org.toop.framework.game.games.tictactoe.BitboardTicTacToe;
import org.toop.framework.gameFramework.model.game.TurnBasedGame;
import org.toop.framework.networking.server.MasterServer;
import org.toop.framework.networking.server.gateway.NettyGatewayServer;
import org.toop.framework.networking.server.stores.TurnBasedGameTypeStore;
import java.time.Duration;
import java.util.concurrent.ConcurrentHashMap;
@@ -31,11 +32,12 @@ public class OnlineView extends ViewWidget {
});
var localHostButton = Primitive.button("host!", () -> {
var games = new ConcurrentHashMap<String, Class<? extends TurnBasedGame>>();
games.put("tic-tac-toe", BitboardTicTacToe.class);
games.put("reversi", BitboardReversi.class);
var a = new MasterServer(6666, games, Duration.ofSeconds(10));
var tps = new TurnBasedGameTypeStore();
tps.register("tic-tac-toe", BitboardTicTacToe::new);
tps.register("reversi", BitboardReversi::new);
var a = new NettyGatewayServer(6666, tps, Duration.ofSeconds(10));
new Thread(() -> {
try {