Abstract different checking methods in Utils

3 files changed, 10 insertions, 6 deletions

diff --git a/src/main/java/me/xmrvizzy/skyblocker/SkyblockerMod.java b/src/main/java/me/xmrvizzy/skyblocker/SkyblockerMod.java
index 04ab384f..add81791 100644
--- a/src/main/java/me/xmrvizzy/skyblocker/SkyblockerMod.java
+++ b/src/main/java/me/xmrvizzy/skyblocker/SkyblockerMod.java
@@ -81,9 +81,9 @@ public class SkyblockerMod implements ClientModInitializer {
         FishingHelper.init();
         FairySouls.init();
         TabHud.init();
-        containerSolverManager.init();
         DungeonMap.init();
-        scheduler.scheduleCyclic(Utils::sbChecker, 20);
+        containerSolverManager.init();
+        scheduler.scheduleCyclic(Utils::update, 20);
         scheduler.scheduleCyclic(DiscordRPCManager::updateDataAndPresence, 100);
         scheduler.scheduleCyclic(DungeonBlaze::update, 4);
         scheduler.scheduleCyclic(LividColor::update, 10);
diff --git a/src/main/java/me/xmrvizzy/skyblocker/skyblock/BackpackPreview.java b/src/main/java/me/xmrvizzy/skyblocker/skyblock/BackpackPreview.java
index e35ef605..d89a18e0 100644
--- a/src/main/java/me/xmrvizzy/skyblocker/skyblock/BackpackPreview.java
+++ b/src/main/java/me/xmrvizzy/skyblocker/skyblock/BackpackPreview.java
@@ -50,7 +50,7 @@ public class BackpackPreview {
     }
 
     public static void tick() {
-        Utils.sbChecker(); // force update isOnSkyblock to prevent crash on disconnect
+        Utils.update(); // force update isOnSkyblock to prevent crash on disconnect
         if (Utils.isOnSkyblock()) {
             // save all dirty storages
             saveStorage();
diff --git a/src/main/java/me/xmrvizzy/skyblocker/utils/Utils.java b/src/main/java/me/xmrvizzy/skyblocker/utils/Utils.java
index 6f238b44..887476f2 100644
--- a/src/main/java/me/xmrvizzy/skyblocker/utils/Utils.java
+++ b/src/main/java/me/xmrvizzy/skyblocker/utils/Utils.java
@@ -77,8 +77,14 @@ public class Utils {
         ClientReceiveMessageEvents.ALLOW_GAME.register(Utils::onChatMessage);
     }
 
-    public static void sbChecker() {
+    public static void update() {
         MinecraftClient client = MinecraftClient.getInstance();
+        updateFromScoreboard(client);
+        updateFromPlayerList(client);
+        updateLocRaw();
+    }
+
+    public static void updateFromScoreboard(MinecraftClient client) {
         List<String> sidebar;
 
         if (client.world == null || client.isInSingleplayer() || (sidebar = getSidebar()) == null) {
@@ -104,8 +110,6 @@ public class Utils {
             SkyblockEvents.LEAVE.invoker().onSkyblockLeave();
         }
         isInDungeons = isOnSkyblock && string.contains("The Catacombs");
-        updateFromPlayerList(client);
-        updateLocRaw();
     }
 
     public static String getLocation() {