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

# Conflicts:
#	Projekte/monopoly/client/src/main/java/pp/monopoly/client/gui/ChoosePartner.java

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

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

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

@@ -221,7 +221,7 @@ public class MonopolyApp extends SimpleApplication implements MonopolyClient, Ga
     /**
      * Returns the current configuration settings for the Battleship client.
      *
-     * @return The {@link BattleshipClientConfig} instance.
+     * @return The {@link BattleshipClientConfig} instance. //TODO Fehler im Kommentar
      */
     @Override
     public MonopolyAppConfig getConfig() {
@@ -279,19 +279,7 @@ public class MonopolyApp extends SimpleApplication implements MonopolyClient, Ga
     private void handleB(boolean isPressed) {
         if (isPressed) {
             Dialog tmp = new BuyCard(this);
-            if (eventCard != null && isBuyCardPopupOpen) {
+            tmp.open();
-                // Schließe das SettingsMenu
-                System.out.println("Schließe BuyCardPopup...");
-                eventCard.close();
-                eventCard = null;
-                tmp.open();
-            } else {
-                // Öffne das SettingsMenu
-                System.out.println("Öffne BuyCardPopup...");
-                eventCard = new EventCard(this);
-                eventCard.open();
-                dialogManager.close(tmp);
-            }
         }
     }
 
@@ -320,6 +308,7 @@ public class MonopolyApp extends SimpleApplication implements MonopolyClient, Ga
 
         attachGameSound();
         attachGameMusic();
+        stateManager.attach(new GameAppState());
     }
 
     /**
@@ -443,6 +432,7 @@ public class MonopolyApp extends SimpleApplication implements MonopolyClient, Ga
      */
     @Override
     public void receivedEvent(ClientStateEvent event) {
+        stateManager.getState(GameAppState.class).setEnabled(true);
     }
 
     /**
@@ -503,4 +493,9 @@ public class MonopolyApp extends SimpleApplication implements MonopolyClient, Ga
     public void disconnect() {
         serverConnection.disconnect();
     }
+
+    public int getId() {
+        if (serverConnection != null && serverConnection instanceof NetworkSupport) return ((NetworkSupport) serverConnection).getId();
+        return 0;
+    }
 }

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

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

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

@@ -1,5 +1,9 @@
 package pp.monopoly.client.gui;
 
+import java.util.Set;
+
+import com.jme3.app.Application;
+import com.jme3.app.state.BaseAppState;
 import com.jme3.material.Material;
 import com.jme3.math.ColorRGBA;
 import com.jme3.math.Vector3f;
@@ -7,48 +11,149 @@ import com.jme3.scene.Geometry;
 import com.jme3.scene.shape.Quad;
 import com.jme3.texture.Texture;
 import com.simsilica.lemur.Axis;
+import com.simsilica.lemur.Button;
 import com.simsilica.lemur.Container;
 import com.simsilica.lemur.Label;
-import com.simsilica.lemur.TextField;
+import com.simsilica.lemur.Selector;
 import com.simsilica.lemur.component.QuadBackgroundComponent;
 import com.simsilica.lemur.component.SpringGridLayout;
+import com.simsilica.lemur.core.VersionedList;
+import com.simsilica.lemur.core.VersionedReference;
 import com.simsilica.lemur.style.ElementId;
 import pp.dialog.Dialog;
 import pp.monopoly.client.MonopolyApp;
+import pp.monopoly.game.server.Player;
+import pp.monopoly.model.TradeHandler;
+import pp.monopoly.notification.Sound;
 
 public class ChoosePartner extends Dialog {
-
     private final MonopolyApp app;
-    private final Container menuContainer;
+    private Selector<String> playerSelector;
+    private final Button cancelButton = new Button("Abbrechen");
+    private final Button confirmButton = new Button("Bestätigen");
+    private final Container mainContainer;
+    private Container lowerLeftMenu;
+    private Container lowerRightMenu;
     private Geometry background;
+    private TradeHandler tradeHandler;
+    QuadBackgroundComponent translucentWhiteBackground =
+            new QuadBackgroundComponent(new ColorRGBA(1.0f, 1.0f, 1.0f, 0.5f));
 
-
+    /**
+     * Constructs the ChoosePartner dialog.
+     *
+     * @param app The Monopoly application instance.
+     */
     public ChoosePartner(MonopolyApp app) {
         super(app.getDialogManager());
         this.app = app;
+        tradeHandler = new TradeHandler(app.getGameLogic().getPlayerHandler().getPlayerById(app.getId()));
 
-        // Hintergrundbild laden und hinzufügen
+        // Background Image
         addBackgroundImage();
 
-        QuadBackgroundComponent translucentWhiteBackground =
+        // Main container for the UI components
-                new QuadBackgroundComponent(new ColorRGBA(1.0f, 1.0f, 1.0f, 0.5f));
+        mainContainer = new Container(new SpringGridLayout(Axis.Y, Axis.X));
+        mainContainer.setPreferredSize(new Vector3f(1000, 600, 0));
+        mainContainer.setBackground(translucentWhiteBackground);
 
-        menuContainer = new Container(new SpringGridLayout(Axis.Y, Axis.X));
+        // Add title with background
-        menuContainer.setPreferredSize(new Vector3f(1000, 600, 0)); // Fixed size of the container
+        Label headerLabel = mainContainer.addChild(new Label("Wähle deinen Handelspartner:", new ElementId("label-Bold")));
-        menuContainer.setBackground(translucentWhiteBackground);
+        headerLabel.setFontSize(40);
+        headerLabel.setBackground(new QuadBackgroundComponent(new ColorRGBA(1.0f, 1.0f, 1.0f, 0.5f)));
 
-        // Create a smaller horizontal container for the label, input field, and spacers
+        // Dropdown for player selection
-        Container horizontalContainer = menuContainer.addChild(new Container(new SpringGridLayout(Axis.X, Axis.Y)));
+        mainContainer.addChild(createDropdown());
-        horizontalContainer.setPreferredSize(new Vector3f(600, 40, 0)); // Adjust container size
-        horizontalContainer.setBackground(null);
 
-        Label title = horizontalContainer.addChild(new Label("Wähle deinen Handelspartner:", new ElementId("label-Bold")));
+        // Add buttons
-        title.setFontSize(40);
+        mainContainer.addChild(createButtonContainer());
 
+        addSelectionActionListener(playerSelector, this::onDropdownSelectionChanged);        
+
+        // Attach main container to GUI node
+        app.getGuiNode().attachChild(mainContainer);
+        mainContainer.setLocalTranslation(
+                (app.getCamera().getWidth() - mainContainer.getPreferredSize().x) / 2,
+                (app.getCamera().getHeight() + mainContainer.getPreferredSize().y) / 2,
+                4
+        );
     }
 
     /**
-     * Lädt das Hintergrundbild und fügt es als geometrische Ebene hinzu.
+     * Creates the dropdown menu for selecting a partner.
+     *
+     * @return The dropdown container.
+     */
+    private Container createDropdown() {
+        Container dropdownContainer = new Container(new SpringGridLayout(Axis.Y, Axis.X));
+        dropdownContainer.setPreferredSize(new Vector3f(100, 80, 0));
+        dropdownContainer.setBackground(new QuadBackgroundComponent(new ColorRGBA(ColorRGBA.Black)));
+
+        VersionedList<String> playerOptions = new VersionedList<>();
+
+        for (Player player : app.getGameLogic().getPlayerHandler().getPlayers()) {
+            if (player.getId() != app.getId()) {
+                playerOptions.add(player.getName() + " (ID: "+player.getId()+")");
+            }
+        }
+
+        playerSelector = new Selector<>(playerOptions, "glass");
+        dropdownContainer.addChild(playerSelector);
+        Vector3f dimens = dropdownContainer.getPreferredSize();
+        Vector3f dimens2 = playerSelector.getPopupContainer().getPreferredSize();
+        dimens2.setX( dimens.getX() );
+        playerSelector.getPopupContainer().setPreferredSize(new Vector3f(200,200,3));
+        playerSelector.setLocalTranslation(0,0,5);
+        onDropdownSelectionChanged(playerOptions.get(0));
+
+        return dropdownContainer;
+    }
+
+    /**
+     * Creates the button container with cancel and confirm buttons.
+     *
+     * @return The button container.
+     */
+    private Container createButtonContainer() {
+        Container buttonContainer = new Container(new SpringGridLayout(Axis.X, Axis.Y));
+        buttonContainer.setBackground(translucentWhiteBackground);
+
+        // "Abbrechen" button
+        lowerLeftMenu = new Container();
+        cancelButton.setPreferredSize(new Vector3f(200, 60, 0));
+        cancelButton.setFontSize(30);
+        cancelButton.addClickCommands(s -> ifTopDialog(() -> {
+            app.getGameLogic().playSound(Sound.BUTTON);
+            close();
+        }));
+        lowerLeftMenu.addChild(cancelButton);
+
+        // Position the container near the bottom-left corner
+        lowerLeftMenu.setLocalTranslation(new Vector3f(120, 170, 5)); // Adjust X and Y to align with the bottom-left corner
+        app.getGuiNode().attachChild(lowerLeftMenu);
+
+
+        // "Bestätigen" button
+        lowerRightMenu = new Container();
+        confirmButton.setPreferredSize(new Vector3f(200, 60, 0));
+        confirmButton.setFontSize(30);
+        confirmButton.addClickCommands(s -> ifTopDialog(() -> {
+            app.getGameLogic().playSound(Sound.BUTTON);
+            close();
+            new TradeMenu(app).open();
+        }));
+        lowerRightMenu.addChild(confirmButton);
+
+        // Position the container near the bottom-right corner
+        lowerRightMenu.setLocalTranslation(new Vector3f(app.getCamera().getWidth() - 320, 170, 5)); // X: 220px from the right, Y: 50px above the bottom
+        app.getGuiNode().attachChild(lowerRightMenu);
+
+
+        return buttonContainer;
+    }
+
+    /**
+     * Adds a background image to the dialog.
      */
     private void addBackgroundImage() {
         Texture backgroundImage = app.getAssetManager().loadTexture("Pictures/unibw-Bib2.png");
@@ -57,8 +162,100 @@ public class ChoosePartner extends Dialog {
         Material backgroundMaterial = new Material(app.getAssetManager(), "Common/MatDefs/Misc/Unshaded.j3md");
         backgroundMaterial.setTexture("ColorMap", backgroundImage);
         background.setMaterial(backgroundMaterial);
-        background.setLocalTranslation(0, 0, -1); // Hintergrundebene
+        background.setLocalTranslation(0, 0, 3); // Position behind other GUI elements
-
         app.getGuiNode().attachChild(background);
     }
+
+    /**
+     * Handles the escape action for the dialog.
+     */
+    @Override
+    public void escape() {
+        new SettingsMenu(app).open();
+    }
+
+    /**
+     * Updates the dialog periodically, called by the dialog manager.
+     *
+     * @param delta The time elapsed since the last update.
+     */
+    @Override
+    public void update(float delta) {
+        // Periodic updates (if needed) can be implemented here
+    }
+
+    @Override
+    public void close() {
+        app.getGuiNode().detachChild(playerSelector);
+        app.getGuiNode().detachChild(lowerLeftMenu);
+        app.getGuiNode().detachChild(lowerRightMenu);
+        app.getGuiNode().detachChild(mainContainer);
+        app.getGuiNode().detachChild(background);
+        super.close();
+    }
+
+        /**
+     * Adds a custom action listener to the Selector.
+     */
+    private void addSelectionActionListener(Selector<String> selector, SelectionActionListener<String> listener) {
+        VersionedReference<Set<Integer>> selectionRef = selector.getSelectionModel().createReference();
+
+        app.getStateManager().attach(new BaseAppState() {
+            @Override
+            public void update(float tpf) {
+                if (selectionRef.update()) {
+                    String selected = selectionRef.get().toString();
+                    listener.onSelectionChanged(selected);
+                }
+            }
+
+            @Override
+            protected void initialize(Application app) {
+                update(1);
+            }
+
+            @Override
+            protected void cleanup(Application app) {
+            }
+
+            @Override
+            protected void onEnable() {
+
+            }
+
+            @Override
+            protected void onDisable() {
+
+            }
+        });
+    }
+
+    /**
+     * Callback for when the dropdown selection changes.
+     */
+    private void onDropdownSelectionChanged(String selected) {
+        app.getGameLogic().playSound(Sound.BUTTON);
+        int idStart = selected.indexOf("(ID: ") + 5; // Find start of the ID
+        int idEnd = selected.indexOf(")", idStart); // Find end of the ID
+        String idStr = selected.substring(idStart, idEnd); // Extract the ID as a string
+        int playerId = Integer.parseInt(idStr); // Convert the ID to an integer
+    
+        // Find the player by ID
+        Player selectedPlayer = app.getGameLogic().getPlayerHandler().getPlayerById(playerId);
+    
+        if (selectedPlayer != null) {
+            tradeHandler.setReceiver(selectedPlayer); // Set the receiver in TradeHandler
+        }
+    }
+
+    /**
+     * Functional interface for a selection action listener.
+     */
+    @FunctionalInterface
+    private interface SelectionActionListener<T> {
+        void onSelectionChanged(T selection);
+    }
 }
+
+
+

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

@@ -66,7 +66,7 @@ public class CreateGameMenu extends Dialog {
 
         final MonopolyApp app = network.getApp();
 
-                int screenWidth = app.getContext().getSettings().getWidth();
+        int screenWidth = app.getContext().getSettings().getWidth();
         int screenHeight = app.getContext().getSettings().getHeight();
 
         // Set up the background image

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

@@ -25,6 +25,7 @@ import com.simsilica.lemur.style.ElementId;
 
 import pp.dialog.Dialog;
 import pp.monopoly.client.MonopolyApp;
+import pp.monopoly.game.server.PlayerColor;
 import pp.monopoly.message.client.PlayerReady;
 import pp.monopoly.notification.Sound;
 
@@ -39,7 +40,7 @@ public class LobbyMenu extends Dialog {
     private Container lowerLeftMenu;
     private Container lowerRightMenu;
 
-    private TextField playerInputField = new TextField("Spieler 1");
+    private TextField playerInputField;
     private TextField startingCapital = new TextField("15000");
     private String figure;
 
@@ -47,6 +48,7 @@ public class LobbyMenu extends Dialog {
         super(app.getDialogManager());
         this.app = app;
 
+        playerInputField = new TextField("Spieler "+(app.getId()+1));
         // Hintergrundbild laden und hinzufügen
         addBackgroundImage();
 
@@ -88,6 +90,7 @@ public class LobbyMenu extends Dialog {
 
         // Dropdowns and Labels
         Container dropdownContainer = menuContainer.addChild(new Container(new SpringGridLayout(Axis.X, Axis.Y)));
+        dropdownContainer.setBackground(new QuadBackgroundComponent(new ColorRGBA(ColorRGBA.Black)));
         dropdownContainer.setPreferredSize(new Vector3f(800, 200, 0));
         dropdownContainer.setBackground(null);
         dropdownContainer.setInsets(new Insets3f(10, 0, 0, 0));
@@ -118,10 +121,18 @@ public class LobbyMenu extends Dialog {
         figures.add("OOP");
         figures.add("Handyholster");
 
+        
+
         Selector<String> figureDropdown = new Selector<>(figures, "glass");
         figureDropdown.setBackground(new QuadBackgroundComponent(ColorRGBA.DarkGray));
         figureDropdown.setPreferredSize(new Vector3f(100, 20, 0));
         figureDropdownContainer.addChild(figureDropdown);
+        Vector3f dimens = dropdownContainer.getPreferredSize();
+        Vector3f dimens2 = figureDropdown.getPopupContainer().getPreferredSize();
+        dimens2.setX( dimens.getX() );
+        figureDropdown.getPopupContainer().setPreferredSize(new Vector3f(200,200,5));
+        figureDropdown.getSelectionModel().setSelection(0);
+        figure = "Laptop";
 
         addSelectionActionListener(figureDropdown, this::onDropdownSelectionChanged);
 
@@ -153,6 +164,7 @@ public class LobbyMenu extends Dialog {
         readyButton.addClickCommands(s -> ifTopDialog(() -> {
             toggleReady();
             app.getGameLogic().playSound(Sound.BUTTON);
+            readyButton.setBackground(new QuadBackgroundComponent(ColorRGBA.DarkGray));
         }));
         lowerRightMenu.addChild(readyButton);
 
@@ -161,7 +173,7 @@ public class LobbyMenu extends Dialog {
         app.getGuiNode().attachChild(lowerRightMenu);
 
         // Add a colored circle between the input field and the dropdown menu
-        circle = createCircle( ColorRGBA.Red); // 50 is the diameter, Red is the color
+        circle = createCircle(); // 50 is the diameter, Red is the color
         circle.setLocalTranslation(new Vector3f(
                 (app.getCamera().getWidth()) / 2, // Center horizontally
                 (app.getCamera().getHeight() / 2) - 90, // Adjust Y position
@@ -195,19 +207,33 @@ public class LobbyMenu extends Dialog {
         app.getGuiNode().attachChild(background);
     }
 
-    private Geometry createCircle(ColorRGBA color) {
+    private Geometry createCircle() {
 
         Sphere sphere = new Sphere(90,90,60.0f);
         Geometry circleGeometry = new Geometry("Circle", sphere);
 
         // Create a material with a solid color
         Material material = new Material(app.getAssetManager(), "Common/MatDefs/Misc/Unshaded.j3md");
-        material.setColor("Color", color); // Set the desired color
+        material.setColor("Color", idToColor()); // Set the desired color
         circleGeometry.setMaterial(material);
 
         return circleGeometry;
     }
 
+    private ColorRGBA idToColor() {
+        switch (app.getId()+1) {
+            case 1: return PlayerColor.CYAN.getColor();
+            case 2: return PlayerColor.YELLOW.getColor();
+            case 3: return PlayerColor.RED.getColor();
+            case 4: return PlayerColor.PINK.getColor();
+            case 5: return PlayerColor.GREEN.getColor();
+            case 6: return PlayerColor.PURPLE.getColor();
+        
+            default:
+                return null;
+        }
+    }
+
     /**
      * Schaltet den "Bereit"-Status um.
      */
@@ -231,7 +257,6 @@ public class LobbyMenu extends Dialog {
             public void update(float tpf) {
                 if (selectionRef.update()) {
                     String selected = selectionRef.get().toString();
-                    System.out.println(selected);
                     listener.onSelectionChanged(selected);
                 }
             }
@@ -260,7 +285,6 @@ public class LobbyMenu extends Dialog {
      * Callback for when the dropdown selection changes.
      */
     private void onDropdownSelectionChanged(String selected) {
-        System.out.println("Selected: " + selected);
         app.getGameLogic().playSound(Sound.BUTTON);
         switch (selected) {
             case "[0]":

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

@@ -1,8 +1,6 @@
 package pp.monopoly.client.gui;
 
-import java.util.concurrent.Executors;
+import java.util.List;
-import java.util.concurrent.ScheduledExecutorService;
-import java.util.concurrent.TimeUnit;
 
 import com.jme3.material.Material;
 import com.jme3.math.ColorRGBA;
@@ -12,15 +10,20 @@ import com.jme3.scene.shape.Box;
 import com.jme3.texture.Texture;
 
 import pp.monopoly.client.MonopolyApp;
+import pp.monopoly.client.gui.popups.EventCard;
+import pp.monopoly.notification.DiceRollEvent;
+import pp.monopoly.notification.EventCardEvent;
+import pp.monopoly.notification.GameEventListener;
 
 /**
  * TestWorld zeigt eine einfache Szene mit einem texturierten Quadrat.
  * Die Kamera wird durch den CameraController gesteuert.
  */
-public class TestWorld {
+public class TestWorld implements GameEventListener{
 
     private final MonopolyApp app;
     private CameraController cameraController; // Steuert die Kamera
+    private Toolbar toolbar;
 
     /**
      * Konstruktor für TestWorld.
@@ -29,6 +32,7 @@ public class TestWorld {
      */
     public TestWorld(MonopolyApp app) {
         this.app = app;
+        app.getGameLogic().addListener(this);
     }
 
     /**
@@ -51,7 +55,8 @@ public class TestWorld {
         );
 
         // Füge die Toolbar hinzu
-        new Toolbar(app).open();
+        toolbar = new Toolbar(app);
+        toolbar.open();
         
         cameraController.setPosition(0);
     }
@@ -91,4 +96,9 @@ public class TestWorld {
 
         app.getRootNode().attachChild(geom);
     }
+
+    @Override
+    public void receivedEvent(EventCardEvent event) {
+        new EventCard(app, event.description()).open();
+    }
 }

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

@@ -1,9 +1,5 @@
-
 package pp.monopoly.client.gui;
 
-import java.util.Random;
-
-import com.jme3.font.BitmapText;
 import com.jme3.math.ColorRGBA;
 import com.jme3.math.Vector2f;
 import com.jme3.math.Vector3f;
@@ -11,277 +7,252 @@ import com.simsilica.lemur.*;
 import com.simsilica.lemur.component.IconComponent;
 import com.simsilica.lemur.component.QuadBackgroundComponent;
 import com.simsilica.lemur.component.SpringGridLayout;
-
 import com.simsilica.lemur.style.ElementId;
 
 import pp.dialog.Dialog;
 import pp.monopoly.client.MonopolyApp;
+import pp.monopoly.game.server.Player;
+import pp.monopoly.game.server.PlayerHandler;
+import pp.monopoly.message.client.EndTurn;
+import pp.monopoly.message.client.RollDice;
+import pp.monopoly.notification.DiceRollEvent;
+import pp.monopoly.notification.GameEventListener;
 import pp.monopoly.notification.Sound;
+import pp.monopoly.notification.UpdatePlayerView;
 
-/**
+public class Toolbar extends Dialog implements GameEventListener {
- * Toolbar Klasse, die am unteren Rand der Szene angezeigt wird.
- * Die Buttons bewegen den Würfel auf dem Spielfeld.
- */
-public class Toolbar extends Dialog {
 
     private final MonopolyApp app;
     private final Container toolbarContainer;
-    private final BitmapText positionText; // Anzeige für die aktuelle Position
+    private Label imageLabel;
-    private final float boardLimit = 0.95f; // Grenzen des Bretts
+    private Label imageLabel2;
-    private final float stepSize = 0.18f; // Schrittgröße pro Bewegung
+    private Container overviewContainer;
-    private int currentPosition = 0; // Aktuelle Position auf dem Spielfeld
+    private Container accountContainer;
-    private final int positionsPerSide = 10; // Anzahl der Positionen pro Seite
+    private PlayerHandler playerHandler;
-    private final Random random = new Random(); // Zufallsgenerator für den Würfelwurf
+    private volatile boolean animatingDice = false;
+    private volatile DiceRollEvent latestDiceRollEvent = null;
 
-    /**
-     * Konstruktor für die Toolbar.
-     *
-     * @param app  Die Hauptanwendung (MonopolyApp)
-     */
     public Toolbar(MonopolyApp app) {
         super(app.getDialogManager());
         this.app = app;
 
+        app.getGameLogic().addListener(this);
+        playerHandler = app.getGameLogic().getPlayerHandler();
+
         // Erstelle die Toolbar
         toolbarContainer = new Container(new SpringGridLayout(Axis.X, Axis.Y), "toolbar");
+        toolbarContainer.setLocalTranslation(0, 200, 0);
+        toolbarContainer.setPreferredSize(new Vector3f(app.getCamera().getWidth(), 200, 0));
 
-        // Setze die Position am unteren Rand und die Breite
+        // Account- und Übersichtskontainer
-        toolbarContainer.setLocalTranslation(
+        accountContainer = toolbarContainer.addChild(new Container());
-                0,                                 // Links bündig
+        overviewContainer = toolbarContainer.addChild(new Container());
-                200,                               // Höhe über dem unteren Rand
-                0                                  // Z-Ebene
-        );
-        toolbarContainer.setPreferredSize(new Vector3f(app.getCamera().getWidth(), 200, 0)); // Volle Breite
 
+        receivedEvent(new UpdatePlayerView());
 
-        // Füge Buttons zur Toolbar hinzu
-        //initializeButtons();
-
-
-        // Menü-Container: Ein Nested-Container für Kontostand und "Meine Gulag Frei Karten"
-        Container accountContainer = toolbarContainer.addChild(new Container());
-        accountContainer.addChild(new Label("Kontostand", new ElementId("label-Bold")));
-        accountContainer.addChild(new Label("6666€", new ElementId("label-Text"))); //TODO Variable hier einsetzen
-        accountContainer.addChild(new Label("Gulag Frei Karten", new ElementId("label-Bold")));
-        accountContainer.setBackground(new QuadBackgroundComponent(new ColorRGBA(0.4657f, 0.4735f, 0.4892f, 1.0f)));
-
-        // Add a spacer between accountContainer and overviewContainer
-        Panel spacer = new Panel(); // Create an empty panel as a spacer
-        spacer.setPreferredSize(new Vector3f(5, 0, 0)); // Adjust the width as needed
-        spacer.setBackground(null);
-        toolbarContainer.addChild(spacer);
-
-        // Menü-Container: Ein Container für Übersicht
-        Container overviewContainer = toolbarContainer.addChild(new Container());
-        overviewContainer.addChild(new Label("Übersicht", new ElementId("label-Bold")));
-        overviewContainer.addChild(new Label("„Spieler 1“: 1244€", new ElementId("label-Text")));//TODO Variable hier einsetzen
-        overviewContainer.addChild(new Label("„Spieler 2“: 1244€", new ElementId("label-Text")));//TODO Variable hier einsetzen
-        overviewContainer.addChild(new Label("„Spieler 3“: 1244€", new ElementId("label-Text")));//TODO Variable hier einsetzen
-        overviewContainer.addChild(new Label("„Spieler 4“: 1244€", new ElementId("label-Text")));//TODO Variable hier einsetzen
-        overviewContainer.addChild(new Label("„Spieler 5“: 1244€", new ElementId("label-Text")));//TODO Variable hier einsetzen
         overviewContainer.setBackground(new QuadBackgroundComponent(new ColorRGBA(0.4657f, 0.4735f, 0.4892f, 1.0f)));
 
-        // Menü-Container: Ein Container für Würfel
+        // Würfelbereich
         Container diceContainer = toolbarContainer.addChild(new Container());
         diceContainer.setLayout(new SpringGridLayout(Axis.X, Axis.Y));
 
-        // Create a horizontal container to align leftContainer and rightContainer side by side
         Container horizontalContainer = new Container(new SpringGridLayout(Axis.X, Axis.Y));
-        horizontalContainer.setPreferredSize(new Vector3f(200, 150, 0)); // Adjust size as needed
+        horizontalContainer.setPreferredSize(new Vector3f(200, 150, 0));
 
-        // Create the first container (leftContainer)
+        // Linker Würfel
         Container leftContainer = new Container();
-        leftContainer.setPreferredSize(new Vector3f(100, 150, 0)); // Adjust size as needed
+        leftContainer.setPreferredSize(new Vector3f(100, 150, 0));
-
+        imageLabel = new Label("");
-        Label imageLabel = new Label("");
+        IconComponent icon = new IconComponent("Pictures/dice/one.png");
-        IconComponent icon = new IconComponent("Pictures/dice/one.png"); // Icon mit Textur erstellen
+        icon.setIconSize(new Vector2f(100, 100));
-        icon.setIconSize(new Vector2f(100,100)); // Skalierung des Bildes
         imageLabel.setIcon(icon);
 
-        Label imageLabel2 = new Label("");
+        // Rechter Würfel
-        IconComponent icon2 = new IconComponent("Pictures/dice/two.png"); // Icon mit Textur erstellen
-        icon2.setIconSize(new Vector2f(100,100)); // Skalierung des Bildes
-        imageLabel2.setIcon(icon2);
-
-        // Create the second container (rightContainer)
         Container rightContainer = new Container();
-        rightContainer.setPreferredSize(new Vector3f(100, 150, 0)); // Adjust size as needed
+        rightContainer.setPreferredSize(new Vector3f(100, 150, 0));
-        leftContainer.setBackground(null);
+        imageLabel2 = new Label("");
-        rightContainer.setBackground(null);
+        IconComponent icon2 = new IconComponent("Pictures/dice/two.png");
-        diceContainer.setBackground(null);
+        icon2.setIconSize(new Vector2f(100, 100));
-        horizontalContainer.setBackground(null);
+        imageLabel2.setIcon(icon2);
-
-        imageLabel.setTextVAlignment(VAlignment.Center);
-        imageLabel.setTextHAlignment(HAlignment.Center);
-        imageLabel2.setTextVAlignment(VAlignment.Center);
-        imageLabel2.setTextHAlignment(HAlignment.Center);
 
         leftContainer.addChild(imageLabel);
         rightContainer.addChild(imageLabel2);
 
-
-
-        // Add leftContainer and rightContainer to the horizontal container
         horizontalContainer.addChild(leftContainer);
         horizontalContainer.addChild(rightContainer);
-
-        // Add the horizontalContainer to the diceContainer (top section)
         diceContainer.addChild(horizontalContainer);
 
-        // Add the Würfeln button directly below the horizontalContainer
+        // Würfeln-Button
         Button diceButton = new Button("Würfeln");
-        diceButton.setPreferredSize(new Vector3f(200, 50, 0)); // Full width for Würfeln button
+        diceButton.setPreferredSize(new Vector3f(200, 50, 0));
         diceButton.addClickCommands(s -> ifTopDialog(() -> {
-            rollDice();
+            startDiceAnimation();
+            app.getGameLogic().send(new RollDice());
             app.getGameLogic().playSound(Sound.BUTTON);
         }));
         diceContainer.addChild(diceButton);
 
-
+        // Menü-Container für weitere Aktionen
-
-
-        // Menü-Container: Ein Nested-Container für Handeln, Grundstücke und Zug beenden
         Container menuContainer = toolbarContainer.addChild(new Container());
-        menuContainer.addChild(new Button("Handeln"));
+        menuContainer.addChild(addTradeMenuButton());
-        menuContainer.addChild(new Button("Grundstücke"));
+        menuContainer.addChild(addPropertyMenuButton());
-        menuContainer.addChild(new Button("Zug beenden"));
+        menuContainer.addChild(addEndTurnButton());
         menuContainer.setBackground(new QuadBackgroundComponent(new ColorRGBA(0.4657f, 0.4735f, 0.4892f, 1.0f)));
 
-        // Füge die Toolbar zur GUI hinzu
         app.getGuiNode().attachChild(toolbarContainer);
-
-        // Erstelle die Position-Anzeige
-        positionText = createPositionDisplay();
-        updatePositionDisplay(); // Initialisiere die Anzeige mit der Startposition
     }
 
-    /**
+    private Button addTradeMenuButton() {
-     * Initialisiert die Buttons in der Toolbar.
+        Button tradeButton = new Button("Handeln");
-     */
+        tradeButton.setPreferredSize(new Vector3f(150, 50, 0));
-    private void initializeButtons() {
+        tradeButton.addClickCommands(s -> ifTopDialog(() -> {
-        addTradeMenuButton();  // Bewegung nach vorne
-        addEndTurnButton(); // Bewegung nach hinten
-        addDiceRollButton();       // Würfel-Button
-
-    }
-
-    /**
-     * Fügt einen Button mit einer Bewegung hinzu.
-     *
-     * @param label   Der Text des Buttons
-     * @param step    Schrittweite (+1 für vorwärts, -1 für rückwärts)
-     */
-
-    /*private void addButton(String label, int step) {
-        Button button = new Button(label);
-        button.setPreferredSize(new Vector3f(150, 50, 0)); // Größe der Buttons
-        button.addClickCommands(source -> moveCube(step));
-        toolbarContainer.addChild(button);
-    }*/
-
-    /**
-     * Fügt den Würfel-Button hinzu, der die Figur entsprechend der gewürfelten Zahl bewegt.
-     */
-    private Button addDiceRollButton() {
-        Button diceButton = new Button("Würfeln");
-        diceButton.setPreferredSize(new Vector3f(50, 20, 0));
-        diceButton.addClickCommands(s -> ifTopDialog(() -> {
-            rollDice();
             app.getGameLogic().playSound(Sound.BUTTON);
-        }));
-        toolbarContainer.addChild(diceButton);
-        return diceButton;
-    }
-
-    private void addTradeMenuButton() {
-        Button diceButton = new Button("Handeln");
-        diceButton.setPreferredSize(new Vector3f(150, 50, 0)); // Größe des Buttons
-        diceButton.addClickCommands(s  -> {
-            rollDice();
-            app.getGameLogic().playSound(Sound.BUTTON);
-            this.close();
-            System.out.println("test");
             new ChoosePartner(app).open();
+        }));
+        return tradeButton;
+    }
+
+    private Button addPropertyMenuButton() {
+        Button propertyMenuButton = new Button("Grundstücke");
+        propertyMenuButton.setPreferredSize(new Vector3f(150, 50, 0));
+        propertyMenuButton.setFontSize(30);
+        propertyMenuButton.addClickCommands(s -> ifTopDialog(() -> {
+            app.getGameLogic().playSound(Sound.BUTTON);
+            new BuildingAdminMenu(app).open();
+        }));
+        return propertyMenuButton;
+    }
+
+    private Button addEndTurnButton() {
+        Button endTurnButton = new Button("Zug beenden");
+        endTurnButton.setPreferredSize(new Vector3f(150, 50, 0));
+        endTurnButton.addClickCommands(s -> ifTopDialog(() -> {
+            app.getGameLogic().playSound(Sound.BUTTON);
+            app.getGameLogic().send(new EndTurn());
+        }));
+        return endTurnButton;
+    }
+
+    private void startDiceAnimation() {
+        animatingDice = true;
+
+        // Starte die Animation und speichere die Startzeit
+        long startTime = System.currentTimeMillis();
+
+        Thread diceAnimation = new Thread(() -> {
+            int[] currentFace = {1};
+            try {
+                while (System.currentTimeMillis() - startTime < 2500) { // Animation läuft für 4 Sekunden
+                    currentFace[0] = (currentFace[0] % 6) + 1;
+
+                    String rotatingImage1 = diceToString(currentFace[0]);
+                    String rotatingImage2 = diceToString((currentFace[0] % 6) + 1);
+
+                    IconComponent newIcon1 = new IconComponent(rotatingImage1);
+                    newIcon1.setIconSize(new Vector2f(100, 100));
+                    app.enqueue(() -> imageLabel.setIcon(newIcon1));
+
+                    IconComponent newIcon2 = new IconComponent(rotatingImage2);
+                    newIcon2.setIconSize(new Vector2f(100, 100));
+                    app.enqueue(() -> imageLabel2.setIcon(newIcon2));
+
+                    // Warte 100 ms, bevor die Bilder wechseln
+                    Thread.sleep(100);
+                }
+
+                // Animation beenden
+                animatingDice = false;
+
+                // Zeige das finale Ergebnis
+                if (latestDiceRollEvent != null) {
+                    showFinalDiceResult(latestDiceRollEvent);
+                }
+
+            } catch (InterruptedException e) {
+                System.err.println("Würfelanimation unterbrochen: " + e.getMessage());
+            }
         });
-        toolbarContainer.addChild(diceButton);
+        diceAnimation.start();
-    }// TODO Funktion der Buttons Überarbeiten und prüfen
-
-    private void addEndTurnButton() {
-        Button diceButton = new Button("Grundstücke");
-        diceButton.setPreferredSize(new Vector3f(150, 50, 0)); // Größe des Buttons
-        diceButton.addClickCommands(s -> ifTopDialog(() -> {
-            rollDice();
-            app.getGameLogic().playSound(Sound.BUTTON);
-        }));
-        toolbarContainer.addChild(diceButton);
     }
 
-    private void addPropertyMenuButton() {
+    private void showFinalDiceResult(DiceRollEvent event) {
-        Button diceButton = new Button("Zug beenden");
+        int diceRoll1 = event.a();
-        diceButton.setPreferredSize(new Vector3f(150, 50, 0)); // Größe des Buttons
+        int diceRoll2 = event.b();
-        diceButton.addClickCommands(s -> ifTopDialog(() -> {
+
-            rollDice();
+        String finalImage1 = diceToString(diceRoll1);
-            app.getGameLogic().playSound(Sound.BUTTON);
+        String finalImage2 = diceToString(diceRoll2);
-        }));
+
-        toolbarContainer.addChild(diceButton);
+        IconComponent finalIcon1 = new IconComponent(finalImage1);
+        finalIcon1.setIconSize(new Vector2f(100, 100));
+        app.enqueue(() -> imageLabel.setIcon(finalIcon1));
+
+        IconComponent finalIcon2 = new IconComponent(finalImage2);
+        finalIcon2.setIconSize(new Vector2f(100, 100));
+        app.enqueue(() -> imageLabel2.setIcon(finalIcon2));
+
+        app.getGameLogic().playSound(Sound.BUTTON);
     }
 
-    /**
+    @Override
-     * Simuliert einen Würfelwurf und bewegt die Figur entsprechend.
+    public void receivedEvent(DiceRollEvent event) {
-     */
+        latestDiceRollEvent = event; // Speichere das Event
-    private void rollDice() {
-        int diceRoll = random.nextInt(6) + 1; // Zahl zwischen 1 und 6
-        System.out.println("Gewürfelt: " + diceRoll);
     }
 
-    /**
+    @Override
-     * Berechnet die neue Position des Würfels basierend auf der aktuellen Brettseite und Position.
+    public void receivedEvent(UpdatePlayerView event) {
-     *
+        playerHandler = app.getGameLogic().getPlayerHandler();
-     * @param position Aktuelle Position auf dem Spielfeld
+        System.err.println("Update Player View");
-     * @return Die berechnete Position als Vector3f
-     */
-    private Vector3f calculatePosition(int position) {
-        int side = position / positionsPerSide; // Seite des Bretts (0 = unten, 1 = rechts, 2 = oben, 3 = links)
-        int offset = position % positionsPerSide; // Position auf der aktuellen Seite
 
-        switch (side) {
+        // Clear existing accountContainer and overviewContainer content
-            case 0: // Unten (positive x-Achse)
+        accountContainer.clearChildren();
-                return new Vector3f(-boardLimit + offset * stepSize, 0.1f, -boardLimit + 0.05f);
+        overviewContainer.clearChildren();
-            case 1: // Rechts (positive z-Achse)
+
-                return new Vector3f(boardLimit - 0.05f, 0.1f, -boardLimit + offset * stepSize);
+        accountContainer.addChild(new Label("Kontostand", new ElementId("label-Bold")));
-            case 2: // Oben (negative x-Achse)
+        accountContainer.addChild(new Label(
-                return new Vector3f(boardLimit - offset * stepSize, 0.1f, boardLimit - 0.05f);
+                playerHandler.getPlayerById(app.getId()).getAccountBalance() + " EUR",
-            case 3: // Links (negative z-Achse)
+                new ElementId("label-Text")
-                return new Vector3f(-boardLimit + 0.05f, 0.1f, boardLimit - offset * stepSize);
+        ));
-            default:
+        accountContainer.addChild(new Label("Gulag Karten", new ElementId("label-Bold")));
-                throw new IllegalArgumentException("Ungültige Position: " + position);
+        accountContainer.addChild(new Label(
+                playerHandler.getPlayerById(app.getId()).getNumJailCard() + "",
+                new ElementId("label-Text")
+        ));
+        accountContainer.setBackground(new QuadBackgroundComponent(new ColorRGBA(0.4657f, 0.4735f, 0.4892f, 1.0f)));
+
+        overviewContainer.addChild(new Label("Übersicht", new ElementId("label-Bold")));
+        for (Player player : playerHandler.getPlayers()) {
+            if (player.getId() != app.getId()) {
+                overviewContainer.addChild(new Label(
+                        player.getName() + ": " + player.getAccountBalance() + " EUR",
+                        new ElementId("label-Text")
+                ));
+            }
         }
+        overviewContainer.setBackground(new QuadBackgroundComponent(new ColorRGBA(0.4657f, 0.4735f, 0.4892f, 1.0f)));
     }
 
-    /**
+    private String diceToString(int i) {
-     * Erstellt die Anzeige für die aktuelle Position.
+        switch (i) {
-     *
+            case 1:
-     * @return Das BitmapText-Objekt für die Anzeige
+                return "Pictures/dice/one.png";
-     */
+            case 2:
-    private BitmapText createPositionDisplay() {
+                return "Pictures/dice/two.png";
-        BitmapText text = new BitmapText(app.getAssetManager().loadFont("Interface/Fonts/Default.fnt"), false);
+            case 3:
-        text.setSize(20); // Schriftgröße
+                return "Pictures/dice/three.png";
-        text.setLocalTranslation(10, app.getCamera().getHeight() - 10, 0); // Oben links
+            case 4:
-        app.getGuiNode().attachChild(text);
+                return "Pictures/dice/four.png";
-        return text;
+            case 5:
-    }
+                return "Pictures/dice/five.png";
-
+            case 6:
-    /**
+                return "Pictures/dice/six.png";
-     * Aktualisiert die Anzeige für die aktuelle Position.
+            default:
-     */
+                throw new IllegalArgumentException("Invalid dice number: " + i);
-    private void updatePositionDisplay() {
+        }
-        positionText.setText("Feld-ID: " + currentPosition);
     }
 
     @Override
     public void close() {
         app.getGuiNode().detachChild(toolbarContainer);
-        app.getGuiNode().detachChild(positionText);
         super.close();
     }
 

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

@@ -0,0 +1,382 @@
+package pp.monopoly.client.gui;
+
+import com.jme3.app.Application;
+import com.jme3.app.state.BaseAppState;
+import com.jme3.material.Material;
+import com.jme3.math.ColorRGBA;
+import com.jme3.math.Vector3f;
+import com.jme3.scene.Geometry;
+import com.jme3.scene.shape.Quad;
+import com.jme3.texture.Texture;
+import com.simsilica.lemur.*;
+import com.simsilica.lemur.component.QuadBackgroundComponent;
+import com.simsilica.lemur.component.SpringGridLayout;
+import com.simsilica.lemur.core.VersionedList;
+import com.simsilica.lemur.core.VersionedReference;
+import com.simsilica.lemur.style.ElementId;
+import com.simsilica.lemur.text.DocumentModel;
+import pp.dialog.Dialog;
+import pp.monopoly.client.MonopolyApp;
+import pp.monopoly.notification.Sound;
+
+import java.util.Set;
+
+public class TradeMenu extends Dialog {
+    private final MonopolyApp app;
+    private final Container mainContainer;
+    private Selector<String> leftBuildingSelector, leftCurrencySelector, leftSpecialCardSelector;
+    private Selector<String> rightBuildingSelector, rightCurrencySelector, rightSpecialCardSelector;
+    private final Button cancelButton = new Button("Abbrechen");
+    private final Button tradeButton = new Button("Handeln");
+    private Container lowerLeftMenu, lowerRightMenu;
+    private TextField leftSelectionsField;
+    private TextField rightSelectionsField;
+    private TextField leftCurrencyInput;
+    private TextField rightCurrencyInput;
+
+    QuadBackgroundComponent translucentWhiteBackground =
+            new QuadBackgroundComponent(new ColorRGBA(ColorRGBA.White));
+
+    /**
+     * Constructs the TradeMenu dialog.
+     *
+     * @param app The Monopoly application instance.
+     */
+    public TradeMenu(MonopolyApp app) {
+        super(app.getDialogManager());
+        this.app = app;
+
+        // Background Image
+        addBackgroundImage();
+
+        // Main container for the UI components
+        mainContainer = new Container(new SpringGridLayout(Axis.Y, Axis.X));
+        mainContainer.setPreferredSize(new Vector3f(1200, 800, 0));
+        mainContainer.setBackground(translucentWhiteBackground);
+
+        // Add header container
+        mainContainer.addChild(createHeaderContainer());
+        // Add main content (three columns: left, middle, right)
+        mainContainer.addChild(createMainContent());
+
+        // Attach main container to GUI node
+        app.getGuiNode().attachChild(mainContainer);
+        mainContainer.setLocalTranslation(
+                (app.getCamera().getWidth() - mainContainer.getPreferredSize().x) / 2,
+                (app.getCamera().getHeight() + mainContainer.getPreferredSize().y) / 2,
+                7
+        );
+    }
+
+
+    /**
+     * Creates a container for the header with a fixed size.
+     *
+     * @return The header container.
+     */
+    private Container createHeaderContainer() {
+        // Create a container for the header
+        Container headerContainer = new Container(new SpringGridLayout(Axis.X, Axis.Y));
+        headerContainer.setPreferredSize(new Vector3f(200, 100, 0)); // Set fixed width and height
+
+        // Add the header label
+        Label headerLabel = headerContainer.addChild(new Label("Handelsmenü", new ElementId("label-Bold")));
+        headerLabel.setFontSize(50); // Adjust font size as needed
+        headerLabel.setInsets(new Insets3f(10, 10, 10, 10)); // Add padding around the label
+        headerLabel.setBackground(new QuadBackgroundComponent(new ColorRGBA(1.0f, 1.0f, 1.0f, 0.5f))); // Optional background
+
+        return headerContainer;
+    }
+
+    /**
+     * Creates the main content layout (left, middle, right columns).
+     *
+     * @return The main content container.
+     */
+    private Container createMainContent() {
+        Container mainContent = new Container(new SpringGridLayout(Axis.X, Axis.Y));
+        mainContent.setPreferredSize(new Vector3f(1200, 700, 0));
+
+        // Left Column
+        mainContent.addChild(createTradeColumn("Wähle Handelsobjekt:", true));
+
+        // Middle Section
+        Container middleSection = mainContent.addChild(new Container(new SpringGridLayout(Axis.Y, Axis.X)));
+        middleSection.setBackground(new QuadBackgroundComponent(new ColorRGBA(0.8f, 0.8f, 0.8f, 1.0f)));
+
+        // Add combined label
+        Label middleLabel = middleSection.addChild(new Label("Gebäude:        Währung:        Sonderkarten:"));
+        middleLabel.setFontSize(24); // Adjust font size as needed
+        middleLabel.setInsets(new Insets3f(5, 5, 5, 5)); // Add padding around the label
+
+        // Add the Quellobjekte TextField
+        leftSelectionsField = middleSection.addChild(new TextField(""));
+        leftSelectionsField.setPreferredSize(new Vector3f(600, 50, 0)); // Larger width to fit the split sections
+
+        addCustomSelectionListener(leftBuildingSelector, newSelection -> updateSelectionsField(leftSelectionsField, leftBuildingSelector, leftCurrencyInput, leftSpecialCardSelector));
+        addCustomSelectionListener(leftSpecialCardSelector, newSelection -> updateSelectionsField(leftSelectionsField, leftBuildingSelector, leftCurrencyInput, leftSpecialCardSelector));
+        // Add change listener for the currency input
+        monitorTextFieldChanges(leftCurrencyInput, () -> updateSelectionsField(leftSelectionsField, leftBuildingSelector, leftCurrencyInput, leftSpecialCardSelector));
+
+        Label arrows = middleSection.addChild(new Label("⇅"));
+        arrows.setFontSize(40);
+
+        // Right Column
+        mainContent.addChild(createTradeColumn("Wähle Zielobjekt:", false));
+
+
+        // Add combined label
+        middleLabel = middleSection.addChild(new Label("Gebäude:        Währung:        Sonderkarten:"));
+        middleLabel.setFontSize(24); // Adjust font size as needed
+        middleLabel.setInsets(new Insets3f(5, 5, 5, 5)); // Add padding around the label
+
+        // Add the Zielobjekte TextField
+        rightSelectionsField = middleSection.addChild(new TextField(""));
+        rightSelectionsField.setPreferredSize(new Vector3f(600, 50, 0));
+
+        addCustomSelectionListener(rightBuildingSelector, newSelection -> updateSelectionsField(rightSelectionsField, rightBuildingSelector, rightCurrencyInput, rightSpecialCardSelector));
+        addCustomSelectionListener(rightSpecialCardSelector, newSelection -> updateSelectionsField(rightSelectionsField, rightBuildingSelector, rightCurrencyInput, rightSpecialCardSelector));
+
+        // Add change listener for the currency input
+        monitorTextFieldChanges(rightCurrencyInput, () -> updateSelectionsField(rightSelectionsField, rightBuildingSelector, rightCurrencyInput, rightSpecialCardSelector));
+
+
+        // "Bestätigen" button
+        lowerRightMenu = new Container();
+        tradeButton.setPreferredSize(new Vector3f(200, 60, 0));
+        tradeButton.setFontSize(30);
+        tradeButton.addClickCommands(s -> ifTopDialog(() -> {
+            app.getGameLogic().playSound(Sound.BUTTON);
+            close();
+            new TradeMenu(app).open();
+        }));
+        lowerRightMenu.addChild(tradeButton);
+
+        // Position the container near the bottom-right corner
+        lowerRightMenu.setLocalTranslation(new Vector3f(app.getCamera().getWidth() - 680, 100, 8)); // X: 220px from the right, Y: 50px above the bottom
+        app.getGuiNode().attachChild(lowerRightMenu);
+
+
+
+        Label spacer = middleSection.addChild(new Label("")); // Spacer
+        spacer.setPreferredSize(new Vector3f(1, 50, 0));
+
+        return mainContent;
+    }
+
+    /**
+     * Creates a column for trade objects (left or right side).
+     *
+     * @param label The label for the column.
+     * @param isLeft Whether this column is the left side.
+     * @return The column container.
+     */
+    private Container createTradeColumn(String label, boolean isLeft) {
+        Container column = new Container(new SpringGridLayout(Axis.Y, Axis.X));
+        column.setBackground(new QuadBackgroundComponent(new ColorRGBA(ColorRGBA.White)));
+
+        Label columnLabel = column.addChild(new Label(label));
+        columnLabel.setFontSize(24);
+        columnLabel.setBackground(translucentWhiteBackground);
+
+        // Add dropdowns
+        column.addChild(new Label("Gebäude:"));
+        Selector<String> buildingSelector = column.addChild(new Selector<>(getSampleItems(),"glass"));
+        buildingSelector.setInsets(new Insets3f(5, 10, 5, 10));
+        buildingSelector.setBackground(new QuadBackgroundComponent(new ColorRGBA(ColorRGBA.Black)));
+
+        column.addChild(new Label("Währung:"));
+        TextField currencyInput = column.addChild(new TextField(""));
+        currencyInput.setInsets(new Insets3f(5, 10, 5, 10));
+        currencyInput.setBackground(new QuadBackgroundComponent(new ColorRGBA(ColorRGBA.Black)));
+
+        column.addChild(new Label("Sonderkarten:"));
+        Selector<String> specialCardSelector = column.addChild(new Selector<>(getSampleItems(),"glass"));
+        specialCardSelector.setInsets(new Insets3f(5, 10, 5, 10));
+        specialCardSelector.setBackground(new QuadBackgroundComponent(new ColorRGBA(ColorRGBA.Black)));
+
+
+        // Assign selectors to corresponding fields
+        if (isLeft) {
+            leftBuildingSelector = buildingSelector;
+            leftSpecialCardSelector = specialCardSelector;
+            leftCurrencyInput = currencyInput;
+
+            // "Abbrechen" button
+            lowerLeftMenu = new Container();
+            cancelButton.setPreferredSize(new Vector3f(200, 60, 0));
+            cancelButton.setFontSize(30);
+            cancelButton.addClickCommands(s -> ifTopDialog(() -> {
+                app.getGameLogic().playSound(Sound.BUTTON);
+                this.close();
+            }));
+            lowerLeftMenu.addChild(cancelButton);
+
+            // Position the container near the bottom-left corner
+            lowerLeftMenu.setLocalTranslation(new Vector3f(50, 100, 8)); // Adjust X and Y to align with the bottom-left corner
+            app.getGuiNode().attachChild(lowerLeftMenu);
+
+            Label spacer = column.addChild(new Label("")); // Spacer
+            spacer.setPreferredSize(new Vector3f(1, 130, 0));
+
+               } else {
+            rightBuildingSelector = buildingSelector;
+            rightSpecialCardSelector = specialCardSelector;
+            rightCurrencyInput = currencyInput;
+
+            Label spacer = column.addChild(new Label("")); // Spacer
+            spacer.setPreferredSize(new Vector3f(1, 130, 0));
+        }
+
+        return column;
+    }
+
+    /**
+     * Provides sample dropdown items.
+     */
+    private VersionedList<String> getSampleItems() {
+        VersionedList<String> items = new VersionedList<>();
+        items.add("Option 1");
+        items.add("Option 2");
+        items.add("Option 3");
+        return items;
+    }
+
+    /**
+     * Adds a background image to the dialog.
+     */
+    private void addBackgroundImage() {
+        Texture backgroundImage = app.getAssetManager().loadTexture("Pictures/unibw-Bib2.png");
+        Quad quad = new Quad(app.getCamera().getWidth(), app.getCamera().getHeight());
+        Geometry background = new Geometry("Background", quad);
+        Material backgroundMaterial = new Material(app.getAssetManager(), "Common/MatDefs/Misc/Unshaded.j3md");
+        backgroundMaterial.setTexture("ColorMap", backgroundImage);
+        background.setMaterial(backgroundMaterial);
+        background.setLocalTranslation(0, 0, 6); // Position behind other GUI elements
+        app.getGuiNode().attachChild(background);
+    }
+
+    private String truncateText(String text, int maxLength) {
+        return text.length() > maxLength ? text.substring(0, maxLength) + "..." : text;
+    }
+
+    private void updateSelectionsField(TextField selectionsField, Selector<String> buildingSelector, TextField currencyInput, Selector<String> specialCardSelector) {
+        // Get selections from the building selector
+        String buildingSelections = buildingSelector != null && buildingSelector.getSelectedItem() != null
+                ? buildingSelector.getSelectedItem().trim()
+                : "";
+
+        // Get text from the currency input
+        String currencySelections = currencyInput != null
+                ? currencyInput.getText().trim()
+                : "";
+
+        // Get selections from the special card selector
+        String specialCardSelections = specialCardSelector != null && specialCardSelector.getSelectedItem() != null
+                ? specialCardSelector.getSelectedItem().trim()
+                : "";
+        // Build the combined text without adding unnecessary spaces
+        StringBuilder combinedText = new StringBuilder();
+
+        if (!buildingSelections.isEmpty()) {
+            combinedText.append(buildingSelections);
+        }
+        if (!currencySelections.isEmpty()) {
+            if (combinedText.length() > 0) {
+                combinedText.append(" | "); // Add a separator if there's already text
+            }
+            combinedText.append(currencySelections);
+        }
+        if (!specialCardSelections.isEmpty()) {
+            if (combinedText.length() > 0) {
+                combinedText.append(" | "); // Add a separator if there's already text
+            }
+            combinedText.append(specialCardSelections);
+        }
+
+        // Update the content of the TextField
+        selectionsField.setText(combinedText.toString());
+    }
+
+
+
+    /**
+     * Handles the escape action for the dialog.
+     */
+    @Override
+    public void escape() {
+        new SettingsMenu(app).open();
+    }
+
+    /**
+     * Updates the dialog periodically, called by the dialog manager.
+     *
+     * @param delta The time elapsed since the last update.
+     */
+    @Override
+    public void update(float delta) {
+        // Periodic updates (if needed) can be implemented here
+    }
+
+    /**
+     * Functional interface for a selection action listener.
+     */
+    @FunctionalInterface
+    private interface SelectionActionListener<T> {
+        void onSelectionChanged(T selection);
+    }
+    /**
+     * Adds a custom action listener to the Selector.
+     */
+    private void addCustomSelectionListener(Selector<String> selector, SelectionActionListener<String> listener) {
+        VersionedReference<Set<Integer>> selectionRef = selector.getSelectionModel().createReference();
+
+        app.getStateManager().attach(new BaseAppState() {
+            @Override
+            public void update(float tpf) {
+                if (selectionRef.update()) {
+                    String selected = selector.getSelectedItem();
+                    listener.onSelectionChanged(selected);
+                }
+            }
+
+            @Override
+            protected void initialize(Application app) {}
+
+            @Override
+            protected void cleanup(Application app) {}
+
+            @Override
+            protected void onEnable() {}
+
+            @Override
+            protected void onDisable() {}
+        });
+    }
+
+    private void monitorTextFieldChanges(TextField textField, Runnable onChange) {
+        VersionedReference<DocumentModel> ref = textField.getDocumentModel().createReference();
+
+        app.getStateManager().attach(new BaseAppState() {
+            @Override
+            public void update(float tpf) {
+                if (ref.update()) {
+                    onChange.run();
+                }
+            }
+
+            @Override
+            protected void initialize(Application app) {}
+
+            @Override
+            protected void cleanup(Application app) {}
+
+            @Override
+            protected void onEnable() {}
+
+            @Override
+            protected void onDisable() {}
+        });
+    }
+
+}

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

@@ -0,0 +1,504 @@
+/*
+ * $Id$
+ * 
+ * Copyright (c) 2014, Simsilica, LLC
+ * All rights reserved.
+ * 
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions 
+ * are met:
+ * 
+ * 1. Redistributions of source code must retain the above copyright 
+ *    notice, this list of conditions and the following disclaimer.
+ * 
+ * 2. Redistributions in binary form must reproduce the above copyright 
+ *    notice, this list of conditions and the following disclaimer in 
+ *    the documentation and/or other materials provided with the 
+ *    distribution.
+ * 
+ * 3. Neither the name of the copyright holder nor the names of its 
+ *    contributors may be used to endorse or promote products derived 
+ *    from this software without specific prior written permission.
+ * 
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS 
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT 
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS 
+ * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE 
+ * COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, 
+ * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES 
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR 
+ * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) 
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, 
+ * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) 
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED 
+ * OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+ package pp.monopoly.client.gui.hslider;
+
+ import com.jme3.scene.Node;
+ import com.jme3.scene.Spatial;
+import com.simsilica.lemur.Axis;
+import com.simsilica.lemur.Button;
+import com.simsilica.lemur.FillMode;
+import com.simsilica.lemur.GuiGlobals;
+import com.simsilica.lemur.HAlignment;
+import com.simsilica.lemur.Label;
+import com.simsilica.lemur.Panel;
+import com.simsilica.lemur.TextField;
+import com.simsilica.lemur.component.SpringGridLayout;
+ import com.simsilica.lemur.core.GuiControl;
+ import com.simsilica.lemur.core.VersionedReference;
+ import com.simsilica.lemur.grid.GridModel;
+ import com.simsilica.lemur.style.Attributes;
+ import com.simsilica.lemur.style.ElementId;
+ import com.simsilica.lemur.style.StyleDefaults;
+ import com.simsilica.lemur.style.Styles;
+ 
+ 
+ /**
+  *
+  *  @author    Paul Speed
+  */
+ public class GridPanel extends Panel {
+ 
+     public static final String ELEMENT_ID = "grid";
+ 
+     private GridModel<Panel> model;
+     private VersionedReference<GridModel<Panel>> modelRef;
+     private SpringGridLayout layout;
+     private int visibleRows = 5;
+     private int visibleColumns = 5;
+     private int row = 0;
+     private int column = 0;
+     private Float alpha; // for setting to new children
+     private Float[] columnwidths = null;
+     private Float[] rowheight = null;
+     private boolean widthsupdate = false;
+     private HAlignment [] columnHalignement = null;
+ 
+ 
+ 
+     public GridPanel(GridModel<Panel> model ) {
+         this(true, model, new ElementId(ELEMENT_ID), null);
+     }
+ 
+     public GridPanel(GridModel<Panel> model, String style ) {
+         this(true, model, new ElementId(ELEMENT_ID), style);
+     }
+ 
+     public GridPanel(GridModel<Panel> model, ElementId elementId, String style ) {
+         this(true, model, elementId, style);
+     }
+ 
+     protected GridPanel(boolean applyStyles, GridModel<Panel> model,
+                         ElementId elementId, String style ) {
+         super(false, elementId, style);
+ 
+         this.layout = new SpringGridLayout(Axis.Y, Axis.X,
+                                            FillMode.ForcedEven,
+                                            FillMode.ForcedEven);
+         getControl(GuiControl.class).setLayout(layout);
+ 
+         if( applyStyles ) {
+             Styles styles = GuiGlobals.getInstance().getStyles();
+             styles.applyStyles(this, elementId, style);
+         }
+ 
+         setModel(model);
+     }
+     // change the layout if necessary
+     public void setLayout(SpringGridLayout lay) {
+         this.layout = lay;
+         getControl(GuiControl.class).getLayout().clearChildren();
+         getControl(GuiControl.class).setLayout(layout);
+ 
+         this.modelRef = null;
+         if( this.model != null ) {
+             this.modelRef = model.createReference();
+             refreshGrid();
+         }
+ 
+     }
+ 
+ 
+     @StyleDefaults(ELEMENT_ID)
+     public static void initializeDefaultStyles( Attributes attrs ) {
+     }
+ 
+     public void setModel( GridModel<Panel> model ) {
+ 
+         if( this.model == model ) {
+             return;
+         }
+ 
+         if( this.model != null ) {
+             // Clear the old panel
+             getControl(GuiControl.class).getLayout().clearChildren();
+             this.modelRef = null;
+         }
+ 
+         this.model = model;
+ 
+         if( this.model != null ) {
+             this.modelRef = model.createReference();
+             refreshGrid();
+         }
+     }
+ 
+     public GridModel<Panel> getModel() {
+         return model;
+     }
+ 
+     public void setRow( int row ) {
+         setLocation(row, column);
+     }
+ 
+     public int getRow() {
+         return row;
+     }
+ 
+     public void setColumn( int column ) {
+         setLocation(row, column);
+     }
+ 
+     public int getColumn() {
+         return column;
+     }
+ 
+     public Panel getCell( int r, int c ) {
+         r = r - row;
+         c = c - column;
+         if( r < 0 || c < 0 || r >= visibleRows || c >= visibleColumns ) {
+             return null;
+         }
+         return (Panel)layout.getChild(r, c);
+     }
+ 
+     public void setLocation( int row, int column ) {
+         if( this.row == row && this.column == column ) {
+             return;
+         }
+         this.row = row;
+         this.column = column;
+         refreshGrid();
+     }
+ 
+     public void setVisibleSize( int rows, int columns ) {
+         this.visibleRows = rows;
+         this.visibleColumns = columns;
+         getControl(GuiControl.class).getLayout().clearChildren();
+         refreshGrid();
+     }
+ 
+     public void setVisibleRows( int rows ) {
+         setVisibleSize(rows, visibleColumns);
+     }
+ 
+     public int getVisibleRows() {
+         return visibleRows;
+     }
+ 
+     public void setVisibleColumns( int columns ) {
+         setVisibleSize(visibleRows, columns);
+     }
+ 
+     public int getVisibleColumns() {
+         return visibleColumns;
+     }
+ 
+     public void setAlpha( float alpha, boolean recursive ) {
+         this.alpha = alpha;
+         super.setAlpha(alpha, recursive);
+     }
+ 
+     protected void refreshGrid() {
+         widthsupdate = false;
+ 
+         if( model == null ) {
+             getControl(GuiControl.class).getLayout().clearChildren();
+             return;
+         }
+ 
+         for( int r = row; r < row + visibleRows; r++ ) {
+             for( int c = column; c < column + visibleColumns; c++ ) {
+                 Node existing = layout.getChild(r-row, c-column);
+                 if( r < 0 || r >= model.getRowCount() || c < 0 || c >= model.getColumnCount() ) {
+                     // Out of bounds
+                     layout.addChild(null, r-row, c-column);
+                 } else {
+                     Panel child = model.getCell(r, c, (Panel)existing);
+ 
+                     // we check if there is a size for either rowheight or columnwidth stored
+                     Float ytemp = null;
+                     Float xtemp = null;
+ 
+                     if (columnwidths !=null) {
+                         if (columnwidths.length > c) {
+                             if (columnwidths[c] != null) xtemp = columnwidths[c];
+                         }
+                     }
+ 
+                     if (rowheight != null) {
+                         if (rowheight.length > r) {
+                             if (rowheight[r] !=null) ytemp = rowheight[r];
+                         }
+                     }
+                     // and only if, we set the preferred size
+                     if (ytemp !=null || xtemp != null) {
+                         child.setPreferredSize(null);
+                         if (xtemp != null) child.setPreferredSize(child.getPreferredSize().clone().setX(xtemp));
+                         if (ytemp !=null) child.setPreferredSize(child.getPreferredSize().clone().setY(ytemp));
+                     }
+ 
+                     if (columnHalignement != null) {
+                         if (columnHalignement.length > c) {
+                             if (columnHalignement[c] != null) {
+                                 // we only set the alignement for "text" elements attached to the listbox
+                                 // for others e.g. progressbar etc. we should call the element and do the changes there
+                                 if (child instanceof Button) ((Button) child).setTextHAlignment(columnHalignement[c]);
+                                 if (child instanceof Label) ((Label) child).setTextHAlignment(columnHalignement[c]);
+                                 if (child instanceof TextField)
+                                     ((TextField) child).setTextHAlignment(columnHalignement[c]);
+                             } else if (child instanceof Button) ((Button) child).setTextHAlignment(HAlignment.Left);
+                         } else if (child instanceof Button) ((Button) child).setTextHAlignment(HAlignment.Left);
+                     } else if (child instanceof Button) ((Button) child).setTextHAlignment(HAlignment.Left);
+ 
+                     if( child != existing ) {
+                         // Make sure new children pick up the alpha of the container
+                         if( alpha != null && alpha != 1 ) {
+                             child.setAlpha(alpha);
+                         }
+ 
+                         layout.addChild(child, r-row, c-column);
+                     }
+                 }
+             }
+         }
+     }
+ 
+     @Override
+     public void updateLogicalState( float tpf ) {
+         super.updateLogicalState(tpf);
+ 
+         if( modelRef.update() ) {
+             refreshGrid();
+         }
+ 
+         if (widthsupdate)  refreshGrid();
+ 
+     }
+ 
+     @Override
+     public String toString() {
+         return getClass().getName() + "[elementId=" + getElementId() + "]";
+     }
+ 
+ 
+     public Float[] getColumnwidths() {
+         return columnwidths;
+     }
+ 
+     public Float[] getRowheights() {
+         return rowheight;
+     }
+ 
+ 
+     public void setRowheight(Float rowheight, int rownumber_starting_with_0){
+         // adds or replaces a columnwidth
+         if (rownumber_starting_with_0 < 0) return;
+         int size = rownumber_starting_with_0+1;
+         if (this.rowheight != null) {
+             size = Math.max(size, this.rowheight.length);
+         }
+         preparegridsizes(size,false);
+         setcheckedsize(rowheight,rownumber_starting_with_0,true,true);
+     }
+ 
+     public void setColumnwidths(Float columnwidth, int columnnumber_starting_with_0) {
+         // adds or replaces a columnwidth
+         if (columnnumber_starting_with_0 <0) return;
+         int size = columnnumber_starting_with_0+1;
+         if (this.columnwidths != null) {
+             size = Math.max(size, this.columnwidths.length);
+         }
+         preparegridsizes(size,true);
+         setcheckedsize(columnwidth,columnnumber_starting_with_0,true,false);
+     }
+ 
+ 
+     public void setRowheight (Float[] rowheights_or_null) {
+         // replaces the given rowheights and only keep the number of rows given
+         setRowheight(rowheights_or_null,true);
+     }
+ 
+     public void setColumnwidths (Float[] columnwidths_or_null) {
+         // replaces the given columnwidths and only keep the number of columns given
+         setColumnwidths(columnwidths_or_null,true);
+     }
+ 
+ 
+     public void setRowheight(Float[] rowheights_or_null, boolean write_null_values) {
+         // replaces the given rowheights and only keep the number of rows given
+         // null values either overwrite or will be ignored
+         Integer tmp = null;
+         if (rowheights_or_null != null) tmp = rowheights_or_null.length;
+         if (preparegridsizes(tmp,false)) {
+             for (int i = 0; i <tmp;i++) {
+                 setcheckedsize(rowheights_or_null[i],i,write_null_values,true);
+             }
+         }
+     }
+ 
+     public void setColumnwidths(Float[] columnwidths_or_null, boolean write_null_values) {
+         // replaces the given columnwidths_or_null and only keep the number of columns given
+         // null values either overwrite or will be ignored
+         Integer tmp = null;
+         if (columnwidths_or_null != null) tmp = columnwidths_or_null.length;
+         if (preparegridsizes(tmp,true)) {
+             for (int i = 0; i <tmp;i++) {
+                 setcheckedsize(columnwidths_or_null[i],i,write_null_values,false);
+             }
+         }
+     }
+ 
+ 
+     private boolean preparegridsizes(Integer givenfieldsize, boolean width) {
+         // prepares and adjust the size of the field(s) that hold columnwidth or rowheights
+         if (givenfieldsize == null) {
+             if (width) { //either columns or rows will be set null
+                 columnwidths =null;
+             } else {
+                 rowheight = null;
+             }
+             for (Spatial p: this.getChildren()) {
+                 Panel x = (Panel) p;
+                 x.setPreferredSize(null); //we set all sizes to 0 as we will recalculate them with next update
+             }
+             widthsupdate = true;
+             return false; // no more activity needed
+         } else {
+             Float[] tmp;
+             tmp = new Float[givenfieldsize];
+             if (width) {
+                 if (columnwidths == null) {
+                     columnwidths = tmp;
+                     return true;
+                 }
+                 int i = 0;
+                 for (Float z:columnwidths) {
+                     tmp[i] =z;
+                     i++;
+                     if (i>= givenfieldsize) break;
+                 }
+                 columnwidths = tmp; // we get what we have
+             } else {
+                 if (rowheight == null) {
+                     rowheight = tmp;
+                     return true;
+                 }
+                 int i = 0;
+                 for (Float z:rowheight) {
+                     tmp[i] =z;
+                     i++;
+                     if (i>= givenfieldsize) break;
+                 }
+                 rowheight = tmp; // we get what we have
+             }
+             return true;
+         }
+     }
+ 
+     private void setcheckedsize(Float size, int row_or_column, boolean override, boolean i_am_a_row) {
+         if (override || (size !=null))  {
+             if (i_am_a_row) {
+                 rowheight[row_or_column] = size;
+             } else {
+                 columnwidths[row_or_column] = size;
+             }
+             widthsupdate = true;
+         }
+     }
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+  //   public void setRowheight(Float rowheight_or_null){
+  //       if (rowheight_or_null<=0) return;
+  //       this.rowheight = rowheight_or_null;
+  //       widthsupdate = true;
+  //   }
+ 
+ 
+ 
+ 
+ 
+     public void setHalignements(HAlignment[] hals) {
+         setHalignements(hals,false);
+     }
+ 
+     public void setHalignements(HAlignment[] hals, boolean overridestandard) {
+         if (checkexistinghal(hals)) {
+             int i =0;
+             for (HAlignment z:hals) {
+                 setHalignementchecked(z,i,overridestandard);
+                 i++;
+                 if (i>=columnHalignement.length)   return; // we ignore given HAlignement that is out of column bound
+             }
+             if (!overridestandard ) return;
+             for (int u = i; u<columnHalignement.length;u++) {
+                 setHalignementchecked(null,u,overridestandard); // override existing HAlignements
+             }
+         }
+     }
+ 
+     public void setHalignements(HAlignment hal, int column) {
+         checkexistinghal(new HAlignment[]{HAlignment.Center});
+         if (column < columnHalignement.length)  setHalignementchecked(hal,column,true);
+     }
+ 
+     private void setHalignementchecked(HAlignment hal, int column,boolean override) {
+         if (override || (hal !=null))  {
+             columnHalignement[column] = hal;
+             widthsupdate = true;
+         }
+     }
+ 
+     private boolean checkexistinghal(HAlignment[] givenfield) {
+         // delete the given Halignements
+         if (givenfield == null) {
+             columnHalignement =null;
+             for (Spatial p: this.getChildren()) {
+                 Button x = (Button)((Panel) p);
+                 x.setTextHAlignment(HAlignment.Left); //standard HAlignement
+             }
+             widthsupdate = true;
+             return false;
+         }
+         // or prepare if we have no columnHalignement yet
+         HAlignment[] tmp;
+         if (columnHalignement == null) {
+             tmp = new HAlignment[model.getColumnCount()];
+             columnHalignement = tmp;
+         } else {
+             if (!(columnHalignement.length ==model.getColumnCount() )) {
+                 tmp = new HAlignment[model.getColumnCount()];
+                 int i = 0;
+                 for (HAlignment z:columnHalignement) {
+                     tmp[i] =z;
+                     i++;
+                     if (i>=model.getColumnCount()) break;
+                 }
+                 columnHalignement = tmp;
+             }
+         }
+         return true;
+     }
+ 
+     public HAlignment[] getColumnHalignement() {
+         return columnHalignement;
+     }
+ }

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

@@ -0,0 +1,135 @@
+/*
+ * $Id$
+ * 
+ * Copyright (c) 2014, Simsilica, LLC
+ * All rights reserved.
+ * 
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions 
+ * are met:
+ * 
+ * 1. Redistributions of source code must retain the above copyright 
+ *    notice, this list of conditions and the following disclaimer.
+ * 
+ * 2. Redistributions in binary form must reproduce the above copyright 
+ *    notice, this list of conditions and the following disclaimer in 
+ *    the documentation and/or other materials provided with the 
+ *    distribution.
+ * 
+ * 3. Neither the name of the copyright holder nor the names of its 
+ *    contributors may be used to endorse or promote products derived 
+ *    from this software without specific prior written permission.
+ * 
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS 
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT 
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS 
+ * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE 
+ * COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, 
+ * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES 
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR 
+ * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) 
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, 
+ * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) 
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED 
+ * OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+ package pp.monopoly.client.gui.hslider;
+
+ import java.util.AbstractList;
+ import java.util.ArrayList;
+ import java.util.List;
+
+import com.simsilica.lemur.core.VersionedObject;
+import com.simsilica.lemur.core.VersionedReference;
+ 
+ 
+ /**
+  *
+  *  @author    Paul Speed
+  */
+ public class VersionedList<T> extends AbstractList<T>
+                               implements VersionedObject<List<T>> {
+     private long version = 0;
+     private List<T> list;
+ 
+     protected VersionedList(List<T> items, boolean copy ) {
+         if( copy ) {
+             list = new ArrayList<T>();
+             list.addAll(items);
+         } else {
+             this.list = items;
+         }
+     }
+ 
+     public VersionedList() {
+         this(new ArrayList<T>(), false);
+     }
+ 
+     public VersionedList(List<T> items ) {
+         this(items, true);
+     }
+ 
+     /**
+      *  Wraps a list in a VersionedList instead of copying it.
+      *  This is useful for cases where a VersionedList is required
+      *  but strict versioning is not, for example, passing a static list
+      *  to a ListBox.  Changes to the wrapped list obviously don't
+      *  trigger version changes in the wrapper.  Only changes through
+      *  the wrapper will increment the version.
+      */
+     public static <T> VersionedList<T> wrap( List<T> list ) {
+         return new VersionedList<T>(list, false);
+     }
+ 
+     public void incrementVersion() { // changed this to public
+         version++;
+     }
+ 
+     @Override
+     public long getVersion() {
+         return version;
+     }
+ 
+     @Override
+     public List<T> getObject() {
+         return this;
+     }
+ 
+     @Override
+     public VersionedReference<List<T>> createReference() {
+         return new VersionedReference<List<T>>(this);
+     }
+ 
+     @Override
+     public T get( int i ) {
+         return list.get(i);
+     }
+ 
+     @Override
+     public int size() {
+         return list.size();
+     }
+ 
+     @Override
+     public T set( int i, T val ) {
+         T result = list.set(i, val);
+         incrementVersion();
+         return result;
+     }
+ 
+     @Override
+     public void add( int i, T val ) {
+         list.add(i, val);
+         incrementVersion();
+     }
+ 
+     @Override
+     public T remove( int i ) {
+         T result = list.remove(i);
+         incrementVersion();
+         return result;
+     }
+ 
+ }
+ 

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

@@ -1,10 +1,6 @@
 package pp.monopoly.client.gui.popups;
 
-import com.jme3.material.Material;
-import com.jme3.material.RenderState.BlendMode;
 import com.jme3.math.ColorRGBA;
-import com.jme3.scene.Geometry;
-import com.jme3.scene.shape.Quad;
 import com.simsilica.lemur.Button;
 import com.simsilica.lemur.Container;
 import com.simsilica.lemur.Label;
@@ -13,43 +9,40 @@ import com.simsilica.lemur.style.ElementId;
 import pp.dialog.Dialog;
 import pp.monopoly.client.MonopolyApp;
 import pp.monopoly.client.gui.SettingsMenu;
+import pp.monopoly.message.client.BuyPropertyRequest;
 import pp.monopoly.model.fields.BoardManager;
 import pp.monopoly.model.fields.BuildingProperty;
+import pp.monopoly.notification.Sound;
 
 /**
  * SettingsMenu ist ein Overlay-Menü, das durch ESC aufgerufen werden kann.
  */
 public class BuyCard extends Dialog {
     private final MonopolyApp app;
-    private final Geometry overlayBackground;
     private final Container buyCardContainer;
     private final Container backgroundContainer;
 
-    private int index = 37;
+    
-
     public BuyCard(MonopolyApp app) {
         super(app.getDialogManager());
         this.app = app;
-
+        
         //Generate the corresponfing field
+        int index = app.getGameLogic().getPlayerHandler().getPlayers().get(0).getFieldID();
         BuildingProperty field = (BuildingProperty) new BoardManager().getFieldAtIndex(index);
 
-        // Halbtransparentes Overlay hinzufügen
-        overlayBackground = createOverlayBackground();
-        app.getGuiNode().attachChild(overlayBackground);
-
         // Create the background container
         backgroundContainer = new Container();
         backgroundContainer.setBackground(new QuadBackgroundComponent(new ColorRGBA(0.8657f, 0.8735f, 0.8892f, 1.0f))); // Darker background
-        app.getGuiNode().attachChild(backgroundContainer);
+        attachChild(backgroundContainer);
 
         // Hauptcontainer für die Gebäudekarte
         buyCardContainer = new Container();
-        buyCardContainer.setBackground(new QuadBackgroundComponent(field.getColor().getColor()));
+        
-
+        
-
+        Label title = buyCardContainer.addChild(new Label( field.getName(), new ElementId("label-Bold")));
-        Label settingsTitle = buyCardContainer.addChild(new Label( field.getName(), new ElementId("settings-title")));
+        title.setBackground(new QuadBackgroundComponent(field.getColor().getColor()));
-        settingsTitle.setFontSize(48);
+        title.setFontSize(48);
 
         // Text, der auf der Karte steht
         // Die Preise werden dynamisch dem BoardManager entnommen
@@ -70,9 +63,17 @@ public class BuyCard extends Dialog {
         // Beenden-Button
         Button quitButton = buyCardContainer.addChild(new Button("Beenden", new ElementId("button")));
         quitButton.setFontSize(32);
+        quitButton.addClickCommands(s -> ifTopDialog(() -> {
+            app.getGameLogic().playSound(Sound.BUTTON);
+            close();
+        }));
         // Kaufen-Button
         Button buyButton = buyCardContainer.addChild(new Button("Kaufen", new ElementId("button")));
         buyButton.setFontSize(32);
+        buyButton.addClickCommands(s -> ifTopDialog( () -> {
+            app.getGameLogic().playSound(Sound.BUTTON);
+            app.getGameLogic().send(new BuyPropertyRequest());
+        }));
 
         float padding = 10; // Padding around the settingsContainer for the background
         backgroundContainer.setPreferredSize(buyCardContainer.getPreferredSize().addLocal(padding, padding, 0));
@@ -94,22 +95,6 @@ public class BuyCard extends Dialog {
         app.getGuiNode().attachChild(buyCardContainer);
     }
 
-    /**
-     * Erstellt einen halbtransparenten Hintergrund für das Menü.
-     *
-     * @return Geometrie des Overlays
-     */
-    private Geometry createOverlayBackground() {
-        Quad quad = new Quad(app.getCamera().getWidth(), app.getCamera().getHeight());
-        Geometry overlay = new Geometry("Overlay", quad);
-        Material material = new Material(app.getAssetManager(), "Common/MatDefs/Misc/Unshaded.j3md");
-        material.setColor("Color", new ColorRGBA(0, 0, 0, 0.5f)); // Halbtransparent
-        material.getAdditionalRenderState().setBlendMode(BlendMode.Alpha);
-        overlay.setMaterial(material);
-        overlay.setLocalTranslation(0, 0, 0);
-        return overlay;
-    }
-
     /**
      * Schließt das Menü und entfernt die GUI-Elemente.
      */
@@ -117,7 +102,6 @@ public class BuyCard extends Dialog {
     public void close() {
         app.getGuiNode().detachChild(buyCardContainer);  // Entferne das Menü
         app.getGuiNode().detachChild(backgroundContainer); //Entfernt Rand
-        app.getGuiNode().detachChild(overlayBackground);  // Entferne das Overlay
         super.close();
     }
 

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

@@ -14,8 +14,6 @@ import com.simsilica.lemur.style.ElementId;
 import pp.dialog.Dialog;
 import pp.monopoly.client.MonopolyApp;
 import pp.monopoly.client.gui.SettingsMenu;
-import pp.monopoly.model.card.Card; // TODO für den Import der Queue notwendig
-import pp.monopoly.model.card.DeckHelper;
 /**
  * SettingsMenu ist ein Overlay-Menü, das durch ESC aufgerufen werden kann.
  */
@@ -24,14 +22,13 @@ public class EventCard extends Dialog {
     private final Geometry overlayBackground;
     private final Container eventCardContainer;
     private final Container backgroundContainer;
+    private final String description;
 
 
-    public EventCard(MonopolyApp app) {
+    public EventCard(MonopolyApp app, String description) {
         super(app.getDialogManager());
         this.app = app;
-
+        this.description = description;
-        //Generate the corresponfing field
-        Card card = new DeckHelper().drawCard(); // TODO nimmt die Karten gerade unabhängig aus dem DeckHelper
 
         // Halbtransparentes Overlay hinzufügen
         overlayBackground = createOverlayBackground();
@@ -56,7 +53,7 @@ public class EventCard extends Dialog {
         // Text, der auf der Karte steht
         // Die Preise werden dynamisch dem BoardManager entnommen
         Container propertyValuesContainer = eventCardContainer.addChild(new Container());
-        propertyValuesContainer.addChild(new Label(card.getDescription(), new ElementId("label-Text")));
+        propertyValuesContainer.addChild(new Label(description, new ElementId("label-Text")));
         propertyValuesContainer.setBackground(new QuadBackgroundComponent(new ColorRGBA(0.4657f, 0.4735f, 0.4892f, 1.0f)));
         propertyValuesContainer.setPreferredSize(new Vector3f(300,200,10));
 
@@ -65,11 +62,6 @@ public class EventCard extends Dialog {
         quitButton.setFontSize(32);
         quitButton.addClickCommands(source -> close());
 
-
-        // TODO Kaufen-Button wird nicht mehr benötigt, prüfen ob weg kann
-        //Button buyButton = buyCardContainer.addChild(new Button("Kaufen", new ElementId("button")));
-        //buyButton.setFontSize(32);
-
         float padding = 10; // Padding around the settingsContainer for the background
         backgroundContainer.setPreferredSize(eventCardContainer.getPreferredSize().addLocal(padding, padding, 0));
 
@@ -119,6 +111,6 @@ public class EventCard extends Dialog {
 
     @Override
     public void escape() {
-        new SettingsMenu(app).open();
+        close();
     }
 }

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

@@ -5,6 +5,7 @@ import com.jme3.material.RenderState.BlendMode;
 import com.jme3.math.ColorRGBA;
 import com.jme3.scene.Geometry;
 import com.jme3.scene.shape.Quad;
+import com.simsilica.lemur.Button;
 import com.simsilica.lemur.Container;
 import com.simsilica.lemur.Label;
 import com.simsilica.lemur.component.QuadBackgroundComponent;
@@ -13,7 +14,9 @@ import com.simsilica.lemur.style.ElementId;
 import pp.dialog.Dialog;
 import pp.monopoly.client.MonopolyApp;
 import pp.monopoly.client.gui.SettingsMenu;
+import pp.monopoly.message.client.BuyPropertyRequest;
 import pp.monopoly.model.fields.FoodField;
+import pp.monopoly.notification.Sound;
 
 /**
  * FoodFieldCard erstellt die Geböudekarte vom Brandl und der Truppenküche
@@ -23,13 +26,13 @@ public class FoodFieldCard extends Dialog {
     private final Geometry overlayBackground;
     private final Container foodFieldContainer;
     private final Container backgroundContainer;
-    private int index = 12;
 
     public FoodFieldCard(MonopolyApp app) {
         super(app.getDialogManager());
         this.app = app;
 
         //Generate the corresponfing field
+        int index = app.getGameLogic().getPlayerHandler().getPlayers().get(0).getFieldID();
         FoodField field = (FoodField) app.getGameLogic().getBoardManager().getFieldAtIndex(index);
 
         // Halbtransparentes Overlay hinzufügen
@@ -68,22 +71,24 @@ public class FoodFieldCard extends Dialog {
         propertyValuesContainer.addChild(new Label("„Hypothek: " + field.getHypo() + " EUR", new ElementId("label-Text")));
         propertyValuesContainer.setBackground(new QuadBackgroundComponent(new ColorRGBA(0.4657f, 0.4735f, 0.4892f, 1.0f)));
 
-
-        //TODO eventuell diese Stelle löschen, da nur die BuyCard Kaufen und beenden hat
-
-        /*
         // Beenden-Button
         Button quitButton = foodFieldContainer.addChild(new Button("Beenden", new ElementId("button")));
         quitButton.setFontSize(32);
+        quitButton.addClickCommands(s -> ifTopDialog(() -> {
+            app.getGameLogic().playSound(Sound.BUTTON);
+            close();
+        }));
         // Kaufen-Button
         Button buyButton = foodFieldContainer.addChild(new Button("Kaufen", new ElementId("button")));
         buyButton.setFontSize(32);
-         */
+        buyButton.addClickCommands(s -> ifTopDialog( () -> {
+            app.getGameLogic().playSound(Sound.BUTTON);
+            app.getGameLogic().send(new BuyPropertyRequest());
+        }));
 
         float padding = 10; // Padding around the settingsContainer for the background
         backgroundContainer.setPreferredSize(foodFieldContainer.getPreferredSize().addLocal(padding, padding, 0));
 
-
         // Zentriere das Menü
         foodFieldContainer.setLocalTranslation(
             (app.getCamera().getWidth() - foodFieldContainer.getPreferredSize().x) / 2,
@@ -127,10 +132,6 @@ public class FoodFieldCard extends Dialog {
         super.close();
     }
 
-    public void setIndex(int index) {
-        this.index = index;
-    }
-
     @Override
     public void escape() {
         new SettingsMenu(app).open();

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

@@ -5,6 +5,7 @@ import com.jme3.material.RenderState.BlendMode;
 import com.jme3.math.ColorRGBA;
 import com.jme3.scene.Geometry;
 import com.jme3.scene.shape.Quad;
+import com.simsilica.lemur.Button;
 import com.simsilica.lemur.Container;
 import com.simsilica.lemur.Label;
 import com.simsilica.lemur.component.QuadBackgroundComponent;
@@ -12,7 +13,9 @@ import com.simsilica.lemur.style.ElementId;
 import pp.dialog.Dialog;
 import pp.monopoly.client.MonopolyApp;
 import pp.monopoly.client.gui.SettingsMenu;
+import pp.monopoly.message.client.BuyPropertyRequest;
 import pp.monopoly.model.fields.GateField;
+import pp.monopoly.notification.Sound;
 
 /**
  * SettingsMenu ist ein Overlay-Menü, das durch ESC aufgerufen werden kann.
@@ -22,13 +25,13 @@ public class GateFieldCard extends Dialog {
     private final Geometry overlayBackground;
     private final Container gateFieldContainer;
     private final Container backgroundContainer;
-    private int index = 5;
 
     public GateFieldCard(MonopolyApp app) {
         super(app.getDialogManager());
         this.app = app;
 
         //Generate the corresponfing field
+        int index = app.getGameLogic().getPlayerHandler().getPlayers().get(0).getFieldID();
         GateField field = (GateField) app.getGameLogic().getBoardManager().getFieldAtIndex(index);
 
         // Halbtransparentes Overlay hinzufügen
@@ -63,16 +66,21 @@ public class GateFieldCard extends Dialog {
         propertyValuesContainer.addChild(new Label("„Hypothek: " + field.getHypo() + " EUR", new ElementId("label-Text")));
         propertyValuesContainer.setBackground(new QuadBackgroundComponent(new ColorRGBA(0.4657f, 0.4735f, 0.4892f, 1.0f)));
 
-        //TODO eventuell diese Stelle löschen, da nur die BuyCard Kaufen und beenden hat
-
-        /*
         // Beenden-Button
-        Button quitButton = foodFieldContainer.addChild(new Button("Beenden", new ElementId("button")));
+        Button quitButton = gateFieldContainer.addChild(new Button("Beenden", new ElementId("button")));
         quitButton.setFontSize(32);
+        quitButton.addClickCommands(s -> ifTopDialog(() -> {
+            app.getGameLogic().playSound(Sound.BUTTON);
+            close();
+        }));
         // Kaufen-Button
-        Button buyButton = foodFieldContainer.addChild(new Button("Kaufen", new ElementId("button")));
+        Button buyButton = gateFieldContainer.addChild(new Button("Kaufen", new ElementId("button")));
         buyButton.setFontSize(32);
-         */
+        buyButton.addClickCommands(s -> ifTopDialog(() -> {
+            app.getGameLogic().playSound(Sound.BUTTON);
+            app.getGameLogic().send(new BuyPropertyRequest());
+            close();
+        }));         
 
         float padding = 10; // Padding around the settingsContainer for the background
         backgroundContainer.setPreferredSize(gateFieldContainer.getPreferredSize().addLocal(padding, padding, 0));
@@ -121,10 +129,6 @@ public class GateFieldCard extends Dialog {
         super.close();
     }
 
-    public void setIndex(int index) {
-        this.index = index;
-    }
-
     @Override
     public void escape() {
         new SettingsMenu(app).open();

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

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

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

@@ -6,6 +6,7 @@ import java.util.ArrayList;
 import java.util.List;
 
 import pp.monopoly.game.server.Player;
+import pp.monopoly.game.server.PlayerHandler;
 import pp.monopoly.message.client.ClientMessage;
 import pp.monopoly.message.server.BuyPropertyResponse;
 import pp.monopoly.message.server.DiceResult;
@@ -24,12 +25,15 @@ import pp.monopoly.model.Board;
 import pp.monopoly.model.IntPoint;
 import pp.monopoly.model.fields.BoardManager;
 import pp.monopoly.notification.ClientStateEvent;
+import pp.monopoly.notification.DiceRollEvent;
+import pp.monopoly.notification.EventCardEvent;
 import pp.monopoly.notification.GameEvent;
 import pp.monopoly.notification.GameEventBroker;
 import pp.monopoly.notification.GameEventListener;
 import pp.monopoly.notification.InfoTextEvent;
 import pp.monopoly.notification.Sound;
 import pp.monopoly.notification.SoundEvent;
+import pp.monopoly.notification.UpdatePlayerView;
 
 /**
  * Controls the client-side game logic for Monopoly.
@@ -52,7 +56,7 @@ public class ClientGameLogic implements ServerInterpreter, GameEventBroker {
     /** The current state of the client game logic. */
     private ClientState state = new LobbyState(this);
 
-    private List<Player> players;
+    private PlayerHandler playerHandler;
 
     private BoardManager boardManager = new BoardManager();
 
@@ -94,8 +98,8 @@ public class ClientGameLogic implements ServerInterpreter, GameEventBroker {
         state.entry();
     }
 
-    public List<Player> getPlayers() {
+    public PlayerHandler getPlayerHandler() {
-        return players;
+        return playerHandler;
     }
 
     /**
@@ -144,7 +148,6 @@ public class ClientGameLogic implements ServerInterpreter, GameEventBroker {
             LOGGER.log(Level.ERROR, "trying to send {0} with sender==null", msg); //NON-NLS
         } else {
             clientSender.send(msg);
-            System.out.println("Message gesendet");
         }
     }
 
@@ -199,10 +202,10 @@ public class ClientGameLogic implements ServerInterpreter, GameEventBroker {
     @Override
     public void received(BuyPropertyResponse msg) {
         if (msg.isSuccessful()) {
-            setInfoText("You successfully bought " + msg.getPropertyName() + "!");
+        
             playSound(Sound.MONEY_LOST);
         } else {
-            setInfoText("Unable to buy " + msg.getPropertyName() + ". Reason: " + msg.getReason());
+        
         }
     }
 
@@ -213,9 +216,8 @@ public class ClientGameLogic implements ServerInterpreter, GameEventBroker {
      */
     @Override
     public void received(DiceResult msg) {
-        setInfoText("You rolled a " + msg.calcTotal() + "!");
-        //Set the dice images
         playSound(Sound.DICE_ROLL);
+        notifyListeners(new DiceRollEvent(msg.getRollResult().get(0), msg.getRollResult().get(1)));
     }
 
     /**
@@ -225,9 +227,8 @@ public class ClientGameLogic implements ServerInterpreter, GameEventBroker {
      */
     @Override
     public void received(EventDrawCard msg) {
-        setInfoText("Event card drawn: " + msg.getCardDescription());
-        // Kartenlogik
         playSound(Sound.EVENT_CARD);
+        notifyListeners(new EventCardEvent(msg.getCardDescription()));
     }
 
     /**
@@ -238,11 +239,11 @@ public class ClientGameLogic implements ServerInterpreter, GameEventBroker {
     @Override
     public void received(GameOver msg) {
         if (msg.isWinner()) {
-            setInfoText("Congratulations! You have won the game!");
+        
             //Winner popup
             playSound(Sound.WINNER);
         } else {
-            setInfoText("Game over. Better luck next time!");
+        
             // Looser popup
             playSound(Sound.LOSER);
         }
@@ -255,9 +256,9 @@ public class ClientGameLogic implements ServerInterpreter, GameEventBroker {
      */
     @Override
     public void received(GameStart msg) {
-        players = msg.getPlayers();
+        playerHandler = msg.getPlayerHandler();
-        setInfoText("The game has started! Good luck!");
         setState(new WaitForTurnState(this));
+        
     }
 
     /**
@@ -268,10 +269,10 @@ public class ClientGameLogic implements ServerInterpreter, GameEventBroker {
     @Override
     public void received(JailEvent msg) {
         if (msg.isGoingToJail()) {
-            setInfoText("You are sent to jail!");
+        
             playSound(Sound.GULAG);
         } else {
-            setInfoText("You are out of jail!");
+        
         }
     }
 
@@ -282,8 +283,8 @@ public class ClientGameLogic implements ServerInterpreter, GameEventBroker {
      */
     @Override
     public void received(PlayerStatusUpdate msg) {
-        
+        playerHandler = msg.getPlayerHandler();
-        setInfoText("Player " + msg.getPlayerName() + " status updated: " + msg.getStatus());
+        notifyListeners(new UpdatePlayerView());
     }
 
     /**
@@ -293,7 +294,7 @@ public class ClientGameLogic implements ServerInterpreter, GameEventBroker {
      */
     @Override
     public void received(TimeOutWarning msg) {
-        setInfoText("Warning! Time is running out. You have " + msg.getRemainingTime() + " seconds left.");
+    
     }
 
     /**
@@ -303,7 +304,7 @@ public class ClientGameLogic implements ServerInterpreter, GameEventBroker {
      */
     @Override
     public void received(ViewAssetsResponse msg) {
-        setInfoText("Your current assets are being displayed.");
+    
     }
 
     /**
@@ -314,10 +315,10 @@ public class ClientGameLogic implements ServerInterpreter, GameEventBroker {
     @Override
     public void received(TradeReply msg) {
         if (msg.getTradeHandler().getStatus()) {
-            setInfoText("Trade accepted by " + msg.getTradeHandler().getReceiver().getName() + ".");
+        
             playSound(Sound.TRADE_ACCEPTED);
         } else {
-            setInfoText("Trade rejected by " + msg.getTradeHandler().getReceiver().getName() + ".");
+        
             playSound(Sound.TRADE_REJECTED);
         }
     }
@@ -329,7 +330,7 @@ public class ClientGameLogic implements ServerInterpreter, GameEventBroker {
      */
     @Override
     public void received(TradeRequest msg) {
-        setInfoText("Trade offer received from " + msg.getTradeHandler().getSender().getName());
+    
         // playSound(Sound.TRADE_REQUEST); no sound effect
         // notifyListeners();
     }
@@ -341,7 +342,7 @@ public class ClientGameLogic implements ServerInterpreter, GameEventBroker {
      */
     @Override
     public void received(NextPlayerTurn msg) {
-        setInfoText("It's your turn!");
+    
         setState(new ActiveState(this));
     }
 }

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

@@ -7,12 +7,15 @@
 
 package pp.monopoly.game.server;
 
+import java.util.ArrayList;
 import java.util.List;
 import java.util.Random;
 
 import com.jme3.network.serializing.Serializable;
 
 import pp.monopoly.message.server.DiceResult;
+import pp.monopoly.message.server.EventDrawCard;
+import pp.monopoly.message.server.PlayerStatusUpdate;
 import pp.monopoly.model.FieldVisitor;
 import pp.monopoly.model.Figure;
 import pp.monopoly.model.card.Card;
@@ -36,12 +39,12 @@ public class Player implements FieldVisitor<Void>{
     private String name;
     private int accountBalance = 15000;
     private Figure figure;
-    private List<PropertyField> properties;
+    private List<PropertyField> properties = new ArrayList<>();
     private int getOutOfJailCard;
     private int fieldID;
     private DiceResult rollResult;
-    private final PlayerHandler handler;
+    private transient final PlayerHandler handler;
-    private PlayerState state = new LobbyState();
+    private transient PlayerState state = new LobbyState();
 
     /**
      * Default constructor for serialization purposes.
@@ -79,12 +82,12 @@ public class Player implements FieldVisitor<Void>{
 
     public PlayerColor getColor() {
         switch ((id%6)+1) {
-            case 1: return PlayerColor.BLUE;
+            case 1: return PlayerColor.CYAN;
-            case 2: return PlayerColor.GREEN_DARK;
+            case 2: return PlayerColor.YELLOW;
-            case 3: return PlayerColor.GREEN_LIGHT;
+            case 3: return PlayerColor.RED;
             case 4: return PlayerColor.PINK;
-            case 5: return PlayerColor.RED;
+            case 5: return PlayerColor.GREEN;
-            case 6: return PlayerColor.YELLOW;
+            case 6: return PlayerColor.PURPLE;
         
             default:
                 return null;
@@ -319,7 +322,9 @@ public class Player implements FieldVisitor<Void>{
     @Override
     public Void visit(EventField field) {
         Card c = getHandler().getLogic().getDeckHelper().drawCard();
-        getHandler().getLogic().getDeckHelper().visit(c, this);
+        getHandler().getLogic().getDeckHelper().visit(c, this); //Logic
+        getHandler().getLogic().send(this, new EventDrawCard(c.getDescription())); // Card notification
+        getHandler().getLogic().send(this, new PlayerStatusUpdate(getHandler())); //update view
         return null;
     }
 
@@ -408,6 +413,10 @@ public class Player implements FieldVisitor<Void>{
         return state.rollDice();
     }
 
+    private void visitEvent() {
+        getHandler().getLogic().getBoardManager().getFieldAtIndex(36).accept(this);
+    }
+
     /**
      * A interface representing the PlayerStates
      */
@@ -439,7 +448,7 @@ public class Player implements FieldVisitor<Void>{
         @Override
         public DiceResult rollDice() {
             List<Integer> roll = List.of(Dice.rollDice(), Dice.rollDice());
-            rollResult = new DiceResult(roll);
+            rollResult = new DiceResult(roll.get(0), roll.get(1));
             return rollResult;
         }
 
@@ -491,7 +500,7 @@ public class Player implements FieldVisitor<Void>{
         @Override
         public DiceResult rollDice() {
             List<Integer> roll = List.of(Dice.rollDice(), Dice.rollDice());
-            rollResult = new DiceResult(roll);
+            rollResult = new DiceResult(roll.get(0), roll.get(1));
             if (rollResult.isDoublets()) {
                 state = new ActiveState();
             } else if (DoubletsCounter == 0) {
@@ -519,7 +528,7 @@ public class Player implements FieldVisitor<Void>{
 
         @Override
         public DiceResult rollDice() {
-            throw new UnsupportedOperationException("not allowed");
+            return null;
         }
 
         @Override

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

@@ -6,12 +6,12 @@ import com.jme3.math.ColorRGBA;
  * Enum representing six distinct colors for players in the game.
  */
 public enum PlayerColor {
-    GREEN_LIGHT(new ColorRGBA(0 / 255f, 204 / 255f, 0 / 255f, 1)),   // Hex: 00cc00
+    CYAN(new ColorRGBA(1 / 255f, 190 / 255f, 254 / 255f, 1)),
-    RED(new ColorRGBA(255 / 255f, 0 / 255f, 0 / 255f, 1)),           // Hex: ff0000
+    YELLOW(new ColorRGBA(255 / 255f, 255 / 255f, 0 / 255f, 1)),
-    BLUE(new ColorRGBA(0 / 255f, 0 / 255f, 204 / 255f, 1)),          // Hex: 0000cc
+    RED(new ColorRGBA(255 / 255f, 0 / 255f, 0 / 255f, 1)),
-    PINK(new ColorRGBA(255 / 255f, 77 / 255f, 166 / 255f, 1)),       // Hex: ff4da6
+    PINK(new ColorRGBA(255 / 255f, 77 / 255f, 166 / 255f, 1)),
-    GREEN_DARK(new ColorRGBA(0 / 255f, 102 / 255f, 0 / 255f, 1)),    // Hex: 006600
+    GREEN(new ColorRGBA(0 / 255f, 204 / 255f, 0 / 255f, 1)),
-    YELLOW(new ColorRGBA(255 / 255f, 255 / 255f, 0 / 255f, 1));      // Hex: ffff00
+    PURPLE(new ColorRGBA(143 / 255f, 0 / 255f, 255 / 255f, 1));
 
     private final ColorRGBA color;
 

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

@@ -1,9 +1,9 @@
 package pp.monopoly.game.server;
 
-import java.util.LinkedList;
 import java.util.Collection;
 import java.util.Collections;
 import java.util.HashSet;
+import java.util.LinkedList;
 import java.util.List;
 import java.util.NoSuchElementException;
 import java.util.Set;
@@ -16,10 +16,9 @@ import pp.monopoly.model.LimitedLinkedList;
  */
 @Serializable
 public class PlayerHandler {
-    private List<Player> players = new LimitedLinkedList<>(6);
+    private List<Player> players = new LinkedList<>();
     private Set<Player> readyPlayers = new HashSet<>();
-    private ServerGameLogic logic;
+    private transient ServerGameLogic logic;
-    private Player hostPlayer;
     private Player extra = null;
 
     /**
@@ -55,14 +54,6 @@ public class PlayerHandler {
         players.addAll(players);
     }
 
-    /**
-     * Return the host player
-     * @return the host player
-     */
-    public Player getHostPlayer() {
-        return hostPlayer;
-    }
-
     /**
      * Return the number of players
      * @return number of players in the game
@@ -114,9 +105,6 @@ public class PlayerHandler {
             throw new IllegalArgumentException("Player already registered");
         }
         players.add(player);
-        if(hostPlayer == null) {
-            hostPlayer = player;
-        }
     }
 
     /**

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

@@ -132,7 +132,6 @@ public class ServerGameLogic implements ClientInterpreter {
 
         playerHandler.addPlayer(player);
         LOGGER.log(Level.DEBUG, "Player added: {0}", player.getId());
-        System.out.println("Anzahl Spieler verbunden:"+ playerHandler.getPlayerCount());
 
         return player;
     }
@@ -175,7 +174,7 @@ public class ServerGameLogic implements ClientInterpreter {
                 LOGGER.log(Level.DEBUG, "Ending turn for player {0}", player.getName());
                 Player next = playerHandler.nextPlayer();
                 next.setActive();
-                send(next, new NextPlayerTurn(next));
+                send(next, new NextPlayerTurn());
             }
         }
     }
@@ -189,7 +188,7 @@ public class ServerGameLogic implements ClientInterpreter {
     @Override
     public void received(PlayerReady msg, int from) {
         Player player = playerHandler.getPlayerById(from);
-        if(player == playerHandler.getHostPlayer()) {
+        if(player.getId() == 0) {
             startMoney = msg.getStartMoney();
         }
 
@@ -204,10 +203,10 @@ public class ServerGameLogic implements ClientInterpreter {
         if(playerHandler.allPlayersReady()) {
             playerHandler.setStartBalance(startMoney);
             for (Player p : playerHandler.getPlayers()) {
-               send(p, new GameStart(playerHandler.getPlayers())); 
+               send(p, new GameStart(playerHandler)); 
             }
             playerHandler.randomOrder();
-            send(playerHandler.getPlayerAtIndex(0), new NextPlayerTurn(playerHandler.getPlayerAtIndex(0)));
+            send(playerHandler.getPlayerAtIndex(0), new NextPlayerTurn());
         }
     }
 
@@ -220,7 +219,7 @@ public class ServerGameLogic implements ClientInterpreter {
     @Override
     public void received(RollDice msg, int from) {
         Player player = playerHandler.getPlayerById(from);
-        if (player != null && state == ServerState.INGAME) {
+        if (player != null) {
             send(player, player.rollDice());
         }
     }

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

@@ -7,30 +7,14 @@ import com.jme3.network.serializing.Serializable;
  */
 @Serializable
 public class BuyPropertyRequest extends ClientMessage{
-    private int propertyId;
-
-    /**
-     * Default constructor for serialization purposes.
-     */
-    private BuyPropertyRequest() { /* empty */ }
 
     /**
      * Constructs a BuyPropertyRequest with the specified property ID.
      *
      * @param propertyId the ID of the property to buy
      */
-    public BuyPropertyRequest(int propertyId) {
+    public BuyPropertyRequest() {}
-        this.propertyId = propertyId;
-    }
 
-    /**
-     * Gets the ID of the property to buy.
-     *
-     * @return the property ID
-     */
-    public int getPropertyId() {
-        return propertyId;
-    }
 
     @Override
     public void accept(ClientInterpreter interpreter, int from) {

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

@@ -11,7 +11,7 @@ public class RollDice extends ClientMessage{
     /**
      * Default constructor for serialization purposes.
      */
-    private RollDice() { /* empty */ }
+    public RollDice() { /* empty */ }
 
     @Override
     public void accept(ClientInterpreter interpreter, int from) {

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

@@ -7,19 +7,24 @@ import com.jme3.network.serializing.Serializable;
 @Serializable
 public class DiceResult extends ServerMessage{
 
-    private List<Integer> rollResult;
+    private final int a;
+    private final int b;
 
     /**
      * Default constructor for serialization purposes.
      */
-    private DiceResult() { /* empty */ }
+    private DiceResult() {
+        a = 1;
+        b = 1;
+    }
 
-    public DiceResult(List<Integer> rollResult) {
+    public DiceResult(int a, int b) {
-        this.rollResult = rollResult;
+        this.a = a;
+        this.b = b;
     }
 
     public List<Integer> getRollResult() {
-        return rollResult;
+        return List.of(a,b);
     }
 
     @Override
@@ -34,10 +39,10 @@ public class DiceResult extends ServerMessage{
     }
 
     public boolean isDoublets() {
-        return rollResult.get(0) == rollResult.get(1);
+        return a == b;
     }
 
     public int calcTotal() {
-        return rollResult.get(0)+rollResult.get(1);
+        return a+b;
     }
 }

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

@@ -1,27 +1,25 @@
 package pp.monopoly.message.server;
 
-import java.util.List;
-
 import com.jme3.network.serializing.Serializable;
 
-import pp.monopoly.game.server.Player;
+import pp.monopoly.game.server.PlayerHandler;
 
 @Serializable
 public class GameStart extends ServerMessage{
 
-    private List<Player> players;
+    private PlayerHandler playerHandler;
 
     /**
      * Default constructor for serialization purposes.
      */
     private GameStart() { /* empty */ }
 
-    public GameStart(List<Player> players) {
+    public GameStart(PlayerHandler playerHandler) {
-        this.players = players;
+        this.playerHandler = playerHandler;
     }
 
-    public List<Player> getPlayers() {
+    public PlayerHandler getPlayerHandler() {
-        return players;
+        return playerHandler;
     }
 
     @Override

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

@@ -2,20 +2,13 @@ package pp.monopoly.message.server;
 
 import com.jme3.network.serializing.Serializable;
 
-import pp.monopoly.game.server.Player;
-
 @Serializable
 public class NextPlayerTurn extends ServerMessage{
 
-    private Player player;
-
     /**
      * Default constructor for serialization purposes.
      */
-    private NextPlayerTurn() { /* empty */ }
+    public NextPlayerTurn() {
-
-    public NextPlayerTurn(Player player) {
-        this.player = player;
     }
 
     @Override
@@ -28,9 +21,4 @@ public class NextPlayerTurn extends ServerMessage{
         // TODO Auto-generated method stub
         throw new UnsupportedOperationException("Unimplemented method 'getInfoTextKey'");
     }
-
-    public Player getPlayer() {
-        return player;
-    }
-
 }

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

@@ -2,36 +2,24 @@ package pp.monopoly.message.server;
 
 import com.jme3.network.serializing.Serializable;
 
-import pp.monopoly.game.server.PlayerColor;
+import pp.monopoly.game.server.PlayerHandler;
 
 @Serializable
 public class PlayerStatusUpdate extends ServerMessage{
 
-    private String playerName;
+    private PlayerHandler playerHandler;
-    private String status;
-    private PlayerColor color;
 
     /**
      * Default constructor for serialization purposes.
      */
     private PlayerStatusUpdate() { /* empty */ }
 
-    public PlayerStatusUpdate(String playerName, String status, PlayerColor color) {
+    public PlayerStatusUpdate(PlayerHandler playerHandler) {
-        this.playerName = playerName;
+        this.playerHandler = playerHandler;
-        this.status = status;
-        this.color = color;
     }
 
-    public String getPlayerName() {
+    public PlayerHandler getPlayerHandler() {
-        return playerName;
+        return playerHandler;
-    }
-
-    public String getStatus() {
-        return status;
-    }
-
-    public PlayerColor getColor() {
-        return color;
     }
 
     @Override

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

@@ -12,13 +12,13 @@ import java.util.List;
 public class TradeHandler {
 
     private final Player sender;
-    private final Player receiver;
+    private Player receiver;
-    private final int offeredAmount;
+    private int offeredAmount;
-    private final List<PropertyField> offeredProperties;
+    private List<PropertyField> offeredProperties;
-    private final int offeredJailCards;
+    private int offeredJailCards;
-    private final int requestedAmount;
+    private int requestedAmount;
-    private final List<PropertyField> requestedProperties;
+    private List<PropertyField> requestedProperties;
-    private final int requestedJailCards;
+    private int requestedJailCards;
     private Boolean status = null;
 
     /**
@@ -45,6 +45,22 @@ public class TradeHandler {
         this.requestedJailCards = requestedJailCards;
     }
 
+        /**
+     * Constructs a TradeHandler for a single trade instance.
+     *
+     * @param sender             the Player initiating the trade
+     * @param receiver           the Player receiving the trade offer
+     * @param offeredAmount      the amount of money offered by the sender
+     * @param offeredProperties  the properties offered by the sender
+     * @param offeredJailCards   the jail cards offered by the sender
+     * @param requestedAmount    the amount of money requested from the receiver
+     * @param requestedProperties the properties requested from the receiver
+     * @param requestedJailCards the jail cards requested from the receiver
+     */
+    public TradeHandler(Player sender) {
+        this.sender = sender;
+    }
+
     public int getOfferedAmount() {
         return offeredAmount;
     }
@@ -88,10 +104,10 @@ public class TradeHandler {
      */
     public boolean initiateTrade() {
         if (!validateTrade()) {
-            System.out.println("Trade offer is invalid.");
+        
             return false;
         }
-        System.out.println("Trade initiated by " + sender.getName() + " to " + receiver.getName());
+    
         return true;
     }
 
@@ -122,14 +138,14 @@ public class TradeHandler {
         transferJailCards(sender, receiver, offeredJailCards);
         transferJailCards(receiver, sender, requestedJailCards);
 
-        System.out.println("Trade completed between " + sender.getName() + " and " + receiver.getName());
+    
     }
 
     /**
      * Rejects the trade.
      */
     public void rejectTrade() {
-        System.out.println(receiver.getName() + " rejected the trade.");
+    
     }
 
     /**
@@ -140,13 +156,13 @@ public class TradeHandler {
     private boolean validateTrade() {
         // Validate sender's ability to offer money
         if (sender.getAccountBalance() < offeredAmount) {
-            System.out.println("Sender does not have enough money to offer.");
+        
             return false;
         }
 
         // Validate receiver's ability to fulfill the requested amount
         if (receiver.getAccountBalance() < requestedAmount) {
-            System.out.println("Receiver does not have enough money to fulfill the request.");
+        
             return false;
         }
 
@@ -154,7 +170,7 @@ public class TradeHandler {
         if (offeredProperties != null) {
             for (PropertyField property : offeredProperties) {
                 if (!sender.getProperties().contains(property)) {
-                    System.out.println("Sender does not own property: " + property.getName());
+                
                     return false;
                 }
             }
@@ -162,7 +178,7 @@ public class TradeHandler {
         if (requestedProperties != null) {
             for (PropertyField property : requestedProperties) {
                 if (!receiver.getProperties().contains(property)) {
-                    System.out.println("Receiver does not own property: " + property.getName());
+                
                     return false;
                 }
             }
@@ -170,11 +186,11 @@ public class TradeHandler {
 
         // Validate jail cards
         if (sender.getNumJailCard() < offeredJailCards) {
-            System.out.println("Sender does not have enough jail cards to offer.");
+        
             return false;
         }
         if (receiver.getNumJailCard() < requestedJailCards) {
-            System.out.println("Receiver does not have enough jail cards to fulfill the request.");
+        
             return false;
         }
 
@@ -192,7 +208,7 @@ public class TradeHandler {
         from.sellProperty(property);
         to.buyProperty(property);
         property.setOwner(to);
-        System.out.println("Property " + property.getName() + " transferred from " + from.getName() + " to " + to.getName());
+    
     }
 
     /**
@@ -207,6 +223,34 @@ public class TradeHandler {
             from.removeJailCard();
             to.addJailCard();
         }
-        System.out.println(numCards + " jail card(s) transferred from " + from.getName() + " to " + to.getName());
+    
+    }
+
+    public void setOfferedAmount(int offeredAmount) {
+        this.offeredAmount = offeredAmount;
+    }
+
+    public void setOfferedJailCards(int offeredJailCards) {
+        this.offeredJailCards = offeredJailCards;
+    }
+
+    public void setOfferedProperties(List<PropertyField> offeredProperties) {
+        this.offeredProperties = offeredProperties;
+    }
+
+    public void setReceiver(Player receiver) {
+        this.receiver = receiver;
+    }
+    
+    public void setRequestedAmount(int requestedAmount) {
+        this.requestedAmount = requestedAmount;
+    }
+
+    public void setRequestedJailCards(int requestedJailCards) {
+        this.requestedJailCards = requestedJailCards;
+    }
+
+    public void setRequestedProperties(List<PropertyField> requestedProperties) {
+        this.requestedProperties = requestedProperties;
     }
 }

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

@@ -16,38 +16,40 @@ public class DeckHelper{
 
     public DeckHelper() {
         cards = new LinkedList<Card>();
-        cards.add(new Card("Du wurdest mit einem Dienst KFZ geblitzt. Zahle: 800€", "dienst-kfz-blitzer"));
+        cards.add(new Card("Du wurdest mit einem Dienst KFZ geblitzt. Zahle: 800 EUR", "dienst-kfz-blitzer"));
         cards.add(new Card("Die erste Spoparty steht bevor. Ziehe vor zum 23er.", "spoparty"));
         cards.add(new Card("Du kommst aus dem Gulak frei.", "gulak-frei-1"));
         cards.add(new Card("Du kommst aus dem Gulak frei.", "gulak-frei-2"));
         cards.add(new Card("Du hast den Dienstführerschein bestanden. Ziehe vor bis Teststrecke.", "dienstfuehrerschein"));
         cards.add(new Card("Malkmus läd zum Pubquiz ein. Rücke vor bis zum 20er.", "pubquiz"));
-        cards.add(new Card("Du warst ohne Namensschild in der Truppenküche. Rücke vor zum 10er. Gehe nicht über Monatsgehalt. Ziehe keine 2000x€ ein.", "namensschild-truppenkueche"));
+        cards.add(new Card("Du warst ohne Namensschild in der Truppenküche. Rücke vor zum 10er. Gehe nicht über Monatsgehalt. Ziehe keine 2000x EUR ein.", "namensschild-truppenkueche"));
-        cards.add(new Card("Du hast heute die Spendierhosen an und gibst eine Runde in der Unibar. Zahle jedem Spieler: 400€", "spendierhosen-unibar"));
+        cards.add(new Card("Du hast heute die Spendierhosen an und gibst eine Runde in der Unibar. Zahle jedem Spieler: 400 EUR", "spendierhosen-unibar"));
         cards.add(new Card("Du warst in der Prüfungsphase krank. Gehe 3 Felder zurück.", "pruefungsphase-krank"));
         cards.add(new Card("Ziehe vor bis zum nächsten Monatsgehalt.", "naechstes-monatsgehalt"));
-        cards.add(new Card("Du hast ein Antreten verschlafen. Zahle: 500€", "antreten-verschlafen-1"));
+        cards.add(new Card("Du hast ein Antreten verschlafen. Zahle: 500 EUR", "antreten-verschlafen-1"));
-        cards.add(new Card("Du hast den Maibock organisiert. Du erhältst: 3000€", "maibock-organisiert"));
+        cards.add(new Card("Du hast den Maibock organisiert. Du erhältst: 3000 EUR", "maibock-organisiert"));
-        cards.add(new Card("Der Spieß macht eine unangekündigte Inventur. Zahle für jedes Haus: 400€ und jedes Hotel: 2800€", "inventur-haeuser-hotels"));
+        cards.add(new Card("Der Spieß macht eine unangekündigte Inventur. Zahle für jedes Haus: 400 EUR und jedes Hotel: 2800 EUR", "inventur-haeuser-hotels"));
         cards.add(new Card("Es gab keine Mozzarella Bällchen mehr für Thoma. Alle Spieler ziehen vor auf Gym.", "dienstsport-gym"));
         cards.add(new Card("Auf deiner Stube wurde Schimmel gefunden. Gehe ins Gulak. Begib Dich direkt dorthin. Gehe nicht über Monatsgehalt. Ziehe nicht ein.", "schimmel-gulak"));
         cards.add(new Card("Deine Stube ist nach einer Partynacht nicht mehr bewohnbar. Du ziehst ins Gulak. Begib Dich direkt dorthin. Gehe nicht über Monatsgehalt. Ziehe nicht ein.", "partynacht-gulak"));
         cards.add(new Card("Das Jahresabschlussantreten steht an. Ziehe vor bis Schwimmhalle.", "jahresabschlussantreten"));
-        cards.add(new Card("Du wurdest beim Verkaufen von Versicherungen erwischt. Zahle: 4000€", "verkaufen-versicherungen"));
+        cards.add(new Card("Du wurdest beim Verkaufen von Versicherungen erwischt. Zahle: 4000 EUR", "verkaufen-versicherungen"));
         cards.add(new Card("Du musstest einen Rückstuferantrag stellen. Setze eine Runde aus.", "rueckstuferantrag"));
-        cards.add(new Card("Auf einer Hausfeier bist du betrunken auf der Treppe gestürzt und dabei auf einen Kameraden gefallen. Zahle: 800€ und gehe zurück zu SanZ.", "hausfeier-sturz"));
+        cards.add(new Card("Auf einer Hausfeier bist du betrunken auf der Treppe gestürzt und dabei auf einen Kameraden gefallen. Zahle: 800 EUR und gehe zurück zu SanZ.", "hausfeier-sturz"));
-        cards.add(new Card("Beförderung. Beim nächsten Monatsgehalt ziehst du ein: 3000€", "befoerderung"));
+        cards.add(new Card("Beförderung. Beim nächsten Monatsgehalt ziehst du ein: 3000 EUR", "befoerderung"));
-        cards.add(new Card("Du entscheidest dich für eine Dienstreise nach Lourd. Zahle: 1000€ und setze eine Runde aus.", "dienstreise-lourd"));
+        cards.add(new Card("Du entscheidest dich für eine Dienstreise nach Lourd. Zahle: 1000 EUR und setze eine Runde aus.", "dienstreise-lourd"));
         cards.add(new Card("Du warst fleißig Blutspenden und erhältst einen Tag Sonderurlaub. Du bist nochmal an der Reihe.", "blutspenden-sonderurlaub"));
         cards.add(new Card("Dir wurde auf dem Oktoberfest dein Geldbeutel geklaut. Gebe 10% deines Vermögens ab.", "geldbeutel-oktoberfest"));
-        cards.add(new Card("Du wirst von deinem Chef für vorbildliches Verhalten gelobt. Du erhältst: 4000€", "lob-chef"));
+        cards.add(new Card("Du wirst von deinem Chef für vorbildliches Verhalten gelobt. Du erhältst: 4000 EUR", "lob-chef"));
-        cards.add(new Card("Deine Bekanntschaft von letzter Nacht war eine Spo. Lasse dich testen und zahle: 200€", "spo-testen"));
+        cards.add(new Card("Deine Bekanntschaft von letzter Nacht war eine Spo. Lasse dich testen und zahle: 200 EUR", "spo-testen"));
         cards.add(new Card("Du wurdest von Kranz geexmattet. Gehe zurück zu Prüfungsamt.", "kranz-exmatrikulation"));
         cards.add(new Card("Die letzte Party ist ein wenig eskaliert. Setze eine Runde aus.", "party-eskaliert"));
-        cards.add(new Card("Du wurdest zur VP gewählt und schmeißt eine Einstandsparty. Zahle: 800€", "vp-einstandsparty"));
+        cards.add(new Card("Du wurdest zur VP gewählt und schmeißt eine Einstandsparty. Zahle: 800 EUR", "vp-einstandsparty"));
-        cards.add(new Card("Du hast eine Party veranstaltet und dick Gewinn gemacht. Ziehe ein: 1500€", "party-gewinn"));
+        cards.add(new Card("Du hast eine Party veranstaltet und dick Gewinn gemacht. Ziehe ein: 1500 EUR", "party-gewinn"));
         cards.add(new Card("Zur falschen Zeit am falschen Ort. Du musst einen Bergmarsch planen und setzt eine Runde aus.", "bergmarsch"));
-        cards.add(new Card("Dein Jodel eines Eispenis mit Unterhodenbeleuchtung geht viral. Ziehe ein: 1000€", "jodel-eispenis"));
+        cards.add(new Card("Dein Jodel eines Eispenis mit Unterhodenbeleuchtung geht viral. Ziehe ein: 1000 EUR", "jodel-eispenis"));
+
+        shuffle();
     }
 
     public void visit(Card card, Player player) {
@@ -203,7 +205,7 @@ public class DeckHelper{
         }
     
         private void namensschildTruppenkueche(Player player) {
-            //TODO
+            //TODO 10 existiert nicht mehr
         }
     
         private void spendierhosenUnibar(Player player) {

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

@@ -3,8 +3,11 @@ package pp.monopoly.model.fields;
 import java.util.ArrayList;
 import java.util.List;
 
+import com.jme3.network.serializing.Serializable;
+
 import pp.monopoly.game.server.Player;
 
+@Serializable
 public class BuildingProperty extends PropertyField {
 
     private int houses;
@@ -17,6 +20,12 @@ public class BuildingProperty extends PropertyField {
     private final int rentFactor4 = 55;
     private final int rentFactorHotel = 70;
 
+    private BuildingProperty(){
+        super("", 0, 0, 0);
+        this.housePrice = 0;
+        this.color = null;
+    }
+
     BuildingProperty(String name, int id, int price, int rent, int housePrice, FieldColor color) {
         super(name, id, price, rent);
         this.housePrice = housePrice;

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

@@ -1,11 +1,18 @@
 package pp.monopoly.model.fields;
 
 
+import com.jme3.network.serializing.Serializable;
+
 import pp.monopoly.game.server.Player;
 
+@Serializable
 public class EventField extends Field{
 
-    public EventField(String name, int id) {
+    private EventField() {
+        super("", 0);
+    }
+
+    EventField(String name, int id) {
         super(name, id);
     }
 

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

@@ -1,11 +1,19 @@
 package pp.monopoly.model.fields;
 
+import com.jme3.network.serializing.Serializable;
+
 import pp.monopoly.game.server.Player;
 
-abstract class Field {
+@Serializable
+public abstract class Field {
     protected final String name;
     protected final int id;
 
+    private Field() {
+        this.name = "";
+        this.id = 0;
+    }
+
     protected Field(String name, int id) {
         this.name = name;
         this.id= id;

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

@@ -1,10 +1,12 @@
 package pp.monopoly.model.fields;
 
 import com.jme3.math.ColorRGBA;
+import com.jme3.network.serializing.Serializable;
 
 /**
  * Enum representing eight distinct colors for properties in the game.
  */
+// @Serializable
 public enum FieldColor {
     BROWN(new ColorRGBA(148 / 255f, 86 / 255f, 57 / 255f, 1)),
     GREEN(new ColorRGBA(30 / 255f, 179 / 255f, 90 / 255f, 1)),
@@ -17,6 +19,10 @@ public enum FieldColor {
 
     private final ColorRGBA color;
 
+    private FieldColor() {
+        this.color = null;
+    }
+
     /**
      * Constructs a FieldColor with the specified ColorRGBA value.
      *

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

@@ -1,11 +1,19 @@
 package pp.monopoly.model.fields;
 
+import com.jme3.network.serializing.Serializable;
+
 import pp.monopoly.game.server.Player;
 
+@Serializable
 public class FineField extends Field{
 
     private final int fine;
 
+    private FineField() {
+        super("", 0);
+        this.fine = 0;
+    }
+
     FineField(String name, int id, int fine) {
         super(name, id);
         this.fine = fine;

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

@@ -1,10 +1,17 @@
 package pp.monopoly.model.fields;
 
+import com.jme3.network.serializing.Serializable;
+
 import pp.monopoly.game.server.Player;
 
+@Serializable
 public class FoodField extends PropertyField {
 
-    public FoodField(String name, int id) {
+    private FoodField() {
+        super("", 0, 0, 0);
+    }
+
+    FoodField(String name, int id) {
         super(name, id, 1500,0);
     }
 

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

@@ -1,9 +1,15 @@
 package pp.monopoly.model.fields;
 
-import pp.monopoly.game.server.Player;
+import com.jme3.network.serializing.Serializable;
 
+import pp.monopoly.game.server.Player;
+@Serializable
 public class GateField extends PropertyField{
 
+    private GateField() {
+        super("", 0, 0, 0);
+    }
+
     GateField(String name, int id) {
         super(name, id, 2000, 25);
     }

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

@@ -1,10 +1,12 @@
 package pp.monopoly.model.fields;
 
-import pp.monopoly.game.server.Player;
+import com.jme3.network.serializing.Serializable;
 
+import pp.monopoly.game.server.Player;
+@Serializable
 public class GoField extends Field{
 
-    public GoField() {
+    GoField() {
         super("Monatsgehalt", 0);
     }
 

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

@@ -1,7 +1,9 @@
 package pp.monopoly.model.fields;
 
-import pp.monopoly.game.server.Player;
+import com.jme3.network.serializing.Serializable;
 
+import pp.monopoly.game.server.Player;
+@Serializable
 public class GulagField extends Field{
 
     private int bailCost = 500;

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

@@ -1,11 +1,14 @@
 package pp.monopoly.model.fields;
 
+import com.jme3.network.serializing.Serializable;
+
 import pp.monopoly.game.server.Player;
 
 /**
  * Represents an abstract property field in the Monopoly game.
  * Contains attributes related to ownership, price, rent, and mortgage status.
  */
+@Serializable
 public abstract class PropertyField extends Field {
 
     private final int price;
@@ -13,6 +16,12 @@ public abstract class PropertyField extends Field {
     private Player owner;
     private boolean mortgaged = false;
 
+    private PropertyField() {
+        super("", 0);
+        this.price = 0;
+        this.rent = 0;
+    }
+    
     /**
      * Constructs a PropertyField with the specified name, ID, price, and rent.
      *

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

@@ -1,7 +1,10 @@
 package pp.monopoly.model.fields;
 
+import com.jme3.network.serializing.Serializable;
+
 import pp.monopoly.game.server.Player;
 
+@Serializable
 public class TestStreckeField extends Field{
     private int money;
 

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

@@ -1,10 +1,13 @@
 package pp.monopoly.model.fields;
 
+import com.jme3.network.serializing.Serializable;
+
 import pp.monopoly.game.server.Player;
 
+@Serializable
 public class WacheField extends Field{
 
-    public WacheField() {
+    WacheField() {
         super("Wache", 30);
     }
 

Projekte/monopoly/model/src/main/java/pp/monopoly/notification/DiceRollEvent.java

@@ -0,0 +1,10 @@
+package pp.monopoly.notification;
+
+public record DiceRollEvent(int a, int b) implements GameEvent{
+
+    @Override
+    public void notifyListener(GameEventListener listener) {
+        listener.receivedEvent(this);
+    }
+
+}

Projekte/monopoly/model/src/main/java/pp/monopoly/notification/EventCardEvent.java

@@ -0,0 +1,10 @@
+package pp.monopoly.notification;
+
+public record EventCardEvent(String description) implements GameEvent{
+
+    @Override
+    public void notifyListener(GameEventListener listener) {
+        listener.receivedEvent(this);
+    }
+
+}

Projekte/monopoly/model/src/main/java/pp/monopoly/notification/GameEventListener.java

@@ -45,4 +45,25 @@ public interface GameEventListener {
      * @param event the received event
      */
     default void receivedEvent(ClientStateEvent event) { /* do nothing */ }
+
+    /**
+     * Indicates that the dice result has changed.
+     *
+     * @param event the received event
+     */
+    default void receivedEvent(DiceRollEvent event) { /*Do nothing */}
+
+    /**
+     * Indicates that the players assets have changed.
+     *
+     * @param event the received event
+     */
+    default void receivedEvent(UpdatePlayerView event) { /*Do nothing */}
+
+    /**
+     * Indicates that an event card has been drawn
+     *
+     * @param event the received event
+     */
+    default void receivedEvent(EventCardEvent event) { /*Do nothing */}
 }

Projekte/monopoly/model/src/main/java/pp/monopoly/notification/UpdatePlayerView.java

@@ -0,0 +1,13 @@
+package pp.monopoly.notification;
+
+public record UpdatePlayerView() implements GameEvent{
+    /**
+     * Notifies the game event listener of this event.
+     *
+     * @param listener the game event listener
+     */
+    @Override
+    public void notifyListener(GameEventListener listener) {
+        listener.receivedEvent(this);
+    }
+}

Projekte/monopoly/model/src/main/resources/monopoly_de.properties

@@ -6,37 +6,37 @@
 ########################################
 #
 monopoly.name=Monopoly
-button.play=Start Game
+button.play=Spiel starten
-button.ready=Ready
+button.ready=Bereit
-button.rotate=Rotate
+button.rotate=Drehen
-server.connection.failed=Failed to establish a server connection.
+server.connection.failed=Fehler beim Herstellen einer Serververbindung.
-its.your.turn=It's your turn! Click on the opponent's field to shoot...
+its.your.turn=Du bist am Zug! Klicke auf das Feld des Gegners, um zu schießen...
-lost.connection.to.server=Lost connection to server. The game terminated.
+lost.connection.to.server=Verbindung zum Server verloren. Das Spiel wurde beendet.
-place.ships.in.your.map=Place ships in your map.
+place.ships.in.your.map=Platziere Schiffe auf deiner Karte.
-wait.for.an.opponent=Wait for an opponent!
+wait.for.an.opponent=Warte auf einen Gegner!
-wait.for.opponent=Wait for your opponent!
+wait.for.opponent=Warte auf deinen Gegner!
-confirm.leaving=Would you really like to leave the game?
+confirm.leaving=Möchtest du das Spiel wirklich beenden?
-you.lost.the.game=You lost the game!
+you.lost.the.game=Du hast das Spiel verloren!
-you.won.the.game=You won the game!
+you.won.the.game=Du hast das Spiel gewonnen!
-button.yes=Yes
+button.yes=Ja
-button.no=No
+button.no=Nein
 button.ok=Ok
-button.connect=Connect
+button.connect=Verbinden
-button.cancel=Cancel
+button.cancel=Abbrechen
 server.dialog=Server
 host.name=Host
 port.number=Port
-wait.its.not.your.turn=Wait, it's not your turn!!
+wait.its.not.your.turn=Warte, es ist nicht dein Zug!!
-menu.quit=Quit game
+menu.quit=Spiel beenden
-menu.return-to-game=Return to game
+menu.return-to-game=Zum Spiel zurückkehren
-menu.sound-enabled=Sound switched on
+menu.sound-enabled=Ton eingeschaltet
-menu.background-sound-enabled=Background music switched on
+menu.background-sound-enabled=Hintergrundmusik eingeschaltet
-menu.map.load=Load map from file...
+menu.map.load=Karte aus Datei laden...
-menu.map.save=Save map in file...
+menu.map.save=Karte in Datei speichern...
-label.file=File:
+label.file=Datei:
-label.connecting=Connecting...
+label.connecting=Verbinde...
-dialog.error=Error
+dialog.error=Fehler
-dialog.question=Question
+dialog.question=Frage
-port.must.be.integer=Port must be an integer number
+port.must.be.integer=Port muss eine ganze Zahl sein
-map.doesnt.fit=The map doesn't fit to this game
+map.doesnt.fit=Die Karte passt nicht zu diesem Spiel
-client.server-start=Start server
+client.server-start=Server starten

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

@@ -37,8 +37,11 @@ import pp.monopoly.message.client.RollDice;
 import pp.monopoly.message.client.TradeOffer;
 import pp.monopoly.message.client.TradeResponse;
 import pp.monopoly.message.client.ViewAssetsRequest;
+import pp.monopoly.message.server.DiceResult;
+import pp.monopoly.message.server.EventDrawCard;
 import pp.monopoly.message.server.GameStart;
 import pp.monopoly.message.server.NextPlayerTurn;
+import pp.monopoly.message.server.PlayerStatusUpdate;
 import pp.monopoly.message.server.ServerMessage;
 import pp.monopoly.model.Figure;
 import pp.monopoly.model.IntPoint;
@@ -130,6 +133,9 @@ public class MonopolyServer implements MessageListener<HostedConnection>, Connec
         Serializer.registerClass(Player.class);
         Serializer.registerClass(Figure.class);
         Serializer.registerClass(PlayerHandler.class);
+        Serializer.registerClass(DiceResult.class);
+        Serializer.registerClass(EventDrawCard.class);
+        Serializer.registerClass(PlayerStatusUpdate.class);
     }
 
     private void registerListeners() {
@@ -145,7 +151,6 @@ public class MonopolyServer implements MessageListener<HostedConnection>, Connec
 
     @Override
     public void messageReceived(HostedConnection source, Message message) {
-        System.out.println("Message recieved");
         LOGGER.log(Level.INFO, "message received from {0}: {1}", source.getId(), message); //NON-NLS
         if (message instanceof ClientMessage clientMessage)
             pendingMessages.add(new ReceivedMessage(clientMessage, source.getId()));
@@ -155,7 +160,6 @@ public class MonopolyServer implements MessageListener<HostedConnection>, Connec
     public void connectionAdded(Server server, HostedConnection hostedConnection) {
         LOGGER.log(Level.INFO, "New connection established: {0}", hostedConnection); //NON-NLS
         logic.addPlayer(hostedConnection.getId());
-        System.out.println("Spieler verbunden: ID = " + hostedConnection.getId());
     }
 
     @Override