Use DRM when validating recipes

wisp-forest · Jul 4, 2024 · ef4c4c7 · ef4c4c7
1 parent 9866934
commit ef4c4c7
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 4 deletions.
diff --git a/src/main/java/wraith/alloyforgery/AlloyForgery.java b/src/main/java/wraith/alloyforgery/AlloyForgery.java
@@ -30,6 +30,8 @@
 import wraith.alloyforgery.recipe.*;
 import wraith.alloyforgery.utils.RecipeInjector;
 
+import java.util.HashMap;
+
 public class AlloyForgery implements ModInitializer {
 
     public static final OwoNetChannel CHANNEL = OwoNetChannel.create(id("main"));

diff --git a/src/main/java/wraith/alloyforgery/mixin/DataPackContentsMixin.java b/src/main/java/wraith/alloyforgery/mixin/DataPackContentsMixin.java
@@ -2,6 +2,7 @@
 
 import net.minecraft.recipe.RecipeManager;
 import net.minecraft.registry.DynamicRegistryManager;
+import net.minecraft.registry.ReloadableRegistries;
 import net.minecraft.server.DataPackContents;
 import net.minecraft.util.Identifier;
 import org.spongepowered.asm.mixin.Final;
@@ -16,9 +17,10 @@
 import java.util.HashMap;
 
 @Mixin(DataPackContents.class)
-public class DataPackContentsMixin {
+public abstract class DataPackContentsMixin {
 
     @Shadow @Final private RecipeManager recipeManager;
+    @Shadow @Final private ReloadableRegistries.Lookup reloadableRegistries;
 
     @Inject(method = "refresh", at = @At("TAIL"))
     private void alloy_forgery$onRefresh(CallbackInfo ci) {
@@ -30,6 +32,6 @@ public class DataPackContentsMixin {
             map.put(entry.value(), entry.id());
         }
 
-        AlloyForgeRecipe.PENDING_RECIPES.forEach((recipe, pendingRecipeData) -> recipe.finishRecipe(pendingRecipeData, key -> map.getOrDefault(key, Identifier.of(AlloyForgery.MOD_ID, "unknown_recipe"))));
+        AlloyForgeRecipe.PENDING_RECIPES.forEach((recipe, pendingRecipeData) -> recipe.finishRecipe(this.reloadableRegistries.getRegistryManager(), pendingRecipeData, key -> map.getOrDefault(key, Identifier.of(AlloyForgery.MOD_ID, "unknown_recipe"))));
     }
 }
diff --git a/src/main/java/wraith/alloyforgery/recipe/AlloyForgeRecipe.java b/src/main/java/wraith/alloyforgery/recipe/AlloyForgeRecipe.java
@@ -12,6 +12,7 @@
 import net.minecraft.recipe.*;
 import net.minecraft.registry.DynamicRegistryManager;
 import net.minecraft.registry.Registries;
+import net.minecraft.registry.RegistryKeys;
 import net.minecraft.registry.RegistryWrapper;
 import net.minecraft.registry.tag.TagKey;
 import net.minecraft.util.Identifier;
@@ -73,9 +74,9 @@ public Optional<Identifier> secondaryID() {
         return this.secondaryID;
     }
 
-    public void finishRecipe(PendingRecipeData pendingData, Function<AlloyForgeRecipe, Identifier> lookup) {
+    public void finishRecipe(DynamicRegistryManager drm, PendingRecipeData pendingData, Function<AlloyForgeRecipe, Identifier> lookup) {
         if (pendingData.defaultTag() != null) {
-            final var itemEntryList = Registries.ITEM.getEntryList(pendingData.defaultTag().getLeft());
+            final var itemEntryList = drm.get(RegistryKeys.ITEM).getEntryList(pendingData.defaultTag().getLeft());
 
             itemEntryList.ifPresentOrElse(registryEntries -> {
                 this.output = registryEntries.get(0).value().getDefaultStack();