add registry access to datagen recipes

Author: thiakil

src/datagen/additions/java/mekanism/additions/common/recipe/AdditionsRecipeProvider.java

@@ -60,7 +60,7 @@ public AdditionsRecipeProvider(PackOutput output, CompletableFuture<HolderLookup
     }
 
     @Override
-    protected void addRecipes(RecipeOutput consumer) {
+    protected void addRecipes(RecipeOutput consumer, HolderLookup.Provider registries) {
         ExtendedShapedRecipeBuilder.shapedRecipe(AdditionsItems.WALKIE_TALKIE)
               .pattern(RecipePattern.createPattern(
                     TripleLine.of(Pattern.EMPTY, Pattern.EMPTY, Pattern.OSMIUM),

src/datagen/additions/java/mekanism/additions/common/recipe/PigmentExtractingPlasticRecipeProvider.java

@@ -11,6 +11,7 @@
 import mekanism.common.recipe.ISubRecipeProvider;
 import mekanism.common.recipe.impl.PigmentExtractingRecipeProvider;
 import mekanism.common.registries.MekanismPigments;
+import net.minecraft.core.HolderLookup;
 import net.minecraft.data.recipes.RecipeOutput;
 
 public class PigmentExtractingPlasticRecipeProvider implements ISubRecipeProvider {
@@ -29,7 +30,7 @@ public class PigmentExtractingPlasticRecipeProvider implements ISubRecipeProvide
     private static final long TRANSPARENT_PLASTIC_SLAB_RATE = TRANSPARENT_PLASTIC_BLOCK_RATE / 2;//21
 
     @Override
-    public void addRecipes(RecipeOutput consumer) {
+    public void addRecipes(RecipeOutput consumer, HolderLookup.Provider registries) {
         String basePath = "pigment_extracting/plastic/";
         for (Map.Entry<EnumColor, IPigmentProvider> entry : MekanismPigments.PIGMENT_COLOR_LOOKUP.entrySet()) {
             EnumColor color = entry.getKey();

src/datagen/additions/java/mekanism/additions/common/recipe/PlasticBlockRecipeProvider.java

@@ -27,6 +27,7 @@
 import mekanism.common.resource.PrimaryResource;
 import mekanism.common.resource.ResourceType;
 import mekanism.common.tags.MekanismTags;
+import net.minecraft.core.HolderLookup;
 import net.minecraft.data.recipes.RecipeCategory;
 import net.minecraft.data.recipes.RecipeOutput;
 import net.minecraft.tags.TagKey;
@@ -60,7 +61,7 @@ public class PlasticBlockRecipeProvider implements ISubRecipeProvider {
           TripleLine.of(Pattern.EMPTY, Pattern.CONSTANT, Pattern.EMPTY));
 
     @Override
-    public void addRecipes(RecipeOutput consumer) {
+    public void addRecipes(RecipeOutput consumer, HolderLookup.Provider registries) {
         String basePath = "plastic/";
         registerPlasticBlocks(consumer, basePath);
         registerPlasticGlow(consumer, basePath);

src/datagen/additions/java/mekanism/additions/common/recipe/PlasticFencesRecipeProvider.java

@@ -16,6 +16,7 @@
 import mekanism.common.recipe.pattern.RecipePattern.TripleLine;
 import mekanism.common.registration.impl.BlockRegistryObject;
 import mekanism.common.tags.MekanismTags;
+import net.minecraft.core.HolderLookup;
 import net.minecraft.data.recipes.RecipeCategory;
 import net.minecraft.data.recipes.RecipeOutput;
 
@@ -29,7 +30,7 @@ public class PlasticFencesRecipeProvider implements ISubRecipeProvider {
           TripleLine.of(AdditionsRecipeProvider.PLASTIC_ROD_CHAR, Pattern.CONSTANT, AdditionsRecipeProvider.PLASTIC_ROD_CHAR));
 
     @Override
-    public void addRecipes(RecipeOutput consumer) {
+    public void addRecipes(RecipeOutput consumer, HolderLookup.Provider registries) {
         String basePath = "plastic/";
         registerPlasticFences(consumer, basePath);
         registerPlasticFenceGates(consumer, basePath);

src/datagen/additions/java/mekanism/additions/common/recipe/PlasticSlabsRecipeProvider.java

@@ -11,6 +11,7 @@
 import mekanism.common.recipe.pattern.Pattern;
 import mekanism.common.recipe.pattern.RecipePattern;
 import mekanism.common.recipe.pattern.RecipePattern.TripleLine;
+import net.minecraft.core.HolderLookup;
 import net.minecraft.data.recipes.RecipeCategory;
 import net.minecraft.data.recipes.RecipeOutput;
 import net.minecraft.tags.TagKey;
@@ -22,7 +23,7 @@ public class PlasticSlabsRecipeProvider implements ISubRecipeProvider {
     private static final RecipePattern PLASTIC_RECOMBINATION = RecipePattern.createPattern(Pattern.CONSTANT, Pattern.CONSTANT);
 
     @Override
-    public void addRecipes(RecipeOutput consumer) {
+    public void addRecipes(RecipeOutput consumer, HolderLookup.Provider registries) {
         String basePath = "plastic/slab/";
         registerPlasticSlabs(consumer, AdditionsBlocks.PLASTIC_SLABS, AdditionsBlocks.PLASTIC_BLOCKS, AdditionsTags.Items.SLABS_PLASTIC, false, basePath);
         registerPlasticSlabs(consumer, AdditionsBlocks.TRANSPARENT_PLASTIC_SLABS, AdditionsBlocks.TRANSPARENT_PLASTIC_BLOCKS,

src/datagen/additions/java/mekanism/additions/common/recipe/PlasticStairsRecipeProvider.java

@@ -11,6 +11,7 @@
 import mekanism.common.recipe.pattern.Pattern;
 import mekanism.common.recipe.pattern.RecipePattern;
 import mekanism.common.recipe.pattern.RecipePattern.TripleLine;
+import net.minecraft.core.HolderLookup;
 import net.minecraft.data.recipes.RecipeCategory;
 import net.minecraft.data.recipes.RecipeOutput;
 import net.minecraft.tags.TagKey;
@@ -24,7 +25,7 @@ public class PlasticStairsRecipeProvider implements ISubRecipeProvider {
           TripleLine.of(Pattern.CONSTANT, Pattern.CONSTANT, Pattern.CONSTANT));
 
     @Override
-    public void addRecipes(RecipeOutput consumer) {
+    public void addRecipes(RecipeOutput consumer, HolderLookup.Provider registries) {
         String basePath = "plastic/stairs/";
         registerPlasticStairs(consumer, AdditionsBlocks.PLASTIC_STAIRS, AdditionsBlocks.PLASTIC_BLOCKS, AdditionsTags.Items.STAIRS_PLASTIC, false, basePath);
         registerPlasticStairs(consumer, AdditionsBlocks.TRANSPARENT_PLASTIC_STAIRS, AdditionsBlocks.TRANSPARENT_PLASTIC_BLOCKS,

src/datagen/defense/java/mekanism/defense/common/DefenseRecipeProvider.java

@@ -16,6 +16,6 @@ public DefenseRecipeProvider(PackOutput output, CompletableFuture<HolderLookup.P
     }
 
     @Override
-    protected void addRecipes(RecipeOutput consumer) {
+    protected void addRecipes(RecipeOutput consumer, HolderLookup.Provider registries) {
     }
 }

src/datagen/generators/java/mekanism/generators/common/GeneratorsRecipeProvider.java

@@ -56,7 +56,7 @@ public GeneratorsRecipeProvider(PackOutput output, CompletableFuture<HolderLooku
     }
 
     @Override
-    protected void addRecipes(RecipeOutput consumer) {
+    protected void addRecipes(RecipeOutput consumer, HolderLookup.Provider registries) {
         addGeneratorRecipes(consumer);
         addFissionReactorRecipes(consumer);
         addFusionReactorRecipes(consumer);

src/datagen/main/java/mekanism/common/recipe/BaseRecipeProvider.java

@@ -33,10 +33,12 @@
 @NothingNullByDefault
 public abstract class BaseRecipeProvider extends RecipeProvider {
 
+    private final CompletableFuture<HolderLookup.Provider> registriesFuture;
     private final ExistingFileHelper existingFileHelper;
 
-    protected BaseRecipeProvider(PackOutput output, CompletableFuture<HolderLookup.Provider> provider, ExistingFileHelper existingFileHelper) {
-        super(output, provider);
+    protected BaseRecipeProvider(PackOutput output, CompletableFuture<HolderLookup.Provider> registriesFuture, ExistingFileHelper existingFileHelper) {
+        super(output, registriesFuture);
+        this.registriesFuture = registriesFuture;
         this.existingFileHelper = existingFileHelper;
     }
 
@@ -56,14 +58,15 @@ public Builder advancement() {
 
     @Override
     protected final void buildRecipes(RecipeOutput output) {
+        HolderLookup.Provider registries = registriesFuture.resultNow();
         WrapperRecipeOutput trackingConsumer = new WrapperRecipeOutput(output, existingFileHelper);
-        addRecipes(trackingConsumer);
+        addRecipes(trackingConsumer, registries);
         for (ISubRecipeProvider subRecipeProvider : getSubRecipeProviders()) {
-            subRecipeProvider.addRecipes(trackingConsumer);
+            subRecipeProvider.addRecipes(trackingConsumer, registries);
         }
     }
 
-    protected abstract void addRecipes(RecipeOutput output);
+    protected abstract void addRecipes(RecipeOutput output, HolderLookup.Provider registries);
 
     /**
      * Gets all the sub/offloaded recipe providers that this recipe provider has.

src/datagen/main/java/mekanism/common/recipe/ISubRecipeProvider.java

@@ -1,11 +1,12 @@
 package mekanism.common.recipe;
 
+import net.minecraft.core.HolderLookup;
 import net.minecraft.data.recipes.RecipeOutput;
 
 /**
  * Interface for helping split the recipe provider over multiple classes to make it a bit easier to interact with
  */
 public interface ISubRecipeProvider {
 
-    void addRecipes(RecipeOutput output);
+    void addRecipes(RecipeOutput output, HolderLookup.Provider registries);
 }