Merge branch 'gui' into 'connect'

# Conflicts:
#   Projekte/monopoly/client/src/main/java/pp/monopoly/client/MonopolyApp.java
#   Projekte/monopoly/client/src/main/java/pp/monopoly/client/gui/LobbyMenu.java
#   Projekte/monopoly/client/src/main/java/pp/monopoly/client/gui/popups/BuildingPropertyCard.java
#   Projekte/monopoly/client/src/main/java/pp/monopoly/client/gui/popups/BuyCard.java
#   Projekte/monopoly/client/src/main/java/pp/monopoly/client/gui/popups/FoodFieldCard.java
#   Projekte/monopoly/client/src/main/java/pp/monopoly/client/gui/popups/GateFieldCard.java
#   Projekte/monopoly/client/src/main/java/pp/monopoly/client/gui/popups/WinnerPopUp.java
#   Projekte/monopoly/model/src/main/java/pp/monopoly/game/client/ClientGameLogic.java

.gitignore

@@ -4,6 +4,7 @@ build
 
 # VSC
 bin
+.vscode
 
 # IntelliJ
 *.iml

Projekte/.run/MonopolyApp (Mac).run.xml

@@ -0,0 +1,18 @@
+<component name="ProjectRunConfigurationManager">
+    <configuration default="false" name="MonopolyApp (Mac)" type="Application" factoryName="Application"
+                   singleton="false">
+        <option name="MAIN_CLASS_NAME" value="pp.monopoly.client.MonopolyApp"/>
+        <module name="Projekte.monopoly.client.main"/>
+        <option name="VM_PARAMETERS" value="-XstartOnFirstThread"/>
+        <option name="WORKING_DIRECTORY" value="$MODULE_WORKING_DIR$"/>
+        <extension name="coverage">
+            <pattern>
+                <option name="PATTERN" value="pp.monopoly.client.*"/>
+                <option name="ENABLED" value="true"/>
+            </pattern>
+        </extension>
+        <method v="2">
+            <option name="Make" enabled="true"/>
+        </method>
+    </configuration>
+</component>

Projekte/.run/MonopolyApp.run.xml

@@ -0,0 +1,18 @@
+<component name="ProjectRunConfigurationManager">
+  <configuration default="false" name="MonopolyApp" type="Application" factoryName="Application" singleton="false"
+                 nameIsGenerated="true">
+    <option name="MAIN_CLASS_NAME" value="pp.monopoly.client.MonopolyApp"/>
+    <module name="Projekte.monopoly.client.main"/>
+    <option name="VM_PARAMETERS" value="-Djava.util.logging.config.file=logging.properties"/>
+    <option name="WORKING_DIRECTORY" value="$MODULE_WORKING_DIR$"/>
+    <extension name="coverage">
+      <pattern>
+        <option name="PATTERN" value="pp.monopoly.client.*"/>
+        <option name="ENABLED" value="true"/>
+      </pattern>
+    </extension>
+    <method v="2">
+      <option name="Make" enabled="true"/>
+    </method>
+  </configuration>
+</component>

Projekte/.run/MonopolyServer.run.xml

@@ -0,0 +1,17 @@
+<component name="ProjectRunConfigurationManager">
+  <configuration default="false" name="MonopolyServer" type="Application" factoryName="Application"
+                 nameIsGenerated="true">
+    <option name="MAIN_CLASS_NAME" value="pp.monopoly.server.MonopolyServer"/>
+    <module name="Projekte.monopoly.server.main"/>
+    <option name="WORKING_DIRECTORY" value="$MODULE_WORKING_DIR$"/>
+    <extension name="coverage">
+      <pattern>
+        <option name="PATTERN" value="pp.monopoly.server.*"/>
+        <option name="ENABLED" value="true"/>
+      </pattern>
+    </extension>
+    <method v="2">
+      <option name="Make" enabled="true"/>
+    </method>
+  </configuration>
+</component>

Projekte/battleship/client/src/main/java/pp/battleship/client/Menu.java

@@ -7,22 +7,22 @@
 
 package pp.battleship.client;
 
+import java.io.File;
+import java.io.IOException;
+import java.util.prefs.Preferences;
+
 import com.simsilica.lemur.Button;
 import com.simsilica.lemur.Checkbox;
 import com.simsilica.lemur.Label;
 import com.simsilica.lemur.style.ElementId;
 
+import static pp.battleship.Resources.lookup;
 import pp.battleship.client.gui.GameMusic;
-import pp.battleship.client.gui.VolumeSlider;
 import pp.dialog.Dialog;
 import pp.dialog.StateCheckboxModel;
 import pp.dialog.TextInputDialog;
+import pp.battleship.client.gui.VolumeSlider;
 
-import java.io.File;
-import java.io.IOException;
-import java.util.prefs.Preferences;
-
-import static pp.battleship.Resources.lookup;
 import static pp.util.PreferencesUtils.getPreferences;
 
 /**
@@ -39,7 +39,7 @@ class Menu extends Dialog {
     private final VolumeSlider slider;
 
     /**
-     * Constructs the Menu dialog for the Battleship application.
+     * Constructs the Menu dialog for the Battleship application.+
      *
      * @param app the BattleshipApp instance
      */

Projekte/battleship/client/src/main/java/pp/battleship/client/NetworkDialog.java

@@ -7,24 +7,23 @@
 
 package pp.battleship.client;
 
+import java.lang.System.Logger;
+import java.lang.System.Logger.Level;
+import java.util.concurrent.ExecutionException;
+import java.util.concurrent.Future;
+
 import com.simsilica.lemur.Button;
 import com.simsilica.lemur.Container;
 import com.simsilica.lemur.Label;
 import com.simsilica.lemur.TextField;
 import com.simsilica.lemur.component.SpringGridLayout;
 
+import static pp.battleship.Resources.lookup;
 import pp.battleship.server.BattleshipServer;
 import pp.dialog.Dialog;
 import pp.dialog.DialogBuilder;
 import pp.dialog.SimpleDialog;
 
-import java.lang.System.Logger;
-import java.lang.System.Logger.Level;
-import java.util.concurrent.ExecutionException;
-import java.util.concurrent.Future;
-
-import static pp.battleship.Resources.lookup;
-
 /**
  * Represents a dialog for setting up a network connection in the Battleship game.
  * Allows users to specify the host and port for connecting to a game server.
@@ -32,7 +31,7 @@ import static pp.battleship.Resources.lookup;
 class NetworkDialog extends SimpleDialog {
     private static final Logger LOGGER = System.getLogger(NetworkDialog.class.getName());
     private static final String LOCALHOST = "localhost"; //NON-NLS
-    private static final String DEFAULT_PORT = "1234"; //NON-NLS
+    private static final String DEFAULT_PORT = "42069"; //NON-NLS
     private final NetworkSupport network;
     private final TextField host = new TextField(LOCALHOST);
     private final TextField port = new TextField(DEFAULT_PORT);

Projekte/battleship/client/src/main/java/pp/battleship/client/gui/VolumeSlider.java

@@ -1,6 +1,7 @@
 package pp.battleship.client.gui;
 
 import com.simsilica.lemur.Slider;
+
 /**
  * The VolumeSlider class represents the Volume Slider in the Menu.
  * It extends the Slider class and provides functionalities for setting the music volume,

Projekte/battleship/converter/src/main/java/pp/battleship/exporter/ModelExporter.java

@@ -45,7 +45,12 @@ public class ModelExporter extends SimpleApplication {
         export("Models/BoatSmall/12219_boat_v2_L2.obj", "BoatSmall.j3o"); //NON-NLS
         export("Models/Battle/14084_WWII_Ship_German_Type_II_U-boat_v2_L1.obj", "Battle.j3o"); //NON-NLS
         export("Models/CV/essex_scb-125_generic.obj", "CV.j3o"); //NON-NLS
-
+        export("Models/Figures/Würfel_blau.obj", "Würfel_blau.j30");
+        export("Models/Figures/Würfel_gelb.obj", "Würfel_gelb.j30");
+        export("Models/Figures/Würfel_grün.obj", "Würfel_grün.j30");
+        export("Models/Figures/Würfel_rosa.obj", "Würfel_rosa.j30");
+        export("Models/Figures/Würfel_rot.obj", "Würfel_rot.j30");
+        export("Models/Figures/Würfel_schwarz.obj", "Würfel_schwarz.j30");
         stop();
     }
 

Projekte/battleship/model/src/main/java/pp/battleship/BattleshipConfig.java

@@ -7,12 +7,11 @@
 
 package pp.battleship;
 
-import pp.util.config.Config;
-
+import static java.lang.Math.max;
 import java.util.Map;
 import java.util.TreeMap;
 
-import static java.lang.Math.max;
+import pp.util.config.Config;
 
 /**
  * Provides access to the configuration settings for the Battleship game.
@@ -31,7 +30,7 @@ public class BattleshipConfig extends Config {
      * The default port number for the Battleship server.
      */
     @Property("port")
-    private int port = 1234;
+    private int port = 12234;
 
     /**
      * The width of the game map in terms of grid units.

Projekte/battleship/server/server.properties

@@ -10,7 +10,7 @@
 # This file defines the configuration settings for the Battleship server.
 #
 # The port number on which the server will listen for incoming connections.
-port=1234
+port=42069
 #
 # The dimensions of the game map.
 # 'map.width' defines the number of columns, and 'map.height' defines the number of rows.

Projekte/jme-common/src/main/resources/Interface/Lemur/pp-styles.groovy

@@ -1,7 +1,10 @@
 // Styling of Lemur components
-// For documentation, see
+// For documentation, see:
 // https://github.com/jMonkeyEngine-Contributions/Lemur/wiki/Styling
 
+import com.jme3.math.ColorRGBA
+import com.simsilica.lemur.*
+import com.simsilica.lemur.component.QuadBackgroundComponent
 import com.simsilica.lemur.Button
 import com.simsilica.lemur.Button.ButtonAction
 import com.simsilica.lemur.Command
@@ -11,19 +14,19 @@ import com.simsilica.lemur.component.QuadBackgroundComponent
 import com.simsilica.lemur.component.TbtQuadBackgroundComponent
 
 def bgColor = color(1, 1, 1, 1)
-def buttonEnabledColor = color(0.8, 0.9, 1, 1)
+def buttonEnabledColor = color(0, 0, 0, 1)
 def buttonDisabledColor = color(0.8, 0.9, 1, 0.2)
-//def buttonBgColor = color(0, 0.75, 0.75, 1)
+def buttonBgColor = color(1, 1, 1, 1)
 def sliderColor = color(0.6, 0.8, 0.8, 1)
 def sliderBgColor = color(0.5, 0.75, 0.75, 1)
 def gradientColor = color(0.5, 0.75, 0.85, 0.5)
 def tabbuttonEnabledColor = color(0.4, 0.45, 0.5, 1)
+def solidWhiteBackground = new QuadBackgroundComponent(new ColorRGBA(1, 1, 1, 1))
+def greyBackground = new QuadBackgroundComponent(new ColorRGBA(0.1f, 0.1f, 0.1f, 1.0f));
+def lightGreyBackground = new QuadBackgroundComponent(new ColorRGBA(0.4f, 0.4f, 0.4f, 1.0f));
+def lightGrey = color(0.6, 0.6, 0.6, 1.0)
+
 
-def playButtonBorderColor = color(1, 0.6, 0, 1) // Orange border for "Spielen" button
-def playButtonTextColor = color(0, 0, 0, 1) // Black text color for "Spielen" button
-def buttonBgColor = color(1, 1, 1, 1) // White background for "Spiel beenden" and "Einstellungen" buttons
-def buttonTextColor = color(0, 0, 0, 1) // Black text color for "Spiel beenden" and "Einstellungen" buttons
-def borderColor = color(0, 0, 0, 1) // Black border for "Spiel beenden" and "Einstellungen"
 
 
 def gradient = TbtQuadBackgroundComponent.create(
@@ -34,7 +37,15 @@ def gradient = TbtQuadBackgroundComponent.create(
 
 def doubleGradient = new QuadBackgroundComponent(gradientColor)
 doubleGradient.texture = texture(name: "/com/simsilica/lemur/icons/double-gradient-128.png",
-                                 generateMips: false)
+        generateMips: false)
+//doubleGradient.color = color(0, 0, 0, 1)
+
+def orangeBorder = TbtQuadBackgroundComponent.create(
+        texture(name: "/com/simsilica/lemur/icons/border.png", // Replace with an appropriate texture if needed
+                generateMips: false),
+        1, 1, 1, 126, 126,
+        1f, false)
+orangeBorder.color = color(1, 0.5, 0, 1) // Orange color
 
 selector("pp") {
     font = font("Interface/Fonts/Metropolis/Metropolis-Regular-32.fnt")
@@ -45,41 +56,45 @@ selector("label", "pp") {
     color = buttonEnabledColor
 }
 
+selector("label-Bold", "pp") {
+    insets = new Insets3f(2, 2, 2, 2)
+    font = font("Interface/Fonts/Metropolis/Metropolis-Bold-32.fnt")
+    fontSize = 30
+    color = buttonEnabledColor
+    textHAlignment = HAlignment.Center
+    textVAlignment = VAlignment.Center
+
+}
+selector("label-Text", "pp") {
+    insets = new Insets3f(2, 2, 2, 2)
+    fontSize = 25
+    color = buttonEnabledColor
+}
+
 selector("header", "pp") {
     font = font("Interface/Fonts/Metropolis/Metropolis-Bold-42.fnt")
     insets = new Insets3f(2, 2, 2, 2)
     color = color(1, 0.5, 0, 1)
     textHAlignment = HAlignment.Center
+    textVAlignment = VAlignment.Center
 }
 
 selector("container", "pp") {
-    background = gradient.clone()
+    background = solidWhiteBackground.clone()
     background.setColor(bgColor)
 }
 
+selector("toolbar") {
+    background = gradient.clone()
+    background.setColor(bgColor)
+    //color = (new ColorRGBA(0.4157f, 0.4235f, 0.4392f, 1.0f))
+
+}
 selector("slider", "pp") {
     background = gradient.clone()
     background.setColor(bgColor)
 }
 
-selector("play-button", "pp") {
-    color = playButtonTextColor // Black text color
-    background = new QuadBackgroundComponent(playButtonBorderColor) // Orange border background
-    insets = new Insets3f(15, 25, 15, 25) // Padding for larger button size
-    background.setMargin(5, 5) // Thin border effect around the background color
-    fontSize = 36 // Larger font size for prominence
-}
-
-selector("menu-button", "pp") {
-    color = buttonTextColor // Black text color
-    background = new QuadBackgroundComponent(buttonBgColor) // White background
-    insets = new Insets3f(10, 20, 10, 20) // Padding
-    background.setMargin(1, 1) // Thin black border
-    background.setColor(borderColor) // Set black border color
-
-    fontSize = 24 // Standard font size
-}
-
 def pressedCommand = new Command<Button>() {
     void execute(Button source) {
         if (source.isPressed())
@@ -140,19 +155,26 @@ selector("title", "pp") {
     shadowOffset = vec3(2, -2, -1)
     background = new QuadBackgroundComponent(color(0.5, 0.75, 0.85, 1))
     background.texture = texture(name: "/com/simsilica/lemur/icons/double-gradient-128.png",
-                                 generateMips: false)
+            generateMips: false)
     insets = new Insets3f(2, 2, 2, 2)
+    textHAlignment = HAlignment.Center
+    textVAlignment = VAlignment.Center
 
     buttonCommands = stdButtonCommands
 }
 
 
 selector("button", "pp") {
-    background = gradient.clone()
-    color = buttonEnabledColor
-    background.setColor(buttonBgColor)
-    insets = new Insets3f(2, 2, 2, 2)
+    def outerBackground = new QuadBackgroundComponent(color(1, 0.5, 0, 1)) // Orange border
+    def innerBackground = new QuadBackgroundComponent(buttonBgColor) // Inner button background
 
+    // Apply the outer border as the main background
+    background = outerBackground
+
+    // Use insets to create a margin/padding effect for the inner background
+    insets = new Insets3f(3, 3, 3, 3) // Adjust the border thickness
+    textHAlignment = HAlignment.Center
+    textVAlignment = VAlignment.Center
     buttonCommands = stdButtonCommands
 }
 
@@ -201,6 +223,7 @@ selector("slider.down.button", "pp") {
 
 selector("checkbox", "pp") {
     color = buttonEnabledColor
+    fontSize = 20
 }
 
 selector("rollup", "pp") {
@@ -217,10 +240,55 @@ selector("tabbedPanel.container", "pp") {
 }
 
 selector("tab.button", "pp") {
-    background = gradient.clone()
+    background = solidWhiteBackground.clone()
     background.setColor(bgColor)
     color = tabbuttonEnabledColor
     insets = new Insets3f(4, 2, 0, 2)
 
     buttonCommands = stdButtonCommands
 }
+selector("settings-title", "pp") {
+    def outerBackground = new QuadBackgroundComponent(color(1, 0.5, 0, 1)) // Grey inner border
+    def innerBackground = new QuadBackgroundComponent(buttonBgColor) // White outer border background
+
+    background = outerBackground
+    fontSize = 40
+    insets = new Insets3f(3, 3, 3, 3)
+    textHAlignment = HAlignment.Center
+    textVAlignment = VAlignment.Center
+ }
+
+selector("menu-button", "pp") {
+    fontSize = 40 // Set font size
+    textHAlignment = HAlignment.Center
+    textVAlignment = VAlignment.Center
+    buttonCommands = stdButtonCommands
+}
+
+// Style for Selector text
+selector("selector.item.label") {
+    color = color(0, 0, 0, 1)  // Black text
+    fontSize = 16  // Optional: Adjust the text size if needed
+    textHAlignment = HAlignment.Left  // Optional: Align text to the left
+    insets = new Insets3f(2, 2, 2, 2)  // Optional: Add padding around text
+}
+// Style the popup container background
+selector("selector.popup") {
+    background = new QuadBackgroundComponent(new ColorRGBA(1, 1, 1, 0.8f))  // Translucent white background
+    insets = new Insets3f(5, 5, 5, 5)  // Padding inside the popup container
+}
+
+// Style the text of dropdown options
+selector("selector.item.label") {
+    color = color(0, 0, 0, 1)  // Black text
+    fontSize = 16  // Optional: Adjust font size
+    textHAlignment = HAlignment.Left  // Align text to the left
+    insets = new Insets3f(2, 5, 2, 5)  // Add padding for each option
+}
+
+// Style the hover state of dropdown options
+selector("selector.item.label", "hover") {
+    color = color(1, 1, 1, 1)  // White text when hovered
+    background = new QuadBackgroundComponent(new ColorRGBA(0.2f, 0.6f, 1.0f, 0.9f))  // Highlighted background
+}
+

Projekte/monopoly/client/build.gradle

@@ -7,8 +7,14 @@ description = 'Monopoly Client'
 dependencies {
     implementation project(":jme-common")
     implementation project(":monopoly:model")
+    implementation project(":monopoly:server")
 
+    implementation 'com.simsilica:lemur-proto:1.13.0'
     implementation libs.jme3.desktop
+    implementation libs.lemur
+    implementation libs.lemurproto
+
+    implementation libs.selenium
 
     runtimeOnly libs.jme3.awt.dialogs
     runtimeOnly libs.jme3.plugins

Projekte/monopoly/client/client.properties

@@ -5,47 +5,13 @@
 ## (c) Mark Minas (mark.minas@unibw.de)
 ########################################
 #
-# Battleship client configuration
-#
-# Specifies the map used by the opponent in single mode.
-# Single mode is activated if this property is set.
-#map.opponent=maps/map2.json
-#
-# Specifies the map used by the player in single mode.
-# The player must define their own map if this property is not set.
-map.own=maps/map1.json
-#
-# Coordinates of the shots fired by the RobotClient in the order listed.
-# Example:
-#   2, 0,\
-#   2, 1,\
-#   2, 2,\
-#   2, 3
-#  defines four shots, namely at the coordinates
-#  (x=2, y=0), (x=2, y=1), (x=2, y=2), and (x=2, y=3)
-robot.targets=2, 0,\
-              2, 1,\
-              2, 2,\
-              2, 3
-#
-# Delay in milliseconds between each shot fired by the RobotClient.
-robot.delay=500
+# Monopoly client configuration
 #
 # The dimensions of the game map used in single mode.
 # 'map.width' defines the number of columns, and 'map.height' defines the number of rows.
 map.width=10
 map.height=10
 #
-# The number of ships of each length available in single mode.
-# The value is a comma-separated list where each element corresponds to the number of ships
-# with a specific length. For example:
-# ship.nums=4, 3, 2, 1
-# This configuration means:
-#   - 4 ships of length 1
-#   - 3 ships of length 2
-#   - 2 ships of length 3
-#   - 1 ship of length 4
-ship.nums=4, 3, 2, 1
 #
 # Screen settings
 #

Projekte/monopoly/client/src/main/java/pp/monopoly/client/GameMusic.java

@@ -0,0 +1,122 @@
+package pp.monopoly.client;
+
+import static pp.util.PreferencesUtils.getPreferences;
+
+import java.lang.System.Logger;
+import java.lang.System.Logger.Level;
+import java.util.prefs.Preferences;
+
+import com.jme3.app.Application;
+import com.jme3.app.state.AbstractAppState;
+import com.jme3.app.state.AppStateManager;
+import com.jme3.asset.AssetLoadException;
+import com.jme3.asset.AssetNotFoundException;
+import com.jme3.audio.AudioData;
+import com.jme3.audio.AudioNode;
+
+/**
+ * Handles the background music beeing played. Is able to start and stop the music. Set the Volume of the Audio.
+ */
+public class GameMusic extends AbstractAppState{
+    private static final Logger LOGGER = System.getLogger(GameMusic.class.getName());
+    private static final Preferences PREFERENCES = getPreferences(GameMusic.class);
+    private static final String ENABLED_PREF = "enabled"; //NON-NLS
+    private static final String VOLUME_PREF = "volume"; //NON-NLS
+
+    private AudioNode music;
+
+    /**
+     * Checks if sound is enabled in the preferences.
+     *
+     * @return {@code true} if sound is enabled, {@code false} otherwise.
+     */
+    public static boolean enabledInPreferences() {
+        return PREFERENCES.getBoolean(ENABLED_PREF, true);
+    }
+
+    /**
+     * Checks if sound is enabled in the preferences.
+     *
+     * @return float to which the volume is set
+     */
+    public static float volumeInPreferences() {
+        return PREFERENCES.getFloat(VOLUME_PREF, 0.5f);
+    }
+
+    /**
+     * Initializes the sound effects for the game.
+     * Overrides {@link AbstractAppState#initialize(AppStateManager, Application)}
+     *
+     * @param stateManager The state manager
+     * @param app          The application
+     */
+    @Override
+    public void initialize(AppStateManager stateManager, Application app) {
+        super.initialize(stateManager, app);
+        music = loadSound(app, "Sound/background.ogg");
+        setVolume(volumeInPreferences());
+        music.setLooping(true);
+        if (isEnabled() && music != null) {
+            music.play();
+        }
+    }
+
+    /**
+     * Loads a sound from the specified file.
+     *
+     * @param app  The application
+     * @param name The name of the sound file.
+     * @return The loaded AudioNode.
+     */
+    private AudioNode loadSound(Application app, String name) {
+        try {
+            final AudioNode sound = new AudioNode(app.getAssetManager(), name, AudioData.DataType.Buffer);
+            sound.setLooping(false);
+            sound.setPositional(false);
+            return sound;
+        }
+        catch (AssetLoadException | AssetNotFoundException ex) {
+            LOGGER.log(Level.ERROR, ex.getMessage(), ex);
+        }
+        return null;
+    }
+
+    /**
+     * Sets the enabled state of this AppState.
+     * Overrides {@link com.jme3.app.state.AbstractAppState#setEnabled(boolean)}
+     *
+     * @param enabled {@code true} to enable the AppState, {@code false} to disable it.
+     */
+    @Override
+    public void setEnabled(boolean enabled) {
+        if (isEnabled() == enabled) return;
+
+        if (music != null) {
+            if (enabled) {
+                music.play();
+            } else {
+                music.stop();
+            }
+        }
+    
+        super.setEnabled(enabled);
+        LOGGER.log(Level.INFO, "Sound enabled: {0}", enabled); //NON-NLS
+        PREFERENCES.putBoolean(ENABLED_PREF, enabled);
+    }
+
+    /**
+     * Toggles the game sound on or off.
+     */
+    public void toggleSound() {
+        setEnabled(!isEnabled());
+    }
+
+    /**
+     * Sets the volume of music
+     * @param vol the volume to which the music should be set
+     */
+    public void setVolume(float vol){
+        music.setVolume(vol);
+        PREFERENCES.putFloat(VOLUME_PREF, vol);
+    }
+}

Projekte/monopoly/client/src/main/java/pp/monopoly/client/GameSound.java

@@ -7,6 +7,10 @@
 
 package pp.monopoly.client;
 
+import java.lang.System.Logger;
+import java.lang.System.Logger.Level;
+import java.util.prefs.Preferences;
+
 import com.jme3.app.Application;
 import com.jme3.app.state.AbstractAppState;
 import com.jme3.app.state.AppStateManager;
@@ -14,13 +18,9 @@ import com.jme3.asset.AssetLoadException;
 import com.jme3.asset.AssetNotFoundException;
 import com.jme3.audio.AudioData;
 import com.jme3.audio.AudioNode;
+
 import pp.monopoly.notification.GameEventListener;
 import pp.monopoly.notification.SoundEvent;
-
-import java.lang.System.Logger;
-import java.lang.System.Logger.Level;
-import java.util.prefs.Preferences;
-
 import static pp.util.PreferencesUtils.getPreferences;
 
 /**
@@ -30,6 +30,19 @@ public class GameSound extends AbstractAppState implements GameEventListener {
     private static final Logger LOGGER = System.getLogger(GameSound.class.getName());
     private static final Preferences PREFERENCES = getPreferences(GameSound.class);
     private static final String ENABLED_PREF = "enabled"; //NON-NLS
+    private static final String VOLUME_PREF = "volume"; //NON-NLS
+
+    private AudioNode passStartSound;
+    private AudioNode eventCardSound;
+    private AudioNode gulagSound;
+    private AudioNode diceRollSound;
+    private AudioNode moneyCollectSound;
+    private AudioNode moneyLostSound;
+    private AudioNode tradeAcceptedSound;
+    private AudioNode tradeRejectedSound;
+    private AudioNode winnerSound;
+    private AudioNode looserSound;
+    private AudioNode buttonSound;
 
     /**
      * Checks if sound is enabled in the preferences.
@@ -47,6 +60,15 @@ public class GameSound extends AbstractAppState implements GameEventListener {
         setEnabled(!isEnabled());
     }
 
+    /**
+     * Checks if sound is enabled in the preferences.
+     *
+     * @return float to which the volume is set
+     */
+    public static float volumeInPreferences() {
+        return PREFERENCES.getFloat(VOLUME_PREF, 0.5f);
+    }
+
     /**
      * Sets the enabled state of this AppState.
      * Overrides {@link com.jme3.app.state.AbstractAppState#setEnabled(boolean)}
@@ -71,6 +93,17 @@ public class GameSound extends AbstractAppState implements GameEventListener {
     @Override
     public void initialize(AppStateManager stateManager, Application app) {
         super.initialize(stateManager, app);
+        passStartSound = loadSound(app, "Sound/Effects/passStart.ogg");
+        eventCardSound = loadSound(app, "Sound/Effects/eventCard.ogg");
+        gulagSound = loadSound(app, "Sound/Effects/gulag.ogg");
+        diceRollSound = loadSound(app, "Sound/Effects/diceRoll.ogg");
+        moneyCollectSound = loadSound(app, "Sound/Effects/moneyCollect.ogg");
+        moneyLostSound = loadSound(app, "Sound/Effects/moneyLost.ogg");
+        tradeAcceptedSound = loadSound(app, "Sound/Effects/tradeAccepted.ogg");
+        tradeRejectedSound = loadSound(app, "Sound/Effects/tradeRejected.ogg");
+        winnerSound = loadSound(app, "Sound/Effects/winner.ogg");
+        looserSound = loadSound(app, "Sound/Effects/loser.ogg");
+        buttonSound = loadSound(app, "Sound/Effects/button.ogg");
     }
 
     /**
@@ -93,10 +126,117 @@ public class GameSound extends AbstractAppState implements GameEventListener {
         return null;
     }
 
+    /**
+     * Plays the passStart sound effect.
+     */
+    public void passStart() {
+        if (isEnabled() && passStartSound != null)
+            passStartSound.playInstance();
+    }
+    /**
+     * Plays the eventCard sound effect.
+     */
+    public void eventCard() {
+        if (isEnabled() && eventCardSound != null)
+            eventCardSound.playInstance();
+    }
+    /**
+     * Plays the gulag sound effect.
+     */
+    public void gulag() {
+        if (isEnabled() && gulagSound != null)
+            gulagSound.playInstance();
+    }
+    /**
+     * Plays the diceRoll sound effect.
+     */
+    public void diceRoll() {
+        if (isEnabled() && diceRollSound != null)
+            diceRollSound.playInstance();
+    }
+    /**
+     * Plays the moneyCollect sound effect.
+     */
+    public void moneyCollect() {
+        if (isEnabled() && moneyCollectSound != null)
+            moneyCollectSound.playInstance();
+    }
+    /**
+     * Plays the moneyLost sound effect.
+     */
+    public void moneyLost() {
+        if (isEnabled() && moneyLostSound != null)
+            moneyLostSound.playInstance();
+    }
+    /**
+     * Plays the tradeAccepted sound effect.
+     */
+    public void tradeAccepted() {
+        if (isEnabled() && tradeAcceptedSound != null)
+            tradeAcceptedSound.playInstance();
+    }
+    /**
+     * Plays the tradeRejected sound effect.
+     */
+    public void tradeRejected() {
+        if (isEnabled() && tradeRejectedSound != null)
+            tradeRejectedSound.playInstance();
+    }
+    /**
+     * Plays the winner sound effect.
+     */
+    public void winner() {
+        if (isEnabled() && winnerSound != null)
+            winnerSound.playInstance();
+    }
+    /**
+     * Plays the looser sound effect.
+     */
+    public void looser() {
+        if (isEnabled() && looserSound != null)
+            looserSound.playInstance();
+    }
+    /**
+     * Plays the button sound effect.
+     */
+    public void button() {
+        if (isEnabled() && buttonSound != null)
+            buttonSound.playInstance();
+    }
+    /**
+     * Sets the volume of the sounds
+     * @param vol the volume to which the sounds should be set
+     */
+    public void setVolume(float vol){
+        passStartSound.setVolume(vol);
+        eventCardSound.setVolume(vol);
+        gulagSound.setVolume(vol);
+        diceRollSound.setVolume(vol);
+        moneyCollectSound.setVolume(vol);
+        moneyLostSound.setVolume(vol);
+        tradeAcceptedSound.setVolume(vol);
+        tradeRejectedSound.setVolume(vol);
+        winnerSound.setVolume(vol);
+        looserSound.setVolume(vol);
+        buttonSound.setVolume(vol);
+
+        PREFERENCES.putFloat(VOLUME_PREF, vol);
+    }
+
     @Override
     public void receivedEvent(SoundEvent event) {
         switch (event.sound()) {
-
+            case PASS_START -> passStart();
+            case EVENT_CARD -> eventCard();
+            case GULAG -> gulag();
+            case DICE_ROLL -> diceRoll();
+            case MONEY_COLLECTED -> moneyCollect();
+            case MONEY_LOST -> moneyLost();
+            case TRADE_ACCEPTED -> tradeAccepted();
+            case TRADE_REJECTED -> tradeRejected();
+            case WINNER -> winner();
+            case LOSER -> looser();
+            case BUTTON -> button();
         }
     }
 }

Projekte/monopoly/client/src/main/java/pp/monopoly/client/Menu.java

@@ -1,59 +0,0 @@
-////////////////////////////////////////
-// Programming project code
-// UniBw M, 2022, 2023, 2024
-// www.unibw.de/inf2
-// (c) Mark Minas (mark.minas@unibw.de)
-////////////////////////////////////////
-
-package pp.monopoly.client;
-
-import com.simsilica.lemur.Button;
-import com.simsilica.lemur.Checkbox;
-import com.simsilica.lemur.Label;
-import com.simsilica.lemur.style.ElementId;
-import pp.dialog.Dialog;
-import pp.dialog.StateCheckboxModel;
-import pp.dialog.TextInputDialog;
-
-import java.util.prefs.Preferences;
-
-import static pp.monopoly.Resources.lookup;
-import static pp.util.PreferencesUtils.getPreferences;
-
-/**
- * The Menu class represents the main menu in the Battleship game application.
- * It extends the Dialog class and provides functionalities for loading, saving,
- * returning to the game, and quitting the application.
- */
-class Menu extends Dialog {
-    private static final Preferences PREFERENCES = getPreferences(Menu.class);
-    private static final String LAST_PATH = "last.file.path";
-    private final MonopolyApp app;
-
-
-    /**
-     * Constructs the Menu dialog for the Battleship application.
-     *
-     * @param app the BattleshipApp instance
-     */
-    public Menu(MonopolyApp app) {
-        super(app.getDialogManager());
-        this.app = app;
-    }
-
-    /**
-     * Updates the state of the load and save buttons based on the game logic.
-     */
-    @Override
-    public void update() {
-
-    }
-
-    /**
-     * As an escape action, this method closes the menu if it is the top dialog.
-     */
-    @Override
-    public void escape() {
-        close();
-    }
-}

Projekte/monopoly/client/src/main/java/pp/monopoly/client/MonopolyApp.java

@@ -21,11 +21,14 @@ import com.jme3.system.AppSettings;
 import com.simsilica.lemur.GuiGlobals;
 import com.simsilica.lemur.style.BaseStyles;
 import pp.monopoly.game.client.MonopolyClient;
+import pp.monopoly.client.gui.SettingsMenu;
+import pp.monopoly.client.gui.StartMenu;
 import pp.monopoly.game.client.ClientGameLogic;
 import pp.monopoly.game.client.ServerConnection;
 import pp.monopoly.notification.ClientStateEvent;
 import pp.monopoly.notification.GameEventListener;
 import pp.monopoly.notification.InfoTextEvent;
+import pp.monopoly.notification.Sound;
 import pp.dialog.DialogBuilder;
 import pp.dialog.DialogManager;
 import pp.graphics.Draw;
@@ -42,7 +45,7 @@ import java.util.logging.LogManager;
 import static pp.monopoly.Resources.lookup;
 
 /**
- * The main class for the Monopoly client application.
+ * The main class for the Battleship client application.
  * It manages the initialization, input setup, GUI setup, and game states for the client.
  */
 public class MonopolyApp extends SimpleApplication implements MonopolyClient, GameEventListener {
@@ -108,7 +111,7 @@ public class MonopolyApp extends SimpleApplication implements MonopolyClient, Ga
     private final ClientGameLogic logic;
 
     /**
-     * Configuration settings for the Monopoly client application.
+     * Configuration settings for the Battleship client application.
      */
     private final MonopolyAppConfig config;
 
@@ -130,7 +133,7 @@ public class MonopolyApp extends SimpleApplication implements MonopolyClient, Ga
     }
 
     /**
-     * Starts the Monopoly application.
+     * Starts the Battleship application.
      *
      * @param args Command-line arguments for launching the application.
      */
@@ -197,9 +200,9 @@ public class MonopolyApp extends SimpleApplication implements MonopolyClient, Ga
     }
 
     /**
-     * Returns the current configuration settings for the Monopoly client.
+     * Returns the current configuration settings for the Battleship client.
      *
-     * @return The {@link MonopolyClientConfig} instance.
+     * @return The {@link BattleshipClientConfig} instance.
      */
     @Override
     public MonopolyAppConfig getConfig() {
@@ -217,7 +220,7 @@ public class MonopolyApp extends SimpleApplication implements MonopolyClient, Ga
         setupInput();
         setupStates();
         setupGui();
-        serverConnection.connect();
+        new StartMenu(this).open();
     }
 
     /**
@@ -226,6 +229,7 @@ public class MonopolyApp extends SimpleApplication implements MonopolyClient, Ga
     private void setupGui() {
         GuiGlobals.initialize(this);
         BaseStyles.loadStyleResources(STYLES_SCRIPT);
+        BaseStyles.loadGlassStyle();
         GuiGlobals.getInstance().getStyles().setDefaultStyle("pp"); //NON-NLS
         final BitmapFont normalFont = assetManager.loadFont(FONT); //NON-NLS
         topText = new BitmapText(normalFont);
@@ -260,9 +264,7 @@ public class MonopolyApp extends SimpleApplication implements MonopolyClient, Ga
         stateManager.detach(stateManager.getState(DebugKeysAppState.class));
 
         attachGameSound();
-
-        //TODO add states
-        stateManager.attachAll();
+        attachGameMusic();
     }
 
     /**
@@ -275,6 +277,15 @@ public class MonopolyApp extends SimpleApplication implements MonopolyClient, Ga
         stateManager.attach(gameSound);
     }
 
+    /**
+     * Attaches the background music state and sets its initial enabled state.
+     */
+    private void attachGameMusic() {
+        final GameMusic gameSound = new GameMusic();
+        gameSound.setEnabled(GameMusic.enabledInPreferences());
+        stateManager.attach(gameSound);
+    }
+
     /**
      * Updates the application state every frame.
      * This method is called once per frame during the game loop.
@@ -293,12 +304,12 @@ public class MonopolyApp extends SimpleApplication implements MonopolyClient, Ga
      *
      * @param isPressed Indicates whether the Escape key is pressed.
      */
-    private void escape(boolean isPressed) {
+    public void escape(boolean isPressed) {
         if (!isPressed) return;
         if (dialogManager.showsDialog())
             dialogManager.escape();
         else
-            new Menu(this).open();
+            new SettingsMenu(this).open();
     }
 
     /**
@@ -310,6 +321,13 @@ public class MonopolyApp extends SimpleApplication implements MonopolyClient, Ga
         return draw;
     }
 
+    /**
+     * Tries to connect
+     */
+    public void connect() {
+        serverConnection.connect();
+    }
+
     /**
      * Handles a request to close the application.
      * If the request is initiated by pressing ESC, this parameter is true.
@@ -342,7 +360,7 @@ public class MonopolyApp extends SimpleApplication implements MonopolyClient, Ga
      *
      * @param text The information text to display.
      */
-    void setInfoText(String text) {
+    public void setInfoText(String text) {
         LOGGER.log(Level.DEBUG, "setInfoText {0}", text); //NON-NLS
         topText.setText(text);
     }
@@ -365,8 +383,6 @@ public class MonopolyApp extends SimpleApplication implements MonopolyClient, Ga
      */
     @Override
     public void receivedEvent(ClientStateEvent event) {
-        //TODO
-        throw new UnsupportedOperationException("unimplemented method");
     }
 
     /**
@@ -397,12 +413,15 @@ public class MonopolyApp extends SimpleApplication implements MonopolyClient, Ga
      * @param question  The question to display in the dialog.
      * @param yesAction The action to perform if "Yes" is selected.
      */
-    void confirmDialog(String question, Runnable yesAction) {
+    public void confirmDialog(String question, Runnable yesAction) {
         DialogBuilder.simple(dialogManager)
                      .setTitle(lookup("dialog.question"))
                      .setText(question)
-                     .setOkButton(lookup("button.yes"), yesAction)
-                     .setNoButton(lookup("button.no"))
+                     .setOkButton(lookup("button.yes"), d -> {
+                        getGameLogic().playSound(Sound.BUTTON); // Play sound
+                        yesAction.run(); // Execute the original yesAction
+                    })
+                     .setNoButton(lookup("button.no"),  d -> getGameLogic().playSound(Sound.BUTTON))
                      .build()
                      .open();
     }
@@ -412,12 +431,16 @@ public class MonopolyApp extends SimpleApplication implements MonopolyClient, Ga
      *
      * @param errorMessage The error message to display in the dialog.
      */
-    void errorDialog(String errorMessage) {
+    public void errorDialog(String errorMessage) {
         DialogBuilder.simple(dialogManager)
                      .setTitle(lookup("dialog.error"))
                      .setText(errorMessage)
-                     .setOkButton(lookup("button.ok"))
+                     .setOkButton(lookup("button.ok"), d -> getGameLogic().playSound(Sound.BUTTON))
                      .build()
                      .open();
     }
+
+    public void disconnect() {
+        serverConnection.disconnect();
+    }
 }

Projekte/monopoly/client/src/main/java/pp/monopoly/client/MonopolyAppConfig.java

@@ -1,13 +1,7 @@
-////////////////////////////////////////
-// Programming project code
-// UniBw M, 2022, 2023, 2024
-// www.unibw.de/inf2
-// (c) Mark Minas (mark.minas@unibw.de)
-////////////////////////////////////////
-
 package pp.monopoly.client;
 
 import com.jme3.math.ColorRGBA;
+
 import pp.monopoly.game.client.MonopolyClientConfig;
 
 /**
@@ -193,4 +187,4 @@ public class MonopolyAppConfig extends MonopolyClientConfig {
     public ColorRGBA getTopColor() {
         return topColor;
     }
-}
+}

Projekte/monopoly/client/src/main/java/pp/monopoly/client/MonopolyAppState.java

@@ -1,19 +1,13 @@
-////////////////////////////////////////
-// Programming project code
-// UniBw M, 2022, 2023, 2024
-// www.unibw.de/inf2
-// (c) Mark Minas (mark.minas@unibw.de)
-////////////////////////////////////////
-
 package pp.monopoly.client;
 
 import com.jme3.app.Application;
 import com.jme3.app.state.AbstractAppState;
 import com.jme3.app.state.AppStateManager;
+
 import pp.monopoly.game.client.ClientGameLogic;
 
 /**
- * Abstract class representing a state in the Battleship game.
+ * Abstract class representing a state in the Monopoly game.
  * Extends the AbstractAppState from jMonkeyEngine to manage state behavior.
  */
 public abstract class MonopolyAppState extends AbstractAppState {
@@ -21,8 +15,6 @@ public abstract class MonopolyAppState extends AbstractAppState {
 
     /**
      * Creates a new MonopolyAppState that is initially disabled.
-     *
-     * @see #setEnabled(boolean)
      */
     protected MonopolyAppState() {
         setEnabled(false);
@@ -38,7 +30,9 @@ public abstract class MonopolyAppState extends AbstractAppState {
     public void initialize(AppStateManager stateManager, Application application) {
         super.initialize(stateManager, application);
         this.app = (MonopolyApp) application;
-        if (isEnabled()) enableState();
+        if (isEnabled()) {
+            enableState();
+        }
     }
 
     /**
@@ -59,15 +53,6 @@ public abstract class MonopolyAppState extends AbstractAppState {
         return app.getGameLogic();
     }
 
-    /**
-     * Checks if any dialog is currently displayed.
-     *
-     * @return true if any dialog is currently shown, false otherwise
-     */
-    public boolean showsDialog() {
-        return app.getDialogManager().showsDialog();
-    }
-
     /**
      * Sets the enabled state of the MonopolyAppState.
      * If the new state is the same as the current state, the method returns.
@@ -79,24 +64,21 @@ public abstract class MonopolyAppState extends AbstractAppState {
         if (isEnabled() == enabled) return;
         super.setEnabled(enabled);
         if (app != null) {
-            if (enabled)
+            if (enabled) {
                 enableState();
-            else
+            } else {
                 disableState();
+            }
         }
     }
 
     /**
-     * This method is called when the state is enabled.
-     * It is meant to be overridden by subclasses to perform
-     * specific actions when the state is enabled.
+     * Called when the state is enabled. Override to define specific behavior.
      */
     protected abstract void enableState();
 
     /**
-     * This method is called when the state is disabled.
-     * It is meant to be overridden by subclasses to perform
-     * specific actions when the state is disabled.
+     * Called when the state is disabled. Override to define specific behavior.
      */
     protected abstract void disableState();
-}
+}

Projekte/monopoly/client/src/main/java/pp/monopoly/client/NetworkSupport.java

@@ -12,6 +12,8 @@ import com.jme3.network.ClientStateListener;
 import com.jme3.network.Message;
 import com.jme3.network.MessageListener;
 import com.jme3.network.Network;
+
+import pp.monopoly.client.gui.CreateGameMenu;
 import pp.monopoly.game.client.ServerConnection;
 import pp.monopoly.message.client.ClientMessage;
 import pp.monopoly.message.server.ServerMessage;
@@ -26,7 +28,7 @@ import static pp.monopoly.Resources.lookup;
  * Manages the network connection for the Battleship application.
  * Handles connecting to and disconnecting from the server, and sending messages.
  */
-class NetworkSupport implements MessageListener<Client>, ClientStateListener, ServerConnection {
+public class NetworkSupport implements MessageListener<Client>, ClientStateListener, ServerConnection {
     private static final Logger LOGGER = System.getLogger(NetworkSupport.class.getName());
     private final MonopolyApp app;
     private Client client;
@@ -40,12 +42,21 @@ class NetworkSupport implements MessageListener<Client>, ClientStateListener, Se
         this.app = app;
     }
 
+    /**
+     * Return the client connections Id
+     * @return the client id
+     */
+    public int getId() {
+        if (client == null) return 0;
+        return client.getId();
+    }
+
     /**
      * Returns the Battleship application instance.
      *
      * @return Battleship application instance
      */
-    MonopolyApp getApp() {
+    public MonopolyApp getApp() {
         return app;
     }
 
@@ -66,7 +77,7 @@ class NetworkSupport implements MessageListener<Client>, ClientStateListener, Se
     @Override
     public void connect() {
         if (client == null)
-            new NetworkDialog(this).open();
+            new CreateGameMenu(this).open();
     }
 
     /**
@@ -87,7 +98,7 @@ class NetworkSupport implements MessageListener<Client>, ClientStateListener, Se
      * @param port The server's port.
      * @throws IOException If an I/O error occurs when creating the client.
      */
-    void initNetwork(String host, int port) throws IOException {
+    public void initNetwork(String host, int port) throws IOException {
         if (client != null)
             throw new IllegalStateException("trying to join a game again");
         client = Network.connectToServer(host, port);

Projekte/monopoly/client/src/main/java/pp/monopoly/client/StartMenu.java

@@ -1,117 +0,0 @@
-package pp.monopoly.client;
-
-import com.jme3.asset.TextureKey;
-import com.jme3.material.Material;
-import com.jme3.math.Vector3f;
-import com.jme3.scene.Geometry;
-import com.jme3.scene.shape.Quad;
-import com.jme3.texture.Texture;
-import com.simsilica.lemur.Button;
-import com.simsilica.lemur.Insets3f;
-import com.simsilica.lemur.Label;
-import com.simsilica.lemur.Panel;
-import com.simsilica.lemur.style.ElementId;
-import com.simsilica.lemur.component.QuadBackgroundComponent;
-import com.jme3.math.ColorRGBA;
-import pp.dialog.Dialog;
-import pp.monopoly.client.gui.GameMenu;
-import pp.dialog.DialogManager;
-
-import java.util.prefs.Preferences;
-
-import static pp.monopoly.Resources.lookup;
-import static pp.util.PreferencesUtils.getPreferences;
-
-public class StartMenu extends Dialog {
-    private static final Preferences PREFERENCES = getPreferences(StartMenu.class);
-    private final MonopolyApp app;
-
-    // Buttons for the menu
-    private final Button playButton = new Button(lookup("button.play"));
-    private final Button quitButton = new Button(lookup("menu.quit"));
-    private final Button settingsButton = new Button("Einstellungen", new ElementId("menu-button"));
-
-    /**
-     * Constructs the StartMenu dialog for the Monopoly application.
-     *
-     * @param app the MonopolyApp instance
-     */
-    public StartMenu(MonopolyApp app) {
-        super(app.getDialogManager());
-        this.app = app;
-
-        // Load and display the background image
-        TextureKey backgroundKey = new TextureKey("unibw-bib", false);
-        Texture backgroundTexture = app.getAssetManager().loadTexture(backgroundKey);
-        Material backgroundMaterial = new Material(app.getAssetManager(), "Common/MatDefs/Misc/Unshaded.j3md");
-        backgroundMaterial.setTexture("ColorMap", backgroundTexture);
-
-        // Create a large Quad for the background
-        Quad backgroundQuad = new Quad(16, 9); // Adjust size as necessary to fill the screen
-        Geometry background = new Geometry("Background", backgroundQuad);
-        background.setMaterial(backgroundMaterial);
-        background.setLocalTranslation(new Vector3f(-8, -4.5f, -1)); // Position it behind the UI components
-
-        // Attach the background as the first element
-        app.getGuiNode().attachChild(background);
-
-        // Load and display the Monopoly logo
-        TextureKey monopolyLogoKey = new TextureKey("log-Monopoly", false);
-        Texture monopolyLogoTexture = app.getAssetManager().loadTexture(monopolyLogoKey);
-        Material monopolyLogoMaterial = new Material(app.getAssetManager(), "Common/MatDefs/Misc/Unshaded.j3md");
-        monopolyLogoMaterial.setTexture("ColorMap", monopolyLogoTexture);
-
-        Quad monopolyQuad = new Quad(5, 1.5f); // Adjust dimensions as necessary
-        Geometry monopolyLogo = new Geometry("MonopolyLogo", monopolyQuad);
-        monopolyLogo.setMaterial(monopolyLogoMaterial);
-        monopolyLogo.setLocalTranslation(new Vector3f(0, 5, 0)); // Position Monopoly logo at the top
-
-        Panel monopolyLogoPanel = new Panel();
-        addChild(monopolyLogoPanel);
-
-        // Load and display the university logo
-        TextureKey universityLogoKey = new TextureKey("unibw-logo.png", false);
-        Texture universityLogoTexture = app.getAssetManager().loadTexture(universityLogoKey);
-        Material universityLogoMaterial = new Material(app.getAssetManager(), "Common/MatDefs/Misc/Unshaded.j3md");
-        universityLogoMaterial.setTexture("ColorMap", universityLogoTexture);
-
-        Quad universityQuad = new Quad(4, 1); // Adjust dimensions to fit below Monopoly logo
-        Geometry universityLogo = new Geometry("UniversityLogo", universityQuad);
-        universityLogo.setMaterial(universityLogoMaterial);
-        universityLogo.setLocalTranslation(new Vector3f(0, 3, 0)); // Position below the Monopoly logo
-
-        Panel universityLogoPanel = new Panel();
-        addChild(universityLogoPanel);
-
-
-
-        // Button actions
-        playButton.addClickCommands(source -> startGame());
-        quitButton.addClickCommands(source -> app.closeApp());
-        settingsButton.addClickCommands(source -> openSettings());
-
-        addChild(monopolyLogoPanel);
-        addChild(universityLogoPanel);
-        addChild(playButton);
-        addChild(quitButton);
-        addChild(settingsButton);
-    }
-
-    private void startGame() {
-        System.out.println("Starting game...");
-    }
-
-    private void openSettings() {
-        app.getDialogManager().close(this);
-        app.getDialogManager().open(new GameMenu(app));
-    }
-
-    @Override
-    public void update() {
-    }
-
-    @Override
-    public void escape() {
-        close();
-    }
-}

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

@@ -1,16 +1,10 @@
-////////////////////////////////////////
-// Programming project code
-// UniBw M, 2022, 2023, 2024
-// www.unibw.de/inf2
-// (c) Mark Minas (mark.minas@unibw.de)
-////////////////////////////////////////
-
 package pp.monopoly.client.gui;
 
 import com.jme3.scene.Node;
 import com.jme3.scene.Spatial;
-import pp.monopoly.model.Item;
+
 import pp.monopoly.model.Board;
+import pp.monopoly.model.Item;
 import pp.monopoly.model.Visitor;
 import pp.monopoly.notification.GameEventListener;
 import pp.monopoly.notification.ItemAddedEvent;
@@ -21,30 +15,23 @@ import pp.view.ModelViewSynchronizer;
  * Abstract base class for synchronizing the visual representation of a {@link Board} with its model state.
  * This class handles the addition and removal of items from the map, ensuring that changes in the model
  * are accurately reflected in the view.
- * <p>
- * Subclasses are responsible for providing the specific implementation of how each item in the map
- * is represented visually by implementing the {@link Visitor} interface.
- * </p>
  */
 abstract class BoardSynchronizer extends ModelViewSynchronizer<Item> implements Visitor<Spatial>, GameEventListener {
-    // The map that this synchronizer is responsible for
-    private final Board board;
+    protected final Board board;
 
     /**
      * Constructs a new BoardSynchronizer.
-     * Initializes the synchronizer with the provided map and the root node for attaching view representations.
      *
-     * @param map  the map to be synchronized
-     * @param root the root node to which the view representations of the map items are attached
+     * @param board the game board to synchronize
+     * @param root  the root node to which the view representations of the board items are attached
      */
-    protected BoardSynchronizer(Board map, Node root) {
+    protected BoardSynchronizer(Board board, Node root) {
         super(root);
-        this.board = map;
+        this.board = board;
     }
 
     /**
      * Translates a model item into its corresponding visual representation.
-     * The specific visual representation is determined by the concrete implementation of the {@link Visitor} interface.
      *
      * @param item the item from the model to be translated
      * @return the visual representation of the item as a {@link Spatial}
@@ -55,35 +42,33 @@ abstract class BoardSynchronizer extends ModelViewSynchronizer<Item> implements
     }
 
     /**
-     * Adds the existing items from the map to the view.
-     * This method should be called during initialization to ensure that all current items in the map
-     * are visually represented.
+     * Adds the existing items from the board to the view during initialization.
      */
     protected void addExisting() {
         board.getItems().forEach(this::add);
     }
 
     /**
-     * Handles the event when an item is removed from the map.
-     * Removes the visual representation of the item from the view if it belongs to the synchronized map.
+     * Handles the event when an item is removed from the board.
      *
-     * @param event the event indicating that an item has been removed from the map
+     * @param event the event indicating that an item has been removed from the board
      */
     @Override
     public void receivedEvent(ItemRemovedEvent event) {
-        if (board == event.map())
-            delete(event.item());
+        if (board == event.getBoard()) {
+            delete(event.getItem());
+        }
     }
 
     /**
-     * Handles the event when an item is added to the map.
-     * Adds the visual representation of the new item to the view if it belongs to the synchronized map.
+     * Handles the event when an item is added to the board.
      *
-     * @param event the event indicating that an item has been added to the map
+     * @param event the event indicating that an item has been added to the board
      */
     @Override
     public void receivedEvent(ItemAddedEvent event) {
-        if (board == event.map())
-            add(event.item());
+        if (board == event.getBoard()) {
+            add(event.getItem());
+        }
     }
 }

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

@@ -0,0 +1,60 @@
+package pp.monopoly.client.gui;
+
+import com.jme3.math.FastMath;
+import com.jme3.math.Vector3f;
+import com.jme3.renderer.Camera;
+
+/**
+ * Steuert die Kamerabewegung in der Szene.
+ */
+public class CameraController {
+    private final Camera camera;
+    private final Vector3f center; // Fokuspunkt der Kamera
+    private final float radius;    // Radius der Kreisbewegung
+    private final float height;    // Höhe der Kamera über dem Spielfeld
+    private final float speed;     // Geschwindigkeit der Kamerabewegung
+    private float angle;           // Aktueller Winkel in der Kreisbewegung
+
+    /**
+     * Konstruktor für den CameraController.
+     *
+     * @param camera Die Kamera, die gesteuert werden soll
+     * @param center Der Mittelpunkt der Kreisbewegung (Fokuspunkt)
+     * @param radius Der Radius der Kreisbewegung
+     * @param height Die Höhe der Kamera über dem Fokuspunkt
+     * @param speed  Die Geschwindigkeit der Kamerabewegung
+     */
+    public CameraController(Camera camera, Vector3f center, float radius, float height, float speed) {
+        this.camera = camera;
+        this.center = center;
+        this.radius = radius;
+        this.height = height;
+        this.speed = speed;
+        this.angle = 0; // Starte bei Winkel 0
+    }
+
+    /**
+     * Aktualisiert die Kameraposition und -ausrichtung.
+     *
+     * @param tpf Zeit pro Frame
+     */
+    public void update(float tpf) {
+        camera.lookAt(center, Vector3f.UNIT_Y);
+    }
+
+    public void setPosition(int fieldID) {
+        camera.setLocation(fieldIdToVector(fieldID));
+    }
+
+    public void setPosition(float x, float y) {
+        camera.setLocation(new Vector3f(x,height,y));
+    }
+
+    private Vector3f fieldIdToVector(int fieldID) {
+        if (fieldID <= 10) return new Vector3f(30,height,0);
+        if (fieldID <= 20) return new Vector3f(0, height, 30);
+        if (fieldID <= 30) return new Vector3f(-30, height, 0);
+        if (fieldID <= 40) return new Vector3f(0, height, -30);
+        else throw new IllegalArgumentException();
+    }
+}

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

@@ -5,45 +5,59 @@
 // (c) Mark Minas (mark.minas@unibw.de)
 ////////////////////////////////////////
 
-package pp.monopoly.client;
-
-import com.simsilica.lemur.Container;
-import com.simsilica.lemur.Label;
-import com.simsilica.lemur.TextField;
-import com.simsilica.lemur.component.SpringGridLayout;
-import pp.dialog.Dialog;
-import pp.dialog.DialogBuilder;
-import pp.dialog.SimpleDialog;
+package pp.monopoly.client.gui;
 
 import java.lang.System.Logger;
 import java.lang.System.Logger.Level;
 import java.util.concurrent.ExecutionException;
 import java.util.concurrent.Future;
 
+import com.jme3.material.Material;
+import com.jme3.math.Vector3f;
+import com.jme3.scene.Geometry;
+import com.jme3.scene.shape.Quad;
+import com.jme3.texture.Texture;
+import com.simsilica.lemur.Button;
+import com.simsilica.lemur.Container;
+import com.simsilica.lemur.Label;
+import com.simsilica.lemur.TextField;
+import com.simsilica.lemur.component.SpringGridLayout;
+
 import static pp.monopoly.Resources.lookup;
 
+import com.simsilica.lemur.style.ElementId;
+import pp.monopoly.client.MonopolyApp;
+import pp.monopoly.client.NetworkSupport;
+import pp.monopoly.notification.Sound;
+import pp.monopoly.server.MonopolyServer;
+import pp.dialog.Dialog;
+import pp.dialog.DialogBuilder;
+
 /**
  * Represents a dialog for setting up a network connection in the Battleship game.
  * Allows users to specify the host and port for connecting to a game server.
  */
-class NetworkDialog extends SimpleDialog {
-    private static final Logger LOGGER = System.getLogger(NetworkDialog.class.getName());
+public class CreateGameMenu extends Dialog {
+    private static final Logger LOGGER = System.getLogger(CreateGameMenu.class.getName());
     private static final String LOCALHOST = "localhost"; //NON-NLS
-    private static final String DEFAULT_PORT = "1234"; //NON-NLS
+    private static final String DEFAULT_PORT = "42069"; //NON-NLS
     private final NetworkSupport network;
     private final TextField host = new TextField(LOCALHOST);
     private final TextField port = new TextField(DEFAULT_PORT);
+    private final Button serverButton = new Button("Selber hosten");
+    private final Button cancelButton = new Button("Abbrechen");
+    private final Button joinButton = new Button("Beitreten");
     private String hostname;
     private int portNumber;
     private Future<Object> connectionFuture;
     private Dialog progressDialog;
 
     /**
-     * Constructs a new NetworkDialog.
+     * Constructs a new CreateGameMenu.
      *
      * @param network The NetworkSupport instance to be used for network operations.
      */
-    NetworkDialog(NetworkSupport network) {
+    public CreateGameMenu(NetworkSupport network) {
         super(network.getApp().getDialogManager());
         this.network = network;
         host.setSingleLine(true);
@@ -51,20 +65,51 @@ class NetworkDialog extends SimpleDialog {
         port.setSingleLine(true);
 
         final MonopolyApp app = network.getApp();
+
+                int screenWidth = app.getContext().getSettings().getWidth();
+        int screenHeight = app.getContext().getSettings().getHeight();
+
+        // Set up the background image
+        Texture backgroundImage = app.getAssetManager().loadTexture("Pictures/unibw-Bib2.png");
+        Quad quad = new Quad(screenWidth, screenHeight);
+        Geometry background = new Geometry("Background", quad);
+        Material backgroundMaterial = new Material(app.getAssetManager(), "Common/MatDefs/Misc/Unshaded.j3md");
+        backgroundMaterial.setTexture("ColorMap", backgroundImage);
+        background.setMaterial(backgroundMaterial);
+        background.setLocalTranslation(0, 0, -1); // Ensure it is behind other GUI elements
+        app.getGuiNode().attachChild(background);
+
+        addChild(new Label("Spiel erstellen", new ElementId("header"))); //NON-NLS
         final Container input = new Container(new SpringGridLayout());
         input.addChild(new Label(lookup("host.name") + ":  "));
         input.addChild(host, 1);
         input.addChild(new Label(lookup("port.number") + ":  "));
         input.addChild(port, 1);
+        
+        addChild(input);
+        // "Abbrechen"-Button
+        cancelButton.setPreferredSize(new Vector3f(120, 40, 0));
+        cancelButton.addClickCommands(s -> ifTopDialog(() -> {
+            app.getGameLogic().playSound(Sound.BUTTON);
+            this.close();
+            new StartMenu(network.getApp()).open();
+        }));
+        addChild(cancelButton);
 
-        DialogBuilder.simple(app.getDialogManager())
-                     .setTitle(lookup("server.dialog"))
-                     .setExtension(d -> d.addChild(input))
-                     .setOkButton(lookup("button.connect"), d -> connect())
-                     .setNoButton(lookup("button.cancel"), app::closeApp)
-                     .setOkClose(false)
-                     .setNoClose(false)
-                     .build(this);
+        // "Selber hosten"-Button
+        serverButton.addClickCommands(s -> ifTopDialog( () -> {
+            network.getApp().getGameLogic().playSound(Sound.BUTTON);
+            startServerInThread();
+        }   ));
+        addChild(serverButton);
+
+        // "Beitreten"-Button
+        joinButton.setPreferredSize(new Vector3f(120, 40, 0));
+        joinButton.addClickCommands(s -> ifTopDialog( () -> {
+            app.getGameLogic().playSound(Sound.BUTTON);
+            connect();
+        }));
+        addChild(joinButton);
     }
 
     /**
@@ -109,6 +154,11 @@ class NetworkDialog extends SimpleDialog {
         }
     }
 
+    @Override
+    public void escape() {
+        new SettingsMenu(network.getApp()).open();
+    }
+
     /**
      * This method is called by {@linkplain pp.dialog.DialogManager#update(float)} for periodically
      * updating this dialog. T
@@ -136,7 +186,7 @@ class NetworkDialog extends SimpleDialog {
         connectionFuture = null;
         progressDialog.close();
         this.close();
-        network.getApp().setInfoText(lookup("wait.for.an.opponent"));
+        new LobbyMenu(network.getApp()).open();
     }
 
     /**
@@ -150,4 +200,27 @@ class NetworkDialog extends SimpleDialog {
         network.getApp().errorDialog(lookup("server.connection.failed"));
         network.getApp().setInfoText(e.getLocalizedMessage());
     }
+
+    /**
+     * Starts the server in a separate thread.
+     */
+    private void startServerInThread() {
+        serverButton.setEnabled(false);
+        Thread serverThread = new Thread(() -> {
+            try {
+                MonopolyServer.main(null);
+            } catch (Exception e) {
+                serverButton.setEnabled(true);
+                LOGGER.log(Level.ERROR, "Server could not be started", e);
+                network.getApp().errorDialog("Could not start server: " + e.getMessage());
+            }
+        });
+        serverThread.start();
+        try {
+            Thread.sleep(2000);
+        } catch (InterruptedException e) {
+            e.printStackTrace();
+        }
+        connect();
+    }
 }

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

@@ -0,0 +1,124 @@
+////////////////////////////////////////
+// Programming project code
+// UniBw M, 2022, 2023, 2024
+// www.unibw.de/inf2
+// (c) Mark Minas (mark.minas@unibw.de)
+////////////////////////////////////////
+
+package pp.monopoly.client.gui;
+
+import com.jme3.material.Material;
+import com.jme3.material.RenderState.BlendMode;
+import com.jme3.math.ColorRGBA;
+import com.jme3.renderer.queue.RenderQueue.ShadowMode;
+import com.jme3.scene.Geometry;
+import com.jme3.scene.Node;
+import com.jme3.scene.Spatial;
+import com.jme3.scene.shape.Box;
+
+import pp.monopoly.client.MonopolyApp;
+import pp.monopoly.game.server.PlayerColor;
+import pp.monopoly.model.Board;
+import pp.monopoly.model.Figure;
+import pp.monopoly.model.Rotation;
+import static pp.util.FloatMath.HALF_PI;
+import static pp.util.FloatMath.PI;
+
+/**
+ * The {@code GameBoardSynchronizer} class is responsible for synchronizing the graphical
+ * representation of the ships and shots on the sea map with the underlying data model.
+ * It extends the {@link BoardSynchronizer} to provide specific synchronization
+ * logic for the sea map.
+ */
+class GameBoardSynchronizer extends BoardSynchronizer {
+    private static final String UNSHADED = "Common/MatDefs/Misc/Unshaded.j3md"; //NON-NLS
+    private static final String LIGHTING = "Common/MatDefs/Light/Lighting.j3md";
+    private static final String COLOR = "Color"; //NON-NLS
+    private static final String FIGURE = "figure"; //NON-NLS
+
+    private final MonopolyApp app;
+    private final ParticleEffectFactory particleFactory;
+
+    /**
+     * Constructs a {@code GameBoardSynchronizer} object with the specified application, root node, and ship map.
+     *
+     * @param app  the Battleship application
+     * @param root the root node to which graphical elements will be attached
+     * @param map  the ship map containing the ships and shots
+     */
+    public GameBoardSynchronizer(MonopolyApp app, Node root, Board board) {
+        super(board, root);
+        this.app = app;
+        this.particleFactory = new ParticleEffectFactory(app);
+        addExisting();
+    }
+
+    /**
+     * Visits a {@link Battleship} and creates a graphical representation of it.
+     * The representation is either a 3D model or a simple box depending on the
+     * type of battleship.
+     *
+     * @param ship the battleship to be represented
+     * @return the node containing the graphical representation of the battleship
+     */
+    public Spatial visit(Figure figure) {
+        final Node node = new Node(FIGURE);
+        node.attachChild(createBox(figure));
+        // compute the center of the ship in world coordinates
+        final float x = 1;
+        final float z = 1;
+        node.setLocalTranslation(x, 0f, z);
+        return node;
+    }
+
+    /**
+     * Creates a simple box to represent a battleship that is not of the "King George V" type.
+     *
+     * @param ship the battleship to be represented
+     * @return the geometry representing the battleship as a box
+     */
+    private Spatial createBox(Figure figure) {
+        final Box box = new Box(0.5f * (figure.getMaxY() - figure.getMinY()) + 0.3f,
+                                0.3f,
+                                0.5f * (figure.getMaxX() - figure.getMinX()) + 0.3f);
+        final Geometry geometry = new Geometry(FIGURE, box);
+        geometry.setMaterial(createColoredMaterial(PlayerColor.PINK.getColor()));
+        geometry.setShadowMode(ShadowMode.CastAndReceive);
+
+        return geometry;
+    }
+
+    /**
+     * Creates a new {@link Material} with the specified color.
+     * If the color includes transparency (i.e., alpha value less than 1),
+     * the material's render state is set to use alpha blending, allowing for
+     * semi-transparent rendering.
+     *
+     * @param color the {@link ColorRGBA} to be applied to the material. If the alpha value
+     *              of the color is less than 1, the material will support transparency.
+     * @return a {@link Material} instance configured with the specified color and,
+     * if necessary, alpha blending enabled.
+     */
+    private Material createColoredMaterial(ColorRGBA color) {
+        final Material material = new Material(app.getAssetManager(), UNSHADED);
+        if (color.getAlpha() < 1f)
+            material.getAdditionalRenderState().setBlendMode(BlendMode.Alpha);
+        material.setColor(COLOR, color);
+        return material;
+    }
+
+    /**
+     * Calculates the rotation angle for the specified rotation.
+     *
+     * @param rot the rotation of the battleship
+     * @return the rotation angle in radians
+     */
+    private static float calculateRotationAngle(Rotation rot) {
+        return switch (rot) {
+            case RIGHT -> HALF_PI;
+            case DOWN -> 0f;
+            case LEFT -> -HALF_PI;
+            case UP -> PI;
+        };
+    }
+}

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

@@ -1,50 +0,0 @@
-package pp.monopoly.client.gui;
-
-
-import com.jme3.math.ColorRGBA;
-import com.simsilica.lemur.Button;
-import com.simsilica.lemur.Label;
-import com.simsilica.lemur.style.ElementId;
-import pp.dialog.Dialog;
-import pp.monopoly.client.MonopolyApp;
-
-public class GameMenu extends Dialog {
-    private final MonopolyApp app;
-
-    /**
-     * Constructs the SettingsMenu dialog for the Monopoly application.
-     *
-     * @param app the MonopolyApp instance
-     */
-    public GameMenu(MonopolyApp app) {
-        super(app.getDialogManager());
-        this.app = app;
-
-        // Add a title label for Settings
-        Label settingsTitle = new Label("Einstellungen", new ElementId("settings-title"));
-        settingsTitle.setFontSize(48);  // Set font size for the title
-        settingsTitle.setColor(ColorRGBA.White);
-
-        // Add any settings-related components here, such as volume control, toggles, etc.
-
-        // Add a back button to return to StartMenu
-        Button backButton = new Button("Zurück", new ElementId("menu-button"));
-        backButton.setColor(ColorRGBA.White);
-        backButton.setFontSize(24);
-        backButton.addClickCommands(source -> returnToStartMenu());
-
-        // Add components to this dialog
-        addChild(settingsTitle);
-        addChild(backButton);
-
-        // You can add more settings components here, like checkboxes or sliders.
-    }
-
-    /**
-     * Returns to the StartMenu when the back button is clicked.
-     */
-    private void returnToStartMenu() {
-        app.getDialogManager().close(this); // Close the current settings dialog
-        //TODO return zum Ausgangsmenü
-    }
-}

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

@@ -0,0 +1,373 @@
+package pp.monopoly.client.gui;
+
+import com.jme3.app.Application;
+import com.jme3.app.state.BaseAppState;
+import com.jme3.material.Material;
+import com.jme3.math.ColorRGBA;
+import com.jme3.math.Vector3f;
+import com.jme3.scene.Geometry;
+import com.jme3.scene.shape.Quad;
+import com.jme3.scene.shape.Sphere;
+import com.jme3.texture.Texture;
+import com.simsilica.lemur.Axis;
+import com.simsilica.lemur.Button;
+import com.simsilica.lemur.Container;
+import com.simsilica.lemur.Insets3f;
+import com.simsilica.lemur.Label;
+import com.simsilica.lemur.Selector;
+import com.simsilica.lemur.TextField;
+import com.simsilica.lemur.component.QuadBackgroundComponent;
+import com.simsilica.lemur.component.SpringGridLayout;
+
+import com.simsilica.lemur.core.VersionedList;
+import com.simsilica.lemur.core.VersionedReference;
+import com.simsilica.lemur.style.ElementId;
+
+import pp.dialog.Dialog;
+import pp.monopoly.client.MonopolyApp;
+import pp.monopoly.message.client.PlayerReady;
+import pp.monopoly.notification.Sound;
+
+import java.util.Set;
+
+public class LobbyMenu extends Dialog {
+
+    private final MonopolyApp app;
+    private final Container menuContainer;
+    private Geometry background;
+    private Geometry circle;
+    private Container lowerLeftMenu;
+    private Container lowerRightMenu;
+    private ColorRGBA playerColor= ColorRGBA.Gray;
+
+    private PlayerHandler playerHandler;
+    private TextField startingCapital;
+    private TextField playerInputField;
+    private Selector<String> figureDropdown;
+
+
+    private TextField playerInputField = new TextField("Spieler 1");
+    private TextField startingCapital = new TextField("15000");
+    private String figure;
+
+    public LobbyMenu(MonopolyApp app) {
+        super(app.getDialogManager());
+        this.app = app;
+
+        app.getGuiNode().detachAllChildren(); // Entfernt das CreateGameMenu (inklusive Hintergrund)
+
+        addBackgroundImage();// Hintergrundbild laden und hinzufügen
+
+        QuadBackgroundComponent translucentWhiteBackground =
+                new QuadBackgroundComponent(new ColorRGBA(1.0f, 1.0f, 1.0f, 0.5f));
+
+        menuContainer = new Container(new SpringGridLayout(Axis.Y, Axis.X));
+        menuContainer.setPreferredSize(new Vector3f(1000, 600, 0));
+        menuContainer.setBackground(translucentWhiteBackground);
+
+        // Create a smaller horizontal container for the label, input field, and spacers
+        Container horizontalContainer = menuContainer.addChild(new Container(new SpringGridLayout(Axis.X, Axis.Y)));
+        horizontalContainer.setPreferredSize(new Vector3f(600, 40, 0));
+        horizontalContainer.setBackground(null);
+
+        Label title = horizontalContainer.addChild(new Label("Startkapital:", new ElementId("label-Bold")));
+        title.setFontSize(40);
+
+        // Add a spacer between the title and the input field
+        Label spacerBeforeInput = horizontalContainer.addChild(new Label("")); // Invisible spacer
+        spacerBeforeInput.setPreferredSize(new Vector3f(20, 1, 0)); // Width of the spacer
+
+        // Add an input field (TextField)
+        horizontalContainer.addChild(startingCapital);
+        startingCapital.setPreferredWidth(100); // Set the width of the input field
+        startingCapital.setPreferredSize(new Vector3f(150, 50, 0));
+        startingCapital.setInsets(new Insets3f(5, 10, 5, 10)); // Add padding around the text inside the field
+
+        // Add a spacer after the input field
+        Label spacerAfterInput = horizontalContainer.addChild(new Label("")); // Invisible spacer
+        spacerAfterInput.setPreferredSize(new Vector3f(20, 1, 0)); // Width of the spacer
+
+        menuContainer.setLocalTranslation(
+                (app.getCamera().getWidth() - menuContainer.getPreferredSize().x) / 2,
+                (app.getCamera().getHeight() + menuContainer.getPreferredSize().y) / 2,
+                1
+        );
+        app.getGuiNode().attachChild(menuContainer);
+
+        // Dropdowns and Labels
+        Container dropdownContainer = menuContainer.addChild(new Container(new SpringGridLayout(Axis.X, Axis.Y)));
+        dropdownContainer.setPreferredSize(new Vector3f(800, 200, 0));
+        dropdownContainer.setBackground(null);
+        dropdownContainer.setInsets(new Insets3f(10, 0, 0, 0));
+        // Player Input Field
+        Container playerInputContainer = dropdownContainer.addChild(new Container(new SpringGridLayout(Axis.Y, Axis.X)));
+        playerInputContainer.addChild(new Label("Spieler:"));
+        playerInputContainer.setBackground(null);
+
+
+        playerInputField.setPreferredSize(new Vector3f(100, 20, 0));
+        playerInputField.setInsets(new Insets3f(5, 10, 5, 10));
+        playerInputField.setBackground(new QuadBackgroundComponent(ColorRGBA.Black));
+        playerInputContainer.addChild(playerInputField);
+        // Spacer (Center Circle Area)
+        Label spacer = dropdownContainer.addChild(new Label(""));
+        spacer.setPreferredSize(new Vector3f(200, 200, 0));
+
+        // Figur Dropdown
+        Container figureDropdownContainer = dropdownContainer.addChild(new Container(new SpringGridLayout(Axis.Y, Axis.X)));
+        figureDropdownContainer.setPreferredSize(new Vector3f(150, 80, 0));
+        figureDropdownContainer.addChild(new Label("Figur:"));
+        figureDropdownContainer.setBackground(null);
+
+        VersionedList<String> figures = new VersionedList<>();
+        figures.add("Laptop");
+        figures.add("Flugzeug");
+        figures.add("Jägermeister");
+        figures.add("Katze");
+        figures.add("OOP");
+        figures.add("Handyholster");
+
+        Selector<String> figureDropdown = new Selector<>(figures, "glass");
+        figureDropdown.setBackground(new QuadBackgroundComponent(ColorRGBA.DarkGray));
+        figureDropdown.setPreferredSize(new Vector3f(150, 140, 0));
+        Vector3f dimens = figureDropdownContainer.getPreferredSize();
+        Vector3f dimens2 = figureDropdown.getPopupContainer().getPreferredSize();
+        dimens2.setX( dimens.getX() );
+        figureDropdown.getPopupContainer().setPreferredSize( dimens2 );
+        figureDropdownContainer.addChild(figureDropdown);
+
+        addSelectionActionListener(figureDropdown, this::onDropdownSelectionChanged);
+
+        Container buttonContainer = menuContainer.addChild(new Container(new SpringGridLayout(Axis.X, Axis.Y)));
+        buttonContainer.setPreferredSize(new Vector3f(100, 40, 0));
+        buttonContainer.setInsets(new Insets3f(20, 0, 10, 0)); // Add spacing above the buttons
+        buttonContainer.setBackground(null);
+        // Lower-left container for "Abbrechen" button
+        lowerLeftMenu = new Container();
+        Button cancelButton = new Button("Beenden");
+        cancelButton.setPreferredSize(new Vector3f(200, 60, 0)); // Set size to match the appearance in the image
+        cancelButton.setFontSize(18); // Adjust font size
+        cancelButton.addClickCommands(s -> ifTopDialog(() -> {
+            app.closeApp();
+            app.getGameLogic().playSound(Sound.BUTTON);
+        }));
+        lowerLeftMenu.addChild(cancelButton);
+
+        // Position the container near the bottom-left corner
+        lowerLeftMenu.setLocalTranslation(new Vector3f(120, 170, 3)); // Adjust X and Y to align with the bottom-left corner
+        app.getGuiNode().attachChild(lowerLeftMenu);
+
+        // Lower-right container for "Bereit" button
+        lowerRightMenu = new Container();
+        Button readyButton = new Button("Bereit");
+        readyButton.setPreferredSize(new Vector3f(200, 60, 0)); // Set size to match the appearance in the image
+        readyButton.setFontSize(18); // Adjust font size
+        readyButton.setBackground(new QuadBackgroundComponent(ColorRGBA.Green)); // Add color to match the style
+        readyButton.addClickCommands(s -> ifTopDialog(() -> {
+            toggleReady();
+            app.getGameLogic().playSound(Sound.BUTTON);
+        }));
+        lowerRightMenu.addChild(readyButton);
+        //TODO aktivieren des Spielers in den ready Status und Sprung in den nächsten Menüzustand
+
+        // Position the container near the bottom-right corner
+        lowerRightMenu.setLocalTranslation(new Vector3f(app.getCamera().getWidth() - 320, 170, 3)); // X: 220px from the right, Y: 50px above the bottom
+        app.getGuiNode().attachChild(lowerRightMenu);
+
+        // Add a colored circle between the input field and the dropdown menu
+        circle = createCircle(); // 50 is the diameter, Red is the color
+        circle.setLocalTranslation(new Vector3f(
+                (app.getCamera().getWidth()) / 2, // Center horizontally
+                (app.getCamera().getHeight() / 2) - 90, // Adjust Y position
+                2 // Ensure it's in front of the background but behind the dropdown
+        ));
+        app.getGuiNode().attachChild(circle); // Attach to the GUI node
+
+        // Zentrierung des Containers
+        menuContainer.setLocalTranslation(
+                (app.getCamera().getWidth() - menuContainer.getPreferredSize().x) / 2,
+                (app.getCamera().getHeight() + menuContainer.getPreferredSize().y) / 2,
+                1  // Höhere Z-Ebene für den Vordergrund
+        );
+
+        app.getGuiNode().attachChild(menuContainer);
+    }
+    /**
+     * Apply the starting capital only if the current player is the host.
+     */
+    private void applyStartingCapital(int playerID) {
+            Player currentPlayer = playerHandler.getPlayerById(playerID);
+
+            // Check if the current player is the host
+            if (currentPlayer.equals(playerHandler.getHostPlayer())) {
+                try {
+                    // Parse and validate starting capital
+                    int startBalance = Integer.parseInt(startingCapital.getText().replaceAll("[^\\d]", ""));
+                    if (startBalance < 0) throw new NumberFormatException("Starting capital must be positive.");
+
+                    // Apply the starting balance to all players
+                    playerHandler.setStartBalance(startBalance);
+                    System.out.println("Starting balance set to: " + startBalance);
+                } catch (NumberFormatException e) {
+                    System.err.println("Invalid starting capital: " + e.getMessage());
+                }
+            } else {
+                System.out.println("Only the host can set the starting balance.");
+            }
+    }
+
+    /**
+     * Apply the player name from the input field.
+     */
+    private void applyPlayerName(int playerID) {
+        Player currentPlayer = playerHandler.getPlayerById(playerID);
+
+        String playerName = playerInputField.getText().trim();
+        if (!playerName.isEmpty()) {
+            currentPlayer.setName(playerName);
+            System.out.println("Player name set to: " + playerName);
+        } else {
+            System.err.println("Invalid player name: Name cannot be empty.");
+        }
+    }
+
+    /**
+     * Apply the selected figure to the player.
+     */
+    private void applyFigure(int playerID) {
+        Player currentPlayer = playerHandler.getPlayerById(playerID);
+
+        String selectedFigure = figureDropdown.getSelectedItem();
+        if (selectedFigure != null && !selectedFigure.isEmpty()) {
+            currentPlayer.setFigure(new Figure(0, 0, 0, Rotation.RIGHT, "selectedFigure"));
+            System.out.println("Player figure set to: " + selectedFigure);
+        } else {
+            System.err.println("Invalid figure selection.");
+        }
+    }
+
+    /**
+     * Lädt das Hintergrundbild und fügt es als geometrische Ebene hinzu.
+     */
+    private void addBackgroundImage() {
+        Texture backgroundImage = app.getAssetManager().loadTexture("Pictures/lobby.png");
+        Quad quad = new Quad(app.getCamera().getWidth(), app.getCamera().getHeight());
+        background = new Geometry("Background", quad);
+        Material backgroundMaterial = new Material(app.getAssetManager(), "Common/MatDefs/Misc/Unshaded.j3md");
+        backgroundMaterial.setTexture("ColorMap", backgroundImage);
+        background.setMaterial(backgroundMaterial);
+        background.setLocalTranslation(0, 0, -1); // Hintergrundebene
+
+        app.getGuiNode().attachChild(background);
+    }
+
+    private Geometry createCircle() {
+
+        Sphere sphere = new Sphere(90,90,60.0f);
+        Geometry circleGeometry = new Geometry("Circle", sphere);
+
+        // Create a material with a solid color
+        Material material = new Material(app.getAssetManager(), "Common/MatDefs/Misc/Unshaded.j3md");
+        material.setColor("Color", playerColor); // Set the desired color
+        circleGeometry.setMaterial(material);
+
+        return circleGeometry;
+    }
+    public void setPlayerColor(ColorRGBA newColor) {
+        this.playerColor = newColor;
+        // Update the circle's color
+        if (circle != null) {
+            Material material = new Material(app.getAssetManager(), "Common/MatDefs/Misc/Unshaded.j3md");
+            material.setColor("Color", playerColor);
+            circle.setMaterial(material);
+        }
+    }
+
+    /**
+     * Assigns a color to the player based on their ID.
+     *
+     * @param playerID the player's ID
+     */
+    private void toggleReady() {
+        app.getGameLogic().send(new PlayerReady(true, playerInputField.getText(), figure, Integer.parseInt(startingCapital.getText())));
+    }
+
+    @Override
+    public void escape() {
+        new SettingsMenu(app).open();
+    }
+
+    /**
+     * Adds a custom action listener to the Selector.
+     */
+    private void addSelectionActionListener(Selector<String> selector, SelectionActionListener<String> listener) {
+        VersionedReference<Set<Integer>> selectionRef = selector.getSelectionModel().createReference();
+
+        app.getStateManager().attach(new BaseAppState() {
+            @Override
+            public void update(float tpf) {
+                if (selectionRef.update()) {
+                    String selected = selectionRef.get().toString();
+                    System.out.println(selected);
+                    listener.onSelectionChanged(selected);
+                }
+            }
+
+            @Override
+            protected void initialize(Application app) {
+            }
+
+            @Override
+            protected void cleanup(Application app) {
+            }
+
+            @Override
+            protected void onEnable() {
+
+            }
+
+            @Override
+            protected void onDisable() {
+
+            }
+        });
+    }
+
+    /**
+     * Callback for when the dropdown selection changes.
+     */
+    private void onDropdownSelectionChanged(String selected) {
+        System.out.println("Selected: " + selected);
+        app.getGameLogic().playSound(Sound.BUTTON);
+        switch (selected) {
+            case "[0]":
+                figure = "Laptop";
+                break;
+            case "[1]":
+                figure = "Flugzeug";
+                break;
+            case "[2]":
+                figure = "Jägermeister";
+                break;
+            case "[3]":
+                figure = "Katze";
+                break;
+            case "[4]":
+                figure = "OOP";
+                break;
+            case "[5]":
+                figure = "Handyholster";
+                break;
+            default:
+                break;    
+        }
+    }
+
+    /**
+     * Functional interface for a selection action listener.
+     */
+    @FunctionalInterface
+    private interface SelectionActionListener<T> {
+        void onSelectionChanged(T selection);
+    }
+}

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

@@ -1,191 +0,0 @@
-////////////////////////////////////////
-// Programming project code
-// UniBw M, 2022, 2023, 2024
-// www.unibw.de/inf2
-// (c) Mark Minas (mark.minas@unibw.de)
-////////////////////////////////////////
-
-package pp.monopoly.client.gui;
-
-import com.jme3.material.Material;
-import com.jme3.material.RenderState.BlendMode;
-import com.jme3.math.ColorRGBA;
-import com.jme3.math.Vector2f;
-import com.jme3.math.Vector3f;
-import com.jme3.scene.Geometry;
-import com.jme3.scene.Node;
-import com.jme3.scene.Spatial.CullHint;
-import com.jme3.scene.shape.Quad;
-import pp.monopoly.client.MonopolyApp;
-import pp.monopoly.model.IntPoint;
-import pp.monopoly.model.Board;
-import pp.util.FloatPoint;
-import pp.util.Position;
-
-/**
- * Represents the visual view of a {@link Board}, used to display the map structure such as the player's map, harbor,
- * and opponent's map. This class handles the graphical representation of the map, including background setup, grid lines,
- * and interaction between the model and the view.
- */
-class MapView {
-    private static final float FIELD_SIZE = 40f;
-    private static final float GRID_LINE_WIDTH = 2f;
-    private static final float BACKGROUND_DEPTH = -4f;
-    private static final float GRID_DEPTH = -1f;
-    private static final ColorRGBA BACKGROUND_COLOR = new ColorRGBA(0, 0.05f, 0.05f, 0.5f);
-    private static final ColorRGBA GRID_COLOR = ColorRGBA.Green;
-
-    // Reference to the main application and the ship map being visualized
-    private final MonopolyApp app;
-    private final Node mapNode = new Node("map"); // NON-NLS
-    private final Board map;
-    private final MapViewSynchronizer synchronizer;
-
-    /**
-     * Constructs a new MapView for a given {@link Board} and {@link MonopolyApp}.
-     * Initializes the view by setting up the background and registering a synchronizer to listen to changes in the map.
-     *
-     * @param map the ship map to visualize
-     * @param app the main application instance
-     */
-    MapView(Board map, MonopolyApp app) {
-        this.map = map;
-        this.app = app;
-        this.synchronizer = new MapViewSynchronizer(this);
-        setupBackground();
-        app.getGameLogic().addListener(synchronizer);
-    }
-
-    /**
-     * Unregisters the {@link MapViewSynchronizer} from the listener list of the ClientGameLogic,
-     * stopping the view from receiving updates when the underlying {@link Board} changes.
-     * After calling this method, this MapView instance should no longer be used.
-     */
-    void unregister() {
-        app.getGameLogic().removeListener(synchronizer);
-    }
-
-    /**
-     * Gets the {@link Board} associated with this view.
-     *
-     * @return the ship map
-     */
-    public Board getMap() {
-        return map;
-    }
-
-    /**
-     * Gets the {@link MonopolyApp} instance associated with this view.
-     *
-     * @return the main application instance
-     */
-    public MonopolyApp getApp() {
-        return app;
-    }
-
-    /**
-     * Sets up the background of the map view using a quad geometry.
-     * The background is configured with a semi-transparent color and placed at a specific depth.
-     */
-    private void setupBackground() {
-        final Material mat = new Material(app.getAssetManager(), "Common/MatDefs/Misc/Unshaded.j3md"); // NON-NLS
-        mat.setColor("Color", BACKGROUND_COLOR); // NON-NLS
-        mat.getAdditionalRenderState().setBlendMode(BlendMode.Alpha);
-        final Position corner = modelToView(map.getWidth(), map.getHeight());
-        final Geometry background = new Geometry("MapBackground", new Quad(corner.getX(), corner.getY()));
-        background.setMaterial(mat);
-        background.setLocalTranslation(0f, 0f, BACKGROUND_DEPTH);
-        background.setCullHint(CullHint.Never);
-        mapNode.attachChild(background);
-    }
-
-    /**
-     * Adds grid lines to the map view to visually separate the fields within the map.
-     * The grid lines are drawn based on the dimensions of the ship map.
-     */
-    public void addGrid() {
-        for (int x = 0; x <= map.getWidth(); x++) {
-            final Position f = modelToView(x, 0);
-            final Position t = modelToView(x, map.getHeight());
-            mapNode.attachChild(gridLine(f, t));
-        }
-        for (int y = 0; y <= map.getHeight(); y++) {
-            final Position f = modelToView(0, y);
-            final Position t = modelToView(map.getWidth(), y);
-            mapNode.attachChild(gridLine(f, t));
-        }
-    }
-
-    /**
-     * Gets the root node containing all visual elements in this map view.
-     *
-     * @return the root node for the map view
-     */
-    public Node getNode() {
-        return mapNode;
-    }
-
-    /**
-     * Gets the total width of the map in view coordinates.
-     *
-     * @return the width of the map in view coordinates
-     */
-    public float getWidth() {
-        return FIELD_SIZE * map.getWidth();
-    }
-
-    /**
-     * Gets the total height of the map in view coordinates.
-     *
-     * @return the height of the map in view coordinates
-     */
-    public float getHeight() {
-        return FIELD_SIZE * map.getHeight();
-    }
-
-    /**
-     * Converts coordinates from view coordinates to model coordinates.
-     *
-     * @param x the x-coordinate in view space
-     * @param y the y-coordinate in view space
-     * @return the corresponding model coordinates as an {@link IntPoint}
-     */
-    public IntPoint viewToModel(float x, float y) {
-        return new IntPoint((int) Math.floor(x / FIELD_SIZE), (int) Math.floor(y / FIELD_SIZE));
-    }
-
-    /**
-     * Converts coordinates from model coordinates to view coordinates.
-     *
-     * @param x the x-coordinate in model space
-     * @param y the y-coordinate in model space
-     * @return the corresponding view coordinates as a {@link Position}
-     */
-    public Position modelToView(float x, float y) {
-        return new FloatPoint(x * FIELD_SIZE, y * FIELD_SIZE);
-    }
-
-    /**
-     * Converts the mouse position to model coordinates.
-     * This method takes into account the map's transformation in the 3D scene.
-     *
-     * @param pos the 2D vector representing the mouse position in the view
-     * @return the corresponding model coordinates as an {@link IntPoint}
-     */
-    public IntPoint mouseToModel(Vector2f pos) {
-        final Vector3f world = new Vector3f(pos.getX(), pos.getY(), 0f);
-        final Vector3f view = mapNode.getWorldTransform().transformInverseVector(world, null);
-        return viewToModel(view.getX(), view.getY());
-    }
-
-    /**
-     * Creates a visual representation of a grid line between two positions.
-     *
-     * @param p1 the start position of the grid line
-     * @param p2 the end position of the grid line
-     * @return a {@link Geometry} representing the grid line
-     */
-    private Geometry gridLine(Position p1, Position p2) {
-        return app.getDraw().makeFatLine(p1, p2, GRID_DEPTH, GRID_COLOR, GRID_LINE_WIDTH);
-    }
-}

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

@@ -1,63 +0,0 @@
-////////////////////////////////////////
-// Programming project code
-// UniBw M, 2022, 2023, 2024
-// www.unibw.de/inf2
-// (c) Mark Minas (mark.minas@unibw.de)
-////////////////////////////////////////
-
-package pp.monopoly.client.gui;
-
-import com.jme3.math.ColorRGBA;
-import com.jme3.scene.Geometry;
-import com.jme3.scene.Node;
-import com.jme3.scene.Spatial;
-import pp.util.Position;
-
-/**
- * Synchronizes the visual representation of the ship map with the game model.
- * It handles the rendering of ships and shots on the map view, updating the view
- * whenever changes occur in the model.
- */
-class MapViewSynchronizer extends BoardSynchronizer {
-    // Constants for rendering properties
-    private static final float SHIP_LINE_WIDTH = 6f;
-    private static final float SHOT_DEPTH = -2f;
-    private static final float SHIP_DEPTH = 0f;
-    private static final float INDENT = 4f;
-
-    // Colors used for different visual elements
-    private static final ColorRGBA HIT_COLOR = ColorRGBA.Red;
-    private static final ColorRGBA MISS_COLOR = ColorRGBA.Blue;
-    private static final ColorRGBA SHIP_BORDER_COLOR = ColorRGBA.White;
-    private static final ColorRGBA PREVIEW_COLOR = ColorRGBA.Gray;
-    private static final ColorRGBA ERROR_COLOR = ColorRGBA.Red;
-
-    // The MapView associated with this synchronizer
-    private final MapView view;
-
-    /**
-     * Constructs a new MapViewSynchronizer for the given MapView.
-     * Initializes the synchronizer and adds existing elements from the model to the view.
-     *
-     * @param view the MapView to synchronize with the game model
-     */
-    public MapViewSynchronizer(MapView view) {
-        super(view.getMap(), view.getNode());
-        this.view = view;
-        addExisting();
-    }
-
-    /**
-     * Creates a line geometry representing part of the ship's border.
-     *
-     * @param x1    the starting x-coordinate of the line
-     * @param y1    the starting y-coordinate of the line
-     * @param x2    the ending x-coordinate of the line
-     * @param y2    the ending y-coordinate of the line
-     * @param color the color of the line
-     * @return a Geometry representing the line
-     */
-    private Geometry shipLine(float x1, float y1, float x2, float y2, ColorRGBA color) {
-        return view.getApp().getDraw().makeFatLine(x1, y1, x2, y2, SHIP_DEPTH, color, SHIP_LINE_WIDTH);
-    }
-}

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

@@ -0,0 +1,22 @@
+package pp.monopoly.client.gui;
+
+import com.jme3.effect.ParticleMesh.Type;
+
+import pp.monopoly.client.MonopolyApp;
+
+/**
+ * Factory class responsible for creating particle effects used in the game.
+ * This centralizes the creation of various types of particle emitters.
+ */
+public class ParticleEffectFactory {
+    private static final int COUNT_FACTOR = 1;
+    private static final float COUNT_FACTOR_F = 1f;
+    private static final boolean POINT_SPRITE = true;
+    private static final Type EMITTER_TYPE = POINT_SPRITE ? Type.Point : Type.Triangle;
+    
+    private final MonopolyApp app;
+
+    ParticleEffectFactory(MonopolyApp app) {
+        this.app = app;
+    }
+}

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

@@ -0,0 +1,92 @@
+////////////////////////////////////////
+// Programming project code
+// UniBw M, 2022, 2023, 2024
+// www.unibw.de/inf2
+// (c) Mark Minas (mark.minas@unibw.de)
+////////////////////////////////////////
+
+package pp.monopoly.client.gui;
+
+import java.util.prefs.Preferences;
+
+import com.simsilica.lemur.Button;
+import com.simsilica.lemur.Checkbox;
+import com.simsilica.lemur.Label;
+import com.simsilica.lemur.style.ElementId;
+
+import static pp.monopoly.Resources.lookup;
+import pp.monopoly.client.GameMusic;
+import pp.monopoly.client.GameSound;
+import pp.monopoly.client.MonopolyApp;
+import pp.dialog.Dialog;
+import pp.dialog.StateCheckboxModel;
+import pp.monopoly.notification.Sound;
+
+import static pp.util.PreferencesUtils.getPreferences;
+
+/**
+ * The Menu class represents the main menu in the Battleship game application.
+ * It extends the Dialog class and provides functionalities for loading, saving,
+ * returning to the game, and quitting the application.
+ */
+public class SettingsMenu extends Dialog {
+    private static final Preferences PREFERENCES = getPreferences(SettingsMenu.class);
+    private static final String LAST_PATH = "last.file.path";
+    private final MonopolyApp app;
+    private final VolumeSlider musicSlider;
+    private final SoundSlider soundSlider;
+
+    /**
+     * Constructs the Menu dialog for the Battleship application.
+     *
+     * @param app the MonopolyApp instance
+     */
+    public SettingsMenu(MonopolyApp app) {
+        super(app.getDialogManager());
+        this.app = app;
+        musicSlider = new VolumeSlider(app.getStateManager().getState(GameMusic.class));
+        soundSlider = new SoundSlider(app.getStateManager().getState(GameSound.class));
+        addChild(new Label("Einstellungen", new ElementId("settings-title"))); //NON-NLS
+        addChild(new Label("Sound Effekte", new ElementId("label"))); //NON-NLS
+
+        addChild(soundSlider);
+
+        addChild(new Checkbox("Soundeffekte an / aus", new StateCheckboxModel(app, GameSound.class)));
+        
+        addChild(new Label("Hintergrund Musik", new ElementId("label"))); //NON-NLS
+        addChild(new Checkbox("Musik an / aus", new StateCheckboxModel(app, GameMusic.class)));
+        
+        addChild(musicSlider);
+
+        addChild(new Button("Zurück zum Spiel", new ElementId("button"))).addClickCommands(s -> ifTopDialog(() -> {
+            this.close();  // Close the StartMenu dialog
+            app.getGameLogic().playSound(Sound.BUTTON);
+        }));
+        addChild(new Button("Beenden", new ElementId("button"))).addClickCommands(s -> ifTopDialog(() -> {
+            app.getGameLogic().playSound(Sound.BUTTON);
+            app.closeApp();
+        }));
+        update();
+    }
+
+    /**
+     * Updates the state of the load and save buttons based on the game logic.
+     */
+    @Override
+    public void update() {
+    }
+
+    @Override
+    public void update(float delta) {
+        musicSlider.update();
+        soundSlider.update();
+    }
+
+    /**
+     * As an escape action, this method closes the menu if it is the top dialog.
+     */
+    @Override
+    public void escape() {
+        close();
+    }
+}

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

@@ -0,0 +1,31 @@
+package pp.monopoly.client.gui;
+
+import com.simsilica.lemur.Slider;
+import pp.monopoly.client.GameSound;
+
+public class SoundSlider extends Slider {
+
+    private final pp.monopoly.client.GameSound sound;
+    private double vol;
+
+    /**
+     * Constructs the Volume Slider for the Menu dialog
+     * @param sound the Effects sound instance
+     */
+    public SoundSlider(GameSound sound) {
+        super();
+        this.sound = sound;
+        vol = GameSound.volumeInPreferences();
+        getModel().setPercent(vol);
+    }
+
+    /**
+     * when triggered it updates the volume to the value set with the slider
+     */
+    public void update() {
+        if (vol != getModel().getPercent()) {
+            vol = getModel().getPercent();
+            sound.setVolume( (float) vol);
+        }
+    }
+}

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

@@ -0,0 +1,126 @@
+package pp.monopoly.client.gui;
+
+import com.jme3.material.Material;
+import com.jme3.math.Vector3f;
+import com.jme3.scene.Geometry;
+import com.jme3.scene.shape.Quad;
+import com.jme3.texture.Texture;
+import com.simsilica.lemur.Axis;
+import com.simsilica.lemur.Button;
+import com.simsilica.lemur.Container;
+import com.simsilica.lemur.HAlignment;
+import com.simsilica.lemur.component.QuadBackgroundComponent;
+import com.simsilica.lemur.component.SpringGridLayout;
+
+import pp.dialog.Dialog;
+import pp.monopoly.client.MonopolyApp;
+import pp.monopoly.notification.Sound;
+
+/**
+ * Constructs the startup menu dialog for the Monopoly application.
+import pp.monopoly.client.gui.GameMenu;
+ */
+public class StartMenu extends Dialog {
+    private final MonopolyApp app;
+
+    /**
+     * Constructs the Startup Menu dialog for the Monopoly application.
+     *
+     * @param app the MonopolyApp instance
+     */
+    public StartMenu(MonopolyApp app) {
+        super(app.getDialogManager());
+        this.app = app;
+        
+        int screenWidth = app.getContext().getSettings().getWidth();
+        int screenHeight = app.getContext().getSettings().getHeight();
+
+        // Set up the background image
+        Texture backgroundImage = app.getAssetManager().loadTexture("Pictures/unibw-Bib2.png");
+        Quad quad = new Quad(screenWidth, screenHeight);
+        Geometry background = new Geometry("Background", quad);
+        Material backgroundMaterial = new Material(app.getAssetManager(), "Common/MatDefs/Misc/Unshaded.j3md");
+        backgroundMaterial.setTexture("ColorMap", backgroundImage);
+        background.setMaterial(backgroundMaterial);
+        background.setLocalTranslation(0, 0, -1); // Ensure it is behind other GUI elements
+        app.getGuiNode().attachChild(background);
+
+        // Center container for title and play button
+        Container centerMenu = new Container(new SpringGridLayout(Axis.Y, Axis.X));
+
+        Button startButton = new Button("Spielen");
+        startButton.setPreferredSize(new Vector3f(190, 60, 0)); // Increase button size (width, height)
+        startButton.setFontSize(40); // Set the font size for the button text
+        startButton.setTextHAlignment(HAlignment.Center); // Center the text horizontally
+
+        startButton.addClickCommands(s -> ifTopDialog(() -> {
+            this.close();  // Close the StartMenu dialog
+            app.connect(); // Perform the connection logic
+            app.getGameLogic().playSound(Sound.BUTTON);
+        }));
+        centerMenu.addChild(startButton);
+
+        // Position the center container in the middle of the screen
+        centerMenu.setLocalTranslation(new Vector3f(screenWidth / 2f - centerMenu.getPreferredSize().x / 2f,
+                                                    screenHeight / 2f - 280 + centerMenu.getPreferredSize().y / 2f,
+                                                    0));
+        app.getGuiNode().attachChild(centerMenu);
+
+        // Load the Monopoly logo as a texture
+        Texture logoTexture = app.getAssetManager().loadTexture("Pictures/logo-monopoly.png");
+
+        // Create a container for the logo
+        Container logoContainer = new Container();
+        QuadBackgroundComponent logoBackground = new QuadBackgroundComponent(logoTexture);
+        logoContainer.setBackground(logoBackground);
+
+        // Set the size of the container to fit the logo
+        float logoWidth = 512;  // Adjust these values based on the logo dimensions
+        float logoHeight = 128; // Adjust these values based on the logo dimensions
+        logoContainer.setPreferredSize(new Vector3f(logoWidth, logoHeight, 0));
+
+        // Position the container at the center of the screen
+        logoContainer.setLocalTranslation(new Vector3f(
+                screenWidth / 2f - logoWidth / 2f,
+                screenHeight / 2f + 200, // Adjust this value for vertical position
+                0
+        ));
+
+        // Attach the container to the GUI node
+        app.getGuiNode().attachChild(logoContainer);
+
+        // Load the Unibw logo as a texture
+        Texture unibwTexture = app.getAssetManager().loadTexture("Pictures/logo-unibw.png");
+
+        // Create a container for the Unibw logo
+        Container unibwContainer = new Container();
+        QuadBackgroundComponent unibwBackground = new QuadBackgroundComponent(unibwTexture);
+        unibwContainer.setBackground(unibwBackground);
+
+        // Set the size of the container to fit the Unibw logo
+        float unibwWidth = 512;  // Adjust these values based on the logo dimensions
+        float unibwHeight = 128; // Adjust these values based on the logo dimensions
+        unibwContainer.setPreferredSize(new Vector3f(unibwWidth, unibwHeight, 0));
+
+        // Position the container slightly below the Monopoly logo
+        unibwContainer.setLocalTranslation(new Vector3f(
+                screenWidth / 2f - unibwWidth / 2f,
+                screenHeight / 2f + 100, // Adjust this value for vertical position
+                0
+        ));
+
+        // Attach the container to the GUI node
+        app.getGuiNode().attachChild(unibwContainer);
+    }
+
+    @Override
+    public void escape() {
+        new SettingsMenu(app).open();
+    }
+
+    @Override
+    public void close() {
+        app.getGuiNode().detachAllChildren();
+        super.close();
+    }
+}

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

@@ -0,0 +1,114 @@
+package pp.monopoly.client.gui;
+
+import java.util.concurrent.Executors;
+import java.util.concurrent.ScheduledExecutorService;
+import java.util.concurrent.TimeUnit;
+
+import com.jme3.material.Material;
+import com.jme3.math.ColorRGBA;
+import com.jme3.math.Vector3f;
+import com.jme3.scene.Geometry;
+import com.jme3.scene.shape.Box;
+import com.jme3.texture.Texture;
+
+import pp.monopoly.client.MonopolyApp;
+
+/**
+ * TestWorld zeigt eine einfache Szene mit einem texturierten Quadrat.
+ * Die Kamera wird durch den CameraController gesteuert.
+ */
+public class TestWorld {
+
+    private final MonopolyApp app;
+    private CameraController cameraController; // Steuert die Kamera
+    private Geometry cube; // Spielfigur
+
+    /**
+     * Konstruktor für TestWorld.
+     *
+     * @param app Die Hauptanwendung (MonopolyApp)
+     */
+    public TestWorld(MonopolyApp app) {
+        this.app = app;
+    }
+
+    /**
+     * Initialisiert die Szene und startet die Kamerabewegung.
+     */
+    public void initializeScene() {
+        app.getGuiNode().detachAllChildren(); // Entferne GUI
+        app.getRootNode().detachAllChildren(); // Entferne andere Szenenobjekte
+
+        setSkyColor(); // Setze den Himmel auf hellblau
+        createBoard(); // Erstelle das Spielfeld
+        createCube();  // Füge den Würfel hinzu
+
+        // Erstelle den CameraController
+        cameraController = new CameraController(
+                app.getCamera(),           // Die Kamera der App
+                Vector3f.ZERO,            // Fokus auf die Mitte des Spielfelds
+                4,                        // Radius des Kreises
+                15,                        // Höhe der Kamera
+                0                     // Geschwindigkeit der Bewegung
+        );
+
+        // Füge die Toolbar hinzu
+        new Toolbar(app, cube);
+        
+        cameraController.setPosition(0);
+    }
+
+
+    /**
+     * Aktualisiert die Kameraposition.
+     *
+     * @param tpf Zeit pro Frame
+     */
+    public void update(float tpf) {
+        if (cameraController != null) {
+            cameraController.update(tpf);
+        }
+    }
+
+    /**
+     * Setzt die Hintergrundfarbe der Szene auf hellblau.
+     */
+    private void setSkyColor() {
+        app.getViewPort().setBackgroundColor(new ColorRGBA(0.5f, 0.7f, 1.0f, 1.0f)); // Hellblauer Himmel
+    }
+
+    /**
+     * Erstelle das Spielfeld.
+     */
+    private void createBoard() {
+        // Erstelle ein Quadrat
+        Box box = new Box(10, 0.1f, 10);  // Dünnes Quadrat für die Textur
+        Geometry geom = new Geometry("Board", box);
+
+        // Setze das Material mit Textur
+        Material mat = new Material(app.getAssetManager(), "Common/MatDefs/Misc/Unshaded.j3md");
+        Texture texture = app.getAssetManager().loadTexture("Pictures/board2.png");
+        mat.setTexture("ColorMap", texture);
+        geom.setMaterial(mat);
+
+        app.getRootNode().attachChild(geom);
+    }
+
+    /**
+     * Erstellt den Würfel (Spielfigur) in der Szene.
+     */
+    private void createCube() {
+        Box box = new Box(0.05f, 0.05f, 0.05f); // Kleinere Größe für Spielfigur
+        cube = new Geometry("Cube", box);
+
+        // Setze das Material für den Würfel
+        Material mat = new Material(app.getAssetManager(), "Common/MatDefs/Misc/Unshaded.j3md");
+        mat.setColor("Color", ColorRGBA.Blue); // Blau gefärbter Würfel
+        cube.setMaterial(mat);
+
+        // Setze den Startpunkt des Würfels
+        cube.setLocalTranslation(0.8999999f, 0.1f, -0.9f);
+
+        app.getRootNode().attachChild(cube);
+    }
+}

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

@@ -0,0 +1,250 @@
+
+package pp.monopoly.client.gui;
+
+import java.util.Random;
+
+import com.jme3.font.BitmapText;
+import com.jme3.math.ColorRGBA;
+import com.jme3.math.Vector3f;
+import com.jme3.scene.Geometry;
+import com.simsilica.lemur.*;
+import com.simsilica.lemur.component.QuadBackgroundComponent;
+import com.simsilica.lemur.component.SpringGridLayout;
+
+import com.simsilica.lemur.style.ElementId;
+import pp.dialog.Dialog;
+import pp.monopoly.client.MonopolyApp;
+import pp.monopoly.notification.Sound;
+
+/**
+ * Toolbar Klasse, die am unteren Rand der Szene angezeigt wird.
+ * Die Buttons bewegen den Würfel auf dem Spielfeld.
+ */
+public class Toolbar extends Dialog {
+
+    private final MonopolyApp app;
+    private final Container toolbarContainer;
+    private final Geometry cube; // Referenz auf den Würfel
+    private final BitmapText positionText; // Anzeige für die aktuelle Position
+    private final float boardLimit = 0.95f; // Grenzen des Bretts
+    private final float stepSize = 0.18f; // Schrittgröße pro Bewegung
+    private int currentPosition = 0; // Aktuelle Position auf dem Spielfeld
+    private final int positionsPerSide = 10; // Anzahl der Positionen pro Seite
+    private final Random random = new Random(); // Zufallsgenerator für den Würfelwurf
+
+    /**
+     * Konstruktor für die Toolbar.
+     *
+     * @param app  Die Hauptanwendung (MonopolyApp)
+     * @param cube Der Würfel, der bewegt werden soll
+     */
+    public Toolbar(MonopolyApp app, Geometry cube) {
+        super(app.getDialogManager());
+        this.app = app;
+        this.cube = cube;
+
+        // Erstelle die Toolbar
+        toolbarContainer = new Container(new SpringGridLayout(Axis.X, Axis.Y), "toolbar");
+
+        // Setze die Position am unteren Rand und die Breite
+        toolbarContainer.setLocalTranslation(
+                0,                                 // Links bündig
+                200,                               // Höhe über dem unteren Rand
+                0                                  // Z-Ebene
+        );
+        toolbarContainer.setPreferredSize(new Vector3f(app.getCamera().getWidth(), 200, 0)); // Volle Breite
+
+
+        // Füge Buttons zur Toolbar hinzu
+        //initializeButtons();
+
+
+        // Menü-Container: Ein Nested-Container für Kontostand und "Meine Gulag Frei Karten"
+        Container accountContainer = toolbarContainer.addChild(new Container());
+        accountContainer.addChild(new Label("Kontostand", new ElementId("label-Bold")));
+        accountContainer.addChild(new Label("6666€", new ElementId("label-Text"))); //TODO Variable hier einsetzen
+        accountContainer.addChild(new Label("Gulag Frei Karten", new ElementId("label-Bold")));
+        accountContainer.setBackground(new QuadBackgroundComponent(new ColorRGBA(0.4657f, 0.4735f, 0.4892f, 1.0f)));
+
+        // Add a spacer between accountContainer and overviewContainer
+        Panel spacer = new Panel(); // Create an empty panel as a spacer
+        spacer.setPreferredSize(new Vector3f(5, 0, 0)); // Adjust the width as needed
+        spacer.setBackground(null);
+        toolbarContainer.addChild(spacer);
+
+        // Menü-Container: Ein Container für Übersicht
+        Container overviewContainer = toolbarContainer.addChild(new Container());
+        overviewContainer.addChild(new Label("Übersicht", new ElementId("label-Bold")));
+        overviewContainer.addChild(new Label("„Spieler 1“: 1244€", new ElementId("label-Text")));//TODO Variable hier einsetzen
+        overviewContainer.addChild(new Label("„Spieler 2“: 1244€", new ElementId("label-Text")));//TODO Variable hier einsetzen
+        overviewContainer.addChild(new Label("„Spieler 3“: 1244€", new ElementId("label-Text")));//TODO Variable hier einsetzen
+        overviewContainer.addChild(new Label("„Spieler 4“: 1244€", new ElementId("label-Text")));//TODO Variable hier einsetzen
+        overviewContainer.addChild(new Label("„Spieler 5“: 1244€", new ElementId("label-Text")));//TODO Variable hier einsetzen
+        overviewContainer.setBackground(new QuadBackgroundComponent(new ColorRGBA(0.4657f, 0.4735f, 0.4892f, 1.0f)));
+
+        // Menü-Container: Ein Container für Würfel
+        Container diceContainer = toolbarContainer.addChild(new Container());
+
+        diceContainer.setPreferredSize(new Vector3f(400, 150, 0));
+        diceContainer.addChild(new Label("Wo Würfel?", new ElementId("label")));
+        diceContainer.addChild(addDiceRollButton());
+        diceContainer.setBackground(null);
+
+
+        // Menü-Container: Ein Nested-Container für Handeln, Grundstücke und Zug beenden
+        Container menuContainer = toolbarContainer.addChild(new Container());
+        menuContainer.addChild(new Button("Handeln"));
+        menuContainer.addChild(new Button("Grundstücke"));
+        menuContainer.addChild(new Button("Zug beenden"));
+        menuContainer.setBackground(new QuadBackgroundComponent(new ColorRGBA(0.4657f, 0.4735f, 0.4892f, 1.0f)));
+
+        // Füge die Toolbar zur GUI hinzu
+        app.getGuiNode().attachChild(toolbarContainer);
+
+        // Erstelle die Position-Anzeige
+        positionText = createPositionDisplay();
+        updatePositionDisplay(); // Initialisiere die Anzeige mit der Startposition
+    }
+
+    /**
+     * Initialisiert die Buttons in der Toolbar.
+     */
+    private void initializeButtons() {
+        addTradeMenuButton();  // Bewegung nach vorne
+        addEndTurnButton(); // Bewegung nach hinten
+        addDiceRollButton();       // Würfel-Button
+
+    }
+
+    /**
+     * Fügt einen Button mit einer Bewegung hinzu.
+     *
+     * @param label   Der Text des Buttons
+     * @param step    Schrittweite (+1 für vorwärts, -1 für rückwärts)
+     */
+
+    /*private void addButton(String label, int step) {
+        Button button = new Button(label);
+        button.setPreferredSize(new Vector3f(150, 50, 0)); // Größe der Buttons
+        button.addClickCommands(source -> moveCube(step));
+        toolbarContainer.addChild(button);
+    }*/
+
+    /**
+     * Fügt den Würfel-Button hinzu, der die Figur entsprechend der gewürfelten Zahl bewegt.
+     */
+    private Button addDiceRollButton() {
+        Button diceButton = new Button("Würfeln");
+        diceButton.setPreferredSize(new Vector3f(50, 20, 0));
+        diceButton.addClickCommands(s -> ifTopDialog(() -> {
+            rollDice();
+            app.getGameLogic().playSound(Sound.BUTTON);
+        }));
+        toolbarContainer.addChild(diceButton);
+        return diceButton;
+    }
+
+    private void addTradeMenuButton() {
+        Button diceButton = new Button("Handeln");
+        diceButton.setPreferredSize(new Vector3f(150, 50, 0)); // Größe des Buttons
+        diceButton.addClickCommands(s -> ifTopDialog(() -> {
+            rollDice();
+            app.getGameLogic().playSound(Sound.BUTTON);
+        }));
+        toolbarContainer.addChild(diceButton);
+    }
+
+    private void addEndTurnButton() {
+        Button diceButton = new Button("Grundstücke");
+        diceButton.setPreferredSize(new Vector3f(150, 50, 0)); // Größe des Buttons
+        diceButton.addClickCommands(s -> ifTopDialog(() -> {
+            rollDice();
+            app.getGameLogic().playSound(Sound.BUTTON);
+        }));
+        toolbarContainer.addChild(diceButton);
+    }
+
+    private void addPropertyMenuButton() {
+        Button diceButton = new Button("Zug beenden");
+        diceButton.setPreferredSize(new Vector3f(150, 50, 0)); // Größe des Buttons
+        diceButton.addClickCommands(s -> ifTopDialog(() -> {
+            rollDice();
+            app.getGameLogic().playSound(Sound.BUTTON);
+        }));
+        toolbarContainer.addChild(diceButton);
+    }
+
+    /**
+     * Simuliert einen Würfelwurf und bewegt die Figur entsprechend.
+     */
+    private void rollDice() {
+        int diceRoll = random.nextInt(6) + 1; // Zahl zwischen 1 und 6
+        System.out.println("Gewürfelt: " + diceRoll);
+        moveCube(diceRoll); // Bewege die Figur um die gewürfelte Zahl
+    }
+
+    /**
+     * Bewegt den Würfel basierend auf der aktuellen Position auf dem Brett.
+     *
+     * @param step Schrittweite (+1 für vorwärts, -1 für rückwärts oder andere Werte)
+     */
+    private void moveCube(int step) {
+        currentPosition = (currentPosition + step + 4 * positionsPerSide) % (4 * positionsPerSide);
+        Vector3f newPosition = calculatePosition(currentPosition);
+        cube.setLocalTranslation(newPosition);
+        updatePositionDisplay(); // Aktualisiere die Positionsanzeige
+        System.out.println("Würfelposition: " + newPosition + " (Feld-ID: " + currentPosition + ")");
+    }
+
+    /**
+     * Berechnet die neue Position des Würfels basierend auf der aktuellen Brettseite und Position.
+     *
+     * @param position Aktuelle Position auf dem Spielfeld
+     * @return Die berechnete Position als Vector3f
+     */
+    private Vector3f calculatePosition(int position) {
+        int side = position / positionsPerSide; // Seite des Bretts (0 = unten, 1 = rechts, 2 = oben, 3 = links)
+        int offset = position % positionsPerSide; // Position auf der aktuellen Seite
+
+        switch (side) {
+            case 0: // Unten (positive x-Achse)
+                return new Vector3f(-boardLimit + offset * stepSize, 0.1f, -boardLimit + 0.05f);
+            case 1: // Rechts (positive z-Achse)
+                return new Vector3f(boardLimit - 0.05f, 0.1f, -boardLimit + offset * stepSize);
+            case 2: // Oben (negative x-Achse)
+                return new Vector3f(boardLimit - offset * stepSize, 0.1f, boardLimit - 0.05f);
+            case 3: // Links (negative z-Achse)
+                return new Vector3f(-boardLimit + 0.05f, 0.1f, boardLimit - offset * stepSize);
+            default:
+                throw new IllegalArgumentException("Ungültige Position: " + position);
+        }
+    }
+
+    /**
+     * Erstellt die Anzeige für die aktuelle Position.
+     *
+     * @return Das BitmapText-Objekt für die Anzeige
+     */
+    private BitmapText createPositionDisplay() {
+        BitmapText text = new BitmapText(app.getAssetManager().loadFont("Interface/Fonts/Default.fnt"), false);
+        text.setSize(20); // Schriftgröße
+        text.setLocalTranslation(10, app.getCamera().getHeight() - 10, 0); // Oben links
+        app.getGuiNode().attachChild(text);
+        return text;
+    }
+
+    /**
+     * Aktualisiert die Anzeige für die aktuelle Position.
+     */
+    private void updatePositionDisplay() {
+        positionText.setText("Feld-ID: " + currentPosition);
+    }
+
+    /**
+     * Entfernt die Toolbar.
+     */
+    public void remove() {
+        app.getGuiNode().detachChild(toolbarContainer);
+        app.getGuiNode().detachChild(positionText);
+    }
+}

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

@@ -0,0 +1,168 @@
+package pp.monopoly.client.gui;
+
+import java.util.Random;
+
+import com.jme3.font.BitmapText;
+import com.jme3.math.Vector3f;
+import com.jme3.scene.Geometry;
+import com.simsilica.lemur.Axis;
+import com.simsilica.lemur.Button;
+import com.simsilica.lemur.Container;
+import com.simsilica.lemur.component.SpringGridLayout;
+
+import pp.monopoly.client.MonopolyApp;
+
+/**
+ * Toolbar Klasse, die am unteren Rand der Szene angezeigt wird.
+ * Die Buttons bewegen den Würfel auf dem Spielfeld.
+ */
+public class Toolbar2 {
+
+    private final MonopolyApp app;
+    private final Container toolbarContainer;
+    private final Geometry cube; // Referenz auf den Würfel
+    private final BitmapText positionText; // Anzeige für die aktuelle Position
+    private final float boardLimit = 0.95f; // Grenzen des Bretts
+    private final float stepSize = 0.18f; // Schrittgröße pro Bewegung
+    private int currentPosition = 0; // Aktuelle Position auf dem Spielfeld
+    private final int positionsPerSide = 10; // Anzahl der Positionen pro Seite
+    private final Random random = new Random(); // Zufallsgenerator für den Würfelwurf
+
+    /**
+     * Konstruktor für die Toolbar.
+     *
+     * @param app  Die Hauptanwendung (MonopolyApp)
+     * @param cube Der Würfel, der bewegt werden soll
+     */
+    public Toolbar2(MonopolyApp app, Geometry cube) {
+        this.app = app;
+        this.cube = cube;
+
+        // Erstelle die Toolbar
+        toolbarContainer = new Container(new SpringGridLayout(Axis.X, Axis.Y));
+
+        // Setze die Position am unteren Rand und die Breite
+        toolbarContainer.setLocalTranslation(
+                0,                                 // Links bündig
+                100,                               // Höhe über dem unteren Rand
+                0                                  // Z-Ebene
+        );
+        toolbarContainer.setPreferredSize(new Vector3f(app.getCamera().getWidth(), 100, 0)); // Volle Breite
+
+        // Füge Buttons zur Toolbar hinzu
+        initializeButtons();
+
+        // Füge die Toolbar zur GUI hinzu
+        app.getGuiNode().attachChild(toolbarContainer);
+
+        // Erstelle die Position-Anzeige
+        positionText = createPositionDisplay();
+        updatePositionDisplay(); // Initialisiere die Anzeige mit der Startposition
+    }
+
+    /**
+     * Initialisiert die Buttons in der Toolbar.
+     */
+    private void initializeButtons() {
+        addButton("Vorwärts", 1);  // Bewegung nach vorne
+        addButton("Rückwärts", -1); // Bewegung nach hinten
+        addDiceRollButton();       // Würfel-Button
+    }
+
+    /**
+     * Fügt einen Button mit einer Bewegung hinzu.
+     *
+     * @param label   Der Text des Buttons
+     * @param step    Schrittweite (+1 für vorwärts, -1 für rückwärts)
+     */
+    private void addButton(String label, int step) {
+        Button button = new Button(label);
+        button.setPreferredSize(new Vector3f(150, 50, 0)); // Größe der Buttons
+        button.addClickCommands(source -> moveCube(step));
+        toolbarContainer.addChild(button);
+    }
+
+    /**
+     * Fügt den Würfel-Button hinzu, der die Figur entsprechend der gewürfelten Zahl bewegt.
+     */
+    private void addDiceRollButton() {
+        Button diceButton = new Button("Würfeln");
+        diceButton.setPreferredSize(new Vector3f(150, 50, 0)); // Größe des Buttons
+        diceButton.addClickCommands(source -> rollDice());
+        toolbarContainer.addChild(diceButton);
+    }
+
+    /**
+     * Simuliert einen Würfelwurf und bewegt die Figur entsprechend.
+     */
+    private void rollDice() {
+        int diceRoll = random.nextInt(6) + 1; // Zahl zwischen 1 und 6
+        System.out.println("Gewürfelt: " + diceRoll);
+        moveCube(diceRoll); // Bewege die Figur um die gewürfelte Zahl
+    }
+
+    /**
+     * Bewegt den Würfel basierend auf der aktuellen Position auf dem Brett.
+     *
+     * @param step Schrittweite (+1 für vorwärts, -1 für rückwärts oder andere Werte)
+     */
+    private void moveCube(int step) {
+        currentPosition = (currentPosition + step + 4 * positionsPerSide) % (4 * positionsPerSide);
+        Vector3f newPosition = calculatePosition(currentPosition);
+        cube.setLocalTranslation(newPosition);
+        updatePositionDisplay(); // Aktualisiere die Positionsanzeige
+        System.out.println("Würfelposition: " + newPosition + " (Feld-ID: " + currentPosition + ")");
+    }
+
+    /**
+     * Berechnet die neue Position des Würfels basierend auf der aktuellen Brettseite und Position.
+     *
+     * @param position Aktuelle Position auf dem Spielfeld
+     * @return Die berechnete Position als Vector3f
+     */
+    private Vector3f calculatePosition(int position) {
+        int side = position / positionsPerSide; // Seite des Bretts (0 = unten, 1 = rechts, 2 = oben, 3 = links)
+        int offset = position % positionsPerSide; // Position auf der aktuellen Seite
+
+        switch (side) {
+            case 0: // Unten (positive x-Achse)
+                return new Vector3f(-boardLimit + offset * stepSize, 0.1f, -boardLimit + 0.05f);
+            case 1: // Rechts (positive z-Achse)
+                return new Vector3f(boardLimit - 0.05f, 0.1f, -boardLimit + offset * stepSize);
+            case 2: // Oben (negative x-Achse)
+                return new Vector3f(boardLimit - offset * stepSize, 0.1f, boardLimit - 0.05f);
+            case 3: // Links (negative z-Achse)
+                return new Vector3f(-boardLimit + 0.05f, 0.1f, boardLimit - offset * stepSize);
+            default:
+                throw new IllegalArgumentException("Ungültige Position: " + position);
+        }
+    }
+
+    /**
+     * Erstellt die Anzeige für die aktuelle Position.
+     *
+     * @return Das BitmapText-Objekt für die Anzeige
+     */
+    private BitmapText createPositionDisplay() {
+        BitmapText text = new BitmapText(app.getAssetManager().loadFont("Interface/Fonts/Default.fnt"), false);
+        text.setSize(20); // Schriftgröße
+        text.setLocalTranslation(10, app.getCamera().getHeight() - 10, 0); // Oben links
+        app.getGuiNode().attachChild(text);
+        return text;
+    }
+
+    /**
+     * Aktualisiert die Anzeige für die aktuelle Position.
+     */
+    private void updatePositionDisplay() {
+        positionText.setText("Feld-ID: " + currentPosition);
+    }
+
+    /**
+     * Entfernt die Toolbar.
+     */
+    public void remove() {
+        app.getGuiNode().detachChild(toolbarContainer);
+        app.getGuiNode().detachChild(positionText);
+    }
+}

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

@@ -0,0 +1,37 @@
+package pp.monopoly.client.gui;
+
+import com.simsilica.lemur.Slider;
+
+import pp.monopoly.client.GameMusic;
+/**
+ * The VolumeSlider class represents the Volume Slider in the Menu.
+ * It extends the Slider class and provides functionalities for setting the music volume,
+ * with the help of the Slider in the GUI 
+ */
+public class VolumeSlider extends Slider {
+
+    private final pp.monopoly.client.GameMusic music;
+    private double vol;
+
+    /**
+     * Constructs the Volume Slider for the Menu dialog
+     * @param music the music instance
+     */
+    public VolumeSlider(GameMusic music) {
+        super();
+        this.music = music;
+        vol = GameMusic.volumeInPreferences();
+        getModel().setPercent(vol);
+    }
+
+    /**
+     * when triggered it updates the volume to the value set with the slider
+     */
+    public void update() {
+        if (vol != getModel().getPercent()) {
+            vol = getModel().getPercent();
+            music.setVolume( (float) vol);
+        }
+    }
+    
+}

Projekte/monopoly/client/src/main/java/pp/monopoly/client/gui/popups/BuildingPropertyCard.java

@@ -0,0 +1,133 @@
+package pp.monopoly.client.gui.popups;
+
+import com.jme3.material.Material;
+import com.jme3.material.RenderState.BlendMode;
+import com.jme3.math.ColorRGBA;
+import com.jme3.scene.Geometry;
+import com.jme3.scene.shape.Quad;
+import com.simsilica.lemur.Container;
+import com.simsilica.lemur.Label;
+import com.simsilica.lemur.component.QuadBackgroundComponent;
+import com.simsilica.lemur.style.ElementId;
+
+import pp.dialog.Dialog;
+import pp.monopoly.client.MonopolyApp;
+import pp.monopoly.model.fields.BuildingProperty;
+
+/**
+ * TODO Kommentare fixen
+ * SettingsMenu ist ein Overlay-Menü, das durch ESC aufgerufen werden kann.
+ */
+public class BuildingPropertyCard extends Dialog {
+    private final MonopolyApp app;
+    private final Geometry overlayBackground;
+    private final Container buildingPropertyContainer;
+    private final Container backgroundContainer;
+    private int index = 37;
+
+    public BuildingPropertyCard(MonopolyApp app) {
+        super(app.getDialogManager());
+        this.app = app;
+
+        //Generate the corresponfing field
+        BuildingProperty field = (BuildingProperty) app.getGameLogic().getBoardManager().getFieldAtIndex(index);
+
+        // Halbtransparentes Overlay hinzufügen
+        overlayBackground = createOverlayBackground();
+        app.getGuiNode().attachChild(overlayBackground);
+
+        // Create the background container
+        backgroundContainer = new Container();
+        backgroundContainer.setBackground(new QuadBackgroundComponent(new ColorRGBA(0.8657f, 0.8735f, 0.8892f, 1.0f))); // Darker background
+        app.getGuiNode().attachChild(backgroundContainer);
+
+        // Hauptcontainer für die Gebäudekarte
+        buildingPropertyContainer = new Container();
+        buildingPropertyContainer.setBackground(new QuadBackgroundComponent(field.getColor().getColor()));
+
+
+        Label settingsTitle = buildingPropertyContainer.addChild(new Label( field.getName(), new ElementId("settings-title")));
+        settingsTitle.setFontSize(48);
+
+        // Text, der auf der Karte steht
+        // Die Preise werden dynamisch dem BoardManager entnommen
+        Container propertyValuesContainer = buildingPropertyContainer.addChild(new Container());
+        propertyValuesContainer.addChild(new Label("„Grundstückswert: " + field.getPrice() + " EUR", new ElementId("label-Text")));
+        propertyValuesContainer.addChild(new Label("", new ElementId("label-Text")));// Leerzeile
+        propertyValuesContainer.addChild(new Label("„Miete allein: " + field.getAllRent().get(0)+ " EUR", new ElementId("label-Text")));
+        propertyValuesContainer.addChild(new Label("„-mit 1 Haus: " + field.getAllRent().get(1) + " EUR", new ElementId("label-Text")));
+        propertyValuesContainer.addChild(new Label("„-mit 2 Häuser: " + field.getAllRent().get(2) + " EUR", new ElementId("label-Text")));
+        propertyValuesContainer.addChild(new Label("„-mit 3 Häuser: " + field.getAllRent().get(3) + " EUR", new ElementId("label-Text")));
+        propertyValuesContainer.addChild(new Label("„-mit 4 Häuser: " + field.getAllRent().get(4) + " EUR", new ElementId("label-Text")));
+        propertyValuesContainer.addChild(new Label("„-mit 1 Hotel: " + field.getAllRent().get(5) + " EUR", new ElementId("label-Text")));
+        propertyValuesContainer.addChild(new Label("„-1 Haus kostet: " + field.getHousePrice()+ " EUR", new ElementId("label-Text")));
+        propertyValuesContainer.addChild(new Label("", new ElementId("label-Text")));// Leerzeile
+        propertyValuesContainer.addChild(new Label("„Hypothek: " + field.getHypo() + " EUR", new ElementId("label-Text")));
+        propertyValuesContainer.setBackground(new QuadBackgroundComponent(new ColorRGBA(0.4657f, 0.4735f, 0.4892f, 1.0f)));
+
+        //TODO eventuell diese Stelle löschen, da nur die BuyCard Kaufen und beenden hat
+
+        /*
+        // Beenden-Button
+        Button quitButton = foodFieldContainer.addChild(new Button("Beenden", new ElementId("button")));
+        quitButton.setFontSize(32);
+        // Kaufen-Button
+        Button buyButton = foodFieldContainer.addChild(new Button("Kaufen", new ElementId("button")));
+        buyButton.setFontSize(32);
+         */
+
+        float padding = 10; // Padding around the settingsContainer for the background
+        backgroundContainer.setPreferredSize(buildingPropertyContainer.getPreferredSize().addLocal(padding, padding, 0));
+
+
+        // Zentriere das Menü
+        buildingPropertyContainer.setLocalTranslation(
+            (app.getCamera().getWidth() - buildingPropertyContainer.getPreferredSize().x) / 2,
+            (app.getCamera().getHeight() + buildingPropertyContainer.getPreferredSize().y) / 2,
+            8
+        );
+
+        backgroundContainer.setLocalTranslation(
+                (app.getCamera().getWidth() - buildingPropertyContainer.getPreferredSize().x - padding) / 2,
+                (app.getCamera().getHeight() + buildingPropertyContainer.getPreferredSize().y+ padding) / 2,
+                7
+        );
+
+        app.getGuiNode().attachChild(buildingPropertyContainer);
+    }
+
+    /**
+     * Erstellt einen halbtransparenten Hintergrund für das Menü.
+     *
+     * @return Geometrie des Overlays
+     */
+    private Geometry createOverlayBackground() {
+        Quad quad = new Quad(app.getCamera().getWidth(), app.getCamera().getHeight());
+        Geometry overlay = new Geometry("Overlay", quad);
+        Material material = new Material(app.getAssetManager(), "Common/MatDefs/Misc/Unshaded.j3md");
+        material.setColor("Color", new ColorRGBA(0, 0, 0, 0.5f)); // Halbtransparent
+        material.getAdditionalRenderState().setBlendMode(BlendMode.Alpha);
+        overlay.setMaterial(material);
+        overlay.setLocalTranslation(0, 0, 0);
+        return overlay;
+    }
+
+    /**
+     * Schließt das Menü und entfernt die GUI-Elemente.
+     */
+    @Override
+    public void close() {
+        System.out.println("Schließe SettingsMenu..."); // Debugging-Ausgabe
+        app.getGuiNode().detachChild(buildingPropertyContainer);  // Entferne das Menü
+        app.getGuiNode().detachChild(backgroundContainer); //Entfernt Rand
+        app.getGuiNode().detachChild(overlayBackground);  // Entferne das Overlay
+        app.setSettingsMenuOpen(false);                  // Menü als geschlossen markieren TODO passt diese Variable noch (zu finden unter den Temps in MonopolyApp
+        app.unblockInputs();                             // Eingaben wieder aktivieren
+        System.out.println("SettingsMenu geschlossen."); // Debugging-Ausgabe
+    }
+    
+    public void setIndex(int index) {
+        this.index = index;
+    }
+
+}

Projekte/monopoly/client/src/main/java/pp/monopoly/client/gui/popups/BuyCard.java

@@ -0,0 +1,124 @@
+package pp.monopoly.client.gui.popups;
+
+import com.jme3.material.Material;
+import com.jme3.material.RenderState.BlendMode;
+import com.jme3.math.ColorRGBA;
+import com.jme3.scene.Geometry;
+import com.jme3.scene.shape.Quad;
+import com.simsilica.lemur.Button;
+import com.simsilica.lemur.Container;
+import com.simsilica.lemur.Label;
+import com.simsilica.lemur.component.QuadBackgroundComponent;
+import com.simsilica.lemur.style.ElementId;
+import pp.dialog.Dialog;
+import pp.monopoly.client.MonopolyApp;
+import pp.monopoly.model.fields.BuildingProperty;
+
+/**
+ * SettingsMenu ist ein Overlay-Menü, das durch ESC aufgerufen werden kann.
+ */
+public class BuyCard extends Dialog {
+    private final MonopolyApp app;
+    private final Geometry overlayBackground;
+    private final Container buyCardContainer;
+    private final Container backgroundContainer;
+
+    private int index = 37;
+
+    public BuyCard(MonopolyApp app) {
+        super(app.getDialogManager());
+        this.app = app;
+
+        //Generate the corresponfing field
+        BuildingProperty field = (BuildingProperty) app.getBoardManager().getFieldAtIndex(index);
+
+        // Halbtransparentes Overlay hinzufügen
+        overlayBackground = createOverlayBackground();
+        app.getGuiNode().attachChild(overlayBackground);
+
+        // Create the background container
+        backgroundContainer = new Container();
+        backgroundContainer.setBackground(new QuadBackgroundComponent(new ColorRGBA(0.8657f, 0.8735f, 0.8892f, 1.0f))); // Darker background
+        app.getGuiNode().attachChild(backgroundContainer);
+
+        // Hauptcontainer für die Gebäudekarte
+        buyCardContainer = new Container();
+        buyCardContainer.setBackground(new QuadBackgroundComponent(field.getColor().getColor()));
+
+
+        Label settingsTitle = buyCardContainer.addChild(new Label( field.getName(), new ElementId("settings-title")));
+        settingsTitle.setFontSize(48);
+
+        // Text, der auf der Karte steht
+        // Die Preise werden dynamisch dem BoardManager entnommen
+        Container propertyValuesContainer = buyCardContainer.addChild(new Container());
+        propertyValuesContainer.addChild(new Label("„Grundstückswert: " + field.getPrice() + " EUR", new ElementId("label-Text")));
+        propertyValuesContainer.addChild(new Label("", new ElementId("label-Text")));// Leerzeile
+        propertyValuesContainer.addChild(new Label("„Miete allein: " + field.getAllRent().get(0)+ " EUR", new ElementId("label-Text")));
+        propertyValuesContainer.addChild(new Label("„-mit 1 Haus: " + field.getAllRent().get(1) + " EUR", new ElementId("label-Text")));
+        propertyValuesContainer.addChild(new Label("„-mit 2 Häuser: " + field.getAllRent().get(2) + " EUR", new ElementId("label-Text")));
+        propertyValuesContainer.addChild(new Label("„-mit 3 Häuser: " + field.getAllRent().get(3) + " EUR", new ElementId("label-Text")));
+        propertyValuesContainer.addChild(new Label("„-mit 4 Häuser: " + field.getAllRent().get(4) + " EUR", new ElementId("label-Text")));
+        propertyValuesContainer.addChild(new Label("„-mit 1 Hotel: " + field.getAllRent().get(5) + " EUR", new ElementId("label-Text")));
+        propertyValuesContainer.addChild(new Label("„-1 Haus kostet: " + field.getHousePrice()+ " EUR", new ElementId("label-Text")));
+        propertyValuesContainer.addChild(new Label("", new ElementId("label-Text")));// Leerzeile
+        propertyValuesContainer.addChild(new Label("„Hypothek: " + field.getHypo() + " EUR", new ElementId("label-Text")));
+        propertyValuesContainer.setBackground(new QuadBackgroundComponent(new ColorRGBA(0.4657f, 0.4735f, 0.4892f, 1.0f)));
+
+        // Beenden-Button
+        Button quitButton = buyCardContainer.addChild(new Button("Beenden", new ElementId("button")));
+        quitButton.setFontSize(32);
+        // Kaufen-Button
+        Button buyButton = buyCardContainer.addChild(new Button("Kaufen", new ElementId("button")));
+        buyButton.setFontSize(32);
+
+        float padding = 10; // Padding around the settingsContainer for the background
+        backgroundContainer.setPreferredSize(buyCardContainer.getPreferredSize().addLocal(padding, padding, 0));
+
+
+        // Zentriere das Menü
+        buyCardContainer.setLocalTranslation(
+            (app.getCamera().getWidth() - buyCardContainer.getPreferredSize().x) / 2,
+            (app.getCamera().getHeight() + buyCardContainer.getPreferredSize().y) / 2,
+            8
+        );
+
+        backgroundContainer.setLocalTranslation(
+                (app.getCamera().getWidth() - buyCardContainer.getPreferredSize().x - padding) / 2,
+                (app.getCamera().getHeight() + buyCardContainer.getPreferredSize().y+ padding) / 2,
+                7
+        );
+
+        app.getGuiNode().attachChild(buyCardContainer);
+    }
+
+    /**
+     * Erstellt einen halbtransparenten Hintergrund für das Menü.
+     *
+     * @return Geometrie des Overlays
+     */
+    private Geometry createOverlayBackground() {
+        Quad quad = new Quad(app.getCamera().getWidth(), app.getCamera().getHeight());
+        Geometry overlay = new Geometry("Overlay", quad);
+        Material material = new Material(app.getAssetManager(), "Common/MatDefs/Misc/Unshaded.j3md");
+        material.setColor("Color", new ColorRGBA(0, 0, 0, 0.5f)); // Halbtransparent
+        material.getAdditionalRenderState().setBlendMode(BlendMode.Alpha);
+        overlay.setMaterial(material);
+        overlay.setLocalTranslation(0, 0, 0);
+        return overlay;
+    }
+
+    /**
+     * Schließt das Menü und entfernt die GUI-Elemente.
+     */
+    @Override
+    public void close() {
+        System.out.println("Schließe SettingsMenu..."); // Debugging-Ausgabe
+        app.getGuiNode().detachChild(buyCardContainer);  // Entferne das Menü
+        app.getGuiNode().detachChild(backgroundContainer); //Entfernt Rand
+        app.getGuiNode().detachChild(overlayBackground);  // Entferne das Overlay
+        app.setSettingsMenuOpen(false);                  // Menü als geschlossen markieren TODO passt diese Variable noch (zu finden unter den Temps in MonopolyApp
+        app.unblockInputs();                             // Eingaben wieder aktivieren
+        System.out.println("SettingsMenu geschlossen."); // Debugging-Ausgabe
+    }
+}

Projekte/monopoly/client/src/main/java/pp/monopoly/client/gui/popups/EventCard.java

@@ -0,0 +1,118 @@
+package pp.monopoly.client.gui.popups;
+
+import com.jme3.material.Material;
+import com.jme3.material.RenderState.BlendMode;
+import com.jme3.math.ColorRGBA;
+import com.jme3.scene.Geometry;
+import com.jme3.scene.shape.Quad;
+import com.simsilica.lemur.Button;
+import com.simsilica.lemur.Container;
+import com.simsilica.lemur.Label;
+import com.simsilica.lemur.component.QuadBackgroundComponent;
+import com.simsilica.lemur.style.ElementId;
+import pp.dialog.Dialog;
+import pp.monopoly.client.MonopolyApp;
+
+import pp.monopoly.model.card.Card; // TODO für den Import der Queue notwendig
+/**
+ * SettingsMenu ist ein Overlay-Menü, das durch ESC aufgerufen werden kann.
+ */
+public class EventCard extends Dialog {
+    private final MonopolyApp app;
+    private final Geometry overlayBackground;
+    private final Container eventCardContainer;
+    private final Container backgroundContainer;
+
+
+    public EventCard(MonopolyApp app) {
+        super(app.getDialogManager());
+        this.app = app;
+
+        //Generate the corresponfing field
+        Card card = app.getDeckHelper().drawCard(); // TODO nimmt die Karten gerade unabhängig aus dem DeckHelper
+
+        // Halbtransparentes Overlay hinzufügen
+        overlayBackground = createOverlayBackground();
+        app.getGuiNode().attachChild(overlayBackground);
+
+        // Create the background container
+        backgroundContainer = new Container();
+        backgroundContainer.setBackground(new QuadBackgroundComponent(new ColorRGBA(0.8657f, 0.8735f, 0.8892f, 1.0f))); // Darker background
+        app.getGuiNode().attachChild(backgroundContainer);
+
+        // Hauptcontainer für die Gebäudekarte
+        eventCardContainer = new Container();
+        eventCardContainer.setBackground(new QuadBackgroundComponent(new ColorRGBA(0.8657f, 0.8735f, 0.8892f, 1.0f)));
+
+        // Titel
+        // Die Namen werden dynamisch dem BoardManager entnommen
+        Label gateFieldTitle = eventCardContainer.addChild(new Label("Ereigniskarte", new ElementId("settings-title")));
+        gateFieldTitle.setFontSize(48);
+        gateFieldTitle.setColor(ColorRGBA.Black);
+
+        // Text, der auf der Karte steht
+        // Die Preise werden dynamisch dem BoardManager entnommen
+        Container propertyValuesContainer = eventCardContainer.addChild(new Container());
+        propertyValuesContainer.addChild(new Label(card.getDescription(), new ElementId("label-Text")));
+        propertyValuesContainer.setBackground(new QuadBackgroundComponent(new ColorRGBA(0.4657f, 0.4735f, 0.4892f, 1.0f)));
+
+        // Beenden-Button
+        Button quitButton = eventCardContainer.addChild(new Button("Jawohl", new ElementId("button")));
+        quitButton.setFontSize(32);
+        quitButton.addClickCommands(source -> close());
+
+
+        // TODO Kaufen-Button wird nicht mehr benötigt, prüfen ob weg kann
+        //Button buyButton = buyCardContainer.addChild(new Button("Kaufen", new ElementId("button")));
+        //buyButton.setFontSize(32);
+
+        float padding = 10; // Padding around the settingsContainer for the background
+        backgroundContainer.setPreferredSize(eventCardContainer.getPreferredSize().addLocal(padding, padding, 0));
+
+
+        // Zentriere das Menü
+        eventCardContainer.setLocalTranslation(
+            (app.getCamera().getWidth() - eventCardContainer.getPreferredSize().x) / 2,
+            (app.getCamera().getHeight() + eventCardContainer.getPreferredSize().y) / 2,
+            8
+        );
+
+        backgroundContainer.setLocalTranslation(
+                (app.getCamera().getWidth() - eventCardContainer.getPreferredSize().x - padding) / 2,
+                (app.getCamera().getHeight() + eventCardContainer.getPreferredSize().y+ padding) / 2,
+                7
+        );
+
+        app.getGuiNode().attachChild(eventCardContainer);
+    }
+
+    /**
+     * Erstellt einen halbtransparenten Hintergrund für das Menü.
+     *
+     * @return Geometrie des Overlays
+     */
+    private Geometry createOverlayBackground() {
+        Quad quad = new Quad(app.getCamera().getWidth(), app.getCamera().getHeight());
+        Geometry overlay = new Geometry("Overlay", quad);
+        Material material = new Material(app.getAssetManager(), "Common/MatDefs/Misc/Unshaded.j3md");
+        material.setColor("Color", new ColorRGBA(0, 0, 0, 0.5f)); // Halbtransparent
+        material.getAdditionalRenderState().setBlendMode(BlendMode.Alpha);
+        overlay.setMaterial(material);
+        overlay.setLocalTranslation(0, 0, 0);
+        return overlay;
+    }
+
+    /**
+     * Schließt das Menü und entfernt die GUI-Elemente.
+     */
+    @Override
+    public void close() {
+        System.out.println("Schließe SettingsMenu..."); // Debugging-Ausgabe
+        app.getGuiNode().detachChild(eventCardContainer);  // Entferne das Menü
+        app.getGuiNode().detachChild(backgroundContainer); //Entfernt Rand
+        app.getGuiNode().detachChild(overlayBackground);  // Entferne das Overlay
+        app.setBuyCardPopupOpen(false);                  // Menü als geschlossen markieren TODO passt diese Variable noch (zu finden unter den Temps in MonopolyApp
+        app.unblockInputs();                             // Eingaben wieder aktivieren
+        System.out.println("SettingsMenu geschlossen."); // Debugging-Ausgabe
+    }
+}

Projekte/monopoly/client/src/main/java/pp/monopoly/client/gui/popups/FoodFieldCard.java

@@ -0,0 +1,136 @@
+package pp.monopoly.client.gui.popups;
+
+import com.jme3.material.Material;
+import com.jme3.material.RenderState.BlendMode;
+import com.jme3.math.ColorRGBA;
+import com.jme3.scene.Geometry;
+import com.jme3.scene.shape.Quad;
+import com.simsilica.lemur.Container;
+import com.simsilica.lemur.Label;
+import com.simsilica.lemur.component.QuadBackgroundComponent;
+import com.simsilica.lemur.style.ElementId;
+
+import pp.dialog.Dialog;
+import pp.monopoly.client.MonopolyApp;
+import pp.monopoly.model.fields.FoodField;
+
+/**
+ * FoodFieldCard erstellt die Geböudekarte vom Brandl und der Truppenküche
+ */
+public class FoodFieldCard extends Dialog {
+    private final MonopolyApp app;
+    private final Geometry overlayBackground;
+    private final Container foodFieldContainer;
+    private final Container backgroundContainer;
+    private int index = 12;
+
+    public FoodFieldCard(MonopolyApp app) {
+        super(app.getDialogManager());
+        this.app = app;
+
+        //Generate the corresponfing field
+        FoodField field = (FoodField) app.getGameLogic().getBoardManager().getFieldAtIndex(index);
+
+        // Halbtransparentes Overlay hinzufügen
+        overlayBackground = createOverlayBackground();
+        app.getGuiNode().attachChild(overlayBackground);
+
+        // Create the background container
+        backgroundContainer = new Container();
+        backgroundContainer.setBackground(new QuadBackgroundComponent(new ColorRGBA(0.8657f, 0.8735f, 0.8892f, 1.0f))); // Darker background
+        app.getGuiNode().attachChild(backgroundContainer);
+
+        // Hauptcontainer für die Gebäudekarte
+        foodFieldContainer = new Container();
+        foodFieldContainer.setBackground(new QuadBackgroundComponent(new ColorRGBA(0.1f, 0.1f, 0.1f, 0.9f)));
+
+
+
+        // Titel, bestehend aus dynamischen Namen anhand der ID und der Schriftfarbe/größe
+        Label settingsTitle = foodFieldContainer.addChild(new Label(field.getName(), new ElementId("settings-title")));
+        settingsTitle.setFontSize(48);
+
+        // Text, der auf der Karte steht
+        Container propertyValuesContainer = foodFieldContainer.addChild(new Container());
+        propertyValuesContainer.addChild(new Label("„Preis: " + field.getPrice() + " EUR", new ElementId("label-Text")));
+        propertyValuesContainer.addChild(new Label("", new ElementId("label-Text"))); // Leerzeile
+        propertyValuesContainer.addChild(new Label("„Wenn man Besitzer des", new ElementId("label-Text")));
+        propertyValuesContainer.addChild(new Label(field.getName()+" ist, so ist die", new ElementId("label-Text")));
+        propertyValuesContainer.addChild(new Label("Miete 40-mal so hoch, wie", new ElementId("label-Text")));
+        propertyValuesContainer.addChild(new Label("Augen auf den zwei Würfeln sind.", new ElementId("label-Text")));
+        propertyValuesContainer.addChild(new Label("", new ElementId("label-Text"))); // Leerzeile
+        propertyValuesContainer.addChild(new Label("„Wenn man Besitzer beider", new ElementId("label-Text")));
+        propertyValuesContainer.addChild(new Label("Restaurants ist, so ist die", new ElementId("label-Text")));
+        propertyValuesContainer.addChild(new Label("Miete 100-mal so hoch, wie", new ElementId("label-Text")));
+        propertyValuesContainer.addChild(new Label("Augen auf den zwei Würfeln sind.", new ElementId("label-Text")));
+        propertyValuesContainer.addChild(new Label("", new ElementId("label-Text"))); // Leerzeile
+        propertyValuesContainer.addChild(new Label("„Hypothek: " + field.getHypo() + " EUR", new ElementId("label-Text")));
+        propertyValuesContainer.setBackground(new QuadBackgroundComponent(new ColorRGBA(0.4657f, 0.4735f, 0.4892f, 1.0f)));
+
+
+        //TODO eventuell diese Stelle löschen, da nur die BuyCard Kaufen und beenden hat
+
+        /*
+        // Beenden-Button
+        Button quitButton = foodFieldContainer.addChild(new Button("Beenden", new ElementId("button")));
+        quitButton.setFontSize(32);
+        // Kaufen-Button
+        Button buyButton = foodFieldContainer.addChild(new Button("Kaufen", new ElementId("button")));
+        buyButton.setFontSize(32);
+         */
+
+        float padding = 10; // Padding around the settingsContainer for the background
+        backgroundContainer.setPreferredSize(foodFieldContainer.getPreferredSize().addLocal(padding, padding, 0));
+
+
+        // Zentriere das Menü
+        foodFieldContainer.setLocalTranslation(
+            (app.getCamera().getWidth() - foodFieldContainer.getPreferredSize().x) / 2,
+            (app.getCamera().getHeight() + foodFieldContainer.getPreferredSize().y) / 2,
+            8
+        );
+
+        backgroundContainer.setLocalTranslation(
+                (app.getCamera().getWidth() - foodFieldContainer.getPreferredSize().x - padding) / 2,
+                (app.getCamera().getHeight() + foodFieldContainer.getPreferredSize().y+ padding) / 2,
+                7
+        );
+
+        app.getGuiNode().attachChild(foodFieldContainer);
+    }
+
+    /**
+     * Erstellt einen halbtransparenten Hintergrund für das Menü.
+     *
+     * @return Geometrie des Overlays
+     */
+    private Geometry createOverlayBackground() {
+        Quad quad = new Quad(app.getCamera().getWidth(), app.getCamera().getHeight());
+        Geometry overlay = new Geometry("Overlay", quad);
+        Material material = new Material(app.getAssetManager(), "Common/MatDefs/Misc/Unshaded.j3md");
+        material.setColor("Color", new ColorRGBA(0, 0, 0, 0.5f)); // Halbtransparent
+        material.getAdditionalRenderState().setBlendMode(BlendMode.Alpha);
+        overlay.setMaterial(material);
+        overlay.setLocalTranslation(0, 0, 0);
+        return overlay;
+    }
+
+    /**
+     * Schließt das Menü und entfernt die GUI-Elemente.
+     */
+    @Override
+    public void close() {
+        System.out.println("Schließe SettingsMenu..."); // Debugging-Ausgabe
+        app.getGuiNode().detachChild(foodFieldContainer);  // Entferne das Menü
+        app.getGuiNode().detachChild(backgroundContainer); //Entfernt Rand
+        app.getGuiNode().detachChild(overlayBackground);  // Entferne das Overlay
+        app.setSettingsMenuOpen(false);                  // Menü als geschlossen markieren TODO passt diese Variable noch (zu finden unter den Temps in MonopolyApp
+        app.unblockInputs();                             // Eingaben wieder aktivieren
+        System.out.println("SettingsMenu geschlossen."); // Debugging-Ausgabe
+    }
+
+    public void setIndex(int index) {
+        this.index = index;
+    }
+
+}

Projekte/monopoly/client/src/main/java/pp/monopoly/client/gui/popups/GateFieldCard.java

@@ -0,0 +1,129 @@
+package pp.monopoly.client.gui.popups;
+
+import com.jme3.material.Material;
+import com.jme3.material.RenderState.BlendMode;
+import com.jme3.math.ColorRGBA;
+import com.jme3.scene.Geometry;
+import com.jme3.scene.shape.Quad;
+import com.simsilica.lemur.Container;
+import com.simsilica.lemur.Label;
+import com.simsilica.lemur.component.QuadBackgroundComponent;
+import com.simsilica.lemur.style.ElementId;
+import pp.dialog.Dialog;
+import pp.monopoly.client.MonopolyApp;
+import pp.monopoly.model.fields.GateField;
+
+/**
+ * SettingsMenu ist ein Overlay-Menü, das durch ESC aufgerufen werden kann.
+ */
+public class GateFieldCard extends Dialog {
+    private final MonopolyApp app;
+    private final Geometry overlayBackground;
+    private final Container gateFieldContainer;
+    private final Container backgroundContainer;
+    private int index = 5;
+
+    public GateFieldCard(MonopolyApp app) {
+        super(app.getDialogManager());
+        this.app = app;
+
+        //Generate the corresponfing field
+        GateField field = (GateField) app.getGameLogic().getBoardManager().getFieldAtIndex(index);
+
+        // Halbtransparentes Overlay hinzufügen
+        overlayBackground = createOverlayBackground();
+        app.getGuiNode().attachChild(overlayBackground);
+
+        // Create the background container
+        backgroundContainer = new Container();
+        backgroundContainer.setBackground(new QuadBackgroundComponent(new ColorRGBA(0.8657f, 0.8735f, 0.8892f, 1.0f))); // Darker background
+        app.getGuiNode().attachChild(backgroundContainer);
+
+        // Hauptcontainer für die Gebäudekarte
+        gateFieldContainer = new Container();
+        gateFieldContainer.setBackground(new QuadBackgroundComponent(new ColorRGBA(0.8657f, 0.8735f, 0.8892f, 1.0f)));
+
+        // Titel
+        // Die Namen werden dynamisch dem BoardManager entnommen
+        Label gateFieldTitle = gateFieldContainer.addChild(new Label(field.getName(), new ElementId("settings-title")));
+        gateFieldTitle.setFontSize(48);
+        gateFieldTitle.setColor(ColorRGBA.Black);
+
+        // Text, der auf der Karte steht
+        // Die Preise werden dynamisch dem BoardManager entnommen
+        Container propertyValuesContainer = gateFieldContainer.addChild(new Container());
+        propertyValuesContainer.addChild(new Label("„Preis: " + field.getPrice() + " EUR", new ElementId("label-Text")));
+        propertyValuesContainer.addChild(new Label("", new ElementId("label-Text")));
+        propertyValuesContainer.addChild(new Label("Wenn man 1 Bahnhof besitzt: 250 EUR", new ElementId("label-Text")));
+        propertyValuesContainer.addChild(new Label("Wenn man 2 Bahnhöfe besitzt: 500 EUR", new ElementId("label-Text")));
+        propertyValuesContainer.addChild(new Label("Wenn man 3 Bahnhöfe besitzt: 1000 EUR", new ElementId("label-Text")));
+        propertyValuesContainer.addChild(new Label("Wenn man 4 Bahnhöfe besitzt: 2000 EUR", new ElementId("label-Text")));
+        propertyValuesContainer.addChild(new Label("", new ElementId("label-Text")));
+        propertyValuesContainer.addChild(new Label("„Hypothek: " + field.getHypo() + " EUR", new ElementId("label-Text")));
+        propertyValuesContainer.setBackground(new QuadBackgroundComponent(new ColorRGBA(0.4657f, 0.4735f, 0.4892f, 1.0f)));
+
+        //TODO eventuell diese Stelle löschen, da nur die BuyCard Kaufen und beenden hat
+
+        /*
+        // Beenden-Button
+        Button quitButton = foodFieldContainer.addChild(new Button("Beenden", new ElementId("button")));
+        quitButton.setFontSize(32);
+        // Kaufen-Button
+        Button buyButton = foodFieldContainer.addChild(new Button("Kaufen", new ElementId("button")));
+        buyButton.setFontSize(32);
+         */
+
+        float padding = 10; // Padding around the settingsContainer for the background
+        backgroundContainer.setPreferredSize(gateFieldContainer.getPreferredSize().addLocal(padding, padding, 0));
+
+
+        // Zentriere das Menü
+        gateFieldContainer.setLocalTranslation(
+            (app.getCamera().getWidth() - gateFieldContainer.getPreferredSize().x) / 2,
+            (app.getCamera().getHeight() + gateFieldContainer.getPreferredSize().y) / 2,
+            8
+        );
+
+        backgroundContainer.setLocalTranslation(
+                (app.getCamera().getWidth() - gateFieldContainer.getPreferredSize().x - padding) / 2,
+                (app.getCamera().getHeight() + gateFieldContainer.getPreferredSize().y+ padding) / 2,
+                7
+        );
+
+        app.getGuiNode().attachChild(gateFieldContainer);
+    }
+
+    /**
+     * Erstellt einen halbtransparenten Hintergrund für das Menü.
+     *
+     * @return Geometrie des Overlays
+     */
+    private Geometry createOverlayBackground() {
+        Quad quad = new Quad(app.getCamera().getWidth(), app.getCamera().getHeight());
+        Geometry overlay = new Geometry("Overlay", quad);
+        Material material = new Material(app.getAssetManager(), "Common/MatDefs/Misc/Unshaded.j3md");
+        material.setColor("Color", new ColorRGBA(0, 0, 0, 0.5f)); // Halbtransparent
+        material.getAdditionalRenderState().setBlendMode(BlendMode.Alpha);
+        overlay.setMaterial(material);
+        overlay.setLocalTranslation(0, 0, 0);
+        return overlay;
+    }
+
+    /**
+     * Schließt das Menü und entfernt die GUI-Elemente.
+     */
+    @Override
+    public void close() {
+        System.out.println("Schließe SettingsMenu..."); // Debugging-Ausgabe
+        app.getGuiNode().detachChild(gateFieldContainer);  // Entferne das Menü
+        app.getGuiNode().detachChild(backgroundContainer); //Entfernt Rand
+        app.getGuiNode().detachChild(overlayBackground);  // Entferne das Overlay
+        app.setSettingsMenuOpen(false);                  // Menü als geschlossen markieren TODO passt diese Variable noch (zu finden unter den Temps in MonopolyApp
+        app.unblockInputs();                             // Eingaben wieder aktivieren
+        System.out.println("SettingsMenu geschlossen."); // Debugging-Ausgabe
+    }
+
+    public void setIndex(int index) {
+        this.index = index;
+    }
+}

Projekte/monopoly/client/src/main/java/pp/monopoly/client/gui/popups/LooserPopUp.java

@@ -0,0 +1,52 @@
+package pp.monopoly.client.gui.popups;
+
+import com.simsilica.lemur.Button;
+import com.simsilica.lemur.Container;
+import com.simsilica.lemur.Label;
+import com.simsilica.lemur.component.IconComponent;
+
+import pp.dialog.Dialog;
+import pp.monopoly.client.MonopolyApp;
+
+public class LooserPopUp extends Dialog {
+
+    private final MonopolyApp app;
+
+    /**
+     * Constructs a new NetworkDialog.
+     *
+     * @param network The NetworkSupport instance to be used for network operations.
+     */
+    public LooserPopUp(MonopolyApp app) {
+        super(app.getDialogManager());
+        this.app = app;
+        initializeDialog();
+    }
+
+    /**
+     * Initializes the dialog with input fields and connection buttons.
+     */
+    private void initializeDialog() {
+        Container inputContainer = new Container();
+
+        // Titel und Eingabefelder für Host und Port
+        inputContainer.addChild(new Label("Schade, du hast leider verloren!"));
+        inputContainer.addChild(new Label("Die nächste Runde wird besser!"));
+
+        Label imageLabel = new Label("");
+        IconComponent icon = new IconComponent("Pictures/MonopolyLooser.png"); // Icon mit Textur erstellen
+        icon.setIconScale(1); // Skalierung des Bildes
+        imageLabel.setIcon(icon);
+
+        // Setze das Icon im Label
+        inputContainer.addChild(imageLabel);
+
+        Button cancelButton = inputContainer.addChild(new Button("Spiel beenden"));
+        cancelButton.addClickCommands(source -> ifTopDialog(app::closeApp));
+        
+        inputContainer.setLocalTranslation(300, 800, 0);
+        app.getGuiNode().attachChild(inputContainer);
+
+    }
+}
+

Projekte/monopoly/client/src/main/java/pp/monopoly/client/gui/popups/LoserPopUp.java

@@ -0,0 +1,55 @@
+package pp.monopoly.client.gui.popups;
+
+import com.jme3.asset.TextureKey;
+import com.jme3.math.Vector2f;
+import com.jme3.texture.Texture;
+import com.simsilica.lemur.Button;
+import com.simsilica.lemur.Container;
+import com.simsilica.lemur.Label;
+import com.simsilica.lemur.component.IconComponent;
+
+import pp.dialog.Dialog;
+import pp.monopoly.client.MonopolyApp;
+
+public class LoserPopUp extends Dialog {
+
+    private final MonopolyApp app;
+
+    /**
+     * Constructs a new NetworkDialog.
+     *
+     * @param network The NetworkSupport instance to be used for network operations.
+     */
+    public LoserPopUp(MonopolyApp app) {
+        super(app.getDialogManager());
+        this.app = app;
+        initializeDialog();
+    }
+
+    /**
+     * Initializes the dialog with input fields and connection buttons.
+     */
+    private void initializeDialog() {
+        Container inputContainer = new Container();
+
+        // Titel und Eingabefelder für Host und Port
+        inputContainer.addChild(new Label("Schade, du hast leider verloren!"));
+        inputContainer.addChild(new Label("Die nächste Runde wird besser!"));
+
+        Label imageLabel = new Label("");
+        TextureKey key = new TextureKey("Pictures/MonopolyLoser.png", true);
+        Texture texture = app.getAssetManager().loadTexture(key);
+        IconComponent icon = new IconComponent(texture.toString());     // Icon mit Textur erstellen
+        icon.setIconSize(new Vector2f(155f, 120f));     // Skalierung des Bildes
+        imageLabel.setIcon(icon);       // Setze das Icon im Label
+
+        inputContainer.addChild(imageLabel);
+
+        Button cancelButton = inputContainer.addChild(new Button("Spiel beenden"));
+        cancelButton.addClickCommands(source -> ifTopDialog(app::closeApp));
+        inputContainer.setLocalTranslation(300,500,0);
+        attachChild(inputContainer);
+
+    }
+}
+

Projekte/monopoly/client/src/main/java/pp/monopoly/client/gui/popups/SelectionListener.java

@@ -0,0 +1,49 @@
+package pp.monopoly.client.gui.popups;
+
+/*
+ * $Id$
+ *
+ * Copyright (c) 2013-2013 jMonkeyEngine
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+ *
+ * * Redistributions of source code must retain the above copyright
+ *   notice, this list of conditions and the following disclaimer.
+ *
+ * * Redistributions in binary form must reproduce the above copyright
+ *   notice, this list of conditions and the following disclaimer in the
+ *   documentation and/or other materials provided with the distribution.
+ *
+ * * Neither the name of 'jMonkeyEngine' nor the names of its contributors
+ *   may be used to endorse or promote products derived from this software
+ *   without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+ * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+ * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+
+import com.jme3.scene.Spatial;
+
+
+/**
+ *  Notified when the current selection changes.
+ *
+ *  @author    Paul Speed
+ */
+public interface SelectionListener {
+
+    public void selectionChanged( Spatial selection, Spatial previous );
+}

Projekte/monopoly/client/src/main/java/pp/monopoly/client/gui/popups/WinnerPopUp.java

@@ -0,0 +1,51 @@
+package pp.monopoly.client.gui.popups;
+
+import com.simsilica.lemur.Button;
+import com.simsilica.lemur.Container;
+import com.simsilica.lemur.Label;
+import com.simsilica.lemur.component.IconComponent;
+
+import pp.dialog.Dialog;
+import pp.monopoly.client.MonopolyApp;
+
+public class WinnerPopUp extends Dialog {
+
+    private final MonopolyApp app;
+
+    /**
+     * Constructs a new NetworkDialog.
+     *
+     * @param app The NetworkSupport instance to be used for network operations.
+     */
+    public WinnerPopUp(MonopolyApp app) {
+        super(app.getDialogManager());
+        this.app = app;
+        initializeDialog();
+    }
+
+    /**
+     * Initializes the dialog with input fields and connection buttons.
+     */
+    private void initializeDialog() {
+        Container inputContainer = new Container();
+
+        // Titel und Eingabefelder für Host und Port
+        inputContainer.addChild(new Label("Herlichen Glückwunsch!"));
+        inputContainer.addChild(new Label("Du,bist der Monopoly Champion!!!"));
+
+        Label imageLabel = new Label("");
+        IconComponent icon = new IconComponent("Pictures/MonopolyWinner.png"); // Icon mit Textur erstellen
+        icon.setIconScale(1); // Skalierung des Bildes
+        imageLabel.setIcon(icon);
+
+        // Setze das Icon im Label
+        inputContainer.addChild(imageLabel);
+
+        Button cancelButton = inputContainer.addChild(new Button("Spiel beenden"));
+        cancelButton.addClickCommands(source -> ifTopDialog(app::closeApp));
+        
+        inputContainer.setLocalTranslation(300, 800, 0);
+        app.getGuiNode().attachChild(inputContainer);
+    }
+}
+

Projekte/monopoly/model/src/main/java/pp/monopoly/MonopolyConfig.java

@@ -7,13 +7,10 @@
 
 package pp.monopoly;
 
-import pp.util.config.Config;
-
-import java.util.Map;
-import java.util.TreeMap;
-
 import static java.lang.Math.max;
 
+import pp.util.config.Config;
+
 /**
  * Provides access to the configuration settings for the Monopoly game.
  * <p>
@@ -31,19 +28,19 @@ public class MonopolyConfig extends Config {
      * The default port number for the Monopoly server.
      */
     @Property("port")
-    private int port = 1234;
+    private int port = 42069;
 
     /**
      * The width of the game map in terms of grid units.
      */
     @Property("map.width")
-    private int mapWidth = 10;
+    private int mapWidth = 12;
 
     /**
      * The height of the game map in terms of grid units.
      */
     @Property("map.height")
-    private int mapHeight = 10;
+    private int mapHeight = 12;
 
     /**
      * Creates an instance of {@code MonopolyConfig} with default settings.

Projekte/monopoly/model/src/main/java/pp/monopoly/game/client/ActiveState.java

@@ -0,0 +1,8 @@
+package pp.monopoly.game.client;
+
+public class ActiveState extends ClientState{
+
+    ActiveState(ClientGameLogic logic) {
+        super(logic);
+    }
+}

Projekte/monopoly/model/src/main/java/pp/monopoly/game/client/ClientGameLogic.java

@@ -1,12 +1,11 @@
-////////////////////////////////////////
-// Programming project code
-// UniBw M, 2022, 2023, 2024
-// www.unibw.de/inf2
-// (c) Mark Minas (mark.minas@unibw.de)
-////////////////////////////////////////
-
 package pp.monopoly.game.client;
 
+import java.lang.System.Logger;
+import java.lang.System.Logger.Level;
+import java.util.ArrayList;
+import java.util.List;
+
+import pp.monopoly.game.server.Player;
 import pp.monopoly.message.client.ClientMessage;
 import pp.monopoly.message.server.BuyPropertyResponse;
 import pp.monopoly.message.server.DiceResult;
@@ -14,15 +13,16 @@ import pp.monopoly.message.server.EventDrawCard;
 import pp.monopoly.message.server.GameOver;
 import pp.monopoly.message.server.GameStart;
 import pp.monopoly.message.server.JailEvent;
+import pp.monopoly.message.server.NextPlayerTurn;
 import pp.monopoly.message.server.PlayerStatusUpdate;
 import pp.monopoly.message.server.ServerInterpreter;
 import pp.monopoly.message.server.TimeOutWarning;
 import pp.monopoly.message.server.TradeReply;
 import pp.monopoly.message.server.TradeRequest;
-import pp.monopoly.message.server.UpdatePlayerAssets;
 import pp.monopoly.message.server.ViewAssetsResponse;
-import pp.monopoly.model.IntPoint;
 import pp.monopoly.model.Board;
+import pp.monopoly.model.IntPoint;
+import pp.monopoly.model.fields.BoardManager;
 import pp.monopoly.notification.ClientStateEvent;
 import pp.monopoly.notification.GameEvent;
 import pp.monopoly.notification.GameEventBroker;
@@ -31,29 +31,30 @@ import pp.monopoly.notification.InfoTextEvent;
 import pp.monopoly.notification.Sound;
 import pp.monopoly.notification.SoundEvent;
 
-import java.io.File;
-import java.io.IOException;
-import java.lang.System.Logger;
-import java.lang.System.Logger.Level;
-import java.util.ArrayList;
-import java.util.List;
-
-import static java.lang.Math.max;
-
 /**
  * Controls the client-side game logic for Monopoly.
- * Manages the player's placement, interactions with the map, and response to server messages.
+ * Handles interactions with the server and game state management on the client side.
  */
 public class ClientGameLogic implements ServerInterpreter, GameEventBroker {
+
+    /** Logger for the client-side game logic. */
     static final Logger LOGGER = System.getLogger(ClientGameLogic.class.getName());
+
+    /** The object responsible for sending messages to the server. */
     private final ClientSender clientSender;
+
+    /** A list of listeners to receive game events. */
     private final List<GameEventListener> listeners = new ArrayList<>();
-    private Board ownMap;
-    private Board harbor;
-    private Board opponentMap;
-    private ClientState state = new ClientState(this) {
-        
-    };
+
+    /** The game board representing the player's current state. */
+    private Board board;
+
+    /** The current state of the client game logic. */
+    private ClientState state = new LobbyState(this);
+
+    private List<Player> players;
+
+    private BoardManager boardManager = new BoardManager();
 
     /**
      * Constructs a ClientGameLogic with the specified sender object.
@@ -64,8 +65,18 @@ public class ClientGameLogic implements ServerInterpreter, GameEventBroker {
         this.clientSender = clientSender;
     }
 
+    /**
+     * Reutns the BoardManager
+     * @return the boardManager
+     */
+    public BoardManager getBoardManager() {
+        return boardManager;
+    }
+    
     /**
      * Returns the current state of the game logic.
+     *
+     * @return the current state
      */
     ClientState getState() {
         return state;
@@ -83,13 +94,17 @@ public class ClientGameLogic implements ServerInterpreter, GameEventBroker {
         state.entry();
     }
 
+    public List<Player> getPlayers() {
+        return players;
+    }
+
     /**
-     * Returns the player's own map.
+     * Returns the player's game board.
      *
-     * @return the player's own map
+     * @return the player's game board
      */
-    public Board getMap() {
-        return ownMap;
+    public Board getBoard() {
+        return board;
     }
 
     /**
@@ -113,32 +128,24 @@ public class ClientGameLogic implements ServerInterpreter, GameEventBroker {
     /**
      * Emits an event to play the specified sound.
      *
-     * @param sound the sound to be played.
+     * @param sound the sound to be played
      */
     public void playSound(Sound sound) {
         notifyListeners(new SoundEvent(sound));
     }
 
-    /**
-     * Loads a map from the specified file.
-     *
-     * @param file the file to load the map from
-     * @throws IOException if an I/O error occurs
-     */
-    public void loadMap(File file) throws IOException {
-        state.loadMap(file);
-    }
-
     /**
      * Sends a message to the server.
      *
      * @param msg the message to be sent
      */
-    void send(ClientMessage msg) {
-        if (clientSender == null)
+    public void send(ClientMessage msg) {
+        if (clientSender == null) {
             LOGGER.log(Level.ERROR, "trying to send {0} with sender==null", msg); //NON-NLS
-        else
+        } else {
             clientSender.send(msg);
+            System.out.println("Message gesendet");
+        }
     }
 
     /**
@@ -170,12 +177,13 @@ public class ClientGameLogic implements ServerInterpreter, GameEventBroker {
         synchronized (this) {
             copy = new ArrayList<>(listeners);
         }
-        for (GameEventListener listener : copy)
+        for (GameEventListener listener : copy) {
             event.notifyListener(listener);
+        }
     }
 
     /**
-     * Called once per frame by the update loop.
+     * Updates the game logic once per frame in the update loop.
      *
      * @param delta time in seconds since the last update call
      */
@@ -183,75 +191,157 @@ public class ClientGameLogic implements ServerInterpreter, GameEventBroker {
         state.update(delta);
     }
 
+    /**
+     * Handles the response for buying a property.
+     *
+     * @param msg the message containing the buy property response
+     */
     @Override
     public void received(BuyPropertyResponse msg) {
-        // TODO Auto-generated method stub
-        throw new UnsupportedOperationException("Unimplemented method 'received'");
+        if (msg.isSuccessful()) {
+            setInfoText("You successfully bought " + msg.getPropertyName() + "!");
+            playSound(Sound.MONEY_LOST);
+        } else {
+            setInfoText("Unable to buy " + msg.getPropertyName() + ". Reason: " + msg.getReason());
+        }
     }
 
+    /**
+     * Handles the result of a dice roll.
+     *
+     * @param msg the message containing the dice roll result
+     */
     @Override
     public void received(DiceResult msg) {
-        // TODO Auto-generated method stub
-        throw new UnsupportedOperationException("Unimplemented method 'received'");
+        setInfoText("You rolled a " + msg.calcTotal() + "!");
+        //Set the dice images
+        playSound(Sound.DICE_ROLL);
     }
 
+    /**
+     * Handles drawing an event card.
+     *
+     * @param msg the message containing the drawn card details
+     */
     @Override
     public void received(EventDrawCard msg) {
-        // TODO Auto-generated method stub
-        throw new UnsupportedOperationException("Unimplemented method 'received'");
+        setInfoText("Event card drawn: " + msg.getCardDescription());
+        // Kartenlogik
+        playSound(Sound.EVENT_CARD);
     }
 
+    /**
+     * Handles the game over message.
+     *
+     * @param msg the message containing game over details
+     */
     @Override
     public void received(GameOver msg) {
-        // TODO Auto-generated method stub
-        throw new UnsupportedOperationException("Unimplemented method 'received'");
+        if (msg.isWinner()) {
+            setInfoText("Congratulations! You have won the game!");
+            //Winner popup
+            playSound(Sound.WINNER);
+        } else {
+            setInfoText("Game over. Better luck next time!");
+            // Looser popup
+            playSound(Sound.LOSER);
+        }
     }
 
+    /**
+     * Handles the start of the game.
+     *
+     * @param msg the game start message
+     */
     @Override
     public void received(GameStart msg) {
-        // TODO Auto-generated method stub
-        throw new UnsupportedOperationException("Unimplemented method 'received'");
+        players = msg.getPlayers();
+        setInfoText("The game has started! Good luck!");
+        setState(new WaitForTurnState(this));
     }
 
+    /**
+     * Handles jail-related events.
+     *
+     * @param msg the message containing jail event details
+     */
     @Override
     public void received(JailEvent msg) {
-        // TODO Auto-generated method stub
-        throw new UnsupportedOperationException("Unimplemented method 'received'");
+        if (msg.isGoingToJail()) {
+            setInfoText("You are sent to jail!");
+            playSound(Sound.GULAG);
+        } else {
+            setInfoText("You are out of jail!");
+        }
     }
 
+    /**
+     * Updates the status of a player.
+     *
+     * @param msg the message containing player status update details
+     */
     @Override
     public void received(PlayerStatusUpdate msg) {
-        // TODO Auto-generated method stub
-        throw new UnsupportedOperationException("Unimplemented method 'received'");
+        
+        setInfoText("Player " + msg.getPlayerName() + " status updated: " + msg.getStatus());
     }
 
+    /**
+     * Handles timeout warnings.
+     *
+     * @param msg the message containing timeout warning details
+     */
     @Override
     public void received(TimeOutWarning msg) {
-        // TODO Auto-generated method stub
-        throw new UnsupportedOperationException("Unimplemented method 'received'");
-    }
-
-    @Override
-    public void received(UpdatePlayerAssets msg) {
-        // TODO Auto-generated method stub
-        throw new UnsupportedOperationException("Unimplemented method 'received'");
+        setInfoText("Warning! Time is running out. You have " + msg.getRemainingTime() + " seconds left.");
     }
 
+    /**
+     * Displays the player's assets in response to a server query.
+     *
+     * @param msg the message containing the player's assets
+     */
     @Override
     public void received(ViewAssetsResponse msg) {
-        // TODO Auto-generated method stub
-        throw new UnsupportedOperationException("Unimplemented method 'received'");
+        setInfoText("Your current assets are being displayed.");
     }
 
+    /**
+     * Handles trade replies from other players.
+     *
+     * @param msg the message containing the trade reply
+     */
     @Override
     public void received(TradeReply msg) {
-        // TODO Auto-generated method stub
-        throw new UnsupportedOperationException("Unimplemented method 'received'");
+        if (msg.getTradeHandler().getStatus()) {
+            setInfoText("Trade accepted by " + msg.getTradeHandler().getReceiver().getName() + ".");
+            playSound(Sound.TRADE_ACCEPTED);
+        } else {
+            setInfoText("Trade rejected by " + msg.getTradeHandler().getReceiver().getName() + ".");
+            playSound(Sound.TRADE_REJECTED);
+        }
     }
 
+    /**
+     * Handles trade requests from other players.
+     *
+     * @param msg the message containing the trade request details
+     */
     @Override
     public void received(TradeRequest msg) {
-        // TODO Auto-generated method stub
-        throw new UnsupportedOperationException("Unimplemented method 'received'");
+        setInfoText("Trade offer received from " + msg.getTradeHandler().getSender().getName());
+        // playSound(Sound.TRADE_REQUEST); no sound effect
+        // notifyListeners();
+    }
+
+    /**
+     * Handles the transition to the next player's turn.
+     *
+     * @param msg the message indicating it's the next player's turn
+     */
+    @Override
+    public void received(NextPlayerTurn msg) {
+        setInfoText("It's your turn!");
+        setState(new ActiveState(this));
     }
 }

Projekte/monopoly/model/src/main/java/pp/monopoly/game/client/LobbyState.java

@@ -0,0 +1,8 @@
+package pp.monopoly.game.client;
+
+public class LobbyState extends ClientState{
+
+    LobbyState(ClientGameLogic logic) {
+        super(logic);
+    }
+}

Projekte/monopoly/model/src/main/java/pp/monopoly/game/client/MonopolyClientConfig.java

@@ -7,13 +7,9 @@
 
 package pp.monopoly.game.client;
 
-import pp.monopoly.MonopolyConfig;
-import pp.monopoly.model.IntPoint;
-
 import java.io.File;
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
+
+import pp.monopoly.MonopolyConfig;
 
 /**
  * Class providing access to the Monopoly client configuration.

Projekte/monopoly/model/src/main/java/pp/monopoly/game/client/WaitForTurnState.java

@@ -0,0 +1,8 @@
+package pp.monopoly.game.client;
+
+public class WaitForTurnState extends ClientState{
+
+    WaitForTurnState(ClientGameLogic logic) {
+        super(logic);
+    }
+}

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

@@ -10,10 +10,12 @@ package pp.monopoly.game.server;
 import java.util.List;
 import java.util.Random;
 
+import com.jme3.network.serializing.Serializable;
+
 import pp.monopoly.message.server.DiceResult;
 import pp.monopoly.model.FieldVisitor;
 import pp.monopoly.model.Figure;
-import pp.monopoly.model.card.DeckHelper;
+import pp.monopoly.model.card.Card;
 import pp.monopoly.model.fields.BuildingProperty;
 import pp.monopoly.model.fields.EventField;
 import pp.monopoly.model.fields.FineField;
@@ -28,11 +30,11 @@ import pp.monopoly.model.fields.WacheField;
 /**
  * Class representing a player
  */
+@Serializable
 public class Player implements FieldVisitor<Void>{
     private final int id;
     private String name;
-    private PlayerColor color;
-    private int accountBalance = 0;
+    private int accountBalance = 15000;
     private Figure figure;
     private List<PropertyField> properties;
     private int getOutOfJailCard;
@@ -41,6 +43,14 @@ public class Player implements FieldVisitor<Void>{
     private final PlayerHandler handler;
     private PlayerState state = new LobbyState();
 
+    /**
+     * Default constructor for serialization purposes.
+     */
+    private Player(){
+        id = 0;
+        handler = null;
+    }
+
     /**
      * Constructs a player with the speciefied params
      * @param id the id of the player
@@ -63,20 +73,38 @@ public class Player implements FieldVisitor<Void>{
         this.handler = handler;
     }
 
+    public void setFigure(Figure figure) {
+        this.figure = figure;
+    }
+
+    public PlayerColor getColor() {
+        switch ((id%6)+1) {
+            case 1: return PlayerColor.BLUE;
+            case 2: return PlayerColor.GREEN_DARK;
+            case 3: return PlayerColor.GREEN_LIGHT;
+            case 4: return PlayerColor.PINK;
+            case 5: return PlayerColor.RED;
+            case 6: return PlayerColor.YELLOW;
+        
+            default:
+                return null;
+        }
+    }
+
     /**
      * Set the name of the Player
      * @param name the new name
      */
-    void setName(String name) {
+    public void setName(String name) {
         this.name = name;
     }
 
     /**
-     * Set the PlayerColor
-     * @param color the color to be set to
+     * Retuns the Playerhandler
+     * @return the Playerhandler
      */
-    void setColor(PlayerColor color) {
-        this.color = color;
+    public PlayerHandler getHandler() {
+        return handler;
     }
 
     /**
@@ -94,6 +122,21 @@ public class Player implements FieldVisitor<Void>{
     public int getFieldID() {
         return fieldID;
     }
+    void setActive() {
+        state = new ActiveState();
+    }
+
+    boolean finishTurn() {
+        if(canFinishTurn()) {
+            state = new WaitForTurnState();
+            return true;
+        }
+        else return false;
+    }
+
+    boolean canFinishTurn() {
+        return accountBalance >= 0;
+    }
 
     /**
      * Moves by the specified amount of steps
@@ -115,9 +158,11 @@ public class Player implements FieldVisitor<Void>{
             fieldID = fieldID%40;
             earnMoney(2000);
         }
+        figure.moveTo(fieldID);
         return fieldID;
     }
 
+
     /**
      * Gets all the properties owned by this player
      * @return List of all properties owned by this player
@@ -134,6 +179,7 @@ public class Player implements FieldVisitor<Void>{
     public void buyProperty(PropertyField property) {
         if (property.getOwner() == null && accountBalance >= property.getPrice()) {
             properties.add(property);
+            property.setOwner(this);
             pay(property.getPrice());
         }
     }
@@ -149,6 +195,14 @@ public class Player implements FieldVisitor<Void>{
         }
     }
 
+    /**
+     * Set the account Balance
+     * @param accountBalance the amount to be set to
+     */
+    public void setAccountBalance(int accountBalance) {
+        this.accountBalance = accountBalance;
+    }
+
     /**
      * Gets this players current accountBalanece
      * @return the amount of money currently owned by this player
@@ -264,7 +318,8 @@ public class Player implements FieldVisitor<Void>{
 
     @Override
     public Void visit(EventField field) {
-        DeckHelper.drawCard();
+        Card c = getHandler().getLogic().getDeckHelper().drawCard();
+        getHandler().getLogic().getDeckHelper().visit(c, this);
         return null;
     }
 
@@ -307,6 +362,26 @@ public class Player implements FieldVisitor<Void>{
         return count;
     }
 
+    public int getNumHouses() {
+        int total = 0;
+        for (PropertyField field : properties) {
+            if (field.getClass() == BuildingProperty.class) {
+                total += ((BuildingProperty) field).getHouses();
+            }
+        }
+        return total;
+    }
+
+    public int getNumHotels() {
+        int total = 0;
+        for (PropertyField field : properties) {
+            if (field.getClass() == BuildingProperty.class) {
+                total += ((BuildingProperty) field).getHotel();
+            }
+        }
+        return total;
+    }
+
         /**
      * Inner class for dice functionality in the game.
      * Rolls random dice values.
@@ -440,47 +515,19 @@ public class Player implements FieldVisitor<Void>{
         }
         
     }
-
-    private class BankruptState implements PlayerState {
-
-        @Override
-        public DiceResult rollDice() {
-            // TODO Auto-generated method stub
-            throw new UnsupportedOperationException("Unimplemented method 'rollDice'");
-        }
-
-        @Override
-        public void payBail() {
-            // TODO Auto-generated method stub
-            throw new UnsupportedOperationException("Unimplemented method 'payBail'");
-        }
-
-        @Override
-        public void useJailCard() {
-            // TODO Auto-generated method stub
-            throw new UnsupportedOperationException("Unimplemented method 'useJailCard'");
-        }
-        
-    }
-
     private class WaitForTurnState implements PlayerState {
 
         @Override
         public DiceResult rollDice() {
-            // TODO Auto-generated method stub
-            throw new UnsupportedOperationException("Unimplemented method 'rollDice'");
+            throw new UnsupportedOperationException("not allowed");
         }
 
         @Override
         public void payBail() {
-            // TODO Auto-generated method stub
-            throw new UnsupportedOperationException("Unimplemented method 'payBail'");
         }
 
         @Override
         public void useJailCard() {
-            // TODO Auto-generated method stub
-            throw new UnsupportedOperationException("Unimplemented method 'useJailCard'");
         }
         
     }

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

@@ -2,17 +2,30 @@ package pp.monopoly.game.server;
 
 import java.util.LinkedList;
 import java.util.Collection;
+import java.util.Collections;
 import java.util.HashSet;
 import java.util.List;
 import java.util.NoSuchElementException;
 import java.util.Set;
+
+import com.jme3.network.serializing.Serializable;
+
+import pp.monopoly.model.LimitedLinkedList;
 /**
  * A class for helping with player actions and managing thier turns
  */
+@Serializable
 public class PlayerHandler {
-    private List<Player> players = new LinkedList<>();
+    private List<Player> players = new LimitedLinkedList<>(6);
     private Set<Player> readyPlayers = new HashSet<>();
     private ServerGameLogic logic;
+    private Player hostPlayer;
+    private Player extra = null;
+
+    /**
+     * Default constructor for serialization purposes.
+     */
+    private PlayerHandler() {}
 
     /**
      * Contructs a PlayerHandler
@@ -42,6 +55,14 @@ public class PlayerHandler {
         players.addAll(players);
     }
 
+    /**
+     * Return the host player
+     * @return the host player
+     */
+    public Player getHostPlayer() {
+        return hostPlayer;
+    }
+
     /**
      * Return the number of players
      * @return number of players in the game
@@ -50,6 +71,14 @@ public class PlayerHandler {
         return players.size();
     }
 
+    /**
+     * Retuns all players
+     * @return List of all players
+     */
+    public List<Player> getPlayers() {
+        return players;
+    }
+
     /**
      * Chechs if all players are ready to start the game
      * @return {@code true} if all players are ready, otherwise {@code false}
@@ -85,6 +114,9 @@ public class PlayerHandler {
             throw new IllegalArgumentException("Player already registered");
         }
         players.add(player);
+        if(hostPlayer == null) {
+            hostPlayer = player;
+        }
     }
 
     /**
@@ -108,16 +140,23 @@ public class PlayerHandler {
      * Completes a player turn and return the next player
      * @return the next players who is active
      */
-    Player nextPlayer() {
-        players.addLast(players.removeFirst());
-        return players.getFirst();
+    public Player nextPlayer() {
+        Player tmp = players.get(0);
+        if (extra != null) {
+            tmp = extra;
+            extra = null;
+            return tmp;
+        }
+        players.remove(0);
+        players.add(tmp);
+        return players.get(0);
     }
 
     /**
      * Returns the {@link ServerGameLogic} of this PlayerHandler
      * @return the {@link ServerGameLogic} of this PlayerHandler
      */
-    ServerGameLogic getLogic() {
+    public ServerGameLogic getLogic() {
         return logic;
     }
 
@@ -126,10 +165,32 @@ public class PlayerHandler {
      * @param id the id to be searched for
      * @return the player with the required id
      */
-    Player getPlayerById(int id) {
+    public Player getPlayerById(int id) {
         for (Player player : players) {
             if (player.getId() == id) return player;
         }
         throw new NoSuchElementException("Player mit id "+id+" existiert nicht");
     }
+
+    /**
+     * Arranges the players turns in a random order.
+     * Shuffles the players and sets their state to WaitForNextTurn, the first one will be active
+     */
+    void randomOrder() {
+        Collections.shuffle(players);
+        for (Player player : players) {
+            player.finishTurn();
+        }
+        players.get(0).setActive();
+    }
+
+    public void setStartBalance(int amount) {
+        for (Player player : players) {
+            player.setAccountBalance(amount);
+        }
+    }
+
+    public void extraTurn(Player player) {
+        if (players.contains(player)) extra = player;
+    }
 }

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

@@ -1,17 +1,31 @@
 package pp.monopoly.game.server;
 
+import java.lang.System.Logger;
+import java.lang.System.Logger.Level;
+
 import pp.monopoly.MonopolyConfig;
-import pp.monopoly.message.client.*;
+import pp.monopoly.message.client.BuyPropertyRequest;
+import pp.monopoly.message.client.ClientInterpreter;
+import pp.monopoly.message.client.EndTurn;
+import pp.monopoly.message.client.PlayerReady;
+import pp.monopoly.message.client.RollDice;
+import pp.monopoly.message.client.TradeOffer;
+import pp.monopoly.message.client.TradeResponse;
+import pp.monopoly.message.client.ViewAssetsRequest;
+import pp.monopoly.message.server.GameStart;
+import pp.monopoly.message.server.NextPlayerTurn;
+import pp.monopoly.message.server.PlayerStatusUpdate;
 import pp.monopoly.message.server.ServerMessage;
 import pp.monopoly.message.server.TradeReply;
 import pp.monopoly.message.server.TradeRequest;
 import pp.monopoly.message.server.ViewAssetsResponse;
+import pp.monopoly.model.Board;
+import pp.monopoly.model.Figure;
+import pp.monopoly.model.Rotation;
+import pp.monopoly.model.card.DeckHelper;
 import pp.monopoly.model.fields.BoardManager;
 import pp.monopoly.model.fields.PropertyField;
 
-import java.lang.System.Logger;
-import java.lang.System.Logger.Level;
-
 /**
  * Controls the server-side game logic for Monopoly.
  * Manages game states, player interactions, and message handling.
@@ -22,9 +36,11 @@ public class ServerGameLogic implements ClientInterpreter {
     private final MonopolyConfig config;
     private final PlayerHandler playerHandler = new PlayerHandler(this);
     private final ServerSender serverSender;
-    private ServerState state = ServerState.CREATEGAME;
+    private ServerState state = ServerState.LOBBY;
     private static final int MAX_PLAYERS = 6;
     private BoardManager boardManager = new BoardManager();
+    private final DeckHelper deckHelper = new DeckHelper();
+    private int startMoney;
 
     /**
      * Constructs a ServerGameLogic instance with the specified sender and configuration.
@@ -95,6 +111,32 @@ public class ServerGameLogic implements ClientInterpreter {
         return player;
     }
 
+    /**
+     * Adds a new player to the game if the game is in the LOBBY state and the maximum
+     * player limit has not been reached.
+     *
+     * @param id the id of the player to add to the game
+     * @return the added Player, or null if the player could not be added
+     */
+    public Player addPlayer(int id) {
+        Player player = new Player(id, playerHandler);
+        if (state != ServerState.LOBBY) {
+            LOGGER.log(Level.WARNING, "Cannot add player; game is not in LOBBY state.");
+            return null;
+        }
+
+        if (playerHandler.getPlayerCount() >= MAX_PLAYERS) {
+            LOGGER.log(Level.WARNING, "Cannot add player; maximum player limit reached.");
+            return null;
+        }
+
+        playerHandler.addPlayer(player);
+        LOGGER.log(Level.DEBUG, "Player added: {0}", player.getId());
+        System.out.println("Anzahl Spieler verbunden:"+ playerHandler.getPlayerCount());
+
+        return player;
+    }
+
     /**
      * Handles a BuyPropertyRequest from a player, allowing the player to purchase a property
      * if it is unowned and they have sufficient funds.
@@ -129,8 +171,12 @@ public class ServerGameLogic implements ClientInterpreter {
     public void received(EndTurn msg, int from) {
         Player player = playerHandler.getPlayerById(from);
         if (player != null && state == ServerState.INGAME) {
-            LOGGER.log(Level.DEBUG, "Ending turn for player {0}", player.getName());
-            playerHandler.nextPlayer();
+            if (player.finishTurn()) {
+                LOGGER.log(Level.DEBUG, "Ending turn for player {0}", player.getName());
+                Player next = playerHandler.nextPlayer();
+                next.setActive();
+                send(next, new NextPlayerTurn(next));
+            }
         }
     }
 
@@ -143,12 +189,26 @@ public class ServerGameLogic implements ClientInterpreter {
     @Override
     public void received(PlayerReady msg, int from) {
         Player player = playerHandler.getPlayerById(from);
+        if(player == playerHandler.getHostPlayer()) {
+            startMoney = msg.getStartMoney();
+        }
+
         if (player != null) {
             player.setName(msg.getName());
-            player.setColor(msg.getColor());
-            player.setName(msg.getName());
+            player.setFigure(new Figure(1, -10, -10, Rotation.LEFT, msg.getFigure()));
+            //TODO add figure to the map
+            playerHandler.setPlayerReady(player, true);    
             LOGGER.log(Level.DEBUG, "Player {0} is ready", player.getName());
         }
+
+        if(playerHandler.allPlayersReady()) {
+            playerHandler.setStartBalance(startMoney);
+            for (Player p : playerHandler.getPlayers()) {
+               send(p, new GameStart(playerHandler.getPlayers())); 
+            }
+            playerHandler.randomOrder();
+            send(playerHandler.getPlayerAtIndex(0), new NextPlayerTurn(playerHandler.getPlayerAtIndex(0)));
+        }
     }
 
     /**
@@ -207,11 +267,12 @@ public class ServerGameLogic implements ClientInterpreter {
      */
     @Override
     public void received(ViewAssetsRequest msg, int from) {
-        Player player = playerHandler.getPlayerById(from);
-        if (player != null) {
-            LOGGER.log(Level.DEBUG, "Processing ViewAssetsRequest for player {0}", player.getName());
+        Player sender = playerHandler.getPlayerById(from);
+        Player player = msg.getPlayer();
+        if (sender != null && player != null) {
+            LOGGER.log(Level.DEBUG, "Processing ViewAssetsRequest for player {0}", sender.getName());
             
-            send(player, new ViewAssetsResponse(player.getProperties(), player.getAccountBalance(), player.getNumJailCard()));
+            send(sender, new ViewAssetsResponse(boardManager, player.getProperties(), player.getAccountBalance(), player.getNumJailCard()));
         }
     }
 
@@ -223,4 +284,12 @@ public class ServerGameLogic implements ClientInterpreter {
     public BoardManager getBoardManager() {
         return boardManager;
     }
+
+    public Player getPlayerById(int id) {
+        return playerHandler.getPlayerById(id);
+    }
+
+    public DeckHelper getDeckHelper() {
+        return deckHelper;
+    }
 }

Projekte/monopoly/model/src/main/java/pp/monopoly/message/client/BuyPropertyRequest.java

@@ -1,11 +1,19 @@
 package pp.monopoly.message.client;
 
+import com.jme3.network.serializing.Serializable;
+
 /**
  * Represents a request from a player to buy a property.
  */
+@Serializable
 public class BuyPropertyRequest extends ClientMessage{
     private int propertyId;
 
+    /**
+     * Default constructor for serialization purposes.
+     */
+    private BuyPropertyRequest() { /* empty */ }
+
     /**
      * Constructs a BuyPropertyRequest with the specified property ID.
      *

Projekte/monopoly/model/src/main/java/pp/monopoly/message/client/EndTurn.java

@@ -1,9 +1,18 @@
 package pp.monopoly.message.client;
+
+import com.jme3.network.serializing.Serializable;
+
 /**
  * Represents a message indicating the player wants to end their turn.
  */
+@Serializable
 public class EndTurn extends ClientMessage{
 
+    /**
+     * Default constructor for serialization purposes.
+     */
+    public EndTurn() { /* empty */ }
+
     @Override
     public void accept(ClientInterpreter interpreter, int from) {
         interpreter.received(this, from);

Projekte/monopoly/model/src/main/java/pp/monopoly/message/client/PlayerReady.java

@@ -1,49 +1,51 @@
 package pp.monopoly.message.client;
 
-import pp.monopoly.game.server.PlayerColor;
+import com.jme3.network.serializing.Serializable;
 
 /**
  * Represents a message indicating the player is ready to play.
  */
-public class PlayerReady extends ClientMessage{
+@Serializable
+public class PlayerReady extends ClientMessage {
     private boolean isReady;
     private String name;
-    private PlayerColor color;
+    private String figure;
+    private int startMoney;
+
+    /**
+     * Default constructor for serialization purposes.
+     */
+    private PlayerReady() { /* empty */ }
 
     /**
      * Constructs a PlayerReady message.
      *
      * @param isReady true if the player is ready, false otherwise
+     * @param name    the name of the player
+     * @param color   the color of the player (can be null)
      */
-    public PlayerReady(boolean isReady) {
+    public PlayerReady(boolean isReady, String name, String figure, int startMoney) {
         this.isReady = isReady;
+        this.name = name;
+        this.figure = figure;
+        this.startMoney = startMoney;
     }
 
-    /**
-     * Getter for the Name
-     * @return the Name
-     */
     public String getName() {
         return name;
     }
 
-    /**
-     * Getter for the Playercolor
-     * @return the Playercolor
-     */
-    public PlayerColor getColor() {
-        return color;
+    public String getFigure() {
+        return figure;
     }
 
-    /**
-     * Checks if the player is ready.
-     *
-     * @return true if ready, false otherwise
-     */
     public boolean isReady() {
         return isReady;
     }
 
+    public int getStartMoney() {
+        return startMoney;
+    }
 
     @Override
     public void accept(ClientInterpreter interpreter, int from) {

Projekte/monopoly/model/src/main/java/pp/monopoly/message/client/RollDice.java

@@ -1,9 +1,18 @@
 package pp.monopoly.message.client;
+
+import com.jme3.network.serializing.Serializable;
+
 /**
  * Represents a message requesting to roll the dice.
  */
+@Serializable
 public class RollDice extends ClientMessage{
 
+    /**
+     * Default constructor for serialization purposes.
+     */
+    private RollDice() { /* empty */ }
+
     @Override
     public void accept(ClientInterpreter interpreter, int from) {
         interpreter.received(this, from);

Projekte/monopoly/model/src/main/java/pp/monopoly/message/client/TradeOffer.java

@@ -1,14 +1,21 @@
 package pp.monopoly.message.client;
 
+import com.jme3.network.serializing.Serializable;
+
 import pp.monopoly.model.TradeHandler;
 
 /**
  * Represents a trade Request message from one player to another.
  */
+@Serializable
 public class TradeOffer extends ClientMessage{
     private int receiverId;
     private TradeHandler tradehandler;
 
+    /**
+     * Default constructor for serialization purposes.
+     */
+    private TradeOffer() { /* empty */ }
 
     /**
      * Constructs a TradeOffer with the specified details.

Projekte/monopoly/model/src/main/java/pp/monopoly/message/client/TradeResponse.java

@@ -1,14 +1,22 @@
 package pp.monopoly.message.client;
 
+import com.jme3.network.serializing.Serializable;
+
 import pp.monopoly.model.TradeHandler;
 
 /**
  * Represents a response to a trade offer.
  */
+@Serializable
 public class TradeResponse extends ClientMessage{
     private int initiatorId;
     private TradeHandler tradeHandler;
 
+    /**
+     * Default constructor for serialization purposes.
+     */
+    private TradeResponse() { /* empty */ }
+
     /**
      * Constructs a TradeResponse with the specified response details.
      *

Projekte/monopoly/model/src/main/java/pp/monopoly/message/client/ViewAssetsRequest.java

@@ -1,12 +1,33 @@
 package pp.monopoly.message.client;
+
+import com.jme3.network.serializing.Serializable;
+
+import pp.monopoly.game.server.Player;
+
 /**
  * Represents a request from a player to view their assets.
  */
+@Serializable
 public class ViewAssetsRequest extends ClientMessage{
 
+    private Player player;
+
+    /**
+     * Default constructor for serialization purposes.
+     */
+    private ViewAssetsRequest() { /* empty */ }
+
+    public ViewAssetsRequest(Player player) {
+        this.player = player;
+    }
+
     @Override
     public void accept(ClientInterpreter interpreter, int from) {
         interpreter.received(this, from);
     }
 
+    public Player getPlayer() {
+        return player;
+    }
+
 }

Projekte/monopoly/model/src/main/java/pp/monopoly/message/server/BuyPropertyResponse.java

@@ -1,11 +1,42 @@
 package pp.monopoly.message.server;
 
+import com.jme3.network.serializing.Serializable;
+
+/**
+ * Represents the server's response to a player's request to buy a property.
+ */
+@Serializable
 public class BuyPropertyResponse extends ServerMessage{
+    private boolean successful;
+    private String propertyName;
+    private String reason; // Reason for failure, if any
+
+    /**
+     * Default constructor for serialization purposes.
+     */
+    private BuyPropertyResponse() { /* empty */ }
+
+    public BuyPropertyResponse(boolean successful, String propertyName, String reason) {
+        this.successful = successful;
+        this.propertyName = propertyName;
+        this.reason = reason;
+    }
+
+    public boolean isSuccessful() {
+        return successful;
+    }
+
+    public String getPropertyName() {
+        return propertyName;
+    }
+
+    public String getReason() {
+        return reason;
+    }
 
     @Override
     public void accept(ServerInterpreter interpreter) {
-        // TODO Auto-generated method stub
-        throw new UnsupportedOperationException("Unimplemented method 'accept'");
+        interpreter.received(this);
     }
 
     @Override
@@ -13,5 +44,4 @@ public class BuyPropertyResponse extends ServerMessage{
         // TODO Auto-generated method stub
         throw new UnsupportedOperationException("Unimplemented method 'getInfoTextKey'");
     }
-
 }

Projekte/monopoly/model/src/main/java/pp/monopoly/message/server/DiceResult.java

@@ -2,10 +2,18 @@ package pp.monopoly.message.server;
 
 import java.util.List;
 
+import com.jme3.network.serializing.Serializable;
+
+@Serializable
 public class DiceResult extends ServerMessage{
 
     private List<Integer> rollResult;
 
+    /**
+     * Default constructor for serialization purposes.
+     */
+    private DiceResult() { /* empty */ }
+
     public DiceResult(List<Integer> rollResult) {
         this.rollResult = rollResult;
     }

Projekte/monopoly/model/src/main/java/pp/monopoly/message/server/EventDrawCard.java

@@ -1,6 +1,19 @@
 package pp.monopoly.message.server;
 
+import com.jme3.network.serializing.Serializable;
+
+@Serializable
 public class EventDrawCard extends ServerMessage{
+    private String cardDescription;
+
+    /**
+     * Default constructor for serialization purposes.
+     */
+    private EventDrawCard() { /* empty */ }
+
+    public EventDrawCard(String cardDescription) {
+        this.cardDescription = cardDescription;
+    }
 
     @Override
     public void accept(ServerInterpreter interpreter) {
@@ -13,4 +26,8 @@ public class EventDrawCard extends ServerMessage{
         throw new UnsupportedOperationException("Unimplemented method 'getInfoTextKey'");
     }
 
+    public String getCardDescription() {
+        return cardDescription;
+    }
+
 }

Projekte/monopoly/model/src/main/java/pp/monopoly/message/server/GameOver.java

@@ -1,6 +1,23 @@
 package pp.monopoly.message.server;
 
+import com.jme3.network.serializing.Serializable;
+
+@Serializable
 public class GameOver extends ServerMessage{
+    private boolean isWinner;
+
+    /**
+     * Default constructor for serialization purposes.
+     */
+    private GameOver() { /* empty */ }
+
+    public GameOver(boolean isWinner) {
+        this.isWinner = isWinner;
+    }
+
+    public boolean isWinner() {
+        return isWinner;
+    }
 
     @Override
     public void accept(ServerInterpreter interpreter) {