Merge branch 'master' into utils-cleanup

# Conflicts:
#	src/main/java/me/xmrvizzy/skyblocker/SkyblockerMod.java
#	src/main/java/me/xmrvizzy/skyblocker/skyblock/dungeon/DungeonBlaze.java
#	src/main/java/me/xmrvizzy/skyblocker/skyblock/dwarven/DwarvenHud.java
#	src/main/java/me/xmrvizzy/skyblocker/skyblock/dwarven/DwarvenHudConfigScreen.java
#	src/main/java/me/xmrvizzy/skyblocker/utils/RenderHelper.java

1 files changed, 70 insertions, 0 deletions

diff --git a/src/main/resources/assets/skyblocker/tabhud/screen_a/garden.json b/src/main/resources/assets/skyblocker/tabhud/screen_a/garden.json
new file mode 100644
index 00000000..3e1556ef
--- /dev/null
+++ b/src/main/resources/assets/skyblocker/tabhud/screen_a/garden.json
@@ -0,0 +1,70 @@
+{
+    "widgets":[
+        {
+            "name": "GardenSkillsWidget",
+            "alias": "gsw"
+        },
+        {
+            "name": "EventWidget",
+            "alias": "evw",
+            "inGarden": true
+        },
+        {
+            "name": "UpgradeWidget",
+            "alias": "uw"
+        },
+        {
+            "name": "ProfileWidget",
+            "alias": "pw"
+        },
+        {
+            "name": "EffectWidget",
+            "alias": "efw"
+        },
+        {
+            "name": "JacobsContestWidget",
+            "alias": "jcw"
+        },
+        {
+            "name": "CookieWidget",
+            "alias": "cw"
+        }
+    ],
+    "layout": [
+        {
+            "op": "stack",
+            "direction": "vertical",
+            "align": "center",
+            "apply_to": ["gsw", "evw", "uw"]
+        },
+        {
+            "op": "stack",
+            "direction": "vertical",
+            "align": "center",
+            "apply_to": ["pw", "efw"]
+        },
+        {
+            "op": "stack",
+            "direction": "vertical",
+            "align": "center",
+            "apply_to": ["jcw", "cw"]
+        },
+        {
+            "op": "align",
+            "reference": "horizontalCenter",
+            "apply_to": ["gsw", "evw", "uw"]
+        },
+        {
+            "op": "collideAgainst",
+            "direction": "left",
+            "widgets": ["pw", "efw"],
+            "colliders": ["gsw", "evw", "uw"]
+        },
+        {
+            "op": "collideAgainst",
+            "direction": "right",
+            "widgets": ["jcw", "cw"],
+            "colliders": ["gsw", "evw", "uw"]
+        }
+    ]
+}
\ No newline at end of file