Add Farming HUD

3 files changed, 58 insertions, 15 deletions

diff --git a/src/main/java/de/hysky/skyblocker/skyblock/tabhud/util/Ico.java b/src/main/java/de/hysky/skyblocker/skyblock/tabhud/util/Ico.java
index 96ab35d5..4872435b 100644
--- a/src/main/java/de/hysky/skyblocker/skyblock/tabhud/util/Ico.java
+++ b/src/main/java/de/hysky/skyblocker/skyblock/tabhud/util/Ico.java
@@ -53,12 +53,23 @@ public class Ico {
     public static final ItemStack COMPOSTER = new ItemStack(Items.COMPOSTER);
     public static final ItemStack SAPLING = new ItemStack(Items.OAK_SAPLING);
     public static final ItemStack SEEDS = new ItemStack(Items.WHEAT_SEEDS);
+    public static final ItemStack WHEAT = new ItemStack(Items.WHEAT);
+    public static final ItemStack CARROT = new ItemStack(Items.CARROT);
+    public static final ItemStack POTATO = new ItemStack(Items.POTATO);
+    public static final ItemStack SUGAR_CANE = new ItemStack(Items.SUGAR_CANE);
+    public static final ItemStack NETHER_WART = new ItemStack(Items.NETHER_WART);
+    public static final ItemStack MUSHROOM = new ItemStack(Items.RED_MUSHROOM);
+    public static final ItemStack CACTUS = new ItemStack(Items.CACTUS);
+    public static final ItemStack MELON = new ItemStack(Items.MELON);
+    public static final ItemStack PUMPKIN = new ItemStack(Items.PUMPKIN);
+    public static final ItemStack COCOA_BEANS = new ItemStack(Items.COCOA_BEANS);
     public static final ItemStack MILESTONE = new ItemStack(Items.LODESTONE);
     public static final ItemStack PICKAXE = new ItemStack(Items.IRON_PICKAXE);
     public static final ItemStack NETHER_STAR = new ItemStack(Items.NETHER_STAR);
     public static final ItemStack HEART_OF_THE_SEA = new ItemStack(Items.HEART_OF_THE_SEA);
     public static final ItemStack EXPERIENCE_BOTTLE = new ItemStack(Items.EXPERIENCE_BOTTLE);
     public static final ItemStack PINK_DYE = new ItemStack(Items.PINK_DYE);
+    public static final ItemStack LIME_DYE = new ItemStack(Items.LIME_DYE);
     public static final ItemStack ENCHANTED_BOOK = new ItemStack(Items.ENCHANTED_BOOK);
     public static final ItemStack SPIDER_EYE = new ItemStack(Items.SPIDER_EYE);
 }
diff --git a/src/main/java/de/hysky/skyblocker/skyblock/tabhud/widget/CameraPositionWidget.java b/src/main/java/de/hysky/skyblocker/skyblock/tabhud/widget/CameraPositionWidget.java
index 9cff3d32..9aa4a50e 100644
--- a/src/main/java/de/hysky/skyblocker/skyblock/tabhud/widget/CameraPositionWidget.java
+++ b/src/main/java/de/hysky/skyblocker/skyblock/tabhud/widget/CameraPositionWidget.java
@@ -8,8 +8,7 @@ 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 MutableText TITLE = Text.literal("Camera Pos").formatted(Formatting.DARK_PURPLE, Formatting.BOLD);
     private static final MinecraftClient CLIENT = MinecraftClient.getInstance();
 
     public CameraPositionWidget() {
@@ -21,17 +20,7 @@ public class CameraPositionWidget extends Widget {
         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;
+        addComponent(new PlainTextComponent(Text.literal("Yaw: " + String.format("%.3f", MathHelper.wrapDegrees(yaw)))));
+        addComponent(new PlainTextComponent(Text.literal("Pitch: " + String.format("%.3f", MathHelper.wrapDegrees(pitch)))));
     }
 }
diff --git a/src/main/java/de/hysky/skyblocker/skyblock/tabhud/widget/hud/HudFarmingWidget.java b/src/main/java/de/hysky/skyblocker/skyblock/tabhud/widget/hud/HudFarmingWidget.java
index 4099f23e..b6ac25f8 100644
--- a/src/main/java/de/hysky/skyblocker/skyblock/tabhud/widget/hud/HudFarmingWidget.java
+++ b/src/main/java/de/hysky/skyblocker/skyblock/tabhud/widget/hud/HudFarmingWidget.java
@@ -1,22 +1,65 @@
 package de.hysky.skyblocker.skyblock.tabhud.widget.hud;
 
+import de.hysky.skyblocker.skyblock.garden.FarmingHud;
 import de.hysky.skyblocker.skyblock.tabhud.util.Ico;
 import de.hysky.skyblocker.skyblock.tabhud.widget.Widget;
+import de.hysky.skyblocker.skyblock.tabhud.widget.component.PlainTextComponent;
+import de.hysky.skyblocker.skyblock.tabhud.widget.component.ProgressComponent;
+import de.hysky.skyblocker.utils.ItemUtils;
+import net.minecraft.client.MinecraftClient;
+import net.minecraft.item.ItemStack;
 import net.minecraft.text.MutableText;
 import net.minecraft.text.Text;
 import net.minecraft.util.Formatting;
+import net.minecraft.util.math.MathHelper;
+
+import java.util.Map;
 
 public class HudFarmingWidget extends Widget {
     private static final MutableText TITLE = Text.literal("Farming").formatted(Formatting.YELLOW, Formatting.BOLD);
+    private static final Map<String, ItemStack> FARMING_TOOLS = Map.ofEntries(
+            Map.entry("THEORETICAL_HOE_WHEAT_1", Ico.WHEAT),
+            Map.entry("THEORETICAL_HOE_WHEAT_2", Ico.WHEAT),
+            Map.entry("THEORETICAL_HOE_WHEAT_3", Ico.WHEAT),
+            Map.entry("THEORETICAL_HOE_CARROT_1", Ico.CARROT),
+            Map.entry("THEORETICAL_HOE_CARROT_2", Ico.CARROT),
+            Map.entry("THEORETICAL_HOE_CARROT_3", Ico.CARROT),
+            Map.entry("THEORETICAL_HOE_POTATO_1", Ico.POTATO),
+            Map.entry("THEORETICAL_HOE_POTATO_2", Ico.POTATO),
+            Map.entry("THEORETICAL_HOE_POTATO_3", Ico.POTATO),
+            Map.entry("THEORETICAL_HOE_CANE_1", Ico.SUGAR_CANE),
+            Map.entry("THEORETICAL_HOE_CANE_2", Ico.SUGAR_CANE),
+            Map.entry("THEORETICAL_HOE_CANE_3", Ico.SUGAR_CANE),
+            Map.entry("THEORETICAL_HOE_WARTs_1", Ico.NETHER_WART),
+            Map.entry("THEORETICAL_HOE_WARTs_2", Ico.NETHER_WART),
+            Map.entry("THEORETICAL_HOE_WARTs_3", Ico.NETHER_WART),
+            Map.entry("FUNGI_CUTTER", Ico.MUSHROOM),
+            Map.entry("CACTUS_KNIFE", Ico.CACTUS),
+            Map.entry("MELON_DICER", Ico.MELON),
+            Map.entry("PUMPKIN_DICER", Ico.PUMPKIN),
+            Map.entry("COCO_CHOPPER", Ico.COCOA_BEANS)
+    );
     public static final HudFarmingWidget INSTANCE = new HudFarmingWidget();
+    private final MinecraftClient client = MinecraftClient.getInstance();
 
     public HudFarmingWidget() {
         super(TITLE, Formatting.YELLOW.getColorValue());
         update();
     }
 
+    @SuppressWarnings("DataFlowIssue")
     @Override
     public void updateContent() {
-        addSimpleIcoText(Ico.HOE, "Farming ", Formatting.RESET, "Farming");
+        ItemStack icon = FARMING_TOOLS.getOrDefault(ItemUtils.getItemId(client.player.getMainHandStack()), Ico.HOE);
+        addSimpleIcoText(icon, "Counter: ", Formatting.YELLOW, FarmingHud.NUMBER_FORMAT.format(FarmingHud.counter()));
+        addSimpleIcoText(icon, "Crops/min: ", Formatting.YELLOW, FarmingHud.NUMBER_FORMAT.format((int) FarmingHud.cropsPerMinute() / 100 * 100));
+        addSimpleIcoText(icon, "Blocks/s: ", Formatting.YELLOW, Integer.toString(FarmingHud.blockBreaks()));
+        addComponent(new ProgressComponent(Ico.HOE, Text.literal("Farming Level: "), FarmingHud.farmingXpPercentProgress(), Formatting.YELLOW.getColorValue()));
+        addSimpleIcoText(Ico.LIME_DYE, "Farming XP/h: ", Formatting.YELLOW, FarmingHud.NUMBER_FORMAT.format((int) FarmingHud.farmingXpPerHour()));
+
+        double yaw = client.getCameraEntity().getYaw();
+        double pitch = client.getCameraEntity().getPitch();
+        addComponent(new PlainTextComponent(Text.literal("Yaw: " + String.format("%.3f", MathHelper.wrapDegrees(yaw))).formatted(Formatting.YELLOW)));
+        addComponent(new PlainTextComponent(Text.literal("Pitch: " + String.format("%.3f", MathHelper.wrapDegrees(pitch))).formatted(Formatting.YELLOW)));
     }
 }