Rework just about everything to gracefully handle unexpected inputs

65 files changed, 780 insertions, 770 deletions

diff --git a/src/main/java/me/xmrvizzy/skyblocker/SkyblockerMod.java b/src/main/java/me/xmrvizzy/skyblocker/SkyblockerMod.java
index f804d90e..fa80bcc2 100644
--- a/src/main/java/me/xmrvizzy/skyblocker/SkyblockerMod.java
+++ b/src/main/java/me/xmrvizzy/skyblocker/SkyblockerMod.java
@@ -6,6 +6,7 @@ import me.xmrvizzy.skyblocker.skyblock.BackpackPreview;
 import me.xmrvizzy.skyblocker.skyblock.StatusBarTracker;
 import me.xmrvizzy.skyblocker.skyblock.dungeon.DungeonBlaze;
 import me.xmrvizzy.skyblocker.skyblock.dwarven.DwarvenHud;
+import me.xmrvizzy.skyblocker.skyblock.tabhud.util.PlayerListMgr;
 import me.xmrvizzy.skyblocker.utils.Scheduler;
 import me.xmrvizzy.skyblocker.utils.Utils;
 
@@ -23,6 +24,7 @@ public class SkyblockerMod {
         scheduler.scheduleCyclic(DungeonBlaze::update, 4);
         scheduler.scheduleCyclic(BackpackPreview::tick, 50);
         scheduler.scheduleCyclic(DwarvenHud::update, 40);
+        scheduler.scheduleCyclic(PlayerListMgr::updateList, 20);
     }
 
     public static SkyblockerMod getInstance() {
diff --git a/src/main/java/me/xmrvizzy/skyblocker/mixin/PlayerListHudMixin.java b/src/main/java/me/xmrvizzy/skyblocker/mixin/PlayerListHudMixin.java
index a2ab848a..53494940 100644
--- a/src/main/java/me/xmrvizzy/skyblocker/mixin/PlayerListHudMixin.java
+++ b/src/main/java/me/xmrvizzy/skyblocker/mixin/PlayerListHudMixin.java
@@ -1,7 +1,5 @@
 package me.xmrvizzy.skyblocker.mixin;
 
-import java.util.List;
-
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.Shadow;
 import org.spongepowered.asm.mixin.injection.At;
@@ -17,7 +15,6 @@ import net.fabricmc.api.Environment;
 import net.minecraft.client.MinecraftClient;
 import net.minecraft.client.gui.hud.PlayerListHud;
 import net.minecraft.client.network.ClientPlayNetworkHandler;
-import net.minecraft.client.network.PlayerListEntry;
 import net.minecraft.client.util.math.MatrixStack;
 import net.minecraft.scoreboard.Scoreboard;
 import net.minecraft.scoreboard.ScoreboardObjective;
@@ -46,29 +43,17 @@ public class PlayerListHudMixin {
             return;
         }
 
-        List<PlayerListEntry> list = nwH.getListedPlayerListEntries().stream()
-                .sorted(PlayerListHudAccessor.getOrdering()).toList();
-
-        // list hasn't loaded completely, abort until widgets handle errors correctly
-        if (list.size() < 40) {
-            return;
-        }
-
         int w = scaledW;
         int h = MinecraftClient.getInstance().getWindow().getScaledHeight();
-
         try {
-
-            Screen screen = Screen.getCorrect(w, h, list, footer);
-            if (screen != null) {
-                screen.render(ms);
-                info.cancel();
-            }
+            long then  = System.nanoTime();
+            Screen screen = Screen.getCorrect(w, h, footer);
+            screen.render(ms);
+            info.cancel();
         } catch (Exception e) {
             e.printStackTrace();
-            client.player.sendMessage(Text.of("The tab HUD has encountered unexpected text, see log! :("));
         }
 
     }
 
-}
+}
\ No newline at end of file
diff --git a/src/main/java/me/xmrvizzy/skyblocker/skyblock/tabhud/screens/EmptyScreen.java b/src/main/java/me/xmrvizzy/skyblocker/skyblock/tabhud/screens/EmptyScreen.java
index efc64a70..5c302eb3 100644
--- a/src/main/java/me/xmrvizzy/skyblocker/skyblock/tabhud/screens/EmptyScreen.java
+++ b/src/main/java/me/xmrvizzy/skyblocker/skyblock/tabhud/screens/EmptyScreen.java
@@ -1,17 +1,14 @@
 package me.xmrvizzy.skyblocker.skyblock.tabhud.screens;
 
-import java.util.List;
-
 import me.xmrvizzy.skyblocker.skyblock.tabhud.widget.EmptyWidget;
 
-import net.minecraft.client.network.PlayerListEntry;
 import net.minecraft.text.Text;
 
 public class EmptyScreen extends Screen {
 
-    public EmptyScreen(int w, int h, List<PlayerListEntry> ple, Text footer) {
+    public EmptyScreen(int w, int h, Text footer) {
         super(w, h);
-        EmptyWidget ew = new EmptyWidget(ple);
+        EmptyWidget ew = new EmptyWidget();
         this.center(ew);
         this.addWidget(ew);
     }
diff --git a/src/main/java/me/xmrvizzy/skyblocker/skyblock/tabhud/screens/Screen.java b/src/main/java/me/xmrvizzy/skyblocker/skyblock/tabhud/screens/Screen.java
index cc16da8b..ae71d7bd 100644
--- a/src/main/java/me/xmrvizzy/skyblocker/skyblock/tabhud/screens/Screen.java
+++ b/src/main/java/me/xmrvizzy/skyblocker/skyblock/tabhud/screens/Screen.java
@@ -1,7 +1,6 @@
 package me.xmrvizzy.skyblocker.skyblock.tabhud.screens;
 
 import java.util.ArrayList;
-import java.util.List;
 
 import me.xmrvizzy.skyblocker.config.SkyblockerConfig;
 import me.xmrvizzy.skyblocker.skyblock.tabhud.TabHud;
@@ -24,7 +23,6 @@ import me.xmrvizzy.skyblocker.skyblock.tabhud.screens.playerList.HomePlayerScree
 import me.xmrvizzy.skyblocker.skyblock.tabhud.screens.playerList.PlayerListScreen;
 import me.xmrvizzy.skyblocker.skyblock.tabhud.util.PlayerLocator;
 import me.xmrvizzy.skyblocker.skyblock.tabhud.widget.Widget;
-import net.minecraft.client.network.PlayerListEntry;
 import net.minecraft.client.util.math.MatrixStack;
 import net.minecraft.text.Text;
 
@@ -39,57 +37,48 @@ public class Screen {
         this.h = (int) (h / scale);
     }
 
-    public static Screen getCorrect(int w, int h, List<PlayerListEntry> ple, Text footer) {
+    public static Screen getCorrect(int w, int h, Text footer) {
         if (TabHud.genericTgl.isPressed()) {
-            return Screen.correctGenericScrn(w, h, ple, footer);
-            // } else if (TabHud.mapTgl.isPressed()) {
-            // return Screen.correctMapScrn(w, h, ple, footer);
+            return Screen.correctGenericScrn(w, h, footer);
         } else if (TabHud.playerTgl.isPressed()) {
-            return Screen.correctPlayerScrn(w, h, ple, footer);
+            return Screen.correctPlayerScrn(w, h, footer);
         } else {
-            return Screen.correctMainScrn(w, h, ple, footer);
+            return Screen.correctMainScrn(w, h, footer);
         }
     }
 
-    // private static Screen correctMapScrn(int w, int h, List<PlayerListEntry>
-    // list, Text footer) {
-    // // return switch (getScreenType(list)) {
-    // // case CRYSTAL_HOLLOWS -> null;
-    // // case DUNGEON -> null;
-    // // default -> new EmptyScreen(w, h, list, footer);
-    // // };
-    // return new EmptyScreen(w, h, list, footer);
-    // }
-
-    private static Screen correctGenericScrn(int w, int h, List<PlayerListEntry> list, Text footer) {
+    private static Screen correctGenericScrn(int w, int h, Text footer) {
         return switch (PlayerLocator.getPlayerLocation()) {
-            case GARDEN -> new GardenInfoScreen(w, h, list, footer); // ok
-            default -> new GenericInfoScreen(w, h, list, footer); // ok
+            case GARDEN -> new GardenInfoScreen(w, h, footer); // ok
+            case UNKNOWN -> new EmptyScreen(w, h, footer); // ok
+            default -> new GenericInfoScreen(w, h, footer); // ok
         };
     }
 
-    private static Screen correctPlayerScrn(int w, int h, List<PlayerListEntry> list, Text footer) {
+    private static Screen correctPlayerScrn(int w, int h, Text footer) {
         return switch (PlayerLocator.getPlayerLocation()) {
-            case GUEST_ISLAND -> new GuestPlayerScreen(w, h, list, footer); // ok
-            case HOME_ISLAND -> new HomePlayerScreen(w, h, list, footer); // ok
-            case DUNGEON -> new DungeonPlayerScreen(w, h, list, footer);
-            default -> new PlayerListScreen(w, h, list, footer); // ok
+            case GUEST_ISLAND -> new GuestPlayerScreen(w, h, footer); // ok
+            case HOME_ISLAND, GARDEN -> new HomePlayerScreen(w, h, footer); // ok for 1 player
+            case DUNGEON -> new DungeonPlayerScreen(w, h, footer);
+            case UNKNOWN -> new EmptyScreen(w, h, footer); // ok
+            default -> new PlayerListScreen(w, h, footer); // ok
         };
     }
 
-    private static Screen correctMainScrn(int w, int h, List<PlayerListEntry> list, Text footer) {
+    private static Screen correctMainScrn(int w, int h, Text footer) {
         return switch (PlayerLocator.getPlayerLocation()) {
-            case PARK -> new ParkServerScreen(w, h, list, footer); // ok
-            case HUB -> new HubServerScreen(w, h, list, footer); // ok
-            case HOME_ISLAND -> new HomeServerScreen(w, h, list, footer); // ok
-            case GUEST_ISLAND -> new GuestServerScreen(w, h, list, footer); // ok
-            case CRYSTAL_HOLLOWS, DWARVEN_MINES -> new MineServerScreen(w, h, list, footer);
-            case FARMING_ISLAND -> new FarmingServerScreen(w, h, list, footer); // ok
-            case DUNGEON_HUB -> new DungeonHubScreen(w, h, list, footer); // ok
-            case DUNGEON -> new DungeonScreen(w, h, list, footer); // ok
-            case CRIMSON_ISLE -> new CrimsonIsleScreen(w, h, list, footer); // ???
-            case GARDEN -> new GardenScreen(w, h, list, footer);
-            default -> new GenericServerScreen(w, h, list, footer); // ok
+            case PARK -> new ParkServerScreen(w, h, footer); // ok
+            case HUB -> new HubServerScreen(w, h, footer); // ok when fire sale incoming, TODO active fs, no fs
+            case HOME_ISLAND -> new HomeServerScreen(w, h, footer); // ok
+            case GUEST_ISLAND -> new GuestServerScreen(w, h, footer); // ok
+            case CRYSTAL_HOLLOWS, DWARVEN_MINES -> new MineServerScreen(w, h, footer); // ok, TODO 4 comms, active forge
+            case FARMING_ISLAND -> new FarmingServerScreen(w, h, footer);
+            case DUNGEON_HUB -> new DungeonHubScreen(w, h, footer); // ok
+            case DUNGEON -> new DungeonScreen(w, h, footer); // ok
+            case CRIMSON_ISLE -> new CrimsonIsleScreen(w, h, footer);
+            case GARDEN -> new GardenScreen(w, h, footer); // ok
+            case UNKNOWN -> new EmptyScreen(w, h, footer); // ok
+            default -> new GenericServerScreen(w, h, footer); // ok
         };
     }
 
diff --git a/src/main/java/me/xmrvizzy/skyblocker/skyblock/tabhud/screens/genericInfo/GardenInfoScreen.java b/src/main/java/me/xmrvizzy/skyblocker/skyblock/tabhud/screens/genericInfo/GardenInfoScreen.java
index f24fb82a..0bb12c8e 100644
--- a/src/main/java/me/xmrvizzy/skyblocker/skyblock/tabhud/screens/genericInfo/GardenInfoScreen.java
+++ b/src/main/java/me/xmrvizzy/skyblocker/skyblock/tabhud/screens/genericInfo/GardenInfoScreen.java
@@ -1,6 +1,6 @@
 package me.xmrvizzy.skyblocker.skyblock.tabhud.screens.genericInfo;
 
-import java.util.List;
+
 
 import me.xmrvizzy.skyblocker.skyblock.tabhud.screens.Screen;
 import me.xmrvizzy.skyblocker.skyblock.tabhud.widget.CookieWidget;
@@ -10,24 +10,24 @@ import me.xmrvizzy.skyblocker.skyblock.tabhud.widget.GardenSkillsWidget;
 import me.xmrvizzy.skyblocker.skyblock.tabhud.widget.JacobsContestWidget;
 import me.xmrvizzy.skyblocker.skyblock.tabhud.widget.ProfileWidget;
 import me.xmrvizzy.skyblocker.skyblock.tabhud.widget.UpgradeWidget;
-import net.minecraft.client.network.PlayerListEntry;
+
 import net.minecraft.text.Text;
 
 public class GardenInfoScreen extends Screen {
 
-    public GardenInfoScreen(int w, int h, List<PlayerListEntry> ple, Text footer) {
+    public GardenInfoScreen(int w, int h, Text footer) {
         super(w, h);
 
         String f = footer.getString();
 
-        GardenSkillsWidget gsw = new GardenSkillsWidget(ple);
-        EventWidget evw = new EventWidget(ple, true);
+        GardenSkillsWidget gsw = new GardenSkillsWidget();
+        EventWidget evw = new EventWidget(true);
         UpgradeWidget uw = new UpgradeWidget(f);
 
-        ProfileWidget pw = new ProfileWidget(ple);
+        ProfileWidget pw = new ProfileWidget();
         EffectWidget efw = new EffectWidget(f);
 
-        JacobsContestWidget jcw = new JacobsContestWidget(ple);
+        JacobsContestWidget jcw = new JacobsContestWidget();
         CookieWidget cw = new CookieWidget(f);
 
         // layout code incoming
diff --git a/src/main/java/me/xmrvizzy/skyblocker/skyblock/tabhud/screens/genericInfo/GenericInfoScreen.java b/src/main/java/me/xmrvizzy/skyblocker/skyblock/tabhud/screens/genericInfo/GenericInfoScreen.java
index 764397ae..a3e75ab6 100644
--- a/src/main/java/me/xmrvizzy/skyblocker/skyblock/tabhud/screens/genericInfo/GenericInfoScreen.java
+++ b/src/main/java/me/xmrvizzy/skyblocker/skyblock/tabhud/screens/genericInfo/GenericInfoScreen.java
@@ -1,6 +1,6 @@
 package me.xmrvizzy.skyblocker.skyblock.tabhud.screens.genericInfo;
 
-import java.util.List;
+
 
 import me.xmrvizzy.skyblocker.skyblock.tabhud.screens.Screen;
 import me.xmrvizzy.skyblocker.skyblock.tabhud.widget.CookieWidget;
@@ -11,24 +11,24 @@ import me.xmrvizzy.skyblocker.skyblock.tabhud.widget.ProfileWidget;
 import me.xmrvizzy.skyblocker.skyblock.tabhud.widget.SkillsWidget;
 import me.xmrvizzy.skyblocker.skyblock.tabhud.widget.UpgradeWidget;
 
-import net.minecraft.client.network.PlayerListEntry;
+
 import net.minecraft.text.Text;
 
 public class GenericInfoScreen extends Screen {
 
-    public GenericInfoScreen(int w, int h, List<PlayerListEntry> ple, Text footer) {
+    public GenericInfoScreen(int w, int h, Text footer) {
         super(w, h);
 
         String f = footer.getString();
 
-        SkillsWidget sw = new SkillsWidget(ple);
-        EventWidget evw = new EventWidget(ple, false);
+        SkillsWidget sw = new SkillsWidget();
+        EventWidget evw = new EventWidget(false);
         UpgradeWidget uw = new UpgradeWidget(f);
 
-        ProfileWidget pw = new ProfileWidget(ple);
+        ProfileWidget pw = new ProfileWidget();
         EffectWidget efw = new EffectWidget(f);
 
-        ElectionWidget elw = new ElectionWidget(ple);
+        ElectionWidget elw = new ElectionWidget();
         CookieWidget cw = new CookieWidget(f);
 
         this.stackWidgetsH(sw, evw, uw);
diff --git a/src/main/java/me/xmrvizzy/skyblocker/skyblock/tabhud/screens/main/CrimsonIsleScreen.java b/src/main/java/me/xmrvizzy/skyblocker/skyblock/tabhud/screens/main/CrimsonIsleScreen.java
index 046abcbb..6e6f563b 100644
--- a/src/main/java/me/xmrvizzy/skyblocker/skyblock/tabhud/screens/main/CrimsonIsleScreen.java
+++ b/src/main/java/me/xmrvizzy/skyblocker/skyblock/tabhud/screens/main/CrimsonIsleScreen.java
@@ -1,24 +1,24 @@
 package me.xmrvizzy.skyblocker.skyblock.tabhud.screens.main;
 
-import java.util.List;
+
 
 import me.xmrvizzy.skyblocker.skyblock.tabhud.screens.Screen;
 import me.xmrvizzy.skyblocker.skyblock.tabhud.widget.QuestWidget;
 import me.xmrvizzy.skyblocker.skyblock.tabhud.widget.ReputationWidget;
 import me.xmrvizzy.skyblocker.skyblock.tabhud.widget.ServerWidget;
 import me.xmrvizzy.skyblocker.skyblock.tabhud.widget.VolcanoWidget;
-import net.minecraft.client.network.PlayerListEntry;
+
 import net.minecraft.text.Text;
 
 public class CrimsonIsleScreen extends Screen {
 
-    public CrimsonIsleScreen(int w, int h, List<PlayerListEntry> ple, Text footer) {
+    public CrimsonIsleScreen(int w, int h, Text footer) {
         super(w, h);