From eac86380ed0db7be002e55d850ca7fea4b698c4d Mon Sep 17 00:00:00 2001
From: syeyoung <cyoung06@naver.com>
Date: Wed, 18 Jan 2023 17:08:17 +0900
Subject: - upgrade mechanic browser to use guiv2 - also add #134

Signed-off-by: syeyoung <cyoung06@naver.com>
---
 .../dungeonsguide/gui/elements/locationedPopup.gui | 20 ++++++++
 .../assets/dungeonsguide/gui/elements/popupmgr.gui |  2 +-
 .../dungeonsguide/gui/elements/scrollablePanel.gui |  2 +-
 .../dungeonsguide/gui/elements/simpleButton.gui    | 26 ++++++----
 .../assets/dungeonsguide/gui/elements/size.gui     |  2 +-
 .../gui/features/mechanicBrowser/browser.gui       | 55 ++++++++++++++++++++++
 .../gui/features/mechanicBrowser/category.gui      | 20 +++++---
 .../gui/features/mechanicBrowser/secret.gui        | 25 ++++++++++
 .../gui/features/mechanicBrowser/state.gui         | 25 ++++++++++
 .../gui/features/mechanicBrowser/tooltip.gui       | 34 +++++++++++++
 10 files changed, 193 insertions(+), 18 deletions(-)
 create mode 100644 mod/src/main/resources/assets/dungeonsguide/gui/elements/locationedPopup.gui
 create mode 100644 mod/src/main/resources/assets/dungeonsguide/gui/features/mechanicBrowser/browser.gui
 create mode 100644 mod/src/main/resources/assets/dungeonsguide/gui/features/mechanicBrowser/secret.gui
 create mode 100644 mod/src/main/resources/assets/dungeonsguide/gui/features/mechanicBrowser/state.gui
 create mode 100644 mod/src/main/resources/assets/dungeonsguide/gui/features/mechanicBrowser/tooltip.gui

(limited to 'mod/src/main/resources/assets/dungeonsguide/gui')

diff --git a/mod/src/main/resources/assets/dungeonsguide/gui/elements/locationedPopup.gui b/mod/src/main/resources/assets/dungeonsguide/gui/elements/locationedPopup.gui
new file mode 100644
index 00000000..9d56c62c
--- /dev/null
+++ b/mod/src/main/resources/assets/dungeonsguide/gui/elements/locationedPopup.gui
@@ -0,0 +1,20 @@
+<!--
+  ~ Dungeons Guide - The most intelligent Hypixel Skyblock Dungeons Mod
+  ~ Copyright (C) 2023  cyoung06 (syeyoung)
+  ~
+  ~ This program is free software: you can redistribute it and/or modify
+  ~ it under the terms of the GNU Affero General Public License as published
+  ~ by the Free Software Foundation, either version 3 of the License, or
+  ~ (at your option) any later version.
+  ~
+  ~ This program is distributed in the hope that it will be useful,
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  ~ GNU Affero General Public License for more details.
+  ~
+  ~ You should have received a copy of the GNU Affero General Public License
+  ~ along with this program.  If not, see <https://www.gnu.org/licenses/>.
+  -->
+    <absXY bind:x="x" bind:y="y">
+        <slot bind:child="child" bind:ref="ref"/>
+    </absXY>
\ No newline at end of file
diff --git a/mod/src/main/resources/assets/dungeonsguide/gui/elements/popupmgr.gui b/mod/src/main/resources/assets/dungeonsguide/gui/elements/popupmgr.gui
index 899d87ce..ed207851 100644
--- a/mod/src/main/resources/assets/dungeonsguide/gui/elements/popupmgr.gui
+++ b/mod/src/main/resources/assets/dungeonsguide/gui/elements/popupmgr.gui
@@ -1,3 +1,3 @@
 <stack bind:ref="stackRef">
-    <slot bind:child="$"/>
+    <slot bind:child="_"/>
 </stack>
\ No newline at end of file
diff --git a/mod/src/main/resources/assets/dungeonsguide/gui/elements/scrollablePanel.gui b/mod/src/main/resources/assets/dungeonsguide/gui/elements/scrollablePanel.gui
index 9047865c..7efaccc7 100644
--- a/mod/src/main/resources/assets/dungeonsguide/gui/elements/scrollablePanel.gui
+++ b/mod/src/main/resources/assets/dungeonsguide/gui/elements/scrollablePanel.gui
@@ -25,7 +25,7 @@
                         <absXY bind:x="contentX" bind:y="contentY">
                             <UnconstrainedBox bind:direction="direction">
                                 <measure bind:size="contentSize">
-                                    <slot bind:child="$"/>
+                                    <slot bind:child="_"/>
                                 </measure>
                             </UnconstrainedBox>
                         </absXY>
diff --git a/mod/src/main/resources/assets/dungeonsguide/gui/elements/simpleButton.gui b/mod/src/main/resources/assets/dungeonsguide/gui/elements/simpleButton.gui
index ac96297c..72c689b1 100644
--- a/mod/src/main/resources/assets/dungeonsguide/gui/elements/simpleButton.gui
+++ b/mod/src/main/resources/assets/dungeonsguide/gui/elements/simpleButton.gui
@@ -15,26 +15,34 @@
   ~ You should have received a copy of the GNU Affero General Public License
   ~ along with this program.  If not, see <https://www.gnu.org/licenses/>.
   -->
-<wrapper disabled="false">
+<wrapper disabled="false" crossAlign="CENTER" textAlign="CENTER" hPadding="0">
     <AbstractButton bind:click="click" bind:disabled="disabled">
         <bgcolor bind:backgroundColor="backgroundColor">
-            <col mainAlign="CENTER">
-                <Text bind:text="text" bind:color="textColor" align="CENTER"/>
+            <col mainAlign="CENTER" bind:crossAlign="crossAlign">
+                <padding bind:left="hPadding" bind:right="hPadding">
+                    <Text bind:text="text" bind:color="textColor" bind:align="textAlign"/>
+                </padding>
             </col>
         </bgcolor>
         <bgcolor slot="hovered" bind:backgroundColor="hoveredBackgroundColor">
-            <col mainAlign="CENTER">
-                <Text bind:text="text" bind:color="hoveredTextColor" align="CENTER"/>
+            <col mainAlign="CENTER" bind:crossAlign="crossAlign">
+                <padding bind:left="hPadding" bind:right="hPadding">
+                    <Text bind:text="text" bind:color="hoveredTextColor" bind:align="textAlign"/>
+                </padding>
             </col>
         </bgcolor>
         <bgcolor slot="disabled" bind:backgroundColor="disabledBackgroundColor">
-            <col mainAlign="CENTER">
-                <Text bind:text="text" bind:color="disabledTextColor" align="CENTER"/>
+            <col mainAlign="CENTER" bind:crossAlign="crossAlign">
+                <padding bind:left="hPadding" bind:right="hPadding">
+                    <Text bind:text="text" bind:color="disabledTextColor" bind:align="textAlign"/>
+                </padding>
             </col>
         </bgcolor>
         <bgcolor slot="pressed" bind:backgroundColor="pressedBackgroundColor">
-            <col mainAlign="CENTER">
-                <Text bind:text="text" bind:color="pressedTextColor" align="CENTER"/>
+            <col mainAlign="CENTER" bind:crossAlign="crossAlign">
+                <padding bind:left="hPadding" bind:right="hPadding">
+                    <Text bind:text="text" bind:color="pressedTextColor" bind:align="textAlign"/>
+                </padding>
             </col>
         </bgcolor>
     </AbstractButton>
diff --git a/mod/src/main/resources/assets/dungeonsguide/gui/elements/size.gui b/mod/src/main/resources/assets/dungeonsguide/gui/elements/size.gui
index 6f326058..fd292d11 100644
--- a/mod/src/main/resources/assets/dungeonsguide/gui/elements/size.gui
+++ b/mod/src/main/resources/assets/dungeonsguide/gui/elements/size.gui
@@ -18,6 +18,6 @@
 
 <wrapper width="+Infinity" height="+Infinity">
     <ConstrainedBox bind:minWidth="width" bind:maxWidth="width" bind:minHeight="height" bind:maxHeight="height">
-        <slot bind:child="$"/>
+        <slot bind:child="_"/>
     </ConstrainedBox>
 </wrapper>
\ No newline at end of file
diff --git a/mod/src/main/resources/assets/dungeonsguide/gui/features/mechanicBrowser/browser.gui b/mod/src/main/resources/assets/dungeonsguide/gui/features/mechanicBrowser/browser.gui
new file mode 100644
index 00000000..fbcbd6b3
--- /dev/null
+++ b/mod/src/main/resources/assets/dungeonsguide/gui/features/mechanicBrowser/browser.gui
@@ -0,0 +1,55 @@
+<!--
+  ~ Dungeons Guide - The most intelligent Hypixel Skyblock Dungeons Mod
+  ~ Copyright (C) 2023  cyoung06 (syeyoung)
+  ~
+  ~ This program is free software: you can redistribute it and/or modify
+  ~ it under the terms of the GNU Affero General Public License as published
+  ~ by the Free Software Foundation, either version 3 of the License, or
+  ~ (at your option) any later version.
+  ~
+  ~ This program is distributed in the hope that it will be useful,
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  ~ GNU Affero General Public License for more details.
+  ~
+  ~ You should have received a copy of the GNU Affero General Public License
+  ~ along with this program.  If not, see <https://www.gnu.org/licenses/>.
+  -->
+
+<scaler bind:scale="scale">
+    <border>
+        <line slot="left" dir="VERTICAL" thickness="1.0" color="#FF444444"/>
+        <line slot="top" dir="HORIZONTAL" thickness="1.0" color="#FF444444"/>
+        <line slot="bottom" dir="HORIZONTAL" thickness="1.0" color="#FF444444"/>
+        <line slot="right" dir="VERTICAL" thickness="1.0" color="#FF444444"/>
+        <bgcolor slot="content" backgroundColor="#FF262626">
+            <col crossAlign="STRETCH">
+                <padding left="1" top="1" bottom="1">
+                    <clip>
+                        <row>
+                            <Text text="Selected: " color="#FFAAAAAA"/>
+                            <size width="4" height="0"/>
+                            <Text bind:text="current" bind:color="color"/>
+                        </row>>
+                    </clip>
+                </padding>
+                <line slot="bottom" dir="HORIZONTAL" thickness="1.0" color="#FF444444"/>
+                <flexible>
+                    <ScrollablePanel direction="VERTICAL">
+                        <col crossAlign="STRETCH">
+                            <ColorButton on:click="cancel" hPadding="1"
+                                         backgroundColor="#FF555555"          textColor="#FFEEEEEE"
+                                         hoveredBackgroundColor="#FF636363"   hoveredTextColor="#FFEEEEEE"
+                                         disabledBackgroundColor="0"  disabledTextColor="0"
+                                         pressedBackgroundColor="#FF707070"   pressedTextColor="#FFEEEEEE"
+                                         text="§bCancel Current"
+                            />
+                            <col bind:_="children" crossAlign="START">
+                            </col>
+                        </col>
+                    </ScrollablePanel>
+                </flexible>
+            </col>
+        </bgcolor>
+    </border>
+</scaler>
diff --git a/mod/src/main/resources/assets/dungeonsguide/gui/features/mechanicBrowser/category.gui b/mod/src/main/resources/assets/dungeonsguide/gui/features/mechanicBrowser/category.gui
index ff341ff1..98d2702d 100644
--- a/mod/src/main/resources/assets/dungeonsguide/gui/features/mechanicBrowser/category.gui
+++ b/mod/src/main/resources/assets/dungeonsguide/gui/features/mechanicBrowser/category.gui
@@ -16,11 +16,19 @@
   ~ along with this program.  If not, see <https://www.gnu.org/licenses/>.
   -->
 
-<col>
-    <size height="10">
-        <bgcolor backgroundColor="#FF000000">
-            <Text bind:value="categoryName"/>
-        </bgcolor>
+<col crossAlign="START">
+    <size height="11">
+        <ColorButton on:click="toggle"
+                         backgroundColor="#FF444444"          textColor="#FFFFFFFF"
+                         hoveredBackgroundColor="#FF505050"   hoveredTextColor="#FFFFFFFF"
+                         disabledBackgroundColor="0"  disabledTextColor="0"
+                         pressedBackgroundColor="#FF555555"   pressedTextColor="#FFFFFFFF"
+                         bind:text="categoryName"
+        />
     </size>
-    
+    <SelectiveContainer bind:visible="visible">
+        <size width="0" height="0" slot="collapsed"></size>
+        <col bind:_="children" crossAlign="START" slot="open">
+        </col>
+    </SelectiveContainer>
 </col>
\ No newline at end of file
diff --git a/mod/src/main/resources/assets/dungeonsguide/gui/features/mechanicBrowser/secret.gui b/mod/src/main/resources/assets/dungeonsguide/gui/features/mechanicBrowser/secret.gui
new file mode 100644
index 00000000..2e2e8bdb
--- /dev/null
+++ b/mod/src/main/resources/assets/dungeonsguide/gui/features/mechanicBrowser/secret.gui
@@ -0,0 +1,25 @@
+<!--
+  ~ Dungeons Guide - The most intelligent Hypixel Skyblock Dungeons Mod
+  ~ Copyright (C) 2023  cyoung06 (syeyoung)
+  ~
+  ~ This program is free software: you can redistribute it and/or modify
+  ~ it under the terms of the GNU Affero General Public License as published
+  ~ by the Free Software Foundation, either version 3 of the License, or
+  ~ (at your option) any later version.
+  ~
+  ~ This program is distributed in the hope that it will be useful,
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  ~ GNU Affero General Public License for more details.
+  ~
+  ~ You should have received a copy of the GNU Affero General Public License
+  ~ along with this program.  If not, see <https://www.gnu.org/licenses/>.
+  -->
+
+    <ColorButton on:click="toggleStates" crossAlign="START" textAlign="LEFT" hPadding="1"
+                 backgroundColor="#FF555555"          textColor="#FFEEEEEE"
+                 hoveredBackgroundColor="#FF636363"   hoveredTextColor="#FFEEEEEE"
+                 disabledBackgroundColor="0"  disabledTextColor="0"
+                 pressedBackgroundColor="#FF707070"   pressedTextColor="#FFEEEEEE"
+                 bind:text="secretName"
+    />
\ No newline at end of file
diff --git a/mod/src/main/resources/assets/dungeonsguide/gui/features/mechanicBrowser/state.gui b/mod/src/main/resources/assets/dungeonsguide/gui/features/mechanicBrowser/state.gui
new file mode 100644
index 00000000..3dc588ce
--- /dev/null
+++ b/mod/src/main/resources/assets/dungeonsguide/gui/features/mechanicBrowser/state.gui
@@ -0,0 +1,25 @@
+<!--
+  ~ Dungeons Guide - The most intelligent Hypixel Skyblock Dungeons Mod
+  ~ Copyright (C) 2023  cyoung06 (syeyoung)
+  ~
+  ~ This program is free software: you can redistribute it and/or modify
+  ~ it under the terms of the GNU Affero General Public License as published
+  ~ by the Free Software Foundation, either version 3 of the License, or
+  ~ (at your option) any later version.
+  ~
+  ~ This program is distributed in the hope that it will be useful,
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  ~ GNU Affero General Public License for more details.
+  ~
+  ~ You should have received a copy of the GNU Affero General Public License
+  ~ along with this program.  If not, see <https://www.gnu.org/licenses/>.
+  -->
+
+    <ColorButton on:click="navigate" crossAlign="START" textAlign="LEFT" hPadding="1"
+                 backgroundColor="#FF555555"          textColor="#FFEEEEEE"
+                 hoveredBackgroundColor="#FF636363"   hoveredTextColor="#FFEEEEEE"
+                 disabledBackgroundColor="0"  disabledTextColor="0"
+                 pressedBackgroundColor="#FF707070"   pressedTextColor="#FFEEEEEE"
+                 bind:text="state"
+    />
\ No newline at end of file
diff --git a/mod/src/main/resources/assets/dungeonsguide/gui/features/mechanicBrowser/tooltip.gui b/mod/src/main/resources/assets/dungeonsguide/gui/features/mechanicBrowser/tooltip.gui
new file mode 100644
index 00000000..d948c9cf
--- /dev/null
+++ b/mod/src/main/resources/assets/dungeonsguide/gui/features/mechanicBrowser/tooltip.gui
@@ -0,0 +1,34 @@
+<!--
+  ~ Dungeons Guide - The most intelligent Hypixel Skyblock Dungeons Mod
+  ~ Copyright (C) 2023  cyoung06 (syeyoung)
+  ~
+  ~ This program is free software: you can redistribute it and/or modify
+  ~ it under the terms of the GNU Affero General Public License as published
+  ~ by the Free Software Foundation, either version 3 of the License, or
+  ~ (at your option) any later version.
+  ~
+  ~ This program is distributed in the hope that it will be useful,
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  ~ GNU Affero General Public License for more details.
+  ~
+  ~ You should have received a copy of the GNU Affero General Public License
+  ~ along with this program.  If not, see <https://www.gnu.org/licenses/>.
+  -->
+
+<UnconstrainedBox>
+    <size width="120">
+        <scaler bind:scale="scale">
+            <border>
+                <line slot="left" dir="VERTICAL" thickness="1.0" color="#FF444444"/>
+                <line slot="top" dir="HORIZONTAL" thickness="1.0" color="#FF444444"/>
+                <line slot="bottom" dir="HORIZONTAL" thickness="1.0" color="#FF444444"/>
+                <line slot="right" dir="VERTICAL" thickness="1.0" color="#FF444444"/>
+                <bgcolor slot="content" backgroundColor="#FF262626">
+                    <col bind:_="children">
+                    </col>
+                </bgcolor>
+            </border>
+        </scaler>
+    </size>
+</UnconstrainedBox>
\ No newline at end of file
-- 
cgit