Merge remote-tracking branch 'origin/7.x-1.18' into 7.x-1.18.2

# Conflicts:
#	runtime/src/main/java/me/shedaniel/rei/impl/client/search/argument/type/TagArgumentType.java

2 files changed, 11 insertions, 1 deletions

diff --git a/api/src/main/java/me/shedaniel/rei/api/client/registry/entry/EntryRegistry.java b/api/src/main/java/me/shedaniel/rei/api/client/registry/entry/EntryRegistry.java
index 8c4c9e4b3..6ff3af865 100644
--- a/api/src/main/java/me/shedaniel/rei/api/client/registry/entry/EntryRegistry.java
+++ b/api/src/main/java/me/shedaniel/rei/api/client/registry/entry/EntryRegistry.java
@@ -153,7 +153,7 @@ public interface EntryRegistry extends Reloadable<REIClientPlugin> {
     
     // TODO Re-evaluate the need for this
     @ApiStatus.Internal
-    Collection<EntryStack<?>> refilterNew(Collection<EntryStack<?>> entries);
+    Collection<EntryStack<?>> refilterNew(boolean warn, Collection<EntryStack<?>> entries);
     
     /**
      * Checks if a stack is already registered.
diff --git a/api/src/main/java/me/shedaniel/rei/api/client/search/SearchFilter.java b/api/src/main/java/me/shedaniel/rei/api/client/search/SearchFilter.java
index 2038b7cdb..80b4987df 100644
--- a/api/src/main/java/me/shedaniel/rei/api/client/search/SearchFilter.java
+++ b/api/src/main/java/me/shedaniel/rei/api/client/search/SearchFilter.java
@@ -27,6 +27,7 @@ import me.shedaniel.rei.api.common.entry.EntryStack;
 import net.fabricmc.api.EnvType;
 import net.fabricmc.api.Environment;
 
+import java.util.Collection;
 import java.util.function.Predicate;
 
 /**
@@ -70,4 +71,13 @@ public interface SearchFilter extends Predicate<EntryStack<?>> {
      * @return the original filter
      */
     String getFilter();
+    
+    /**
+     * Prepares the following stacks for matching, this could help to speed up the matching process.<br>
+     * However, this is not required.
+     *
+     * @param stacks the stacks to prepare
+     */
+    default void prepareFilter(Collection<EntryStack<?>> stacks) {
+    }
 }