From d3dfa2763c309bff375f82204feeb3bc49d9467f Mon Sep 17 00:00:00 2001 From: Hubry Date: Thu, 27 Feb 2020 15:29:05 +0100 Subject: [PATCH] Fix recipe mistake missed when checking the generated recipe diff --- .../resources/data/botania/recipes/mana_tablet.json | 11 ++++++++--- src/main/java/vazkii/botania/data/RecipeProvider.java | 4 +++- 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/src/generated/resources/data/botania/recipes/mana_tablet.json b/src/generated/resources/data/botania/recipes/mana_tablet.json index 916bee5b9..32f9a4865 100644 --- a/src/generated/resources/data/botania/recipes/mana_tablet.json +++ b/src/generated/resources/data/botania/recipes/mana_tablet.json @@ -6,9 +6,14 @@ "SSS" ], "key": { - "P": { - "tag": "forge:gems/mana_diamond" - }, + "P": [ + { + "item": "botania:mana_pearl" + }, + { + "tag": "forge:gems/mana_diamond" + } + ], "S": { "tag": "botania:livingrock" } diff --git a/src/main/java/vazkii/botania/data/RecipeProvider.java b/src/main/java/vazkii/botania/data/RecipeProvider.java index b47913446..c9e8a07bd 100644 --- a/src/main/java/vazkii/botania/data/RecipeProvider.java +++ b/src/main/java/vazkii/botania/data/RecipeProvider.java @@ -982,7 +982,9 @@ public class RecipeProvider extends net.minecraft.data.RecipeProvider { .addCriterion("has_item", hasItem(ModTags.Items.PETALS)) .build(WrapperResult.ofType(TwigWandRecipe.SERIALIZER, consumer)); ShapedRecipeBuilder.shapedRecipe(ModItems.manaTablet) - .key('P', ModTags.Items.GEMS_MANA_DIAMOND) + .key('P', Ingredient.fromItemListStream(Stream.of( + new Ingredient.SingleItemList(new ItemStack(ModItems.manaPearl)), + new Ingredient.TagList(ModTags.Items.GEMS_MANA_DIAMOND)))) .key('S', ModTags.Items.LIVINGROCK) .patternLine("SSS") .patternLine("SPS")