changed settings menu to match

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

@@ -18,10 +18,11 @@ import com.simsilica.lemur.style.ElementId;
 
 import static pp.battleship.Resources.lookup;
 import pp.battleship.client.gui.GameMusic;
-import pp.battleship.client.gui.VolumeSlider;
 import pp.dialog.Dialog;
 import pp.dialog.StateCheckboxModel;
 import pp.dialog.TextInputDialog;
+import pp.monopoly.client.gui.VolumeSlider;
+
 import static pp.util.PreferencesUtils.getPreferences;
 
 /**

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

@@ -1,51 +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.util.prefs.Preferences;
-
-import pp.dialog.Dialog;
-import static pp.util.PreferencesUtils.getPreferences;
-
-/**
- * The Menu class represents the main menu in the Battleship game application.
- * It extends the Dialog class and provides functionalities for loading, saving,
- * returning to the game, and quitting the application.
- */
-class Menu extends Dialog {
-    private static final Preferences PREFERENCES = getPreferences(Menu.class);
-    private static final String LAST_PATH = "last.file.path";
-    private final MonopolyApp app;
-
-
-    /**
-     * Constructs the Menu dialog for the Battleship application.
-     *
-     * @param app the BattleshipApp instance
-     */
-    public Menu(MonopolyApp app) {
-        super(app.getDialogManager());
-        this.app = app;
-    }
-
-    /**
-     * Updates the state of the load and save buttons based on the game logic.
-     */
-    @Override
-    public void update() {
-
-    }
-
-    /**
-     * As an escape action, this method closes the menu if it is the top dialog.
-     */
-    @Override
-    public void escape() {
-        close();
-    }
-}

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

@@ -1,85 +1,381 @@
+////////////////////////////////////////
+// Programming project code
+// UniBw M, 2022, 2023, 2024
+// www.unibw.de/inf2
+// (c) Mark Minas (mark.minas@unibw.de)
+////////////////////////////////////////
+
 package pp.monopoly.client;
 
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.Executors;
-
+import com.jme3.app.DebugKeysAppState;
 import com.jme3.app.SimpleApplication;
+import com.jme3.app.StatsAppState;
 import com.jme3.font.BitmapFont;
 import com.jme3.font.BitmapText;
 import com.jme3.input.KeyInput;
+import com.jme3.input.MouseInput;
 import com.jme3.input.controls.ActionListener;
 import com.jme3.input.controls.KeyTrigger;
+import com.jme3.input.controls.MouseButtonTrigger;
 import com.jme3.system.AppSettings;
 import com.simsilica.lemur.GuiGlobals;
 import com.simsilica.lemur.style.BaseStyles;
-
+import pp.monopoly.game.client.MonopolyClient;
+import pp.monopoly.client.gui.SettingsMenu;
+import pp.monopoly.game.client.ClientGameLogic;
+import pp.monopoly.game.client.ServerConnection;
+import pp.monopoly.notification.ClientStateEvent;
+import pp.monopoly.notification.GameEventListener;
+import pp.monopoly.notification.InfoTextEvent;
 import pp.dialog.DialogBuilder;
 import pp.dialog.DialogManager;
 import pp.graphics.Draw;
-import pp.monopoly.client.gui.*;
-import pp.monopoly.client.gui.popups.BuildingPropertyCard;
-import pp.monopoly.client.gui.popups.BuyCard;
-import pp.monopoly.client.gui.popups.FoodFieldCard;
-import pp.monopoly.client.gui.popups.GateFieldCard;
-import pp.monopoly.game.client.ClientGameLogic;
-import pp.monopoly.game.client.MonopolyClient;
-import pp.monopoly.game.client.ServerConnection;
-import pp.monopoly.model.fields.BoardManager;
-import pp.monopoly.notification.GameEventListener;
-import pp.monopoly.notification.InfoTextEvent;
+
+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.
+ * It manages the initialization, input setup, GUI setup, and game states for the client.
+ */
 public class MonopolyApp extends SimpleApplication implements MonopolyClient, GameEventListener {
 
-    private BitmapText topText;
-    private final ServerConnection serverConnection;
-    private final ClientGameLogic logic;
-    private final MonopolyAppConfig config;
-    private final ActionListener escapeListener = (name, isPressed, tpf) -> handleEscape(isPressed);
-    private final DialogManager dialogManager = new DialogManager(this);
-    private ExecutorService executor;
-    private final Draw draw;
-    private SettingsMenu settingsMenu;
-    private TestWorld testWorld;
-    private boolean isSettingsMenuOpen = false;
-    private boolean inputBlocked = false;
-    private NetworkSupport networkSupport;
-    private BoardManager boardManager = new BoardManager();
-
-    // TODO Temp später entfernen
-
-    private BuildingPropertyCard buildingProperty;
-    private FoodFieldCard foodField;
-    private GateFieldCard gateField;
-    private BuyCard buyCard;
-    private boolean isBuyCardPopupOpen = false;
-    private final ActionListener BListener = (name, isPressed, tpf) -> handleB(isPressed);
+    /**
+     * Logger for logging messages within the application.
+     */
+    private static final Logger LOGGER = System.getLogger(MonopolyApp.class.getName());
 
     /**
      * Path to the styles script for GUI elements.
      */
-    private static final String STYLES_SCRIPT = "Interface/Lemur/pp-styles.groovy"; // NON-NLS
+    private static final String STYLES_SCRIPT = "Interface/Lemur/pp-styles.groovy"; //NON-NLS
+
     /**
      * Path to the font resource used in the GUI.
      */
-    private static final String FONT = "Interface/Fonts/Default.fnt"; // NON-NLS
+    private static final String FONT = "Interface/Fonts/Default.fnt"; //NON-NLS
 
+    /**
+     * Path to the client configuration file, if one exists.
+     */
+    private static final File CONFIG_FILE = new File("client.properties");
+
+    /**
+     * Input mapping name for mouse clicks.
+     */
+    public static final String CLICK = "CLICK";
+
+    /**
+     * Input mapping name for the Escape key.
+     */
+    private static final String ESC = "ESC";
+
+    /**
+     * Manager for handling dialogs within the application.
+     */
+    private final DialogManager dialogManager = new DialogManager(this);
+
+    /**
+     * The server connection instance, used for communicating with the game server.
+     */
+    private final ServerConnection serverConnection;
+
+    /**
+     * Instance of the {@link Draw} class for rendering graphics.
+     */
+    private Draw draw;
+
+    /**
+     * Text display at the top of the GUI for showing information to the user.
+     */
+    private BitmapText topText;
+
+    /**
+     * Executor service for handling asynchronous tasks within the application.
+     */
+    private ExecutorService executor;
+
+    /**
+     * Handler for managing the client's game logic.
+     */
+    private final ClientGameLogic logic;
+
+    /**
+     * Configuration settings for the Battleship client application.
+     */
+    private final MonopolyAppConfig config;
+
+    /**
+     * Listener for handling actions triggered by the Escape key.
+     */
+    private final ActionListener escapeListener = (name, isPressed, tpf) -> escape(isPressed);
+
+    static {
+        // Configure logging
+        LogManager manager = LogManager.getLogManager();
+        try {
+            manager.readConfiguration(new FileInputStream("logging.properties"));
+            LOGGER.log(Level.INFO, "Successfully read logging properties"); //NON-NLS
+        }
+        catch (IOException e) {
+            LOGGER.log(Level.INFO, e.getMessage());
+        }
+    }
+
+    /**
+     * Starts the Battleship application.
+     *
+     * @param args Command-line arguments for launching the application.
+     */
     public static void main(String[] args) {
         new MonopolyApp().start();
     }
 
-    public MonopolyApp() {
-        this.draw = new Draw(assetManager);
+    /**
+     * Constructs a new {@code MonopolyApp} instance.
+     * Initializes the configuration, server connection, and game logic listeners.
+     */
+    private MonopolyApp() {
         config = new MonopolyAppConfig();
-        serverConnection = new NetworkSupport(this); // Initialize NetworkSupport
+        config.readFromIfExists(CONFIG_FILE);
+        serverConnection = makeServerConnection();
         logic = new ClientGameLogic(serverConnection);
         logic.addListener(this);
         setShowSettings(config.getShowSettings());
         setSettings(makeSettings());
     }
 
-        /**
+    /**
+     * Creates and configures application settings from the client configuration.
+     *
+     * @return A configured {@link AppSettings} object.
+     */
+    private AppSettings makeSettings() {
+        final AppSettings settings = new AppSettings(true);
+        settings.setTitle(lookup("monopoly.name"));
+        settings.setResolution(config.getResolutionWidth(), config.getResolutionHeight());
+        settings.setFullscreen(config.fullScreen());
+        settings.setUseRetinaFrameBuffer(config.useRetinaFrameBuffer());
+        settings.setGammaCorrection(config.useGammaCorrection());
+        return settings;
+    }
+
+    /**
+     * Factory method for creating a server connection based on the current
+     * client configuration.
+     *
+     * @return A {@link ServerConnection} instance, which could be a real or mock server.
+     */
+    private ServerConnection makeServerConnection() {
+        return new NetworkSupport(this);
+    }
+
+    /**
+     * Returns the dialog manager responsible for managing in-game dialogs.
+     *
+     * @return The {@link DialogManager} instance.
+     */
+    public DialogManager getDialogManager() {
+        return dialogManager;
+    }
+
+    /**
+     * Returns the game logic handler for the client.
+     *
+     * @return The {@link ClientGameLogic} instance.
+     */
+    @Override
+    public ClientGameLogic getGameLogic() {
+        return logic;
+    }
+
+    /**
+     * Returns the current configuration settings for the Battleship client.
+     *
+     * @return The {@link BattleshipClientConfig} instance.
+     */
+    @Override
+    public MonopolyAppConfig getConfig() {
+        return config;
+    }
+
+    /**
+     * Initializes the application.
+     * Sets up input mappings, GUI, game states, and connects to the server.
+     */
+    @Override
+    public void simpleInitApp() {
+        setPauseOnLostFocus(false);
+        draw = new Draw(assetManager);
+        setupInput();
+        setupStates();
+        setupGui();
+        // serverConnection.connect();
+    }
+
+    /**
+     * Sets up the graphical user interface (GUI) for the application.
+     */
+    private void setupGui() {
+        GuiGlobals.initialize(this);
+        BaseStyles.loadStyleResources(STYLES_SCRIPT);
+        GuiGlobals.getInstance().getStyles().setDefaultStyle("pp"); //NON-NLS
+        final BitmapFont normalFont = assetManager.loadFont(FONT); //NON-NLS
+        topText = new BitmapText(normalFont);
+        final int height = context.getSettings().getHeight();
+        topText.setLocalTranslation(10f, height - 10f, 0f);
+        topText.setColor(config.getTopColor());
+        guiNode.attachChild(topText);
+    }
+
+    /**
+     * Configures input mappings and sets up listeners for user interactions.
+     */
+    private void setupInput() {
+        inputManager.deleteMapping(INPUT_MAPPING_EXIT);
+        inputManager.setCursorVisible(false);
+        inputManager.addMapping(ESC, new KeyTrigger(KeyInput.KEY_ESCAPE));
+        inputManager.addMapping(CLICK, new MouseButtonTrigger(MouseInput.BUTTON_LEFT));
+        inputManager.addListener(escapeListener, ESC);
+    }
+
+    /**
+     * Initializes and attaches the necessary application states for the game.
+     */
+    private void setupStates() {
+        if (config.getShowStatistics()) {
+            final BitmapFont normalFont = assetManager.loadFont(FONT); //NON-NLS
+            final StatsAppState stats = new StatsAppState(guiNode, normalFont);
+            stateManager.attach(stats);
+        }
+        flyCam.setEnabled(false);
+        stateManager.detach(stateManager.getState(StatsAppState.class));
+        stateManager.detach(stateManager.getState(DebugKeysAppState.class));
+
+        attachGameSound();
+        attachGameMusic();
+    }
+
+    /**
+     * Attaches the game sound state and sets its initial enabled state.
+     */
+    private void attachGameSound() {
+        final GameSound gameSound = new GameSound();
+        logic.addListener(gameSound);
+        gameSound.setEnabled(GameSound.enabledInPreferences());
+        stateManager.attach(gameSound);
+    }
+
+    /**
+     * Attaches the background music state and sets its initial enabled state.
+     */
+    private void attachGameMusic() {
+        final GameMusic gameSound = new GameMusic();
+        gameSound.setEnabled(GameMusic.enabledInPreferences());
+        stateManager.attach(gameSound);
+    }
+
+    /**
+     * Updates the application state every frame.
+     * This method is called once per frame during the game loop.
+     *
+     * @param tpf Time per frame in seconds.
+     */
+    @Override
+    public void simpleUpdate(float tpf) {
+        super.simpleUpdate(tpf);
+        dialogManager.update(tpf);
+        logic.update(tpf);
+    }
+
+    /**
+     * Handles the Escape key action to either close the top dialog or show the main menu.
+     *
+     * @param isPressed Indicates whether the Escape key is pressed.
+     */
+    private void escape(boolean isPressed) {
+        if (!isPressed) return;
+        if (dialogManager.showsDialog())
+            dialogManager.escape();
+        else
+            new SettingsMenu(this).open();
+    }
+
+    /**
+     * Returns the {@link Draw} instance used for rendering graphical elements in the game.
+     *
+     * @return The {@link Draw} instance.
+     */
+    public Draw getDraw() {
+        return draw;
+    }
+
+    /**
+     * Handles a request to close the application.
+     * If the request is initiated by pressing ESC, this parameter is true.
+     *
+     * @param esc If true, the request is due to the ESC key being pressed.
+     */
+    @Override
+    public void requestClose(boolean esc) { /* do nothing */ }
+
+    /**
+     * Closes the application, displaying a confirmation dialog if the client is connected to a server.
+     */
+    public void closeApp() {
+        if (serverConnection.isConnected())
+            confirmDialog(lookup("confirm.leaving"), this::close);
+        else
+            close();
+    }
+
+    /**
+     * Closes the application, disconnecting from the server and stopping the application.
+     */
+    private void close() {
+        serverConnection.disconnect();
+        stop();
+    }
+
+    /**
+     * Updates the informational text displayed in the GUI.
+     *
+     * @param text The information text to display.
+     */
+    public void setInfoText(String text) {
+        LOGGER.log(Level.DEBUG, "setInfoText {0}", text); //NON-NLS
+        topText.setText(text);
+    }
+
+    /**
+     * Updates the informational text in the GUI based on the key received in an {@link InfoTextEvent}.
+     *
+     * @param event The {@link InfoTextEvent} containing the key for the text to display.
+     */
+    @Override
+    public void receivedEvent(InfoTextEvent event) {
+        LOGGER.log(Level.DEBUG, "received info text {0}", event.key()); //NON-NLS
+        setInfoText(lookup(event.key()));
+    }
+
+    /**
+     * Handles client state events to update the game states accordingly.
+     *
+     * @param event The {@link ClientStateEvent} representing the state change.
+     */
+    @Override
+    public void receivedEvent(ClientStateEvent event) {
+    }
+
+    /**
      * Returns the executor service used for handling multithreaded tasks.
      *
      * @return The {@link ExecutorService} instance.
@@ -101,183 +397,33 @@ public class MonopolyApp extends SimpleApplication implements MonopolyClient, Ga
         super.stop(waitFor);
     }
 
-    @Override
-    public MonopolyAppConfig getConfig() {
-        return config;
-    }
-
-    @Override
-    public ClientGameLogic getGameLogic() {
-        return logic;
-    }
-
-    public BoardManager getBoardManager() {
-        return boardManager;
-    }
-
-    public NetworkSupport getNetworkSupport() {
-        return networkSupport;
-    }
-
-    private AppSettings makeSettings() {
-        final AppSettings settings = new AppSettings(true);
-        settings.setTitle("Monopoly Game");
-        settings.setResolution(config.getResolutionWidth(), config.getResolutionHeight());
-        settings.setFullscreen(config.fullScreen());
-        return settings;
-    }
-
-    @Override
-    public void simpleInitApp() {
-        GuiGlobals.initialize(this);
-        BaseStyles.loadStyleResources(STYLES_SCRIPT);
-        GuiGlobals.getInstance().getStyles().setDefaultStyle("pp"); // NON-NLS
-        BaseStyles.loadStyleResources("com/simsilica/lemur/style/base/glass-styles.groovy");
-        GuiGlobals.getInstance().getStyles();
-        final BitmapFont normalFont = assetManager.loadFont(FONT); // NON-NLS
-
-        setupInput();
-        setupGui();
-
-        // Zeige das Startmenü
-        StartMenu.createStartMenu(this);
-    }
-
-    private void setupGui() {
-        BitmapFont normalFont = assetManager.loadFont("Interface/Fonts/Default.fnt");
-        topText = new BitmapText(normalFont);
-        topText.setLocalTranslation(10, settings.getHeight() - 10, 0);
-        guiNode.attachChild(topText);
-    }
-
-    private void setupInput() {
-        inputManager.deleteMapping(INPUT_MAPPING_EXIT);
-        inputManager.setCursorVisible(true);
-        inputManager.addMapping("ESC", new KeyTrigger(KeyInput.KEY_ESCAPE));
-        inputManager.addListener(escapeListener, "ESC");
-
-        inputManager.addMapping("B", new KeyTrigger(KeyInput.KEY_B));
-        inputManager.addListener(BListener, "B");
-    }
-
-    private void handleEscape(boolean isPressed) {
-        if (isPressed) {
-            if (settingsMenu != null && isSettingsMenuOpen) {
-                // Schließe das SettingsMenu
-                System.out.println("Schließe SettingsMenu...");
-                settingsMenu.close();
-                settingsMenu = null;
-                setSettingsMenuOpen(false);
-            } else {
-                // Öffne das SettingsMenu
-                System.out.println("Öffne SettingsMenu...");
-                settingsMenu = new SettingsMenu(this);
-                settingsMenu.open();
-                setSettingsMenuOpen(true);
-            }
-        }
-    }
-
-    //logik zum wechselnden erscheinen und verschwinden beim drücken von B //TODO süäter entfernen
-    private void handleB(boolean isPressed) {
-        if (isPressed) {
-            if (gateField != null && isBuyCardPopupOpen) {
-                // Schließe das SettingsMenu
-                System.out.println("Schließe BuyCardPopup...");
-                gateField.close();
-                gateField = null;
-                setBuyCardPopupOpen(false);
-            } else {
-                // Öffne das SettingsMenu
-                System.out.println("Öffne BuyCardPopup...");
-                gateField = new GateFieldCard(this);
-                gateField.open();
-                setBuyCardPopupOpen(true);
-            }
-        }
-    }
-
-    private void blockInputs() {
-        if (!inputBlocked) {
-            System.out.println("Blockiere Eingaben...");
-            inputManager.setCursorVisible(true); // Cursor sichtbar machen
-            inputManager.clearMappings(); // Alle Mappings entfernen
-            inputBlocked = true;
-        }
-    }
-
-    public void unblockInputs() {
-        if (inputBlocked) {
-            System.out.println("Aktiviere Eingaben...");
-            setupInput(); // Standard-Eingaben neu registrieren
-            inputBlocked = false;
-        }
-    }
-
-    public void setInfoText(String text) {
-        topText.setText(text);
-    }
-
-    @Override
-    public void receivedEvent(InfoTextEvent event) {
-        setInfoText(event.key());
-    }
-
-    public DialogManager getDialogManager() {
-        return dialogManager;
-    }
-
-    public Draw getDraw() {
-        return draw;
-    }
-
-    public void closeApp() {
-        stop();
+    /**
+     * Displays a confirmation dialog with a specified question and action for the "Yes" button.
+     *
+     * @param question  The question to display in the dialog.
+     * @param yesAction The action to perform if "Yes" is selected.
+     */
+    public void confirmDialog(String question, Runnable yesAction) {
+        DialogBuilder.simple(dialogManager)
+                     .setTitle(lookup("dialog.question"))
+                     .setText(question)
+                     .setOkButton(lookup("button.yes"), yesAction)
+                     .setNoButton(lookup("button.no"))
+                     .build()
+                     .open();
     }
 
+    /**
+     * Displays an error dialog with the specified error message.
+     *
+     * @param errorMessage The error message to display in the dialog.
+     */
     public void errorDialog(String errorMessage) {
         DialogBuilder.simple(dialogManager)
-                .setTitle("Fehler")
-                .setText(errorMessage)
-                .setOkButton("OK")
-                .build()
-                .open();
-    }
-
-    public void setSettingsMenuOpen(boolean isOpen) {
-        this.isSettingsMenuOpen = isOpen;
-    }
-
-    // TODO später entfernen
-
-    public void setBuyCardPopupOpen(boolean isOpen) {
-        this.isBuyCardPopupOpen = isOpen;
-    }
-
-    @Override
-    public void simpleUpdate(float tpf) {
-        if (testWorld != null) {
-            testWorld.update(tpf); // Aktualisiere die Kamera in der TestWorld
-        }
-    }
-
-    public void startTestWorld() {
-        guiNode.detachAllChildren(); // Entferne GUI
-        testWorld = new TestWorld(this); // Erstelle eine Instanz von TestWorld
-        testWorld.initializeScene(); // Initialisiere die Szene
-    }
-
-    // TODO später entfernen
-
-    public void startBuyCard() {
-    }
-
-    public void returnToMenu() {
-        guiNode.detachAllChildren(); // Entferne die GUI
-        StartMenu.createStartMenu(this); // Zeige das Startmenü erneut
-    }
-
-    public ServerConnection getServerConnection() {
-        return serverConnection;
+                     .setTitle(lookup("dialog.error"))
+                     .setText(errorMessage)
+                     .setOkButton(lookup("button.ok"))
+                     .build()
+                     .open();
     }
 }

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

@@ -161,7 +161,7 @@ public class StartMenu extends Dialog {
      */
     private static void startGame(MonopolyApp app) {
         app.getGuiNode().detachAllChildren();
-        app.getServerConnection().connect();
+        // app.getServerConnection().connect();
     }
 
     /**

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

@@ -214,7 +214,7 @@ public class LobbyMenu {
         app.getGuiNode().detachChild(circle);
         app.getGuiNode().detachChild(lowerLeftMenu);
         app.getGuiNode().detachChild(lowerRightMenu);
-        app.getServerConnection().connect();
+        // app.getServerConnection().connect();
     }
 
     /**

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

@@ -1,123 +1,79 @@
+////////////////////////////////////////
+// Programming project code
+// UniBw M, 2022, 2023, 2024
+// www.unibw.de/inf2
+// (c) Mark Minas (mark.minas@unibw.de)
+////////////////////////////////////////
+
 package pp.monopoly.client.gui;
 
-import 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 java.util.prefs.Preferences;
+
 import com.simsilica.lemur.Button;
 import com.simsilica.lemur.Checkbox;
-import com.simsilica.lemur.Container;
 import com.simsilica.lemur.Label;
-import com.simsilica.lemur.Slider;
-import com.simsilica.lemur.component.QuadBackgroundComponent;
 import com.simsilica.lemur.style.ElementId;
-import com.simsilica.lemur.ValueRenderer;
 
-import com.simsilica.lemur.Selector;
-import pp.dialog.Dialog;
+import static pp.monopoly.Resources.lookup;
+import pp.monopoly.client.GameMusic;
+import pp.monopoly.client.GameSound;
 import pp.monopoly.client.MonopolyApp;
+import pp.dialog.Dialog;
+import pp.dialog.StateCheckboxModel;
+import static pp.util.PreferencesUtils.getPreferences;
 
 /**
- * SettingsMenu ist ein Overlay-Menü, das durch ESC aufgerufen werden kann.
+ * The Menu class represents the main menu in the Battleship game application.
+ * It extends the Dialog class and provides functionalities for loading, saving,
+ * returning to the game, and quitting the application.
  */
 public class SettingsMenu extends Dialog {
+    private static final Preferences PREFERENCES = getPreferences(SettingsMenu.class);
+    private static final String LAST_PATH = "last.file.path";
     private final MonopolyApp app;
-    private final Geometry overlayBackground;
-    private final Container settingsContainer;
-    private final Container backgroundContainer;
+    private final VolumeSlider slider;
 
+    /**
+     * Constructs the Menu dialog for the Battleship application.
+     *
+     * @param app the MonopolyApp instance
+     */
     public SettingsMenu(MonopolyApp app) {
         super(app.getDialogManager());
         this.app = app;
+        slider = new VolumeSlider(app.getStateManager().getState(GameMusic.class));
+        addChild(new Label("Einstellungen", new ElementId("header"))); //NON-NLS
+        addChild(new Label("Sound Effekte", new ElementId("label"))); //NON-NLS
+        addChild(new Checkbox("Soundeffekte an / aus", new StateCheckboxModel(app, GameSound.class)));
+        
+        addChild(new Label("Hintergrund Musik", new ElementId("label"))); //NON-NLS
+        addChild(new Checkbox("Musik an / aus", new StateCheckboxModel(app, GameMusic.class)));
+        
+        addChild(slider);
 
-        // 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 das Menü
-        settingsContainer = new Container();
-        settingsContainer.setBackground(new QuadBackgroundComponent(new ColorRGBA(0.1f, 0.1f, 0.1f, 0.9f)));
-
-
-
-        // Titel
-        Label settingsTitle = settingsContainer.addChild(new Label("Einstellungen", new ElementId("settings-title")));
-        settingsTitle.setFontSize(48);
-
-        // Effekt-Sound: Slider und Checkbox
-        Container effectSoundContainer = settingsContainer.addChild(new Container());
-        effectSoundContainer.addChild(new Label("Effekt Sound", new ElementId("label")));
-        effectSoundContainer.addChild(new Slider());
-        effectSoundContainer.addChild(new Checkbox("Soundeffekte an")).setChecked(true);
-        effectSoundContainer.setBackground(new QuadBackgroundComponent(new ColorRGBA(0.4657f, 0.4735f, 0.4892f, 1.0f)));
-        // Hintergrundmusik: Slider und Checkbox
-        Container backgroundMusicContainer = settingsContainer.addChild(new Container());
-        backgroundMusicContainer.addChild(new Label("Hintergrund Musik", new ElementId("label")));
-        backgroundMusicContainer.addChild(new Slider());
-        backgroundMusicContainer.addChild(new Checkbox("Musik an")).setChecked(true);
-        backgroundMusicContainer.setBackground(new QuadBackgroundComponent(new ColorRGBA(0.4657f, 0.4735f, 0.4892f, 1.0f)));
-
-        // Beenden-Button
-        Button quitButton = settingsContainer.addChild(new Button("Beenden", new ElementId("menu-button")));
-        quitButton.setFontSize(32);
-        quitButton.addClickCommands(source -> app.stop());
-
-        float padding = 10; // Padding around the settingsContainer for the background
-        backgroundContainer.setPreferredSize(settingsContainer.getPreferredSize().addLocal(padding, padding, 0));
-
-
-        // Zentriere das Menü
-        settingsContainer.setLocalTranslation(
-            (app.getCamera().getWidth() - settingsContainer.getPreferredSize().x) / 2,
-            (app.getCamera().getHeight() + settingsContainer.getPreferredSize().y) / 2,
-            4
-        );
-
-        backgroundContainer.setLocalTranslation(
-                (app.getCamera().getWidth() - settingsContainer.getPreferredSize().x - padding) / 2,
-                (app.getCamera().getHeight() + settingsContainer.getPreferredSize().y+ padding) / 2,
-                3
-        );
-
-        app.getGuiNode().attachChild(settingsContainer);
+        addChild(new Button("Zurück zum Spiel")).addClickCommands(s -> ifTopDialog(this::close));
+        addChild(new Button("Beenden")).addClickCommands(s -> ifTopDialog(app::closeApp));
+        
+        update();
     }
 
     /**
-     * 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.
+     * Updates the state of the load and save buttons based on the game logic.
      */
     @Override
-    public void close() {
-        System.out.println("Schließe SettingsMenu..."); // Debugging-Ausgabe
-        app.getGuiNode().detachChild(settingsContainer);  // Entferne das Menü
-        app.getGuiNode().detachChild(backgroundContainer); //Entfernt Rand
-        app.getGuiNode().detachChild(overlayBackground);  // Entferne das Overlay
-        app.setSettingsMenuOpen(false);                  // Menü als geschlossen markieren
-        app.unblockInputs();                             // Eingaben wieder aktivieren
-        System.out.println("SettingsMenu geschlossen."); // Debugging-Ausgabe
+    public void update() {
     }
 
+    @Override
+    public void update(float delta) {
+        slider.update();
+    }
 
+    /**
+     * As an escape action, this method closes the menu if it is the top dialog.
+     */
+    @Override
+    public void escape() {
+        close();
+    }
 }

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

@@ -1,6 +1,8 @@
-package pp.battleship.client.gui;
+package pp.monopoly.client.gui;
 
 import com.simsilica.lemur.Slider;
+
+import pp.monopoly.client.GameMusic;
 /**
  * The VolumeSlider class represents the Volume Slider in the Menu.
  * It extends the Slider class and provides functionalities for setting the music volume,
@@ -8,7 +10,7 @@ import com.simsilica.lemur.Slider;
  */
 public class VolumeSlider extends Slider {
 
-    private final GameMusic music;
+    private final pp.monopoly.client.GameMusic music;
     private double vol;
 
     /**

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

@@ -30,7 +30,7 @@ public class BuildingPropertyCard extends Dialog {
         this.app = app;
 
         //Generate the corresponfing field
-        BuildingProperty field = (BuildingProperty) app.getBoardManager().getFieldAtIndex(index);
+        BuildingProperty field = (BuildingProperty) app.getGameLogic().getBoardManager().getFieldAtIndex(index);
 
         // Halbtransparentes Overlay hinzufügen
         overlayBackground = createOverlayBackground();
@@ -121,8 +121,8 @@ public class BuildingPropertyCard extends Dialog {
         app.getGuiNode().detachChild(buildingPropertyContainer);  // Entferne das Menü
         app.getGuiNode().detachChild(backgroundContainer); //Entfernt Rand
         app.getGuiNode().detachChild(overlayBackground);  // Entferne das Overlay
-        app.setSettingsMenuOpen(false);                  // Menü als geschlossen markieren
-        app.unblockInputs();                             // Eingaben wieder aktivieren
+        // app.setSettingsMenuOpen(false);                  // Menü als geschlossen markieren
+        // app.unblockInputs();                             // Eingaben wieder aktivieren
         System.out.println("SettingsMenu geschlossen."); // Debugging-Ausgabe
     }
     

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

@@ -107,8 +107,8 @@ public class BuyCard extends Dialog {
         app.getGuiNode().detachChild(settingsContainer);  // Entferne das Menü
         app.getGuiNode().detachChild(backgroundContainer); //Entfernt Rand
         app.getGuiNode().detachChild(overlayBackground);  // Entferne das Overlay
-        app.setSettingsMenuOpen(false);                  // Menü als geschlossen markieren
-        app.unblockInputs();                             // Eingaben wieder aktivieren
+        // app.setSettingsMenuOpen(false);                  // Menü als geschlossen markieren
+        // app.unblockInputs();                             // Eingaben wieder aktivieren
         System.out.println("SettingsMenu geschlossen."); // Debugging-Ausgabe
     }
 

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

@@ -30,7 +30,7 @@ public class FoodFieldCard extends Dialog {
         this.app = app;
 
         //Generate the corresponfing field
-        FoodField field = (FoodField) app.getBoardManager().getFieldAtIndex(index);
+        FoodField field = (FoodField) app.getGameLogic().getBoardManager().getFieldAtIndex(index);
 
         // Halbtransparentes Overlay hinzufügen
         overlayBackground = createOverlayBackground();
@@ -125,8 +125,8 @@ public class FoodFieldCard extends Dialog {
         app.getGuiNode().detachChild(foodFieldContainer);  // Entferne das Menü
         app.getGuiNode().detachChild(backgroundContainer); //Entfernt Rand
         app.getGuiNode().detachChild(overlayBackground);  // Entferne das Overlay
-        app.setSettingsMenuOpen(false);                  // Menü als geschlossen markieren
-        app.unblockInputs();                             // Eingaben wieder aktivieren
+        // app.setSettingsMenuOpen(false);                  // Menü als geschlossen markieren
+        // app.unblockInputs();                             // Eingaben wieder aktivieren
         System.out.println("SettingsMenu geschlossen."); // Debugging-Ausgabe
     }
 

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

@@ -28,7 +28,7 @@ public class GateFieldCard extends Dialog {
         this.app = app;
 
         //Generate the corresponfing field
-        GateField field = (GateField) app.getBoardManager().getFieldAtIndex(index);
+        GateField field = (GateField) app.getGameLogic().getBoardManager().getFieldAtIndex(index);
 
         // Halbtransparentes Overlay hinzufügen
         overlayBackground = createOverlayBackground();
@@ -118,8 +118,8 @@ public class GateFieldCard extends Dialog {
         app.getGuiNode().detachChild(gateFieldContainer);  // Entferne das Menü
         app.getGuiNode().detachChild(backgroundContainer); //Entfernt Rand
         app.getGuiNode().detachChild(overlayBackground);  // Entferne das Overlay
-        app.setSettingsMenuOpen(false);                  // Menü als geschlossen markieren
-        app.unblockInputs();                             // Eingaben wieder aktivieren
+        // app.setSettingsMenuOpen(false);                  // Menü als geschlossen markieren
+        // app.unblockInputs();                             // Eingaben wieder aktivieren
         System.out.println("SettingsMenu geschlossen."); // Debugging-Ausgabe
     }
 

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

@@ -22,6 +22,7 @@ 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.fields.BoardManager;
 import pp.monopoly.notification.ClientStateEvent;
 import pp.monopoly.notification.GameEvent;
 import pp.monopoly.notification.GameEventBroker;
@@ -53,6 +54,8 @@ public class ClientGameLogic implements ServerInterpreter, GameEventBroker {
 
     private PlayerHandler playerHandler;
 
+    private BoardManager boardManager = new BoardManager();
+
     /**
      * Constructs a ClientGameLogic with the specified sender object.
      *
@@ -62,6 +65,14 @@ public class ClientGameLogic implements ServerInterpreter, GameEventBroker {
         this.clientSender = clientSender;
     }
 
+    /**
+     * Reutns the BoardManager
+     * @return the boardManager
+     */
+    public BoardManager getBoardManager() {
+        return boardManager;
+    }
+    
     /**
      * Returns the current state of the game logic.
      *