From 14d4abe61f1344f29a9eebb73d6a3d7004dfc2d5 Mon Sep 17 00:00:00 2001
From: Kevinthegreat <92656833+kevinthegreat1@users.noreply.github.com>
Date: Mon, 22 Jul 2024 15:46:14 +0800
Subject: Code review part 1

---
 .../java/de/hysky/skyblocker/utils/container/ContainerMatcher.java   | 5 ++++-
 .../java/de/hysky/skyblocker/utils/container/ContainerSolver.java    | 4 +++-
 .../java/de/hysky/skyblocker/utils/render/gui/ContainerSolver.java   | 0
 .../de/hysky/skyblocker/utils/render/gui/ContainerSolverManager.java | 0
 4 files changed, 7 insertions(+), 2 deletions(-)
 delete mode 100644 src/main/java/de/hysky/skyblocker/utils/render/gui/ContainerSolver.java
 delete mode 100644 src/main/java/de/hysky/skyblocker/utils/render/gui/ContainerSolverManager.java

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

diff --git a/src/main/java/de/hysky/skyblocker/utils/container/ContainerMatcher.java b/src/main/java/de/hysky/skyblocker/utils/container/ContainerMatcher.java
index 61d3821e..159f399e 100644
--- a/src/main/java/de/hysky/skyblocker/utils/container/ContainerMatcher.java
+++ b/src/main/java/de/hysky/skyblocker/utils/container/ContainerMatcher.java
@@ -3,11 +3,14 @@ package de.hysky.skyblocker.utils.container;
 import net.minecraft.client.gui.screen.Screen;
 import org.jetbrains.annotations.NotNull;
 
-public interface ContainerMatcher {
+import java.util.function.Predicate;
+
+public interface ContainerMatcher extends Predicate<Screen> {
     /**
      * Tests if the given screen should be handled by this matcher.
      * @return {@code true} if this matcher should apply to the given screen, {@code false} otherwise
      */
+    @Override
     boolean test(@NotNull Screen screen);
 
     /**
diff --git a/src/main/java/de/hysky/skyblocker/utils/container/ContainerSolver.java b/src/main/java/de/hysky/skyblocker/utils/container/ContainerSolver.java
index f3cb400e..c6162049 100644
--- a/src/main/java/de/hysky/skyblocker/utils/container/ContainerSolver.java
+++ b/src/main/java/de/hysky/skyblocker/utils/container/ContainerSolver.java
@@ -1,6 +1,7 @@
 package de.hysky.skyblocker.utils.container;
 
 import de.hysky.skyblocker.SkyblockerMod;
+import de.hysky.skyblocker.utils.Resettable;
 import de.hysky.skyblocker.utils.render.gui.ColorHighlight;
 import it.unimi.dsi.fastutil.ints.Int2ObjectMap;
 import net.minecraft.client.gui.screen.ingame.GenericContainerScreen;
@@ -8,11 +9,12 @@ import net.minecraft.item.ItemStack;
 
 import java.util.List;
 
-public interface ContainerSolver extends ContainerMatcher {
+public interface ContainerSolver extends ContainerMatcher, Resettable {
 	List<ColorHighlight> getColors(Int2ObjectMap<ItemStack> slots);
 
 	default void start(GenericContainerScreen screen) {}
 
+	@Override
 	default void reset() {}
 
 	default boolean onClickSlot(int slot, ItemStack stack, int screenId) {
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
deleted file mode 100644
index e69de29b..00000000
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
deleted file mode 100644
index e69de29b..00000000
-- 
cgit