- Icons

Signed-off-by: syeyoung <cyoung06@naver.com>

26 files changed, 79 insertions, 41 deletions

diff --git a/mod/src/main/resources/assets/dungeonsguide/gui/config/categoryitem.gui b/mod/src/main/resources/assets/dungeonsguide/gui/config/categoryitem.gui
index 41521764..cd9d3638 100644
--- a/mod/src/main/resources/assets/dungeonsguide/gui/config/categoryitem.gui
+++ b/mod/src/main/resources/assets/dungeonsguide/gui/config/categoryitem.gui
@@ -16,27 +16,31 @@
   ~ along with this program.  If not, see <https://www.gnu.org/licenses/>.
   -->
 
-<padding left="5" right="5" top="5" bottom="5">
+<!--<padding left="5" right="5" top="5" bottom="5">-->
 
     <AbstractButton on:click="click" disabled="false">
         <RoundRect radius="5" backgroundColor="#FF11294d">
             <col mainAlign="START" crossAlign="STRETCH">
-                <padding left="5" right="5" top="5" bottom="5">
+                <padding left="3" right="5" top="3">
                     <IntrinsicHeight>
                         <row mainAlign="START" crossAlign="CENTER">
                             <aspectRatio width="1" height="1">
                                 <Stencil>
-                                    <ResourceImage location="dungeonsguide:textures/dglogox128.png" width="128" height="128" textureWidth="128" textureHeight="128"/>
+                                    <ResourceImage bind:location="icon" width="128" height="128" textureWidth="128" textureHeight="128"/>
                                     <RoundRect radius="3" slot="stencil"/>
                                 </Stencil>
                             </aspectRatio>
                             <size width="5" height="0"/>
-                            <flexible><Text bind:text="name" color="#FFFFFFFF" size="12"/></flexible>
+                            <flexible>
+                                <padding top="2" bottom="2">
+                                    <Text bind:text="name" color="#FFFFFFFF" size="12"/>
+                                </padding>
+                            </flexible>
                         </row>
                     </IntrinsicHeight>
                 </padding>
                 <flexible>
-                    <padding left="5" bottom="5" right="5" top="3">
+                    <padding left="5" bottom="5" right="5" top="5">
                         <Text bind:text="description" color="#FFAAAAAA"/>
                     </padding>
                 </flexible>
@@ -44,23 +48,26 @@
         </RoundRect>
         <RoundRect radius="5" backgroundColor="#FF1d4481" slot="hovered">
             <col mainAlign="START" crossAlign="STRETCH">
-                <padding left="5" right="5" top="5" bottom="5">
+                <padding left="3" right="5" top="3">
                     <IntrinsicHeight>
                         <row mainAlign="START" crossAlign="CENTER">
-
                             <aspectRatio width="1" height="1">
                                 <Stencil>
-                                    <ResourceImage location="dungeonsguide:textures/dglogox128.png" width="128" height="128" textureWidth="128" textureHeight="128"/>
+                                    <ResourceImage bind:location="icon" width="128" height="128" textureWidth="128" textureHeight="128"/>
                                     <RoundRect radius="3" slot="stencil"/>
                                 </Stencil>
                             </aspectRatio>
                             <size width="5" height="0"/>
-                            <flexible><Text bind:text="name" color="#FFFFFFFF" size="12"/></flexible>
+                            <flexible>
+                                <padding top="2" bottom="2">
+                                    <Text bind:text="name" color="#FFFFFFFF" size="12"/>
+                                </padding>
+                            </flexible>
                         </row>
                     </IntrinsicHeight>
                 </padding>
                 <flexible>
-                    <padding left="5" bottom="5" right="5" top="3">
+                    <padding left="5" bottom="5" right="5" top="5">
                         <Text bind:text="description" color="#FFAAAAAA"/>
                     </padding>
                 </flexible>
@@ -68,23 +75,26 @@
         </RoundRect>
         <RoundRect radius="5" backgroundColor="#FF34578e" slot="pressed">
             <col mainAlign="START" crossAlign="STRETCH">
-                <padding left="5" right="5" top="5" bottom="5">
+                <padding left="3" right="5" top="3">
                     <IntrinsicHeight>
                         <row mainAlign="START" crossAlign="CENTER">
-
                             <aspectRatio width="1" height="1">
                                 <Stencil>
-                                    <ResourceImage location="dungeonsguide:textures/dglogox128.png" width="128" height="128" textureWidth="128" textureHeight="128"/>
+                                    <ResourceImage bind:location="icon" width="128" height="128" textureWidth="128" textureHeight="128"/>
                                     <RoundRect radius="3" slot="stencil"/>
                                 </Stencil>
                             </aspectRatio>
                             <size width="5" height="0"/>
-                            <flexible><Text bind:text="name" color="#FFFFFFFF" size="12"/></flexible>
+                            <flexible>
+                                <padding top="2" bottom="2">
+                                    <Text bind:text="name" color="#FFFFFFFF" size="12"/>
+                                </padding>
+                            </flexible>
                         </row>
                     </IntrinsicHeight>
                 </padding>
                 <flexible>
-                    <padding left="5" bottom="5" right="5" top="3">
+                    <padding left="5" bottom="5" right="5" top="5">
                         <Text bind:text="description" color="#FFAAAAAA"/>
                     </padding>
                 </flexible>
@@ -92,4 +102,4 @@
         </RoundRect>
         <size slot="disabled" width="0" height="0"/>
     </AbstractButton>
-</padding>
\ No newline at end of file
+<!--</padding>-->
\ No newline at end of file
diff --git a/mod/src/main/resources/assets/dungeonsguide/gui/config/categorypage.gui b/mod/src/main/resources/assets/dungeonsguide/gui/config/categorypage.gui
index 6abf4b80..2eb07353 100644
--- a/mod/src/main/resources/assets/dungeonsguide/gui/config/categorypage.gui
+++ b/mod/src/main/resources/assets/dungeonsguide/gui/config/categorypage.gui
@@ -25,7 +25,9 @@
                         <padding top="5" left="5" right="5">
                             <Text text="Categories" size="16" color="#FFFFFFFF"/>
                         </padding>
-                        <WrapGrid minimumWidth="160" gap="5" bind:_="categories"/>
+                        <padding top="3" left="3" right="3">
+                            <WrapGrid minimumWidth="160" gap="5" bind:_="categories"/>
+                        </padding>
                         <size width="0" height="5"/>
                     </col>
                     <size width="0" height="0" slot="hide"/>
diff --git a/mod/src/main/resources/assets/dungeonsguide/gui/config/mainpage.gui b/mod/src/main/resources/assets/dungeonsguide/gui/config/mainpage.gui
index 21a9d642..77fb5598 100644
--- a/mod/src/main/resources/assets/dungeonsguide/gui/config/mainpage.gui
+++ b/mod/src/main/resources/assets/dungeonsguide/gui/config/mainpage.gui
@@ -34,9 +34,15 @@
             <size height="20"/>
             <line color="#FF747474"/>
             <size height="5"/>
-            <WrapGrid minimumWidth="160" gap="5" bind:_="categories"/>
+            <padding left="3" top="3" right="3" bottom="3">
+                <WrapGrid minimumWidth="160" gap="5" bind:_="categories"/>
+            </padding>
             <size height="5"/>
             <line color="#FF747474"/>
+            <size height="5"/>
+            <size width="80" height="30">
+                <RoundButton text="GUI Config" on:click="guiconfig"/>
+            </size>
             <size height="20"/>
             <row mainAlign="CENTER">
                 <size height="32" width="32">
diff --git a/mod/src/main/resources/assets/dungeonsguide/gui/config/menuitem.gui b/mod/src/main/resources/assets/dungeonsguide/gui/config/menuitem.gui
index a75f08a3..a0c624aa 100644
--- a/mod/src/main/resources/assets/dungeonsguide/gui/config/menuitem.gui
+++ b/mod/src/main/resources/assets/dungeonsguide/gui/config/menuitem.gui
@@ -18,48 +18,54 @@
 
 
 <AbstractButton on:click="click" disabled="false">
-    <padding left="10" right="5" top="5" bottom="5">
+    <padding left="10" right="5" top="3" bottom="3">
         <IntrinsicHeight>
             <row mainAlign="START" crossAlign="CENTER">
                 <aspectRatio width="1" height="1">
                     <Stencil>
-                        <ResourceImage location="dungeonsguide:textures/dglogox128.png" width="128" height="128" textureWidth="128" textureHeight="128"/>
+                        <ResourceImage bind:location="image" width="128" height="128" textureWidth="128" textureHeight="128"/>
                         <RoundRect radius="3" slot="stencil"/>
                     </Stencil>
                 </aspectRatio>
                 <size width="5" height="0"/>
-                <Text bind:text="category" color="#FFFFFFFF"/>
+                <padding top="2" bottom="2">
+                    <Text bind:text="category" color="#FFFFFFFF"/>
+                </padding>
             </row>
         </IntrinsicHeight>
     </padding>
     <bgcolor backgroundColor="#FF356091" slot="hovered">
-        <padding left="10" right="5" top="5" bottom="5">
+        <padding left="10" right="5" top="3" bottom="3">
             <IntrinsicHeight>
                 <row mainAlign="START" crossAlign="CENTER">
                     <aspectRatio width="1" height="1">
                         <Stencil>
-                            <ResourceImage location="dungeonsguide:textures/dglogox128.png" width="128" height="128" textureWidth="128" textureHeight="128"/>
+                            <ResourceImage bind:location="image" width="128" height="128" textureWidth="128" textureHeight="128"/>
                             <RoundRect radius="3" slot="stencil"/>
                         </Stencil>
                     </aspectRatio>
                     <size width="5" height="0"/>
-                    <Text bind:text="category" color="#FFFFFFFF"/>
+                    <padding top="2" bottom="2">
+                        <Text bind:text="category" color="#FFFFFFFF"/>
+                    </padding>
                 </row>
             </IntrinsicHeight>
         </padding>
     </bgcolor>
     <bgcolor backgroundColor="#FF50799E" slot="pressed">
-        <padding left="10" right="5" top="5" bottom="5">
+        <padding left="10" right="5" top="3" bottom="3">
             <IntrinsicHeight>
                 <row mainAlign="START" crossAlign="CENTER">
                     <aspectRatio width="1" height="1">
                         <Stencil>
-                            <ResourceImage location="dungeonsguide:textures/dglogox128.png" width="128" height="128" textureWidth="128" textureHeight="128"/>
+                            <ResourceImage bind:location="image" width="128" height="128" textureWidth="128" textureHeight="128"/>
                             <RoundRect radius="3" slot="stencil"/>
                         </Stencil>
                     </aspectRatio>
                     <size width="5" height="0"/>
-                    <Text bind:text="category" color="#FFFFFFFF"/>
+                    <padding top="2" bottom="2">
+                        <Text bind:text="category" color="#FFFFFFFF"/>
+                    </padding>
                 </row>
             </IntrinsicHeight>
         </padding>
diff --git a/mod/src/main/resources/assets/dungeonsguide/gui/config/normalconfig.gui b/mod/src/main/resources/assets/dungeonsguide/gui/config/normalconfig.gui
index 15699c1b..410b3423 100644
--- a/mod/src/main/resources/assets/dungeonsguide/gui/config/normalconfig.gui
+++ b/mod/src/main/resources/assets/dungeonsguide/gui/config/normalconfig.gui
@@ -25,6 +25,15 @@
                     <bgcolor backgroundColor="0xFF1E4684">
                         <row>
                             <aspectRatio width="1" height="1">
+                                <ColorButton on:click="toggleSidebar" hPadding="1"
+                                             backgroundColor="#FF1C376E"          textColor="#FFFFFFFF"
+                                             hoveredBackgroundColor="#FF1C5692"   hoveredTextColor="#FFFFFFFF"
+                                             disabledBackgroundColor="0"  disabledTextColor="0"
+                                             pressedBackgroundColor="#FF1D5F9C"   pressedTextColor="#FFFFFFFF"
+                                             text="☰"
+                                />
+                            </aspectRatio>
+                            <aspectRatio width="1" height="1">
                                 <ColorButton on:click="back" hPadding="1"
                                              backgroundColor="#FF1C376E"          textColor="#FFFFFFFF"
                                              hoveredBackgroundColor="#FF1C5692"   hoveredTextColor="#FFFFFFFF"
@@ -65,21 +74,26 @@
                 <line color="#FFFFFFFF"/>
                 <flexible>
                     <row>
-                        <ConstrainedBox maxWidth="150">
-                            <bgcolor backgroundColor="0xFF000000">
-                                <padding left="0" top="5" bottom="5" right="5">
-                                    <col>
-                                        <col bind:_="menu">
-                                        </col>
-                                        <padding top="4" bottom="4">
-                                            <line color="#FFFFFFFF"/>
+                        <SelectiveContainer bind:visible="sidebar">
+                            <row slot="show">
+                                <size width="150">
+                                    <bgcolor backgroundColor="0xFF000000">
+                                        <padding left="0" top="5" bottom="5" right="5">
+                                            <col>
+                                                <col bind:_="menu">
+                                                </col>
+                                                <padding top="4" bottom="4">
+                                                    <line color="#FFFFFFFF"/>
+                                                </padding>
+                                                <slot bind:_="relocate"/>
+                                            </col>
                                         </padding>
-                                        <slot bind:_="relocate"/>
-                                    </col>
-                                </padding>
-                            </bgcolor>
-                        </ConstrainedBox>
-                        <line dir="VERTICAL" color="#FFFFFFFF"/>
+                                    </bgcolor>
+                                </size>
+                                <line dir="VERTICAL" color="#FFFFFFFF"/>
+                            </row>
+                            <size width="0" height="0" slot="hide"/>
+                        </SelectiveContainer>
                         <flexible>
                             <Navigator>
                                 <!-- default page-->
diff --git a/mod/src/main/resources/assets/dungeonsguide/textures/config/categoryIcon/alerts.png b/mod/src/main/resources/assets/dungeonsguide/textures/config/categoryIcon/alerts.png
new file mode 100644
index 00000000..4c87d79c
--- /dev/null
+++ b/mod/src/main/resources/assets/dungeonsguide/textures/config/categoryIcon/alerts.png
diff --git a/mod/src/main/resources/assets/dungeonsguide/textures/config/categoryIcon/blood_rush.png b/mod/src/main/resources/assets/dungeonsguide/textures/config/categoryIcon/blood_rush.png
new file mode 100644
index 00000000..93d2c474
--- /dev/null
+++ b/mod/src/main/resources/assets/dungeonsguide/textures/config/categoryIcon/blood_rush.png
diff --git a/mod/src/main/resources/assets/dungeonsguide/textures/config/categoryIcon/bossfight.png b/mod/src/main/resources/assets/dungeonsguide/textures/config/categoryIcon/bossfight.png
new file mode 100644
index 00000000..6d6d456c
--- /dev/null
+++ b/mod/src/main/resources/assets/dungeonsguide/textures/config/categoryIcon/bossfight.png
diff --git a/mod/src/main/resources/assets/dungeonsguide/textures/config/categoryIcon/communication.png b/mod/src/main/resources/assets/dungeonsguide/textures/config/categoryIcon/communication.png
new file mode 100644
index 00000000..fc34c272
--- /dev/null
+++ b/mod/src/main/resources/assets/dungeonsguide/textures/config/categoryIcon/communication.png
diff --git a/mod/src/main/resources/assets/dungeonsguide/textures/config/categoryIcon/cosmetics.png b/mod/src/main/resources/assets/dungeonsguide/textures/config/categoryIcon/cosmetics.png
new file mode 100644
index 00000000..e6db9ae8
--- /dev/null
+++ b/mod/src/main/resources/assets/dungeonsguide/textures/config/categoryIcon/cosmetics.png
diff --git a/mod/src/main/resources/assets/dungeonsguide/textures/config/categoryIcon/debug.png b/mod/src/main/resources/assets/dungeonsguide/textures/config/categoryIcon/debug.png
new file mode 100644
index 00000000..f5dc3617
--- /dev/null
+++ b/mod/src/main/resources/assets/dungeonsguide/textures/config/categoryIcon/debug.png
diff --git a/mod/src/main/resources/assets/dungeonsguide/textures/config/categoryIcon/discord.png b/mod/src/main/resources/assets/dungeonsguide/textures/config/categoryIcon/discord.png
new file mode 100644
index 00000000..a3ee4710
--- /dev/null
+++ b/mod/src/main/resources/assets/dungeonsguide/textures/config/categoryIcon/discord.png
diff --git a/mod/src/main/resources/assets/dungeonsguide/textures/config/categoryIcon/display_all.png b/mod/src/main/resources/assets/dungeonsguide/textures/config/categoryIcon/display_all.png
new file mode 100644
index 00000000..2f1c3886
--- /dev/null
+++ b/mod/src/main/resources/assets/dungeonsguide/textures/config/categoryIcon/display_all.png
diff --git a/mod/src/main/resources/assets/dungeonsguide/textures/config/categoryIcon/display_one.png b/mod/src/main/resources/assets/dungeonsguide/textures/config/categoryIcon/display_one.png
new file mode 100644
index 00000000..e94e14fa
--- /dev/null
+++ b/mod/src/main/resources/assets/dungeonsguide/textures/config/categoryIcon/display_one.png
diff --git a/mod/src/main/resources/assets/dungeonsguide/textures/config/categoryIcon/dungeon_hud.png b/mod/src/main/resources/assets/dungeonsguide/textures/config/categoryIcon/dungeon_hud.png
new file mode 100644
index 00000000..b27bd8d1
--- /dev/null
+++ b/mod/src/main/resources/assets/dungeonsguide/textures/config/categoryIcon/dungeon_hud.png
diff --git a/mod/src/main/resources/assets/dungeonsguide/textures/config/categoryIcon/dungeon_party.png b/mod/src/main/resources/assets/dungeonsguide/textures/config/categoryIcon/dungeon_party.png
new file mode 100644
index 00000000..3f9b78a3
--- /dev/null
+++ b/mod/src/main/resources/assets/dungeonsguide/textures/config/categoryIcon/dungeon_party.png
diff --git a/mod/src/main/resources/assets/dungeonsguide/textures/config/categoryIcon/floor_4.png b/mod/src/main/resources/assets/dungeonsguide/textures/config/categoryIcon/floor_4.png
new file mode 100644
index 00000000..7cadebe9
--- /dev/null
+++ b/mod/src/main/resources/assets/dungeonsguide/textures/config/categoryIcon/floor_4.png
diff --git a/mod/src/main/resources/assets/dungeonsguide/textures/config/categoryIcon/floor_5.png b/mod/src/main/resources/assets/dungeonsguide/textures/config/categoryIcon/floor_5.png
new file mode 100644
index 00000000..c4d288ad
--- /dev/null
+++ b/mod/src/main/resources/assets/dungeonsguide/textures/config/categoryIcon/floor_5.png
diff --git a/mod/src/main/resources/assets/dungeonsguide/textures/config/categoryIcon/floor_6.png b/mod/src/main/resources/assets/dungeonsguide/textures/config/categoryIcon/floor_6.png
new file mode 100644
index 00000000..2363face
--- /dev/null
+++ b/mod/src/main/resources/assets/dungeonsguide/textures/config/categoryIcon/floor_6.png
diff --git a/mod/src/main/resources/assets/dungeonsguide/textures/config/categoryIcon/floor_7.png b/mod/src/main/resources/assets/dungeonsguide/textures/config/categoryIcon/floor_7.png
new file mode 100644
index 00000000..6d6d456c
--- /dev/null
+++ b/mod/src/main/resources/assets/dungeonsguide/textures/config/categoryIcon/floor_7.png
diff --git a/mod/src/main/resources/assets/dungeonsguide/textures/config/categoryIcon/global_hud.png b/mod/src/main/resources/assets/dungeonsguide/textures/config/categoryIcon/global_hud.png
new file mode 100644
index 00000000..be1c113f
--- /dev/null
+++ b/mod/src/main/resources/assets/dungeonsguide/textures/config/categoryIcon/global_hud.png
diff --git a/mod/src/main/resources/assets/dungeonsguide/textures/config/categoryIcon/misc.png b/mod/src/main/resources/assets/dungeonsguide/textures/config/categoryIcon/misc.png
new file mode 100644
index 00000000..bbffcd15
--- /dev/null
+++ b/mod/src/main/resources/assets/dungeonsguide/textures/config/categoryIcon/misc.png
diff --git a/mod/src/main/resources/assets/dungeonsguide/textures/config/categoryIcon/pathfinding__secrets.png b/mod/src/main/resources/assets/dungeonsguide/textures/config/categoryIcon/pathfinding__secrets.png
new file mode 100644
index 00000000..e94e14fa
--- /dev/null
+++ b/mod/src/main/resources/assets/dungeonsguide/textures/config/categoryIcon/pathfinding__secrets.png
diff --git a/mod/src/main/resources/assets/dungeonsguide/textures/config/categoryIcon/player__mob.png b/mod/src/main/resources/assets/dungeonsguide/textures/config/categoryIcon/player__mob.png
new file mode 100644
index 00000000..d086d330
--- /dev/null
+++ b/mod/src/main/resources/assets/dungeonsguide/textures/config/categoryIcon/player__mob.png
diff --git a/mod/src/main/resources/assets/dungeonsguide/textures/config/categoryIcon/puzzle_solvers.png b/mod/src/main/resources/assets/dungeonsguide/textures/config/categoryIcon/puzzle_solvers.png
new file mode 100644
index 00000000..48f69b0f
--- /dev/null
+++ b/mod/src/main/resources/assets/dungeonsguide/textures/config/categoryIcon/puzzle_solvers.png
diff --git a/mod/src/main/resources/assets/dungeonsguide/textures/config/categoryIcon/secret_browser.png b/mod/src/main/resources/assets/dungeonsguide/textures/config/categoryIcon/secret_browser.png
new file mode 100644
index 00000000..af590dd6
--- /dev/null
+++ b/mod/src/main/resources/assets/dungeonsguide/textures/config/categoryIcon/secret_browser.png