chore: update ItemFilterAdapter to take registry access params

Author: desht

common/src/main/java/dev/ftb/mods/ftbquests/api/ItemFilterAdapter.java

@@ -1,5 +1,6 @@
 package dev.ftb.mods.ftbquests.api;
 
+import net.minecraft.core.HolderLookup;
 import net.minecraft.tags.TagKey;
 import net.minecraft.world.item.Item;
 import net.minecraft.world.item.ItemStack;
@@ -35,7 +36,7 @@ public interface ItemFilterAdapter {
      * @param toCheck the itemstack to check
      * @return true if the first item is a filter stack AND the second item is matched by it
      */
-    boolean doesItemMatch(ItemStack filterStack, ItemStack toCheck);
+    boolean doesItemMatch(ItemStack filterStack, ItemStack toCheck, HolderLookup.Provider registryAccess);
 
     /**
      * Retrieve the actual item matcher from this filter implementation, which is basically a predicate that can
@@ -45,7 +46,7 @@ public interface ItemFilterAdapter {
      * @param filterStack the filter item (note: the filter, not the item to be tested!)
      * @return a matcher object
      */
-    Matcher getMatcher(ItemStack filterStack);
+    Matcher getMatcher(ItemStack filterStack,  HolderLookup.Provider registryAccess);
 
     /**
      * Does this filter mod provide a way to filter items by item tag?

common/src/main/java/dev/ftb/mods/ftbquests/integration/item_filtering/DisplayStacksCache.java

@@ -6,6 +6,7 @@
 import dev.ftb.mods.ftbquests.api.event.CustomFilterDisplayItemsEvent;
 import dev.ftb.mods.ftbquests.client.FTBQuestsClient;
 import it.unimi.dsi.fastutil.ints.Int2ObjectLinkedOpenHashMap;
+import net.minecraft.core.HolderLookup;
 import net.minecraft.world.item.CreativeModeTabs;
 import net.minecraft.world.item.ItemStack;
 import org.jetbrains.annotations.NotNull;
@@ -18,12 +19,12 @@ public class DisplayStacksCache {
     private static List<ItemStack> extraCache = null;
 
     @NotNull
-    public static List<ItemStack> getCachedDisplayStacks(ItemStack filterStack, ItemFilterAdapter adapter) {
+    public static List<ItemStack> getCachedDisplayStacks(ItemStack filterStack, ItemFilterAdapter adapter, HolderLookup.Provider registryAccess) {
         int key = ItemStack.hashItemAndComponents(filterStack);
 
         List<ItemStack> result = cache.getAndMoveToFirst(key);
         if (result == null) {
-            result = computeMatchingStacks(adapter.getMatcher(filterStack));
+            result = computeMatchingStacks(adapter.getMatcher(filterStack, registryAccess));
             cache.put(key, result);
             if (cache.size() >= MAX_CACHE_SIZE) {
                 cache.removeLast();

common/src/main/java/dev/ftb/mods/ftbquests/integration/item_filtering/ItemMatchingSystem.java

@@ -2,6 +2,7 @@
 
 import dev.ftb.mods.ftblibrary.config.NameMap;
 import dev.ftb.mods.ftbquests.api.ItemFilterAdapter;
+import net.minecraft.core.HolderLookup;
 import net.minecraft.core.component.DataComponentMap;
 import net.minecraft.world.item.ItemStack;
 
@@ -25,18 +26,18 @@ public Optional<ItemFilterAdapter> getFilterAdapter(ItemStack stack) {
         return adapters.stream().filter(adapter -> adapter.isFilterStack(stack)).findFirst();
     }
 
-    public boolean doesItemMatch(ItemStack filterStack, ItemStack toCheck, ComponentMatchType matchType) {
+    public boolean doesItemMatch(ItemStack filterStack, ItemStack toCheck, ComponentMatchType matchType, HolderLookup.Provider registryAccess) {
         return getFilterAdapter(filterStack)
-                .map(adapter -> adapter.doesItemMatch(filterStack, toCheck))
+                .map(adapter -> adapter.doesItemMatch(filterStack, toCheck, registryAccess))
                 .orElse(areItemStacksEqual(filterStack, toCheck,  matchType));
     }
 
-    public List<ItemStack> getAllMatchingStacks(ItemStack filterStack) {
+    public List<ItemStack> getAllMatchingStacks(ItemStack filterStack, HolderLookup.Provider registryAccess) {
         List<ItemStack> res = new ArrayList<>();
 
         adapters.forEach(adapter -> {
             if (adapter.isFilterStack(filterStack)) {
-                res.addAll(DisplayStacksCache.getCachedDisplayStacks(filterStack, adapter));
+                res.addAll(DisplayStacksCache.getCachedDisplayStacks(filterStack, adapter, registryAccess));
             }
         });
 

common/src/main/java/dev/ftb/mods/ftbquests/quest/task/ItemTask.java

@@ -147,7 +147,7 @@ public void readNetData(RegistryFriendlyByteBuf buffer) {
 	}
 
 	public List<ItemStack> getValidDisplayItems() {
-		return ItemMatchingSystem.INSTANCE.getAllMatchingStacks(itemStack);
+		return ItemMatchingSystem.INSTANCE.getAllMatchingStacks(itemStack, getQuestFile().holderLookup());
 	}
 
 	@Override
@@ -188,7 +188,7 @@ public boolean test(ItemStack stack) {
 			return true;
 		}
 
-		return ItemMatchingSystem.INSTANCE.doesItemMatch(itemStack, stack, matchComponents);
+		return ItemMatchingSystem.INSTANCE.doesItemMatch(itemStack, stack, matchComponents, getQuestFile().holderLookup());
 	}
 
 	@Override

gradle.properties

@@ -9,7 +9,7 @@ maven_group=dev.ftb.mods
 mod_author=FTB Team
 
 # Build time
-mod_version=2101.1.20
+mod_version=2101.1.21
 minecraft_version=1.21.1
 
 # Cross env