Update 2 files

- /Projekte/monopoly/model/src/test/java/pp/monopoly/Testhandbuch.java
- /Projekte/monopoly/model/src/test/java/pp/monopoly/game/server/ServerGameLogicTest.java

Projekte/.run/MonopolyApp.run.xml

@@ -1,18 +0,0 @@
-<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

@@ -1,17 +0,0 @@
-<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

@@ -18,11 +18,10 @@ 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.monopoly.client.gui.VolumeSlider;
-
 import static pp.util.PreferencesUtils.getPreferences;
 
 /**

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

@@ -7,23 +7,24 @@
 
 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.
@@ -31,7 +32,7 @@ import pp.dialog.SimpleDialog;
 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 = "42069"; //NON-NLS
+    private static final String DEFAULT_PORT = "1234"; //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,8 +1,6 @@
-package pp.monopoly.client.gui;
+package pp.battleship.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,
@@ -10,7 +8,7 @@ import pp.monopoly.client.GameMusic;
  */
 public class VolumeSlider extends Slider {
 
-    private final pp.monopoly.client.GameMusic music;
+    private final GameMusic music;
     private double vol;
 
     /**

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

@@ -7,11 +7,12 @@
 
 package pp.battleship;
 
-import static java.lang.Math.max;
+import pp.util.config.Config;
+
 import java.util.Map;
 import java.util.TreeMap;
 
-import pp.util.config.Config;
+import static java.lang.Math.max;
 
 /**
  * Provides access to the configuration settings for the Battleship game.
@@ -30,7 +31,7 @@ public class BattleshipConfig extends Config {
      * The default port number for the Battleship server.
      */
     @Property("port")
-    private int port = 12234;
+    private int port = 1234;
 
     /**
      * 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=42069
+port=1234
 #
 # 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,8 +1,6 @@
 // Styling of Lemur components
 // 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
@@ -22,8 +20,6 @@ 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(color(1, 1, 1, 1)) // Solid white
-def greyBackground = color(0.8, 0.8, 0.8, 1)  // Grey background color
-def redBorderColor = color(1, 0, 0, 1)        // Red border color
 
 
 
@@ -36,10 +32,9 @@ def gradient = TbtQuadBackgroundComponent.create(
 def doubleGradient = new QuadBackgroundComponent(gradientColor)
 doubleGradient.texture = texture(name: "/com/simsilica/lemur/icons/double-gradient-128.png",
         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
+        texture(name: "/com/simsilica/lemur/icons/bordered-gradient.png", // Replace with an appropriate texture if needed
                 generateMips: false),
         1, 1, 1, 126, 126,
         1f, false)
@@ -54,27 +49,11 @@ 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") {
@@ -83,10 +62,20 @@ selector("container", "pp") {
 }
 
 selector("toolbar") {
-    background = gradient.clone()
-    background.setColor(bgColor)
-    //color = (new ColorRGBA(0.4157f, 0.4235f, 0.4392f, 1.0f))
+    // Set the grey background
+    background = new QuadBackgroundComponent(greyBackground)
 
+    // Add a red border using a TbtQuadBackgroundComponent
+    def redBorder = TbtQuadBackgroundComponent.create(
+            texture(name: "/com/simsilica/lemur/icons/bordered-gradient.png",
+                    generateMips: false),
+            1, 1, 1, 1, 1,
+            1f, false)
+    redBorder.color = redBorderColor
+    background = greyBackground
+
+    // Optional: Set padding inside the toolbar
+    insets = new Insets3f(10, 10, 10, 10)
 }
 selector("slider", "pp") {
     background = gradient.clone()
@@ -155,8 +144,6 @@ selector("title", "pp") {
     background.texture = texture(name: "/com/simsilica/lemur/icons/double-gradient-128.png",
             generateMips: false)
     insets = new Insets3f(2, 2, 2, 2)
-    textHAlignment = HAlignment.Center
-    textVAlignment = VAlignment.Center
 
     buttonCommands = stdButtonCommands
 }
@@ -171,8 +158,6 @@ selector("button", "pp") {
 
     // 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
 }
 
@@ -247,41 +232,5 @@ selector("tab.button", "pp") {
 }
 selector("settings-title", "pp") {
     fontSize = 48 // Set font size
-    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
-}
-
+    background = new QuadBackgroundComponent(color(0.4157f, 0.4235f, 0.4392f, 1.0f)) // Grey background
+ }

Projekte/monopoly/client/build.gradle

@@ -9,12 +9,7 @@ dependencies {
     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,13 +5,47 @@
 ## (c) Mark Minas (mark.minas@unibw.de)
 ########################################
 #
-# Monopoly client configuration
+# 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
 #
 # 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

@@ -1,122 +0,0 @@
-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

@@ -31,17 +31,9 @@ public class GameSound extends AbstractAppState implements GameEventListener {
     private static final Preferences PREFERENCES = getPreferences(GameSound.class);
     private static final String ENABLED_PREF = "enabled"; //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;
+    private AudioNode splashSound;
+    private AudioNode shipDestroyedSound;
+    private AudioNode explosionSound;
 
     /**
      * Checks if sound is enabled in the preferences.
@@ -83,17 +75,6 @@ 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/looser.ogg");
-        buttonSound = loadSound(app, "Sound/Effects/button.ogg");
     }
 
     /**
@@ -117,97 +98,32 @@ public class GameSound extends AbstractAppState implements GameEventListener {
     }
 
     /**
-     * Plays the passStart sound effect.
+     * Plays the splash sound effect.
      */
-    public void passStart() {
-        if (isEnabled() && passStartSound != null)
-            passStartSound.playInstance();
+    public void splash() {
+        if (isEnabled() && splashSound != null)
+            splashSound.playInstance();
     }
+
     /**
-     * Plays the eventCard sound effect.
+     * Plays the explosion sound effect.
      */
-    public void eventCard() {
-        if (isEnabled() && eventCardSound != null)
-            eventCardSound.playInstance();
+    public void explosion() {
+        if (isEnabled() && explosionSound != null)
+            explosionSound.playInstance();
     }
+
     /**
-     * Plays the gulag sound effect.
+     * Plays sound effect when a ship has been destroyed.
      */
-    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();
+    public void shipDestroyed() {
+        if (isEnabled() && shipDestroyedSound != null)
+            shipDestroyedSound.playInstance();
     }
 
     @Override
     public void receivedEvent(SoundEvent event) {
         switch (event.sound()) {
-            case PASS_START -> passStart();
-            case EVENT_CARD -> eventCard();
-            case GULAG -> eventCard();
-            case DICE_ROLL -> eventCard();
-            case MONEY_COLLECTED -> eventCard();
-            case MONEY_LOST -> eventCard();
-            case TRADE_ACCEPTED -> eventCard();
-            case TRADE_REJECTED -> eventCard();
-            case WINNER -> eventCard();
-            case LOSER -> eventCard();
-            case BUTTON -> eventCard();
         }
     }
 }

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

@@ -0,0 +1,51 @@
+////////////////////////////////////////
+// Programming project code
+// UniBw M, 2022, 2023, 2024
+// www.unibw.de/inf2
+// (c) Mark Minas (mark.minas@unibw.de)
+////////////////////////////////////////
+
+package pp.monopoly.client;
+
+import java.util.prefs.Preferences;
+
+import pp.dialog.Dialog;
+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

@@ -1,437 +1,210 @@
-////////////////////////////////////////
-// 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.DebugKeysAppState;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
+
 import com.jme3.app.SimpleApplication;
-import com.jme3.app.StatsAppState;
 import com.jme3.font.BitmapFont;
 import com.jme3.font.BitmapText;
 import com.jme3.input.KeyInput;
-import com.jme3.input.MouseInput;
 import com.jme3.input.controls.ActionListener;
 import com.jme3.input.controls.KeyTrigger;
-import com.jme3.input.controls.MouseButtonTrigger;
 import com.jme3.system.AppSettings;
 import com.simsilica.lemur.GuiGlobals;
+import com.simsilica.lemur.Label;
 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.dialog.DialogBuilder;
 import pp.dialog.DialogManager;
 import pp.graphics.Draw;
+import pp.monopoly.client.gui.SettingsMenu;
+import pp.monopoly.client.gui.TestWorld;
+import pp.monopoly.game.client.ClientGameLogic;
+import pp.monopoly.game.client.MonopolyClient;
+import pp.monopoly.game.client.ServerConnection;
+import pp.monopoly.notification.GameEventListener;
+import pp.monopoly.notification.InfoTextEvent;
 
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.IOException;
-import java.lang.System.Logger;
-import java.lang.System.Logger.Level;
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.Executors;
-import java.util.logging.LogManager;
-
-import static pp.monopoly.Resources.lookup;
-
-/**
- * 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 {
-
-    /**
-     * Logger for logging messages within the application.
-     */
-    private static final Logger LOGGER = System.getLogger(MonopolyApp.class.getName());
-
+    private BitmapText topText;
+    private final ServerConnection serverConnection;
+    private final ClientGameLogic logic;
+    private final MonopolyAppConfig config;
+    private final ActionListener escapeListener = (name, isPressed, tpf) -> handleEscape(isPressed);
+    private final DialogManager dialogManager = new DialogManager(this);
+    private final ExecutorService executor = Executors.newCachedThreadPool();
+    private final Draw draw;
+    private SettingsMenu settingsMenu;
+    private TestWorld testWorld;
+    private boolean isSettingsMenuOpen = false;
+    private boolean inputBlocked = false;
     /**
      * Path to the styles script for GUI elements.
      */
     private static final String STYLES_SCRIPT = "Interface/Lemur/pp-styles.groovy"; //NON-NLS
-
     /**
      * Path to the font resource used in the GUI.
      */
     private static final String FONT = "Interface/Fonts/Default.fnt"; //NON-NLS
 
-    /**
-     * Path to the client configuration file, if one exists.
-     */
-    private static final File CONFIG_FILE = new File("client.properties");
 
-    /**
-     * Input mapping name for mouse clicks.
-     */
-    public static final String CLICK = "CLICK";
-
-    /**
-     * Input mapping name for the Escape key.
-     */
-    private static final String ESC = "ESC";
-
-    /**
-     * Manager for handling dialogs within the application.
-     */
-    private final DialogManager dialogManager = new DialogManager(this);
-
-    /**
-     * The server connection instance, used for communicating with the game server.
-     */
-    private final ServerConnection serverConnection;
-
-    /**
-     * Instance of the {@link Draw} class for rendering graphics.
-     */
-    private Draw draw;
-
-    /**
-     * Text display at the top of the GUI for showing information to the user.
-     */
-    private BitmapText topText;
-
-    /**
-     * Executor service for handling asynchronous tasks within the application.
-     */
-    private ExecutorService executor;
-
-    /**
-     * Handler for managing the client's game logic.
-     */
-    private final ClientGameLogic logic;
-
-    /**
-     * Configuration settings for the Battleship client application.
-     */
-    private final MonopolyAppConfig config;
-
-    /**
-     * Listener for handling actions triggered by the Escape key.
-     */
-    private final ActionListener escapeListener = (name, isPressed, tpf) -> escape(isPressed);
-
-    static {
-        // Configure logging
-        LogManager manager = LogManager.getLogManager();
-        try {
-            manager.readConfiguration(new FileInputStream("logging.properties"));
-            LOGGER.log(Level.INFO, "Successfully read logging properties"); //NON-NLS
-        }
-        catch (IOException e) {
-            LOGGER.log(Level.INFO, e.getMessage());
-        }
-    }
-
-    /**
-     * Starts the Battleship application.
-     *
-     * @param args Command-line arguments for launching the application.
-     */
     public static void main(String[] args) {
         new MonopolyApp().start();
     }
 
-    /**
-     * Constructs a new {@code MonopolyApp} instance.
-     * Initializes the configuration, server connection, and game logic listeners.
-     */
-    private MonopolyApp() {
+    public MonopolyApp() {
+        this.draw = new Draw(assetManager);
         config = new MonopolyAppConfig();
-        config.readFromIfExists(CONFIG_FILE);
-        serverConnection = makeServerConnection();
+        serverConnection = new NetworkSupport(this);
         logic = new ClientGameLogic(serverConnection);
         logic.addListener(this);
         setShowSettings(config.getShowSettings());
         setSettings(makeSettings());
     }
 
-    /**
-     * Creates and configures application settings from the client configuration.
-     *
-     * @return A configured {@link AppSettings} object.
-     */
-    private AppSettings makeSettings() {
-        final AppSettings settings = new AppSettings(true);
-        settings.setTitle(lookup("monopoly.name"));
-        settings.setResolution(config.getResolutionWidth(), config.getResolutionHeight());
-        settings.setFullscreen(config.fullScreen());
-        settings.setUseRetinaFrameBuffer(config.useRetinaFrameBuffer());
-        settings.setGammaCorrection(config.useGammaCorrection());
-        return settings;
-    }
-
-    /**
-     * Factory method for creating a server connection based on the current
-     * client configuration.
-     *
-     * @return A {@link ServerConnection} instance, which could be a real or mock server.
-     */
-    private ServerConnection makeServerConnection() {
-        return new NetworkSupport(this);
-    }
-
-    /**
-     * Returns the dialog manager responsible for managing in-game dialogs.
-     *
-     * @return The {@link DialogManager} instance.
-     */
-    public DialogManager getDialogManager() {
-        return dialogManager;
-    }
-
-    /**
-     * Returns the game logic handler for the client.
-     *
-     * @return The {@link ClientGameLogic} instance.
-     */
-    @Override
-    public ClientGameLogic getGameLogic() {
-        return logic;
-    }
-
-    /**
-     * Returns the current configuration settings for the Battleship client.
-     *
-     * @return The {@link BattleshipClientConfig} instance.
-     */
     @Override
     public MonopolyAppConfig getConfig() {
         return config;
     }
 
-    /**
-     * Initializes the application.
-     * Sets up input mappings, GUI, game states, and connects to the server.
-     */
     @Override
-    public void simpleInitApp() {
-        setPauseOnLostFocus(false);
-        draw = new Draw(assetManager);
-        setupInput();
-        setupStates();
-        setupGui();
-        new StartMenu(this).open();
+    public ClientGameLogic getGameLogic() {
+        return logic;
     }
 
-    /**
-     * Sets up the graphical user interface (GUI) for the application.
-     */
-    private void setupGui() {
+    private AppSettings makeSettings() {
+        final AppSettings settings = new AppSettings(true);
+        settings.setTitle("Monopoly Game");
+        settings.setResolution(config.getResolutionWidth(), config.getResolutionHeight());
+        settings.setFullscreen(config.fullScreen());
+        return settings;
+    }
+
+    @Override
+    public void simpleInitApp() {
         GuiGlobals.initialize(this);
         BaseStyles.loadStyleResources(STYLES_SCRIPT);
         GuiGlobals.getInstance().getStyles().setDefaultStyle("pp"); //NON-NLS
         final BitmapFont normalFont = assetManager.loadFont(FONT); //NON-NLS
+
+        setupInput();
+        setupGui();
+
+        // Zeige das Startmenü
+        StartMenu.createStartMenu(this);
+    }
+
+    private void setupGui() {
+        BitmapFont normalFont = assetManager.loadFont("Interface/Fonts/Default.fnt");
         topText = new BitmapText(normalFont);
-        final int height = context.getSettings().getHeight();
-        topText.setLocalTranslation(10f, height - 10f, 0f);
-        topText.setColor(config.getTopColor());
+        topText.setLocalTranslation(10, settings.getHeight() - 10, 0);
         guiNode.attachChild(topText);
     }
 
-    /**
-     * Configures input mappings and sets up listeners for user interactions.
-     */
     private void setupInput() {
         inputManager.deleteMapping(INPUT_MAPPING_EXIT);
-        inputManager.setCursorVisible(false);
-        inputManager.addMapping(ESC, new KeyTrigger(KeyInput.KEY_ESCAPE));
-        inputManager.addMapping(CLICK, new MouseButtonTrigger(MouseInput.BUTTON_LEFT));
-        inputManager.addListener(escapeListener, ESC);
+        inputManager.setCursorVisible(true);
+        inputManager.addMapping("ESC", new KeyTrigger(KeyInput.KEY_ESCAPE));
+        inputManager.addListener(escapeListener, "ESC");
     }
 
-    /**
-     * Initializes and attaches the necessary application states for the game.
-     */
-    private void setupStates() {
-        if (config.getShowStatistics()) {
-            final BitmapFont normalFont = assetManager.loadFont(FONT); //NON-NLS
-            final StatsAppState stats = new StatsAppState(guiNode, normalFont);
-            stateManager.attach(stats);
+    private void handleEscape(boolean isPressed) {
+        if (isPressed) {
+            if (settingsMenu != null && isSettingsMenuOpen) {
+                // Schließe das SettingsMenu
+                System.out.println("Schließe SettingsMenu...");
+                settingsMenu.close();
+                settingsMenu = null;
+                setSettingsMenuOpen(false);
+            } else {
+                // Öffne das SettingsMenu
+                System.out.println("Öffne SettingsMenu...");
+                settingsMenu = new SettingsMenu(this);
+                settingsMenu.open();
+                setSettingsMenuOpen(true);
+            }
         }
-        flyCam.setEnabled(false);
-        stateManager.detach(stateManager.getState(StatsAppState.class));
-        stateManager.detach(stateManager.getState(DebugKeysAppState.class));
+    }
+    
+    
 
-        attachGameSound();
-        attachGameMusic();
+    private void blockInputs() {
+        if (!inputBlocked) {
+            System.out.println("Blockiere Eingaben...");
+            inputManager.setCursorVisible(true); // Cursor sichtbar machen
+            inputManager.clearMappings();       // Alle Mappings entfernen
+            inputBlocked = true;
+        }
+    }
+    
+    public void unblockInputs() {
+        if (inputBlocked) {
+            System.out.println("Aktiviere Eingaben...");
+            setupInput(); // Standard-Eingaben neu registrieren
+            inputBlocked = false;
+        }
     }
 
-    /**
-     * Attaches the game sound state and sets its initial enabled state.
-     */
-    private void attachGameSound() {
-        final GameSound gameSound = new GameSound();
-        logic.addListener(gameSound);
-        gameSound.setEnabled(GameSound.enabledInPreferences());
-        stateManager.attach(gameSound);
+    public void setInfoText(String text) {
+        topText.setText(text);
     }
 
-    /**
-     * 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.
-     *
-     * @param tpf Time per frame in seconds.
-     */
     @Override
-    public void simpleUpdate(float tpf) {
-        super.simpleUpdate(tpf);
-        dialogManager.update(tpf);
-        logic.update(tpf);
+    public void receivedEvent(InfoTextEvent event) {
+        setInfoText(event.key());
     }
 
-    /**
-     * Handles the Escape key action to either close the top dialog or show the main menu.
-     *
-     * @param isPressed Indicates whether the Escape key is pressed.
-     */
-    private void escape(boolean isPressed) {
-        if (!isPressed) return;
-        if (dialogManager.showsDialog())
-            dialogManager.escape();
-        else
-            new SettingsMenu(this).open();
+    @Override
+    public void stop(boolean waitFor) {
+        if (executor != null) executor.shutdownNow();
+        serverConnection.disconnect();
+        super.stop(waitFor);
+    }
+
+    public DialogManager getDialogManager() {
+        return dialogManager;
     }
 
-    /**
-     * Returns the {@link Draw} instance used for rendering graphical elements in the game.
-     *
-     * @return The {@link Draw} instance.
-     */
     public Draw getDraw() {
         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.
-     *
-     * @param esc If true, the request is due to the ESC key being pressed.
-     */
-    @Override
-    public void requestClose(boolean esc) { /* do nothing */ }
-
-    /**
-     * Closes the application, displaying a confirmation dialog if the client is connected to a server.
-     */
-    public void closeApp() {
-        if (serverConnection.isConnected())
-            confirmDialog(lookup("confirm.leaving"), this::close);
-        else
-            close();
-    }
-
-    /**
-     * Closes the application, disconnecting from the server and stopping the application.
-     */
-    private void close() {
-        serverConnection.disconnect();
-        stop();
-    }
-
-    /**
-     * Updates the informational text displayed in the GUI.
-     *
-     * @param text The information text to display.
-     */
-    public void setInfoText(String text) {
-        LOGGER.log(Level.DEBUG, "setInfoText {0}", text); //NON-NLS
-        topText.setText(text);
-    }
-
-    /**
-     * Updates the informational text in the GUI based on the key received in an {@link InfoTextEvent}.
-     *
-     * @param event The {@link InfoTextEvent} containing the key for the text to display.
-     */
-    @Override
-    public void receivedEvent(InfoTextEvent event) {
-        LOGGER.log(Level.DEBUG, "received info text {0}", event.key()); //NON-NLS
-        setInfoText(lookup(event.key()));
-    }
-
-    /**
-     * Handles client state events to update the game states accordingly.
-     *
-     * @param event The {@link ClientStateEvent} representing the state change.
-     */
-    @Override
-    public void receivedEvent(ClientStateEvent event) {
-    }
-
-    /**
-     * Returns the executor service used for handling multithreaded tasks.
-     *
-     * @return The {@link ExecutorService} instance.
-     */
     public ExecutorService getExecutor() {
-        if (executor == null)
-            executor = Executors.newCachedThreadPool();
         return executor;
     }
 
-    /**
-     * Stops the application, shutting down the executor service and halting execution.
-     *
-     * @param waitFor If true, waits for the application to stop before returning.
-     */
-    @Override
-    public void stop(boolean waitFor) {
-        if (executor != null) executor.shutdownNow();
-        super.stop(waitFor);
+    public void closeApp() {
+        stop();
     }
 
-    /**
-     * Displays a confirmation dialog with a specified question and action for the "Yes" button.
-     *
-     * @param question  The question to display in the dialog.
-     * @param yesAction The action to perform if "Yes" is selected.
-     */
-    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"))
-                     .build()
-                     .open();
-    }
-
-    /**
-     * Displays an error dialog with the specified error message.
-     *
-     * @param errorMessage The error message to display in the dialog.
-     */
     public void errorDialog(String errorMessage) {
         DialogBuilder.simple(dialogManager)
-                     .setTitle(lookup("dialog.error"))
-                     .setText(errorMessage)
-                     .setOkButton(lookup("button.ok"))
-                     .build()
-                     .open();
+                .setTitle("Fehler")
+                .setText(errorMessage)
+                .setOkButton("OK")
+                .build()
+                .open();
+    }
+
+    public void setSettingsMenuOpen(boolean isOpen) {
+        this.isSettingsMenuOpen = isOpen;
+    }
+
+    @Override
+    public void simpleUpdate(float tpf) {
+        if (testWorld != null) {
+            testWorld.update(tpf); // Aktualisiere die Kamera in der TestWorld
+        }
+    }
+
+    public void startTestWorld() {
+        guiNode.detachAllChildren(); // Entferne GUI
+        testWorld = new TestWorld(this); // Erstelle eine Instanz von TestWorld
+        testWorld.initializeScene();     // Initialisiere die Szene
+    }
+
+    public void returnToMenu() {
+        guiNode.detachAllChildren(); // Entferne die GUI
+        StartMenu.createStartMenu(this); // Zeige das Startmenü erneut
     }
 }

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

@@ -0,0 +1,146 @@
+package pp.monopoly.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 pp.dialog.Dialog;
+import pp.dialog.DialogBuilder;
+import pp.dialog.SimpleDialog;
+
+/**
+ * Represents a dialog for setting up a network connection in the Monopoly 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());
+    private static final String LOCALHOST = "localhost";
+    private static final String DEFAULT_PORT = "1234";
+    private final NetworkSupport network;
+    private final TextField host = new TextField(LOCALHOST);
+    private final TextField port = new TextField(DEFAULT_PORT);
+    private String hostname;
+    private int portNumber;
+    private Future<Object> connectionFuture;
+    private Dialog progressDialog;
+
+    /**
+     * Constructs a new NetworkDialog.
+     *
+     * @param network The NetworkSupport instance to be used for network operations.
+     */
+    NetworkDialog(NetworkSupport network) {
+        super(network.getApp().getDialogManager());
+        this.network = network;
+        initializeDialog();
+    }
+
+    /**
+     * Initializes the dialog with input fields and connection buttons.
+     */
+    private void initializeDialog() {
+        final MonopolyApp app = network.getApp();
+        Container inputContainer = new Container();
+
+        // Titel und Eingabefelder für Host und Port
+        inputContainer.addChild(new Label("Server-Adresse"));
+        inputContainer.addChild(host);
+
+        inputContainer.addChild(new Label("Port"));
+        inputContainer.addChild(port);
+
+        Button connectButton = inputContainer.addChild(new Button("Verbinden"));
+        connectButton.addClickCommands(source -> connect());
+
+        Button cancelButton = inputContainer.addChild(new Button("Abbrechen"));
+        cancelButton.addClickCommands(source -> app.closeApp());
+
+        app.getGuiNode().attachChild(inputContainer);
+    }
+
+    /**
+     * Initiates the connection attempt based on the entered host and port.
+     */
+    private void connect() {
+        LOGGER.log(Level.INFO, "Connecting to host={0}, port={1}", host, port);
+        try {
+            hostname = host.getText().trim().isEmpty() ? LOCALHOST : host.getText();
+            portNumber = Integer.parseInt(port.getText());
+            openProgressDialog();
+            connectionFuture = network.getApp().getExecutor().submit(this::initNetwork);
+        } catch (NumberFormatException e) {
+            network.getApp().errorDialog("Port muss eine Zahl sein.");
+        }
+    }
+
+    /**
+     * Opens a progress dialog while connecting.
+     */
+    private void openProgressDialog() {
+        progressDialog = DialogBuilder.simple(network.getApp().getDialogManager())
+                                      .setText("Verbinde zum Server...")
+                                      .build();
+        progressDialog.open();
+    }
+
+    /**
+     * Attempts to initialize the network connection.
+     *
+     * @throws RuntimeException If an error occurs when creating the client.
+     */
+    private Object initNetwork() {
+        try {
+            network.initNetwork(hostname, portNumber);
+            return null;
+        } catch (Exception e) {
+            throw new RuntimeException(e);
+        }
+    }
+
+    /**
+     * Updates the connection status and handles completion or failure.
+     */
+    @Override
+    public void update(float delta) {
+        if (connectionFuture != null && connectionFuture.isDone()) {
+            try {
+                connectionFuture.get();
+                onSuccess();
+            } catch (ExecutionException e) {
+                onFailure(e.getCause());
+            } catch (InterruptedException e) {
+                LOGGER.log(Level.WARNING, "Connection interrupted.", e);
+                Thread.currentThread().interrupt();
+            }
+        }
+    }
+
+    /**
+     * Handles a successful connection to the game server.
+     */
+    private void onSuccess() {
+        connectionFuture = null;
+        progressDialog.close();
+        this.close();
+        network.getApp().setInfoText("Warte auf einen Gegner...");
+    }
+
+    /**
+     * Handles a failed connection attempt.
+     *
+     * @param e The cause of the failure.
+     */
+    private void onFailure(Throwable e) {
+        connectionFuture = null;
+        progressDialog.close();
+        network.getApp().errorDialog("Verbindung zum Server fehlgeschlagen.");
+        network.getApp().setInfoText(e.getLocalizedMessage());
+    }
+    
+}

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

@@ -1,62 +1,43 @@
-////////////////////////////////////////
-// Programming project code
-// UniBw M, 2022, 2023, 2024
-// www.unibw.de/inf2
-// (c) Mark Minas (mark.minas@unibw.de)
-////////////////////////////////////////
-
 package pp.monopoly.client;
 
+import java.io.IOException;
+import java.lang.System.Logger;
+import java.lang.System.Logger.Level;
+
 import com.jme3.network.Client;
 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;
 
-import java.io.IOException;
-import java.lang.System.Logger;
-import java.lang.System.Logger.Level;
-
-import static pp.monopoly.Resources.lookup;
-
 /**
- * Manages the network connection for the Battleship application.
+ * Manages the network connection for the Monopoly application.
  * Handles connecting to and disconnecting from the server, and sending messages.
  */
-public class NetworkSupport implements MessageListener<Client>, ClientStateListener, ServerConnection {
+class NetworkSupport implements MessageListener<Client>, ClientStateListener, ServerConnection {
     private static final Logger LOGGER = System.getLogger(NetworkSupport.class.getName());
     private final MonopolyApp app;
     private Client client;
 
     /**
-     * Constructs a NetworkSupport instance for the given Battleship application.
+     * Constructs a NetworkSupport instance for the Monopoly application.
      *
-     * @param app The Battleship application instance.
+     * @param app The Monopoly application instance.
      */
     public NetworkSupport(MonopolyApp app) {
         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.
+     * Returns the Monopoly application instance.
      *
-     * @return Battleship application instance
+     * @return Monopoly application instance
      */
-    public MonopolyApp getApp() {
+    MonopolyApp getApp() {
         return app;
     }
 
@@ -76,8 +57,9 @@ public class NetworkSupport implements MessageListener<Client>, ClientStateListe
      */
     @Override
     public void connect() {
-        if (client == null)
-            new CreateGameMenu(this).open();
+        if (client == null) {
+            new NetworkDialog(this).open();
+        }
     }
 
     /**
@@ -88,7 +70,7 @@ public class NetworkSupport implements MessageListener<Client>, ClientStateListe
         if (client == null) return;
         client.close();
         client = null;
-        LOGGER.log(Level.INFO, "client closed"); //NON-NLS
+        LOGGER.log(Level.INFO, "Client connection closed.");
     }
 
     /**
@@ -98,9 +80,10 @@ public class NetworkSupport implements MessageListener<Client>, ClientStateListe
      * @param port The server's port.
      * @throws IOException If an I/O error occurs when creating the client.
      */
-    public void initNetwork(String host, int port) throws IOException {
-        if (client != null)
-            throw new IllegalStateException("trying to join a game again");
+    void initNetwork(String host, int port) throws IOException {
+        if (client != null) {
+            throw new IllegalStateException("Already connected to the game server.");
+        }
         client = Network.connectToServer(host, port);
         client.start();
         client.addMessageListener(this);
@@ -115,9 +98,10 @@ public class NetworkSupport implements MessageListener<Client>, ClientStateListe
      */
     @Override
     public void messageReceived(Client client, Message message) {
-        LOGGER.log(Level.INFO, "message received from server: {0}", message); //NON-NLS
-        if (message instanceof ServerMessage serverMessage)
+        LOGGER.log(Level.INFO, "Message received from server: {0}", message);
+        if (message instanceof ServerMessage serverMessage) {
             app.enqueue(() -> serverMessage.accept(app.getGameLogic()));
+        }
     }
 
     /**
@@ -127,7 +111,7 @@ public class NetworkSupport implements MessageListener<Client>, ClientStateListe
      */
     @Override
     public void clientConnected(Client client) {
-        LOGGER.log(Level.INFO, "Client connected: {0}", client); //NON-NLS
+        LOGGER.log(Level.INFO, "Successfully connected to server: {0}", client);
     }
 
     /**
@@ -138,13 +122,9 @@ public class NetworkSupport implements MessageListener<Client>, ClientStateListe
      */
     @Override
     public void clientDisconnected(Client client, DisconnectInfo disconnectInfo) {
-        LOGGER.log(Level.INFO, "Client {0} disconnected: {1}", client, disconnectInfo); //NON-NLS
-        if (this.client != client)
-            throw new IllegalArgumentException("parameter value must be client");
-        LOGGER.log(Level.INFO, "client still connected: {0}", client.isConnected()); //NON-NLS
+        LOGGER.log(Level.INFO, "Disconnected from server: {0}", disconnectInfo);
         this.client = null;
-        disconnect();
-        app.enqueue(() -> app.setInfoText(lookup("lost.connection.to.server")));
+        app.enqueue(() -> app.setInfoText("Verbindung zum Server verloren."));
     }
 
     /**
@@ -154,10 +134,11 @@ public class NetworkSupport implements MessageListener<Client>, ClientStateListe
      */
     @Override
     public void send(ClientMessage message) {
-        LOGGER.log(Level.INFO, "sending {0}", message); //NON-NLS
-        if (client == null)
-            app.errorDialog(lookup("lost.connection.to.server"));
-        else
+        LOGGER.log(Level.INFO, "Sending message to server: {0}", message);
+        if (client == null) {
+            app.errorDialog("Verbindung zum Server verloren.");
+        } else {
             client.send(message);
+        }
     }
-}
+}

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

@@ -1,6 +1,7 @@
-package pp.monopoly.client.gui;
+package pp.monopoly.client;
 
 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;
@@ -13,7 +14,8 @@ import com.simsilica.lemur.component.QuadBackgroundComponent;
 import com.simsilica.lemur.component.SpringGridLayout;
 
 import pp.dialog.Dialog;
-import pp.monopoly.client.MonopolyApp;
+import pp.monopoly.client.gui.CreateGameMenu;
+import pp.monopoly.client.gui.SettingsMenu;
 
 /**
  * Constructs the startup menu dialog for the Monopoly application.
@@ -32,7 +34,13 @@ public class StartMenu extends Dialog {
     public StartMenu(MonopolyApp app) {
         super(app.getDialogManager());
         this.app = app;
-        
+    }
+
+    /**
+     * Creates and displays the Start Menu with buttons for starting the game,
+     * opening settings, and quitting the application.
+     */
+    public static void createStartMenu(MonopolyApp app) {
         int screenWidth = app.getContext().getSettings().getWidth();
         int screenHeight = app.getContext().getSettings().getHeight();
 
@@ -46,6 +54,9 @@ public class StartMenu extends Dialog {
         background.setLocalTranslation(0, 0, -1); // Ensure it is behind other GUI elements
         app.getGuiNode().attachChild(background);
 
+        createMonopolyLogo(app);
+        createUnibwLogo(app);
+
         // Center container for title and play button
         Container centerMenu = new Container(new SpringGridLayout(Axis.Y, Axis.X));
 
@@ -54,7 +65,7 @@ public class StartMenu extends Dialog {
         startButton.setFontSize(40); // Set the font size for the button text
         startButton.setTextHAlignment(HAlignment.Center); // Center the text horizontally
 
-        startButton.addClickCommands(s -> app.connect());
+        startButton.addClickCommands(source -> startGame(app));
         centerMenu.addChild(startButton);
 
         // Position the center container in the middle of the screen
@@ -69,7 +80,7 @@ public class StartMenu extends Dialog {
         Button quitButton = new Button("Spiel beenden");
         quitButton.setPreferredSize(new Vector3f(130, 40, 0)); // Increase button size slightly (width, height)
         quitButton.setFontSize(18);
-        quitButton.addClickCommands(source -> ifTopDialog(app::closeApp));
+        quitButton.addClickCommands(source -> quitGame());
         lowerLeftMenu.addChild(quitButton);
         app.getGuiNode().attachChild(lowerLeftMenu);
 
@@ -79,10 +90,17 @@ public class StartMenu extends Dialog {
         Button settingsButton = new Button("Einstellungen");
         settingsButton.setPreferredSize(new Vector3f(130, 40, 0)); // Increase button size slightly (width, height)
         settingsButton.setFontSize(18); // Increase the font size for the text
-        settingsButton.addClickCommands(source -> new SettingsMenu(app).open());
+        settingsButton.addClickCommands(source -> openSettings(app));
         lowerRightMenu.addChild(settingsButton);
         app.getGuiNode().attachChild(lowerRightMenu);
+    }
 
+    /**
+     * Creates and positions the Monopoly logo container in the center of the screen.
+     */
+    private static void createMonopolyLogo(MonopolyApp app) {
+        int screenWidth = app.getContext().getSettings().getWidth();
+        int screenHeight = app.getContext().getSettings().getHeight();
 
         // Load the Monopoly logo as a texture
         Texture logoTexture = app.getAssetManager().loadTexture("Pictures/logo-monopoly.png");
@@ -106,6 +124,14 @@ public class StartMenu extends Dialog {
 
         // Attach the container to the GUI node
         app.getGuiNode().attachChild(logoContainer);
+    }
+
+    /**
+     * Creates and positions the Unibw logo container in the center of the screen.
+     */
+    private static void createUnibwLogo(MonopolyApp app) {
+        int screenWidth = app.getContext().getSettings().getWidth();
+        int screenHeight = app.getContext().getSettings().getHeight();
 
         // Load the Unibw logo as a texture
         Texture unibwTexture = app.getAssetManager().loadTexture("Pictures/logo-unibw.png");
@@ -131,8 +157,26 @@ public class StartMenu extends Dialog {
         app.getGuiNode().attachChild(unibwContainer);
     }
 
-    @Override
-    public void escape() {
-        close();
+    /**
+     * Starts the game by transitioning to the CreateGameMenu.
+     */
+    private static void startGame(MonopolyApp app) {
+        app.getGuiNode().detachAllChildren();
+        new CreateGameMenu(app);
+    }
+
+    /**
+     * Opens the settings menu.
+     */
+    private static void openSettings(MonopolyApp app) {
+        app.getGuiNode().detachAllChildren();
+        new SettingsMenu(app);
+    }
+
+    /**
+     * Quits the game application.
+     */
+    private static void quitGame() {
+        System.exit(0);
     }
 }

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

@@ -39,22 +39,21 @@ public class CameraController {
      * @param tpf Zeit pro Frame
      */
     public void update(float tpf) {
+        // Aktualisiere den Winkel basierend auf der Geschwindigkeit
+        angle += speed * tpf;
+        if (angle >= FastMath.TWO_PI) {
+            angle -= FastMath.TWO_PI; // Winkel zurücksetzen, um Überläufe zu vermeiden
+        }
+
+        // Berechne die neue Position der Kamera
+        float x = center.x + radius * FastMath.cos(angle);
+        float z = center.z + radius * FastMath.sin(angle);
+        float y = center.y + height;
+
+        // Setze die Kameraposition
+        camera.setLocation(new Vector3f(x, y, z));
+
+        // Lasse die Kamera auf den Fokuspunkt blicken
         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

@@ -1,192 +1,121 @@
-////////////////////////////////////////
-// 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.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.Axis;
 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 pp.monopoly.client.MonopolyApp;
-import pp.monopoly.client.NetworkSupport;
-import pp.monopoly.server.MonopolyServer;
-import pp.dialog.Dialog;
-import pp.dialog.DialogBuilder;
-import pp.dialog.SimpleDialog;
+import pp.monopoly.client.StartMenu;
 
 /**
- * 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.
+ * CreateGameMenu class represents the menu for creating a new game.
  */
-public class CreateGameMenu extends SimpleDialog {
-    private static final Logger LOGGER = System.getLogger(CreateGameMenu.class.getName());
-    private static final String LOCALHOST = "localhost"; //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;
+public class CreateGameMenu {
+    private final MonopolyApp app;
+    private final Container menuContainer;
+    private Geometry background;
 
     /**
-     * Constructs a new CreateGameMenu.
+     * Konstruktor für das CreateGameMenu.
      *
-     * @param network The NetworkSupport instance to be used for network operations.
+     * @param app Die Hauptanwendung (MonopolyApp)
      */
-    public CreateGameMenu(NetworkSupport network) {
-        super(network.getApp().getDialogManager());
-        this.network = network;
-        host.setSingleLine(true);
-        host.setPreferredWidth(400f);
-        port.setSingleLine(true);
+    public CreateGameMenu(MonopolyApp app) {
+        this.app = app;
+
+        // Hintergrundbild laden und hinzufügen
+        addBackgroundImage();
+
+        // Hauptcontainer für das Menü
+        menuContainer = new Container(new SpringGridLayout(Axis.Y, Axis.X));
+        menuContainer.setPreferredSize(new Vector3f(600, 400, 0)); // Feste Größe des Containers
+
+        // Titel
+        Label title = menuContainer.addChild(new Label("Neues Spiel"));
+        title.setFontSize(48);
+
+        // Eingabefelder-Container
+        Container inputContainer = menuContainer.addChild(new Container(new SpringGridLayout(Axis.Y, Axis.X)));
+        inputContainer.setPreferredSize(new Vector3f(200, 150, 0)); // Eingabefelder nicht ganz so breit
+        inputContainer.setLocalTranslation(20, 0, 0); // Abstand vom Rand
+
+        inputContainer.addChild(new Label("Server-Adresse:"));
+        TextField serverAddressField = inputContainer.addChild(new TextField("localhost"));
+        serverAddressField.setPreferredWidth(400); // Breite des Textfelds
+
+        inputContainer.addChild(new Label("Port:"));
+        TextField portField = inputContainer.addChild(new TextField("42069"));
+        portField.setPreferredWidth(400); // Breite des Textfelds
+
+        // Button-Container
+        Container buttonContainer = menuContainer.addChild(new Container(new SpringGridLayout(Axis.X, Axis.Y)));
+        buttonContainer.setPreferredSize(new Vector3f(400, 50, 0));
+        buttonContainer.setLocalTranslation(20, 0, 0); // Abstand vom Rand
 
-        final MonopolyApp app = network.getApp();
-        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
+        Button cancelButton = buttonContainer.addChild(new Button("Abbrechen"));
         cancelButton.setPreferredSize(new Vector3f(120, 40, 0));
-        cancelButton.addClickCommands(source -> new StartMenu(app).open());
-        addChild(cancelButton);
-        cancelButton.addClickCommands(s -> new StartMenu(app));
+        cancelButton.addClickCommands(source -> goBackToStartMenu());
 
-        // "Selber hosten"-Button
-        addChild(serverButton).addClickCommands(s -> startServerInThread());
+        // "Spiel hosten"-Button
+        Button hostButton = buttonContainer.addChild(new Button("Spiel hosten"));
+        hostButton.setPreferredSize(new Vector3f(120, 40, 0));
+        hostButton.addClickCommands(source -> {
+            closeCreateGameMenu();      // Schließt das Menü
+            app.startTestWorld();       // Starte die TestWorld im selben Fenster
+        });
 
         // "Beitreten"-Button
+        Button joinButton = buttonContainer.addChild(new Button("Beitreten"));
         joinButton.setPreferredSize(new Vector3f(120, 40, 0));
-        addChild(joinButton);
-        joinButton.addClickCommands(s -> connect());
+        // Placeholder für die Beitrittslogik
+
+        // 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);
     }
 
     /**
-     * Handles the action for the connect button in the connection dialog.
-     * Tries to parse the port number and initiate connection to the server.
+     * Lädt das Hintergrundbild und fügt es als geometrische Ebene hinzu.
      */
-    private void connect() {
-        LOGGER.log(Level.INFO, "connect to host={0}, port={1}", host, port); //NON-NLS
-        try {
-            hostname = host.getText().trim().isEmpty() ? LOCALHOST : host.getText();
-            portNumber = Integer.parseInt(port.getText());
-            openProgressDialog();
-            connectionFuture = network.getApp().getExecutor().submit(this::initNetwork);
-        }
-        catch (NumberFormatException e) {
-            network.getApp().errorDialog(lookup("port.must.be.integer"));
-        }
+    private void addBackgroundImage() {
+        Texture backgroundImage = app.getAssetManager().loadTexture("Pictures/unibw-Bib2.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);
     }
 
     /**
-     * Creates a dialog indicating that the connection is in progress.
+     * Geht zum Startmenü zurück, wenn "Abbrechen" angeklickt wird.
      */
-    private void openProgressDialog() {
-        progressDialog = DialogBuilder.simple(network.getApp().getDialogManager())
-                                      .setText(lookup("label.connecting"))
-                                      .build();
-        progressDialog.open();
+    private void goBackToStartMenu() {
+        closeCreateGameMenu();          // Schließt das Menü
+        StartMenu.createStartMenu(app); // Zeige das Startmenü
     }
 
     /**
-     * Tries to initialize the network connection.
-     *
-     * @throws RuntimeException If an error occurs when creating the client.
+     * Entfernt das CreateGameMenu und dessen Hintergrund.
      */
-    private Object initNetwork() {
-        try {
-            network.initNetwork(hostname, portNumber);
-            return null;
-        }
-        catch (Exception e) {
-            throw new RuntimeException(e);
-        }
-    }
-
-    /**
-     * This method is called by {@linkplain pp.dialog.DialogManager#update(float)} for periodically
-     * updating this dialog. T
-     */
-    @Override
-    public void update(float delta) {
-        if (connectionFuture != null && connectionFuture.isDone())
-            try {
-                connectionFuture.get();
-                success();
-            }
-            catch (ExecutionException e) {
-                failure(e.getCause());
-            }
-            catch (InterruptedException e) {
-                LOGGER.log(Level.WARNING, "Interrupted!", e); //NON-NLS
-                Thread.currentThread().interrupt();
-            }
-    }
-
-    /**
-     * Handles a successful connection to the game server.
-     */
-    private void success() {
-        connectionFuture = null;
-        progressDialog.close();
-        this.close();
-        new LobbyMenu(network.getApp()).open();
-    }
-
-    /**
-     * Handles a failed connection attempt.
-     *
-     * @param e The cause of the failure.
-     */
-    private void failure(Throwable e) {
-        connectionFuture = null;
-        progressDialog.close();
-        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) {
-            // TODO Auto-generated catch block
-            e.printStackTrace();
-        }
-        connect();
+    private void closeCreateGameMenu() {
+        app.getGuiNode().detachChild(menuContainer); // Entfernt den Menü-Container
+        app.getGuiNode().detachChild(background);    // Entfernt das Hintergrundbild
     }
 }

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

@@ -0,0 +1,51 @@
+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

@@ -1,284 +0,0 @@
-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 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 TextField playerInputField = new TextField("Spieler 1");
-    private TextField startingCapital = new TextField("15000");
-
-    public LobbyMenu(MonopolyApp app) {
-        super(app.getDialogManager());
-        this.app = app;
-
-        // Entfernt das CreateGameMenu (inklusive Hintergrund)
-        app.getGuiNode().detachAllChildren();
-
-        // Hintergrundbild laden und hinzufügen
-        addBackgroundImage();
-
-        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)); // Fixed size of the container
-        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)); // Adjust container size
-        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)); // Add padding for the text inside the field
-        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)); // Adjust this to fit the center graphic
-
-        // Figur Dropdown
-        Container figureDropdownContainer = dropdownContainer.addChild(new Container(new SpringGridLayout(Axis.Y, Axis.X)));
-        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(100, 20, 0));
-        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("Abbrechen");
-        cancelButton.setPreferredSize(new Vector3f(200, 60, 0)); // Set size to match the appearance in the image
-        cancelButton.setFontSize(18); // Adjust font size
-        cancelButton.addClickCommands(source -> close()); // Add functionality
-        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(source -> toggleReady(null)); // Add functionality
-        lowerRightMenu.addChild(readyButton);
-
-        // 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( ColorRGBA.Red); // 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);
-    }
-
-
-    /**
-     * 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(ColorRGBA color) {
-
-        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", color); // Set the desired color
-        circleGeometry.setMaterial(material);
-
-        return circleGeometry;
-    }
-
-    /**
-     * Schaltet den "Bereit"-Status um.
-     */
-    private void toggleReady(Label playersLabel) {
-        app.getGameLogic().send(new PlayerReady(true, "Test", "flugzeug", 15000));;
-    }
-
-    @Override
-    public void close() {
-        super.close();
-    }
-
-    /**
-     * 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);
-        switch (selected) {
-            case "[0]":
-                System.out.println("Alpha selected");
-                break;
-            case "[1]":
-                System.out.println("Beta selected");
-                break;
-            case "[2]":
-                System.out.println("Gamma selected");
-                break;
-            case "[3]":
-                close();
-                break;
-            default:
-                System.out.println("Unknown selection");
-        }
-    }
-
-    /**
-     * 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

@@ -0,0 +1,75 @@
+package pp.monopoly.client.gui;
+
+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.Node;
+import com.jme3.scene.Spatial.CullHint;
+import com.jme3.scene.shape.Quad;
+
+import pp.monopoly.client.MonopolyApp;
+import pp.monopoly.model.Board;
+
+/**
+ * Represents the visual view of a {@link Board}, used to display the map structure and elements.
+ * This class handles the graphical representation of the board, including background setup and grid lines.
+ */
+class MapView {
+    private static final float FIELD_SIZE = 40f;
+    private static final float BACKGROUND_DEPTH = -4f;
+    private static final ColorRGBA BACKGROUND_COLOR = new ColorRGBA(0, 0.05f, 0.05f, 0.5f);
+
+    private final MonopolyApp app;
+    private final Node mapNode = new Node("map");
+    private final Board board;
+    private final MapViewSynchronizer synchronizer;
+
+    /**
+     * Constructs a new MapView for a given {@link Board} and {@link MonopolyApp}.
+     *
+     * @param board the board to visualize
+     * @param app   the main application instance
+     */
+    MapView(Board board, MonopolyApp app) {
+        this.board = board;
+        this.app = app;
+        this.synchronizer = new MapViewSynchronizer(this);
+        setupBackground();
+        app.getGameLogic().addListener(synchronizer);
+    }
+
+    /**
+     * Unregisters the {@link MapViewSynchronizer} from listening to board changes.
+     */
+    void unregister() {
+        app.getGameLogic().removeListener(synchronizer);
+    }
+
+    /**
+     * Sets up the background of the map view using a quad geometry.
+     */
+    private void setupBackground() {
+        Material mat = new Material(app.getAssetManager(), "Common/MatDefs/Misc/Unshaded.j3md");
+        mat.setColor("Color", BACKGROUND_COLOR);
+        mat.getAdditionalRenderState().setBlendMode(BlendMode.Alpha);
+        Geometry background = new Geometry("MapBackground", new Quad(board.getWidth() * FIELD_SIZE, board.getHeight() * FIELD_SIZE));
+        background.setMaterial(mat);
+        background.setLocalTranslation(0f, 1f, BACKGROUND_DEPTH);
+        background.setCullHint(CullHint.Never);
+        mapNode.attachChild(background);
+    }
+
+    /**
+     * 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;
+    }
+
+    public Board getBoard() {
+        return board;
+    }
+}

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

@@ -0,0 +1,45 @@
+package pp.monopoly.client.gui;
+
+import com.jme3.scene.Spatial;
+
+import pp.monopoly.model.Figure;
+
+/**
+ * Synchronizes the visual representation of the board with the game model.
+ * Handles updates for items on the board.
+ */
+class MapViewSynchronizer extends BoardSynchronizer {
+    private final MapView view;
+
+    /**
+     * Constructs a new MapViewSynchronizer for the given MapView.
+     *
+     * @param view the MapView to synchronize with the game model
+     */
+    public MapViewSynchronizer(MapView view) {
+        super(view.getBoard(), view.getNode());
+        this.view = view;
+        addExisting();
+    }
+
+    /**
+     * Enables the state by performing initial setup, such as adding any items to the view.
+     */
+    
+    protected void enableState() {
+        // Platz für zusätzliche Initialisierungen
+    }
+
+    /**
+     * Disables the state by clearing the view.
+     */
+    
+    protected void disableState() {
+        view.getNode().detachAllChildren(); // Entfernt alle visuellen Elemente vom Knoten
+    }
+
+    
+    public Spatial visit(Figure figure) {
+        return figure.accept(this);
+    }
+}

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

@@ -1,79 +1,100 @@
-////////////////////////////////////////
-// 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.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.Checkbox;
+import com.simsilica.lemur.Container;
 import com.simsilica.lemur.Label;
+import com.simsilica.lemur.Slider;
+import com.simsilica.lemur.component.QuadBackgroundComponent;
 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 static pp.util.PreferencesUtils.getPreferences;
+import pp.monopoly.client.MonopolyApp;
 
 /**
- * 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.
+ * SettingsMenu ist ein Overlay-Menü, das durch ESC aufgerufen werden kann.
  */
 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 slider;
+    private final Geometry overlayBackground;
+    private final Container settingsContainer;
 
-    /**
-     * Constructs the Menu dialog for the Battleship application.
-     *
-     * @param app the MonopolyApp instance
-     */
     public SettingsMenu(MonopolyApp app) {
         super(app.getDialogManager());
         this.app = app;
-        slider = new VolumeSlider(app.getStateManager().getState(GameMusic.class));
-        addChild(new Label("Einstellungen", new ElementId("header"))); //NON-NLS
-        addChild(new Label("Sound Effekte", new ElementId("label"))); //NON-NLS
-        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(slider);
 
-        addChild(new Button("Zurück zum Spiel")).addClickCommands(s -> ifTopDialog(this::close));
-        addChild(new Button("Beenden")).addClickCommands(s -> ifTopDialog(app::closeApp));
-        
-        update();
+        // Halbtransparentes Overlay hinzufügen
+        overlayBackground = createOverlayBackground();
+        app.getGuiNode().attachChild(overlayBackground);
+
+        // Hauptcontainer für das Menü
+        settingsContainer = new Container();
+        settingsContainer.setBackground(new QuadBackgroundComponent(new ColorRGBA(0.1f, 0.1f, 0.1f, 0.9f)));
+
+        // Titel
+        Label settingsTitle = settingsContainer.addChild(new Label("Einstellungen", new ElementId("settings-title")));
+        settingsTitle.setFontSize(48);
+
+        // Effekt-Sound: Slider und Checkbox
+        Container effectSoundContainer = settingsContainer.addChild(new Container());
+        effectSoundContainer.addChild(new Label("Effekt Sound", new ElementId("label")));
+        effectSoundContainer.addChild(new Slider());
+        effectSoundContainer.addChild(new Checkbox("Aktivieren")).setChecked(true);
+
+        // Hintergrundmusik: Slider und Checkbox
+        Container backgroundMusicContainer = settingsContainer.addChild(new Container());
+        backgroundMusicContainer.addChild(new Label("Hintergrund Musik", new ElementId("label")));
+        backgroundMusicContainer.addChild(new Slider());
+        backgroundMusicContainer.addChild(new Checkbox("Aktivieren")).setChecked(true);
+
+        // Beenden-Button
+        Button quitButton = settingsContainer.addChild(new Button("Beenden", new ElementId("menu-button")));
+        quitButton.setFontSize(32);
+        quitButton.addClickCommands(source -> app.stop());
+
+        // Zentriere das Menü
+        settingsContainer.setLocalTranslation(
+            (app.getCamera().getWidth() - settingsContainer.getPreferredSize().x) / 2,
+            (app.getCamera().getHeight() + settingsContainer.getPreferredSize().y) / 2,
+            1
+        );
+
+        app.getGuiNode().attachChild(settingsContainer);
     }
 
     /**
-     * Updates the state of the load and save buttons based on the game logic.
+     * Erstellt einen halbtransparenten Hintergrund für das Menü.
+     *
+     * @return Geometrie des Overlays
      */
-    @Override
-    public void update() {
-    }
-
-    @Override
-    public void update(float delta) {
-        slider.update();
+    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;
     }
 
     /**
-     * As an escape action, this method closes the menu if it is the top dialog.
+     * Schließt das Menü und entfernt die GUI-Elemente.
      */
     @Override
-    public void escape() {
-        close();
+    public void close() {
+        System.out.println("Schließe SettingsMenu..."); // Debugging-Ausgabe
+        app.getGuiNode().detachChild(settingsContainer);  // Entferne das Menü
+        app.getGuiNode().detachChild(overlayBackground);  // Entferne das Overlay
+        app.setSettingsMenuOpen(false);                  // Menü als geschlossen markieren
+        app.unblockInputs();                             // Eingaben wieder aktivieren
+        System.out.println("SettingsMenu geschlossen."); // Debugging-Ausgabe
     }
+
+
 }

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

@@ -1,9 +1,5 @@
 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;
@@ -47,18 +43,15 @@ public class TestWorld {
         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
+                5,                        // Radius des Kreises
+                3,                        // Höhe der Kamera
+                0.5f                      // Geschwindigkeit der Bewegung
         );
 
         // Füge die Toolbar hinzu
         new Toolbar(app, cube);
-        
-        cameraController.setPosition(0);
     }
 
-
     /**
      * Aktualisiert die Kameraposition.
      *
@@ -82,12 +75,12 @@ public class TestWorld {
      */
     private void createBoard() {
         // Erstelle ein Quadrat
-        Box box = new Box(10, 0.1f, 10);  // Dünnes Quadrat für die Textur
+        Box box = new Box(1, 0.01f, 1);  // 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");
+        Texture texture = app.getAssetManager().loadTexture("Pictures/board.png");
         mat.setTexture("ColorMap", texture);
         geom.setMaterial(mat);
 

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

@@ -1,25 +1,22 @@
-
 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.Axis;
+import com.simsilica.lemur.Button;
+import com.simsilica.lemur.Container;
 import com.simsilica.lemur.component.SpringGridLayout;
 
-import com.simsilica.lemur.style.ElementId;
-import pp.dialog.Dialog;
 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 Toolbar extends Dialog {
+public class Toolbar {
 
     private final MonopolyApp app;
     private final Container toolbarContainer;
@@ -38,64 +35,22 @@ public class Toolbar extends Dialog {
      * @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");
+        toolbarContainer = new Container(new SpringGridLayout(Axis.X, Axis.Y));
 
         // Setze die Position am unteren Rand und die Breite
         toolbarContainer.setLocalTranslation(
                 0,                                 // Links bündig
-                200,                               // Höhe über dem unteren Rand
+                100,                               // Höhe über dem unteren Rand
                 0                                  // Z-Ebene
         );
-        toolbarContainer.setPreferredSize(new Vector3f(app.getCamera().getWidth(), 200, 0)); // Volle Breite
-
+        toolbarContainer.setPreferredSize(new Vector3f(app.getCamera().getWidth(), 100, 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)));
+        initializeButtons();
 
         // Füge die Toolbar zur GUI hinzu
         app.getGuiNode().attachChild(toolbarContainer);
@@ -109,10 +64,9 @@ public class Toolbar extends Dialog {
      * Initialisiert die Buttons in der Toolbar.
      */
     private void initializeButtons() {
-        addTradeMenuButton();  // Bewegung nach vorne
-        addEndTurnButton(); // Bewegung nach hinten
+        addButton("Vorwärts", 1);  // Bewegung nach vorne
+        addButton("Rückwärts", -1); // Bewegung nach hinten
         addDiceRollButton();       // Würfel-Button
-
     }
 
     /**
@@ -121,41 +75,18 @@ public class Toolbar extends Dialog {
      * @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) {
+    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() {
+    private void addDiceRollButton() {
         Button diceButton = new Button("Würfeln");
-        diceButton.setPreferredSize(new Vector3f(50, 20, 0));
-        diceButton.addClickCommands(source -> rollDice());
-        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(source -> rollDice());
-        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(source -> rollDice());
-        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(source -> rollDice());
         toolbarContainer.addChild(diceButton);

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

@@ -1,168 +0,0 @@
-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/popups/BuildingPropertyCard.java

@@ -1,133 +0,0 @@
-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 = 39;
-
-    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
-        // 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

@@ -1,116 +0,0 @@
-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.math.Vector3f;
-import com.jme3.scene.Geometry;
-import com.jme3.scene.shape.Quad;
-import com.simsilica.lemur.*;
-import com.simsilica.lemur.component.QuadBackgroundComponent;
-import com.simsilica.lemur.style.ElementId;
-import pp.dialog.Dialog;
-import pp.monopoly.client.MonopolyApp;
-
-/**
- * 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 settingsContainer;
-    private final Container backgroundContainer;
-
-    public BuyCard(MonopolyApp app) {
-        super(app.getDialogManager());
-        this.app = app;
-
-        // 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 das Menü
-        settingsContainer = new Container();
-        settingsContainer.setBackground(new QuadBackgroundComponent(new ColorRGBA(0.1f, 0.1f, 0.1f, 0.9f)));
-
-
-
-        // Titel
-        Label settingsTitle = settingsContainer.addChild(new Label("Gebäude 30", new ElementId("settings-title"))); //TODO Dynamische Gebäudezahl einfügen
-        settingsTitle.setFontSize(48);
-
-        int i = 0;
-        int a = 10;
-        int b = -45;
-
-        // Effekt-Sound: Slider und Checkbox
-        Container propertyValuesContainer = settingsContainer.addChild(new Container());
-        propertyValuesContainer.addChild(new Label("„Preis:" + i, new ElementId("label-Text")));//TODO Variable hier einsetzen
-        propertyValuesContainer.addChild(new Label("„Miete:" + a, new ElementId("label-Text")));//TODO Variable hier einsetzen
-        propertyValuesContainer.addChild(new Label("„Hypothek:" + b, new ElementId("label-Text")));//TODO Variable hier einsetzen
-        propertyValuesContainer.setBackground(new QuadBackgroundComponent(new ColorRGBA(0.4657f, 0.4735f, 0.4892f, 1.0f)));
-
-        // Beenden-Button
-        Button quitButton = settingsContainer.addChild(new Button("Beenden", new ElementId("button")));
-        quitButton.setFontSize(32);
-        // Kaufen-Button
-        Button buyButton = settingsContainer.addChild(new Button("Kaufen", new ElementId("button")));
-        buyButton.setFontSize(32);
-
-        float padding = 10; // Padding around the settingsContainer for the background
-        backgroundContainer.setPreferredSize(settingsContainer.getPreferredSize().addLocal(padding, padding, 0));
-
-
-        // Zentriere das Menü
-        settingsContainer.setLocalTranslation(
-            (app.getCamera().getWidth() - settingsContainer.getPreferredSize().x) / 2,
-            (app.getCamera().getHeight() + settingsContainer.getPreferredSize().y) / 2,
-            8
-        );
-
-        backgroundContainer.setLocalTranslation(
-                (app.getCamera().getWidth() - settingsContainer.getPreferredSize().x - padding) / 2,
-                (app.getCamera().getHeight() + settingsContainer.getPreferredSize().y+ padding) / 2,
-                7
-        );
-
-        app.getGuiNode().attachChild(settingsContainer);
-    }
-
-    /**
-     * 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(settingsContainer);  // Entferne das Menü
-        app.getGuiNode().detachChild(backgroundContainer); //Entfernt Rand
-        app.getGuiNode().detachChild(overlayBackground);  // Entferne das Overlay
-        // app.setSettingsMenuOpen(false);                  // Menü als geschlossen markieren
-        // 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

@@ -1,137 +0,0 @@
-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.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
-        // 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

@@ -1,129 +0,0 @@
-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 settingsTitle = gateFieldContainer.addChild(new Label(field.getName(), new ElementId("settings-title")));
-        settingsTitle.setFontSize(48);
-        settingsTitle.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
-        // 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/SelectionListener.java

@@ -1,49 +0,0 @@
-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/model/build.gradle

@@ -7,4 +7,9 @@ description = 'Monopoly common model'
 dependencies {
     api project(":common")
     api libs.jme3.networking
-}
+    testImplementation libs.mockito.core
+
+    testImplementation project(":monopoly:client")
+    testImplementation project(":monopoly:model")
+    testImplementation project(":monopoly:server")
+}

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

@@ -34,13 +34,13 @@ public class MonopolyConfig extends Config {
      * The width of the game map in terms of grid units.
      */
     @Property("map.width")
-    private int mapWidth = 12;
+    private int mapWidth = 10;
 
     /**
      * The height of the game map in terms of grid units.
      */
     @Property("map.height")
-    private int mapHeight = 12;
+    private int mapHeight = 10;
 
     /**
      * Creates an instance of {@code MonopolyConfig} with default settings.

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

@@ -1,8 +0,0 @@
-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,11 +1,19 @@
+////////////////////////////////////////
+// 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.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 pp.monopoly.game.server.PlayerHandler;
 import pp.monopoly.message.client.ClientMessage;
 import pp.monopoly.message.server.BuyPropertyResponse;
 import pp.monopoly.message.server.DiceResult;
@@ -13,7 +21,6 @@ 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;
@@ -22,7 +29,6 @@ import pp.monopoly.message.server.TradeRequest;
 import pp.monopoly.message.server.ViewAssetsResponse;
 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,30 +37,26 @@ 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;
+
 /**
  * Controls the client-side game logic for Monopoly.
- * Handles interactions with the server and game state management on the client side.
+ * Manages the player's placement, interactions with the map, and response to server messages.
  */
 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<>();
-
-    /** 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 PlayerHandler playerHandler;
-
-    private BoardManager boardManager = new BoardManager();
+    private ClientState state = new ClientState(this) {
+        
+    };
 
     /**
      * Constructs a ClientGameLogic with the specified sender object.
@@ -65,18 +67,8 @@ 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;
@@ -94,14 +86,10 @@ public class ClientGameLogic implements ServerInterpreter, GameEventBroker {
         state.entry();
     }
 
-    public PlayerHandler getPlayerHandler() {
-        return playerHandler;
-    }
-
     /**
-     * Returns the player's game board.
+     * Returns the player's own map.
      *
-     * @return the player's game board
+     * @return the player's own map
      */
     public Board getBoard() {
         return board;
@@ -128,23 +116,32 @@ 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
      */
-    public void send(ClientMessage msg) {
-        if (clientSender == null) {
+    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);
-        }
     }
 
     /**
@@ -176,13 +173,12 @@ public class ClientGameLogic implements ServerInterpreter, GameEventBroker {
         synchronized (this) {
             copy = new ArrayList<>(listeners);
         }
-        for (GameEventListener listener : copy) {
+        for (GameEventListener listener : copy)
             event.notifyListener(listener);
-        }
     }
 
     /**
-     * Updates the game logic once per frame in the update loop.
+     * Called once per frame by the update loop.
      *
      * @param delta time in seconds since the last update call
      */
@@ -190,11 +186,6 @@ 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) {
         if (msg.isSuccessful()) {
@@ -204,66 +195,35 @@ public class ClientGameLogic implements ServerInterpreter, GameEventBroker {
             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) {
         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) {
         setInfoText("Event card drawn: " + msg.getCardDescription());
-        //event card logic
         playSound(Sound.EVENT_CARD);
     }
-
-    /**
-     * Handles the game over message.
-     *
-     * @param msg the message containing game over details
-     */
+    
     @Override
     public void received(GameOver msg) {
         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) {
-        playerHandler = msg.getPlayerHandler();
         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) {
         if (msg.isGoingToJail()) {
@@ -273,74 +233,28 @@ public class ClientGameLogic implements ServerInterpreter, GameEventBroker {
             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) {
-        
         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) {
         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) {
         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) {
-        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) {
-        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

@@ -1,8 +0,0 @@
-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/WaitForTurnState.java

@@ -1,8 +0,0 @@
-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

@@ -13,7 +13,7 @@ import java.util.Random;
 import pp.monopoly.message.server.DiceResult;
 import pp.monopoly.model.FieldVisitor;
 import pp.monopoly.model.Figure;
-import pp.monopoly.model.card.Card;
+import pp.monopoly.model.card.DeckHelper;
 import pp.monopoly.model.fields.BuildingProperty;
 import pp.monopoly.model.fields.EventField;
 import pp.monopoly.model.fields.FineField;
@@ -31,7 +31,8 @@ import pp.monopoly.model.fields.WacheField;
 public class Player implements FieldVisitor<Void>{
     private final int id;
     private String name;
-    private int accountBalance = 15000;
+    private PlayerColor color;
+    private int accountBalance = 0;
     private Figure figure;
     private List<PropertyField> properties;
     private int getOutOfJailCard;
@@ -62,24 +63,6 @@ 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
@@ -89,11 +72,11 @@ public class Player implements FieldVisitor<Void>{
     }
 
     /**
-     * Retuns the Playerhandler
-     * @return the Playerhandler
+     * Set the PlayerColor
+     * @param color the color to be set to
      */
-    public PlayerHandler getHandler() {
-        return handler;
+    void setColor(PlayerColor color) {
+        this.color = color;
     }
 
     /**
@@ -111,21 +94,6 @@ 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
@@ -147,11 +115,9 @@ 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
@@ -183,14 +149,6 @@ 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
@@ -306,8 +264,7 @@ public class Player implements FieldVisitor<Void>{
 
     @Override
     public Void visit(EventField field) {
-        Card c = getHandler().getLogic().getDeckHelper().drawCard();
-        getHandler().getLogic().getDeckHelper().visit(c, this);
+        DeckHelper.drawCard();
         return null;
     }
 
@@ -350,27 +307,7 @@ 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.
      */
@@ -501,22 +438,50 @@ public class Player implements FieldVisitor<Void>{
             getOutOfJailCard--;
             state = new ActiveState();
         }
-        
+
     }
-    private class WaitForTurnState implements PlayerState {
+
+    private class BankruptState implements PlayerState {
 
         @Override
         public DiceResult rollDice() {
-            throw new UnsupportedOperationException("not allowed");
+            // 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'");
+        }
+
+        @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,22 +2,17 @@ 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 pp.monopoly.model.LimitedLinkedList;
 /**
  * A class for helping with player actions and managing thier turns
  */
 public class PlayerHandler {
-    private List<Player> players = new LimitedLinkedList<>(6);
+    private List<Player> players = new LinkedList<>();
     private Set<Player> readyPlayers = new HashSet<>();
     private ServerGameLogic logic;
-    private Player hostPlayer;
-    private Player extra = null;
 
     /**
      * Contructs a PlayerHandler
@@ -47,14 +42,6 @@ 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
@@ -63,14 +50,6 @@ 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}
@@ -106,9 +85,6 @@ public class PlayerHandler {
             throw new IllegalArgumentException("Player already registered");
         }
         players.add(player);
-        if(hostPlayer == null) {
-            hostPlayer = player;
-        }
     }
 
     /**
@@ -132,13 +108,8 @@ public class PlayerHandler {
      * Completes a player turn and return the next player
      * @return the next players who is active
      */
-    public Player nextPlayer() {
+    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);
@@ -148,7 +119,7 @@ public class PlayerHandler {
      * Returns the {@link ServerGameLogic} of this PlayerHandler
      * @return the {@link ServerGameLogic} of this PlayerHandler
      */
-    public ServerGameLogic getLogic() {
+    ServerGameLogic getLogic() {
         return logic;
     }
 
@@ -163,26 +134,4 @@ public class PlayerHandler {
         }
         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();
-    }
-
-    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,30 +1,20 @@
 package pp.monopoly.game.server;
 
+import pp.monopoly.MonopolyConfig;
+import pp.monopoly.message.client.*;
+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.fields.BoardManager;
+import pp.monopoly.model.fields.PropertyField;
+
 import java.lang.System.Logger;
 import java.lang.System.Logger.Level;
 
 import pp.monopoly.MonopolyConfig;
-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;
 
 /**
  * Controls the server-side game logic for Monopoly.
@@ -36,11 +26,9 @@ public class ServerGameLogic implements ClientInterpreter {
     private final MonopolyConfig config;
     private final PlayerHandler playerHandler = new PlayerHandler(this);
     private final ServerSender serverSender;
-    private ServerState state = ServerState.LOBBY;
+    private ServerState state = ServerState.CREATEGAME;
     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.
@@ -132,7 +120,6 @@ public class ServerGameLogic implements ClientInterpreter {
 
         playerHandler.addPlayer(player);
         LOGGER.log(Level.DEBUG, "Player added: {0}", player.getId());
-        System.out.println("Anzahl Spieler verbunden:"+ playerHandler.getPlayerCount());
 
         return player;
     }
@@ -171,12 +158,8 @@ public class ServerGameLogic implements ClientInterpreter {
     public void received(EndTurn msg, int from) {
         Player player = playerHandler.getPlayerById(from);
         if (player != null && state == ServerState.INGAME) {
-            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));
-            }
+            LOGGER.log(Level.DEBUG, "Ending turn for player {0}", player.getName());
+            playerHandler.nextPlayer();
         }
     }
 
@@ -189,26 +172,12 @@ 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.setFigure(new Figure(1, -10, -10, Rotation.LEFT, msg.getFigure()));
-            //TODO add figure to the map
-            playerHandler.setPlayerReady(player, true);    
+            player.setColor(msg.getColor());
+            player.setName(msg.getName());
             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)); 
-            }
-            playerHandler.randomOrder();
-            send(playerHandler.getPlayerAtIndex(0), new NextPlayerTurn(playerHandler.getPlayerAtIndex(0)));
-        }
     }
 
     /**
@@ -267,12 +236,11 @@ public class ServerGameLogic implements ClientInterpreter {
      */
     @Override
     public void received(ViewAssetsRequest msg, int from) {
-        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());
+        Player player = playerHandler.getPlayerById(from);
+        if (player != null) {
+            LOGGER.log(Level.DEBUG, "Processing ViewAssetsRequest for player {0}", player.getName());
             
-            send(sender, new ViewAssetsResponse(boardManager, player.getProperties(), player.getAccountBalance(), player.getNumJailCard()));
+            send(player, new ViewAssetsResponse(player.getProperties(), player.getAccountBalance(), player.getNumJailCard()));
         }
     }
 
@@ -288,8 +256,4 @@ public class ServerGameLogic implements ClientInterpreter {
     public Player getPlayerById(int id) {
         return playerHandler.getPlayerById(id);
     }
-
-    public DeckHelper getDeckHelper() {
-        return deckHelper;
-    }
 }

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

@@ -1,43 +1,49 @@
 package pp.monopoly.message.client;
 
+import pp.monopoly.game.server.PlayerColor;
+
 /**
  * Represents a message indicating the player is ready to play.
  */
-public class PlayerReady extends ClientMessage {
-    private final boolean isReady;
-    private final String name;
-    private final String figure;
-    private final int startMoney;
+public class PlayerReady extends ClientMessage{
+    private boolean isReady;
+    private String name;
+    private PlayerColor color;
 
     /**
      * 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, String name, String figure, int startMoney) {
+    public PlayerReady(boolean isReady) {
         this.isReady = isReady;
-        this.name = name;
-        this.figure = figure;
-        this.startMoney = startMoney;
     }
 
+    /**
+     * Getter for the Name
+     * @return the Name
+     */
     public String getName() {
         return name;
     }
 
-    public String getFigure() {
-        return figure;
+    /**
+     * Getter for the Playercolor
+     * @return the Playercolor
+     */
+    public PlayerColor getColor() {
+        return color;
     }
 
+    /**
+     * 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/ViewAssetsRequest.java

@@ -1,25 +1,12 @@
 package pp.monopoly.message.client;
-
-import pp.monopoly.game.server.Player;
-
 /**
  * Represents a request from a player to view their assets.
  */
 public class ViewAssetsRequest extends ClientMessage{
 
-    private final Player player;
-
-    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/GameStart.java

@@ -1,19 +1,7 @@
 package pp.monopoly.message.server;
 
-import pp.monopoly.game.server.PlayerHandler;
-
 public class GameStart extends ServerMessage{
 
-    private final PlayerHandler ph;
-
-    public GameStart(PlayerHandler ph) {
-        this.ph = ph;
-    }
-
-    public PlayerHandler getPlayerHandler() {
-        return ph;
-    }
-
     @Override
     public void accept(ServerInterpreter interpreter) {
         interpreter.received(this);

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

@@ -1,28 +0,0 @@
-package pp.monopoly.message.server;
-
-import pp.monopoly.game.server.Player;
-
-public class NextPlayerTurn extends ServerMessage{
-
-    private final Player player;
-
-    public NextPlayerTurn(Player player) {
-        this.player = player;
-    }
-
-    @Override
-    public void accept(ServerInterpreter interpreter) {
-        interpreter.received(this);
-    }
-
-    @Override
-    public String getInfoTextKey() {
-        // TODO Auto-generated method stub
-        throw new UnsupportedOperationException("Unimplemented method 'getInfoTextKey'");
-    }
-
-    public Player getPlayer() {
-        return player;
-    }
-
-}

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

@@ -89,11 +89,4 @@ public interface ServerInterpreter {
      * @param msg the TradeRequest message received
      */
     void received(TradeRequest msg);
-
-    /**
-     * Handles a NextPlayerTurn message received from the server.
-     *
-     * @param msg the NextPlayerTurn message received
-     */
-    void received(NextPlayerTurn msg);
 }

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

@@ -2,16 +2,13 @@ package pp.monopoly.message.server;
 
 import java.util.List;
 
-import pp.monopoly.model.fields.BoardManager;
 import pp.monopoly.model.fields.PropertyField;
-
 /**
  * Represents a response containing the player's assets.
  */
 public class ViewAssetsResponse extends ServerMessage{
 
     private final List<PropertyField> properties;
-    private final BoardManager board;
     private final int accountBalance;
     private final int jailCards;
 
@@ -21,8 +18,7 @@ public class ViewAssetsResponse extends ServerMessage{
      * @param properties    a List of PropertyField objects representing the player's properties
      * @param accountBalance the player's current account balance
      */
-    public ViewAssetsResponse(BoardManager board, List<PropertyField> properties, int accountBalance, int jailCards) {
-        this.board = board;
+    public ViewAssetsResponse(List<PropertyField> properties, int accountBalance, int jailCards) {
         this.properties = properties;
         this.accountBalance = accountBalance;
         this.jailCards = jailCards;
@@ -51,7 +47,4 @@ public class ViewAssetsResponse extends ServerMessage{
         return jailCards;
     }
 
-    public BoardManager getboard() {
-        return board;
-    }
 }

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

@@ -57,6 +57,7 @@ public class Board {
         this.width = width;
         this.height = height;
         this.eventBroker = eventBroker;
+        addItem(new Figure(5, 5, 5, Rotation.LEFT));
     }
 
     /**

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

@@ -0,0 +1,7 @@
+package pp.monopoly.model;
+
+import pp.monopoly.model.card.Card;
+
+public interface CardVisitor<T> {
+    T visit(Card c);
+}

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

@@ -8,11 +8,31 @@ import static java.lang.Math.max;
 import static java.lang.Math.min;
 
 public class Figure implements Item{
-    private final String type;
+    /**
+     * Enumeration representing the different statuses a Figure can have during the game.
+     */
+    public enum Status {
+        /**
+         * The ship is in its normal state, not being previewed for placement.
+         */
+        NORMAL,
+
+        /**
+         * The ship is being previewed in a valid position for placement.
+         */
+        VALID_PREVIEW,
+
+        /**
+         * The ship is being previewed in an invalid position for placement.
+         */
+        INVALID_PREVIEW
+    }
+
     private final int length; // The length of the Figure
     private int x;            // The x-coordinate of the Figure's position
     private int y;            // The y-coordinate of the Figure's position
     private Rotation rot;     // The rotation of the Figure
+    private Status status;    // The current status of the Figure
     private final Set<IntPoint> damaged = new HashSet<>(); // The set of positions that have been hit on this ship
 
     /**
@@ -20,7 +40,7 @@ public class Figure implements Item{
      * at position (0, 0), with a default rotation of RIGHT.
      */
     private Figure() {
-        this(0, 0, 0, Rotation.RIGHT, "cube");
+        this(0, 0, 0, Rotation.RIGHT);
     }
 
     /**
@@ -31,12 +51,12 @@ public class Figure implements Item{
      * @param y      the y-coordinate of the Figure's initial position
      * @param rot    the rotation of the Figure
      */
-    public Figure(int length, int x, int y, Rotation rot, String type) {
+    public Figure(int length, int x, int y, Rotation rot) {
         this.x = x;
         this.y = y;
         this.rot = rot;
         this.length = length;
-        this.type = type;
+        this.status = Status.NORMAL;
     }
 
     /**
@@ -67,7 +87,7 @@ public class Figure implements Item{
         this.x = x;
         this.y = y;
     }
-    
+
     /**
      * Moves the Figure to the specified position.
      *
@@ -78,46 +98,21 @@ public class Figure implements Item{
     }
 
     /**
-     * Moves the Figure to the specified coordinates.
+     * Returns the current status of the Figure.
      *
-     * @param x the new x-coordinate of the Figure's position
-     * @param y the new y-coordinate of the Figure's position
+     * @return the status of the Figure
      */
-    public void moveTo(int fieldId) {
-        moveTo(fieldIdToPosition(fieldId));
+    public Status getStatus() {
+        return status;
     }
 
-    private IntPoint fieldIdToPosition(int fieldId) {
-        if (fieldId < 0 || fieldId > 39) {
-            throw new IllegalArgumentException("Invalid fieldId: " + fieldId);
-        }
-
-        // Determine which edge and position along the edge
-        if (fieldId <= 9) {
-            // Bottom edge: From (-10, -10) to (10, -10)
-            int x = -10 + fieldId * 2;
-            return new IntPoint(x, -10);
-        } else if (fieldId <= 19) {
-            // Right edge: From (10, -10) to (10, 10)
-            int y = -10 + (fieldId - 10) * 2;
-            return new IntPoint(10, y);
-        } else if (fieldId <= 29) {
-            // Top edge: From (10, 10) to (-10, 10)
-            int x = 10 - (fieldId - 20) * 2;
-            return new IntPoint(x, 10);
-        } else {
-            // Left edge: From (-10, 10) to (-10, -10)
-            int y = 10 - (fieldId - 30) * 2;
-            return new IntPoint(-10, y);
-        }
-    }
-
-    private Rotation fieldIdToRotation(int fieldId) {
-        if (fieldId >= 0 && fieldId <= 10) return Rotation.DOWN;
-        else if (fieldId <= 20) return Rotation.LEFT;
-        else if (fieldId <= 30) return Rotation.UP;
-        else if (fieldId <= 39) return Rotation.RIGHT;
-        else throw new IllegalArgumentException();
+    /**
+     * Sets the status of the Figure.
+     *
+     * @param status the new status to be set for the Figure
+     */
+    public void setStatus(Status status) {
+        this.status = status;
     }
 
     /**

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

@@ -1,49 +0,0 @@
-package pp.monopoly.model;
-
-import java.util.LinkedList;
-
-/**
- * A LinkedList with a maximum size limit.
- *
- * @param <E> the type of elements held in this collection
- */
-public class LimitedLinkedList<E> extends LinkedList<E> {
-
-    private final int maxSize;
-
-    /**
-     * Constructs a LimitedLinkedList with the specified maximum size.
-     *
-     * @param maxSize the maximum number of elements this list can hold
-     */
-    public LimitedLinkedList(int maxSize) {
-        if (maxSize <= 0) {
-            throw new IllegalArgumentException("Max size must be greater than 0");
-        }
-        this.maxSize = maxSize;
-    }
-
-    /**
-     * Adds an element to the list. If the list exceeds its maximum size,
-     * the oldest element (first) is removed.
-     *
-     * @param element the element to be added
-     * @return true if the element was added successfully
-     */
-    @Override
-    public boolean add(E element) {
-        if (size() >= maxSize) {
-            return false;
-        }
-        return super.add(element);
-    }
-
-    /**
-     * Gets the maximum size of this list.
-     *
-     * @return the maximum size
-     */
-    public int getMaxSize() {
-        return maxSize;
-    }
-}

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

@@ -6,112 +6,66 @@ import pp.monopoly.model.fields.PropertyField;
 import java.util.List;
 
 /**
- * Handles a single trade between two players.
- * Encapsulates trade details, validation, acceptance, and rejection.
+ * Helper class that handles the trade logic between two players.
+ * Manages trade initiation, validation, acceptance, and rejection involving multiple properties, money, and jail cards.
  */
 public class TradeHandler {
 
-    private final Player sender;
-    private final Player receiver;
-    private final int offeredAmount;
-    private final List<PropertyField> offeredProperties;
-    private final int offeredJailCards;
-    private final int requestedAmount;
-    private final List<PropertyField> requestedProperties;
-    private final int requestedJailCards;
-    private Boolean status = null;
-
     /**
-     * Constructs a TradeHandler for a single trade instance.
+     * Initiates a trade offer between two players involving properties, money, and jail cards.
      *
-     * @param sender             the Player initiating the trade
-     * @param receiver           the Player receiving the trade offer
-     * @param offeredAmount      the amount of money offered by the sender
-     * @param offeredProperties  the properties offered by the sender
-     * @param offeredJailCards   the jail cards offered by the sender
-     * @param requestedAmount    the amount of money requested from the receiver
-     * @param requestedProperties the properties requested from the receiver
-     * @param requestedJailCards the jail cards requested from the receiver
+     * @param sender             the Player who is initiating the trade
+     * @param receiver           the Player who is the target of the trade offer
+     * @param offeredAmount      the amount of money the sender offers
+     * @param offeredProperties  the list of properties the sender offers
+     * @param offeredJailCards   the number of jail cards the sender offers
+     * @param requestedAmount    the amount of money the sender requests from the receiver
+     * @param requestedProperties the list of properties the sender requests from the receiver
+     * @param requestedJailCards the number of jail cards the sender requests from the receiver
+     * @return true if the trade offer is valid and initiated, false otherwise
      */
-    public TradeHandler(Player sender, Player receiver, int offeredAmount, List<PropertyField> offeredProperties,
-                        int offeredJailCards, int requestedAmount, List<PropertyField> requestedProperties, int requestedJailCards) {
-        this.sender = sender;
-        this.receiver = receiver;
-        this.offeredAmount = offeredAmount;
-        this.offeredProperties = offeredProperties;
-        this.offeredJailCards = offeredJailCards;
-        this.requestedAmount = requestedAmount;
-        this.requestedProperties = requestedProperties;
-        this.requestedJailCards = requestedJailCards;
-    }
-
-    public int getOfferedAmount() {
-        return offeredAmount;
-    }
-
-    public int getOfferedJailCards() {
-        return offeredJailCards;
-    }
-
-    public List<PropertyField> getOfferedProperties() {
-        return offeredProperties;
-    }
-
-    public Player getReceiver() {
-        return receiver;
-    }
-
-    public int getRequestedAmount() {
-        return requestedAmount;
-    }
-
-    public int getRequestedJailCards() {
-        return requestedJailCards;
-    }
-
-    public List<PropertyField> getRequestedProperties() {
-        return requestedProperties;
-    }
-
-    public Player getSender() {
-        return sender;
-    }
-
-    public Boolean getStatus() {
-        return status;
-    }
-
-    /**
-     * Initiates the trade and validates its terms.
-     *
-     * @return true if the trade is valid and can proceed, false otherwise
-     */
-    public boolean initiateTrade() {
-        if (!validateTrade()) {
+    public boolean initiateTrade(Player sender, Player receiver, int offeredAmount, List<PropertyField> offeredProperties,
+                                 int offeredJailCards, int requestedAmount, List<PropertyField> requestedProperties, int requestedJailCards) {
+        // Validate the trade offer
+        if (!validateTrade(sender, offeredAmount, offeredProperties, offeredJailCards, receiver, requestedAmount, requestedProperties, requestedJailCards)) {
             System.out.println("Trade offer is invalid.");
             return false;
         }
-        System.out.println("Trade initiated by " + sender.getName() + " to " + receiver.getName());
+
+        // Notify the receiver about the trade offer (this would be an actual message in a real implementation)
+        System.out.println("Trade offer initiated by " + sender.getName() + " to " + receiver.getName());
         return true;
     }
 
     /**
-     * Completes the trade by transferring money, properties, and jail cards.
+     * Accepts the trade offer and completes the trade between two players.
+     *
+     * @param sender             the Player who initiated the trade
+     * @param receiver           the Player who accepted the trade
+     * @param offeredAmount      the amount of money to transfer from the sender to the receiver
+     * @param offeredProperties  the list of properties to transfer from the sender to the receiver
+     * @param offeredJailCards   the number of jail cards to transfer from the sender to the receiver
+     * @param requestedAmount    the amount of money to transfer from the receiver to the sender
+     * @param requestedProperties the list of properties to transfer from the receiver to the sender
+     * @param requestedJailCards the number of jail cards to transfer from the receiver to the sender
      */
-    public void acceptTrade() {
+    public void acceptTrade(Player sender, Player receiver, int offeredAmount, List<PropertyField> offeredProperties,
+                            int offeredJailCards, int requestedAmount, List<PropertyField> requestedProperties, int requestedJailCards) {
         // Transfer money
-        sender.earnMoney(-offeredAmount);
-        receiver.earnMoney(offeredAmount);
+        sender.earnMoney(-offeredAmount);  // Deduct money from the sender
+        receiver.earnMoney(offeredAmount); // Add money to the receiver
 
-        receiver.earnMoney(-requestedAmount);
-        sender.earnMoney(requestedAmount);
+        receiver.earnMoney(-requestedAmount); // Deduct money from the receiver
+        sender.earnMoney(requestedAmount);    // Add money to the sender
 
-        // Transfer properties
+        // Transfer ownership of the properties from sender to receiver
         if (offeredProperties != null) {
             for (PropertyField property : offeredProperties) {
                 transferProperty(sender, receiver, property);
             }
         }
+
+        // Transfer ownership of the properties from receiver to sender
         if (requestedProperties != null) {
             for (PropertyField property : requestedProperties) {
                 transferProperty(receiver, sender, property);
@@ -122,57 +76,73 @@ public class TradeHandler {
         transferJailCards(sender, receiver, offeredJailCards);
         transferJailCards(receiver, sender, requestedJailCards);
 
-        System.out.println("Trade completed between " + sender.getName() + " and " + receiver.getName());
+        System.out.println("Trade accepted. " + sender.getName() + " and " + receiver.getName() + " completed the trade.");
     }
 
     /**
-     * Rejects the trade.
-     */
-    public void rejectTrade() {
-        System.out.println(receiver.getName() + " rejected the trade.");
-    }
-
-    /**
-     * Validates the trade offer by checking ownership, balances, and jail cards.
+     * Rejects the trade offer.
      *
-     * @return true if the trade is valid, false otherwise
+     * @param receiver the Player who is rejecting the trade
      */
-    private boolean validateTrade() {
-        // Validate sender's ability to offer money
+    public void rejectTrade(Player receiver) {
+        System.out.println("Trade rejected by " + receiver.getName());
+    }
+
+    /**
+     * Validates a trade offer by checking if the sender and receiver own the properties involved,
+     * have sufficient funds for the money involved in the trade, and have enough jail cards.
+     *
+     * @param sender             the Player initiating the trade
+     * @param offeredAmount      the amount of money the sender is offering
+     * @param offeredProperties  the list of properties the sender is offering
+     * @param offeredJailCards   the number of jail cards the sender is offering
+     * @param receiver           the Player receiving the trade offer
+     * @param requestedAmount    the amount of money the sender is requesting
+     * @param requestedProperties the list of properties the sender is requesting from the receiver
+     * @param requestedJailCards the number of jail cards the sender is requesting from the receiver
+     * @return true if the trade offer is valid, false otherwise
+     */
+    private boolean validateTrade(Player sender, int offeredAmount, List<PropertyField> offeredProperties, int offeredJailCards,
+                                  Player receiver, int requestedAmount, List<PropertyField> requestedProperties, int requestedJailCards) {
+        // Check if sender has enough money to offer
         if (sender.getAccountBalance() < offeredAmount) {
-            System.out.println("Sender does not have enough money to offer.");
+            System.out.println("Sender does not have enough balance to make this offer.");
             return false;
         }
 
-        // Validate receiver's ability to fulfill the requested amount
+        // Check if receiver has enough money to offer
         if (receiver.getAccountBalance() < requestedAmount) {
-            System.out.println("Receiver does not have enough money to fulfill the request.");
+            System.out.println("Receiver does not have enough balance to fulfill requested amount.");
             return false;
         }
 
-        // Validate property ownership
+        // Check if sender owns all the offered properties
         if (offeredProperties != null) {
             for (PropertyField property : offeredProperties) {
                 if (!sender.getProperties().contains(property)) {
-                    System.out.println("Sender does not own property: " + property.getName());
-                    return false;
-                }
-            }
-        }
-        if (requestedProperties != null) {
-            for (PropertyField property : requestedProperties) {
-                if (!receiver.getProperties().contains(property)) {
-                    System.out.println("Receiver does not own property: " + property.getName());
+                    System.out.println("Sender does not own the property " + property.getName() + " being offered.");
                     return false;
                 }
             }
         }
 
-        // Validate jail cards
+        // Check if receiver owns all the requested properties
+        if (requestedProperties != null) {
+            for (PropertyField property : requestedProperties) {
+                if (!receiver.getProperties().contains(property)) {
+                    System.out.println("Receiver does not own the property " + property.getName() + " requested.");
+                    return false;
+                }
+            }
+        }
+
+        // Check if sender has enough jail cards to offer
         if (sender.getNumJailCard() < offeredJailCards) {
             System.out.println("Sender does not have enough jail cards to offer.");
             return false;
         }
+
+        // Check if receiver has enough jail cards to fulfill the request
         if (receiver.getNumJailCard() < requestedJailCards) {
             System.out.println("Receiver does not have enough jail cards to fulfill the request.");
             return false;
@@ -182,16 +152,17 @@ public class TradeHandler {
     }
 
     /**
-     * Transfers a property between players.
+     * Transfers a property from one player to another.
      *
-     * @param from the Player transferring the property
-     * @param to   the Player receiving the property
+     * @param from     the Player transferring the property
+     * @param to       the Player receiving the property
      * @param property the PropertyField being transferred
      */
     private void transferProperty(Player from, Player to, PropertyField property) {
         from.sellProperty(property);
         to.buyProperty(property);
-        property.setOwner(to);
+        property.setOwner(to); // Update the property's owner
+
         System.out.println("Property " + property.getName() + " transferred from " + from.getName() + " to " + to.getName());
     }
 
@@ -207,6 +178,6 @@ public class TradeHandler {
             from.removeJailCard();
             to.addJailCard();
         }
-        System.out.println(numCards + " jail card(s) transferred from " + from.getName() + " to " + to.getName());
+        System.out.println("Transferred " + numCards + " jail card(s) from " + from.getName() + " to " + to.getName());
     }
 }

Projekte/monopoly/model/src/main/java/pp/monopoly/model/card/Card.java

@@ -1,7 +1,5 @@
 package pp.monopoly.model.card;
 
-import pp.monopoly.game.server.Player;
-
 public class Card {
     private final String description;
     private final String keyword;
@@ -11,11 +9,11 @@ public class Card {
         this.keyword = keyword;
     }
 
-    public void accept(DeckHelper visitor, Player player) {
-        visitor.visit(this, player);
+    public void accept(DeckHelper visitor) {
+        visitor.visit(this);
     }
 
-    String getDescription() {
+    public String getDescription() {
         return description;
     }
 

Projekte/monopoly/model/src/main/java/pp/monopoly/model/card/DeckHelper.java

@@ -2,318 +2,25 @@ package pp.monopoly.model.card;
 
 import java.util.ArrayList;
 import java.util.Collections;
-import java.util.LinkedList;
 import java.util.List;
 import java.util.Queue;
 
-import pp.monopoly.game.server.Player;
-import pp.monopoly.message.client.EndTurn;
+import pp.monopoly.model.CardVisitor;
 
-public class DeckHelper{
+public class DeckHelper implements CardVisitor<Void>{
 
-    private Queue<Card> cards;
-    private List<Card> drawn = new ArrayList<>();
+    private static Queue<Card> cards;
 
-    public DeckHelper() {
-        cards = new LinkedList<Card>();
-        cards.add(new Card("Du wurdest mit einem Dienst KFZ geblitzt. Zahle: 800€", "dienst-kfz-blitzer"));
-        cards.add(new Card("Die erste Spoparty steht bevor. Ziehe vor zum 23er.", "spoparty"));
-        cards.add(new Card("Du kommst aus dem Gulak frei.", "gulak-frei-1"));
-        cards.add(new Card("Du kommst aus dem Gulak frei.", "gulak-frei-2"));
-        cards.add(new Card("Du hast den Dienstführerschein bestanden. Ziehe vor bis Teststrecke.", "dienstfuehrerschein"));
-        cards.add(new Card("Malkmus läd zum Pubquiz ein. Rücke vor bis zum 20er.", "pubquiz"));
-        cards.add(new Card("Du warst ohne Namensschild in der Truppenküche. Rücke vor zum 10er. Gehe nicht über Monatsgehalt. Ziehe keine 2000x€ ein.", "namensschild-truppenkueche"));
-        cards.add(new Card("Du hast heute die Spendierhosen an und gibst eine Runde in der Unibar. Zahle jedem Spieler: 400€", "spendierhosen-unibar"));
-        cards.add(new Card("Du warst in der Prüfungsphase krank. Gehe 3 Felder zurück.", "pruefungsphase-krank"));
-        cards.add(new Card("Ziehe vor bis zum nächsten Monatsgehalt.", "naechstes-monatsgehalt"));
-        cards.add(new Card("Du hast ein Antreten verschlafen. Zahle: 500€", "antreten-verschlafen-1"));
-        cards.add(new Card("Du hast den Maibock organisiert. Du erhältst: 3000€", "maibock-organisiert"));
-        cards.add(new Card("Der Spieß macht eine unangekündigte Inventur. Zahle für jedes Haus: 400€ und jedes Hotel: 2800€", "inventur-haeuser-hotels"));
-        cards.add(new Card("Es gab keine Mozzarella Bällchen mehr für Thoma. Alle Spieler ziehen vor auf Gym.", "dienstsport-gym"));
-        cards.add(new Card("Auf deiner Stube wurde Schimmel gefunden. Gehe ins Gulak. Begib Dich direkt dorthin. Gehe nicht über Monatsgehalt. Ziehe nicht ein.", "schimmel-gulak"));
-        cards.add(new Card("Deine Stube ist nach einer Partynacht nicht mehr bewohnbar. Du ziehst ins Gulak. Begib Dich direkt dorthin. Gehe nicht über Monatsgehalt. Ziehe nicht ein.", "partynacht-gulak"));
-        cards.add(new Card("Das Jahresabschlussantreten steht an. Ziehe vor bis Schwimmhalle.", "jahresabschlussantreten"));
-        cards.add(new Card("Du wurdest beim Verkaufen von Versicherungen erwischt. Zahle: 4000€", "verkaufen-versicherungen"));
-        cards.add(new Card("Du musstest einen Rückstuferantrag stellen. Setze eine Runde aus.", "rueckstuferantrag"));
-        cards.add(new Card("Auf einer Hausfeier bist du betrunken auf der Treppe gestürzt und dabei auf einen Kameraden gefallen. Zahle: 800€ und gehe zurück zu SanZ.", "hausfeier-sturz"));
-        cards.add(new Card("Beförderung. Beim nächsten Monatsgehalt ziehst du ein: 3000€", "befoerderung"));
-        cards.add(new Card("Du entscheidest dich für eine Dienstreise nach Lourd. Zahle: 1000€ und setze eine Runde aus.", "dienstreise-lourd"));
-        cards.add(new Card("Du warst fleißig Blutspenden und erhältst einen Tag Sonderurlaub. Du bist nochmal an der Reihe.", "blutspenden-sonderurlaub"));
-        cards.add(new Card("Dir wurde auf dem Oktoberfest dein Geldbeutel geklaut. Gebe 10% deines Vermögens ab.", "geldbeutel-oktoberfest"));
-        cards.add(new Card("Du wirst von deinem Chef für vorbildliches Verhalten gelobt. Du erhältst: 4000€", "lob-chef"));
-        cards.add(new Card("Deine Bekanntschaft von letzter Nacht war eine Spo. Lasse dich testen und zahle: 200€", "spo-testen"));
-        cards.add(new Card("Du wurdest von Kranz geexmattet. Gehe zurück zu Prüfungsamt.", "kranz-exmatrikulation"));
-        cards.add(new Card("Die letzte Party ist ein wenig eskaliert. Setze eine Runde aus.", "party-eskaliert"));
-        cards.add(new Card("Du wurdest zur VP gewählt und schmeißt eine Einstandsparty. Zahle: 800€", "vp-einstandsparty"));
-        cards.add(new Card("Du hast eine Party veranstaltet und dick Gewinn gemacht. Ziehe ein: 1500€", "party-gewinn"));
-        cards.add(new Card("Zur falschen Zeit am falschen Ort. Du musst einen Bergmarsch planen und setzt eine Runde aus.", "bergmarsch"));
-        cards.add(new Card("Dein Jodel eines Eispenis mit Unterhodenbeleuchtung geht viral. Ziehe ein: 1000€", "jodel-eispenis"));
+    private DeckHelper() {
+        
     }
 
-    public void visit(Card card, Player player) {
-        switch (card.getKeyword()) {
-            case "dienst-kfz-blitzer":
-                dienstKfzBlitzer(player);
-                break;
-        
-            case "spoparty":
-                spoparty(player);
-                break;
-        
-            case "gulak-frei-1":
-            case "gulak-frei-2":
-                gulakFrei(player);
-                break;
-        
-            case "dienstfuehrerschein":
-                dienstfuehrerschein(player);
-                break;
-        
-            case "pubquiz":
-                pubquiz(player);
-                break;
-        
-            case "namensschild-truppenkueche":
-                namensschildTruppenkueche(player);
-                break;
-        
-            case "spendierhosen-unibar":
-                spendierhosenUnibar(player);
-                break;
-        
-            case "pruefungsphase-krank":
-                pruefungsphaseKrank(player);
-                break;
-        
-            case "naechstes-monatsgehalt":
-                naechstesMonatsgehalt(player);
-                break;
-        
-            case "antreten-verschlafen-1":
-                antretenVerschlafen(player);
-                break;
-        
-            case "maibock-organisiert":
-                maibockOrganisiert(player);
-                break;
-        
-            case "inventur-haeuser-hotels":
-                inventurHaeuserHotels(player);
-                break;
-        
-            case "dienstsport-gym":
-                dienstsportGym(player);
-                break;
-        
-            case "schimmel-gulak":
-                schimmelGulak(player);
-                break;
-        
-            case "partynacht-gulak":
-                partynachtGulak(player);
-                break;
-        
-            case "jahresabschlussantreten":
-                jahresabschlussantreten(player);
-                break;
-        
-            case "verkaufen-versicherungen":
-                verkaufenVersicherungen(player);
-                break;
-        
-            case "rueckstuferantrag":
-                rueckstuferantrag(player);
-                break;
-        
-            case "hausfeier-sturz":
-                hausfeierSturz(player);
-                break;
-        
-            case "befoerderung":
-                befoerderung(player);
-                break;
-        
-            case "dienstreise-lourd":
-                dienstreiseLourd(player);
-                break;
-        
-            case "blutspenden-sonderurlaub":
-                blutspendenSonderurlaub(player);
-                break;
-        
-            case "geldbeutel-oktoberfest":
-                geldbeutelOktoberfest(player);
-                break;
-        
-            case "lob-chef":
-                lobChef(player);
-                break;
-        
-            case "spo-testen":
-                spoTesten(player);
-                break;
-        
-            case "kranz-exmatrikulation":
-                kranzExmatrikulation(player);
-                break;
-        
-            case "party-eskaliert":
-                partyEskaliert(player);
-                break;
-        
-            case "vp-einstandsparty":
-                vpEinstandsparty(player);
-                break;
-        
-            case "party-gewinn":
-                partyGewinn(player);
-                break;
-        
-            case "bergmarsch":
-                bergmarsch(player);
-                break;
-        
-            case "jodel-eispenis":
-                jodelEispenis(player);
-                break;
-        
-            default:
-                break;
-        }
+    @Override
+    public Void visit(Card c) {
+        // TODO Auto-generated method stub
+        throw new UnsupportedOperationException("Unimplemented method 'visit'");
     }
 
-        private void dienstKfzBlitzer(Player player) {
-            player.pay(800);
-        }
-    
-        private void spoparty(Player player) {
-            player.movePos(14);
-        }
-    
-        private void gulakFrei(Player player) {
-            player.addJailCard();
-        }
-    
-        private void dienstfuehrerschein(Player player) {
-            player.movePos(20);
-        }
-    
-        private void pubquiz(Player player) {
-            player.movePos(39);
-        }
-    
-        private void namensschildTruppenkueche(Player player) {
-            //TODO
-        }
-    
-        private void spendierhosenUnibar(Player player) {
-            for (Player p : player.getHandler().getPlayers()) {
-                p.earnMoney(400);
-            }
-            player.pay(player.getHandler().getPlayerCount()*400 - 400);
-        }
-    
-        private void pruefungsphaseKrank(Player player) {
-            player.movePos(player.getFieldID() - 3);
-        }
-    
-        private void naechstesMonatsgehalt(Player player) {
-            player.movePos(0);
-        }
-    
-        private void antretenVerschlafen(Player player) {
-            player.pay(500);
-        }
-    
-        private void maibockOrganisiert(Player player) {
-            player.earnMoney(3000);
-        }
-    
-        private void inventurHaeuserHotels(Player player) {
-            player.pay(player.getNumHouses() * 400 + player.getNumHotels() * 2800);
-        }
-    
-        private void dienstsportGym(Player player) {
-            for (Player p : player.getHandler().getPlayers()) {
-                p.movePos(1);
-            }
-        }
-    
-        private void schimmelGulak(Player player) {
-            player.movePos(10);
-        }
-    
-        private void partynachtGulak(Player player) {
-            player.movePos(10);
-        }
-    
-        private void jahresabschlussantreten(Player player) {
-            player.movePos(17); 
-        }
-    
-        private void verkaufenVersicherungen(Player player) {
-            player.pay(4000);
-        }
-    
-        private void rueckstuferantrag(Player player) {
-            player.getHandler().getLogic().received(new EndTurn(), player.getId());
-        }
-    
-        private void hausfeierSturz(Player player) {
-            player.pay(800);
-            player.movePos(32);
-        }
-    
-        private void befoerderung(Player player) {
-            player.earnMoney(3000);
-        }
-    
-        private void dienstreiseLourd(Player player) {
-            player.pay(1000);
-            player.getHandler().getLogic().received(new EndTurn(), player.getId());
-        }
-    
-        private void blutspendenSonderurlaub(Player player) {
-            player.getHandler().extraTurn(player);
-        }
-    
-        private void geldbeutelOktoberfest(Player player) {
-            player.pay(player.getAccountBalance() / 10);
-        }
-    
-        private void lobChef(Player player) {
-            player.earnMoney( 4000);
-        }
-    
-        private void spoTesten(Player player) {
-            player.pay( 200);
-        }
-    
-        private void kranzExmatrikulation(Player player) {
-            player.movePos(5);
-        }
-    
-        private void partyEskaliert(Player player) {
-            player.getHandler().getLogic().received(new EndTurn(), player.getId());
-        }
-    
-        private void vpEinstandsparty(Player player) {
-            player.pay( 800);
-        }
-    
-        private void partyGewinn(Player player) {
-            player.earnMoney( 1500);
-        }
-    
-        private void bergmarsch(Player player) {
-            player.getHandler().getLogic().received(new EndTurn(), player.getId());
-        }
-    
-        private void jodelEispenis(Player player) {
-            player.earnMoney(1000);
-        }
-    
-
     private void shuffle() {
         List<Card> cardList = new ArrayList<>(cards);
         Collections.shuffle(cardList);
@@ -321,13 +28,7 @@ public class DeckHelper{
         cards.addAll(cardList);
     }
 
-    public Card drawCard() {
-        if (cards.isEmpty()) {
-            drawn.forEach(cards::add);
-            shuffle();
-        }
-        Card card = cards.poll();
-        drawn.add(card);
-        return card;
+    public static Card drawCard() {
+        return cards != null ? cards.poll() : null;
     }
 }

Projekte/monopoly/model/src/main/java/pp/monopoly/model/fields/BoardManager.java

@@ -22,49 +22,49 @@ public class BoardManager {
      * Creates a Monopoly GameBoard
      * @return the List of Fields in correct  Order
      */
-    public static List<Field> createBoard() {
+    private static List<Field> createBoard() {
         ArrayList<Field> fields = new ArrayList<>();
 
         fields.add(new GoField());
-        fields.add(new BuildingProperty("Gym", 1, 600, 20, 500, FieldColor.BROWN));
+        fields.add(new BuildingProperty("Gym", 1, 600, 20));
         fields.add(new EventField("Hausfeier", 2));
-        fields.add(new BuildingProperty("Sportplatz", 3, 600, 40, 500, FieldColor.BROWN));
+        fields.add(new BuildingProperty("Sportplatz", 3, 600, 40));
         fields.add(new FineField("Diszi", 4, 2000));
         fields.add(new GateField("Südtor", 5));
-        fields.add(new BuildingProperty("Studium+", 6, 1000, 60, 500, FieldColor.BLUE_LIGHT));
+        fields.add(new BuildingProperty("Studium+", 6, 1000, 60));
         fields.add(new EventField("Üvas", 7));
-        fields.add(new BuildingProperty("PhysikHörsaal", 8, 1000, 60, 500, FieldColor.BLUE_LIGHT));
-        fields.add(new BuildingProperty("Audimax", 9, 1200, 80, 500, FieldColor.BLUE_LIGHT));
+        fields.add(new BuildingProperty("PhysikHörsaal", 8, 1000, 60));
+        fields.add(new BuildingProperty("Audimax", 9, 1200, 80));
         fields.add(new GulagField());
-        fields.add(new BuildingProperty("99er", 11, 1400, 100, 1000, FieldColor.PINK));
+        fields.add(new BuildingProperty("99er", 11, 1400, 100));
         fields.add(new FoodField("Brandl", 12));
-        fields.add(new BuildingProperty("12er", 13, 1400, 100, 1000, FieldColor.PINK));
-        fields.add(new BuildingProperty("23er", 14, 1600, 120, 1000, FieldColor.PINK));
+        fields.add(new BuildingProperty("12er", 13, 1400, 100));
+        fields.add(new BuildingProperty("23er", 14, 1600, 120));
         fields.add(new GateField("HauptWache", 15));
-        fields.add(new BuildingProperty("Schwimmhalle", 16, 1800, 140, 1000, FieldColor.ORANGE));
-        fields.add(new BuildingProperty("CISM-Bahn", 17, 1800, 140, 1000, FieldColor.ORANGE));
+        fields.add(new BuildingProperty("Schwimmhalle", 16, 1800, 140));
+        fields.add(new BuildingProperty("CISM-Bahn", 17, 1800, 140));
         fields.add(new EventField("Marine-Welcome-Party", 18));
-        fields.add(new BuildingProperty("Kletterturm", 19, 2000, 160, 1000, FieldColor.ORANGE));
+        fields.add(new BuildingProperty("Kletterturm", 19, 2000, 160));
         fields.add(new TestStreckeField());
-        fields.add(new BuildingProperty("StudFBer C", 21, 2200, 180, 1500, FieldColor.RED));
+        fields.add(new BuildingProperty("StudFBer C", 21, 2200, 180));
         fields.add(new EventField("Üvas", 22));
-        fields.add(new BuildingProperty("StudFBer B", 23, 2200, 180, 1500, FieldColor.RED));
-        fields.add(new BuildingProperty("StudFBer A", 24, 2400, 200, 1500, FieldColor.RED));
+        fields.add(new BuildingProperty("StudFBer B", 23, 2200, 180));
+        fields.add(new BuildingProperty("StudFBer A", 24, 2400, 200));
         fields.add(new GateField("Nordtor", 25));
-        fields.add(new BuildingProperty("Cascada", 26, 2600, 220, 1500, FieldColor.YELLOW));
-        fields.add(new BuildingProperty("Fakultätsgebäude", 27, 2600, 220, 1500, FieldColor.YELLOW));
+        fields.add(new BuildingProperty("Cascada", 26, 2600, 220));
+        fields.add(new BuildingProperty("Fakultätsgebäude", 27, 2600, 220));
         fields.add(new FoodField("Truppenküche", 28));
-        fields.add(new BuildingProperty("Prüfungsamt", 29, 2800, 240, 1500, FieldColor.YELLOW));
+        fields.add(new BuildingProperty("Prüfungsamt", 29, 2800, 240));
         fields.add(new WacheField());
-        fields.add(new BuildingProperty("Feuerwehr", 31, 3000, 260, 2000, FieldColor.GREEN));
-        fields.add(new BuildingProperty("SanZ", 32, 300, 260, 2000, FieldColor.GREEN));
+        fields.add(new BuildingProperty("Feuerwehr", 31, 3000, 260));
+        fields.add(new BuildingProperty("SanZ", 32, 300, 260));
         fields.add(new EventField("Maibock", 33));
-        fields.add(new BuildingProperty("Rechenzentrum", 34, 3200, 280, 2000, FieldColor.GREEN));
+        fields.add(new BuildingProperty("Rechenzentrum", 34, 3200, 280));
         fields.add(new GateField("Osttor", 35));
         fields.add(new EventField("Üvas", 36));
-        fields.add(new BuildingProperty("2er", 37, 3500, 350, 2000, FieldColor.BLUE_DARK));
+        fields.add(new BuildingProperty("2er", 37, 3500, 350));
         fields.add(new FineField("EZM", 38, 1000));
-        fields.add(new BuildingProperty("20er", 39, 4000, 500, 2000, FieldColor.BLUE_DARK));
+        fields.add(new BuildingProperty("20er", 39, 4000, 500));
 
         return fields;
     }
@@ -88,8 +88,4 @@ public class BoardManager {
         if (board.contains(field)) return field.getId();
         else throw new NoSuchElementException();
     }
-
-    public List<Field> getBoard() {
-        return board;
-    }
 }

Projekte/monopoly/model/src/main/java/pp/monopoly/model/fields/BuildingProperty.java

@@ -1,42 +1,30 @@
 package pp.monopoly.model.fields;
 
-import java.util.ArrayList;
-import java.util.List;
-
 import pp.monopoly.game.server.Player;
 
 public class BuildingProperty extends PropertyField {
 
     private int houses;
     private boolean hotel = false;
-    private final int housePrice;
-    private final FieldColor color;
-    private final int rentFactor1 = 5;
-    private final int rentFactor2 = 15;
-    private final int rentFactor3 = 40;
-    private final int rentFactor4 = 55;
-    private final int rentFactorHotel = 70;
 
-    BuildingProperty(String name, int id, int price, int rent, int housePrice, FieldColor color) {
+    BuildingProperty(String name, int id, int price, int rent) {
         super(name, id, price, rent);
-        this.housePrice = housePrice;
-        this.color = color;
     }
 
     @Override
     public int calcRent() {
         if (hotel) {
-            return (int) Math.round(rent*rentFactorHotel/10)*10;
+            return (int) Math.round(rent*70/10)*10;
         }
         switch (houses) {
             case 1:
-                return (int) Math.round(rent*rentFactor1/10)*10;
+                return (int) Math.round(rent*5/10)*10;
             case 2:
-                return (int) Math.round(rent*rentFactor2/10)*10;
+                return (int) Math.round(rent*15/10)*10;
             case 3:
-                return (int) Math.round(rent*rentFactor3/10)*10;
+                return (int) Math.round(rent*40/10)*10;
             case 4:
-            return (int) Math.round(rent*rentFactor4/10)*10;
+            return (int) Math.round(rent*55/10)*10;
 
             default:
                 return rent;
@@ -79,31 +67,4 @@ public class BuildingProperty extends PropertyField {
     public void accept(Player player) {
         player.visit(this);
     }
-
-    public List<Integer> getAllRent() {
-        List<Integer> list = new ArrayList<>();
-        list.add(rent);
-        list.add((int) Math.round(rent*rentFactor1/10)*10);
-        list.add((int) Math.round(rent*rentFactor2/10)*10);
-        list.add((int) Math.round(rent*rentFactor3/10)*10);
-        list.add((int) Math.round(rent*rentFactor4/10)*10);
-        list.add((int) Math.round(rent*rentFactorHotel/10)*10);
-        return list;
-    }
-
-    public FieldColor getColor() {
-        return color;
-    }
-
-    public int getHousePrice() {
-        return housePrice;
-    }
-
-    public int getHouses() {
-        return houses;
-    }
-
-    public int getHotel() {
-        return hotel ? 1:0;
-    }
 }

Projekte/monopoly/model/src/main/java/pp/monopoly/model/fields/EventField.java

@@ -2,6 +2,8 @@ package pp.monopoly.model.fields;
 
 
 import pp.monopoly.game.server.Player;
+import pp.monopoly.model.card.Card;
+import pp.monopoly.model.card.DeckHelper;
 
 public class EventField extends Field{
 
@@ -13,4 +15,9 @@ public class EventField extends Field{
     public void accept(Player player) {
         player.visit(this);
     }
+
+    public Card drawCard() {
+        return DeckHelper.drawCard();
+    }
+
 }

Projekte/monopoly/model/src/main/java/pp/monopoly/model/fields/FieldColor.java

@@ -1,37 +0,0 @@
-package pp.monopoly.model.fields;
-
-import com.jme3.math.ColorRGBA;
-
-/**
- * Enum representing eight distinct colors for properties in the game.
- */
-public enum FieldColor {
-    BROWN(new ColorRGBA(148 / 255f, 86 / 255f, 57 / 255f, 1)),
-    GREEN(new ColorRGBA(30 / 255f, 179 / 255f, 90 / 255f, 1)),
-    YELLOW(new ColorRGBA(252 / 255f, 241 / 255f, 1 / 255f, 1)),
-    BLUE_LIGHT(new ColorRGBA(170 / 255f, 223 / 255f, 246 / 255f, 1)),
-    PINK(new ColorRGBA(214 / 255f, 60 / 255f, 153 / 255f, 1)),
-    ORANGE(new ColorRGBA(244 / 255f, 147 / 255f, 32 / 255f, 1)),
-    RED(new ColorRGBA(232 / 255f, 27 / 255f, 30 / 255f, 1)),
-    BLUE_DARK(new ColorRGBA(2 / 255f, 112 / 255f, 191 / 255f, 1));
-
-    private final ColorRGBA color;
-
-    /**
-     * Constructs a FieldColor with the specified ColorRGBA value.
-     *
-     * @param color the ColorRGBA value associated with the field color
-     */
-    FieldColor(ColorRGBA color) {
-        this.color = color;
-    } 
-
-    /**
-     * Gets the ColorRGBA value of the field color.
-     *
-     * @return the ColorRGBA value
-     */
-    public ColorRGBA getColor() {
-        return color;
-    }
-}

Projekte/monopoly/model/src/main/java/pp/monopoly/model/fields/GulagField.java

@@ -15,8 +15,4 @@ public class GulagField extends Field{
         player.visit(this);
     }
 
-    public int getBailCost() {
-        return bailCost;
-    }
-
 }

Projekte/monopoly/model/src/main/java/pp/monopoly/model/fields/TestStreckeField.java

@@ -19,8 +19,6 @@ public class TestStreckeField extends Field{
     }
 
     public int collectMoney() {
-        int tmp = money;
-        money = 0;
-        return tmp;
+        return money = 0;
     }
 }

Projekte/monopoly/model/src/test/java/pp/monopoly/Testhandbuch.java

@@ -1,385 +0,0 @@
-package pp.monopoly;
-import org.junit.Test;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.assertEquals;
-public class Testhandbuch {
-
-
-
-
-
-        // T001 UC-game-01 - testStartApplication
-        @Test
-        public void testStartApplication() {
-            MonopolyApp app = new MonopolyApp();
-            app.simpleInitApp();
-            MainMenu mainMenu = app.getStateManager().getState(MainMenu.class);
-            assertNotNull(mainMenu);
-        }
-
-        // T002 UC-game-02 - testOpenStartMenu
-        @Test
-        public void testOpenStartMenu() {
-            MonopolyApp app = new MonopolyApp();
-            app.simpleInitApp();
-            MainMenu mainMenu = app.getStateManager().getState(MainMenu.class);
-            mainMenu.showMenu();
-            assertTrue(mainMenu.isMenuVisible());
-        }
-
-        // T003 UC-game-03 - testNavigateToPlayOption
-        @Test
-        public void testNavigateToPlayOption() {
-            MonopolyApp app = new MonopolyApp();
-            app.simpleInitApp();
-            MainMenu mainMenu = app.getStateManager().getState(MainMenu.class);
-            mainMenu.showMenu();
-            mainMenu.startNewGame();
-            NewGameMenu newGameMenu = app.getStateManager().getState(NewGameMenu.class);
-            assertNotNull(newGameMenu);
-        }
-
-        // T004 UC-game-04 - testExitApplicationFromMenu
-        @Test
-        public void testExitApplicationFromMenu() {
-            MonopolyApp app = new MonopolyApp();
-            app.simpleInitApp();
-            MainMenu mainMenu = app.getStateManager().getState(MainMenu.class);
-            mainMenu.showMenu();
-            mainMenu.exitGame();
-            assertTrue(app.isClosed());
-        }
-
-        // T005 UC-game-05 - testOpenSettingsFromMenu
-        @Test
-        public void testOpenSettingsFromMenu() {
-            MonopolyApp app = new MonopolyApp();
-            app.simpleInitApp();
-            MainMenu mainMenu = app.getStateManager().getState(MainMenu.class);
-            mainMenu.showMenu();
-            mainMenu.openSettings();
-            SettingMenu settingMenu = app.getStateManager().getState(SettingMenu.class);
-            assertNotNull(settingMenu);
-        }
-
-        // T006 UC-game-06 - testOpenGameMenuWithESC
-        @Test
-        public void testOpenGameMenuWithESC() {
-            MonopolyApp app = new MonopolyApp();
-            app.simpleInitApp();
-            app.simpleUpdate(0.1f);
-            GameMenu gameMenu = app.getStateManager().getState(GameMenu.class);
-            assertTrue(gameMenu.isVisible());
-        }
-
-        // T007 UC-game-07 - testEnterHostName
-        @Test
-        public void testEnterHostName() {
-            MonopolyApp app = new MonopolyApp();
-            app.simpleInitApp();
-            NewGameMenu newGameMenu = app.getStateManager().getState(NewGameMenu.class);
-            newGameMenu.showMenu();
-            newGameMenu.enterHostName("localhost");
-            assertEquals("localhost", newGameMenu.getHostName());
-        }
-
-        // T008 UC-game-07 - testEnterPortNumber
-        @Test
-        public void testEnterPortNumber() {
-            MonopolyApp app = new MonopolyApp();
-            app.simpleInitApp();
-            NewGameMenu newGameMenu = app.getStateManager().getState(NewGameMenu.class);
-            newGameMenu.showMenu();
-            newGameMenu.enterPortNumber(12345);
-            assertEquals(12345, newGameMenu.getPortNumber());
-        }
-
-        // T009 UC-game-07 - testCancelGameCreation
-        @Test
-        public void testCancelGameCreation() {
-            MonopolyApp app = new MonopolyApp();
-            app.simpleInitApp();
-            NewGameMenu newGameMenu = app.getStateManager().getState(NewGameMenu.class);
-            newGameMenu.showMenu();
-            newGameMenu.cancel();
-            MainMenu mainMenu = app.getStateManager().getState(MainMenu.class);
-            assertTrue(mainMenu.isMenuVisible());
-        }
-
-        // T010 UC-game-08 - testEnterPlayerLobby
-        @Test
-        public void testEnterPlayerLobby() {
-            MonopolyApp app = new MonopolyApp();
-            app.simpleInitApp();
-            app.getStateManager().getState(NetworkDialog.class).connect();
-            Lobby lobby = app.getStateManager().getState(Lobby.class);
-            assertNotNull(lobby);
-        }
-
-        // T011 UC-game-09 - testEnterStartingCapital
-        @Test
-        public void testEnterStartingCapital() {
-            MonopolyApp app = new MonopolyApp();
-            app.simpleInitApp();
-            NewGameMenu newGameMenu = app.getStateManager().getState(NewGameMenu.class);
-            newGameMenu.showMenu();
-            newGameMenu.enterStartingCapital(1500);
-            assertEquals(1500, newGameMenu.getStartingCapital());
-        }
-
-        // T012 UC-game-09 - testIncreaseStartingCapital
-        @Test
-        public void testIncreaseStartingCapital() {
-            MonopolyApp app = new MonopolyApp();
-            app.simpleInitApp();
-            NewGameMenu newGameMenu = app.getStateManager().getState(NewGameMenu.class);
-            newGameMenu.showMenu();
-            newGameMenu.enterStartingCapital(1500);
-            newGameMenu.increaseStartingCapital(100);
-            assertEquals(1600, newGameMenu.getStartingCapital());
-        }
-
-        // T013 UC-game-09 - testDecreaseStartingCapital
-        @Test
-        public void testDecreaseStartingCapital() {
-            MonopolyApp app = new MonopolyApp();
-            app.simpleInitApp();
-            NewGameMenu newGameMenu = app.getStateManager().getState(NewGameMenu.class);
-            newGameMenu.showMenu();
-            newGameMenu.enterStartingCapital(1500);
-            newGameMenu.decreaseStartingCapital(100);
-            assertEquals(1400, newGameMenu.getStartingCapital());
-        }
-
-        // T014 UC-game-10 - testDefaultPlayerName
-        @Test
-        public void testDefaultPlayerName() {
-            MonopolyApp app = new MonopolyApp();
-            app.simpleInitApp();
-            app.getStateManager().getState(Lobby.class).initializePlayerNames();
-            assertEquals("Spieler 1", app.getStateManager().getState(Lobby.class).getPlayerName(0));
-            assertEquals("Spieler 2", app.getStateManager().getState(Lobby.class).getPlayerName(1));
-        }
-
-        // T015 UC-game-11 - testEnterDisplayName
-        @Test
-        public void testEnterDisplayName() {
-            MonopolyApp app = new MonopolyApp();
-            app.simpleInitApp();
-            Lobby lobby = app.getStateManager().getState(Lobby.class);
-            lobby.enterDisplayName("TestPlayer");
-            assertEquals("TestPlayer", lobby.getPlayerName(0));
-        }
-
-        // T016 UC-game-11 - testDuplicateNameEntry
-        @Test
-        public void testDuplicateNameEntry() {
-            MonopolyApp app = new MonopolyApp();
-            app.simpleInitApp();
-            Lobby lobby = app.getStateManager().getState(Lobby.class);
-            lobby.enterDisplayName("Player1");
-            assertTrue(lobby.isDuplicateName("Player1"));
-        }
-
-        // T017 UC-game-12 - testSelectPlayerColor
-        @Test
-        public void testSelectPlayerColor() {
-            MonopolyApp app = new MonopolyApp();
-            app.simpleInitApp();
-            Lobby lobby = app.getStateManager().getState(Lobby.class);
-            lobby.selectColor("Red");
-            assertEquals("Red", lobby.getPlayerColor(0));
-        }
-
-        // T018 UC-game-12 - testSelectOccupiedColor
-        @Test
-        public void testSelectOccupiedColor() {
-            MonopolyApp app = new MonopolyApp();
-            app.simpleInitApp();
-            Lobby lobby = app.getStateManager().getState(Lobby.class);
-            lobby.selectColor("Red");
-            assertTrue(lobby.isColorOccupied("Red"));
-        }
-
-        // T019 UC-game-13 - testSelectPlayerToken
-        @Test
-        public void testSelectPlayerToken() {
-            MonopolyApp app = new MonopolyApp();
-            app.simpleInitApp();
-            Lobby lobby = app.getStateManager().getState(Lobby.class);
-            lobby.selectToken("Ship");
-            assertEquals("Ship", lobby.getPlayerToken(0));
-        }
-
-        // T020 UC-game-13 - testSelectOccupiedToken
-        @Test
-        public void testSelectOccupiedToken() {
-            MonopolyApp app = new MonopolyApp();
-            app.simpleInitApp();
-            Lobby lobby = app.getStateManager().getState(Lobby.class);
-            lobby.selectToken("Ship");
-            assertTrue(lobby.isTokenOccupied("Ship"));
-        }
-
-        // T021 UC-game-14 - testCancelPlayerLobby
-        @Test
-        public void testCancelPlayerLobby() {
-            MonopolyApp app = new MonopolyApp();
-            app.simpleInitApp();
-            Lobby lobby = app.getStateManager().getState(Lobby.class);
-            lobby.cancel();
-            MainMenu mainMenu = app.getStateManager().getState(MainMenu.class);
-            assertTrue(mainMenu.isMenuVisible());
-        }
-
-        // T022 UC-game-15 - testOpenLobbyMenuWithESC
-        @Test
-        public void testOpenLobbyMenuWithESC() {
-            MonopolyApp app = new MonopolyApp();
-            app.simpleInitApp();
-            app.simpleUpdate(0.1f);
-            LobbyMenu lobbyMenu = app.getStateManager().getState(LobbyMenu.class);
-            assertTrue(lobbyMenu.isVisible());
-        }
-
-        // T023 UC-game-16 - testPlayerReadyConfirmation
-        @Test
-        public void testPlayerReadyConfirmation() {
-            MonopolyApp app = new MonopolyApp();
-            app.simpleInitApp();
-            Lobby lobby = app.getStateManager().getState(Lobby.class);
-            lobby.setPlayerReady(true);
-            assertTrue(lobby.isPlayerReady(0));
-        }
-
-        // T024 UC-game-17 - testStartGame
-        @Test
-        public void testStartGame() {
-            MonopolyApp app = new MonopolyApp();
-            app.simpleInitApp();
-            Lobby lobby = app.getStateManager().getState(Lobby.class);
-            lobby.startGame();
-            assertEquals(GameState.InGame, lobby.getGameState());
-        }
-
-        // T025 UC-game-18 - testPlayerMovement
-        @Test
-        public void testPlayerMovement() {
-            MonopolyApp app = new MonopolyApp();
-            app.simpleInitApp();
-            Game game = app.getStateManager().getState(Game.class);
-            Player player = game.getPlayer(0);
-            player.move(5);
-            assertEquals(5, player.getPosition());
-        }
-
-        // T026 UC-game-19 - testPurchaseProperty
-        @Test
-        public void testPurchaseProperty() {
-            MonopolyApp app = new MonopolyApp();
-            app.simpleInitApp();
-            Game game = app.getStateManager().getState(Game.class);
-            Player player = game.getPlayer(0);
-            Property property = game.getProperty(0);
-            player.buyProperty(property);
-            assertTrue(player.getProperties().contains(property));
-        }
-
-        // T027 UC-game-20 - testMovePlayerOnDiceRoll
-        @Test
-        public void testMovePlayerOnDiceRoll() {
-            MonopolyApp app = new MonopolyApp();
-            app.simpleInitApp();
-            Game game = app.getStateManager().getState(Game.class);
-            Player player = game.getPlayer(0);
-            int initialPosition = player.getPosition();
-            player.rollDice();
-            assertTrue(player.getPosition() > initialPosition);
-        }
-
-        // T028 UC-game-21 - testPassGo
-        @Test
-        public void testPassGo() {
-            MonopolyApp app = new MonopolyApp();
-            app.simpleInitApp();
-            Game game = app.getStateManager().getState(Game.class);
-            Player player = game.getPlayer(0);
-            player.move(40);  // Assuming 40 steps moves player to Go
-            assertTrue(player.passedGo());
-        }
-
-        // T029 UC-game-22 - testCollectMoneyFromGo
-        @Test
-        public void testCollectMoneyFromGo() {
-            MonopolyApp app = new MonopolyApp();
-            app.simpleInitApp();
-            Game game = app.getStateManager().getState(Game.class);
-            Player player = game.getPlayer(0);
-            int initialBalance = player.getBalance();
-            player.move(40);  // Move to Go
-            assertTrue(player.getBalance() > initialBalance);
-        }
-
-        // T030 UC-game-23 - testPayRent
-        @Test
-        public void testPayRent() {
-            MonopolyApp app = new MonopolyApp();
-            app.simpleInitApp();
-            Game game = app.getStateManager().getState(Game.class);
-            Player player = game.getPlayer(0);
-            PropertyField property = (PropertyField) game.getField(1);
-            player.move(1);
-            int initialBalance = player.getBalance();
-            player.payRent(property);
-            assertTrue(player.getBalance() < initialBalance);
-        }
-
-        // T031 UC-game-24 - testDeclareBankruptcy
-        @Test
-        public void testDeclareBankruptcy() {
-            MonopolyApp app = new MonopolyApp();
-            app.simpleInitApp();
-            Game game = app.getStateManager().getState(Game.class);
-            Player player = game.getPlayer(0);
-            player.declareBankruptcy();
-            assertEquals(PlayerState.Bankrupt, player.getState());
-        }
-
-        // T032 UC-game-25 - testTradeProperty
-        @Test
-        public void testTradeProperty() {
-            MonopolyApp app = new MonopolyApp();
-            app.simpleInitApp();
-            Game game = app.getStateManager().getState(Game.class);
-            Player player1 = game.getPlayer(0);
-            Player player2 = game.getPlayer(1);
-            Property property = game.getProperty(0);
-            player1.offerTrade(player2, property);
-            assertTrue(player2.hasProperty(property));
-        }
-
-        // T033 UC-game-26 - testGameOverCondition
-        @Test
-        public void testGameOverCondition() {
-            MonopolyApp app = new MonopolyApp();
-            app.simpleInitApp();
-            Game game = app.getStateManager().getState(Game.class);
-            Player player = game.getPlayer(0);
-            player.declareBankruptcy();
-            assertTrue(game.isGameOver());
-        }
-
-        // T034 UC-game-27 - testPlayerInJail
-        @Test
-        public void testPlayerInJail() {
-            MonopolyApp app = new MonopolyApp();
-            app.simpleInitApp();
-            Game game = app.getStateManager().getState(Game.class);
-            Player player = game.getPlayer(0);
-            game.sendToJail(player);
-            assertEquals(PlayerState.InJail, player.getState());
-        }
-    }
-
-

Projekte/monopoly/model/src/test/java/pp/monopoly/client/ClientLogicTest.java

@@ -1,30 +1,106 @@
 package pp.monopoly.client;
 
-import com.jme3.input.KeyInput;
 import com.jme3.scene.Spatial;
-import com.simsilica.lemur.Button;
+import com.jme3.scene.Node;
 import org.junit.Before;
 import org.junit.Test;
 
 import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
+import static org.mockito.Mockito.*;
 
 public class ClientLogicTest {
 
     private MonopolyApp app;
+    private Node guiNodeMock;
 
     @Before
     public void setUp() {
-        app = new MonopolyApp();
+        // Erstelle eine Mock-Instanz der MonopolyApp
+        app = spy(new MonopolyApp());
+
+        // Mock GuiNode
+        guiNodeMock = mock(Node.class);
+        doReturn(guiNodeMock).when(app).getGuiNode();
+
+        // Initialisiere die App
+        doNothing().when(app).simpleInitApp();
         app.simpleInitApp();
     }
 
     @Test
     // T001: UC-game-01 - Überprüft, ob die Anwendung erfolgreich gestartet wird und das Hauptmenü angezeigt wird
     public void testStartApplication() {
+        // Mock des Hauptmenü-Kindes
+        Spatial mainMenuMock = mock(Spatial.class);
+        when(guiNodeMock.getChild("MainMenu")).thenReturn(mainMenuMock);
+
+        // Test, ob das Hauptmenü angezeigt wird
         Spatial mainMenu = app.getGuiNode().getChild("MainMenu");
         assertNotNull("Das Hauptmenü sollte sichtbar sein", mainMenu);
     }
+
+    @Test
+    // T002: UC-game-02 - Überprüft, ob das Startmenü nach dem Start der Anwendung angezeigt wird
+    public void testOpenStartMenu() {
+        // Mock des Startmenü-Kindes
+        Spatial startMenuMock = mock(Spatial.class);
+        when(guiNodeMock.getChild("StartMenu")).thenReturn(startMenuMock);
+
+        // Test, ob das Startmenü angezeigt wird
+        Spatial startMenu = app.getGuiNode().getChild("StartMenu");
+        assertNotNull("Das Startmenü sollte sichtbar sein", startMenu);
+    }
+
+    @Test
+    // T003: UC-game-03 - Überprüft, ob der „Spiel starten“-Button das Spielerstellungsmenü öffnet
+    public void testNavigateToPlayOption() {
+        // Mock des Spielerstellungsmenü-Kindes
+        Spatial playMenuMock = mock(Spatial.class);
+        when(guiNodeMock.getChild("PlayMenu")).thenReturn(playMenuMock);
+
+        // Test, ob das Spielerstellungsmenü angezeigt wird
+        Spatial playMenu = app.getGuiNode().getChild("PlayMenu");
+        assertNotNull("Das Spielerstellungsmenü sollte sichtbar sein", playMenu);
+    }
+
+    @Test
+    // T004: UC-game-04 - Testet, ob die Anwendung geschlossen wird, wenn „Beenden“ im Hauptmenü gewählt wird
+    public void testExitApplicationFromMenu() {
+        // Simuliere den Schließen-Aufruf
+        doNothing().when(app).closeApp();
+
+        // Rufe die Schließen-Methode auf
+        app.closeApp();
+
+        // Verifiziere, dass die Methode aufgerufen wurde
+        verify(app, times(1)).closeApp();
+    }
+
+    @Test
+    // T005: UC-game-05 - Überprüft, ob das Einstellungen-Menü aus dem Hauptmenü aufgerufen werden kann
+    public void testOpenSettingsFromMenu() {
+        // Mock des Einstellungsmenü-Kindes
+        Spatial settingsMenuMock = mock(Spatial.class);
+        when(guiNodeMock.getChild("SettingsMenu")).thenReturn(settingsMenuMock);
+
+        // Test, ob das Einstellungsmenü angezeigt wird
+        Spatial settingsMenu = app.getGuiNode().getChild("SettingsMenu");
+        assertNotNull("Das Einstellungsmenü sollte sichtbar sein", settingsMenu);
+    }
+
+    @Test
+    // T006: UC-game-06 - Testet, ob das Spielmenü geöffnet wird, wenn der Spieler im Spiel „ESC“ drückt
+    public void testOpenGameMenuWithESC() {
+        // Simuliere den ESC-Tastendruck
+        doNothing().when(app).handleEscape(true);
+
+        // Rufe die ESC-Tastenmethode auf
+        app.handleEscape(true);
+
+        // Verifiziere, dass die Methode aufgerufen wurde
+        verify(app, times(1)).handleEscape(true);
+    }
+}
 /*
     @Test
     // T002: UC-game-02 - Überprüft, ob das Startmenü nach dem Start der Anwendung angezeigt wird
@@ -33,6 +109,7 @@ public class ClientLogicTest {
         assertNotNull("Das Startmenü sollte sichtbar sein", startMenu);
     }
 */
+/*
 @Test
 // T002: UC-game-02 - Überprüft, ob das Startmenü (MainMenu) angezeigt wird und die Buttons korrekt funktionieren
 public void testMainMenuButtons() {
@@ -158,4 +235,5 @@ public void testMainMenuButtons() {
             throw new AssertionError("'ReturnButton' ist kein Button-Objekt.");
         }
     }
-}
+}
+*/

Projekte/monopoly/model/src/test/java/pp/monopoly/game/client/ClientGameLogicTest.java

@@ -1,606 +1,123 @@
 package pp.monopoly.game.client;
-
-import com.jme3.scene.Spatial;
-import com.simsilica.lemur.Button;
-import com.simsilica.lemur.TextField;
+/*
 import org.junit.Before;
 import org.junit.Test;
-import pp.monopoly.client.MonopolyApp;
-import pp.monopoly.game.server.Player;
-import pp.monopoly.message.server.DiceResult;
-import pp.monopoly.notification.ClientStateEvent;
+import org.mockito.Mock;
+import org.mockito.MockitoAnnotations;
+import pp.monopoly.server.MonopolyServer;
+import pp.monopoly.client.ClientSender;
 
 import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertTrue;
+import static org.mockito.Mockito.*;
 
+/**
+ * Tests the client-side logic of the Monopoly game.
+ */
+/*
 public class ClientGameLogicTest {
 
-    private MonopolyApp app;
+    private ClientGameLogic logic;
 
-    private MonopolyApp app;
-    private NewGameMenu newGameMenu;
+    @Mock
+    private MonopolyServer serverMock;
+
+    @Mock
+    private ClientSender clientSenderMock;
 
     @Before
     public void setUp() {
-        app = new MonopolyApp();
-        app.simpleInitApp(); // Initialisiert die App mit GUI und Spielzuständen
-        newGameMenu = new NewGameMenu();
+        MockitoAnnotations.openMocks(this);
+        logic = new ClientGameLogic(clientSenderMock);
     }
 
     @Test
-    // T006: UC-game-06 - Testet, ob das Spielmenü geöffnet wird, wenn der Spieler im Spiel „ESC“ drückt
-    public void testOpenGameMenuWithESC() {
-        app.escape(true); // Simuliert das Drücken der ESC-Taste
-
-        Spatial gameMenu = app.getGuiNode().getChild("GameMenu");
-        assertNotNull("Das Spielmenü sollte sichtbar sein, nachdem ESC gedrückt wurde", gameMenu);
-    }
-
-    @Test
-    // T007: UC-game-07 - Testet, ob der Spieler erfolgreich den Namen des Hosts eingeben kann
     public void testEnterHostName() {
-        Spatial hostNameField = app.getGuiNode().getChild("HostNameField");
-        assertNotNull("Das Eingabefeld für den Hostnamen sollte sichtbar sein", hostNameField);
+        String hostName = "localhost";
+        logic.setHostName(hostName);
 
-        if (hostNameField instanceof TextField) {
-            TextField hostNameInput = (TextField) hostNameField;
-            hostNameInput.setText("TestHost");
-
-            assertEquals("Der eingegebene Hostname sollte 'TestHost' sein", "TestHost", hostNameInput.getText());
-        }
-        else {
-            throw new AssertionError("'HostNameField' ist kein TextField-Objekt.");
-        }
+        assertEquals("The hostname should be correctly set.", hostName, logic.getHostName());
     }
 
     @Test
-    // T008: UC-game-08 - Testet, ob der Spieler die Portnummer des Hosts eingeben kann
     public void testEnterPortNumber() {
-        Spatial portNumberField = app.getGuiNode().getChild("PortNumberField");
-        assertNotNull("Das Eingabefeld für die Portnummer sollte sichtbar sein", portNumberField);
+        int portNumber = 12345;
+        logic.setPortNumber(portNumber);
 
-        if (portNumberField instanceof TextField) {
-            TextField portNumberInput = (TextField) portNumberField;
-            portNumberInput.setText("12345");
-
-            assertEquals("Die eingegebene Portnummer sollte '12345' sein", "12345", portNumberInput.getText());
-        }
-        else {
-            throw new AssertionError("'PortNumberField' ist kein TextField-Objekt.");
-        }
+        assertEquals("The port number should be correctly set.", portNumber, logic.getPortNumber());
     }
 
     @Test
-    // T009: UC-game-09 - Testet, ob der Spieler das Erstellen eines Spiels abbrechen kann
     public void testCancelGameCreation() {
-        Spatial cancelButtonSpatial = app.getGuiNode().getChild("CancelButton");
-        assertNotNull("Der 'Abbrechen'-Button sollte existieren", cancelButtonSpatial);
+        doNothing().when(clientSenderMock).returnToMainMenu();
 
-        if (cancelButtonSpatial instanceof Button) {
-            Button cancelButton = (Button) cancelButtonSpatial;
-            cancelButton.click();
+        logic.cancelGameCreation();
 
-            Spatial mainMenu = app.getGuiNode().getChild("MainMenu");
-            assertNotNull("Das Hauptmenü sollte nach dem Abbrechen des Spiels sichtbar sein", mainMenu);
-        }
-        else {
-            throw new AssertionError("'CancelButton' ist kein Button-Objekt.");
-        }
+        verify(clientSenderMock, times(1)).returnToMainMenu();
+    }
+
+    @Test
+    public void testEnterPlayerLobby() {
+        doNothing().when(clientSenderMock).enterLobby();
+
+        logic.enterLobby();
+
+        verify(clientSenderMock, times(1)).enterLobby();
     }
 
-    /*
-        @Test
-        // T010: UC-game-10 - Testet, ob der Spieler die Spielerlobby betreten kann
-        public void testEnterPlayerLobby() {
-            app.receivedEvent(new pp.monopoly.notification.ClientStateEvent(pp.monopoly.notification.ClientStateEvent.State.LOBBY));
-
-            Spatial playerLobby = app.getGuiNode().getChild("PlayerLobby");
-            assertNotNull("Die Spielerlobby sollte nach dem Beitritt sichtbar sein", playerLobby);
-        }
-
-
-        @Test
-        // T010: UC-game-10 - Testet, ob der Spieler die Spielerlobby betreten kann
-        public void testEnterPlayerLobby() {
-            // Simuliert den Empfang eines ClientStateEvent für den Lobby-State
-            app.receivedEvent(new ClientStateEvent(ClientStateEvent.State.LOBBY));
-
-            // Überprüft, ob das Lobby-UI sichtbar ist
-            Spatial playerLobby = app.getGuiNode().getChild("PlayerLobby");
-            assertNotNull("Die Spielerlobby sollte nach dem Beitritt sichtbar sein", playerLobby);
-    */
     @Test
-    // T011: UC-game-11 - Testet, ob der hostende Spieler einen Startbetrag eingeben kann
     public void testEnterStartingCapital() {
-        Spatial startingCapitalField = app.getGuiNode().getChild("StartingCapitalField");
-        assertNotNull("Das Eingabefeld für den Startbetrag sollte existieren", startingCapitalField);
+        int startingCapital = 1500;
+        logic.setStartingCapital(startingCapital);
 
-        if (startingCapitalField instanceof TextField) {
-            TextField startingCapitalInput = (TextField) startingCapitalField;
-            startingCapitalInput.setText("1500");
-
-            assertEquals("Der eingegebene Startbetrag sollte '1500' sein", "1500", startingCapitalInput.getText());
-        }
-        else {
-            throw new AssertionError("'StartingCapitalField' ist kein TextField-Objekt.");
-        }
+        assertEquals("The starting capital should be correctly set.", startingCapital, logic.getStartingCapital());
     }
 
     @Test
-    // T012: UC-game-12 - Testet, ob der Spieler den Startbetrag um 100 € erhöhen kann
     public void testIncreaseStartingCapital() {
-        Spatial increaseButton = app.getGuiNode().getChild("IncreaseCapitalButton");
-        assertNotNull("Der 'Erhöhen'-Button sollte existieren", increaseButton);
+        logic.setStartingCapital(1500);
+        logic.increaseStartingCapital();
 
-        if (increaseButton instanceof Button) {
-            Button increaseCapitalButton = (Button) increaseButton;
-            increaseCapitalButton.click();
-
-            Spatial startingCapitalField = app.getGuiNode().getChild("StartingCapitalField");
-            if (startingCapitalField instanceof TextField) {
-                TextField startingCapitalInput = (TextField) startingCapitalField;
-                assertEquals("Der Startbetrag sollte um 100 erhöht worden sein", "1600", startingCapitalInput.getText());
-            }
-            else {
-                throw new AssertionError("'StartingCapitalField' ist kein TextField-Objekt.");
-            }
-        }
-        else {
-            throw new AssertionError("'IncreaseCapitalButton' ist kein Button-Objekt.");
-        }
+        assertEquals("The starting capital should increase by 100.", 1600, logic.getStartingCapital());
     }
 
     @Test
-    // T013: UC-game-13 - Testet, ob der Spieler den Startbetrag um 100 € senken kann
     public void testDecreaseStartingCapital() {
-        Spatial decreaseButton = app.getGuiNode().getChild("DecreaseCapitalButton");
-        assertNotNull("Der 'Senken'-Button sollte existieren", decreaseButton);
+        logic.setStartingCapital(1500);
+        logic.decreaseStartingCapital();
 
-        if (decreaseButton instanceof Button) {
-            Button decreaseCapitalButton = (Button) decreaseButton;
-            decreaseCapitalButton.click();
-
-            Spatial startingCapitalField = app.getGuiNode().getChild("StartingCapitalField");
-            if (startingCapitalField instanceof TextField) {
-                TextField startingCapitalInput = (TextField) startingCapitalField;
-                assertEquals("Der Startbetrag sollte um 100 gesenkt worden sein", "1400", startingCapitalInput.getText());
-            }
-            else {
-                throw new AssertionError("'StartingCapitalField' ist kein TextField-Objekt.");
-            }
-        }
-        else {
-            throw new AssertionError("'DecreaseCapitalButton' ist kein Button-Objekt.");
-        }
+        assertEquals("The starting capital should decrease by 100.", 1400, logic.getStartingCapital());
     }
 
     @Test
-    // T014: UC-game-14 - Testet, ob die Standard-Spielernamen korrekt voreingestellt sind
     public void testDefaultPlayerName() {
-        Spatial playerNameField = app.getGuiNode().getChild("PlayerNameField");
-        assertNotNull("Das Eingabefeld für den Spielernamen sollte existieren", playerNameField);
+        logic.addPlayer("Player 1");
 
-        if (playerNameField instanceof TextField) {
-            TextField playerNameInput = (TextField) playerNameField;
-            assertEquals("Der voreingestellte Spielername sollte 'Spieler 1' sein", "Spieler 1", playerNameInput.getText());
-        }
-        else {
-            throw new AssertionError("'PlayerNameField' ist kein TextField-Objekt.");
-        }
+        assertTrue("The player name should be correctly set.", logic.getPlayerNames().contains("Player 1"));
     }
 
     @Test
-    // T015: UC-game-15 - Testet, ob der Spieler einen Anzeigenamen eingeben kann
     public void testEnterDisplayName() {
-        Spatial displayNameField = app.getGuiNode().getChild("DisplayNameField");
-        assertNotNull("Das Eingabefeld für den Anzeigenamen sollte existieren", displayNameField);
+        String displayName = "JohnDoe";
+        logic.setPlayerName(displayName);
 
-        if (displayNameField instanceof TextField) {
-            TextField displayNameInput = (TextField) displayNameField;
-            displayNameInput.setText("MaxMustermann");
-
-            assertEquals("Der eingegebene Anzeigename sollte 'MaxMustermann' sein", "MaxMustermann", displayNameInput.getText());
-        }
-        else {
-            throw new AssertionError("'DisplayNameField' ist kein TextField-Objekt.");
-        }
+        assertEquals("The display name should be correctly set.", displayName, logic.getPlayerName());
     }
 
     @Test
-    // T016: UC-game-16 - Testet, ob eine Warnung angezeigt wird, wenn ein Spieler einen bereits belegten Namen eingibt
     public void testDuplicateNameEntry() {
-        Spatial playerNameField = app.getGuiNode().getChild("PlayerNameField");
-        assertNotNull("Das Eingabefeld für den Spielernamen sollte existieren", playerNameField);
+        logic.addPlayer("Player 1");
+        boolean result = logic.addPlayer("Player 1");
 
-        if (playerNameField instanceof TextField) {
-            TextField playerNameInput = (TextField) playerNameField;
-            playerNameInput.setText("Spieler 1");
-            app.getGuiNode().getChild("AddPlayerButton").click(); // Spieler hinzufügen
-            playerNameInput.setText("Spieler 1");
-            app.getGuiNode().getChild("AddPlayerButton").click(); // Spieler mit gleichem Namen hinzufügen
-
-            Spatial warning = app.getGuiNode().getChild("DuplicateNameWarning");
-            assertNotNull("Es sollte eine Warnung angezeigt werden, wenn ein Name doppelt vergeben wird", warning);
-        }
-        else {
-            throw new AssertionError("'PlayerNameField' ist kein TextField-Objekt.");
-        }
+        assertTrue("Duplicate names should not be allowed.", !result);
     }
 
     @Test
-    // T017: UC-game-17 - Testet, ob der Spieler eine verfügbare Spielfigurfarbe auswählen kann
     public void testSelectPlayerColor() {
-        Spatial colorSelector = app.getGuiNode().getChild("ColorSelector");
-        assertNotNull("Der Farbwähler sollte existieren", colorSelector);
+        logic.addPlayer("Player 1");
+        boolean result = logic.setPlayerColor("Player 1", "Red");
 
-        if (colorSelector instanceof Button) {
-            Button colorButton = (Button) colorSelector;
-            colorButton.click();
-
-            Spatial selectedColor = app.getGuiNode().getChild("SelectedColor");
-            assertNotNull("Die gewählte Farbe sollte sichtbar sein", selectedColor);
-        }
-        else {
-            throw new AssertionError("'ColorSelector' ist kein Button-Objekt.");
-        }
-    }
-
-    @Test
-    // T018: UC-game-18 - Testet, ob eine belegte Spielfigurfarbe nicht ausgewählt werden kann
-    public void testSelectOccupiedColor() {
-        app.getGuiNode().getChild("ColorSelectorRed").click(); // Spieler 1 wählt Rot
-        app.getGuiNode().getChild("AddPlayerButton").click(); // Spieler 1 hinzufügen
-
-        app.getGuiNode().getChild("ColorSelectorRed").click(); // Spieler 2 versucht Rot zu wählen
-        Spatial warning = app.getGuiNode().getChild("ColorOccupiedWarning");
-        assertNotNull("Es sollte eine Warnung angezeigt werden, wenn eine belegte Farbe ausgewählt wird", warning);
-    }
-
-    @Test
-    // T019: UC-game-19 - Testet, ob der Spieler eine Spielfigur auswählen kann
-    public void testSelectPlayerToken() {
-        Spatial tokenSelector = app.getGuiNode().getChild("TokenSelector");
-        assertNotNull("Der Token-Wähler sollte existieren", tokenSelector);
-
-        if (tokenSelector instanceof Button) {
-            Button tokenButton = (Button) tokenSelector;
-            tokenButton.click();
-
-            Spatial selectedToken = app.getGuiNode().getChild("SelectedToken");
-            assertNotNull("Die gewählte Spielfigur sollte sichtbar sein", selectedToken);
-        }
-        else {
-            throw new AssertionError("'TokenSelector' ist kein Button-Objekt.");
-        }
-    }
-
-    @Test
-    // T020: UC-game-20 - Testet, ob eine belegte Spielfigur nicht ausgewählt werden kann
-    public void testSelectOccupiedToken() {
-        app.getGuiNode().getChild("TokenSelectorShip").click();
-        app.getGuiNode().getChild("AddPlayerButton").click();
-
-        app.getGuiNode().getChild("TokenSelectorShip").click();
-        Spatial warning = app.getGuiNode().getChild("TokenOccupiedWarning");
-        assertNotNull("Es sollte eine Warnung angezeigt werden, wenn eine belegte Spielfigur ausgewählt wird", warning);
-    }
-
-    @Test
-    // T021: UC-game-14 - Überprüft, ob der Spieler zur „Spiel erstellen“-Ansicht zurückkehrt, wenn Abbrechen gedrückt wird
-    public void testCancelPlayerLobby() {
-        Spatial cancelButtonSpatial = app.getGuiNode().getChild("CancelLobbyButton");
-        assertNotNull("Der 'Abbrechen'-Button in der Lobby sollte existieren", cancelButtonSpatial);
-
-        if (cancelButtonSpatial instanceof Button) {
-            Button cancelButton = (Button) cancelButtonSpatial;
-            cancelButton.click();
-
-            Spatial mainMenu = app.getGuiNode().getChild("MainMenu");
-            assertNotNull("Das Hauptmenü sollte nach dem Abbrechen der Lobby sichtbar sein", mainMenu);
-        }
-        else {
-            throw new AssertionError("'CancelLobbyButton' ist kein Button-Objekt.");
-        }
-    }
-
-    @Test
-    // T022: UC-game-15 - Überprüft, ob das Spielmenü in der Lobby durch Drücken der ESC-Taste geöffnet wird
-    public void testOpenLobbyMenuWithESC() {
-        app.escape(true); // Simuliert das Drücken der ESC-Taste
-
-        Spatial lobbyMenu = app.getGuiNode().getChild("LobbyMenu");
-        assertNotNull("Das Lobby-Menü sollte sichtbar sein, nachdem ESC in der Lobby gedrückt wurde", lobbyMenu);
-    }
-
-    @Test
-    // T023: UC-game-16 - Testet, ob der Spieler die Auswahl der Spielfigur bestätigen kann
-    public void testPlayerReadyConfirmation() {
-        Spatial confirmButtonSpatial = app.getGuiNode().getChild("ConfirmTokenButton");
-        assertNotNull("Der 'Bestätigen'-Button für die Spielfigur sollte existieren", confirmButtonSpatial);
-
-        if (confirmButtonSpatial instanceof Button) {
-            Button confirmButton = (Button) confirmButtonSpatial;
-            confirmButton.click();
-
-            Spatial readyStatus = app.getGuiNode().getChild("PlayerReadyStatus");
-            assertNotNull("Der Status 'Bereit' sollte angezeigt werden, nachdem die Spielfigur bestätigt wurde", readyStatus);
-        }
-        else {
-            throw new AssertionError("'ConfirmTokenButton' ist kein Button-Objekt.");
-        }
-    }
-        @Test
-        // T024: UC-game-16 - Überprüft, ob das Spiel startet, wenn alle Spieler ihre Auswahl bestätigt haben
-        public void testAllPlayersReady() {
-            app.receivedEvent(new pp.monopoly.notification.ClientStateEvent(pp.monopoly.notification.ClientStateEvent.State.ALL_PLAYERS_READY));
-
-            Spatial gameScreen = app.getGuiNode().getChild("GameScreen");
-            assertNotNull("Das Spiel sollte starten, wenn alle Spieler bereit sind", gameScreen);
-        }
-        @Test
-        // T025: UC-game-17 - Testet, ob das Einstellungen-Menü während des Spiels geöffnet wird
-        public void testOpenMainGameSettings () {
-            app.escape(true);
-
-            Spatial settingsButton = app.getGuiNode().getChild("SettingsButton");
-            assertNotNull("Der 'Einstellungen'-Button sollte im Spielmenü vorhanden sein", settingsButton);
-
-            if (settingsButton instanceof Button) {
-                ((Button) settingsButton).click();
-                Spatial settingsMenu = app.getGuiNode().getChild("SettingsMenu");
-                assertNotNull("Das Einstellungen-Menü sollte im Spiel angezeigt werden", settingsMenu);
-            }
-            else {
-                throw new AssertionError("'SettingsButton' ist kein Button-Objekt.");
-            }
-        }
-
-    @Test
-// T026: UC-gameplay-01 - Überprüft, ob der Spieler erfolgreich würfeln kann
-    public void testRollDice() {
-        Spatial rollDiceButton = app.getGuiNode().getChild("RollDiceButton");
-        assertNotNull("Der 'Würfeln'-Button sollte sichtbar sein", rollDiceButton);
-
-        if (rollDiceButton instanceof Button) {
-            ((Button) rollDiceButton).click(); // Simuliert einen Würfelwurf
-            Spatial diceResult = app.getGuiNode().getChild("DiceResult");
-            assertNotNull("Das Ergebnis des Würfelwurfs sollte angezeigt werden", diceResult);
-        }
-    }
-    @Test
-// T027: UC-gameplay-01 - Überprüft, ob der aktive Spieler die richtige Anzahl an Feldern basierend auf dem Wurf bewegt
-    public void testMovePlayerAutomatically() {
-        Game game = new Game(); // Initialisiert ein neues Spiel
-        PlayerHandler playerHandler = game.getPlayerHandler(); // Holt den PlayerHandler, der die Spieler verwaltet
-
-        Player activePlayer = playerHandler.getActivePlayer(); // Holt den aktuellen aktiven Spieler
-        assertNotNull("Es sollte einen aktiven Spieler geben", activePlayer);
-
-        DiceResult diceResult = game.rollDice(); // Würfelwurf simulieren
-        int steps = diceResult.getTotal();
-
-        int initialPosition = activePlayer.getFieldId(); // Ursprüngliche Position des aktiven Spielers
-        playerHandler.moveActivePlayer(steps); // Bewegt den aktiven Spieler basierend auf dem Wurf
-
-        int expectedPosition = (initialPosition + steps) % game.getGameBoard().getNumberOfFields(); // Zielposition berechnen
-        int newPosition = activePlayer.getFieldId();
-
-        assertEquals("Der aktive Spieler sollte sich korrekt bewegen", expectedPosition, newPosition);
-
-        // Überprüfen, dass alle anderen Spieler im WaitForTurn-State bleiben
-        playerHandler.getPlayers().stream()
-                     .filter(player -> player != activePlayer)
-                     .forEach(player -> assertTrue("Andere Spieler sollten im WaitForTurn-State sein", player.getState() instanceof WaitForTurnState));
-    }
-
-    @Test
-// T028: UC-gameplay-02 - Überprüft, ob die Würfel zufällige Zahlen generieren
-    public void testGenerationDice() {
-        boolean isRandom = false;
-        DiceResult previousResult = null;
-
-        for (int i = 0; i < 10; i++) {
-            DiceResult currentResult = app.getGame().rollDice();
-
-            assertNotNull("Das Würfelergebnis sollte nicht null sein", currentResult);
-            assertTrue("Die Würfelzahl 1 sollte zwischen 1 und 6 liegen", currentResult.getDice1() >= 1 && currentResult.getDice1() <= 6);
-            assertTrue("Die Würfelzahl 2 sollte zwischen 1 und 6 liegen", currentResult.getDice2() >= 1 && currentResult.getDice2() <= 6);
-
-            if (previousResult != null && (currentResult.getDice1() != previousResult.getDice1() || currentResult.getDice2() != previousResult.getDice2())) {
-                isRandom = true; // Unterschiedliche Würfelwerte gefunden
-                break;
-            }
-            previousResult = currentResult;
-        }
-        assertTrue("Die Würfelergebnisse sollten zufällig sein", isRandom);
-    }
-
-    @Test
-// T029: UC-gameplay-03 - Überprüft, ob die richtigen Augenzahlen angezeigt werden
-    public void testDisplayResults() {
-        DiceResult result = app.getGame().rollDice();
-
-        assertNotNull("Das Würfelergebnis sollte nicht null sein", result);
-        assertTrue("Die Würfelzahl 1 sollte zwischen 1 und 6 liegen", result.getDice1() >= 1 && result.getDice1() <= 6);
-        assertTrue("Die Würfelzahl 2 sollte zwischen 1 und 6 liegen", result.getDice2() >= 1 && result.getDice2() <= 6);
-        assertEquals("Die Summe sollte korrekt berechnet werden", result.getDice1() + result.getDice2(), result.getTotal());
-    }
-    @Test
-    // T030: UC-gameplay-04 - Überprüfen, ob die Summe der Würfelergebnisse korrekt berechnet wird
-    public void testSumDiceResults() {
-        Spatial rollDiceButton = app.getGuiNode().getChild("RollDiceButton");
-        assertNotNull("Der 'Würfeln'-Button sollte sichtbar sein", rollDiceButton);
-
-        if (rollDiceButton instanceof Button) {
-            ((Button) rollDiceButton).click(); // Simuliert einen Würfelwurf
-            Spatial diceResult1 = app.getGuiNode().getChild("DiceResult1");
-            Spatial diceResult2 = app.getGuiNode().getChild("DiceResult2");
-
-            assertNotNull("Die Ergebnisse des Würfelwurfs sollten angezeigt werden", diceResult1);
-            assertNotNull("Die Ergebnisse des Würfelwurfs sollten angezeigt werden", diceResult2);
-
-            int result1 = Integer.parseInt(diceResult1.getUserData("value").toString());
-            int result2 = Integer.parseInt(diceResult2.getUserData("value").toString());
-            int expectedSum = result1 + result2;
-
-            Spatial sumDisplay = app.getGuiNode().getChild("DiceSum");
-            assertEquals("Die Summe der Würfelergebnisse sollte korrekt angezeigt werden", expectedSum, Integer.parseInt(sumDisplay.getUserData("value").toString()));
-        } else {
-            throw new AssertionError("'RollDiceButton' ist kein Button-Objekt.");
-        }
-    }
-
-    @Test
-    // T031: UC-gameplay-05 - Überprüfen, ob die Würfel nach dem Wurf ausgegraut werden
-    public void testGrayOutDiceAfterRoll() {
-        Spatial rollDiceButton = app.getGuiNode().getChild("RollDiceButton");
-        assertNotNull("Der 'Würfeln'-Button sollte sichtbar sein", rollDiceButton);
-
-        if (rollDiceButton instanceof Button) {
-            ((Button) rollDiceButton).click(); // Simuliert einen Würfelwurf
-
-            Spatial diceDisplay = app.getGuiNode().getChild("DiceDisplay");
-            assertNotNull("Die Würfelanzeige sollte nach dem Wurf sichtbar sein", diceDisplay);
-
-            boolean isGrayedOut = diceDisplay.getUserData("grayedOut");
-            assertTrue("Die Würfel sollten nach dem Wurf ausgegraut sein", isGrayedOut);
-        } else {
-            throw new AssertionError("'RollDiceButton' ist kein Button-Objekt.");
-        }
-    }
-
-    @Test
-    // T032: UC-gameplay-06 - Überprüfen, ob das Würfeln eines Paschs erkannt wird
-    public void testDetectDouble() {
-        Spatial rollDiceButton = app.getGuiNode().getChild("RollDiceButton");
-        assertNotNull("Der 'Würfeln'-Button sollte sichtbar sein", rollDiceButton);
-
-        if (rollDiceButton instanceof Button) {
-            // Simuliert mehrere Würfe, um einen Pasch zu erkennen
-            for (int i = 0; i < 10; i++) {
-                ((Button) rollDiceButton).click();
-                Spatial diceResult1 = app.getGuiNode().getChild("DiceResult1");
-                Spatial diceResult2 = app.getGuiNode().getChild("DiceResult2");
-
-                int result1 = Integer.parseInt(diceResult1.getUserData("value").toString());
-                int result2 = Integer.parseInt(diceResult2.getUserData("value").toString());
-
-                if (result1 == result2) {
-                    Spatial doubleIndicator = app.getGuiNode().getChild("DoubleIndicator");
-                    assertNotNull("Ein Pasch sollte angezeigt werden, wenn zwei identische Zahlen geworfen werden", doubleIndicator);
-                    break;
-                }
-            }
-        } else {
-            throw new AssertionError("'RollDiceButton' ist kein Button-Objekt.");
-        }
-    }
-
-    @Test
-    // T033: UC-gameplay-06 - Überprüfen, ob der Spieler bei einem Pasch erneut würfeln darf
-    public void testDoubleRoll() {
-        Spatial rollDiceButton = app.getGuiNode().getChild("RollDiceButton");
-        assertNotNull("Der 'Würfeln'-Button sollte sichtbar sein", rollDiceButton);
-
-        if (rollDiceButton instanceof Button) {
-            // Simuliert das Würfeln eines Paschs
-            ((Button) rollDiceButton).click();
-            Spatial diceResult1 = app.getGuiNode().getChild("DiceResult1");
-            Spatial diceResult2 = app.getGuiNode().getChild("DiceResult2");
-
-            int result1 = Integer.parseInt(diceResult1.getUserData("value").toString());
-            int result2 = Integer.parseInt(diceResult2.getUserData("value").toString());
-
-            if (result1 == result2) { // Überprüft, ob ein Pasch geworfen wurde
-                Spatial rollAgainIndicator = app.getGuiNode().getChild("RollAgainIndicator");
-                assertNotNull("Der Spieler sollte bei einem Pasch erneut würfeln dürfen", rollAgainIndicator);
-            }
-        } else {
-            throw new AssertionError("'RollDiceButton' ist kein Button-Objekt.");
-        }
-    }
-
-    @Test
-    // T034: UC-gameplay-06 - Überprüfen, ob der Spieler nach dem dritten Pasch ins Gefängnis muss
-    public void testTripleDoubleGulag() {
-        int doubleCount = 0;
-
-        for (int i = 0; i < 3; i++) {
-            Spatial rollDiceButton = app.getGuiNode().getChild("RollDiceButton");
-            assertNotNull("Der 'Würfeln'-Button sollte sichtbar sein", rollDiceButton);
-
-            if (rollDiceButton instanceof Button) {
-                ((Button) rollDiceButton).click();
-                Spatial diceResult1 = app.getGuiNode().getChild("DiceResult1");
-                Spatial diceResult2 = app.getGuiNode().getChild("DiceResult2");
-
-                int result1 = Integer.parseInt(diceResult1.getUserData("value").toString());
-                int result2 = Integer.parseInt(diceResult2.getUserData("value").toString());
-
-                if (result1 == result2) {
-                    doubleCount++;
-                }
-
-                if (doubleCount == 3) {
-                    Spatial jailIndicator = app.getGuiNode().getChild("JailIndicator");
-                    assertNotNull("Der Spieler sollte nach dem dritten Pasch ins Gefängnis gehen", jailIndicator);
-                    break;
-                }
-            } else {
-                throw new AssertionError("'RollDiceButton' ist kein Button-Objekt.");
-            }
-        }
-
-        assertTrue("Der Spieler sollte drei Paschs geworfen haben", doubleCount == 3);
-    }
-    @Test
-// T035: UC-gameplay-07 - Überprüfen, ob ein Spieler für Steuerfelder korrekt belastet wird
-    public void testTaxFieldCharges() {
-        Game game = new Game();
-        PlayerHandler playerHandler = game.getPlayerHandler();
-        Player activePlayer = playerHandler.getActivePlayer();
-        assertNotNull("Es sollte einen aktiven Spieler geben", activePlayer);
-
-        int initialBalance = activePlayer.getAccountBalance();
-
-        activePlayer.moveToField(game.getGameBoard().getFieldById(4)); // ID 4: Steuerfeld "Diszi"
-        game.getGameBoard().applyFieldEffect(activePlayer);
-
-        int expectedBalance = initialBalance - 200; // Beispielsteuer: 200 €
-        assertEquals("Der Spieler sollte für das Steuerfeld korrekt belastet werden", expectedBalance, activePlayer.getAccountBalance());
-    }
-
-    @Test
-// T036: UC-gameplay-08 - Überprüfen, ob ein Spieler korrekt ins Gefängnis geschickt wird
-    public void testGoToJailField() {
-        Game game = new Game();
-        PlayerHandler playerHandler = game.getPlayerHandler();
-        Player activePlayer = playerHandler.getActivePlayer();
-        assertNotNull("Es sollte einen aktiven Spieler geben", activePlayer);
-
-        activePlayer.moveToField(game.getGameBoard().getFieldById(30)); // ID 30: Ab ins Gefängnis
-        game.getGameBoard().applyFieldEffect(activePlayer);
-
-        assertEquals("Der Spieler sollte ins Gefängnis geschickt werden", 10, activePlayer.getFieldId()); // ID 10: Gefängnis
-    }
-
-    @Test
-// T037: UC-gameplay-09 - Überprüfen, ob ein Spieler bei "Frei Parken" keine Gebühren zahlt
-    public void testFreeParking() {
-        Game game = new Game();
-        PlayerHandler playerHandler = game.getPlayerHandler();
-        Player activePlayer = playerHandler.getActivePlayer();
-        assertNotNull("Es sollte einen aktiven Spieler geben", activePlayer);
-
-        int initialBalance = activePlayer.getAccountBalance();
-
-        activePlayer.moveToField(game.getGameBoard().getFieldById(20)); // ID 20: Frei Parken
-        game.getGameBoard().applyFieldEffect(activePlayer);
-
-        assertEquals("Der Spieler sollte bei 'Frei Parken' keine Gebühren zahlen", initialBalance, activePlayer.getAccountBalance());
+        assertTrue("The player should be able to select an available color.", result);
     }
 }
-
-
-
+*/

Projekte/monopoly/server/server.properties

@@ -10,5 +10,5 @@
 # This file defines the configuration settings for the Battleship server.
 #
 # The port number on which the server will listen for incoming connections.
-port=42069
+port=1234
 

Projekte/monopoly/server/src/main/java/pp/monopoly/server/MonopolyServer.java

@@ -7,6 +7,21 @@
 
 package pp.monopoly.server;
 
+import com.jme3.network.ConnectionListener;
+import com.jme3.network.HostedConnection;
+import com.jme3.network.Message;
+import com.jme3.network.MessageListener;
+import com.jme3.network.Network;
+import com.jme3.network.Server;
+import com.jme3.network.serializing.Serializer;
+import pp.monopoly.MonopolyConfig;
+import pp.monopoly.game.server.Player;
+import pp.monopoly.game.server.ServerGameLogic;
+import pp.monopoly.game.server.ServerSender;
+import pp.monopoly.message.client.ClientMessage;
+import pp.monopoly.message.server.ServerMessage;
+import pp.monopoly.model.IntPoint;
+
 import java.io.File;
 import java.io.FileInputStream;
 import java.io.IOException;
@@ -16,22 +31,6 @@ import java.util.concurrent.BlockingQueue;
 import java.util.concurrent.LinkedBlockingQueue;
 import java.util.logging.LogManager;
 
-import com.jme3.network.ConnectionListener;
-import com.jme3.network.HostedConnection;
-import com.jme3.network.Message;
-import com.jme3.network.MessageListener;
-import com.jme3.network.Network;
-import com.jme3.network.Server;
-import com.jme3.network.serializing.Serializer;
-
-import pp.monopoly.MonopolyConfig;
-import pp.monopoly.game.server.Player;
-import pp.monopoly.game.server.ServerGameLogic;
-import pp.monopoly.game.server.ServerSender;
-import pp.monopoly.message.client.ClientMessage;
-import pp.monopoly.message.server.ServerMessage;
-import pp.monopoly.model.IntPoint;
-
 /**
  * Server implementing the visitor pattern as MessageReceiver for ClientMessages
  */
@@ -120,9 +119,8 @@ public class MonopolyServer implements MessageListener<HostedConnection>, Connec
 
     @Override
     public void connectionAdded(Server server, HostedConnection hostedConnection) {
-        LOGGER.log(Level.INFO, "New connection established: {0}", hostedConnection); //NON-NLS
+        LOGGER.log(Level.INFO, "new connection {0}", hostedConnection); //NON-NLS
         logic.addPlayer(hostedConnection.getId());
-        System.out.println("Spieler verbunden: ID = " + hostedConnection.getId());
     }
 
     @Override

Projekte/settings.gradle

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