Merge branch 'gui' of https://athene2.informatik.unibw-muenchen.de/progproj/gruppen-ht24/Gruppe-02 into gui

Reworked gui and client states

See merge request progproj/gruppen-ht24/Gruppe-02!19

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

@@ -3,6 +3,7 @@
 // https://github.com/jMonkeyEngine-Contributions/Lemur/wiki/Styling
 
 import com.jme3.math.ColorRGBA
+import com.jme3.texture.Texture
 import com.simsilica.lemur.*
 import com.simsilica.lemur.component.QuadBackgroundComponent
 import com.simsilica.lemur.Button
@@ -12,6 +13,8 @@ import com.simsilica.lemur.HAlignment
 import com.simsilica.lemur.Insets3f
 import com.simsilica.lemur.component.QuadBackgroundComponent
 import com.simsilica.lemur.component.TbtQuadBackgroundComponent
+import pp.monopoly.client.MonopolyApp
+import pp.monopoly.game.server.Player
 
 def bgColor = color(1, 1, 1, 1)
 def buttonEnabledColor = color(0, 0, 0, 1)
@@ -47,6 +50,23 @@ def orangeBorder = TbtQuadBackgroundComponent.create(
         1f, false)
 orangeBorder.color = color(1, 0.5, 0, 1) // Orange color
 
+
+def createCustomBackground(app) {
+    // Load the texture from the assets
+    Texture texture = app.getAssetManager().loadTexture("Pictures/kontobg.png")
+
+    // Create the TbtQuadBackgroundComponent
+    def backgroundCustom = TbtQuadBackgroundComponent.create(
+            texture,          // The texture to use
+            1, 1, 1,          // Insets for the 9-patch behavior
+            126, 126,         // The size of the texture
+            1f,               // The scale factor
+            false             // No tiling
+    )
+
+    return backgroundCustom
+}
+
 selector("pp") {
     font = font("Interface/Fonts/Metropolis/Metropolis-Regular-32.fnt")
 }
@@ -69,7 +89,7 @@ selector("label-Bold", "pp") {
 selector("label-toolbar", "pp") {
     insets = new Insets3f(2, 2, 2, 2)
     font = font("Interface/Fonts/Metropolis/Metropolis-Bold-32.fnt")
-    fontSize = 30
+    fontSize = 25
     color = new ColorRGBA(ColorRGBA.White)
     textHAlignment = HAlignment.Center
     textVAlignment = VAlignment.Center
@@ -198,7 +218,6 @@ selector("button", "pp") {
     insets = new Insets3f(3, 3, 3, 3) // Adjust the border thickness
     textHAlignment = HAlignment.Center
     textVAlignment = VAlignment.Center
-    buttonCommands = stdButtonCommands
 }
 
 selector("slider", "pp") {
@@ -325,22 +344,23 @@ selector("selector.item.label", "hover") {
     background = new QuadBackgroundComponent(new ColorRGBA(0.2f, 0.6f, 1.0f, 0.9f))  // Highlighted background
 }
 
-
 def enabledCommandToolbar = new Command<Button>() {
+    MonopolyApp app // Pass the app instance to access player details
+
     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
+        // Get the current player's color
+        Player currentPlayer = app.getGameLogic().getPlayerHandler().getPlayerById(app.getId());
+        ColorRGBA playerColor = Player.getColor(currentPlayer.getId()).getColor();
+
+        if (source.isEnabled()) {
+            source.setColor(ColorRGBA.White);
+            def playerBackground = new QuadBackgroundComponent(playerColor); // Use player's color
+            source.setBackground(playerBackground);
+        } else {
+            source.setColor(ColorRGBA.White);
+            def grayBackground = new QuadBackgroundComponent(ColorRGBA.Gray); // Use gray when disabled
             source.setBackground(grayBackground);
         }
-
-
-
-
     }
 }
 
@@ -366,3 +386,15 @@ selector("button-toolbar", "pp") {
 }
 
 
+selector("button-clear", "pp") { playerColor ->
+    def validColor = playerColor ?: new ColorRGBA(0, 0, 0, 0) // Vollständig transparent
+    def playerGradientBackground = new QuadBackgroundComponent(validColor)
+
+    // Kein Hintergrundbild, komplett transparent
+    playerGradientBackground.setColor(new ColorRGBA(0, 0, 0, 0)) // RGBA (Rot, Grün, Blau, Alpha)
+
+    background = playerGradientBackground.clone() // Setze den Hintergrund
+    insets = new Insets3f(-3, -3, -3, -3) // Optional: Ränder
+    textHAlignment = HAlignment.Center // Text-Zentrierung
+    textVAlignment = VAlignment.Center // Text-Zentrierung
+}

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

@@ -9,7 +9,6 @@ import com.jme3.material.Material;
 import com.jme3.math.ColorRGBA;
 import com.jme3.math.FastMath;
 import com.jme3.math.Quaternion;
-import com.jme3.math.Vector2f;
 import com.jme3.math.Vector3f;
 import com.jme3.renderer.Camera;
 import com.jme3.renderer.queue.RenderQueue.ShadowMode;
@@ -22,11 +21,10 @@ import com.jme3.shadow.EdgeFilteringMode;
 import com.jme3.texture.Texture;
 import com.jme3.util.SkyFactory;
 import com.jme3.util.TangentBinormalGenerator;
-import pp.monopoly.model.Board;
+
 import pp.monopoly.client.gui.BobTheBuilder;
 import pp.monopoly.client.gui.Toolbar;
-
-import static pp.util.FloatMath.PI;
+import pp.monopoly.model.Board;
 import static pp.util.FloatMath.TWO_PI;
 import static pp.util.FloatMath.cos;
 import static pp.util.FloatMath.sin;
@@ -181,12 +179,12 @@ public class BoardAppState extends MonopolyAppState {
      */
     private void setupSky() {
         final AssetManager assetManager = getApp().getAssetManager();
-        final Texture west = assetManager.loadTexture("Pictures/Backdrop/left.jpg"); //NON-NLS
-        final Texture east = assetManager.loadTexture("Pictures/Backdrop/right.jpg"); //NON-NLS
-        final Texture north = assetManager.loadTexture("Pictures/Backdrop/front.jpg"); //NON-NLS
-        final Texture south = assetManager.loadTexture("Pictures/Backdrop/back.jpg"); //NON-NLS
-        final Texture up = assetManager.loadTexture("Pictures/Backdrop/up.jpg"); //NON-NLS
-        final Texture down = assetManager.loadTexture("Pictures/Backdrop/down.jpg"); //NON-NLS
+        final Texture west = assetManager.loadTexture("Pictures/Backdrop/west.jpg"); //NON-NLS
+        final Texture east = assetManager.loadTexture("Pictures/Backdrop/ost.jpg"); //NON-NLS
+        final Texture north = assetManager.loadTexture("Pictures/Backdrop/nord.jpg"); //NON-NLS
+        final Texture south = assetManager.loadTexture("Pictures/Backdrop/sued.jpg"); //NON-NLS
+        final Texture up = assetManager.loadTexture("Pictures/Backdrop/sued.jpg"); //NON-NLS
+        final Texture down = assetManager.loadTexture("Pictures/Backdrop/sued.jpg"); //NON-NLS
         final Spatial sky = SkyFactory.createSky(assetManager, west, east, north, south, up, down);
         // sky.rotate(0, PI, 0);
         viewNode.attachChild(sky);

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

@@ -1,99 +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.lang.System.Logger.Level;
-
-import com.jme3.input.controls.ActionListener;
-import com.jme3.scene.Node;
-
-import pp.monopoly.client.gui.TestWorld;
-
-/**
- * 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());
-
-    /**
-     * 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() {
-        LOGGER.log(Level.DEBUG, "Enabling game state");
-        battleNode.detachAllChildren();
-        initializeGuiComponents();
-        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() {
-    }
-
-    /**
-     * 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) {
-        super.update(tpf);
-    }
-}

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

@@ -13,14 +13,13 @@ import com.jme3.asset.AssetLoadException;
 import com.jme3.asset.AssetNotFoundException;
 import com.jme3.audio.AudioData;
 import com.jme3.audio.AudioNode;
-
 /**
  * Handles the background and secondary music in the game.
  * Allows playing, stopping, and toggling between background music and a secondary track.
  */
 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 Logger LOGGER = System.getLogger(pp.monopoly.client.GameMusic.class.getName());
+    private static final Preferences PREFERENCES = getPreferences(pp.monopoly.client.GameMusic.class);
     private static final String ENABLED_PREF = "enabled"; // NON-NLS
     private static final String VOLUME_PREF = "volume"; // NON-NLS
 
@@ -68,8 +67,9 @@ public class GameMusic extends AbstractAppState {
 
     /**
      * Plays the main music.
+
      */
-    private void playMainMusic() {
+    public void playMainMusic() {
         if (!isEnabled()) {
             return; // Sound is disabled
         }
@@ -92,11 +92,10 @@ public class GameMusic extends AbstractAppState {
     /**
      * Plays the secondary music and stops the main music.
      *
-     * @param app                The application instance
-     * @param secondaryMusicFile The file path of the secondary audio file
      */
-    private void playSecondaryMusic() {
-        if(!isEnabled()) {
+    public void playSecondaryMusic() {
+        if (!isEnabled()) {
+            stopAllMusic();
             return;
         }
         if (isSecondaryMusicPlaying) {
@@ -115,7 +114,7 @@ public class GameMusic extends AbstractAppState {
     /**
      * Stops the secondary music.
      */
-    private void stopSecondaryMusic() {
+    public void stopSecondaryMusic() {
         if (secondaryMusic != null && isSecondaryMusicPlaying) {
             secondaryMusic.stop();
             isSecondaryMusicPlaying = false;
@@ -127,17 +126,17 @@ public class GameMusic extends AbstractAppState {
      * If the secondary track is playing, it stops and resumes the background music.
      * If the background music is playing, it pauses and plays the secondary track.
      *
-     * @param app                The application instance
-     * @param secondaryMusicFile The file path of the secondary audio file
      */
     public void toggleMusic() {
-        if(!isEnabled()) {
+        if (!isEnabled()) {
+            stopAllMusic();
             return;
         }
         if (isSecondaryMusicPlaying) {
             stopSecondaryMusic();
             playMainMusic();
         } else {
+            stopMainMusic();
             playSecondaryMusic();
         }
     }
@@ -153,6 +152,14 @@ public class GameMusic extends AbstractAppState {
         PREFERENCES.putFloat(VOLUME_PREF, vol);
     }
 
+    /**
+     * Stops all music (both main and secondary).
+     */
+    public void stopAllMusic() {
+        stopMainMusic();
+        stopSecondaryMusic();
+    }
+
     /**
      * Enables or disables the sound system.
      * When disabled, all music stops.
@@ -161,13 +168,14 @@ public class GameMusic extends AbstractAppState {
      */
     @Override
     public void setEnabled(boolean enabled) {
-        if (isEnabled() == enabled) return;
+        if (isEnabled() == enabled) return; // Avoid redundant operations
+
+        PREFERENCES.putBoolean(ENABLED_PREF, enabled);
 
         if (enabled) {
             playMainMusic();
         } else {
-            stopMainMusic();
-            stopSecondaryMusic();
+            stopAllMusic();
         }
 
         super.setEnabled(enabled);

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

@@ -1,9 +1,5 @@
 package pp.monopoly.client.gui;
 
-import static com.jme3.material.Materials.LIGHTING;
-
-import java.util.stream.Collectors;
-
 import com.jme3.material.Material;
 import com.jme3.material.RenderState.BlendMode;
 import com.jme3.math.ColorRGBA;
@@ -14,7 +10,6 @@ import com.jme3.scene.Spatial;
 import com.jme3.scene.shape.Box;
 
 import pp.monopoly.client.MonopolyApp;
-import pp.monopoly.game.server.Player;
 import pp.monopoly.model.Figure;
 import pp.monopoly.model.Hotel;
 import pp.monopoly.model.House;
@@ -48,7 +43,7 @@ public class BobTheBuilder extends GameBoardSynchronizer {
 
         // Setze die Rotation basierend auf der Feld-ID
         node.setLocalRotation(figure.getRot().toQuaternion());
-        // node.addControl(new FigureControl(figure));
+        node.addControl(new FigureControl(figure));
         return node;
     }
 
@@ -146,14 +141,6 @@ public class BobTheBuilder extends GameBoardSynchronizer {
 
     @Override
     public void receivedEvent(UpdatePlayerView event) {
-        board.removePlayers();
-        
-        //TODO transition animation
-        for (Player player : app.getGameLogic().getPlayerHandler().getPlayers()) {
-            board.add(player.getFigure());
-        }
-        for (Item item : board.getItems().stream().filter(p -> p instanceof Figure).collect(Collectors.toList())) {
-            add(item);
-        }
+        //TODO player move animation
     }
 }

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

@@ -0,0 +1,28 @@
+package pp.monopoly.client.gui;
+
+import com.jme3.renderer.RenderManager;
+import com.jme3.renderer.ViewPort;
+import com.jme3.scene.control.AbstractControl;
+
+import pp.monopoly.model.Figure;
+
+public class FigureControl extends AbstractControl {
+
+    private final Figure figure;
+
+    public FigureControl(Figure figure) {
+        super();
+        this.figure = figure;
+    }
+
+    @Override
+    protected void controlUpdate(float tpf) {
+        //TODO: animation
+    }
+
+    @Override
+    protected void controlRender(RenderManager rm, ViewPort vp) {
+        // No rendering required
+    }
+
+}

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

@@ -2,38 +2,92 @@ package pp.monopoly.client.gui;
 
 import com.jme3.texture.Texture;
 import com.simsilica.lemur.Button;
+import com.simsilica.lemur.Command;
 import com.simsilica.lemur.component.QuadBackgroundComponent;
-import com.simsilica.lemur.style.ElementId;
-
 import pp.monopoly.client.MonopolyApp;
+import pp.monopoly.game.server.Player;
+import pp.monopoly.game.server.PlayerColor;
+import pp.monopoly.notification.Sound;
 
 public class ImageButton extends Button {
 
-    private final String file;
-    private static MonopolyApp app;
-    
-    public ImageButton( String s, String file, MonopolyApp app ) {
-        this(s, true, new ElementId(ELEMENT_ID), null, file, app);
-    }
-    
-    public ImageButton( String s, String style, String file, MonopolyApp app ) {
-        this(s, true, new ElementId(ELEMENT_ID), style, file, app);
-    }
-    
-    public ImageButton( String s, ElementId elementId, String file, MonopolyApp app ) {
-        this(s, true, elementId, null, file, app);
-    }
-        
-    public ImageButton( String s, ElementId elementId, String style, String file, MonopolyApp app ) {
-        this(s, true, elementId, style, file, app);
-    }
-    
-    protected ImageButton( String s, boolean applyStyles, ElementId elementId, String style, String file, MonopolyApp app ) {
-        super(s, false, elementId, style);
-        this.file = file;
-        ImageButton.app = app;
-        Texture backgroundImage = app.getAssetManager().loadTexture("Pictures/Buttons/"+file+".png");
-        setBackground(new QuadBackgroundComponent(backgroundImage));
+    private final MonopolyApp app;
+    private final String functionality;
+    private final PlayerColor playerColor;
+
+    public ImageButton(String functionality, MonopolyApp app) {
+        super("", "button-clear");
+        this.app = app;
+        this.functionality = functionality;
+        this.playerColor = Player.getColor(app.getId());
+
+        updateButtonAppearance(ButtonState.ENABLED);
+        addButtonCommands();
     }
 
+    /**
+     * Updates the button's appearance based on its state.
+     *
+     * @param state the current button state
+     */
+    private void updateButtonAppearance(ButtonState state) {
+        setBackgroundTexture(state.name().toLowerCase());
+    }
+
+    /**
+     * Adds button commands for state-specific actions like hover, press, enable, and disable.
+     */
+    private void addButtonCommands() {
+        addCommands(ButtonAction.Enabled, source -> updateButtonAppearance(ButtonState.ENABLED));
+        addCommands(ButtonAction.Disabled, source -> updateButtonAppearance(ButtonState.DISABLED));
+        addCommands(ButtonAction.Hover, source -> {
+            if (isEnabled()) {
+                updateButtonAppearance(ButtonState.HOVER);
+            }
+        });
+        addCommands(ButtonAction.HighlightOff, source -> updateButtonAppearance(isEnabled() ? ButtonState.ENABLED : ButtonState.DISABLED));
+        addCommands(ButtonAction.Up, source -> updateButtonAppearance(isEnabled() ? ButtonState.ENABLED : ButtonState.DISABLED));
+        addCommands(ButtonAction.Down, source -> {
+            if (isEnabled()) {
+                app.getGameLogic().playSound(Sound.BUTTON);
+            }
+        });
+    }
+
+    /**
+     * Sets the background texture for the button based on the given state.
+     *
+     * @param state the button state (e.g., "enabled", "disabled", "hover")
+     */
+    private void setBackgroundTexture(String state) {
+        String texturePath = buildTexturePath(state);
+        Texture texture = app.getAssetManager().loadTexture(texturePath);
+        setBackground(new QuadBackgroundComponent(texture));
+    }
+
+    /**
+     * Builds the file path for the button texture.
+     *
+     * @param state the button state (e.g., "enabled", "disabled", "hover")
+     * @return the full file path to the texture
+     */
+    private String buildTexturePath(String state) {
+        return String.format("Pictures/Buttons/Button_%s_%s_%s.png", functionality, playerColor.getColorName(), state);
+    }
+
+    /**
+     * Button states for handling appearance transitions.
+     */
+    private enum ButtonState {
+        ENABLED, DISABLED, HOVER
+    }
+
+    public void addClickCommands( Command<? super Button> command ) {
+        super.addCommands(ButtonAction.Down, command);
+    }
+
+    @SuppressWarnings("unchecked") // because Java doesn't like var-arg generics
+    public void addClickCommands( Command<? super Button>... commands ) {
+        super.addCommands(ButtonAction.Down, commands);
+    }
 }

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

@@ -79,8 +79,9 @@ public class LobbyMenu extends Dialog {
         this.app = app;
 
         GameMusic music = app.getStateManager().getState(GameMusic.class);
-        music.toggleMusic();
-
+        if (music != null && music.isEnabled()) {
+            music.playSecondaryMusic();
+        }
         playerInputField = new TextField("Spieler "+(app.getId()+1));
         // Hintergrundbild laden und hinzufügen
         addBackgroundImage();
@@ -276,6 +277,12 @@ public class LobbyMenu extends Dialog {
         new SettingsMenu(app).open();
     }
 
+    /**
+     * Updates the menu at regular intervals.
+     * Checks if the dropdown selection has been updated and invokes the selection change handler.
+     *
+     * @param tpf Time per frame, in seconds, since the last update.
+     */
     @Override
     public void update(float tpf) {
         if (selectionRef.update()) {
@@ -283,10 +290,27 @@ public class LobbyMenu extends Dialog {
         }
     }
 
+    /**
+     * Closes the current menu and transitions music playback.
+     * Stops the secondary music (if playing) and resumes the main background music
+     * if music is enabled in the preferences. Ensures smooth transitions in audio.
+     */
+    @Override
+    public void close() {
+        GameMusic music = app.getStateManager().getState(GameMusic.class);
+        if (music != null) {
+            music.stopSecondaryMusic();
+            if (music.isEnabled()) {
+                music.playMainMusic();
+            }
+        }
+        super.close();
+    }
+
     /**
      * Updates the selected figure based on the dropdown menu selection.
      *
-     * @param selected the selected figure
+     * @param selector the selected figure
      */
     private void onDropdownSelectionChanged(Selector<String> selector) {
         app.getGameLogic().playSound(Sound.BUTTON);

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

@@ -51,7 +51,17 @@ public class SettingsMenu extends Dialog {
     private final SoundSlider soundSlider;
 
     /**
-     * Constructs the Menu dialog for the Battleship application.
+     * Checkbox for toggling sound effects.
+     */
+    private final Checkbox soundCheckbox;
+
+    /**
+     * Checkbox for toggling background music.
+     */
+    private final Checkbox musicCheckbox;
+
+    /**
+     * Constructs the Menu dialog for the Monopoly application.
      *
      * @param app the MonopolyApp instance
      */
@@ -65,11 +75,15 @@ public class SettingsMenu extends Dialog {
 
         addChild(soundSlider);
 
-        addChild(new Checkbox("Soundeffekte an / aus", new StateCheckboxModel(app, GameSound.class)));
-        
+        soundCheckbox = new Checkbox("Soundeffekte an / aus", new StateCheckboxModel(app, GameSound.class));
+        addChild(soundCheckbox);
+
         addChild(new Label("Hintergrund Musik", new ElementId("label"))); //NON-NLS
-        addChild(new Checkbox("Musik an / aus", new StateCheckboxModel(app, GameMusic.class)));
-        
+
+        musicCheckbox = new Checkbox("Musik an / aus", new StateCheckboxModel(app, GameMusic.class));
+        musicCheckbox.addClickCommands(s -> toggleMusicPreference());
+        addChild(musicCheckbox);
+
         addChild(musicSlider);
 
         addChild(new Button("Zurück zum Spiel", new ElementId("button"))).addClickCommands(s -> ifTopDialog(() -> {
@@ -84,16 +98,42 @@ public class SettingsMenu extends Dialog {
     }
 
     /**
-     * Updates the state of the load and save buttons based on the game logic.
+     * Toggles the music preference based on the state of the musicCheckbox.
+     * Enables or disables background music and starts playback if enabled.
+     */
+    private void toggleMusicPreference() {
+        boolean enabled = musicCheckbox.isChecked();
+        GameMusic gameMusic = app.getStateManager().getState(GameMusic.class);
+        if (gameMusic != null) {
+            gameMusic.setEnabled(enabled);
+            if (enabled) {
+                gameMusic.playMainMusic();
+            }
+        }
+    }
+
+    /**
+     * Updates the state of the music checkbox to match the current preferences.
+     * This ensures the checkbox reflects the actual enabled/disabled state of the music.
      */
     @Override
     public void update() {
+        GameMusic gameMusic = app.getStateManager().getState(GameMusic.class);
+        if (gameMusic != null) {
+            musicCheckbox.setChecked(gameMusic.isEnabled());
+        }
     }
 
+    /**
+     * Updates UI elements such as sliders and synchronizes the state of the settings menu.
+     *
+     * @param delta the time in seconds since the last update
+     */
     @Override
     public void update(float delta) {
         musicSlider.update();
         soundSlider.update();
+        update();
     }
 
     /**

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

@@ -1,565 +0,0 @@
-package pp.monopoly.client.gui;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Timer;
-import java.util.TimerTask;
-
-import com.jme3.light.AmbientLight;
-import com.jme3.light.DirectionalLight;
-import com.jme3.material.Material;
-import com.jme3.math.ColorRGBA;
-import com.jme3.math.FastMath;
-import com.jme3.math.Vector3f;
-import com.jme3.renderer.RenderManager;
-import com.jme3.renderer.ViewPort;
-import com.jme3.scene.control.AbstractControl;
-import com.jme3.texture.Texture;
-
-import pp.monopoly.client.MonopolyApp;
-import pp.monopoly.client.gui.popups.AcceptTrade;
-import pp.monopoly.client.gui.popups.BuildingPropertyCard;
-import pp.monopoly.client.gui.popups.ConfirmTrade;
-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.Gulag;
-import pp.monopoly.client.gui.popups.GulagInfo;
-import pp.monopoly.client.gui.popups.LooserPopUp;
-import pp.monopoly.client.gui.popups.NoMoneyWarning;
-import pp.monopoly.client.gui.popups.ReceivedRent;
-import pp.monopoly.client.gui.popups.RejectTrade;
-import pp.monopoly.client.gui.popups.Rent;
-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.message.server.NotificationMessage;
-import pp.monopoly.message.server.TradeReply;
-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.
- */
-public class TestWorld implements GameEventListener {
-
-    private final MonopolyApp app;
-    private PlayerHandler playerHandler;
-    private CameraController cameraController;
-    private Toolbar toolbar;
-    private List<String> existingHouses = new ArrayList<>();
-
-    /**
-     * Konstruktor für die TestWorld.
-     *
-     * @param app     Die Hauptanwendung
-     */
-    public TestWorld(MonopolyApp app) {
-        this.app = app;
-        this.playerHandler = app.getGameLogic().getPlayerHandler();
-        app.getGameLogic().addListener(this);
-        cameraController = new CameraController(app.getCamera());
-    }
-
-    /**
-     * Initialisiert die Szene mit Spielfeld und Figuren.
-     */
-    public void initializeScene() {
-        // Entferne bestehende Inhalte
-        app.getGuiNode().detachAllChildren();
-        app.getRootNode().detachAllChildren();
-
-        System.out.println("Szene initialisiert.");
-
-        //Füge Inhalte ein
-        setSkyColor();
-        createBoard();
-        addLighting();
-        createPlayerFigures();
-        toolbar = new Toolbar(app);
-        toolbar.open();
-    }
-
-    /**
-     * 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));
-    }
-
-    /**
-     * Erstellt das Spielfeld und fügt es zur Szene hinzu.
-     */
-    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);
-
-            Material mat = new Material(app.getAssetManager(), "Common/MatDefs/Light/Lighting.j3md");
-            Texture texture = app.getAssetManager().loadTexture("Pictures/board2.png");
-            mat.setTexture("DiffuseMap", texture);
-            geom.setMaterial(mat);
-
-            geom.setLocalTranslation(0, -0.1f, 0);
-
-            com.jme3.math.Quaternion rotation = new com.jme3.math.Quaternion();
-            rotation.fromAngleAxis(FastMath.HALF_PI, com.jme3.math.Vector3f.UNIT_Y);
-            geom.setLocalRotation(rotation);
-
-            app.getRootNode().attachChild(geom);
-        } catch (Exception e) {
-            System.err.println("Fehler beim Erstellen des Spielfelds: " + e.getMessage());
-        }
-    }
-
-    private void addLighting() {
-        // Direktionales Licht
-        DirectionalLight sun = new DirectionalLight();
-        sun.setColor(ColorRGBA.White);
-        sun.setDirection(new Vector3f(-0.5f, -0.7f, -1.0f).normalizeLocal());
-        app.getRootNode().addLight(sun);
-
-        // Umgebungslicht
-        AmbientLight ambient = new AmbientLight();
-        ambient.setColor(new ColorRGBA(0.6f, 0.6f, 0.6f, 1.0f));
-        app.getRootNode().addLight(ambient);
-    }
-
-    private com.jme3.math.Quaternion calculateRotationForField(int fieldID) {
-        com.jme3.math.Quaternion rotation = new com.jme3.math.Quaternion();
-    
-        // Berechne die Rotation basierend auf der Feld-ID
-        if (fieldID >= 0 && fieldID <= 9) {
-            // Untere Seite (0-9)
-            rotation.fromAngleAxis(0, Vector3f.UNIT_Y); // Richtung: nach oben
-        } else if (fieldID >= 10 && fieldID <= 19) {
-            // Rechte Seite (10-19)
-            rotation.fromAngleAxis(FastMath.HALF_PI, Vector3f.UNIT_Y); // Richtung: nach links
-        } else if (fieldID >= 20 && fieldID <= 29) {
-            // Obere Seite (20-29)
-            rotation.fromAngleAxis(FastMath.PI, Vector3f.UNIT_Y); // Richtung: nach unten
-        } else if (fieldID >= 30 && fieldID <= 39) {
-            // Linke Seite (30-39)
-            rotation.fromAngleAxis(3 * FastMath.HALF_PI, Vector3f.UNIT_Y); // Richtung: nach rechts
-        }
-    
-        // Korrigiere die Richtung für die Quadranten 10–19 und 30–39 (gegenüberliegende Richtung)
-        if ((fieldID >= 10 && fieldID <= 19) || (fieldID >= 30 && fieldID <= 39)) {
-            com.jme3.math.Quaternion oppositeDirection = new com.jme3.math.Quaternion();
-            oppositeDirection.fromAngleAxis(FastMath.PI, Vector3f.UNIT_Y); // 180° drehen
-            rotation = rotation.multLocal(oppositeDirection);
-        }
-    
-        // Füge zusätzliche 90° nach links hinzu
-        com.jme3.math.Quaternion leftTurn = new com.jme3.math.Quaternion();
-        leftTurn.fromAngleAxis(FastMath.HALF_PI, Vector3f.UNIT_Y); // 90° nach links
-        rotation = rotation.multLocal(leftTurn);
-    
-        return rotation;
-    }
-
-    /**
-     * Erstellt die Spielfiguren basierend auf der bereits bekannten Spielerliste.
-     */
-    private void createPlayerFigures() {
-        for (Player player : playerHandler.getPlayers()) {
-            try {
-                // Lade das Modell
-                com.jme3.scene.Spatial model = app.getAssetManager().loadModel(
-                        "models/" + "Spielfiguren/" + player.getFigure().getType() + "/" + player.getFigure().getType() + ".j3o");
-    
-                // Skaliere und positioniere das Modell
-                model.setLocalScale(0.5f);
-                Vector3f startPosition = calculateFieldPosition(player.getFieldID(), player.getId());
-                model.setLocalTranslation(startPosition);
-    
-                // Setze die Rotation basierend auf der Feld-ID
-                model.setLocalRotation(calculateRotationForField(player.getFieldID()));
-    
-                model.setName("PlayerFigure_" + player.getId());
-    
-                // Füge das Modell zur Szene hinzu
-                app.getRootNode().attachChild(model);
-            } 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 playerIndexOnField = calculatePlayerIndexOnField(player.getFieldID(), player.getId());
-        String figureName = "PlayerFigure_" + player.getId();
-        com.jme3.scene.Spatial figure = app.getRootNode().getChild(figureName);
-    
-        if (figure != null) {
-            // Füge einen Delay hinzu (z.B. 3 Sekunden)
-            Timer timer = new Timer();
-            timer.schedule(new TimerTask() {
-                @Override
-                public void run() {
-                    app.enqueue(() -> {
-                        // Setze die Position
-                        Vector3f targetPosition = calculateFieldPosition(player.getFieldID(), player.getId());
-                        figure.setLocalTranslation(targetPosition);
-    
-                        // Aktualisiere die Rotation basierend auf der Feld-ID
-                        figure.setLocalRotation(calculateRotationForField(player.getFieldID()));
-                    });
-                }
-            }, 3000); // 3000 Millisekunden Delay
-        } else {
-            System.err.println("Figur für Spieler " + player.getId() + " nicht gefunden.");
-        }
-    }
-
-    private int getFieldIDFromPosition(Vector3f position) {
-        for (int fieldID = 0; fieldID < 40; fieldID++) {
-            Vector3f fieldPosition = calculateFieldPosition(fieldID, 0);
-            if (fieldPosition.distance(position) < 0.5f) { // Toleranz für Positionserkennung
-                return fieldID;
-            }
-        }
-        throw new IllegalArgumentException("Position entspricht keinem gültigen Feld: " + position);
-    }
-
-
-
-    /**
-     * 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) {
-        // Ziel: Immer entlang der Spielfeldkante navigieren
-        float deltaX = targetPosition.x - startPosition.x;
-        float deltaZ = targetPosition.z - startPosition.z;
-    
-        // Überprüfen, ob Bewegung entlang X oder Z-Koordinate zuerst erfolgen soll
-        if (deltaX != 0 && deltaZ != 0) {
-            if (Math.abs(deltaX) > Math.abs(deltaZ)) {
-                // Bewegung entlang X zuerst
-                return new Vector3f(targetPosition.x, 0, startPosition.z);
-            } else {
-                // Bewegung entlang Z zuerst
-                return new Vector3f(startPosition.x, 0, targetPosition.z);
-            }
-        } else {
-            // Bewegung ist bereits entlang einer Achse (keine Ecke erforderlich)
-            return targetPosition;
-        }
-    }
-
-    private List<Vector3f> calculatePath(int startFieldID, int targetFieldID, int playerIndex) {
-        List<Vector3f> pathPoints = new ArrayList<>();
-    
-        // Bewegung im Uhrzeigersinn
-        if (startFieldID < targetFieldID) {
-            for (int i = startFieldID; i <= targetFieldID; i++) {
-                // Füge Ecken hinzu, falls sie überschritten werden
-                if (i == 10 || i == 20 || i == 30 || i == 0) {
-                    pathPoints.add(calculateFieldPosition(i, playerIndex));
-                }
-            }
-        } else {
-            // Bewegung über das Ende des Spielfelds hinaus (z.B. von 39 zu 5)
-            for (int i = startFieldID; i < 40; i++) {
-                if (i == 10 || i == 20 || i == 30 || i == 0) {
-                    pathPoints.add(calculateFieldPosition(i, playerIndex));
-                }
-            }
-            for (int i = 0; i <= targetFieldID; i++) {
-                if (i == 10 || i == 20 || i == 30 || i == 0) {
-                    pathPoints.add(calculateFieldPosition(i, playerIndex));
-                }
-            }
-        }
-    
-        // Füge das Ziel hinzu
-        pathPoints.add(calculateFieldPosition(targetFieldID, playerIndex));
-    
-        return pathPoints;
-    }
-    
-
-
-    private int calculatePlayerIndexOnField(int fieldID, int playerID) {
-        List<Player> playersOnField = playerHandler.getPlayers().stream()
-            .filter(p -> p.getFieldID() == fieldID)
-            .toList();
-
-        for (int i = 0; i < playersOnField.size(); i++) {
-            if (playersOnField.get(i).getId() == playerID) {
-                return i;
-            }
-        }
-        return 0;
-    }
-
-    private void animateMovementAlongPath(com.jme3.scene.Spatial figure, List<Vector3f> pathPoints) {
-        float animationDurationPerSegment = 2.5f; // Langsamere Animation (2.5 Sekunden pro Segment)
-        int[] currentSegment = {0};
-    
-        app.enqueue(() -> {
-            figure.addControl(new AbstractControl() {
-                private float elapsedTime = 0.0f;
-    
-                @Override
-                protected void controlUpdate(float tpf) {
-                    if (currentSegment[0] >= pathPoints.size() - 1) {
-                        this.setEnabled(false); // Animation abgeschlossen
-                        return;
-                    }
-    
-                    elapsedTime += tpf;
-                    float progress = Math.min(elapsedTime / animationDurationPerSegment, 1.0f);
-    
-                    Vector3f start = pathPoints.get(currentSegment[0]);
-                    Vector3f end = pathPoints.get(currentSegment[0] + 1);
-    
-                    Vector3f interpolatedPosition = start.interpolateLocal(end, progress);
-                    figure.setLocalTranslation(interpolatedPosition);
-    
-                    if (progress >= 1.0f) {
-                        elapsedTime = 0.0f;
-                        currentSegment[0]++;
-                    }
-                }
-    
-                @Override
-                protected void controlRender(RenderManager rm, ViewPort vp) {
-                    // Nicht benötigt
-                }
-            });
-        });
-    }
-
-    @Override
-    public void receivedEvent(PopUpEvent event) {
-        if (event.msg().equals("Buy")) {
-            Timer timer = new Timer();
-            timer.schedule(new TimerTask() {
-                @Override
-                public void run() {
-                    app.enqueue(() -> {
-                        int field = app.getGameLogic().getPlayerHandler().getPlayerById(app.getId()).getFieldID();
-                        Object fieldObject = app.getGameLogic().getBoardManager().getFieldAtIndex(field);
-
-                        if (fieldObject instanceof BuildingProperty) {
-                            new BuildingPropertyCard(app).open();
-                        } else if (fieldObject instanceof GateField) {
-                            new GateFieldCard(app).open();
-                        } else if (fieldObject instanceof FoodField) {
-                            new FoodFieldCard(app).open();
-                        }
-                    });
-                }
-            }, 2500);
-        } 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();
-        } else if (event.msg().equals("tradeRequest")) {
-            new ConfirmTrade(app).open();
-        } else if (event.msg().equals("goingToJail")) {
-            new Gulag(app).open();
-        } else if (event.msg().equals("NoMoneyWarning")) {
-            new NoMoneyWarning(app).open();
-        } else if(event.msg().equals("rent")) {
-            new Rent(app, ( (NotificationMessage) event.message()).getRentOwner(), ( (NotificationMessage) event.message()).getRentAmount() ).open();
-        } else if (event.msg().equals("jailtryagain")) {
-            new GulagInfo(app, 1).open();
-        } else if (event.msg().equals("jailpay")) {
-            new GulagInfo(app, 3).open();
-        } else if (event.msg().equals("tradepos")) {
-            new AcceptTrade(app, (TradeReply) event.message()).open();
-        } else if (event.msg().equals("tradeneg")) {
-            new RejectTrade(app, (TradeReply) event.message()).open();
-        } else if (event.msg().equals("ReceivedRent")) {
-            new ReceivedRent(app, ( (NotificationMessage) event.message()).getRentOwner(), ( (NotificationMessage) event.message()).getRentAmount() ).open();
-        }
-    }
-
-    private Vector3f calculateBuildingPosition(int fieldID) {
-        float baseX = 0.0f;
-        float baseZ = 0.0f;
-    
-        switch (fieldID) {
-            case 0: baseX = -8.4f; baseZ = -7.7f; break;
-            case 1: baseX = -6.3f; baseZ = -7.7f; break;
-            case 2: baseX = -4.7f; baseZ = -7.7f; break;
-            case 3: baseX = -3.1f; baseZ = -7.7f; break;
-            case 4: baseX = -1.4f; baseZ = -7.7f; break;
-            case 5: baseX =  0.2f; baseZ = -7.7f; break;
-            case 6: baseX =  1.8f; baseZ = -7.7f; break;
-            case 7: baseX =  3.5f; baseZ = -7.7f; break;
-            case 8: baseX =  5.1f; baseZ = -7.7f; break;
-            case 9: baseX =  6.7f; baseZ = -7.7f; break;
-            case 10: baseX = 8.2f; baseZ = -7.7f; break;
-            case 11: baseX = 8.2f; baseZ = -6.5f; break;    //passt
-            case 12: baseX = 8.2f; baseZ = -4.9f; break;    //passt
-            case 13: baseX = 8.2f; baseZ = -3.3f; break;    //passt
-            case 14: baseX = 8.2f; baseZ = -1.6f; break;    //passt
-            case 15: baseX = 8.2f; baseZ =  0.0f; break;    //passt
-            case 16: baseX = 8.2f; baseZ =  1.6f; break;    //passt
-            case 17: baseX = 8.2f; baseZ =  3.3f; break;    //passt
-            case 18: baseX = 8.2f; baseZ =  4.9f; break;    //passt
-            case 19: baseX = 8.2f; baseZ =  6.5f; break;    //passt
-            case 20: baseX = 8.2f; baseZ =  7.7f; break;
-            case 21: baseX = 6.5f; baseZ =  7.7f; break;
-            case 22: baseX = 4.9f; baseZ =  7.7f; break;
-            case 23: baseX = 3.3f; baseZ =  7.7f; break;
-            case 24: baseX = 1.6f; baseZ =  7.7f; break;
-            case 25: baseX = 0.0f; baseZ =  7.7f; break;
-            case 26: baseX = -1.6f; baseZ = 7.7f; break;
-            case 27: baseX = -3.3f; baseZ = 7.7f; break;
-            case 28: baseX = -4.9f; baseZ = 7.7f; break;
-            case 29: baseX = -6.5f; baseZ = 7.7f; break;
-            case 30: baseX = -7.2f; baseZ = 7.7f; break;
-            case 31: baseX = -7.2f; baseZ = 6.5f; break;
-            case 32: baseX = -7.2f; baseZ = 4.9f; break;
-            case 33: baseX = -7.2f; baseZ = 3.3f; break;
-            case 34: baseX = -7.2f; baseZ = 1.6f; break;
-            case 35: baseX = -7.2f; baseZ = 0.0f; break;
-            case 36: baseX = -7.2f; baseZ = -1.6f; break;
-            case 37: baseX = -7.2f; baseZ = -3.3f; break;
-            case 38: baseX = -7.2f; baseZ = -4.9f; break;
-            case 39: baseX = -7.2f; baseZ = -6.5f; break;
-            default: throw new IllegalArgumentException("Ungültige Feld-ID: " + fieldID);
-        }
-    
-        return new Vector3f(baseX, 0, baseZ);
-    }
-
-    private void updateHousesOnBoard() {
-        app.enqueue(() -> {
-            List<BuildingProperty> propertiesWithBuildings = app.getGameLogic().getBoardManager().getPropertiesWithBuildings();
-
-            for (BuildingProperty property : propertiesWithBuildings) {
-                int houseCount = property.getHouses();
-                int hotelCount = property.getHotel();
-
-                String uniqueIdentifier = "Building_" + property.getId() + "_" + (hotelCount > 0 ? "Hotel" : houseCount);
-
-                if (existingHouses.contains(uniqueIdentifier)) continue;
-
-                try {
-                    String modelPath = hotelCount > 0
-                            ? "models/Hotel/Hotel.j3o"
-                            : "models/Haus/" + houseCount + "Haus.j3o";
-
-                    com.jme3.scene.Spatial buildingModel = app.getAssetManager().loadModel(modelPath);
-
-                    Material mat = new Material(app.getAssetManager(), "Common/MatDefs/Light/Lighting.j3md");
-                    
-                    buildingModel.setMaterial(mat);
-
-                    buildingModel.setLocalScale(0.5f);
-                    Vector3f position = calculateBuildingPosition(property.getId()).add(0, 0.5f, 0);
-                    buildingModel.setLocalTranslation(position);
-
-                    com.jme3.math.Quaternion rotation = new com.jme3.math.Quaternion();
-                    if (property.getId() >= 1 && property.getId() <= 10) {
-                        rotation.fromAngleAxis(FastMath.HALF_PI, Vector3f.UNIT_Y);
-                    } else if (property.getId() >= 21 && property.getId() <= 30) {
-                        rotation.fromAngleAxis(3 * FastMath.HALF_PI, Vector3f.UNIT_Y);
-                    } else if (property.getId() >= 31 && property.getId() <= 39) {
-                        rotation.fromAngleAxis(FastMath.PI, Vector3f.UNIT_Y);
-                    }
-
-                    buildingModel.setLocalRotation(rotation);
-                    buildingModel.setName(uniqueIdentifier);
-                    app.getRootNode().attachChild(buildingModel);
-                    existingHouses.add(uniqueIdentifier);
-
-                } catch (Exception e) {
-                    System.err.println("Fehler beim Hinzufügen eines Gebäudes: " + e.getMessage());
-                }
-            }
-        });
-    }
-
-    @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());
-            }
-        }, 2500);
-    }
-
-    @Override
-    public void receivedEvent(UpdatePlayerView event) {
-        this.playerHandler = app.getGameLogic().getPlayerHandler();
-        for (Player player : playerHandler.getPlayers()) {
-            movePlayerFigure(player);
-        }
-        updateHousesOnBoard();
-    }
-}

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

@@ -1,8 +1,11 @@
 package pp.monopoly.client.gui;
 
+import com.jme3.input.event.MouseButtonEvent;
+import com.jme3.input.event.MouseMotionEvent;
 import com.jme3.math.ColorRGBA;
 import com.jme3.math.Vector2f;
 import com.jme3.math.Vector3f;
+import com.jme3.scene.Spatial;
 import com.jme3.texture.Texture;
 import com.simsilica.lemur.Axis;
 import com.simsilica.lemur.Button;
@@ -13,8 +16,9 @@ import com.simsilica.lemur.VAlignment;
 import com.simsilica.lemur.component.IconComponent;
 import com.simsilica.lemur.component.QuadBackgroundComponent;
 import com.simsilica.lemur.component.SpringGridLayout;
+import com.simsilica.lemur.event.MouseEventControl;
+import com.simsilica.lemur.event.MouseListener;
 import com.simsilica.lemur.style.ElementId;
-
 import pp.dialog.Dialog;
 import pp.monopoly.client.MonopolyApp;
 import pp.monopoly.client.gui.popups.Bankrupt;
@@ -30,88 +34,41 @@ import pp.monopoly.notification.UpdatePlayerView;
 
 /**
  * Represents the toolbar interface in the Monopoly application.
- * <p>
- * This class provides game controls, player information, and event handling
- * for actions such as dice rolling, trading, and ending turns.
- * Implements {@link GameEventListener} to respond to game events.
- * </p>
+ * Provides game controls, player information, and event handling.
  */
 public class Toolbar extends Dialog implements GameEventListener {
 
-    /**
-     * Reference to the Monopoly application instance.
-     */
+    /** The Monopoly application instance*/
     private final MonopolyApp app;
-
-    /**
-     * The main container for the toolbar interface.
-     */
+    /** The container representing the toolbar interface */
     private final Container toolbarContainer;
-
-    /**
-     * Container for displaying an overview of other players.
-     */
+    /** The container representing the player overview information */
     private Container overviewContainer;
-
-    /**
-     * Container for displaying account-related information.
-     */
+    /** The container representing the player account information */
     private Container accountContainer;
-
-    /**
-     * Handles player-related data and actions.
-     */
+    /** The player handler instance */
     private PlayerHandler playerHandler;
-
-    /**
-     * Label for the first dice display.
-     */
+    /** The label representing the left dice */
     private Label imageLabel;
-
-    /**
-     * Label for the second dice display.
-     */
+    /** The label representing the right dice */
     private Label imageLabel2;
-
-
-    /**
-     * Button for rolling the dice.
-     */
-    private Button diceButton;
-
-
-    /**
-     * Button for initiating trades.
-     */
+    /** The flag to check if the dice can be rolled */
+    private boolean canRollDice = false;
+    /** The trade button */
     private Button tradeButton;
-
-
-    /**
-     * Button for accessing the property menu.
-     */
+    /** The property menu button */
     private Button propertyMenuButton;
-
-    /**
-     * Button for ending the player's turn.
-     */
+    /** The end turn button */
     private Button endTurnButton;
-
-    /**
-     * Stores the most recent dice roll event.
-     */
+    /** The latest incoming Dice Roll Event */
     private DiceRollEvent latestDiceRollEvent = null;
-
-    /**Indicates if the bankrupt PopUp has already been shown */
+    /** The flag to check if the bankrupt pop up is already shown */
     private boolean bankruptPopUp = false;
 
     /**
-     * Constructs the toolbar for the Monopoly application.
-     * <p>
-     * Initializes the toolbar interface, adds event listeners, and sets up
-     * the GUI elements such as dice, buttons, and player information displays.
-     * </p>
+     * Constructs a new {@code Toolbar} for the given {@code MonopolyApp}.
      *
-     * @param app the Monopoly application instance
+     * @param app The {@code MonopolyApp} instance to create the toolbar for.
      */
     public Toolbar(MonopolyApp app) {
         super(app.getDialogManager());
@@ -120,103 +77,173 @@ public class Toolbar extends Dialog implements GameEventListener {
         app.getGameLogic().addListener(this);
         this.playerHandler = app.getGameLogic().getPlayerHandler();
 
-        toolbarContainer = createToolbarContainer();
+        toolbarContainer = setupToolbar();
         app.getGuiNode().attachChild(toolbarContainer);
+
+        endTurnButton.setEnabled(false);
     }
 
-    private Container createToolbarContainer() {
+    /**
+     * Sets up the toolbar interface with the game controls, player information, and event handling.
+     *
+     * @return The container representing the toolbar interface.
+     */
+    private Container setupToolbar() {
         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));
+
         Texture backgroundToolbar = app.getAssetManager().loadTexture("Pictures/toolbarbg.png");
         QuadBackgroundComponent background = new QuadBackgroundComponent(backgroundToolbar);
+        background.setMargin(0, 0); // Removes any internal margin
         container.setBackground(background);
-    
-        // Spielerfarbe abrufen
-        Player currentPlayer = playerHandler.getPlayerById(app.getId());
-        ColorRGBA playerColor = Player.getColor(currentPlayer.getId()).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ü
+        setupBorders(container);
+        setupPlayerInfoSection(container);
+        setupDiceSection(container);
+        setupActionMenu(container);
+
+        return container;
+    }
+
+    /**
+     * Sets up the borders for the toolbar interface.
+     *
+     * @param container The container representing the toolbar interface.
+     */
+    private void setupBorders(Container container) {
+        addBorder(0, 205, app.getCamera().getWidth(), 5, ColorRGBA.DarkGray); // Top
+        addBorder(0, 5, app.getCamera().getWidth(), 10, ColorRGBA.DarkGray); // Bottom
+        addBorder(0, 200, 8, 210, ColorRGBA.DarkGray); // Left
+        addBorder(app.getCamera().getWidth() - 5, 200, 8, 210, ColorRGBA.DarkGray); // Right
+    }
+
+    /**
+     * Adds a border to the toolbar interface with the specified dimensions and color.
+     *
+     * @param x      The x-coordinate of the border.
+     * @param y      The y-coordinate of the border.
+     * @param width  The width of the border.
+     * @param height The height of the border.
+     * @param color  The color of the border.
+     */
+    private void addBorder(float x, float y, float width, float height, ColorRGBA color) {
+        Container border = new Container();
+        border.setPreferredSize(new Vector3f(width, height, 0));
+        border.setBackground(new QuadBackgroundComponent(color));
+        border.setLocalTranslation(x, y, 3);
+        app.getGuiNode().attachChild(border);
+    }
+
+    /**
+     * Sets up the player information section of the toolbar interface.
+     *
+     * @param parentContainer The container representing the toolbar interface.
+     */
+    private void setupPlayerInfoSection(Container parentContainer) {
+        Container playerInfoSection = parentContainer.addChild(new Container(new SpringGridLayout(Axis.X, Axis.Y)));
+        playerInfoSection.setPreferredSize(new Vector3f(600, 300, 0)); // Adjust size for both containers
+
+        Texture backgroundTexture = app.getAssetManager().loadTexture("Pictures/"+ Player.getColor(app.getId()).getColorName()+ "Background.png");
+        QuadBackgroundComponent background = new QuadBackgroundComponent(backgroundTexture);
+        playerInfoSection.setBackground(background);
+
+        accountContainer = playerInfoSection.addChild(new Container());
+        accountContainer.setPreferredSize(new Vector3f(300, 300, 0));
+        accountContainer.setBackground(null);
+
+        overviewContainer = playerInfoSection.addChild(new Container());
+        overviewContainer.setPreferredSize(new Vector3f(300, 300, 0));
+        overviewContainer.setBackground(null);
+
+        refreshPlayerView();
+    }
+
+    /**
+     * Sets up the dice section of the toolbar interface.
+     *
+     * @param container The container representing the toolbar interface.
+     */
+    private void setupDiceSection(Container container) {
+        Container diceContainer = container.addChild(new Container(new SpringGridLayout(Axis.X, Axis.Y)));
+        diceContainer.addChild(createDiceDisplay());
+        diceContainer.setBackground(null);
+    }
+
+    /**
+     * Sets up the action menu of the toolbar interface.
+     *
+     * @param container The container representing the toolbar interface.
+     */
+    private void setupActionMenu(Container container) {
         Container menuContainer = container.addChild(new Container());
         menuContainer.addChild(createTradeButton());
         menuContainer.addChild(createPropertyMenuButton());
         menuContainer.addChild(createEndTurnButton());
         menuContainer.setBackground(null);
-    
-        return container;
     }
 
-
-    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);
-            endTurnButton.setEnabled(true);
-            startDiceAnimation();
-            app.getGameLogic().send(new RollDice());
-            app.getGameLogic().playSound(Sound.BUTTON);
-        }));
-        diceContainer.addChild(diceButton);
-
-        return diceContainer;
+    /**
+     * Returns the color of the current player.
+     *
+     * @return The color of the current player.
+     */
+    private ColorRGBA getCurrentPlayerColor() {
+        Player currentPlayer = playerHandler.getPlayerById(app.getId());
+        return Player.getColor(currentPlayer.getId()).getColor();
     }
 
+    /**
+     * Creates the dice display section of the toolbar interface.
+     *
+     * @return The container representing the dice display section.
+     */
     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.setBackground(null);
+
         horizontalContainer.addChild(createDiceContainer(imageLabel));
         horizontalContainer.addChild(createDiceContainer(imageLabel2));
 
+            // Add mouse event control for click handling
+        MouseEventControl.addListenersToSpatial(horizontalContainer, new MouseListener() {
+            @Override
+            public void mouseButtonEvent(MouseButtonEvent event, Spatial target, Spatial capture) {
+                if (event.isPressed()) {
+                    handleDiceRoll();
+                }
+            }
+
+            @Override
+            public void mouseEntered(MouseMotionEvent event, Spatial target, Spatial capture) {
+                // Do nothing
+            }
+
+            @Override
+            public void mouseExited(MouseMotionEvent event, Spatial target, Spatial capture) {
+                // Do nothing
+            }
+
+            @Override
+            public void mouseMoved(MouseMotionEvent event, Spatial target, Spatial capture) {
+                // Do nothing
+            }
+        });
+
         return horizontalContainer;
     }
 
+    /**
+     * Creates a dice label with the specified icon path.
+     *
+     * @param iconPath The path to the icon image.
+     * @return The label representing the dice.
+     */
     private Label createDiceLabel(String iconPath) {
         Label label = new Label("");
         IconComponent icon = new IconComponent(iconPath);
@@ -225,6 +252,12 @@ public class Toolbar extends Dialog implements GameEventListener {
         return label;
     }
 
+    /**
+     * Creates a dice container with the specified label.
+     *
+     * @param label The label representing the dice.
+     * @return The container representing the dice.
+     */
     private Container createDiceContainer(Label label) {
         Container container = new Container();
         container.setBackground(null);
@@ -233,77 +266,114 @@ public class Toolbar extends Dialog implements GameEventListener {
         return container;
     }
 
-    private Button createTradeButton() {
+    /**
+     * Handles the dice roll event.
+     */
+    private void handleDiceRoll() {
+        ifTopDialog(() -> {
+            if (!canRollDice) return;
+            canRollDice = false;
+            if (endTurnButton != null) endTurnButton.setEnabled(true);
+            startDiceAnimation();
+            app.getGameLogic().send(new RollDice());
+            app.getGameLogic().playSound(Sound.BUTTON);
+        });
+    }
 
-        tradeButton = new Button("", new ElementId("button-toolbar"));
+
+    private Button createTradeButton() {
+        String iconPath = "icons/icon-handeln.png";
+        // createActionButton(playerColor, "icons/icon-handeln.png", 100, () -> new ChoosePartner(app).open());
+        tradeButton = new ImageButton("generic", app);
         tradeButton.setPreferredSize(new Vector3f(150, 50, 0));
 
-        String iconTradePath = "icons/icon-handeln.png";
-        IconComponent iconTrade = new IconComponent(iconTradePath);
-        iconTrade.setHAlignment(HAlignment.Center);
-        iconTrade.setVAlignment(VAlignment.Center);
-        iconTrade.setIconSize(new Vector2f(100, 100));
+        IconComponent icon = new IconComponent(iconPath);
+        icon.setHAlignment(HAlignment.Center);
+        icon.setVAlignment(VAlignment.Center);
+        icon.setIconSize(new Vector2f(75 , 75));
+        tradeButton.setIcon(icon);
 
-        tradeButton.setIcon(iconTrade);
-        tradeButton.setFontSize(40);
-
-        // Add click behavior
-        tradeButton.addClickCommands(source -> ifTopDialog(() -> {
-            app.getGameLogic().playSound(Sound.BUTTON);
+        tradeButton.addClickCommands(s -> ifTopDialog(() -> {
             new ChoosePartner(app).open();
         }));
 
         return tradeButton;
     }
 
+
     private Button createPropertyMenuButton() {
-        propertyMenuButton = new Button("", new ElementId("button-toolbar"));
+
+        String iconPath = "icons/icon-gebaude.png";
+        propertyMenuButton = new ImageButton("generic", app);
         propertyMenuButton.setPreferredSize(new Vector3f(150, 50, 0));
 
-        String iconBuildingPath = "icons/icon-gebaude.png";
-        IconComponent iconBuilding = new IconComponent(iconBuildingPath);
-        iconBuilding.setHAlignment(HAlignment.Center);
-        iconBuilding.setVAlignment(VAlignment.Center);
-        iconBuilding.setIconSize(new Vector2f(75, 75));
+        IconComponent icon = new IconComponent(iconPath);
+        icon.setHAlignment(HAlignment.Center);
+        icon.setVAlignment(VAlignment.Center);
+        icon.setIconSize(new Vector2f(50 , 50));
+        propertyMenuButton.setIcon(icon);
 
-        propertyMenuButton.setIcon(iconBuilding);
-        propertyMenuButton.setFontSize(30);
         propertyMenuButton.addClickCommands(s -> ifTopDialog(() -> {
-            app.getGameLogic().playSound(Sound.BUTTON);
             new BuildingAdminMenu(app).open();
         }));
+
         return propertyMenuButton;
     }
 
     private Button createEndTurnButton() {
-        endTurnButton = new Button("", new ElementId("button-toolbar"));
-        endTurnButton.setFontSize(28);
+        // return createActionButton(playerColor, "icons/icon-zugbeenden.png", 75, () -> handleEndTurn());
+
+        String iconPath = "icons/icon-zugbeenden.png";
+        endTurnButton = new ImageButton("generic", app);
         endTurnButton.setPreferredSize(new Vector3f(150, 50, 0));
 
-        String iconEndTurnPath = "icons/icon-zugbeenden.png";
-        IconComponent iconEndTurn = new IconComponent(iconEndTurnPath);
-        iconEndTurn.setHAlignment(HAlignment.Center);
-        iconEndTurn.setVAlignment(VAlignment.Center);
-        iconEndTurn.setIconSize(new Vector2f(75, 75));
+        IconComponent icon = new IconComponent(iconPath);
+        icon.setHAlignment(HAlignment.Center);
+        icon.setVAlignment(VAlignment.Center);
+        icon.setIconSize(new Vector2f(50 , 50));
+        endTurnButton.setIcon(icon);
 
-        endTurnButton.setIcon(iconEndTurn);
         endTurnButton.addClickCommands(s -> ifTopDialog(() -> {
-            app.getGameLogic().playSound(Sound.BUTTON);
-            if (app.getGameLogic().getPlayerHandler().getPlayerById(app.getId()).getAccountBalance() < 0 && !bankruptPopUp) {
-                new Bankrupt(app).open();
-                bankruptPopUp = true;
-            } else {
-                bankruptPopUp = false;
-                app.getGameLogic().send(new EndTurn());
-                receivedEvent(new ButtonStatusEvent(false));
-            }
+            app.getGameLogic().send(new EndTurn());
+            receivedEvent(new ButtonStatusEvent(false));
         }));
+
         return endTurnButton;
     }
 
+    /**
+     * Creates a background with the specified color.
+     *
+     * @param color The color of the background.
+     * @return The background component.
+     */
+    private QuadBackgroundComponent createButtonBackground(ColorRGBA color) {
+        QuadBackgroundComponent background = new QuadBackgroundComponent(color);
+        Texture gradient = app.getAssetManager().loadTexture("Textures/gradient.png");
+        if (gradient != null) background.setTexture(gradient);
+        return background;
+    }
+
+    /**
+     * Handles the end turn event.
+     */
+    private void handleEndTurn() {
+        Player currentPlayer = playerHandler.getPlayerById(app.getId());
+        if (currentPlayer.getAccountBalance() < 0 && !bankruptPopUp) {
+            new Bankrupt(app).open();
+            bankruptPopUp = true;
+        } else {
+            bankruptPopUp = false;
+            app.getGameLogic().send(new EndTurn());
+            receivedEvent(new ButtonStatusEvent(false));
+        }
+    }
+
+    /**
+     * Starts the dice animation.
+     */
     private void startDiceAnimation() {
         long startTime = System.currentTimeMillis();
-    
         new Thread(() -> {
             try {
                 animateDice(startTime);
@@ -317,29 +387,36 @@ public class Toolbar extends Dialog implements GameEventListener {
     }
 
     /**
-     * Animates the dice roll by cycling through dice images.
+     * Animates the dice roll.
+     *
+     * @param startTime The start time of the animation.
+     * @throws InterruptedException If the animation is interrupted.
      */
     private void animateDice(long startTime) throws InterruptedException {
         int[] currentFace = {1};
-        while (System.currentTimeMillis() - startTime < 2000) { // Animation duration
+        while (System.currentTimeMillis() - startTime < 2000) {
             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
+            updateDiceIcons(currentFace[0]);
+            Thread.sleep(100);
         }
     }
 
     /**
-     * Displays the final dice result after animation.
+     * Updates the dice icons with the specified face.
      *
-     * @param event the dice roll event containing the result
+     * @param face The face of the dice.
+     */
+    private void updateDiceIcons(int face) {
+        app.enqueue(() -> {
+            setDiceIcon(imageLabel, diceToString(face));
+            setDiceIcon(imageLabel2, diceToString((face % 6) + 1));
+        });
+    }
+
+    /**
+     * Shows the final dice result.
+     *
+     * @param event The dice roll event.
      */
     private void showFinalDiceResult(DiceRollEvent event) {
         app.enqueue(() -> {
@@ -347,28 +424,39 @@ public class Toolbar extends Dialog implements GameEventListener {
             setDiceIcon(imageLabel2, diceToString(event.b()));
         });
     }
-    
+
+    /**
+     * Sets the dice icon with the specified image path.
+     *
+     * @param label     The label representing the dice.
+     * @param imagePath The path to the icon image.
+     */
     private void setDiceIcon(Label label, String imagePath) {
         IconComponent icon = new IconComponent(imagePath);
-        icon.setIconSize(new Vector2f(80, 80)); // Set consistent dice size
+        icon.setIconSize(new Vector2f(80, 80));
         label.setIcon(icon);
     }
-    
-
-    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);
-        }
-    }
 
     /**
-     * Handles dice roll events by updating the dice display.
+     * Converts the dice number to a string representation.
+     *
+     * @param i The dice number.
+     * @return The string representation of the dice number.
+     */
+    private String diceToString(int i) {
+        return "Pictures/dice/" + switch (i) {
+            case 1 -> "one";
+            case 2 -> "two";
+            case 3 -> "three";
+            case 4 -> "four";
+            case 5 -> "five";
+            case 6 -> "six";
+            default -> throw new IllegalArgumentException("Invalid dice number: " + i);
+        } + ".png";
+    }
+
+    /**
+     * Handles dice roll events and updates the dice display.
      *
      * @param event the dice roll event containing dice values
      */
@@ -378,67 +466,76 @@ public class Toolbar extends Dialog implements GameEventListener {
     }
 
     /**
-     * Updates the player view with the latest account and overview data.
+     * Updates the player view by refreshing the player information displayed on the toolbar.
      *
-     * @param event the update event for the player view
+     * @param event the update player view event
      */
     @Override
     public void receivedEvent(UpdatePlayerView event) {
         playerHandler = app.getGameLogic().getPlayerHandler();
-        System.out.println("Update Player View");
+        refreshPlayerView();
+    }
+
+    /**
+     * Refreshes the player view.
+     */
+    private void refreshPlayerView() {
         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);
+        addAccountDetails();
+        addOverviewDetails();
 
-        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(player.getId()).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);
-            }
-        }
+        accountContainer.setBackground(null);
         overviewContainer.setBackground(null);
     }
 
     /**
-     * Updates the enabled status of toolbar buttons based on the event.
+     * Adds the account details to the player view.
+     */
+    private void addAccountDetails() {
+        Player currentPlayer = playerHandler.getPlayerById(app.getId());
+        accountContainer.addChild(new Label("Kontostand", new ElementId("label-toolbar")));
+        accountContainer.addChild(new Label(currentPlayer.getAccountBalance() + " EUR", new ElementId("label-account")));
+        accountContainer.addChild(new Label("Gulag Karten", new ElementId("label-toolbar")));
+        accountContainer.addChild(new Label(String.valueOf(currentPlayer.getNumJailCard()), new ElementId("label-account")));
+    }
+
+    /**
+     * Adds the overview details to the player view.
+     */
+    private void addOverviewDetails() {
+        overviewContainer.addChild(new Label("Übersicht", new ElementId("label-toolbar")));
+        for (Player player : playerHandler.getPlayers()) {
+            if (player.getId() != app.getId()) {
+                Label playerLabel = new Label(
+                        player.getName() + ": " + player.getAccountBalance() + " EUR",
+                        new ElementId("label-Text")
+                );
+                playerLabel.setColor(Player.getColor(player.getId()).getColor());
+                overviewContainer.addChild(playerLabel);
+            }
+        }
+    }
+
+    /**
+     * Updates the status of toolbar buttons based on the provided button status event.
+     * Disables or enables buttons such as trade, property menu, and end turn based on the player's turn status.
      *
-     * @param event the button status event
+     * @param event the button status event indicating whether the buttons should be enabled
      */
     @Override
     public void receivedEvent(ButtonStatusEvent event) {
+        System.out.println("Button status event received: " + event.buttonsEnabled()+ "GGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGG");
         boolean enabled = event.buttonsEnabled();
-        diceButton.setEnabled(enabled);
+        canRollDice = enabled;
         tradeButton.setEnabled(enabled);
         propertyMenuButton.setEnabled(enabled);
         endTurnButton.setEnabled(false);
     }
 
     /**
-     * Closes the toolbar and detaches it from the GUI.
+     * Closes the toolbar, detaching it from the GUI.
      */
     @Override
     public void close() {
@@ -459,7 +556,7 @@ public class Toolbar extends Dialog implements GameEventListener {
      */
     @Override
     public void update() {
-        receivedEvent(new UpdatePlayerView());
+        refreshPlayerView();
         super.update();
     }
 }

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

@@ -66,7 +66,8 @@ public class Bankrupt extends Dialog {
 
         // 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.addChild(new Label("Du hast noch einen negativen Kontostand. Wenn du jetzt deinen Zug beendest, gehst du Bankrott und verlierst das Spiel!\n"+
+        "Dieses PopUp wird nicht erneut angezeigt!", 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

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

@@ -40,8 +40,8 @@ public class BuyHouse extends Dialog {
     /** Background container providing a border for the popup. */
     private final Container backgroundContainer;
 
-    /** TextField to display selected properties. */
-    private TextField selectionDisplay;
+    /** Label to display selected properties. */
+    private Label selectionDisplay;
 
     /** Reference for tracking dropdown selection changes. */
     private VersionedReference<Set<Integer>> selectionRef;
@@ -125,13 +125,13 @@ public class BuyHouse extends Dialog {
         buyHouseContainer.setLocalTranslation(
                 (app.getCamera().getWidth() - buyHouseContainer.getPreferredSize().x) / 2,
                 (app.getCamera().getHeight() + buyHouseContainer.getPreferredSize().y) / 2,
-                9
+                11
         );
 
         backgroundContainer.setLocalTranslation(
                 (app.getCamera().getWidth() - buyHouseContainer.getPreferredSize().x - padding) / 2,
                 (app.getCamera().getHeight() + buyHouseContainer.getPreferredSize().y + padding) / 2,
-                8
+                10
         );
 
         app.getGuiNode().attachChild(buyHouseContainer);
@@ -162,7 +162,7 @@ public class BuyHouse extends Dialog {
         selectionRef = propertySelector.getSelectionModel().createReference();
 
         // Initialize the selection display here
-        selectionDisplay = new TextField(""); // Create TextField for displaying selections
+        selectionDisplay = new Label("");
         selectionDisplay.setPreferredSize(new Vector3f(300, 30, 0));
         dropdownContainer.addChild(selectionDisplay); // Add it to the dropdown container
 

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

@@ -83,14 +83,14 @@ public class EventCardPopup extends Dialog {
         eventCardContainer.setLocalTranslation(
             (app.getCamera().getWidth() - eventCardContainer.getPreferredSize().x) / 2,
             (app.getCamera().getHeight() + eventCardContainer.getPreferredSize().y) / 2,
-            10
+            9
         );
 
         // Zentriere das Popup
         backgroundContainer.setLocalTranslation(
                 (app.getCamera().getWidth() - eventCardContainer.getPreferredSize().x - padding) / 2,
                 (app.getCamera().getHeight() + eventCardContainer.getPreferredSize().y+ padding) / 2,
-                9
+                8
         );
 
         app.getGuiNode().attachChild(eventCardContainer);

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

@@ -45,8 +45,8 @@ public class RepayMortage extends Dialog {
     /** Background container providing a border for the popup. */
     private final Container backgroundContainer;
 
-    /** Text field to display selected properties. */
-    private TextField selectionDisplay;
+    /** Label to display selected properties. */
+    private Label selectionDisplay;
 
     /** Reference to track property selections in the dropdown menu. */
     private VersionedReference<Set<Integer>> selectionRef;
@@ -166,7 +166,7 @@ public class RepayMortage extends Dialog {
         selectionRef = propertySelector.getSelectionModel().createReference();
 
         // Initialize the selection display here
-        selectionDisplay = new TextField(""); // Create TextField for displaying selections
+        selectionDisplay = new Label(""); // Create TextField for displaying selections
         selectionDisplay.setPreferredSize(new Vector3f(300, 30, 0));
         dropdownContainer.addChild(selectionDisplay); // Add it to the dropdown container
 

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

@@ -45,8 +45,8 @@ public class SellHouse extends Dialog {
     /** Background container providing a styled border around the main dialog. */
     private final Container backgroundContainer;
 
-    /** Text field to display selected properties. */
-    private TextField selectionDisplay;
+    /** Label to display selected properties. */
+    private Label selectionDisplay;
 
     /** Reference to track selection changes in the property selector. */
     private VersionedReference<Set<Integer>> selectionRef;
@@ -86,7 +86,7 @@ public class SellHouse extends Dialog {
         title.setFontSize(48);
         title.setColor(ColorRGBA.Black);
 
-        //Unterteilund des sellHouseContainer in drei "Untercontainer"
+        //Unterteilung des sellHouseContainer in drei "Untercontainer"
         Container upContainer = sellhouseContainer.addChild(new Container());
         Container middleContainer = sellhouseContainer.addChild(new Container());
         Container downContainer = sellhouseContainer.addChild(new Container());
@@ -172,7 +172,7 @@ public class SellHouse extends Dialog {
         selectionRef = propertySelector.getSelectionModel().createReference();
 
         // Initialize the selection display here
-        selectionDisplay = new TextField(""); // Create TextField for displaying selections
+        selectionDisplay = new Label("");
         selectionDisplay.setPreferredSize(new Vector3f(300, 30, 0));
         dropdownContainer.addChild(selectionDisplay); // Add it to the dropdown container
         

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

@@ -46,8 +46,8 @@ public class TakeMortage extends Dialog {
     /** Background container providing a styled border around the main dialog. */
     private final Container backgroundContainer;
 
-    /** Text field to display selected properties. */
-    private TextField selectionDisplay;
+    /** Label to display selected properties. */
+    private Label selectionDisplay;
 
     /** Reference to track selection changes in the property selector. */
     private VersionedReference<Set<Integer>> selectionRef;
@@ -172,7 +172,7 @@ public class TakeMortage extends Dialog {
         selectionRef = propertySelector.getSelectionModel().createReference();
 
         // Initialize the selection display here
-        selectionDisplay = new TextField(""); // Create TextField for displaying selections
+        selectionDisplay = new Label(""); // Create TextField for displaying selections
         selectionDisplay.setPreferredSize(new Vector3f(300, 30, 0));
         dropdownContainer.addChild(selectionDisplay); // Add it to the dropdown container
 

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

@@ -1,9 +1,4 @@
 package pp.monopoly.game.client;
-
-import pp.monopoly.game.server.Player;
-import pp.monopoly.message.server.NextPlayerTurn;
-import pp.monopoly.message.server.ViewAssetsResponse;
-
 /**
  * Represents the active client state in the Monopoly game.
  * Extends {@link ClientState}.
@@ -24,17 +19,4 @@ public class ActiveState extends ClientState {
     boolean isTurn() {
         return true;
     }
-
-    @Override
-    void recivedNextPlayerTurn(NextPlayerTurn msg) {
-        logic.getBoard().clear();
-        for (Player player : logic.getPlayerHandler().getPlayers()) {
-            logic.getBoard().add(player.getFigure());
-        }
-    }
-
-    @Override
-    void recivedViewAssetsResponse(ViewAssetsResponse msg) {
-        
-    }
 }

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

@@ -5,6 +5,8 @@ import java.lang.System.Logger.Level;
 import java.util.ArrayList;
 import java.util.List;
 
+import com.jme3.math.Vector3f;
+
 import pp.monopoly.game.server.Player;
 import pp.monopoly.game.server.PlayerHandler;
 import pp.monopoly.message.client.ClientMessage;
@@ -24,8 +26,10 @@ import pp.monopoly.message.server.TradeReply;
 import pp.monopoly.message.server.TradeRequest;
 import pp.monopoly.message.server.ViewAssetsResponse;
 import pp.monopoly.model.Board;
+import pp.monopoly.model.Figure;
 import pp.monopoly.model.Hotel;
 import pp.monopoly.model.House;
+import pp.monopoly.model.Rotation;
 import pp.monopoly.model.TradeHandler;
 import pp.monopoly.model.fields.BoardManager;
 import pp.monopoly.model.fields.BuildingProperty;
@@ -231,7 +235,7 @@ public class ClientGameLogic implements ServerInterpreter, GameEventBroker {
         playerHandler = msg.getPlayerHandler();
         setState(new WaitForTurnState(this));
         for (Player player : playerHandler.getPlayers()) {
-            board.add(player.getFigure());
+            board.add(new Figure(Vector3f.ZERO, Rotation.NORTH, player.getFigure()));
         }
         notifyListeners(new ButtonStatusEvent(false));
         notifyListeners(new UpdatePlayerView());

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

@@ -23,7 +23,6 @@ import pp.monopoly.message.server.NextPlayerTurn;
 import pp.monopoly.message.server.NotificationMessage;
 import pp.monopoly.message.server.PlayerStatusUpdate;
 import pp.monopoly.model.FieldVisitor;
-import pp.monopoly.model.Figure;
 import pp.monopoly.model.card.Card;
 import pp.monopoly.model.fields.BuildingProperty;
 import pp.monopoly.model.fields.EventField;
@@ -44,7 +43,7 @@ public class Player implements FieldVisitor<Void>{
     private final int id;
     private String name;
     private int accountBalance = 15000;
-    private Figure figure;
+    private String figure;
     private Set<Integer> properties = new HashSet<>();
     private int getOutOfJailCard;
     private int fieldID;
@@ -82,11 +81,19 @@ public class Player implements FieldVisitor<Void>{
         this.handler = handler;
     }
 
-    public void setFigure(Figure figure) {
+    /**
+     * Set the figure of the player
+     * @param figure the figure to be set
+     */
+    public void setFigure(String figure) {
         this.figure = figure;
     }
-    
-    public Figure getFigure(){
+
+    /**
+     * Returns the figure of the player
+     * @return the figure of the player
+     */
+    public String getFigure() {
         return figure;
     }
 
@@ -180,7 +187,6 @@ public class Player implements FieldVisitor<Void>{
             earnMoney(2000); // Passing GO gives money
         }
         fieldID = (fieldID + steps) % 40;
-        figure.moveTo(fieldID);
         handler.getLogic().send(this, new PlayerStatusUpdate(handler));
         handler.getLogic().getBoardManager().getFieldAtIndex(fieldID).accept(this);
         return fieldID;
@@ -194,7 +200,6 @@ public class Player implements FieldVisitor<Void>{
     public int setPosition(int position){
         if(position < 40 && position >= 0) {
             fieldID = position;
-            figure.moveTo(fieldID);
             handler.getLogic().send(this, new PlayerStatusUpdate(handler));
             handler.getLogic().getBoardManager().getFieldAtIndex(fieldID).accept(this);
         }
@@ -212,7 +217,6 @@ public class Player implements FieldVisitor<Void>{
                 earnMoney(2000);
             }
             fieldID = position;
-            figure.moveTo(fieldID);
             handler.getLogic().send(this, new PlayerStatusUpdate(handler));
             handler.getLogic().getBoardManager().getFieldAtIndex(fieldID).accept(this);
         }

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

@@ -6,12 +6,14 @@ import com.jme3.math.ColorRGBA;
  * Enum representing six distinct colors for players in the game.
  */
 public enum PlayerColor {
-    CYAN(new ColorRGBA(1 / 255f, 190 / 255f, 254 / 255f, 1), "Cyan"),
-    YELLOW(new ColorRGBA(255 / 255f, 255 / 255f, 0 / 255f, 1), "Gelb"),
-    RED(new ColorRGBA(255 / 255f, 0 / 255f, 0 / 255f, 1), "Rot"),
-    PINK(new ColorRGBA(255 / 255f, 77 / 255f, 166 / 255f, 1), "Pink"),
-    GREEN(new ColorRGBA(0 / 255f, 204 / 255f, 0 / 255f, 1), "Grün"),
-    PURPLE(new ColorRGBA(143 / 255f, 0 / 255f, 255 / 255f, 1), "Lila");
+    CYAN(new ColorRGBA(69 / 255f, 205 / 255f, 205 / 255f, 1), "Cyan"),
+    YELLOW(new ColorRGBA(225 / 255f, 201 / 255f, 44 / 255f, 1), "Yellow"),
+    RED(new ColorRGBA(255 / 255f, 33 / 255f, 33 / 255f, 1), "Red"),
+    PINK(new ColorRGBA(196 / 255f, 73 / 255f, 240 / 255f, 1), "Pink"),
+    GREEN(new ColorRGBA(61 / 255f, 227 / 255f, 58 / 255f, 1), "Green"),
+    PURPLE(new ColorRGBA(60 / 255f, 74 / 255f, 223 / 255f, 1), "Purple");
+
+
 
     private final ColorRGBA color;
     private final String colorName;

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

@@ -3,11 +3,9 @@ package pp.monopoly.game.server;
 import java.lang.System.Logger;
 import java.lang.System.Logger.Level;
 import java.util.HashSet;
-import java.util.List;
 import java.util.Set;
 import java.util.stream.Collectors;
 
-import com.jme3.math.Vector3f;
 
 import pp.monopoly.MonopolyConfig;
 import pp.monopoly.message.client.AlterProperty;
@@ -29,8 +27,6 @@ import pp.monopoly.message.server.ServerMessage;
 import pp.monopoly.message.server.TradeReply;
 import pp.monopoly.message.server.TradeRequest;
 import pp.monopoly.message.server.ViewAssetsResponse;
-import pp.monopoly.model.Figure;
-import pp.monopoly.model.Rotation;
 import pp.monopoly.model.TradeHandler;
 import pp.monopoly.model.card.DeckHelper;
 import pp.monopoly.model.fields.BoardManager;
@@ -223,8 +219,7 @@ public class ServerGameLogic implements ClientInterpreter {
             String name = msg.getName();
             String truc = name.length() > 10 ? name.substring(0, 15) : name;
             player.setName(truc);
-            Figure figure = new Figure(new Vector3f(0, 1, 0), Rotation.NORTH, msg.getFigure());
-            player.setFigure(figure);
+            player.setFigure(msg.getFigure());
             // board.addFigure(figure);
             playerHandler.setPlayerReady(player, true);    
             LOGGER.log(Level.DEBUG, "Player {0} is ready", player.getName());
@@ -327,25 +322,29 @@ public class ServerGameLogic implements ClientInterpreter {
     }
 
     /**
-     * Executes the trade by transferring requested properties from the receiver
-     * to the sender and offered properties from the sender to the receiver.
+     * Executes a trade between two players, transferring properties and money as specified.
+     *
+     * @param sender            the player initiating the trade
+     * @param receiver          the player receiving the trade offer
+     * @param requestedProperties the properties requested by the receiver
+     * @param offeredProperties   the properties offered by the sender
      */
-    public void executeTrade(Player sender, Player receiver, Set<PropertyField> requestedProperties, Set<PropertyField> offeredProperties) {
+    private void executeTrade(Player sender, Player receiver, Set<PropertyField> requestedProperties, Set<PropertyField> offeredProperties) {
         // Transfer requested properties from receiver to sender
-        for (PropertyField field : requestedProperties) {
+        for (PropertyField field : offeredProperties) {
                 receiver.removeProperty(field.getId());
                 sender.addProperty(field.getId());
                 field.setOwner(sender); // Update ownership
-                System.out.printf("Property %s transferred from %s to %s.\n", 
+                LOGGER.log(Level.DEBUG, "Property %s transferred from %s to %s.\n", 
                                 field.getName(), receiver.getName(), sender.getName());
         }
 
         // Transfer offered properties from sender to receiver
-        for (PropertyField field : offeredProperties) {
+        for (PropertyField field : requestedProperties) {
                 sender.removeProperty(field.getId());
                 receiver.addProperty(field.getId());
                 field.setOwner(receiver); // Update ownership
-                System.out.printf("Property %s transferred from %s to %s.\n", 
+                LOGGER.log(Level.DEBUG, "Property %s transferred from %s to %s.\n", 
                                 field.getName(), sender.getName(), receiver.getName());
             }
     }
@@ -448,16 +447,99 @@ public class ServerGameLogic implements ClientInterpreter {
         } else if (msg.getKeyword().equals("PayJail")) {
             playerHandler.getPlayerById(from).payBail();
         } else if(msg.getKeyword().equals("hack")) {
-            // for (BuildingProperty bp : boardManager.getPropertyFields( List.of(1,3)).stream().filter(p -> p instanceof BuildingProperty).map(p -> (BuildingProperty) p).collect(Collectors.toList())) {
-            //     bp.build();
-            // }
-            for(PropertyField field : boardManager.getBoard().stream().filter(p -> p instanceof PropertyField).map(p -> (PropertyField) p).collect(Collectors.toList())) {
-                field.setOwner(playerHandler.getPlayerById(0));
-                playerHandler.getPlayerById(0).addProperty(field.getId());
-            }
-            playerHandler.getPlayerById(0).earnMoney(20000);
+            generatePredefinedGameState();
         }
 
         updateAllPlayers();
     }
+
+    private void generatePredefinedGameState() {
+        // Ensure at least two players exist
+        if (playerHandler.getPlayers().size() < 2) {
+            Player player1 = new Player(0, "Player1", playerHandler);
+            Player player2 = new Player(1, "Player2", playerHandler);
+    
+            playerHandler.addPlayer(player1);
+            playerHandler.addPlayer(player2);
+        }
+    
+        Player p1 = playerHandler.getPlayerById(0);
+        Player p2 = playerHandler.getPlayerById(1);
+    
+        // Reset properties and balances for a clean state
+        p1.getProperties().clear();
+        p2.getProperties().clear();
+        boardManager.getBoard().forEach(field -> {
+            if (field instanceof PropertyField) {
+                ((PropertyField) field).setOwner(null);
+            }
+        });
+    
+        // Define properties to assign
+        Set<Integer> p1Properties = Set.of(1, 3, 6, 8); // Gym, Sportplatz, Studium+, PhysikHörsaal
+        Set<Integer> p2Properties = Set.of(21, 23, 24, 9); // Red set + Audimax
+    
+        // Assign properties via AlterProperty
+        assignProperties(p1, p1Properties);
+        assignProperties(p2, p2Properties);
+    
+        // Player 1 builds houses on Gym and Sportplatz
+        buildHouses(p1, Set.of(1, 3));
+    
+        // Player 2 builds houses on the Red set
+        buildHouses(p2, Set.of(21, 23, 24));
+    
+        // Set player balances
+        p1.setAccountBalance(12325);
+        p2.setAccountBalance(26750);
+    
+        // Add Get Out of Jail cards
+        p1.addJailCard();
+    
+        // Set player positions
+        p1.setPosition(6); // Near Studium+
+        p2.setPosition(25); // Near Nordtor
+    
+        LOGGER.log(Level.INFO, "Predefined game state generated.");
+        updateAllPlayers();
+    }
+    
+    /**
+     * Assigns properties to a player using AlterProperty messages.
+     *
+     * @param player     the player to assign properties to
+     * @param properties the set of property IDs to assign
+     */
+    private void assignProperties(Player player, Set<Integer> properties) {
+        AlterProperty alterProperty = new AlterProperty("AssignProperties");
+        alterProperty.setProperties(properties);
+    
+        for (Integer propertyId : properties) {
+            PropertyField field = (PropertyField) boardManager.getFieldAtIndex(propertyId);
+            field.setOwner(player);
+            player.addProperty(propertyId);
+        }
+        LOGGER.log(Level.DEBUG, "Properties assigned to player {0}: {1}", player.getName(), properties);
+    }
+    
+    /**
+     * Builds houses for a player on specific properties using AlterProperty messages.
+     *
+     * @param player     the player building houses
+     * @param properties the set of property IDs to build houses on
+     */
+    private void buildHouses(Player player, Set<Integer> properties) {
+        AlterProperty alterProperty = new AlterProperty("BuyHouse");
+        alterProperty.setProperties(properties);
+    
+        for (Integer propertyId : properties) {
+            BuildingProperty field = (BuildingProperty) boardManager.getFieldAtIndex(propertyId);
+            if (boardManager.canBuild(field) && player.getAccountBalance() >= field.getHousePrice()) {
+                field.build();
+                player.pay(field.getHousePrice());
+                LOGGER.log(Level.DEBUG, "House built on property {0} for player {1}.", field.getName(), player.getName());
+            }
+        }
+    }
+    
 }

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

@@ -28,7 +28,18 @@ public class TradeResponse extends ClientMessage{
         this.tradeHandler = tradeHandler;
     }
 
+    /**
+     * Returns whether the trade was accepted.
+     *
+     * @return {@code true} if the trade was accepted, {@code false} otherwise
+     */
     public boolean isAccepted() { return status; }
+    
+    /**
+     * Returns the TradeHandler corresponding to the Trade.
+     *
+     * @return the TradeHandler corresponding to the Trade
+     */
     public TradeHandler getTradeHandler() {
         return tradeHandler;
     }

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

@@ -90,7 +90,7 @@ public class ServerGameLogicTest {
         // Arrange: Spieler initialisieren und Position setzen
         Player player = new Player(1, "Testspieler", mock(PlayerHandler.class)); // Spieler-Objekt erstellen
         Figure figure = mock(Figure.class); // Mock für die Spielfigur
-        player.setFigure(figure); // Mock-Figur dem Spieler zuweisen
+        
         int initialFieldID = player.getFieldID(); // Startfeld
         DiceResult diceResult = new DiceResult(3, 4); // Würfel: 3 und 4
 
@@ -106,7 +106,7 @@ public class ServerGameLogicTest {
 
         // Assert: Position überprüfen und sicherstellen, dass `figure.moveTo` aufgerufen wurde
         assertEquals(expectedFieldID, player.getFieldID()); // Überprüfen, ob der Spieler auf dem erwarteten Feld ist
-        verify(figure).moveTo(expectedFieldID); // Sicherstellen, dass die Figur bewegt wurde
+        
     }
 
     /**
@@ -748,7 +748,6 @@ public class ServerGameLogicTest {
 
         // Create a player with mocked handler
         Player player = new Player(1, "Spieler 1", handler);
-        player.setFigure(figure); // Set the mocked figure
         // player.setPosition(5); // Set the initial position
 
         // Stub handler.getLogic() to return mocked ServerGameLogic
@@ -1028,7 +1027,11 @@ public class ServerGameLogicTest {
 
         player.jail();
 
-        player.payBail();
+        try {
+            player.payBail();
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
         
         // Assert: Spieler ist nicht mehr im Gulag und Geld wurde abgezogen
         assertTrue(player.canFinishTurn()); // Spieler kann den Zug beenden
@@ -1231,10 +1234,6 @@ public class ServerGameLogicTest {
         handler.addPlayer(player2);
         handler.addPlayer(player3);
 
-        player1.setFigure(figure); // Zuweisung einer Spielfigur
-        player2.setFigure(figure);
-        player3.setFigure(figure);
-
         DeckHelper deckHelper = new DeckHelper();
 
         Card card = null;
@@ -1263,7 +1262,7 @@ public class ServerGameLogicTest {
         // Arrange
         PlayerHandler handler = new PlayerHandler(null);
         Player player = new Player(1, handler);
-        player.setFigure(figure);
+        
         DeckHelper deckHelper = new DeckHelper();
 
         Card card = null;
@@ -1290,7 +1289,7 @@ public class ServerGameLogicTest {
         // Arrange
         PlayerHandler handler = new PlayerHandler(null);
         Player player = new Player(1, handler);
-        player.setFigure(figure); // Zuweisung einer Spielfigur
+        
         DeckHelper deckHelper = new DeckHelper();
 
         Card card = null;
@@ -1316,7 +1315,7 @@ public class ServerGameLogicTest {
         // Arrange
         PlayerHandler handler = new PlayerHandler(null);
         Player player = new Player(1, handler);
-        player.setFigure(figure); // Zuweisung einer Spielfigur
+        
         DeckHelper deckHelper = new DeckHelper();
 
         Card card = null;
@@ -1346,7 +1345,7 @@ public class ServerGameLogicTest {
         ServerGameLogic logic = mock(ServerGameLogic.class); // Mock ServerGameLogic
         PlayerHandler handler = new PlayerHandler(logic); // Übergebe den Mock
         Player player = new Player(1, handler);
-        player.setFigure(figure); // Zuweisung einer Spielfigur
+        
         DeckHelper deckHelper = new DeckHelper();
 
         Card card = null;
@@ -1370,7 +1369,7 @@ public class ServerGameLogicTest {
         ServerGameLogic logic = mock(ServerGameLogic.class); // Mock ServerGameLogic
         PlayerHandler handler = new PlayerHandler(logic); // Übergebe den Mock
         Player player = new Player(1, handler);
-        player.setFigure(figure); // Zuweisung einer Spielfigur
+        
         handler.addPlayer(player); // Spieler zur Liste hinzufügen
         DeckHelper deckHelper = new DeckHelper();
 
@@ -1395,7 +1394,7 @@ public class ServerGameLogicTest {
         ServerGameLogic logic = mock(ServerGameLogic.class); // Mock ServerGameLogic
         PlayerHandler handler = new PlayerHandler(logic); // Übergebe den Mock
         Player player = new Player(1, handler);
-        player.setFigure(figure); // Zuweisung einer Spielfigur
+        
         handler.addPlayer(player); // Spieler zur Liste hinzufügen
         DeckHelper deckHelper = new DeckHelper();
 
@@ -1422,7 +1421,7 @@ public class ServerGameLogicTest {
         ServerGameLogic logic = mock(ServerGameLogic.class); // Mock ServerGameLogic
         PlayerHandler handler = new PlayerHandler(logic); // Übergebe den Mock
         Player player = new Player(1, handler);
-        player.setFigure(figure); // Zuweisung einer Spielfigur
+        
         handler.addPlayer(player); // Spieler zur Liste hinzufügen
         DeckHelper deckHelper = new DeckHelper();
 
@@ -1449,7 +1448,7 @@ public class ServerGameLogicTest {
         ServerGameLogic logic = mock(ServerGameLogic.class); // Mock ServerGameLogic
         PlayerHandler handler = new PlayerHandler(logic); // Übergebe den Mock
         Player player = new Player(1, handler);
-        player.setFigure(figure); // Zuweisung einer Spielfigur
+        
         handler.addPlayer(player); // Spieler zur Liste hinzufügen
         DeckHelper deckHelper = new DeckHelper();
 
@@ -1484,7 +1483,7 @@ public class ServerGameLogicTest {
         ServerGameLogic logic = mock(ServerGameLogic.class); // Mock ServerGameLogic
         PlayerHandler handler = new PlayerHandler(logic); // Übergebe den Mock
         Player player = new Player(1, handler);
-        player.setFigure(figure); // Zuweisung einer Spielfigur
+        
         player.setAccountBalance(1500); // Startguthaben
         handler.addPlayer(player); // Spieler zur Liste hinzufügen
         DeckHelper deckHelper = new DeckHelper();
@@ -1511,7 +1510,7 @@ public class ServerGameLogicTest {
         ServerGameLogic logic = mock(ServerGameLogic.class); // Mock ServerGameLogic
         PlayerHandler handler = new PlayerHandler(logic); // Übergebe den Mock
         Player player = new Player(1, handler);
-        player.setFigure(figure); // Zuweisung einer Spielfigur
+        
         handler.addPlayer(player); // Spieler zur Liste hinzufügen
         DeckHelper deckHelper = new DeckHelper();
 
@@ -1542,7 +1541,7 @@ public class ServerGameLogicTest {
         ServerGameLogic logic = mock(ServerGameLogic.class); // Mock ServerGameLogic
         PlayerHandler handler = new PlayerHandler(logic); // Übergebe den Mock
         Player player = new Player(1, handler);
-        player.setFigure(figure); // Zuweisung einer Spielfigur
+        
         handler.addPlayer(player); // Spieler zur Liste hinzufügen
         DeckHelper deckHelper = new DeckHelper();
 
@@ -1565,7 +1564,7 @@ public class ServerGameLogicTest {
         ServerGameLogic logic = mock(ServerGameLogic.class); // Mock ServerGameLogic
         PlayerHandler handler = new PlayerHandler(logic); // Übergebe den Mock
         Player player = new Player(1, handler);
-        player.setFigure(figure); // Zuweisung einer Spielfigur
+        
         try {
             player.setPosition(10); // Starte auf Position 10
         } catch (Exception e) {
@@ -1594,7 +1593,7 @@ public class ServerGameLogicTest {
         ServerGameLogic logic = mock(ServerGameLogic.class); // Mock ServerGameLogic
         PlayerHandler handler = new PlayerHandler(logic); // Übergebe den Mock
         Player player = new Player(1, handler);
-        player.setFigure(figure); // Zuweisung einer Spielfigur
+        
         handler.addPlayer(player); // Spieler zur Liste hinzufügen
         DeckHelper deckHelper = new DeckHelper();
 
@@ -1619,7 +1618,7 @@ public class ServerGameLogicTest {
         ServerGameLogic logic = mock(ServerGameLogic.class); // Mock der ServerGameLogic
         PlayerHandler handler = new PlayerHandler(logic); // Mock-Logik übergeben
         Player player = new Player(1, handler);
-        player.setFigure(figure); // Spielfigur setzen
+        
         handler.addPlayer(player); // Spieler hinzufügen
         DeckHelper deckHelper = new DeckHelper();
 
@@ -1644,7 +1643,7 @@ public class ServerGameLogicTest {
         ServerGameLogic logic = mock(ServerGameLogic.class); // Mock der ServerGameLogic
         PlayerHandler handler = new PlayerHandler(logic); // Mock-Logik übergeben
         Player player = new Player(1, handler);
-        player.setFigure(figure); // Spielfigur setzen
+        
         handler.addPlayer(player); // Spieler hinzufügen
         DeckHelper deckHelper = new DeckHelper();
 
@@ -1673,7 +1672,7 @@ public class ServerGameLogicTest {
         PlayerHandler handler = new PlayerHandler(logic); // Mock-Logik übergeben
 
         Player player = new Player(1, handler);
-        player.setFigure(figure); // Spielfigur setzen
+        
         handler.addPlayer(player); // Spieler 1 hinzufügen
 
 
@@ -1698,7 +1697,7 @@ public class ServerGameLogicTest {
         ServerGameLogic logic = mock(ServerGameLogic.class); // Mock der ServerGameLogic
         PlayerHandler handler = new PlayerHandler(logic); // Mock-Logik übergeben
         Player player = new Player(1, handler);
-        player.setFigure(figure); // Spielfigur setzen
+        
         player.setAccountBalance(1500); // Startsaldo setzen
         handler.addPlayer(player); // Spieler hinzufügen
         DeckHelper deckHelper = new DeckHelper();
@@ -1725,7 +1724,7 @@ public class ServerGameLogicTest {
         ServerGameLogic logic = mock(ServerGameLogic.class); // Mock der ServerGameLogic
         PlayerHandler handler = new PlayerHandler(logic); // Mock-Logik übergeben
         Player player = new Player(1, handler);
-        player.setFigure(figure); // Spielfigur setzen
+        
         player.setAccountBalance(1500); // Startsaldo setzen
         handler.addPlayer(player); // Spieler hinzufügen
         DeckHelper deckHelper = new DeckHelper();
@@ -1753,7 +1752,7 @@ public class ServerGameLogicTest {
         ServerGameLogic logic = mock(ServerGameLogic.class); // Mock der ServerGameLogic
         PlayerHandler handler = new PlayerHandler(logic); // Mock-Logik übergeben
         Player player = new Player(1, handler);
-        player.setFigure(figure); // Spielfigur setzen
+        
         handler.addPlayer(player); // Spieler hinzufügen
         DeckHelper deckHelper = new DeckHelper();
 
@@ -1780,7 +1779,7 @@ public class ServerGameLogicTest {
         ServerGameLogic logic = mock(ServerGameLogic.class); // Mock der ServerGameLogic
         PlayerHandler handler = new PlayerHandler(logic); // Mock-Logik übergeben
         Player player = new Player(1, handler);
-        player.setFigure(figure); // Spielfigur setzen
+        
         handler.addPlayer(player); // Spieler hinzufügen
         player.setAccountBalance(15000); // Anfangsstand des Kontos
         DeckHelper deckHelper = new DeckHelper();
@@ -1806,7 +1805,7 @@ public class ServerGameLogicTest {
         ServerGameLogic logic = mock(ServerGameLogic.class); // Mock der ServerGameLogic
         PlayerHandler handler = new PlayerHandler(logic); // Mock-Logik übergeben
         Player player = new Player(1, handler);
-        player.setFigure(figure); // Spielfigur setzen
+        
         handler.addPlayer(player); // Spieler hinzufügen
         player.setAccountBalance(15000); // Anfangsstand des Kontos
         DeckHelper deckHelper = new DeckHelper();
@@ -1833,7 +1832,7 @@ public class ServerGameLogicTest {
         ServerGameLogic logic = mock(ServerGameLogic.class); // Mock der ServerGameLogic
         PlayerHandler handler = new PlayerHandler(logic); // Mock-Logik übergeben
         Player player = new Player(1, handler);
-        player.setFigure(figure); // Spielfigur setzen
+        
         handler.addPlayer(player); // Spieler hinzufügen
         player.setAccountBalance(15000); // Anfangsstand des Kontos
         DeckHelper deckHelper = new DeckHelper();
@@ -1860,7 +1859,7 @@ public class ServerGameLogicTest {
         ServerGameLogic logic = mock(ServerGameLogic.class); // Mock der ServerGameLogic
         PlayerHandler handler = new PlayerHandler(logic); // Mock-Logik übergeben
         Player player = new Player(1, handler);
-        player.setFigure(figure); // Spielfigur setzen
+        
         handler.addPlayer(player); // Spieler hinzufügen
         player.setAccountBalance(15000); // Startguthaben des Spielers
         DeckHelper deckHelper = new DeckHelper();