Merge pull request #728 from Emirlol/bazaar-highlight

Bazaar Helper

4 files changed, 43 insertions, 15 deletions

diff --git a/src/main/java/de/hysky/skyblocker/utils/ItemUtils.java b/src/main/java/de/hysky/skyblocker/utils/ItemUtils.java
index e43ce783..65807886 100644
--- a/src/main/java/de/hysky/skyblocker/utils/ItemUtils.java
+++ b/src/main/java/de/hysky/skyblocker/utils/ItemUtils.java
@@ -43,7 +43,7 @@ import java.util.regex.Pattern;
 
 import static net.fabricmc.fabric.api.client.command.v2.ClientCommandManager.literal;
 
-public class ItemUtils {
+public final class ItemUtils {
     public static final String ID = "id";
     public static final String UUID = "uuid";
     public static final Pattern NOT_DURABILITY = Pattern.compile("[^0-9 /]");
@@ -55,6 +55,8 @@ public class ItemUtils {
             ComponentChanges.CODEC.optionalFieldOf("components", ComponentChanges.EMPTY).forGetter(ItemStack::getComponentChanges)
     ).apply(instance, ItemStack::new)));
 
+    private ItemUtils() {}
+
     public static LiteralArgumentBuilder<FabricClientCommandSource> dumpHeldItemCommand() {
         return literal("dumpHeldItem").executes(context -> {
             context.getSource().sendFeedback(Text.literal("[Skyblocker Debug] Held Item: " + SkyblockerMod.GSON_COMPACT.toJson(ItemStack.CODEC.encodeStart(JsonOps.INSTANCE, context.getSource().getPlayer().getMainHandStack()).getOrThrow())));
@@ -198,9 +200,13 @@ public class ItemUtils {
         return null;
     }
 
+    /**
+     * Gets the first line of the lore that matches the specified predicate.
+     * @return The first line of the lore that matches the predicate, or {@code null} if no line matches.
+     */
     @Nullable
-    public static String getLoreLineIf(ItemStack item, Predicate<String> predicate) {
-        for (Text line : getLore(item)) {
+    public static String getLoreLineIf(ItemStack stack, Predicate<String> predicate) {
+        for (Text line : getLore(stack)) {
             String string = line.getString();
             if (predicate.test(string)) {
                 return string;
@@ -210,21 +216,40 @@ public class ItemUtils {
         return null;
     }
 
+    /**
+     * Gets the first line of the lore that matches the specified pattern, using {@link Matcher#matches()}.
+     * @return A matcher that contains match results if the pattern was found in the lore, otherwise {@code null}.
+     */
     @Nullable
-    public static Matcher getLoreLineIfMatch(ItemStack item, Pattern pattern) {
-        for (Text line : getLore(item)) {
-            String string = line.getString();
-            Matcher matcher = pattern.matcher(string);
-            if (matcher.matches()) {
+    public static Matcher getLoreLineIfMatch(ItemStack stack, Pattern pattern) {
+        Matcher matcher = pattern.matcher("");
+        for (Text line : getLore(stack)) {
+            if (matcher.reset(line.getString()).matches()) {
                 return matcher;
             }
         }
-
         return null;
     }
 
-    public static @NotNull List<Text> getLore(ItemStack item) {
-        return item.getOrDefault(DataComponentTypes.LORE, LoreComponent.DEFAULT).styledLines();
+	/**
+	 * Gets the first line of the lore that matches the specified pattern, using {@link Matcher#find()}.
+	 * @param pattern the pattern to search for
+	 * @param stack the stack to search the lore of
+	 * @return A {@link Matcher matcher} that contains match results if the pattern was found in the lore, otherwise {@code null}.
+	 */
+	@Nullable
+	public static Matcher getLoreLineIfContainsMatch(ItemStack stack, Pattern pattern) {
+		Matcher matcher = pattern.matcher("");
+		for (Text line : getLore(stack)) {
+			if (matcher.reset(line.getString()).find()) {
+				return matcher;
+			}
+		}
+		return null;
+	}
+
+    public static @NotNull List<Text> getLore(ItemStack stack) {
+        return stack.getOrDefault(DataComponentTypes.LORE, LoreComponent.DEFAULT).styledLines();
     }
 
     public static @NotNull PropertyMap propertyMapWithTexture(String textureValue) {
diff --git a/src/main/java/de/hysky/skyblocker/utils/chat/ChatPatternListener.java b/src/main/java/de/hysky/skyblocker/utils/chat/ChatPatternListener.java
index 708af280..e701e24c 100644
--- a/src/main/java/de/hysky/skyblocker/utils/chat/ChatPatternListener.java
+++ b/src/main/java/de/hysky/skyblocker/utils/chat/ChatPatternListener.java
@@ -1,6 +1,7 @@
 package de.hysky.skyblocker.utils.chat;
 
 import net.minecraft.text.Text;
+import org.intellij.lang.annotations.Language;
 
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
@@ -9,7 +10,7 @@ public abstract class ChatPatternListener implements ChatMessageListener {
     protected static final String NUMBER = "-?[0-9]{1,3}(?>,[0-9]{3})*(?:\\.[1-9])?";
     public final Pattern pattern;
 
-    public ChatPatternListener(String pattern) {
+    protected ChatPatternListener(@Language("RegExp") String pattern) {
         this.pattern = Pattern.compile(pattern);
     }
 
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 81c9ebec..9a9d0907 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
@@ -4,6 +4,7 @@ import de.hysky.skyblocker.SkyblockerMod;
 import it.unimi.dsi.fastutil.ints.Int2ObjectMap;
 import net.minecraft.client.gui.screen.ingame.GenericContainerScreen;
 import net.minecraft.item.ItemStack;
+import org.intellij.lang.annotations.Language;
 
 import java.util.List;
 import java.util.regex.Pattern;
@@ -12,7 +13,7 @@ import java.util.regex.Pattern;
  * Abstract class for gui solvers. Extend this class to add a new gui solver, like terminal solvers or experiment solvers.
  */
 public abstract class ContainerSolver extends AbstractContainerMatcher {
-    protected ContainerSolver(String titlePattern) {
+    protected ContainerSolver(@Language("RegExp") String titlePattern) {
         super(titlePattern);
     }
 
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 9a1e3072..79cc78f5 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
@@ -1,10 +1,10 @@
 package de.hysky.skyblocker.utils.render.gui;
 
 import com.mojang.blaze3d.systems.RenderSystem;
-
 import de.hysky.skyblocker.mixins.accessors.HandledScreenAccessor;
 import de.hysky.skyblocker.skyblock.accessories.newyearcakes.NewYearCakeBagHelper;
 import de.hysky.skyblocker.skyblock.accessories.newyearcakes.NewYearCakesHelper;
+import de.hysky.skyblocker.skyblock.bazaar.ReorderHelper;
 import de.hysky.skyblocker.skyblock.chocolatefactory.ChocolateFactorySolver;
 import de.hysky.skyblocker.skyblock.dungeon.CroesusHelper;
 import de.hysky.skyblocker.skyblock.dungeon.CroesusProfit;
@@ -59,7 +59,8 @@ public class ContainerSolverManager {
                 UltrasequencerSolver.INSTANCE,
                 new NewYearCakeBagHelper(),
                 NewYearCakesHelper.INSTANCE,
-                new ChocolateFactorySolver()
+                new ChocolateFactorySolver(),
+                new ReorderHelper()
         };
     }