Merge pull request #208 from AzureAaron/garden-tab-hud-improvements

Garden Tab Hud Improvements

3 files changed, 72 insertions, 4 deletions

diff --git a/src/main/java/me/xmrvizzy/skyblocker/skyblock/tabhud/screens/main/GardenScreen.java b/src/main/java/me/xmrvizzy/skyblocker/skyblock/tabhud/screens/main/GardenScreen.java
index ae5b642f..8fd69cbb 100644
--- a/src/main/java/me/xmrvizzy/skyblocker/skyblock/tabhud/screens/main/GardenScreen.java
+++ b/src/main/java/me/xmrvizzy/skyblocker/skyblock/tabhud/screens/main/GardenScreen.java
@@ -2,8 +2,10 @@ package me.xmrvizzy.skyblocker.skyblock.tabhud.screens.main;
 
 
 import me.xmrvizzy.skyblocker.skyblock.tabhud.screens.Screen;
+import me.xmrvizzy.skyblocker.skyblock.tabhud.widget.CameraPositionWidget;
 import me.xmrvizzy.skyblocker.skyblock.tabhud.widget.ComposterWidget;
 import me.xmrvizzy.skyblocker.skyblock.tabhud.widget.GardenServerWidget;
+import me.xmrvizzy.skyblocker.skyblock.tabhud.widget.GardenVisitorsWidget;
 import net.minecraft.text.Text;
 
 public class GardenScreen extends Screen{
@@ -13,11 +15,16 @@ public class GardenScreen extends Screen{
 
         GardenServerWidget gsw = new GardenServerWidget();
         ComposterWidget cw = new ComposterWidget();
+        GardenVisitorsWidget vw = new GardenVisitorsWidget();
+        CameraPositionWidget cpw = new CameraPositionWidget();
 
-        this.stackWidgetsH(gsw, cw);
-        this.centerW(gsw);
-        this.centerW(cw);
-        this.addWidgets(gsw, cw);
+        this.stackWidgetsH(gsw, vw);
+        this.stackWidgetsH(cw, cpw);
+        this.offCenterL(gsw);
+        this.offCenterL(vw);
+        this.offCenterR(cw);
+        this.offCenterR(cpw);
+        this.addWidgets(gsw, cw, vw, cpw);
     }
 
 }
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..ca108837
--- /dev/null
+++ b/src/main/java/me/xmrvizzy/skyblocker/skyblock/tabhud/widget/CameraPositionWidget.java
@@ -0,0 +1,32 @@
+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());
+		
+		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))));
+		
+		this.pack();
+	}
+	
+	//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..6a4d2af3
--- /dev/null
+++ b/src/main/java/me/xmrvizzy/skyblocker/skyblock/tabhud/widget/GardenVisitorsWidget.java
@@ -0,0 +1,29 @@
+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());
+		
+		if (PlayerListMgr.textAt(54) == null) {
+			this.addComponent(new PlainTextComponent(Text.literal("No visitors!").formatted(Formatting.GRAY)));
+			this.pack();
+			
+			return;
+		}
+		
+		for (int i = 54; i < 59; i++) {
+			String text = PlayerListMgr.strAt(i);
+			if (text != null) this.addComponent(new PlainTextComponent(Text.literal(text)));
+		}
+		
+		this.pack();
+	}
+}