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 (Mac).run.xml

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

Projekte/.run/MonopolyApp.run.xml

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

Projekte/battleship/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
@@ -21,11 +19,7 @@ def sliderColor = color(0.6, 0.8, 0.8, 1)
 def sliderBgColor = color(0.5, 0.75, 0.75, 1)
 def gradientColor = color(0.5, 0.75, 0.85, 0.5)
 def tabbuttonEnabledColor = color(0.4, 0.45, 0.5, 1)
-def solidWhiteBackground = new QuadBackgroundComponent(new ColorRGBA(1, 1, 1, 1))
-def greyBackground = new QuadBackgroundComponent(new ColorRGBA(0.1f, 0.1f, 0.1f, 1.0f));
-def lightGreyBackground = new QuadBackgroundComponent(new ColorRGBA(0.4f, 0.4f, 0.4f, 1.0f));
-def lightGrey = color(0.6, 0.6, 0.6, 1.0)
-
+def solidWhiteBackground = new QuadBackgroundComponent(color(1, 1, 1, 1)) // Solid white
 
 
 
@@ -38,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)
@@ -56,50 +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-toolbar", "pp") {
-    insets = new Insets3f(2, 2, 2, 2)
-    font = font("Interface/Fonts/Metropolis/Metropolis-Bold-32.fnt")
-    fontSize = 30
-    color = new ColorRGBA(ColorRGBA.White)
-    textHAlignment = HAlignment.Center
-    textVAlignment = VAlignment.Center
-
-}
-selector("label-Text", "pp") {
-    insets = new Insets3f(2, 2, 2, 2)
-    fontSize = 25
-    color = buttonEnabledColor
-}
-
-selector("label-account", "pp") {
-    insets = new Insets3f(2, 2, 2, 2)
-    fontSize = 25
-    color = new ColorRGBA(ColorRGBA.White)
-    textHAlignment = HAlignment.Center
-    textVAlignment = VAlignment.Center
-}
-
-selector("card-label", "pp") {
-    insets = new Insets3f(2, 2, 2, 2)
-    color = ColorRGBA.Black
-}
-
 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") {
@@ -108,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()
@@ -180,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
 }
@@ -196,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
 }
 
@@ -271,98 +231,6 @@ selector("tab.button", "pp") {
     buttonCommands = stdButtonCommands
 }
 selector("settings-title", "pp") {
-    def outerBackground = new QuadBackgroundComponent(color(1, 0.5, 0, 1)) // Grey inner border
-    def innerBackground = new QuadBackgroundComponent(buttonBgColor) // White outer border background
-
-    background = outerBackground
-    fontSize = 40
-    insets = new Insets3f(3, 3, 3, 3)
-    textHAlignment = HAlignment.Center
-    textVAlignment = VAlignment.Center
+    fontSize = 48 // Set font size
+    background = new QuadBackgroundComponent(color(0.4157f, 0.4235f, 0.4392f, 1.0f)) // Grey background
  }
-selector("warning-title", "pp") {
-    def outerBackground = new QuadBackgroundComponent(color(1, 0.5, 0, 1)) // Grey inner border
-    def innerBackground = new QuadBackgroundComponent(buttonBgColor) // White outer border background
-    font = font("Interface/Fonts/Metropolis/Metropolis-Bold-42.fnt")
-    background = outerBackground
-    fontSize = 40
-    insets = new Insets3f(3, 3, 3, 3)
-    textHAlignment = HAlignment.Center
-    textVAlignment = VAlignment.Center
-}
-
-selector("menu-button", "pp") {
-    fontSize = 40 // Set font size
-    textHAlignment = HAlignment.Center
-    textVAlignment = VAlignment.Center
-    buttonCommands = stdButtonCommands
-}
-
-// Style for Selector text
-selector("selector.item.label") {
-    color = color(0, 0, 0, 1)  // Black text
-    fontSize = 16  // Optional: Adjust the text size if needed
-    textHAlignment = HAlignment.Left  // Optional: Align text to the left
-    insets = new Insets3f(2, 2, 2, 2)  // Optional: Add padding around text
-}
-// Style the popup container background
-selector("selector.popup") {
-    background = new QuadBackgroundComponent(new ColorRGBA(1, 1, 1, 0.8f))  // Translucent white background
-    insets = new Insets3f(5, 5, 5, 5)  // Padding inside the popup container
-}
-
-// Style the text of dropdown options
-selector("selector.item.label") {
-    color = color(0, 0, 0, 1)  // Black text
-    fontSize = 16  // Optional: Adjust font size
-    textHAlignment = HAlignment.Left  // Align text to the left
-    insets = new Insets3f(2, 5, 2, 5)  // Add padding for each option
-}
-
-// Style the hover state of dropdown options
-selector("selector.item.label", "hover") {
-    color = color(1, 1, 1, 1)  // White text when hovered
-    background = new QuadBackgroundComponent(new ColorRGBA(0.2f, 0.6f, 1.0f, 0.9f))  // Highlighted background
-}
-
-
-def enabledCommandToolbar = new Command<Button>() {
-    void execute(Button source) {
-        if (source.isEnabled()){
-            source.setColor(ColorRGBA.White)
-            def orangeBackground = new QuadBackgroundComponent(color(1, 0.5, 0, 1)); // Orange background
-            source.setBackground(orangeBackground);
-        } else{
-            source.setColor(ColorRGBA.White)
-            def grayBackground = new QuadBackgroundComponent(ColorRGBA.Gray); // Gray background
-            source.setBackground(grayBackground);
-        }
-
-
-
-
-    }
-}
-
-def stdButtonCommandsToolbar = [
-        (ButtonAction.Down)    : [pressedCommand],
-        (ButtonAction.Up)      : [pressedCommand],
-        (ButtonAction.Enabled) : [enabledCommandToolbar],
-        (ButtonAction.Disabled): [enabledCommandToolbar]
-]
-
-selector("button-toolbar", "pp") {
-    def outerBackground = new QuadBackgroundComponent(color(1, 0.5, 0, 1)) // Orange border
-    def innerBackground = new QuadBackgroundComponent(buttonBgColor) // Inner button background
-
-    // Apply the outer border as the main background
-    background = outerBackground
-
-    // Use insets to create a margin/padding effect for the inner background
-    insets = new Insets3f(3, 3, 3, 3) // Adjust the border thickness
-    textHAlignment = HAlignment.Center
-    textVAlignment = VAlignment.Center
-    buttonCommands = stdButtonCommandsToolbar
-}
-
-

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/GameAppState.java

@@ -1,113 +0,0 @@
-////////////////////////////////////////
-// Programming project code
-// UniBw M, 2022, 2023, 2024
-// www.unibw.de/inf2
-// (c) Mark Minas (mark.minas@unibw.de)
-////////////////////////////////////////
-
-package pp.monopoly.client;
-
-import java.lang.System.Logger;
-import java.util.List;
-
-import com.jme3.input.controls.ActionListener;
-import com.jme3.scene.Node;
-import com.jme3.system.AppSettings;
-
-import pp.monopoly.client.gui.TestWorld;
-import pp.monopoly.game.server.Player;
-
-/**
- * Represents the state responsible for managing the battle interface within the Battleship game.
- * This state handles the display and interaction of the battle map, including the opponent's map.
- * It manages GUI components, input events, and the layout of the interface when this state is enabled.
- */
-public class GameAppState extends MonopolyAppState {
-    private static final Logger LOGGER = System.getLogger(MonopolyAppState.class.getName());
-    private static final float DEPTH = 0f;
-    private static final float GAP = 20f;
-
-    /**
-     * A listener for handling click events in the battle interface.
-     * When a click is detected, it triggers the corresponding actions on the opponent's map.
-     */
-    private final ActionListener clickListener = (name, isPressed, tpf) -> click(isPressed);
-    
-    /**
-     * The root node for all GUI components in the battle state.
-     */
-    private final Node battleNode = new Node("Game"); //NON-NLS
-
-    /**
-     * A view representing the opponent's map in the GUI.
-     */
-    private TestWorld testWorld;
-
-    /**
-     * Enables the battle state by initializing, laying out, and adding GUI components.
-     * Attaches the components to the GUI node and registers input listeners.
-     */
-    @Override
-    protected void enableState() {
-        battleNode.detachAllChildren();
-        initializeGuiComponents();
-        layoutGuiComponents();
-        addGuiComponents();
-        getApp().getGuiNode().attachChild(battleNode);
-    }
-
-    /**
-     * Disables the battle state by removing GUI components and unregistering input listeners.
-     * Also handles cleanup of resources, such as the opponent's map view.
-     */
-    @Override
-    protected void disableState() {
-        getApp().getGuiNode().detachChild(battleNode);
-        getApp().getInputManager().removeListener(clickListener);
-    }
-
-    /**
-     * Initializes the GUI components used in the battle state.
-     * Creates the opponent's map view and adds a grid overlay to it.
-     */
-    private void initializeGuiComponents() {
-
-        // Initialisiere TestWorld mit Spielern
-        testWorld = new TestWorld(getApp());
-        testWorld.initializeScene();
-    }
-    
-
-    /**
-     * Adds the initialized GUI components to the battle node.
-     * Currently, it attaches the opponent's map view to the node.
-     */
-    private void addGuiComponents() {
-    }
-
-    /**
-     * Lays out the GUI components within the window, positioning them appropriately.
-     * The opponent's map view is positioned based on the window's dimensions and a specified gap.
-     */
-    private void layoutGuiComponents() {
-        final AppSettings s = getApp().getContext().getSettings();
-        final float windowWidth = s.getWidth();
-        final float windowHeight = s.getHeight();
-    }
-
-    /**
-     * Handles click events in the battle interface. If the event indicates a click (not a release),
-     * it translates the cursor position to the model's coordinate system and triggers the game logic
-     * for interacting with the opponent's map.
-     *
-     * @param isPressed whether the mouse button is currently pressed (true) or released (false)
-     */
-    private void click(boolean isPressed) {
-    }
-
-    @Override
-    public void update(float tpf) {
-        // testWorld.update(tpf);
-        super.update(tpf);
-    }
-}

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

@@ -30,19 +30,10 @@ public class GameSound extends AbstractAppState implements GameEventListener {
     private static final Logger LOGGER = System.getLogger(GameSound.class.getName());
     private static final Preferences PREFERENCES = getPreferences(GameSound.class);
     private static final String ENABLED_PREF = "enabled"; //NON-NLS
-    private static final String VOLUME_PREF = "volume"; //NON-NLS
 
-    private AudioNode passStartSound;
-    private AudioNode eventCardSound;
-    private AudioNode gulagSound;
-    private AudioNode diceRollSound;
-    private AudioNode moneyCollectSound;
-    private AudioNode moneyLostSound;
-    private AudioNode tradeAcceptedSound;
-    private AudioNode tradeRejectedSound;
-    private AudioNode winnerSound;
-    private AudioNode looserSound;
-    private AudioNode buttonSound;
+    private AudioNode splashSound;
+    private AudioNode shipDestroyedSound;
+    private AudioNode explosionSound;
 
     /**
      * Checks if sound is enabled in the preferences.
@@ -60,15 +51,6 @@ public class GameSound extends AbstractAppState implements GameEventListener {
         setEnabled(!isEnabled());
     }
 
-    /**
-     * Checks if sound is enabled in the preferences.
-     *
-     * @return float to which the volume is set
-     */
-    public static float volumeInPreferences() {
-        return PREFERENCES.getFloat(VOLUME_PREF, 0.5f);
-    }
-
     /**
      * Sets the enabled state of this AppState.
      * Overrides {@link com.jme3.app.state.AbstractAppState#setEnabled(boolean)}
@@ -93,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/loser.ogg");
-        buttonSound = loadSound(app, "Sound/Effects/button.ogg");
     }
 
     /**
@@ -127,116 +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.
-     */
-    public void eventCard() {
-        if (isEnabled() && eventCardSound != null)
-            eventCardSound.playInstance();
-    }
-    /**
-     * Plays the gulag sound effect.
-     */
-    public void gulag() {
-        if (isEnabled() && gulagSound != null)
-            gulagSound.playInstance();
-    }
-    /**
-     * Plays the diceRoll sound effect.
-     */
-    public void diceRoll() {
-        if (isEnabled() && diceRollSound != null)
-            diceRollSound.playInstance();
-    }
-    /**
-     * Plays the moneyCollect sound effect.
-     */
-    public void moneyCollect() {
-        if (isEnabled() && moneyCollectSound != null)
-            moneyCollectSound.playInstance();
-    }
-    /**
-     * Plays the moneyLost sound effect.
-     */
-    public void moneyLost() {
-        if (isEnabled() && moneyLostSound != null)
-            moneyLostSound.playInstance();
-    }
-    /**
-     * Plays the tradeAccepted sound effect.
-     */
-    public void tradeAccepted() {
-        if (isEnabled() && tradeAcceptedSound != null)
-            tradeAcceptedSound.playInstance();
-    }
-    /**
-     * Plays the tradeRejected sound effect.
-     */
-    public void tradeRejected() {
-        if (isEnabled() && tradeRejectedSound != null)
-            tradeRejectedSound.playInstance();
-    }
-    /**
-     * Plays the winner sound effect.
-     */
-    public void winner() {
-        if (isEnabled() && winnerSound != null)
-            winnerSound.playInstance();
-    }
-    /**
-     * Plays the looser sound effect.
-     */
-    public void looser() {
-        if (isEnabled() && looserSound != null)
-            looserSound.playInstance();
-    }
-    /**
-     * Plays the button sound effect.
-     */
-    public void button() {
-        if (isEnabled() && buttonSound != null)
-            buttonSound.playInstance();
-    }
-    /**
-     * Sets the volume of the sounds
-     * @param vol the volume to which the sounds should be set
-     */
-    public void setVolume(float vol){
-        passStartSound.setVolume(vol);
-        eventCardSound.setVolume(vol);
-        gulagSound.setVolume(vol);
-        diceRollSound.setVolume(vol);
-        moneyCollectSound.setVolume(vol);
-        moneyLostSound.setVolume(vol);
-        tradeAcceptedSound.setVolume(vol);
-        tradeRejectedSound.setVolume(vol);
-        winnerSound.setVolume(vol);
-        looserSound.setVolume(vol);
-        buttonSound.setVolume(vol);
 
-        PREFERENCES.putFloat(VOLUME_PREF, vol);
+    /**
+     * Plays the explosion sound effect.
+     */
+    public void explosion() {
+        if (isEnabled() && explosionSound != null)
+            explosionSound.playInstance();
+    }
+
+    /**
+     * Plays sound effect when a ship has been destroyed.
+     */
+    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 -> gulag();
-            case DICE_ROLL -> diceRoll();
-            case MONEY_COLLECTED -> moneyCollect();
-            case MONEY_LOST -> moneyLost();
-            case TRADE_ACCEPTED -> tradeAccepted();
-            case TRADE_REJECTED -> tradeRejected();
-            case WINNER -> winner();
-            case LOSER -> looser();
-            case BUTTON -> button();
         }
     }
 }

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

@@ -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,505 +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 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 com.jme3.app.DebugKeysAppState;
 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.dialog.Dialog;
 import pp.dialog.DialogBuilder;
 import pp.dialog.DialogManager;
 import pp.graphics.Draw;
-import static pp.monopoly.Resources.lookup;
 import pp.monopoly.client.gui.SettingsMenu;
-import pp.monopoly.client.gui.StartMenu;
 import pp.monopoly.client.gui.TestWorld;
-import pp.monopoly.client.gui.popups.Bankrupt;
-import pp.monopoly.client.gui.popups.BuildingPropertyCard;
-import pp.monopoly.client.gui.popups.BuyCard;
-import pp.monopoly.client.gui.popups.BuyHouse;
-import pp.monopoly.client.gui.popups.EventCardPopup;
-import pp.monopoly.client.gui.popups.FoodFieldCard;
-import pp.monopoly.client.gui.popups.GateFieldCard;
-import pp.monopoly.client.gui.popups.LooserPopUp;
-import pp.monopoly.client.gui.popups.RepayMortage;
-import pp.monopoly.client.gui.popups.SellHouse;
-import pp.monopoly.client.gui.popups.TakeMortage;
-import pp.monopoly.client.gui.popups.TimeOut;
 import pp.monopoly.game.client.ClientGameLogic;
 import pp.monopoly.game.client.MonopolyClient;
 import pp.monopoly.game.client.ServerConnection;
-import pp.monopoly.notification.ClientStateEvent;
 import pp.monopoly.notification.GameEventListener;
 import pp.monopoly.notification.InfoTextEvent;
-import pp.monopoly.notification.Sound;
 
-/**
- * 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);
-
-    //TODO temp for testing
-    private EventCardPopup eventCard;
-    private BuildingPropertyCard buildingProperty;
-    private FoodFieldCard foodField;
-    private GateFieldCard gateField;
-    private BuyCard buyCard;
-    private LooserPopUp looserpopup;
-    private Bankrupt bankrupt;
-    private TimeOut timeOut;
-    private SellHouse sellHouse;
-    private BuyHouse buyHouse;
-    private TakeMortage takeMortage;
-    private RepayMortage repayMortage;
-
-    private boolean isBuyCardPopupOpen = false;
-    private final ActionListener BListener = (name, isPressed, tpf) -> handleB(isPressed);
-    private TestWorld testWorld;
-
-    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. //TODO Fehler im Kommentar
-     */
     @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);
-        BaseStyles.loadGlassStyle();
         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);
-
-        //TODO tmp for testing
-        inputManager.addMapping("B", new KeyTrigger(KeyInput.KEY_B));
-        inputManager.addListener(BListener, "B");
-        inputManager.addMapping("T", new KeyTrigger(KeyInput.KEY_T));
-        
+        inputManager.setCursorVisible(true);
+        inputManager.addMapping("ESC", new KeyTrigger(KeyInput.KEY_ESCAPE));
+        inputManager.addListener(escapeListener, "ESC");
     }
 
-    //logik zum wechselnden erscheinen und verschwinden beim drücken von B //TODO süäter entfernen
-    private void handleB(boolean isPressed) {
+    private void handleEscape(boolean isPressed) {
         if (isPressed) {
-            Dialog tmp = new FoodFieldCard(this);
-            tmp.open();
+            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);
+            }
         }
     }
     
-    /**
-     * 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 blockInputs() {
+        if (!inputBlocked) {
+            System.out.println("Blockiere Eingaben...");
+            inputManager.setCursorVisible(true); // Cursor sichtbar machen
+            inputManager.clearMappings();       // Alle Mappings entfernen
+            inputBlocked = true;
         }
-        flyCam.setEnabled(false);
-        stateManager.detach(stateManager.getState(StatsAppState.class));
-        stateManager.detach(stateManager.getState(DebugKeysAppState.class));
-
-        attachGameSound();
-        attachGameMusic();
-        stateManager.attach(new GameAppState());
     }
     
-    /**
-     * 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 unblockInputs() {
+        if (inputBlocked) {
+            System.out.println("Aktiviere Eingaben...");
+            setupInput(); // Standard-Eingaben neu registrieren
+            inputBlocked = false;
+        }
     }
 
-    /**
-     * 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);
+    public void setInfoText(String text) {
+        topText.setText(text);
     }
 
-    /**
-     * 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);
-        stateManager.update(tpf);
-
-       // //TODO testing replace later
-       // if (testWorld != null) {
-       //     testWorld.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.
-     */
-    public 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) {
-        stateManager.getState(GameAppState.class).setEnabled(true);
-    }
-
-    /**
-     * 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"), d -> {
-                        getGameLogic().playSound(Sound.BUTTON); // Play sound
-                        yesAction.run(); // Execute the original yesAction
-                    })
-                     .setNoButton(lookup("button.no"),  d -> getGameLogic().playSound(Sound.BUTTON))
-                     .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"), d -> getGameLogic().playSound(Sound.BUTTON))
-                     .build()
-                     .open();
+                .setTitle("Fehler")
+                .setText(errorMessage)
+                .setOkButton("OK")
+                .build()
+                .open();
     }
 
-    public void disconnect() {
-        serverConnection.disconnect();
+    public void setSettingsMenuOpen(boolean isOpen) {
+        this.isSettingsMenuOpen = isOpen;
     }
 
-    public int getId() {
-        if (serverConnection != null && serverConnection instanceof NetworkSupport) return ((NetworkSupport) serverConnection).getId();
-        return 0;
+    @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,8 +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.notification.Sound;
+import pp.monopoly.client.gui.CreateGameMenu;
+import pp.monopoly.client.gui.SettingsMenu;
 
 /**
  * Constructs the startup menu dialog for the Monopoly application.
@@ -22,6 +23,8 @@ import pp.monopoly.client.gui.GameMenu;
  */
 public class StartMenu extends Dialog {
     private final MonopolyApp app;
+    private Container logoContainer;
+    private Container unibwLogoContainer;
 
     /**
      * Constructs the Startup Menu dialog for the Monopoly application.
@@ -31,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();
 
@@ -45,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));
 
@@ -53,11 +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 -> ifTopDialog(() -> {
-            this.close();  // Close the StartMenu dialog
-            app.connect(); // Perform the connection logic
-            app.getGameLogic().playSound(Sound.BUTTON);
-        }));
+        startButton.addClickCommands(source -> startGame(app));
         centerMenu.addChild(startButton);
 
         // Position the center container in the middle of the screen
@@ -66,6 +74,34 @@ public class StartMenu extends Dialog {
                                                     0));
         app.getGuiNode().attachChild(centerMenu);
 
+        // Lower-left container for "Spiel beenden" button
+        Container lowerLeftMenu = new Container();
+        lowerLeftMenu.setLocalTranslation(new Vector3f(100, 90, 0));
+        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 -> quitGame());
+        lowerLeftMenu.addChild(quitButton);
+        app.getGuiNode().attachChild(lowerLeftMenu);
+
+        // Lower-right container for "Einstellungen" button
+        Container lowerRightMenu = new Container();
+        lowerRightMenu.setLocalTranslation(new Vector3f(screenWidth - 200, 90, 0));
+        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 -> 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");
 
@@ -88,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");
@@ -113,14 +157,26 @@ public class StartMenu extends Dialog {
         app.getGuiNode().attachChild(unibwContainer);
     }
 
-    @Override
-    public void escape() {
-        new SettingsMenu(app).open();
+    /**
+     * Starts the game by transitioning to the CreateGameMenu.
+     */
+    private static void startGame(MonopolyApp app) {
+        app.getGuiNode().detachAllChildren();
+        new CreateGameMenu(app);
     }
 
-    @Override
-    public void close() {
+    /**
+     * Opens the settings menu.
+     */
+    private static void openSettings(MonopolyApp app) {
         app.getGuiNode().detachAllChildren();
-        super.close();
+        new SettingsMenu(app);
+    }
+
+    /**
+     * Quits the game application.
+     */
+    private static void quitGame() {
+        System.exit(0);
     }
 }

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

@@ -1,190 +0,0 @@
-package pp.monopoly.client.gui;
-
-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.texture.Texture;
-import com.simsilica.lemur.*;
-import com.simsilica.lemur.component.QuadBackgroundComponent;
-import com.simsilica.lemur.component.SpringGridLayout;
-import com.simsilica.lemur.style.ElementId;
-import pp.dialog.Dialog;
-import pp.monopoly.client.MonopolyApp;
-import pp.monopoly.client.gui.popups.BuyHouse;
-import pp.monopoly.client.gui.popups.RepayMortage;
-import pp.monopoly.client.gui.popups.SellHouse;
-import pp.monopoly.client.gui.popups.TakeMortage;
-import pp.monopoly.notification.Sound;
-
-public class BuildingAdminMenu extends Dialog {
-    private final MonopolyApp app;
-
-    private final Container mainContainer;
-    private Geometry background;
-    private final Button backButton = new Button("Zurück");
-    private final Button buildButton = new Button("Bauen");
-    private final Button demolishButton = new Button("Abriss");
-    private final Button takeMortgageButton = new Button("Hypothek aufnehmen");
-    private final Button payMortgageButton = new Button("Hypothek bezahlen");
-    private final Button overviewButton = new Button("Übersicht");
-
-    public BuildingAdminMenu(MonopolyApp app) {
-        super(app.getDialogManager());
-        this.app = app;
-
-        // Background Image
-        addBackgroundImage();
-
-        // Main container for the UI components
-        mainContainer = new Container(new SpringGridLayout(Axis.Y, Axis.X));
-        mainContainer.setPreferredSize(new Vector3f(800, 600, 0));
-        mainContainer.setBackground(new QuadBackgroundComponent(new ColorRGBA(1, 1, 1, 0.7f))); // Translucent white background
-
-        // Add header
-        mainContainer.addChild(createHeaderContainer());
-        // Add content
-        mainContainer.addChild(createContent());
-        // Attach main container to GUI node
-        app.getGuiNode().attachChild(mainContainer);
-        mainContainer.setLocalTranslation(
-                (app.getCamera().getWidth() - mainContainer.getPreferredSize().x) / 2,
-                (app.getCamera().getHeight() + mainContainer.getPreferredSize().y) / 2,
-                7
-        );
-    }
-
-    /**
-     * Creates the header container.
-     *
-     * @return The header container.
-     */
-    private Container createHeaderContainer() {
-        Container headerContainer = new Container(new SpringGridLayout(Axis.X, Axis.Y));
-        headerContainer.setPreferredSize(new Vector3f(800, 100, 0));
-        Label headerLabel = headerContainer.addChild(new Label("Grundstücke Verwalten", new ElementId("header")));
-        headerLabel.setFontSize(45);
-        headerLabel.setInsets(new Insets3f(10, 10, 10, 10));
-        return headerContainer;
-    }
-
-    /**
-     * Creates the main content container with columns for Overview, Build, and Mortgage.
-     *
-     * @return The content container.
-     */
-    private Container createContent() {
-        Container contentContainer = new Container(new SpringGridLayout(Axis.X, Axis.Y));
-        contentContainer.setPreferredSize(new Vector3f(800, 500, 0));
-
-        // Overview Column
-        Container overviewColumn = new Container(new SpringGridLayout(Axis.Y, Axis.X));
-        overviewColumn.addChild(new Label("Übersicht:")).setFontSize(30);
-
-        //Building Overview Button
-        overviewButton.setPreferredSize(new Vector3f(200, 50, 0));
-        overviewButton.addClickCommands(s -> ifTopDialog(() -> {
-            app.getGameLogic().playSound(Sound.BUTTON);
-            new PropertyOverviewMenu(app).open();
-        }));
-        overviewColumn.addChild(overviewButton);
-
-        // Back Button
-        backButton.setPreferredSize(new Vector3f(200, 50, 0));
-        backButton.addClickCommands(s -> ifTopDialog(() -> {
-            app.getGameLogic().playSound(Sound.BUTTON);
-            close();
-        }));
-        overviewColumn.addChild(backButton);
-
-        contentContainer.addChild(overviewColumn);
-
-
-        // Build Column
-        Container buildColumn = new Container(new SpringGridLayout(Axis.Y, Axis.X));
-        buildColumn.addChild(new Label("Bauen:")).setFontSize(30);
-
-        // Build Houses Button
-        buildButton.setPreferredSize(new Vector3f(200, 50, 0));
-        buildButton.addClickCommands(s -> ifTopDialog(() -> {
-            app.getGameLogic().playSound(Sound.BUTTON);
-            new BuyHouse(app).open();
-        }));
-        buildColumn.addChild(buildButton);
-
-        //Demolish Houses Button
-        demolishButton.setPreferredSize(new Vector3f(200, 50, 0));
-        demolishButton.addClickCommands(s -> ifTopDialog(() -> {
-            app.getGameLogic().playSound(Sound.BUTTON);
-            new SellHouse(app).open();
-        }));
-        buildColumn.addChild(demolishButton);
-
-        contentContainer.addChild(buildColumn);
-
-
-        // Mortgage Column
-        Container mortgageColumn = new Container(new SpringGridLayout(Axis.Y, Axis.X));
-        mortgageColumn.addChild(new Label("Hypotheken:")).setFontSize(30);
-
-        // Lend Mortgage Button
-        takeMortgageButton.setPreferredSize(new Vector3f(200, 50, 0));
-        takeMortgageButton.addClickCommands(s -> ifTopDialog(() -> {
-            app.getGameLogic().playSound(Sound.BUTTON);
-            new TakeMortage(app).open();
-        }));
-        mortgageColumn.addChild(takeMortgageButton);
-
-        //Repay Mortgage Button
-        payMortgageButton.setPreferredSize(new Vector3f(200, 50, 0));
-        payMortgageButton.addClickCommands(s -> ifTopDialog(() -> {
-            app.getGameLogic().playSound(Sound.BUTTON);
-            new RepayMortage(app).open();
-        }));
-        mortgageColumn.addChild(payMortgageButton);  
-
-        contentContainer.addChild(mortgageColumn);
-
-        return contentContainer;
-    }
-
-    /**
-     * Adds a background image to the dialog.
-     */
-    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, 6); // Position behind other GUI elements
-        app.getGuiNode().attachChild(background);
-    }
-
-    /**
-     * Handles the "Zurück" action.
-     */
-    private void handleBack() {
-        app.getGameLogic().playSound(Sound.BUTTON);
-        close();
-    }
-
-    @Override
-    public void close() {
-        app.getGuiNode().detachChild(mainContainer);
-        app.getGuiNode().detachChild(background);
-        super.close();
-    }
-
-    @Override
-    public void escape() {
-        handleBack();
-    }
-
-    @Override
-    public void update(float delta) {
-        // Periodic updates if necessary
-    }
-}

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

@@ -1,5 +1,6 @@
 package pp.monopoly.client.gui;
 
+import com.jme3.math.FastMath;
 import com.jme3.math.Vector3f;
 import com.jme3.renderer.Camera;
 
@@ -8,7 +9,11 @@ import com.jme3.renderer.Camera;
  */
 public class CameraController {
     private final Camera camera;
-    private final float height = 25;    // Höhe der Kamera über dem Spielfeld        // Aktueller Winkel in der Kreisbewegung
+    private final Vector3f center; // Fokuspunkt der Kamera
+    private final float radius;    // Radius der Kreisbewegung
+    private final float height;    // Höhe der Kamera über dem Spielfeld
+    private final float speed;     // Geschwindigkeit der Kamerabewegung
+    private float angle;           // Aktueller Winkel in der Kreisbewegung
 
     /**
      * Konstruktor für den CameraController.
@@ -19,10 +24,13 @@ public class CameraController {
      * @param height Die Höhe der Kamera über dem Fokuspunkt
      * @param speed  Die Geschwindigkeit der Kamerabewegung
      */
-    public CameraController(Camera camera) {
+    public CameraController(Camera camera, Vector3f center, float radius, float height, float speed) {
         this.camera = camera;
-        setPosition(0);
-        camera.lookAt(Vector3f.ZERO, Vector3f.UNIT_Y);
+        this.center = center;
+        this.radius = radius;
+        this.height = height;
+        this.speed = speed;
+        this.angle = 0; // Starte bei Winkel 0
     }
 
     /**
@@ -31,22 +39,21 @@ public class CameraController {
      * @param tpf Zeit pro Frame
      */
     public void update(float tpf) {
-        camera.lookAt(Vector3f.ZERO, Vector3f.UNIT_Y);
-    }
+        // 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
+        }
 
-    public void setPosition(int fieldID) {
-        camera.setLocation(fieldIdToVector(fieldID));
-    }
+        // 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;
 
-    public void setPosition(float x, float y) {
-        camera.setLocation(new Vector3f(x,height,y));
-    }
+        // Setze die Kameraposition
+        camera.setLocation(new Vector3f(x, y, z));
 
-    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();
+        // Lasse die Kamera auf den Fokuspunkt blicken
+        camera.lookAt(center, Vector3f.UNIT_Y);
     }
 }

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

@@ -1,224 +0,0 @@
-package pp.monopoly.client.gui;
-
-import java.util.Set;
-
-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.texture.Texture;
-import com.simsilica.lemur.*;
-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.game.server.Player;
-import pp.monopoly.message.client.ViewAssetsRequest;
-import pp.monopoly.model.TradeHandler;
-import pp.monopoly.notification.Sound;
-
-public class ChoosePartner extends Dialog {
-    private final MonopolyApp app;
-    private Selector<String> playerSelector;
-    private final Button cancelButton = new Button("Abbrechen");
-    private final Button confirmButton = new Button("Bestätigen");
-    private final Container mainContainer;
-    private Container lowerLeftMenu;
-    private Container lowerRightMenu;
-    private Geometry background;
-    private TradeHandler tradeHandler;
-    private VersionedReference<Set<Integer>> selectionRef; // Reference to track selector changes
-    private String lastSelected = ""; // To keep track of the last selected value
-
-    QuadBackgroundComponent translucentWhiteBackground =
-            new QuadBackgroundComponent(new ColorRGBA(1.0f, 1.0f, 1.0f, 0.5f));
-
-    /**
-     * Constructs the ChoosePartner dialog.
-     *
-     * @param app The Monopoly application instance.
-     */
-    public ChoosePartner(MonopolyApp app) {
-        super(app.getDialogManager());
-        this.app = app;
-        tradeHandler = new TradeHandler(app.getGameLogic().getPlayerHandler().getPlayerById(app.getId()));
-        app.getGameLogic().send(new ViewAssetsRequest());
-
-        // Background Image
-        addBackgroundImage();
-
-        // Main container for the UI components
-        mainContainer = new Container(new SpringGridLayout(Axis.Y, Axis.X));
-        mainContainer.setPreferredSize(new Vector3f(1000, 600, 0));
-        mainContainer.setBackground(translucentWhiteBackground);
-
-        // Add title with background
-        Label headerLabel = mainContainer.addChild(new Label("Wähle deinen Handelspartner:", new ElementId("label-Bold")));
-        headerLabel.setFontSize(40);
-        headerLabel.setBackground(new QuadBackgroundComponent(new ColorRGBA(1.0f, 1.0f, 1.0f, 0.5f)));
-
-        // Dropdown for player selection
-        mainContainer.addChild(createDropdown());
-
-        // Add buttons
-        mainContainer.addChild(createButtonContainer());
-
-        // Attach main container to GUI node
-        app.getGuiNode().attachChild(mainContainer);
-        mainContainer.setLocalTranslation(
-                (app.getCamera().getWidth() - mainContainer.getPreferredSize().x) / 2,
-                (app.getCamera().getHeight() + mainContainer.getPreferredSize().y) / 2,
-                4
-        );
-
-        // Initialize selection reference for tracking changes
-        selectionRef = playerSelector.getSelectionModel().createReference();
-    }
-
-    /**
-     * Creates the dropdown menu for selecting a partner.
-     *
-     * @return The dropdown container.
-     */
-    private Container createDropdown() {
-        Container dropdownContainer = new Container(new SpringGridLayout(Axis.Y, Axis.X));
-        dropdownContainer.setPreferredSize(new Vector3f(100, 80, 0));
-        dropdownContainer.setBackground(new QuadBackgroundComponent(new ColorRGBA(ColorRGBA.Black)));
-
-        VersionedList<String> playerOptions = new VersionedList<>();
-
-        for (Player player : app.getGameLogic().getPlayerHandler().getPlayers()) {
-            if (player.getId() != app.getId()) {
-                playerOptions.add(player.getName() + " (ID: " + player.getId() + ")");
-            }
-        }
-
-        playerSelector = new Selector<>(playerOptions, "glass");
-        dropdownContainer.addChild(playerSelector);
-        Vector3f dimens = dropdownContainer.getPreferredSize();
-        Vector3f dimens2 = playerSelector.getPopupContainer().getPreferredSize();
-        dimens2.setX(dimens.getX());
-        playerSelector.getPopupContainer().setPreferredSize(new Vector3f(200, 200, 3));
-        playerSelector.setLocalTranslation(0, 0, 5);
-
-        // Set initial selection
-        if (!playerOptions.isEmpty()) {
-            onDropdownSelectionChanged(playerOptions.get(0));
-        }
-
-        return dropdownContainer;
-    }
-
-    /**
-     * Creates the button container with cancel and confirm buttons.
-     *
-     * @return The button container.
-     */
-    private Container createButtonContainer() {
-        Container buttonContainer = new Container(new SpringGridLayout(Axis.X, Axis.Y));
-        buttonContainer.setBackground(translucentWhiteBackground);
-
-        // "Abbrechen" button
-        lowerLeftMenu = new Container();
-        cancelButton.setPreferredSize(new Vector3f(200, 60, 0));
-        cancelButton.setFontSize(30);
-        cancelButton.addClickCommands(s -> ifTopDialog(() -> {
-            app.getGameLogic().playSound(Sound.BUTTON);
-            close();
-        }));
-        lowerLeftMenu.addChild(cancelButton);
-
-        // Position the container near the bottom-left corner
-        lowerLeftMenu.setLocalTranslation(new Vector3f(120, 170, 5)); // Adjust X and Y to align with the bottom-left corner
-        app.getGuiNode().attachChild(lowerLeftMenu);
-
-        // "Bestätigen" button
-        lowerRightMenu = new Container();
-        confirmButton.setPreferredSize(new Vector3f(200, 60, 0));
-        confirmButton.setFontSize(30);
-        confirmButton.addClickCommands(s -> ifTopDialog(() -> {
-            app.getGameLogic().playSound(Sound.BUTTON);
-            close();
-            new TradeMenu(app, tradeHandler).open();
-        }));
-        lowerRightMenu.addChild(confirmButton);
-
-        // Position the container near the bottom-right corner
-        lowerRightMenu.setLocalTranslation(new Vector3f(app.getCamera().getWidth() - 320, 170, 5)); // X: 220px from the right, Y: 50px above the bottom
-        app.getGuiNode().attachChild(lowerRightMenu);
-
-        return buttonContainer;
-    }
-
-    /**
-     * Adds a background image to the dialog.
-     */
-    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, 3); // Position behind other GUI elements
-        app.getGuiNode().attachChild(background);
-    }
-
-    /**
-     * Handles the escape action for the dialog.
-     */
-    @Override
-    public void escape() {
-        new SettingsMenu(app).open();
-    }
-
-    /**
-     * Updates the dialog periodically, called by the dialog manager.
-     *
-     * @param delta The time elapsed since the last update.
-     */
-    @Override
-    public void update(float delta) {
-        // Check if the selection has changed
-        if (selectionRef.update()) {
-            String selected = playerSelector.getSelectedItem();
-            if (!selected.equals(lastSelected)) {
-                lastSelected = selected;
-                onDropdownSelectionChanged(selected);
-            }
-        }
-    }
-
-    @Override
-    public void close() {
-        app.getGuiNode().detachChild(playerSelector);
-        app.getGuiNode().detachChild(lowerLeftMenu);
-        app.getGuiNode().detachChild(lowerRightMenu);
-        app.getGuiNode().detachChild(mainContainer);
-        app.getGuiNode().detachChild(background);
-        super.close();
-    }
-
-    /**
-     * Callback for when the dropdown selection changes.
-     */
-    private void onDropdownSelectionChanged(String selected) {
-        app.getGameLogic().playSound(Sound.BUTTON);
-        int idStart = selected.indexOf("(ID: ") + 5; // Find start of the ID
-        int idEnd = selected.indexOf(")", idStart); // Find end of the ID
-        String idStr = selected.substring(idStart, idEnd); // Extract the ID as a string
-        int playerId = Integer.parseInt(idStr); // Convert the ID to an integer
-
-        // Find the player by ID
-        Player selectedPlayer = app.getGameLogic().getPlayerHandler().getPlayerById(playerId);
-
-        if (selectedPlayer != null) {
-            tradeHandler.setReceiver(selectedPlayer); // Set the receiver in TradeHandler
-        }
-    }
-}

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

@@ -1,226 +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 com.simsilica.lemur.style.ElementId;
 import pp.monopoly.client.MonopolyApp;
-import pp.monopoly.client.NetworkSupport;
-import pp.monopoly.notification.Sound;
-import pp.monopoly.server.MonopolyServer;
-import pp.dialog.Dialog;
-import pp.dialog.DialogBuilder;
+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 Dialog {
-    private static final Logger LOGGER = System.getLogger(CreateGameMenu.class.getName());
-    private static final String LOCALHOST = "localhost"; //NON-NLS
-    private static final String DEFAULT_PORT = "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;
 
-        final MonopolyApp app = network.getApp();
+        // Hintergrundbild laden und hinzufügen
+        addBackgroundImage();
 
-        int screenWidth = app.getContext().getSettings().getWidth();
-        int screenHeight = app.getContext().getSettings().getHeight();
+        // 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
 
-        // Set up the background image
+        // 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
+
+        // "Abbrechen"-Button
+        Button cancelButton = buttonContainer.addChild(new Button("Abbrechen"));
+        cancelButton.setPreferredSize(new Vector3f(120, 40, 0));
+        cancelButton.addClickCommands(source -> goBackToStartMenu());
+
+        // "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));
+        // 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);
+    }
+
+    /**
+     * Lädt das Hintergrundbild und fügt es als geometrische Ebene hinzu.
+     */
+    private void addBackgroundImage() {
         Texture backgroundImage = app.getAssetManager().loadTexture("Pictures/unibw-Bib2.png");
-        Quad quad = new Quad(screenWidth, screenHeight);
-        Geometry background = new Geometry("Background", quad);
+        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); // Ensure it is behind other GUI elements
+        background.setLocalTranslation(0, 0, -1); // Hintergrundebene
+
         app.getGuiNode().attachChild(background);
-
-        addChild(new Label("Spiel erstellen", new ElementId("header"))); //NON-NLS
-        final Container input = new Container(new SpringGridLayout());
-        input.addChild(new Label(lookup("host.name") + ":  "));
-        input.addChild(host, 1);
-        input.addChild(new Label(lookup("port.number") + ":  "));
-        input.addChild(port, 1);
-        
-        addChild(input);
-        // "Abbrechen"-Button
-        cancelButton.setPreferredSize(new Vector3f(120, 40, 0));
-        cancelButton.addClickCommands(s -> ifTopDialog(() -> {
-            app.getGameLogic().playSound(Sound.BUTTON);
-            this.close();
-            new StartMenu(network.getApp()).open();
-        }));
-        addChild(cancelButton);
-
-        // "Selber hosten"-Button
-        serverButton.addClickCommands(s -> ifTopDialog( () -> {
-            network.getApp().getGameLogic().playSound(Sound.BUTTON);
-            startServerInThread();
-        }   ));
-        addChild(serverButton);
-
-        // "Beitreten"-Button
-        joinButton.setPreferredSize(new Vector3f(120, 40, 0));
-        joinButton.addClickCommands(s -> ifTopDialog( () -> {
-            app.getGameLogic().playSound(Sound.BUTTON);
-            connect();
-        }));
-        addChild(joinButton);
     }
 
     /**
-     * Handles the action for the connect button in the connection dialog.
-     * Tries to parse the port number and initiate connection to the server.
+     * Geht zum Startmenü zurück, wenn "Abbrechen" angeklickt wird.
      */
-    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 goBackToStartMenu() {
+        closeCreateGameMenu();          // Schließt das Menü
+        StartMenu.createStartMenu(app); // Zeige das Startmenü
     }
 
     /**
-     * Creates a dialog indicating that the connection is in progress.
+     * Entfernt das CreateGameMenu und dessen Hintergrund.
      */
-    private void openProgressDialog() {
-        progressDialog = DialogBuilder.simple(network.getApp().getDialogManager())
-                                      .setText(lookup("label.connecting"))
-                                      .build();
-        progressDialog.open();
-    }
-
-    /**
-     * Tries 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);
-        }
-    }
-
-    @Override
-    public void escape() {
-        new SettingsMenu(network.getApp()).open();
-    }
-
-    /**
-     * This method is called by {@linkplain pp.dialog.DialogManager#update(float)} for periodically
-     * updating this dialog. T
-     */
-    @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) {
-            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,320 +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.game.server.PlayerColor;
-import pp.monopoly.message.client.PlayerReady;
-import pp.monopoly.notification.Sound;
-
-import java.util.Set;
-
-public class LobbyMenu extends Dialog {
-
-    private final MonopolyApp app;
-    private final Container menuContainer;
-    private Geometry background;
-    private Geometry circle;
-    private Container lowerLeftMenu;
-    private Container lowerRightMenu;
-
-    private TextField playerInputField;
-    private TextField startingCapital = new TextField("15000");
-    private String figure;
-
-    public LobbyMenu(MonopolyApp app) {
-        super(app.getDialogManager());
-        this.app = app;
-
-        playerInputField = new TextField("Spieler "+(app.getId()+1));
-        // 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.setBackground(new QuadBackgroundComponent(new ColorRGBA(ColorRGBA.Black)));
-        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);
-        Vector3f dimens = dropdownContainer.getPreferredSize();
-        Vector3f dimens2 = figureDropdown.getPopupContainer().getPreferredSize();
-        dimens2.setX( dimens.getX() );
-        figureDropdown.getPopupContainer().setPreferredSize(new Vector3f(200,200,5));
-        figureDropdown.getSelectionModel().setSelection(0);
-        figure = "Laptop";
-
-        addSelectionActionListener(figureDropdown, this::onDropdownSelectionChanged);
-
-        Container buttonContainer = menuContainer.addChild(new Container(new SpringGridLayout(Axis.X, Axis.Y)));
-        buttonContainer.setPreferredSize(new Vector3f(100, 40, 0));
-        buttonContainer.setInsets(new Insets3f(20, 0, 10, 0)); // Add spacing above the buttons
-        buttonContainer.setBackground(null);
-        // Lower-left container for "Abbrechen" button
-        lowerLeftMenu = new Container();
-        Button cancelButton = new Button("Beenden");
-        cancelButton.setPreferredSize(new Vector3f(200, 60, 0)); // Set size to match the appearance in the image
-        cancelButton.setFontSize(18); // Adjust font size
-        cancelButton.addClickCommands(s -> ifTopDialog(() -> {
-            app.closeApp();
-            app.getGameLogic().playSound(Sound.BUTTON);
-        }));
-        lowerLeftMenu.addChild(cancelButton);
-
-        // Position the container near the bottom-left corner
-        lowerLeftMenu.setLocalTranslation(new Vector3f(120, 170, 3)); // Adjust X and Y to align with the bottom-left corner
-        app.getGuiNode().attachChild(lowerLeftMenu);
-
-        // Lower-right container for "Bereit" button
-        lowerRightMenu = new Container();
-        Button readyButton = new Button("Bereit");
-        readyButton.setPreferredSize(new Vector3f(200, 60, 0)); // Set size to match the appearance in the image
-        readyButton.setFontSize(18); // Adjust font size
-        readyButton.setBackground(new QuadBackgroundComponent(ColorRGBA.Green)); // Add color to match the style
-        readyButton.addClickCommands(s -> ifTopDialog(() -> {
-            toggleReady();
-            app.getGameLogic().playSound(Sound.BUTTON);
-            readyButton.setBackground(new QuadBackgroundComponent(ColorRGBA.DarkGray));
-        }));
-        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(); // 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() {
-
-        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", idToColor()); // Set the desired color
-        circleGeometry.setMaterial(material);
-
-        return circleGeometry;
-    }
-
-    private ColorRGBA idToColor() {
-        switch (app.getId()+1) {
-            case 1: return PlayerColor.CYAN.getColor();
-            case 2: return PlayerColor.YELLOW.getColor();
-            case 3: return PlayerColor.RED.getColor();
-            case 4: return PlayerColor.PINK.getColor();
-            case 5: return PlayerColor.GREEN.getColor();
-            case 6: return PlayerColor.PURPLE.getColor();
-        
-            default:
-                return null;
-        }
-    }
-
-    /**
-     * Schaltet den "Bereit"-Status um.
-     */
-    private void toggleReady() {
-        app.getGameLogic().send(new PlayerReady(true, playerInputField.getText(), figure, Integer.parseInt(startingCapital.getText())));
-    }
-
-    @Override
-    public void escape() {
-        new SettingsMenu(app).open();
-    }
-
-    /**
-     * Adds a custom action listener to the Selector.
-     */
-    private void addSelectionActionListener(Selector<String> selector, SelectionActionListener<String> listener) {
-        VersionedReference<Set<Integer>> selectionRef = selector.getSelectionModel().createReference();
-
-        app.getStateManager().attach(new BaseAppState() {
-            @Override
-            public void update(float tpf) {
-                if (selectionRef.update()) {
-                    String selected = selectionRef.get().toString();
-                    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) {
-        app.getGameLogic().playSound(Sound.BUTTON);
-        switch (selected) {
-            case "[0]":
-                figure = "Laptop";
-                break;
-            case "[1]":
-                figure = "Flugzeug";
-                break;
-            case "[2]":
-                figure = "Jägermeister";
-                break;
-            case "[3]":
-                figure = "Katze";
-                break;
-            case "[4]":
-                figure = "OOP";
-                break;
-            case "[5]":
-                figure = "Handyholster";
-                break;
-            default:
-                break;    
-        }
-    }
-
-    /**
-     * Functional interface for a selection action listener.
-     */
-    @FunctionalInterface
-    private interface SelectionActionListener<T> {
-        void onSelectionChanged(T selection);
-    }
-}

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

@@ -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/PropertyOverviewMenu.java

@@ -1,252 +0,0 @@
-package pp.monopoly.client.gui;
-
-import com.jme3.math.ColorRGBA;
-import com.jme3.math.Vector3f;
-import com.jme3.renderer.RenderManager;
-import com.jme3.renderer.ViewPort;
-import com.jme3.scene.control.AbstractControl;
-import com.simsilica.lemur.*;
-import com.simsilica.lemur.component.QuadBackgroundComponent;
-import com.simsilica.lemur.component.SpringGridLayout;
-import com.simsilica.lemur.style.ElementId;
-
-import pp.dialog.Dialog;
-import pp.monopoly.client.MonopolyApp;
-import pp.monopoly.game.server.Player;
-import pp.monopoly.model.fields.BuildingProperty;
-import pp.monopoly.model.fields.FoodField;
-import pp.monopoly.model.fields.GateField;
-import pp.monopoly.model.fields.PropertyField;
-
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * PropertyOverviewMenu is a dialog for displaying the player's properties in the game.
- */
-public class PropertyOverviewMenu extends Dialog {
-    private final MonopolyApp app;
-    private final Container mainContainer;
-    private final Container displayContainer;
-    private final Slider horizontalSlider;
-    private final List<Container> cards;
-
-    /**
-     * Constructs the PropertyOverviewMenu dialog.
-     *
-     * @param app The Monopoly application instance.
-     */
-    public PropertyOverviewMenu(MonopolyApp app) {
-        super(app.getDialogManager());
-        this.app = app;
-
-
-        // Make the menu fullscreen
-        Vector3f screenSize = new Vector3f(app.getCamera().getWidth(), app.getCamera().getHeight(), 0);
-
-        // Main container for the menu layout
-        mainContainer = new Container();
-        mainContainer.setPreferredSize(screenSize); // Make fullscreen
-        mainContainer.setBackground(new QuadBackgroundComponent(new ColorRGBA(1.0f, 1.0f, 1.0f, 0.8f))); // Semi-transparent background
-
-        // Header label
-        Label headerLabel = mainContainer.addChild(new Label("Meine Grundstücke", new ElementId("header")));
-        headerLabel.setFontSize(40);
-
-        // Central display container (to hold the "Gebäude" cards)
-        displayContainer = mainContainer.addChild(new Container(new SpringGridLayout(Axis.X, Axis.Y, FillMode.Even, FillMode.None))); // Horizontal layout
-        displayContainer.setPreferredSize(new Vector3f(screenSize.x - 300, 550, 0)); // Take up the remaining width
-        displayContainer.setBackground(new QuadBackgroundComponent(ColorRGBA.White));
-        displayContainer.setLocalTranslation(0, 0, 11);
-
-        // Add some placeholder "Gebäude" cards to the display container
-        cards = new ArrayList<>();
-        populatePlayerProperties();
-
-
-        // Initially add only visible cards to the displayContainer
-        refreshVisibleCards(0);
-
-        // Horizontal slider for scrolling through cards
-        horizontalSlider = mainContainer.addChild(new Slider(Axis.X));
-        horizontalSlider.setPreferredSize(new Vector3f(screenSize.x - 300, 20, 5));
-        horizontalSlider.setModel(new DefaultRangedValueModel(0, Math.max(0, cards.size() - 5), 0));
-        horizontalSlider.addControl(new SliderValueChangeListener());
-
-        // Add the "Zurück" button at the bottom
-        Button backButton = mainContainer.addChild(new Button("Zurück", new ElementId("button")));
-        backButton.setPreferredSize(new Vector3f(200, 60, 0));
-        backButton.addClickCommands(source -> this.close());
-
-        // Attach the main container to the GUI node
-        app.getGuiNode().attachChild(mainContainer);
-        mainContainer.setLocalTranslation(
-                0,
-                app.getCamera().getHeight(), // Align to the top
-                10
-        );
-    }
-
-
-    /**
-     * Fetches the player's properties and populates them into the cards list.
-     */
-    private void populatePlayerProperties() {
-        // Fetch the current player
-        Player currentPlayer = app.getGameLogic().getPlayerHandler().getPlayerById(app.getId());
-
-        // Fetch the player's properties using their indices
-        List<PropertyField> fields = new ArrayList<>();
-        for (Integer i : currentPlayer.getProperties()) {
-            fields.add((PropertyField) app.getGameLogic().getBoardManager().getFieldAtIndex(i));
-        }
-
-        // Iterate through the fetched properties
-        for (PropertyField property : fields) {
-            if (property instanceof BuildingProperty) {
-                BuildingProperty building = (BuildingProperty) property;
-                cards.add(createBuildingCard(building));
-            } else if (property instanceof FoodField) {
-                FoodField foodField = (FoodField) property;
-                cards.add(createFoodFieldCard(foodField));
-            } else if (property instanceof GateField) {
-                GateField gateField = (GateField) property;
-                cards.add(createGateFieldCard(gateField));
-            }
-        }
-    }
-
-    /**
-     * Creates a card for BuildingProperty with detailed rent and cost information.
-     */
-    private Container createBuildingCard(BuildingProperty field) {
-        Container card = new Container();
-        card.setPreferredSize(new Vector3f(200, 300, 2)); // Match the size of the BuildingPropertyCard
-        card.setBackground(new QuadBackgroundComponent(field.getColor().getColor()));
-        card.setInsets(new Insets3f(5, 5, 5, 5)); // Add 5-pixel inset
-
-        card.addChild(new Label(field.getName(), new ElementId("label-Bold"))).setFontSize(25);
-
-        // Add property details
-        Container propertyValuesContainer = card.addChild(new Container());
-        propertyValuesContainer.addChild(new Label("Grundstückswert: €" + field.getPrice(), new ElementId("label-Text"))).setFontSize(14);
-        propertyValuesContainer.addChild(new Label("", new ElementId("label-Text"))).setFontSize(14); // Leerzeile
-        propertyValuesContainer.addChild(new Label("Miete allein: €" + field.getAllRent().get(0), new ElementId("label-Text"))).setFontSize(14);
-        propertyValuesContainer.addChild(new Label("- mit 1 Haus: €" + field.getAllRent().get(1), new ElementId("label-Text"))).setFontSize(14);
-        propertyValuesContainer.addChild(new Label("- mit 2 Häuser: €" + field.getAllRent().get(2), new ElementId("label-Text"))).setFontSize(14);
-        propertyValuesContainer.addChild(new Label("- mit 3 Häuser: €" + field.getAllRent().get(3), new ElementId("label-Text"))).setFontSize(14);
-        propertyValuesContainer.addChild(new Label("- mit 4 Häuser: €" + field.getAllRent().get(4), new ElementId("label-Text"))).setFontSize(14);
-        propertyValuesContainer.addChild(new Label("- mit 1 Hotel: €" + field.getAllRent().get(5), new ElementId("label-Text"))).setFontSize(14);
-        propertyValuesContainer.addChild(new Label("- 1 Haus kostet: €" + field.getHousePrice(), new ElementId("label-Text"))).setFontSize(14);
-        propertyValuesContainer.addChild(new Label("", new ElementId("label-Text"))).setFontSize(14); // Leerzeile
-        propertyValuesContainer.addChild(new Label("Hypothek: €" + field.getHypo(), new ElementId("label-Text"))).setFontSize(14);
-        propertyValuesContainer.setBackground(new QuadBackgroundComponent(new ColorRGBA(0.4657f, 0.4735f, 0.4892f, 1.0f)));
-
-        return card;
-    }
-
-    /**
-     * Creates a card for FoodField with dynamic pricing and rent details.
-     */
-    private Container createFoodFieldCard(FoodField field) {
-        Container card = new Container();
-        card.setPreferredSize(new Vector3f(200, 300, 2)); // Adjust card size
-        card.setBackground(new QuadBackgroundComponent(new ColorRGBA(0.1f, 0.1f, 0.1f, 0.9f))); // Dark background for card
-        card.setInsets(new Insets3f(5, 5, 5, 5)); // Add 5-pixel inset
-
-        // Title Section
-        Label title = card.addChild(new Label(field.getName(), new ElementId("label-Bold")));
-        title.setFontSize(30);
-        title.setColor(ColorRGBA.White); // Ensure readability on dark background
-
-        // Property Values Section
-        Container propertyValuesContainer = card.addChild(new Container());
-        propertyValuesContainer.setBackground(new QuadBackgroundComponent(new ColorRGBA(0.4657f, 0.4735f, 0.4892f, 1.0f))); // Grey background
-        propertyValuesContainer.addChild(new Label("Preis: €" + field.getPrice(), new ElementId("label-Text"))).setFontSize(14);
-        propertyValuesContainer.addChild(new Label("", new ElementId("label-Text"))).setFontSize(14); // Leerzeile
-        propertyValuesContainer.addChild(new Label("Wenn man Besitzer der", new ElementId("label-Text"))).setFontSize(14);
-        propertyValuesContainer.addChild(new Label(field.getName() + " ist, so ist", new ElementId("label-Text"))).setFontSize(14);
-        propertyValuesContainer.addChild(new Label("die Miete 40x Würfelwert.", new ElementId("label-Text"))).setFontSize(14);
-        propertyValuesContainer.addChild(new Label("", new ElementId("label-Text"))).setFontSize(14); // Leerzeile
-        propertyValuesContainer.addChild(new Label("Besitzer beider", new ElementId("label-Text"))).setFontSize(14);
-        propertyValuesContainer.addChild(new Label("Restaurants zahlt", new ElementId("label-Text"))).setFontSize(14);
-        propertyValuesContainer.addChild(new Label("100x Würfelwert.", new ElementId("label-Text"))).setFontSize(14);
-        propertyValuesContainer.addChild(new Label("", new ElementId("label-Text"))).setFontSize(14); // Leerzeile
-        propertyValuesContainer.addChild(new Label("Hypothek: €" + field.getHypo(), new ElementId("label-Text"))).setFontSize(14);
-
-        return card;
-    }
-
-    /**
-     * Creates a card for GateField with rent details for owning multiple gates.
-     */
-    private Container createGateFieldCard(GateField field) {
-        Container card = new Container();
-        card.setPreferredSize(new Vector3f(200, 300, 2)); // Adjust card size
-        card.setBackground(new QuadBackgroundComponent(new ColorRGBA(0.8657f, 0.8735f, 0.8892f, 1.0f))); // Light grey background
-        card.setInsets(new Insets3f(5, 5, 5, 5)); // Add 5-pixel inset
-
-        // Title Section
-        Label title = card.addChild(new Label(field.getName(), new ElementId("label-Bold")));
-        title.setFontSize(30);
-        title.setColor(ColorRGBA.Black);
-
-        // Property Values Section
-        Container propertyValuesContainer = card.addChild(new Container());
-        propertyValuesContainer.addChild(new Label("Preis: €" + field.getPrice(), new ElementId("label-Text"))).setFontSize(14);
-        propertyValuesContainer.addChild(new Label("", new ElementId("label-Text"))).setFontSize(14);
-        propertyValuesContainer.addChild(new Label("Miete: 250 EUR", new ElementId("label-Text"))).setFontSize(14);
-        propertyValuesContainer.addChild(new Label("Wenn man", new ElementId("label-Text"))).setFontSize(14);
-        propertyValuesContainer.addChild(new Label("2 Bahnhof besitzt: 500 EUR", new ElementId("label-Text"))).setFontSize(14);
-        propertyValuesContainer.addChild(new Label("Wenn man", new ElementId("label-Text"))).setFontSize(14);
-        propertyValuesContainer.addChild(new Label("3 Bahnhof besitzt: 1000 EUR", new ElementId("label-Text"))).setFontSize(14);
-        propertyValuesContainer.addChild(new Label("Wenn man", new ElementId("label-Text"))).setFontSize(14);
-        propertyValuesContainer.addChild(new Label("4 Bahnhof besitzt: 2000 EUR", new ElementId("label-Text"))).setFontSize(14);
-        propertyValuesContainer.addChild(new Label("", new ElementId("label-Text"))).setFontSize(14);
-        propertyValuesContainer.addChild(new Label("„Hypothek: " + field.getHypo() + " EUR", new ElementId("label-Text"))).setFontSize(14);
-        propertyValuesContainer.setBackground(new QuadBackgroundComponent(new ColorRGBA(0.4657f, 0.4735f, 0.4892f, 1.0f))); // Dark grey background
-
-        return card;
-    }
-
-    /**
-     * Updates the visible cards in the displayContainer based on the slider value.
-     *
-     * @param startIndex The starting index of the visible cards.
-     */
-    private void refreshVisibleCards(int startIndex) {
-        displayContainer.clearChildren(); // Remove all current children
-        int maxVisible = 5; // Number of cards to display at once
-        for (int i = startIndex; i < startIndex + maxVisible && i < cards.size(); i++) {
-            displayContainer.addChild(cards.get(i));
-        }
-    }
-
-
-    /**
-     * Custom listener for slider value changes.
-     */
-    private class SliderValueChangeListener extends AbstractControl {
-        @Override
-        protected void controlUpdate(float tpf) {
-            // Get the slider's current value and refresh visible cards
-            int sliderValue = (int) ((Slider) getSpatial()).getModel().getValue();
-            refreshVisibleCards(sliderValue);
-        }
-
-        @Override
-        protected void controlRender(RenderManager renderManager, ViewPort viewPort) {
-            // No rendering logic needed
-        }
-
-    }
-
-    /**
-     * Closes the dialog and detaches it from the GUI node.
-     */
-    @Override
-    public void close() {
-        app.getGuiNode().detachChild(mainContainer);
-        super.close();
-    }
-}

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

@@ -1,92 +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 pp.monopoly.notification.Sound;
-
-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 musicSlider;
-    private final SoundSlider soundSlider;
+    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;
-        musicSlider = new VolumeSlider(app.getStateManager().getState(GameMusic.class));
-        soundSlider = new SoundSlider(app.getStateManager().getState(GameSound.class));
-        addChild(new Label("Einstellungen", new ElementId("settings-title"))); //NON-NLS
-        addChild(new Label("Sound Effekte", new ElementId("label"))); //NON-NLS
 
-        addChild(soundSlider);
+        // Halbtransparentes Overlay hinzufügen
+        overlayBackground = createOverlayBackground();
+        app.getGuiNode().attachChild(overlayBackground);
 
-        addChild(new Checkbox("Soundeffekte an / aus", new StateCheckboxModel(app, GameSound.class)));
+        // Hauptcontainer für das Menü
+        settingsContainer = new Container();
+        settingsContainer.setBackground(new QuadBackgroundComponent(new ColorRGBA(0.1f, 0.1f, 0.1f, 0.9f)));
 
-        addChild(new Label("Hintergrund Musik", new ElementId("label"))); //NON-NLS
-        addChild(new Checkbox("Musik an / aus", new StateCheckboxModel(app, GameMusic.class)));
+        // Titel
+        Label settingsTitle = settingsContainer.addChild(new Label("Einstellungen", new ElementId("settings-title")));
+        settingsTitle.setFontSize(48);
 
-        addChild(musicSlider);
+        // 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);
 
-        addChild(new Button("Zurück zum Spiel", new ElementId("button"))).addClickCommands(s -> ifTopDialog(() -> {
-            this.close();  // Close the StartMenu dialog
-            app.getGameLogic().playSound(Sound.BUTTON);
-        }));
-        addChild(new Button("Beenden", new ElementId("button"))).addClickCommands(s -> ifTopDialog(() -> {
-            app.getGameLogic().playSound(Sound.BUTTON);
-            app.closeApp();
-        }));
-        update();
+        // 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) {
-        musicSlider.update();
-        soundSlider.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/SoundSlider.java

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

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

@@ -1,322 +1,107 @@
 package pp.monopoly.client.gui;
 
-import java.util.Timer;
-import java.util.TimerTask;
-
-import com.jme3.math.FastMath;
+import com.jme3.material.Material;
+import com.jme3.math.ColorRGBA;
 import com.jme3.math.Vector3f;
-import com.jme3.renderer.RenderManager;
-import com.jme3.renderer.ViewPort;
-import com.jme3.scene.control.AbstractControl;
+import com.jme3.scene.Geometry;
+import com.jme3.scene.shape.Box;
+import com.jme3.texture.Texture;
 
 import pp.monopoly.client.MonopolyApp;
-import pp.monopoly.client.gui.popups.BuyCard;
-import pp.monopoly.client.gui.popups.EventCardPopup;
-import pp.monopoly.client.gui.popups.FoodFieldCard;
-import pp.monopoly.client.gui.popups.GateFieldCard;
-import pp.monopoly.client.gui.popups.LooserPopUp;
-import pp.monopoly.client.gui.popups.TimeOut;
-import pp.monopoly.client.gui.popups.WinnerPopUp;
-import pp.monopoly.game.server.Player;
-import pp.monopoly.game.server.PlayerHandler;
-import pp.monopoly.model.fields.BuildingProperty;
-import pp.monopoly.model.fields.FoodField;
-import pp.monopoly.model.fields.GateField;
-import pp.monopoly.notification.EventCardEvent;
-import pp.monopoly.notification.GameEventListener;
-import pp.monopoly.notification.PopUpEvent;
-import pp.monopoly.notification.UpdatePlayerView;
 
 /**
- * TestWorld zeigt eine einfache Szene mit Spielfeld und Spielfiguren.
+ * TestWorld zeigt eine einfache Szene mit einem texturierten Quadrat.
+ * Die Kamera wird durch den CameraController gesteuert.
  */
-public class TestWorld implements GameEventListener {
+public class TestWorld {
 
     private final MonopolyApp app;
-    private PlayerHandler playerHandler;
-    private CameraController cameraController;
-    private Toolbar toolbar;
+    private CameraController cameraController; // Steuert die Kamera
+    private Geometry cube; // Spielfigur
 
     /**
-     * Konstruktor für die TestWorld.
+     * Konstruktor für TestWorld.
      *
-     * @param app     Die Hauptanwendung
-     * @param players Die Liste der Spieler mit ihren Figuren
+     * @param app Die Hauptanwendung (MonopolyApp)
      */
     public TestWorld(MonopolyApp app) {
         this.app = app;
-        this.playerHandler = app.getGameLogic().getPlayerHandler(); // Hole den PlayerHandler
-        app.getGameLogic().addListener(this);
-        cameraController = new CameraController(app.getCamera(), playerHandler); // Übergebe PlayerHandler
     }
 
     /**
-     * Initialisiert die Szene mit Spielfeld und Figuren.
+     * Initialisiert die Szene und startet die Kamerabewegung.
      */
     public void initializeScene() {
-        // Entferne bestehende Inhalte
-        app.getGuiNode().detachAllChildren();
-        app.getRootNode().detachAllChildren();
+        app.getGuiNode().detachAllChildren(); // Entferne GUI
+        app.getRootNode().detachAllChildren(); // Entferne andere Szenenobjekte
 
-        System.out.println("Szene initialisiert.");
+        setSkyColor(); // Setze den Himmel auf hellblau
+        createBoard(); // Erstelle das Spielfeld
+        createCube();  // Füge den Würfel hinzu
 
-        //Füge Inhalte ein
-        setSkyColor();
-        createBoard();
-        createPlayerFigures();
-        toolbar = new Toolbar(app);
-        toolbar.open();
+        // Erstelle den CameraController
+        cameraController = new CameraController(
+                app.getCamera(),           // Die Kamera der App
+                Vector3f.ZERO,            // Fokus auf die Mitte des Spielfelds
+                5,                        // Radius des Kreises
+                3,                        // Höhe der Kamera
+                0.5f                      // Geschwindigkeit der Bewegung
+        );
+
+        // Füge die Toolbar hinzu
+        new Toolbar(app, cube);
+    }
+
+    /**
+     * Aktualisiert die Kameraposition.
+     *
+     * @param tpf Zeit pro Frame
+     */
+    public void update(float tpf) {
+        if (cameraController != null) {
+            cameraController.update(tpf);
+        }
     }
 
     /**
      * Setzt die Hintergrundfarbe der Szene auf hellblau.
      */
     private void setSkyColor() {
-        app.getViewPort().setBackgroundColor(new com.jme3.math.ColorRGBA(0.5f, 0.7f, 1.0f, 1.0f));
+        app.getViewPort().setBackgroundColor(new ColorRGBA(0.5f, 0.7f, 1.0f, 1.0f)); // Hellblauer Himmel
     }
 
     /**
-     * Erstellt das Spielfeld und fügt es zur Szene hinzu.
+     * Erstelle das Spielfeld.
      */
     private void createBoard() {
-        try {
-            com.jme3.scene.shape.Box box = new com.jme3.scene.shape.Box(10, 0.1f, 10);
-            com.jme3.scene.Geometry geom = new com.jme3.scene.Geometry("Board", box);
+        // Erstelle ein Quadrat
+        Box box = new Box(1, 0.01f, 1);  // Dünnes Quadrat für die Textur
+        Geometry geom = new Geometry("Board", box);
 
-            com.jme3.material.Material mat = new com.jme3.material.Material(app.getAssetManager(), "Common/MatDefs/Misc/Unshaded.j3md");
-            com.jme3.texture.Texture texture = app.getAssetManager().loadTexture("Pictures/board2.png");
-            mat.setTexture("ColorMap", texture);
-            geom.setMaterial(mat);
+        // Setze das Material mit Textur
+        Material mat = new Material(app.getAssetManager(), "Common/MatDefs/Misc/Unshaded.j3md");
+        Texture texture = app.getAssetManager().loadTexture("Pictures/board.png");
+        mat.setTexture("ColorMap", texture);
+        geom.setMaterial(mat);
 
-            geom.setLocalTranslation(0, -0.1f, 0);
-
-            com.jme3.math.Quaternion rotation = new com.jme3.math.Quaternion();
-            rotation.fromAngleAxis(com.jme3.math.FastMath.HALF_PI, com.jme3.math.Vector3f.UNIT_Y);
-            geom.setLocalRotation(rotation);
-
-            app.getRootNode().attachChild(geom);
-
-            System.out.println("Spielbrett erfolgreich erstellt, gedreht und hinzugefügt.");
-        } catch (Exception e) {
-            System.err.println("Fehler beim Erstellen des Spielfelds: " + e.getMessage());
-        }
+        app.getRootNode().attachChild(geom);
     }
 
     /**
-     * Erstellt die Spielfiguren basierend auf der bereits bekannten Spielerliste.
+     * Erstellt den Würfel (Spielfigur) in der Szene.
      */
-    private void createPlayerFigures() {
-        for (int i = 0; i < playerHandler.getPlayers().size(); i++) {
-            Player player = playerHandler.getPlayers().get(i);
-            try {
-                com.jme3.scene.Spatial model = app.getAssetManager().loadModel(
-                    "Models/" + player.getFigure().getType() + "/" + player.getFigure().getType() + ".j3o"
-                );
-                model.setLocalScale(0.5f);
+    private void createCube() {
+        Box box = new Box(0.05f, 0.05f, 0.05f); // Kleinere Größe für Spielfigur
+        cube = new Geometry("Cube", box);
 
-                Vector3f startPosition = calculateFieldPosition(player.getFieldID(), i);
-                model.setLocalTranslation(startPosition);
+        // Setze das Material für den Würfel
+        Material mat = new Material(app.getAssetManager(), "Common/MatDefs/Misc/Unshaded.j3md");
+        mat.setColor("Color", ColorRGBA.Blue); // Blau gefärbter Würfel
+        cube.setMaterial(mat);
 
-                model.setName("PlayerFigure_" + player.getId());
-                app.getRootNode().attachChild(model);
+        // Setze den Startpunkt des Würfels
+        cube.setLocalTranslation(0.8999999f, 0.1f, -0.9f);
 
-                System.out.println("Figur für Spieler " + player.getId() + " erstellt bei " + startPosition);
-            } catch (Exception e) {
-                System.err.println("Fehler beim Laden des Modells für Spieler " + player.getId() + ": " + e.getMessage());
-            }
-        }
-    }
-
-    private Vector3f calculateFieldPosition(int fieldID, int playerIndex) {
-        float offset = 0.1f;
-        float baseX = 0.0f;
-        float baseZ = 0.0f;
-
-        switch (fieldID) {
-            case 0: baseX = -9.1f; baseZ = -9.1f; break;
-            case 1: baseX = -6.5f; baseZ = -9.1f; break;
-            case 2: baseX = -4.9f; baseZ = -9.1f; break;
-            case 3: baseX = -3.3f; baseZ = -9.1f; break;
-            case 4: baseX = -1.6f; baseZ = -9.1f; break;
-            case 5: baseX =  0.0f; baseZ = -9.1f; break;
-            case 6: baseX =  1.6f; baseZ = -9.1f; break;
-            case 7: baseX =  3.3f; baseZ = -9.1f; break;
-            case 8: baseX =  4.9f; baseZ = -9.1f; break;
-            case 9: baseX =  6.5f; baseZ = -9.1f; break;
-            case 10: baseX = 9.1f; baseZ = -9.1f; break; 
-            case 11: baseX = 9.1f; baseZ = -6.5f; break;
-            case 12: baseX = 9.1f; baseZ = -4.9f; break;
-            case 13: baseX = 9.1f; baseZ = -3.3f; break;
-            case 14: baseX = 9.1f; baseZ = -1.6f; break;
-            case 15: baseX = 9.1f; baseZ =  0.0f; break;
-            case 16: baseX = 9.1f; baseZ =  1.6f; break;
-            case 17: baseX = 9.1f; baseZ =  3.3f; break;
-            case 18: baseX = 9.1f; baseZ =  4.9f; break;
-            case 19: baseX = 9.1f; baseZ =  6.5f; break;
-            case 20: baseX = 9.1f; baseZ =  9.1f; break;
-            case 21: baseX = 6.5f; baseZ =  9.1f; break;
-            case 22: baseX = 4.9f; baseZ =  9.1f; break;
-            case 23: baseX = 3.3f; baseZ =  9.1f; break;
-            case 24: baseX = 1.6f; baseZ =  9.1f; break;
-            case 25: baseX = 0.0f; baseZ =  9.1f; break;
-            case 26: baseX = -1.6f; baseZ = 9.1f; break;
-            case 27: baseX = -3.3f; baseZ = 9.1f; break;
-            case 28: baseX = -4.9f; baseZ = 9.1f; break;
-            case 29: baseX = -6.5f; baseZ = 9.1f; break;
-            case 30: baseX = -9.1f; baseZ = 9.1f; break;
-            case 31: baseX = -9.1f; baseZ = 6.5f; break;
-            case 32: baseX = -9.1f; baseZ = 4.9f; break;
-            case 33: baseX = -9.1f; baseZ = 3.3f; break;
-            case 34: baseX = -9.1f; baseZ = 1.6f; break;
-            case 35: baseX = -9.1f; baseZ = 0.0f; break;
-            case 36: baseX = -9.1f; baseZ = -1.6f; break;
-            case 37: baseX = -9.1f; baseZ = -3.3f; break;
-            case 38: baseX = -9.1f; baseZ = -4.9f; break;
-            case 39: baseX = -9.1f; baseZ = -6.5f; break;
-            default: throw new IllegalArgumentException("Ungültige Feld-ID: " + fieldID);
-        }
-
-        float xOffset = (playerIndex % 2) * offset;
-        float zOffset = (playerIndex / 2) * offset;
-
-        return new Vector3f(baseX + xOffset, 0, baseZ + zOffset);
-    }
-
-    private void movePlayerFigure(Player player) {
-        int fieldID = player.getFieldID();
-        int playerIndex = playerHandler.getPlayers().indexOf(player); // Spielerindex holen
-        Vector3f targetPosition = calculateFieldPosition(fieldID, playerIndex);
-    
-        String figureName = "PlayerFigure_" + player.getId();
-        com.jme3.scene.Spatial figure = app.getRootNode().getChild(figureName);
-    
-        if (figure != null) {
-            Vector3f startPosition = figure.getLocalTranslation();
-            Vector3f cornerPosition = calculateCornerPosition(startPosition, targetPosition); // Berechne Eckpunkt
-            float animationDuration = 3.0f; // Gesamtdauer der Animation
-            float[] elapsedTime = {0.0f};   // Verstrichene Zeit
-    
-            Timer timer = new Timer();
-            timer.schedule(new TimerTask() {
-                @Override
-                public void run() {
-                    app.enqueue(() -> {
-                        app.getRootNode().addControl(new AbstractControl() {
-                            @Override
-                            protected void controlUpdate(float tpf) {
-                                elapsedTime[0] += tpf;
-                                float progress = Math.min(elapsedTime[0] / animationDuration, 1.0f);
-    
-                                Vector3f interpolatedPosition;
-                                if (progress < 0.5f) {
-                                    // Erste Hälfte der Animation: Bewegung zur Ecke
-                                    float localProgress = progress / 0.5f; // Normiere auf [0, 1]
-                                    interpolatedPosition = new Vector3f(
-                                        FastMath.interpolateLinear(localProgress, startPosition.x, cornerPosition.x),
-                                        FastMath.interpolateLinear(localProgress, startPosition.y, cornerPosition.y),
-                                        FastMath.interpolateLinear(localProgress, startPosition.z, cornerPosition.z)
-                                    );
-                                } else {
-                                    // Zweite Hälfte der Animation: Bewegung vom Eckpunkt zum Ziel
-                                    float localProgress = (progress - 0.5f) / 0.5f; // Normiere auf [0, 1]
-                                    interpolatedPosition = new Vector3f(
-                                        FastMath.interpolateLinear(localProgress, cornerPosition.x, targetPosition.x),
-                                        FastMath.interpolateLinear(localProgress, cornerPosition.y, targetPosition.y),
-                                        FastMath.interpolateLinear(localProgress, cornerPosition.z, targetPosition.z)
-                                    );
-                                }
-    
-                                figure.setLocalTranslation(interpolatedPosition);
-    
-                                // Animation beenden, wenn sie fertig ist
-                                if (progress >= 1.0f) {
-                                    this.setEnabled(false);
-                                    app.getRootNode().removeControl(this);
-                                    System.out.println("Spieler " + player.getId() + " hat das Ziel erreicht: " + targetPosition);
-                                }
-                            }
-    
-                            @Override
-                            protected void controlRender(RenderManager rm, ViewPort vp) {
-                                // Keine spezielle Renderlogik notwendig
-                            }
-                        });
-                    });
-                }
-            }, (long) 2000); // Verzögerung in Millisekunden
-        } else {
-            System.err.println("Figur für Spieler " + player.getId() + " nicht gefunden.");
-        }
-    }
-    
-    /**
-     * Berechnet den Eckpunkt basierend auf Start- und Zielposition.
-     *
-     * @param startPosition Die Startposition der Figur.
-     * @param targetPosition Die Zielposition der Figur.
-     * @return Die Position der Ecke, die passiert werden muss.
-     */
-    private Vector3f calculateCornerPosition(Vector3f startPosition, Vector3f targetPosition) {
-        if (Math.abs(startPosition.x - targetPosition.x) > Math.abs(startPosition.z - targetPosition.z)) {
-            // Bewegung entlang der X-Achse zuerst, dann Z-Achse
-            return new Vector3f(targetPosition.x, 0, startPosition.z);
-        } else {
-            // Bewegung entlang der Z-Achse zuerst, dann X-Achse
-            return new Vector3f(startPosition.x, 0, targetPosition.z);
-        }
-    }
-
-    @Override
-    public void receivedEvent(PopUpEvent event) {
-        if (event.msg().equals("Buy")) {
-            // Erstelle einen Timer, um den Delay umzusetzen
-            Timer timer = new Timer();
-            timer.schedule(new TimerTask() {
-                @Override
-                public void run() {
-                    // GUI-Operationen im jMonkey-Thread ausführen
-                    app.enqueue(() -> {
-                        int field = app.getGameLogic().getPlayerHandler().getPlayerById(app.getId()).getFieldID();
-                        Object fieldObject = app.getGameLogic().getBoardManager().getFieldAtIndex(field);
-                    
-                        if (fieldObject instanceof BuildingProperty) {
-                            new BuyCard(app).open();
-                        } else if (fieldObject instanceof GateField) {
-                            new GateFieldCard(app).open();
-                        } else if (fieldObject instanceof FoodField) {
-                            new FoodFieldCard(app).open();
-                        }
-                    });
-                }
-            }, 5000); // Verzögerung in Millisekunden
-        } else if (event.msg().equals("Winner")) {
-            new WinnerPopUp(app).open();
-        } else if (event.msg().equals("Looser")) {
-            new LooserPopUp(app).open();
-        } else if (event.msg().equals("timeout")) {
-            new TimeOut(app).open();
-        }
-    }
-
-    @Override
-    public void receivedEvent(EventCardEvent event) {
-        Timer timer = new Timer();
-        timer.schedule(new TimerTask() {
-            @Override
-            public void run() {
-                app.enqueue(() -> new EventCardPopup(app, event.description()).open());
-            }
-        }, 5000); // 5 Sekunden Verzögerung für Event-Popups
-    }
-
-    
-    @Override
-    public void receivedEvent(UpdatePlayerView event) {
-        this.playerHandler = app.getGameLogic().getPlayerHandler();
-
-        // Aktualisiere die Position aller Spielerfiguren
-        for (Player player : playerHandler.getPlayers()) {
-            movePlayerFigure(player);
-        }
+        app.getRootNode().attachChild(cube);
     }
 }

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

@@ -1,329 +1,168 @@
 package pp.monopoly.client.gui;
 
-import com.jme3.math.ColorRGBA;
-import com.jme3.math.Vector2f;
+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.Label;
-import com.simsilica.lemur.component.IconComponent;
-import com.simsilica.lemur.component.QuadBackgroundComponent;
 import com.simsilica.lemur.component.SpringGridLayout;
-import com.simsilica.lemur.style.ElementId;
 
-import pp.dialog.Dialog;
 import pp.monopoly.client.MonopolyApp;
-import pp.monopoly.game.server.Player;
-import pp.monopoly.game.server.PlayerHandler;
-import pp.monopoly.message.client.EndTurn;
-import pp.monopoly.message.client.RollDice;
-import pp.monopoly.notification.ButtonStatusEvent;
-import pp.monopoly.notification.DiceRollEvent;
-import pp.monopoly.notification.GameEventListener;
-import pp.monopoly.notification.Sound;
-import pp.monopoly.notification.UpdatePlayerView;
 
-public class Toolbar extends Dialog implements GameEventListener {
+/**
+ * Toolbar Klasse, die am unteren Rand der Szene angezeigt wird.
+ * Die Buttons bewegen den Würfel auf dem Spielfeld.
+ */
+public class Toolbar {
 
     private final MonopolyApp app;
     private final Container toolbarContainer;
-    private Container overviewContainer;
-    private Container accountContainer;
-    private PlayerHandler playerHandler;
-    private Label imageLabel;
-    private Label imageLabel2;
-    private Button diceButton;
-    private Button tradeButton;
-    private Button propertyMenuButton;
-    private Button endTurnButton;
+    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
 
-    private volatile boolean animatingDice = false;
-    private volatile DiceRollEvent latestDiceRollEvent = null;
-
-    public Toolbar(MonopolyApp app) {
-        super(app.getDialogManager());
+    /**
+     * Konstruktor für die Toolbar.
+     *
+     * @param app  Die Hauptanwendung (MonopolyApp)
+     * @param cube Der Würfel, der bewegt werden soll
+     */
+    public Toolbar(MonopolyApp app, Geometry cube) {
         this.app = app;
+        this.cube = cube;
 
-        app.getGameLogic().addListener(this);
-        this.playerHandler = app.getGameLogic().getPlayerHandler();
+        // Erstelle die Toolbar
+        toolbarContainer = new Container(new SpringGridLayout(Axis.X, Axis.Y));
 
-        toolbarContainer = createToolbarContainer();
+        // 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
     }
 
-    private Container createToolbarContainer() {
-        // Erstelle den Hauptcontainer
-        Container container = new Container(new SpringGridLayout(Axis.X, Axis.Y), "toolbar");
-        container.setLocalTranslation(0, 200, 0);
-        container.setPreferredSize(new Vector3f(app.getCamera().getWidth(), 200, 0));
-    
-        // Spielerfarbe abrufen
-        Player currentPlayer = playerHandler.getPlayerById(app.getId());
-        ColorRGBA playerColor = currentPlayer.getColor().getColor();
-    
-        // Oberer Balken
-        Container playerColorBar = new Container();
-        playerColorBar.setPreferredSize(new Vector3f(app.getCamera().getWidth(), 15, 0)); // Höhe des oberen Balkens
-        playerColorBar.setBackground(new QuadBackgroundComponent(playerColor));
-        playerColorBar.setLocalTranslation(0, 210, 3); // Position über der Toolbar
-        app.getGuiNode().attachChild(playerColorBar);
-
-        // unterer Balken
-        Container playerColorBarbot = new Container();
-        playerColorBarbot.setPreferredSize(new Vector3f(app.getCamera().getWidth(), 10, 0)); // Höhe des oberen Balkens
-        playerColorBarbot.setBackground(new QuadBackgroundComponent(playerColor));
-        playerColorBarbot.setLocalTranslation(0, 10, 3); // Position über der Toolbar
-        app.getGuiNode().attachChild(playerColorBarbot);
-    
-    
-        // Linker Balken
-        Container leftBar = new Container();
-        leftBar.setPreferredSize(new Vector3f(10, 210, 0)); // Breite 10, Höhe 210
-        leftBar.setBackground(new QuadBackgroundComponent(playerColor));
-        leftBar.setLocalTranslation(0, 200, 3); // Position am linken Rand
-        app.getGuiNode().attachChild(leftBar);
-    
-        // Rechter Balken
-        Container rightBar = new Container();
-        rightBar.setPreferredSize(new Vector3f(10, 210, 0)); // Breite 10, Höhe 210
-        rightBar.setBackground(new QuadBackgroundComponent(playerColor));
-        rightBar.setLocalTranslation(app.getCamera().getWidth() - 10, 200, 2); // Position am rechten Rand
-        app.getGuiNode().attachChild(rightBar);
-        
-        // Übersicht und Konto
-        accountContainer = container.addChild(new Container());
-        overviewContainer = container.addChild(new Container());
-        receivedEvent(new UpdatePlayerView()); // Initiale Aktualisierung
-    
-        // Würfel-Bereich
-        container.addChild(createDiceSection());
-    
-        // Aktionsmenü
-        Container menuContainer = container.addChild(new Container());
-        menuContainer.addChild(createTradeButton());
-        menuContainer.addChild(createPropertyMenuButton());
-        menuContainer.addChild(createEndTurnButton());
-        menuContainer.setBackground(createBackground());
-    
-        return container;
+    /**
+     * 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
     }
 
-
-    private Container createDiceSection() {
-        Container diceContainer = new Container(new SpringGridLayout(Axis.X, Axis.Y));
-        diceContainer.addChild(createDiceDisplay());
-        diceContainer.setBackground(null);
-
-        diceButton = new Button("Würfeln", new ElementId("button-toolbar"));
-        diceButton.setPreferredSize(new Vector3f(200, 50, 0));
-        diceButton.addClickCommands(s -> ifTopDialog(() -> {
-            diceButton.setEnabled(false);
-            startDiceAnimation();
-            app.getGameLogic().send(new RollDice());
-            app.getGameLogic().playSound(Sound.BUTTON);
-        }));
-        diceContainer.addChild(diceButton);
-
-        return diceContainer;
+    /**
+     * 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);
     }
 
-    private Container createDiceDisplay() {
-        Container horizontalContainer = new Container(new SpringGridLayout(Axis.X, Axis.Y));
-        horizontalContainer.setPreferredSize(new Vector3f(200, 150, 0));
-        horizontalContainer.setBackground(null);
-
-        imageLabel = createDiceLabel("Pictures/dice/one.png");
-        imageLabel2 = createDiceLabel("Pictures/dice/two.png");
-
-        horizontalContainer.addChild(createDiceContainer(imageLabel));
-        horizontalContainer.addChild(createDiceContainer(imageLabel2));
-
-        return horizontalContainer;
+    /**
+     * 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);
     }
 
-    private Label createDiceLabel(String iconPath) {
-        Label label = new Label("");
-        IconComponent icon = new IconComponent(iconPath);
-        icon.setIconSize(new Vector2f(100, 100));
-        label.setIcon(icon);
-        return label;
+    /**
+     * 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
     }
 
-    private Container createDiceContainer(Label label) {
-        Container container = new Container();
-        container.setBackground(null);
-        container.setPreferredSize(new Vector3f(100, 150, 0));
-        container.addChild(label);
-        return container;
+    /**
+     * 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 + ")");
     }
 
-    private Button createTradeButton() {
-        tradeButton = new Button("Handeln", new ElementId("button-toolbar"));
-        tradeButton.setPreferredSize(new Vector3f(150, 50, 0));
-        tradeButton.addClickCommands(s -> ifTopDialog(() -> {
-            app.getGameLogic().playSound(Sound.BUTTON);
-            new ChoosePartner(app).open();
-        }));
-        return tradeButton;
-    }
+    /**
+     * 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
 
-    private Button createPropertyMenuButton() {
-        propertyMenuButton = new Button("Grundstücke", new ElementId("button-toolbar"));
-        propertyMenuButton.setPreferredSize(new Vector3f(150, 50, 0));
-        propertyMenuButton.setFontSize(30);
-        propertyMenuButton.addClickCommands(s -> ifTopDialog(() -> {
-            app.getGameLogic().playSound(Sound.BUTTON);
-            new PropertyOverviewMenu(app).open();
-        }));
-        return propertyMenuButton;
-    }
-
-    private Button createEndTurnButton() {
-        endTurnButton = new Button("Zug beenden", new ElementId("button-toolbar"));
-        endTurnButton.setFontSize(28);
-        endTurnButton.setPreferredSize(new Vector3f(150, 50, 0));
-        endTurnButton.addClickCommands(s -> ifTopDialog(() -> {
-            app.getGameLogic().playSound(Sound.BUTTON);
-            app.getGameLogic().send(new EndTurn());
-            receivedEvent(new ButtonStatusEvent(false));
-        }));
-        return endTurnButton;
-    }
-
-    private QuadBackgroundComponent createBackground() {
-        return new QuadBackgroundComponent(new ColorRGBA(0.4657f, 0.4735f, 0.4892f, 1.0f));
-    }
-
-    private void startDiceAnimation() {
-        animatingDice = true;
-        long startTime = System.currentTimeMillis();
-    
-        new Thread(() -> {
-            try {
-                animateDice(startTime);
-                animatingDice = false;
-                if (latestDiceRollEvent != null) {
-                    showFinalDiceResult(latestDiceRollEvent);
-                }
-            } catch (InterruptedException e) {
-                System.err.println("Dice animation interrupted: " + e.getMessage());
-            }
-        }).start();
-    }
-    
-    private void animateDice(long startTime) throws InterruptedException {
-        int[] currentFace = {1};
-        while (System.currentTimeMillis() - startTime < 2000) { // Animation duration
-            currentFace[0] = (currentFace[0] % 6) + 1;
-    
-            String rotatingImage1 = diceToString(currentFace[0]);
-            String rotatingImage2 = diceToString((currentFace[0] % 6) + 1);
-    
-            app.enqueue(() -> {
-                setDiceIcon(imageLabel, rotatingImage1);
-                setDiceIcon(imageLabel2, rotatingImage2);
-            });
-    
-            Thread.sleep(100); // Time between frame updates
+        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);
         }
     }
 
-    private void showFinalDiceResult(DiceRollEvent event) {
-        app.enqueue(() -> {
-            setDiceIcon(imageLabel, diceToString(event.a()));
-            setDiceIcon(imageLabel2, diceToString(event.b()));
-        });
+    /**
+     * 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;
     }
 
-    private void setDiceIcon(Label label, String imagePath) {
-        IconComponent icon = new IconComponent(imagePath);
-        icon.setIconSize(new Vector2f(80, 80)); // Set consistent dice size
-        label.setIcon(icon);
+    /**
+     * Aktualisiert die Anzeige für die aktuelle Position.
+     */
+    private void updatePositionDisplay() {
+        positionText.setText("Feld-ID: " + currentPosition);
     }
 
-
-    private String diceToString(int i) {
-        switch (i) {
-            case 1: return "Pictures/dice/one.png";
-            case 2: return "Pictures/dice/two.png";
-            case 3: return "Pictures/dice/three.png";
-            case 4: return "Pictures/dice/four.png";
-            case 5: return "Pictures/dice/five.png";
-            case 6: return "Pictures/dice/six.png";
-            default: throw new IllegalArgumentException("Invalid dice number: " + i);
-        }
-    }
-
-    @Override
-    public void receivedEvent(DiceRollEvent event) {
-        latestDiceRollEvent = event;
-    }
-
-    @Override
-    public void receivedEvent(UpdatePlayerView event) {
-        playerHandler = app.getGameLogic().getPlayerHandler();
-        System.out.println("Update Player View");
-        accountContainer.clearChildren();
-        overviewContainer.clearChildren();
-
-        accountContainer.addChild(new Label("Kontostand", new ElementId("label-toolbar")));
-        accountContainer.addChild(new Label(
-                playerHandler.getPlayerById(app.getId()).getAccountBalance() + " EUR",
-                new ElementId("label-account")
-        ));
-        accountContainer.addChild(new Label("Gulag Karten", new ElementId("label-toolbar")));
-        accountContainer.addChild(new Label(
-                playerHandler.getPlayerById(app.getId()).getNumJailCard() + "",
-                new ElementId("label-account")
-        ));
-        accountContainer.setBackground(null);
-
-        overviewContainer.addChild(new Label("Übersicht", new ElementId("label-toolbar")));
-        for (Player player : playerHandler.getPlayers()) {
-            if (player.getId() != app.getId()) {
-                // Spielerfarbe abrufen
-                ColorRGBA playerColor = (player.getColor().getColor());
-            
-                // Label für den Spieler erstellen
-                Label playerLabel = new Label(
-                    player.getName() + ": " + player.getAccountBalance() + " EUR",
-                    new ElementId("label-Text")
-                );
-            
-                // Farbe setzen
-                playerLabel.setColor(playerColor);
-            
-                // Label zum Container hinzufügen
-                overviewContainer.addChild(playerLabel);
-            }
-        }
-        overviewContainer.setBackground(null);
-    }
-
-    @Override
-    public void receivedEvent(ButtonStatusEvent event) {
-        boolean enabled = event.buttonsEnabled();
-        diceButton.setEnabled(enabled);
-        tradeButton.setEnabled(enabled);
-        propertyMenuButton.setEnabled(enabled);
-        endTurnButton.setEnabled(enabled);
-    }
-
-    @Override
-    public void close() {
+    /**
+     * Entfernt die Toolbar.
+     */
+    public void remove() {
         app.getGuiNode().detachChild(toolbarContainer);
-        super.close();
-    }
-
-    @Override
-    public void escape() {
-        new SettingsMenu(app).open();
-    }
-
-    @Override
-    public void update() {
-        receivedEvent(new UpdatePlayerView());
-        super.update();
+        app.getGuiNode().detachChild(positionText);
     }
 }

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/TradeMenu.java

@@ -1,314 +0,0 @@
-package pp.monopoly.client.gui;
-
-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.texture.Texture;
-import com.simsilica.lemur.*;
-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 com.simsilica.lemur.text.DocumentModel;
-
-import pp.dialog.Dialog;
-import pp.monopoly.client.MonopolyApp;
-import pp.monopoly.message.client.TradeOffer;
-import pp.monopoly.model.TradeHandler;
-import pp.monopoly.model.fields.PropertyField;
-import pp.monopoly.notification.Sound;
-
-import java.util.HashSet;
-import java.util.Set;
-
-public class TradeMenu extends Dialog {
-    private final MonopolyApp app;
-    private final TradeHandler tradeHandler;
-
-    private final Container mainContainer;
-    private Geometry background;
-    private Selector<String> leftBuildingSelector, leftSpecialCardSelector;
-    private Selector<String> rightBuildingSelector, rightSpecialCardSelector;
-    private TextField leftSelectionsField, rightSelectionsField;
-    private TextField leftCurrencyInput, rightCurrencyInput;
-
-    private VersionedReference<Set<Integer>> leftBuildingRef, rightBuildingRef;
-    private VersionedReference<DocumentModel> leftCurrencyRef, rightCurrencyRef;
-    private VersionedReference<Set<Integer>> leftCardRef, rightCardRef;
-
-    private Set<String> rightselBuildings = new HashSet<>();
-    private Set<String> leftselBuildings = new HashSet<>();
-
-    private static final ColorRGBA TRANSLUCENT_WHITE = new ColorRGBA(1, 1, 1, 0.5f);
-
-    public TradeMenu(MonopolyApp app, TradeHandler tradeHandler) {
-        super(app.getDialogManager());
-        this.app = app;
-        this.tradeHandler = tradeHandler;
-
-        addBackgroundImage();
-
-        mainContainer = createMainContainer();
-        app.getGuiNode().attachChild(mainContainer);
-        positionMainContainer();
-
-        initializeReferences();
-    }
-
-    private Container createMainContainer() {
-        Container container = new Container(new SpringGridLayout(Axis.Y, Axis.X));
-        container.setPreferredSize(new Vector3f(1200, 800, 0));
-        container.setBackground(new QuadBackgroundComponent(TRANSLUCENT_WHITE));
-
-        container.addChild(createHeader());
-        container.addChild(createMainContent());
-        return container;
-    }
-
-    private Label createHeader() {
-        Label header = new Label("Handelsmenü", new ElementId("label-Bold"));
-        header.setFontSize(50);
-        header.setInsets(new Insets3f(10, 10, 10, 10));
-        header.setBackground(new QuadBackgroundComponent(TRANSLUCENT_WHITE));
-        return header;
-    }
-
-    private Container createMainContent() {
-        Container mainContent = new Container(new SpringGridLayout(Axis.X, Axis.Y));
-        mainContent.setPreferredSize(new Vector3f(1200, 700, 0));
-
-        mainContent.addChild(createTradeColumn("Wähle Handelsobjekt:", true));
-        mainContent.addChild(createMiddleSection());
-        mainContent.addChild(createTradeColumn("Wähle Zielobjekt:", false));
-
-        Container buttons = mainContent.addChild(new Container(new SpringGridLayout()));
-        Button cancel = new Button("Abbrechen");
-        cancel.addClickCommands(s -> ifTopDialog(() -> {
-            close();
-            app.getGameLogic().playSound(Sound.BUTTON);
-        }));
-
-        Button trade = new Button("Handeln");
-        trade.addClickCommands(s -> ifTopDialog(() -> {
-            app.getGameLogic().playSound(Sound.BUTTON);
-            setTrades();
-            app.getGameLogic().send(new TradeOffer(tradeHandler));
-            close();
-        }));
-
-        buttons.addChild(cancel);
-        buttons.addChild(trade);
-
-        return mainContent;
-    }
-
-    private void setTrades() {
-        tradeHandler.setOfferedAmount(Integer.parseInt(leftCurrencyInput.getText()));
-        tradeHandler.setRequestedAmount(Integer.parseInt(rightCurrencyInput.getText()));
-        tradeHandler.setOfferedJailCards(Integer.parseInt(leftSpecialCardSelector.getSelectedItem()));
-        tradeHandler.setRequestedJailCards(Integer.parseInt(rightSpecialCardSelector.getSelectedItem()));
-
-        Set<PropertyField> offeredProperties = new HashSet<>();
-        for (String propertyString : leftselBuildings) {
-            offeredProperties.add( (PropertyField) app.getGameLogic().getBoardManager().getFieldByName(propertyString));
-        }
-        
-        Set<PropertyField> requestedProperties = new HashSet<>();
-        for (String propertyString : rightselBuildings) {
-            requestedProperties.add( (PropertyField) app.getGameLogic().getBoardManager().getFieldByName(propertyString));
-        }
-
-        tradeHandler.setOfferedProperties(offeredProperties);
-        tradeHandler.setRequestedProperties(requestedProperties);
-    }
-
-    private Container createTradeColumn(String label, boolean isLeft) {
-        Container column = new Container(new SpringGridLayout(Axis.Y, Axis.X));
-        column.setBackground(new QuadBackgroundComponent(ColorRGBA.White));
-
-        Label columnLabel = column.addChild(new Label(label));
-        columnLabel.setFontSize(24);
-        columnLabel.setBackground(new QuadBackgroundComponent(TRANSLUCENT_WHITE));
-
-        column.addChild(new Label("Gebäude:"));
-        Selector<String> buildingSelector = createPropertySelector(isLeft);
-        column.addChild(buildingSelector);
-
-        column.addChild(new Label("Währung:"));
-        TextField currencyInput = createCurrencyInput();
-        column.addChild(currencyInput);
-
-        column.addChild(new Label("Sonderkarten:"));
-        Selector<String> specialCardSelector = createSpecialCardSelector(isLeft);
-        styleSelector(specialCardSelector);
-        column.addChild(specialCardSelector);
-
-        assignSelectors(buildingSelector, specialCardSelector, currencyInput, isLeft);
-        return column;
-    }
-
-    private Selector<String> createPropertySelector(boolean isLeft) {
-        VersionedList<String> properties = new VersionedList<>();
-        for (PropertyField field : getPropertyFields(isLeft)) {
-            properties.add(field.getName());
-        }
-        Selector<String> selector = new Selector<>(properties, "glass");
-        styleSelector(selector);
-        return selector;
-    }
-
-    private Selector<String> createSpecialCardSelector(boolean isLeft) {
-        VersionedList<String> numbers = new VersionedList<>();
-        for (int i = 0; i <= app.getGameLogic().getPlayerHandler().getPlayerById(isLeft ? tradeHandler.getReceiver().getId() : tradeHandler.getSender().getId()).getNumJailCard(); i++) {
-            numbers.add(i + "");
-        }
-        Selector<String> selector = new Selector<>(numbers, "glass");
-        styleSelector(selector);
-        return selector;
-    }
-
-    private Iterable<PropertyField> getPropertyFields(boolean isLeft) {
-        return app.getGameLogic()
-                .getBoardManager()
-                .getPropertyFields(app.getGameLogic()
-                        .getPlayerHandler()
-                        .getPlayerById(isLeft ? tradeHandler.getReceiver().getId() : tradeHandler.getSender().getId())
-                        .getProperties());
-    }
-
-    private TextField createCurrencyInput() {
-        TextField currencyInput = new TextField("0");
-        styleTextField(currencyInput);
-        return currencyInput;
-    }
-
-    private Container createMiddleSection() {
-        Container middleSection = new Container(new SpringGridLayout(Axis.Y, Axis.X));
-        middleSection.setBackground(new QuadBackgroundComponent(new ColorRGBA(0.8f, 0.8f, 0.8f, 1.0f)));
-
-        Label middleLabelTop = middleSection.addChild(new Label("Gebäude:        Währung:        Sonderkarten:"));
-        middleLabelTop.setFontSize(24);
-        middleLabelTop.setInsets(new Insets3f(5, 5, 5, 5));
-
-        leftSelectionsField = middleSection.addChild(new TextField(""));
-        leftSelectionsField.setPreferredSize(new Vector3f(600, 50, 0));
-
-        Label arrows = middleSection.addChild(new Label("⇅"));
-        arrows.setFontSize(40);
-
-        rightSelectionsField = middleSection.addChild(new TextField(""));
-        rightSelectionsField.setPreferredSize(new Vector3f(600, 50, 0));
-
-        Label middleLabelBottom = middleSection.addChild(new Label("Gebäude:        Währung:        Sonderkarten:"));
-        middleLabelBottom.setFontSize(24);
-        middleLabelBottom.setInsets(new Insets3f(5, 5, 5, 5));
-
-        return middleSection;
-    }
-
-    private void styleSelector(Selector<String> selector) {
-        selector.setInsets(new Insets3f(5, 10, 5, 10));
-        selector.setBackground(new QuadBackgroundComponent(ColorRGBA.Black));
-    }
-
-    private void styleTextField(TextField textField) {
-        textField.setInsets(new Insets3f(5, 10, 5, 10));
-        textField.setBackground(new QuadBackgroundComponent(ColorRGBA.Black));
-    }
-
-    private void assignSelectors(Selector<String> buildingSelector, Selector<String> specialCardSelector, TextField currencyInput, boolean isLeft) {
-        if (isLeft) {
-            leftBuildingSelector = buildingSelector;
-            leftSpecialCardSelector = specialCardSelector;
-            leftCurrencyInput = currencyInput;
-        } else {
-            rightBuildingSelector = buildingSelector;
-            rightSpecialCardSelector = specialCardSelector;
-            rightCurrencyInput = currencyInput;
-        }
-    }
-
-    private void positionMainContainer() {
-        mainContainer.setLocalTranslation(
-                (app.getCamera().getWidth() - mainContainer.getPreferredSize().x) / 2,
-                (app.getCamera().getHeight() + mainContainer.getPreferredSize().y) / 2,
-                7
-        );
-    }
-
-    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, 6);
-        app.getGuiNode().attachChild(background);
-    }
-
-    private void initializeReferences() {
-        leftBuildingRef = leftBuildingSelector.getSelectionModel().createReference();
-        leftCardRef = leftSpecialCardSelector.getSelectionModel().createReference();
-        leftCurrencyRef = leftCurrencyInput.getDocumentModel().createReference();
-
-        rightBuildingRef = rightBuildingSelector.getSelectionModel().createReference();
-        rightCardRef = rightSpecialCardSelector.getSelectionModel().createReference();
-        rightCurrencyRef = rightCurrencyInput.getDocumentModel().createReference();
-    }
-
-    @Override
-    public void update(float delta) {
-        if (leftBuildingRef.update() || leftCardRef.update() || leftCurrencyRef.update()) {
-            updateSelections(leftSelectionsField, leftBuildingSelector, leftCurrencyInput, leftSpecialCardSelector, true);
-        }
-
-        if (rightBuildingRef.update() || rightCardRef.update() || rightCurrencyRef.update()) {
-            updateSelections(rightSelectionsField, rightBuildingSelector, rightCurrencyInput, rightSpecialCardSelector, false);
-        }
-    }
-
-    private void updateSelections(TextField target, Selector<String> building, TextField currency, Selector<String> card, boolean isLeft) {
-        StringBuilder buildingText = new StringBuilder();
-        if (isLeft) {
-            if (leftselBuildings.contains(building.getSelectedItem())) {
-                leftselBuildings.remove(building.getSelectedItem()); // Remove if already selected
-            } else {
-                leftselBuildings.add(building.getSelectedItem()); // Add if not already selected
-            }
-            for (String  property : leftselBuildings) {
-                buildingText.append(property);
-                buildingText.append(", ");
-            }
-        } else {
-            if (rightselBuildings.contains(building.getSelectedItem())) {
-                rightselBuildings.remove(building.getSelectedItem()); // Remove if already selected
-            } else {
-                rightselBuildings.add(building.getSelectedItem()); // Add if not already selected
-            }
-            for (String  property : rightselBuildings) {
-                buildingText.append(property);
-                buildingText.append(", ");
-            }
-        }
-
-        String currencyText = currency.getText() != null ? currency.getText().trim() : "";
-        String cardText = card.getSelectedItem() != null ? card.getSelectedItem() : "";
-        target.setText(String.join(" | ", buildingText, currencyText, cardText));
-    }
-
-    @Override
-    public void escape() {
-        new SettingsMenu(app).open();
-    }
-
-    @Override
-    public void close() {
-        app.getGuiNode().detachChild(mainContainer);
-        app.getGuiNode().detachChild(background);
-        super.close();
-    }
-}

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

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

Projekte/monopoly/client/src/main/java/pp/monopoly/client/gui/hslider/GridPanel.java

@@ -1,504 +0,0 @@
-/*
- * $Id$
- * 
- * Copyright (c) 2014, Simsilica, LLC
- * All rights reserved.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions 
- * are met:
- * 
- * 1. Redistributions of source code must retain the above copyright 
- *    notice, this list of conditions and the following disclaimer.
- * 
- * 2. 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.
- * 
- * 3. Neither the name of the copyright holder 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 HOLDER 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.
- */
-
- package pp.monopoly.client.gui.hslider;
-
- import com.jme3.scene.Node;
- import com.jme3.scene.Spatial;
-import com.simsilica.lemur.Axis;
-import com.simsilica.lemur.Button;
-import com.simsilica.lemur.FillMode;
-import com.simsilica.lemur.GuiGlobals;
-import com.simsilica.lemur.HAlignment;
-import com.simsilica.lemur.Label;
-import com.simsilica.lemur.Panel;
-import com.simsilica.lemur.TextField;
-import com.simsilica.lemur.component.SpringGridLayout;
- import com.simsilica.lemur.core.GuiControl;
- import com.simsilica.lemur.core.VersionedReference;
- import com.simsilica.lemur.grid.GridModel;
- import com.simsilica.lemur.style.Attributes;
- import com.simsilica.lemur.style.ElementId;
- import com.simsilica.lemur.style.StyleDefaults;
- import com.simsilica.lemur.style.Styles;
- 
- 
- /**
-  *
-  *  @author    Paul Speed
-  */
- public class GridPanel extends Panel {
- 
-     public static final String ELEMENT_ID = "grid";
- 
-     private GridModel<Panel> model;
-     private VersionedReference<GridModel<Panel>> modelRef;
-     private SpringGridLayout layout;
-     private int visibleRows = 5;
-     private int visibleColumns = 5;
-     private int row = 0;
-     private int column = 0;
-     private Float alpha; // for setting to new children
-     private Float[] columnwidths = null;
-     private Float[] rowheight = null;
-     private boolean widthsupdate = false;
-     private HAlignment [] columnHalignement = null;
- 
- 
- 
-     public GridPanel(GridModel<Panel> model ) {
-         this(true, model, new ElementId(ELEMENT_ID), null);
-     }
- 
-     public GridPanel(GridModel<Panel> model, String style ) {
-         this(true, model, new ElementId(ELEMENT_ID), style);
-     }
- 
-     public GridPanel(GridModel<Panel> model, ElementId elementId, String style ) {
-         this(true, model, elementId, style);
-     }
- 
-     protected GridPanel(boolean applyStyles, GridModel<Panel> model,
-                         ElementId elementId, String style ) {
-         super(false, elementId, style);
- 
-         this.layout = new SpringGridLayout(Axis.Y, Axis.X,
-                                            FillMode.ForcedEven,
-                                            FillMode.ForcedEven);
-         getControl(GuiControl.class).setLayout(layout);
- 
-         if( applyStyles ) {
-             Styles styles = GuiGlobals.getInstance().getStyles();
-             styles.applyStyles(this, elementId, style);
-         }
- 
-         setModel(model);
-     }
-     // change the layout if necessary
-     public void setLayout(SpringGridLayout lay) {
-         this.layout = lay;
-         getControl(GuiControl.class).getLayout().clearChildren();
-         getControl(GuiControl.class).setLayout(layout);
- 
-         this.modelRef = null;
-         if( this.model != null ) {
-             this.modelRef = model.createReference();
-             refreshGrid();
-         }
- 
-     }
- 
- 
-     @StyleDefaults(ELEMENT_ID)
-     public static void initializeDefaultStyles( Attributes attrs ) {
-     }
- 
-     public void setModel( GridModel<Panel> model ) {
- 
-         if( this.model == model ) {
-             return;
-         }
- 
-         if( this.model != null ) {
-             // Clear the old panel
-             getControl(GuiControl.class).getLayout().clearChildren();
-             this.modelRef = null;
-         }
- 
-         this.model = model;
- 
-         if( this.model != null ) {
-             this.modelRef = model.createReference();
-             refreshGrid();
-         }
-     }
- 
-     public GridModel<Panel> getModel() {
-         return model;
-     }
- 
-     public void setRow( int row ) {
-         setLocation(row, column);
-     }
- 
-     public int getRow() {
-         return row;
-     }
- 
-     public void setColumn( int column ) {
-         setLocation(row, column);
-     }
- 
-     public int getColumn() {
-         return column;
-     }
- 
-     public Panel getCell( int r, int c ) {
-         r = r - row;
-         c = c - column;
-         if( r < 0 || c < 0 || r >= visibleRows || c >= visibleColumns ) {
-             return null;
-         }
-         return (Panel)layout.getChild(r, c);
-     }
- 
-     public void setLocation( int row, int column ) {
-         if( this.row == row && this.column == column ) {
-             return;
-         }
-         this.row = row;
-         this.column = column;
-         refreshGrid();
-     }
- 
-     public void setVisibleSize( int rows, int columns ) {
-         this.visibleRows = rows;
-         this.visibleColumns = columns;
-         getControl(GuiControl.class).getLayout().clearChildren();
-         refreshGrid();
-     }
- 
-     public void setVisibleRows( int rows ) {
-         setVisibleSize(rows, visibleColumns);
-     }
- 
-     public int getVisibleRows() {
-         return visibleRows;
-     }
- 
-     public void setVisibleColumns( int columns ) {
-         setVisibleSize(visibleRows, columns);
-     }
- 
-     public int getVisibleColumns() {
-         return visibleColumns;
-     }
- 
-     public void setAlpha( float alpha, boolean recursive ) {
-         this.alpha = alpha;
-         super.setAlpha(alpha, recursive);
-     }
- 
-     protected void refreshGrid() {
-         widthsupdate = false;
- 
-         if( model == null ) {
-             getControl(GuiControl.class).getLayout().clearChildren();
-             return;
-         }
- 
-         for( int r = row; r < row + visibleRows; r++ ) {
-             for( int c = column; c < column + visibleColumns; c++ ) {
-                 Node existing = layout.getChild(r-row, c-column);
-                 if( r < 0 || r >= model.getRowCount() || c < 0 || c >= model.getColumnCount() ) {
-                     // Out of bounds
-                     layout.addChild(null, r-row, c-column);
-                 } else {
-                     Panel child = model.getCell(r, c, (Panel)existing);
- 
-                     // we check if there is a size for either rowheight or columnwidth stored
-                     Float ytemp = null;
-                     Float xtemp = null;
- 
-                     if (columnwidths !=null) {
-                         if (columnwidths.length > c) {
-                             if (columnwidths[c] != null) xtemp = columnwidths[c];
-                         }
-                     }
- 
-                     if (rowheight != null) {
-                         if (rowheight.length > r) {
-                             if (rowheight[r] !=null) ytemp = rowheight[r];
-                         }
-                     }
-                     // and only if, we set the preferred size
-                     if (ytemp !=null || xtemp != null) {
-                         child.setPreferredSize(null);
-                         if (xtemp != null) child.setPreferredSize(child.getPreferredSize().clone().setX(xtemp));
-                         if (ytemp !=null) child.setPreferredSize(child.getPreferredSize().clone().setY(ytemp));
-                     }
- 
-                     if (columnHalignement != null) {
-                         if (columnHalignement.length > c) {
-                             if (columnHalignement[c] != null) {
-                                 // we only set the alignement for "text" elements attached to the listbox
-                                 // for others e.g. progressbar etc. we should call the element and do the changes there
-                                 if (child instanceof Button) ((Button) child).setTextHAlignment(columnHalignement[c]);
-                                 if (child instanceof Label) ((Label) child).setTextHAlignment(columnHalignement[c]);
-                                 if (child instanceof TextField)
-                                     ((TextField) child).setTextHAlignment(columnHalignement[c]);
-                             } else if (child instanceof Button) ((Button) child).setTextHAlignment(HAlignment.Left);
-                         } else if (child instanceof Button) ((Button) child).setTextHAlignment(HAlignment.Left);
-                     } else if (child instanceof Button) ((Button) child).setTextHAlignment(HAlignment.Left);
- 
-                     if( child != existing ) {
-                         // Make sure new children pick up the alpha of the container
-                         if( alpha != null && alpha != 1 ) {
-                             child.setAlpha(alpha);
-                         }
- 
-                         layout.addChild(child, r-row, c-column);
-                     }
-                 }
-             }
-         }
-     }
- 
-     @Override
-     public void updateLogicalState( float tpf ) {
-         super.updateLogicalState(tpf);
- 
-         if( modelRef.update() ) {
-             refreshGrid();
-         }
- 
-         if (widthsupdate)  refreshGrid();
- 
-     }
- 
-     @Override
-     public String toString() {
-         return getClass().getName() + "[elementId=" + getElementId() + "]";
-     }
- 
- 
-     public Float[] getColumnwidths() {
-         return columnwidths;
-     }
- 
-     public Float[] getRowheights() {
-         return rowheight;
-     }
- 
- 
-     public void setRowheight(Float rowheight, int rownumber_starting_with_0){
-         // adds or replaces a columnwidth
-         if (rownumber_starting_with_0 < 0) return;
-         int size = rownumber_starting_with_0+1;
-         if (this.rowheight != null) {
-             size = Math.max(size, this.rowheight.length);
-         }
-         preparegridsizes(size,false);
-         setcheckedsize(rowheight,rownumber_starting_with_0,true,true);
-     }
- 
-     public void setColumnwidths(Float columnwidth, int columnnumber_starting_with_0) {
-         // adds or replaces a columnwidth
-         if (columnnumber_starting_with_0 <0) return;
-         int size = columnnumber_starting_with_0+1;
-         if (this.columnwidths != null) {
-             size = Math.max(size, this.columnwidths.length);
-         }
-         preparegridsizes(size,true);
-         setcheckedsize(columnwidth,columnnumber_starting_with_0,true,false);
-     }
- 
- 
-     public void setRowheight (Float[] rowheights_or_null) {
-         // replaces the given rowheights and only keep the number of rows given
-         setRowheight(rowheights_or_null,true);
-     }
- 
-     public void setColumnwidths (Float[] columnwidths_or_null) {
-         // replaces the given columnwidths and only keep the number of columns given
-         setColumnwidths(columnwidths_or_null,true);
-     }
- 
- 
-     public void setRowheight(Float[] rowheights_or_null, boolean write_null_values) {
-         // replaces the given rowheights and only keep the number of rows given
-         // null values either overwrite or will be ignored
-         Integer tmp = null;
-         if (rowheights_or_null != null) tmp = rowheights_or_null.length;
-         if (preparegridsizes(tmp,false)) {
-             for (int i = 0; i <tmp;i++) {
-                 setcheckedsize(rowheights_or_null[i],i,write_null_values,true);
-             }
-         }
-     }
- 
-     public void setColumnwidths(Float[] columnwidths_or_null, boolean write_null_values) {
-         // replaces the given columnwidths_or_null and only keep the number of columns given
-         // null values either overwrite or will be ignored
-         Integer tmp = null;
-         if (columnwidths_or_null != null) tmp = columnwidths_or_null.length;
-         if (preparegridsizes(tmp,true)) {
-             for (int i = 0; i <tmp;i++) {
-                 setcheckedsize(columnwidths_or_null[i],i,write_null_values,false);
-             }
-         }
-     }
- 
- 
-     private boolean preparegridsizes(Integer givenfieldsize, boolean width) {
-         // prepares and adjust the size of the field(s) that hold columnwidth or rowheights
-         if (givenfieldsize == null) {
-             if (width) { //either columns or rows will be set null
-                 columnwidths =null;
-             } else {
-                 rowheight = null;
-             }
-             for (Spatial p: this.getChildren()) {
-                 Panel x = (Panel) p;
-                 x.setPreferredSize(null); //we set all sizes to 0 as we will recalculate them with next update
-             }
-             widthsupdate = true;
-             return false; // no more activity needed
-         } else {
-             Float[] tmp;
-             tmp = new Float[givenfieldsize];
-             if (width) {
-                 if (columnwidths == null) {
-                     columnwidths = tmp;
-                     return true;
-                 }
-                 int i = 0;
-                 for (Float z:columnwidths) {
-                     tmp[i] =z;
-                     i++;
-                     if (i>= givenfieldsize) break;
-                 }
-                 columnwidths = tmp; // we get what we have
-             } else {
-                 if (rowheight == null) {
-                     rowheight = tmp;
-                     return true;
-                 }
-                 int i = 0;
-                 for (Float z:rowheight) {
-                     tmp[i] =z;
-                     i++;
-                     if (i>= givenfieldsize) break;
-                 }
-                 rowheight = tmp; // we get what we have
-             }
-             return true;
-         }
-     }
- 
-     private void setcheckedsize(Float size, int row_or_column, boolean override, boolean i_am_a_row) {
-         if (override || (size !=null))  {
-             if (i_am_a_row) {
-                 rowheight[row_or_column] = size;
-             } else {
-                 columnwidths[row_or_column] = size;
-             }
-             widthsupdate = true;
-         }
-     }
- 
- 
- 
- 
- 
- 
- 
-  //   public void setRowheight(Float rowheight_or_null){
-  //       if (rowheight_or_null<=0) return;
-  //       this.rowheight = rowheight_or_null;
-  //       widthsupdate = true;
-  //   }
- 
- 
- 
- 
- 
-     public void setHalignements(HAlignment[] hals) {
-         setHalignements(hals,false);
-     }
- 
-     public void setHalignements(HAlignment[] hals, boolean overridestandard) {
-         if (checkexistinghal(hals)) {
-             int i =0;
-             for (HAlignment z:hals) {
-                 setHalignementchecked(z,i,overridestandard);
-                 i++;
-                 if (i>=columnHalignement.length)   return; // we ignore given HAlignement that is out of column bound
-             }
-             if (!overridestandard ) return;
-             for (int u = i; u<columnHalignement.length;u++) {
-                 setHalignementchecked(null,u,overridestandard); // override existing HAlignements
-             }
-         }
-     }
- 
-     public void setHalignements(HAlignment hal, int column) {
-         checkexistinghal(new HAlignment[]{HAlignment.Center});
-         if (column < columnHalignement.length)  setHalignementchecked(hal,column,true);
-     }
- 
-     private void setHalignementchecked(HAlignment hal, int column,boolean override) {
-         if (override || (hal !=null))  {
-             columnHalignement[column] = hal;
-             widthsupdate = true;
-         }
-     }
- 
-     private boolean checkexistinghal(HAlignment[] givenfield) {
-         // delete the given Halignements
-         if (givenfield == null) {
-             columnHalignement =null;
-             for (Spatial p: this.getChildren()) {
-                 Button x = (Button)((Panel) p);
-                 x.setTextHAlignment(HAlignment.Left); //standard HAlignement
-             }
-             widthsupdate = true;
-             return false;
-         }
-         // or prepare if we have no columnHalignement yet
-         HAlignment[] tmp;
-         if (columnHalignement == null) {
-             tmp = new HAlignment[model.getColumnCount()];
-             columnHalignement = tmp;
-         } else {
-             if (!(columnHalignement.length ==model.getColumnCount() )) {
-                 tmp = new HAlignment[model.getColumnCount()];
-                 int i = 0;
-                 for (HAlignment z:columnHalignement) {
-                     tmp[i] =z;
-                     i++;
-                     if (i>=model.getColumnCount()) break;
-                 }
-                 columnHalignement = tmp;
-             }
-         }
-         return true;
-     }
- 
-     public HAlignment[] getColumnHalignement() {
-         return columnHalignement;
-     }
- }

Projekte/monopoly/client/src/main/java/pp/monopoly/client/gui/hslider/VersionedList.java

@@ -1,135 +0,0 @@
-/*
- * $Id$
- * 
- * Copyright (c) 2014, Simsilica, LLC
- * All rights reserved.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions 
- * are met:
- * 
- * 1. Redistributions of source code must retain the above copyright 
- *    notice, this list of conditions and the following disclaimer.
- * 
- * 2. 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.
- * 
- * 3. Neither the name of the copyright holder 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 HOLDER 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.
- */
-
- package pp.monopoly.client.gui.hslider;
-
- import java.util.AbstractList;
- import java.util.ArrayList;
- import java.util.List;
-
-import com.simsilica.lemur.core.VersionedObject;
-import com.simsilica.lemur.core.VersionedReference;
- 
- 
- /**
-  *
-  *  @author    Paul Speed
-  */
- public class VersionedList<T> extends AbstractList<T>
-                               implements VersionedObject<List<T>> {
-     private long version = 0;
-     private List<T> list;
- 
-     protected VersionedList(List<T> items, boolean copy ) {
-         if( copy ) {
-             list = new ArrayList<T>();
-             list.addAll(items);
-         } else {
-             this.list = items;
-         }
-     }
- 
-     public VersionedList() {
-         this(new ArrayList<T>(), false);
-     }
- 
-     public VersionedList(List<T> items ) {
-         this(items, true);
-     }
- 
-     /**
-      *  Wraps a list in a VersionedList instead of copying it.
-      *  This is useful for cases where a VersionedList is required
-      *  but strict versioning is not, for example, passing a static list
-      *  to a ListBox.  Changes to the wrapped list obviously don't
-      *  trigger version changes in the wrapper.  Only changes through
-      *  the wrapper will increment the version.
-      */
-     public static <T> VersionedList<T> wrap( List<T> list ) {
-         return new VersionedList<T>(list, false);
-     }
- 
-     public void incrementVersion() { // changed this to public
-         version++;
-     }
- 
-     @Override
-     public long getVersion() {
-         return version;
-     }
- 
-     @Override
-     public List<T> getObject() {
-         return this;
-     }
- 
-     @Override
-     public VersionedReference<List<T>> createReference() {
-         return new VersionedReference<List<T>>(this);
-     }
- 
-     @Override
-     public T get( int i ) {
-         return list.get(i);
-     }
- 
-     @Override
-     public int size() {
-         return list.size();
-     }
- 
-     @Override
-     public T set( int i, T val ) {
-         T result = list.set(i, val);
-         incrementVersion();
-         return result;
-     }
- 
-     @Override
-     public void add( int i, T val ) {
-         list.add(i, val);
-         incrementVersion();
-     }
- 
-     @Override
-     public T remove( int i ) {
-         T result = list.remove(i);
-         incrementVersion();
-         return result;
-     }
- 
- }
- 

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

@@ -1,120 +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.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;
-
-/**
- * Bankrupt is a Warning-Popup which appears when the balance is negative at the end of a player´s turn
- */
-public class AcceptTrade extends Dialog {
-    private final MonopolyApp app;
-    private final Geometry overlayBackground;
-    private final Container noMoneyWarningContainer;
-    private final Container backgroundContainer;
-
-
-
-    public AcceptTrade(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 die Warnung
-        noMoneyWarningContainer = new Container();
-        noMoneyWarningContainer.setBackground(new QuadBackgroundComponent(new ColorRGBA(0.8657f, 0.8735f, 0.8892f, 1.0f)));
-        noMoneyWarningContainer.setPreferredSize(new Vector3f(550,250,10));
-
-        float padding = 10; // Passt den backgroundContainer an die Größe des bankruptContainers an
-        backgroundContainer.setPreferredSize(noMoneyWarningContainer.getPreferredSize().addLocal(padding, padding, 0));
-
-        // Titel
-        Label gateFieldTitle = noMoneyWarningContainer.addChild(new Label("Handel angenommen!", new ElementId("warning-title")));
-        gateFieldTitle.setFontSize(48);
-        gateFieldTitle.setColor(ColorRGBA.Black);
-
-        // Text, der im Popup steht
-        Container textContainer = noMoneyWarningContainer.addChild(new Container());
-        textContainer.addChild(new Label("Du hast Spieler XXX einen Handel vorgeschlagen", new ElementId("label-Text")));
-        textContainer.addChild(new Label("", new ElementId("label-Text")));
-        textContainer.addChild(new Label("Der Handel wurde angenommen", new ElementId("label-Text")));
-        textContainer.setBackground(new QuadBackgroundComponent(new ColorRGBA(0.4657f, 0.4735f, 0.4892f, 1.0f)));
-
-        // Passt den textContainer an die Größe des bankruptContainers an
-        textContainer.setPreferredSize(noMoneyWarningContainer.getPreferredSize().addLocal(-250,-200,0));
-
-        // Beenden-Button
-        Button quitButton = noMoneyWarningContainer.addChild(new Button("Bestätigen", new ElementId("button")));
-        quitButton.setFontSize(32);
-        quitButton.addClickCommands(source -> close());
-
-
-        // Zentriere das Popup
-        noMoneyWarningContainer.setLocalTranslation(
-            (app.getCamera().getWidth() - noMoneyWarningContainer.getPreferredSize().x) / 2,
-            (app.getCamera().getHeight() + noMoneyWarningContainer.getPreferredSize().y) / 2,
-            8
-        );
-
-        // Zentriere das Popup
-        backgroundContainer.setLocalTranslation(
-                (app.getCamera().getWidth() - noMoneyWarningContainer.getPreferredSize().x - padding) / 2,
-                (app.getCamera().getHeight() + noMoneyWarningContainer.getPreferredSize().y+ padding) / 2,
-                7
-        );
-
-        app.getGuiNode().attachChild(noMoneyWarningContainer);
-    }
-
-    /**
-     * 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;
-    }
-
-    /**
-     * Closes the menu and removes the GUI elements.
-     */
-    @Override
-    public void close() {
-        app.getGuiNode().detachChild(noMoneyWarningContainer);  // Entferne das Menü
-        app.getGuiNode().detachChild(backgroundContainer); //Entfernt Rand
-        app.getGuiNode().detachChild(overlayBackground);  // Entferne das Overlay
-        super.close();
-    }
-
-    @Override
-    public void escape() {
-        close();
-    }
-}

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

@@ -1,118 +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.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;
-
-/**
- * Bankrupt is a Warning-Popup which appears when the balance is negative at the end of a player´s turn
- */
-public class Bankrupt extends Dialog {
-    private final MonopolyApp app;
-    private final Geometry overlayBackground;
-    private final Container bankruptContainer;
-    private final Container backgroundContainer;
-
-
-
-    public Bankrupt(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 die Warnung
-        bankruptContainer = new Container();
-        bankruptContainer.setBackground(new QuadBackgroundComponent(new ColorRGBA(0.8657f, 0.8735f, 0.8892f, 1.0f)));
-        bankruptContainer.setPreferredSize(new Vector3f(550,250,10));
-
-        float padding = 10; // Passt den backgroundContainer an die Größe des bankruptContainers an
-        backgroundContainer.setPreferredSize(bankruptContainer.getPreferredSize().addLocal(padding, padding, 0));
-
-        // Titel
-        Label gateFieldTitle = bankruptContainer.addChild(new Label("Vorsicht !", new ElementId("warning-title")));
-        gateFieldTitle.setFontSize(48);
-        gateFieldTitle.setColor(ColorRGBA.Black);
-
-        // Text, der im Popup steht
-        Container textContainer = bankruptContainer.addChild(new Container());
-        textContainer.addChild(new Label("Du hast noch einen negativen Kontostand. Wenn du jetzt deinen Zug beendest, gehst du Bankrott und verlierst das Spiel!", new ElementId("label-Text")));
-        textContainer.setBackground(new QuadBackgroundComponent(new ColorRGBA(0.4657f, 0.4735f, 0.4892f, 1.0f)));
-
-        // Passt den textContainer an die Größe des bankruptContainers an
-        textContainer.setPreferredSize(bankruptContainer.getPreferredSize().addLocal(-250,-200,0));
-
-        // Beenden-Button
-        Button quitButton = bankruptContainer.addChild(new Button("Bestätigen", new ElementId("button")));
-        quitButton.setFontSize(32);
-        quitButton.addClickCommands(source -> close());
-
-
-        // Zentriere das Popup
-        bankruptContainer.setLocalTranslation(
-            (app.getCamera().getWidth() - bankruptContainer.getPreferredSize().x) / 2,
-            (app.getCamera().getHeight() + bankruptContainer.getPreferredSize().y) / 2,
-            8
-        );
-
-        // Zentriere das Popup
-        backgroundContainer.setLocalTranslation(
-                (app.getCamera().getWidth() - bankruptContainer.getPreferredSize().x - padding) / 2,
-                (app.getCamera().getHeight() + bankruptContainer.getPreferredSize().y+ padding) / 2,
-                7
-        );
-
-        app.getGuiNode().attachChild(bankruptContainer);
-    }
-
-    /**
-     * 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;
-    }
-
-    /**
-     * Closes the menu and removes the GUI elements.
-     */
-    @Override
-    public void close() {
-        app.getGuiNode().detachChild(bankruptContainer);  // Entferne das Menü
-        app.getGuiNode().detachChild(backgroundContainer); //Entfernt Rand
-        app.getGuiNode().detachChild(overlayBackground);  // Entferne das Overlay
-        super.close();
-    }
-
-    @Override
-    public void escape() {
-        close();
-    }
-}

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

@@ -1,123 +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.client.gui.SettingsMenu;
-import pp.monopoly.model.fields.BuildingProperty;
-
-/**
- * BuildingPropertyCard creates the popup for field information
- */
-public class BuildingPropertyCard extends Dialog {
-    private final MonopolyApp app;
-    private final Geometry overlayBackground;
-    private final Container buildingPropertyContainer;
-    private final Container backgroundContainer;
-    private int index = 37;
-
-    public BuildingPropertyCard(MonopolyApp app) {
-        super(app.getDialogManager());
-        this.app = app;
-
-        //Generate the corresponfing field
-        BuildingProperty field = (BuildingProperty) app.getGameLogic().getBoardManager().getFieldAtIndex(index);
-
-        // Halbtransparentes Overlay hinzufügen
-        overlayBackground = createOverlayBackground();
-        app.getGuiNode().attachChild(overlayBackground);
-
-        // Create the background container
-        backgroundContainer = new Container();
-        backgroundContainer.setBackground(new QuadBackgroundComponent(new ColorRGBA(0.8657f, 0.8735f, 0.8892f, 1.0f))); // Darker background
-        app.getGuiNode().attachChild(backgroundContainer);
-
-        // Hauptcontainer für die Gebäudekarte
-        buildingPropertyContainer = new Container();
-        buildingPropertyContainer.setBackground(new QuadBackgroundComponent(field.getColor().getColor()));
-
-        float padding = 10; // Passt den backgroundContainer an die Größe des buildingPropertyContainer an
-        backgroundContainer.setPreferredSize(buildingPropertyContainer.getPreferredSize().addLocal(padding, padding, 0));
-
-
-        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)));
-
-        // Zentriere das Popup
-        buildingPropertyContainer.setLocalTranslation(
-            (app.getCamera().getWidth() - buildingPropertyContainer.getPreferredSize().x) / 2,
-            (app.getCamera().getHeight() + buildingPropertyContainer.getPreferredSize().y) / 2,
-            8
-        );
-
-        // Zentriere das Popup
-        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() {
-        app.getGuiNode().detachChild(buildingPropertyContainer);  // Entferne das Menü
-        app.getGuiNode().detachChild(backgroundContainer); //Entfernt Rand
-        app.getGuiNode().detachChild(overlayBackground);  // Entferne das Overlay
-        super.close();
-    }
-    
-    public void setIndex(int index) {
-        this.index = index;
-    }
-
-    @Override
-    public void escape() {
-        new SettingsMenu(app).open();
-    }
-}

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

@@ -1,115 +0,0 @@
-package pp.monopoly.client.gui.popups;
-
-import com.jme3.math.ColorRGBA;
-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.client.gui.SettingsMenu;
-import pp.monopoly.message.client.BuyPropertyResponse;
-import pp.monopoly.model.fields.BoardManager;
-import pp.monopoly.model.fields.BuildingProperty;
-import pp.monopoly.notification.Sound;
-
-/**
- * BuyCard is a popup that appears when a player lands on a field that is still available for purchase.
- */
-public class BuyCard extends Dialog {
-    private final MonopolyApp app;
-    private final Container buyCardContainer;
-    private final Container backgroundContainer;
-
-    
-    public BuyCard(MonopolyApp app) {
-        super(app.getDialogManager());
-        this.app = app;
-        
-        //Generate the corresponding field
-        int index = app.getGameLogic().getPlayerHandler().getPlayerById(app.getId()).getFieldID();
-        BuildingProperty field = (BuildingProperty) new BoardManager().getFieldAtIndex(index);
-
-        // Create the background container
-        backgroundContainer = new Container();
-        backgroundContainer.setBackground(new QuadBackgroundComponent(new ColorRGBA(0.8657f, 0.8735f, 0.8892f, 1.0f))); // Darker background
-        attachChild(backgroundContainer);
-
-        // Hauptcontainer für die Gebäudekarte
-        buyCardContainer = new Container();
-        buyCardContainer.setBackground(new QuadBackgroundComponent(field.getColor().getColor())); // Ändert den Rahmen und die Hintergrundfarbe der Karten
-
-        float padding = 10; // Passt den backgroundContainer an die Größe des buyCardContainers an
-        backgroundContainer.setPreferredSize(buyCardContainer.getPreferredSize().addLocal(padding, padding, 0));
-        
-        // Titel
-        Label title = buyCardContainer.addChild(new Label( field.getName(), new ElementId("label-Bold")));
-        title.setBackground(new QuadBackgroundComponent(field.getColor().getColor()));
-        title.setFontSize(48);
-
-        // Text, der auf dem Popup steht
-        // Die Preise werden dynamisch dem BoardManager entnommen
-        Container propertyValuesContainer = buyCardContainer.addChild(new Container());
-        propertyValuesContainer.addChild(new Label("„Grundstückswert: " + field.getPrice() + " EUR", new ElementId("label-Text")));
-        propertyValuesContainer.addChild(new Label("", new ElementId("label-Text")));// Leerzeile
-        propertyValuesContainer.addChild(new Label("„Miete allein: " + field.getAllRent().get(0)+ " EUR", new ElementId("label-Text")));
-        propertyValuesContainer.addChild(new Label("„-mit 1 Haus: " + field.getAllRent().get(1) + " EUR", new ElementId("label-Text")));
-        propertyValuesContainer.addChild(new Label("„-mit 2 Häuser: " + field.getAllRent().get(2) + " EUR", new ElementId("label-Text")));
-        propertyValuesContainer.addChild(new Label("„-mit 3 Häuser: " + field.getAllRent().get(3) + " EUR", new ElementId("label-Text")));
-        propertyValuesContainer.addChild(new Label("„-mit 4 Häuser: " + field.getAllRent().get(4) + " EUR", new ElementId("label-Text")));
-        propertyValuesContainer.addChild(new Label("„-mit 1 Hotel: " + field.getAllRent().get(5) + " EUR", new ElementId("label-Text")));
-        propertyValuesContainer.addChild(new Label("„-1 Haus kostet: " + field.getHousePrice()+ " EUR", new ElementId("label-Text")));
-        propertyValuesContainer.addChild(new Label("", new ElementId("label-Text")));// Leerzeile
-        propertyValuesContainer.addChild(new Label("„Hypothek: " + field.getHypo() + " EUR", new ElementId("label-Text")));
-        propertyValuesContainer.setBackground(new QuadBackgroundComponent(new ColorRGBA(0.4657f, 0.4735f, 0.4892f, 1.0f)));
-
-        // Beenden-Button
-        Button quitButton = buyCardContainer.addChild(new Button("Beenden", new ElementId("button")));
-        quitButton.setFontSize(32);
-        quitButton.addClickCommands(s -> ifTopDialog(() -> {
-            System.err.println("Button does something?");
-            app.getGameLogic().playSound(Sound.BUTTON);
-            close();
-        }));
-        // Kaufen-Button
-        Button buyButton = buyCardContainer.addChild(new Button("Kaufen", new ElementId("button")));
-        buyButton.setFontSize(32);
-        buyButton.addClickCommands(s -> ifTopDialog( () -> {
-            app.getGameLogic().playSound(Sound.BUTTON);
-            close();
-            app.getGameLogic().send(new BuyPropertyResponse());
-        }));
-
-        // Zentriere das Popup
-        buyCardContainer.setLocalTranslation(
-            (app.getCamera().getWidth() - buyCardContainer.getPreferredSize().x) / 2,
-            (app.getCamera().getHeight() + buyCardContainer.getPreferredSize().y) / 2,
-            10
-        );
-
-        // Zentriere das Popup
-        backgroundContainer.setLocalTranslation(
-                (app.getCamera().getWidth() - buyCardContainer.getPreferredSize().x - padding) / 2,
-                (app.getCamera().getHeight() + buyCardContainer.getPreferredSize().y+ padding) / 2,
-                9
-        );
-
-        app.getGuiNode().attachChild(buyCardContainer);
-    }
-
-    /**
-     * Schließt das Menü und entfernt die GUI-Elemente.
-     */
-    @Override
-    public void close() {
-        app.getGuiNode().detachChild(buyCardContainer);  // Entferne das Menü
-        app.getGuiNode().detachChild(backgroundContainer); //Entfernt Rand
-        super.close();
-    }
-
-    @Override
-    public void escape() {
-        new SettingsMenu(app).open();
-    }
-}

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

@@ -1,155 +0,0 @@
-package pp.monopoly.client.gui.popups;
-
-import com.jme3.math.ColorRGBA;
-import com.jme3.math.Vector3f;
-import com.simsilica.lemur.Button;
-import com.simsilica.lemur.Container;
-import com.simsilica.lemur.Label;
-import com.simsilica.lemur.ListBox;
-import com.simsilica.lemur.component.QuadBackgroundComponent;
-import com.simsilica.lemur.core.VersionedList;
-import com.simsilica.lemur.style.ElementId;
-import pp.dialog.Dialog;
-import pp.monopoly.client.MonopolyApp;
-import pp.monopoly.client.gui.SettingsMenu;
-import pp.monopoly.game.server.Player;
-import pp.monopoly.model.fields.BoardManager;
-import pp.monopoly.model.fields.BuildingProperty;
-import pp.monopoly.notification.Sound;
-
-import java.util.List;
-import java.util.stream.Collectors;
-
-/**
- * BuyHouse is a popup which appears when a player clicks on the "Buy House"-button in the BuildingAdminMenu
- */
-public class BuyHouse extends Dialog {
-    private final MonopolyApp app;
-    private final Container buyHouseContainer;
-    private final Container backgroundContainer;
-
-
-    public BuyHouse(MonopolyApp app) {
-        super(app.getDialogManager());
-        this.app = app;
-
-        // Create the background container
-        backgroundContainer = new Container();
-        backgroundContainer.setBackground(new QuadBackgroundComponent(new ColorRGBA(0.8657f, 0.8735f, 0.8892f, 1.0f))); // Darker background
-        attachChild(backgroundContainer);
-
-        // Hauptcontainer für das Menü
-        buyHouseContainer = new Container();
-        buyHouseContainer.setPreferredSize(new Vector3f(800, 600, 0));
-
-        float padding = 10; // Passt den backgroundContainer an die Größe des sellhouseContainers an
-        backgroundContainer.setPreferredSize(buyHouseContainer.getPreferredSize().addLocal(padding, padding, 0));
-
-        // Titel
-        Label title = buyHouseContainer.addChild(new Label( "Gebäude Kaufen", new ElementId("warining-Bold")));
-        title.setFontSize(48);
-        title.setColor(ColorRGBA.Black);
-
-        //Unterteilund des sellHouseContainer in drei "Untercontainer"
-        Container upContainer = buyHouseContainer.addChild(new Container());
-        Container middleContainer = buyHouseContainer.addChild(new Container());
-        Container downContainer = buyHouseContainer.addChild(new Container());
-
-        // Text, der auf der Karte steht
-        upContainer.addChild(new Label("„Grundstück wählen:", new ElementId("label-Text"))); //TODO hier überall die entsprechenden Variablen einfügen
-        upContainer.addChild(new Label("", new ElementId("label-Text")));// Leerzeile
-        upContainer.setBackground(new QuadBackgroundComponent(new ColorRGBA(0.4657f, 0.4735f, 0.4892f, 1.0f)));
-
-        middleContainer.setPreferredSize(new Vector3f(100, 150, 0));
-        middleContainer.setBackground(new QuadBackgroundComponent(ColorRGBA.Orange));
-
-        // Create a VersionedList for the ListBox model
-        VersionedList<BuildingProperty> listModel = new VersionedList<>();
-
-        // Retrieve current player and their properties //TODO hier Prüfen, ob abweichungen zur SellHouse-Klasse beachtet werden müssen
-        Player currentPlayer = app.getGameLogic().getPlayerHandler().getPlayerById(app.getId());
-        BoardManager boardManager = app.getGameLogic().getBoardManager();
-
-        List<BuildingProperty> playerProperties = boardManager.getPropertyFields(
-                                                                      currentPlayer.getProperties()).stream()
-                                                              .filter(property -> property instanceof BuildingProperty)
-                                                              .map(property -> (BuildingProperty) property)
-                                                              .filter(property -> property.getHouses() > 0 || property.getHotel() == 1)
-                                                              .collect(Collectors.toList());
-
-        // Populate the list model
-        listModel.addAll(playerProperties);
-
-        // Create a ListBox with the "glass" style and the model
-        ListBox<BuildingProperty> listBox = new ListBox<>(listModel, "glass");
-        listBox.setPreferredSize(new Vector3f(300, 200, 0)); // Adjust size as needed
-
-        // Add selection listener
-        listBox.addClickCommands(item -> {
-            BuildingProperty selected = listBox.getSelectedItem(); // Correct method to retrieve the selected item
-            if (selected != null) {
-                System.out.println("Selected property: " + selected.getName());
-            }
-        });
-
-        // Add the ListBox to the middle container
-        middleContainer.addChild(listBox);
-
-
-        downContainer.addChild(new Label("", new ElementId("label-Text")));// Leerzeile
-        downContainer.addChild(new Label("Kosten:", new ElementId("label-Text")));// Leerzeile
-        downContainer.addChild(new Label("Hier die tätsächliche Erstattung", new ElementId("label-Text")));
-        downContainer.setBackground(new QuadBackgroundComponent(new ColorRGBA(0.4657f, 0.4735f, 0.4892f, 1.0f)));
-
-        // Beenden-Button
-        Button cancelButton = buyHouseContainer.addChild(new Button("Abbrechen", new ElementId("button")));
-        cancelButton.setFontSize(32);
-        cancelButton.addClickCommands(s -> ifTopDialog(() -> {
-            app.getGameLogic().playSound(Sound.BUTTON);
-            close();
-        }));
-        // Kaufen-Button
-        Button confirmButton = buyHouseContainer.addChild(new Button("Bestätigen", new ElementId("button")));
-        confirmButton.setFontSize(32);
-        confirmButton.addClickCommands(s -> ifTopDialog( () -> {
-            app.getGameLogic().playSound(Sound.BUTTON);
-            BuildingProperty selected = listBox.getSelectedItem();
-            if (selected != null) {
-                System.out.println("Confirmed property: " + selected.getName());
-                // Send the "alter building" message to the server
-               //app.getGameLogic().sendMessage(new AlterBuildingMessage(selected.getId(), false)); TODO Message an Server
-            }
-        }));
-
-        // Zentriere das Popup
-        buyHouseContainer.setLocalTranslation(
-            (app.getCamera().getWidth() - buyHouseContainer.getPreferredSize().x) / 2,
-            (app.getCamera().getHeight() + buyHouseContainer.getPreferredSize().y) / 2,
-            9
-        );
-
-        // Zentriere das Popup
-        backgroundContainer.setLocalTranslation(
-                (app.getCamera().getWidth() - buyHouseContainer.getPreferredSize().x - padding) / 2,
-                (app.getCamera().getHeight() + buyHouseContainer.getPreferredSize().y+ padding) / 2,
-                8
-        );
-
-        app.getGuiNode().attachChild(buyHouseContainer);
-    }
-
-    /**
-     * Schließt das Menü und entfernt die GUI-Elemente.
-     */
-    @Override
-    public void close() {
-        app.getGuiNode().detachChild(buyHouseContainer);  // Entferne das Menü
-        app.getGuiNode().detachChild(backgroundContainer); //Entfernt Rand
-        super.close();
-    }
-
-    @Override
-    public void escape() {
-        new SettingsMenu(app).open();
-    }
-}

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

@@ -1,138 +0,0 @@
-package pp.monopoly.client.gui.popups;
-
-import com.jme3.math.ColorRGBA;
-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.client.gui.SettingsMenu;
-import pp.monopoly.client.gui.TradeMenu;
-import pp.monopoly.message.client.TradeResponse;
-import pp.monopoly.message.server.TradeReply;
-import pp.monopoly.model.TradeHandler;
-import pp.monopoly.model.fields.PropertyField;
-import pp.monopoly.notification.Sound;
-
-/**
- * ConfirmTrade is a popup which appears when a trade is proposed to this certain player.
- */
-public class ConfirmTrade extends Dialog {
-    private final MonopolyApp app;
-    private final Container confirmTradeContainer;
-    private final Container backgroundContainer;
-    private TradeHandler tradeHandler;
-
-
-    public ConfirmTrade(MonopolyApp app) {
-        super(app.getDialogManager());
-        this.app = app;
-        tradeHandler = app.getGameLogic().getTradeHandler();
-
-        // Create the background container
-        backgroundContainer = new Container();
-        backgroundContainer.setBackground(new QuadBackgroundComponent(new ColorRGBA(0.8657f, 0.8735f, 0.8892f, 1.0f))); // Darker background
-        attachChild(backgroundContainer);
-
-        // Hauptcontainer für das Bestätigungspopup
-        confirmTradeContainer = new Container();
-
-        float padding = 10; // Passt den backgroundContainer an die Größe des confirmTradeContainer an
-        backgroundContainer.setPreferredSize(confirmTradeContainer.getPreferredSize().addLocal(padding, padding, 0));
-        
-        // Titel
-        Label title = confirmTradeContainer.addChild(new Label( "Handel", new ElementId("label-Bold")));
-        title.setFontSize(48);
-        title.setColor(ColorRGBA.Black);
-
-        StringBuilder offeredProperties = new StringBuilder();
-        for (PropertyField field : tradeHandler.getOfferedProperties()) {
-            offeredProperties.append(field.getName());
-            offeredProperties.append(", ");
-        }
-
-        StringBuilder requestedProperties = new StringBuilder();
-        for (PropertyField field : tradeHandler.getRequestedProperties()) {
-            requestedProperties.append(field.getName());
-            requestedProperties.append(", ");
-        }
-
-        // Text, der auf der Karte steht
-        // Die Werte werden dem Handel entnommen (Iwas auch immer da dann ist)
-        Container propertyValuesContainer = confirmTradeContainer.addChild(new Container());
-        propertyValuesContainer.addChild(new Label("„Spieler " + tradeHandler.getSender().getName() + " möchte:", new ElementId("label-Text"))); 
-        propertyValuesContainer.addChild(new Label("", new ElementId("label-Text")));// Leerzeile
-        propertyValuesContainer.addChild(new Label("- " + offeredProperties, new ElementId("label-Text")));
-        propertyValuesContainer.addChild(new Label("- " + tradeHandler.getOfferedAmount() + " EUR", new ElementId("label-Text")));
-        propertyValuesContainer.addChild(new Label("- " + tradeHandler.getOfferedJailCards() +" Sonderkaten", new ElementId("label-Text")));
-        propertyValuesContainer.addChild(new Label("", new ElementId("label-Text")));// Leerzeile
-        propertyValuesContainer.addChild(new Label("gegen:", new ElementId("label-Text")));
-        propertyValuesContainer.addChild(new Label("", new ElementId("label-Text")));// Leerzeile
-        propertyValuesContainer.addChild(new Label("- "+ requestedProperties, new ElementId("label-Text")));
-        propertyValuesContainer.addChild(new Label("- "+ tradeHandler.getRequestedAmount() +" EUR", new ElementId("label-Text")));
-        propertyValuesContainer.addChild(new Label("- "+ tradeHandler.getRequestedJailCards() +" Sonderkaten", new ElementId("label-Text")));
-        propertyValuesContainer.addChild(new Label("", new ElementId("label-Text")));// Leerzeile
-        propertyValuesContainer.addChild(new Label("tauschen, willst du das Angebot annehmen?", new ElementId("label-Text")));
-        propertyValuesContainer.setBackground(new QuadBackgroundComponent(new ColorRGBA(0.4657f, 0.4735f, 0.4892f, 1.0f)));
-
-        // Ablehnen-Button
-        Button declineButton = confirmTradeContainer.addChild(new Button("Ablehnen", new ElementId("button")));
-        declineButton.setFontSize(32);
-        declineButton.addClickCommands(s -> ifTopDialog(() -> {
-            app.getGameLogic().playSound(Sound.BUTTON);
-            app.getGameLogic().send(new TradeResponse(false, tradeHandler));
-            close();
-        }));
-        // Verhandeln-Button
-        Button negotiateButton = confirmTradeContainer.addChild(new Button("Verhandeln", new ElementId("button")));
-        negotiateButton.setFontSize(32);
-        negotiateButton.addClickCommands(s -> ifTopDialog( () -> {
-            app.getGameLogic().playSound(Sound.BUTTON);
-            close();
-            TradeHandler t = new TradeHandler(app.getGameLogic().getPlayerHandler().getPlayerById(tradeHandler.getSender().getId()));
-            t.setReceiver(app.getGameLogic().getPlayerHandler().getPlayerById(tradeHandler.getReceiver().getId()));
-            new TradeMenu(app, t).open();
-        }));
-        // Confirm-Button
-        Button confirmButton = confirmTradeContainer.addChild(new Button("Bestätigen", new ElementId("button")));
-        confirmButton.setFontSize(32);
-        confirmButton.addClickCommands(s -> ifTopDialog( () -> {
-            app.getGameLogic().playSound(Sound.BUTTON);
-            app.getGameLogic().send(new TradeResponse(true, tradeHandler));
-            close();
-        }));
-
-        // Zentriere das Menü
-        confirmTradeContainer.setLocalTranslation(
-            (app.getCamera().getWidth() - confirmTradeContainer.getPreferredSize().x) / 2,
-            (app.getCamera().getHeight() + confirmTradeContainer.getPreferredSize().y) / 2,
-            8
-        );
-
-        // Zentriere das Menü
-        backgroundContainer.setLocalTranslation(
-                (app.getCamera().getWidth() - confirmTradeContainer.getPreferredSize().x - padding) / 2,
-                (app.getCamera().getHeight() + confirmTradeContainer.getPreferredSize().y+ padding) / 2,
-                7
-        );
-
-        app.getGuiNode().attachChild(confirmTradeContainer);
-    }
-
-    /**
-     * Schließt das Menü und entfernt die GUI-Elemente.
-     */
-    @Override
-    public void close() {
-        app.getGuiNode().detachChild(confirmTradeContainer);  // Entferne das Menü
-        app.getGuiNode().detachChild(backgroundContainer); //Entfernt Rand
-        super.close();
-    }
-
-    @Override
-    public void escape() {
-        new SettingsMenu(app).open();
-    }
-}

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

@@ -1,115 +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.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;
-
-/**
- * EventCardPopup is a popup which appears when a certain EventCard is triggered by entering a EventCardField
- */
-public class EventCardPopup extends Dialog {
-    private final MonopolyApp app;
-    private final Geometry overlayBackground;
-    private final Container eventCardContainer;
-    private final Container backgroundContainer;
-    private final String description;
-
-
-    public EventCardPopup(MonopolyApp app, String description) {
-        super(app.getDialogManager());
-        this.app = app;
-        this.description = description;
-
-        // 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 Eventcard
-        eventCardContainer = new Container();
-        eventCardContainer.setBackground(new QuadBackgroundComponent(new ColorRGBA(0.8657f, 0.8735f, 0.8892f, 1.0f)));
-        eventCardContainer.setPreferredSize(new Vector3f(550,400,10));
-
-        float padding = 10; // Passt den backgroundContainer an die Größe des eventCardContainers an
-        backgroundContainer.setPreferredSize(eventCardContainer.getPreferredSize().addLocal(padding, padding, 0));
-
-        // Titel
-        Label gateFieldTitle = eventCardContainer.addChild(new Label("Ereigniskarte", new ElementId("settings-title")));
-        gateFieldTitle.setFontSize(48);
-        gateFieldTitle.setColor(ColorRGBA.Black);
-
-        // Text, der auf der Karte steht
-        // Die Erklärungsfelder werden automatisch den descriptions der Message entnommen
-        Container propertyValuesContainer = eventCardContainer.addChild(new Container());
-        propertyValuesContainer.addChild(new Label(description, new ElementId("label-Text")));
-        propertyValuesContainer.setBackground(new QuadBackgroundComponent(new ColorRGBA(0.4657f, 0.4735f, 0.4892f, 1.0f)));
-        propertyValuesContainer.setPreferredSize(new Vector3f(300,200,10));
-
-        // Beenden-Button
-        Button quitButton = eventCardContainer.addChild(new Button("Jawohl", new ElementId("button")));
-        quitButton.setFontSize(32);
-        quitButton.addClickCommands(source -> close());
-
-        // Zentriere das Popup
-        eventCardContainer.setLocalTranslation(
-            (app.getCamera().getWidth() - eventCardContainer.getPreferredSize().x) / 2,
-            (app.getCamera().getHeight() + eventCardContainer.getPreferredSize().y) / 2,
-            8
-        );
-
-        // Zentriere das Popup
-        backgroundContainer.setLocalTranslation(
-                (app.getCamera().getWidth() - eventCardContainer.getPreferredSize().x - padding) / 2,
-                (app.getCamera().getHeight() + eventCardContainer.getPreferredSize().y+ padding) / 2,
-                7
-        );
-
-        app.getGuiNode().attachChild(eventCardContainer);
-    }
-
-    /**
-     * Erstellt einen halbtransparenten Hintergrund für das Menü.
-     *
-     * @return Geometrie des Overlays
-     */
-    private Geometry createOverlayBackground() {
-        Quad quad = new Quad(app.getCamera().getWidth(), app.getCamera().getHeight());
-        Geometry overlay = new Geometry("Overlay", quad);
-        Material material = new Material(app.getAssetManager(), "Common/MatDefs/Misc/Unshaded.j3md");
-        material.setColor("Color", new ColorRGBA(0, 0, 0, 0.5f)); // Halbtransparent
-        material.getAdditionalRenderState().setBlendMode(BlendMode.Alpha);
-        overlay.setMaterial(material);
-        overlay.setLocalTranslation(0, 0, 0);
-        return overlay;
-    }
-
-    /**
-     * Schließt das Menü und entfernt die GUI-Elemente.
-     */
-    @Override
-    public void close() {
-        app.getGuiNode().detachChild(eventCardContainer);  // Entferne das Menü
-        app.getGuiNode().detachChild(backgroundContainer); //Entfernt Rand
-        app.getGuiNode().detachChild(overlayBackground);  // Entferne das Overlay
-        super.close();
-    }
-
-    @Override
-    public void escape() {
-        close();
-    }
-}

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

@@ -1,141 +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.client.gui.SettingsMenu;
-import pp.monopoly.message.client.BuyPropertyResponse;
-import pp.monopoly.model.fields.FoodField;
-import pp.monopoly.notification.Sound;
-
-/**
- * FoodFieldCard creates the popup for field information
- */
-public class FoodFieldCard extends Dialog {
-    private final MonopolyApp app;
-    private final Geometry overlayBackground;
-    private final Container foodFieldContainer;
-    private final Container backgroundContainer;
-
-    public FoodFieldCard(MonopolyApp app) {
-        super(app.getDialogManager());
-        this.app = app;
-
-        //Generate the corresponfing field
-        int index = app.getGameLogic().getPlayerHandler().getPlayerById(app.getId()).getFieldID();
-        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)));
-
-        float padding = 10; // Passt den backgroundContainer an die Größe des foodFieldContainers an
-        backgroundContainer.setPreferredSize(foodFieldContainer.getPreferredSize().addLocal(padding, padding, 0));
-
-        // 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);
-        settingsTitle.setColor(ColorRGBA.White);
-
-        // 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)));
-
-        // Beenden-Button
-        Button quitButton = foodFieldContainer.addChild(new Button("Beenden", new ElementId("button")));
-        quitButton.setFontSize(32);
-        quitButton.addClickCommands(s -> ifTopDialog(() -> {
-            app.getGameLogic().playSound(Sound.BUTTON);
-            close();
-        }));
-        // Kaufen-Button
-        Button buyButton = foodFieldContainer.addChild(new Button("Kaufen", new ElementId("button")));
-        buyButton.setFontSize(32);
-        buyButton.addClickCommands(s -> ifTopDialog( () -> {
-            app.getGameLogic().playSound(Sound.BUTTON);
-            app.getGameLogic().send(new BuyPropertyResponse());
-            close();
-        }));
-
-        // Zentriere das Popup
-        foodFieldContainer.setLocalTranslation(
-            (app.getCamera().getWidth() - foodFieldContainer.getPreferredSize().x) / 2,
-            (app.getCamera().getHeight() + foodFieldContainer.getPreferredSize().y) / 2,
-            8
-        );
-
-        // Zentriere das Popup
-        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() {
-        app.getGuiNode().detachChild(foodFieldContainer);  // Entferne das Menü
-        app.getGuiNode().detachChild(backgroundContainer); //Entfernt Rand
-        app.getGuiNode().detachChild(overlayBackground);  // Entferne das Overlay
-        super.close();
-    }
-
-    @Override
-    public void escape() {
-        new SettingsMenu(app).open();
-    }
-
-}

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

@@ -1,138 +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.client.gui.SettingsMenu;
-import pp.monopoly.message.client.BuyPropertyResponse;
-import pp.monopoly.model.fields.GateField;
-import pp.monopoly.notification.Sound;
-
-/**
- * GateFieldCard creates the popup for field information
- */
-public class GateFieldCard extends Dialog {
-    private final MonopolyApp app;
-    private final Geometry overlayBackground;
-    private final Container gateFieldContainer;
-    private final Container backgroundContainer;
-
-    public GateFieldCard(MonopolyApp app) {
-        super(app.getDialogManager());
-        this.app = app;
-
-        //Generate the corresponfing field
-        int index = app.getGameLogic().getPlayerHandler().getPlayerById(app.getId()).getFieldID();
-        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)));
-
-        float padding = 10; // Passt den backgroundContainer an die Größe des gateFieldContainers an
-        backgroundContainer.setPreferredSize(gateFieldContainer.getPreferredSize().addLocal(padding, padding, 0));
-
-        // Titel, bestehend aus dynamischen Namen anhand der ID und der Schriftfarbe/größe
-        Label gateFieldTitle = gateFieldContainer.addChild(new Label(field.getName(), new ElementId("settings-title")));
-        gateFieldTitle.setFontSize(48);
-        gateFieldTitle.setColor(ColorRGBA.White);
-
-        // 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("Miete: 250 EUR", new ElementId("label-Text")));
-        propertyValuesContainer.addChild(new Label("Wenn man", new ElementId("label-Text")));
-        propertyValuesContainer.addChild(new Label("2 Bahnhof besitzt: 500 EUR", new ElementId("label-Text")));
-        propertyValuesContainer.addChild(new Label("Wenn man", new ElementId("label-Text")));
-        propertyValuesContainer.addChild(new Label("3 Bahnhof besitzt: 1000 EUR", new ElementId("label-Text")));
-        propertyValuesContainer.addChild(new Label("Wenn man", new ElementId("label-Text")));
-        propertyValuesContainer.addChild(new Label("4 Bahnhof 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)));
-
-        // Beenden-Button
-        Button quitButton = gateFieldContainer.addChild(new Button("Beenden", new ElementId("button")));
-        quitButton.setFontSize(32);
-        quitButton.addClickCommands(s -> ifTopDialog(() -> {
-            app.getGameLogic().playSound(Sound.BUTTON);
-            close();
-        }));
-        // Kaufen-Button
-        Button buyButton = gateFieldContainer.addChild(new Button("Kaufen", new ElementId("button")));
-        buyButton.setFontSize(32);
-        buyButton.addClickCommands(s -> ifTopDialog(() -> {
-            app.getGameLogic().playSound(Sound.BUTTON);
-            app.getGameLogic().send(new BuyPropertyResponse());
-            close();
-        }));
-
-        // Zentriere das Popup
-        gateFieldContainer.setLocalTranslation(
-            (app.getCamera().getWidth() - gateFieldContainer.getPreferredSize().x) / 2,
-            (app.getCamera().getHeight() + gateFieldContainer.getPreferredSize().y) / 2,
-            8
-        );
-
-        // Zentriere das Popup
-        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() {
-        app.getGuiNode().detachChild(gateFieldContainer);  // Entferne das Menü
-        app.getGuiNode().detachChild(backgroundContainer); //Entfernt Rand
-        app.getGuiNode().detachChild(overlayBackground);  // Entferne das Overlay
-        super.close();
-    }
-
-    @Override
-    public void escape() {
-        new SettingsMenu(app).open();
-    }
-}

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

@@ -1,119 +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.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;
-
-/**
- * Gulag is a warning popup that is triggered when a certain player enters the "Wache" field
- */
-public class Gulag extends Dialog {
-    private final MonopolyApp app;
-    private final Geometry overlayBackground;
-    private final Container gulagContainer;
-    private final Container backgroundContainer;
-
-
-
-    public Gulag(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 die Warnung
-        gulagContainer = new Container();
-        gulagContainer.setBackground(new QuadBackgroundComponent(new ColorRGBA(0.8657f, 0.8735f, 0.8892f, 1.0f)));
-        gulagContainer.setPreferredSize(new Vector3f(550,250,10));
-
-        float padding = 10; // Passt den backgroundContainer an die Größe des bankruptContainers an
-        backgroundContainer.setPreferredSize(gulagContainer.getPreferredSize().addLocal(padding, padding, 0));
-
-        // Titel
-        Label gateFieldTitle = gulagContainer.addChild(new Label("Du kommst ins Gulag!", new ElementId("warning-title")));
-        gateFieldTitle.setFontSize(48);
-        gateFieldTitle.setColor(ColorRGBA.Black);
-
-        // Text, der auf der Karte steht
-        /* Container textContainer = gulagContainer.addChild(new Container());
-        textContainer.addChild(new Label("Du hast die Verbindung verloren und kannst nichts dagegen machen. Akzeptiere einfach, dass du verloren hast!", new ElementId("label-Text")));
-        textContainer.setBackground(new QuadBackgroundComponent(new ColorRGBA(0.4657f, 0.4735f, 0.4892f, 1.0f)));
-        textContainer.setPreferredSize(gulagContainer.getPreferredSize().addLocal(-250,-200,0));
-        */
-
-        // Beenden-Button
-        Button quitButton = gulagContainer.addChild(new Button("Jawohl Gulag", new ElementId("button")));
-        quitButton.setFontSize(32);
-        quitButton.addClickCommands(source -> close());
-
-
-        // Zentriere das Popup
-        gulagContainer.setLocalTranslation(
-            (app.getCamera().getWidth() - gulagContainer.getPreferredSize().x) / 2,
-            (app.getCamera().getHeight() + gulagContainer.getPreferredSize().y) / 2,
-            8
-        );
-
-        // Zentriere das Popup
-        backgroundContainer.setLocalTranslation(
-                (app.getCamera().getWidth() - gulagContainer.getPreferredSize().x - padding) / 2,
-                (app.getCamera().getHeight() + gulagContainer.getPreferredSize().y+ padding) / 2,
-                7
-        );
-
-        app.getGuiNode().attachChild(gulagContainer);
-    }
-
-    /**
-     * 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() {
-        app.getGuiNode().detachChild(gulagContainer);  // Entferne das Menü
-        app.getGuiNode().detachChild(backgroundContainer); //Entfernt Rand
-        app.getGuiNode().detachChild(overlayBackground);  // Entferne das Overlay
-        super.close();
-    }
-
-    @Override
-    public void escape() {
-        close();
-    }
-
-}

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

@@ -1,129 +0,0 @@
-package pp.monopoly.client.gui.popups;
-
-import com.jme3.material.Material;
-import com.jme3.material.RenderState;
-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.Button;
-import com.simsilica.lemur.Container;
-import com.simsilica.lemur.Label;
-import com.simsilica.lemur.component.IconComponent;
-import com.simsilica.lemur.component.QuadBackgroundComponent;
-import com.simsilica.lemur.style.ElementId;
-import pp.dialog.Dialog;
-import pp.monopoly.client.MonopolyApp;
-import pp.monopoly.notification.Sound;
-
-public class LooserPopUp extends Dialog {
-    private final MonopolyApp app;
-    private final Geometry overlayBackground;
-    private final Container LooserContainer;
-    private final Container backgroundContainer;
-
-
-    /**
-     * Constructs a new WinnerPopUp dialog.
-     *
-     * @param app The MonopolyApp instance.
-     */
-    public LooserPopUp(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 die Warnung
-        LooserContainer = new Container();
-        LooserContainer.setBackground(new QuadBackgroundComponent(new ColorRGBA(0.8657f, 0.8735f, 0.8892f, 1.0f)));
-        LooserContainer.setPreferredSize(new Vector3f(355,600,10));
-
-        float padding = 10; // Passt den backgroundContainer an die Größe des bankruptContainers an
-        backgroundContainer.setPreferredSize(LooserContainer.getPreferredSize().addLocal(padding, padding, 0));
-
-        // Titel
-        Label looserTitle = LooserContainer.addChild(new Label("Schade, du hast leider verloren, die nächste Runde wird besser!", new ElementId("header")));
-        looserTitle.setFontSize(25);
-        // looserTitle.setColor(ColorRGBA.Black);
-        // Create the image container
-        Container imageContainer = LooserContainer.addChild(new Container());
-        imageContainer.setBackground(new QuadBackgroundComponent(new ColorRGBA(0.4657f, 0.4735f, 0.4892f, 1.0f))); // Dark gray background
-        imageContainer.setPreferredSize(LooserContainer.getPreferredSize().addLocal(-250, -200, 0)); // Adjust size for layout
-
-        // Add the image to the container
-        Label imageLabel = new Label(""); // Create a label for the image
-        IconComponent icon = new IconComponent("Pictures/MonopolyLooser.png"); // Load the image as an icon
-        icon.setIconScale(0.7f); // Scale the image appropriately
-        imageLabel.setIcon(icon);
-        imageContainer.addChild(imageLabel); // Add the image label to the container
-
-        //Beenden Button
-        Button quitButton = LooserContainer.addChild(new Button("Spiel Beenden", new ElementId("button")));
-        quitButton.setFontSize(32);
-        quitButton.addClickCommands(s -> ifTopDialog(() -> {
-            app.getGameLogic().playSound(Sound.BUTTON);
-            app.closeApp();
-        }));
-
-
-        // Zentriere das Popup
-        LooserContainer.setLocalTranslation(
-                (app.getCamera().getWidth() - LooserContainer.getPreferredSize().x) / 2,
-                (app.getCamera().getHeight() + LooserContainer.getPreferredSize().y) / 2,
-                8
-        );
-
-        // Zentriere das Popup
-        backgroundContainer.setLocalTranslation(
-                (app.getCamera().getWidth() - LooserContainer.getPreferredSize().x - padding) / 2,
-                (app.getCamera().getHeight() + LooserContainer.getPreferredSize().y+ padding) / 2,
-                7
-        );
-
-        app.getGuiNode().attachChild(LooserContainer);
-    }
-
-    /**
-     * 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(RenderState.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() {
-        app.getGuiNode().detachChild(LooserContainer);  // Entferne das Menü
-        app.getGuiNode().detachChild(backgroundContainer); //Entfernt Rand
-        app.getGuiNode().detachChild(overlayBackground);  // Entferne das Overlay
-        super.close();
-    }
-
-    @Override
-    public void escape() {
-        close();
-    }
-
-}

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

@@ -1,118 +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.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;
-
-/**
- * Bankrupt is a Warning-Popup which appears when the balance is negative at the end of a player´s turn
- */
-public class NoMoneyWarning extends Dialog {
-    private final MonopolyApp app;
-    private final Geometry overlayBackground;
-    private final Container noMoneyWarningContainer;
-    private final Container backgroundContainer;
-
-
-
-    public NoMoneyWarning(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 die Warnung
-        noMoneyWarningContainer = new Container();
-        noMoneyWarningContainer.setBackground(new QuadBackgroundComponent(new ColorRGBA(0.8657f, 0.8735f, 0.8892f, 1.0f)));
-        noMoneyWarningContainer.setPreferredSize(new Vector3f(550,250,10));
-
-        float padding = 10; // Passt den backgroundContainer an die Größe des bankruptContainers an
-        backgroundContainer.setPreferredSize(noMoneyWarningContainer.getPreferredSize().addLocal(padding, padding, 0));
-
-        // Titel
-        Label gateFieldTitle = noMoneyWarningContainer.addChild(new Label("Na, schon wieder Pleite?", new ElementId("warning-title")));
-        gateFieldTitle.setFontSize(38);
-        gateFieldTitle.setColor(ColorRGBA.Black);
-
-        // Text, der im Popup steht
-        Container textContainer = noMoneyWarningContainer.addChild(new Container());
-        textContainer.addChild(new Label("Du hast nicht genug Geld, um dieses Gebäude zu kaufen", new ElementId("label-Text")));
-        textContainer.setBackground(new QuadBackgroundComponent(new ColorRGBA(0.4657f, 0.4735f, 0.4892f, 1.0f)));
-
-        // Passt den textContainer an die Größe des bankruptContainers an
-        textContainer.setPreferredSize(noMoneyWarningContainer.getPreferredSize().addLocal(-250,-200,0));
-
-        // Beenden-Button
-        Button quitButton = noMoneyWarningContainer.addChild(new Button("Bestätigen", new ElementId("button")));
-        quitButton.setFontSize(32);
-        quitButton.addClickCommands(source -> close());
-
-
-        // Zentriere das Popup
-        noMoneyWarningContainer.setLocalTranslation(
-            (app.getCamera().getWidth() - noMoneyWarningContainer.getPreferredSize().x) / 2,
-            (app.getCamera().getHeight() + noMoneyWarningContainer.getPreferredSize().y) / 2,
-            8
-        );
-
-        // Zentriere das Popup
-        backgroundContainer.setLocalTranslation(
-                (app.getCamera().getWidth() - noMoneyWarningContainer.getPreferredSize().x - padding) / 2,
-                (app.getCamera().getHeight() + noMoneyWarningContainer.getPreferredSize().y+ padding) / 2,
-                7
-        );
-
-        app.getGuiNode().attachChild(noMoneyWarningContainer);
-    }
-
-    /**
-     * 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;
-    }
-
-    /**
-     * Closes the menu and removes the GUI elements.
-     */
-    @Override
-    public void close() {
-        app.getGuiNode().detachChild(noMoneyWarningContainer);  // Entferne das Menü
-        app.getGuiNode().detachChild(backgroundContainer); //Entfernt Rand
-        app.getGuiNode().detachChild(overlayBackground);  // Entferne das Overlay
-        super.close();
-    }
-
-    @Override
-    public void escape() {
-        close();
-    }
-}

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

@@ -1,120 +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.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;
-
-/**
- * Bankrupt is a Warning-Popup which appears when the balance is negative at the end of a player´s turn
- */
-public class RejectTrade extends Dialog {
-    private final MonopolyApp app;
-    private final Geometry overlayBackground;
-    private final Container noMoneyWarningContainer;
-    private final Container backgroundContainer;
-
-
-
-    public RejectTrade(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 die Warnung
-        noMoneyWarningContainer = new Container();
-        noMoneyWarningContainer.setBackground(new QuadBackgroundComponent(new ColorRGBA(0.8657f, 0.8735f, 0.8892f, 1.0f)));
-        noMoneyWarningContainer.setPreferredSize(new Vector3f(550,250,10));
-
-        float padding = 10; // Passt den backgroundContainer an die Größe des bankruptContainers an
-        backgroundContainer.setPreferredSize(noMoneyWarningContainer.getPreferredSize().addLocal(padding, padding, 0));
-
-        // Titel
-        Label gateFieldTitle = noMoneyWarningContainer.addChild(new Label("Handel abgelehnt!", new ElementId("warning-title")));
-        gateFieldTitle.setFontSize(48);
-        gateFieldTitle.setColor(ColorRGBA.Black);
-
-        // Text, der im Popup steht
-        Container textContainer = noMoneyWarningContainer.addChild(new Container());
-        textContainer.addChild(new Label("Du hast Spieler XXX einen Handel vorgeschlagen", new ElementId("label-Text")));
-        textContainer.addChild(new Label("", new ElementId("label-Text")));
-        textContainer.addChild(new Label("Der Handel wurde abgelehnt", new ElementId("label-Text")));
-        textContainer.setBackground(new QuadBackgroundComponent(new ColorRGBA(0.4657f, 0.4735f, 0.4892f, 1.0f)));
-
-        // Passt den textContainer an die Größe des bankruptContainers an
-        textContainer.setPreferredSize(noMoneyWarningContainer.getPreferredSize().addLocal(-250,-200,0));
-
-        // Beenden-Button
-        Button quitButton = noMoneyWarningContainer.addChild(new Button("Bestätigen", new ElementId("button")));
-        quitButton.setFontSize(32);
-        quitButton.addClickCommands(source -> close());
-
-
-        // Zentriere das Popup
-        noMoneyWarningContainer.setLocalTranslation(
-            (app.getCamera().getWidth() - noMoneyWarningContainer.getPreferredSize().x) / 2,
-            (app.getCamera().getHeight() + noMoneyWarningContainer.getPreferredSize().y) / 2,
-            8
-        );
-
-        // Zentriere das Popup
-        backgroundContainer.setLocalTranslation(
-                (app.getCamera().getWidth() - noMoneyWarningContainer.getPreferredSize().x - padding) / 2,
-                (app.getCamera().getHeight() + noMoneyWarningContainer.getPreferredSize().y+ padding) / 2,
-                7
-        );
-
-        app.getGuiNode().attachChild(noMoneyWarningContainer);
-    }
-
-    /**
-     * 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;
-    }
-
-    /**
-     * Closes the menu and removes the GUI elements.
-     */
-    @Override
-    public void close() {
-        app.getGuiNode().detachChild(noMoneyWarningContainer);  // Entferne das Menü
-        app.getGuiNode().detachChild(backgroundContainer); //Entfernt Rand
-        app.getGuiNode().detachChild(overlayBackground);  // Entferne das Overlay
-        super.close();
-    }
-
-    @Override
-    public void escape() {
-        close();
-    }
-}

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

@@ -1,149 +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.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.notification.Sound;
-
-/**
- * Rent popup is triggered when a player enters a field owned by another player and needs to pay rent.
- */
-public class Rent extends Dialog {
-    private final MonopolyApp app;
-    private final Geometry overlayBackground;
-    private final Container rentContainer;
-    private final Container backgroundContainer;
-
-    public Rent(MonopolyApp app, String playerName, int amount) {
-        super(app.getDialogManager());
-        this.app = app;
-
-        // Create the overlay
-        overlayBackground = createOverlayBackground();
-        app.getGuiNode().attachChild(overlayBackground);
-
-        // Create and position the background container
-        backgroundContainer = createBackgroundContainer();
-        app.getGuiNode().attachChild(backgroundContainer);
-
-        // Create and position the rent container
-        rentContainer = createRentContainer(playerName, amount);
-        app.getGuiNode().attachChild(rentContainer);
-
-        centerContainers();
-    }
-
-    /**
-     * Creates a semi-transparent overlay background.
-     *
-     * @return the overlay geometry
-     */
-    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)); // Semi-transparent black
-        material.getAdditionalRenderState().setBlendMode(BlendMode.Alpha);
-        overlay.setMaterial(material);
-        overlay.setLocalTranslation(0, 0, 0);
-        return overlay;
-    }
-
-    /**
-     * Creates the background container with styling.
-     *
-     * @return the styled background container
-     */
-    private Container createBackgroundContainer() {
-        Container container = new Container();
-        container.setBackground(new QuadBackgroundComponent(new ColorRGBA(0.8657f, 0.8735f, 0.8892f, 1.0f))); // Light gray background
-        return container;
-    }
-
-    /**
-     * Creates the main rent container with title, text, and button.
-     *
-     * @param playerName the name of the player to whom the rent is owed
-     * @param amount     the rent amount
-     * @return the rent container
-     */
-    private Container createRentContainer(String playerName, int amount) {
-        Container container = new Container();
-        container.setBackground(new QuadBackgroundComponent(ColorRGBA.Gray));
-        container.setPreferredSize(new Vector3f(550, 250, 10));
-
-        // Title
-        Label title = container.addChild(new Label("Miete!", new ElementId("label-Bold")));
-        title.setFontSize(48);
-        title.setColor(ColorRGBA.Black);
-
-        // Rent message
-        Container textContainer = container.addChild(new Container());
-        textContainer.addChild(new Label("Du musst Spieler " + playerName + " " + amount + " EUR Miete zahlen",
-                new ElementId("label-Text")));
-        textContainer.setBackground(new QuadBackgroundComponent(new ColorRGBA(0.4657f, 0.4735f, 0.4892f, 1.0f)));
-        textContainer.setPreferredSize(container.getPreferredSize().addLocal(-250, -200, 0));
-
-        // Payment button
-        Button payButton = container.addChild(new Button("Überweisen", new ElementId("button")));
-        payButton.setFontSize(32);
-        payButton.addClickCommands(s -> ifTopDialog( () -> {
-                app.getGameLogic().playSound(Sound.BUTTON);
-                close();
-
-        }));
-
-        return container;
-    }
-
-    /**
-     * Centers the rent and background containers on the screen.
-     */
-    private void centerContainers() {
-        float padding = 10;
-
-        // Center rent container
-        rentContainer.setLocalTranslation(
-                (app.getCamera().getWidth() - rentContainer.getPreferredSize().x) / 2,
-                (app.getCamera().getHeight() + rentContainer.getPreferredSize().y) / 2,
-                8
-        );
-
-        // Center background container with padding
-        backgroundContainer.setPreferredSize(rentContainer.getPreferredSize().addLocal(padding, padding, 0));
-        backgroundContainer.setLocalTranslation(
-                (app.getCamera().getWidth() - backgroundContainer.getPreferredSize().x) / 2,
-                (app.getCamera().getHeight() + backgroundContainer.getPreferredSize().y) / 2,
-                7
-        );
-    }
-
-    /**
-     * Closes the popup and removes GUI elements.
-     */
-    @Override
-    public void close() {
-        app.getGuiNode().detachChild(rentContainer);
-        app.getGuiNode().detachChild(backgroundContainer);
-        app.getGuiNode().detachChild(overlayBackground);
-        super.close();
-    }
-
-    /**
-     * Handles the escape action to close the dialog.
-     */
-    @Override
-    public void escape() {
-        close();
-    }
-}

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

@@ -1,155 +0,0 @@
-package pp.monopoly.client.gui.popups;
-
-import com.jme3.math.ColorRGBA;
-import com.jme3.math.Vector3f;
-import com.simsilica.lemur.Button;
-import com.simsilica.lemur.Container;
-import com.simsilica.lemur.Label;
-import com.simsilica.lemur.ListBox;
-import com.simsilica.lemur.component.QuadBackgroundComponent;
-import com.simsilica.lemur.core.VersionedList;
-import com.simsilica.lemur.style.ElementId;
-import pp.dialog.Dialog;
-import pp.monopoly.client.MonopolyApp;
-import pp.monopoly.client.gui.SettingsMenu;
-import pp.monopoly.game.server.Player;
-import pp.monopoly.model.fields.BoardManager;
-import pp.monopoly.model.fields.BuildingProperty;
-import pp.monopoly.notification.Sound;
-
-import java.util.List;
-import java.util.stream.Collectors;
-
-/**
- * RepayMortage is a popup which appears when a player clicks on the "Repay Mortage"-button in the BuildingAdminMenu
- */
-public class RepayMortage extends Dialog {
-    private final MonopolyApp app;
-    private final Container repayMortageContainer;
-    private final Container backgroundContainer;
-
-
-    public RepayMortage(MonopolyApp app) {
-        super(app.getDialogManager());
-        this.app = app;
-
-        // Create the background container
-        backgroundContainer = new Container();
-        backgroundContainer.setBackground(new QuadBackgroundComponent(new ColorRGBA(0.8657f, 0.8735f, 0.8892f, 1.0f))); // Darker background
-        attachChild(backgroundContainer);
-
-        // Hauptcontainer für das Menü
-        repayMortageContainer = new Container();
-        repayMortageContainer.setPreferredSize(new Vector3f(800, 600, 0));
-
-        float padding = 10; // Passt den backgroundContainer an die Größe des sellhouseContainers an
-        backgroundContainer.setPreferredSize(repayMortageContainer.getPreferredSize().addLocal(padding, padding, 0));
-
-        // Titel
-        Label title = repayMortageContainer.addChild(new Label( "Hypothek Abbezahlen", new ElementId("warining-Bold")));
-        title.setFontSize(48);
-        title.setColor(ColorRGBA.Black);
-
-        //Unterteilund des sellHouseContainer in drei "Untercontainer"
-        Container upContainer = repayMortageContainer.addChild(new Container());
-        Container middleContainer = repayMortageContainer.addChild(new Container());
-        Container downContainer = repayMortageContainer.addChild(new Container());
-
-        // Text, der auf der Karte steht
-        upContainer.addChild(new Label("„Grundstück wählen:", new ElementId("label-Text"))); //TODO hier überall die entsprechenden Variablen einfügen
-        upContainer.addChild(new Label("", new ElementId("label-Text")));// Leerzeile
-        upContainer.setBackground(new QuadBackgroundComponent(new ColorRGBA(0.4657f, 0.4735f, 0.4892f, 1.0f)));
-
-        middleContainer.setPreferredSize(new Vector3f(100, 150, 0));
-        middleContainer.setBackground(new QuadBackgroundComponent(ColorRGBA.Orange));
-
-        // Create a VersionedList for the ListBox model
-        VersionedList<BuildingProperty> listModel = new VersionedList<>();
-
-        // Retrieve current player and their properties //TODO hier Prüfen, ob abweichungen zur SellHouse-Klasse beachtet werden müssen
-        Player currentPlayer = app.getGameLogic().getPlayerHandler().getPlayerById(app.getId());
-        BoardManager boardManager = app.getGameLogic().getBoardManager();
-
-        List<BuildingProperty> playerProperties = boardManager.getPropertyFields(
-                                                                      currentPlayer.getProperties()).stream()
-                                                              .filter(property -> property instanceof BuildingProperty)
-                                                              .map(property -> (BuildingProperty) property)
-                                                              .filter(property -> property.getHouses() > 0 || property.getHotel() == 1)
-                                                              .collect(Collectors.toList());
-
-        // Populate the list model
-        listModel.addAll(playerProperties);
-
-        // Create a ListBox with the "glass" style and the model
-        ListBox<BuildingProperty> listBox = new ListBox<>(listModel, "glass");
-        listBox.setPreferredSize(new Vector3f(300, 200, 0)); // Adjust size as needed
-
-        // Add selection listener
-        listBox.addClickCommands(item -> {
-            BuildingProperty selected = listBox.getSelectedItem(); // Correct method to retrieve the selected item
-            if (selected != null) {
-                System.out.println("Selected property: " + selected.getName());
-            }
-        });
-
-        // Add the ListBox to the middle container
-        middleContainer.addChild(listBox);
-
-
-        downContainer.addChild(new Label("", new ElementId("label-Text")));// Leerzeile
-        downContainer.addChild(new Label("Kosten:", new ElementId("label-Text")));// Leerzeile
-        downContainer.addChild(new Label("Hier die tätsächliche Erstattung", new ElementId("label-Text")));
-        downContainer.setBackground(new QuadBackgroundComponent(new ColorRGBA(0.4657f, 0.4735f, 0.4892f, 1.0f)));
-
-        // Beenden-Button
-        Button cancelButton = repayMortageContainer.addChild(new Button("Abbrechen", new ElementId("button")));
-        cancelButton.setFontSize(32);
-        cancelButton.addClickCommands(s -> ifTopDialog(() -> {
-            app.getGameLogic().playSound(Sound.BUTTON);
-            close();
-        }));
-        // Kaufen-Button
-        Button confirmButton = repayMortageContainer.addChild(new Button("Bestätigen", new ElementId("button")));
-        confirmButton.setFontSize(32);
-        confirmButton.addClickCommands(s -> ifTopDialog( () -> {
-            app.getGameLogic().playSound(Sound.BUTTON);
-            BuildingProperty selected = listBox.getSelectedItem();
-            if (selected != null) {
-                System.out.println("Confirmed property: " + selected.getName());
-                // Send the "alter building" message to the server
-               //app.getGameLogic().sendMessage(new AlterBuildingMessage(selected.getId(), false)); TODO Message an Server
-            }
-        }));
-
-        // Zentriere das Popup
-        repayMortageContainer.setLocalTranslation(
-            (app.getCamera().getWidth() - repayMortageContainer.getPreferredSize().x) / 2,
-            (app.getCamera().getHeight() + repayMortageContainer.getPreferredSize().y) / 2,
-            9
-        );
-
-        // Zentriere das Popup
-        backgroundContainer.setLocalTranslation(
-                (app.getCamera().getWidth() - repayMortageContainer.getPreferredSize().x - padding) / 2,
-                (app.getCamera().getHeight() + repayMortageContainer.getPreferredSize().y+ padding) / 2,
-                8
-        );
-
-        app.getGuiNode().attachChild(repayMortageContainer);
-    }
-
-    /**
-     * Schließt das Menü und entfernt die GUI-Elemente.
-     */
-    @Override
-    public void close() {
-        app.getGuiNode().detachChild(repayMortageContainer);  // Entferne das Menü
-        app.getGuiNode().detachChild(backgroundContainer); //Entfernt Rand
-        super.close();
-    }
-
-    @Override
-    public void escape() {
-        new SettingsMenu(app).open();
-    }
-}

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/client/src/main/java/pp/monopoly/client/gui/popups/SellHouse.java

@@ -1,159 +0,0 @@
-package pp.monopoly.client.gui.popups;
-
-import com.jme3.math.ColorRGBA;
-import com.jme3.math.Vector2f;
-import com.jme3.math.Vector3f;
-import com.simsilica.lemur.Button;
-import com.simsilica.lemur.Checkbox;
-import com.simsilica.lemur.Container;
-import com.simsilica.lemur.Label;
-import com.simsilica.lemur.ListBox;
-import com.simsilica.lemur.component.IconComponent;
-import com.simsilica.lemur.component.QuadBackgroundComponent;
-import com.simsilica.lemur.core.VersionedList;
-import com.simsilica.lemur.style.ElementId;
-import pp.dialog.Dialog;
-import pp.monopoly.client.MonopolyApp;
-import pp.monopoly.client.gui.SettingsMenu;
-import pp.monopoly.game.server.Player;
-import pp.monopoly.message.client.BuyPropertyResponse;
-import pp.monopoly.model.fields.BoardManager;
-import pp.monopoly.model.fields.BuildingProperty;
-import pp.monopoly.notification.Sound;
-
-import java.util.List;
-import java.util.stream.Collectors;
-
-/**
- * SellHouse is a popup which appears when a player clicks on the "demolish"-button in the BuildingAdminMenu
- */
-public class SellHouse extends Dialog {
-    private final MonopolyApp app;
-    private final Container sellhouseContainer;
-    private final Container backgroundContainer;
-
-
-    public SellHouse(MonopolyApp app) {
-        super(app.getDialogManager());
-        this.app = app;
-
-        // Create the background container
-        backgroundContainer = new Container();
-        backgroundContainer.setBackground(new QuadBackgroundComponent(new ColorRGBA(0.8657f, 0.8735f, 0.8892f, 1.0f))); // Darker background
-        attachChild(backgroundContainer);
-
-        // Hauptcontainer für das Menü
-        sellhouseContainer = new Container();
-        sellhouseContainer.setPreferredSize(new Vector3f(800, 600, 0));
-
-        float padding = 10; // Passt den backgroundContainer an die Größe des sellhouseContainers an
-        backgroundContainer.setPreferredSize(sellhouseContainer.getPreferredSize().addLocal(padding, padding, 0));
-
-        // Titel
-        Label title = sellhouseContainer.addChild(new Label( "Gebäude Abreißen", new ElementId("warining-Bold")));
-        title.setFontSize(48);
-        title.setColor(ColorRGBA.Black);
-
-        //Unterteilund des sellHouseContainer in drei "Untercontainer"
-        Container upContainer = sellhouseContainer.addChild(new Container());
-        Container middleContainer = sellhouseContainer.addChild(new Container());
-        Container downContainer = sellhouseContainer.addChild(new Container());
-
-        // Text, der auf der Karte steht
-        upContainer.addChild(new Label("„Grundstück wählen:", new ElementId("label-Text"))); //TODO hier überall die entsprechenden Variablen einfügen
-        upContainer.addChild(new Label("", new ElementId("label-Text")));// Leerzeile
-        upContainer.setBackground(new QuadBackgroundComponent(new ColorRGBA(0.4657f, 0.4735f, 0.4892f, 1.0f)));
-
-        middleContainer.setPreferredSize(new Vector3f(100, 150, 0));
-        middleContainer.setBackground(new QuadBackgroundComponent(ColorRGBA.Orange));
-
-        // Create a VersionedList for the ListBox model
-        VersionedList<BuildingProperty> listModel = new VersionedList<>();
-
-        // Retrieve current player and their properties
-        Player currentPlayer = app.getGameLogic().getPlayerHandler().getPlayerById(app.getId());
-        BoardManager boardManager = app.getGameLogic().getBoardManager();
-
-        List<BuildingProperty> playerProperties = boardManager.getPropertyFields(
-                                                                      currentPlayer.getProperties()).stream()
-                                                              .filter(property -> property instanceof BuildingProperty)
-                                                              .map(property -> (BuildingProperty) property)
-                                                              .filter(property -> property.getHouses() > 0 || property.getHotel() == 1)
-                                                              .collect(Collectors.toList());
-
-        // Populate the list model
-        listModel.addAll(playerProperties);
-
-        // Create a ListBox with the "glass" style and the model
-        ListBox<BuildingProperty> listBox = new ListBox<>(listModel, "glass");
-        listBox.setPreferredSize(new Vector3f(300, 200, 0)); // Adjust size as needed
-
-        // Add selection listener
-        listBox.addClickCommands(item -> {
-            BuildingProperty selected = listBox.getSelectedItem(); // Correct method to retrieve the selected item
-            if (selected != null) {
-                System.out.println("Selected property: " + selected.getName());
-            }
-        });
-
-        // Add the ListBox to the middle container
-        middleContainer.addChild(listBox);
-
-
-        downContainer.addChild(new Label("", new ElementId("label-Text")));// Leerzeile
-        downContainer.addChild(new Label("Erstattung:", new ElementId("label-Text")));// Leerzeile
-        downContainer.addChild(new Label("Hier die tätsächliche Erstattung", new ElementId("label-Text")));
-        downContainer.setBackground(new QuadBackgroundComponent(new ColorRGBA(0.4657f, 0.4735f, 0.4892f, 1.0f)));
-
-        // Beenden-Button
-        Button cancelButton = sellhouseContainer.addChild(new Button("Abbrechen", new ElementId("button")));
-        cancelButton.setFontSize(32);
-        cancelButton.addClickCommands(s -> ifTopDialog(() -> {
-            app.getGameLogic().playSound(Sound.BUTTON);
-            close();
-        }));
-        // Kaufen-Button
-        Button confirmButton = sellhouseContainer.addChild(new Button("Bestätigen", new ElementId("button")));
-        confirmButton.setFontSize(32);
-        confirmButton.addClickCommands(s -> ifTopDialog( () -> {
-            app.getGameLogic().playSound(Sound.BUTTON);
-            BuildingProperty selected = listBox.getSelectedItem();
-            if (selected != null) {
-                System.out.println("Confirmed property: " + selected.getName());
-                // Send the "alter building" message to the server
-               //app.getGameLogic().sendMessage(new AlterBuildingMessage(selected.getId(), false)); TODO Message an Server
-            }
-        }));
-
-        // Zentriere das Popup
-        sellhouseContainer.setLocalTranslation(
-            (app.getCamera().getWidth() - sellhouseContainer.getPreferredSize().x) / 2,
-            (app.getCamera().getHeight() + sellhouseContainer.getPreferredSize().y) / 2,
-            9
-        );
-
-        // Zentriere das Popup
-        backgroundContainer.setLocalTranslation(
-                (app.getCamera().getWidth() - sellhouseContainer.getPreferredSize().x - padding) / 2,
-                (app.getCamera().getHeight() + sellhouseContainer.getPreferredSize().y+ padding) / 2,
-                8
-        );
-
-        app.getGuiNode().attachChild(sellhouseContainer);
-    }
-
-    /**
-     * Schließt das Menü und entfernt die GUI-Elemente.
-     */
-    @Override
-    public void close() {
-        app.getGuiNode().detachChild(sellhouseContainer);  // Entferne das Menü
-        app.getGuiNode().detachChild(backgroundContainer); //Entfernt Rand
-        super.close();
-    }
-
-    @Override
-    public void escape() {
-        new SettingsMenu(app).open();
-    }
-}

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

@@ -1,155 +0,0 @@
-package pp.monopoly.client.gui.popups;
-
-import com.jme3.math.ColorRGBA;
-import com.jme3.math.Vector3f;
-import com.simsilica.lemur.Button;
-import com.simsilica.lemur.Container;
-import com.simsilica.lemur.Label;
-import com.simsilica.lemur.ListBox;
-import com.simsilica.lemur.component.QuadBackgroundComponent;
-import com.simsilica.lemur.core.VersionedList;
-import com.simsilica.lemur.style.ElementId;
-import pp.dialog.Dialog;
-import pp.monopoly.client.MonopolyApp;
-import pp.monopoly.client.gui.SettingsMenu;
-import pp.monopoly.game.server.Player;
-import pp.monopoly.model.fields.BoardManager;
-import pp.monopoly.model.fields.BuildingProperty;
-import pp.monopoly.notification.Sound;
-
-import java.util.List;
-import java.util.stream.Collectors;
-
-/**
- * TakeMortage is a popup which appears when a player clicks on the "TakeMortage"-button in the BuildingAdminMenu
- */
-public class TakeMortage extends Dialog {
-    private final MonopolyApp app;
-    private final Container takeMortageContainer;
-    private final Container backgroundContainer;
-
-
-    public TakeMortage(MonopolyApp app) {
-        super(app.getDialogManager());
-        this.app = app;
-
-        // Create the background container
-        backgroundContainer = new Container();
-        backgroundContainer.setBackground(new QuadBackgroundComponent(new ColorRGBA(0.8657f, 0.8735f, 0.8892f, 1.0f))); // Darker background
-        attachChild(backgroundContainer);
-
-        // Hauptcontainer für das Menü
-        takeMortageContainer = new Container();
-        takeMortageContainer.setPreferredSize(new Vector3f(800, 600, 0));
-
-        float padding = 10; // Passt den backgroundContainer an die Größe des sellhouseContainers an
-        backgroundContainer.setPreferredSize(takeMortageContainer.getPreferredSize().addLocal(padding, padding, 0));
-
-        // Titel
-        Label title = takeMortageContainer.addChild(new Label( "Hypothek aufnehmen", new ElementId("warining-Bold")));
-        title.setFontSize(48);
-        title.setColor(ColorRGBA.Black);
-
-        //Unterteilund des sellHouseContainer in drei "Untercontainer"
-        Container upContainer = takeMortageContainer.addChild(new Container());
-        Container middleContainer = takeMortageContainer.addChild(new Container());
-        Container downContainer = takeMortageContainer.addChild(new Container());
-
-        // Text, der auf der Karte steht
-        upContainer.addChild(new Label("„Grundstück wählen:", new ElementId("label-Text"))); //TODO hier überall die entsprechenden Variablen einfügen
-        upContainer.addChild(new Label("", new ElementId("label-Text")));// Leerzeile
-        upContainer.setBackground(new QuadBackgroundComponent(new ColorRGBA(0.4657f, 0.4735f, 0.4892f, 1.0f)));
-
-        middleContainer.setPreferredSize(new Vector3f(100, 150, 0));
-        middleContainer.setBackground(new QuadBackgroundComponent(ColorRGBA.Orange));
-
-        // Create a VersionedList for the ListBox model
-        VersionedList<BuildingProperty> listModel = new VersionedList<>();
-
-        // Retrieve current player and their properties //TODO hier Prüfen, ob abweichungen zur SellHouse-Klasse beachtet werden müssen
-        Player currentPlayer = app.getGameLogic().getPlayerHandler().getPlayerById(app.getId());
-        BoardManager boardManager = app.getGameLogic().getBoardManager();
-
-        List<BuildingProperty> playerProperties = boardManager.getPropertyFields(
-                                                                      currentPlayer.getProperties()).stream()
-                                                              .filter(property -> property instanceof BuildingProperty)
-                                                              .map(property -> (BuildingProperty) property)
-                                                              .filter(property -> property.getHouses() > 0 || property.getHotel() == 1)
-                                                              .collect(Collectors.toList());
-
-        // Populate the list model
-        listModel.addAll(playerProperties);
-
-        // Create a ListBox with the "glass" style and the model
-        ListBox<BuildingProperty> listBox = new ListBox<>(listModel, "glass");
-        listBox.setPreferredSize(new Vector3f(300, 200, 0)); // Adjust size as needed
-
-        // Add selection listener
-        listBox.addClickCommands(item -> {
-            BuildingProperty selected = listBox.getSelectedItem(); // Correct method to retrieve the selected item
-            if (selected != null) {
-                System.out.println("Selected property: " + selected.getName());
-            }
-        });
-
-        // Add the ListBox to the middle container
-        middleContainer.addChild(listBox);
-
-
-        downContainer.addChild(new Label("", new ElementId("label-Text")));// Leerzeile
-        downContainer.addChild(new Label("Erstattung:", new ElementId("label-Text")));// Leerzeile
-        downContainer.addChild(new Label("Hier die tätsächliche Erstattung", new ElementId("label-Text")));
-        downContainer.setBackground(new QuadBackgroundComponent(new ColorRGBA(0.4657f, 0.4735f, 0.4892f, 1.0f)));
-
-        // Beenden-Button
-        Button cancelButton = takeMortageContainer.addChild(new Button("Abbrechen", new ElementId("button")));
-        cancelButton.setFontSize(32);
-        cancelButton.addClickCommands(s -> ifTopDialog(() -> {
-            app.getGameLogic().playSound(Sound.BUTTON);
-            close();
-        }));
-        // Kaufen-Button
-        Button confirmButton = takeMortageContainer.addChild(new Button("Bestätigen", new ElementId("button")));
-        confirmButton.setFontSize(32);
-        confirmButton.addClickCommands(s -> ifTopDialog( () -> {
-            app.getGameLogic().playSound(Sound.BUTTON);
-            BuildingProperty selected = listBox.getSelectedItem();
-            if (selected != null) {
-                System.out.println("Confirmed property: " + selected.getName());
-                // Send the "alter building" message to the server
-               //app.getGameLogic().sendMessage(new AlterBuildingMessage(selected.getId(), false)); TODO Message an Server
-            }
-        }));
-
-        // Zentriere das Popup
-        takeMortageContainer.setLocalTranslation(
-            (app.getCamera().getWidth() - takeMortageContainer.getPreferredSize().x) / 2,
-            (app.getCamera().getHeight() + takeMortageContainer.getPreferredSize().y) / 2,
-            9
-        );
-
-        // Zentriere das Popup
-        backgroundContainer.setLocalTranslation(
-                (app.getCamera().getWidth() - takeMortageContainer.getPreferredSize().x - padding) / 2,
-                (app.getCamera().getHeight() + takeMortageContainer.getPreferredSize().y+ padding) / 2,
-                8
-        );
-
-        app.getGuiNode().attachChild(takeMortageContainer);
-    }
-
-    /**
-     * Schließt das Menü und entfernt die GUI-Elemente.
-     */
-    @Override
-    public void close() {
-        app.getGuiNode().detachChild(takeMortageContainer);  // Entferne das Menü
-        app.getGuiNode().detachChild(backgroundContainer); //Entfernt Rand
-        super.close();
-    }
-
-    @Override
-    public void escape() {
-        new SettingsMenu(app).open();
-    }
-}

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

@@ -1,120 +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.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.notification.Sound;
-import static pp.monopoly.Resources.lookup;
-
-/**
- * TimeOut is a warning popup that is triggered when the connection to the server is interrupted.
- */
-public class TimeOut extends Dialog {
-    private final MonopolyApp app;
-    private final Geometry overlayBackground;
-    private final Container timeOutContainer;
-    private final Container backgroundContainer;
-
-
-
-    public TimeOut(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 die Warnung
-        timeOutContainer = new Container();
-        timeOutContainer.setBackground(new QuadBackgroundComponent(new ColorRGBA(0.8657f, 0.8735f, 0.8892f, 1.0f)));
-        timeOutContainer.setPreferredSize(new Vector3f(550,250,10));
-
-        float padding = 10; // Passt den backgroundContainer an die Größe des bankruptContainers an
-        backgroundContainer.setPreferredSize(timeOutContainer.getPreferredSize().addLocal(padding, padding, 0));
-
-        // Titel
-        Label gateFieldTitle = timeOutContainer.addChild(new Label("Vorsicht !", new ElementId("warning-title")));
-        gateFieldTitle.setFontSize(48);
-        gateFieldTitle.setColor(ColorRGBA.Black);
-
-        // Text, der auf der Karte steht
-        Container textContainer = timeOutContainer.addChild(new Container());
-        textContainer.addChild(new Label("Du hast die Verbindung verloren und kannst nichts dagegen machen. Akzeptiere einfach, dass du verloren hast!", new ElementId("label-Text")));
-        textContainer.setBackground(new QuadBackgroundComponent(new ColorRGBA(0.4657f, 0.4735f, 0.4892f, 1.0f)));
-        textContainer.setPreferredSize(timeOutContainer.getPreferredSize().addLocal(-250,-200,0));
-
-        // Beenden-Button
-        Button quitButton = timeOutContainer.addChild(new Button("Bestätigen", new ElementId("button")));
-        quitButton.setFontSize(32);
-        quitButton.addClickCommands(source -> close());
-
-
-        // Zentriere das Popup
-        timeOutContainer.setLocalTranslation(
-            (app.getCamera().getWidth() - timeOutContainer.getPreferredSize().x) / 2,
-            (app.getCamera().getHeight() + timeOutContainer.getPreferredSize().y) / 2,
-            8
-        );
-
-        // Zentriere das Popup
-        backgroundContainer.setLocalTranslation(
-                (app.getCamera().getWidth() - timeOutContainer.getPreferredSize().x - padding) / 2,
-                (app.getCamera().getHeight() + timeOutContainer.getPreferredSize().y+ padding) / 2,
-                7
-        );
-
-        app.getGuiNode().attachChild(timeOutContainer);
-    }
-
-    /**
-     * 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() {
-        app.getGuiNode().detachChild(timeOutContainer);  // Entferne das Menü
-        app.getGuiNode().detachChild(backgroundContainer); //Entfernt Rand
-        app.getGuiNode().detachChild(overlayBackground);  // Entferne das Overlay
-        super.close();
-    }
-
-    @Override
-    public void escape() {
-        close();
-    }
-
-}

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

@@ -1,128 +0,0 @@
-package pp.monopoly.client.gui.popups;
-
-import com.jme3.material.Material;
-import com.jme3.material.RenderState;
-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.Button;
-import com.simsilica.lemur.Container;
-import com.simsilica.lemur.Label;
-import com.simsilica.lemur.component.IconComponent;
-import com.simsilica.lemur.component.QuadBackgroundComponent;
-import com.simsilica.lemur.style.ElementId;
-import pp.dialog.Dialog;
-import pp.monopoly.client.MonopolyApp;
-import pp.monopoly.notification.Sound;
-
-public class WinnerPopUp extends Dialog {
-    private final MonopolyApp app;
-    private final Geometry overlayBackground;
-    private final Container WinnerContainer;
-    private final Container backgroundContainer;
-
-
-    /**
-     * Constructs a new WinnerPopUp dialog.
-     *
-     * @param app The MonopolyApp instance.
-     */
-    public WinnerPopUp(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 die Warnung
-        WinnerContainer = new Container();
-        WinnerContainer.setBackground(new QuadBackgroundComponent(new ColorRGBA(0.8657f, 0.8735f, 0.8892f, 1.0f)));
-        WinnerContainer.setPreferredSize(new Vector3f(440,600,10));
-
-        float padding = 10; // Passt den backgroundContainer an die Größe des bankruptContainers an
-        backgroundContainer.setPreferredSize(WinnerContainer.getPreferredSize().addLocal(padding, padding, 0));
-
-        // Titel
-        Label winnerTitle = WinnerContainer.addChild(new Label("Herlichen Glückwunsch, du bist der neue Monopoly Champion!", new ElementId("header")));
-        winnerTitle.setFontSize(25);
-       // winnerTitle.setColor(ColorRGBA.Black);
-        // Create the image container
-        Container imageContainer = WinnerContainer.addChild(new Container());
-        imageContainer.setBackground(new QuadBackgroundComponent(new ColorRGBA(0.4657f, 0.4735f, 0.4892f, 1.0f))); // Dark gray background
-        imageContainer.setPreferredSize(WinnerContainer.getPreferredSize().addLocal(-250, -200, 0)); // Adjust size for layout
-
-        // Add the image to the container
-        Label imageLabel = new Label(""); // Create a label for the image
-        IconComponent icon = new IconComponent("Pictures/MonopolyWinner.png"); // Load the image as an icon
-        icon.setIconScale(1); // Scale the image appropriately
-        imageLabel.setIcon(icon);
-        imageContainer.addChild(imageLabel); // Add the image label to the container
-
-
-        Button quitButton = WinnerContainer.addChild(new Button("Spiel Beenden", new ElementId("button")));
-        quitButton.setFontSize(32);
-        quitButton.addClickCommands(s -> ifTopDialog(() -> {
-            app.getGameLogic().playSound(Sound.BUTTON);
-            app.closeApp();
-        }));
-
-        // Zentriere das Popup
-        WinnerContainer.setLocalTranslation(
-                (app.getCamera().getWidth() - WinnerContainer.getPreferredSize().x) / 2,
-                (app.getCamera().getHeight() + WinnerContainer.getPreferredSize().y) / 2,
-                8
-        );
-
-        // Zentriere das Popup
-        backgroundContainer.setLocalTranslation(
-                (app.getCamera().getWidth() - WinnerContainer.getPreferredSize().x - padding) / 2,
-                (app.getCamera().getHeight() + WinnerContainer.getPreferredSize().y+ padding) / 2,
-                7
-        );
-
-        app.getGuiNode().attachChild(WinnerContainer);
-    }
-
-    /**
-     * 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(RenderState.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() {
-        app.getGuiNode().detachChild(WinnerContainer);  // Entferne das Menü
-        app.getGuiNode().detachChild(backgroundContainer); //Entfernt Rand
-        app.getGuiNode().detachChild(overlayBackground);  // Entferne das Overlay
-        super.close();
-    }
-
-    @Override
-    public void escape() {
-        close();
-    }
-
-}