From 470585150a1f2a506215e17bc9b9871bfdd80aa6 Mon Sep 17 00:00:00 2001
From: syeyoung <cyoung06@naver.com>
Date: Wed, 18 Jan 2023 08:32:56 +0900
Subject: - gui overhaul and stuff

Signed-off-by: syeyoung <cyoung06@naver.com>
---
 .../gui/features/discordParty/invite.gui           | 64 ++++++++--------
 .../gui/features/discordParty/joinRequest.gui      | 87 ++++++++++++----------
 .../gui/features/mechanicBrowser/category.gui      | 26 +++++++
 3 files changed, 106 insertions(+), 71 deletions(-)
 create mode 100644 mod/src/main/resources/assets/dungeonsguide/gui/features/mechanicBrowser/category.gui

(limited to 'mod/src/main/resources')

diff --git a/mod/src/main/resources/assets/dungeonsguide/gui/features/discordParty/invite.gui b/mod/src/main/resources/assets/dungeonsguide/gui/features/discordParty/invite.gui
index f26c525a..757e9bf0 100644
--- a/mod/src/main/resources/assets/dungeonsguide/gui/features/discordParty/invite.gui
+++ b/mod/src/main/resources/assets/dungeonsguide/gui/features/discordParty/invite.gui
@@ -42,36 +42,40 @@
                                     <Text text="§ewants you to join their party!" color="#FFFFFFFF"/>
                                     <size height="5"/>
                                     <size height="30">
-                                        <scaler scale="2.0">
-                                            <row crossAlign="START">
-                                                <flexible fit="TIGHT" flex="1">
-                                                    <size/>
-                                                </flexible>
-                                                <flexible fit="TIGHT" flex="3">
-                                                    <ColorButton on:click="accept"
-                                                                 backgroundColor="#FF7289DA"          textColor="#FFFFFFFF"
-                                                                 hoveredBackgroundColor="#FF859DF0"   hoveredTextColor="#FFFFFFFF"
-                                                                 disabledBackgroundColor="0"  disabledTextColor="0"
-                                                                 pressedBackgroundColor="#FF9BB0FF"   pressedTextColor="#FFFFFFFF"
-                                                                 text="ACCEPT"
-                                                    />
-                                                </flexible>
-                                                <flexible fit="TIGHT" flex="1">
-                                                    <size/>
-                                                </flexible>
-                                                <flexible fit="TIGHT" flex="3">
-                                                    <ColorButton on:click="deny"
-                                                                 backgroundColor="#FF99AAB5"          textColor="#FFFFFFFF"
-                                                                 hoveredBackgroundColor="#FFAEC0CB"   hoveredTextColor="#FFFFFFFF"
-                                                                 disabledBackgroundColor="0"  disabledTextColor="0"
-                                                                 pressedBackgroundColor="#FFCADDE8"   pressedTextColor="#FFFFFFFF"
-                                                                 text="DENY"
-                                                    />
-                                                </flexible>
-                                                <flexible fit="TIGHT" flex="1">
-                                                    <size/>
-                                                </flexible>
-                                            </row>
+                                        <scaler scale="2.0" >
+                                            <SelectiveContainer bind:visible="visible">
+                                                <row crossAlign="START" slot="buttons">
+                                                    <flexible fit="TIGHT" flex="1">
+                                                        <size/>
+                                                    </flexible>
+                                                    <flexible fit="TIGHT" flex="3">
+                                                        <ColorButton on:click="accept"
+                                                                     backgroundColor="#FF7289DA"          textColor="#FFFFFFFF"
+                                                                     hoveredBackgroundColor="#FF859DF0"   hoveredTextColor="#FFFFFFFF"
+                                                                     disabledBackgroundColor="0"  disabledTextColor="0"
+                                                                     pressedBackgroundColor="#FF9BB0FF"   pressedTextColor="#FFFFFFFF"
+                                                                     text="ACCEPT"
+                                                        />
+                                                    </flexible>
+                                                    <flexible fit="TIGHT" flex="1">
+                                                        <size/>
+                                                    </flexible>
+                                                    <flexible fit="TIGHT" flex="3">
+                                                        <ColorButton on:click="deny"
+                                                                     backgroundColor="#FF99AAB5"          textColor="#FFFFFFFF"
+                                                                     hoveredBackgroundColor="#FFAEC0CB"   hoveredTextColor="#FFFFFFFF"
+                                                                     disabledBackgroundColor="0"  disabledTextColor="0"
+                                                                     pressedBackgroundColor="#FFCADDE8"   pressedTextColor="#FFFFFFFF"
+                                                                     text="DENY"
+                                                        />
+                                                    </flexible>
+                                                    <flexible fit="TIGHT" flex="1">
+                                                        <size/>
+                                                    </flexible>
+                                                </row>
+                                                <Text text="Accepted Invite" slot="accepted" color="#FFFFFFFF"/>
+                                                <Text text="Denied Invite" slot="denied" color="#FFFFFFFF"/>
+                                            </SelectiveContainer>
                                         </scaler>
                                     </size>
                                 </col>
diff --git a/mod/src/main/resources/assets/dungeonsguide/gui/features/discordParty/joinRequest.gui b/mod/src/main/resources/assets/dungeonsguide/gui/features/discordParty/joinRequest.gui
index 7737d947..1640b705 100644
--- a/mod/src/main/resources/assets/dungeonsguide/gui/features/discordParty/joinRequest.gui
+++ b/mod/src/main/resources/assets/dungeonsguide/gui/features/discordParty/joinRequest.gui
@@ -43,47 +43,52 @@
                                     <size height="5"/>
                                     <size height="30">
                                         <scaler scale="2.0">
-                                            <row crossAlign="START">
-                                                <flexible fit="TIGHT" flex="1">
-                                                    <size/>
-                                                </flexible>
-                                                <flexible fit="TIGHT" flex="3">
-                                                    <ColorButton on:click="accept"
-                                                                 backgroundColor="#FF7289DA"          textColor="#FFFFFFFF"
-                                                                 hoveredBackgroundColor="#FF859DF0"   hoveredTextColor="#FFFFFFFF"
-                                                                 disabledBackgroundColor="0"  disabledTextColor="0"
-                                                                 pressedBackgroundColor="#FF9BB0FF"   pressedTextColor="#FFFFFFFF"
-                                                                 text="ACCEPT"
-                                                    />
-                                                </flexible>
-                                                <flexible fit="TIGHT" flex="1">
-                                                    <size/>
-                                                </flexible>
-                                                <flexible fit="TIGHT" flex="3">
-                                                    <ColorButton on:click="deny"
-                                                                 backgroundColor="#FF99AAB5"          textColor="#FFFFFFFF"
-                                                                 hoveredBackgroundColor="#FFAEC0CB"   hoveredTextColor="#FFFFFFFF"
-                                                                 disabledBackgroundColor="0"  disabledTextColor="0"
-                                                                 pressedBackgroundColor="#FFCADDE8"   pressedTextColor="#FFFFFFFF"
-                                                                 text="DENY"
-                                                    />
-                                                </flexible>
-                                                <flexible fit="TIGHT" flex="1">
-                                                    <size/>
-                                                </flexible>
-                                                <flexible fit="TIGHT" flex="3">
-                                                    <ColorButton on:click="ignore"
-                                                                 backgroundColor="#FF99AAB5"          textColor="#FFFFFFFF"
-                                                                 hoveredBackgroundColor="#FFAEC0CB"   hoveredTextColor="#FFFFFFFF"
-                                                                 disabledBackgroundColor="0"  disabledTextColor="0"
-                                                                 pressedBackgroundColor="#FFCADDE8"   pressedTextColor="#FFFFFFFF"
-                                                                 text="Ignore"
-                                                    />
-                                                </flexible>
-                                                <flexible fit="TIGHT" flex="1">
-                                                    <size/>
-                                                </flexible>
-                                            </row>
+                                            <SelectiveContainer bind:visible="visible">
+                                                <row crossAlign="START" slot="buttons">
+                                                    <flexible fit="TIGHT" flex="1">
+                                                        <size/>
+                                                    </flexible>
+                                                    <flexible fit="TIGHT" flex="3">
+                                                        <ColorButton on:click="accept"
+                                                                     backgroundColor="#FF7289DA"          textColor="#FFFFFFFF"
+                                                                     hoveredBackgroundColor="#FF859DF0"   hoveredTextColor="#FFFFFFFF"
+                                                                     disabledBackgroundColor="0"  disabledTextColor="0"
+                                                                     pressedBackgroundColor="#FF9BB0FF"   pressedTextColor="#FFFFFFFF"
+                                                                     text="ACCEPT"
+                                                        />
+                                                    </flexible>
+                                                    <flexible fit="TIGHT" flex="1">
+                                                        <size/>
+                                                    </flexible>
+                                                    <flexible fit="TIGHT" flex="3">
+                                                        <ColorButton on:click="deny"
+                                                                     backgroundColor="#FF99AAB5"          textColor="#FFFFFFFF"
+                                                                     hoveredBackgroundColor="#FFAEC0CB"   hoveredTextColor="#FFFFFFFF"
+                                                                     disabledBackgroundColor="0"  disabledTextColor="0"
+                                                                     pressedBackgroundColor="#FFCADDE8"   pressedTextColor="#FFFFFFFF"
+                                                                     text="DENY"
+                                                        />
+                                                    </flexible>
+                                                    <flexible fit="TIGHT" flex="1">
+                                                        <size/>
+                                                    </flexible>
+                                                    <flexible fit="TIGHT" flex="3">
+                                                        <ColorButton on:click="ignore"
+                                                                     backgroundColor="#FF99AAB5"          textColor="#FFFFFFFF"
+                                                                     hoveredBackgroundColor="#FFAEC0CB"   hoveredTextColor="#FFFFFFFF"
+                                                                     disabledBackgroundColor="0"  disabledTextColor="0"
+                                                                     pressedBackgroundColor="#FFCADDE8"   pressedTextColor="#FFFFFFFF"
+                                                                     text="Ignore"
+                                                        />
+                                                    </flexible>
+                                                    <flexible fit="TIGHT" flex="1">
+                                                        <size/>
+                                                    </flexible>
+                                                </row>
+                                                <Text text="Accepted Join Request" slot="accepted" color="#FFFFFFFF"/>
+                                                <Text text="Denied Join Request" slot="denied" color="#FFFFFFFF"/>
+                                                <Text text="Ignored Join Request" slot="ignored" color="#FFFFFFFF"/>
+                                            </SelectiveContainer>
                                         </scaler>
                                     </size>
                                 </col>
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
new file mode 100644
index 00000000..ff341ff1
--- /dev/null
+++ b/mod/src/main/resources/assets/dungeonsguide/gui/features/mechanicBrowser/category.gui
@@ -0,0 +1,26 @@
+<!--
+  ~ 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/>.
+  -->
+
+<col>
+    <size height="10">
+        <bgcolor backgroundColor="#FF000000">
+            <Text bind:value="categoryName"/>
+        </bgcolor>
+    </size>
+    
+</col>
\ No newline at end of file
-- 
cgit