Added return/quit button to side menu.

HackusatePvP · Jun 14, 2024 · bb3a456 · bb3a456
1 parent a332e95
commit bb3a456
Show file tree

Hide file tree

Showing 2 changed files with 33 additions and 15 deletions.
diff --git a/src/main/java/me/piitex/renjava/RenJava.java b/src/main/java/me/piitex/renjava/RenJava.java
@@ -400,6 +400,18 @@ public Menu buildSideMenu(boolean rightClickedMenu) {
         // You don't have to add the button overlays just add the layout which already contains the overlays.
         menu.addLayout(layout);
 
+        ButtonOverlay returnButton;
+
+
+        if (getStageType() == StageType.MAIN_MENU) {
+            returnButton = new ButtonOverlay("menu-quit-button", "Quit", Color.BLACK, uiFont, Color.TRANSPARENT, Color.TRANSPARENT, hoverColor, 1, 1);
+        } else {
+            returnButton = new ButtonOverlay("menu-return-button", "Return", Color.BLACK, uiFont, Color.TRANSPARENT, Color.TRANSPARENT, hoverColor, 1, 1);
+        }
+        returnButton.setX(25);
+        returnButton.setY(1000);
+        menu.addOverlay(returnButton);
+
         return menu;
     }
 

diff --git a/src/main/java/me/piitex/renjava/events/defaults/MenuClickEventListener.java b/src/main/java/me/piitex/renjava/events/defaults/MenuClickEventListener.java
@@ -18,6 +18,7 @@ public class MenuClickEventListener implements EventListener {
     @Listener
     public void onButtonClick(ButtonClickEvent event) {
         Button button = event.getButton();
+        boolean rightClicked = renJava.getPlayer().isRightClickMenu();
 
         if (button.getId().equalsIgnoreCase("menu-start-button")) {
             RenLogger.LOGGER.info("Creating new game...");
@@ -31,34 +32,28 @@ public void onButtonClick(ButtonClickEvent event) {
             renJava.start();
         }
         if (button.getId().equalsIgnoreCase("menu-load-button")) {
-            // NOTE: 10/20/2023  new LoadScreenView(new ImageLoader("gui/overlay/game_menu.png")).build(renJava.getStage(), true);
+            renJava.setStage(renJava.getStage(), StageType.LOAD_MENU);
             Menu menu = renJava.buildLoadMenu(1); // Builds first page
-            menu.addMenu(renJava.buildSideMenu(renJava.getPlayer().isRightClickMenu()));
+            menu.addMenu(renJava.buildSideMenu(rightClicked));
             menu.render();
-            renJava.setStage(renJava.getStage(), StageType.LOAD_MENU); // Update stage type
         }
         if (button.getId().equalsIgnoreCase("menu-preference-button")) {
-            //new PreferenceScreenView(new ImageLoader("gui/overlay/game_menu.png")).build(renJava.getStage(), true);
+            renJava.setStage(renJava.getStage(), StageType.OPTIONS_MENU);
             Menu settings = renJava.buildSettingsMenu();
-            settings.addMenu(renJava.buildSideMenu(renJava.getPlayer().isRightClickMenu()));
-
+            settings.addMenu(renJava.buildSideMenu(rightClicked));
             settings.render();
-            renJava.setStage(renJava.getStage(), StageType.OPTIONS_MENU);
         }
         if (button.getId().equalsIgnoreCase("menu-about-button")) {
+            renJava.setStage(renJava.getStage(), StageType.ABOUT_MENU);
             Menu about = renJava.buildAboutMenu();
-            about.addMenu(renJava.buildSideMenu(renJava.getPlayer().isRightClickMenu()));
-
+            about.addMenu(renJava.buildSideMenu(rightClicked));
             about.render();
-            renJava.setStage(renJava.getStage(), StageType.ABOUT_MENU);
         }
         if (button.getId().equalsIgnoreCase("menu-save-button")) {
-            //new Save(1, renJava.getPlayer().getCurrentStory().getId(), renJava.getPlayer().getCurrentScene().getId());
+            renJava.setStage(renJava.getStage(), StageType.SAVE_MENU);
             Menu menu = renJava.buildLoadMenu(1); // Builds first page
-            menu.addMenu(renJava.buildSideMenu(renJava.getPlayer().isRightClickMenu()));
+            menu.addMenu(renJava.buildSideMenu(rightClicked));
             menu.render();
-
-            renJava.setStage(renJava.getStage(), StageType.SAVE_MENU);
         }
         if (button.getId().equalsIgnoreCase("menu-quit-button")) {
             renJava.getAddonLoader().disable();
@@ -104,10 +99,21 @@ public void onButtonClick(ButtonClickEvent event) {
             save.write();
 
             // Re-render
+            renJava.setStage(renJava.getStage(), StageType.SAVE_MENU);
             Menu menu = renJava.buildLoadMenu(1); // Builds first page
             menu.addMenu(renJava.buildSideMenu(true));
             menu.render();
-            renJava.setStage(renJava.getStage(), StageType.SAVE_MENU); // Update stage type
+        }
+        if (button.getId().equalsIgnoreCase("menu-return-button")) {
+            if (renJava.getStageType() == StageType.MAIN_MENU) {
+                renJava.getAddonLoader().disable();
+                Platform.exit();
+                return;
+            }
+            renJava.setStage(renJava.getStage(), StageType.MAIN_MENU);
+            Menu menu = renJava.buildTitleScreen(rightClicked);
+            menu.addMenu(renJava.buildSideMenu(rightClicked));
+            menu.render();
         }
     }