diff --git a/src/main/java/org/toop/Main.java b/src/main/java/org/toop/Main.java index ded10ef..7d16e1a 100644 --- a/src/main/java/org/toop/Main.java +++ b/src/main/java/org/toop/Main.java @@ -7,6 +7,7 @@ import org.toop.server.Server; import org.apache.logging.log4j.Logger; import org.apache.logging.log4j.LogManager; +import org.toop.server.ServerTask; public class Main { 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.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(); + } /** @@ -37,22 +29,22 @@ public class Main { */ private static boolean initEvents() { try { - GlobalEventBus.subscribeAndRegister(Events.ServerEvents.OnChangingServerBackend.class, e -> - logger.info("Changing server backend state to {}", e.backend()) - ); - - GlobalEventBus.subscribeAndRegister(Events.ServerEvents.OnChangingServerIp.class, e -> - logger.info("Changing server ip to {}", e.ip()) - ); - - GlobalEventBus.subscribeAndRegister(Events.ServerEvents.OnChangingServerPort.class, e -> - logger.info("Changing server port to {}", e.port()) - ); +// GlobalEventBus.subscribeAndRegister(Events.ServerEvents.OnChangingServerBackend.class, e -> +// logger.info("Changing server backend state to {}", e.backend()) +// ); +// +// GlobalEventBus.subscribeAndRegister(Events.ServerEvents.OnChangingServerIp.class, e -> +// logger.info("Changing server ip to {}", e.ip()) +// ); +// +// GlobalEventBus.subscribeAndRegister(Events.ServerEvents.OnChangingServerPort.class, e -> +// logger.info("Changing server port to {}", e.port()) +// ); return true; } catch (Exception e) { - e.printStackTrace(); + logger.info("{}", e.getMessage()); return false; } } diff --git a/src/main/java/org/toop/game/GameBase.java b/src/main/java/org/toop/game/GameBase.java index 6e313a7..f4a0d0f 100644 --- a/src/main/java/org/toop/game/GameBase.java +++ b/src/main/java/org/toop/game/GameBase.java @@ -7,8 +7,7 @@ public abstract class GameBase { protected int size; protected char[] grid; - public GameBase(Player[] players, int size) { - this.players = players; + public GameBase(int size) { currentPlayer = 0; this.size = size; diff --git a/src/main/java/org/toop/game/TTT.java b/src/main/java/org/toop/game/TTT.java index e5b7619..972f4e3 100644 --- a/src/main/java/org/toop/game/TTT.java +++ b/src/main/java/org/toop/game/TTT.java @@ -4,12 +4,11 @@ public class TTT extends GameBase { private int moveCount; public TTT(String player1, String player2) { - Player[] players = new Player[2]; + super(9); + players = new Player[2]; players[0] = new Player(player1, 'X'); players[1] = new Player(player2, 'O'); - super(players, 9); - moveCount = 0; } @@ -19,7 +18,7 @@ public class TTT extends GameBase { return false; } - return (grid[index] == ' ') ? true : false; + return grid[index] == ' '; } @Override diff --git a/src/main/java/org/toop/server/Server.java b/src/main/java/org/toop/server/Server.java index b550855..385c8c4 100644 --- a/src/main/java/org/toop/server/Server.java +++ b/src/main/java/org/toop/server/Server.java @@ -1,12 +1,17 @@ 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.Events; import org.toop.eventbus.GlobalEventBus; import org.toop.server.backend.*; import java.util.EnumSet; -public class Server { +public class Server extends Thread { + + private static final Logger logger = LogManager.getLogger(Main.class); public enum ServerBackend { LOCAL, @@ -161,4 +166,12 @@ public class Server { GlobalEventBus.subscribeAndRegister(Events.ServerEvents.changeServerPort.class, e -> this.setPort(e.port())); } -} \ No newline at end of file + public void run() { + while (true) { +// logger.info(server.getIp()); + logger.info(this.isAlive()); + } + } + +} + diff --git a/src/main/java/org/toop/server/ServerTask.java b/src/main/java/org/toop/server/ServerTask.java new file mode 100644 index 0000000..cd45bb6 --- /dev/null +++ b/src/main/java/org/toop/server/ServerTask.java @@ -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()); + } + } + +}