diff --git a/src/main/java/de/hdm_stuttgart/battlearena/Model/Multiplayer/TestServer/ConnectionHandling.java b/src/main/java/de/hdm_stuttgart/battlearena/Model/Multiplayer/TestServer/ConnectionHandling.java index d1e1df01198a66bb85eb0914013d2dfc5ffdf856..52a154034c0bc12b84c584eb704d731be8a736c2 100644 --- a/src/main/java/de/hdm_stuttgart/battlearena/Model/Multiplayer/TestServer/ConnectionHandling.java +++ b/src/main/java/de/hdm_stuttgart/battlearena/Model/Multiplayer/TestServer/ConnectionHandling.java @@ -7,16 +7,17 @@ public class ConnectionHandling { public static void main(String[] args) throws IOException, InterruptedException { Client client = new Client(); - client.startConnection("192.168.0.105", 4444); - for (int i = 1; i < 3; i++){ + client.startConnection("localhost", 4444); + for (int i = 1; i < 10; i++){ int x = client.sendX(1+i); System.out.println(x); - int y = client.sendY(0+i); + TimeUnit.MILLISECONDS.sleep(100); + + int y = client.sendY(i); System.out.println(y); TimeUnit.SECONDS.sleep(1); } } - } diff --git a/src/main/java/de/hdm_stuttgart/battlearena/Model/Multiplayer/TestServer/Server.java b/src/main/java/de/hdm_stuttgart/battlearena/Model/Multiplayer/TestServer/Server.java index e9c36d2cd8dee17eeb09ca3b5465a65076e12f57..a57d69fda0654365216e0a774c51dd33df7b74f3 100644 --- a/src/main/java/de/hdm_stuttgart/battlearena/Model/Multiplayer/TestServer/Server.java +++ b/src/main/java/de/hdm_stuttgart/battlearena/Model/Multiplayer/TestServer/Server.java @@ -1,5 +1,9 @@ package de.hdm_stuttgart.battlearena.Model.Multiplayer.TestServer; +import de.hdm_stuttgart.battlearena.Model.Multiplayer.GameServer; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; + import java.net.*; import java.io.*; import java.util.concurrent.Executors; @@ -7,17 +11,21 @@ import java.util.concurrent.ScheduledExecutorService; import java.util.concurrent.TimeUnit; public class Server { + + private static final Logger log = LogManager.getLogger(Server.class); private ServerSocket serverSocket; private static int px; private static int py; public static void main(String[] args) throws IOException { Server server = new Server(); - server.start("192.168.0.105",4444); + log.info("server starting..."); + server.start("localhost",4444); } public void start(String lolcalhost, int port) throws IOException { serverSocket = new ServerSocket(port); + log.info("server started!"); while (true) new ServerHandler(serverSocket.accept()).start(); } @@ -52,15 +60,21 @@ public class Server { int receivedX = Integer.parseInt(inputLine.substring(2)); px = receivedX; + localOut.println(inputLine); + localOut.flush(); + log.info("Current X and Y: " + px + " / " + py); + log.info("Sent response to client: " + receivedX); + } else if (inputLine.startsWith("y:")) { int receivedY = Integer.parseInt(inputLine.substring(2)); py = receivedY; + + localOut.println(inputLine); + localOut.flush(); + log.info("Current X and Y: " + px + " / " + py); + log.info("Sent response to client: " + receivedY); } - localOut.println(inputLine); - localOut.flush(); - System.out.println("Current X: " + px + " Current Y: " + py); - System.out.println("Sent response to client: " + inputLine); } } catch (IOException e) { throw new RuntimeException(e); diff --git a/src/main/java/module-info.java b/src/main/java/module-info.java index c37776eeb147449e3fa1dbb6aaf650b8c5f12637..fdd0d1f6d210d6e1dcaaa42982871ac052341a1a 100644 --- a/src/main/java/module-info.java +++ b/src/main/java/module-info.java @@ -4,6 +4,7 @@ module gui { requires javafx.media; requires org.apache.logging.log4j; + opens de.hdm_stuttgart.battlearena to javafx.fxml; exports de.hdm_stuttgart.battlearena.Main; exports de.hdm_stuttgart.battlearena.Controller;