From 0a564891275a8c295ab4fb9cd597abbd0acfd984 Mon Sep 17 00:00:00 2001 From: 90 Date: Tue, 3 Oct 2023 19:21:27 +0300 Subject: [PATCH] Make CommonRecipeProvider an actual data provider --- .../datagen/CommonRecipeProvider.java | 13 ++++++++---- .../megacells/datagen/MEGADataGenerators.java | 2 +- .../_90/megacells/datagen/RecipeProvider.java | 20 ------------------- ...Provider.java => ForgeRecipeProvider.java} | 7 +++---- .../megacells/datagen/MEGADataGenerators.java | 4 +++- 5 files changed, 16 insertions(+), 30 deletions(-) delete mode 100644 fabric/src/data/java/gripe/_90/megacells/datagen/RecipeProvider.java rename forge/src/data/java/gripe/_90/megacells/datagen/{RecipeProvider.java => ForgeRecipeProvider.java} (97%) diff --git a/common/src/data/java/gripe/_90/megacells/datagen/CommonRecipeProvider.java b/common/src/data/java/gripe/_90/megacells/datagen/CommonRecipeProvider.java index d65a940b..99fc9773 100644 --- 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 consumer) { +public class CommonRecipeProvider extends RecipeProvider { + public CommonRecipeProvider(PackOutput output) { + super(output); + } + + @Override + public void buildRecipes(Consumer 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 index f8511ce9..4d3e6c62 100644 --- 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 deleted file mode 100644 index ff68ea61..00000000 --- a/fabric/src/data/java/gripe/_90/megacells/datagen/RecipeProvider.java +++ /dev/null @@ -1,20 +0,0 @@ -package gripe._90.megacells.datagen; - -import java.util.function.Consumer; - -import org.jetbrains.annotations.NotNull; - -import net.fabricmc.fabric.api.datagen.v1.FabricDataOutput; -import net.fabricmc.fabric.api.datagen.v1.provider.FabricRecipeProvider; -import net.minecraft.data.recipes.FinishedRecipe; - -class RecipeProvider extends FabricRecipeProvider { - RecipeProvider(FabricDataOutput output) { - super(output); - } - - @Override - public void buildRecipes(@NotNull Consumer consumer) { - CommonRecipeProvider.buildRecipes(consumer); - } -} diff --git a/forge/src/data/java/gripe/_90/megacells/datagen/RecipeProvider.java b/forge/src/data/java/gripe/_90/megacells/datagen/ForgeRecipeProvider.java similarity index 97% rename from forge/src/data/java/gripe/_90/megacells/datagen/RecipeProvider.java rename to forge/src/data/java/gripe/_90/megacells/datagen/ForgeRecipeProvider.java index 7fd29885..c5dff828 100644 --- a/forge/src/data/java/gripe/_90/megacells/datagen/RecipeProvider.java +++ b/forge/src/data/java/gripe/_90/megacells/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 OSMIUM = ItemTags.create(new ResourceLocation("forge", "ingots/osmium")); - public RecipeProvider(PackOutput output) { + public ForgeRecipeProvider(PackOutput output) { super(output); } @Override protected void buildRecipes(@NotNull Consumer 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 index a091b0b7..1c7ad250 100644 --- 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)); } }