From d014ed627e1dee4c5ef606eba6412ec654fbc2bb Mon Sep 17 00:00:00 2001 From: ToMe25 <38815969+ToMe25@users.noreply.github.com> Date: Sun, 12 Jan 2020 01:51:24 +0100 Subject: [PATCH] Change some Recipes to use Tags (#3081) Change the Terrasteel armor recipes to use the Terrasteel ingot tag instead of the item, and change some recipes to use the Block tags from #3079 --- src/main/resources/data/botania/recipes/brewery.json | 2 +- .../recipes/conversions/elementium_block_deconstruct.json | 2 +- .../recipes/conversions/manasteel_block_deconstruct.json | 2 +- .../recipes/conversions/terrasteel_block_deconstruct.json | 2 +- src/main/resources/data/botania/recipes/spawner_claw.json | 2 +- src/main/resources/data/botania/recipes/terra_pick.json | 3 +-- src/main/resources/data/botania/recipes/terra_plate.json | 2 +- src/main/resources/data/botania/recipes/terrasteel_boots.json | 2 +- .../resources/data/botania/recipes/terrasteel_chestplate.json | 2 +- src/main/resources/data/botania/recipes/terrasteel_helmet.json | 2 +- .../data/botania/recipes/terrasteel_helmet_revealing.json | 2 +- .../resources/data/botania/recipes/terrasteel_leggings.json | 2 +- 12 files changed, 12 insertions(+), 13 deletions(-) diff --git a/src/main/resources/data/botania/recipes/brewery.json b/src/main/resources/data/botania/recipes/brewery.json index 5dfa86014..f36878f9d 100644 --- a/src/main/resources/data/botania/recipes/brewery.json +++ b/src/main/resources/data/botania/recipes/brewery.json @@ -19,7 +19,7 @@ "item": "minecraft:brewing_stand" }, "M": { - "item": "botania:manasteel_block" + "tag": "forge:storage_blocks/manasteel" } } } \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/conversions/elementium_block_deconstruct.json b/src/main/resources/data/botania/recipes/conversions/elementium_block_deconstruct.json index d792f8e4e..64670579f 100644 --- a/src/main/resources/data/botania/recipes/conversions/elementium_block_deconstruct.json +++ b/src/main/resources/data/botania/recipes/conversions/elementium_block_deconstruct.json @@ -5,7 +5,7 @@ }, "ingredients": [ { - "item": "botania:elementium_block" + "tag": "forge:storage_blocks/elementium" } ], "type": "minecraft:crafting_shapeless" diff --git a/src/main/resources/data/botania/recipes/conversions/manasteel_block_deconstruct.json b/src/main/resources/data/botania/recipes/conversions/manasteel_block_deconstruct.json index 2fc7bb09a..b4090075e 100644 --- a/src/main/resources/data/botania/recipes/conversions/manasteel_block_deconstruct.json +++ b/src/main/resources/data/botania/recipes/conversions/manasteel_block_deconstruct.json @@ -5,7 +5,7 @@ }, "ingredients": [ { - "item": "botania:manasteel_block" + "tag": "forge:storage_blocks/manasteel" } ], "type": "minecraft:crafting_shapeless" diff --git a/src/main/resources/data/botania/recipes/conversions/terrasteel_block_deconstruct.json b/src/main/resources/data/botania/recipes/conversions/terrasteel_block_deconstruct.json index a5b88a6e7..2680f2362 100644 --- a/src/main/resources/data/botania/recipes/conversions/terrasteel_block_deconstruct.json +++ b/src/main/resources/data/botania/recipes/conversions/terrasteel_block_deconstruct.json @@ -5,7 +5,7 @@ }, "ingredients": [ { - "item": "botania:terrasteel_block" + "tag": "forge:storage_blocks/terrasteel" } ], "type": "minecraft:crafting_shapeless" diff --git a/src/main/resources/data/botania/recipes/spawner_claw.json b/src/main/resources/data/botania/recipes/spawner_claw.json index 2f4af2f75..b44737efc 100644 --- a/src/main/resources/data/botania/recipes/spawner_claw.json +++ b/src/main/resources/data/botania/recipes/spawner_claw.json @@ -22,7 +22,7 @@ "item": "botania:ender_air_bottle" }, "M": { - "item": "botania:manasteel_block" + "tag": "forge:storage_blocks/manasteel" } } } \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/terra_pick.json b/src/main/resources/data/botania/recipes/terra_pick.json index 3fc99b5de..abdfb00bd 100644 --- a/src/main/resources/data/botania/recipes/terra_pick.json +++ b/src/main/resources/data/botania/recipes/terra_pick.json @@ -13,8 +13,7 @@ "item": "botania:mana_tablet" }, "I": { - "__comment": "TODO tag", - "item": "botania:terrasteel_ingot" + "tag": "forge:ingots/terrasteel" }, "L": { "item": "botania:livingwood_twig" diff --git a/src/main/resources/data/botania/recipes/terra_plate.json b/src/main/resources/data/botania/recipes/terra_plate.json index feab83ef3..3c6cc1e00 100644 --- a/src/main/resources/data/botania/recipes/terra_plate.json +++ b/src/main/resources/data/botania/recipes/terra_plate.json @@ -28,7 +28,7 @@ "tag": "forge:storage_blocks/lapis" }, "M": { - "item": "botania:manasteel_block" + "tag": "forge:storage_blocks/manasteel" } } } \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/terrasteel_boots.json b/src/main/resources/data/botania/recipes/terrasteel_boots.json index b6a9aef99..2f2ab0ab7 100644 --- a/src/main/resources/data/botania/recipes/terrasteel_boots.json +++ b/src/main/resources/data/botania/recipes/terrasteel_boots.json @@ -14,7 +14,7 @@ "item": "botania:livingwood_twig" }, "S": { - "item": "botania:terrasteel_ingot" + "tag": "forge:ingots/terrasteel" }, "R": { "tag": "botania:runes/winter" diff --git a/src/main/resources/data/botania/recipes/terrasteel_chestplate.json b/src/main/resources/data/botania/recipes/terrasteel_chestplate.json index 1dd135627..0d10b41e9 100644 --- a/src/main/resources/data/botania/recipes/terrasteel_chestplate.json +++ b/src/main/resources/data/botania/recipes/terrasteel_chestplate.json @@ -14,7 +14,7 @@ "item": "botania:livingwood_twig" }, "S": { - "item": "botania:terrasteel_ingot" + "tag": "forge:ingots/terrasteel" }, "R": { "tag": "botania:runes/summer" diff --git a/src/main/resources/data/botania/recipes/terrasteel_helmet.json b/src/main/resources/data/botania/recipes/terrasteel_helmet.json index 0d32c499f..c6fd8d849 100644 --- a/src/main/resources/data/botania/recipes/terrasteel_helmet.json +++ b/src/main/resources/data/botania/recipes/terrasteel_helmet.json @@ -14,7 +14,7 @@ "item": "botania:livingwood_twig" }, "S": { - "item": "botania:terrasteel_ingot" + "tag": "forge:ingots/terrasteel" }, "R": { "tag": "botania:runes/spring" diff --git a/src/main/resources/data/botania/recipes/terrasteel_helmet_revealing.json b/src/main/resources/data/botania/recipes/terrasteel_helmet_revealing.json index e4c8f98af..1428a90bf 100644 --- a/src/main/resources/data/botania/recipes/terrasteel_helmet_revealing.json +++ b/src/main/resources/data/botania/recipes/terrasteel_helmet_revealing.json @@ -14,7 +14,7 @@ "item": "botania:livingwood_twig" }, "S": { - "item": "botania:terrasteel_ingot" + "tag": "forge:ingots/terrasteel" }, "R": { "tag": "botania:runes/spring" diff --git a/src/main/resources/data/botania/recipes/terrasteel_leggings.json b/src/main/resources/data/botania/recipes/terrasteel_leggings.json index 22d007ed7..77d2187b6 100644 --- a/src/main/resources/data/botania/recipes/terrasteel_leggings.json +++ b/src/main/resources/data/botania/recipes/terrasteel_leggings.json @@ -14,7 +14,7 @@ "item": "botania:livingwood_twig" }, "S": { - "item": "botania:terrasteel_ingot" + "tag": "forge:ingots/terrasteel" }, "R": { "tag": "botania:runes/autumn"