Improve support for garden area, works fully now

3 files changed, 126 insertions, 3 deletions

diff --git a/src/main/java/me/xmrvizzy/skyblocker/skyblock/tabhud/widget/EventWidget.java b/src/main/java/me/xmrvizzy/skyblocker/skyblock/tabhud/widget/EventWidget.java
index 051ce11c..7fcbe1c1 100644
--- a/src/main/java/me/xmrvizzy/skyblocker/skyblock/tabhud/widget/EventWidget.java
+++ b/src/main/java/me/xmrvizzy/skyblocker/skyblock/tabhud/widget/EventWidget.java
@@ -16,15 +16,19 @@ import net.minecraft.util.Formatting;
 public class EventWidget extends Widget {
     private static final MutableText TITLE = Text.literal("Event Info").formatted(Formatting.YELLOW, Formatting.BOLD);
 
-    public EventWidget(List<PlayerListEntry> list) {
+    public EventWidget(List<PlayerListEntry> list, boolean isInGarden) {
         super(TITLE, Formatting.YELLOW.getColorValue());
 
-        Text eventName = StrMan.stdEntry(list, 73, "Name:", Formatting.YELLOW);
+        // hypixel devs carefully inserting the most random edge cases #317:
+        // the event info is placed a bit differently when in the garden.
+        int offset = (isInGarden) ? -1 : 0;
+
+        Text eventName = StrMan.stdEntry(list, 73 + offset, "Name:", Formatting.YELLOW);
         IcoTextComponent event = new IcoTextComponent(Ico.NTAG, eventName);
         this.addComponent(event);
 
         // this could look better
-        Text time = StrMan.plainEntry(list, 74);
+        Text time = StrMan.plainEntry(list, 74 + offset);
         IcoTextComponent t = new IcoTextComponent(Ico.CLOCK, time);
         this.addComponent(t);
         this.pack();
diff --git a/src/main/java/me/xmrvizzy/skyblocker/skyblock/tabhud/widget/GardenSkillsWidget.java b/src/main/java/me/xmrvizzy/skyblocker/skyblock/tabhud/widget/GardenSkillsWidget.java
new file mode 100644
index 00000000..99011616
--- /dev/null
+++ b/src/main/java/me/xmrvizzy/skyblocker/skyblock/tabhud/widget/GardenSkillsWidget.java
@@ -0,0 +1,63 @@
+package me.xmrvizzy.skyblocker.skyblock.tabhud.widget;
+
+import java.util.List;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+import me.xmrvizzy.skyblocker.skyblock.tabhud.util.Ico;
+import me.xmrvizzy.skyblocker.skyblock.tabhud.util.StrMan;
+import me.xmrvizzy.skyblocker.skyblock.tabhud.widget.component.IcoTextComponent;
+import me.xmrvizzy.skyblocker.skyblock.tabhud.widget.component.ProgressComponent;
+import me.xmrvizzy.skyblocker.skyblock.tabhud.widget.component.TableComponent;
+
+import net.minecraft.client.network.PlayerListEntry;
+import net.minecraft.text.MutableText;
+import net.minecraft.text.Text;
+import net.minecraft.util.Formatting;
+
+
+public class GardenSkillsWidget extends Widget {
+
+    private static final MutableText TITLE = Text.literal("Skill Info").formatted(Formatting.YELLOW,
+            Formatting.BOLD);
+
+    // match the skill entry
+    // group 1: skill name and level
+    // group 2: progress to next level (without "%")
+    private static final Pattern SKILL_PATTERN = Pattern.compile("\\S*: ([A-Za-z]* [0-9]*): (\\S*)%");
+    // same with leading space
+    // TODO: make better, maybe
+    private static final Pattern MS_PATTERN = Pattern.compile(" \\S*: ([A-Za-z]* [0-9]*): (\\S*)%");
+
+    public GardenSkillsWidget(List<PlayerListEntry> list) {
+        super(TITLE, Formatting.YELLOW.getColorValue());
+
+        Matcher m = StrMan.regexAt(list, 66, SKILL_PATTERN);
+
+        float pcnt = Float.parseFloat(m.group(2));
+        String skill = m.group(1);
+
+        ProgressComponent pc = new ProgressComponent(Ico.LANTERN, Text.of(skill), pcnt, Formatting.GOLD.getColorValue());
+        this.addComponent(pc);
+
+        Text speed = StrMan.stdEntry(list, 67, "SPD", Formatting.WHITE);
+        IcoTextComponent spd = new IcoTextComponent(Ico.SUGAR, speed);
+        Text farmfort = StrMan.stdEntry(list, 68, "FFO", Formatting.GOLD);
+        IcoTextComponent ffo = new IcoTextComponent(Ico.HOE, farmfort);
+
+        TableComponent tc = new TableComponent(2, 1, Formatting.YELLOW.getColorValue());
+        tc.addToCell(0, 0, spd);
+        tc.addToCell(1, 0, ffo);
+        this.addComponent(tc);
+
+        m = StrMan.regexAt(list, 69, MS_PATTERN);
+        pcnt = Float.parseFloat(m.group(2));
+        skill = m.group(1);
+
+        ProgressComponent pc2 = new ProgressComponent(Ico.MILESTONE, Text.of(skill), pcnt, Formatting.GREEN.getColorValue());
+        this.addComponent(pc2);
+
+        this.pack();
+    }
+
+}
diff --git a/src/main/java/me/xmrvizzy/skyblocker/skyblock/tabhud/widget/JacobsContestWidget.java b/src/main/java/me/xmrvizzy/skyblocker/skyblock/tabhud/widget/JacobsContestWidget.java
new file mode 100644
index 00000000..11817662
--- /dev/null
+++ b/src/main/java/me/xmrvizzy/skyblocker/skyblock/tabhud/widget/JacobsContestWidget.java
@@ -0,0 +1,56 @@
+package me.xmrvizzy.skyblocker.skyblock.tabhud.widget;
+
+import java.util.HashMap;
+import java.util.List;
+
+import me.xmrvizzy.skyblocker.skyblock.tabhud.util.Ico;
+import me.xmrvizzy.skyblocker.skyblock.tabhud.util.StrMan;
+import me.xmrvizzy.skyblocker.skyblock.tabhud.widget.component.IcoTextComponent;
+import me.xmrvizzy.skyblocker.skyblock.tabhud.widget.component.TableComponent;
+import net.minecraft.client.network.PlayerListEntry;
+import net.minecraft.item.ItemStack;
+import net.minecraft.item.Items;
+import net.minecraft.text.MutableText;
+import net.minecraft.text.Text;
+import net.minecraft.util.Formatting;
+
+public class JacobsContestWidget extends Widget {
+
+    private static final MutableText TITLE = Text.literal("Jacob's Contest").formatted(Formatting.YELLOW,
+            Formatting.BOLD);
+
+    private static final HashMap<String, ItemStack> FARM_DATA = new HashMap<>();
+
+    // again, there HAS to be a better way to do this
+    static {
+        FARM_DATA.put("Wheat", new ItemStack(Items.WHEAT));
+        FARM_DATA.put("Sugar Cane", new ItemStack(Items.SUGAR_CANE));
+        FARM_DATA.put("Carrot", new ItemStack(Items.CARROT));
+        FARM_DATA.put("Potato", new ItemStack(Items.POTATO));
+        FARM_DATA.put("Melon", new ItemStack(Items.MELON_SLICE));
+        FARM_DATA.put("Pumpkin", new ItemStack(Items.PUMPKIN));
+        FARM_DATA.put("Cocoa Beans", new ItemStack(Items.COCOA_BEANS));
+        FARM_DATA.put("Nether Wart", new ItemStack(Items.NETHER_WART));
+        FARM_DATA.put("Cactus", new ItemStack(Items.CACTUS));
+        FARM_DATA.put("Mushroom", new ItemStack(Items.RED_MUSHROOM));
+    }
+
+    public JacobsContestWidget(List<PlayerListEntry> list) {
+        super(TITLE, Formatting.YELLOW.getColorValue());
+
+        Text time = StrMan.stdEntry(list, 76, "Starts in:", Formatting.GOLD);
+        IcoTextComponent t = new IcoTextComponent(Ico.CLOCK, time);
+        this.addComponent(t);
+
+        TableComponent tc = new TableComponent(1, 3, Formatting.YELLOW  .getColorValue());
+
+        for (int i = 77; i < 80; i++) {
+            String item = StrMan.strAt(list, i).trim();
+            tc.addToCell(0, i - 77, new IcoTextComponent(FARM_DATA.get(item), Text.of(item)));
+        }
+        this.addComponent(tc);
+
+        this.pack();
+    }
+
+}