Add Livid Color

7 files changed, 110 insertions, 12 deletions

diff --git a/src/main/java/me/xmrvizzy/skyblocker/SkyblockerMod.java b/src/main/java/me/xmrvizzy/skyblocker/SkyblockerMod.java
index 64c09a2f..2ab1b45e 100644
--- a/src/main/java/me/xmrvizzy/skyblocker/SkyblockerMod.java
+++ b/src/main/java/me/xmrvizzy/skyblocker/SkyblockerMod.java
@@ -11,11 +11,13 @@ import me.xmrvizzy.skyblocker.skyblock.StatusBarTracker;
 import me.xmrvizzy.skyblocker.skyblock.api.RepositoryUpdate;
 import me.xmrvizzy.skyblocker.skyblock.api.StatsCommand;
 import me.xmrvizzy.skyblocker.skyblock.dungeon.DungeonBlaze;
+import me.xmrvizzy.skyblocker.skyblock.dungeon.LividColor;
 import me.xmrvizzy.skyblocker.skyblock.dwarven.DwarvenHud;
 import me.xmrvizzy.skyblocker.skyblock.item.PriceInfoTooltip;
 import me.xmrvizzy.skyblocker.skyblock.item.WikiLookup;
 import me.xmrvizzy.skyblocker.skyblock.itemlist.ItemRegistry;
 import me.xmrvizzy.skyblocker.skyblock.quicknav.QuickNav;
+import me.xmrvizzy.skyblocker.utils.MessageScheduler;
 import me.xmrvizzy.skyblocker.utils.Scheduler;
 import me.xmrvizzy.skyblocker.utils.UpdateChecker;
 import me.xmrvizzy.skyblocker.utils.Utils;
@@ -32,6 +34,7 @@ public class SkyblockerMod implements ClientModInitializer {
 
     @SuppressWarnings("deprecation")
     public final Scheduler scheduler = new Scheduler();
+    public final MessageScheduler messageScheduler = new MessageScheduler();
     public final ContainerSolverManager containerSolverManager = new ContainerSolverManager();
     public final StatusBarTracker statusBarTracker = new StatusBarTracker();
 
@@ -66,20 +69,24 @@ public class SkyblockerMod implements ClientModInitializer {
         ChatMessageListener.init();
         UpdateChecker.init();
         DiscordRPCManager.init();
+        LividColor.init();
         FishingHelper.init();
         containerSolverManager.init();
         scheduler.scheduleCyclic(Utils::sbChecker, 20);
         scheduler.scheduleCyclic(DiscordRPCManager::update, 100);
         scheduler.scheduleCyclic(DungeonBlaze::update, 4);
+        scheduler.scheduleCyclic(LividColor::update, 10);
         scheduler.scheduleCyclic(BackpackPreview::tick, 50);
         scheduler.scheduleCyclic(DwarvenHud::update, 40);
     }
 
     /**
      * Ticks the scheduler. Called once at the end of every client tick through {@link ClientTickEvents#END_CLIENT_TICK}.
+     *
      * @param client the Minecraft client.
      */
     public void tick(MinecraftClient client) {
         scheduler.tick();
+        messageScheduler.tick();
     }
 }
diff --git a/src/main/java/me/xmrvizzy/skyblocker/config/SkyblockerConfig.java b/src/main/java/me/xmrvizzy/skyblocker/config/SkyblockerConfig.java
index 13f70137..65e5c392 100644
--- a/src/main/java/me/xmrvizzy/skyblocker/config/SkyblockerConfig.java
+++ b/src/main/java/me/xmrvizzy/skyblocker/config/SkyblockerConfig.java
@@ -269,6 +269,8 @@ public class SkyblockerConfig implements ConfigData {
         public boolean solveThreeWeirdos = true;
         public boolean blazesolver = true;
         public boolean solveTrivia = true;
+        public boolean lividColor = true;
+        public String lividColorText = "[color]";
         @ConfigEntry.Gui.CollapsibleObject()
         public Terminals terminals = new Terminals();
     }
diff --git a/src/main/java/me/xmrvizzy/skyblocker/skyblock/dungeon/LividColor.java b/src/main/java/me/xmrvizzy/skyblocker/skyblock/dungeon/LividColor.java
new file mode 100644
index 00000000..d05c8cb9
--- /dev/null
+++ b/src/main/java/me/xmrvizzy/skyblocker/skyblock/dungeon/LividColor.java
@@ -0,0 +1,43 @@
+package me.xmrvizzy.skyblocker.skyblock.dungeon;
+
+import me.xmrvizzy.skyblocker.SkyblockerMod;
+import me.xmrvizzy.skyblocker.config.SkyblockerConfig;
+import me.xmrvizzy.skyblocker.utils.Utils;
+import net.fabricmc.fabric.api.client.message.v1.ClientReceiveMessageEvents;
+import net.minecraft.client.MinecraftClient;
+import net.minecraft.util.math.BlockPos;
+
+public class LividColor {
+    private static int tenTicks = 0;
+
+    public static void init() {
+        ClientReceiveMessageEvents.ALLOW_GAME.register((message, overlay) -> {
+            if (SkyblockerConfig.get().locations.dungeons.lividColor && message.getString().equals("[BOSS] Livid: I respect you for making it to here, but I'll be your undoing.")) {
+                tenTicks = 8;
+            }
+            return true;
+        });
+    }
+
+    public static void update() {
+        MinecraftClient client = MinecraftClient.getInstance();
+        if (tenTicks != 0) {
+            if (SkyblockerConfig.get().locations.dungeons.lividColor && Utils.isInDungeons() && client.world != null) {
+                if (tenTicks == 1) {
+                    SkyblockerMod.getInstance().messageScheduler.sendMessageAfterCooldown(SkyblockerConfig.get().locations.dungeons.lividColorText.replace("[color]", "red"));
+                    tenTicks = 0;
+                    return;
+                }
+                String key = client.world.getBlockState(new BlockPos(5, 110, 42)).getBlock().getTranslationKey();
+                if (key.startsWith("block.minecraft.") && key.endsWith("wool") && !key.endsWith("red_wool")) {
+                    SkyblockerMod.getInstance().messageScheduler.sendMessageAfterCooldown(SkyblockerConfig.get().locations.dungeons.lividColorText.replace("[color]", key.substring(16, key.length() - 5)));
+                    tenTicks = 0;
+                    return;
+                }
+                tenTicks--;
+            } else {
+                tenTicks = 0;
+            }
+        }
+    }
+}
diff --git a/src/main/java/me/xmrvizzy/skyblocker/skyblock/dungeon/Reparty.java b/src/main/java/me/xmrvizzy/skyblocker/skyblock/dungeon/Reparty.java
index fdc39c42..d6e799ab 100644
--- a/src/main/java/me/xmrvizzy/skyblocker/skyblock/dungeon/Reparty.java
+++ b/src/main/java/me/xmrvizzy/skyblocker/skyblock/dungeon/Reparty.java
@@ -29,7 +29,7 @@ public class Reparty extends ChatPatternListener {
         ClientCommandRegistrationCallback.EVENT.register((dispatcher, registryAccess) -> dispatcher.register(ClientCommandManager.literal("rp").executes(context -> {
             if (!Utils.isOnSkyblock() || this.repartying || client.player == null) return 0;
             this.repartying = true;
-            client.player.networkHandler.sendCommand("p list");
+            SkyblockerMod.getInstance().messageScheduler.sendMessageAfterCooldown("/p list");
             return 0;
         })));
     }
@@ -63,16 +63,15 @@ public class Reparty extends ChatPatternListener {
             this.repartying = false;
             return;
         }
-        sendCommand(playerEntity, "p disband", 1);
+        sendCommand("p disband", 1);
         for (int i = 0; i < this.players.length; ++i) {
             String command = "p invite " + this.players[i];
-            sendCommand(playerEntity, command, i + 2);
+            sendCommand(command, i + 2);
         }
         skyblocker.scheduler.schedule(() -> this.repartying = false, this.players.length + 2);
     }
 
-    private void sendCommand(ClientPlayerEntity player, String command, int delay) {
-        // skyblocker.scheduler.schedule(() -> player.sendChatMessage(command, Text.of(command)), delay * BASE_DELAY);
-        skyblocker.scheduler.schedule(() -> player.networkHandler.sendCommand(command), delay * BASE_DELAY);
+    private void sendCommand(String command, int delay) {
+        skyblocker.messageScheduler.queueMessage(command, delay * BASE_DELAY);
     }
 }
diff --git a/src/main/java/me/xmrvizzy/skyblocker/skyblock/quicknav/QuickNavButton.java b/src/main/java/me/xmrvizzy/skyblocker/skyblock/quicknav/QuickNavButton.java
index e31827ab..7269840a 100644
--- a/src/main/java/me/xmrvizzy/skyblocker/skyblock/quicknav/QuickNavButton.java
+++ b/src/main/java/me/xmrvizzy/skyblocker/skyblock/quicknav/QuickNavButton.java
@@ -2,6 +2,7 @@ package me.xmrvizzy.skyblocker.skyblock.quicknav;
 
 import com.mojang.blaze3d.systems.RenderSystem;
 
+import me.xmrvizzy.skyblocker.SkyblockerMod;
 import me.xmrvizzy.skyblocker.mixin.HandledScreenAccessor;
 import net.fabricmc.api.EnvType;
 import net.fabricmc.api.Environment;
@@ -57,7 +58,7 @@ public class QuickNavButton extends ClickableWidget {
     public void onClick(double mouseX, double mouseY) {
         if (!this.toggled) {
             this.toggled = true;
-            CLIENT.player.networkHandler.sendCommand(command.replace("/", ""));
+            SkyblockerMod.getInstance().messageScheduler.sendMessageAfterCooldown(command);
             // TODO : add null check with log error
         }
     }
diff --git a/src/main/java/me/xmrvizzy/skyblocker/utils/MessageScheduler.java b/src/main/java/me/xmrvizzy/skyblocker/utils/MessageScheduler.java
new file mode 100644
index 00000000..85cc963d
--- /dev/null
+++ b/src/main/java/me/xmrvizzy/skyblocker/utils/MessageScheduler.java
@@ -0,0 +1,43 @@
+package me.xmrvizzy.skyblocker.utils;
+
+import net.minecraft.client.MinecraftClient;
+
+/**
+ * A scheduler for sending chat messages or commands. Use the instance in {@link me.xmrvizzy.skyblocker.SkyblockerMod#messageScheduler SkyblockerMod.messageScheduler}. Do not instantiate this class.
+ */
+@SuppressWarnings("deprecation")
+public class MessageScheduler extends Scheduler {
+    private long lastMessage = 0;
+
+    public void sendMessageAfterCooldown(String message) {
+        if (lastMessage + 200 < System.currentTimeMillis()) {
+            sendMessage(message);
+            lastMessage = System.currentTimeMillis();
+        } else {
+            tasks.add(new ScheduledTask(() -> sendMessage(message), 0));
+        }
+    }
+
+    private void sendMessage(String message) {
+        if (MinecraftClient.getInstance().player != null) {
+            MinecraftClient.getInstance().inGameHud.getChatHud().addToMessageHistory(message);
+            if (message.startsWith("/")) {
+                MinecraftClient.getInstance().player.networkHandler.sendCommand(message.substring(1));
+            } else {
+                MinecraftClient.getInstance().player.networkHandler.sendChatMessage(message);
+            }
+        }
+    }
+
+    public void queueMessage(String message, int delay) {
+        tasks.add(new ScheduledTask(() -> sendMessage(message), delay));
+    }
+
+    @Override
+    protected void runTask(Runnable task) {
+        if (lastMessage + 200 < System.currentTimeMillis()) {
+            task.run();
+            lastMessage = System.currentTimeMillis();
+        }
+    }
+}
diff --git a/src/main/java/me/xmrvizzy/skyblocker/utils/Scheduler.java b/src/main/java/me/xmrvizzy/skyblocker/utils/Scheduler.java
index efba4995..09db3f93 100644
--- a/src/main/java/me/xmrvizzy/skyblocker/utils/Scheduler.java
+++ b/src/main/java/me/xmrvizzy/skyblocker/utils/Scheduler.java
@@ -12,7 +12,7 @@ import java.util.PriorityQueue;
 public class Scheduler {
     private static final Logger LOGGER = LoggerFactory.getLogger(Scheduler.class);
     private int currentTick;
-    private final PriorityQueue<ScheduledTask> tasks;
+    protected final PriorityQueue<ScheduledTask> tasks;
 
     /**
      * Do not instantiate this class. Use {@link SkyblockerMod#scheduler} instead.
@@ -52,17 +52,20 @@ public class Scheduler {
         currentTick += 1;
         ScheduledTask task;
         while ((task = tasks.peek()) != null && task.schedule <= currentTick) {
-            tasks.poll();
-            task.run();
+            runTask(tasks.poll());
         }
     }
 
+    protected void runTask(Runnable task){
+        task.run();
+    }
+
     /**
      * A task that runs every period ticks. More specifically, this task reschedules itself to run again after period ticks every time it runs.
      * @param inner the task to run
      * @param period the period in ticks
      */
-    private record CyclicTask(Runnable inner, int period) implements Runnable {
+    protected record CyclicTask(Runnable inner, int period) implements Runnable {
         @Override
         public void run() {
             SkyblockerMod.getInstance().scheduler.schedule(this, period);
@@ -75,7 +78,7 @@ public class Scheduler {
      * @param inner the task to run
      * @param schedule the tick to run at
      */
-    private record ScheduledTask(Runnable inner, int schedule) implements Comparable<ScheduledTask>, Runnable {
+    protected record ScheduledTask(Runnable inner, int schedule) implements Comparable<ScheduledTask>, Runnable {
         @Override
         public int compareTo(ScheduledTask o) {
             return schedule - o.schedule;