From 08502cd6bc247150b7028a03acd574c97a9b7a9a Mon Sep 17 00:00:00 2001 From: Ayutac Date: Wed, 8 Mar 2023 21:46:05 +0100 Subject: [PATCH] Port/1.19.4 new recipes (#3120) * Added cherry recipes to sawmill * Added extractor recipes for new flowers --- .../extractor/ExtractorRecipesProvider.groovy | 30 ++++++++++++++++++- .../IndustrialSawmillRecipesProvider.groovy | 10 +++++++ 2 files changed, 39 insertions(+), 1 deletion(-) diff --git a/src/datagen/groovy/techreborn/datagen/recipes/machine/extractor/ExtractorRecipesProvider.groovy b/src/datagen/groovy/techreborn/datagen/recipes/machine/extractor/ExtractorRecipesProvider.groovy index c06a857d3..5e89bb514 100644 --- a/src/datagen/groovy/techreborn/datagen/recipes/machine/extractor/ExtractorRecipesProvider.groovy +++ b/src/datagen/groovy/techreborn/datagen/recipes/machine/extractor/ExtractorRecipesProvider.groovy @@ -28,6 +28,7 @@ import net.fabricmc.fabric.api.datagen.v1.FabricDataOutput import net.minecraft.item.ItemStack import net.minecraft.item.Items import net.minecraft.registry.RegistryWrapper +import net.minecraft.resource.featuretoggle.FeatureFlags import techreborn.datagen.recipes.TechRebornRecipesProvider import techreborn.init.TRContent @@ -43,6 +44,7 @@ class ExtractorRecipesProvider extends TechRebornRecipesProvider { generateDoubleDyes() generateQuadrupleDyes() generateFroglight() + generateMisc() generateFluidExtraction() } @@ -76,9 +78,23 @@ class ExtractorRecipesProvider extends TechRebornRecipesProvider { criterion getCriterionName(item), getCriterionConditions(item) } } + [ + (Items.TORCHFLOWER) : Items.ORANGE_DYE, + (Items.PINK_PETALS) : Items.PINK_DYE + ].each { item, dye -> + offerExtractorRecipe { + ingredients item + outputs stack(dye, 2) + source item.toString() + power 10 + time 300 + criterion getCriterionName(item), getCriterionConditions(item) + feature FeatureFlags.UPDATE_1_20 + } + } } - // ONLY for double vanilla double dye recipes + // ONLY for doubling vanilla double dye recipes void generateQuadrupleDyes() { [ (Items.LILAC) : Items.MAGENTA_DYE, @@ -114,6 +130,18 @@ class ExtractorRecipesProvider extends TechRebornRecipesProvider { } } + void generateMisc() { + offerExtractorRecipe { + ingredients Items.CHERRY_LEAVES + outputs stack(Items.PINK_PETALS, 4) + source Items.CHERRY_LEAVES.toString() + power 10 + time 300 + criterion getCriterionName(Items.CHERRY_LEAVES), getCriterionConditions(Items.CHERRY_LEAVES) + feature FeatureFlags.UPDATE_1_20 + } + } + void generateFluidExtraction() { final int exPower = 10 final int exTime = 150 diff --git a/src/datagen/groovy/techreborn/datagen/recipes/machine/industrial_sawmill/IndustrialSawmillRecipesProvider.groovy b/src/datagen/groovy/techreborn/datagen/recipes/machine/industrial_sawmill/IndustrialSawmillRecipesProvider.groovy index 6845630ba..59e15c443 100644 --- a/src/datagen/groovy/techreborn/datagen/recipes/machine/industrial_sawmill/IndustrialSawmillRecipesProvider.groovy +++ b/src/datagen/groovy/techreborn/datagen/recipes/machine/industrial_sawmill/IndustrialSawmillRecipesProvider.groovy @@ -63,6 +63,14 @@ class IndustrialSawmillRecipesProvider extends TechRebornRecipesProvider { fluidAmount 1000 // in millibuckets } } + offerIndustrialSawmillRecipe { + ingredients ItemTags.CHERRY_LOGS + outputs stack(Items.CHERRY_PLANKS,4), stack(TRContent.Dusts.SAW, 3) + power 40 + time 200 + fluidAmount 1000 // in millibuckets + feature FeatureFlags.UPDATE_1_20 + } offerIndustrialSawmillRecipe { ingredients ItemTags.BAMBOO_BLOCKS outputs stack(Items.BAMBOO_PLANKS,2), stack(TRContent.Dusts.SAW, 1) @@ -94,6 +102,7 @@ class IndustrialSawmillRecipesProvider extends TechRebornRecipesProvider { } } [ + (Items.CHERRY_STAIRS): Items.CHERRY_SLAB, (Items.BAMBOO_STAIRS): Items.BAMBOO_SLAB, (Items.BAMBOO_MOSAIC_STAIRS): Items.BAMBOO_MOSAIC_SLAB ].each { stairs, slab -> @@ -131,6 +140,7 @@ class IndustrialSawmillRecipesProvider extends TechRebornRecipesProvider { } } [ + (Items.CHERRY_SLAB): Items.CHERRY_PRESSURE_PLATE, (Items.BAMBOO_SLAB): Items.BAMBOO_PRESSURE_PLATE, (Items.BAMBOO_MOSAIC_SLAB): Items.BAMBOO_PRESSURE_PLATE ].each { slab, plate ->