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

Fixed garbage code

Browse Source
This commit is contained in:
Bas de Jong
2025-09-11 15:02:56 +02:00
parent 9cf1bac943
commit bb0abe7937
5 changed files with 55 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
src/main/java/org/toop/Main.java
View File

@@ -7,6 +7,7 @@ import org.toop.server.Server;
import org.apache.logging.log4j.Logger; import org.apache.logging.log4j.Logger;
import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.LogManager;
import org.toop.server.ServerTask;
public class Main { public class Main {
private static final Logger logger = LogManager.getLogger(Main.class); private static final Logger logger = LogManager.getLogger(Main.class);
@@ -18,18 +19,9 @@ public class Main {
} }
Server server = new Server(Server.ServerBackend.LOCAL, "127.0.0.1", "5000"); Server server = new Server(Server.ServerBackend.LOCAL, "127.0.0.1", "5000");
server.setBackend(Server.ServerBackend.REMOTE);
GlobalEventBus.subscribeAndRegister(Events.ServerEvents.OnCommand.class, e -> {
logger.info("Command sent to server: {} with args: {}", e.command(), e.args());
});
GlobalEventBus.post(new Events.ServerEvents.command(Server.Command.HELP, "test", "test2"));
GlobalEventBus.post(new Events.ServerEvents.command(Server.Command.BYE));
GlobalEventBus.post(new Events.ServerEvents.changeServerIp("127.1.1.1"));
GlobalEventBus.post(new Events.ServerEvents.changeServerPort("5003"));
Window.start(); Window.start();
} }
/** /**
@@ -37,22 +29,22 @@ public class Main {
*/ */
private static boolean initEvents() { private static boolean initEvents() {
try { try {
GlobalEventBus.subscribeAndRegister(Events.ServerEvents.OnChangingServerBackend.class, e -> // GlobalEventBus.subscribeAndRegister(Events.ServerEvents.OnChangingServerBackend.class, e ->
logger.info("Changing server backend state to {}", e.backend()) // logger.info("Changing server backend state to {}", e.backend())
); // );
//
GlobalEventBus.subscribeAndRegister(Events.ServerEvents.OnChangingServerIp.class, e -> // GlobalEventBus.subscribeAndRegister(Events.ServerEvents.OnChangingServerIp.class, e ->
logger.info("Changing server ip to {}", e.ip()) // logger.info("Changing server ip to {}", e.ip())
); // );
//
GlobalEventBus.subscribeAndRegister(Events.ServerEvents.OnChangingServerPort.class, e -> // GlobalEventBus.subscribeAndRegister(Events.ServerEvents.OnChangingServerPort.class, e ->
logger.info("Changing server port to {}", e.port()) // logger.info("Changing server port to {}", e.port())
); // );
return true; return true;
} }
catch (Exception e) { catch (Exception e) {
e.printStackTrace(); logger.info("{}", e.getMessage());
return false; return false;
} }
} }

3
src/main/java/org/toop/game/GameBase.java
View File

@@ -7,8 +7,7 @@ public abstract class GameBase {
protected int size; protected int size;
protected char[] grid; protected char[] grid;
public GameBase(Player[] players, int size) { public GameBase(int size) {
this.players = players;
currentPlayer = 0; currentPlayer = 0;
this.size = size; this.size = size;

7
src/main/java/org/toop/game/TTT.java
View File

@@ -4,12 +4,11 @@ public class TTT extends GameBase {
private int moveCount; private int moveCount;
public TTT(String player1, String player2) { public TTT(String player1, String player2) {
Player[] players = new Player[2]; super(9);
players = new Player[2];
players[0] = new Player(player1, 'X'); players[0] = new Player(player1, 'X');
players[1] = new Player(player2, 'O'); players[1] = new Player(player2, 'O');
super(players, 9);
moveCount = 0; moveCount = 0;
} }
@@ -19,7 +18,7 @@ public class TTT extends GameBase {
return false; return false;
} }
return (grid[index] == ' ') ? true : false; return grid[index] == ' ';
} }
@Override @Override

15
src/main/java/org/toop/server/Server.java
View File

@@ -1,12 +1,17 @@
package org.toop.server; package org.toop.server;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import org.toop.Main;
import org.toop.eventbus.EventRegistry; import org.toop.eventbus.EventRegistry;
import org.toop.eventbus.Events; import org.toop.eventbus.Events;
import org.toop.eventbus.GlobalEventBus; import org.toop.eventbus.GlobalEventBus;
import org.toop.server.backend.*; import org.toop.server.backend.*;
import java.util.EnumSet; import java.util.EnumSet;
public class Server { public class Server extends Thread {
private static final Logger logger = LogManager.getLogger(Main.class);
public enum ServerBackend { public enum ServerBackend {
LOCAL, LOCAL,
@@ -161,4 +166,12 @@ public class Server {
GlobalEventBus.subscribeAndRegister(Events.ServerEvents.changeServerPort.class, e -> this.setPort(e.port())); GlobalEventBus.subscribeAndRegister(Events.ServerEvents.changeServerPort.class, e -> this.setPort(e.port()));
} }
public void run() {
while (true) {
// logger.info(server.getIp());
logger.info(this.isAlive());
}
}
} }

22
src/main/java/org/toop/server/ServerTask.java Normal file
View File

@@ -0,0 +1,22 @@
package org.toop.server;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import org.toop.Main;
public class ServerTask extends Thread {
private static final Logger logger = LogManager.getLogger(Main.class);
Server server;
public ServerTask(Server server) {
this.server = server;
}
public void run() {
while (true) {
// logger.info(server.getIp());
logger.info(this.isAlive());
}
}
}