and so it begins (sorry msg)

67 files changed, 339 insertions, 152 deletions

diff --git a/src/main/java/de/hysky/skyblocker/config/HudConfigScreen.java b/src/main/java/de/hysky/skyblocker/config/HudConfigScreen.java
index 328cbe18..2e4b8977 100644
--- a/src/main/java/de/hysky/skyblocker/config/HudConfigScreen.java
+++ b/src/main/java/de/hysky/skyblocker/config/HudConfigScreen.java
@@ -1,6 +1,6 @@
 package de.hysky.skyblocker.config;
 
-import de.hysky.skyblocker.skyblock.tabhud.widget.Widget;
+import de.hysky.skyblocker.skyblock.tabhud.widget.HudWidget;
 import de.hysky.skyblocker.utils.render.RenderHelper;
 import it.unimi.dsi.fastutil.ints.IntIntMutablePair;
 import net.minecraft.client.gui.DrawContext;
@@ -19,9 +19,9 @@ import java.util.List;
  */
 public abstract class HudConfigScreen extends Screen {
     private final Screen parent;
-    private final List<Widget> widgets;
+    private final List<HudWidget> widgets;
 
-    private Widget draggingWidget;
+    private HudWidget draggingWidget;
     private double mouseClickRelativeX;
     private double mouseClickRelativeY;
 
@@ -31,7 +31,7 @@ public abstract class HudConfigScreen extends Screen {
      * @param parent the parent screen
      * @param widget the widget to configure
      */
-    public HudConfigScreen(Text title, Screen parent, Widget widget) {
+    public HudConfigScreen(Text title, Screen parent, HudWidget widget) {
         this(title, parent, List.of(widget));
     }
 
@@ -41,7 +41,7 @@ public abstract class HudConfigScreen extends Screen {
      * @param parent the parent screen
      * @param widgets the widgets to configure
      */
-    public HudConfigScreen(Text title, Screen parent, List<Widget> widgets) {
+    public HudConfigScreen(Text title, Screen parent, List<HudWidget> widgets) {
         super(title);
         this.parent = parent;
         this.widgets = widgets;
@@ -56,12 +56,12 @@ public abstract class HudConfigScreen extends Screen {
     }
 
     /**
-     * Renders the widgets using the default {@link Widget#render(DrawContext, boolean)} method. Override to change the behavior.
+     * Renders the widgets using the default {@link HudWidget#render(DrawContext, boolean)} method. Override to change the behavior.
      * @param context the context to render in
      * @param widgets the widgets to render
      */
-    protected void renderWidget(DrawContext context, List<Widget> widgets) {
-        for (Widget widget : widgets) {
+    protected void renderWidget(DrawContext context, List<HudWidget> widgets) {
+        for (HudWidget widget : widgets) {
             widget.render(context, SkyblockerConfigManager.get().uiAndVisuals.tabHud.enableHudBackground);
         }
     }
@@ -78,7 +78,7 @@ public abstract class HudConfigScreen extends Screen {
     @Override
     public final boolean mouseClicked(double mouseX, double mouseY, int button) {
         if (button == 0) {
-            for (Widget widget : widgets) {
+            for (HudWidget widget : widgets) {
                 if (RenderHelper.pointIsInArea(mouseX, mouseY, widget.getX(), widget.getY(), widget.getX() + widget.getWidth(), widget.getY() + widget.getHeight())) {
                     draggingWidget = widget;
                     mouseClickRelativeX = mouseX - widget.getX();
@@ -107,7 +107,7 @@ public abstract class HudConfigScreen extends Screen {
             throw new IllegalStateException("The number of positions (" + configPositions.size() + ") does not match the number of widgets (" + widgets.size() + ")");
         }
         for (int i = 0; i < widgets.size(); i++) {
-            Widget widget = widgets.get(i);
+            HudWidget widget = widgets.get(i);
             IntIntMutablePair configPos = configPositions.get(i);
             widget.setX(configPos.leftInt());
             widget.setY(configPos.rightInt());
@@ -137,5 +137,5 @@ public abstract class HudConfigScreen extends Screen {
      * @param configManager the config so you don't have to get it
      * @param widgets the widgets to save
      */
-    protected abstract void savePos(SkyblockerConfig configManager, List<Widget> widgets);
+    protected abstract void savePos(SkyblockerConfig configManager, List<HudWidget> widgets);
 }
diff --git a/src/main/java/de/hysky/skyblocker/skyblock/dwarven/CrystalsHudConfigScreen.java b/src/main/java/de/hysky/skyblocker/skyblock/dwarven/CrystalsHudConfigScreen.java
index 0348c09d..1858b214 100644
--- a/src/main/java/de/hysky/skyblocker/skyblock/dwarven/CrystalsHudConfigScreen.java
+++ b/src/main/java/de/hysky/skyblocker/skyblock/dwarven/CrystalsHudConfigScreen.java
@@ -3,7 +3,7 @@ package de.hysky.skyblocker.skyblock.dwarven;
 import de.hysky.skyblocker.config.HudConfigScreen;
 import de.hysky.skyblocker.config.SkyblockerConfig;
 import de.hysky.skyblocker.skyblock.tabhud.widget.EmptyWidget;
-import de.hysky.skyblocker.skyblock.tabhud.widget.Widget;
+import de.hysky.skyblocker.skyblock.tabhud.widget.HudWidget;
 import it.unimi.dsi.fastutil.ints.IntIntMutablePair;
 import net.minecraft.client.gui.DrawContext;
 import net.minecraft.client.gui.screen.Screen;
@@ -31,14 +31,14 @@ public class CrystalsHudConfigScreen extends HudConfigScreen {
     }
 
     @Override
-    protected void renderWidget(DrawContext context, List<Widget> widgets) {
+    protected void renderWidget(DrawContext context, List<HudWidget> widgets) {
         int size = CrystalsHud.getDimensionsForConfig();
         WIDGET.setDimensions(size);
         context.drawTexture(RenderLayer::getGuiTextured, CrystalsHud.MAP_TEXTURE, WIDGET.getX(), WIDGET.getY(), 0, 0, size, size, size, size);
     }
 
     @Override
-    protected void savePos(SkyblockerConfig configManager, List<Widget> widgets) {
+    protected void savePos(SkyblockerConfig configManager, List<HudWidget> widgets) {
         configManager.mining.crystalsHud.x = widgets.getFirst().getX();
         configManager.mining.crystalsHud.y = widgets.getFirst().getY();
     }
diff --git a/src/main/java/de/hysky/skyblocker/skyblock/dwarven/DwarvenHudConfigScreen.java b/src/main/java/de/hysky/skyblocker/skyblock/dwarven/DwarvenHudConfigScreen.java
index baa3ed55..40124ce0 100644
--- a/src/main/java/de/hysky/skyblocker/skyblock/dwarven/DwarvenHudConfigScreen.java
+++ b/src/main/java/de/hysky/skyblocker/skyblock/dwarven/DwarvenHudConfigScreen.java
@@ -5,7 +5,7 @@ import de.hysky.skyblocker.config.SkyblockerConfig;
 import de.hysky.skyblocker.config.SkyblockerConfigManager;
 import de.hysky.skyblocker.config.configs.MiningConfig;
 import de.hysky.skyblocker.skyblock.dwarven.DwarvenHud.Commission;
-import de.hysky.skyblocker.skyblock.tabhud.widget.Widget;
+import de.hysky.skyblocker.skyblock.tabhud.widget.HudWidget;
 import de.hysky.skyblocker.skyblock.tabhud.widget.hud.HudCommsWidget;
 import de.hysky.skyblocker.skyblock.tabhud.widget.hud.HudPowderWidget;
 import it.unimi.dsi.fastutil.ints.IntIntMutablePair;
@@ -42,12 +42,12 @@ public class DwarvenHudConfigScreen extends HudConfigScreen {
     }
 
     @Override
-    protected void renderWidget(DrawContext context, List<Widget> widgets) {
+    protected void renderWidget(DrawContext context, List<HudWidget> widgets) {
         DwarvenHud.render(HudCommsWidget.INSTANCE_CFG, HudPowderWidget.INSTANCE_CFG, context, widgets.getFirst().getX(), widgets.getFirst().getY(), widgets.get(1).getX(), widgets.get(1).getY(), CFG_COMMS);
     }
 
     @Override
-    protected void savePos(SkyblockerConfig configManager, List<Widget> widgets) {
+    protected void savePos(SkyblockerConfig configManager, List<HudWidget> widgets) {
         configManager.mining.dwarvenHud.commissionsX = widgets.getFirst().getX();
         configManager.mining.dwarvenHud.commissionsY = widgets.getFirst().getY();
         configManager.mining.dwarvenHud.powderX = widgets.get(1).getX();
diff --git a/src/main/java/de/hysky/skyblocker/skyblock/end/EndHudConfigScreen.java b/src/main/java/de/hysky/skyblocker/skyblock/end/EndHudConfigScreen.java
index 4540ce6e..19a96bd4 100644
--- a/src/main/java/de/hysky/skyblocker/skyblock/end/EndHudConfigScreen.java
+++ b/src/main/java/de/hysky/skyblocker/skyblock/end/EndHudConfigScreen.java
@@ -2,7 +2,7 @@ package de.hysky.skyblocker.skyblock.end;
 
 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.HudWidget;
 import it.unimi.dsi.fastutil.ints.IntIntMutablePair;
 import net.minecraft.client.gui.screen.Screen;
 import net.minecraft.text.Text;
@@ -21,7 +21,7 @@ public class EndHudConfigScreen extends HudConfigScreen {
     }
 
     @Override
-    protected void savePos(SkyblockerConfig configManager, List<Widget> widgets) {
+    protected void savePos(SkyblockerConfig configManager, List<HudWidget> widgets) {
         configManager.otherLocations.end.x = widgets.getFirst().getX();
         configManager.otherLocations.end.y = widgets.getFirst().getY();
     }
diff --git a/src/main/java/de/hysky/skyblocker/skyblock/end/EndHudWidget.java b/src/main/java/de/hysky/skyblocker/skyblock/end/EndHudWidget.java
index a2869447..56a41e3d 100644
--- a/src/main/java/de/hysky/skyblocker/skyblock/end/EndHudWidget.java
+++ b/src/main/java/de/hysky/skyblocker/skyblock/end/EndHudWidget.java
@@ -2,7 +2,7 @@ package de.hysky.skyblocker.skyblock.end;
 
 import com.mojang.authlib.properties.PropertyMap;
 import de.hysky.skyblocker.config.SkyblockerConfigManager;
-import de.hysky.skyblocker.skyblock.tabhud.widget.Widget;
+import de.hysky.skyblocker.skyblock.tabhud.widget.HudWidget;
 import de.hysky.skyblocker.skyblock.tabhud.widget.component.IcoTextComponent;
 import de.hysky.skyblocker.skyblock.tabhud.widget.component.PlainTextComponent;
 import net.minecraft.component.DataComponentTypes;
@@ -17,7 +17,7 @@ import java.text.NumberFormat;
 import java.util.Locale;
 import java.util.Optional;
 
-public class EndHudWidget extends Widget {
+public class EndHudWidget extends HudWidget {
     private static final MutableText TITLE = Text.literal("The End").formatted(Formatting.LIGHT_PURPLE, Formatting.BOLD);
 
     public static final EndHudWidget INSTANCE = new EndHudWidget(TITLE, Formatting.DARK_PURPLE.getColorValue());
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 0271c66a..47059ec0 100644
--- a/src/main/java/de/hysky/skyblocker/skyblock/garden/FarmingHudConfigScreen.java
+++ b/src/main/java/de/hysky/skyblocker/skyblock/garden/FarmingHudConfigScreen.java
@@ -2,7 +2,7 @@ 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.HudWidget;
 import it.unimi.dsi.fastutil.ints.IntIntMutablePair;
 import net.minecraft.client.gui.screen.Screen;
 import net.minecraft.text.Text;
@@ -23,7 +23,7 @@ public class FarmingHudConfigScreen extends HudConfigScreen {
     }
 
     @Override
-    protected void savePos(SkyblockerConfig configManager, List<Widget> widgets) {
+    protected void savePos(SkyblockerConfig configManager, List<HudWidget> widgets) {
         configManager.farming.garden.farmingHud.x = widgets.getFirst().getX();
         configManager.farming.garden.farmingHud.y = widgets.getFirst().getY();
     }
diff --git a/src/main/java/de/hysky/skyblocker/skyblock/garden/FarmingHudWidget.java b/src/main/java/de/hysky/skyblocker/skyblock/garden/FarmingHudWidget.java
index 954c9f27..1fdcdac1 100644
--- a/src/main/java/de/hysky/skyblocker/skyblock/garden/FarmingHudWidget.java
+++ b/src/main/java/de/hysky/skyblocker/skyblock/garden/FarmingHudWidget.java
@@ -4,7 +4,7 @@ import de.hysky.skyblocker.config.SkyblockerConfigManager;
 import de.hysky.skyblocker.skyblock.item.tooltip.info.TooltipInfoType;
 import de.hysky.skyblocker.skyblock.itemlist.ItemRepository;
 import de.hysky.skyblocker.skyblock.tabhud.util.Ico;
-import de.hysky.skyblocker.skyblock.tabhud.widget.Widget;
+import de.hysky.skyblocker.skyblock.tabhud.widget.HudWidget;
 import de.hysky.skyblocker.skyblock.tabhud.widget.component.PlainTextComponent;
 import de.hysky.skyblocker.skyblock.tabhud.widget.component.ProgressComponent;
 import de.hysky.skyblocker.utils.ItemUtils;
@@ -19,7 +19,7 @@ import net.minecraft.util.math.MathHelper;
 
 import java.util.Map;
 
-public class FarmingHudWidget extends Widget {
+public class FarmingHudWidget extends HudWidget {
     private static final MutableText TITLE = Text.literal("Farming").formatted(Formatting.YELLOW, Formatting.BOLD);
     public static final Map<String, String> FARMING_TOOLS = Map.ofEntries(
             Map.entry("THEORETICAL_HOE_WHEAT_1", "WHEAT"),
diff --git a/src/main/java/de/hysky/skyblocker/skyblock/tabhud/screenbuilder/ScreenBuilder.java b/src/main/java/de/hysky/skyblocker/skyblock/tabhud/screenbuilder/ScreenBuilder.java
index ceeaa365..4f311cb1 100644
--- a/src/main/java/de/hysky/skyblocker/skyblock/tabhud/screenbuilder/ScreenBuilder.java
+++ b/src/main/java/de/hysky/skyblocker/skyblock/tabhud/screenbuilder/ScreenBuilder.java
@@ -12,7 +12,7 @@ import com.google.gson.JsonElement;
 import com.google.gson.JsonObject;
 import com.google.gson.JsonParser;
 
-import de.hysky.skyblocker.skyblock.tabhud.widget.Widget;
+import de.hysky.skyblocker.skyblock.tabhud.widget.HudWidget;
 import de.hysky.skyblocker.skyblock.tabhud.screenbuilder.pipeline.AlignStage;
 import de.hysky.skyblocker.skyblock.tabhud.screenbuilder.pipeline.CollideStage;
 import de.hysky.skyblocker.skyblock.tabhud.screenbuilder.pipeline.PipelineStage;