Make CommonRecipeProvider an actual data provider

62832 · Oct 3, 2023 · 0a56489 · 0a56489
1 parent 77db901
commit 0a56489
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 30 deletions.
diff --git a/common/src/data/java/gripe/_90/megacells/datagen/CommonRecipeProvider.java b/common/src/data/java/gripe/_90/megacells/datagen/CommonRecipeProvider.java
@@ -1,12 +1,12 @@
 package gripe._90.megacells.datagen;
 
-import static net.minecraft.data.recipes.RecipeProvider.has;
-
 import java.util.function.Consumer;
 
 import net.minecraft.core.registries.BuiltInRegistries;
+import net.minecraft.data.PackOutput;
 import net.minecraft.data.recipes.FinishedRecipe;
 import net.minecraft.data.recipes.RecipeCategory;
+import net.minecraft.data.recipes.RecipeProvider;
 import net.minecraft.data.recipes.ShapedRecipeBuilder;
 import net.minecraft.data.recipes.ShapelessRecipeBuilder;
 import net.minecraft.tags.FluidTags;
@@ -36,8 +36,13 @@
 import gripe._90.megacells.definition.MEGATags;
 import gripe._90.megacells.integration.appbot.AppBotItems;
 
-public class CommonRecipeProvider {
-    public static void buildRecipes(Consumer<FinishedRecipe> consumer) {
+public class CommonRecipeProvider extends RecipeProvider {
+    public CommonRecipeProvider(PackOutput output) {
+        super(output);
+    }
+
+    @Override
+    public void buildRecipes(Consumer<FinishedRecipe> consumer) {
         component(consumer, MEGAItems.TIER_1M, StorageTier.SIZE_256K, AEItems.SKY_DUST.asItem(), null);
         component(consumer, MEGAItems.TIER_4M, MEGAItems.TIER_1M, null, ConventionTags.ENDER_PEARL_DUST);
         component(consumer, MEGAItems.TIER_16M, MEGAItems.TIER_4M, null, ConventionTags.ENDER_PEARL_DUST);

diff --git a/fabric/src/data/java/gripe/_90/megacells/datagen/MEGADataGenerators.java b/fabric/src/data/java/gripe/_90/megacells/datagen/MEGADataGenerators.java
@@ -14,7 +14,7 @@ public void onInitializeDataGenerator(FabricDataGenerator generator) {
 
         pack.addProvider((FabricDataOutput output) -> new CommonLanguageProvider(output));
         pack.addProvider((FabricDataOutput output) -> new CommonLootTableProvider(output));
+        pack.addProvider((FabricDataOutput output) -> new CommonRecipeProvider(output));
         pack.addProvider(ModelProvider::new);
-        pack.addProvider(RecipeProvider::new);
     }
 }
diff --git a/fabric/src/data/java/gripe/_90/megacells/datagen/RecipeProvider.java b/fabric/src/data/java/gripe/_90/megacells/datagen/RecipeProvider.java
diff --git a/..._90/megacells/datagen/RecipeProvider.java → ...egacells/datagen/ForgeRecipeProvider.java b/..._90/megacells/datagen/RecipeProvider.java → ...egacells/datagen/ForgeRecipeProvider.java
@@ -7,6 +7,7 @@
 import net.minecraft.data.PackOutput;
 import net.minecraft.data.recipes.FinishedRecipe;
 import net.minecraft.data.recipes.RecipeCategory;
+import net.minecraft.data.recipes.RecipeProvider;
 import net.minecraft.data.recipes.ShapedRecipeBuilder;
 import net.minecraft.data.recipes.ShapelessRecipeBuilder;
 import net.minecraft.resources.ResourceLocation;
@@ -27,17 +28,15 @@
 import gripe._90.megacells.definition.MEGAItems;
 import gripe._90.megacells.integration.appmek.AppMekItems;
 
-public class RecipeProvider extends net.minecraft.data.recipes.RecipeProvider {
+public class ForgeRecipeProvider extends RecipeProvider {
     private static final TagKey<Item> OSMIUM = ItemTags.create(new ResourceLocation("forge", "ingots/osmium"));
 
-    public RecipeProvider(PackOutput output) {
+    public ForgeRecipeProvider(PackOutput output) {
         super(output);
     }
 
     @Override
     protected void buildRecipes(@NotNull Consumer<FinishedRecipe> consumer) {
-        CommonRecipeProvider.buildRecipes(consumer);
-
         if (MEGACells.PLATFORM.isAddonLoaded(Addons.APPMEK)) {
             ShapedRecipeBuilder.shaped(RecipeCategory.MISC, AppMekItems.MEGA_CHEMICAL_CELL_HOUSING)
                     .pattern("aba")

diff --git a/forge/src/data/java/gripe/_90/megacells/datagen/MEGADataGenerators.java b/forge/src/data/java/gripe/_90/megacells/datagen/MEGADataGenerators.java
@@ -25,6 +25,8 @@ public static void onGatherData(GatherDataEvent event) {
 
         generator.addProvider(event.includeClient(), new CommonLanguageProvider(output));
         generator.addProvider(event.includeServer(), new CommonLootTableProvider(output));
-        generator.addProvider(event.includeServer(), new RecipeProvider(output));
+        generator.addProvider(event.includeServer(), new CommonRecipeProvider(output));
+
+        generator.addProvider(event.includeServer(), new ForgeRecipeProvider(output));
     }
 }