Switch tag contains to something that won't crash after registries ar…

…e frozen
SlimeKnights · Apr 9, 2022 · 3e633a8 · 3e633a8
1 parent 27eaee6
commit 3e633a8
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/src/main/java/slimeknights/mantle/recipe/helper/TagPreference.java b/src/main/java/slimeknights/mantle/recipe/helper/TagPreference.java
@@ -1,6 +1,5 @@
 package slimeknights.mantle.recipe.helper;
 
-import net.minecraft.core.Holder;
 import net.minecraft.core.Registry;
 import net.minecraft.resources.ResourceKey;
 import net.minecraft.resources.ResourceLocation;
@@ -51,7 +50,7 @@ private static <T> Optional<T> getUncachedPreference(TagKey<T> tag) {
     }
     // streams have a lovely function to get the minimum element based on a comparator
     // if the tag is empty, stream is empty so returns empty
-    return RegistryHelper.getTagStream(tag).filter(Holder::isBound).map(Holder::value).min(getComparator(registry));
+    return RegistryHelper.getTagValueStream(tag).min(getComparator(registry));
   }
 
   /**

diff --git a/src/main/java/slimeknights/mantle/util/RegistryHelper.java b/src/main/java/slimeknights/mantle/util/RegistryHelper.java
@@ -49,7 +49,11 @@ public static <T> Stream<T> getTagValueStream(TagKey<T> key) {
 
   /** Checks if the given tag contains the given registry object */
   public static <T> boolean contains(Registry<T> registry, TagKey<T> tag, T value) {
-    return registry.createIntrusiveHolder(value).is(tag);
+    int index = registry.getId(value);
+    if (index == Registry.DEFAULT) {
+      return false;
+    }
+    return registry.getHolder(index).filter(holder -> holder.containsTag(tag)).isPresent();
   }
 
   /** Checks if the given tag contains the given registry object */