Massive refactor, see details

Instead of creating a new widget instance every frame, instantiate once and update content.
This means that every widget had to be updated to work like that.
This also necessitated some ugly hackery for the dwarven HUD.
Many other minor things like moving and renaming classes

62 files changed, 766 insertions, 312 deletions

diff --git a/src/main/java/me/xmrvizzy/skyblocker/SkyblockerMod.java b/src/main/java/me/xmrvizzy/skyblocker/SkyblockerMod.java
index 461817ce..b6f11790 100644
--- a/src/main/java/me/xmrvizzy/skyblocker/SkyblockerMod.java
+++ b/src/main/java/me/xmrvizzy/skyblocker/SkyblockerMod.java
@@ -17,7 +17,7 @@ import me.xmrvizzy.skyblocker.skyblock.itemlist.ItemRegistry;
 import me.xmrvizzy.skyblocker.skyblock.quicknav.QuickNav;
 import me.xmrvizzy.skyblocker.skyblock.rift.TheRift;
 import me.xmrvizzy.skyblocker.skyblock.tabhud.TabHud;
-import me.xmrvizzy.skyblocker.skyblock.tabhud.screens.ScreenMaster;
+import me.xmrvizzy.skyblocker.skyblock.tabhud.screenbuilder.ScreenMaster;
 import me.xmrvizzy.skyblocker.skyblock.tabhud.util.PlayerListMgr;
 import me.xmrvizzy.skyblocker.utils.*;
 import me.xmrvizzy.skyblocker.utils.title.TitleContainer;
diff --git a/src/main/java/me/xmrvizzy/skyblocker/mixin/PlayerListHudMixin.java b/src/main/java/me/xmrvizzy/skyblocker/mixin/PlayerListHudMixin.java
index b3d78fa8..0acf5b31 100644
--- a/src/main/java/me/xmrvizzy/skyblocker/mixin/PlayerListHudMixin.java
+++ b/src/main/java/me/xmrvizzy/skyblocker/mixin/PlayerListHudMixin.java
@@ -6,11 +6,13 @@ import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Inject;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
 
+import dev.architectury.event.events.common.TickEvent.Player;
 import me.xmrvizzy.skyblocker.config.SkyblockerConfig;
 import me.xmrvizzy.skyblocker.skyblock.tabhud.TabHud;
+import me.xmrvizzy.skyblocker.skyblock.tabhud.screenbuilder.ScreenBuilder;
+import me.xmrvizzy.skyblocker.skyblock.tabhud.screenbuilder.ScreenMaster;
 import me.xmrvizzy.skyblocker.skyblock.tabhud.screens.Screen;
-import me.xmrvizzy.skyblocker.skyblock.tabhud.screens.ScreenBuilder;
-import me.xmrvizzy.skyblocker.skyblock.tabhud.screens.ScreenMaster;
+import me.xmrvizzy.skyblocker.skyblock.tabhud.util.PlayerListMgr;
 import me.xmrvizzy.skyblocker.utils.Utils;
 import net.fabricmc.api.EnvType;
 import net.fabricmc.api.Environment;
@@ -51,8 +53,10 @@ public class PlayerListHudMixin {
         w = (int) (w / scale);
         h = (int) (h / scale);
 
+        PlayerListMgr.updateFooter(footer);
+
         try {
-            ScreenMaster.render(context, w,h,footer);
+            ScreenMaster.render(context, w,h);
             // Screen screen = Screen.getCorrect(w, h, footer);
             // screen.render(context);
             info.cancel();
diff --git a/src/main/java/me/xmrvizzy/skyblocker/skyblock/dwarven/DwarvenHud.java b/src/main/java/me/xmrvizzy/skyblocker/skyblock/dwarven/DwarvenHud.java
index 122f6c6c..8f8afb3a 100644
--- a/src/main/java/me/xmrvizzy/skyblocker/skyblock/dwarven/DwarvenHud.java
+++ b/src/main/java/me/xmrvizzy/skyblocker/skyblock/dwarven/DwarvenHud.java
@@ -1,30 +1,29 @@
 package me.xmrvizzy.skyblocker.skyblock.dwarven;
 
+import java.util.ArrayList;
+import java.util.List;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
+
 import me.xmrvizzy.skyblocker.config.SkyblockerConfig;
 import me.xmrvizzy.skyblocker.skyblock.tabhud.widget.CommsWidget;
+import me.xmrvizzy.skyblocker.skyblock.tabhud.widget.HudCommsWidget;
 import net.fabricmc.fabric.api.client.command.v2.ClientCommandManager;
 import net.fabricmc.fabric.api.client.command.v2.ClientCommandRegistrationCallback;
 import net.fabricmc.fabric.api.client.rendering.v1.HudRenderCallback;
 import net.minecraft.client.MinecraftClient;
 import net.minecraft.client.gui.DrawContext;
-import net.minecraft.client.util.math.MatrixStack;
 import net.minecraft.text.Text;
 import net.minecraft.util.Formatting;
 
-import java.util.ArrayList;
-import java.util.List;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-import java.util.stream.Collectors;
-import java.util.stream.Stream;
-
 public class DwarvenHud {
 
 
     public static final MinecraftClient client = MinecraftClient.getInstance();
     public static List<Commission> commissionList = new ArrayList<>();
 
-
     public static final List<Pattern> COMMISSIONS = Stream.of(
             "(?:Titanium|Mithril|Hard Stone) Miner",
             "(?:Ice Walker|Goblin|Goblin Raid|Automaton|Sludge|Team Treasurite Member|Yog|Boss Corleone|Thyst) Slayer",
@@ -40,6 +39,7 @@ public class DwarvenHud {
             "Chest Looter"
             ).map(s -> Pattern.compile("^.*(" + s + "): (\\d+\\.?\\d*%|DONE)"))
             .collect(Collectors.toList());
+
     public static void init() {
         ClientCommandRegistrationCallback.EVENT.register((dispatcher, registryAccess) -> dispatcher.register(ClientCommandManager.literal("skyblocker")
                 .then(ClientCommandManager.literal("hud")
@@ -88,17 +88,17 @@ public class DwarvenHud {
     }
 
     public static void renderSimple(DrawContext context, int hudX, int hudY, List<Commission> commissions) {
-        CommsWidget cw = new CommsWidget(commissions, false);
-        cw.setX(hudX);
-        cw.setY(hudY);
-        cw.render(context, SkyblockerConfig.get().locations.dwarvenMines.dwarvenHud.enableBackground);
+        HudCommsWidget.INSTANCE.updateData(commissions, false);
+        HudCommsWidget.INSTANCE.setX(hudX);
+        HudCommsWidget.INSTANCE.setY(hudY);
+        HudCommsWidget.INSTANCE.render(context, SkyblockerConfig.get().locations.dwarvenMines.dwarvenHud.enableBackground);
     }
 
     public static void renderFancy(DrawContext context, int hudX, int hudY, List<Commission> commissions) {
-        CommsWidget cw = new CommsWidget(commissions, true);
-        cw.setX(hudX);
-        cw.setY(hudY);
-        cw.render(context, SkyblockerConfig.get().locations.dwarvenMines.dwarvenHud.enableBackground);
+        HudCommsWidget.INSTANCE.updateData(commissions, true);
+        HudCommsWidget.INSTANCE.setX(hudX);
+        HudCommsWidget.INSTANCE.setY(hudY);
+        HudCommsWidget.INSTANCE.render(context, SkyblockerConfig.get().locations.dwarvenMines.dwarvenHud.enableBackground);
     }
 
     public static void update() {
diff --git a/src/main/java/me/xmrvizzy/skyblocker/skyblock/tabhud/screenbuilder/ScreenBuilder.java b/src/main/java/me/xmrvizzy/skyblocker/skyblock/tabhud/screenbuilder/ScreenBuilder.java
new file mode 100644
index 00000000..1197ca2d
--- /dev/null
+++ b/src/main/java/me/xmrvizzy/skyblocker/skyblock/tabhud/screenbuilder/ScreenBuilder.java
@@ -0,0 +1,166 @@
+package me.xmrvizzy.skyblocker.skyblock.tabhud.screenbuilder;
+
+import java.io.BufferedReader;
+import java.io.IOException;
+import java.lang.reflect.Constructor;
+import java.lang.reflect.InvocationTargetException;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.List;
+
+import com.google.gson.JsonArray;
+import com.google.gson.JsonElement;
+import com.google.gson.JsonObject;
+import com.google.gson.JsonParser;
+
+import me.xmrvizzy.skyblocker.SkyblockerMod;
+import me.xmrvizzy.skyblocker.skyblock.tabhud.screenbuilder.pipeline.AlignStage;
+import me.xmrvizzy.skyblocker.skyblock.tabhud.screenbuilder.pipeline.CollideStage;
+import me.xmrvizzy.skyblocker.skyblock.tabhud.screenbuilder.pipeline.PipelineStage;
+import me.xmrvizzy.skyblocker.skyblock.tabhud.screenbuilder.pipeline.PlaceStage;
+import me.xmrvizzy.skyblocker.skyblock.tabhud.screenbuilder.pipeline.StackStage;
+import me.xmrvizzy.skyblocker.skyblock.tabhud.widget.EmptyWidget;
+import me.xmrvizzy.skyblocker.skyblock.tabhud.widget.EventWidget;
+import me.xmrvizzy.skyblocker.skyblock.tabhud.widget.Widget;
+import net.minecraft.client.MinecraftClient;
+import net.minecraft.client.gui.DrawContext;
+import net.minecraft.util.Identifier;
+
+public class ScreenBuilder {
+
+    // layout pipeline
+    private ArrayList<PipelineStage> layoutPipeline = new ArrayList<>();
+
+    // all widget instances this builder knows
+    private ArrayList<Widget> instances = new ArrayList<>();
+    // maps alias -> widget instance
+    private HashMap<String, Widget> objectMap = new HashMap<>();
+
+    /**
+     * Create a ScreenBuilder from a json.
+     */
+    public ScreenBuilder(String jsonfile) throws IOException {
+
+        Identifier ident = new Identifier(SkyblockerMod.NAMESPACE, "tabhud/" + jsonfile + ".json");
+        BufferedReader reader = MinecraftClient.getInstance().getResourceManager().openAsReader(ident);
+        JsonObject json = JsonParser.parseReader(reader).getAsJsonObject();
+        reader.close();
+
+        JsonArray widgets = json.getAsJsonArray("widgets");
+        JsonArray layout = json.getAsJsonArray("layout");
+
+        for (JsonElement w : widgets) {
+            JsonObject widget = w.getAsJsonObject();
+            String name = widget.get("name").getAsString();
+            String alias = widget.get("alias").getAsString();
+
+            Widget wid = instanceFrom(name, widget);
+            objectMap.put(alias, wid);
+            instances.add(wid);
+        }
+
+        for (JsonElement l : layout) {
+            layoutPipeline.add(createStage(l.getAsJsonObject()));
+        }
+
+    }
+
+    /**
+     * Try to find a class in the widget package that has the supplied name and
+     * call it's constructor. Manual work is required if the class has arguments.
+     */
+    public Widget instanceFrom(String name, JsonObject widget) {
+
+        // do widgets that require args the normal way
+        switch (name) {
+            case "EventWidget":
+                return new EventWidget(widget.get("inGarden").getAsBoolean());
+            case "Widget":
+                // clown case sanity check. don't instantiate the superclass >:|
+                return new EmptyWidget();
+        }
+
+        // reflect something together for the "normal" ones.
+        // TODO don't get package list for every widget; do it once and cache.
+        // fine for now, as this would only shorten the load time anyways
+
+        // find all packages that might contain widget classes
+        Package[] packs = Package.getPackages();
+
+        List<String> packnames = Arrays.stream(packs)
+                .map(pack -> pack.getName())
+                .filter(s -> s.startsWith("me.xmrvizzy.skyblocker.skyblock.tabhud.widget"))
+                .toList();
+
+        // construct the full class name and try to load.
+        Class<?> clazz = null;
+        for (String pn : packnames) {
+            try {
+                clazz = Class.forName(pn + "." + name);
+            } catch (LinkageError | ClassNotFoundException ex) {
+                continue;
+            }
+        }
+
+        // load failed.
+        if (clazz == null) {
+            return new EmptyWidget();
+        }
+
+        // return instance of that class.
+        try {
+            Constructor<?> ctor = clazz.getConstructor();
+            return (Widget) ctor.newInstance();
+        } catch (NoSuchMethodException | InstantiationException | IllegalAccessException
+                | IllegalArgumentException | InvocationTargetException | SecurityException ex) {
+            return new EmptyWidget();
+        }
+    }
+
+    /**
+     * Create a PipelineStage from a json object.
+     */
+    public PipelineStage createStage(JsonObject descr) {
+
+        String op = descr.get("op").getAsString();
+
+        switch (op) {
+            case "place":
+                return new PlaceStage(this, descr);
+            case "stack":
+                return new StackStage(this, descr);
+            case "align":
+                return new AlignStage(this, descr);
+            case "collideAgainst":
+                return new CollideStage(this, descr);
+        }
+        return null;
+    }
+
+    /**
+     * Lookup Widget instance from alias name
+     */
+    public Widget getInstance(String name) {
+        return this.objectMap.get(name);
+    }
+
+    /**
+     * Run the pipeline to build a Screen
+     */
+    public void run(DrawContext context, int screenW, int screenH) {
+        // TODO for future:
+        // no need to update and run pipeline if PlayerListMgr wasn't updated.
+
+        for (Widget w : instances) {
+            w.update();
+        }
+        for (PipelineStage ps : layoutPipeline) {
+            ps.run(screenW, screenH);
+        }
+        for (Widget w : instances) {
+            w.render(context);
+        }
+    }
+
+}
diff --git a/src/main/java/me/xmrvizzy/skyblocker/skyblock/tabhud/screens/ScreenMaster.java b/src/main/java/me/xmrvizzy/skyblocker/skyblock/tabhud/screenbuilder/ScreenMaster.java
index 02b595d1..97969503 100644
--- a/src/main/java/me/xmrvizzy/skyblocker/skyblock/tabhud/screens/ScreenMaster.java
+++ b/src/main/java/me/xmrvizzy/skyblocker/skyblock/tabhud/screenbuilder/ScreenMaster.java
@@ -1,4 +1,4 @@
-package me.xmrvizzy.skyblocker.skyblock.tabhud.screens;
+package me.xmrvizzy.skyblocker.skyblock.tabhud.screenbuilder;
 
 import java.io.BufferedReader;
 import java.io.IOException;
@@ -15,7 +15,6 @@ import com.google.gson.JsonParser;
 import me.xmrvizzy.skyblocker.SkyblockerMod;
 import net.minecraft.client.MinecraftClient;
 import net.minecraft.client.gui.DrawContext;
-import net.minecraft.text.Text;
 import net.minecraft.util.Identifier;
 
 public class ScreenMaster {
@@ -23,21 +22,24 @@ public class ScreenMaster {
     private static final Identifier ASSIGNMENT_JSON = new Identifier(SkyblockerMod.NAMESPACE, "tabhud/assignment.json");
     private static final Logger LOGGER = LoggerFactory.getLogger("skyblocker");
 
-    private static HashMap<String, ScreenBuilder> screenAMap = new HashMap<>();
+    private static HashMap<String, ScreenBuilder> standardMap = new HashMap<>();
+    // private static HashMap<String, ScreenBuilder> screenAMap = new HashMap<>();
     // private static HashMap<String, ScreenBuilder> screenBMap = new HashMap<>();
-    // private static HashMap<String, ScreenBuilder> screenCMap = new HashMap<>();
 
     static {
         init();
     }
 
+    /**
+     * Load the assignment json and construct the screen mapping
+     */
     public static void init() {
         try (BufferedReader reader = MinecraftClient.getInstance().getResourceManager().openAsReader(ASSIGNMENT_JSON)) {
 
             JsonObject json = JsonParser.parseReader(reader).getAsJsonObject();
-            JsonObject screenA = json.getAsJsonObject("screenA");
-            for (Entry<String, JsonElement> entry : screenA.entrySet()) {
-                screenAMap.put(entry.getKey(), new ScreenBuilder(entry.getValue().getAsString()));
+            JsonObject standard = json.getAsJsonObject("standard");
+            for (Entry<String, JsonElement> entry : standard.entrySet()) {
+                standardMap.put(entry.getKey(), new ScreenBuilder(entry.getValue().getAsString()));
             }
 
         } catch (IOException ioex) {
@@ -46,13 +48,17 @@ public class ScreenMaster {
         }
     }
 
-    public static void render(DrawContext context, int w, int h, Text footer) {
-        screenAMap.get("default").run(context, w, h, footer);
+    /**
+     * Top level render method.
+     * Calls the appropriate ScreenBuilder with the screen's dimensions
+     */
+    public static void render(DrawContext context, int w, int h) {
+        standardMap.get("default").run(context, w, h);
     }
 }
 
 /*
- * 
+ *
  * stackWidgetsH
 stackWidgetsW
 --> stack (direction?) horiz/vert (align?) center/top/bottom/left/right
diff --git a/src/main/java/me/xmrvizzy/skyblocker/skyblock/tabhud/screenbuilder/pipeline/AlignStage.java b