From b051f20bd7a731c4e861aa3ca856aa76e5df1e2c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Przemys=C5=82aw=20Pluta?=
 <noreply.git@mx.bartlomiejpluta.com>
Date: Thu, 1 Sep 2022 13:30:52 +0200
Subject: [PATCH] Add "Equipment" button to Game Menu

---
 .../demo/gui/GameMenuWindow.java              | 18 ++++--------------
 .../demo/gui/StartMenuWindow.java             | 14 ++++----------
 .../bartlomiejpluta/demo/menu/GuiManager.java | 19 ++++++++++---------
 .../56ca6b39-f949-4212-9c23-312db25887e0.xml  | 10 ++++++++++
 4 files changed, 28 insertions(+), 33 deletions(-)

diff --git a/src/main/java/com/bartlomiejpluta/demo/gui/GameMenuWindow.java b/src/main/java/com/bartlomiejpluta/demo/gui/GameMenuWindow.java
index cd5463a..d72d0b4 100644
--- a/src/main/java/com/bartlomiejpluta/demo/gui/GameMenuWindow.java
+++ b/src/main/java/com/bartlomiejpluta/demo/gui/GameMenuWindow.java
@@ -1,9 +1,11 @@
 package com.bartlomiejpluta.demo.gui;
 
 import com.bartlomiejpluta.base.api.context.Context;
-import com.bartlomiejpluta.base.api.gui.*;
+import com.bartlomiejpluta.base.api.gui.Component;
+import com.bartlomiejpluta.base.api.gui.GUI;
+import com.bartlomiejpluta.base.api.gui.Ref;
+import com.bartlomiejpluta.base.api.gui.WindowManager;
 import com.bartlomiejpluta.base.lib.gui.VOptionChoice;
-import lombok.Getter;
 
 import java.util.Map;
 
@@ -13,18 +15,6 @@ public class GameMenuWindow extends DecoratedWindow {
    @Ref("menu")
    private VOptionChoice menu;
 
-   @Ref("resume_game")
-   @Getter
-   private Button resumeGameBtn;
-
-   @Ref("start_menu")
-   @Getter
-   private Button startMenuBtn;
-
-   @Ref("exit")
-   @Getter
-   private Button exitBtn;
-
    public GameMenuWindow(Context context, GUI gui, Map<String, Component> refs) {
       super(context, gui, refs);
    }
diff --git a/src/main/java/com/bartlomiejpluta/demo/gui/StartMenuWindow.java b/src/main/java/com/bartlomiejpluta/demo/gui/StartMenuWindow.java
index 26dcc43..42bf9ac 100644
--- a/src/main/java/com/bartlomiejpluta/demo/gui/StartMenuWindow.java
+++ b/src/main/java/com/bartlomiejpluta/demo/gui/StartMenuWindow.java
@@ -1,22 +1,16 @@
 package com.bartlomiejpluta.demo.gui;
 
 import com.bartlomiejpluta.base.api.context.Context;
-import com.bartlomiejpluta.base.api.gui.*;
+import com.bartlomiejpluta.base.api.gui.Component;
+import com.bartlomiejpluta.base.api.gui.GUI;
+import com.bartlomiejpluta.base.api.gui.Ref;
+import com.bartlomiejpluta.base.api.gui.WindowManager;
 import com.bartlomiejpluta.base.lib.gui.VOptionChoice;
-import lombok.Getter;
 
 import java.util.Map;
 
 public class StartMenuWindow extends DecoratedWindow {
 
-   @Ref("new_game")
-   @Getter
-   private Button newGameBtn;
-
-   @Ref("exit")
-   @Getter
-   private Button exitBtn;
-
    @Ref("menu")
    private VOptionChoice menu;
 
diff --git a/src/main/java/com/bartlomiejpluta/demo/menu/GuiManager.java b/src/main/java/com/bartlomiejpluta/demo/menu/GuiManager.java
index 99b3727..f0603c2 100644
--- a/src/main/java/com/bartlomiejpluta/demo/menu/GuiManager.java
+++ b/src/main/java/com/bartlomiejpluta/demo/menu/GuiManager.java
@@ -37,17 +37,18 @@ public class GuiManager {
       this.gui.setRoot(this.manager);
 
       this.startMenu = gui.inflateWindow(A.widgets.start_menu.uid, StartMenuWindow.class);
-      this.startMenu.getNewGameBtn().setAction(runner::newGame);
-      this.startMenu.getExitBtn().setAction(runner::exit);
-
-      this.gameMenu = gui.inflateWindow(A.widgets.game_menu.uid, GameMenuWindow.class);
-      this.gameMenu.getResumeGameBtn().setAction(this::resumeGame);
-      this.gameMenu.getStartMenuBtn().setAction(runner::returnToStartMenu);
-      this.gameMenu.getExitBtn().setAction(runner::exit);
-
-      this.dialog = gui.inflateWindow(A.widgets.dialog.uid, DialogWindow.class);
+      this.startMenu.reference("new_game", Button.class).setAction(runner::newGame);
+      this.startMenu.reference("exit", Button.class).setAction(runner::exit);
 
       this.equipment = gui.inflateWindow(A.widgets.equipment.uid, EquipmentWindow.class);
+
+      this.gameMenu = gui.inflateWindow(A.widgets.game_menu.uid, GameMenuWindow.class);
+      this.gameMenu.reference("resume_game", Button.class).setAction(this::resumeGame);
+      this.gameMenu.reference("equipment", Button.class).setAction(() -> manager.open(equipment));
+      this.gameMenu.reference("start_menu", Button.class).setAction(runner::returnToStartMenu);
+      this.gameMenu.reference("exit", Button.class).setAction(runner::exit);
+
+      this.dialog = gui.inflateWindow(A.widgets.dialog.uid, DialogWindow.class);
       this.loot = gui.inflateWindow(widgets.loot_menu.uid, LootWindow.class);
    }
 
diff --git a/widgets/56ca6b39-f949-4212-9c23-312db25887e0.xml b/widgets/56ca6b39-f949-4212-9c23-312db25887e0.xml
index 6abd42d..8a92fc1 100644
--- a/widgets/56ca6b39-f949-4212-9c23-312db25887e0.xml
+++ b/widgets/56ca6b39-f949-4212-9c23-312db25887e0.xml
@@ -31,6 +31,16 @@
                     fontSize="17f">Resume game
             </demo:Button>
 
+            <demo:Button
+                    ref="equipment"
+                    font="A.fonts.roboto_regular.uid"
+                    width="relative"
+                    red="1f"
+                    green="1f"
+                    blue="1f"
+                    fontSize="17f">Equipment
+            </demo:Button>
+
             <demo:Button
                     ref="start_menu"
                     font="A.fonts.roboto_regular.uid"