Projekte/monopoly/client/build.gradle

@@ -10,8 +10,6 @@ dependencies {
     implementation project(":monopoly:server")
 
     implementation libs.jme3.desktop
-    implementation libs.lemur
-    implementation libs.lemurproto
 
     runtimeOnly libs.jme3.awt.dialogs
     runtimeOnly libs.jme3.plugins

Projekte/monopoly/client/src/main/java/pp/monopoly/client/gui/CreateGameMenu.java

@@ -1,7 +1,11 @@
 package pp.monopoly.client.gui;
 
+import javax.swing.JOptionPane;
+
 import com.jme3.material.Material;
 import com.jme3.math.Vector3f;
+import com.jme3.network.Client;
+import com.jme3.network.Network;
 import com.jme3.scene.Geometry;
 import com.jme3.scene.shape.Quad;
 import com.jme3.texture.Texture;
@@ -14,6 +18,7 @@ import com.simsilica.lemur.component.SpringGridLayout;
 
 import pp.monopoly.client.MonopolyApp;
 import pp.monopoly.client.StartMenu;
+import pp.monopoly.server.MonopolyServer;
 
 public class CreateGameMenu {
 
@@ -63,12 +68,12 @@ public class CreateGameMenu {
         // "Selber hosten"-Button
         Button hostButton = buttonContainer.addChild(new Button("Selber hosten"));
         hostButton.setPreferredSize(new Vector3f(120, 40, 0));
-       // hostButton.addClickCommands(source -> startServerAndJoin());
+        hostButton.addClickCommands(source -> startServerAndJoin());
 
         // "Beitreten"-Button (vorerst funktionslos)
         Button joinButton = buttonContainer.addChild(new Button("Beitreten"));
         joinButton.setPreferredSize(new Vector3f(120, 40, 0));
-       // joinButton.addClickCommands(source -> joinServer());
+        joinButton.addClickCommands(source -> joinServer());
 
         // Serverstatus-Label
         Label serverStatusLabel = menuContainer.addChild(new Label("Serverstatus: Noch nicht gestartet"));
@@ -120,34 +125,35 @@ public class CreateGameMenu {
     /**
      * Startet den Server und tritt nach 2 Sekunden der Lobby bei.
      */
-    //private void startServerAndJoin() {
+    private void startServerAndJoin() {
-    //    new Thread(() -> {
+        new Thread(() -> {
-    //        app.start();
+            app.start();
-    //        app.startServer();
+            MonopolyServer server = new MonopolyServer();
-//
+            server.run();
-    //        // Warte 2 Sekunden
+
-    //        try {
+            // Warte 2 Sekunden
-    //            Thread.sleep(2000);
+            try {
-    //        } catch (InterruptedException e) {
+                Thread.sleep(2000);
-    //            Thread.currentThread().interrupt();
+            } catch (InterruptedException e) {
-    //        }
+                Thread.currentThread().interrupt();
-//
+            }
-    //        // Verbinde mit dem Server
+
-    //        app.enqueue(() -> joinServer());
+            // Verbinde mit dem Server
-    //    }).start();
+            app.enqueue(() -> joinServer());
-    //}
+        }).start();
+    }
 
     /**
      * Tritt dem Server basierend auf den Eingaben bei.
      */
-   //private void joinServer() {
+    private void joinServer() {
-   //    String serverAddress = serverAddressField.getText();
+        String serverAddress = serverAddressField.getText();
-   //    int port = Integer.parseInt(portField.getText());
+        int port = Integer.parseInt(portField.getText());
-   //    app.getServerConnection().connect(serverAddress, port);
+        app.getServerConnection().connect(serverAddress, port);
 
-   //    // Öffnet die Lobby
+        // Öffnet die Lobby
-   //    app.getGuiNode().detachChild(menuContainer);
+        app.getGuiNode().detachChild(menuContainer);
-   //    app.getGuiNode().detachChild(background); // Entfernt das Hintergrundbild
+        app.getGuiNode().detachChild(background); // Entfernt das Hintergrundbild
-   //    new LobbyMenu(app);
+        new LobbyMenu(app);
-   //}
+    }
 }

Projekte/monopoly/model/src/main/java/pp/monopoly/game/server/ServerGameLogic.java

@@ -174,7 +174,8 @@ public class ServerGameLogic implements ClientInterpreter {
         Player player = playerHandler.getPlayerById(from);
         if (player != null) {
             player.setName(msg.getName());
-            playerHandler.setPlayerReady(player, true);    
+            player.setColor(msg.getColor());
+            player.setName(msg.getName());
             LOGGER.log(Level.DEBUG, "Player {0} is ready", player.getName());
         }
     }

Projekte/settings.gradle

@@ -25,7 +25,7 @@ dependencyResolutionManagement {
             library('jme3-effects', 'org.jmonkeyengine', 'jme3-effects').versionRef('jme')
 
             library('lemur', 'com.simsilica:lemur:1.16.0')
-            library('lemurproto', 'com.simsilica:lemur-proto:1.13.0')
+            library('lemur-proto', 'com.simsilica:lemur-proto:1.13.0')
 
             library('junit4', 'junit:junit:4.13.2')
             library('gson', 'com.google.code.gson:gson:2.11.0')