Replaced most assertions with proper error handling

2 files changed, 14 insertions, 4 deletions

diff --git a/src/main/java/me/xmrvizzy/skyblocker/utils/Scheduler.java b/src/main/java/me/xmrvizzy/skyblocker/utils/Scheduler.java
index 0fdf4892..16e5b023 100644
--- a/src/main/java/me/xmrvizzy/skyblocker/utils/Scheduler.java
+++ b/src/main/java/me/xmrvizzy/skyblocker/utils/Scheduler.java
@@ -1,8 +1,12 @@
 package me.xmrvizzy.skyblocker.utils;
 
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
 import java.util.PriorityQueue;
 
 public class Scheduler {
+    private static final Logger LOGGER = LoggerFactory.getLogger(Scheduler.class);
     private int currentTick;
     private final PriorityQueue<ScheduledTask> tasks;
 
@@ -12,21 +16,25 @@ public class Scheduler {
     }
 
     public void schedule(Runnable task, int delay) {
-        assert delay > 0;
+        if (delay < 0)
+            LOGGER.warn("Scheduled a task with negative delay");
         ScheduledTask tmp = new ScheduledTask(currentTick + delay, task);
         tasks.add(tmp);
     }
 
     public void scheduleCyclic(Runnable task, int period) {
-        new CyclicTask(task, period).run();
+        if (period <= 0)
+            LOGGER.error("Attempted to schedule a cyclic task with period lower than 1");
+        else
+            new CyclicTask(task, period).run();
     }
 
     public void tick() {
         currentTick += 1;
         ScheduledTask task;
         while ((task = tasks.peek()) != null && task.schedule <= currentTick) {
-            task.run();
             tasks.poll();
+            task.run();
         }
     }
 
diff --git a/src/main/java/me/xmrvizzy/skyblocker/utils/Utils.java b/src/main/java/me/xmrvizzy/skyblocker/utils/Utils.java
index 66d04b50..5894c9df 100644
--- a/src/main/java/me/xmrvizzy/skyblocker/utils/Utils.java
+++ b/src/main/java/me/xmrvizzy/skyblocker/utils/Utils.java
@@ -3,6 +3,7 @@ package me.xmrvizzy.skyblocker.utils;
 import me.xmrvizzy.skyblocker.skyblock.item.PriceInfoTooltip;
 import net.fabricmc.fabric.api.client.item.v1.ItemTooltipCallback;
 import net.minecraft.client.MinecraftClient;
+import net.minecraft.client.network.ClientPlayerEntity;
 import net.minecraft.scoreboard.Scoreboard;
 import net.minecraft.scoreboard.ScoreboardObjective;
 import net.minecraft.scoreboard.ScoreboardPlayerScore;
@@ -102,7 +103,8 @@ public class Utils {
 
     public static List<String> getSidebar() {
         try {
-            assert MinecraftClient.getInstance().player != null;
+            ClientPlayerEntity client = MinecraftClient.getInstance().player;
+            if (client == null) return Collections.emptyList();
             Scoreboard scoreboard = MinecraftClient.getInstance().player.getScoreboard();
             ScoreboardObjective objective = scoreboard.getObjectiveForSlot(1);
             List<String> lines = new ArrayList<>();