Merge branch 'master' of https://github.com/SkyblockerMod/Skyblocker into json-tabhud

# Conflicts:
#	src/main/java/me/xmrvizzy/skyblocker/SkyblockerMod.java
#	src/main/java/me/xmrvizzy/skyblocker/skyblock/dwarven/DwarvenHud.java
#	src/main/java/me/xmrvizzy/skyblocker/skyblock/tabhud/screens/main/GardenScreen.java
#	src/main/java/me/xmrvizzy/skyblocker/skyblock/tabhud/util/PlayerLocator.java

Pull upstream changes

4 files changed, 72 insertions, 2 deletions

diff --git a/src/main/java/me/xmrvizzy/skyblocker/skyblock/tabhud/util/PlayerListMgr.java b/src/main/java/me/xmrvizzy/skyblocker/skyblock/tabhud/util/PlayerListMgr.java
index 5caa190c..30cc242e 100644
--- a/src/main/java/me/xmrvizzy/skyblocker/skyblock/tabhud/util/PlayerListMgr.java
+++ b/src/main/java/me/xmrvizzy/skyblocker/skyblock/tabhud/util/PlayerListMgr.java
@@ -7,7 +7,7 @@ import java.util.regex.Pattern;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import me.xmrvizzy.skyblocker.mixin.PlayerListHudAccessor;
+import me.xmrvizzy.skyblocker.mixin.accessor.PlayerListHudAccessor;
 
 import me.xmrvizzy.skyblocker.utils.Utils;
 import net.minecraft.client.MinecraftClient;
diff --git a/src/main/java/me/xmrvizzy/skyblocker/skyblock/tabhud/util/PlayerLocator.java b/src/main/java/me/xmrvizzy/skyblocker/skyblock/tabhud/util/PlayerLocator.java
index 9b24171a..deadaa7d 100644
--- a/src/main/java/me/xmrvizzy/skyblocker/skyblock/tabhud/util/PlayerLocator.java
+++ b/src/main/java/me/xmrvizzy/skyblocker/skyblock/tabhud/util/PlayerLocator.java
@@ -26,6 +26,7 @@ public class PlayerLocator {
         GARDEN("garden"),
         INSTANCED("kuudra"),
         THE_RIFT("rift"),
+        DARK_AUCTION("dark_auction"),
         UNKNOWN("unknown");
 
         public String internal;
@@ -92,7 +93,9 @@ public class PlayerLocator {
             case "Instanced":
                 return Location.INSTANCED;
             case "The Rift":
-                return Location.THE_RIFT;
+            	return Location.THE_RIFT;
+            case "Dark Auction":
+            	return Location.DARK_AUCTION;
             default:
                 return Location.UNKNOWN;
         }
diff --git a/src/main/java/me/xmrvizzy/skyblocker/skyblock/tabhud/widget/CameraPositionWidget.java b/src/main/java/me/xmrvizzy/skyblocker/skyblock/tabhud/widget/CameraPositionWidget.java
new file mode 100644
index 00000000..7e44bc44
--- /dev/null
+++ b/src/main/java/me/xmrvizzy/skyblocker/skyblock/tabhud/widget/CameraPositionWidget.java
@@ -0,0 +1,37 @@
+package me.xmrvizzy.skyblocker.skyblock.tabhud.widget;
+
+import me.xmrvizzy.skyblocker.skyblock.tabhud.widget.component.PlainTextComponent;
+import net.minecraft.client.MinecraftClient;
+import net.minecraft.text.MutableText;
+import net.minecraft.text.Text;
+import net.minecraft.util.Formatting;
+import net.minecraft.util.math.MathHelper;
+
+public class CameraPositionWidget extends Widget {
+    private static final MutableText TITLE = Text.literal("Camera Pos").formatted(Formatting.DARK_PURPLE,
+            Formatting.BOLD);
+    private static final MinecraftClient CLIENT = MinecraftClient.getInstance();
+
+    public CameraPositionWidget() {
+        super(TITLE, Formatting.DARK_PURPLE.getColorValue());
+    }
+
+    @Override
+    public void updateContent() {
+        double yaw = CLIENT.getCameraEntity().getYaw();
+        double pitch = CLIENT.getCameraEntity().getPitch();
+
+        this.addComponent(
+                new PlainTextComponent(Text.literal("Yaw: " + roundToDecimalPlaces(MathHelper.wrapDegrees(yaw), 3))));
+        this.addComponent(new PlainTextComponent(
+                Text.literal("Pitch: " + roundToDecimalPlaces(MathHelper.wrapDegrees(pitch), 3))));
+
+    }
+
+    // https://stackoverflow.com/a/33889423
+    private static double roundToDecimalPlaces(double value, int decimalPlaces) {
+        double shift = Math.pow(10, decimalPlaces);
+
+        return Math.round(value * shift) / shift;
+    }
+}
diff --git a/src/main/java/me/xmrvizzy/skyblocker/skyblock/tabhud/widget/GardenVisitorsWidget.java b/src/main/java/me/xmrvizzy/skyblocker/skyblock/tabhud/widget/GardenVisitorsWidget.java
new file mode 100644
index 00000000..945fb17c
--- /dev/null
+++ b/src/main/java/me/xmrvizzy/skyblocker/skyblock/tabhud/widget/GardenVisitorsWidget.java
@@ -0,0 +1,30 @@
+package me.xmrvizzy.skyblocker.skyblock.tabhud.widget;
+
+import me.xmrvizzy.skyblocker.skyblock.tabhud.util.PlayerListMgr;
+import me.xmrvizzy.skyblocker.skyblock.tabhud.widget.component.PlainTextComponent;
+import net.minecraft.text.MutableText;
+import net.minecraft.text.Text;
+import net.minecraft.util.Formatting;
+
+public class GardenVisitorsWidget extends Widget {
+    private static final MutableText TITLE = Text.literal("Visitors").formatted(Formatting.DARK_GREEN, Formatting.BOLD);
+
+    public GardenVisitorsWidget() {
+        super(TITLE, Formatting.DARK_GREEN.getColorValue());
+    }
+
+    @Override
+    public void updateContent() {
+        if (PlayerListMgr.textAt(54) == null) {
+            this.addComponent(new PlainTextComponent(Text.literal("No visitors!").formatted(Formatting.GRAY)));
+            return;
+        }
+
+        for (int i = 54; i < 59; i++) {
+            String text = PlayerListMgr.strAt(i);
+            if (text != null)
+                this.addComponent(new PlainTextComponent(Text.literal(text)));
+        }
+
+    }
+}