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

Gui

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

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

@@ -1,5 +1,6 @@
 // Styling of Lemur components
 // For documentation, see:
+// For documentation, see:
 // https://github.com/jMonkeyEngine-Contributions/Lemur/wiki/Styling
 
 import com.jme3.math.ColorRGBA
@@ -11,7 +12,6 @@ import com.simsilica.lemur.Command
 import com.simsilica.lemur.HAlignment
 import com.simsilica.lemur.Insets3f
 import com.simsilica.lemur.component.QuadBackgroundComponent
-import com.simsilica.lemur.component.TbtQuadBackgroundComponent
 
 def bgColor = color(1, 1, 1, 1)
 def buttonEnabledColor = color(0, 0, 0, 1)
@@ -19,7 +19,7 @@ def buttonDisabledColor = color(0.8, 0.9, 1, 0.2)
 def buttonBgColor = color(1, 1, 1, 1)
 def sliderColor = color(0.6, 0.8, 0.8, 1)
 def sliderBgColor = color(0.5, 0.75, 0.75, 1)
-def gradientColor = color(0.5, 0.75, 0.85, 0.5)
+def gradientColor = color(1, 1, 1, 1)
 def tabbuttonEnabledColor = color(0.4, 0.45, 0.5, 1)
 def solidWhiteBackground = new QuadBackgroundComponent(new ColorRGBA(1, 1, 1, 1))
 def greyBackground = new QuadBackgroundComponent(new ColorRGBA(0.1f, 0.1f, 0.1f, 1.0f));
@@ -30,10 +30,8 @@ def lightGrey = color(0.6, 0.6, 0.6, 1.0)
 
 
 def gradient = TbtQuadBackgroundComponent.create(
-        texture(name: "/com/simsilica/lemur/icons/bordered-gradient.png",
+        texture(name: "/com/simsilica/lemur/icons/bordered-gradient.png", generateMips: false),
-                generateMips: false),
+       1, 1, 1, 126, 126, 1f, false)
-        1, 1, 1, 126, 126,
-        1f, false)
 
 def doubleGradient = new QuadBackgroundComponent(gradientColor)
 doubleGradient.texture = texture(name: "/com/simsilica/lemur/icons/double-gradient-128.png",
@@ -79,6 +77,7 @@ selector("header", "pp") {
     textVAlignment = VAlignment.Center
 }
 
+// Container Stil
 selector("container", "pp") {
     background = solidWhiteBackground.clone()
     background.setColor(bgColor)
@@ -91,8 +90,8 @@ selector("toolbar") {
 
 }
 selector("slider", "pp") {
-    background = gradient.clone()
+    insets = new Insets3f(5, 10, 5, 10) // Abstand
-    background.setColor(bgColor)
+    background = new QuadBackgroundComponent(sliderBgColor)
 }
 
 def pressedCommand = new Command<Button>() {
@@ -113,30 +112,6 @@ def enabledCommand = new Command<Button>() {
     }
 }
 
-def repeatCommand = new Command<Button>() {
-    private long startTime
-    private long lastClick
-
-    void execute(Button source) {
-        // Only do the repeating click while the mouse is
-        // over the button (and pressed of course)
-        if (source.isPressed() && source.isHighlightOn()) {
-            long elapsedTime = System.currentTimeMillis() - startTime
-            // After half a second pause, click 8 times a second
-            if (elapsedTime > 500 && elapsedTime > lastClick + 125) {
-                source.click()
-
-                // Try to quantize the last click time to prevent drift
-                lastClick = ((elapsedTime - 500) / 125) * 125 + 500
-            }
-        }
-        else {
-            startTime = System.currentTimeMillis()
-            lastClick = 0
-        }
-    }
-}
-
 def stdButtonCommands = [
         (ButtonAction.Down)    : [pressedCommand],
         (ButtonAction.Up)      : [pressedCommand],

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

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

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

@@ -1,30 +1,26 @@
-////////////////////////////////////////
-// Programming project code
-// UniBw M, 2022, 2023, 2024
-// www.unibw.de/inf2
-// (c) Mark Minas (mark.minas@unibw.de)
-////////////////////////////////////////
-
 package pp.monopoly.client;
 
 import java.lang.System.Logger;
 import java.lang.System.Logger.Level;
 import java.util.prefs.Preferences;
 
+import java.lang.System.Logger;
+import java.lang.System.Logger.Level;
+import java.util.prefs.Preferences;
+
 import com.jme3.app.Application;
 import com.jme3.app.state.AbstractAppState;
 import com.jme3.app.state.AppStateManager;
-import com.jme3.asset.AssetLoadException;
-import com.jme3.asset.AssetNotFoundException;
 import com.jme3.audio.AudioData;
 import com.jme3.audio.AudioNode;
 
+
 import pp.monopoly.notification.GameEventListener;
 import pp.monopoly.notification.SoundEvent;
 import static pp.util.PreferencesUtils.getPreferences;
 
 /**
- * An application state that plays sounds.
+ * An application state that plays sounds based on game events.
  */
 public class GameSound extends AbstractAppState implements GameEventListener {
     private static final Logger LOGGER = System.getLogger(GameSound.class.getName());
@@ -71,7 +67,6 @@ public class GameSound extends AbstractAppState implements GameEventListener {
 
     /**
      * Sets the enabled state of this AppState.
-     * Overrides {@link com.jme3.app.state.AbstractAppState#setEnabled(boolean)}
      *
      * @param enabled {@code true} to enable the AppState, {@code false} to disable it.
      */
@@ -79,16 +74,15 @@ public class GameSound extends AbstractAppState implements GameEventListener {
     public void setEnabled(boolean enabled) {
         if (isEnabled() == enabled) return;
         super.setEnabled(enabled);
-        LOGGER.log(Level.INFO, "Sound enabled: {0}", enabled); //NON-NLS
+        LOGGER.log(Level.INFO, "Sound enabled: {0}", enabled);
         PREFERENCES.putBoolean(ENABLED_PREF, enabled);
     }
 
     /**
-     * Initializes the sound effects for the game.
+     * Initializes the sound effects for the game and stores the application reference.
-     * Overrides {@link AbstractAppState#initialize(AppStateManager, Application)}
      *
      * @param stateManager The state manager
-     * @param app          The application
+     * @param app          The application instance
      */
     @Override
     public void initialize(AppStateManager stateManager, Application app) {
@@ -109,18 +103,16 @@ public class GameSound extends AbstractAppState implements GameEventListener {
     /**
      * Loads a sound from the specified file.
      *
-     * @param app  The application
      * @param name The name of the sound file.
      * @return The loaded AudioNode.
      */
-    private AudioNode loadSound(Application app, String name) {
+    private AudioNode loadSound(String name) {
         try {
-            final AudioNode sound = new AudioNode(app.getAssetManager(), name, AudioData.DataType.Buffer);
+            AudioNode sound = new AudioNode(app.getAssetManager(), name, AudioData.DataType.Buffer);
             sound.setLooping(false);
             sound.setPositional(false);
             return sound;
-        }
+        } catch (Exception ex) {
-        catch (AssetLoadException | AssetNotFoundException ex) {
             LOGGER.log(Level.ERROR, ex.getMessage(), ex);
         }
         return null;
@@ -239,4 +231,4 @@ public class GameSound extends AbstractAppState implements GameEventListener {
             case BUTTON -> button();
         }
     }
-}
+}//heloo

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

@@ -18,6 +18,7 @@ import com.jme3.input.controls.ActionListener;
 import com.jme3.input.controls.KeyTrigger;
 import com.jme3.input.controls.MouseButtonTrigger;
 import com.jme3.system.AppSettings;
+import com.jme3.texture.Texture;
 import com.simsilica.lemur.GuiGlobals;
 import com.simsilica.lemur.Label;
 import com.simsilica.lemur.style.BaseStyles;
@@ -279,7 +280,19 @@ public class MonopolyApp extends SimpleApplication implements MonopolyClient, Ga
     private void handleB(boolean isPressed) {
         if (isPressed) {
             Dialog tmp = new BuyCard(this);
-            tmp.open();
+            if (eventCard != null && isBuyCardPopupOpen) {
+                // Schließe das SettingsMenu
+                System.out.println("Schließe BuyCardPopup...");
+                eventCard.close();
+                eventCard = null;
+                tmp.open();
+            } else {
+                // Öffne das SettingsMenu
+                System.out.println("Öffne BuyCardPopup...");
+                eventCard = new EventCard(this);
+                eventCard.open();
+                dialogManager.close(tmp);
+            }
         }
     }
 
@@ -308,7 +321,6 @@ public class MonopolyApp extends SimpleApplication implements MonopolyClient, Ga
 
         attachGameSound();
         attachGameMusic();
-        stateManager.attach(new GameAppState());
     }
 
     /**
@@ -432,7 +444,6 @@ public class MonopolyApp extends SimpleApplication implements MonopolyClient, Ga
      */
     @Override
     public void receivedEvent(ClientStateEvent event) {
-        stateManager.getState(GameAppState.class).setEnabled(true);
     }
 
     /**

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

@@ -3,8 +3,10 @@ package pp.monopoly.client.gui;
 import com.jme3.scene.Node;
 import com.jme3.scene.Spatial;
 
+
 import pp.monopoly.model.Board;
 import pp.monopoly.model.Item;
+import pp.monopoly.model.Item;
 import pp.monopoly.model.Visitor;
 import pp.monopoly.notification.GameEventListener;
 import pp.monopoly.notification.ItemAddedEvent;
@@ -24,10 +26,14 @@ abstract class BoardSynchronizer extends ModelViewSynchronizer<Item> implements
      *
      * @param board the game board to synchronize
      * @param root  the root node to which the view representations of the board items are attached
+     * @param board the game board to synchronize
+     * @param root  the root node to which the view representations of the board items are attached
      */
+    protected BoardSynchronizer(Board board, Node root) {
     protected BoardSynchronizer(Board board, Node root) {
         super(root);
         this.board = board;
+        this.board = board;
     }
 
     /**
@@ -42,6 +48,7 @@ abstract class BoardSynchronizer extends ModelViewSynchronizer<Item> implements
     }
 
     /**
+     * Adds the existing items from the board to the view during initialization.
      * Adds the existing items from the board to the view during initialization.
      */
     protected void addExisting() {
@@ -49,26 +56,36 @@ abstract class BoardSynchronizer extends ModelViewSynchronizer<Item> implements
     }
 
     /**
+     * Handles the event when an item is removed from the board.
      * Handles the event when an item is removed from the board.
      *
      * @param event the event indicating that an item has been removed from the board
+     * @param event the event indicating that an item has been removed from the board
      */
     @Override
     public void receivedEvent(ItemRemovedEvent event) {
         if (board == event.getBoard()) {
             delete(event.getItem());
         }
+        if (board == event.getBoard()) {
+            delete(event.getItem());
+        }
     }
 
     /**
+     * Handles the event when an item is added to the board.
      * Handles the event when an item is added to the board.
      *
      * @param event the event indicating that an item has been added to the board
+     * @param event the event indicating that an item has been added to the board
      */
     @Override
     public void receivedEvent(ItemAddedEvent event) {
         if (board == event.getBoard()) {
             add(event.getItem());
         }
+        if (board == event.getBoard()) {
+            add(event.getItem());
+        }
     }
 }

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

@@ -6,12 +6,17 @@ import com.jme3.scene.Geometry;
 import com.jme3.scene.shape.Quad;
 import com.jme3.texture.Texture;
 import com.simsilica.lemur.Axis;
+import com.simsilica.lemur.Axis;
 import com.simsilica.lemur.Button;
 import com.simsilica.lemur.Container;
 import com.simsilica.lemur.HAlignment;
+import com.simsilica.lemur.Container;
+import com.simsilica.lemur.HAlignment;
 import com.simsilica.lemur.component.QuadBackgroundComponent;
 import com.simsilica.lemur.component.SpringGridLayout;
 
+import com.simsilica.lemur.component.SpringGridLayout;
+
 import pp.dialog.Dialog;
 import pp.monopoly.client.MonopolyApp;
 import pp.monopoly.notification.Sound;
@@ -20,10 +25,12 @@ import pp.monopoly.notification.Sound;
  * Constructs the startup menu dialog for the Monopoly application.
 import pp.monopoly.client.gui.GameMenu;
  */
+ */
 public class StartMenu extends Dialog {
     private final MonopolyApp app;
 
     /**
+     * Constructs the Startup Menu dialog for the Monopoly application.
      * Constructs the Startup Menu dialog for the Monopoly application.
      *
      * @param app the MonopolyApp instance
@@ -41,8 +48,10 @@ public class StartMenu extends Dialog {
         Geometry background = new Geometry("Background", quad);
         Material backgroundMaterial = new Material(app.getAssetManager(), "Common/MatDefs/Misc/Unshaded.j3md");
         backgroundMaterial.setTexture("ColorMap", backgroundImage);
+        backgroundMaterial.setTexture("ColorMap", backgroundImage);
         background.setMaterial(backgroundMaterial);
         background.setLocalTranslation(0, 0, -1); // Ensure it is behind other GUI elements
+        background.setLocalTranslation(0, 0, -1); // Ensure it is behind other GUI elements
         app.getGuiNode().attachChild(background);
 
         // Center container for title and play button

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

@@ -0,0 +1,80 @@
+package pp.monopoly.client.gui;
+
+import com.jme3.app.SimpleApplication;
+import com.jme3.material.Material;
+import com.jme3.math.Vector3f;
+import com.jme3.scene.Geometry;
+import com.jme3.scene.shape.Box;
+import com.jme3.texture.Texture;
+import com.jme3.system.JmeCanvasContext;
+import com.jme3.system.AppSettings;
+
+import javax.swing.*;
+import java.awt.*;
+import java.awt.event.ActionEvent;
+
+public class TestWorldWithMenu extends SimpleApplication {
+
+    public static void createAndShowGUI() {
+        // Create JFrame
+        JFrame frame = new JFrame("Test World with Menu");
+        frame.setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE);
+        frame.setLayout(new BorderLayout());
+        frame.setSize(800, 600);
+
+        // Create Menu Bar
+        JMenuBar menuBar = new JMenuBar();
+        JMenu fileMenu = new JMenu("File");
+        JMenuItem exitItem = new JMenuItem(new AbstractAction("Exit") {
+            @Override
+            public void actionPerformed(ActionEvent e) {
+                System.exit(0);
+            }
+        });
+        fileMenu.add(exitItem);
+        menuBar.add(fileMenu);
+        frame.setJMenuBar(menuBar);
+
+        // Create Canvas for jMonkey
+        AppSettings settings = new AppSettings(true);
+        settings.setWidth(800);
+        settings.setHeight(600);
+
+        TestWorldWithMenu app = new TestWorldWithMenu();
+        app.setSettings(settings);
+        app.createCanvas(); // Create a canvas for embedding
+        JmeCanvasContext ctx = (JmeCanvasContext) app.getContext();
+        ctx.setSystemListener(app);
+        Canvas canvas = ctx.getCanvas();
+        canvas.setSize(800, 600);
+
+        // Add the canvas to JFrame
+        frame.add(canvas, BorderLayout.CENTER);
+
+        // Show the frame
+        frame.setVisible(true);
+
+        // Start the jMonkeyEngine application
+        app.startCanvas();
+    }
+
+    @Override
+    public void simpleInitApp() {
+        // Erstelle ein Quadrat
+        Box box = new Box(1, 0.01f, 1);  // Dünnes Quadrat für die Textur
+        Geometry geom = new Geometry("Box", box);
+
+        // Setze das Material mit Textur
+        Material mat = new Material(assetManager, "Common/MatDefs/Misc/Unshaded.j3md");
+        Texture texture = assetManager.loadTexture("Pictures/board.png"); // Replace with the path to your image
+        mat.setTexture("ColorMap", texture);
+        geom.setMaterial(mat);
+
+        // Füge das Quadrat zur Szene hinzu
+        rootNode.attachChild(geom);
+
+        // Setze die Kameraposition, um das Quadrat zu fokussieren
+        cam.setLocation(new Vector3f(0, 0, 3));  // Kamera auf der Z-Achse, nah am Quadrat
+        cam.lookAt(geom.getLocalTranslation(), Vector3f.UNIT_Y);
+    }
+}

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

@@ -199,10 +199,10 @@ public class ClientGameLogic implements ServerInterpreter, GameEventBroker {
     @Override
     public void received(BuyPropertyResponse msg) {
         if (msg.isSuccessful()) {
-        
+            setInfoText("You successfully bought " + msg.getPropertyName() + "!");
             playSound(Sound.MONEY_LOST);
         } else {
-        
+            setInfoText("Unable to buy " + msg.getPropertyName() + ". Reason: " + msg.getReason());
         }
     }
 
@@ -213,7 +213,7 @@ 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);
     }
@@ -225,7 +225,7 @@ public class ClientGameLogic implements ServerInterpreter, GameEventBroker {
      */
     @Override
     public void received(EventDrawCard msg) {
-    
+        setInfoText("Event card drawn: " + msg.getCardDescription());
         // Kartenlogik
         playSound(Sound.EVENT_CARD);
     }
@@ -238,11 +238,11 @@ public class ClientGameLogic implements ServerInterpreter, GameEventBroker {
     @Override
     public void received(GameOver msg) {
         if (msg.isWinner()) {
-        
+            setInfoText("Congratulations! You have won the game!");
             //Winner popup
             playSound(Sound.WINNER);
         } else {
-        
+            setInfoText("Game over. Better luck next time!");
             // Looser popup
             playSound(Sound.LOSER);
         }
@@ -256,8 +256,8 @@ public class ClientGameLogic implements ServerInterpreter, GameEventBroker {
     @Override
     public void received(GameStart msg) {
         players = msg.getPlayers();
+        setInfoText("The game has started! Good luck!");
         setState(new WaitForTurnState(this));
-        
     }
 
     /**
@@ -268,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!");
         }
     }
 
@@ -283,7 +283,7 @@ public class ClientGameLogic implements ServerInterpreter, GameEventBroker {
     @Override
     public void received(PlayerStatusUpdate msg) {
         
-    
+        setInfoText("Player " + msg.getPlayerName() + " status updated: " + msg.getStatus());
     }
 
     /**
@@ -293,7 +293,7 @@ public class ClientGameLogic implements ServerInterpreter, GameEventBroker {
      */
     @Override
     public void received(TimeOutWarning msg) {
-    
+        setInfoText("Warning! Time is running out. You have " + msg.getRemainingTime() + " seconds left.");
     }
 
     /**
@@ -303,7 +303,7 @@ public class ClientGameLogic implements ServerInterpreter, GameEventBroker {
      */
     @Override
     public void received(ViewAssetsResponse msg) {
-    
+        setInfoText("Your current assets are being displayed.");
     }
 
     /**
@@ -314,10 +314,10 @@ public class ClientGameLogic implements ServerInterpreter, GameEventBroker {
     @Override
     public void received(TradeReply msg) {
         if (msg.getTradeHandler().getStatus()) {
-        
+            setInfoText("Trade accepted by " + msg.getTradeHandler().getReceiver().getName() + ".");
             playSound(Sound.TRADE_ACCEPTED);
         } else {
-        
+            setInfoText("Trade rejected by " + msg.getTradeHandler().getReceiver().getName() + ".");
             playSound(Sound.TRADE_REJECTED);
         }
     }
@@ -329,7 +329,7 @@ public class ClientGameLogic implements ServerInterpreter, GameEventBroker {
      */
     @Override
     public void received(TradeRequest msg) {
-    
+        setInfoText("Trade offer received from " + msg.getTradeHandler().getSender().getName());
         // playSound(Sound.TRADE_REQUEST); no sound effect
         // notifyListeners();
     }
@@ -341,8 +341,7 @@ public class ClientGameLogic implements ServerInterpreter, GameEventBroker {
      */
     @Override
     public void received(NextPlayerTurn msg) {
-    
+        setInfoText("It's your turn!");
-        System.out.println("Du bsit am zug message empfangen");
         setState(new ActiveState(this));
     }
 }

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

@@ -175,7 +175,7 @@ public class ServerGameLogic implements ClientInterpreter {
                 LOGGER.log(Level.DEBUG, "Ending turn for player {0}", player.getName());
                 Player next = playerHandler.nextPlayer();
                 next.setActive();
-                send(next, new NextPlayerTurn());
+                send(next, new NextPlayerTurn(next));
             }
         }
     }
@@ -207,7 +207,7 @@ public class ServerGameLogic implements ClientInterpreter {
                send(p, new GameStart(playerHandler.getPlayers())); 
             }
             playerHandler.randomOrder();
-            send(playerHandler.getPlayerAtIndex(0), new NextPlayerTurn());
+            send(playerHandler.getPlayerAtIndex(0), new NextPlayerTurn(playerHandler.getPlayerAtIndex(0)));
         }
     }
 

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/model/fields/BuildingProperty.java

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

@@ -1,26 +1,25 @@
-////////////////////////////////////////
-// Programming project code
-// UniBw M, 2022, 2023, 2024
-// www.unibw.de/inf2
-// (c) Mark Minas (mark.minas@unibw.de)
-////////////////////////////////////////
-
 package pp.monopoly.notification;
 
 /**
- * Event when an item is added to a map.
+ * Event when a sound needs to be played.
  *
- * @param sound the sound to be played
+ * @param soundFileName the sound file to be played
  */
-public record SoundEvent(Sound sound) implements GameEvent {
+public class SoundEvent implements GameEvent {
+    private final String soundFileName;
+
+    public SoundEvent(Sound sound) {
+        this.soundFileName = sound.getFileName(); // Angenommen, Sound hat eine Methode getFileName()
+    }
+
+    public String getSoundFileName() {
+        return soundFileName;
+    }
 
-    /**
-     * Notifies the game event listener of this event.
-     *
-     * @param listener the game event listener
-     */
     @Override
     public void notifyListener(GameEventListener listener) {
         listener.receivedEvent(this);
     }
 }
+
+

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

@@ -43,18 +43,6 @@ import pp.monopoly.message.server.ServerMessage;
 import pp.monopoly.model.Figure;
 import pp.monopoly.model.IntPoint;
 import pp.monopoly.model.LimitedLinkedList;
-import pp.monopoly.model.fields.BuildingProperty;
-import pp.monopoly.model.fields.EventField;
-import pp.monopoly.model.fields.Field;
-import pp.monopoly.model.fields.FieldColor;
-import pp.monopoly.model.fields.FineField;
-import pp.monopoly.model.fields.FoodField;
-import pp.monopoly.model.fields.GateField;
-import pp.monopoly.model.fields.GoField;
-import pp.monopoly.model.fields.GulagField;
-import pp.monopoly.model.fields.PropertyField;
-import pp.monopoly.model.fields.TestStreckeField;
-import pp.monopoly.model.fields.WacheField;
 
 /**
  * Server implementing the visitor pattern as MessageReceiver for ClientMessages
@@ -141,19 +129,7 @@ public class MonopolyServer implements MessageListener<HostedConnection>, Connec
         Serializer.registerClass(NextPlayerTurn.class);
         Serializer.registerClass(Player.class);
         Serializer.registerClass(Figure.class);
-        // Serializer.registerClass(PlayerHandler.class);
+        Serializer.registerClass(PlayerHandler.class);
-        // Serializer.registerClass(BuildingProperty.class);
-        // Serializer.registerClass(EventField.class);
-        // Serializer.registerClass(Field.class);
-        // // Serializer.registerClass(FieldColor.class);
-        // Serializer.registerClass(FineField.class);
-        // Serializer.registerClass(FoodField.class);
-        // Serializer.registerClass(GateField.class);
-        // Serializer.registerClass(GoField.class);
-        // Serializer.registerClass(GulagField.class);
-        // Serializer.registerClass(PropertyField.class);
-        // Serializer.registerClass(TestStreckeField.class);
-        // Serializer.registerClass(WacheField.class);
     }
 
     private void registerListeners() {