Refactor Farming Hud

4 files changed, 17 insertions, 11 deletions

diff --git a/src/main/java/de/hysky/skyblocker/config/HudConfigScreen.java b/src/main/java/de/hysky/skyblocker/config/HudConfigScreen.java
index 6884af83..07109b46 100644
--- a/src/main/java/de/hysky/skyblocker/config/HudConfigScreen.java
+++ b/src/main/java/de/hysky/skyblocker/config/HudConfigScreen.java
@@ -52,7 +52,6 @@ public abstract class HudConfigScreen extends Screen {
     @Override
     public final void render(DrawContext context, int mouseX, int mouseY, float delta) {
         super.render(context, mouseX, mouseY, delta);
-        renderBackground(context, mouseX, mouseY, delta);
         renderWidget(context, widgets);
         context.drawCenteredTextWithShadow(textRenderer, "Right Click To Reset Position", width / 2, height / 2, Color.GRAY.getRGB());
     }
diff --git a/src/main/java/de/hysky/skyblocker/skyblock/garden/FarmingHud.java b/src/main/java/de/hysky/skyblocker/skyblock/garden/FarmingHud.java
index dba282c1..ab504d6d 100644
--- a/src/main/java/de/hysky/skyblocker/skyblock/garden/FarmingHud.java
+++ b/src/main/java/de/hysky/skyblocker/skyblock/garden/FarmingHud.java
@@ -1,14 +1,16 @@
 package de.hysky.skyblocker.skyblock.garden;
 
+import de.hysky.skyblocker.SkyblockerMod;
 import de.hysky.skyblocker.config.SkyblockerConfigManager;
-import de.hysky.skyblocker.skyblock.tabhud.widget.hud.HudFarmingWidget;
 import de.hysky.skyblocker.utils.ItemUtils;
 import de.hysky.skyblocker.utils.Location;
 import de.hysky.skyblocker.utils.Utils;
+import de.hysky.skyblocker.utils.scheduler.Scheduler;
 import it.unimi.dsi.fastutil.floats.FloatLongPair;
 import it.unimi.dsi.fastutil.ints.IntLongPair;
 import it.unimi.dsi.fastutil.longs.LongArrayFIFOQueue;
 import it.unimi.dsi.fastutil.longs.LongPriorityQueue;
+import net.fabricmc.fabric.api.client.command.v2.ClientCommandRegistrationCallback;
 import net.fabricmc.fabric.api.client.message.v1.ClientReceiveMessageEvents;
 import net.fabricmc.fabric.api.client.rendering.v1.HudRenderCallback;
 import net.fabricmc.fabric.api.event.client.player.ClientPlayerBlockBreakEvents;
@@ -26,6 +28,8 @@ import java.util.Queue;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
+import static net.fabricmc.fabric.api.client.command.v2.ClientCommandManager.literal;
+
 public class FarmingHud {
     private static final Logger LOGGER = LoggerFactory.getLogger(FarmingHud.class);
     public static final NumberFormat NUMBER_FORMAT = NumberFormat.getInstance(Locale.US);
@@ -62,8 +66,8 @@ public class FarmingHud {
                     }
                 }
 
-                HudFarmingWidget.INSTANCE.update();
-                HudFarmingWidget.INSTANCE.render(context, SkyblockerConfigManager.get().general.tabHud.enableHudBackground);
+                FarmingHudWidget.INSTANCE.update();
+                FarmingHudWidget.INSTANCE.render(context, SkyblockerConfigManager.get().general.tabHud.enableHudBackground);
             }
         });
         ClientPlayerBlockBreakEvents.AFTER.register((world, player, pos, state) -> {
@@ -84,6 +88,8 @@ public class FarmingHud {
                 }
             }
         });
+        ClientCommandRegistrationCallback.EVENT.register((dispatcher, registryAccess) -> dispatcher.register(literal(SkyblockerMod.NAMESPACE).then(literal("hud").then(literal("farming")
+                .executes(Scheduler.queueOpenScreenCommand(() -> new FarmingHudConfigScreen(null)))))));
     }
 
     private static boolean shouldRender() {
diff --git a/src/main/java/de/hysky/skyblocker/skyblock/garden/FarmingHudConfigScreen.java b/src/main/java/de/hysky/skyblocker/skyblock/garden/FarmingHudConfigScreen.java
index 51c1c69e..5384d47a 100644
--- a/src/main/java/de/hysky/skyblocker/skyblock/garden/FarmingHudConfigScreen.java
+++ b/src/main/java/de/hysky/skyblocker/skyblock/garden/FarmingHudConfigScreen.java
@@ -3,7 +3,6 @@ package de.hysky.skyblocker.skyblock.garden;
 import de.hysky.skyblocker.config.HudConfigScreen;
 import de.hysky.skyblocker.config.SkyblockerConfig;
 import de.hysky.skyblocker.skyblock.tabhud.widget.Widget;
-import de.hysky.skyblocker.skyblock.tabhud.widget.hud.HudFarmingWidget;
 import it.unimi.dsi.fastutil.ints.IntIntMutablePair;
 import net.minecraft.client.gui.screen.Screen;
 import net.minecraft.text.Text;
@@ -12,7 +11,7 @@ import java.util.List;
 
 public class FarmingHudConfigScreen extends HudConfigScreen {
     public FarmingHudConfigScreen(Screen parent) {
-        super(Text.literal("Farming HUD Config"), parent, HudFarmingWidget.INSTANCE);
+        super(Text.literal("Farming HUD Config"), parent, FarmingHudWidget.INSTANCE);
     }
 
     @SuppressWarnings("SuspiciousNameCombination")
diff --git a/src/main/java/de/hysky/skyblocker/skyblock/tabhud/widget/hud/HudFarmingWidget.java b/src/main/java/de/hysky/skyblocker/skyblock/garden/FarmingHudWidget.java
index 645bef96..6ddb0e05 100644
--- a/src/main/java/de/hysky/skyblocker/skyblock/tabhud/widget/hud/HudFarmingWidget.java
+++ b/src/main/java/de/hysky/skyblocker/skyblock/garden/FarmingHudWidget.java
@@ -1,6 +1,6 @@
-package de.hysky.skyblocker.skyblock.tabhud.widget.hud;
+package de.hysky.skyblocker.skyblock.garden;
 
-import de.hysky.skyblocker.skyblock.garden.FarmingHud;
+import de.hysky.skyblocker.config.SkyblockerConfigManager;
 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;
@@ -15,7 +15,7 @@ import net.minecraft.util.math.MathHelper;
 
 import java.util.Map;
 
-public class HudFarmingWidget extends Widget {
+public class FarmingHudWidget 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),
@@ -39,11 +39,13 @@ public class HudFarmingWidget extends Widget {
             Map.entry("PUMPKIN_DICER", Ico.PUMPKIN),
             Map.entry("COCO_CHOPPER", Ico.COCOA_BEANS)
     );
-    public static final HudFarmingWidget INSTANCE = new HudFarmingWidget();
+    public static final FarmingHudWidget INSTANCE = new FarmingHudWidget();
     private final MinecraftClient client = MinecraftClient.getInstance();
 
-    public HudFarmingWidget() {
+    public FarmingHudWidget() {
         super(TITLE, Formatting.YELLOW.getColorValue());
+        setX(SkyblockerConfigManager.get().locations.garden.farmingHud.x);
+        setY(SkyblockerConfigManager.get().locations.garden.farmingHud.y);
         update();
     }