Merge branch 'gui' into 'connect'

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

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

@@ -64,16 +64,6 @@ selector("label-Bold", "pp") {
     textHAlignment = HAlignment.Center
     textVAlignment = VAlignment.Center
 
-}
-
-selector("label-toolbar", "pp") {
-    insets = new Insets3f(2, 2, 2, 2)
-    font = font("Interface/Fonts/Metropolis/Metropolis-Bold-32.fnt")
-    fontSize = 30
-    color = new ColorRGBA(ColorRGBA.White)
-    textHAlignment = HAlignment.Center
-    textVAlignment = VAlignment.Center
-
 }
 selector("label-Text", "pp") {
     insets = new Insets3f(2, 2, 2, 2)
@@ -81,19 +71,6 @@ selector("label-Text", "pp") {
     color = buttonEnabledColor
 }
 
-selector("label-account", "pp") {
-    insets = new Insets3f(2, 2, 2, 2)
-    fontSize = 25
-    color = new ColorRGBA(ColorRGBA.White)
-    textHAlignment = HAlignment.Center
-    textVAlignment = VAlignment.Center
-}
-
-selector("card-label", "pp") {
-    insets = new Insets3f(2, 2, 2, 2)
-    color = ColorRGBA.Black
-}
-
 selector("header", "pp") {
     font = font("Interface/Fonts/Metropolis/Metropolis-Bold-42.fnt")
     insets = new Insets3f(2, 2, 2, 2)
@@ -280,16 +257,6 @@ selector("settings-title", "pp") {
     textHAlignment = HAlignment.Center
     textVAlignment = VAlignment.Center
  }
-selector("warning-title", "pp") {
-    def outerBackground = new QuadBackgroundComponent(color(1, 0.5, 0, 1)) // Grey inner border
-    def innerBackground = new QuadBackgroundComponent(buttonBgColor) // White outer border background
-    font = font("Interface/Fonts/Metropolis/Metropolis-Bold-42.fnt")
-    background = outerBackground
-    fontSize = 40
-    insets = new Insets3f(3, 3, 3, 3)
-    textHAlignment = HAlignment.Center
-    textVAlignment = VAlignment.Center
-}
 
 selector("menu-button", "pp") {
     fontSize = 40 // Set font size
@@ -325,44 +292,3 @@ selector("selector.item.label", "hover") {
     background = new QuadBackgroundComponent(new ColorRGBA(0.2f, 0.6f, 1.0f, 0.9f))  // Highlighted background
 }
 
-
-def enabledCommandToolbar = new Command<Button>() {
-    void execute(Button source) {
-        if (source.isEnabled()){
-            source.setColor(ColorRGBA.White)
-            def orangeBackground = new QuadBackgroundComponent(color(1, 0.5, 0, 1)); // Orange background
-            source.setBackground(orangeBackground);
-        } else{
-            source.setColor(ColorRGBA.White)
-            def grayBackground = new QuadBackgroundComponent(ColorRGBA.Gray); // Gray background
-            source.setBackground(grayBackground);
-        }
-
-
-
-
-    }
-}
-
-def stdButtonCommandsToolbar = [
-        (ButtonAction.Down)    : [pressedCommand],
-        (ButtonAction.Up)      : [pressedCommand],
-        (ButtonAction.Enabled) : [enabledCommandToolbar],
-        (ButtonAction.Disabled): [enabledCommandToolbar]
-]
-
-selector("button-toolbar", "pp") {
-    def outerBackground = new QuadBackgroundComponent(color(1, 0.5, 0, 1)) // Orange border
-    def innerBackground = new QuadBackgroundComponent(buttonBgColor) // Inner button background
-
-    // Apply the outer border as the main background
-    background = outerBackground
-
-    // Use insets to create a margin/padding effect for the inner background
-    insets = new Insets3f(3, 3, 3, 3) // Adjust the border thickness
-    textHAlignment = HAlignment.Center
-    textVAlignment = VAlignment.Center
-    buttonCommands = stdButtonCommandsToolbar
-}
-
-

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

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

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

@@ -7,15 +7,6 @@
 
 package pp.monopoly.client;
 
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.IOException;
-import java.lang.System.Logger;
-import java.lang.System.Logger.Level;
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.Executors;
-import java.util.logging.LogManager;
-
 import com.jme3.app.DebugKeysAppState;
 import com.jme3.app.SimpleApplication;
 import com.jme3.app.StatsAppState;
@@ -29,34 +20,29 @@ import com.jme3.input.controls.MouseButtonTrigger;
 import com.jme3.system.AppSettings;
 import com.simsilica.lemur.GuiGlobals;
 import com.simsilica.lemur.style.BaseStyles;
-
-import pp.dialog.Dialog;
-import pp.dialog.DialogBuilder;
-import pp.dialog.DialogManager;
-import pp.graphics.Draw;
-import static pp.monopoly.Resources.lookup;
+import pp.monopoly.game.client.MonopolyClient;
 import pp.monopoly.client.gui.SettingsMenu;
 import pp.monopoly.client.gui.StartMenu;
-import pp.monopoly.client.gui.TestWorld;
-import pp.monopoly.client.gui.popups.Bankrupt;
-import pp.monopoly.client.gui.popups.BuildingPropertyCard;
-import pp.monopoly.client.gui.popups.BuyCard;
-import pp.monopoly.client.gui.popups.BuyHouse;
-import pp.monopoly.client.gui.popups.EventCardPopup;
-import pp.monopoly.client.gui.popups.FoodFieldCard;
-import pp.monopoly.client.gui.popups.GateFieldCard;
-import pp.monopoly.client.gui.popups.LooserPopUp;
-import pp.monopoly.client.gui.popups.RepayMortage;
-import pp.monopoly.client.gui.popups.SellHouse;
-import pp.monopoly.client.gui.popups.TakeMortage;
-import pp.monopoly.client.gui.popups.TimeOut;
 import pp.monopoly.game.client.ClientGameLogic;
-import pp.monopoly.game.client.MonopolyClient;
 import pp.monopoly.game.client.ServerConnection;
 import pp.monopoly.notification.ClientStateEvent;
 import pp.monopoly.notification.GameEventListener;
 import pp.monopoly.notification.InfoTextEvent;
 import pp.monopoly.notification.Sound;
+import pp.dialog.DialogBuilder;
+import pp.dialog.DialogManager;
+import pp.graphics.Draw;
+
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.IOException;
+import java.lang.System.Logger;
+import java.lang.System.Logger.Level;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
+import java.util.logging.LogManager;
+
+import static pp.monopoly.Resources.lookup;
 
 /**
  * The main class for the Battleship client application.
@@ -134,24 +120,6 @@ public class MonopolyApp extends SimpleApplication implements MonopolyClient, Ga
      */
     private final ActionListener escapeListener = (name, isPressed, tpf) -> escape(isPressed);
 
-    //TODO temp for testing
-    private EventCardPopup eventCard;
-    private BuildingPropertyCard buildingProperty;
-    private FoodFieldCard foodField;
-    private GateFieldCard gateField;
-    private BuyCard buyCard;
-    private LooserPopUp looserpopup;
-    private Bankrupt bankrupt;
-    private TimeOut timeOut;
-    private SellHouse sellHouse;
-    private BuyHouse buyHouse;
-    private TakeMortage takeMortage;
-    private RepayMortage repayMortage;
-
-    private boolean isBuyCardPopupOpen = false;
-    private final ActionListener BListener = (name, isPressed, tpf) -> handleB(isPressed);
-    private TestWorld testWorld;
-
     static {
         // Configure logging
         LogManager manager = LogManager.getLogManager();
@@ -234,7 +202,7 @@ public class MonopolyApp extends SimpleApplication implements MonopolyClient, Ga
     /**
      * Returns the current configuration settings for the Battleship client.
      *
-     * @return The {@link BattleshipClientConfig} instance. //TODO Fehler im Kommentar
+     * @return The {@link BattleshipClientConfig} instance.
      */
     @Override
     public MonopolyAppConfig getConfig() {
@@ -280,20 +248,6 @@ public class MonopolyApp extends SimpleApplication implements MonopolyClient, Ga
         inputManager.addMapping(ESC, new KeyTrigger(KeyInput.KEY_ESCAPE));
         inputManager.addMapping(CLICK, new MouseButtonTrigger(MouseInput.BUTTON_LEFT));
         inputManager.addListener(escapeListener, ESC);
-
-        //TODO tmp for testing
-        inputManager.addMapping("B", new KeyTrigger(KeyInput.KEY_B));
-        inputManager.addListener(BListener, "B");
-        inputManager.addMapping("T", new KeyTrigger(KeyInput.KEY_T));
-        
-    }
-
-    //logik zum wechselnden erscheinen und verschwinden beim drücken von B //TODO süäter entfernen
-    private void handleB(boolean isPressed) {
-        if (isPressed) {
-            Dialog tmp = new FoodFieldCard(this);
-            tmp.open();
-        }
     }
 
     /**
@@ -311,7 +265,6 @@ public class MonopolyApp extends SimpleApplication implements MonopolyClient, Ga
 
         attachGameSound();
         attachGameMusic();
-        stateManager.attach(new GameAppState());
     }
 
     /**
@@ -344,12 +297,6 @@ public class MonopolyApp extends SimpleApplication implements MonopolyClient, Ga
         super.simpleUpdate(tpf);
         dialogManager.update(tpf);
         logic.update(tpf);
-        stateManager.update(tpf);
-
-       // //TODO testing replace later
-       // if (testWorld != null) {
-       //     testWorld.update(tpf);
-       // }
     }
 
     /**
@@ -436,7 +383,6 @@ public class MonopolyApp extends SimpleApplication implements MonopolyClient, Ga
      */
     @Override
     public void receivedEvent(ClientStateEvent event) {
-        stateManager.getState(GameAppState.class).setEnabled(true);
     }
 
     /**
@@ -497,9 +443,4 @@ 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

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

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

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

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

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

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

@@ -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,7 +25,6 @@ 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,8 +38,15 @@ public class LobbyMenu extends Dialog {
     private Geometry circle;
     private Container lowerLeftMenu;
     private Container lowerRightMenu;
+    private ColorRGBA playerColor= ColorRGBA.Gray;
 
+    private PlayerHandler playerHandler;
+    private TextField startingCapital;
     private TextField playerInputField;
+    private Selector<String> figureDropdown;
+
+
+    private TextField playerInputField = new TextField("Spieler 1");
     private TextField startingCapital = new TextField("15000");
     private String figure;
 
@@ -48,20 +54,20 @@ public class LobbyMenu extends Dialog {
         super(app.getDialogManager());
         this.app = app;
 
-        playerInputField = new TextField("Spieler "+(app.getId()+1));
-        // Hintergrundbild laden und hinzufügen
-        addBackgroundImage();
+        app.getGuiNode().detachAllChildren(); // Entfernt das CreateGameMenu (inklusive Hintergrund)
+
+        addBackgroundImage();// Hintergrundbild laden und hinzufügen
 
         QuadBackgroundComponent translucentWhiteBackground =
                 new QuadBackgroundComponent(new ColorRGBA(1.0f, 1.0f, 1.0f, 0.5f));
 
         menuContainer = new Container(new SpringGridLayout(Axis.Y, Axis.X));
-        menuContainer.setPreferredSize(new Vector3f(1000, 600, 0)); // Fixed size of the container
+        menuContainer.setPreferredSize(new Vector3f(1000, 600, 0));
         menuContainer.setBackground(translucentWhiteBackground);
 
         // Create a smaller horizontal container for the label, input field, and spacers
         Container horizontalContainer = menuContainer.addChild(new Container(new SpringGridLayout(Axis.X, Axis.Y)));
-        horizontalContainer.setPreferredSize(new Vector3f(600, 40, 0)); // Adjust container size
+        horizontalContainer.setPreferredSize(new Vector3f(600, 40, 0));
         horizontalContainer.setBackground(null);
 
         Label title = horizontalContainer.addChild(new Label("Startkapital:", new ElementId("label-Bold")));
@@ -90,7 +96,6 @@ 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));
@@ -101,15 +106,16 @@ public class LobbyMenu extends Dialog {
 
 
         playerInputField.setPreferredSize(new Vector3f(100, 20, 0));
-        playerInputField.setInsets(new Insets3f(5, 10, 5, 10)); // Add padding for the text inside the field
+        playerInputField.setInsets(new Insets3f(5, 10, 5, 10));
         playerInputField.setBackground(new QuadBackgroundComponent(ColorRGBA.Black));
         playerInputContainer.addChild(playerInputField);
         // Spacer (Center Circle Area)
         Label spacer = dropdownContainer.addChild(new Label(""));
-        spacer.setPreferredSize(new Vector3f(200, 200, 0)); // Adjust this to fit the center graphic
+        spacer.setPreferredSize(new Vector3f(200, 200, 0));
 
         // Figur Dropdown
         Container figureDropdownContainer = dropdownContainer.addChild(new Container(new SpringGridLayout(Axis.Y, Axis.X)));
+        figureDropdownContainer.setPreferredSize(new Vector3f(150, 80, 0));
         figureDropdownContainer.addChild(new Label("Figur:"));
         figureDropdownContainer.setBackground(null);
 
@@ -121,18 +127,14 @@ 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();
+        figureDropdown.setPreferredSize(new Vector3f(150, 140, 0));
+        Vector3f dimens = figureDropdownContainer.getPreferredSize();
         Vector3f dimens2 = figureDropdown.getPopupContainer().getPreferredSize();
         dimens2.setX( dimens.getX() );
-        figureDropdown.getPopupContainer().setPreferredSize(new Vector3f(200,200,5));
-        figureDropdown.getSelectionModel().setSelection(0);
-        figure = "Laptop";
+        figureDropdown.getPopupContainer().setPreferredSize( dimens2 );
+        figureDropdownContainer.addChild(figureDropdown);
 
         addSelectionActionListener(figureDropdown, this::onDropdownSelectionChanged);
 
@@ -164,9 +166,9 @@ public class LobbyMenu extends Dialog {
         readyButton.addClickCommands(s -> ifTopDialog(() -> {
             toggleReady();
             app.getGameLogic().playSound(Sound.BUTTON);
-            readyButton.setBackground(new QuadBackgroundComponent(ColorRGBA.DarkGray));
         }));
         lowerRightMenu.addChild(readyButton);
+        //TODO aktivieren des Spielers in den ready Status und Sprung in den nächsten Menüzustand
 
         // Position the container near the bottom-right corner
         lowerRightMenu.setLocalTranslation(new Vector3f(app.getCamera().getWidth() - 320, 170, 3)); // X: 220px from the right, Y: 50px above the bottom
@@ -190,7 +192,59 @@ public class LobbyMenu extends Dialog {
 
         app.getGuiNode().attachChild(menuContainer);
     }
+    /**
+     * Apply the starting capital only if the current player is the host.
+     */
+    private void applyStartingCapital(int playerID) {
+            Player currentPlayer = playerHandler.getPlayerById(playerID);
 
+            // Check if the current player is the host
+            if (currentPlayer.equals(playerHandler.getHostPlayer())) {
+                try {
+                    // Parse and validate starting capital
+                    int startBalance = Integer.parseInt(startingCapital.getText().replaceAll("[^\\d]", ""));
+                    if (startBalance < 0) throw new NumberFormatException("Starting capital must be positive.");
+
+                    // Apply the starting balance to all players
+                    playerHandler.setStartBalance(startBalance);
+                    System.out.println("Starting balance set to: " + startBalance);
+                } catch (NumberFormatException e) {
+                    System.err.println("Invalid starting capital: " + e.getMessage());
+                }
+            } else {
+                System.out.println("Only the host can set the starting balance.");
+            }
+    }
+
+    /**
+     * Apply the player name from the input field.
+     */
+    private void applyPlayerName(int playerID) {
+        Player currentPlayer = playerHandler.getPlayerById(playerID);
+
+        String playerName = playerInputField.getText().trim();
+        if (!playerName.isEmpty()) {
+            currentPlayer.setName(playerName);
+            System.out.println("Player name set to: " + playerName);
+        } else {
+            System.err.println("Invalid player name: Name cannot be empty.");
+        }
+    }
+
+    /**
+     * Apply the selected figure to the player.
+     */
+    private void applyFigure(int playerID) {
+        Player currentPlayer = playerHandler.getPlayerById(playerID);
+
+        String selectedFigure = figureDropdown.getSelectedItem();
+        if (selectedFigure != null && !selectedFigure.isEmpty()) {
+            currentPlayer.setFigure(new Figure(0, 0, 0, Rotation.RIGHT, "selectedFigure"));
+            System.out.println("Player figure set to: " + selectedFigure);
+        } else {
+            System.err.println("Invalid figure selection.");
+        }
+    }
 
     /**
      * Lädt das Hintergrundbild und fügt es als geometrische Ebene hinzu.
@@ -214,28 +268,25 @@ public class LobbyMenu extends Dialog {
 
         // Create a material with a solid color
         Material material = new Material(app.getAssetManager(), "Common/MatDefs/Misc/Unshaded.j3md");
-        material.setColor("Color", idToColor()); // Set the desired color
+        material.setColor("Color", playerColor); // 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;
+    public void setPlayerColor(ColorRGBA newColor) {
+        this.playerColor = newColor;
+        // Update the circle's color
+        if (circle != null) {
+            Material material = new Material(app.getAssetManager(), "Common/MatDefs/Misc/Unshaded.j3md");
+            material.setColor("Color", playerColor);
+            circle.setMaterial(material);
         }
     }
 
     /**
-     * Schaltet den "Bereit"-Status um.
+     * Assigns a color to the player based on their ID.
+     *
+     * @param playerID the player's ID
      */
     private void toggleReady() {
         app.getGameLogic().send(new PlayerReady(true, playerInputField.getText(), figure, Integer.parseInt(startingCapital.getText())));
@@ -257,6 +308,7 @@ 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);
                 }
             }
@@ -285,6 +337,7 @@ 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/PropertyOverviewMenu.java

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

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

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

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

@@ -1,329 +1,250 @@
+
 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;
-import com.simsilica.lemur.Axis;
-import com.simsilica.lemur.Button;
-import com.simsilica.lemur.Container;
-import com.simsilica.lemur.Label;
-import com.simsilica.lemur.component.IconComponent;
+import com.jme3.scene.Geometry;
+import com.simsilica.lemur.*;
 import com.simsilica.lemur.component.QuadBackgroundComponent;
 import com.simsilica.lemur.component.SpringGridLayout;
-import com.simsilica.lemur.style.ElementId;
 
+import com.simsilica.lemur.style.ElementId;
 import pp.dialog.Dialog;
 import pp.monopoly.client.MonopolyApp;
-import pp.monopoly.game.server.Player;
-import pp.monopoly.game.server.PlayerHandler;
-import pp.monopoly.message.client.EndTurn;
-import pp.monopoly.message.client.RollDice;
-import pp.monopoly.notification.ButtonStatusEvent;
-import pp.monopoly.notification.DiceRollEvent;
-import pp.monopoly.notification.GameEventListener;
 import pp.monopoly.notification.Sound;
-import pp.monopoly.notification.UpdatePlayerView;
 
-public class Toolbar extends Dialog implements GameEventListener {
+/**
+ * Toolbar Klasse, die am unteren Rand der Szene angezeigt wird.
+ * Die Buttons bewegen den Würfel auf dem Spielfeld.
+ */
+public class Toolbar extends Dialog {
 
     private final MonopolyApp app;
     private final Container toolbarContainer;
-    private Container overviewContainer;
-    private Container accountContainer;
-    private PlayerHandler playerHandler;
-    private Label imageLabel;
-    private Label imageLabel2;
-    private Button diceButton;
-    private Button tradeButton;
-    private Button propertyMenuButton;
-    private Button endTurnButton;
+    private final Geometry cube; // Referenz auf den Würfel
+    private final BitmapText positionText; // Anzeige für die aktuelle Position
+    private final float boardLimit = 0.95f; // Grenzen des Bretts
+    private final float stepSize = 0.18f; // Schrittgröße pro Bewegung
+    private int currentPosition = 0; // Aktuelle Position auf dem Spielfeld
+    private final int positionsPerSide = 10; // Anzahl der Positionen pro Seite
+    private final Random random = new Random(); // Zufallsgenerator für den Würfelwurf
 
-    private volatile boolean animatingDice = false;
-    private volatile DiceRollEvent latestDiceRollEvent = null;
-
-    public Toolbar(MonopolyApp app) {
+    /**
+     * Konstruktor für die Toolbar.
+     *
+     * @param app  Die Hauptanwendung (MonopolyApp)
+     * @param cube Der Würfel, der bewegt werden soll
+     */
+    public Toolbar(MonopolyApp app, Geometry cube) {
         super(app.getDialogManager());
         this.app = app;
+        this.cube = cube;
 
-        app.getGameLogic().addListener(this);
-        this.playerHandler = app.getGameLogic().getPlayerHandler();
+        // Erstelle die Toolbar
+        toolbarContainer = new Container(new SpringGridLayout(Axis.X, Axis.Y), "toolbar");
 
-        toolbarContainer = createToolbarContainer();
-        app.getGuiNode().attachChild(toolbarContainer);
-    }
+        // Setze die Position am unteren Rand und die Breite
+        toolbarContainer.setLocalTranslation(
+                0,                                 // Links bündig
+                200,                               // Höhe über dem unteren Rand
+                0                                  // Z-Ebene
+        );
+        toolbarContainer.setPreferredSize(new Vector3f(app.getCamera().getWidth(), 200, 0)); // Volle Breite
 
-    private Container createToolbarContainer() {
-        // Erstelle den Hauptcontainer
-        Container container = new Container(new SpringGridLayout(Axis.X, Axis.Y), "toolbar");
-        container.setLocalTranslation(0, 200, 0);
-        container.setPreferredSize(new Vector3f(app.getCamera().getWidth(), 200, 0));
-    
-        // Spielerfarbe abrufen
-        Player currentPlayer = playerHandler.getPlayerById(app.getId());
-        ColorRGBA playerColor = currentPlayer.getColor().getColor();
-    
-        // Oberer Balken
-        Container playerColorBar = new Container();
-        playerColorBar.setPreferredSize(new Vector3f(app.getCamera().getWidth(), 15, 0)); // Höhe des oberen Balkens
-        playerColorBar.setBackground(new QuadBackgroundComponent(playerColor));
-        playerColorBar.setLocalTranslation(0, 210, 3); // Position über der Toolbar
-        app.getGuiNode().attachChild(playerColorBar);
 
-        // unterer Balken
-        Container playerColorBarbot = new Container();
-        playerColorBarbot.setPreferredSize(new Vector3f(app.getCamera().getWidth(), 10, 0)); // Höhe des oberen Balkens
-        playerColorBarbot.setBackground(new QuadBackgroundComponent(playerColor));
-        playerColorBarbot.setLocalTranslation(0, 10, 3); // Position über der Toolbar
-        app.getGuiNode().attachChild(playerColorBarbot);
-    
-    
-        // Linker Balken
-        Container leftBar = new Container();
-        leftBar.setPreferredSize(new Vector3f(10, 210, 0)); // Breite 10, Höhe 210
-        leftBar.setBackground(new QuadBackgroundComponent(playerColor));
-        leftBar.setLocalTranslation(0, 200, 3); // Position am linken Rand
-        app.getGuiNode().attachChild(leftBar);
-    
-        // Rechter Balken
-        Container rightBar = new Container();
-        rightBar.setPreferredSize(new Vector3f(10, 210, 0)); // Breite 10, Höhe 210
-        rightBar.setBackground(new QuadBackgroundComponent(playerColor));
-        rightBar.setLocalTranslation(app.getCamera().getWidth() - 10, 200, 2); // Position am rechten Rand
-        app.getGuiNode().attachChild(rightBar);
-        
-        // Übersicht und Konto
-        accountContainer = container.addChild(new Container());
-        overviewContainer = container.addChild(new Container());
-        receivedEvent(new UpdatePlayerView()); // Initiale Aktualisierung
-    
-        // Würfel-Bereich
-        container.addChild(createDiceSection());
-    
-        // Aktionsmenü
-        Container menuContainer = container.addChild(new Container());
-        menuContainer.addChild(createTradeButton());
-        menuContainer.addChild(createPropertyMenuButton());
-        menuContainer.addChild(createEndTurnButton());
-        menuContainer.setBackground(createBackground());
-    
-        return container;
-    }
-    
+        // Füge Buttons zur Toolbar hinzu
+        //initializeButtons();
 
-    private Container createDiceSection() {
-        Container diceContainer = new Container(new SpringGridLayout(Axis.X, Axis.Y));
-        diceContainer.addChild(createDiceDisplay());
+
+        // Menü-Container: Ein Nested-Container für Kontostand und "Meine Gulag Frei Karten"
+        Container accountContainer = toolbarContainer.addChild(new Container());
+        accountContainer.addChild(new Label("Kontostand", new ElementId("label-Bold")));
+        accountContainer.addChild(new Label("6666€", new ElementId("label-Text"))); //TODO Variable hier einsetzen
+        accountContainer.addChild(new Label("Gulag Frei Karten", new ElementId("label-Bold")));
+        accountContainer.setBackground(new QuadBackgroundComponent(new ColorRGBA(0.4657f, 0.4735f, 0.4892f, 1.0f)));
+
+        // Add a spacer between accountContainer and overviewContainer
+        Panel spacer = new Panel(); // Create an empty panel as a spacer
+        spacer.setPreferredSize(new Vector3f(5, 0, 0)); // Adjust the width as needed
+        spacer.setBackground(null);
+        toolbarContainer.addChild(spacer);
+
+        // Menü-Container: Ein Container für Übersicht
+        Container overviewContainer = toolbarContainer.addChild(new Container());
+        overviewContainer.addChild(new Label("Übersicht", new ElementId("label-Bold")));
+        overviewContainer.addChild(new Label("„Spieler 1“: 1244€", new ElementId("label-Text")));//TODO Variable hier einsetzen
+        overviewContainer.addChild(new Label("„Spieler 2“: 1244€", new ElementId("label-Text")));//TODO Variable hier einsetzen
+        overviewContainer.addChild(new Label("„Spieler 3“: 1244€", new ElementId("label-Text")));//TODO Variable hier einsetzen
+        overviewContainer.addChild(new Label("„Spieler 4“: 1244€", new ElementId("label-Text")));//TODO Variable hier einsetzen
+        overviewContainer.addChild(new Label("„Spieler 5“: 1244€", new ElementId("label-Text")));//TODO Variable hier einsetzen
+        overviewContainer.setBackground(new QuadBackgroundComponent(new ColorRGBA(0.4657f, 0.4735f, 0.4892f, 1.0f)));
+
+        // Menü-Container: Ein Container für Würfel
+        Container diceContainer = toolbarContainer.addChild(new Container());
+
+        diceContainer.setPreferredSize(new Vector3f(400, 150, 0));
+        diceContainer.addChild(new Label("Wo Würfel?", new ElementId("label")));
+        diceContainer.addChild(addDiceRollButton());
         diceContainer.setBackground(null);
 
-        diceButton = new Button("Würfeln", new ElementId("button-toolbar"));
-        diceButton.setPreferredSize(new Vector3f(200, 50, 0));
+
+        // Menü-Container: Ein Nested-Container für Handeln, Grundstücke und Zug beenden
+        Container menuContainer = toolbarContainer.addChild(new Container());
+        menuContainer.addChild(new Button("Handeln"));
+        menuContainer.addChild(new Button("Grundstücke"));
+        menuContainer.addChild(new Button("Zug beenden"));
+        menuContainer.setBackground(new QuadBackgroundComponent(new ColorRGBA(0.4657f, 0.4735f, 0.4892f, 1.0f)));
+
+        // Füge die Toolbar zur GUI hinzu
+        app.getGuiNode().attachChild(toolbarContainer);
+
+        // Erstelle die Position-Anzeige
+        positionText = createPositionDisplay();
+        updatePositionDisplay(); // Initialisiere die Anzeige mit der Startposition
+    }
+
+    /**
+     * Initialisiert die Buttons in der Toolbar.
+     */
+    private void initializeButtons() {
+        addTradeMenuButton();  // Bewegung nach vorne
+        addEndTurnButton(); // Bewegung nach hinten
+        addDiceRollButton();       // Würfel-Button
+
+    }
+
+    /**
+     * Fügt einen Button mit einer Bewegung hinzu.
+     *
+     * @param label   Der Text des Buttons
+     * @param step    Schrittweite (+1 für vorwärts, -1 für rückwärts)
+     */
+
+    /*private void addButton(String label, int step) {
+        Button button = new Button(label);
+        button.setPreferredSize(new Vector3f(150, 50, 0)); // Größe der Buttons
+        button.addClickCommands(source -> moveCube(step));
+        toolbarContainer.addChild(button);
+    }*/
+
+    /**
+     * Fügt den Würfel-Button hinzu, der die Figur entsprechend der gewürfelten Zahl bewegt.
+     */
+    private Button addDiceRollButton() {
+        Button diceButton = new Button("Würfeln");
+        diceButton.setPreferredSize(new Vector3f(50, 20, 0));
         diceButton.addClickCommands(s -> ifTopDialog(() -> {
-            diceButton.setEnabled(false);
-            startDiceAnimation();
-            app.getGameLogic().send(new RollDice());
+            rollDice();
             app.getGameLogic().playSound(Sound.BUTTON);
         }));
-        diceContainer.addChild(diceButton);
-
-        return diceContainer;
+        toolbarContainer.addChild(diceButton);
+        return diceButton;
     }
 
-    private Container createDiceDisplay() {
-        Container horizontalContainer = new Container(new SpringGridLayout(Axis.X, Axis.Y));
-        horizontalContainer.setPreferredSize(new Vector3f(200, 150, 0));
-        horizontalContainer.setBackground(null);
-
-        imageLabel = createDiceLabel("Pictures/dice/one.png");
-        imageLabel2 = createDiceLabel("Pictures/dice/two.png");
-
-        horizontalContainer.addChild(createDiceContainer(imageLabel));
-        horizontalContainer.addChild(createDiceContainer(imageLabel2));
-
-        return horizontalContainer;
-    }
-
-    private Label createDiceLabel(String iconPath) {
-        Label label = new Label("");
-        IconComponent icon = new IconComponent(iconPath);
-        icon.setIconSize(new Vector2f(100, 100));
-        label.setIcon(icon);
-        return label;
-    }
-
-    private Container createDiceContainer(Label label) {
-        Container container = new Container();
-        container.setBackground(null);
-        container.setPreferredSize(new Vector3f(100, 150, 0));
-        container.addChild(label);
-        return container;
-    }
-
-    private Button createTradeButton() {
-        tradeButton = new Button("Handeln", new ElementId("button-toolbar"));
-        tradeButton.setPreferredSize(new Vector3f(150, 50, 0));
-        tradeButton.addClickCommands(s -> ifTopDialog(() -> {
+    private void addTradeMenuButton() {
+        Button diceButton = new Button("Handeln");
+        diceButton.setPreferredSize(new Vector3f(150, 50, 0)); // Größe des Buttons
+        diceButton.addClickCommands(s -> ifTopDialog(() -> {
+            rollDice();
             app.getGameLogic().playSound(Sound.BUTTON);
-            new ChoosePartner(app).open();
         }));
-        return tradeButton;
+        toolbarContainer.addChild(diceButton);
     }
 
-    private Button createPropertyMenuButton() {
-        propertyMenuButton = new Button("Grundstücke", new ElementId("button-toolbar"));
-        propertyMenuButton.setPreferredSize(new Vector3f(150, 50, 0));
-        propertyMenuButton.setFontSize(30);
-        propertyMenuButton.addClickCommands(s -> ifTopDialog(() -> {
+    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);
-            new PropertyOverviewMenu(app).open();
         }));
-        return propertyMenuButton;
+        toolbarContainer.addChild(diceButton);
     }
 
-    private Button createEndTurnButton() {
-        endTurnButton = new Button("Zug beenden", new ElementId("button-toolbar"));
-        endTurnButton.setFontSize(28);
-        endTurnButton.setPreferredSize(new Vector3f(150, 50, 0));
-        endTurnButton.addClickCommands(s -> ifTopDialog(() -> {
+    private void addPropertyMenuButton() {
+        Button diceButton = new Button("Zug beenden");
+        diceButton.setPreferredSize(new Vector3f(150, 50, 0)); // Größe des Buttons
+        diceButton.addClickCommands(s -> ifTopDialog(() -> {
+            rollDice();
             app.getGameLogic().playSound(Sound.BUTTON);
-            app.getGameLogic().send(new EndTurn());
-            receivedEvent(new ButtonStatusEvent(false));
         }));
-        return endTurnButton;
+        toolbarContainer.addChild(diceButton);
     }
 
-    private QuadBackgroundComponent createBackground() {
-        return new QuadBackgroundComponent(new ColorRGBA(0.4657f, 0.4735f, 0.4892f, 1.0f));
+    /**
+     * Simuliert einen Würfelwurf und bewegt die Figur entsprechend.
+     */
+    private void rollDice() {
+        int diceRoll = random.nextInt(6) + 1; // Zahl zwischen 1 und 6
+        System.out.println("Gewürfelt: " + diceRoll);
+        moveCube(diceRoll); // Bewege die Figur um die gewürfelte Zahl
     }
 
-    private void startDiceAnimation() {
-        animatingDice = true;
-        long startTime = System.currentTimeMillis();
-    
-        new Thread(() -> {
-            try {
-                animateDice(startTime);
-                animatingDice = false;
-                if (latestDiceRollEvent != null) {
-                    showFinalDiceResult(latestDiceRollEvent);
-                }
-            } catch (InterruptedException e) {
-                System.err.println("Dice animation interrupted: " + e.getMessage());
-            }
-        }).start();
+    /**
+     * Bewegt den Würfel basierend auf der aktuellen Position auf dem Brett.
+     *
+     * @param step Schrittweite (+1 für vorwärts, -1 für rückwärts oder andere Werte)
+     */
+    private void moveCube(int step) {
+        currentPosition = (currentPosition + step + 4 * positionsPerSide) % (4 * positionsPerSide);
+        Vector3f newPosition = calculatePosition(currentPosition);
+        cube.setLocalTranslation(newPosition);
+        updatePositionDisplay(); // Aktualisiere die Positionsanzeige
+        System.out.println("Würfelposition: " + newPosition + " (Feld-ID: " + currentPosition + ")");
     }
-    
-    private void animateDice(long startTime) throws InterruptedException {
-        int[] currentFace = {1};
-        while (System.currentTimeMillis() - startTime < 2000) { // Animation duration
-            currentFace[0] = (currentFace[0] % 6) + 1;
-    
-            String rotatingImage1 = diceToString(currentFace[0]);
-            String rotatingImage2 = diceToString((currentFace[0] % 6) + 1);
-    
-            app.enqueue(() -> {
-                setDiceIcon(imageLabel, rotatingImage1);
-                setDiceIcon(imageLabel2, rotatingImage2);
-            });
-    
-            Thread.sleep(100); // Time between frame updates
-        }
-    }
-    
-    private void showFinalDiceResult(DiceRollEvent event) {
-        app.enqueue(() -> {
-            setDiceIcon(imageLabel, diceToString(event.a()));
-            setDiceIcon(imageLabel2, diceToString(event.b()));
-        });
-    }
-    
-    private void setDiceIcon(Label label, String imagePath) {
-        IconComponent icon = new IconComponent(imagePath);
-        icon.setIconSize(new Vector2f(80, 80)); // Set consistent dice size
-        label.setIcon(icon);
-    }
-    
 
-    private String diceToString(int i) {
-        switch (i) {
-            case 1: return "Pictures/dice/one.png";
-            case 2: return "Pictures/dice/two.png";
-            case 3: return "Pictures/dice/three.png";
-            case 4: return "Pictures/dice/four.png";
-            case 5: return "Pictures/dice/five.png";
-            case 6: return "Pictures/dice/six.png";
-            default: throw new IllegalArgumentException("Invalid dice number: " + i);
+    /**
+     * Berechnet die neue Position des Würfels basierend auf der aktuellen Brettseite und Position.
+     *
+     * @param position Aktuelle Position auf dem Spielfeld
+     * @return Die berechnete Position als Vector3f
+     */
+    private Vector3f calculatePosition(int position) {
+        int side = position / positionsPerSide; // Seite des Bretts (0 = unten, 1 = rechts, 2 = oben, 3 = links)
+        int offset = position % positionsPerSide; // Position auf der aktuellen Seite
+
+        switch (side) {
+            case 0: // Unten (positive x-Achse)
+                return new Vector3f(-boardLimit + offset * stepSize, 0.1f, -boardLimit + 0.05f);
+            case 1: // Rechts (positive z-Achse)
+                return new Vector3f(boardLimit - 0.05f, 0.1f, -boardLimit + offset * stepSize);
+            case 2: // Oben (negative x-Achse)
+                return new Vector3f(boardLimit - offset * stepSize, 0.1f, boardLimit - 0.05f);
+            case 3: // Links (negative z-Achse)
+                return new Vector3f(-boardLimit + 0.05f, 0.1f, boardLimit - offset * stepSize);
+            default:
+                throw new IllegalArgumentException("Ungültige Position: " + position);
         }
     }
 
-    @Override
-    public void receivedEvent(DiceRollEvent event) {
-        latestDiceRollEvent = event;
+    /**
+     * Erstellt die Anzeige für die aktuelle Position.
+     *
+     * @return Das BitmapText-Objekt für die Anzeige
+     */
+    private BitmapText createPositionDisplay() {
+        BitmapText text = new BitmapText(app.getAssetManager().loadFont("Interface/Fonts/Default.fnt"), false);
+        text.setSize(20); // Schriftgröße
+        text.setLocalTranslation(10, app.getCamera().getHeight() - 10, 0); // Oben links
+        app.getGuiNode().attachChild(text);
+        return text;
     }
 
-    @Override
-    public void receivedEvent(UpdatePlayerView event) {
-        playerHandler = app.getGameLogic().getPlayerHandler();
-        System.out.println("Update Player View");
-        accountContainer.clearChildren();
-        overviewContainer.clearChildren();
-
-        accountContainer.addChild(new Label("Kontostand", new ElementId("label-toolbar")));
-        accountContainer.addChild(new Label(
-                playerHandler.getPlayerById(app.getId()).getAccountBalance() + " EUR",
-                new ElementId("label-account")
-        ));
-        accountContainer.addChild(new Label("Gulag Karten", new ElementId("label-toolbar")));
-        accountContainer.addChild(new Label(
-                playerHandler.getPlayerById(app.getId()).getNumJailCard() + "",
-                new ElementId("label-account")
-        ));
-        accountContainer.setBackground(null);
-
-        overviewContainer.addChild(new Label("Übersicht", new ElementId("label-toolbar")));
-        for (Player player : playerHandler.getPlayers()) {
-            if (player.getId() != app.getId()) {
-                // Spielerfarbe abrufen
-                ColorRGBA playerColor = (player.getColor().getColor());
-            
-                // Label für den Spieler erstellen
-                Label playerLabel = new Label(
-                    player.getName() + ": " + player.getAccountBalance() + " EUR",
-                    new ElementId("label-Text")
-                );
-            
-                // Farbe setzen
-                playerLabel.setColor(playerColor);
-            
-                // Label zum Container hinzufügen
-                overviewContainer.addChild(playerLabel);
-            }
-        }
-        overviewContainer.setBackground(null);
+    /**
+     * Aktualisiert die Anzeige für die aktuelle Position.
+     */
+    private void updatePositionDisplay() {
+        positionText.setText("Feld-ID: " + currentPosition);
     }
 
-    @Override
-    public void receivedEvent(ButtonStatusEvent event) {
-        boolean enabled = event.buttonsEnabled();
-        diceButton.setEnabled(enabled);
-        tradeButton.setEnabled(enabled);
-        propertyMenuButton.setEnabled(enabled);
-        endTurnButton.setEnabled(enabled);
-    }
-
-    @Override
-    public void close() {
+    /**
+     * Entfernt die Toolbar.
+     */
+    public void remove() {
         app.getGuiNode().detachChild(toolbarContainer);
-        super.close();
-    }
-
-    @Override
-    public void escape() {
-        new SettingsMenu(app).open();
-    }
-
-    @Override
-    public void update() {
-        receivedEvent(new UpdatePlayerView());
-        super.update();
+        app.getGuiNode().detachChild(positionText);
     }
 }

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

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

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

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

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

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

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

@@ -1,120 +0,0 @@
-package pp.monopoly.client.gui.popups;
-
-import com.jme3.material.Material;
-import com.jme3.material.RenderState.BlendMode;
-import com.jme3.math.ColorRGBA;
-import com.jme3.math.Vector3f;
-import com.jme3.scene.Geometry;
-import com.jme3.scene.shape.Quad;
-import com.simsilica.lemur.Button;
-import com.simsilica.lemur.Container;
-import com.simsilica.lemur.Label;
-import com.simsilica.lemur.component.QuadBackgroundComponent;
-import com.simsilica.lemur.style.ElementId;
-import pp.dialog.Dialog;
-import pp.monopoly.client.MonopolyApp;
-
-/**
- * Bankrupt is a Warning-Popup which appears when the balance is negative at the end of a player´s turn
- */
-public class AcceptTrade extends Dialog {
-    private final MonopolyApp app;
-    private final Geometry overlayBackground;
-    private final Container noMoneyWarningContainer;
-    private final Container backgroundContainer;
-
-
-
-    public AcceptTrade(MonopolyApp app) {
-        super(app.getDialogManager());
-        this.app = app;
-
-
-        // Halbtransparentes Overlay hinzufügen
-        overlayBackground = createOverlayBackground();
-        app.getGuiNode().attachChild(overlayBackground);
-
-        // Create the background container
-        backgroundContainer = new Container();
-        backgroundContainer.setBackground(new QuadBackgroundComponent(new ColorRGBA(0.8657f, 0.8735f, 0.8892f, 1.0f))); // Darker background
-        app.getGuiNode().attachChild(backgroundContainer);
-
-
-        // Hauptcontainer für die Warnung
-        noMoneyWarningContainer = new Container();
-        noMoneyWarningContainer.setBackground(new QuadBackgroundComponent(new ColorRGBA(0.8657f, 0.8735f, 0.8892f, 1.0f)));
-        noMoneyWarningContainer.setPreferredSize(new Vector3f(550,250,10));
-
-        float padding = 10; // Passt den backgroundContainer an die Größe des bankruptContainers an
-        backgroundContainer.setPreferredSize(noMoneyWarningContainer.getPreferredSize().addLocal(padding, padding, 0));
-
-        // Titel
-        Label gateFieldTitle = noMoneyWarningContainer.addChild(new Label("Handel angenommen!", new ElementId("warning-title")));
-        gateFieldTitle.setFontSize(48);
-        gateFieldTitle.setColor(ColorRGBA.Black);
-
-        // Text, der im Popup steht
-        Container textContainer = noMoneyWarningContainer.addChild(new Container());
-        textContainer.addChild(new Label("Du hast Spieler XXX einen Handel vorgeschlagen", new ElementId("label-Text")));
-        textContainer.addChild(new Label("", new ElementId("label-Text")));
-        textContainer.addChild(new Label("Der Handel wurde angenommen", new ElementId("label-Text")));
-        textContainer.setBackground(new QuadBackgroundComponent(new ColorRGBA(0.4657f, 0.4735f, 0.4892f, 1.0f)));
-
-        // Passt den textContainer an die Größe des bankruptContainers an
-        textContainer.setPreferredSize(noMoneyWarningContainer.getPreferredSize().addLocal(-250,-200,0));
-
-        // Beenden-Button
-        Button quitButton = noMoneyWarningContainer.addChild(new Button("Bestätigen", new ElementId("button")));
-        quitButton.setFontSize(32);
-        quitButton.addClickCommands(source -> close());
-
-
-        // Zentriere das Popup
-        noMoneyWarningContainer.setLocalTranslation(
-            (app.getCamera().getWidth() - noMoneyWarningContainer.getPreferredSize().x) / 2,
-            (app.getCamera().getHeight() + noMoneyWarningContainer.getPreferredSize().y) / 2,
-            8
-        );
-
-        // Zentriere das Popup
-        backgroundContainer.setLocalTranslation(
-                (app.getCamera().getWidth() - noMoneyWarningContainer.getPreferredSize().x - padding) / 2,
-                (app.getCamera().getHeight() + noMoneyWarningContainer.getPreferredSize().y+ padding) / 2,
-                7
-        );
-
-        app.getGuiNode().attachChild(noMoneyWarningContainer);
-    }
-
-    /**
-     * Erstellt einen halbtransparenten Hintergrund für das Menü.
-     *
-     * @return Geometrie des Overlays
-     */
-    private Geometry createOverlayBackground() {
-        Quad quad = new Quad(app.getCamera().getWidth(), app.getCamera().getHeight());
-        Geometry overlay = new Geometry("Overlay", quad);
-        Material material = new Material(app.getAssetManager(), "Common/MatDefs/Misc/Unshaded.j3md");
-        material.setColor("Color", new ColorRGBA(0, 0, 0, 0.5f)); // Halbtransparent
-        material.getAdditionalRenderState().setBlendMode(BlendMode.Alpha);
-        overlay.setMaterial(material);
-        overlay.setLocalTranslation(0, 0, 0);
-        return overlay;
-    }
-
-    /**
-     * Closes the menu and removes the GUI elements.
-     */
-    @Override
-    public void close() {
-        app.getGuiNode().detachChild(noMoneyWarningContainer);  // Entferne das Menü
-        app.getGuiNode().detachChild(backgroundContainer); //Entfernt Rand
-        app.getGuiNode().detachChild(overlayBackground);  // Entferne das Overlay
-        super.close();
-    }
-
-    @Override
-    public void escape() {
-        close();
-    }
-}

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

@@ -1,118 +0,0 @@
-package pp.monopoly.client.gui.popups;
-
-import com.jme3.material.Material;
-import com.jme3.material.RenderState.BlendMode;
-import com.jme3.math.ColorRGBA;
-import com.jme3.math.Vector3f;
-import com.jme3.scene.Geometry;
-import com.jme3.scene.shape.Quad;
-import com.simsilica.lemur.Button;
-import com.simsilica.lemur.Container;
-import com.simsilica.lemur.Label;
-import com.simsilica.lemur.component.QuadBackgroundComponent;
-import com.simsilica.lemur.style.ElementId;
-import pp.dialog.Dialog;
-import pp.monopoly.client.MonopolyApp;
-
-/**
- * Bankrupt is a Warning-Popup which appears when the balance is negative at the end of a player´s turn
- */
-public class Bankrupt extends Dialog {
-    private final MonopolyApp app;
-    private final Geometry overlayBackground;
-    private final Container bankruptContainer;
-    private final Container backgroundContainer;
-
-
-
-    public Bankrupt(MonopolyApp app) {
-        super(app.getDialogManager());
-        this.app = app;
-
-
-        // Halbtransparentes Overlay hinzufügen
-        overlayBackground = createOverlayBackground();
-        app.getGuiNode().attachChild(overlayBackground);
-
-        // Create the background container
-        backgroundContainer = new Container();
-        backgroundContainer.setBackground(new QuadBackgroundComponent(new ColorRGBA(0.8657f, 0.8735f, 0.8892f, 1.0f))); // Darker background
-        app.getGuiNode().attachChild(backgroundContainer);
-
-
-        // Hauptcontainer für die Warnung
-        bankruptContainer = new Container();
-        bankruptContainer.setBackground(new QuadBackgroundComponent(new ColorRGBA(0.8657f, 0.8735f, 0.8892f, 1.0f)));
-        bankruptContainer.setPreferredSize(new Vector3f(550,250,10));
-
-        float padding = 10; // Passt den backgroundContainer an die Größe des bankruptContainers an
-        backgroundContainer.setPreferredSize(bankruptContainer.getPreferredSize().addLocal(padding, padding, 0));
-
-        // Titel
-        Label gateFieldTitle = bankruptContainer.addChild(new Label("Vorsicht !", new ElementId("warning-title")));
-        gateFieldTitle.setFontSize(48);
-        gateFieldTitle.setColor(ColorRGBA.Black);
-
-        // Text, der im Popup steht
-        Container textContainer = bankruptContainer.addChild(new Container());
-        textContainer.addChild(new Label("Du hast noch einen negativen Kontostand. Wenn du jetzt deinen Zug beendest, gehst du Bankrott und verlierst das Spiel!", new ElementId("label-Text")));
-        textContainer.setBackground(new QuadBackgroundComponent(new ColorRGBA(0.4657f, 0.4735f, 0.4892f, 1.0f)));
-
-        // Passt den textContainer an die Größe des bankruptContainers an
-        textContainer.setPreferredSize(bankruptContainer.getPreferredSize().addLocal(-250,-200,0));
-
-        // Beenden-Button
-        Button quitButton = bankruptContainer.addChild(new Button("Bestätigen", new ElementId("button")));
-        quitButton.setFontSize(32);
-        quitButton.addClickCommands(source -> close());
-
-
-        // Zentriere das Popup
-        bankruptContainer.setLocalTranslation(
-            (app.getCamera().getWidth() - bankruptContainer.getPreferredSize().x) / 2,
-            (app.getCamera().getHeight() + bankruptContainer.getPreferredSize().y) / 2,
-            8
-        );
-
-        // Zentriere das Popup
-        backgroundContainer.setLocalTranslation(
-                (app.getCamera().getWidth() - bankruptContainer.getPreferredSize().x - padding) / 2,
-                (app.getCamera().getHeight() + bankruptContainer.getPreferredSize().y+ padding) / 2,
-                7
-        );
-
-        app.getGuiNode().attachChild(bankruptContainer);
-    }
-
-    /**
-     * Erstellt einen halbtransparenten Hintergrund für das Menü.
-     *
-     * @return Geometrie des Overlays
-     */
-    private Geometry createOverlayBackground() {
-        Quad quad = new Quad(app.getCamera().getWidth(), app.getCamera().getHeight());
-        Geometry overlay = new Geometry("Overlay", quad);
-        Material material = new Material(app.getAssetManager(), "Common/MatDefs/Misc/Unshaded.j3md");
-        material.setColor("Color", new ColorRGBA(0, 0, 0, 0.5f)); // Halbtransparent
-        material.getAdditionalRenderState().setBlendMode(BlendMode.Alpha);
-        overlay.setMaterial(material);
-        overlay.setLocalTranslation(0, 0, 0);
-        return overlay;
-    }
-
-    /**
-     * Closes the menu and removes the GUI elements.
-     */
-    @Override
-    public void close() {
-        app.getGuiNode().detachChild(bankruptContainer);  // Entferne das Menü
-        app.getGuiNode().detachChild(backgroundContainer); //Entfernt Rand
-        app.getGuiNode().detachChild(overlayBackground);  // Entferne das Overlay
-        super.close();
-    }
-
-    @Override
-    public void escape() {
-        close();
-    }
-}

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

@@ -12,11 +12,11 @@ import com.simsilica.lemur.style.ElementId;
 
 import pp.dialog.Dialog;
 import pp.monopoly.client.MonopolyApp;
-import pp.monopoly.client.gui.SettingsMenu;
 import pp.monopoly.model.fields.BuildingProperty;
 
 /**
- * BuildingPropertyCard creates the popup for field information
+ * TODO Kommentare fixen
+ * SettingsMenu ist ein Overlay-Menü, das durch ESC aufgerufen werden kann.
  */
 public class BuildingPropertyCard extends Dialog {
     private final MonopolyApp app;
@@ -45,9 +45,6 @@ public class BuildingPropertyCard extends Dialog {
         buildingPropertyContainer = new Container();
         buildingPropertyContainer.setBackground(new QuadBackgroundComponent(field.getColor().getColor()));
 
-        float padding = 10; // Passt den backgroundContainer an die Größe des buildingPropertyContainer an
-        backgroundContainer.setPreferredSize(buildingPropertyContainer.getPreferredSize().addLocal(padding, padding, 0));
-
 
         Label settingsTitle = buildingPropertyContainer.addChild(new Label( field.getName(), new ElementId("settings-title")));
         settingsTitle.setFontSize(48);
@@ -68,14 +65,28 @@ public class BuildingPropertyCard 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)));
 
-        // Zentriere das Popup
+        //TODO eventuell diese Stelle löschen, da nur die BuyCard Kaufen und beenden hat
+
+        /*
+        // Beenden-Button
+        Button quitButton = foodFieldContainer.addChild(new Button("Beenden", new ElementId("button")));
+        quitButton.setFontSize(32);
+        // Kaufen-Button
+        Button buyButton = foodFieldContainer.addChild(new Button("Kaufen", new ElementId("button")));
+        buyButton.setFontSize(32);
+         */
+
+        float padding = 10; // Padding around the settingsContainer for the background
+        backgroundContainer.setPreferredSize(buildingPropertyContainer.getPreferredSize().addLocal(padding, padding, 0));
+
+
+        // Zentriere das Menü
         buildingPropertyContainer.setLocalTranslation(
             (app.getCamera().getWidth() - buildingPropertyContainer.getPreferredSize().x) / 2,
             (app.getCamera().getHeight() + buildingPropertyContainer.getPreferredSize().y) / 2,
             8
         );
 
-        // Zentriere das Popup
         backgroundContainer.setLocalTranslation(
                 (app.getCamera().getWidth() - buildingPropertyContainer.getPreferredSize().x - padding) / 2,
                 (app.getCamera().getHeight() + buildingPropertyContainer.getPreferredSize().y+ padding) / 2,
@@ -106,18 +117,17 @@ public class BuildingPropertyCard extends Dialog {
      */
     @Override
     public void close() {
+        System.out.println("Schließe SettingsMenu..."); // Debugging-Ausgabe
         app.getGuiNode().detachChild(buildingPropertyContainer);  // Entferne das Menü
         app.getGuiNode().detachChild(backgroundContainer); //Entfernt Rand
         app.getGuiNode().detachChild(overlayBackground);  // Entferne das Overlay
-        super.close();
+        app.setSettingsMenuOpen(false);                  // Menü als geschlossen markieren TODO passt diese Variable noch (zu finden unter den Temps in MonopolyApp
+        app.unblockInputs();                             // Eingaben wieder aktivieren
+        System.out.println("SettingsMenu geschlossen."); // Debugging-Ausgabe
     }
     
     public void setIndex(int index) {
         this.index = index;
     }
 
-    @Override
-    public void escape() {
-        new SettingsMenu(app).open();
-    }
 }

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

@@ -1,6 +1,10 @@
 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;
@@ -8,47 +12,44 @@ import com.simsilica.lemur.component.QuadBackgroundComponent;
 import com.simsilica.lemur.style.ElementId;
 import pp.dialog.Dialog;
 import pp.monopoly.client.MonopolyApp;
-import pp.monopoly.client.gui.SettingsMenu;
-import pp.monopoly.message.client.BuyPropertyResponse;
-import pp.monopoly.model.fields.BoardManager;
 import pp.monopoly.model.fields.BuildingProperty;
-import pp.monopoly.notification.Sound;
 
 /**
- * BuyCard is a popup that appears when a player lands on a field that is still available for purchase.
+ * 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 corresponding field
-        int index = app.getGameLogic().getPlayerHandler().getPlayerById(app.getId()).getFieldID();
-        BuildingProperty field = (BuildingProperty) new BoardManager().getFieldAtIndex(index);
+
+        //Generate the corresponfing field
+        BuildingProperty field = (BuildingProperty) app.getBoardManager().getFieldAtIndex(index);
+
+        // Halbtransparentes Overlay hinzufügen
+        overlayBackground = createOverlayBackground();
+        app.getGuiNode().attachChild(overlayBackground);
 
         // Create the background container
         backgroundContainer = new Container();
         backgroundContainer.setBackground(new QuadBackgroundComponent(new ColorRGBA(0.8657f, 0.8735f, 0.8892f, 1.0f))); // Darker background
-        attachChild(backgroundContainer);
+        app.getGuiNode().attachChild(backgroundContainer);
 
         // Hauptcontainer für die Gebäudekarte
         buyCardContainer = new Container();
-        buyCardContainer.setBackground(new QuadBackgroundComponent(field.getColor().getColor())); // Ändert den Rahmen und die Hintergrundfarbe der Karten
+        buyCardContainer.setBackground(new QuadBackgroundComponent(field.getColor().getColor()));
 
-        float padding = 10; // Passt den backgroundContainer an die Größe des buyCardContainers an
-        backgroundContainer.setPreferredSize(buyCardContainer.getPreferredSize().addLocal(padding, padding, 0));
-        
-        // Titel
-        Label title = buyCardContainer.addChild(new Label( field.getName(), new ElementId("label-Bold")));
-        title.setBackground(new QuadBackgroundComponent(field.getColor().getColor()));
-        title.setFontSize(48);
 
-        // Text, der auf dem Popup steht
+        Label settingsTitle = buyCardContainer.addChild(new Label( field.getName(), new ElementId("settings-title")));
+        settingsTitle.setFontSize(48);
+
+        // Text, der auf der Karte steht
         // Die Preise werden dynamisch dem BoardManager entnommen
         Container propertyValuesContainer = buyCardContainer.addChild(new Container());
         propertyValuesContainer.addChild(new Label("„Grundstückswert: " + field.getPrice() + " EUR", new ElementId("label-Text")));
@@ -67,49 +68,57 @@ public class BuyCard extends Dialog {
         // Beenden-Button
         Button quitButton = buyCardContainer.addChild(new Button("Beenden", new ElementId("button")));
         quitButton.setFontSize(32);
-        quitButton.addClickCommands(s -> ifTopDialog(() -> {
-            System.err.println("Button does something?");
-            app.getGameLogic().playSound(Sound.BUTTON);
-            close();
-        }));
         // Kaufen-Button
         Button buyButton = buyCardContainer.addChild(new Button("Kaufen", new ElementId("button")));
         buyButton.setFontSize(32);
-        buyButton.addClickCommands(s -> ifTopDialog( () -> {
-            app.getGameLogic().playSound(Sound.BUTTON);
-            close();
-            app.getGameLogic().send(new BuyPropertyResponse());
-        }));
 
-        // Zentriere das Popup
+        float padding = 10; // Padding around the settingsContainer for the background
+        backgroundContainer.setPreferredSize(buyCardContainer.getPreferredSize().addLocal(padding, padding, 0));
+
+
+        // Zentriere das Menü
         buyCardContainer.setLocalTranslation(
             (app.getCamera().getWidth() - buyCardContainer.getPreferredSize().x) / 2,
             (app.getCamera().getHeight() + buyCardContainer.getPreferredSize().y) / 2,
-            10
+            8
         );
 
-        // Zentriere das Popup
         backgroundContainer.setLocalTranslation(
                 (app.getCamera().getWidth() - buyCardContainer.getPreferredSize().x - padding) / 2,
                 (app.getCamera().getHeight() + buyCardContainer.getPreferredSize().y+ padding) / 2,
-                9
+                7
         );
 
         app.getGuiNode().attachChild(buyCardContainer);
     }
 
+    /**
+     * Erstellt einen halbtransparenten Hintergrund für das Menü.
+     *
+     * @return Geometrie des Overlays
+     */
+    private Geometry createOverlayBackground() {
+        Quad quad = new Quad(app.getCamera().getWidth(), app.getCamera().getHeight());
+        Geometry overlay = new Geometry("Overlay", quad);
+        Material material = new Material(app.getAssetManager(), "Common/MatDefs/Misc/Unshaded.j3md");
+        material.setColor("Color", new ColorRGBA(0, 0, 0, 0.5f)); // Halbtransparent
+        material.getAdditionalRenderState().setBlendMode(BlendMode.Alpha);
+        overlay.setMaterial(material);
+        overlay.setLocalTranslation(0, 0, 0);
+        return overlay;
+    }
+
     /**
      * Schließt das Menü und entfernt die GUI-Elemente.
      */
     @Override
     public void close() {
+        System.out.println("Schließe SettingsMenu..."); // Debugging-Ausgabe
         app.getGuiNode().detachChild(buyCardContainer);  // Entferne das Menü
         app.getGuiNode().detachChild(backgroundContainer); //Entfernt Rand
-        super.close();
-    }
-
-    @Override
-    public void escape() {
-        new SettingsMenu(app).open();
+        app.getGuiNode().detachChild(overlayBackground);  // Entferne das Overlay
+        app.setSettingsMenuOpen(false);                  // Menü als geschlossen markieren TODO passt diese Variable noch (zu finden unter den Temps in MonopolyApp
+        app.unblockInputs();                             // Eingaben wieder aktivieren
+        System.out.println("SettingsMenu geschlossen."); // Debugging-Ausgabe
     }
 }

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

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

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

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

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

@@ -3,7 +3,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.math.Vector3f;
 import com.jme3.scene.Geometry;
 import com.jme3.scene.shape.Quad;
 import com.simsilica.lemur.Button;
@@ -14,21 +13,23 @@ import com.simsilica.lemur.style.ElementId;
 import pp.dialog.Dialog;
 import pp.monopoly.client.MonopolyApp;
 
+import pp.monopoly.model.card.Card; // TODO für den Import der Queue notwendig
 /**
- * EventCardPopup is a popup which appears when a certain EventCard is triggered by entering a EventCardField
+ * SettingsMenu ist ein Overlay-Menü, das durch ESC aufgerufen werden kann.
  */
-public class EventCardPopup extends Dialog {
+public class EventCard extends Dialog {
     private final MonopolyApp app;
     private final Geometry overlayBackground;
     private final Container eventCardContainer;
     private final Container backgroundContainer;
-    private final String description;
 
 
-    public EventCardPopup(MonopolyApp app, String description) {
+    public EventCard(MonopolyApp app) {
         super(app.getDialogManager());
         this.app = app;
-        this.description = description;
+
+        //Generate the corresponfing field
+        Card card = app.getDeckHelper().drawCard(); // TODO nimmt die Karten gerade unabhängig aus dem DeckHelper
 
         // Halbtransparentes Overlay hinzufügen
         overlayBackground = createOverlayBackground();
@@ -39,39 +40,43 @@ public class EventCardPopup extends Dialog {
         backgroundContainer.setBackground(new QuadBackgroundComponent(new ColorRGBA(0.8657f, 0.8735f, 0.8892f, 1.0f))); // Darker background
         app.getGuiNode().attachChild(backgroundContainer);
 
-        // Hauptcontainer für die Eventcard
+        // Hauptcontainer für die Gebäudekarte
         eventCardContainer = new Container();
         eventCardContainer.setBackground(new QuadBackgroundComponent(new ColorRGBA(0.8657f, 0.8735f, 0.8892f, 1.0f)));
-        eventCardContainer.setPreferredSize(new Vector3f(550,400,10));
-
-        float padding = 10; // Passt den backgroundContainer an die Größe des eventCardContainers an
-        backgroundContainer.setPreferredSize(eventCardContainer.getPreferredSize().addLocal(padding, padding, 0));
 
         // Titel
+        // Die Namen werden dynamisch dem BoardManager entnommen
         Label gateFieldTitle = eventCardContainer.addChild(new Label("Ereigniskarte", new ElementId("settings-title")));
         gateFieldTitle.setFontSize(48);
         gateFieldTitle.setColor(ColorRGBA.Black);
 
         // Text, der auf der Karte steht
-        // Die Erklärungsfelder werden automatisch den descriptions der Message entnommen
+        // Die Preise werden dynamisch dem BoardManager entnommen
         Container propertyValuesContainer = eventCardContainer.addChild(new Container());
-        propertyValuesContainer.addChild(new Label(description, new ElementId("label-Text")));
+        propertyValuesContainer.addChild(new Label(card.getDescription(), new ElementId("label-Text")));
         propertyValuesContainer.setBackground(new QuadBackgroundComponent(new ColorRGBA(0.4657f, 0.4735f, 0.4892f, 1.0f)));
-        propertyValuesContainer.setPreferredSize(new Vector3f(300,200,10));
 
         // Beenden-Button
         Button quitButton = eventCardContainer.addChild(new Button("Jawohl", new ElementId("button")));
         quitButton.setFontSize(32);
         quitButton.addClickCommands(source -> close());
 
-        // Zentriere das Popup
+
+        // TODO Kaufen-Button wird nicht mehr benötigt, prüfen ob weg kann
+        //Button buyButton = buyCardContainer.addChild(new Button("Kaufen", new ElementId("button")));
+        //buyButton.setFontSize(32);
+
+        float padding = 10; // Padding around the settingsContainer for the background
+        backgroundContainer.setPreferredSize(eventCardContainer.getPreferredSize().addLocal(padding, padding, 0));
+
+
+        // Zentriere das Menü
         eventCardContainer.setLocalTranslation(
             (app.getCamera().getWidth() - eventCardContainer.getPreferredSize().x) / 2,
             (app.getCamera().getHeight() + eventCardContainer.getPreferredSize().y) / 2,
             8
         );
 
-        // Zentriere das Popup
         backgroundContainer.setLocalTranslation(
                 (app.getCamera().getWidth() - eventCardContainer.getPreferredSize().x - padding) / 2,
                 (app.getCamera().getHeight() + eventCardContainer.getPreferredSize().y+ padding) / 2,
@@ -102,14 +107,12 @@ public class EventCardPopup extends Dialog {
      */
     @Override
     public void close() {
+        System.out.println("Schließe SettingsMenu..."); // Debugging-Ausgabe
         app.getGuiNode().detachChild(eventCardContainer);  // Entferne das Menü
         app.getGuiNode().detachChild(backgroundContainer); //Entfernt Rand
         app.getGuiNode().detachChild(overlayBackground);  // Entferne das Overlay
-        super.close();
-    }
-
-    @Override
-    public void escape() {
-        close();
+        app.setBuyCardPopupOpen(false);                  // Menü als geschlossen markieren TODO passt diese Variable noch (zu finden unter den Temps in MonopolyApp
+        app.unblockInputs();                             // Eingaben wieder aktivieren
+        System.out.println("SettingsMenu geschlossen."); // Debugging-Ausgabe
     }
 }

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

@@ -5,7 +5,6 @@ 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,26 +12,23 @@ import com.simsilica.lemur.style.ElementId;
 
 import pp.dialog.Dialog;
 import pp.monopoly.client.MonopolyApp;
-import pp.monopoly.client.gui.SettingsMenu;
-import pp.monopoly.message.client.BuyPropertyResponse;
 import pp.monopoly.model.fields.FoodField;
-import pp.monopoly.notification.Sound;
 
 /**
- * FoodFieldCard creates the popup for field information
+ * FoodFieldCard erstellt die Geböudekarte vom Brandl und der Truppenküche
  */
 public class FoodFieldCard extends Dialog {
     private final MonopolyApp app;
     private final Geometry overlayBackground;
     private final Container foodFieldContainer;
     private final Container backgroundContainer;
+    private int index = 12;
 
     public FoodFieldCard(MonopolyApp app) {
         super(app.getDialogManager());
         this.app = app;
 
         //Generate the corresponfing field
-        int index = app.getGameLogic().getPlayerHandler().getPlayerById(app.getId()).getFieldID();
         FoodField field = (FoodField) app.getGameLogic().getBoardManager().getFieldAtIndex(index);
 
         // Halbtransparentes Overlay hinzufügen
@@ -48,13 +44,11 @@ public class FoodFieldCard extends Dialog {
         foodFieldContainer = new Container();
         foodFieldContainer.setBackground(new QuadBackgroundComponent(new ColorRGBA(0.1f, 0.1f, 0.1f, 0.9f)));
 
-        float padding = 10; // Passt den backgroundContainer an die Größe des foodFieldContainers an
-        backgroundContainer.setPreferredSize(foodFieldContainer.getPreferredSize().addLocal(padding, padding, 0));
+
 
         // Titel, bestehend aus dynamischen Namen anhand der ID und der Schriftfarbe/größe
         Label settingsTitle = foodFieldContainer.addChild(new Label(field.getName(), new ElementId("settings-title")));
         settingsTitle.setFontSize(48);
-        settingsTitle.setColor(ColorRGBA.White);
 
         // Text, der auf der Karte steht
         Container propertyValuesContainer = foodFieldContainer.addChild(new Container());
@@ -73,30 +67,29 @@ 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 BuyPropertyResponse());
-            close();
-        }));
+         */
 
-        // Zentriere das Popup
+        float padding = 10; // Padding around the settingsContainer for the background
+        backgroundContainer.setPreferredSize(foodFieldContainer.getPreferredSize().addLocal(padding, padding, 0));
+
+
+        // Zentriere das Menü
         foodFieldContainer.setLocalTranslation(
             (app.getCamera().getWidth() - foodFieldContainer.getPreferredSize().x) / 2,
             (app.getCamera().getHeight() + foodFieldContainer.getPreferredSize().y) / 2,
             8
         );
 
-        // Zentriere das Popup
         backgroundContainer.setLocalTranslation(
                 (app.getCamera().getWidth() - foodFieldContainer.getPreferredSize().x - padding) / 2,
                 (app.getCamera().getHeight() + foodFieldContainer.getPreferredSize().y+ padding) / 2,
@@ -127,15 +120,17 @@ public class FoodFieldCard extends Dialog {
      */
     @Override
     public void close() {
+        System.out.println("Schließe SettingsMenu..."); // Debugging-Ausgabe
         app.getGuiNode().detachChild(foodFieldContainer);  // Entferne das Menü
         app.getGuiNode().detachChild(backgroundContainer); //Entfernt Rand
         app.getGuiNode().detachChild(overlayBackground);  // Entferne das Overlay
-        super.close();
+        app.setSettingsMenuOpen(false);                  // Menü als geschlossen markieren TODO passt diese Variable noch (zu finden unter den Temps in MonopolyApp
+        app.unblockInputs();                             // Eingaben wieder aktivieren
+        System.out.println("SettingsMenu geschlossen."); // Debugging-Ausgabe
     }
 
-    @Override
-    public void escape() {
-        new SettingsMenu(app).open();
+    public void setIndex(int index) {
+        this.index = index;
     }
 
 }

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

@@ -5,33 +5,29 @@ import com.jme3.material.RenderState.BlendMode;
 import com.jme3.math.ColorRGBA;
 import com.jme3.scene.Geometry;
 import com.jme3.scene.shape.Quad;
-import com.simsilica.lemur.Button;
 import com.simsilica.lemur.Container;
 import com.simsilica.lemur.Label;
 import com.simsilica.lemur.component.QuadBackgroundComponent;
 import com.simsilica.lemur.style.ElementId;
 import pp.dialog.Dialog;
 import pp.monopoly.client.MonopolyApp;
-import pp.monopoly.client.gui.SettingsMenu;
-import pp.monopoly.message.client.BuyPropertyResponse;
 import pp.monopoly.model.fields.GateField;
-import pp.monopoly.notification.Sound;
 
 /**
- * GateFieldCard creates the popup for field information
+ * SettingsMenu ist ein Overlay-Menü, das durch ESC aufgerufen werden kann.
  */
 public class GateFieldCard extends Dialog {
     private final MonopolyApp app;
     private final Geometry overlayBackground;
     private final Container gateFieldContainer;
     private final Container backgroundContainer;
+    private int index = 5;
 
     public GateFieldCard(MonopolyApp app) {
         super(app.getDialogManager());
         this.app = app;
 
         //Generate the corresponfing field
-        int index = app.getGameLogic().getPlayerHandler().getPlayerById(app.getId()).getFieldID();
         GateField field = (GateField) app.getGameLogic().getBoardManager().getFieldAtIndex(index);
 
         // Halbtransparentes Overlay hinzufügen
@@ -47,54 +43,47 @@ public class GateFieldCard extends Dialog {
         gateFieldContainer = new Container();
         gateFieldContainer.setBackground(new QuadBackgroundComponent(new ColorRGBA(0.8657f, 0.8735f, 0.8892f, 1.0f)));
 
-        float padding = 10; // Passt den backgroundContainer an die Größe des gateFieldContainers an
-        backgroundContainer.setPreferredSize(gateFieldContainer.getPreferredSize().addLocal(padding, padding, 0));
-
-        // Titel, bestehend aus dynamischen Namen anhand der ID und der Schriftfarbe/größe
+        // Titel
+        // Die Namen werden dynamisch dem BoardManager entnommen
         Label gateFieldTitle = gateFieldContainer.addChild(new Label(field.getName(), new ElementId("settings-title")));
         gateFieldTitle.setFontSize(48);
-        gateFieldTitle.setColor(ColorRGBA.White);
+        gateFieldTitle.setColor(ColorRGBA.Black);
 
         // Text, der auf der Karte steht
         // Die Preise werden dynamisch dem BoardManager entnommen
         Container propertyValuesContainer = gateFieldContainer.addChild(new Container());
         propertyValuesContainer.addChild(new Label("„Preis: " + field.getPrice() + " EUR", new ElementId("label-Text")));
         propertyValuesContainer.addChild(new Label("", new ElementId("label-Text")));
-        propertyValuesContainer.addChild(new Label("Miete: 250 EUR", new ElementId("label-Text")));
-        propertyValuesContainer.addChild(new Label("Wenn man", new ElementId("label-Text")));
-        propertyValuesContainer.addChild(new Label("2 Bahnhof besitzt: 500 EUR", new ElementId("label-Text")));
-        propertyValuesContainer.addChild(new Label("Wenn man", new ElementId("label-Text")));
-        propertyValuesContainer.addChild(new Label("3 Bahnhof besitzt: 1000 EUR", new ElementId("label-Text")));
-        propertyValuesContainer.addChild(new Label("Wenn man", new ElementId("label-Text")));
-        propertyValuesContainer.addChild(new Label("4 Bahnhof besitzt: 2000 EUR", new ElementId("label-Text")));
+        propertyValuesContainer.addChild(new Label("Wenn man 1 Bahnhof besitzt: 250 EUR", new ElementId("label-Text")));
+        propertyValuesContainer.addChild(new Label("Wenn man 2 Bahnhöfe besitzt: 500 EUR", new ElementId("label-Text")));
+        propertyValuesContainer.addChild(new Label("Wenn man 3 Bahnhöfe besitzt: 1000 EUR", new ElementId("label-Text")));
+        propertyValuesContainer.addChild(new Label("Wenn man 4 Bahnhöfe besitzt: 2000 EUR", new ElementId("label-Text")));
         propertyValuesContainer.addChild(new Label("", new ElementId("label-Text")));
         propertyValuesContainer.addChild(new Label("„Hypothek: " + field.getHypo() + " EUR", new ElementId("label-Text")));
         propertyValuesContainer.setBackground(new QuadBackgroundComponent(new ColorRGBA(0.4657f, 0.4735f, 0.4892f, 1.0f)));
 
-        // Beenden-Button
-        Button quitButton = gateFieldContainer.addChild(new Button("Beenden", new ElementId("button")));
-        quitButton.setFontSize(32);
-        quitButton.addClickCommands(s -> ifTopDialog(() -> {
-            app.getGameLogic().playSound(Sound.BUTTON);
-            close();
-        }));
-        // Kaufen-Button
-        Button buyButton = gateFieldContainer.addChild(new Button("Kaufen", new ElementId("button")));
-        buyButton.setFontSize(32);
-        buyButton.addClickCommands(s -> ifTopDialog(() -> {
-            app.getGameLogic().playSound(Sound.BUTTON);
-            app.getGameLogic().send(new BuyPropertyResponse());
-            close();
-        }));
+        //TODO eventuell diese Stelle löschen, da nur die BuyCard Kaufen und beenden hat
 
-        // Zentriere das Popup
+        /*
+        // Beenden-Button
+        Button quitButton = foodFieldContainer.addChild(new Button("Beenden", new ElementId("button")));
+        quitButton.setFontSize(32);
+        // Kaufen-Button
+        Button buyButton = foodFieldContainer.addChild(new Button("Kaufen", new ElementId("button")));
+        buyButton.setFontSize(32);
+         */
+
+        float padding = 10; // Padding around the settingsContainer for the background
+        backgroundContainer.setPreferredSize(gateFieldContainer.getPreferredSize().addLocal(padding, padding, 0));
+
+
+        // Zentriere das Menü
         gateFieldContainer.setLocalTranslation(
             (app.getCamera().getWidth() - gateFieldContainer.getPreferredSize().x) / 2,
             (app.getCamera().getHeight() + gateFieldContainer.getPreferredSize().y) / 2,
             8
         );
 
-        // Zentriere das Popup
         backgroundContainer.setLocalTranslation(
                 (app.getCamera().getWidth() - gateFieldContainer.getPreferredSize().x - padding) / 2,
                 (app.getCamera().getHeight() + gateFieldContainer.getPreferredSize().y+ padding) / 2,
@@ -125,14 +114,16 @@ public class GateFieldCard extends Dialog {
      */
     @Override
     public void close() {
+        System.out.println("Schließe SettingsMenu..."); // Debugging-Ausgabe
         app.getGuiNode().detachChild(gateFieldContainer);  // Entferne das Menü
         app.getGuiNode().detachChild(backgroundContainer); //Entfernt Rand
         app.getGuiNode().detachChild(overlayBackground);  // Entferne das Overlay
-        super.close();
+        app.setSettingsMenuOpen(false);                  // Menü als geschlossen markieren TODO passt diese Variable noch (zu finden unter den Temps in MonopolyApp
+        app.unblockInputs();                             // Eingaben wieder aktivieren
+        System.out.println("SettingsMenu geschlossen."); // Debugging-Ausgabe
     }
 
-    @Override
-    public void escape() {
-        new SettingsMenu(app).open();
+    public void setIndex(int index) {
+        this.index = index;
     }
 }

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

@@ -1,119 +0,0 @@
-package pp.monopoly.client.gui.popups;
-
-import com.jme3.material.Material;
-import com.jme3.material.RenderState.BlendMode;
-import com.jme3.math.ColorRGBA;
-import com.jme3.math.Vector3f;
-import com.jme3.scene.Geometry;
-import com.jme3.scene.shape.Quad;
-import com.simsilica.lemur.Button;
-import com.simsilica.lemur.Container;
-import com.simsilica.lemur.Label;
-import com.simsilica.lemur.component.QuadBackgroundComponent;
-import com.simsilica.lemur.style.ElementId;
-import pp.dialog.Dialog;
-import pp.monopoly.client.MonopolyApp;
-
-/**
- * Gulag is a warning popup that is triggered when a certain player enters the "Wache" field
- */
-public class Gulag extends Dialog {
-    private final MonopolyApp app;
-    private final Geometry overlayBackground;
-    private final Container gulagContainer;
-    private final Container backgroundContainer;
-
-
-
-    public Gulag(MonopolyApp app) {
-        super(app.getDialogManager());
-        this.app = app;
-
-
-        // Halbtransparentes Overlay hinzufügen
-        overlayBackground = createOverlayBackground();
-        app.getGuiNode().attachChild(overlayBackground);
-
-        // Create the background container
-        backgroundContainer = new Container();
-        backgroundContainer.setBackground(new QuadBackgroundComponent(new ColorRGBA(0.8657f, 0.8735f, 0.8892f, 1.0f))); // Darker background
-        app.getGuiNode().attachChild(backgroundContainer);
-
-
-
-        // Hauptcontainer für die Warnung
-        gulagContainer = new Container();
-        gulagContainer.setBackground(new QuadBackgroundComponent(new ColorRGBA(0.8657f, 0.8735f, 0.8892f, 1.0f)));
-        gulagContainer.setPreferredSize(new Vector3f(550,250,10));
-
-        float padding = 10; // Passt den backgroundContainer an die Größe des bankruptContainers an
-        backgroundContainer.setPreferredSize(gulagContainer.getPreferredSize().addLocal(padding, padding, 0));
-
-        // Titel
-        Label gateFieldTitle = gulagContainer.addChild(new Label("Du kommst ins Gulag!", new ElementId("warning-title")));
-        gateFieldTitle.setFontSize(48);
-        gateFieldTitle.setColor(ColorRGBA.Black);
-
-        // Text, der auf der Karte steht
-        /* Container textContainer = gulagContainer.addChild(new Container());
-        textContainer.addChild(new Label("Du hast die Verbindung verloren und kannst nichts dagegen machen. Akzeptiere einfach, dass du verloren hast!", new ElementId("label-Text")));
-        textContainer.setBackground(new QuadBackgroundComponent(new ColorRGBA(0.4657f, 0.4735f, 0.4892f, 1.0f)));
-        textContainer.setPreferredSize(gulagContainer.getPreferredSize().addLocal(-250,-200,0));
-        */
-
-        // Beenden-Button
-        Button quitButton = gulagContainer.addChild(new Button("Jawohl Gulag", new ElementId("button")));
-        quitButton.setFontSize(32);
-        quitButton.addClickCommands(source -> close());
-
-
-        // Zentriere das Popup
-        gulagContainer.setLocalTranslation(
-            (app.getCamera().getWidth() - gulagContainer.getPreferredSize().x) / 2,
-            (app.getCamera().getHeight() + gulagContainer.getPreferredSize().y) / 2,
-            8
-        );
-
-        // Zentriere das Popup
-        backgroundContainer.setLocalTranslation(
-                (app.getCamera().getWidth() - gulagContainer.getPreferredSize().x - padding) / 2,
-                (app.getCamera().getHeight() + gulagContainer.getPreferredSize().y+ padding) / 2,
-                7
-        );
-
-        app.getGuiNode().attachChild(gulagContainer);
-    }
-
-    /**
-     * Erstellt einen halbtransparenten Hintergrund für das Menü.
-     *
-     * @return Geometrie des Overlays
-     */
-    private Geometry createOverlayBackground() {
-        Quad quad = new Quad(app.getCamera().getWidth(), app.getCamera().getHeight());
-        Geometry overlay = new Geometry("Overlay", quad);
-        Material material = new Material(app.getAssetManager(), "Common/MatDefs/Misc/Unshaded.j3md");
-        material.setColor("Color", new ColorRGBA(0, 0, 0, 0.5f)); // Halbtransparent
-        material.getAdditionalRenderState().setBlendMode(BlendMode.Alpha);
-        overlay.setMaterial(material);
-        overlay.setLocalTranslation(0, 0, 0);
-        return overlay;
-    }
-
-    /**
-     * Schließt das Menü und entfernt die GUI-Elemente.
-     */
-    @Override
-    public void close() {
-        app.getGuiNode().detachChild(gulagContainer);  // Entferne das Menü
-        app.getGuiNode().detachChild(backgroundContainer); //Entfernt Rand
-        app.getGuiNode().detachChild(overlayBackground);  // Entferne das Overlay
-        super.close();
-    }
-
-    @Override
-    public void escape() {
-        close();
-    }
-
-}

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

@@ -1,129 +1,52 @@
 package pp.monopoly.client.gui.popups;
 
-import com.jme3.material.Material;
-import com.jme3.material.RenderState;
-import com.jme3.math.ColorRGBA;
-import com.jme3.math.Vector3f;
-import com.jme3.scene.Geometry;
-import com.jme3.scene.shape.Quad;
 import com.simsilica.lemur.Button;
 import com.simsilica.lemur.Container;
 import com.simsilica.lemur.Label;
 import com.simsilica.lemur.component.IconComponent;
-import com.simsilica.lemur.component.QuadBackgroundComponent;
-import com.simsilica.lemur.style.ElementId;
+
 import pp.dialog.Dialog;
 import pp.monopoly.client.MonopolyApp;
-import pp.monopoly.notification.Sound;
 
 public class LooserPopUp extends Dialog {
-    private final MonopolyApp app;
-    private final Geometry overlayBackground;
-    private final Container LooserContainer;
-    private final Container backgroundContainer;
 
+    private final MonopolyApp app;
 
     /**
-     * Constructs a new WinnerPopUp dialog.
+     * Constructs a new NetworkDialog.
      *
-     * @param app The MonopolyApp instance.
+     * @param network The NetworkSupport instance to be used for network operations.
      */
     public LooserPopUp(MonopolyApp app) {
         super(app.getDialogManager());
         this.app = app;
+        initializeDialog();
+    }
 
+    /**
+     * Initializes the dialog with input fields and connection buttons.
+     */
+    private void initializeDialog() {
+        Container inputContainer = new Container();
 
-        // Halbtransparentes Overlay hinzufügen
-        overlayBackground = createOverlayBackground();
-        app.getGuiNode().attachChild(overlayBackground);
+        // Titel und Eingabefelder für Host und Port
+        inputContainer.addChild(new Label("Schade, du hast leider verloren!"));
+        inputContainer.addChild(new Label("Die nächste Runde wird besser!"));
 
-        // Create the background container
-        backgroundContainer = new Container();
-        backgroundContainer.setBackground(new QuadBackgroundComponent(new ColorRGBA(0.8657f, 0.8735f, 0.8892f, 1.0f))); // Darker background
-        app.getGuiNode().attachChild(backgroundContainer);
-
-
-
-        // Hauptcontainer für die Warnung
-        LooserContainer = new Container();
-        LooserContainer.setBackground(new QuadBackgroundComponent(new ColorRGBA(0.8657f, 0.8735f, 0.8892f, 1.0f)));
-        LooserContainer.setPreferredSize(new Vector3f(355,600,10));
-
-        float padding = 10; // Passt den backgroundContainer an die Größe des bankruptContainers an
-        backgroundContainer.setPreferredSize(LooserContainer.getPreferredSize().addLocal(padding, padding, 0));
-
-        // Titel
-        Label looserTitle = LooserContainer.addChild(new Label("Schade, du hast leider verloren, die nächste Runde wird besser!", new ElementId("header")));
-        looserTitle.setFontSize(25);
-        // looserTitle.setColor(ColorRGBA.Black);
-        // Create the image container
-        Container imageContainer = LooserContainer.addChild(new Container());
-        imageContainer.setBackground(new QuadBackgroundComponent(new ColorRGBA(0.4657f, 0.4735f, 0.4892f, 1.0f))); // Dark gray background
-        imageContainer.setPreferredSize(LooserContainer.getPreferredSize().addLocal(-250, -200, 0)); // Adjust size for layout
-
-        // Add the image to the container
-        Label imageLabel = new Label(""); // Create a label for the image
-        IconComponent icon = new IconComponent("Pictures/MonopolyLooser.png"); // Load the image as an icon
-        icon.setIconScale(0.7f); // Scale the image appropriately
+        Label imageLabel = new Label("");
+        IconComponent icon = new IconComponent("Pictures/MonopolyLooser.png"); // Icon mit Textur erstellen
+        icon.setIconScale(1); // Skalierung des Bildes
         imageLabel.setIcon(icon);
-        imageContainer.addChild(imageLabel); // Add the image label to the container
 
-        //Beenden Button
-        Button quitButton = LooserContainer.addChild(new Button("Spiel Beenden", new ElementId("button")));
-        quitButton.setFontSize(32);
-        quitButton.addClickCommands(s -> ifTopDialog(() -> {
-            app.getGameLogic().playSound(Sound.BUTTON);
-            app.closeApp();
-        }));
+        // Setze das Icon im Label
+        inputContainer.addChild(imageLabel);
 
+        Button cancelButton = inputContainer.addChild(new Button("Spiel beenden"));
+        cancelButton.addClickCommands(source -> ifTopDialog(app::closeApp));
+        
+        inputContainer.setLocalTranslation(300, 800, 0);
+        app.getGuiNode().attachChild(inputContainer);
 
-        // Zentriere das Popup
-        LooserContainer.setLocalTranslation(
-                (app.getCamera().getWidth() - LooserContainer.getPreferredSize().x) / 2,
-                (app.getCamera().getHeight() + LooserContainer.getPreferredSize().y) / 2,
-                8
-        );
-
-        // Zentriere das Popup
-        backgroundContainer.setLocalTranslation(
-                (app.getCamera().getWidth() - LooserContainer.getPreferredSize().x - padding) / 2,
-                (app.getCamera().getHeight() + LooserContainer.getPreferredSize().y+ padding) / 2,
-                7
-        );
-
-        app.getGuiNode().attachChild(LooserContainer);
     }
-
-    /**
-     * Erstellt einen halbtransparenten Hintergrund für das Menü.
-     *
-     * @return Geometrie des Overlays
-     */
-    private Geometry createOverlayBackground() {
-        Quad quad = new Quad(app.getCamera().getWidth(), app.getCamera().getHeight());
-        Geometry overlay = new Geometry("Overlay", quad);
-        Material material = new Material(app.getAssetManager(), "Common/MatDefs/Misc/Unshaded.j3md");
-        material.setColor("Color", new ColorRGBA(0, 0, 0, 0.5f)); // Halbtransparent
-        material.getAdditionalRenderState().setBlendMode(RenderState.BlendMode.Alpha);
-        overlay.setMaterial(material);
-        overlay.setLocalTranslation(0, 0, 0);
-        return overlay;
-    }
-
-    /**
-     * Schließt das Menü und entfernt die GUI-Elemente.
-     */
-    @Override
-    public void close() {
-        app.getGuiNode().detachChild(LooserContainer);  // Entferne das Menü
-        app.getGuiNode().detachChild(backgroundContainer); //Entfernt Rand
-        app.getGuiNode().detachChild(overlayBackground);  // Entferne das Overlay
-        super.close();
-    }
-
-    @Override
-    public void escape() {
-        close();
-    }
-
 }
+

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

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

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

@@ -1,118 +0,0 @@
-package pp.monopoly.client.gui.popups;
-
-import com.jme3.material.Material;
-import com.jme3.material.RenderState.BlendMode;
-import com.jme3.math.ColorRGBA;
-import com.jme3.math.Vector3f;
-import com.jme3.scene.Geometry;
-import com.jme3.scene.shape.Quad;
-import com.simsilica.lemur.Button;
-import com.simsilica.lemur.Container;
-import com.simsilica.lemur.Label;
-import com.simsilica.lemur.component.QuadBackgroundComponent;
-import com.simsilica.lemur.style.ElementId;
-import pp.dialog.Dialog;
-import pp.monopoly.client.MonopolyApp;
-
-/**
- * Bankrupt is a Warning-Popup which appears when the balance is negative at the end of a player´s turn
- */
-public class NoMoneyWarning extends Dialog {
-    private final MonopolyApp app;
-    private final Geometry overlayBackground;
-    private final Container noMoneyWarningContainer;
-    private final Container backgroundContainer;
-
-
-
-    public NoMoneyWarning(MonopolyApp app) {
-        super(app.getDialogManager());
-        this.app = app;
-
-
-        // Halbtransparentes Overlay hinzufügen
-        overlayBackground = createOverlayBackground();
-        app.getGuiNode().attachChild(overlayBackground);
-
-        // Create the background container
-        backgroundContainer = new Container();
-        backgroundContainer.setBackground(new QuadBackgroundComponent(new ColorRGBA(0.8657f, 0.8735f, 0.8892f, 1.0f))); // Darker background
-        app.getGuiNode().attachChild(backgroundContainer);
-
-
-        // Hauptcontainer für die Warnung
-        noMoneyWarningContainer = new Container();
-        noMoneyWarningContainer.setBackground(new QuadBackgroundComponent(new ColorRGBA(0.8657f, 0.8735f, 0.8892f, 1.0f)));
-        noMoneyWarningContainer.setPreferredSize(new Vector3f(550,250,10));
-
-        float padding = 10; // Passt den backgroundContainer an die Größe des bankruptContainers an
-        backgroundContainer.setPreferredSize(noMoneyWarningContainer.getPreferredSize().addLocal(padding, padding, 0));
-
-        // Titel
-        Label gateFieldTitle = noMoneyWarningContainer.addChild(new Label("Na, schon wieder Pleite?", new ElementId("warning-title")));
-        gateFieldTitle.setFontSize(38);
-        gateFieldTitle.setColor(ColorRGBA.Black);
-
-        // Text, der im Popup steht
-        Container textContainer = noMoneyWarningContainer.addChild(new Container());
-        textContainer.addChild(new Label("Du hast nicht genug Geld, um dieses Gebäude zu kaufen", new ElementId("label-Text")));
-        textContainer.setBackground(new QuadBackgroundComponent(new ColorRGBA(0.4657f, 0.4735f, 0.4892f, 1.0f)));
-
-        // Passt den textContainer an die Größe des bankruptContainers an
-        textContainer.setPreferredSize(noMoneyWarningContainer.getPreferredSize().addLocal(-250,-200,0));
-
-        // Beenden-Button
-        Button quitButton = noMoneyWarningContainer.addChild(new Button("Bestätigen", new ElementId("button")));
-        quitButton.setFontSize(32);
-        quitButton.addClickCommands(source -> close());
-
-
-        // Zentriere das Popup
-        noMoneyWarningContainer.setLocalTranslation(
-            (app.getCamera().getWidth() - noMoneyWarningContainer.getPreferredSize().x) / 2,
-            (app.getCamera().getHeight() + noMoneyWarningContainer.getPreferredSize().y) / 2,
-            8
-        );
-
-        // Zentriere das Popup
-        backgroundContainer.setLocalTranslation(
-                (app.getCamera().getWidth() - noMoneyWarningContainer.getPreferredSize().x - padding) / 2,
-                (app.getCamera().getHeight() + noMoneyWarningContainer.getPreferredSize().y+ padding) / 2,
-                7
-        );
-
-        app.getGuiNode().attachChild(noMoneyWarningContainer);
-    }
-
-    /**
-     * Erstellt einen halbtransparenten Hintergrund für das Menü.
-     *
-     * @return Geometrie des Overlays
-     */
-    private Geometry createOverlayBackground() {
-        Quad quad = new Quad(app.getCamera().getWidth(), app.getCamera().getHeight());
-        Geometry overlay = new Geometry("Overlay", quad);
-        Material material = new Material(app.getAssetManager(), "Common/MatDefs/Misc/Unshaded.j3md");
-        material.setColor("Color", new ColorRGBA(0, 0, 0, 0.5f)); // Halbtransparent
-        material.getAdditionalRenderState().setBlendMode(BlendMode.Alpha);
-        overlay.setMaterial(material);
-        overlay.setLocalTranslation(0, 0, 0);
-        return overlay;
-    }
-
-    /**
-     * Closes the menu and removes the GUI elements.
-     */
-    @Override
-    public void close() {
-        app.getGuiNode().detachChild(noMoneyWarningContainer);  // Entferne das Menü
-        app.getGuiNode().detachChild(backgroundContainer); //Entfernt Rand
-        app.getGuiNode().detachChild(overlayBackground);  // Entferne das Overlay
-        super.close();
-    }
-
-    @Override
-    public void escape() {
-        close();
-    }
-}

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

@@ -1,120 +0,0 @@
-package pp.monopoly.client.gui.popups;
-
-import com.jme3.material.Material;
-import com.jme3.material.RenderState.BlendMode;
-import com.jme3.math.ColorRGBA;
-import com.jme3.math.Vector3f;
-import com.jme3.scene.Geometry;
-import com.jme3.scene.shape.Quad;
-import com.simsilica.lemur.Button;
-import com.simsilica.lemur.Container;
-import com.simsilica.lemur.Label;
-import com.simsilica.lemur.component.QuadBackgroundComponent;
-import com.simsilica.lemur.style.ElementId;
-import pp.dialog.Dialog;
-import pp.monopoly.client.MonopolyApp;
-
-/**
- * Bankrupt is a Warning-Popup which appears when the balance is negative at the end of a player´s turn
- */
-public class RejectTrade extends Dialog {
-    private final MonopolyApp app;
-    private final Geometry overlayBackground;
-    private final Container noMoneyWarningContainer;
-    private final Container backgroundContainer;
-
-
-
-    public RejectTrade(MonopolyApp app) {
-        super(app.getDialogManager());
-        this.app = app;
-
-
-        // Halbtransparentes Overlay hinzufügen
-        overlayBackground = createOverlayBackground();
-        app.getGuiNode().attachChild(overlayBackground);
-
-        // Create the background container
-        backgroundContainer = new Container();
-        backgroundContainer.setBackground(new QuadBackgroundComponent(new ColorRGBA(0.8657f, 0.8735f, 0.8892f, 1.0f))); // Darker background
-        app.getGuiNode().attachChild(backgroundContainer);
-
-
-        // Hauptcontainer für die Warnung
-        noMoneyWarningContainer = new Container();
-        noMoneyWarningContainer.setBackground(new QuadBackgroundComponent(new ColorRGBA(0.8657f, 0.8735f, 0.8892f, 1.0f)));
-        noMoneyWarningContainer.setPreferredSize(new Vector3f(550,250,10));
-
-        float padding = 10; // Passt den backgroundContainer an die Größe des bankruptContainers an
-        backgroundContainer.setPreferredSize(noMoneyWarningContainer.getPreferredSize().addLocal(padding, padding, 0));
-
-        // Titel
-        Label gateFieldTitle = noMoneyWarningContainer.addChild(new Label("Handel abgelehnt!", new ElementId("warning-title")));
-        gateFieldTitle.setFontSize(48);
-        gateFieldTitle.setColor(ColorRGBA.Black);
-
-        // Text, der im Popup steht
-        Container textContainer = noMoneyWarningContainer.addChild(new Container());
-        textContainer.addChild(new Label("Du hast Spieler XXX einen Handel vorgeschlagen", new ElementId("label-Text")));
-        textContainer.addChild(new Label("", new ElementId("label-Text")));
-        textContainer.addChild(new Label("Der Handel wurde abgelehnt", new ElementId("label-Text")));
-        textContainer.setBackground(new QuadBackgroundComponent(new ColorRGBA(0.4657f, 0.4735f, 0.4892f, 1.0f)));
-
-        // Passt den textContainer an die Größe des bankruptContainers an
-        textContainer.setPreferredSize(noMoneyWarningContainer.getPreferredSize().addLocal(-250,-200,0));
-
-        // Beenden-Button
-        Button quitButton = noMoneyWarningContainer.addChild(new Button("Bestätigen", new ElementId("button")));
-        quitButton.setFontSize(32);
-        quitButton.addClickCommands(source -> close());
-
-
-        // Zentriere das Popup
-        noMoneyWarningContainer.setLocalTranslation(
-            (app.getCamera().getWidth() - noMoneyWarningContainer.getPreferredSize().x) / 2,
-            (app.getCamera().getHeight() + noMoneyWarningContainer.getPreferredSize().y) / 2,
-            8
-        );
-
-        // Zentriere das Popup
-        backgroundContainer.setLocalTranslation(
-                (app.getCamera().getWidth() - noMoneyWarningContainer.getPreferredSize().x - padding) / 2,
-                (app.getCamera().getHeight() + noMoneyWarningContainer.getPreferredSize().y+ padding) / 2,
-                7
-        );
-
-        app.getGuiNode().attachChild(noMoneyWarningContainer);
-    }
-
-    /**
-     * Erstellt einen halbtransparenten Hintergrund für das Menü.
-     *
-     * @return Geometrie des Overlays
-     */
-    private Geometry createOverlayBackground() {
-        Quad quad = new Quad(app.getCamera().getWidth(), app.getCamera().getHeight());
-        Geometry overlay = new Geometry("Overlay", quad);
-        Material material = new Material(app.getAssetManager(), "Common/MatDefs/Misc/Unshaded.j3md");
-        material.setColor("Color", new ColorRGBA(0, 0, 0, 0.5f)); // Halbtransparent
-        material.getAdditionalRenderState().setBlendMode(BlendMode.Alpha);
-        overlay.setMaterial(material);
-        overlay.setLocalTranslation(0, 0, 0);
-        return overlay;
-    }
-
-    /**
-     * Closes the menu and removes the GUI elements.
-     */
-    @Override
-    public void close() {
-        app.getGuiNode().detachChild(noMoneyWarningContainer);  // Entferne das Menü
-        app.getGuiNode().detachChild(backgroundContainer); //Entfernt Rand
-        app.getGuiNode().detachChild(overlayBackground);  // Entferne das Overlay
-        super.close();
-    }
-
-    @Override
-    public void escape() {
-        close();
-    }
-}

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

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

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

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

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

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

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

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

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

@@ -1,120 +0,0 @@
-package pp.monopoly.client.gui.popups;
-
-import com.jme3.material.Material;
-import com.jme3.material.RenderState.BlendMode;
-import com.jme3.math.ColorRGBA;
-import com.jme3.math.Vector3f;
-import com.jme3.scene.Geometry;
-import com.jme3.scene.shape.Quad;
-import com.simsilica.lemur.Button;
-import com.simsilica.lemur.Container;
-import com.simsilica.lemur.Label;
-import com.simsilica.lemur.component.QuadBackgroundComponent;
-import com.simsilica.lemur.style.ElementId;
-import pp.dialog.Dialog;
-import pp.monopoly.client.MonopolyApp;
-import pp.monopoly.notification.Sound;
-import static pp.monopoly.Resources.lookup;
-
-/**
- * TimeOut is a warning popup that is triggered when the connection to the server is interrupted.
- */
-public class TimeOut extends Dialog {
-    private final MonopolyApp app;
-    private final Geometry overlayBackground;
-    private final Container timeOutContainer;
-    private final Container backgroundContainer;
-
-
-
-    public TimeOut(MonopolyApp app) {
-        super(app.getDialogManager());
-        this.app = app;
-
-
-        // Halbtransparentes Overlay hinzufügen
-        overlayBackground = createOverlayBackground();
-        app.getGuiNode().attachChild(overlayBackground);
-
-        // Create the background container
-        backgroundContainer = new Container();
-        backgroundContainer.setBackground(new QuadBackgroundComponent(new ColorRGBA(0.8657f, 0.8735f, 0.8892f, 1.0f))); // Darker background
-        app.getGuiNode().attachChild(backgroundContainer);
-
-
-
-        // Hauptcontainer für die Warnung
-        timeOutContainer = new Container();
-        timeOutContainer.setBackground(new QuadBackgroundComponent(new ColorRGBA(0.8657f, 0.8735f, 0.8892f, 1.0f)));
-        timeOutContainer.setPreferredSize(new Vector3f(550,250,10));
-
-        float padding = 10; // Passt den backgroundContainer an die Größe des bankruptContainers an
-        backgroundContainer.setPreferredSize(timeOutContainer.getPreferredSize().addLocal(padding, padding, 0));
-
-        // Titel
-        Label gateFieldTitle = timeOutContainer.addChild(new Label("Vorsicht !", new ElementId("warning-title")));
-        gateFieldTitle.setFontSize(48);
-        gateFieldTitle.setColor(ColorRGBA.Black);
-
-        // Text, der auf der Karte steht
-        Container textContainer = timeOutContainer.addChild(new Container());
-        textContainer.addChild(new Label("Du hast die Verbindung verloren und kannst nichts dagegen machen. Akzeptiere einfach, dass du verloren hast!", new ElementId("label-Text")));
-        textContainer.setBackground(new QuadBackgroundComponent(new ColorRGBA(0.4657f, 0.4735f, 0.4892f, 1.0f)));
-        textContainer.setPreferredSize(timeOutContainer.getPreferredSize().addLocal(-250,-200,0));
-
-        // Beenden-Button
-        Button quitButton = timeOutContainer.addChild(new Button("Bestätigen", new ElementId("button")));
-        quitButton.setFontSize(32);
-        quitButton.addClickCommands(source -> close());
-
-
-        // Zentriere das Popup
-        timeOutContainer.setLocalTranslation(
-            (app.getCamera().getWidth() - timeOutContainer.getPreferredSize().x) / 2,
-            (app.getCamera().getHeight() + timeOutContainer.getPreferredSize().y) / 2,
-            8
-        );
-
-        // Zentriere das Popup
-        backgroundContainer.setLocalTranslation(
-                (app.getCamera().getWidth() - timeOutContainer.getPreferredSize().x - padding) / 2,
-                (app.getCamera().getHeight() + timeOutContainer.getPreferredSize().y+ padding) / 2,
-                7
-        );
-
-        app.getGuiNode().attachChild(timeOutContainer);
-    }
-
-    /**
-     * Erstellt einen halbtransparenten Hintergrund für das Menü.
-     *
-     * @return Geometrie des Overlays
-     */
-    private Geometry createOverlayBackground() {
-        Quad quad = new Quad(app.getCamera().getWidth(), app.getCamera().getHeight());
-        Geometry overlay = new Geometry("Overlay", quad);
-        Material material = new Material(app.getAssetManager(), "Common/MatDefs/Misc/Unshaded.j3md");
-        material.setColor("Color", new ColorRGBA(0, 0, 0, 0.5f)); // Halbtransparent
-        material.getAdditionalRenderState().setBlendMode(BlendMode.Alpha);
-        overlay.setMaterial(material);
-        overlay.setLocalTranslation(0, 0, 0);
-        return overlay;
-    }
-
-    /**
-     * Schließt das Menü und entfernt die GUI-Elemente.
-     */
-    @Override
-    public void close() {
-        app.getGuiNode().detachChild(timeOutContainer);  // Entferne das Menü
-        app.getGuiNode().detachChild(backgroundContainer); //Entfernt Rand
-        app.getGuiNode().detachChild(overlayBackground);  // Entferne das Overlay
-        super.close();
-    }
-
-    @Override
-    public void escape() {
-        close();
-    }
-
-}

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

@@ -1,128 +1,51 @@
 package pp.monopoly.client.gui.popups;
 
-import com.jme3.material.Material;
-import com.jme3.material.RenderState;
-import com.jme3.math.ColorRGBA;
-import com.jme3.math.Vector3f;
-import com.jme3.scene.Geometry;
-import com.jme3.scene.shape.Quad;
 import com.simsilica.lemur.Button;
 import com.simsilica.lemur.Container;
 import com.simsilica.lemur.Label;
 import com.simsilica.lemur.component.IconComponent;
-import com.simsilica.lemur.component.QuadBackgroundComponent;
-import com.simsilica.lemur.style.ElementId;
+
 import pp.dialog.Dialog;
 import pp.monopoly.client.MonopolyApp;
-import pp.monopoly.notification.Sound;
 
 public class WinnerPopUp extends Dialog {
-    private final MonopolyApp app;
-    private final Geometry overlayBackground;
-    private final Container WinnerContainer;
-    private final Container backgroundContainer;
 
+    private final MonopolyApp app;
 
     /**
-     * Constructs a new WinnerPopUp dialog.
+     * Constructs a new NetworkDialog.
      *
-     * @param app The MonopolyApp instance.
+     * @param app The NetworkSupport instance to be used for network operations.
      */
     public WinnerPopUp(MonopolyApp app) {
         super(app.getDialogManager());
         this.app = app;
+        initializeDialog();
+    }
 
+    /**
+     * Initializes the dialog with input fields and connection buttons.
+     */
+    private void initializeDialog() {
+        Container inputContainer = new Container();
 
-        // Halbtransparentes Overlay hinzufügen
-        overlayBackground = createOverlayBackground();
-        app.getGuiNode().attachChild(overlayBackground);
+        // Titel und Eingabefelder für Host und Port
+        inputContainer.addChild(new Label("Herlichen Glückwunsch!"));
+        inputContainer.addChild(new Label("Du,bist der Monopoly Champion!!!"));
 
-        // Create the background container
-        backgroundContainer = new Container();
-        backgroundContainer.setBackground(new QuadBackgroundComponent(new ColorRGBA(0.8657f, 0.8735f, 0.8892f, 1.0f))); // Darker background
-        app.getGuiNode().attachChild(backgroundContainer);
-
-
-
-        // Hauptcontainer für die Warnung
-        WinnerContainer = new Container();
-        WinnerContainer.setBackground(new QuadBackgroundComponent(new ColorRGBA(0.8657f, 0.8735f, 0.8892f, 1.0f)));
-        WinnerContainer.setPreferredSize(new Vector3f(440,600,10));
-
-        float padding = 10; // Passt den backgroundContainer an die Größe des bankruptContainers an
-        backgroundContainer.setPreferredSize(WinnerContainer.getPreferredSize().addLocal(padding, padding, 0));
-
-        // Titel
-        Label winnerTitle = WinnerContainer.addChild(new Label("Herlichen Glückwunsch, du bist der neue Monopoly Champion!", new ElementId("header")));
-        winnerTitle.setFontSize(25);
-       // winnerTitle.setColor(ColorRGBA.Black);
-        // Create the image container
-        Container imageContainer = WinnerContainer.addChild(new Container());
-        imageContainer.setBackground(new QuadBackgroundComponent(new ColorRGBA(0.4657f, 0.4735f, 0.4892f, 1.0f))); // Dark gray background
-        imageContainer.setPreferredSize(WinnerContainer.getPreferredSize().addLocal(-250, -200, 0)); // Adjust size for layout
-
-        // Add the image to the container
-        Label imageLabel = new Label(""); // Create a label for the image
-        IconComponent icon = new IconComponent("Pictures/MonopolyWinner.png"); // Load the image as an icon
-        icon.setIconScale(1); // Scale the image appropriately
+        Label imageLabel = new Label("");
+        IconComponent icon = new IconComponent("Pictures/MonopolyWinner.png"); // Icon mit Textur erstellen
+        icon.setIconScale(1); // Skalierung des Bildes
         imageLabel.setIcon(icon);
-        imageContainer.addChild(imageLabel); // Add the image label to the container
 
+        // Setze das Icon im Label
+        inputContainer.addChild(imageLabel);
 
-        Button quitButton = WinnerContainer.addChild(new Button("Spiel Beenden", new ElementId("button")));
-        quitButton.setFontSize(32);
-        quitButton.addClickCommands(s -> ifTopDialog(() -> {
-            app.getGameLogic().playSound(Sound.BUTTON);
-            app.closeApp();
-        }));
-
-        // Zentriere das Popup
-        WinnerContainer.setLocalTranslation(
-                (app.getCamera().getWidth() - WinnerContainer.getPreferredSize().x) / 2,
-                (app.getCamera().getHeight() + WinnerContainer.getPreferredSize().y) / 2,
-                8
-        );
-
-        // Zentriere das Popup
-        backgroundContainer.setLocalTranslation(
-                (app.getCamera().getWidth() - WinnerContainer.getPreferredSize().x - padding) / 2,
-                (app.getCamera().getHeight() + WinnerContainer.getPreferredSize().y+ padding) / 2,
-                7
-        );
-
-        app.getGuiNode().attachChild(WinnerContainer);
+        Button cancelButton = inputContainer.addChild(new Button("Spiel beenden"));
+        cancelButton.addClickCommands(source -> ifTopDialog(app::closeApp));
+        
+        inputContainer.setLocalTranslation(300, 800, 0);
+        app.getGuiNode().attachChild(inputContainer);
     }
+}
 
-    /**
-     * Erstellt einen halbtransparenten Hintergrund für das Menü.
-     *
-     * @return Geometrie des Overlays
-     */
-    private Geometry createOverlayBackground() {
-        Quad quad = new Quad(app.getCamera().getWidth(), app.getCamera().getHeight());
-        Geometry overlay = new Geometry("Overlay", quad);
-        Material material = new Material(app.getAssetManager(), "Common/MatDefs/Misc/Unshaded.j3md");
-        material.setColor("Color", new ColorRGBA(0, 0, 0, 0.5f)); // Halbtransparent
-        material.getAdditionalRenderState().setBlendMode(RenderState.BlendMode.Alpha);
-        overlay.setMaterial(material);
-        overlay.setLocalTranslation(0, 0, 0);
-        return overlay;
-    }
-
-    /**
-     * Schließt das Menü und entfernt die GUI-Elemente.
-     */
-    @Override
-    public void close() {
-        app.getGuiNode().detachChild(WinnerContainer);  // Entferne das Menü
-        app.getGuiNode().detachChild(backgroundContainer); //Entfernt Rand
-        app.getGuiNode().detachChild(overlayBackground);  // Entferne das Overlay
-        super.close();
-    }
-
-    @Override
-    public void escape() {
-        close();
-    }
-
-}

Projekte/monopoly/model/build.gradle

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

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

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

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

@@ -5,16 +5,15 @@ import java.lang.System.Logger.Level;
 import java.util.ArrayList;
 import java.util.List;
 
-import pp.monopoly.game.server.PlayerHandler;
+import pp.monopoly.game.server.Player;
 import pp.monopoly.message.client.ClientMessage;
-import pp.monopoly.message.server.BuyPropertyRequest;
+import pp.monopoly.message.server.BuyPropertyResponse;
 import pp.monopoly.message.server.DiceResult;
 import pp.monopoly.message.server.EventDrawCard;
 import pp.monopoly.message.server.GameOver;
 import pp.monopoly.message.server.GameStart;
 import pp.monopoly.message.server.JailEvent;
 import pp.monopoly.message.server.NextPlayerTurn;
-import pp.monopoly.message.server.NotificationMessage;
 import pp.monopoly.message.server.PlayerStatusUpdate;
 import pp.monopoly.message.server.ServerInterpreter;
 import pp.monopoly.message.server.TimeOutWarning;
@@ -23,20 +22,14 @@ import pp.monopoly.message.server.TradeRequest;
 import pp.monopoly.message.server.ViewAssetsResponse;
 import pp.monopoly.model.Board;
 import pp.monopoly.model.IntPoint;
-import pp.monopoly.model.TradeHandler;
 import pp.monopoly.model.fields.BoardManager;
 import pp.monopoly.notification.ClientStateEvent;
-import pp.monopoly.notification.DiceRollEvent;
-import pp.monopoly.notification.ButtonStatusEvent;
-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.PopUpEvent;
 import pp.monopoly.notification.Sound;
 import pp.monopoly.notification.SoundEvent;
-import pp.monopoly.notification.UpdatePlayerView;
 
 /**
  * Controls the client-side game logic for Monopoly.
@@ -59,13 +52,10 @@ public class ClientGameLogic implements ServerInterpreter, GameEventBroker {
     /** The current state of the client game logic. */
     private ClientState state = new LobbyState(this);
 
-    private PlayerHandler playerHandler;
+    private List<Player> players;
 
     private BoardManager boardManager = new BoardManager();
 
-    private TradeHandler tradeHandler;
-
-
     /**
      * Constructs a ClientGameLogic with the specified sender object.
      *
@@ -104,8 +94,8 @@ public class ClientGameLogic implements ServerInterpreter, GameEventBroker {
         state.entry();
     }
 
-    public PlayerHandler getPlayerHandler() {
-        return playerHandler;
+    public List<Player> getPlayers() {
+        return players;
     }
 
     /**
@@ -117,10 +107,6 @@ public class ClientGameLogic implements ServerInterpreter, GameEventBroker {
         return board;
     }
 
-    public TradeHandler getTradeHandler() {
-        return tradeHandler;
-    }
-
     /**
      * Moves the preview figure to the specified position.
      *
@@ -158,6 +144,7 @@ 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");
         }
     }
 
@@ -204,6 +191,21 @@ public class ClientGameLogic implements ServerInterpreter, GameEventBroker {
         state.update(delta);
     }
 
+    /**
+     * Handles the response for buying a property.
+     *
+     * @param msg the message containing the buy property response
+     */
+    @Override
+    public void received(BuyPropertyResponse msg) {
+        if (msg.isSuccessful()) {
+            setInfoText("You successfully bought " + msg.getPropertyName() + "!");
+            playSound(Sound.MONEY_LOST);
+        } else {
+            setInfoText("Unable to buy " + msg.getPropertyName() + ". Reason: " + msg.getReason());
+        }
+    }
+
     /**
      * Handles the result of a dice roll.
      *
@@ -211,8 +213,9 @@ 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)));
     }
 
     /**
@@ -222,8 +225,9 @@ 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()));
     }
 
     /**
@@ -234,10 +238,12 @@ public class ClientGameLogic implements ServerInterpreter, GameEventBroker {
     @Override
     public void received(GameOver msg) {
         if (msg.isWinner()) {
-            notifyListeners(new PopUpEvent("Winner", msg));
+            setInfoText("Congratulations! You have won the game!");
+            //Winner popup
             playSound(Sound.WINNER);
         } else {
-            notifyListeners(new PopUpEvent("Looser", msg));
+            setInfoText("Game over. Better luck next time!");
+            // Looser popup
             playSound(Sound.LOSER);
         }
     }
@@ -249,9 +255,9 @@ public class ClientGameLogic implements ServerInterpreter, GameEventBroker {
      */
     @Override
     public void received(GameStart msg) {
-        playerHandler = msg.getPlayerHandler();
+        players = msg.getPlayers();
+        setInfoText("The game has started! Good luck!");
         setState(new WaitForTurnState(this));
-        notifyListeners(new ButtonStatusEvent(false));
     }
 
     /**
@@ -262,10 +268,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!");
         }
     }
 
@@ -276,9 +282,8 @@ public class ClientGameLogic implements ServerInterpreter, GameEventBroker {
      */
     @Override
     public void received(PlayerStatusUpdate msg) {
-        playerHandler = msg.getPlayerHandler();
-        System.out.println("Update Player");
-        notifyListeners(new UpdatePlayerView());
+        
+        setInfoText("Player " + msg.getPlayerName() + " status updated: " + msg.getStatus());
     }
 
     /**
@@ -288,7 +293,7 @@ public class ClientGameLogic implements ServerInterpreter, GameEventBroker {
      */
     @Override
     public void received(TimeOutWarning msg) {
-        notifyListeners(new PopUpEvent("timeout", msg));
+        setInfoText("Warning! Time is running out. You have " + msg.getRemainingTime() + " seconds left.");
     }
 
     /**
@@ -298,7 +303,7 @@ public class ClientGameLogic implements ServerInterpreter, GameEventBroker {
      */
     @Override
     public void received(ViewAssetsResponse msg) {
-        boardManager = msg.getboard();
+        setInfoText("Your current assets are being displayed.");
     }
 
     /**
@@ -308,9 +313,11 @@ public class ClientGameLogic implements ServerInterpreter, GameEventBroker {
      */
     @Override
     public void received(TradeReply msg) {
-        if (msg.isAccepted()) {
+        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);
         }
     }
@@ -322,8 +329,9 @@ public class ClientGameLogic implements ServerInterpreter, GameEventBroker {
      */
     @Override
     public void received(TradeRequest msg) {
-        tradeHandler = msg.getTradeHandler();
-        notifyListeners(new PopUpEvent("tradeRequest", msg));
+        setInfoText("Trade offer received from " + msg.getTradeHandler().getSender().getName());
+        // playSound(Sound.TRADE_REQUEST); no sound effect
+        // notifyListeners();
     }
 
     /**
@@ -333,19 +341,7 @@ public class ClientGameLogic implements ServerInterpreter, GameEventBroker {
      */
     @Override
     public void received(NextPlayerTurn msg) {
-        notifyListeners(new ButtonStatusEvent(true));
+        setInfoText("It's your turn!");
         setState(new ActiveState(this));
     }
-
-    @Override
-    public void received(BuyPropertyRequest msg) {
-        notifyListeners(new PopUpEvent("Buy", msg));
-    }
-
-    @Override
-    public void received(NotificationMessage msg) {
-        if (msg.getKeyWord().equals("rent")) {
-            notifyListeners(new PopUpEvent("rent", msg));
-        }
-    }
 }

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

@@ -7,20 +7,12 @@
 
 package pp.monopoly.game.server;
 
-import java.util.ArrayList;
-import java.util.HashSet;
 import java.util.List;
 import java.util.Random;
-import java.util.Set;
 
 import com.jme3.network.serializing.Serializable;
 
-import pp.monopoly.message.server.BuyPropertyRequest;
 import pp.monopoly.message.server.DiceResult;
-import pp.monopoly.message.server.EventDrawCard;
-import pp.monopoly.message.server.NextPlayerTurn;
-import pp.monopoly.message.server.NotificationMessage;
-import pp.monopoly.message.server.PlayerStatusUpdate;
 import pp.monopoly.model.FieldVisitor;
 import pp.monopoly.model.Figure;
 import pp.monopoly.model.card.Card;
@@ -44,14 +36,12 @@ public class Player implements FieldVisitor<Void>{
     private String name;
     private int accountBalance = 15000;
     private Figure figure;
-    private Set<Integer> properties = new HashSet<>();
+    private List<PropertyField> properties;
     private int getOutOfJailCard;
     private int fieldID;
     private DiceResult rollResult;
-    private transient final PlayerHandler handler;
-    private transient PlayerState state = new WaitForTurnState();
-    private int doubletscounter = 0;
-    private boolean mayRollDice = false;
+    private final PlayerHandler handler;
+    private PlayerState state = new LobbyState();
 
     /**
      * Default constructor for serialization purposes.
@@ -86,19 +76,15 @@ public class Player implements FieldVisitor<Void>{
     public void setFigure(Figure figure) {
         this.figure = figure;
     }
-    
-    public Figure getFigure(){
-        return figure;
-    }
 
     public PlayerColor getColor() {
         switch ((id%6)+1) {
-            case 1: return PlayerColor.CYAN;
-            case 2: return PlayerColor.YELLOW;
-            case 3: return PlayerColor.RED;
+            case 1: return PlayerColor.BLUE;
+            case 2: return PlayerColor.GREEN_DARK;
+            case 3: return PlayerColor.GREEN_LIGHT;
             case 4: return PlayerColor.PINK;
-            case 5: return PlayerColor.GREEN;
-            case 6: return PlayerColor.PURPLE;
+            case 5: return PlayerColor.RED;
+            case 6: return PlayerColor.YELLOW;
         
             default:
                 return null;
@@ -138,8 +124,6 @@ public class Player implements FieldVisitor<Void>{
     }
     void setActive() {
         state = new ActiveState();
-        doubletscounter = 0;
-        mayRollDice = true;
     }
 
     boolean finishTurn() {
@@ -155,43 +139,36 @@ public class Player implements FieldVisitor<Void>{
     }
 
     /**
-     * Moves the player by a given number of steps, handling board wrapping.
-     *
-     * @param steps number of steps to move
+     * Moves by the specified amount of steps
+     * @param steps the number of steps to move
      * @return the new position
      */
-    public int move(int steps) {
-        if (fieldID + steps >= 40) {
-            earnMoney(2000); // Passing GO gives money
-        }
-        fieldID = (fieldID + steps) % 40;
-        figure.moveTo(fieldID);
-        handler.getLogic().send(this, new PlayerStatusUpdate(handler));
-        handler.getLogic().getBoardManager().getFieldAtIndex(fieldID).accept(this);
-        return fieldID;
+    public int move(int steps){
+        return movePos(fieldID+steps);
     }
 
     /**
-     * Sets the player to the specified Position on the board
+     * Moves the player to the specified Position on the board
      * @param position the position to move to
      * @return the new position
      */
-    public int setPosition(int position){
-        if(position < 40 && position > 0) {
-            fieldID = position;
-            figure.moveTo(fieldID);
-            handler.getLogic().send(this, new PlayerStatusUpdate(handler));
-            handler.getLogic().getBoardManager().getFieldAtIndex(fieldID).accept(this);
+    public int movePos(int position){
+        fieldID = fieldID+position;
+        if(fieldID >= 40) {
+            fieldID = fieldID%40;
+            earnMoney(2000);
         }
+        figure.moveTo(fieldID);
         return fieldID;
     }
 
+
     /**
      * Gets all the properties owned by this player
      * @return List of all properties owned by this player
      */
-    public List<Integer> getProperties() {
-        return new ArrayList<>(properties);
+    public List<PropertyField> getProperties() {
+        return properties;
     }
 
     /**
@@ -201,7 +178,7 @@ public class Player implements FieldVisitor<Void>{
      */
     public void buyProperty(PropertyField property) {
         if (property.getOwner() == null && accountBalance >= property.getPrice()) {
-            properties.add(property.getId());
+            properties.add(property);
             property.setOwner(this);
             pay(property.getPrice());
         }
@@ -300,59 +277,36 @@ public class Player implements FieldVisitor<Void>{
 
     @Override
     public Void visit(BuildingProperty field) {
-        if(field.getOwner() == null) {
-            getHandler().getLogic().send(this, new BuyPropertyRequest());
-        } else if (field.getOwner() != this){
-            int rent = field.calcRent();
-            field.getOwner().earnMoney(rent);
-            pay(rent);
-            NotificationMessage msg = new NotificationMessage("rent");
-            msg.setRentAmount(rent);
-            msg.setRentOwnerId(field.getOwner().getName());
-            getHandler().getLogic().send(this, msg);
-        }
+        int rent = field.calcRent();
+
+        field.getOwner().earnMoney(rent);
+        pay(rent);
         return null;
     }
 
     @Override
     public Void visit(FoodField field) {
-        if(field.getOwner() == null) {
-            getHandler().getLogic().send(this, new BuyPropertyRequest());
-        } else {
-            int factor = 4;
-            if (field.getOwner().getNumProp(field) == 2) {
-                factor = 10;
-            }
-            int rent = rollResult.calcTotal()*factor;
-            field.getOwner().earnMoney(rent);
-            pay(rent);
-            NotificationMessage msg = new NotificationMessage("rent");
-            msg.setRentAmount(rent);
-            msg.setRentOwnerId(field.getOwner().getName());
-            getHandler().getLogic().send(this, msg);
+        int factor = 4;
+        if (field.getOwner().getNumProp(field) == 2) {
+            factor = 10;
         }
+        field.getOwner().earnMoney(rollResult.calcTotal()*factor);
+        pay(rollResult.calcTotal()*factor);
         return null;
     }
 
     @Override
     public Void visit(GateField field) {
-        if(field.getOwner() == null) {
-            getHandler().getLogic().send(this, new BuyPropertyRequest());
-        } else {
-            int rent = field.calcRent() * field.getOwner().getNumProp(field);
+        int rent = field.calcRent() * field.getOwner().getNumProp(field);
 
-            field.getOwner().earnMoney(rent);
-            pay(rent);
-            NotificationMessage msg = new NotificationMessage("rent");
-            msg.setRentAmount(rent);
-            msg.setRentOwnerId(field.getOwner().getName());
-            getHandler().getLogic().send(this, msg);
-        }
+        field.getOwner().earnMoney(rent);
+        pay(rent);
         return null;
     }
 
     @Override
     public Void visit(GulagField field) {
+        state = new JailState();
         return null;
     }
 
@@ -365,22 +319,21 @@ public class Player implements FieldVisitor<Void>{
     @Override
     public Void visit(EventField field) {
         Card c = getHandler().getLogic().getDeckHelper().drawCard();
-        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
+        getHandler().getLogic().getDeckHelper().visit(c, this);
         return null;
     }
 
     @Override
     public Void visit(WacheField field) {
-        setPosition(10);
-        jail();
+        movePos(10);
         return null;
     }
 
     @Override
     public Void visit(GoField field) {
         earnMoney(2000);
+        GulagField res = (GulagField) handler.getLogic().getBoardManager().getFieldAtIndex(10);
+        res.accept(this);
         return null;
     }
 
@@ -393,20 +346,6 @@ public class Player implements FieldVisitor<Void>{
         return null;
     }
 
-    public List<PropertyField> getPropertyFields() {
-        List<PropertyField> properties = new ArrayList<>();
-
-        for (Integer i : this.properties) {
-            properties.add((PropertyField)getHandler().getLogic().getBoardManager().getFieldAtIndex(i));
-        }
-
-        return properties;
-    }
-
-    public void jail() {
-        state = new JailState();
-    }
-
     /**
      * Return the number of Properties of the speciefied fild type
      * @param field the type of field to search for
@@ -414,9 +353,7 @@ public class Player implements FieldVisitor<Void>{
      */
     public int getNumProp(PropertyField field) {
         int count = 0;
-        if (properties.isEmpty()) return 0;
-        
-        for (PropertyField propertyField : getPropertyFields()) {
+        for (PropertyField propertyField : properties) {
             if (propertyField.getClass() == field.getClass()) {
                 count++;
             }
@@ -427,7 +364,7 @@ public class Player implements FieldVisitor<Void>{
 
     public int getNumHouses() {
         int total = 0;
-        for (PropertyField field : getPropertyFields()) {
+        for (PropertyField field : properties) {
             if (field.getClass() == BuildingProperty.class) {
                 total += ((BuildingProperty) field).getHouses();
             }
@@ -437,7 +374,7 @@ public class Player implements FieldVisitor<Void>{
 
     public int getNumHotels() {
         int total = 0;
-        for (PropertyField field : getPropertyFields()) {
+        for (PropertyField field : properties) {
             if (field.getClass() == BuildingProperty.class) {
                 total += ((BuildingProperty) field).getHotel();
             }
@@ -462,37 +399,15 @@ public class Player implements FieldVisitor<Void>{
         }
     }
 
-/**
- * Rolls two dice, handles movement logic, and checks for doublets.
- *
- * @return the DiceResult of the roll
- */
-DiceResult rollDice() {
-    if (!mayRollDice) {
-        throw new IllegalStateException("Player is not allowed to roll dice at this moment.");
+    /**
+     * Rolls two dice and returns a list with the results.
+     *
+     * @return a List of two integers representing the dice roll results
+     */
+    DiceResult rollDice() {
+        return state.rollDice();
     }
 
-    rollResult = state.rollDice();
-    mayRollDice = false;
-
-    if (rollResult.isDoublets()) {
-        doubletscounter++;
-        mayRollDice = true; // Allow another roll for doublets
-
-        if (doubletscounter >= 3) {
-            setPosition(10); // Send to jail on third doublet
-            doubletscounter = 0; // Reset doublets counter
-        } else {
-            getHandler().getLogic().send(this, new NextPlayerTurn());
-        }
-    } else {
-        doubletscounter = 0; // Reset counter if no doublets
-    }
-
-    return rollResult;
-}
-
-
     /**
      * A interface representing the PlayerStates
      */
@@ -524,9 +439,7 @@ DiceResult rollDice() {
         @Override
         public DiceResult rollDice() {
             List<Integer> roll = List.of(Dice.rollDice(), Dice.rollDice());
-            rollResult = new DiceResult(roll.get(0), roll.get(1));
-            System.out.println(rollResult.calcTotal());
-            move(rollResult.calcTotal());
+            rollResult = new DiceResult(roll);
             return rollResult;
         }
 
@@ -542,6 +455,31 @@ DiceResult rollDice() {
     }
 
 
+    /**
+     * A class to represent the Lobby PlayerState
+     * Set when in Lobby
+     */
+    private class LobbyState implements PlayerState{
+
+        @Override
+        public DiceResult rollDice() {
+            //do nothing
+            return null;
+        }
+
+        @Override
+        public void payBail() {
+            //do nothing
+        }
+
+        @Override
+        public void useJailCard() {
+            // do nothing
+        }
+
+    }
+
+
     /**
      * A class to represent the Jailed PlayerState
      * Set when in Gulag
@@ -553,7 +491,7 @@ DiceResult rollDice() {
         @Override
         public DiceResult rollDice() {
             List<Integer> roll = List.of(Dice.rollDice(), Dice.rollDice());
-            rollResult = new DiceResult(roll.get(0), roll.get(1));
+            rollResult = new DiceResult(roll);
             if (rollResult.isDoublets()) {
                 state = new ActiveState();
             } else if (DoubletsCounter == 0) {
@@ -575,13 +513,13 @@ DiceResult rollDice() {
             getOutOfJailCard--;
             state = new ActiveState();
         }
-
+        
     }
     private class WaitForTurnState implements PlayerState {
 
         @Override
         public DiceResult rollDice() {
-            return null;
+            throw new UnsupportedOperationException("not allowed");
         }
 
         @Override
@@ -591,19 +529,6 @@ DiceResult rollDice() {
         @Override
         public void useJailCard() {
         }
-
-    }
-
-    @Override
-    public String toString() {
-        return "Player{name=" + name + ", figure=" + figure + "}";
-    }
-
-    public void addProperty(Integer id) {
-        properties.add(id);
-    }
-
-    public void removeProperty(Integer id) {
-        properties.remove(id);
+        
     }
 }

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 {
-    CYAN(new ColorRGBA(1 / 255f, 190 / 255f, 254 / 255f, 1)),
-    YELLOW(new ColorRGBA(255 / 255f, 255 / 255f, 0 / 255f, 1)),
-    RED(new ColorRGBA(255 / 255f, 0 / 255f, 0 / 255f, 1)),
-    PINK(new ColorRGBA(255 / 255f, 77 / 255f, 166 / 255f, 1)),
-    GREEN(new ColorRGBA(0 / 255f, 204 / 255f, 0 / 255f, 1)),
-    PURPLE(new ColorRGBA(143 / 255f, 0 / 255f, 255 / 255f, 1));
+    GREEN_LIGHT(new ColorRGBA(0 / 255f, 204 / 255f, 0 / 255f, 1)),   // Hex: 00cc00
+    RED(new ColorRGBA(255 / 255f, 0 / 255f, 0 / 255f, 1)),           // Hex: ff0000
+    BLUE(new ColorRGBA(0 / 255f, 0 / 255f, 204 / 255f, 1)),          // Hex: 0000cc
+    PINK(new ColorRGBA(255 / 255f, 77 / 255f, 166 / 255f, 1)),       // Hex: ff4da6
+    GREEN_DARK(new ColorRGBA(0 / 255f, 102 / 255f, 0 / 255f, 1)),    // Hex: 006600
+    YELLOW(new ColorRGBA(255 / 255f, 255 / 255f, 0 / 255f, 1));      // Hex: ffff00
 
     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,9 +16,10 @@ import pp.monopoly.model.LimitedLinkedList;
  */
 @Serializable
 public class PlayerHandler {
-    private List<Player> players = new LinkedList<>();
+    private List<Player> players = new LimitedLinkedList<>(6);
     private Set<Player> readyPlayers = new HashSet<>();
-    private transient ServerGameLogic logic;
+    private ServerGameLogic logic;
+    private Player hostPlayer;
     private Player extra = null;
 
     /**
@@ -54,6 +55,14 @@ public class PlayerHandler {
         players.addAll(players);
     }
 
+    /**
+     * Return the host player
+     * @return the host player
+     */
+    public Player getHostPlayer() {
+        return hostPlayer;
+    }
+
     /**
      * Return the number of players
      * @return number of players in the game
@@ -105,6 +114,9 @@ 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

@@ -2,13 +2,9 @@ package pp.monopoly.game.server;
 
 import java.lang.System.Logger;
 import java.lang.System.Logger.Level;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Properties;
-import java.util.Set;
 
 import pp.monopoly.MonopolyConfig;
-import pp.monopoly.message.client.BuyPropertyResponse;
+import pp.monopoly.message.client.BuyPropertyRequest;
 import pp.monopoly.message.client.ClientInterpreter;
 import pp.monopoly.message.client.EndTurn;
 import pp.monopoly.message.client.PlayerReady;
@@ -23,9 +19,9 @@ import pp.monopoly.message.server.ServerMessage;
 import pp.monopoly.message.server.TradeReply;
 import pp.monopoly.message.server.TradeRequest;
 import pp.monopoly.message.server.ViewAssetsResponse;
+import pp.monopoly.model.Board;
 import pp.monopoly.model.Figure;
 import pp.monopoly.model.Rotation;
-import pp.monopoly.model.TradeHandler;
 import pp.monopoly.model.card.DeckHelper;
 import pp.monopoly.model.fields.BoardManager;
 import pp.monopoly.model.fields.PropertyField;
@@ -136,6 +132,7 @@ 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;
     }
@@ -148,16 +145,20 @@ public class ServerGameLogic implements ClientInterpreter {
      * @param from the connection ID of the player who sent the request
      */
     @Override
-    public void received(BuyPropertyResponse msg, int from) {
+    public void received(BuyPropertyRequest msg, int from) {
         Player player = playerHandler.getPlayerById(from);
-        if (player != null) {
-            PropertyField property = (PropertyField) boardManager.getFieldAtIndex(player.getFieldID()); // Assuming player position for property
+        if (player != null && state == ServerState.INGAME) {
+            PropertyField property = (PropertyField) boardManager.getFieldAtIndex(player.move(0)); // Assuming player position for property
             
-            player.buyProperty(property);
-            System.out.println("Properties:" +player.getProperties().toString());
-            LOGGER.log(Level.INFO, "Player {0} bought property {1}", player.getName(), property.getName());
+            if (property.getOwner() == null && player.getAccountBalance() >= property.getPrice()) {
+                player.buyProperty(property);
+                property.setOwner(player);
+                player.earnMoney(-property.getPrice());
+                LOGGER.log(Level.INFO, "Player {0} bought property {1}", player.getName(), property.getName());
+            } else {
+                LOGGER.log(Level.WARNING, "Player {0} cannot buy property {1}", player.getName(), property.getName());
+            }
         }
-        updateAllPlayers();
     }
 
     /**
@@ -169,17 +170,14 @@ public class ServerGameLogic implements ClientInterpreter {
     @Override
     public void received(EndTurn msg, int from) {
         Player player = playerHandler.getPlayerById(from);
-        if (player != null && player == playerHandler.getPlayerAtIndex(0)) {
+        if (player != null && state == ServerState.INGAME) {
             if (player.finishTurn()) {
                 LOGGER.log(Level.DEBUG, "Ending turn for player {0}", player.getName());
                 Player next = playerHandler.nextPlayer();
                 next.setActive();
-                send(next, new NextPlayerTurn());
-                send(next, new PlayerStatusUpdate(playerHandler));
-                send(player, new PlayerStatusUpdate(playerHandler));
+                send(next, new NextPlayerTurn(next));
             }
         }
-        updateAllPlayers();
     }
 
     /**
@@ -191,7 +189,7 @@ public class ServerGameLogic implements ClientInterpreter {
     @Override
     public void received(PlayerReady msg, int from) {
         Player player = playerHandler.getPlayerById(from);
-        if(player.getId() == 0) {
+        if(player == playerHandler.getHostPlayer()) {
             startMoney = msg.getStartMoney();
         }
 
@@ -206,10 +204,10 @@ public class ServerGameLogic implements ClientInterpreter {
         if(playerHandler.allPlayersReady()) {
             playerHandler.setStartBalance(startMoney);
             for (Player p : playerHandler.getPlayers()) {
-               send(p, new GameStart(playerHandler)); 
+               send(p, new GameStart(playerHandler.getPlayers())); 
             }
             playerHandler.randomOrder();
-            send(playerHandler.getPlayerAtIndex(0), new NextPlayerTurn());
+            send(playerHandler.getPlayerAtIndex(0), new NextPlayerTurn(playerHandler.getPlayerAtIndex(0)));
         }
     }
 
@@ -222,10 +220,9 @@ public class ServerGameLogic implements ClientInterpreter {
     @Override
     public void received(RollDice msg, int from) {
         Player player = playerHandler.getPlayerById(from);
-        if (player != null) {
+        if (player != null && state == ServerState.INGAME) {
             send(player, player.rollDice());
         }
-        updateAllPlayers();
     }
 
     /**
@@ -237,11 +234,11 @@ public class ServerGameLogic implements ClientInterpreter {
     @Override
     public void received(TradeOffer msg, int from) {
         Player sender = playerHandler.getPlayerById(from);
-        Player receiver = msg.getTradeHandler().getReceiver();
+        Player receiver = playerHandler.getPlayerById(msg.getReceiverId());
         
         if (sender != null && receiver != null) {
             LOGGER.log(Level.INFO, "Player {0} offers a trade to player {1}", sender.getName(), receiver.getName());
-            send(receiver, new TradeRequest(msg.getTradeHandler()));
+            send(playerHandler.getPlayerById(msg.getReceiverId()), new TradeRequest(msg.getReceiverId(), msg.getTradeHandler()));
         }
     }
 
@@ -253,79 +250,15 @@ public class ServerGameLogic implements ClientInterpreter {
      */
     @Override
     public void received(TradeResponse msg, int from) {
-
-        TradeHandler tradeHandler = msg.getTradeHandler();
-
+        Player responder = playerHandler.getPlayerById(from);
+        Player initiator = playerHandler.getPlayerById(msg.getInitiatorId());
         
-        
-        Player receiver = playerHandler.getPlayerById(tradeHandler.getReceiver().getId());
-        Player sender = playerHandler.getPlayerById(tradeHandler.getSender().getId());
-        
-        if(msg.isAccepted()) {
-            Set<PropertyField> offered = new HashSet<>();
-
-            for (PropertyField propertyField : tradeHandler.getOfferedProperties()) {
-                offered.add( (PropertyField) boardManager.getFieldAtIndex(propertyField.getId()));
-            }
-
-            Set<PropertyField> requested = new HashSet<>();
-
-            for (PropertyField propertyField : tradeHandler.getRequestedProperties()) {
-                requested.add( (PropertyField) boardManager.getFieldAtIndex(propertyField.getId()));
-            }
-
-            executeTrade(sender, receiver, offered, requested);
-
-            sender.earnMoney(tradeHandler.getRequestedAmount());
-            sender.pay(tradeHandler.getOfferedAmount());
-            receiver.earnMoney(tradeHandler.getOfferedAmount());
-            receiver.pay(tradeHandler.getRequestedAmount());
-
-            for (int i = 0; i < tradeHandler.getOfferedJailCards(); i++) {
-                sender.removeJailCard();
-                receiver.addJailCard();
-            }
-
-            for (int i = 0; i < tradeHandler.getRequestedAmount(); i++) {
-                sender.addJailCard();
-                receiver.removeJailCard();
-            }
-        }
-        updateAllPlayers();
-        
-        if (receiver != null && sender != null) {
-            LOGGER.log(Level.INFO, "Player {0} responded to trade with player {1}", receiver.getName(), sender.getName());
-            send(sender, new TradeReply(msg.isAccepted(), msg.getTradeHandler()));
+        if (responder != null && initiator != null) {
+            LOGGER.log(Level.INFO, "Player {0} responded to trade with player {1}", responder.getName(), initiator.getName());
+            send(initiator, new TradeReply(msg.getInitiatorId(), msg.getTradeHandler()));
         }
     }
 
-    /**
-     * Executes the trade by transferring requested properties from the receiver
-     * to the sender and offered properties from the sender to the receiver.
-     */
-    public void executeTrade(Player sender, Player receiver, Set<PropertyField> requestedProperties, Set<PropertyField> offeredProperties) {
-        // Transfer requested properties from receiver to sender
-        for (PropertyField field : requestedProperties) {
-                receiver.removeProperty(field.getId());
-                sender.addProperty(field.getId());
-                field.setOwner(sender); // Update ownership
-                System.out.printf("Property %s transferred from %s to %s.\n", 
-                                field.getName(), receiver.getName(), sender.getName());
-        }
-
-        // Transfer offered properties from sender to receiver
-        for (PropertyField field : offeredProperties) {
-                sender.removeProperty(field.getId());
-                receiver.addProperty(field.getId());
-                field.setOwner(receiver); // Update ownership
-                System.out.printf("Property %s transferred from %s to %s.\n", 
-                                field.getName(), sender.getName(), receiver.getName());
-            }
-    }
-
-
-
-
     /**
      * Handles a ViewAssetsRequest message, sending the player a response containing their assets.
      *
@@ -335,16 +268,11 @@ public class ServerGameLogic implements ClientInterpreter {
     @Override
     public void received(ViewAssetsRequest msg, int from) {
         Player sender = playerHandler.getPlayerById(from);
-        if (sender != null) {
-            LOGGER.log(Level.DEBUG, "Processing ViewAssetsRequest for player {0}", sender.getName()); 
-            send(sender, new ViewAssetsResponse(boardManager));
-            updateAllPlayers();
-        }
-    }
-
-    private void updateAllPlayers() {
-        for (Player player : playerHandler.getPlayers()) {
-            send(player, new PlayerStatusUpdate(playerHandler));
+        Player player = msg.getPlayer();
+        if (sender != null && player != null) {
+            LOGGER.log(Level.DEBUG, "Processing ViewAssetsRequest for player {0}", sender.getName());
+            
+            send(sender, new ViewAssetsResponse(boardManager, player.getProperties(), player.getAccountBalance(), player.getNumJailCard()));
         }
     }
 

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

@@ -0,0 +1,39 @@
+package pp.monopoly.message.client;
+
+import com.jme3.network.serializing.Serializable;
+
+/**
+ * Represents a request from a player to buy a property.
+ */
+@Serializable
+public class BuyPropertyRequest extends ClientMessage{
+    private int propertyId;
+
+    /**
+     * Default constructor for serialization purposes.
+     */
+    private BuyPropertyRequest() { /* empty */ }
+
+    /**
+     * Constructs a BuyPropertyRequest with the specified property ID.
+     *
+     * @param propertyId the ID of the property to buy
+     */
+    public BuyPropertyRequest(int propertyId) {
+        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) {
+        interpreter.received(this, from);
+    }
+}

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

@@ -1,23 +0,0 @@
-package pp.monopoly.message.client;
-
-import com.jme3.network.serializing.Serializable;
-
-/**
- * Represents a request from a player to buy a property.
- */
-@Serializable
-public class BuyPropertyResponse extends ClientMessage{
-
-    /**
-     * Constructs a BuyPropertyRequest with the specified property ID.
-     *
-     * @param propertyId the ID of the property to buy
-     */
-    public BuyPropertyResponse() {}
-
-
-    @Override
-    public void accept(ClientInterpreter interpreter, int from) {
-        interpreter.received(this, from);
-    }
-}

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

@@ -17,7 +17,7 @@ public interface ClientInterpreter {
      * @param msg  the BuyPropertyRequest to be processed
      * @param from the connection ID from which the message was received
      */
-    void received(BuyPropertyResponse msg, int from);
+    void received(BuyPropertyRequest msg, int from);
 
     /**
      * Processes a received EndTurn.

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.
      */
-    public RollDice() { /* empty */ }
+    private RollDice() { /* empty */ }
 
     @Override
     public void accept(ClientInterpreter interpreter, int from) {

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

@@ -9,6 +9,7 @@ import pp.monopoly.model.TradeHandler;
  */
 @Serializable
 public class TradeOffer extends ClientMessage{
+    private int receiverId;
     private TradeHandler tradehandler;
 
     /**
@@ -22,10 +23,12 @@ public class TradeOffer extends ClientMessage{
      * @param receiverId the ID of the player receiving the Request
      * @param tradehandler the tradehandler
      */
-    public TradeOffer(TradeHandler tradehandler) {
+    public TradeOffer(int receiverId, TradeHandler tradehandler) {
+        this.receiverId = receiverId;
         this.tradehandler = tradehandler;
     }
 
+    public int getReceiverId() { return receiverId; }
     public TradeHandler getTradeHandler() { return tradehandler; }
 
     @Override

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

@@ -9,7 +9,7 @@ import pp.monopoly.model.TradeHandler;
  */
 @Serializable
 public class TradeResponse extends ClientMessage{
-    private boolean status;
+    private int initiatorId;
     private TradeHandler tradeHandler;
 
     /**
@@ -20,15 +20,15 @@ public class TradeResponse extends ClientMessage{
     /**
      * Constructs a TradeResponse with the specified response details.
      *
-     * @param status the ID of the player who initiated the trade
+     * @param initiatorId the ID of the player who initiated the trade
      * @param accepted true if the offer is accepted, false if declined
      */
-    public TradeResponse(boolean status, TradeHandler tradeHandler) {
-        this.status = status;
+    public TradeResponse(int initiatorId, TradeHandler tradeHandler) {
+        this.initiatorId = initiatorId;
         this.tradeHandler = tradeHandler;
     }
 
-    public boolean isAccepted() { return status; }
+    public int getInitiatorId() { return initiatorId; }
     public TradeHandler getTradeHandler() {
         return tradeHandler;
     }

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

@@ -2,13 +2,23 @@ package pp.monopoly.message.client;
 
 import com.jme3.network.serializing.Serializable;
 
+import pp.monopoly.game.server.Player;
+
 /**
  * Represents a request from a player to view their assets.
  */
 @Serializable
 public class ViewAssetsRequest extends ClientMessage{
 
-    public ViewAssetsRequest() {
+    private Player player;
+
+    /**
+     * Default constructor for serialization purposes.
+     */
+    private ViewAssetsRequest() { /* empty */ }
+
+    public ViewAssetsRequest(Player player) {
+        this.player = player;
     }
 
     @Override
@@ -16,4 +26,8 @@ public class ViewAssetsRequest extends ClientMessage{
         interpreter.received(this, from);
     }
 
+    public Player getPlayer() {
+        return player;
+    }
+
 }

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

@@ -1,21 +0,0 @@
-package pp.monopoly.message.server;
-
-import com.jme3.network.serializing.Serializable;
-
-@Serializable
-public class BuyPropertyRequest extends ServerMessage{
-
-    public BuyPropertyRequest(){}
-
-    @Override
-    public void accept(ServerInterpreter interpreter) {
-        interpreter.received(this);
-    }
-
-    @Override
-    public String getInfoTextKey() {
-        // TODO Auto-generated method stub
-        throw new UnsupportedOperationException("Unimplemented method 'getInfoTextKey'");
-    }
-
-}

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

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

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

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

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

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

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

@@ -2,13 +2,20 @@ 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.
      */
-    public NextPlayerTurn() {
+    private NextPlayerTurn() { /* empty */ }
+
+    public NextPlayerTurn(Player player) {
+        this.player = player;
     }
 
     @Override
@@ -21,4 +28,9 @@ 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/NotificationMessage.java

@@ -1,50 +0,0 @@
-package pp.monopoly.message.server;
-
-import com.jme3.network.serializing.Serializable;
-
-@Serializable
-public class NotificationMessage extends ServerMessage{
-
-    private final String keyWord;
-
-    private int rentAmount;
-    private String rentOwner;
-
-    private NotificationMessage(){ keyWord = null;}
-
-    public NotificationMessage(String keyWord) {
-        this.keyWord = keyWord;
-    }
-
-    public int getRentAmount() {
-        return rentAmount;
-    }
-
-    public void setRentAmount(int rentAmount) {
-        this.rentAmount = rentAmount;
-    }
-
-    public void setRentOwnerId(String rentOwnerId) {
-        this.rentOwner = rentOwnerId;
-    }
-
-    public String getRentOwner() {
-        return rentOwner;
-    }
-    
-    public String getKeyWord() {
-        return keyWord;
-    }
-
-    @Override
-    public void accept(ServerInterpreter interpreter) {
-        interpreter.received(this);
-    }
-
-    @Override
-    public String getInfoTextKey() {
-        // TODO Auto-generated method stub
-        throw new UnsupportedOperationException("Unimplemented method 'getInfoTextKey'");
-    }
-
-}

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

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