From eb661f21f3fd52ca93d0cbc688948b272434cfbb Mon Sep 17 00:00:00 2001
From: Fernando Arzola <17498701+Arufonsu@users.noreply.github.com>
Date: Tue, 23 Jul 2024 22:18:52 -0400
Subject: [PATCH] enhancement: hotbar update (#52)

---
 resources/gui/hotbar.png                     | Bin 437 -> 338 bytes
 resources/gui/hotbaritem.png                 | Bin 202 -> 207 bytes
 resources/gui/layouts/game/HotbarWindow.json | 702 ++++++++++---------
 3 files changed, 371 insertions(+), 331 deletions(-)

diff --git a/resources/gui/hotbar.png b/resources/gui/hotbar.png
index b26112dd87eefbcf9552379609b76390bd263ba4..442f2cf4aeb73cab4991c93208c9b697f3d6bb28 100644
GIT binary patch
literal 338
zcmeAS@N?(olHy`uVBq!ia0y~yV4MPE>u|6ENhfVT9w4QV>=ES4z)+>ez|hdb!0-zw
z)bN6Vp;VuN;Z-~XgVl5f2JwO#(Orx{iMO6Ejv*Cu-d^1p$m}TMa&Z3=g>vJ7e+y&S
zUdQoS2rztD6|!j8-jBzsv-jD2`^>}e=R)l|TjR}XM_3y6?>xVC`V5AE9~EC28UC?5
zGAbx)FsQJwHnc2Ym>?j+Ak@U<;1s~%!NJAANl(e7vuA)#-Sdls;r(m7>v8v;Ll}Pa
e{*I|mdnU~5FF47oh&dGKaRyIUKbLh*2~7Y_JYQu1

literal 437
zcmeAS@N?(olHy`uVBq!ia0y~yV4MkLYjLmv$;2MDg+PiW-O<;Pfnj4m_n$;oAYUQb
zBgmJ5p-PQ`p`nF=;TKS-;RORjsR0ASs{{rHs~HRo;stYd1=;{5*pj^6U4S$Y{B+)3
z52QE?JR*x37`TN%nDNrxx<5cWB|TjnLn>~)y{hQPoG9XU@%t<_*}GvTsfr#lO?wkK
zZaXk!FL7k3T2*IuQGc?}xyXa1+uzI2lUw~Nxu;N%VMpV;eIZvrZ(DV*uI~T2&o!~T
zI2)$USa$bk#f|;>$0W+xm=EZl{k-*<#PYM36dBe`Kgl4FY{YP61`mUw8nZ*s0CCSO
z+r58T=JpbH25lqX-LKxA-nJ^Pzy0rXiN{+?L>OLQxO+eJ>nDE4t%~ugZx)^hg`lUa
KpUXO@geCyw2$O99

diff --git a/resources/gui/hotbaritem.png b/resources/gui/hotbaritem.png
index b1783989d7f6a9c1503231c61d5b1996bf6e07e8..7ad939fe95cdff4daa4f43359a3f8a0afa29817c 100644
GIT binary patch
literal 207
zcmeAS@N?(olHy`uVBq!ia0vp^Dj>|k1|%Oc%$NbB7>k44ofy`glX(f`bb7ithD5Z!
zy|Iw@Z~#wB;(YTCIWITOcWiTwrCHLaNV(or&{t6lUD{mtz%Jv9cN%;3o_q82_y5Xa
zeb7-GEpBX_a;9*Os^QA5n%{C`4V-+ka=F%5UAF)GYIC^zpCEz73T}=)O%kkzTuCBF
tG&%y21!VeG^m!B<sb~(BbDQ}kZ{Z8w-xr^>Z2~%q!PC{xWt~$(69B!uN+AFM

literal 202
zcmeAS@N?(olHy`uVBq!ia0vp^N<gg4!3HEhO5aEaQjEnx?oJHr&dIz4a#}oH977^n
z-`?2B+h8EzeDQN`L(oBuD>(<|<V=_q=pnk1aiOBnrWL|m|39r#k4?XEdCwa6ou@K*
zo0Z=d&OUP{K+tl&ui#dJwk^kVo&1kTKVEzPW9ZIPFZK$WI$Gd>JN`R7@YpL@u;l+6
f<*yg24R<l#Kd$@J&fWhp&^-*Eu6{1-oD!M<i0n-#

diff --git a/resources/gui/layouts/game/HotbarWindow.json b/resources/gui/layouts/game/HotbarWindow.json
index 0c465c7..a7d90c6 100644
--- a/resources/gui/layouts/game/HotbarWindow.json
+++ b/resources/gui/layouts/game/HotbarWindow.json
@@ -1,5 +1,5 @@
 {
-  "Bounds": "953,4,409,42",
+  "Bounds": "953,4,404,44",
   "Padding": "0,0,0,0",
   "AlignmentEdgeDistances": "0,4,4,0",
   "AlignmentTransform": "0,0",
@@ -23,7 +23,7 @@
   "RightMouseClickSound": null,
   "Children": {
     "HotbarContainer0": {
-      "Bounds": "8,4,34,35",
+      "Bounds": "4,4,36,36",
       "Padding": "0,0,0,0",
       "AlignmentEdgeDistances": "0,0,0,0",
       "AlignmentTransform": "0,0",
@@ -68,36 +68,10 @@
           "Texture": "",
           "HoverSound": "octave-tap-resonant.wav",
           "LeftMouseClickSound": "octave-tap-warm.wav",
-          "RightMouseClickSound": "octave-beep-tapped.wav",
-          "Children": {
-            "HotbarEquipedIcon0": {
-              "Bounds": "26,2,2,2",
-              "Padding": "0,0,0,0",
-              "AlignmentEdgeDistances": "0,0,0,0",
-              "AlignmentTransform": "0,0",
-              "Margin": "0,0,0,0",
-              "RenderColor": "0,255,0,0",
-              "Alignments": "",
-              "DrawBackground": true,
-              "MinimumSize": "1,1",
-              "MaximumSize": "4096,4096",
-              "Disabled": false,
-              "Hidden": false,
-              "RestrictToParent": false,
-              "MouseInputEnabled": false,
-              "HideToolTip": false,
-              "ToolTipBackground": null,
-              "ToolTipFont": null,
-              "ToolTipTextColor": "",
-              "Texture": "",
-              "HoverSound": null,
-              "LeftMouseClickSound": null,
-              "RightMouseClickSound": null
-            }
-          }
+          "RightMouseClickSound": "octave-beep-tapped.wav"
         },
-        "HotbarEquippedLabel0": {
-          "Bounds": "24,0,10,11",
+        "_equipLabel0": {
+          "Bounds": "26,0,10,11",
           "Padding": "0,0,0,0",
           "AlignmentEdgeDistances": "0,0,0,0",
           "AlignmentTransform": "0,0",
@@ -126,8 +100,38 @@
           "Font": "sourcesansproblack,8",
           "TextScale": 1.0
         },
-        "HotbarCooldownLabel0": {
-          "Bounds": "14,12,5,11",
+        "_quantityLabel0": {
+          "Bounds": "31,0,5,11",
+          "Padding": "0,0,0,0",
+          "AlignmentEdgeDistances": "0,0,0,0",
+          "AlignmentTransform": "0,0",
+          "Margin": "0,0,0,0",
+          "RenderColor": "255,255,255,255",
+          "Alignments": "Right,Top",
+          "DrawBackground": true,
+          "MinimumSize": "1,1",
+          "MaximumSize": "4096,4096",
+          "Disabled": false,
+          "Hidden": true,
+          "RestrictToParent": false,
+          "MouseInputEnabled": false,
+          "HideToolTip": false,
+          "ToolTipBackground": null,
+          "ToolTipFont": null,
+          "ToolTipTextColor": "",
+          "BackgroundTemplate": "equipped.png",
+          "TextColor": "255,255,255,255",
+          "HoveredTextColor": "",
+          "ClickedTextColor": "",
+          "DisabledTextColor": "255,90,90,90",
+          "TextAlign": "Left, Top",
+          "TextPadding": "2,-2,2,-1",
+          "AutoSizeToContents": true,
+          "Font": "sourcesansproblack,8",
+          "TextScale": 1.0
+        },
+        "_cooldownLabel0": {
+          "Bounds": "15,12,5,11",
           "Padding": "0,0,0,0",
           "AlignmentEdgeDistances": "0,0,0,0",
           "AlignmentTransform": "0,0",
@@ -157,7 +161,7 @@
           "TextScale": 1.0
         },
         "HotbarLabel0": {
-          "Bounds": "29,24,5,11",
+          "Bounds": "31,25,5,11",
           "Padding": "0,0,0,0",
           "AlignmentEdgeDistances": "0,0,0,0",
           "AlignmentTransform": "0,0",
@@ -189,7 +193,7 @@
       }
     },
     "HotbarContainer1": {
-      "Bounds": "48,4,34,35",
+      "Bounds": "44,4,36,36",
       "Padding": "0,0,0,0",
       "AlignmentEdgeDistances": "0,0,0,0",
       "AlignmentTransform": "0,0",
@@ -234,36 +238,40 @@
           "Texture": "",
           "HoverSound": "octave-tap-resonant.wav",
           "LeftMouseClickSound": "octave-tap-warm.wav",
-          "RightMouseClickSound": "octave-beep-tapped.wav",
-          "Children": {
-            "HotbarEquipedIcon1": {
-              "Bounds": "26,2,2,2",
-              "Padding": "0,0,0,0",
-              "AlignmentEdgeDistances": "0,0,0,0",
-              "AlignmentTransform": "0,0",
-              "Margin": "0,0,0,0",
-              "RenderColor": "0,255,0,0",
-              "Alignments": "",
-              "DrawBackground": true,
-              "MinimumSize": "1,1",
-              "MaximumSize": "4096,4096",
-              "Disabled": false,
-              "Hidden": false,
-              "RestrictToParent": false,
-              "MouseInputEnabled": false,
-              "HideToolTip": false,
-              "ToolTipBackground": null,
-              "ToolTipFont": null,
-              "ToolTipTextColor": "",
-              "Texture": "",
-              "HoverSound": null,
-              "LeftMouseClickSound": null,
-              "RightMouseClickSound": null
-            }
-          }
+          "RightMouseClickSound": "octave-beep-tapped.wav"
+        },
+        "_equipLabel1": {
+          "Bounds": "26,0,10,11",
+          "Padding": "0,0,0,0",
+          "AlignmentEdgeDistances": "0,0,0,0",
+          "AlignmentTransform": "0,0",
+          "Margin": "0,0,0,0",
+          "RenderColor": "255,255,255,255",
+          "Alignments": "Right,Top",
+          "DrawBackground": true,
+          "MinimumSize": "1,1",
+          "MaximumSize": "4096,4096",
+          "Disabled": false,
+          "Hidden": true,
+          "RestrictToParent": false,
+          "MouseInputEnabled": false,
+          "HideToolTip": false,
+          "ToolTipBackground": null,
+          "ToolTipFont": null,
+          "ToolTipTextColor": "",
+          "BackgroundTemplate": "equipped.png",
+          "TextColor": "255,255,255,255",
+          "HoveredTextColor": "",
+          "ClickedTextColor": "",
+          "DisabledTextColor": "255,90,90,90",
+          "TextAlign": "Left, Top",
+          "TextPadding": "2,-2,2,-1",
+          "AutoSizeToContents": true,
+          "Font": "sourcesansproblack,8",
+          "TextScale": 1.0
         },
-        "HotbarEquippedLabel1": {
-          "Bounds": "24,0,10,11",
+        "_quantityLabel1": {
+          "Bounds": "31,0,5,11",
           "Padding": "0,0,0,0",
           "AlignmentEdgeDistances": "0,0,0,0",
           "AlignmentTransform": "0,0",
@@ -292,8 +300,8 @@
           "Font": "sourcesansproblack,8",
           "TextScale": 1.0
         },
-        "HotbarCooldownLabel1": {
-          "Bounds": "14,12,5,11",
+        "_cooldownLabel1": {
+          "Bounds": "15,12,5,11",
           "Padding": "0,0,0,0",
           "AlignmentEdgeDistances": "0,0,0,0",
           "AlignmentTransform": "0,0",
@@ -323,7 +331,7 @@
           "TextScale": 1.0
         },
         "HotbarLabel1": {
-          "Bounds": "29,24,5,11",
+          "Bounds": "31,25,5,11",
           "Padding": "0,0,0,0",
           "AlignmentEdgeDistances": "0,0,0,0",
           "AlignmentTransform": "0,0",
@@ -355,7 +363,7 @@
       }
     },
     "HotbarContainer2": {
-      "Bounds": "88,4,34,35",
+      "Bounds": "84,4,36,36",
       "Padding": "0,0,0,0",
       "AlignmentEdgeDistances": "0,0,0,0",
       "AlignmentTransform": "0,0",
@@ -400,36 +408,40 @@
           "Texture": "",
           "HoverSound": "octave-tap-resonant.wav",
           "LeftMouseClickSound": "octave-tap-warm.wav",
-          "RightMouseClickSound": "octave-beep-tapped.wav",
-          "Children": {
-            "HotbarEquipedIcon2": {
-              "Bounds": "26,2,2,2",
-              "Padding": "0,0,0,0",
-              "AlignmentEdgeDistances": "0,0,0,0",
-              "AlignmentTransform": "0,0",
-              "Margin": "0,0,0,0",
-              "RenderColor": "0,255,0,0",
-              "Alignments": "",
-              "DrawBackground": true,
-              "MinimumSize": "1,1",
-              "MaximumSize": "4096,4096",
-              "Disabled": false,
-              "Hidden": false,
-              "RestrictToParent": false,
-              "MouseInputEnabled": false,
-              "HideToolTip": false,
-              "ToolTipBackground": null,
-              "ToolTipFont": null,
-              "ToolTipTextColor": "",
-              "Texture": "",
-              "HoverSound": null,
-              "LeftMouseClickSound": null,
-              "RightMouseClickSound": null
-            }
-          }
+          "RightMouseClickSound": "octave-beep-tapped.wav"
+        },
+        "_equipLabel2": {
+          "Bounds": "26,0,10,11",
+          "Padding": "0,0,0,0",
+          "AlignmentEdgeDistances": "0,0,0,0",
+          "AlignmentTransform": "0,0",
+          "Margin": "0,0,0,0",
+          "RenderColor": "255,255,255,255",
+          "Alignments": "Right,Top",
+          "DrawBackground": true,
+          "MinimumSize": "1,1",
+          "MaximumSize": "4096,4096",
+          "Disabled": false,
+          "Hidden": true,
+          "RestrictToParent": false,
+          "MouseInputEnabled": false,
+          "HideToolTip": false,
+          "ToolTipBackground": null,
+          "ToolTipFont": null,
+          "ToolTipTextColor": "",
+          "BackgroundTemplate": "equipped.png",
+          "TextColor": "255,255,255,255",
+          "HoveredTextColor": "",
+          "ClickedTextColor": "",
+          "DisabledTextColor": "255,90,90,90",
+          "TextAlign": "Left, Top",
+          "TextPadding": "2,-2,2,-1",
+          "AutoSizeToContents": true,
+          "Font": "sourcesansproblack,8",
+          "TextScale": 1.0
         },
-        "HotbarEquippedLabel2": {
-          "Bounds": "24,0,10,11",
+        "_quantityLabel2": {
+          "Bounds": "31,0,5,11",
           "Padding": "0,0,0,0",
           "AlignmentEdgeDistances": "0,0,0,0",
           "AlignmentTransform": "0,0",
@@ -458,8 +470,8 @@
           "Font": "sourcesansproblack,8",
           "TextScale": 1.0
         },
-        "HotbarCooldownLabel2": {
-          "Bounds": "14,12,5,11",
+        "_cooldownLabel2": {
+          "Bounds": "15,12,5,11",
           "Padding": "0,0,0,0",
           "AlignmentEdgeDistances": "0,0,0,0",
           "AlignmentTransform": "0,0",
@@ -489,7 +501,7 @@
           "TextScale": 1.0
         },
         "HotbarLabel2": {
-          "Bounds": "29,24,5,11",
+          "Bounds": "31,25,5,11",
           "Padding": "0,0,0,0",
           "AlignmentEdgeDistances": "0,0,0,0",
           "AlignmentTransform": "0,0",
@@ -521,7 +533,7 @@
       }
     },
     "HotbarContainer3": {
-      "Bounds": "128,4,34,35",
+      "Bounds": "124,4,36,36",
       "Padding": "0,0,0,0",
       "AlignmentEdgeDistances": "0,0,0,0",
       "AlignmentTransform": "0,0",
@@ -566,36 +578,40 @@
           "Texture": "",
           "HoverSound": "octave-tap-resonant.wav",
           "LeftMouseClickSound": "octave-tap-warm.wav",
-          "RightMouseClickSound": "octave-beep-tapped.wav",
-          "Children": {
-            "HotbarEquipedIcon3": {
-              "Bounds": "26,2,2,2",
-              "Padding": "0,0,0,0",
-              "AlignmentEdgeDistances": "0,0,0,0",
-              "AlignmentTransform": "0,0",
-              "Margin": "0,0,0,0",
-              "RenderColor": "0,255,0,0",
-              "Alignments": "",
-              "DrawBackground": true,
-              "MinimumSize": "1,1",
-              "MaximumSize": "4096,4096",
-              "Disabled": false,
-              "Hidden": false,
-              "RestrictToParent": false,
-              "MouseInputEnabled": false,
-              "HideToolTip": false,
-              "ToolTipBackground": null,
-              "ToolTipFont": null,
-              "ToolTipTextColor": "",
-              "Texture": "",
-              "HoverSound": null,
-              "LeftMouseClickSound": null,
-              "RightMouseClickSound": null
-            }
-          }
+          "RightMouseClickSound": "octave-beep-tapped.wav"
+        },
+        "_equipLabel3": {
+          "Bounds": "26,0,10,11",
+          "Padding": "0,0,0,0",
+          "AlignmentEdgeDistances": "0,0,0,0",
+          "AlignmentTransform": "0,0",
+          "Margin": "0,0,0,0",
+          "RenderColor": "255,255,255,255",
+          "Alignments": "Right,Top",
+          "DrawBackground": true,
+          "MinimumSize": "1,1",
+          "MaximumSize": "4096,4096",
+          "Disabled": false,
+          "Hidden": true,
+          "RestrictToParent": false,
+          "MouseInputEnabled": false,
+          "HideToolTip": false,
+          "ToolTipBackground": null,
+          "ToolTipFont": null,
+          "ToolTipTextColor": "",
+          "BackgroundTemplate": "equipped.png",
+          "TextColor": "255,255,255,255",
+          "HoveredTextColor": "",
+          "ClickedTextColor": "",
+          "DisabledTextColor": "255,90,90,90",
+          "TextAlign": "Left, Top",
+          "TextPadding": "2,-2,2,-1",
+          "AutoSizeToContents": true,
+          "Font": "sourcesansproblack,8",
+          "TextScale": 1.0
         },
-        "HotbarEquippedLabel3": {
-          "Bounds": "24,0,10,11",
+        "_quantityLabel3": {
+          "Bounds": "31,0,5,11",
           "Padding": "0,0,0,0",
           "AlignmentEdgeDistances": "0,0,0,0",
           "AlignmentTransform": "0,0",
@@ -624,8 +640,8 @@
           "Font": "sourcesansproblack,8",
           "TextScale": 1.0
         },
-        "HotbarCooldownLabel3": {
-          "Bounds": "14,12,5,11",
+        "_cooldownLabel3": {
+          "Bounds": "15,12,5,11",
           "Padding": "0,0,0,0",
           "AlignmentEdgeDistances": "0,0,0,0",
           "AlignmentTransform": "0,0",
@@ -655,7 +671,7 @@
           "TextScale": 1.0
         },
         "HotbarLabel3": {
-          "Bounds": "29,24,5,11",
+          "Bounds": "31,25,5,11",
           "Padding": "0,0,0,0",
           "AlignmentEdgeDistances": "0,0,0,0",
           "AlignmentTransform": "0,0",
@@ -687,7 +703,7 @@
       }
     },
     "HotbarContainer4": {
-      "Bounds": "168,4,34,35",
+      "Bounds": "164,4,36,36",
       "Padding": "0,0,0,0",
       "AlignmentEdgeDistances": "0,0,0,0",
       "AlignmentTransform": "0,0",
@@ -732,36 +748,40 @@
           "Texture": "",
           "HoverSound": "octave-tap-resonant.wav",
           "LeftMouseClickSound": "octave-tap-warm.wav",
-          "RightMouseClickSound": "octave-beep-tapped.wav",
-          "Children": {
-            "HotbarEquipedIcon4": {
-              "Bounds": "26,2,2,2",
-              "Padding": "0,0,0,0",
-              "AlignmentEdgeDistances": "0,0,0,0",
-              "AlignmentTransform": "0,0",
-              "Margin": "0,0,0,0",
-              "RenderColor": "0,255,0,0",
-              "Alignments": "",
-              "DrawBackground": true,
-              "MinimumSize": "1,1",
-              "MaximumSize": "4096,4096",
-              "Disabled": false,
-              "Hidden": false,
-              "RestrictToParent": false,
-              "MouseInputEnabled": false,
-              "HideToolTip": false,
-              "ToolTipBackground": null,
-              "ToolTipFont": null,
-              "ToolTipTextColor": "",
-              "Texture": "",
-              "HoverSound": null,
-              "LeftMouseClickSound": null,
-              "RightMouseClickSound": null
-            }
-          }
+          "RightMouseClickSound": "octave-beep-tapped.wav"
+        },
+        "_equipLabel4": {
+          "Bounds": "26,0,10,11",
+          "Padding": "0,0,0,0",
+          "AlignmentEdgeDistances": "0,0,0,0",
+          "AlignmentTransform": "0,0",
+          "Margin": "0,0,0,0",
+          "RenderColor": "255,255,255,255",
+          "Alignments": "Right,Top",
+          "DrawBackground": true,
+          "MinimumSize": "1,1",
+          "MaximumSize": "4096,4096",
+          "Disabled": false,
+          "Hidden": true,
+          "RestrictToParent": false,
+          "MouseInputEnabled": false,
+          "HideToolTip": false,
+          "ToolTipBackground": null,
+          "ToolTipFont": null,
+          "ToolTipTextColor": "",
+          "BackgroundTemplate": "equipped.png",
+          "TextColor": "255,255,255,255",
+          "HoveredTextColor": "",
+          "ClickedTextColor": "",
+          "DisabledTextColor": "255,90,90,90",
+          "TextAlign": "Left, Top",
+          "TextPadding": "2,-2,2,-1",
+          "AutoSizeToContents": true,
+          "Font": "sourcesansproblack,8",
+          "TextScale": 1.0
         },
-        "HotbarEquippedLabel4": {
-          "Bounds": "24,0,10,11",
+        "_quantityLabel4": {
+          "Bounds": "31,0,5,11",
           "Padding": "0,0,0,0",
           "AlignmentEdgeDistances": "0,0,0,0",
           "AlignmentTransform": "0,0",
@@ -790,8 +810,8 @@
           "Font": "sourcesansproblack,8",
           "TextScale": 1.0
         },
-        "HotbarCooldownLabel4": {
-          "Bounds": "14,12,5,11",
+        "_cooldownLabel4": {
+          "Bounds": "15,12,5,11",
           "Padding": "0,0,0,0",
           "AlignmentEdgeDistances": "0,0,0,0",
           "AlignmentTransform": "0,0",
@@ -821,7 +841,7 @@
           "TextScale": 1.0
         },
         "HotbarLabel4": {
-          "Bounds": "29,24,5,11",
+          "Bounds": "31,25,5,11",
           "Padding": "0,0,0,0",
           "AlignmentEdgeDistances": "0,0,0,0",
           "AlignmentTransform": "0,0",
@@ -853,7 +873,7 @@
       }
     },
     "HotbarContainer5": {
-      "Bounds": "208,4,34,35",
+      "Bounds": "204,4,36,36",
       "Padding": "0,0,0,0",
       "AlignmentEdgeDistances": "0,0,0,0",
       "AlignmentTransform": "0,0",
@@ -898,36 +918,10 @@
           "Texture": "",
           "HoverSound": "octave-tap-resonant.wav",
           "LeftMouseClickSound": "octave-tap-warm.wav",
-          "RightMouseClickSound": "octave-beep-tapped.wav",
-          "Children": {
-            "HotbarEquipedIcon5": {
-              "Bounds": "26,2,2,2",
-              "Padding": "0,0,0,0",
-              "AlignmentEdgeDistances": "0,0,0,0",
-              "AlignmentTransform": "0,0",
-              "Margin": "0,0,0,0",
-              "RenderColor": "0,255,0,0",
-              "Alignments": "",
-              "DrawBackground": true,
-              "MinimumSize": "1,1",
-              "MaximumSize": "4096,4096",
-              "Disabled": false,
-              "Hidden": false,
-              "RestrictToParent": false,
-              "MouseInputEnabled": false,
-              "HideToolTip": false,
-              "ToolTipBackground": null,
-              "ToolTipFont": null,
-              "ToolTipTextColor": "",
-              "Texture": "",
-              "HoverSound": null,
-              "LeftMouseClickSound": null,
-              "RightMouseClickSound": null
-            }
-          }
+          "RightMouseClickSound": "octave-beep-tapped.wav"
         },
-        "HotbarEquippedLabel5": {
-          "Bounds": "24,0,10,11",
+        "_equipLabel5": {
+          "Bounds": "26,0,10,11",
           "Padding": "0,0,0,0",
           "AlignmentEdgeDistances": "0,0,0,0",
           "AlignmentTransform": "0,0",
@@ -956,8 +950,38 @@
           "Font": "sourcesansproblack,8",
           "TextScale": 1.0
         },
-        "HotbarCooldownLabel5": {
-          "Bounds": "14,12,5,11",
+        "_quantityLabel5": {
+          "Bounds": "31,0,5,11",
+          "Padding": "0,0,0,0",
+          "AlignmentEdgeDistances": "0,0,0,0",
+          "AlignmentTransform": "0,0",
+          "Margin": "0,0,0,0",
+          "RenderColor": "255,255,255,255",
+          "Alignments": "Right,Top",
+          "DrawBackground": true,
+          "MinimumSize": "1,1",
+          "MaximumSize": "4096,4096",
+          "Disabled": false,
+          "Hidden": true,
+          "RestrictToParent": false,
+          "MouseInputEnabled": false,
+          "HideToolTip": false,
+          "ToolTipBackground": null,
+          "ToolTipFont": null,
+          "ToolTipTextColor": "",
+          "BackgroundTemplate": "equipped.png",
+          "TextColor": "255,255,255,255",
+          "HoveredTextColor": "",
+          "ClickedTextColor": "",
+          "DisabledTextColor": "255,90,90,90",
+          "TextAlign": "Left, Top",
+          "TextPadding": "2,-2,2,-1",
+          "AutoSizeToContents": true,
+          "Font": "sourcesansproblack,8",
+          "TextScale": 1.0
+        },
+        "_cooldownLabel5": {
+          "Bounds": "15,12,5,11",
           "Padding": "0,0,0,0",
           "AlignmentEdgeDistances": "0,0,0,0",
           "AlignmentTransform": "0,0",
@@ -987,7 +1011,7 @@
           "TextScale": 1.0
         },
         "HotbarLabel5": {
-          "Bounds": "29,24,5,11",
+          "Bounds": "31,25,5,11",
           "Padding": "0,0,0,0",
           "AlignmentEdgeDistances": "0,0,0,0",
           "AlignmentTransform": "0,0",
@@ -1019,7 +1043,7 @@
       }
     },
     "HotbarContainer6": {
-      "Bounds": "248,4,34,35",
+      "Bounds": "244,4,36,36",
       "Padding": "0,0,0,0",
       "AlignmentEdgeDistances": "0,0,0,0",
       "AlignmentTransform": "0,0",
@@ -1064,36 +1088,40 @@
           "Texture": "",
           "HoverSound": "octave-tap-resonant.wav",
           "LeftMouseClickSound": "octave-tap-warm.wav",
-          "RightMouseClickSound": "octave-beep-tapped.wav",
-          "Children": {
-            "HotbarEquipedIcon6": {
-              "Bounds": "26,2,2,2",
-              "Padding": "0,0,0,0",
-              "AlignmentEdgeDistances": "0,0,0,0",
-              "AlignmentTransform": "0,0",
-              "Margin": "0,0,0,0",
-              "RenderColor": "0,255,0,0",
-              "Alignments": "",
-              "DrawBackground": true,
-              "MinimumSize": "1,1",
-              "MaximumSize": "4096,4096",
-              "Disabled": false,
-              "Hidden": false,
-              "RestrictToParent": false,
-              "MouseInputEnabled": false,
-              "HideToolTip": false,
-              "ToolTipBackground": null,
-              "ToolTipFont": null,
-              "ToolTipTextColor": "",
-              "Texture": "",
-              "HoverSound": null,
-              "LeftMouseClickSound": null,
-              "RightMouseClickSound": null
-            }
-          }
+          "RightMouseClickSound": "octave-beep-tapped.wav"
+        },
+        "_equipLabel6": {
+          "Bounds": "26,0,10,11",
+          "Padding": "0,0,0,0",
+          "AlignmentEdgeDistances": "0,0,0,0",
+          "AlignmentTransform": "0,0",
+          "Margin": "0,0,0,0",
+          "RenderColor": "255,255,255,255",
+          "Alignments": "Right,Top",
+          "DrawBackground": true,
+          "MinimumSize": "1,1",
+          "MaximumSize": "4096,4096",
+          "Disabled": false,
+          "Hidden": true,
+          "RestrictToParent": false,
+          "MouseInputEnabled": false,
+          "HideToolTip": false,
+          "ToolTipBackground": null,
+          "ToolTipFont": null,
+          "ToolTipTextColor": "",
+          "BackgroundTemplate": "equipped.png",
+          "TextColor": "255,255,255,255",
+          "HoveredTextColor": "",
+          "ClickedTextColor": "",
+          "DisabledTextColor": "255,90,90,90",
+          "TextAlign": "Left, Top",
+          "TextPadding": "2,-2,2,-1",
+          "AutoSizeToContents": true,
+          "Font": "sourcesansproblack,8",
+          "TextScale": 1.0
         },
-        "HotbarEquippedLabel6": {
-          "Bounds": "24,0,10,11",
+        "_quantityLabel6": {
+          "Bounds": "31,0,5,11",
           "Padding": "0,0,0,0",
           "AlignmentEdgeDistances": "0,0,0,0",
           "AlignmentTransform": "0,0",
@@ -1122,8 +1150,8 @@
           "Font": "sourcesansproblack,8",
           "TextScale": 1.0
         },
-        "HotbarCooldownLabel6": {
-          "Bounds": "14,12,5,11",
+        "_cooldownLabel6": {
+          "Bounds": "15,12,5,11",
           "Padding": "0,0,0,0",
           "AlignmentEdgeDistances": "0,0,0,0",
           "AlignmentTransform": "0,0",
@@ -1153,7 +1181,7 @@
           "TextScale": 1.0
         },
         "HotbarLabel6": {
-          "Bounds": "29,24,5,11",
+          "Bounds": "31,25,5,11",
           "Padding": "0,0,0,0",
           "AlignmentEdgeDistances": "0,0,0,0",
           "AlignmentTransform": "0,0",
@@ -1185,7 +1213,7 @@
       }
     },
     "HotbarContainer7": {
-      "Bounds": "288,4,34,35",
+      "Bounds": "284,4,36,36",
       "Padding": "0,0,0,0",
       "AlignmentEdgeDistances": "0,0,0,0",
       "AlignmentTransform": "0,0",
@@ -1230,36 +1258,40 @@
           "Texture": "",
           "HoverSound": "octave-tap-resonant.wav",
           "LeftMouseClickSound": "octave-tap-warm.wav",
-          "RightMouseClickSound": "octave-beep-tapped.wav",
-          "Children": {
-            "HotbarEquipedIcon7": {
-              "Bounds": "26,2,2,2",
-              "Padding": "0,0,0,0",
-              "AlignmentEdgeDistances": "0,0,0,0",
-              "AlignmentTransform": "0,0",
-              "Margin": "0,0,0,0",
-              "RenderColor": "0,255,0,0",
-              "Alignments": "",
-              "DrawBackground": true,
-              "MinimumSize": "1,1",
-              "MaximumSize": "4096,4096",
-              "Disabled": false,
-              "Hidden": false,
-              "RestrictToParent": false,
-              "MouseInputEnabled": false,
-              "HideToolTip": false,
-              "ToolTipBackground": null,
-              "ToolTipFont": null,
-              "ToolTipTextColor": "",
-              "Texture": "",
-              "HoverSound": null,
-              "LeftMouseClickSound": null,
-              "RightMouseClickSound": null
-            }
-          }
+          "RightMouseClickSound": "octave-beep-tapped.wav"
+        },
+        "_equipLabel7": {
+          "Bounds": "26,0,10,11",
+          "Padding": "0,0,0,0",
+          "AlignmentEdgeDistances": "0,0,0,0",
+          "AlignmentTransform": "0,0",
+          "Margin": "0,0,0,0",
+          "RenderColor": "255,255,255,255",
+          "Alignments": "Right,Top",
+          "DrawBackground": true,
+          "MinimumSize": "1,1",
+          "MaximumSize": "4096,4096",
+          "Disabled": false,
+          "Hidden": true,
+          "RestrictToParent": false,
+          "MouseInputEnabled": false,
+          "HideToolTip": false,
+          "ToolTipBackground": null,
+          "ToolTipFont": null,
+          "ToolTipTextColor": "",
+          "BackgroundTemplate": "equipped.png",
+          "TextColor": "255,255,255,255",
+          "HoveredTextColor": "",
+          "ClickedTextColor": "",
+          "DisabledTextColor": "255,90,90,90",
+          "TextAlign": "Left, Top",
+          "TextPadding": "2,-2,2,-1",
+          "AutoSizeToContents": true,
+          "Font": "sourcesansproblack,8",
+          "TextScale": 1.0
         },
-        "HotbarEquippedLabel7": {
-          "Bounds": "24,0,10,11",
+        "_quantityLabel7": {
+          "Bounds": "31,0,5,11",
           "Padding": "0,0,0,0",
           "AlignmentEdgeDistances": "0,0,0,0",
           "AlignmentTransform": "0,0",
@@ -1288,8 +1320,8 @@
           "Font": "sourcesansproblack,8",
           "TextScale": 1.0
         },
-        "HotbarCooldownLabel7": {
-          "Bounds": "14,12,5,11",
+        "_cooldownLabel7": {
+          "Bounds": "15,12,5,11",
           "Padding": "0,0,0,0",
           "AlignmentEdgeDistances": "0,0,0,0",
           "AlignmentTransform": "0,0",
@@ -1319,7 +1351,7 @@
           "TextScale": 1.0
         },
         "HotbarLabel7": {
-          "Bounds": "29,24,5,11",
+          "Bounds": "31,25,5,11",
           "Padding": "0,0,0,0",
           "AlignmentEdgeDistances": "0,0,0,0",
           "AlignmentTransform": "0,0",
@@ -1351,7 +1383,7 @@
       }
     },
     "HotbarContainer8": {
-      "Bounds": "328,4,34,35",
+      "Bounds": "324,4,36,36",
       "Padding": "0,0,0,0",
       "AlignmentEdgeDistances": "0,0,0,0",
       "AlignmentTransform": "0,0",
@@ -1396,36 +1428,40 @@
           "Texture": "",
           "HoverSound": "octave-tap-resonant.wav",
           "LeftMouseClickSound": "octave-tap-warm.wav",
-          "RightMouseClickSound": "octave-beep-tapped.wav",
-          "Children": {
-            "HotbarEquipedIcon8": {
-              "Bounds": "26,2,2,2",
-              "Padding": "0,0,0,0",
-              "AlignmentEdgeDistances": "0,0,0,0",
-              "AlignmentTransform": "0,0",
-              "Margin": "0,0,0,0",
-              "RenderColor": "0,255,0,0",
-              "Alignments": "",
-              "DrawBackground": true,
-              "MinimumSize": "1,1",
-              "MaximumSize": "4096,4096",
-              "Disabled": false,
-              "Hidden": false,
-              "RestrictToParent": false,
-              "MouseInputEnabled": false,
-              "HideToolTip": false,
-              "ToolTipBackground": null,
-              "ToolTipFont": null,
-              "ToolTipTextColor": "",
-              "Texture": "",
-              "HoverSound": null,
-              "LeftMouseClickSound": null,
-              "RightMouseClickSound": null
-            }
-          }
+          "RightMouseClickSound": "octave-beep-tapped.wav"
+        },
+        "_equipLabel8": {
+          "Bounds": "26,0,10,11",
+          "Padding": "0,0,0,0",
+          "AlignmentEdgeDistances": "0,0,0,0",
+          "AlignmentTransform": "0,0",
+          "Margin": "0,0,0,0",
+          "RenderColor": "255,255,255,255",
+          "Alignments": "Right,Top",
+          "DrawBackground": true,
+          "MinimumSize": "1,1",
+          "MaximumSize": "4096,4096",
+          "Disabled": false,
+          "Hidden": true,
+          "RestrictToParent": false,
+          "MouseInputEnabled": false,
+          "HideToolTip": false,
+          "ToolTipBackground": null,
+          "ToolTipFont": null,
+          "ToolTipTextColor": "",
+          "BackgroundTemplate": "equipped.png",
+          "TextColor": "255,255,255,255",
+          "HoveredTextColor": "",
+          "ClickedTextColor": "",
+          "DisabledTextColor": "255,90,90,90",
+          "TextAlign": "Left, Top",
+          "TextPadding": "2,-2,2,-1",
+          "AutoSizeToContents": true,
+          "Font": "sourcesansproblack,8",
+          "TextScale": 1.0
         },
-        "HotbarEquippedLabel8": {
-          "Bounds": "24,0,10,11",
+        "_quantityLabel8": {
+          "Bounds": "31,0,5,11",
           "Padding": "0,0,0,0",
           "AlignmentEdgeDistances": "0,0,0,0",
           "AlignmentTransform": "0,0",
@@ -1454,8 +1490,8 @@
           "Font": "sourcesansproblack,8",
           "TextScale": 1.0
         },
-        "HotbarCooldownLabel8": {
-          "Bounds": "14,12,5,11",
+        "_cooldownLabel8": {
+          "Bounds": "15,12,5,11",
           "Padding": "0,0,0,0",
           "AlignmentEdgeDistances": "0,0,0,0",
           "AlignmentTransform": "0,0",
@@ -1485,7 +1521,7 @@
           "TextScale": 1.0
         },
         "HotbarLabel8": {
-          "Bounds": "29,24,5,11",
+          "Bounds": "31,25,5,11",
           "Padding": "0,0,0,0",
           "AlignmentEdgeDistances": "0,0,0,0",
           "AlignmentTransform": "0,0",
@@ -1517,7 +1553,7 @@
       }
     },
     "HotbarContainer9": {
-      "Bounds": "368,4,34,35",
+      "Bounds": "364,4,36,36",
       "Padding": "0,0,0,0",
       "AlignmentEdgeDistances": "0,0,0,0",
       "AlignmentTransform": "0,0",
@@ -1562,36 +1598,40 @@
           "Texture": "",
           "HoverSound": "octave-tap-resonant.wav",
           "LeftMouseClickSound": "octave-tap-warm.wav",
-          "RightMouseClickSound": "octave-beep-tapped.wav",
-          "Children": {
-            "HotbarEquipedIcon9": {
-              "Bounds": "26,2,2,2",
-              "Padding": "0,0,0,0",
-              "AlignmentEdgeDistances": "0,0,0,0",
-              "AlignmentTransform": "0,0",
-              "Margin": "0,0,0,0",
-              "RenderColor": "0,255,0,0",
-              "Alignments": "",
-              "DrawBackground": true,
-              "MinimumSize": "1,1",
-              "MaximumSize": "4096,4096",
-              "Disabled": false,
-              "Hidden": false,
-              "RestrictToParent": false,
-              "MouseInputEnabled": false,
-              "HideToolTip": false,
-              "ToolTipBackground": null,
-              "ToolTipFont": null,
-              "ToolTipTextColor": "",
-              "Texture": "",
-              "HoverSound": null,
-              "LeftMouseClickSound": null,
-              "RightMouseClickSound": null
-            }
-          }
+          "RightMouseClickSound": "octave-beep-tapped.wav"
+        },
+        "_equipLabel9": {
+          "Bounds": "26,0,10,11",
+          "Padding": "0,0,0,0",
+          "AlignmentEdgeDistances": "0,0,0,0",
+          "AlignmentTransform": "0,0",
+          "Margin": "0,0,0,0",
+          "RenderColor": "255,255,255,255",
+          "Alignments": "Right,Top",
+          "DrawBackground": true,
+          "MinimumSize": "1,1",
+          "MaximumSize": "4096,4096",
+          "Disabled": false,
+          "Hidden": true,
+          "RestrictToParent": false,
+          "MouseInputEnabled": false,
+          "HideToolTip": false,
+          "ToolTipBackground": null,
+          "ToolTipFont": null,
+          "ToolTipTextColor": "",
+          "BackgroundTemplate": "equipped.png",
+          "TextColor": "255,255,255,255",
+          "HoveredTextColor": "",
+          "ClickedTextColor": "",
+          "DisabledTextColor": "255,90,90,90",
+          "TextAlign": "Left, Top",
+          "TextPadding": "2,-2,2,-1",
+          "AutoSizeToContents": true,
+          "Font": "sourcesansproblack,8",
+          "TextScale": 1.0
         },
-        "HotbarEquippedLabel9": {
-          "Bounds": "24,0,10,11",
+        "_quantityLabel9": {
+          "Bounds": "31,0,5,11",
           "Padding": "0,0,0,0",
           "AlignmentEdgeDistances": "0,0,0,0",
           "AlignmentTransform": "0,0",
@@ -1620,8 +1660,8 @@
           "Font": "sourcesansproblack,8",
           "TextScale": 1.0
         },
-        "HotbarCooldownLabel9": {
-          "Bounds": "14,12,5,11",
+        "_cooldownLabel9": {
+          "Bounds": "15,12,5,11",
           "Padding": "0,0,0,0",
           "AlignmentEdgeDistances": "0,0,0,0",
           "AlignmentTransform": "0,0",
@@ -1651,7 +1691,7 @@
           "TextScale": 1.0
         },
         "HotbarLabel9": {
-          "Bounds": "29,24,5,11",
+          "Bounds": "31,25,5,11",
           "Padding": "0,0,0,0",
           "AlignmentEdgeDistances": "0,0,0,0",
           "AlignmentTransform": "0,0",