Merge pull request #710 from AzureAaron/block-incorrect-term-clicks

Block Incorrect Terminal Clicks

2 files changed, 13 insertions, 5 deletions

diff --git a/src/main/java/de/hysky/skyblocker/utils/render/gui/ContainerSolver.java b/src/main/java/de/hysky/skyblocker/utils/render/gui/ContainerSolver.java
index e2e057b3..0417dc3c 100644
--- a/src/main/java/de/hysky/skyblocker/utils/render/gui/ContainerSolver.java
+++ b/src/main/java/de/hysky/skyblocker/utils/render/gui/ContainerSolver.java
@@ -20,7 +20,7 @@ public abstract class ContainerSolver {
 
     protected abstract boolean isEnabled();
 
-    public Pattern getName() {
+    public final Pattern getName() {
         return containerName;
     }
 
@@ -34,12 +34,13 @@ public abstract class ContainerSolver {
         SkyblockerMod.getInstance().containerSolverManager.markDirty();
     }
 
-    protected void onClickSlot(int slot, ItemStack stack, int screenId, String[] groups) {
+    protected boolean onClickSlot(int slot, ItemStack stack, int screenId, String[] groups) {
+        return false;
     }
 
     protected abstract List<ColorHighlight> getColors(String[] groups, Int2ObjectMap<ItemStack> slots);
 
-    protected void trimEdges(Int2ObjectMap<ItemStack> slots, int rows) {
+    protected final void trimEdges(Int2ObjectMap<ItemStack> slots, int rows) {
         for (int i = 0; i < rows; i++) {
             slots.remove(9 * i);
             slots.remove(9 * i + 8);
diff --git a/src/main/java/de/hysky/skyblocker/utils/render/gui/ContainerSolverManager.java b/src/main/java/de/hysky/skyblocker/utils/render/gui/ContainerSolverManager.java
index b37c57a4..08fb6a86 100644
--- a/src/main/java/de/hysky/skyblocker/utils/render/gui/ContainerSolverManager.java
+++ b/src/main/java/de/hysky/skyblocker/utils/render/gui/ContainerSolverManager.java
@@ -8,6 +8,7 @@ import de.hysky.skyblocker.skyblock.accessories.newyearcakes.NewYearCakesHelper;
 import de.hysky.skyblocker.skyblock.dungeon.CroesusHelper;
 import de.hysky.skyblocker.skyblock.dungeon.CroesusProfit;
 import de.hysky.skyblocker.skyblock.dungeon.terminal.ColorTerminal;
+import de.hysky.skyblocker.skyblock.dungeon.terminal.LightsOnTerminal;
 import de.hysky.skyblocker.skyblock.dungeon.terminal.OrderTerminal;
 import de.hysky.skyblocker.skyblock.dungeon.terminal.StartsWithTerminal;
 import de.hysky.skyblocker.skyblock.experiment.ChronomatronSolver;
@@ -47,6 +48,7 @@ public class ContainerSolverManager {
                 new ColorTerminal(),
                 new OrderTerminal(),
                 new StartsWithTerminal(),
+                new LightsOnTerminal(),
                 new CroesusHelper(),
                 new CroesusProfit(),
                 new ChronomatronSolver(),
@@ -114,10 +116,15 @@ public class ContainerSolverManager {
         highlights = null;
     }
 
-    public void onSlotClick(int slot, ItemStack stack) {
+    /**
+     * @return Whether the click should be disallowed.
+     */
+    public boolean onSlotClick(int slot, ItemStack stack) {
         if (currentSolver != null) {
-            currentSolver.onClickSlot(slot, stack, screenId, groups);
+            return currentSolver.onClickSlot(slot, stack, screenId, groups);
         }
+
+        return false;
     }
 
     public void onDraw(DrawContext context, List<Slot> slots) {