Merge pull request #788 from Emirlol/container-matcher-refactor

Refactor container matcher implementations into interfaces

1 files changed, 8 insertions, 8 deletions

diff --git a/src/main/java/de/hysky/skyblocker/skyblock/experiment/ExperimentSolver.java b/src/main/java/de/hysky/skyblocker/skyblock/experiment/ExperimentSolver.java
index ad2800e0..8d9b8311 100644
--- a/src/main/java/de/hysky/skyblocker/skyblock/experiment/ExperimentSolver.java
+++ b/src/main/java/de/hysky/skyblocker/skyblock/experiment/ExperimentSolver.java
@@ -2,16 +2,18 @@ package de.hysky.skyblocker.skyblock.experiment;
 
 import de.hysky.skyblocker.config.SkyblockerConfigManager;
 import de.hysky.skyblocker.config.configs.HelperConfig;
-import de.hysky.skyblocker.utils.render.gui.ContainerSolver;
+import de.hysky.skyblocker.utils.container.SimpleContainerSolver;
 import net.fabricmc.fabric.api.client.screen.v1.ScreenEvents;
 import net.minecraft.client.gui.screen.Screen;
 import net.minecraft.client.gui.screen.ingame.GenericContainerScreen;
 import net.minecraft.item.ItemStack;
+import org.intellij.lang.annotations.Language;
+import org.jetbrains.annotations.NotNull;
 
 import java.util.HashMap;
 import java.util.Map;
 
-public sealed abstract class ExperimentSolver extends ContainerSolver permits ChronomatronSolver, SuperpairsSolver, UltrasequencerSolver {
+public abstract sealed class ExperimentSolver extends SimpleContainerSolver permits ChronomatronSolver, SuperpairsSolver, UltrasequencerSolver {
     public enum State {
         REMEMBER, WAIT, SHOW, END
     }
@@ -19,7 +21,7 @@ public sealed abstract class ExperimentSolver extends ContainerSolver permits Ch
     private State state = State.REMEMBER;
     private final Map<Integer, ItemStack> slots = new HashMap<>();
 
-    protected ExperimentSolver(String containerName) {
+    protected ExperimentSolver(@NotNull @Language("RegExp") String containerName) {
         super(containerName);
     }
 
@@ -36,22 +38,20 @@ public sealed abstract class ExperimentSolver extends ContainerSolver permits Ch
     }
 
     @Override
-    protected final boolean isEnabled() {
+    public final boolean isEnabled() {
         return isEnabled(SkyblockerConfigManager.get().helpers.experiments);
     }
 
     protected abstract boolean isEnabled(HelperConfig.Experiments experimentsConfig);
 
     @Override
-    protected void start(GenericContainerScreen screen) {
-        super.start(screen);
+    public void start(GenericContainerScreen screen) {
         state = State.REMEMBER;
         ScreenEvents.afterTick(screen).register(this::tick);
     }
 
     @Override
-    protected void reset() {
-        super.reset();
+    public void reset() {
         state = State.REMEMBER;
         slots.clear();
     }