From 6b9ed6855b34c57e8c5a557c640172ed341e6c26 Mon Sep 17 00:00:00 2001
From: Kevin <92656833+kevinthegreat1@users.noreply.github.com>
Date: Thu, 7 Dec 2023 20:53:33 -0500
Subject: Update Exeriment Solvers for 1.20.3/1.20.4 (#437)

---
 .../skyblock/experiment/SuperpairsSolver.java      | 24 +++++++++++++---------
 .../skyblock/experiment/UltrasequencerSolver.java  |  1 +
 2 files changed, 15 insertions(+), 10 deletions(-)

(limited to 'src/main/java/de/hysky/skyblocker/skyblock')

diff --git a/src/main/java/de/hysky/skyblocker/skyblock/experiment/SuperpairsSolver.java b/src/main/java/de/hysky/skyblocker/skyblock/experiment/SuperpairsSolver.java
index c00249fe..c34abca1 100644
--- a/src/main/java/de/hysky/skyblocker/skyblock/experiment/SuperpairsSolver.java
+++ b/src/main/java/de/hysky/skyblocker/skyblock/experiment/SuperpairsSolver.java
@@ -37,19 +37,23 @@ public class SuperpairsSolver extends ExperimentSolver {
         setState(State.SHOW);
     }
 
+    @Override
+    protected void reset() {
+        super.reset();
+        superpairsPrevClickedSlot = 0;
+        superpairsCurrentSlot = null;
+        superpairsDuplicatedSlots.clear();
+    }
+
     @Override
     protected void tick(Screen screen) {
         if (isEnabled() && screen instanceof GenericContainerScreen genericContainerScreen && genericContainerScreen.getTitle().getString().startsWith("Superpairs (")) {
-            if (getState() == State.SHOW) {
-                if (genericContainerScreen.getScreenHandler().getInventory().getStack(4).isOf(Items.CAULDRON)) {
-                    reset();
-                } else if (getSlots().get(superpairsPrevClickedSlot) == null) {
-                    ItemStack itemStack = genericContainerScreen.getScreenHandler().getInventory().getStack(superpairsPrevClickedSlot);
-                    if (!(itemStack.isOf(Items.CYAN_STAINED_GLASS) || itemStack.isOf(Items.BLACK_STAINED_GLASS_PANE) || itemStack.isOf(Items.AIR))) {
-                        getSlots().entrySet().stream().filter((entry -> ItemStack.areEqual(entry.getValue(), itemStack))).findAny().ifPresent(entry -> superpairsDuplicatedSlots.add(entry.getKey()));
-                        getSlots().put(superpairsPrevClickedSlot, itemStack);
-                        superpairsCurrentSlot = itemStack;
-                    }
+            if (getState() == State.SHOW && getSlots().get(superpairsPrevClickedSlot) == null) {
+                ItemStack itemStack = genericContainerScreen.getScreenHandler().getInventory().getStack(superpairsPrevClickedSlot);
+                if (!(itemStack.isOf(Items.CYAN_STAINED_GLASS) || itemStack.isOf(Items.BLACK_STAINED_GLASS_PANE) || itemStack.isOf(Items.AIR))) {
+                    getSlots().entrySet().stream().filter((entry -> ItemStack.areEqual(entry.getValue(), itemStack))).findAny().ifPresent(entry -> superpairsDuplicatedSlots.add(entry.getKey()));
+                    getSlots().put(superpairsPrevClickedSlot, itemStack);
+                    superpairsCurrentSlot = itemStack;
                 }
             }
         } else {
diff --git a/src/main/java/de/hysky/skyblocker/skyblock/experiment/UltrasequencerSolver.java b/src/main/java/de/hysky/skyblocker/skyblock/experiment/UltrasequencerSolver.java
index 1fcb976b..746235b7 100644
--- a/src/main/java/de/hysky/skyblocker/skyblock/experiment/UltrasequencerSolver.java
+++ b/src/main/java/de/hysky/skyblocker/skyblock/experiment/UltrasequencerSolver.java
@@ -54,6 +54,7 @@ public class UltrasequencerSolver extends ExperimentSolver {
                 case WAIT -> {
                     if (genericContainerScreen.getScreenHandler().getInventory().getStack(49).getName().getString().startsWith("Timer: ")) {
                         setState(State.SHOW);
+                        markHighlightsDirty();
                     }
                 }
                 case END -> {
-- 
cgit