diff --git a/src/main/java/vazkii/botania/common/block/ModFluffBlocks.java b/src/main/java/vazkii/botania/common/block/ModFluffBlocks.java index 4f2b07fb1..5f902cb52 100644 --- a/src/main/java/vazkii/botania/common/block/ModFluffBlocks.java +++ b/src/main/java/vazkii/botania/common/block/ModFluffBlocks.java @@ -318,7 +318,10 @@ public final class ModFluffBlocks { register(r, new BlockBiomeStoneStairs(base.getDefaultState(), props), base.getRegistryName().getPath() + STAIR_SUFFIX); register(r, new BlockBiomeStoneSlab(props), base.getRegistryName().getPath() + SLAB_SUFFIX); - register(r, new BlockModLexiconable(props, marimorph), LibBlockNames.METAMORPHIC_PREFIX + variant + "_cobblestone"); + base = new BlockModLexiconable(props, marimorph); + register(r, base, LibBlockNames.METAMORPHIC_PREFIX + variant + "_cobblestone"); + register(r, new BlockBiomeStoneStairs(base.getDefaultState(), props), base.getRegistryName().getPath() + STAIR_SUFFIX); + register(r, new BlockBiomeStoneSlab(props), base.getRegistryName().getPath() + SLAB_SUFFIX); register(r, new BlockBiomeStoneWall(props), LibBlockNames.METAMORPHIC_PREFIX + variant + "_cobblestone" + WALL_SUFFIX); base = new BlockModLexiconable(props, marimorph); diff --git a/src/main/resources/assets/botania/textures/items/triggers/manadetector.png b/src/main/resources/assets/botania/textures/items/triggers/mana_detector.png similarity index 100% rename from src/main/resources/assets/botania/textures/items/triggers/manadetector.png rename to src/main/resources/assets/botania/textures/items/triggers/mana_detector.png diff --git a/src/main/resources/assets/botania/textures/items/triggers/runealtarcancraft.png b/src/main/resources/assets/botania/textures/items/triggers/rune_altar_can_craft.png similarity index 100% rename from src/main/resources/assets/botania/textures/items/triggers/runealtarcancraft.png rename to src/main/resources/assets/botania/textures/items/triggers/rune_altar_can_craft.png diff --git a/src/main/resources/assets/botania/textures/items/willflame.png.mcmeta b/src/main/resources/assets/botania/textures/items/will_flame.mcmeta similarity index 100% rename from src/main/resources/assets/botania/textures/items/willflame.png.mcmeta rename to src/main/resources/assets/botania/textures/items/will_flame.mcmeta diff --git a/src/main/resources/assets/botania/textures/items/willflame.png b/src/main/resources/assets/botania/textures/items/will_flame.png similarity index 100% rename from src/main/resources/assets/botania/textures/items/willflame.png rename to src/main/resources/assets/botania/textures/items/will_flame.png diff --git a/src/main/resources/data/botania/recipes/_constants.json b/src/main/resources/data/botania/recipes/_constants.json index f55b8f183..c7216a81a 100644 --- a/src/main/resources/data/botania/recipes/_constants.json +++ b/src/main/resources/data/botania/recipes/_constants.json @@ -20,7 +20,7 @@ ], "name": "all_dyes" }, -{ + { "ingredient": [ { "item": "minecraft:glass" }, { "item": "minecraft:white_stained_glass" }, diff --git a/src/main/resources/data/botania/recipes/abstruse_platform.json b/src/main/resources/data/botania/recipes/abstruse_platform.json index 752bc76f7..519b41553 100644 --- a/src/main/resources/data/botania/recipes/abstruse_platform.json +++ b/src/main/resources/data/botania/recipes/abstruse_platform.json @@ -7,7 +7,7 @@ "343", "0P0" ], - "type": "forge:ore_shaped", + "type": "minecraft:crafting_shaped", "key": { "0": { "item": "botania:livingwood", diff --git a/src/main/resources/data/botania/recipes/alchemycatalyst.json b/src/main/resources/data/botania/recipes/alchemycatalyst.json index 135ff815a..536aafbc8 100644 --- a/src/main/resources/data/botania/recipes/alchemycatalyst.json +++ b/src/main/resources/data/botania/recipes/alchemycatalyst.json @@ -7,7 +7,7 @@ "BPB", "SGS" ], - "type": "forge:ore_shaped", + "type": "minecraft:crafting_shaped", "key": { "P": { "item": "botania:mana_pearl" diff --git a/src/main/resources/data/botania/recipes/alfheimportal.json b/src/main/resources/data/botania/recipes/alfheimportal.json index d9dc71105..2e64d36c3 100644 --- a/src/main/resources/data/botania/recipes/alfheimportal.json +++ b/src/main/resources/data/botania/recipes/alfheimportal.json @@ -7,7 +7,7 @@ "WTW", "WTW" ], - "type": "forge:ore_shaped", + "type": "minecraft:crafting_shaped", "key": { "T": { "tag": "forge:nuggets/terrasteel" diff --git a/src/main/resources/data/botania/recipes/animatedtorch.json b/src/main/resources/data/botania/recipes/animatedtorch.json index c4f3273cc..96e321e74 100644 --- a/src/main/resources/data/botania/recipes/animatedtorch.json +++ b/src/main/resources/data/botania/recipes/animatedtorch.json @@ -6,7 +6,7 @@ "D", "T" ], - "type": "forge:ore_shaped", + "type": "minecraft:crafting_shaped", "key": { "D": { "tag": "forge:dusts/mana" diff --git a/src/main/resources/data/botania/recipes/apothecary_default.json b/src/main/resources/data/botania/recipes/apothecary_default.json index 30dcbb808..1de34c173 100644 --- a/src/main/resources/data/botania/recipes/apothecary_default.json +++ b/src/main/resources/data/botania/recipes/apothecary_default.json @@ -7,7 +7,7 @@ " C ", "CCC" ], - "type": "forge:ore_shaped", + "type": "minecraft:crafting_shaped", "key": { "P": [ { @@ -35,7 +35,7 @@ "tag": "botania:petals/gray" }, { - "tag": "botania:petals/lightgray" + "tag": "botania:petals/light_gray" }, { "tag": "botania:petals/cyan" diff --git a/src/main/resources/data/botania/recipes/astrolabe.json b/src/main/resources/data/botania/recipes/astrolabe.json index c76a28e11..2e34e4274 100644 --- a/src/main/resources/data/botania/recipes/astrolabe.json +++ b/src/main/resources/data/botania/recipes/astrolabe.json @@ -7,7 +7,7 @@ "EEE", "GED" ], - "type": "forge:ore_shaped", + "type": "minecraft:crafting_shaped", "key": { "D": { "item": "botania:dreamwood" diff --git a/src/main/resources/data/botania/recipes/auraring.json b/src/main/resources/data/botania/recipes/auraring.json index 0f1fcf685..94f583bd8 100644 --- a/src/main/resources/data/botania/recipes/auraring.json +++ b/src/main/resources/data/botania/recipes/auraring.json @@ -7,7 +7,7 @@ "I I", " I " ], - "type": "forge:ore_shaped", + "type": "minecraft:crafting_shaped", "key": { "R": { "tag": "botania:runes/mana" diff --git a/src/main/resources/data/botania/recipes/auraringgreater.json b/src/main/resources/data/botania/recipes/auraringgreater.json index f68dd4ef3..84bfefb94 100644 --- a/src/main/resources/data/botania/recipes/auraringgreater.json +++ b/src/main/resources/data/botania/recipes/auraringgreater.json @@ -10,5 +10,5 @@ "item": "botania:auraring" } ], - "type": "forge:ore_shapeless" + "type": "minecraft:crafting_shapeless" } \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/autocraftinghalo.json b/src/main/resources/data/botania/recipes/autocraftinghalo.json index 562d45f36..665fda0eb 100644 --- a/src/main/resources/data/botania/recipes/autocraftinghalo.json +++ b/src/main/resources/data/botania/recipes/autocraftinghalo.json @@ -10,5 +10,5 @@ "tag": "forge:gems/mana_diamond" } ], - "type": "forge:ore_shapeless" + "type": "minecraft:crafting_shapeless" } \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/avatar.json b/src/main/resources/data/botania/recipes/avatar.json index e43488470..1a1f59730 100644 --- a/src/main/resources/data/botania/recipes/avatar.json +++ b/src/main/resources/data/botania/recipes/avatar.json @@ -7,7 +7,7 @@ "WDW", "W W" ], - "type": "forge:ore_shaped", + "type": "minecraft:crafting_shaped", "key": { "D": { "tag": "forge:gems/mana_diamond" diff --git a/src/main/resources/data/botania/recipes/azulejo_0.json b/src/main/resources/data/botania/recipes/azulejo_0.json index 62b7d59cd..4058eb98f 100644 --- a/src/main/resources/data/botania/recipes/azulejo_0.json +++ b/src/main/resources/data/botania/recipes/azulejo_0.json @@ -10,5 +10,5 @@ "tag": "forge:storage_blocks/quartz" } ], - "type": "forge:ore_shapeless" + "type": "minecraft:crafting_shapeless" } \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/balancecloak.json b/src/main/resources/data/botania/recipes/balancecloak.json index e4d262865..a96988c1a 100644 --- a/src/main/resources/data/botania/recipes/balancecloak.json +++ b/src/main/resources/data/botania/recipes/balancecloak.json @@ -7,7 +7,7 @@ "RWR", "RSR" ], - "type": "forge:ore_shaped", + "type": "minecraft:crafting_shaped", "key": { "R": { "tag": "forge:gems/emerald" diff --git a/src/main/resources/data/botania/recipes/baublebox.json b/src/main/resources/data/botania/recipes/baublebox.json index 432a33d9a..6b57bada2 100644 --- a/src/main/resources/data/botania/recipes/baublebox.json +++ b/src/main/resources/data/botania/recipes/baublebox.json @@ -7,7 +7,7 @@ "MCG", " M " ], - "type": "forge:ore_shaped", + "type": "minecraft:crafting_shaped", "key": { "C": { "tag": "forge:chests/wooden" diff --git a/src/main/resources/data/botania/recipes/bellows.json b/src/main/resources/data/botania/recipes/bellows.json index ee108aa4a..da83bcb52 100644 --- a/src/main/resources/data/botania/recipes/bellows.json +++ b/src/main/resources/data/botania/recipes/bellows.json @@ -7,7 +7,7 @@ "RL ", "SSS" ], - "type": "forge:ore_shaped", + "type": "minecraft:crafting_shaped", "key": { "R": { "tag": "botania:runes/air" diff --git a/src/main/resources/data/botania/recipes/black_petal_block.json b/src/main/resources/data/botania/recipes/black_petal_block.json index de3f8a4bb..9f176c499 100644 --- a/src/main/resources/data/botania/recipes/black_petal_block.json +++ b/src/main/resources/data/botania/recipes/black_petal_block.json @@ -7,7 +7,7 @@ "PPP", "PPP" ], - "type": "forge:ore_shaped", + "type": "minecraft:crafting_shaped", "group": "botania:petal_block", "key": { "P": { diff --git a/src/main/resources/data/botania/recipes/blackholetalisman_0.json b/src/main/resources/data/botania/recipes/blackholetalisman_0.json index 16d4a54be..8495c9164 100644 --- a/src/main/resources/data/botania/recipes/blackholetalisman_0.json +++ b/src/main/resources/data/botania/recipes/blackholetalisman_0.json @@ -8,7 +8,7 @@ "EAE", " E " ], - "type": "forge:ore_shaped", + "type": "minecraft:crafting_shaped", "key": { "A": { "item": "botania:ender_air_bottle" diff --git a/src/main/resources/data/botania/recipes/blazeblock.json b/src/main/resources/data/botania/recipes/blazeblock.json index 3bc317ff6..1ded699ff 100644 --- a/src/main/resources/data/botania/recipes/blazeblock.json +++ b/src/main/resources/data/botania/recipes/blazeblock.json @@ -16,7 +16,7 @@ "BBB", "BBB" ], - "type": "forge:ore_shaped", + "type": "minecraft:crafting_shaped", "key": { "B": { "tag": "forge:rods/blaze" diff --git a/src/main/resources/data/botania/recipes/bloodpendant.json b/src/main/resources/data/botania/recipes/bloodpendant.json index d85000ce8..b1e57e080 100644 --- a/src/main/resources/data/botania/recipes/bloodpendant.json +++ b/src/main/resources/data/botania/recipes/bloodpendant.json @@ -7,7 +7,7 @@ "PGP", "DP " ], - "type": "forge:ore_shaped", + "type": "minecraft:crafting_shaped", "key": { "P": { "tag": "forge:gems/prismarine" diff --git a/src/main/resources/data/botania/recipes/blue_petal_block.json b/src/main/resources/data/botania/recipes/blue_petal_block.json index ea6fadf73..49556ee6d 100644 --- a/src/main/resources/data/botania/recipes/blue_petal_block.json +++ b/src/main/resources/data/botania/recipes/blue_petal_block.json @@ -7,7 +7,7 @@ "PPP", "PPP" ], - "type": "forge:ore_shaped", + "type": "minecraft:crafting_shaped", "group": "botania:petal_block", "key": { "P": { diff --git a/src/main/resources/data/botania/recipes/brewery.json b/src/main/resources/data/botania/recipes/brewery.json index a5a1c14a3..5dfa86014 100644 --- a/src/main/resources/data/botania/recipes/brewery.json +++ b/src/main/resources/data/botania/recipes/brewery.json @@ -7,7 +7,7 @@ "RAR", "RMR" ], - "type": "forge:ore_shaped", + "type": "minecraft:crafting_shaped", "key": { "A": { "tag": "botania:runes/mana" diff --git a/src/main/resources/data/botania/recipes/brown_petal_block.json b/src/main/resources/data/botania/recipes/brown_petal_block.json index fb6a4d26d..c54c047b6 100644 --- a/src/main/resources/data/botania/recipes/brown_petal_block.json +++ b/src/main/resources/data/botania/recipes/brown_petal_block.json @@ -7,7 +7,7 @@ "PPP", "PPP" ], - "type": "forge:ore_shaped", + "type": "minecraft:crafting_shaped", "group": "botania:petal_block", "key": { "P": { diff --git a/src/main/resources/data/botania/recipes/cacophonium.json b/src/main/resources/data/botania/recipes/cacophonium.json index 3a616cf76..6f2a31581 100644 --- a/src/main/resources/data/botania/recipes/cacophonium.json +++ b/src/main/resources/data/botania/recipes/cacophonium.json @@ -7,7 +7,7 @@ "GNG", "GG " ], - "type": "forge:ore_shaped", + "type": "minecraft:crafting_shaped", "key": { "G": [ { diff --git a/src/main/resources/data/botania/recipes/clip.json b/src/main/resources/data/botania/recipes/clip.json index 5a70d0b13..17dbaf13a 100644 --- a/src/main/resources/data/botania/recipes/clip.json +++ b/src/main/resources/data/botania/recipes/clip.json @@ -7,7 +7,7 @@ "D D", "DD " ], - "type": "forge:ore_shaped", + "type": "minecraft:crafting_shaped", "key": { "D": { "item": "botania:dreamwood" diff --git a/src/main/resources/data/botania/recipes/cloudpendant.json b/src/main/resources/data/botania/recipes/cloudpendant.json index 78fa88e14..03035616c 100644 --- a/src/main/resources/data/botania/recipes/cloudpendant.json +++ b/src/main/resources/data/botania/recipes/cloudpendant.json @@ -7,7 +7,7 @@ "S S", "DSF" ], - "type": "forge:ore_shaped", + "type": "minecraft:crafting_shaped", "key": { "S": { "item": "botania:mana_string" diff --git a/src/main/resources/data/botania/recipes/cobblerod.json b/src/main/resources/data/botania/recipes/cobblerod.json index a5592bb9c..2f52f73c9 100644 --- a/src/main/resources/data/botania/recipes/cobblerod.json +++ b/src/main/resources/data/botania/recipes/cobblerod.json @@ -7,7 +7,7 @@ " TW", "T " ], - "type": "forge:ore_shaped", + "type": "minecraft:crafting_shaped", "key": { "C": { "tag": "forge:cobblestone" diff --git a/src/main/resources/data/botania/recipes/cocoon.json b/src/main/resources/data/botania/recipes/cocoon.json index fd123186d..eea9d8aaf 100644 --- a/src/main/resources/data/botania/recipes/cocoon.json +++ b/src/main/resources/data/botania/recipes/cocoon.json @@ -16,7 +16,7 @@ "CPC", "SDS" ], - "type": "forge:ore_shaped", + "type": "minecraft:crafting_shaped", "key": { "S": { "item": "minecraft:string" diff --git a/src/main/resources/data/botania/recipes/conjurationcatalyst.json b/src/main/resources/data/botania/recipes/conjurationcatalyst.json index 46a8f2784..33971dea9 100644 --- a/src/main/resources/data/botania/recipes/conjurationcatalyst.json +++ b/src/main/resources/data/botania/recipes/conjurationcatalyst.json @@ -7,7 +7,7 @@ "GPG", "SGS" ], - "type": "forge:ore_shaped", + "type": "minecraft:crafting_shaped", "key": { "P": { "item": "botania:alchemycatalyst" diff --git a/src/main/resources/data/botania/recipes/conversions/black_petal_block_deconstruct.json b/src/main/resources/data/botania/recipes/conversions/black_petal_block_deconstruct.json index 50f0fda4d..6a2b84f3e 100644 --- a/src/main/resources/data/botania/recipes/conversions/black_petal_block_deconstruct.json +++ b/src/main/resources/data/botania/recipes/conversions/black_petal_block_deconstruct.json @@ -1,6 +1,6 @@ { "result": { - "item": "botania:petal_black", + "item": "botania:black_petal", "count": 9 }, "group": "botania:petal_block_deconstruct", diff --git a/src/main/resources/data/botania/recipes/conversions/blazeblock_deconstruct.json b/src/main/resources/data/botania/recipes/conversions/blazeblock_deconstruct.json index bb6b5e295..255975427 100644 --- a/src/main/resources/data/botania/recipes/conversions/blazeblock_deconstruct.json +++ b/src/main/resources/data/botania/recipes/conversions/blazeblock_deconstruct.json @@ -17,5 +17,5 @@ "item": "botania:blaze_block" } ], - "type": "forge:ore_shapeless" + "type": "minecraft:crafting_shapeless" } \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/conversions/blue_petal_block_deconstruct.json b/src/main/resources/data/botania/recipes/conversions/blue_petal_block_deconstruct.json index 59408d4f5..96cfe552e 100644 --- a/src/main/resources/data/botania/recipes/conversions/blue_petal_block_deconstruct.json +++ b/src/main/resources/data/botania/recipes/conversions/blue_petal_block_deconstruct.json @@ -1,6 +1,6 @@ { "result": { - "item": "botania:petal_blue", + "item": "blue_petal", "count": 9 }, "group": "botania:petal_block_deconstruct", diff --git a/src/main/resources/data/botania/recipes/conversions/brown_petal_block_deconstruct.json b/src/main/resources/data/botania/recipes/conversions/brown_petal_block_deconstruct.json index c18f7ec6f..b4b25fa99 100644 --- a/src/main/resources/data/botania/recipes/conversions/brown_petal_block_deconstruct.json +++ b/src/main/resources/data/botania/recipes/conversions/brown_petal_block_deconstruct.json @@ -1,6 +1,6 @@ { "result": { - "item": "botania:petal_brown", + "item": "brown_petal", "count": 9 }, "group": "botania:petal_block_deconstruct", diff --git a/src/main/resources/data/botania/recipes/conversions/cyan_petal_block_deconstruct.json b/src/main/resources/data/botania/recipes/conversions/cyan_petal_block_deconstruct.json index a821c35bd..52ff851fa 100644 --- a/src/main/resources/data/botania/recipes/conversions/cyan_petal_block_deconstruct.json +++ b/src/main/resources/data/botania/recipes/conversions/cyan_petal_block_deconstruct.json @@ -1,6 +1,6 @@ { "result": { - "item": "botania:petal_cyan", + "item": "cyan_petal", "count": 9 }, "group": "botania:petal_block_deconstruct", diff --git a/src/main/resources/data/botania/recipes/conversions/elementium_from_nuggets.json b/src/main/resources/data/botania/recipes/conversions/elementium_from_nuggets.json index 19416d2f2..901afdeff 100644 --- a/src/main/resources/data/botania/recipes/conversions/elementium_from_nuggets.json +++ b/src/main/resources/data/botania/recipes/conversions/elementium_from_nuggets.json @@ -7,7 +7,7 @@ "III", "III" ], - "type": "forge:ore_shaped", + "type": "minecraft:crafting_shaped", "key": { "I": { "tag": "forge:nuggets/elementium" diff --git a/src/main/resources/data/botania/recipes/conversions/elementium_to_nuggets.json b/src/main/resources/data/botania/recipes/conversions/elementium_to_nuggets.json index 04b482d10..a398b249f 100644 --- a/src/main/resources/data/botania/recipes/conversions/elementium_to_nuggets.json +++ b/src/main/resources/data/botania/recipes/conversions/elementium_to_nuggets.json @@ -8,5 +8,5 @@ "tag": "forge:ingots/elementium" } ], - "type": "forge:ore_shapeless" + "type": "minecraft:crafting_shapeless" } \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/conversions/gray_petal_block_deconstruct.json b/src/main/resources/data/botania/recipes/conversions/gray_petal_block_deconstruct.json index 97b289c81..ea5ca3970 100644 --- a/src/main/resources/data/botania/recipes/conversions/gray_petal_block_deconstruct.json +++ b/src/main/resources/data/botania/recipes/conversions/gray_petal_block_deconstruct.json @@ -1,6 +1,6 @@ { "result": { - "item": "botania:petal_gray", + "item": "gray_petal", "count": 9 }, "group": "botania:petal_block_deconstruct", diff --git a/src/main/resources/data/botania/recipes/conversions/green_petal_block_deconstruct.json b/src/main/resources/data/botania/recipes/conversions/green_petal_block_deconstruct.json index c1a21387d..a0786775a 100644 --- a/src/main/resources/data/botania/recipes/conversions/green_petal_block_deconstruct.json +++ b/src/main/resources/data/botania/recipes/conversions/green_petal_block_deconstruct.json @@ -1,6 +1,6 @@ { "result": { - "item": "botania:petal_green", + "item": "green_petal", "count": 9 }, "group": "botania:petal_block_deconstruct", diff --git a/src/main/resources/data/botania/recipes/conversions/light_blue_petal_block_deconstruct.json b/src/main/resources/data/botania/recipes/conversions/light_blue_petal_block_deconstruct.json index 8513d2ce4..b4abaa0b6 100644 --- a/src/main/resources/data/botania/recipes/conversions/light_blue_petal_block_deconstruct.json +++ b/src/main/resources/data/botania/recipes/conversions/light_blue_petal_block_deconstruct.json @@ -1,6 +1,6 @@ { "result": { - "item": "botania:petal_light_blue", + "item": "light_blue_petal", "count": 9 }, "group": "botania:petal_block_deconstruct", diff --git a/src/main/resources/data/botania/recipes/conversions/lime_petal_block_deconstruct.json b/src/main/resources/data/botania/recipes/conversions/lime_petal_block_deconstruct.json index 2a80b573d..2c7d6ef5b 100644 --- a/src/main/resources/data/botania/recipes/conversions/lime_petal_block_deconstruct.json +++ b/src/main/resources/data/botania/recipes/conversions/lime_petal_block_deconstruct.json @@ -1,6 +1,6 @@ { "result": { - "item": "botania:petal_lime", + "item": "lime_petal", "count": 9 }, "group": "botania:petal_block_deconstruct", diff --git a/src/main/resources/data/botania/recipes/conversions/magenta_petal_block_deconstruct.json b/src/main/resources/data/botania/recipes/conversions/magenta_petal_block_deconstruct.json index cd15621db..5ff1a809b 100644 --- a/src/main/resources/data/botania/recipes/conversions/magenta_petal_block_deconstruct.json +++ b/src/main/resources/data/botania/recipes/conversions/magenta_petal_block_deconstruct.json @@ -1,6 +1,6 @@ { "result": { - "item": "botania:petal_magenta", + "item": "magenta_petal", "count": 9 }, "group": "botania:petal_block_deconstruct", diff --git a/src/main/resources/data/botania/recipes/conversions/manasteel_from_nuggets.json b/src/main/resources/data/botania/recipes/conversions/manasteel_from_nuggets.json index 80f4045c1..9c63b894b 100644 --- a/src/main/resources/data/botania/recipes/conversions/manasteel_from_nuggets.json +++ b/src/main/resources/data/botania/recipes/conversions/manasteel_from_nuggets.json @@ -7,7 +7,7 @@ "III", "III" ], - "type": "forge:ore_shaped", + "type": "minecraft:crafting_shaped", "key": { "I": { "tag": "forge:nuggets/manasteel" diff --git a/src/main/resources/data/botania/recipes/conversions/manasteel_to_nuggets.json b/src/main/resources/data/botania/recipes/conversions/manasteel_to_nuggets.json index 4d663a047..caa4690a3 100644 --- a/src/main/resources/data/botania/recipes/conversions/manasteel_to_nuggets.json +++ b/src/main/resources/data/botania/recipes/conversions/manasteel_to_nuggets.json @@ -8,5 +8,5 @@ "tag": "forge:ingots/manasteel" } ], - "type": "forge:ore_shapeless" + "type": "minecraft:crafting_shapeless" } \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/conversions/orange_petal_block_deconstruct.json b/src/main/resources/data/botania/recipes/conversions/orange_petal_block_deconstruct.json index 1b119d05c..34f16125f 100644 --- a/src/main/resources/data/botania/recipes/conversions/orange_petal_block_deconstruct.json +++ b/src/main/resources/data/botania/recipes/conversions/orange_petal_block_deconstruct.json @@ -1,6 +1,6 @@ { "result": { - "item": "botania:petal_orange", + "item": "orange_petal", "count": 9 }, "group": "botania:petal_block_deconstruct", diff --git a/src/main/resources/data/botania/recipes/conversions/pink_petal_block_deconstruct.json b/src/main/resources/data/botania/recipes/conversions/pink_petal_block_deconstruct.json index 70495f127..037000df0 100644 --- a/src/main/resources/data/botania/recipes/conversions/pink_petal_block_deconstruct.json +++ b/src/main/resources/data/botania/recipes/conversions/pink_petal_block_deconstruct.json @@ -1,6 +1,6 @@ { "result": { - "item": "botania:petal_pink", + "item": "pink_petal", "count": 9 }, "group": "botania:petal_block_deconstruct", diff --git a/src/main/resources/data/botania/recipes/conversions/purple_petal_block_deconstruct.json b/src/main/resources/data/botania/recipes/conversions/purple_petal_block_deconstruct.json index 87994cf8b..d59c29933 100644 --- a/src/main/resources/data/botania/recipes/conversions/purple_petal_block_deconstruct.json +++ b/src/main/resources/data/botania/recipes/conversions/purple_petal_block_deconstruct.json @@ -1,6 +1,6 @@ { "result": { - "item": "botania:petal_purple", + "item": "purple_petal", "count": 9 }, "group": "botania:petal_block_deconstruct", diff --git a/src/main/resources/data/botania/recipes/conversions/red_petal_block_deconstruct.json b/src/main/resources/data/botania/recipes/conversions/red_petal_block_deconstruct.json index 84faab3c2..b84a31d6e 100644 --- a/src/main/resources/data/botania/recipes/conversions/red_petal_block_deconstruct.json +++ b/src/main/resources/data/botania/recipes/conversions/red_petal_block_deconstruct.json @@ -1,6 +1,6 @@ { "result": { - "item": "botania:petal_red", + "item": "red_petal", "count": 9 }, "group": "botania:petal_block_deconstruct", diff --git a/src/main/resources/data/botania/recipes/conversions/silver_petal_block_deconstruct.json b/src/main/resources/data/botania/recipes/conversions/silver_petal_block_deconstruct.json index db6c6bd96..177d4fc8d 100644 --- a/src/main/resources/data/botania/recipes/conversions/silver_petal_block_deconstruct.json +++ b/src/main/resources/data/botania/recipes/conversions/silver_petal_block_deconstruct.json @@ -1,6 +1,6 @@ { "result": { - "item": "botania:petal_silver", + "item": "silver_petal", "count": 9 }, "group": "botania:petal_block_deconstruct", diff --git a/src/main/resources/data/botania/recipes/conversions/terrasteel_from_nugget.json b/src/main/resources/data/botania/recipes/conversions/terrasteel_from_nugget.json index 7f9029323..5ea856a32 100644 --- a/src/main/resources/data/botania/recipes/conversions/terrasteel_from_nugget.json +++ b/src/main/resources/data/botania/recipes/conversions/terrasteel_from_nugget.json @@ -7,7 +7,7 @@ "III", "III" ], - "type": "forge:ore_shaped", + "type": "minecraft:crafting_shaped", "key": { "I": { "tag": "forge:nuggets/terrasteel" diff --git a/src/main/resources/data/botania/recipes/conversions/terrasteel_to_nugget.json b/src/main/resources/data/botania/recipes/conversions/terrasteel_to_nugget.json index 2b4c00b33..0e1758445 100644 --- a/src/main/resources/data/botania/recipes/conversions/terrasteel_to_nugget.json +++ b/src/main/resources/data/botania/recipes/conversions/terrasteel_to_nugget.json @@ -8,5 +8,5 @@ "tag": "forge:ingots/terrasteel" } ], - "type": "forge:ore_shapeless" + "type": "minecraft:crafting_shapeless" } \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/conversions/white_petal_block_deconstruct.json b/src/main/resources/data/botania/recipes/conversions/white_petal_block_deconstruct.json index bea70013a..5e8a640c2 100644 --- a/src/main/resources/data/botania/recipes/conversions/white_petal_block_deconstruct.json +++ b/src/main/resources/data/botania/recipes/conversions/white_petal_block_deconstruct.json @@ -1,6 +1,6 @@ { "result": { - "item": "botania:petal_white", + "item": "white_petal", "count": 9 }, "ingredients": [ diff --git a/src/main/resources/data/botania/recipes/conversions/yellow_petal_block_deconstruct.json b/src/main/resources/data/botania/recipes/conversions/yellow_petal_block_deconstruct.json index bfc91ad6f..ebb24ec5e 100644 --- a/src/main/resources/data/botania/recipes/conversions/yellow_petal_block_deconstruct.json +++ b/src/main/resources/data/botania/recipes/conversions/yellow_petal_block_deconstruct.json @@ -1,6 +1,6 @@ { "result": { - "item": "botania:petal_yellow", + "item": "yellow_petal", "count": 9 }, "group": "botania:petal_block_deconstruct", diff --git a/src/main/resources/data/botania/recipes/corporea_spark.json b/src/main/resources/data/botania/recipes/corporea_spark.json index 296bf9485..b00f2a82e 100644 --- a/src/main/resources/data/botania/recipes/corporea_spark.json +++ b/src/main/resources/data/botania/recipes/corporea_spark.json @@ -13,5 +13,5 @@ "item": "botania:ender_air_bottle" } ], - "type": "forge:ore_shapeless" + "type": "minecraft:crafting_shapeless" } \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/corporea_spark_master.json b/src/main/resources/data/botania/recipes/corporea_spark_master.json index b5f014b6a..984336d4d 100644 --- a/src/main/resources/data/botania/recipes/corporea_spark_master.json +++ b/src/main/resources/data/botania/recipes/corporea_spark_master.json @@ -10,5 +10,5 @@ "tag": "forge:gems/dragonstone" } ], - "type": "forge:ore_shapeless" + "type": "minecraft:crafting_shapeless" } \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/corporeacrystalcube.json b/src/main/resources/data/botania/recipes/corporeacrystalcube.json index ea2ef2e4a..a83c367a9 100644 --- a/src/main/resources/data/botania/recipes/corporeacrystalcube.json +++ b/src/main/resources/data/botania/recipes/corporeacrystalcube.json @@ -7,7 +7,7 @@ "G", "W" ], - "type": "forge:ore_shaped", + "type": "minecraft:crafting_shaped", "key": { "C": { "item": "botania:corporea_spark" diff --git a/src/main/resources/data/botania/recipes/corporeaindex.json b/src/main/resources/data/botania/recipes/corporeaindex.json index 0d05f83e4..ca771acc9 100644 --- a/src/main/resources/data/botania/recipes/corporeaindex.json +++ b/src/main/resources/data/botania/recipes/corporeaindex.json @@ -7,7 +7,7 @@ "OSO", "DOD" ], - "type": "forge:ore_shaped", + "type": "minecraft:crafting_shaped", "key": { "A": { "item": "botania:ender_air_bottle" diff --git a/src/main/resources/data/botania/recipes/corporeainterceptor.json b/src/main/resources/data/botania/recipes/corporeainterceptor.json index 92845a522..0a0ef83d0 100644 --- a/src/main/resources/data/botania/recipes/corporeainterceptor.json +++ b/src/main/resources/data/botania/recipes/corporeainterceptor.json @@ -10,5 +10,5 @@ "item": "botania:corporea_spark" } ], - "type": "forge:ore_shapeless" + "type": "minecraft:crafting_shapeless" } \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/corporearetainer.json b/src/main/resources/data/botania/recipes/corporearetainer.json index 345709d68..4b300d329 100644 --- a/src/main/resources/data/botania/recipes/corporearetainer.json +++ b/src/main/resources/data/botania/recipes/corporearetainer.json @@ -10,5 +10,5 @@ "item": "botania:corporea_spark" } ], - "type": "forge:ore_shapeless" + "type": "minecraft:crafting_shapeless" } \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/cosmetic_32.json b/src/main/resources/data/botania/recipes/cosmetic_32.json index e5d93e7db..7e9469846 100644 --- a/src/main/resources/data/botania/recipes/cosmetic_32.json +++ b/src/main/resources/data/botania/recipes/cosmetic_32.json @@ -8,7 +8,7 @@ "PSP", "PPP" ], - "type": "forge:ore_shaped", + "type": "minecraft:crafting_shaped", "key": { "P": { "item": "botania:tinypotato" diff --git a/src/main/resources/data/botania/recipes/cosmetic_alien_antenna.json b/src/main/resources/data/botania/recipes/cosmetic_alien_antenna.json index dc9026fa2..da600854e 100644 --- a/src/main/resources/data/botania/recipes/cosmetic_alien_antenna.json +++ b/src/main/resources/data/botania/recipes/cosmetic_alien_antenna.json @@ -7,7 +7,7 @@ "PSP", "PPP" ], - "type": "forge:ore_shaped", + "type": "minecraft:crafting_shaped", "key": { "P": { "item": "botania:dye_silver" diff --git a/src/main/resources/data/botania/recipes/cosmetic_anaglyph_glasses.json b/src/main/resources/data/botania/recipes/cosmetic_anaglyph_glasses.json index a64151c08..60bc8bf39 100644 --- a/src/main/resources/data/botania/recipes/cosmetic_anaglyph_glasses.json +++ b/src/main/resources/data/botania/recipes/cosmetic_anaglyph_glasses.json @@ -7,7 +7,7 @@ "PSP", "PPP" ], - "type": "forge:ore_shaped", + "type": "minecraft:crafting_shaped", "key": { "P": { "item": "botania:dye_cyan" diff --git a/src/main/resources/data/botania/recipes/cosmetic_ancient_mask.json b/src/main/resources/data/botania/recipes/cosmetic_ancient_mask.json index b89dd51ac..94a096404 100644 --- a/src/main/resources/data/botania/recipes/cosmetic_ancient_mask.json +++ b/src/main/resources/data/botania/recipes/cosmetic_ancient_mask.json @@ -7,7 +7,7 @@ "PSP", "PPP" ], - "type": "forge:ore_shaped", + "type": "minecraft:crafting_shaped", "key": { "P": { "item": "botania:dye_pink" diff --git a/src/main/resources/data/botania/recipes/cosmetic_black_bowtie.json b/src/main/resources/data/botania/recipes/cosmetic_black_bowtie.json index 9cdb421c7..a057afb2b 100644 --- a/src/main/resources/data/botania/recipes/cosmetic_black_bowtie.json +++ b/src/main/resources/data/botania/recipes/cosmetic_black_bowtie.json @@ -7,10 +7,10 @@ "PSP", "PPP" ], - "type": "forge:ore_shaped", + "type": "minecraft:crafting_shaped", "key": { "P": { - "item": "botania:petal_white" + "item": "botania:white_petal" }, "S": { "item": "botania:mana_string" diff --git a/src/main/resources/data/botania/recipes/cosmetic_black_tie.json b/src/main/resources/data/botania/recipes/cosmetic_black_tie.json index 8fc677624..d95db9bdf 100644 --- a/src/main/resources/data/botania/recipes/cosmetic_black_tie.json +++ b/src/main/resources/data/botania/recipes/cosmetic_black_tie.json @@ -7,10 +7,10 @@ "PSP", "PPP" ], - "type": "forge:ore_shaped", + "type": "minecraft:crafting_shaped", "key": { "P": { - "item": "botania:petal_orange" + "item": "botania:orange_petal" }, "S": { "item": "botania:mana_string" diff --git a/src/main/resources/data/botania/recipes/cosmetic_blue_butterfly.json b/src/main/resources/data/botania/recipes/cosmetic_blue_butterfly.json index bcf52ff7b..0b734e4f6 100644 --- a/src/main/resources/data/botania/recipes/cosmetic_blue_butterfly.json +++ b/src/main/resources/data/botania/recipes/cosmetic_blue_butterfly.json @@ -7,10 +7,10 @@ "PSP", "PPP" ], - "type": "forge:ore_shaped", + "type": "minecraft:crafting_shaped", "key": { "P": { - "item": "botania:petal_purple" + "item": "botania:purple_petal" }, "S": { "item": "botania:mana_string" diff --git a/src/main/resources/data/botania/recipes/cosmetic_botanist_emblem.json b/src/main/resources/data/botania/recipes/cosmetic_botanist_emblem.json index efb795931..400ccee95 100644 --- a/src/main/resources/data/botania/recipes/cosmetic_botanist_emblem.json +++ b/src/main/resources/data/botania/recipes/cosmetic_botanist_emblem.json @@ -7,7 +7,7 @@ "PSP", "PPP" ], - "type": "forge:ore_shaped", + "type": "minecraft:crafting_shaped", "key": { "P": { "item": "botania:dye_lime" diff --git a/src/main/resources/data/botania/recipes/cosmetic_cat_ears.json b/src/main/resources/data/botania/recipes/cosmetic_cat_ears.json index 6a0c2a1d6..9c78e91b5 100644 --- a/src/main/resources/data/botania/recipes/cosmetic_cat_ears.json +++ b/src/main/resources/data/botania/recipes/cosmetic_cat_ears.json @@ -7,10 +7,10 @@ "PSP", "PPP" ], - "type": "forge:ore_shaped", + "type": "minecraft:crafting_shaped", "key": { "P": { - "item": "botania:petal_blue" + "item": "botania:blue_petal" }, "S": { "item": "botania:mana_string" diff --git a/src/main/resources/data/botania/recipes/cosmetic_clock_eye.json b/src/main/resources/data/botania/recipes/cosmetic_clock_eye.json index ed11df481..5789ee8c7 100644 --- a/src/main/resources/data/botania/recipes/cosmetic_clock_eye.json +++ b/src/main/resources/data/botania/recipes/cosmetic_clock_eye.json @@ -7,7 +7,7 @@ "PSP", "PPP" ], - "type": "forge:ore_shaped", + "type": "minecraft:crafting_shaped", "key": { "P": { "item": "botania:dye_orange" diff --git a/src/main/resources/data/botania/recipes/cosmetic_devil_horns.json b/src/main/resources/data/botania/recipes/cosmetic_devil_horns.json index 56bb08cdc..f6a97462b 100644 --- a/src/main/resources/data/botania/recipes/cosmetic_devil_horns.json +++ b/src/main/resources/data/botania/recipes/cosmetic_devil_horns.json @@ -7,7 +7,7 @@ "PSP", "PPP" ], - "type": "forge:ore_shaped", + "type": "minecraft:crafting_shaped", "key": { "P": { "item": "botania:dye_light_blue" diff --git a/src/main/resources/data/botania/recipes/cosmetic_devil_tail.json b/src/main/resources/data/botania/recipes/cosmetic_devil_tail.json index 6c5ce434f..0c3708cdc 100644 --- a/src/main/resources/data/botania/recipes/cosmetic_devil_tail.json +++ b/src/main/resources/data/botania/recipes/cosmetic_devil_tail.json @@ -7,10 +7,10 @@ "PSP", "PPP" ], - "type": "forge:ore_shaped", + "type": "minecraft:crafting_shaped", "key": { "P": { - "item": "botania:petal_green" + "item": "botania:green_petal" }, "S": { "item": "botania:mana_string" diff --git a/src/main/resources/data/botania/recipes/cosmetic_eerie_mask.json b/src/main/resources/data/botania/recipes/cosmetic_eerie_mask.json index b0ad08833..07f4936bd 100644 --- a/src/main/resources/data/botania/recipes/cosmetic_eerie_mask.json +++ b/src/main/resources/data/botania/recipes/cosmetic_eerie_mask.json @@ -7,7 +7,7 @@ "PSP", "PPP" ], - "type": "forge:ore_shaped", + "type": "minecraft:crafting_shaped", "key": { "P": { "item": "botania:dye_gray" diff --git a/src/main/resources/data/botania/recipes/cosmetic_engineer_goggles.json b/src/main/resources/data/botania/recipes/cosmetic_engineer_goggles.json index a4408df50..766139818 100644 --- a/src/main/resources/data/botania/recipes/cosmetic_engineer_goggles.json +++ b/src/main/resources/data/botania/recipes/cosmetic_engineer_goggles.json @@ -7,10 +7,10 @@ "PSP", "PPP" ], - "type": "forge:ore_shaped", + "type": "minecraft:crafting_shaped", "key": { "P": { - "item": "botania:petal_yellow" + "item": "botania:yellow_petal" }, "S": { "item": "botania:mana_string" diff --git a/src/main/resources/data/botania/recipes/cosmetic_eyepatch.json b/src/main/resources/data/botania/recipes/cosmetic_eyepatch.json index 62a85697f..829d827f7 100644 --- a/src/main/resources/data/botania/recipes/cosmetic_eyepatch.json +++ b/src/main/resources/data/botania/recipes/cosmetic_eyepatch.json @@ -7,10 +7,10 @@ "PSP", "PPP" ], - "type": "forge:ore_shaped", + "type": "minecraft:crafting_shaped", "key": { "P": { - "item": "botania:petal_lime" + "item": "botania:lime_petal" }, "S": { "item": "botania:mana_string" diff --git a/src/main/resources/data/botania/recipes/cosmetic_four_leaf_clover.json b/src/main/resources/data/botania/recipes/cosmetic_four_leaf_clover.json index 0cbfa6a43..b112fe60c 100644 --- a/src/main/resources/data/botania/recipes/cosmetic_four_leaf_clover.json +++ b/src/main/resources/data/botania/recipes/cosmetic_four_leaf_clover.json @@ -7,7 +7,7 @@ "PSP", "PPP" ], - "type": "forge:ore_shaped", + "type": "minecraft:crafting_shaped", "key": { "P": { "item": "botania:dye_white" diff --git a/src/main/resources/data/botania/recipes/cosmetic_googly_eyes.json b/src/main/resources/data/botania/recipes/cosmetic_googly_eyes.json index 6a1c429c2..dafe08f96 100644 --- a/src/main/resources/data/botania/recipes/cosmetic_googly_eyes.json +++ b/src/main/resources/data/botania/recipes/cosmetic_googly_eyes.json @@ -7,10 +7,10 @@ "PSP", "PPP" ], - "type": "forge:ore_shaped", + "type": "minecraft:crafting_shaped", "key": { "P": { - "item": "botania:petal_black" + "item": "botania:black_petal" }, "S": { "item": "botania:mana_string" diff --git a/src/main/resources/data/botania/recipes/cosmetic_groucho_glasses.json b/src/main/resources/data/botania/recipes/cosmetic_groucho_glasses.json index b1356cb54..4290e328b 100644 --- a/src/main/resources/data/botania/recipes/cosmetic_groucho_glasses.json +++ b/src/main/resources/data/botania/recipes/cosmetic_groucho_glasses.json @@ -7,7 +7,7 @@ "PSP", "PPP" ], - "type": "forge:ore_shaped", + "type": "minecraft:crafting_shaped", "key": { "P": { "item": "botania:dye_blue" diff --git a/src/main/resources/data/botania/recipes/cosmetic_hyper_plus.json b/src/main/resources/data/botania/recipes/cosmetic_hyper_plus.json index b32d6292d..16f8c048e 100644 --- a/src/main/resources/data/botania/recipes/cosmetic_hyper_plus.json +++ b/src/main/resources/data/botania/recipes/cosmetic_hyper_plus.json @@ -7,7 +7,7 @@ "PSP", "PPP" ], - "type": "forge:ore_shaped", + "type": "minecraft:crafting_shaped", "key": { "P": { "item": "botania:dye_yellow" diff --git a/src/main/resources/data/botania/recipes/cosmetic_kamui_eye.json b/src/main/resources/data/botania/recipes/cosmetic_kamui_eye.json index ef900d745..c310768ce 100644 --- a/src/main/resources/data/botania/recipes/cosmetic_kamui_eye.json +++ b/src/main/resources/data/botania/recipes/cosmetic_kamui_eye.json @@ -7,10 +7,10 @@ "PSP", "PPP" ], - "type": "forge:ore_shaped", + "type": "minecraft:crafting_shaped", "key": { "P": { - "item": "botania:petal_red" + "item": "botania:red_petal" }, "S": { "item": "botania:mana_string" diff --git a/src/main/resources/data/botania/recipes/cosmetic_lusitanic_shield.json b/src/main/resources/data/botania/recipes/cosmetic_lusitanic_shield.json index c401cf908..e0938106d 100644 --- a/src/main/resources/data/botania/recipes/cosmetic_lusitanic_shield.json +++ b/src/main/resources/data/botania/recipes/cosmetic_lusitanic_shield.json @@ -7,7 +7,7 @@ "PSP", "PPP" ], - "type": "forge:ore_shaped", + "type": "minecraft:crafting_shaped", "key": { "P": { "item": "botania:dye_green" diff --git a/src/main/resources/data/botania/recipes/cosmetic_orange_shades.json b/src/main/resources/data/botania/recipes/cosmetic_orange_shades.json index 85b1d5412..9f959b971 100644 --- a/src/main/resources/data/botania/recipes/cosmetic_orange_shades.json +++ b/src/main/resources/data/botania/recipes/cosmetic_orange_shades.json @@ -7,7 +7,7 @@ "PSP", "PPP" ], - "type": "forge:ore_shaped", + "type": "minecraft:crafting_shaped", "key": { "P": { "item": "botania:dye_purple" diff --git a/src/main/resources/data/botania/recipes/cosmetic_pink_flower_bud.json b/src/main/resources/data/botania/recipes/cosmetic_pink_flower_bud.json index c2bfed832..a227f6843 100644 --- a/src/main/resources/data/botania/recipes/cosmetic_pink_flower_bud.json +++ b/src/main/resources/data/botania/recipes/cosmetic_pink_flower_bud.json @@ -7,10 +7,10 @@ "PSP", "PPP" ], - "type": "forge:ore_shaped", + "type": "minecraft:crafting_shaped", "key": { "P": { - "item": "botania:petal_silver" + "item": "botania:silver_petal" }, "S": { "item": "botania:mana_string" diff --git a/src/main/resources/data/botania/recipes/cosmetic_polka_dotted_bows.json b/src/main/resources/data/botania/recipes/cosmetic_polka_dotted_bows.json index 96f6452ff..84af1e903 100644 --- a/src/main/resources/data/botania/recipes/cosmetic_polka_dotted_bows.json +++ b/src/main/resources/data/botania/recipes/cosmetic_polka_dotted_bows.json @@ -7,10 +7,10 @@ "PSP", "PPP" ], - "type": "forge:ore_shaped", + "type": "minecraft:crafting_shaped", "key": { "P": { - "item": "botania:petal_cyan" + "item": "botania:cyan_petal" }, "S": { "item": "botania:mana_string" diff --git a/src/main/resources/data/botania/recipes/cosmetic_puffy_scarf.json b/src/main/resources/data/botania/recipes/cosmetic_puffy_scarf.json index deff6ef6f..a3119b121 100644 --- a/src/main/resources/data/botania/recipes/cosmetic_puffy_scarf.json +++ b/src/main/resources/data/botania/recipes/cosmetic_puffy_scarf.json @@ -7,10 +7,10 @@ "PSP", "PPP" ], - "type": "forge:ore_shaped", + "type": "minecraft:crafting_shaped", "key": { "P": { - "item": "botania:petal_light_blue" + "item": "botania:light_blue_petal" }, "S": { "item": "botania:mana_string" diff --git a/src/main/resources/data/botania/recipes/cosmetic_questgiver_mark.json b/src/main/resources/data/botania/recipes/cosmetic_questgiver_mark.json index 293d786fd..092e6feb5 100644 --- a/src/main/resources/data/botania/recipes/cosmetic_questgiver_mark.json +++ b/src/main/resources/data/botania/recipes/cosmetic_questgiver_mark.json @@ -7,7 +7,7 @@ "PSP", "PPP" ], - "type": "forge:ore_shaped", + "type": "minecraft:crafting_shaped", "key": { "P": { "item": "botania:dye_black" diff --git a/src/main/resources/data/botania/recipes/cosmetic_red_glasses.json b/src/main/resources/data/botania/recipes/cosmetic_red_glasses.json index 0e8afad99..a7b257a88 100644 --- a/src/main/resources/data/botania/recipes/cosmetic_red_glasses.json +++ b/src/main/resources/data/botania/recipes/cosmetic_red_glasses.json @@ -7,10 +7,10 @@ "PSP", "PPP" ], - "type": "forge:ore_shaped", + "type": "minecraft:crafting_shaped", "key": { "P": { - "item": "botania:petal_magenta" + "item": "botania:magenta_petal" }, "S": { "item": "botania:mana_string" diff --git a/src/main/resources/data/botania/recipes/cosmetic_red_ribbons.json b/src/main/resources/data/botania/recipes/cosmetic_red_ribbons.json index 469102ee0..76abd2499 100644 --- a/src/main/resources/data/botania/recipes/cosmetic_red_ribbons.json +++ b/src/main/resources/data/botania/recipes/cosmetic_red_ribbons.json @@ -7,10 +7,10 @@ "PSP", "PPP" ], - "type": "forge:ore_shaped", + "type": "minecraft:crafting_shaped", "key": { "P": { - "item": "botania:petal_gray" + "item": "botania:gray_petal" }, "S": { "item": "botania:mana_string" diff --git a/src/main/resources/data/botania/recipes/cosmetic_thick_eyebrows.json b/src/main/resources/data/botania/recipes/cosmetic_thick_eyebrows.json index 73391e2f6..ea0bc348c 100644 --- a/src/main/resources/data/botania/recipes/cosmetic_thick_eyebrows.json +++ b/src/main/resources/data/botania/recipes/cosmetic_thick_eyebrows.json @@ -7,7 +7,7 @@ "PSP", "PPP" ], - "type": "forge:ore_shaped", + "type": "minecraft:crafting_shaped", "key": { "P": { "item": "botania:dye_brown" diff --git a/src/main/resources/data/botania/recipes/cosmetic_tiny_potato_mask.json b/src/main/resources/data/botania/recipes/cosmetic_tiny_potato_mask.json index 2646a9d50..65109a373 100644 --- a/src/main/resources/data/botania/recipes/cosmetic_tiny_potato_mask.json +++ b/src/main/resources/data/botania/recipes/cosmetic_tiny_potato_mask.json @@ -7,7 +7,7 @@ "PSP", "PPP" ], - "type": "forge:ore_shaped", + "type": "minecraft:crafting_shaped", "key": { "P": { "item": "botania:dye_red" diff --git a/src/main/resources/data/botania/recipes/cosmetic_unicorn_horn.json b/src/main/resources/data/botania/recipes/cosmetic_unicorn_horn.json index 0aaa91865..2a8a71b5b 100644 --- a/src/main/resources/data/botania/recipes/cosmetic_unicorn_horn.json +++ b/src/main/resources/data/botania/recipes/cosmetic_unicorn_horn.json @@ -7,7 +7,7 @@ "PSP", "PPP" ], - "type": "forge:ore_shaped", + "type": "minecraft:crafting_shaped", "key": { "P": { "item": "botania:dye_magenta" diff --git a/src/main/resources/data/botania/recipes/cosmetic_wicked_eyepatch.json b/src/main/resources/data/botania/recipes/cosmetic_wicked_eyepatch.json index 7466be8fb..5cf703691 100644 --- a/src/main/resources/data/botania/recipes/cosmetic_wicked_eyepatch.json +++ b/src/main/resources/data/botania/recipes/cosmetic_wicked_eyepatch.json @@ -7,10 +7,10 @@ "PSP", "PPP" ], - "type": "forge:ore_shaped", + "type": "minecraft:crafting_shaped", "key": { "P": { - "item": "botania:petal_pink" + "item": "botania:pink_petal" }, "S": { "item": "botania:mana_string" diff --git a/src/main/resources/data/botania/recipes/cosmetic_witch_pin.json b/src/main/resources/data/botania/recipes/cosmetic_witch_pin.json index 3a294e6a2..2592a88b7 100644 --- a/src/main/resources/data/botania/recipes/cosmetic_witch_pin.json +++ b/src/main/resources/data/botania/recipes/cosmetic_witch_pin.json @@ -7,10 +7,10 @@ "PSP", "PPP" ], - "type": "forge:ore_shaped", + "type": "minecraft:crafting_shaped", "key": { "P": { - "item": "botania:petal_brown" + "item": "botania:brown_petal" }, "S": { "item": "botania:mana_string" diff --git a/src/main/resources/data/botania/recipes/craftcrate.json b/src/main/resources/data/botania/recipes/craftcrate.json index 98b5502dd..be78a46c0 100644 --- a/src/main/resources/data/botania/recipes/craftcrate.json +++ b/src/main/resources/data/botania/recipes/craftcrate.json @@ -7,7 +7,7 @@ "W W", "W W" ], - "type": "forge:ore_shaped", + "type": "minecraft:crafting_shaped", "key": { "C": { "item": "minecraft:crafting_table" diff --git a/src/main/resources/data/botania/recipes/craftinghalo.json b/src/main/resources/data/botania/recipes/craftinghalo.json index 59e20b400..0c5b72a39 100644 --- a/src/main/resources/data/botania/recipes/craftinghalo.json +++ b/src/main/resources/data/botania/recipes/craftinghalo.json @@ -7,7 +7,7 @@ "ICI", " I " ], - "type": "forge:ore_shaped", + "type": "minecraft:crafting_shaped", "key": { "P": { "item": "botania:mana_pearl" diff --git a/src/main/resources/data/botania/recipes/crystalbow.json b/src/main/resources/data/botania/recipes/crystalbow.json index d2c4c7776..673f4502d 100644 --- a/src/main/resources/data/botania/recipes/crystalbow.json +++ b/src/main/resources/data/botania/recipes/crystalbow.json @@ -7,7 +7,7 @@ "T S", " DS" ], - "type": "forge:ore_shaped", + "type": "minecraft:crafting_shaped", "key": { "S": { "item": "botania:mana_string" diff --git a/src/main/resources/data/botania/recipes/cyan_petal_block.json b/src/main/resources/data/botania/recipes/cyan_petal_block.json index d972a5d02..6ec2cf40a 100644 --- a/src/main/resources/data/botania/recipes/cyan_petal_block.json +++ b/src/main/resources/data/botania/recipes/cyan_petal_block.json @@ -7,7 +7,7 @@ "PPP", "PPP" ], - "type": "forge:ore_shaped", + "type": "minecraft:crafting_shaped", "group": "botania:petal_block", "key": { "P": { diff --git a/src/main/resources/data/botania/recipes/dirtrod.json b/src/main/resources/data/botania/recipes/dirtrod.json index 97c09413e..703e617a3 100644 --- a/src/main/resources/data/botania/recipes/dirtrod.json +++ b/src/main/resources/data/botania/recipes/dirtrod.json @@ -7,7 +7,7 @@ " T ", "E " ], - "type": "forge:ore_shaped", + "type": "minecraft:crafting_shaped", "key": { "D": { "item": "minecraft:dirt", diff --git a/src/main/resources/data/botania/recipes/distributor.json b/src/main/resources/data/botania/recipes/distributor.json index 93fee7b1d..d324fbdfb 100644 --- a/src/main/resources/data/botania/recipes/distributor.json +++ b/src/main/resources/data/botania/recipes/distributor.json @@ -7,7 +7,7 @@ "S S", "RRR" ], - "type": "forge:ore_shaped", + "type": "minecraft:crafting_shaped", "key": { "R": { "tag": "botania:livingrock" diff --git a/src/main/resources/data/botania/recipes/divacharm.json b/src/main/resources/data/botania/recipes/divacharm.json index 76b07c0b5..c6da9e5c9 100644 --- a/src/main/resources/data/botania/recipes/divacharm.json +++ b/src/main/resources/data/botania/recipes/divacharm.json @@ -7,7 +7,7 @@ " HG", " GL" ], - "type": "forge:ore_shaped", + "type": "minecraft:crafting_shaped", "key": { "P": { "item": "botania:tinyplanet" diff --git a/src/main/resources/data/botania/recipes/diviningrod.json b/src/main/resources/data/botania/recipes/diviningrod.json index 5697afa09..4c2bac1ff 100644 --- a/src/main/resources/data/botania/recipes/diviningrod.json +++ b/src/main/resources/data/botania/recipes/diviningrod.json @@ -7,7 +7,7 @@ " TT", "T " ], - "type": "forge:ore_shaped", + "type": "minecraft:crafting_shaped", "key": { "T": { "item": "botania:livingwood_twig" diff --git a/src/main/resources/data/botania/recipes/dodgering.json b/src/main/resources/data/botania/recipes/dodgering.json index 3dfd8cdf3..36201e870 100644 --- a/src/main/resources/data/botania/recipes/dodgering.json +++ b/src/main/resources/data/botania/recipes/dodgering.json @@ -7,7 +7,7 @@ "M M", " MR" ], - "type": "forge:ore_shaped", + "type": "minecraft:crafting_shaped", "key": { "R": { "tag": "botania:runes/air" diff --git a/src/main/resources/data/botania/recipes/dragonstone_block.json b/src/main/resources/data/botania/recipes/dragonstone_block.json index a9c3596a4..66f8e1123 100644 --- a/src/main/resources/data/botania/recipes/dragonstone_block.json +++ b/src/main/resources/data/botania/recipes/dragonstone_block.json @@ -7,7 +7,7 @@ "III", "III" ], - "type": "forge:ore_shaped", + "type": "minecraft:crafting_shaped", "key": { "I": { "tag": "forge:gems/dragonstone" diff --git a/src/main/resources/data/botania/recipes/dreamwood_1.json b/src/main/resources/data/botania/recipes/dreamwood_1.json index b202fa62d..9190109aa 100644 --- a/src/main/resources/data/botania/recipes/dreamwood_1.json +++ b/src/main/resources/data/botania/recipes/dreamwood_1.json @@ -9,5 +9,5 @@ "item": "botania:dreamwood" } ], - "type": "forge:ore_shapeless" + "type": "minecraft:crafting_shapeless" } \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/dreamwood_5.json b/src/main/resources/data/botania/recipes/dreamwood_5.json index 95154e87e..2af13ea0e 100644 --- a/src/main/resources/data/botania/recipes/dreamwood_5.json +++ b/src/main/resources/data/botania/recipes/dreamwood_5.json @@ -11,5 +11,5 @@ "tag": "forge:dusts/glowstone" } ], - "type": "forge:ore_shapeless" + "type": "minecraft:crafting_shapeless" } \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/dreamwood_twig.json b/src/main/resources/data/botania/recipes/dreamwood_twig.json index 98385401f..80b6ab927 100644 --- a/src/main/resources/data/botania/recipes/dreamwood_twig.json +++ b/src/main/resources/data/botania/recipes/dreamwood_twig.json @@ -6,7 +6,7 @@ "W", "W" ], - "type": "forge:ore_shaped", + "type": "minecraft:crafting_shaped", "key": { "W": { "item": "botania:dreamwood" diff --git a/src/main/resources/data/botania/recipes/drum_canopy.json b/src/main/resources/data/botania/recipes/drum_canopy.json index 891b5a438..89e14a05b 100644 --- a/src/main/resources/data/botania/recipes/drum_canopy.json +++ b/src/main/resources/data/botania/recipes/drum_canopy.json @@ -7,7 +7,7 @@ "WHW", "WLW" ], - "type": "forge:ore_shaped", + "type": "minecraft:crafting_shaped", "key": { "W": { "tag": "botania:livingwood" diff --git a/src/main/resources/data/botania/recipes/drum_gathering.json b/src/main/resources/data/botania/recipes/drum_gathering.json index 3625dc50e..2b897f449 100644 --- a/src/main/resources/data/botania/recipes/drum_gathering.json +++ b/src/main/resources/data/botania/recipes/drum_gathering.json @@ -7,7 +7,7 @@ "WEW", "WLW" ], - "type": "forge:ore_shaped", + "type": "minecraft:crafting_shaped", "key": { "E": { "tag": "forge:ingots/elementium" diff --git a/src/main/resources/data/botania/recipes/drum_wild.json b/src/main/resources/data/botania/recipes/drum_wild.json index 065036542..ba2a60cce 100644 --- a/src/main/resources/data/botania/recipes/drum_wild.json +++ b/src/main/resources/data/botania/recipes/drum_wild.json @@ -7,7 +7,7 @@ "WHW", "WLW" ], - "type": "forge:ore_shaped", + "type": "minecraft:crafting_shaped", "key": { "W": { "tag": "botania:livingwood" diff --git a/src/main/resources/data/botania/recipes/dye_black.json b/src/main/resources/data/botania/recipes/dye_black.json index 7052c6e32..f2e14318f 100644 --- a/src/main/resources/data/botania/recipes/dye_black.json +++ b/src/main/resources/data/botania/recipes/dye_black.json @@ -11,5 +11,5 @@ "item": "botania:pestle_and_mortar" } ], - "type": "forge:ore_shapeless" + "type": "minecraft:crafting_shapeless" } \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/dye_blue.json b/src/main/resources/data/botania/recipes/dye_blue.json index ce12cfd51..07441cd9e 100644 --- a/src/main/resources/data/botania/recipes/dye_blue.json +++ b/src/main/resources/data/botania/recipes/dye_blue.json @@ -11,5 +11,5 @@ "item": "botania:pestle_and_mortar" } ], - "type": "forge:ore_shapeless" + "type": "minecraft:crafting_shapeless" } \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/dye_brown.json b/src/main/resources/data/botania/recipes/dye_brown.json index 4762608ed..d2291f240 100644 --- a/src/main/resources/data/botania/recipes/dye_brown.json +++ b/src/main/resources/data/botania/recipes/dye_brown.json @@ -11,5 +11,5 @@ "item": "botania:pestle_and_mortar" } ], - "type": "forge:ore_shapeless" + "type": "minecraft:crafting_shapeless" } \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/dye_cyan.json b/src/main/resources/data/botania/recipes/dye_cyan.json index 5b4b40cce..63e2869ae 100644 --- a/src/main/resources/data/botania/recipes/dye_cyan.json +++ b/src/main/resources/data/botania/recipes/dye_cyan.json @@ -11,5 +11,5 @@ "item": "botania:pestle_and_mortar" } ], - "type": "forge:ore_shapeless" + "type": "minecraft:crafting_shapeless" } \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/dye_gray.json b/src/main/resources/data/botania/recipes/dye_gray.json index 361397bc7..3aa96929c 100644 --- a/src/main/resources/data/botania/recipes/dye_gray.json +++ b/src/main/resources/data/botania/recipes/dye_gray.json @@ -11,5 +11,5 @@ "item": "botania:pestle_and_mortar" } ], - "type": "forge:ore_shapeless" + "type": "minecraft:crafting_shapeless" } \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/dye_green.json b/src/main/resources/data/botania/recipes/dye_green.json index e31472ec7..d3972b4d2 100644 --- a/src/main/resources/data/botania/recipes/dye_green.json +++ b/src/main/resources/data/botania/recipes/dye_green.json @@ -11,5 +11,5 @@ "item": "botania:pestle_and_mortar" } ], - "type": "forge:ore_shapeless" + "type": "minecraft:crafting_shapeless" } \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/dye_light_blue.json b/src/main/resources/data/botania/recipes/dye_light_blue.json index 5f5396f86..1bbb1ca25 100644 --- a/src/main/resources/data/botania/recipes/dye_light_blue.json +++ b/src/main/resources/data/botania/recipes/dye_light_blue.json @@ -17,5 +17,5 @@ "item": "botania:pestle_and_mortar" } ], - "type": "forge:ore_shapeless" + "type": "minecraft:crafting_shapeless" } \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/dye_lime.json b/src/main/resources/data/botania/recipes/dye_lime.json index 6a8d39c52..9707e157d 100644 --- a/src/main/resources/data/botania/recipes/dye_lime.json +++ b/src/main/resources/data/botania/recipes/dye_lime.json @@ -11,5 +11,5 @@ "item": "botania:pestle_and_mortar" } ], - "type": "forge:ore_shapeless" + "type": "minecraft:crafting_shapeless" } \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/dye_magenta.json b/src/main/resources/data/botania/recipes/dye_magenta.json index ece05065c..b3980e868 100644 --- a/src/main/resources/data/botania/recipes/dye_magenta.json +++ b/src/main/resources/data/botania/recipes/dye_magenta.json @@ -11,5 +11,5 @@ "item": "botania:pestle_and_mortar" } ], - "type": "forge:ore_shapeless" + "type": "minecraft:crafting_shapeless" } \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/dye_magenta_double.json b/src/main/resources/data/botania/recipes/dye_magenta_double.json index 1ae39c05b..7c5057b04 100644 --- a/src/main/resources/data/botania/recipes/dye_magenta_double.json +++ b/src/main/resources/data/botania/recipes/dye_magenta_double.json @@ -13,5 +13,5 @@ "item": "botania:pestle_and_mortar" } ], - "type": "forge:ore_shapeless" + "type": "minecraft:crafting_shapeless" } \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/dye_orange.json b/src/main/resources/data/botania/recipes/dye_orange.json index 7dd73c807..b1676b8ea 100644 --- a/src/main/resources/data/botania/recipes/dye_orange.json +++ b/src/main/resources/data/botania/recipes/dye_orange.json @@ -17,5 +17,5 @@ "item": "botania:pestle_and_mortar" } ], - "type": "forge:ore_shapeless" + "type": "minecraft:crafting_shapeless" } \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/dye_pink.json b/src/main/resources/data/botania/recipes/dye_pink.json index 4591dc399..df504e995 100644 --- a/src/main/resources/data/botania/recipes/dye_pink.json +++ b/src/main/resources/data/botania/recipes/dye_pink.json @@ -17,5 +17,5 @@ "item": "botania:pestle_and_mortar" } ], - "type": "forge:ore_shapeless" + "type": "minecraft:crafting_shapeless" } \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/dye_pink_double.json b/src/main/resources/data/botania/recipes/dye_pink_double.json index da3b84913..48a4cefae 100644 --- a/src/main/resources/data/botania/recipes/dye_pink_double.json +++ b/src/main/resources/data/botania/recipes/dye_pink_double.json @@ -13,5 +13,5 @@ "item": "botania:pestle_and_mortar" } ], - "type": "forge:ore_shapeless" + "type": "minecraft:crafting_shapeless" } \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/dye_purple.json b/src/main/resources/data/botania/recipes/dye_purple.json index cbdd23a93..f7935d64b 100644 --- a/src/main/resources/data/botania/recipes/dye_purple.json +++ b/src/main/resources/data/botania/recipes/dye_purple.json @@ -11,5 +11,5 @@ "item": "botania:pestle_and_mortar" } ], - "type": "forge:ore_shapeless" + "type": "minecraft:crafting_shapeless" } \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/dye_red.json b/src/main/resources/data/botania/recipes/dye_red.json index f93c15bd6..4db3b464e 100644 --- a/src/main/resources/data/botania/recipes/dye_red.json +++ b/src/main/resources/data/botania/recipes/dye_red.json @@ -21,5 +21,5 @@ "item": "botania:pestle_and_mortar" } ], - "type": "forge:ore_shapeless" + "type": "minecraft:crafting_shapeless" } \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/dye_red_double.json b/src/main/resources/data/botania/recipes/dye_red_double.json index 795575334..a099f82fd 100644 --- a/src/main/resources/data/botania/recipes/dye_red_double.json +++ b/src/main/resources/data/botania/recipes/dye_red_double.json @@ -13,5 +13,5 @@ "item": "botania:pestle_and_mortar" } ], - "type": "forge:ore_shapeless" + "type": "minecraft:crafting_shapeless" } \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/dye_silver.json b/src/main/resources/data/botania/recipes/dye_silver.json index 07c314a93..96f9b9cbc 100644 --- a/src/main/resources/data/botania/recipes/dye_silver.json +++ b/src/main/resources/data/botania/recipes/dye_silver.json @@ -18,12 +18,12 @@ "data": 8 }, { - "tag": "botania:petals/lightgray" + "tag": "botania:petals/light_gray" } ], { "item": "botania:pestle_and_mortar" } ], - "type": "forge:ore_shapeless" + "type": "minecraft:crafting_shapeless" } \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/dye_white.json b/src/main/resources/data/botania/recipes/dye_white.json index 8e082bebf..9bded71a3 100644 --- a/src/main/resources/data/botania/recipes/dye_white.json +++ b/src/main/resources/data/botania/recipes/dye_white.json @@ -11,5 +11,5 @@ "item": "botania:pestle_and_mortar" } ], - "type": "forge:ore_shapeless" + "type": "minecraft:crafting_shapeless" } \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/dye_yellow.json b/src/main/resources/data/botania/recipes/dye_yellow.json index 939102a53..abc63cebf 100644 --- a/src/main/resources/data/botania/recipes/dye_yellow.json +++ b/src/main/resources/data/botania/recipes/dye_yellow.json @@ -17,5 +17,5 @@ "item": "botania:pestle_and_mortar" } ], - "type": "forge:ore_shapeless" + "type": "minecraft:crafting_shapeless" } \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/dye_yellow_double.json b/src/main/resources/data/botania/recipes/dye_yellow_double.json index b1bc5d8e3..b77f7bd73 100644 --- a/src/main/resources/data/botania/recipes/dye_yellow_double.json +++ b/src/main/resources/data/botania/recipes/dye_yellow_double.json @@ -13,5 +13,5 @@ "item": "botania:pestle_and_mortar" } ], - "type": "forge:ore_shapeless" + "type": "minecraft:crafting_shapeless" } \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/elementium_block.json b/src/main/resources/data/botania/recipes/elementium_block.json index 1b7e67bee..ab4538520 100644 --- a/src/main/resources/data/botania/recipes/elementium_block.json +++ b/src/main/resources/data/botania/recipes/elementium_block.json @@ -7,7 +7,7 @@ "III", "III" ], - "type": "forge:ore_shaped", + "type": "minecraft:crafting_shaped", "key": { "I": { "tag": "forge:ingots/elementium" diff --git a/src/main/resources/data/botania/recipes/elementiumaxe.json b/src/main/resources/data/botania/recipes/elementiumaxe.json index 93a4d44c0..734194fcb 100644 --- a/src/main/resources/data/botania/recipes/elementiumaxe.json +++ b/src/main/resources/data/botania/recipes/elementiumaxe.json @@ -7,7 +7,7 @@ "TS", "T " ], - "type": "forge:ore_shaped", + "type": "minecraft:crafting_shaped", "key": { "S": { "tag": "forge:ingots/elementium" diff --git a/src/main/resources/data/botania/recipes/elementiumboots.json b/src/main/resources/data/botania/recipes/elementiumboots.json index 3a3425c57..7dc2d1e21 100644 --- a/src/main/resources/data/botania/recipes/elementiumboots.json +++ b/src/main/resources/data/botania/recipes/elementiumboots.json @@ -6,7 +6,7 @@ "S S", "S S" ], - "type": "forge:ore_shaped", + "type": "minecraft:crafting_shaped", "key": { "S": { "tag": "forge:ingots/elementium" diff --git a/src/main/resources/data/botania/recipes/elementiumchest.json b/src/main/resources/data/botania/recipes/elementiumchest.json index 3ae420d61..1883026f1 100644 --- a/src/main/resources/data/botania/recipes/elementiumchest.json +++ b/src/main/resources/data/botania/recipes/elementiumchest.json @@ -7,7 +7,7 @@ "SSS", "SSS" ], - "type": "forge:ore_shaped", + "type": "minecraft:crafting_shaped", "key": { "S": { "tag": "forge:ingots/elementium" diff --git a/src/main/resources/data/botania/recipes/elementiumhelm.json b/src/main/resources/data/botania/recipes/elementiumhelm.json index 9e87d40f4..6a6746648 100644 --- a/src/main/resources/data/botania/recipes/elementiumhelm.json +++ b/src/main/resources/data/botania/recipes/elementiumhelm.json @@ -6,7 +6,7 @@ "SSS", "S S" ], - "type": "forge:ore_shaped", + "type": "minecraft:crafting_shaped", "key": { "S": { "tag": "forge:ingots/elementium" diff --git a/src/main/resources/data/botania/recipes/elementiumlegs.json b/src/main/resources/data/botania/recipes/elementiumlegs.json index 9c196e40b..99ba92d83 100644 --- a/src/main/resources/data/botania/recipes/elementiumlegs.json +++ b/src/main/resources/data/botania/recipes/elementiumlegs.json @@ -7,7 +7,7 @@ "S S", "S S" ], - "type": "forge:ore_shaped", + "type": "minecraft:crafting_shaped", "key": { "S": { "tag": "forge:ingots/elementium" diff --git a/src/main/resources/data/botania/recipes/elementiumpick.json b/src/main/resources/data/botania/recipes/elementiumpick.json index 48667d076..b4a835b1a 100644 --- a/src/main/resources/data/botania/recipes/elementiumpick.json +++ b/src/main/resources/data/botania/recipes/elementiumpick.json @@ -7,7 +7,7 @@ " T ", " T " ], - "type": "forge:ore_shaped", + "type": "minecraft:crafting_shaped", "key": { "S": { "tag": "forge:ingots/elementium" diff --git a/src/main/resources/data/botania/recipes/elementiumshears.json b/src/main/resources/data/botania/recipes/elementiumshears.json index ca623bc70..46fa8e6da 100644 --- a/src/main/resources/data/botania/recipes/elementiumshears.json +++ b/src/main/resources/data/botania/recipes/elementiumshears.json @@ -6,7 +6,7 @@ "S ", " S" ], - "type": "forge:ore_shaped", + "type": "minecraft:crafting_shaped", "key": { "S": { "tag": "forge:ingots/elementium" diff --git a/src/main/resources/data/botania/recipes/elementiumshovel.json b/src/main/resources/data/botania/recipes/elementiumshovel.json index 49f019a05..3de958a3f 100644 --- a/src/main/resources/data/botania/recipes/elementiumshovel.json +++ b/src/main/resources/data/botania/recipes/elementiumshovel.json @@ -7,7 +7,7 @@ "T", "T" ], - "type": "forge:ore_shaped", + "type": "minecraft:crafting_shaped", "key": { "S": { "tag": "forge:ingots/elementium" diff --git a/src/main/resources/data/botania/recipes/elementiumsword.json b/src/main/resources/data/botania/recipes/elementiumsword.json index 07ccf0b40..c6c53c73d 100644 --- a/src/main/resources/data/botania/recipes/elementiumsword.json +++ b/src/main/resources/data/botania/recipes/elementiumsword.json @@ -7,7 +7,7 @@ "S", "T" ], - "type": "forge:ore_shaped", + "type": "minecraft:crafting_shaped", "key": { "S": { "tag": "forge:ingots/elementium" diff --git a/src/main/resources/data/botania/recipes/elven_spreader.json b/src/main/resources/data/botania/recipes/elven_spreader.json index 515aa8676..517719937 100644 --- a/src/main/resources/data/botania/recipes/elven_spreader.json +++ b/src/main/resources/data/botania/recipes/elven_spreader.json @@ -8,7 +8,7 @@ "WWW" ], "group": "botania:spreader", - "type": "forge:ore_shaped", + "type": "minecraft:crafting_shaped", "key": { "P": [ { @@ -36,7 +36,7 @@ "tag": "botania:petals/gray" }, { - "tag": "botania:petals/lightgray" + "tag": "botania:petals/light_gray" }, { "tag": "botania:petals/cyan" diff --git a/src/main/resources/data/botania/recipes/enderdagger.json b/src/main/resources/data/botania/recipes/enderdagger.json index 13119df48..19f331c57 100644 --- a/src/main/resources/data/botania/recipes/enderdagger.json +++ b/src/main/resources/data/botania/recipes/enderdagger.json @@ -7,7 +7,7 @@ "S", "T" ], - "type": "forge:ore_shaped", + "type": "minecraft:crafting_shaped", "key": { "P": { "item": "botania:mana_pearl" diff --git a/src/main/resources/data/botania/recipes/endereyeblock.json b/src/main/resources/data/botania/recipes/endereyeblock.json index 7ad8d1c6d..e4bdf1f4f 100644 --- a/src/main/resources/data/botania/recipes/endereyeblock.json +++ b/src/main/resources/data/botania/recipes/endereyeblock.json @@ -7,7 +7,7 @@ "EOE", "RER" ], - "type": "forge:ore_shaped", + "type": "minecraft:crafting_shaped", "key": { "R": { "tag": "forge:dusts/redstone" diff --git a/src/main/resources/data/botania/recipes/enderhand.json b/src/main/resources/data/botania/recipes/enderhand.json index c6ad78737..22a976f04 100644 --- a/src/main/resources/data/botania/recipes/enderhand.json +++ b/src/main/resources/data/botania/recipes/enderhand.json @@ -7,7 +7,7 @@ "LEL", "OL " ], - "type": "forge:ore_shaped", + "type": "minecraft:crafting_shaped", "key": { "P": { "item": "botania:mana_pearl" diff --git a/src/main/resources/data/botania/recipes/exchangerod.json b/src/main/resources/data/botania/recipes/exchangerod.json index c67699506..8b1e4c856 100644 --- a/src/main/resources/data/botania/recipes/exchangerod.json +++ b/src/main/resources/data/botania/recipes/exchangerod.json @@ -7,7 +7,7 @@ " TS", "T " ], - "type": "forge:ore_shaped", + "type": "minecraft:crafting_shaped", "key": { "R": { "tag": "botania:runes/sloth" diff --git a/src/main/resources/data/botania/recipes/fertilizer_powder.json b/src/main/resources/data/botania/recipes/fertilizer_powder.json index 238ee2c7b..5fb105284 100644 --- a/src/main/resources/data/botania/recipes/fertilizer_powder.json +++ b/src/main/resources/data/botania/recipes/fertilizer_powder.json @@ -17,16 +17,16 @@ "data": 15 }, { - "item": "#all_dyes" + "constant": "botania:all_dyes" }, { - "item": "#all_dyes" + "constant": "botania:all_dyes" }, { - "item": "#all_dyes" + "constant": "botania:all_dyes" }, { - "item": "#all_dyes" + "constant": "botania:all_dyes" } ], "type": "minecraft:crafting_shapeless" diff --git a/src/main/resources/data/botania/recipes/firerod.json b/src/main/resources/data/botania/recipes/firerod.json index 8d8929d0f..396426312 100644 --- a/src/main/resources/data/botania/recipes/firerod.json +++ b/src/main/resources/data/botania/recipes/firerod.json @@ -7,7 +7,7 @@ " T ", "R " ], - "type": "forge:ore_shaped", + "type": "minecraft:crafting_shaped", "key": { "R": { "tag": "botania:runes/fire" diff --git a/src/main/resources/data/botania/recipes/flare_chakram.json b/src/main/resources/data/botania/recipes/flare_chakram.json index 4ed6a8b91..c6bed3fc0 100644 --- a/src/main/resources/data/botania/recipes/flare_chakram.json +++ b/src/main/resources/data/botania/recipes/flare_chakram.json @@ -8,7 +8,7 @@ "CPC", "BBB" ], - "type": "forge:ore_shaped", + "type": "minecraft:crafting_shaped", "key": { "P": { "item": "botania:pixie_dust" diff --git a/src/main/resources/data/botania/recipes/flighttiara_0.json b/src/main/resources/data/botania/recipes/flighttiara_0.json index 0de2d7b78..260a66df3 100644 --- a/src/main/resources/data/botania/recipes/flighttiara_0.json +++ b/src/main/resources/data/botania/recipes/flighttiara_0.json @@ -8,7 +8,7 @@ "ILI", "FEF" ], - "type": "forge:ore_shaped", + "type": "minecraft:crafting_shaped", "key": { "E": { "item": "botania:ender_air_bottle" diff --git a/src/main/resources/data/botania/recipes/flighttiara_1.json b/src/main/resources/data/botania/recipes/flighttiara_1.json index 52e4d3117..42f6c1036 100644 --- a/src/main/resources/data/botania/recipes/flighttiara_1.json +++ b/src/main/resources/data/botania/recipes/flighttiara_1.json @@ -13,5 +13,5 @@ "tag": "forge:gems/quartz" } ], - "type": "forge:ore_shapeless" + "type": "minecraft:crafting_shapeless" } \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/flighttiara_2.json b/src/main/resources/data/botania/recipes/flighttiara_2.json index 92dc09838..c7027f2f2 100644 --- a/src/main/resources/data/botania/recipes/flighttiara_2.json +++ b/src/main/resources/data/botania/recipes/flighttiara_2.json @@ -13,5 +13,5 @@ "item": "botania:quartz_dark" } ], - "type": "forge:ore_shapeless" + "type": "minecraft:crafting_shapeless" } \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/flighttiara_3.json b/src/main/resources/data/botania/recipes/flighttiara_3.json index a51ccfd92..8eb00cd46 100644 --- a/src/main/resources/data/botania/recipes/flighttiara_3.json +++ b/src/main/resources/data/botania/recipes/flighttiara_3.json @@ -13,5 +13,5 @@ "item": "botania:quartz_mana" } ], - "type": "forge:ore_shapeless" + "type": "minecraft:crafting_shapeless" } \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/flighttiara_4.json b/src/main/resources/data/botania/recipes/flighttiara_4.json index 941ebcb5e..8a2f17c19 100644 --- a/src/main/resources/data/botania/recipes/flighttiara_4.json +++ b/src/main/resources/data/botania/recipes/flighttiara_4.json @@ -13,5 +13,5 @@ "item": "botania:quartz_blaze" } ], - "type": "forge:ore_shapeless" + "type": "minecraft:crafting_shapeless" } \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/flighttiara_5.json b/src/main/resources/data/botania/recipes/flighttiara_5.json index 2a926e04d..38fb93183 100644 --- a/src/main/resources/data/botania/recipes/flighttiara_5.json +++ b/src/main/resources/data/botania/recipes/flighttiara_5.json @@ -13,5 +13,5 @@ "item": "botania:quartz_lavender" } ], - "type": "forge:ore_shapeless" + "type": "minecraft:crafting_shapeless" } \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/flighttiara_6.json b/src/main/resources/data/botania/recipes/flighttiara_6.json index fc4b6d4d6..7103b916e 100644 --- a/src/main/resources/data/botania/recipes/flighttiara_6.json +++ b/src/main/resources/data/botania/recipes/flighttiara_6.json @@ -13,5 +13,5 @@ "item": "botania:quartz_red" } ], - "type": "forge:ore_shapeless" + "type": "minecraft:crafting_shapeless" } \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/flighttiara_7.json b/src/main/resources/data/botania/recipes/flighttiara_7.json index 8bacf3dea..07cea50f5 100644 --- a/src/main/resources/data/botania/recipes/flighttiara_7.json +++ b/src/main/resources/data/botania/recipes/flighttiara_7.json @@ -13,5 +13,5 @@ "item": "botania:quartz_elven" } ], - "type": "forge:ore_shapeless" + "type": "minecraft:crafting_shapeless" } \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/flighttiara_8.json b/src/main/resources/data/botania/recipes/flighttiara_8.json index 19fdb2a7d..e51fecfac 100644 --- a/src/main/resources/data/botania/recipes/flighttiara_8.json +++ b/src/main/resources/data/botania/recipes/flighttiara_8.json @@ -13,5 +13,5 @@ "item": "botania:quartz_sunny" } ], - "type": "forge:ore_shapeless" + "type": "minecraft:crafting_shapeless" } \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/foresteye.json b/src/main/resources/data/botania/recipes/foresteye.json index 0230a45e7..f71bbc93c 100644 --- a/src/main/resources/data/botania/recipes/foresteye.json +++ b/src/main/resources/data/botania/recipes/foresteye.json @@ -7,7 +7,7 @@ "SES", "MSM" ], - "type": "forge:ore_shaped", + "type": "minecraft:crafting_shaped", "key": { "S": { "tag": "botania:livingrock" diff --git a/src/main/resources/data/botania/recipes/gaia_ingot.json b/src/main/resources/data/botania/recipes/gaia_ingot.json index 07879c8fa..29e4a5a48 100644 --- a/src/main/resources/data/botania/recipes/gaia_ingot.json +++ b/src/main/resources/data/botania/recipes/gaia_ingot.json @@ -7,7 +7,7 @@ "SIS", " S " ], - "type": "forge:ore_shaped", + "type": "minecraft:crafting_shaped", "key": { "S": { "item": "botania:life_essence" diff --git a/src/main/resources/data/botania/recipes/gaia_spreader.json b/src/main/resources/data/botania/recipes/gaia_spreader.json index e38e9d9bb..f37c5fac6 100644 --- a/src/main/resources/data/botania/recipes/gaia_spreader.json +++ b/src/main/resources/data/botania/recipes/gaia_spreader.json @@ -6,7 +6,7 @@ "ESD" ], "group": "botania:spreader", - "type": "forge:ore_shaped", + "type": "minecraft:crafting_shaped", "key": { "S": { "item": "botania:elven_spreader" diff --git a/src/main/resources/data/botania/recipes/garden_of_glass/blazeblock.json b/src/main/resources/data/botania/recipes/garden_of_glass/blazeblock.json index fc9db1c82..2accf43fc 100644 --- a/src/main/resources/data/botania/recipes/garden_of_glass/blazeblock.json +++ b/src/main/resources/data/botania/recipes/garden_of_glass/blazeblock.json @@ -13,7 +13,7 @@ "BBB", "BBB" ], - "type": "forge:ore_shaped", + "type": "minecraft:crafting_shaped", "key": { "B": { "item": "minecraft:blaze_powder" diff --git a/src/main/resources/data/botania/recipes/garden_of_glass/blazeblock_deconstruct.json b/src/main/resources/data/botania/recipes/garden_of_glass/blazeblock_deconstruct.json index d99304dba..8ee9d0441 100644 --- a/src/main/resources/data/botania/recipes/garden_of_glass/blazeblock_deconstruct.json +++ b/src/main/resources/data/botania/recipes/garden_of_glass/blazeblock_deconstruct.json @@ -14,5 +14,5 @@ "item": "botania:blaze_block" } ], - "type": "forge:ore_shapeless" + "type": "minecraft:crafting_shapeless" } \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/garden_of_glass/cocoon.json b/src/main/resources/data/botania/recipes/garden_of_glass/cocoon.json index cbb62aeb8..2d761b6d6 100644 --- a/src/main/resources/data/botania/recipes/garden_of_glass/cocoon.json +++ b/src/main/resources/data/botania/recipes/garden_of_glass/cocoon.json @@ -13,7 +13,7 @@ "SFS", "SIS" ], - "type": "forge:ore_shaped", + "type": "minecraft:crafting_shaped", "key": { "S": { "item": "minecraft:string" diff --git a/src/main/resources/data/botania/recipes/garden_of_glass/end_portal_frame.json b/src/main/resources/data/botania/recipes/garden_of_glass/end_portal_frame.json index 99fc7042c..d3b003de4 100644 --- a/src/main/resources/data/botania/recipes/garden_of_glass/end_portal_frame.json +++ b/src/main/resources/data/botania/recipes/garden_of_glass/end_portal_frame.json @@ -11,7 +11,7 @@ "pattern": [ "OGO" ], - "type": "forge:ore_shaped", + "type": "minecraft:crafting_shaped", "key": { "G": { "item": "botania:life_essence" diff --git a/src/main/resources/data/botania/recipes/garden_of_glass/fertilizer_powder.json b/src/main/resources/data/botania/recipes/garden_of_glass/fertilizer_powder.json index 4d91ed7ed..c67070246 100644 --- a/src/main/resources/data/botania/recipes/garden_of_glass/fertilizer_powder.json +++ b/src/main/resources/data/botania/recipes/garden_of_glass/fertilizer_powder.json @@ -14,16 +14,16 @@ "item": "minecraft:bone_meal" }, { - "item": "#all_dyes" + "constant": "botania:all_dyes" }, { - "item": "#all_dyes" + "constant": "botania:all_dyes" }, { - "item": "#all_dyes" + "constant": "botania:all_dyes" }, { - "item": "#all_dyes" + "constant": "botania:all_dyes" } ], "type": "minecraft:crafting_shapeless" diff --git a/src/main/resources/data/botania/recipes/garden_of_glass/mana_spreader.json b/src/main/resources/data/botania/recipes/garden_of_glass/mana_spreader.json index 2fff4d663..2d4d9339a 100644 --- a/src/main/resources/data/botania/recipes/garden_of_glass/mana_spreader.json +++ b/src/main/resources/data/botania/recipes/garden_of_glass/mana_spreader.json @@ -14,7 +14,7 @@ "WWW" ], "group": "botania:spreader", - "type": "forge:ore_shaped", + "type": "minecraft:crafting_shaped", "key": { "P": [ { @@ -42,7 +42,7 @@ "tag": "botania:petals/gray" }, { - "tag": "botania:petals/lightgray" + "tag": "botania:petals/light_gray" }, { "tag": "botania:petals/cyan" diff --git a/src/main/resources/data/botania/recipes/garden_of_glass/pebble_to_cobblestone.json b/src/main/resources/data/botania/recipes/garden_of_glass/pebble_to_cobblestone.json index 86df7a4e7..4b8d221f1 100644 --- a/src/main/resources/data/botania/recipes/garden_of_glass/pebble_to_cobblestone.json +++ b/src/main/resources/data/botania/recipes/garden_of_glass/pebble_to_cobblestone.json @@ -22,5 +22,5 @@ "item": "botania:pebble" } ], - "type": "forge:ore_shapeless" + "type": "minecraft:crafting_shapeless" } \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/garden_of_glass/root_to_sapling.json b/src/main/resources/data/botania/recipes/garden_of_glass/root_to_sapling.json index 0b6998e49..d3bc282f4 100644 --- a/src/main/resources/data/botania/recipes/garden_of_glass/root_to_sapling.json +++ b/src/main/resources/data/botania/recipes/garden_of_glass/root_to_sapling.json @@ -23,5 +23,5 @@ "item": "botania:living_root" } ], - "type": "forge:ore_shapeless" + "type": "minecraft:crafting_shapeless" } \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/glasspick.json b/src/main/resources/data/botania/recipes/glasspick.json index 97432ba2a..3c3b5c084 100644 --- a/src/main/resources/data/botania/recipes/glasspick.json +++ b/src/main/resources/data/botania/recipes/glasspick.json @@ -7,7 +7,7 @@ " T ", " T " ], - "type": "forge:ore_shaped", + "type": "minecraft:crafting_shaped", "key": { "T": { "item": "botania:livingwood_twig" diff --git a/src/main/resources/data/botania/recipes/goddesscharm.json b/src/main/resources/data/botania/recipes/goddesscharm.json index 1085222ea..73c584f8a 100644 --- a/src/main/resources/data/botania/recipes/goddesscharm.json +++ b/src/main/resources/data/botania/recipes/goddesscharm.json @@ -7,7 +7,7 @@ " P ", "ADS" ], - "type": "forge:ore_shaped", + "type": "minecraft:crafting_shaped", "key": { "P": { "tag": "botania:petals/pink" diff --git a/src/main/resources/data/botania/recipes/gravityrod.json b/src/main/resources/data/botania/recipes/gravityrod.json index 9acab7127..92c31082a 100644 --- a/src/main/resources/data/botania/recipes/gravityrod.json +++ b/src/main/resources/data/botania/recipes/gravityrod.json @@ -7,7 +7,7 @@ " WT", "T " ], - "type": "forge:ore_shaped", + "type": "minecraft:crafting_shaped", "key": { "T": { "item": "botania:dreamwood_twig" diff --git a/src/main/resources/data/botania/recipes/gray_petal_block.json b/src/main/resources/data/botania/recipes/gray_petal_block.json index 677fc66cc..4f24410ee 100644 --- a/src/main/resources/data/botania/recipes/gray_petal_block.json +++ b/src/main/resources/data/botania/recipes/gray_petal_block.json @@ -7,7 +7,7 @@ "PPP", "PPP" ], - "type": "forge:ore_shaped", + "type": "minecraft:crafting_shaped", "group": "botania:petal_block", "key": { "P": { diff --git a/src/main/resources/data/botania/recipes/green_petal_block.json b/src/main/resources/data/botania/recipes/green_petal_block.json index 231381ac2..8fd998af5 100644 --- a/src/main/resources/data/botania/recipes/green_petal_block.json +++ b/src/main/resources/data/botania/recipes/green_petal_block.json @@ -7,7 +7,7 @@ "PPP", "PPP" ], - "type": "forge:ore_shaped", + "type": "minecraft:crafting_shaped", "group": "botania:petal_block", "key": { "P": { diff --git a/src/main/resources/data/botania/recipes/holycloak.json b/src/main/resources/data/botania/recipes/holycloak.json index bea8ec360..f244ef08d 100644 --- a/src/main/resources/data/botania/recipes/holycloak.json +++ b/src/main/resources/data/botania/recipes/holycloak.json @@ -7,7 +7,7 @@ "GWG", "GSG" ], - "type": "forge:ore_shaped", + "type": "minecraft:crafting_shaped", "key": { "S": { "item": "botania:life_essence" diff --git a/src/main/resources/data/botania/recipes/horn_grass.json b/src/main/resources/data/botania/recipes/horn_grass.json index 75f80ea1e..5214673d9 100644 --- a/src/main/resources/data/botania/recipes/horn_grass.json +++ b/src/main/resources/data/botania/recipes/horn_grass.json @@ -7,7 +7,7 @@ "WSW", "WW " ], - "type": "forge:ore_shaped", + "type": "minecraft:crafting_shaped", "key": { "S": { "item": "botania:seeds_grass" diff --git a/src/main/resources/data/botania/recipes/horn_leaves.json b/src/main/resources/data/botania/recipes/horn_leaves.json index f5d1809d6..78609abaf 100644 --- a/src/main/resources/data/botania/recipes/horn_leaves.json +++ b/src/main/resources/data/botania/recipes/horn_leaves.json @@ -10,5 +10,5 @@ "tag": "minecraft:leaves" } ], - "type": "forge:ore_shapeless" + "type": "minecraft:crafting_shapeless" } \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/hourglass.json b/src/main/resources/data/botania/recipes/hourglass.json index 97ccc8026..fd2102165 100644 --- a/src/main/resources/data/botania/recipes/hourglass.json +++ b/src/main/resources/data/botania/recipes/hourglass.json @@ -7,7 +7,7 @@ "RSR", "GMG" ], - "type": "forge:ore_shaped", + "type": "minecraft:crafting_shaped", "key": { "R": { "tag": "forge:dusts/redstone" diff --git a/src/main/resources/data/botania/recipes/icependant.json b/src/main/resources/data/botania/recipes/icependant.json index e1957cf74..6b44ab620 100644 --- a/src/main/resources/data/botania/recipes/icependant.json +++ b/src/main/resources/data/botania/recipes/icependant.json @@ -7,7 +7,7 @@ "S S", "MSR" ], - "type": "forge:ore_shaped", + "type": "minecraft:crafting_shaped", "key": { "R": { "tag": "botania:runes/water" diff --git a/src/main/resources/data/botania/recipes/incenseplate.json b/src/main/resources/data/botania/recipes/incenseplate.json index 29617f2ee..574bb0652 100644 --- a/src/main/resources/data/botania/recipes/incenseplate.json +++ b/src/main/resources/data/botania/recipes/incenseplate.json @@ -5,7 +5,7 @@ "pattern": [ "WSS" ], - "type": "forge:ore_shaped", + "type": "minecraft:crafting_shaped", "key": { "S": { "item": "botania:livingwood0slab", diff --git a/src/main/resources/data/botania/recipes/incensestick.json b/src/main/resources/data/botania/recipes/incensestick.json index cc3d985c6..ca6ea6a5c 100644 --- a/src/main/resources/data/botania/recipes/incensestick.json +++ b/src/main/resources/data/botania/recipes/incensestick.json @@ -7,7 +7,7 @@ " B ", "T " ], - "type": "forge:ore_shaped", + "type": "minecraft:crafting_shaped", "key": { "B": { "item": "minecraft:blaze_powder" diff --git a/src/main/resources/data/botania/recipes/invisibilitycloak.json b/src/main/resources/data/botania/recipes/invisibilitycloak.json index c8ee8b77f..bebef4478 100644 --- a/src/main/resources/data/botania/recipes/invisibilitycloak.json +++ b/src/main/resources/data/botania/recipes/invisibilitycloak.json @@ -7,7 +7,7 @@ "GWG", "GPG" ], - "type": "forge:ore_shaped", + "type": "minecraft:crafting_shaped", "key": { "P": { "item": "botania:mana_pearl" diff --git a/src/main/resources/data/botania/recipes/itemfinder.json b/src/main/resources/data/botania/recipes/itemfinder.json index 8c9f9b815..1d41f7b8b 100644 --- a/src/main/resources/data/botania/recipes/itemfinder.json +++ b/src/main/resources/data/botania/recipes/itemfinder.json @@ -7,7 +7,7 @@ "IYI", "IEI" ], - "type": "forge:ore_shaped", + "type": "minecraft:crafting_shaped", "key": { "E": { "tag": "forge:gems/emerald" diff --git a/src/main/resources/data/botania/recipes/keepivy.json b/src/main/resources/data/botania/recipes/keepivy.json index 4541aeab7..b800a865c 100644 --- a/src/main/resources/data/botania/recipes/keepivy.json +++ b/src/main/resources/data/botania/recipes/keepivy.json @@ -13,5 +13,5 @@ "item": "botania:ender_air_bottle" } ], - "type": "forge:ore_shapeless" + "type": "minecraft:crafting_shapeless" } \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/knockbackbelt.json b/src/main/resources/data/botania/recipes/knockbackbelt.json index 5f4f989e9..5f471e5ac 100644 --- a/src/main/resources/data/botania/recipes/knockbackbelt.json +++ b/src/main/resources/data/botania/recipes/knockbackbelt.json @@ -7,7 +7,7 @@ "L L", "SLE" ], - "type": "forge:ore_shaped", + "type": "minecraft:crafting_shaped", "key": { "A": { "tag": "botania:runes/fire" diff --git a/src/main/resources/data/botania/recipes/laputashard_0.json b/src/main/resources/data/botania/recipes/laputashard_0.json index c6f7d901c..bed9ae1c7 100644 --- a/src/main/resources/data/botania/recipes/laputashard_0.json +++ b/src/main/resources/data/botania/recipes/laputashard_0.json @@ -8,7 +8,7 @@ "PDP", "ASE" ], - "type": "forge:ore_shaped", + "type": "minecraft:crafting_shaped", "key": { "P": { "tag": "forge:gems/prismarine" diff --git a/src/main/resources/data/botania/recipes/laputashard_1.json b/src/main/resources/data/botania/recipes/laputashard_1.json index 4516716b3..df9a185b5 100644 --- a/src/main/resources/data/botania/recipes/laputashard_1.json +++ b/src/main/resources/data/botania/recipes/laputashard_1.json @@ -13,5 +13,5 @@ "data": 0 } ], - "type": "forge:ore_shapeless" + "type": "minecraft:crafting_shapeless" } \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/laputashard_10.json b/src/main/resources/data/botania/recipes/laputashard_10.json index 19c24dd99..eab3b6655 100644 --- a/src/main/resources/data/botania/recipes/laputashard_10.json +++ b/src/main/resources/data/botania/recipes/laputashard_10.json @@ -13,5 +13,5 @@ "data": 9 } ], - "type": "forge:ore_shapeless" + "type": "minecraft:crafting_shapeless" } \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/laputashard_11.json b/src/main/resources/data/botania/recipes/laputashard_11.json index f5c2b4f67..f55fe4f1a 100644 --- a/src/main/resources/data/botania/recipes/laputashard_11.json +++ b/src/main/resources/data/botania/recipes/laputashard_11.json @@ -13,5 +13,5 @@ "data": 10 } ], - "type": "forge:ore_shapeless" + "type": "minecraft:crafting_shapeless" } \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/laputashard_12.json b/src/main/resources/data/botania/recipes/laputashard_12.json index 0ccc24b57..0dab5e627 100644 --- a/src/main/resources/data/botania/recipes/laputashard_12.json +++ b/src/main/resources/data/botania/recipes/laputashard_12.json @@ -13,5 +13,5 @@ "data": 11 } ], - "type": "forge:ore_shapeless" + "type": "minecraft:crafting_shapeless" } \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/laputashard_13.json b/src/main/resources/data/botania/recipes/laputashard_13.json index 2c6f08260..cc19a81ad 100644 --- a/src/main/resources/data/botania/recipes/laputashard_13.json +++ b/src/main/resources/data/botania/recipes/laputashard_13.json @@ -13,5 +13,5 @@ "data": 12 } ], - "type": "forge:ore_shapeless" + "type": "minecraft:crafting_shapeless" } \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/laputashard_14.json b/src/main/resources/data/botania/recipes/laputashard_14.json index 1e0c6e067..f4ea11950 100644 --- a/src/main/resources/data/botania/recipes/laputashard_14.json +++ b/src/main/resources/data/botania/recipes/laputashard_14.json @@ -13,5 +13,5 @@ "data": 13 } ], - "type": "forge:ore_shapeless" + "type": "minecraft:crafting_shapeless" } \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/laputashard_15.json b/src/main/resources/data/botania/recipes/laputashard_15.json index bd552c975..e4a2284b1 100644 --- a/src/main/resources/data/botania/recipes/laputashard_15.json +++ b/src/main/resources/data/botania/recipes/laputashard_15.json @@ -13,5 +13,5 @@ "data": 14 } ], - "type": "forge:ore_shapeless" + "type": "minecraft:crafting_shapeless" } \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/laputashard_16.json b/src/main/resources/data/botania/recipes/laputashard_16.json index 6a105006f..a79959423 100644 --- a/src/main/resources/data/botania/recipes/laputashard_16.json +++ b/src/main/resources/data/botania/recipes/laputashard_16.json @@ -13,5 +13,5 @@ "data": 15 } ], - "type": "forge:ore_shapeless" + "type": "minecraft:crafting_shapeless" } \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/laputashard_17.json b/src/main/resources/data/botania/recipes/laputashard_17.json index 033470331..30660ff9d 100644 --- a/src/main/resources/data/botania/recipes/laputashard_17.json +++ b/src/main/resources/data/botania/recipes/laputashard_17.json @@ -13,5 +13,5 @@ "data": 16 } ], - "type": "forge:ore_shapeless" + "type": "minecraft:crafting_shapeless" } \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/laputashard_18.json b/src/main/resources/data/botania/recipes/laputashard_18.json index 7bf8b9e49..c2f01fd08 100644 --- a/src/main/resources/data/botania/recipes/laputashard_18.json +++ b/src/main/resources/data/botania/recipes/laputashard_18.json @@ -13,5 +13,5 @@ "data": 17 } ], - "type": "forge:ore_shapeless" + "type": "minecraft:crafting_shapeless" } \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/laputashard_19.json b/src/main/resources/data/botania/recipes/laputashard_19.json index c3b5d223c..5c45b8565 100644 --- a/src/main/resources/data/botania/recipes/laputashard_19.json +++ b/src/main/resources/data/botania/recipes/laputashard_19.json @@ -13,5 +13,5 @@ "data": 18 } ], - "type": "forge:ore_shapeless" + "type": "minecraft:crafting_shapeless" } \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/laputashard_2.json b/src/main/resources/data/botania/recipes/laputashard_2.json index 5a7df0259..0aa1d4b2a 100644 --- a/src/main/resources/data/botania/recipes/laputashard_2.json +++ b/src/main/resources/data/botania/recipes/laputashard_2.json @@ -13,5 +13,5 @@ "data": 1 } ], - "type": "forge:ore_shapeless" + "type": "minecraft:crafting_shapeless" } \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/laputashard_3.json b/src/main/resources/data/botania/recipes/laputashard_3.json index eafaf7dfe..28c981ab7 100644 --- a/src/main/resources/data/botania/recipes/laputashard_3.json +++ b/src/main/resources/data/botania/recipes/laputashard_3.json @@ -13,5 +13,5 @@ "data": 2 } ], - "type": "forge:ore_shapeless" + "type": "minecraft:crafting_shapeless" } \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/laputashard_4.json b/src/main/resources/data/botania/recipes/laputashard_4.json index 2c5ecf3b8..d1d7d58b7 100644 --- a/src/main/resources/data/botania/recipes/laputashard_4.json +++ b/src/main/resources/data/botania/recipes/laputashard_4.json @@ -13,5 +13,5 @@ "data": 3 } ], - "type": "forge:ore_shapeless" + "type": "minecraft:crafting_shapeless" } \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/laputashard_5.json b/src/main/resources/data/botania/recipes/laputashard_5.json index 41fafedea..097034829 100644 --- a/src/main/resources/data/botania/recipes/laputashard_5.json +++ b/src/main/resources/data/botania/recipes/laputashard_5.json @@ -13,5 +13,5 @@ "data": 4 } ], - "type": "forge:ore_shapeless" + "type": "minecraft:crafting_shapeless" } \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/laputashard_6.json b/src/main/resources/data/botania/recipes/laputashard_6.json index 7f7948f37..791bb5efe 100644 --- a/src/main/resources/data/botania/recipes/laputashard_6.json +++ b/src/main/resources/data/botania/recipes/laputashard_6.json @@ -13,5 +13,5 @@ "data": 5 } ], - "type": "forge:ore_shapeless" + "type": "minecraft:crafting_shapeless" } \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/laputashard_7.json b/src/main/resources/data/botania/recipes/laputashard_7.json index 466cc7b04..47288cdf0 100644 --- a/src/main/resources/data/botania/recipes/laputashard_7.json +++ b/src/main/resources/data/botania/recipes/laputashard_7.json @@ -13,5 +13,5 @@ "data": 6 } ], - "type": "forge:ore_shapeless" + "type": "minecraft:crafting_shapeless" } \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/laputashard_8.json b/src/main/resources/data/botania/recipes/laputashard_8.json index a7a27d57d..21f605985 100644 --- a/src/main/resources/data/botania/recipes/laputashard_8.json +++ b/src/main/resources/data/botania/recipes/laputashard_8.json @@ -13,5 +13,5 @@ "data": 7 } ], - "type": "forge:ore_shapeless" + "type": "minecraft:crafting_shapeless" } \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/laputashard_9.json b/src/main/resources/data/botania/recipes/laputashard_9.json index 1490dedea..a71042af4 100644 --- a/src/main/resources/data/botania/recipes/laputashard_9.json +++ b/src/main/resources/data/botania/recipes/laputashard_9.json @@ -13,5 +13,5 @@ "data": 8 } ], - "type": "forge:ore_shapeless" + "type": "minecraft:crafting_shapeless" } \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/lavapendant.json b/src/main/resources/data/botania/recipes/lavapendant.json index 3a0f41f45..ffd28644f 100644 --- a/src/main/resources/data/botania/recipes/lavapendant.json +++ b/src/main/resources/data/botania/recipes/lavapendant.json @@ -7,7 +7,7 @@ "S S", "DSF" ], - "type": "forge:ore_shaped", + "type": "minecraft:crafting_shaped", "key": { "S": { "item": "botania:mana_string" diff --git a/src/main/resources/data/botania/recipes/lens_bounce.json b/src/main/resources/data/botania/recipes/lens_bounce.json index 3d13bb4b3..82887ff67 100644 --- a/src/main/resources/data/botania/recipes/lens_bounce.json +++ b/src/main/resources/data/botania/recipes/lens_bounce.json @@ -10,5 +10,5 @@ "tag": "botania:runes/summer" } ], - "type": "forge:ore_shapeless" + "type": "minecraft:crafting_shapeless" } \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/lens_damage.json b/src/main/resources/data/botania/recipes/lens_damage.json index b138de46f..d97665bad 100644 --- a/src/main/resources/data/botania/recipes/lens_damage.json +++ b/src/main/resources/data/botania/recipes/lens_damage.json @@ -10,5 +10,5 @@ "tag": "botania:runes/wrath" } ], - "type": "forge:ore_shapeless" + "type": "minecraft:crafting_shapeless" } \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/lens_efficiency.json b/src/main/resources/data/botania/recipes/lens_efficiency.json index 1dc337c2e..f07cc3bb8 100644 --- a/src/main/resources/data/botania/recipes/lens_efficiency.json +++ b/src/main/resources/data/botania/recipes/lens_efficiency.json @@ -10,5 +10,5 @@ "tag": "botania:runes/water" } ], - "type": "forge:ore_shapeless" + "type": "minecraft:crafting_shapeless" } \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/lens_explosive.json b/src/main/resources/data/botania/recipes/lens_explosive.json index c92eaeb02..9be9bb8e5 100644 --- a/src/main/resources/data/botania/recipes/lens_explosive.json +++ b/src/main/resources/data/botania/recipes/lens_explosive.json @@ -10,5 +10,5 @@ "tag": "botania:runes/envy" } ], - "type": "forge:ore_shapeless" + "type": "minecraft:crafting_shapeless" } \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/lens_firework.json b/src/main/resources/data/botania/recipes/lens_firework.json index b8327248e..556ed2df2 100644 --- a/src/main/resources/data/botania/recipes/lens_firework.json +++ b/src/main/resources/data/botania/recipes/lens_firework.json @@ -13,5 +13,5 @@ "tag": "forge:ingots/elementium" } ], - "type": "forge:ore_shapeless" + "type": "minecraft:crafting_shapeless" } \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/lens_flare.json b/src/main/resources/data/botania/recipes/lens_flare.json index 5ac25c311..92de213bc 100644 --- a/src/main/resources/data/botania/recipes/lens_flare.json +++ b/src/main/resources/data/botania/recipes/lens_flare.json @@ -13,5 +13,5 @@ "tag": "forge:ingots/elementium" } ], - "type": "forge:ore_shapeless" + "type": "minecraft:crafting_shapeless" } \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/lens_gravity.json b/src/main/resources/data/botania/recipes/lens_gravity.json index 6db5395ef..94fdf03d7 100644 --- a/src/main/resources/data/botania/recipes/lens_gravity.json +++ b/src/main/resources/data/botania/recipes/lens_gravity.json @@ -10,5 +10,5 @@ "tag": "botania:runes/winter" } ], - "type": "forge:ore_shapeless" + "type": "minecraft:crafting_shapeless" } \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/lens_influence.json b/src/main/resources/data/botania/recipes/lens_influence.json index 0c7023a36..48597e2a2 100644 --- a/src/main/resources/data/botania/recipes/lens_influence.json +++ b/src/main/resources/data/botania/recipes/lens_influence.json @@ -7,7 +7,7 @@ "PLP", "PPP" ], - "type": "forge:ore_shaped", + "type": "minecraft:crafting_shaped", "key": { "P": { "tag": "forge:gems/prismarine" diff --git a/src/main/resources/data/botania/recipes/lens_light.json b/src/main/resources/data/botania/recipes/lens_light.json index 4c49d968a..bd9bdfba8 100644 --- a/src/main/resources/data/botania/recipes/lens_light.json +++ b/src/main/resources/data/botania/recipes/lens_light.json @@ -7,7 +7,7 @@ "FLF", "GFG" ], - "type": "forge:ore_shaped", + "type": "minecraft:crafting_shaped", "key": { "F": { "item": "minecraft:fire_charge" diff --git a/src/main/resources/data/botania/recipes/lens_light_alt.json b/src/main/resources/data/botania/recipes/lens_light_alt.json index da66d101c..9a2d6cb10 100644 --- a/src/main/resources/data/botania/recipes/lens_light_alt.json +++ b/src/main/resources/data/botania/recipes/lens_light_alt.json @@ -7,7 +7,7 @@ "GLG", "FGF" ], - "type": "forge:ore_shaped", + "type": "minecraft:crafting_shaped", "key": { "F": { "item": "minecraft:fire_charge" diff --git a/src/main/resources/data/botania/recipes/lens_magnet.json b/src/main/resources/data/botania/recipes/lens_magnet.json index 87d5497be..a55888e24 100644 --- a/src/main/resources/data/botania/recipes/lens_magnet.json +++ b/src/main/resources/data/botania/recipes/lens_magnet.json @@ -13,5 +13,5 @@ "tag": "forge:ingots/gold" } ], - "type": "forge:ore_shapeless" + "type": "minecraft:crafting_shapeless" } \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/lens_mine.json b/src/main/resources/data/botania/recipes/lens_mine.json index 546d624eb..f0a36ba15 100644 --- a/src/main/resources/data/botania/recipes/lens_mine.json +++ b/src/main/resources/data/botania/recipes/lens_mine.json @@ -7,7 +7,7 @@ "ALA", " R " ], - "type": "forge:ore_shaped", + "type": "minecraft:crafting_shaped", "key": { "P": { "item": "minecraft:piston" diff --git a/src/main/resources/data/botania/recipes/lens_normal_glass_block.json b/src/main/resources/data/botania/recipes/lens_normal_glass_block.json index 08c99fb45..6dfa2bd25 100644 --- a/src/main/resources/data/botania/recipes/lens_normal_glass_block.json +++ b/src/main/resources/data/botania/recipes/lens_normal_glass_block.json @@ -7,7 +7,7 @@ "SGS", " S " ], - "type": "forge:ore_shaped", + "type": "minecraft:crafting_shaped", "key": { "S": { "tag": "forge:ingots/manasteel" diff --git a/src/main/resources/data/botania/recipes/lens_normal_glass_pane.json b/src/main/resources/data/botania/recipes/lens_normal_glass_pane.json index 5e7ac89db..238eb7c08 100644 --- a/src/main/resources/data/botania/recipes/lens_normal_glass_pane.json +++ b/src/main/resources/data/botania/recipes/lens_normal_glass_pane.json @@ -7,7 +7,7 @@ "SGS", " S " ], - "type": "forge:ore_shaped", + "type": "minecraft:crafting_shaped", "key": { "S": { "tag": "forge:ingots/manasteel" diff --git a/src/main/resources/data/botania/recipes/lens_paint.json b/src/main/resources/data/botania/recipes/lens_paint.json index dc303f424..c84e163da 100644 --- a/src/main/resources/data/botania/recipes/lens_paint.json +++ b/src/main/resources/data/botania/recipes/lens_paint.json @@ -7,7 +7,7 @@ "WLW", " E " ], - "type": "forge:ore_shaped", + "type": "minecraft:crafting_shaped", "key": { "E": { "tag": "forge:ingots/elementium" diff --git a/src/main/resources/data/botania/recipes/lens_power.json b/src/main/resources/data/botania/recipes/lens_power.json index f0b9a5555..e65dd13f3 100644 --- a/src/main/resources/data/botania/recipes/lens_power.json +++ b/src/main/resources/data/botania/recipes/lens_power.json @@ -10,5 +10,5 @@ "tag": "botania:runes/fire" } ], - "type": "forge:ore_shapeless" + "type": "minecraft:crafting_shapeless" } \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/lens_redirect.json b/src/main/resources/data/botania/recipes/lens_redirect.json index 3e7398800..dc4a9a9dc 100644 --- a/src/main/resources/data/botania/recipes/lens_redirect.json +++ b/src/main/resources/data/botania/recipes/lens_redirect.json @@ -13,5 +13,5 @@ "tag": "forge:ingots/elementium" } ], - "type": "forge:ore_shapeless" + "type": "minecraft:crafting_shapeless" } \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/lens_speed.json b/src/main/resources/data/botania/recipes/lens_speed.json index 8758d9b7c..e5a3fe08d 100644 --- a/src/main/resources/data/botania/recipes/lens_speed.json +++ b/src/main/resources/data/botania/recipes/lens_speed.json @@ -10,5 +10,5 @@ "tag": "botania:runes/air" } ], - "type": "forge:ore_shapeless" + "type": "minecraft:crafting_shapeless" } \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/lens_time.json b/src/main/resources/data/botania/recipes/lens_time.json index 5edd4efe9..e07fc158d 100644 --- a/src/main/resources/data/botania/recipes/lens_time.json +++ b/src/main/resources/data/botania/recipes/lens_time.json @@ -10,5 +10,5 @@ "tag": "botania:runes/earth" } ], - "type": "forge:ore_shapeless" + "type": "minecraft:crafting_shapeless" } \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/lens_tripwire.json b/src/main/resources/data/botania/recipes/lens_tripwire.json index db9f72576..838c3e824 100644 --- a/src/main/resources/data/botania/recipes/lens_tripwire.json +++ b/src/main/resources/data/botania/recipes/lens_tripwire.json @@ -13,5 +13,5 @@ "tag": "forge:ingots/elementium" } ], - "type": "forge:ore_shapeless" + "type": "minecraft:crafting_shapeless" } \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/lens_warp.json b/src/main/resources/data/botania/recipes/lens_warp.json index e8d52083e..1ba672131 100644 --- a/src/main/resources/data/botania/recipes/lens_warp.json +++ b/src/main/resources/data/botania/recipes/lens_warp.json @@ -10,5 +10,5 @@ "item": "botania:pixie_dust" } ], - "type": "forge:ore_shapeless" + "type": "minecraft:crafting_shapeless" } \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/lens_weight.json b/src/main/resources/data/botania/recipes/lens_weight.json index bc49e445e..c7f7f5851 100644 --- a/src/main/resources/data/botania/recipes/lens_weight.json +++ b/src/main/resources/data/botania/recipes/lens_weight.json @@ -7,7 +7,7 @@ "PLP", "PRP" ], - "type": "forge:ore_shaped", + "type": "minecraft:crafting_shaped", "key": { "P": { "tag": "forge:gems/prismarine" diff --git a/src/main/resources/data/botania/recipes/lexicon.json b/src/main/resources/data/botania/recipes/lexicon.json index 53b7d4c46..69e98a895 100644 --- a/src/main/resources/data/botania/recipes/lexicon.json +++ b/src/main/resources/data/botania/recipes/lexicon.json @@ -10,5 +10,5 @@ "item": "minecraft:book" } ], - "type": "forge:ore_shapeless" + "type": "minecraft:crafting_shapeless" } \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/light_blue_petal_block.json b/src/main/resources/data/botania/recipes/light_blue_petal_block.json index 1f97b893b..0e9287103 100644 --- a/src/main/resources/data/botania/recipes/light_blue_petal_block.json +++ b/src/main/resources/data/botania/recipes/light_blue_petal_block.json @@ -7,7 +7,7 @@ "PPP", "PPP" ], - "type": "forge:ore_shaped", + "type": "minecraft:crafting_shaped", "group": "botania:petal_block", "key": { "P": { diff --git a/src/main/resources/data/botania/recipes/lightlauncher.json b/src/main/resources/data/botania/recipes/lightlauncher.json index 391688695..793edbf74 100644 --- a/src/main/resources/data/botania/recipes/lightlauncher.json +++ b/src/main/resources/data/botania/recipes/lightlauncher.json @@ -6,7 +6,7 @@ "DDD", "DLD" ], - "type": "forge:ore_shaped", + "type": "minecraft:crafting_shaped", "key": { "D": { "item": "botania:dreamwood" diff --git a/src/main/resources/data/botania/recipes/lightrelay_0.json b/src/main/resources/data/botania/recipes/lightrelay_0.json index f5b561cee..9a9836839 100644 --- a/src/main/resources/data/botania/recipes/lightrelay_0.json +++ b/src/main/resources/data/botania/recipes/lightrelay_0.json @@ -17,5 +17,5 @@ "tag": "forge:dusts/glowstone" } ], - "type": "forge:ore_shapeless" + "type": "minecraft:crafting_shapeless" } \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/lightrelay_1.json b/src/main/resources/data/botania/recipes/lightrelay_1.json index 384125871..cd7b0a647 100644 --- a/src/main/resources/data/botania/recipes/lightrelay_1.json +++ b/src/main/resources/data/botania/recipes/lightrelay_1.json @@ -12,5 +12,5 @@ "tag": "forge:dusts/redstone" } ], - "type": "forge:ore_shapeless" + "type": "minecraft:crafting_shapeless" } \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/lime_petal_block.json b/src/main/resources/data/botania/recipes/lime_petal_block.json index 9d3ce9771..654274f54 100644 --- a/src/main/resources/data/botania/recipes/lime_petal_block.json +++ b/src/main/resources/data/botania/recipes/lime_petal_block.json @@ -7,7 +7,7 @@ "PPP", "PPP" ], - "type": "forge:ore_shaped", + "type": "minecraft:crafting_shaped", "group": "botania:petal_block", "key": { "P": { diff --git a/src/main/resources/data/botania/recipes/livingrock_1.json b/src/main/resources/data/botania/recipes/livingrock_1.json index 99c762441..da3d15f04 100644 --- a/src/main/resources/data/botania/recipes/livingrock_1.json +++ b/src/main/resources/data/botania/recipes/livingrock_1.json @@ -8,7 +8,7 @@ "RR", "RR" ], - "type": "forge:ore_shaped", + "type": "minecraft:crafting_shaped", "key": { "R": { "tag": "botania:livingrock" diff --git a/src/main/resources/data/botania/recipes/livingrock_3.json b/src/main/resources/data/botania/recipes/livingrock_3.json index a660577c4..306e9928a 100644 --- a/src/main/resources/data/botania/recipes/livingrock_3.json +++ b/src/main/resources/data/botania/recipes/livingrock_3.json @@ -13,5 +13,5 @@ "tag": "forge:cobblestone" } ], - "type": "forge:ore_shapeless" + "type": "minecraft:crafting_shapeless" } \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/livingwood_1.json b/src/main/resources/data/botania/recipes/livingwood_1.json index 023608782..63667c718 100644 --- a/src/main/resources/data/botania/recipes/livingwood_1.json +++ b/src/main/resources/data/botania/recipes/livingwood_1.json @@ -9,5 +9,5 @@ "tag": "botania:livingwood" } ], - "type": "forge:ore_shapeless" + "type": "minecraft:crafting_shapeless" } \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/livingwood_5.json b/src/main/resources/data/botania/recipes/livingwood_5.json index a7343c4a1..b44cce48b 100644 --- a/src/main/resources/data/botania/recipes/livingwood_5.json +++ b/src/main/resources/data/botania/recipes/livingwood_5.json @@ -11,5 +11,5 @@ "tag": "forge:dusts/glowstone" } ], - "type": "forge:ore_shapeless" + "type": "minecraft:crafting_shapeless" } \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/livingwood_twig.json b/src/main/resources/data/botania/recipes/livingwood_twig.json index 014bce6cf..a151d74b5 100644 --- a/src/main/resources/data/botania/recipes/livingwood_twig.json +++ b/src/main/resources/data/botania/recipes/livingwood_twig.json @@ -6,7 +6,7 @@ "W", "W" ], - "type": "forge:ore_shaped", + "type": "minecraft:crafting_shaped", "key": { "W": { "tag": "botania:livingwood" diff --git a/src/main/resources/data/botania/recipes/livingwoodbow.json b/src/main/resources/data/botania/recipes/livingwoodbow.json index 70f702d8d..3debd7b46 100644 --- a/src/main/resources/data/botania/recipes/livingwoodbow.json +++ b/src/main/resources/data/botania/recipes/livingwoodbow.json @@ -7,7 +7,7 @@ "T S", " TS" ], - "type": "forge:ore_shaped", + "type": "minecraft:crafting_shaped", "key": { "S": { "item": "botania:mana_string" diff --git a/src/main/resources/data/botania/recipes/magenta_petal_block.json b/src/main/resources/data/botania/recipes/magenta_petal_block.json index dad6ec15c..ec6a24732 100644 --- a/src/main/resources/data/botania/recipes/magenta_petal_block.json +++ b/src/main/resources/data/botania/recipes/magenta_petal_block.json @@ -7,7 +7,7 @@ "PPP", "PPP" ], - "type": "forge:ore_shaped", + "type": "minecraft:crafting_shaped", "group": "botania:petal_block", "key": { "P": { diff --git a/src/main/resources/data/botania/recipes/magnetring.json b/src/main/resources/data/botania/recipes/magnetring.json index 87444ce42..9abec3795 100644 --- a/src/main/resources/data/botania/recipes/magnetring.json +++ b/src/main/resources/data/botania/recipes/magnetring.json @@ -7,7 +7,7 @@ "M M", " M " ], - "type": "forge:ore_shaped", + "type": "minecraft:crafting_shaped", "key": { "L": { "item": "botania:lens_magnet" diff --git a/src/main/resources/data/botania/recipes/magnetringgreater.json b/src/main/resources/data/botania/recipes/magnetringgreater.json index c9f3bef94..35ee5eeef 100644 --- a/src/main/resources/data/botania/recipes/magnetringgreater.json +++ b/src/main/resources/data/botania/recipes/magnetringgreater.json @@ -10,5 +10,5 @@ "item": "botania:magnetring" } ], - "type": "forge:ore_shapeless" + "type": "minecraft:crafting_shapeless" } \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/mana_diamond_block.json b/src/main/resources/data/botania/recipes/mana_diamond_block.json index d694f8fbd..ee3c9184a 100644 --- a/src/main/resources/data/botania/recipes/mana_diamond_block.json +++ b/src/main/resources/data/botania/recipes/mana_diamond_block.json @@ -7,7 +7,7 @@ "III", "III" ], - "type": "forge:ore_shaped", + "type": "minecraft:crafting_shaped", "key": { "I": { "tag": "forge:gems/mana_diamond" diff --git a/src/main/resources/data/botania/recipes/mana_spreader.json b/src/main/resources/data/botania/recipes/mana_spreader.json index ac6226cb8..90a4ab187 100644 --- a/src/main/resources/data/botania/recipes/mana_spreader.json +++ b/src/main/resources/data/botania/recipes/mana_spreader.json @@ -17,7 +17,7 @@ "WWW" ], "group": "botania:spreader", - "type": "forge:ore_shaped", + "type": "minecraft:crafting_shaped", "key": { "P": [ { @@ -45,7 +45,7 @@ "tag": "botania:petals/gray" }, { - "tag": "botania:petals/lightgray" + "tag": "botania:petals/light_gray" }, { "tag": "botania:petals/cyan" diff --git a/src/main/resources/data/botania/recipes/manabomb.json b/src/main/resources/data/botania/recipes/manabomb.json index 766db2e3c..b8a9b8593 100644 --- a/src/main/resources/data/botania/recipes/manabomb.json +++ b/src/main/resources/data/botania/recipes/manabomb.json @@ -7,7 +7,7 @@ "TGT", "LTL" ], - "type": "forge:ore_shaped", + "type": "minecraft:crafting_shaped", "key": { "T": { "item": "minecraft:tnt" diff --git a/src/main/resources/data/botania/recipes/manadetector.json b/src/main/resources/data/botania/recipes/manadetector.json index 37a189ddf..e1cb58339 100644 --- a/src/main/resources/data/botania/recipes/manadetector.json +++ b/src/main/resources/data/botania/recipes/manadetector.json @@ -7,7 +7,7 @@ "SCS", "RSR" ], - "type": "forge:ore_shaped", + "type": "minecraft:crafting_shaped", "key": { "R": { "tag": "forge:dusts/redstone" diff --git a/src/main/resources/data/botania/recipes/managun.json b/src/main/resources/data/botania/recipes/managun.json index b96c68a49..59e7906dd 100644 --- a/src/main/resources/data/botania/recipes/managun.json +++ b/src/main/resources/data/botania/recipes/managun.json @@ -7,7 +7,7 @@ " WT", " W" ], - "type": "forge:ore_shaped", + "type": "minecraft:crafting_shaped", "key": { "S": { "item": "botania:redstone_spreader" diff --git a/src/main/resources/data/botania/recipes/manamirror.json b/src/main/resources/data/botania/recipes/manamirror.json index d8a67ada4..0206fea91 100644 --- a/src/main/resources/data/botania/recipes/manamirror.json +++ b/src/main/resources/data/botania/recipes/manamirror.json @@ -8,7 +8,7 @@ " SI", "T " ], - "type": "forge:ore_shaped", + "type": "minecraft:crafting_shaped", "key": { "P": { "item": "botania:mana_pearl" diff --git a/src/main/resources/data/botania/recipes/manasteel_block.json b/src/main/resources/data/botania/recipes/manasteel_block.json index 28af24245..f5bc0d4cd 100644 --- a/src/main/resources/data/botania/recipes/manasteel_block.json +++ b/src/main/resources/data/botania/recipes/manasteel_block.json @@ -7,7 +7,7 @@ "III", "III" ], - "type": "forge:ore_shaped", + "type": "minecraft:crafting_shaped", "key": { "I": { "tag": "forge:ingots/manasteel" diff --git a/src/main/resources/data/botania/recipes/manasteelaxe.json b/src/main/resources/data/botania/recipes/manasteelaxe.json index 7d80ff2a6..af4a72c79 100644 --- a/src/main/resources/data/botania/recipes/manasteelaxe.json +++ b/src/main/resources/data/botania/recipes/manasteelaxe.json @@ -7,7 +7,7 @@ "TS", "T " ], - "type": "forge:ore_shaped", + "type": "minecraft:crafting_shaped", "key": { "S": { "tag": "forge:ingots/manasteel" diff --git a/src/main/resources/data/botania/recipes/manasteelboots.json b/src/main/resources/data/botania/recipes/manasteelboots.json index bfc6efeb8..e3dc1286b 100644 --- a/src/main/resources/data/botania/recipes/manasteelboots.json +++ b/src/main/resources/data/botania/recipes/manasteelboots.json @@ -6,7 +6,7 @@ "S S", "S S" ], - "type": "forge:ore_shaped", + "type": "minecraft:crafting_shaped", "key": { "S": { "tag": "forge:ingots/manasteel" diff --git a/src/main/resources/data/botania/recipes/manasteelchest.json b/src/main/resources/data/botania/recipes/manasteelchest.json index 6e806d259..c9d366c94 100644 --- a/src/main/resources/data/botania/recipes/manasteelchest.json +++ b/src/main/resources/data/botania/recipes/manasteelchest.json @@ -7,7 +7,7 @@ "SSS", "SSS" ], - "type": "forge:ore_shaped", + "type": "minecraft:crafting_shaped", "key": { "S": { "tag": "forge:ingots/manasteel" diff --git a/src/main/resources/data/botania/recipes/manasteelhelm.json b/src/main/resources/data/botania/recipes/manasteelhelm.json index 0c38f164c..eb3573eb3 100644 --- a/src/main/resources/data/botania/recipes/manasteelhelm.json +++ b/src/main/resources/data/botania/recipes/manasteelhelm.json @@ -6,7 +6,7 @@ "SSS", "S S" ], - "type": "forge:ore_shaped", + "type": "minecraft:crafting_shaped", "key": { "S": { "tag": "forge:ingots/manasteel" diff --git a/src/main/resources/data/botania/recipes/manasteellegs.json b/src/main/resources/data/botania/recipes/manasteellegs.json index 6283838d2..6da1250aa 100644 --- a/src/main/resources/data/botania/recipes/manasteellegs.json +++ b/src/main/resources/data/botania/recipes/manasteellegs.json @@ -7,7 +7,7 @@ "S S", "S S" ], - "type": "forge:ore_shaped", + "type": "minecraft:crafting_shaped", "key": { "S": { "tag": "forge:ingots/manasteel" diff --git a/src/main/resources/data/botania/recipes/manasteelpick.json b/src/main/resources/data/botania/recipes/manasteelpick.json index 433e0086e..d4a663ab5 100644 --- a/src/main/resources/data/botania/recipes/manasteelpick.json +++ b/src/main/resources/data/botania/recipes/manasteelpick.json @@ -7,7 +7,7 @@ " T ", " T " ], - "type": "forge:ore_shaped", + "type": "minecraft:crafting_shaped", "key": { "S": { "tag": "forge:ingots/manasteel" diff --git a/src/main/resources/data/botania/recipes/manasteelshears.json b/src/main/resources/data/botania/recipes/manasteelshears.json index 5227c9a01..f2f866361 100644 --- a/src/main/resources/data/botania/recipes/manasteelshears.json +++ b/src/main/resources/data/botania/recipes/manasteelshears.json @@ -6,7 +6,7 @@ "S ", " S" ], - "type": "forge:ore_shaped", + "type": "minecraft:crafting_shaped", "key": { "S": { "tag": "forge:ingots/manasteel" diff --git a/src/main/resources/data/botania/recipes/manasteelshovel.json b/src/main/resources/data/botania/recipes/manasteelshovel.json index d880c02c4..09360c575 100644 --- a/src/main/resources/data/botania/recipes/manasteelshovel.json +++ b/src/main/resources/data/botania/recipes/manasteelshovel.json @@ -7,7 +7,7 @@ "T", "T" ], - "type": "forge:ore_shaped", + "type": "minecraft:crafting_shaped", "key": { "S": { "tag": "forge:ingots/manasteel" diff --git a/src/main/resources/data/botania/recipes/manasteelsword.json b/src/main/resources/data/botania/recipes/manasteelsword.json index 9b9bce449..d6e445285 100644 --- a/src/main/resources/data/botania/recipes/manasteelsword.json +++ b/src/main/resources/data/botania/recipes/manasteelsword.json @@ -7,7 +7,7 @@ "S", "T" ], - "type": "forge:ore_shaped", + "type": "minecraft:crafting_shaped", "key": { "S": { "tag": "forge:ingots/manasteel" diff --git a/src/main/resources/data/botania/recipes/manatablet.json b/src/main/resources/data/botania/recipes/manatablet.json index 1cb0498a2..1c641bd78 100644 --- a/src/main/resources/data/botania/recipes/manatablet.json +++ b/src/main/resources/data/botania/recipes/manatablet.json @@ -7,7 +7,7 @@ "SPS", "SSS" ], - "type": "forge:ore_shaped", + "type": "minecraft:crafting_shaped", "key": { "P": [ { diff --git a/src/main/resources/data/botania/recipes/manavoid.json b/src/main/resources/data/botania/recipes/manavoid.json index 73d18dca6..df3188ae4 100644 --- a/src/main/resources/data/botania/recipes/manavoid.json +++ b/src/main/resources/data/botania/recipes/manavoid.json @@ -7,7 +7,7 @@ "O O", "SSS" ], - "type": "forge:ore_shaped", + "type": "minecraft:crafting_shaped", "key": { "S": { "tag": "botania:livingrock" diff --git a/src/main/resources/data/botania/recipes/manaweave_cloth.json b/src/main/resources/data/botania/recipes/manaweave_cloth.json index a6a593acb..07aa2c23a 100644 --- a/src/main/resources/data/botania/recipes/manaweave_cloth.json +++ b/src/main/resources/data/botania/recipes/manaweave_cloth.json @@ -6,7 +6,7 @@ "SS", "SS" ], - "type": "forge:ore_shaped", + "type": "minecraft:crafting_shaped", "key": { "S": { "item": "botania:mana_string" diff --git a/src/main/resources/data/botania/recipes/manaweaveboots.json b/src/main/resources/data/botania/recipes/manaweaveboots.json index c7efa6be8..b0cac8667 100644 --- a/src/main/resources/data/botania/recipes/manaweaveboots.json +++ b/src/main/resources/data/botania/recipes/manaweaveboots.json @@ -6,7 +6,7 @@ "S S", "S S" ], - "type": "forge:ore_shaped", + "type": "minecraft:crafting_shaped", "key": { "S": { "item": "botania:manaweave_cloth" diff --git a/src/main/resources/data/botania/recipes/manaweavechest.json b/src/main/resources/data/botania/recipes/manaweavechest.json index 59933d649..67ede1460 100644 --- a/src/main/resources/data/botania/recipes/manaweavechest.json +++ b/src/main/resources/data/botania/recipes/manaweavechest.json @@ -7,7 +7,7 @@ "SSS", "SSS" ], - "type": "forge:ore_shaped", + "type": "minecraft:crafting_shaped", "key": { "S": { "item": "botania:manaweave_cloth" diff --git a/src/main/resources/data/botania/recipes/manaweavehelm.json b/src/main/resources/data/botania/recipes/manaweavehelm.json index 71cdb25fa..1ec111bf4 100644 --- a/src/main/resources/data/botania/recipes/manaweavehelm.json +++ b/src/main/resources/data/botania/recipes/manaweavehelm.json @@ -6,7 +6,7 @@ "SSS", "S S" ], - "type": "forge:ore_shaped", + "type": "minecraft:crafting_shaped", "key": { "S": { "item": "botania:manaweave_cloth" diff --git a/src/main/resources/data/botania/recipes/manaweavelegs.json b/src/main/resources/data/botania/recipes/manaweavelegs.json index 57863b1c3..7ff541141 100644 --- a/src/main/resources/data/botania/recipes/manaweavelegs.json +++ b/src/main/resources/data/botania/recipes/manaweavelegs.json @@ -7,7 +7,7 @@ "S S", "S S" ], - "type": "forge:ore_shaped", + "type": "minecraft:crafting_shaped", "key": { "S": { "item": "botania:manaweave_cloth" diff --git a/src/main/resources/data/botania/recipes/miningring.json b/src/main/resources/data/botania/recipes/miningring.json index a7072ff1a..bc05ef662 100644 --- a/src/main/resources/data/botania/recipes/miningring.json +++ b/src/main/resources/data/botania/recipes/miningring.json @@ -7,7 +7,7 @@ "M M", " M " ], - "type": "forge:ore_shaped", + "type": "minecraft:crafting_shaped", "key": { "P": { "item": "minecraft:golden_pickaxe" diff --git a/src/main/resources/data/botania/recipes/missilerod.json b/src/main/resources/data/botania/recipes/missilerod.json index 3ae480373..7e7da5f9f 100644 --- a/src/main/resources/data/botania/recipes/missilerod.json +++ b/src/main/resources/data/botania/recipes/missilerod.json @@ -7,7 +7,7 @@ " TD", "T G" ], - "type": "forge:ore_shaped", + "type": "minecraft:crafting_shaped", "key": { "D": { "tag": "forge:gems/dragonstone" diff --git a/src/main/resources/data/botania/recipes/monocle.json b/src/main/resources/data/botania/recipes/monocle.json index 3eab76258..24575e7a9 100644 --- a/src/main/resources/data/botania/recipes/monocle.json +++ b/src/main/resources/data/botania/recipes/monocle.json @@ -7,7 +7,7 @@ "IN", " N" ], - "type": "forge:ore_shaped", + "type": "minecraft:crafting_shaped", "key": { "G": { "item": "botania:managlass" diff --git a/src/main/resources/data/botania/recipes/obediencestick.json b/src/main/resources/data/botania/recipes/obediencestick.json index 2755d7bfb..5a9ee5234 100644 --- a/src/main/resources/data/botania/recipes/obediencestick.json +++ b/src/main/resources/data/botania/recipes/obediencestick.json @@ -7,7 +7,7 @@ " T ", "T " ], - "type": "forge:ore_shaped", + "type": "minecraft:crafting_shaped", "key": { "T": { "item": "botania:livingwood_twig" diff --git a/src/main/resources/data/botania/recipes/openbucket.json b/src/main/resources/data/botania/recipes/openbucket.json index 98179574a..09fd66e51 100644 --- a/src/main/resources/data/botania/recipes/openbucket.json +++ b/src/main/resources/data/botania/recipes/openbucket.json @@ -6,7 +6,7 @@ "E E", " E " ], - "type": "forge:ore_shaped", + "type": "minecraft:crafting_shaped", "key": { "E": { "tag": "forge:ingots/elementium" diff --git a/src/main/resources/data/botania/recipes/orange_petal_block.json b/src/main/resources/data/botania/recipes/orange_petal_block.json index 1317bfb23..c18b69a24 100644 --- a/src/main/resources/data/botania/recipes/orange_petal_block.json +++ b/src/main/resources/data/botania/recipes/orange_petal_block.json @@ -7,7 +7,7 @@ "PPP", "PPP" ], - "type": "forge:ore_shaped", + "type": "minecraft:crafting_shaped", "group": "botania:petal_block", "key": { "P": { diff --git a/src/main/resources/data/botania/recipes/pattern_craft_3_1.json b/src/main/resources/data/botania/recipes/pattern_craft_3_1.json index e4427e4b3..8049b1b7b 100644 --- a/src/main/resources/data/botania/recipes/pattern_craft_3_1.json +++ b/src/main/resources/data/botania/recipes/pattern_craft_3_1.json @@ -7,7 +7,7 @@ "PPP", "PPP" ], - "type": "forge:ore_shaped", + "type": "minecraft:crafting_shaped", "group": "botania:craft_pattern", "key": { "P": { diff --git a/src/main/resources/data/botania/recipes/pattern_crafty_1_1.json b/src/main/resources/data/botania/recipes/pattern_crafty_1_1.json index 8e9f02069..7ae01530a 100644 --- a/src/main/resources/data/botania/recipes/pattern_crafty_1_1.json +++ b/src/main/resources/data/botania/recipes/pattern_crafty_1_1.json @@ -7,7 +7,7 @@ "PPP", "PPP" ], - "type": "forge:ore_shaped", + "type": "minecraft:crafting_shaped", "group": "botania:craft_pattern", "key": { "P": { diff --git a/src/main/resources/data/botania/recipes/pattern_crafty_1_2.json b/src/main/resources/data/botania/recipes/pattern_crafty_1_2.json index 5840d8319..acfbc43b8 100644 --- a/src/main/resources/data/botania/recipes/pattern_crafty_1_2.json +++ b/src/main/resources/data/botania/recipes/pattern_crafty_1_2.json @@ -7,7 +7,7 @@ "RPP", "PPP" ], - "type": "forge:ore_shaped", + "type": "minecraft:crafting_shaped", "group": "botania:craft_pattern", "key": { "P": { diff --git a/src/main/resources/data/botania/recipes/pattern_crafty_1_3.json b/src/main/resources/data/botania/recipes/pattern_crafty_1_3.json index 0535d67c2..9b9d545cd 100644 --- a/src/main/resources/data/botania/recipes/pattern_crafty_1_3.json +++ b/src/main/resources/data/botania/recipes/pattern_crafty_1_3.json @@ -7,7 +7,7 @@ "RPP", "RPP" ], - "type": "forge:ore_shaped", + "type": "minecraft:crafting_shaped", "group": "botania:craft_pattern", "key": { "P": { diff --git a/src/main/resources/data/botania/recipes/pattern_crafty_2_1.json b/src/main/resources/data/botania/recipes/pattern_crafty_2_1.json index 18b8e6d9f..78557ee62 100644 --- a/src/main/resources/data/botania/recipes/pattern_crafty_2_1.json +++ b/src/main/resources/data/botania/recipes/pattern_crafty_2_1.json @@ -7,7 +7,7 @@ "PPP", "PPP" ], - "type": "forge:ore_shaped", + "type": "minecraft:crafting_shaped", "group": "botania:craft_pattern", "key": { "P": { diff --git a/src/main/resources/data/botania/recipes/pattern_crafty_2_2.json b/src/main/resources/data/botania/recipes/pattern_crafty_2_2.json index f480e24b7..15687c00c 100644 --- a/src/main/resources/data/botania/recipes/pattern_crafty_2_2.json +++ b/src/main/resources/data/botania/recipes/pattern_crafty_2_2.json @@ -7,7 +7,7 @@ "RRP", "PPP" ], - "type": "forge:ore_shaped", + "type": "minecraft:crafting_shaped", "group": "botania:craft_pattern", "key": { "P": { diff --git a/src/main/resources/data/botania/recipes/pattern_crafty_2_3.json b/src/main/resources/data/botania/recipes/pattern_crafty_2_3.json index a391cd110..86c63f6f8 100644 --- a/src/main/resources/data/botania/recipes/pattern_crafty_2_3.json +++ b/src/main/resources/data/botania/recipes/pattern_crafty_2_3.json @@ -7,7 +7,7 @@ "RRP", "RRP" ], - "type": "forge:ore_shaped", + "type": "minecraft:crafting_shaped", "group": "botania:craft_pattern", "key": { "P": { diff --git a/src/main/resources/data/botania/recipes/pattern_crafty_3_2.json b/src/main/resources/data/botania/recipes/pattern_crafty_3_2.json index 2306fd4a1..aa6a5c4d3 100644 --- a/src/main/resources/data/botania/recipes/pattern_crafty_3_2.json +++ b/src/main/resources/data/botania/recipes/pattern_crafty_3_2.json @@ -7,7 +7,7 @@ "RRR", "PPP" ], - "type": "forge:ore_shaped", + "type": "minecraft:crafting_shaped", "group": "botania:craft_pattern", "key": { "P": { diff --git a/src/main/resources/data/botania/recipes/pattern_crafty_donut.json b/src/main/resources/data/botania/recipes/pattern_crafty_donut.json index 63bbd5f1e..cb5bc8e4f 100644 --- a/src/main/resources/data/botania/recipes/pattern_crafty_donut.json +++ b/src/main/resources/data/botania/recipes/pattern_crafty_donut.json @@ -7,7 +7,7 @@ "RPR", "RRR" ], - "type": "forge:ore_shaped", + "type": "minecraft:crafting_shaped", "group": "botania:craft_pattern", "key": { "P": { diff --git a/src/main/resources/data/botania/recipes/pavement_0.json b/src/main/resources/data/botania/recipes/pavement_0.json index 13b285483..d02ea0035 100644 --- a/src/main/resources/data/botania/recipes/pavement_0.json +++ b/src/main/resources/data/botania/recipes/pavement_0.json @@ -16,5 +16,5 @@ "item": "minecraft:gravel" } ], - "type": "forge:ore_shapeless" + "type": "minecraft:crafting_shapeless" } \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/pavement_1.json b/src/main/resources/data/botania/recipes/pavement_1.json index a14440824..eb9b23718 100644 --- a/src/main/resources/data/botania/recipes/pavement_1.json +++ b/src/main/resources/data/botania/recipes/pavement_1.json @@ -20,5 +20,5 @@ "data": 0 } ], - "type": "forge:ore_shapeless" + "type": "minecraft:crafting_shapeless" } \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/pavement_2.json b/src/main/resources/data/botania/recipes/pavement_2.json index 794ffa123..4ec425581 100644 --- a/src/main/resources/data/botania/recipes/pavement_2.json +++ b/src/main/resources/data/botania/recipes/pavement_2.json @@ -20,5 +20,5 @@ "data": 4 } ], - "type": "forge:ore_shapeless" + "type": "minecraft:crafting_shapeless" } \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/pavement_3.json b/src/main/resources/data/botania/recipes/pavement_3.json index 28961d567..8299a7528 100644 --- a/src/main/resources/data/botania/recipes/pavement_3.json +++ b/src/main/resources/data/botania/recipes/pavement_3.json @@ -19,5 +19,5 @@ "item": "minecraft:redstone" } ], - "type": "forge:ore_shapeless" + "type": "minecraft:crafting_shapeless" } \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/pavement_4.json b/src/main/resources/data/botania/recipes/pavement_4.json index fb20f94e4..57543860d 100644 --- a/src/main/resources/data/botania/recipes/pavement_4.json +++ b/src/main/resources/data/botania/recipes/pavement_4.json @@ -19,5 +19,5 @@ "item": "minecraft:wheat" } ], - "type": "forge:ore_shapeless" + "type": "minecraft:crafting_shapeless" } \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/pavement_5.json b/src/main/resources/data/botania/recipes/pavement_5.json index 08d9ba404..8e3cde2b0 100644 --- a/src/main/resources/data/botania/recipes/pavement_5.json +++ b/src/main/resources/data/botania/recipes/pavement_5.json @@ -19,5 +19,5 @@ "item": "minecraft:slime_ball" } ], - "type": "forge:ore_shapeless" + "type": "minecraft:crafting_shapeless" } \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/pestleandmortar.json b/src/main/resources/data/botania/recipes/pestleandmortar.json index f0d95a35f..f23961a93 100644 --- a/src/main/resources/data/botania/recipes/pestleandmortar.json +++ b/src/main/resources/data/botania/recipes/pestleandmortar.json @@ -7,7 +7,7 @@ "W ", "B " ], - "type": "forge:ore_shaped", + "type": "minecraft:crafting_shaped", "key": { "B": { "item": "minecraft:bowl" diff --git a/src/main/resources/data/botania/recipes/petal_black.json b/src/main/resources/data/botania/recipes/petal_black.json index d11b86099..92f1f97e8 100644 --- a/src/main/resources/data/botania/recipes/petal_black.json +++ b/src/main/resources/data/botania/recipes/petal_black.json @@ -1,6 +1,6 @@ { "result": { - "item": "botania:petal_black", + "item": "botania:black_petal", "count": 2 }, "group": "botania:petal", @@ -9,5 +9,5 @@ "tag": "botania:flowers/black" } ], - "type": "forge:ore_shapeless" + "type": "minecraft:crafting_shapeless" } \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/petal_black_double.json b/src/main/resources/data/botania/recipes/petal_black_double.json index edc38c9da..717ebf016 100644 --- a/src/main/resources/data/botania/recipes/petal_black_double.json +++ b/src/main/resources/data/botania/recipes/petal_black_double.json @@ -1,6 +1,6 @@ { "result": { - "item": "botania:petal_black", + "item": "botania:black_petal", "count": 4 }, "group": "botania:petal_double", @@ -9,5 +9,5 @@ "tag": "botania:double_flowers/black" } ], - "type": "forge:ore_shapeless" + "type": "minecraft:crafting_shapeless" } \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/petal_blue.json b/src/main/resources/data/botania/recipes/petal_blue.json index c7e4b6628..fcabdbfed 100644 --- a/src/main/resources/data/botania/recipes/petal_blue.json +++ b/src/main/resources/data/botania/recipes/petal_blue.json @@ -1,6 +1,6 @@ { "result": { - "item": "botania:petal_blue", + "item": "botania:blue_petal", "count": 2 }, "group": "botania:petal", @@ -9,5 +9,5 @@ "tag": "botania:flowers/blue" } ], - "type": "forge:ore_shapeless" + "type": "minecraft:crafting_shapeless" } \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/petal_blue_double.json b/src/main/resources/data/botania/recipes/petal_blue_double.json index c7e69c6e9..34e371809 100644 --- a/src/main/resources/data/botania/recipes/petal_blue_double.json +++ b/src/main/resources/data/botania/recipes/petal_blue_double.json @@ -1,6 +1,6 @@ { "result": { - "item": "botania:petal_blue", + "item": "botania:blue_petal", "count": 4 }, "group": "botania:petal_double", @@ -9,5 +9,5 @@ "tag": "botania:double_flowers/blue" } ], - "type": "forge:ore_shapeless" + "type": "minecraft:crafting_shapeless" } \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/petal_brown.json b/src/main/resources/data/botania/recipes/petal_brown.json index d77bcf9a4..011210f89 100644 --- a/src/main/resources/data/botania/recipes/petal_brown.json +++ b/src/main/resources/data/botania/recipes/petal_brown.json @@ -1,6 +1,6 @@ { "result": { - "item": "botania:petal_brown", + "item": "botania:brown_petal", "count": 2 }, "group": "botania:petal", @@ -9,5 +9,5 @@ "tag": "botania:flowers/brown" } ], - "type": "forge:ore_shapeless" + "type": "minecraft:crafting_shapeless" } \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/petal_brown_double.json b/src/main/resources/data/botania/recipes/petal_brown_double.json index 500f96dd7..d1227af21 100644 --- a/src/main/resources/data/botania/recipes/petal_brown_double.json +++ b/src/main/resources/data/botania/recipes/petal_brown_double.json @@ -1,6 +1,6 @@ { "result": { - "item": "botania:petal_brown", + "item": "botania:brown_petal", "count": 4 }, "group": "botania:petal_double", @@ -9,5 +9,5 @@ "tag": "botania:double_flowers/brown" } ], - "type": "forge:ore_shapeless" + "type": "minecraft:crafting_shapeless" } \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/petal_cyan.json b/src/main/resources/data/botania/recipes/petal_cyan.json index 56a4fc347..cadaf82b7 100644 --- a/src/main/resources/data/botania/recipes/petal_cyan.json +++ b/src/main/resources/data/botania/recipes/petal_cyan.json @@ -1,6 +1,6 @@ { "result": { - "item": "botania:petal_cyan", + "item": "botania:cyan_petal", "count": 2 }, "group": "botania:petal", @@ -9,5 +9,5 @@ "tag": "botania:flowers/cyan" } ], - "type": "forge:ore_shapeless" + "type": "minecraft:crafting_shapeless" } \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/petal_cyan_double.json b/src/main/resources/data/botania/recipes/petal_cyan_double.json index bc2f0f6e4..b9e7b4e21 100644 --- a/src/main/resources/data/botania/recipes/petal_cyan_double.json +++ b/src/main/resources/data/botania/recipes/petal_cyan_double.json @@ -1,6 +1,6 @@ { "result": { - "item": "botania:petal_cyan", + "item": "botania:cyan_petal", "count": 4 }, "group": "botania:petal_double", @@ -9,5 +9,5 @@ "tag": "botania:double_flowers/cyan" } ], - "type": "forge:ore_shapeless" + "type": "minecraft:crafting_shapeless" } \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/petal_gray.json b/src/main/resources/data/botania/recipes/petal_gray.json index 5e6c5a8dc..7b5bfa0c0 100644 --- a/src/main/resources/data/botania/recipes/petal_gray.json +++ b/src/main/resources/data/botania/recipes/petal_gray.json @@ -1,6 +1,6 @@ { "result": { - "item": "botania:petal_gray", + "item": "botania:gray_petal", "count": 2 }, "group": "botania:petal", @@ -9,5 +9,5 @@ "tag": "botania:flowers/gray" } ], - "type": "forge:ore_shapeless" + "type": "minecraft:crafting_shapeless" } \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/petal_gray_double.json b/src/main/resources/data/botania/recipes/petal_gray_double.json index 3b0a59779..e8731375b 100644 --- a/src/main/resources/data/botania/recipes/petal_gray_double.json +++ b/src/main/resources/data/botania/recipes/petal_gray_double.json @@ -1,6 +1,6 @@ { "result": { - "item": "botania:petal_gray", + "item": "botania:gray_petal", "count": 4 }, "group": "botania:petal_double", @@ -9,5 +9,5 @@ "tag": "botania:double_flowers/gray" } ], - "type": "forge:ore_shapeless" + "type": "minecraft:crafting_shapeless" } \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/petal_green.json b/src/main/resources/data/botania/recipes/petal_green.json index 0ad1b7003..b283e8605 100644 --- a/src/main/resources/data/botania/recipes/petal_green.json +++ b/src/main/resources/data/botania/recipes/petal_green.json @@ -1,6 +1,6 @@ { "result": { - "item": "botania:petal_green", + "item": "botania:green_petal", "count": 2 }, "group": "botania:petal", @@ -9,5 +9,5 @@ "tag": "botania:flowers/green" } ], - "type": "forge:ore_shapeless" + "type": "minecraft:crafting_shapeless" } \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/petal_green_double.json b/src/main/resources/data/botania/recipes/petal_green_double.json index c2f43ff31..5c39aa298 100644 --- a/src/main/resources/data/botania/recipes/petal_green_double.json +++ b/src/main/resources/data/botania/recipes/petal_green_double.json @@ -1,6 +1,6 @@ { "result": { - "item": "botania:petal_green", + "item": "botania:green_petal", "count": 4 }, "group": "botania:petal_double", @@ -9,5 +9,5 @@ "tag": "botania:double_flowers/green" } ], - "type": "forge:ore_shapeless" + "type": "minecraft:crafting_shapeless" } \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/petal_light_blue.json b/src/main/resources/data/botania/recipes/petal_light_blue.json index fe520a73b..da645ea5e 100644 --- a/src/main/resources/data/botania/recipes/petal_light_blue.json +++ b/src/main/resources/data/botania/recipes/petal_light_blue.json @@ -1,6 +1,6 @@ { "result": { - "item": "botania:petal_light_blue", + "item": "botania:light_blue_petal", "count": 2 }, "group": "botania:petal", @@ -9,5 +9,5 @@ "tag": "botania:flowers/lightblue" } ], - "type": "forge:ore_shapeless" + "type": "minecraft:crafting_shapeless" } \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/petal_light_blue_double.json b/src/main/resources/data/botania/recipes/petal_light_blue_double.json index b3f2de47f..772df22c9 100644 --- a/src/main/resources/data/botania/recipes/petal_light_blue_double.json +++ b/src/main/resources/data/botania/recipes/petal_light_blue_double.json @@ -1,6 +1,6 @@ { "result": { - "item": "botania:petal_light_blue", + "item": "botania:light_blue_petal", "count": 4 }, "group": "botania:petal_double", @@ -9,5 +9,5 @@ "tag": "botania:double_flowers/lightblue" } ], - "type": "forge:ore_shapeless" + "type": "minecraft:crafting_shapeless" } \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/petal_lime.json b/src/main/resources/data/botania/recipes/petal_lime.json index 026edaef0..3d6d69997 100644 --- a/src/main/resources/data/botania/recipes/petal_lime.json +++ b/src/main/resources/data/botania/recipes/petal_lime.json @@ -1,6 +1,6 @@ { "result": { - "item": "botania:petal_lime", + "item": "botania:lime_petal", "count": 2 }, "group": "botania:petal", @@ -9,5 +9,5 @@ "tag": "botania:flowers/lime" } ], - "type": "forge:ore_shapeless" + "type": "minecraft:crafting_shapeless" } \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/petal_lime_double.json b/src/main/resources/data/botania/recipes/petal_lime_double.json index 63cf90b28..3fbdc72af 100644 --- a/src/main/resources/data/botania/recipes/petal_lime_double.json +++ b/src/main/resources/data/botania/recipes/petal_lime_double.json @@ -1,6 +1,6 @@ { "result": { - "item": "botania:petal_lime", + "item": "botania:lime_petal", "count": 4 }, "group": "botania:petal_double", @@ -9,5 +9,5 @@ "tag": "botania:double_flowers/lime" } ], - "type": "forge:ore_shapeless" + "type": "minecraft:crafting_shapeless" } \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/petal_magenta.json b/src/main/resources/data/botania/recipes/petal_magenta.json index 1d5fe7669..622c53b15 100644 --- a/src/main/resources/data/botania/recipes/petal_magenta.json +++ b/src/main/resources/data/botania/recipes/petal_magenta.json @@ -1,6 +1,6 @@ { "result": { - "item": "botania:petal_magenta", + "item": "botania:magenta_petal", "count": 2 }, "group": "botania:petal", @@ -9,5 +9,5 @@ "tag": "botania:flowers/magenta" } ], - "type": "forge:ore_shapeless" + "type": "minecraft:crafting_shapeless" } \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/petal_magenta_double.json b/src/main/resources/data/botania/recipes/petal_magenta_double.json index 92795bbf5..0e0350efd 100644 --- a/src/main/resources/data/botania/recipes/petal_magenta_double.json +++ b/src/main/resources/data/botania/recipes/petal_magenta_double.json @@ -1,6 +1,6 @@ { "result": { - "item": "botania:petal_magenta", + "item": "botania:magenta_petal", "count": 4 }, "group": "botania:petal_double", @@ -9,5 +9,5 @@ "tag": "botania:double_flowers/magenta" } ], - "type": "forge:ore_shapeless" + "type": "minecraft:crafting_shapeless" } \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/petal_orange.json b/src/main/resources/data/botania/recipes/petal_orange.json index 49a75eb31..38e3156fb 100644 --- a/src/main/resources/data/botania/recipes/petal_orange.json +++ b/src/main/resources/data/botania/recipes/petal_orange.json @@ -1,6 +1,6 @@ { "result": { - "item": "botania:petal_orange", + "item": "botania:orange_petal", "count": 2 }, "group": "botania:petal", @@ -9,5 +9,5 @@ "tag": "botania:flowers/orange" } ], - "type": "forge:ore_shapeless" + "type": "minecraft:crafting_shapeless" } \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/petal_orange_double.json b/src/main/resources/data/botania/recipes/petal_orange_double.json index 6d9fcfcfa..fb47af014 100644 --- a/src/main/resources/data/botania/recipes/petal_orange_double.json +++ b/src/main/resources/data/botania/recipes/petal_orange_double.json @@ -1,6 +1,6 @@ { "result": { - "item": "botania:petal_orange", + "item": "botania:orange_petal", "count": 4 }, "group": "botania:petal_double", @@ -9,5 +9,5 @@ "tag": "botania:double_flowers/orange" } ], - "type": "forge:ore_shapeless" + "type": "minecraft:crafting_shapeless" } \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/petal_pink.json b/src/main/resources/data/botania/recipes/petal_pink.json index ddf6a0ec0..5c9e09021 100644 --- a/src/main/resources/data/botania/recipes/petal_pink.json +++ b/src/main/resources/data/botania/recipes/petal_pink.json @@ -1,6 +1,6 @@ { "result": { - "item": "botania:petal_pink", + "item": "botania:pink_petal", "count": 2 }, "group": "botania:petal", @@ -9,5 +9,5 @@ "tag": "botania:flowers/pink" } ], - "type": "forge:ore_shapeless" + "type": "minecraft:crafting_shapeless" } \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/petal_pink_double.json b/src/main/resources/data/botania/recipes/petal_pink_double.json index 3622e4692..881043235 100644 --- a/src/main/resources/data/botania/recipes/petal_pink_double.json +++ b/src/main/resources/data/botania/recipes/petal_pink_double.json @@ -1,6 +1,6 @@ { "result": { - "item": "botania:petal_pink", + "item": "botania:pink_petal", "count": 4 }, "group": "botania:petal_double", @@ -9,5 +9,5 @@ "tag": "botania:double_flowers/pink" } ], - "type": "forge:ore_shapeless" + "type": "minecraft:crafting_shapeless" } \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/petal_purple.json b/src/main/resources/data/botania/recipes/petal_purple.json index 4bc79cae0..de52d2829 100644 --- a/src/main/resources/data/botania/recipes/petal_purple.json +++ b/src/main/resources/data/botania/recipes/petal_purple.json @@ -1,6 +1,6 @@ { "result": { - "item": "botania:petal_purple", + "item": "botania:purple_petal", "count": 2 }, "group": "botania:petal", @@ -9,5 +9,5 @@ "tag": "botania:flowers/purple" } ], - "type": "forge:ore_shapeless" + "type": "minecraft:crafting_shapeless" } \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/petal_purple_double.json b/src/main/resources/data/botania/recipes/petal_purple_double.json index 03c689896..cefb221a3 100644 --- a/src/main/resources/data/botania/recipes/petal_purple_double.json +++ b/src/main/resources/data/botania/recipes/petal_purple_double.json @@ -1,6 +1,6 @@ { "result": { - "item": "botania:petal_purple", + "item": "botania:purple_petal", "count": 4 }, "group": "botania:petal_double", @@ -9,5 +9,5 @@ "tag": "botania:double_flowers/purple" } ], - "type": "forge:ore_shapeless" + "type": "minecraft:crafting_shapeless" } \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/petal_red.json b/src/main/resources/data/botania/recipes/petal_red.json index 97a23bd5d..d10e5697d 100644 --- a/src/main/resources/data/botania/recipes/petal_red.json +++ b/src/main/resources/data/botania/recipes/petal_red.json @@ -1,6 +1,6 @@ { "result": { - "item": "botania:petal_red", + "item": "botania:red_petal", "count": 2 }, "group": "botania:petal", @@ -9,5 +9,5 @@ "tag": "botania:flowers/red" } ], - "type": "forge:ore_shapeless" + "type": "minecraft:crafting_shapeless" } \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/petal_red_double.json b/src/main/resources/data/botania/recipes/petal_red_double.json index 9e49a7cbf..5824008df 100644 --- a/src/main/resources/data/botania/recipes/petal_red_double.json +++ b/src/main/resources/data/botania/recipes/petal_red_double.json @@ -1,6 +1,6 @@ { "result": { - "item": "botania:petal_red", + "item": "botania:red_petal", "count": 4 }, "group": "botania:petal_double", @@ -9,5 +9,5 @@ "tag": "botania:double_flowers/red" } ], - "type": "forge:ore_shapeless" + "type": "minecraft:crafting_shapeless" } \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/petal_silver.json b/src/main/resources/data/botania/recipes/petal_silver.json index 8440699f8..fe23c1d03 100644 --- a/src/main/resources/data/botania/recipes/petal_silver.json +++ b/src/main/resources/data/botania/recipes/petal_silver.json @@ -1,13 +1,13 @@ { "result": { - "item": "botania:petal_silver", + "item": "botania:silver_petal", "count": 2 }, "group": "botania:petal", "ingredients": [ { - "tag": "botania:flowers/lightgray" + "tag": "botania:flowers/light_gray" } ], - "type": "forge:ore_shapeless" + "type": "minecraft:crafting_shapeless" } \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/petal_silver_double.json b/src/main/resources/data/botania/recipes/petal_silver_double.json index d953f4ee4..e7586eb8a 100644 --- a/src/main/resources/data/botania/recipes/petal_silver_double.json +++ b/src/main/resources/data/botania/recipes/petal_silver_double.json @@ -1,13 +1,13 @@ { "result": { - "item": "botania:petal_silver", + "item": "botania:silver_petal", "count": 4 }, "group": "botania:petal_double", "ingredients": [ { - "tag": "botania:double_flowers/lightgray" + "tag": "botania:double_flowers/light_gray" } ], - "type": "forge:ore_shapeless" + "type": "minecraft:crafting_shapeless" } \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/petal_white.json b/src/main/resources/data/botania/recipes/petal_white.json index 5abf36fe9..98f5acf80 100644 --- a/src/main/resources/data/botania/recipes/petal_white.json +++ b/src/main/resources/data/botania/recipes/petal_white.json @@ -1,6 +1,6 @@ { "result": { - "item": "botania:petal_white", + "item": "botania:white_petal", "count": 2 }, "group": "botania:petal", @@ -9,5 +9,5 @@ "tag": "botania:flowers/white" } ], - "type": "forge:ore_shapeless" + "type": "minecraft:crafting_shapeless" } \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/petal_white_double.json b/src/main/resources/data/botania/recipes/petal_white_double.json index ef33cfb36..1400b0e55 100644 --- a/src/main/resources/data/botania/recipes/petal_white_double.json +++ b/src/main/resources/data/botania/recipes/petal_white_double.json @@ -1,6 +1,6 @@ { "result": { - "item": "botania:petal_white", + "item": "botania:white_petal", "count": 4 }, "group": "botania:petal_double", @@ -9,5 +9,5 @@ "tag": "botania:double_flowers/white" } ], - "type": "forge:ore_shapeless" + "type": "minecraft:crafting_shapeless" } \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/petal_yellow.json b/src/main/resources/data/botania/recipes/petal_yellow.json index 3d2a55686..4a13483fd 100644 --- a/src/main/resources/data/botania/recipes/petal_yellow.json +++ b/src/main/resources/data/botania/recipes/petal_yellow.json @@ -1,6 +1,6 @@ { "result": { - "item": "botania:petal_yellow", + "item": "botania:yellow_petal", "count": 2 }, "group": "botania:petal", @@ -9,5 +9,5 @@ "tag": "botania:flowers/yellow" } ], - "type": "forge:ore_shapeless" + "type": "minecraft:crafting_shapeless" } \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/petal_yellow_double.json b/src/main/resources/data/botania/recipes/petal_yellow_double.json index b54fdac1b..83a4d5f7d 100644 --- a/src/main/resources/data/botania/recipes/petal_yellow_double.json +++ b/src/main/resources/data/botania/recipes/petal_yellow_double.json @@ -1,6 +1,6 @@ { "result": { - "item": "botania:petal_yellow", + "item": "botania:yellow_petal", "count": 4 }, "group": "botania:petal_double", @@ -9,5 +9,5 @@ "tag": "botania:double_flowers/yellow" } ], - "type": "forge:ore_shapeless" + "type": "minecraft:crafting_shapeless" } \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/phantomink.json b/src/main/resources/data/botania/recipes/phantomink.json index 2926621de..2678e2e33 100644 --- a/src/main/resources/data/botania/recipes/phantomink.json +++ b/src/main/resources/data/botania/recipes/phantomink.json @@ -11,7 +11,7 @@ "tag": "forge:dyes" }, { - "item": "#glass" + "constants": "botania:glass" }, { "item": "minecraft:glass_bottle" @@ -26,5 +26,5 @@ "item": "minecraft:glass_bottle" } ], - "type": "forge:ore_shapeless" + "type": "minecraft:crafting_shapeless" } \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/pink_petal_block.json b/src/main/resources/data/botania/recipes/pink_petal_block.json index b9b77c2b1..a9b7d5639 100644 --- a/src/main/resources/data/botania/recipes/pink_petal_block.json +++ b/src/main/resources/data/botania/recipes/pink_petal_block.json @@ -7,7 +7,7 @@ "PPP", "PPP" ], - "type": "forge:ore_shaped", + "type": "minecraft:crafting_shaped", "group": "botania:petal_block", "key": { "P": { diff --git a/src/main/resources/data/botania/recipes/pixiering.json b/src/main/resources/data/botania/recipes/pixiering.json index 5564f75cb..e87858bf0 100644 --- a/src/main/resources/data/botania/recipes/pixiering.json +++ b/src/main/resources/data/botania/recipes/pixiering.json @@ -7,7 +7,7 @@ "E E", " E " ], - "type": "forge:ore_shaped", + "type": "minecraft:crafting_shaped", "key": { "D": { "item": "botania:pixie_dust" diff --git a/src/main/resources/data/botania/recipes/placeholder.json b/src/main/resources/data/botania/recipes/placeholder.json index 1389057a3..dfd681be5 100644 --- a/src/main/resources/data/botania/recipes/placeholder.json +++ b/src/main/resources/data/botania/recipes/placeholder.json @@ -11,5 +11,5 @@ "tag": "botania:livingrock" } ], - "type": "forge:ore_shapeless" + "type": "minecraft:crafting_shapeless" } \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/pool_default.json b/src/main/resources/data/botania/recipes/pool_default.json index 74a612d8d..8ef18c2a2 100644 --- a/src/main/resources/data/botania/recipes/pool_default.json +++ b/src/main/resources/data/botania/recipes/pool_default.json @@ -6,7 +6,7 @@ "R R", "RRR" ], - "type": "forge:ore_shaped", + "type": "minecraft:crafting_shaped", "key": { "R": { "tag": "botania:livingrock" diff --git a/src/main/resources/data/botania/recipes/prism.json b/src/main/resources/data/botania/recipes/prism.json index 47564a539..dde3403c6 100644 --- a/src/main/resources/data/botania/recipes/prism.json +++ b/src/main/resources/data/botania/recipes/prism.json @@ -7,7 +7,7 @@ "GSG", "GPG" ], - "type": "forge:ore_shaped", + "type": "minecraft:crafting_shaped", "key": { "P": { "tag": "forge:gems/prismarine" diff --git a/src/main/resources/data/botania/recipes/pump.json b/src/main/resources/data/botania/recipes/pump.json index 5df74bdaa..1b226b10e 100644 --- a/src/main/resources/data/botania/recipes/pump.json +++ b/src/main/resources/data/botania/recipes/pump.json @@ -7,7 +7,7 @@ "IBI", "SSS" ], - "type": "forge:ore_shaped", + "type": "minecraft:crafting_shaped", "key": { "B": { "item": "minecraft:bucket" diff --git a/src/main/resources/data/botania/recipes/purple_petal_block.json b/src/main/resources/data/botania/recipes/purple_petal_block.json index f449d729b..3ebf75f98 100644 --- a/src/main/resources/data/botania/recipes/purple_petal_block.json +++ b/src/main/resources/data/botania/recipes/purple_petal_block.json @@ -7,7 +7,7 @@ "PPP", "PPP" ], - "type": "forge:ore_shaped", + "type": "minecraft:crafting_shaped", "group": "botania:petal_block", "key": { "P": { diff --git a/src/main/resources/data/botania/recipes/pylon_gaia.json b/src/main/resources/data/botania/recipes/pylon_gaia.json index de40cd86b..13eef91f5 100644 --- a/src/main/resources/data/botania/recipes/pylon_gaia.json +++ b/src/main/resources/data/botania/recipes/pylon_gaia.json @@ -7,7 +7,7 @@ "EPE", " D " ], - "type": "forge:ore_shaped", + "type": "minecraft:crafting_shaped", "key": { "P": { "item": "botania:pylon_mana" diff --git a/src/main/resources/data/botania/recipes/pylon_mana.json b/src/main/resources/data/botania/recipes/pylon_mana.json index a04022372..b70e018ac 100644 --- a/src/main/resources/data/botania/recipes/pylon_mana.json +++ b/src/main/resources/data/botania/recipes/pylon_mana.json @@ -7,7 +7,7 @@ "MDM", " G " ], - "type": "forge:ore_shaped", + "type": "minecraft:crafting_shaped", "key": { "D": { "tag": "forge:gems/mana_diamond" diff --git a/src/main/resources/data/botania/recipes/pylon_natura.json b/src/main/resources/data/botania/recipes/pylon_natura.json index 90782509f..3fc0a0ee0 100644 --- a/src/main/resources/data/botania/recipes/pylon_natura.json +++ b/src/main/resources/data/botania/recipes/pylon_natura.json @@ -7,7 +7,7 @@ "TPT", " E " ], - "type": "forge:ore_shaped", + "type": "minecraft:crafting_shaped", "key": { "P": { "item": "botania:pylon_mana" diff --git a/src/main/resources/data/botania/recipes/quartz_blaze.json b/src/main/resources/data/botania/recipes/quartz_blaze.json index 09dd19e24..333100910 100644 --- a/src/main/resources/data/botania/recipes/quartz_blaze.json +++ b/src/main/resources/data/botania/recipes/quartz_blaze.json @@ -8,7 +8,7 @@ "QCQ", "QQQ" ], - "type": "forge:ore_shaped", + "type": "minecraft:crafting_shaped", "key": { "Q": { "tag": "forge:gems/quartz" diff --git a/src/main/resources/data/botania/recipes/quartz_dark.json b/src/main/resources/data/botania/recipes/quartz_dark.json index 5bb595d78..1d2106010 100644 --- a/src/main/resources/data/botania/recipes/quartz_dark.json +++ b/src/main/resources/data/botania/recipes/quartz_dark.json @@ -8,7 +8,7 @@ "QCQ", "QQQ" ], - "type": "forge:ore_shaped", + "type": "minecraft:crafting_shaped", "key": { "Q": { "tag": "forge:gems/quartz" diff --git a/src/main/resources/data/botania/recipes/quartz_lavender.json b/src/main/resources/data/botania/recipes/quartz_lavender.json index c81adc433..5ffb66d8e 100644 --- a/src/main/resources/data/botania/recipes/quartz_lavender.json +++ b/src/main/resources/data/botania/recipes/quartz_lavender.json @@ -8,7 +8,7 @@ "QCQ", "QQQ" ], - "type": "forge:ore_shaped", + "type": "minecraft:crafting_shaped", "key": { "Q": { "tag": "forge:gems/quartz" diff --git a/src/main/resources/data/botania/recipes/quartz_red.json b/src/main/resources/data/botania/recipes/quartz_red.json index d26c6e3c0..9423dc712 100644 --- a/src/main/resources/data/botania/recipes/quartz_red.json +++ b/src/main/resources/data/botania/recipes/quartz_red.json @@ -8,7 +8,7 @@ "QCQ", "QQQ" ], - "type": "forge:ore_shaped", + "type": "minecraft:crafting_shaped", "key": { "Q": { "tag": "forge:gems/quartz" diff --git a/src/main/resources/data/botania/recipes/quartz_sunny.json b/src/main/resources/data/botania/recipes/quartz_sunny.json index e9d1ac3b9..36d0f5dfd 100644 --- a/src/main/resources/data/botania/recipes/quartz_sunny.json +++ b/src/main/resources/data/botania/recipes/quartz_sunny.json @@ -8,7 +8,7 @@ "QCQ", "QQQ" ], - "type": "forge:ore_shaped", + "type": "minecraft:crafting_shaped", "key": { "Q": { "tag": "forge:gems/quartz" diff --git a/src/main/resources/data/botania/recipes/quartztypeblaze_0.json b/src/main/resources/data/botania/recipes/quartztypeblaze_0.json index fc0b2e389..7c8ab82f4 100644 --- a/src/main/resources/data/botania/recipes/quartztypeblaze_0.json +++ b/src/main/resources/data/botania/recipes/quartztypeblaze_0.json @@ -7,7 +7,7 @@ "QQ", "QQ" ], - "type": "forge:ore_shaped", + "type": "minecraft:crafting_shaped", "key": { "Q": { "item": "botania:quartz_blaze" diff --git a/src/main/resources/data/botania/recipes/quartztypedark_0.json b/src/main/resources/data/botania/recipes/quartztypedark_0.json index 9a7b406d4..29e2cfb3a 100644 --- a/src/main/resources/data/botania/recipes/quartztypedark_0.json +++ b/src/main/resources/data/botania/recipes/quartztypedark_0.json @@ -7,7 +7,7 @@ "QQ", "QQ" ], - "type": "forge:ore_shaped", + "type": "minecraft:crafting_shaped", "key": { "Q": { "item": "botania:quartz_dark" diff --git a/src/main/resources/data/botania/recipes/quartztypeelf_0.json b/src/main/resources/data/botania/recipes/quartztypeelf_0.json index 41821f726..2fd1ad47e 100644 --- a/src/main/resources/data/botania/recipes/quartztypeelf_0.json +++ b/src/main/resources/data/botania/recipes/quartztypeelf_0.json @@ -7,7 +7,7 @@ "QQ", "QQ" ], - "type": "forge:ore_shaped", + "type": "minecraft:crafting_shaped", "key": { "Q": { "item": "botania:quartz_elven" diff --git a/src/main/resources/data/botania/recipes/quartztypelavender_0.json b/src/main/resources/data/botania/recipes/quartztypelavender_0.json index aa0f7968a..805847534 100644 --- a/src/main/resources/data/botania/recipes/quartztypelavender_0.json +++ b/src/main/resources/data/botania/recipes/quartztypelavender_0.json @@ -7,7 +7,7 @@ "QQ", "QQ" ], - "type": "forge:ore_shaped", + "type": "minecraft:crafting_shaped", "key": { "Q": { "item": "botania:quartz_lavender" diff --git a/src/main/resources/data/botania/recipes/quartztypemana_0.json b/src/main/resources/data/botania/recipes/quartztypemana_0.json index 55e31809c..a490b1d47 100644 --- a/src/main/resources/data/botania/recipes/quartztypemana_0.json +++ b/src/main/resources/data/botania/recipes/quartztypemana_0.json @@ -7,7 +7,7 @@ "QQ", "QQ" ], - "type": "forge:ore_shaped", + "type": "minecraft:crafting_shaped", "key": { "Q": { "item": "botania:quartz_mana" diff --git a/src/main/resources/data/botania/recipes/quartztypered_0.json b/src/main/resources/data/botania/recipes/quartztypered_0.json index 72bf7b094..2626758d7 100644 --- a/src/main/resources/data/botania/recipes/quartztypered_0.json +++ b/src/main/resources/data/botania/recipes/quartztypered_0.json @@ -7,7 +7,7 @@ "QQ", "QQ" ], - "type": "forge:ore_shaped", + "type": "minecraft:crafting_shaped", "key": { "Q": { "item": "botania:quartz_red" diff --git a/src/main/resources/data/botania/recipes/quartztypesunny_0.json b/src/main/resources/data/botania/recipes/quartztypesunny_0.json index 0db850835..c8da5bc87 100644 --- a/src/main/resources/data/botania/recipes/quartztypesunny_0.json +++ b/src/main/resources/data/botania/recipes/quartztypesunny_0.json @@ -7,7 +7,7 @@ "QQ", "QQ" ], - "type": "forge:ore_shaped", + "type": "minecraft:crafting_shaped", "key": { "Q": { "item": "botania:quartz_sunny" diff --git a/src/main/resources/data/botania/recipes/rainbowrod.json b/src/main/resources/data/botania/recipes/rainbowrod.json index 2fa9b4b89..7a2a84f7f 100644 --- a/src/main/resources/data/botania/recipes/rainbowrod.json +++ b/src/main/resources/data/botania/recipes/rainbowrod.json @@ -7,7 +7,7 @@ " EP", "E " ], - "type": "forge:ore_shaped", + "type": "minecraft:crafting_shaped", "key": { "P": { "item": "botania:pixie_dust" diff --git a/src/main/resources/data/botania/recipes/reachring.json b/src/main/resources/data/botania/recipes/reachring.json index 5b6ee6d24..446b47f74 100644 --- a/src/main/resources/data/botania/recipes/reachring.json +++ b/src/main/resources/data/botania/recipes/reachring.json @@ -7,7 +7,7 @@ "E E", " E " ], - "type": "forge:ore_shaped", + "type": "minecraft:crafting_shaped", "key": { "R": { "tag": "botania:runes/pride" diff --git a/src/main/resources/data/botania/recipes/red_petal_block.json b/src/main/resources/data/botania/recipes/red_petal_block.json index 7ba725263..c453de516 100644 --- a/src/main/resources/data/botania/recipes/red_petal_block.json +++ b/src/main/resources/data/botania/recipes/red_petal_block.json @@ -7,7 +7,7 @@ "PPP", "PPP" ], - "type": "forge:ore_shaped", + "type": "minecraft:crafting_shaped", "group": "botania:petal_block", "key": { "P": { diff --git a/src/main/resources/data/botania/recipes/red_string.json b/src/main/resources/data/botania/recipes/red_string.json index 052850412..32dd3fc27 100644 --- a/src/main/resources/data/botania/recipes/red_string.json +++ b/src/main/resources/data/botania/recipes/red_string.json @@ -16,5 +16,5 @@ "item": "botania:ender_air_bottle" } ], - "type": "forge:ore_shapeless" + "type": "minecraft:crafting_shapeless" } \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/red_string_alt.json b/src/main/resources/data/botania/recipes/red_string_alt.json index 8403e5e03..d3f8ab846 100644 --- a/src/main/resources/data/botania/recipes/red_string_alt.json +++ b/src/main/resources/data/botania/recipes/red_string_alt.json @@ -19,5 +19,5 @@ "item": "minecraft:pumpkin" } ], - "type": "forge:ore_shapeless" + "type": "minecraft:crafting_shapeless" } \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/redstone_root.json b/src/main/resources/data/botania/recipes/redstone_root.json index de830b924..e6eeecd8b 100644 --- a/src/main/resources/data/botania/recipes/redstone_root.json +++ b/src/main/resources/data/botania/recipes/redstone_root.json @@ -11,5 +11,5 @@ "data": 1 } ], - "type": "forge:ore_shapeless" + "type": "minecraft:crafting_shapeless" } \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/redstone_spreader.json b/src/main/resources/data/botania/recipes/redstone_spreader.json index 99ef424d9..1359bc63a 100644 --- a/src/main/resources/data/botania/recipes/redstone_spreader.json +++ b/src/main/resources/data/botania/recipes/redstone_spreader.json @@ -11,5 +11,5 @@ "tag": "forge:dusts/redstone" } ], - "type": "forge:ore_shapeless" + "type": "minecraft:crafting_shapeless" } \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/redstringcomparator.json b/src/main/resources/data/botania/recipes/redstringcomparator.json index 6ffd5e117..c74f1a973 100644 --- a/src/main/resources/data/botania/recipes/redstringcomparator.json +++ b/src/main/resources/data/botania/recipes/redstringcomparator.json @@ -7,7 +7,7 @@ "RCS", "RRR" ], - "type": "forge:ore_shaped", + "type": "minecraft:crafting_shaped", "key": { "R": { "tag": "botania:livingrock" diff --git a/src/main/resources/data/botania/recipes/redstringcontainer.json b/src/main/resources/data/botania/recipes/redstringcontainer.json index b88c9b301..f32c3b921 100644 --- a/src/main/resources/data/botania/recipes/redstringcontainer.json +++ b/src/main/resources/data/botania/recipes/redstringcontainer.json @@ -7,7 +7,7 @@ "RCS", "RRR" ], - "type": "forge:ore_shaped", + "type": "minecraft:crafting_shaped", "key": { "R": { "tag": "botania:livingrock" diff --git a/src/main/resources/data/botania/recipes/redstringdispenser.json b/src/main/resources/data/botania/recipes/redstringdispenser.json index ba6b9e70d..eafb81b52 100644 --- a/src/main/resources/data/botania/recipes/redstringdispenser.json +++ b/src/main/resources/data/botania/recipes/redstringdispenser.json @@ -7,7 +7,7 @@ "RDS", "RRR" ], - "type": "forge:ore_shaped", + "type": "minecraft:crafting_shaped", "key": { "R": { "tag": "botania:livingrock" diff --git a/src/main/resources/data/botania/recipes/redstringfertilizer.json b/src/main/resources/data/botania/recipes/redstringfertilizer.json index 6403d411c..862796482 100644 --- a/src/main/resources/data/botania/recipes/redstringfertilizer.json +++ b/src/main/resources/data/botania/recipes/redstringfertilizer.json @@ -7,7 +7,7 @@ "RBS", "RRR" ], - "type": "forge:ore_shaped", + "type": "minecraft:crafting_shaped", "key": { "R": { "tag": "botania:livingrock" diff --git a/src/main/resources/data/botania/recipes/redstringinterceptor.json b/src/main/resources/data/botania/recipes/redstringinterceptor.json index 37aaa0172..b5e70992b 100644 --- a/src/main/resources/data/botania/recipes/redstringinterceptor.json +++ b/src/main/resources/data/botania/recipes/redstringinterceptor.json @@ -7,7 +7,7 @@ "RMS", "RRR" ], - "type": "forge:ore_shaped", + "type": "minecraft:crafting_shaped", "key": { "R": { "tag": "botania:livingrock" diff --git a/src/main/resources/data/botania/recipes/redstringrelay.json b/src/main/resources/data/botania/recipes/redstringrelay.json index 8d4f5d0a0..964323399 100644 --- a/src/main/resources/data/botania/recipes/redstringrelay.json +++ b/src/main/resources/data/botania/recipes/redstringrelay.json @@ -7,7 +7,7 @@ "RMS", "RRR" ], - "type": "forge:ore_shaped", + "type": "minecraft:crafting_shaped", "key": { "R": { "tag": "botania:livingrock" diff --git a/src/main/resources/data/botania/recipes/rfgenerator.json b/src/main/resources/data/botania/recipes/rfgenerator.json index e041d83bf..87b8d1392 100644 --- a/src/main/resources/data/botania/recipes/rfgenerator.json +++ b/src/main/resources/data/botania/recipes/rfgenerator.json @@ -13,7 +13,7 @@ "RMR", "SRS" ], - "type": "forge:ore_shaped", + "type": "minecraft:crafting_shaped", "key": { "R": { "tag": "forge:storage_blocks/redstone" diff --git a/src/main/resources/data/botania/recipes/runealtar.json b/src/main/resources/data/botania/recipes/runealtar.json index a4a4de445..36080327e 100644 --- a/src/main/resources/data/botania/recipes/runealtar.json +++ b/src/main/resources/data/botania/recipes/runealtar.json @@ -6,7 +6,7 @@ "SSS", "SPS" ], - "type": "forge:ore_shaped", + "type": "minecraft:crafting_shaped", "key": { "P": [ { diff --git a/src/main/resources/data/botania/recipes/sextant.json b/src/main/resources/data/botania/recipes/sextant.json index 5b479ceac..98c0e2718 100644 --- a/src/main/resources/data/botania/recipes/sextant.json +++ b/src/main/resources/data/botania/recipes/sextant.json @@ -7,7 +7,7 @@ " TT", "III" ], - "type": "forge:ore_shaped", + "type": "minecraft:crafting_shaped", "key": { "T": { "item": "botania:livingwood_twig" diff --git a/src/main/resources/data/botania/recipes/shimmerrock.json b/src/main/resources/data/botania/recipes/shimmerrock.json index c44463b3c..d966789a0 100644 --- a/src/main/resources/data/botania/recipes/shimmerrock.json +++ b/src/main/resources/data/botania/recipes/shimmerrock.json @@ -10,5 +10,5 @@ "item": "botania:bifrostperm" } ], - "type": "forge:ore_shapeless" + "type": "minecraft:crafting_shapeless" } \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/shinyflower_0.json b/src/main/resources/data/botania/recipes/shinyflower_0.json index 56c0deef9..0e6a57034 100644 --- a/src/main/resources/data/botania/recipes/shinyflower_0.json +++ b/src/main/resources/data/botania/recipes/shinyflower_0.json @@ -15,5 +15,5 @@ "tag": "botania:flowers/white" } ], - "type": "forge:ore_shapeless" + "type": "minecraft:crafting_shapeless" } \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/shinyflower_1.json b/src/main/resources/data/botania/recipes/shinyflower_1.json index 9c30b4add..c9a0647ad 100644 --- a/src/main/resources/data/botania/recipes/shinyflower_1.json +++ b/src/main/resources/data/botania/recipes/shinyflower_1.json @@ -15,5 +15,5 @@ "tag": "botania:flowers/orange" } ], - "type": "forge:ore_shapeless" + "type": "minecraft:crafting_shapeless" } \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/shinyflower_10.json b/src/main/resources/data/botania/recipes/shinyflower_10.json index 5a61de5a9..6434a6ccd 100644 --- a/src/main/resources/data/botania/recipes/shinyflower_10.json +++ b/src/main/resources/data/botania/recipes/shinyflower_10.json @@ -15,5 +15,5 @@ "tag": "botania:flowers/purple" } ], - "type": "forge:ore_shapeless" + "type": "minecraft:crafting_shapeless" } \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/shinyflower_11.json b/src/main/resources/data/botania/recipes/shinyflower_11.json index 343675148..dd3f611b5 100644 --- a/src/main/resources/data/botania/recipes/shinyflower_11.json +++ b/src/main/resources/data/botania/recipes/shinyflower_11.json @@ -15,5 +15,5 @@ "tag": "botania:flowers/blue" } ], - "type": "forge:ore_shapeless" + "type": "minecraft:crafting_shapeless" } \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/shinyflower_12.json b/src/main/resources/data/botania/recipes/shinyflower_12.json index b90bfa46a..b544e967e 100644 --- a/src/main/resources/data/botania/recipes/shinyflower_12.json +++ b/src/main/resources/data/botania/recipes/shinyflower_12.json @@ -15,5 +15,5 @@ "tag": "botania:flowers/brown" } ], - "type": "forge:ore_shapeless" + "type": "minecraft:crafting_shapeless" } \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/shinyflower_13.json b/src/main/resources/data/botania/recipes/shinyflower_13.json index dc598a459..72d3bbe72 100644 --- a/src/main/resources/data/botania/recipes/shinyflower_13.json +++ b/src/main/resources/data/botania/recipes/shinyflower_13.json @@ -15,5 +15,5 @@ "tag": "botania:flowers/green" } ], - "type": "forge:ore_shapeless" + "type": "minecraft:crafting_shapeless" } \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/shinyflower_14.json b/src/main/resources/data/botania/recipes/shinyflower_14.json index 5a44c1ba6..977474406 100644 --- a/src/main/resources/data/botania/recipes/shinyflower_14.json +++ b/src/main/resources/data/botania/recipes/shinyflower_14.json @@ -15,5 +15,5 @@ "tag": "botania:flowers/red" } ], - "type": "forge:ore_shapeless" + "type": "minecraft:crafting_shapeless" } \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/shinyflower_15.json b/src/main/resources/data/botania/recipes/shinyflower_15.json index 617ce204b..05c6ef25d 100644 --- a/src/main/resources/data/botania/recipes/shinyflower_15.json +++ b/src/main/resources/data/botania/recipes/shinyflower_15.json @@ -15,5 +15,5 @@ "tag": "botania:flowers/black" } ], - "type": "forge:ore_shapeless" + "type": "minecraft:crafting_shapeless" } \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/shinyflower_2.json b/src/main/resources/data/botania/recipes/shinyflower_2.json index e3ece2cd9..c6379aaee 100644 --- a/src/main/resources/data/botania/recipes/shinyflower_2.json +++ b/src/main/resources/data/botania/recipes/shinyflower_2.json @@ -15,5 +15,5 @@ "tag": "botania:flowers/magenta" } ], - "type": "forge:ore_shapeless" + "type": "minecraft:crafting_shapeless" } \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/shinyflower_3.json b/src/main/resources/data/botania/recipes/shinyflower_3.json index bada199ff..bebdbcac3 100644 --- a/src/main/resources/data/botania/recipes/shinyflower_3.json +++ b/src/main/resources/data/botania/recipes/shinyflower_3.json @@ -15,5 +15,5 @@ "tag": "botania:flowers/lightblue" } ], - "type": "forge:ore_shapeless" + "type": "minecraft:crafting_shapeless" } \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/shinyflower_4.json b/src/main/resources/data/botania/recipes/shinyflower_4.json index 32fa14d8e..17fcd6b21 100644 --- a/src/main/resources/data/botania/recipes/shinyflower_4.json +++ b/src/main/resources/data/botania/recipes/shinyflower_4.json @@ -15,5 +15,5 @@ "tag": "botania:flowers/yellow" } ], - "type": "forge:ore_shapeless" + "type": "minecraft:crafting_shapeless" } \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/shinyflower_5.json b/src/main/resources/data/botania/recipes/shinyflower_5.json index fd8c05bac..83bfbba20 100644 --- a/src/main/resources/data/botania/recipes/shinyflower_5.json +++ b/src/main/resources/data/botania/recipes/shinyflower_5.json @@ -15,5 +15,5 @@ "tag": "botania:flowers/lime" } ], - "type": "forge:ore_shapeless" + "type": "minecraft:crafting_shapeless" } \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/shinyflower_6.json b/src/main/resources/data/botania/recipes/shinyflower_6.json index 06919a7f8..848421466 100644 --- a/src/main/resources/data/botania/recipes/shinyflower_6.json +++ b/src/main/resources/data/botania/recipes/shinyflower_6.json @@ -15,5 +15,5 @@ "tag": "botania:flowers/pink" } ], - "type": "forge:ore_shapeless" + "type": "minecraft:crafting_shapeless" } \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/shinyflower_7.json b/src/main/resources/data/botania/recipes/shinyflower_7.json index 7fcac6391..2e611e1bd 100644 --- a/src/main/resources/data/botania/recipes/shinyflower_7.json +++ b/src/main/resources/data/botania/recipes/shinyflower_7.json @@ -15,5 +15,5 @@ "tag": "botania:flowers/gray" } ], - "type": "forge:ore_shapeless" + "type": "minecraft:crafting_shapeless" } \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/shinyflower_8.json b/src/main/resources/data/botania/recipes/shinyflower_8.json index d5ebb3255..3f4cd0d52 100644 --- a/src/main/resources/data/botania/recipes/shinyflower_8.json +++ b/src/main/resources/data/botania/recipes/shinyflower_8.json @@ -12,8 +12,8 @@ "tag": "forge:dusts/glowstone" }, { - "tag": "botania:flowers/lightgray" + "tag": "botania:flowers/light_gray" } ], - "type": "forge:ore_shapeless" + "type": "minecraft:crafting_shapeless" } \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/shinyflower_9.json b/src/main/resources/data/botania/recipes/shinyflower_9.json index 276b9e640..f75acf83c 100644 --- a/src/main/resources/data/botania/recipes/shinyflower_9.json +++ b/src/main/resources/data/botania/recipes/shinyflower_9.json @@ -15,5 +15,5 @@ "tag": "botania:flowers/cyan" } ], - "type": "forge:ore_shapeless" + "type": "minecraft:crafting_shapeless" } \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/silver_petal_block.json b/src/main/resources/data/botania/recipes/silver_petal_block.json index 3a1018739..e47ab88be 100644 --- a/src/main/resources/data/botania/recipes/silver_petal_block.json +++ b/src/main/resources/data/botania/recipes/silver_petal_block.json @@ -7,7 +7,7 @@ "PPP", "PPP" ], - "type": "forge:ore_shaped", + "type": "minecraft:crafting_shaped", "group": "botania:petal_block", "key": { "P": { diff --git a/src/main/resources/data/botania/recipes/skydirtrod.json b/src/main/resources/data/botania/recipes/skydirtrod.json index 9d243492d..4d4633b6e 100644 --- a/src/main/resources/data/botania/recipes/skydirtrod.json +++ b/src/main/resources/data/botania/recipes/skydirtrod.json @@ -13,5 +13,5 @@ "tag": "botania:runes/air" } ], - "type": "forge:ore_shapeless" + "type": "minecraft:crafting_shapeless" } \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/slab_recombine/biomestonea_12.json b/src/main/resources/data/botania/recipes/slab_recombine/biomestonea_12.json deleted file mode 100644 index a2c6e9ed7..000000000 --- a/src/main/resources/data/botania/recipes/slab_recombine/biomestonea_12.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "result": { - "item": "botania:biomestonea", - "data": 12 - }, - "pattern": [ - "Q", - "Q" - ], - "type": "minecraft:crafting_shaped", - "key": { - "Q": { - "item": "botania:biomestonea12slab", - "data": 0 - } - } -} \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/slab_recombine/biomestonea_13.json b/src/main/resources/data/botania/recipes/slab_recombine/biomestonea_13.json deleted file mode 100644 index 626eee68f..000000000 --- a/src/main/resources/data/botania/recipes/slab_recombine/biomestonea_13.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "result": { - "item": "botania:biomestonea", - "data": 13 - }, - "pattern": [ - "Q", - "Q" - ], - "type": "minecraft:crafting_shaped", - "key": { - "Q": { - "item": "botania:biomestonea13slab", - "data": 0 - } - } -} \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/slab_recombine/biomestonea_14.json b/src/main/resources/data/botania/recipes/slab_recombine/biomestonea_14.json deleted file mode 100644 index 791acf2db..000000000 --- a/src/main/resources/data/botania/recipes/slab_recombine/biomestonea_14.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "result": { - "item": "botania:biomestonea", - "data": 14 - }, - "pattern": [ - "Q", - "Q" - ], - "type": "minecraft:crafting_shaped", - "key": { - "Q": { - "item": "botania:biomestonea14slab", - "data": 0 - } - } -} \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/slab_recombine/biomestonea_15.json b/src/main/resources/data/botania/recipes/slab_recombine/biomestonea_15.json deleted file mode 100644 index 859316ee2..000000000 --- a/src/main/resources/data/botania/recipes/slab_recombine/biomestonea_15.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "result": { - "item": "botania:biomestonea", - "data": 15 - }, - "pattern": [ - "Q", - "Q" - ], - "type": "minecraft:crafting_shaped", - "key": { - "Q": { - "item": "botania:biomestonea15slab", - "data": 0 - } - } -} \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/slab_recombine/biomestonea_2.json b/src/main/resources/data/botania/recipes/slab_recombine/biomestonea_2.json deleted file mode 100644 index d0b11f688..000000000 --- a/src/main/resources/data/botania/recipes/slab_recombine/biomestonea_2.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "result": { - "item": "botania:biomestonea", - "data": 2 - }, - "pattern": [ - "Q", - "Q" - ], - "type": "minecraft:crafting_shaped", - "key": { - "Q": { - "item": "botania:biomestonea2slab", - "data": 0 - } - } -} \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/slab_recombine/biomestonea_3.json b/src/main/resources/data/botania/recipes/slab_recombine/biomestonea_3.json deleted file mode 100644 index 097ff5a18..000000000 --- a/src/main/resources/data/botania/recipes/slab_recombine/biomestonea_3.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "result": { - "item": "botania:biomestonea", - "data": 3 - }, - "pattern": [ - "Q", - "Q" - ], - "type": "minecraft:crafting_shaped", - "key": { - "Q": { - "item": "botania:biomestonea3slab", - "data": 0 - } - } -} \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/slab_recombine/biomestonea_4.json b/src/main/resources/data/botania/recipes/slab_recombine/biomestonea_4.json deleted file mode 100644 index b50d194e9..000000000 --- a/src/main/resources/data/botania/recipes/slab_recombine/biomestonea_4.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "result": { - "item": "botania:biomestonea", - "data": 4 - }, - "pattern": [ - "Q", - "Q" - ], - "type": "minecraft:crafting_shaped", - "key": { - "Q": { - "item": "botania:biomestonea4slab", - "data": 0 - } - } -} \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/slab_recombine/biomestonea_5.json b/src/main/resources/data/botania/recipes/slab_recombine/biomestonea_5.json deleted file mode 100644 index 6e42b4ac8..000000000 --- a/src/main/resources/data/botania/recipes/slab_recombine/biomestonea_5.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "result": { - "item": "botania:biomestonea", - "data": 5 - }, - "pattern": [ - "Q", - "Q" - ], - "type": "minecraft:crafting_shaped", - "key": { - "Q": { - "item": "botania:biomestonea5slab", - "data": 0 - } - } -} \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/slab_recombine/biomestonea_6.json b/src/main/resources/data/botania/recipes/slab_recombine/biomestonea_6.json deleted file mode 100644 index 0e99e3aca..000000000 --- a/src/main/resources/data/botania/recipes/slab_recombine/biomestonea_6.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "result": { - "item": "botania:biomestonea", - "data": 6 - }, - "pattern": [ - "Q", - "Q" - ], - "type": "minecraft:crafting_shaped", - "key": { - "Q": { - "item": "botania:biomestonea6slab", - "data": 0 - } - } -} \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/slab_recombine/biomestonea_7.json b/src/main/resources/data/botania/recipes/slab_recombine/biomestonea_7.json deleted file mode 100644 index f68107ce5..000000000 --- a/src/main/resources/data/botania/recipes/slab_recombine/biomestonea_7.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "result": { - "item": "botania:biomestonea", - "data": 7 - }, - "pattern": [ - "Q", - "Q" - ], - "type": "minecraft:crafting_shaped", - "key": { - "Q": { - "item": "botania:biomestonea7slab", - "data": 0 - } - } -} \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/slab_recombine/biomestonea_8.json b/src/main/resources/data/botania/recipes/slab_recombine/biomestonea_8.json deleted file mode 100644 index 0a2ddf78d..000000000 --- a/src/main/resources/data/botania/recipes/slab_recombine/biomestonea_8.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "result": { - "item": "botania:biomestonea", - "data": 8 - }, - "pattern": [ - "Q", - "Q" - ], - "type": "minecraft:crafting_shaped", - "key": { - "Q": { - "item": "botania:biomestonea8slab", - "data": 0 - } - } -} \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/slab_recombine/biomestonea_9.json b/src/main/resources/data/botania/recipes/slab_recombine/biomestonea_9.json deleted file mode 100644 index 672bbce16..000000000 --- a/src/main/resources/data/botania/recipes/slab_recombine/biomestonea_9.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "result": { - "item": "botania:biomestonea", - "data": 9 - }, - "pattern": [ - "Q", - "Q" - ], - "type": "minecraft:crafting_shaped", - "key": { - "Q": { - "item": "botania:biomestonea9slab", - "data": 0 - } - } -} \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/slab_recombine/biomestoneb_0.json b/src/main/resources/data/botania/recipes/slab_recombine/biomestoneb_0.json deleted file mode 100644 index 5c8e3916b..000000000 --- a/src/main/resources/data/botania/recipes/slab_recombine/biomestoneb_0.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "result": { - "item": "botania:biomestoneb", - "data": 0 - }, - "pattern": [ - "Q", - "Q" - ], - "type": "minecraft:crafting_shaped", - "key": { - "Q": { - "item": "botania:biomestoneb0slab", - "data": 0 - } - } -} \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/slab_recombine/biomestoneb_1.json b/src/main/resources/data/botania/recipes/slab_recombine/biomestoneb_1.json deleted file mode 100644 index 7851a8f11..000000000 --- a/src/main/resources/data/botania/recipes/slab_recombine/biomestoneb_1.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "result": { - "item": "botania:biomestoneb", - "data": 1 - }, - "pattern": [ - "Q", - "Q" - ], - "type": "minecraft:crafting_shaped", - "key": { - "Q": { - "item": "botania:biomestoneb1slab", - "data": 0 - } - } -} \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/slab_recombine/biomestoneb_2.json b/src/main/resources/data/botania/recipes/slab_recombine/biomestoneb_2.json deleted file mode 100644 index 0c2ae73c7..000000000 --- a/src/main/resources/data/botania/recipes/slab_recombine/biomestoneb_2.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "result": { - "item": "botania:biomestoneb", - "data": 2 - }, - "pattern": [ - "Q", - "Q" - ], - "type": "minecraft:crafting_shaped", - "key": { - "Q": { - "item": "botania:biomestoneb2slab", - "data": 0 - } - } -} \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/slab_recombine/biomestoneb_3.json b/src/main/resources/data/botania/recipes/slab_recombine/biomestoneb_3.json deleted file mode 100644 index 3bf7aa953..000000000 --- a/src/main/resources/data/botania/recipes/slab_recombine/biomestoneb_3.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "result": { - "item": "botania:biomestoneb", - "data": 3 - }, - "pattern": [ - "Q", - "Q" - ], - "type": "minecraft:crafting_shaped", - "key": { - "Q": { - "item": "botania:biomestoneb3slab", - "data": 0 - } - } -} \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/slab_recombine/biomestoneb_4.json b/src/main/resources/data/botania/recipes/slab_recombine/biomestoneb_4.json deleted file mode 100644 index d2e73f43a..000000000 --- a/src/main/resources/data/botania/recipes/slab_recombine/biomestoneb_4.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "result": { - "item": "botania:biomestoneb", - "data": 4 - }, - "pattern": [ - "Q", - "Q" - ], - "type": "minecraft:crafting_shaped", - "key": { - "Q": { - "item": "botania:biomestoneb4slab", - "data": 0 - } - } -} \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/slab_recombine/biomestoneb_5.json b/src/main/resources/data/botania/recipes/slab_recombine/biomestoneb_5.json deleted file mode 100644 index 09d1662e4..000000000 --- a/src/main/resources/data/botania/recipes/slab_recombine/biomestoneb_5.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "result": { - "item": "botania:biomestoneb", - "data": 5 - }, - "pattern": [ - "Q", - "Q" - ], - "type": "minecraft:crafting_shaped", - "key": { - "Q": { - "item": "botania:biomestoneb5slab", - "data": 0 - } - } -} \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/slab_recombine/biomestoneb_6.json b/src/main/resources/data/botania/recipes/slab_recombine/biomestoneb_6.json deleted file mode 100644 index 735e4aaf9..000000000 --- a/src/main/resources/data/botania/recipes/slab_recombine/biomestoneb_6.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "result": { - "item": "botania:biomestoneb", - "data": 6 - }, - "pattern": [ - "Q", - "Q" - ], - "type": "minecraft:crafting_shaped", - "key": { - "Q": { - "item": "botania:biomestoneb6slab", - "data": 0 - } - } -} \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/slab_recombine/biomestoneb_7.json b/src/main/resources/data/botania/recipes/slab_recombine/biomestoneb_7.json deleted file mode 100644 index 79327459f..000000000 --- a/src/main/resources/data/botania/recipes/slab_recombine/biomestoneb_7.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "result": { - "item": "botania:biomestoneb", - "data": 7 - }, - "pattern": [ - "Q", - "Q" - ], - "type": "minecraft:crafting_shaped", - "key": { - "Q": { - "item": "botania:biomestoneb7slab", - "data": 0 - } - } -} \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/slab_recombine/pavement_2.json b/src/main/resources/data/botania/recipes/slab_recombine/black_pavement.json similarity index 56% rename from src/main/resources/data/botania/recipes/slab_recombine/pavement_2.json rename to src/main/resources/data/botania/recipes/slab_recombine/black_pavement.json index 5c3063690..725bb7658 100644 --- a/src/main/resources/data/botania/recipes/slab_recombine/pavement_2.json +++ b/src/main/resources/data/botania/recipes/slab_recombine/black_pavement.json @@ -1,7 +1,6 @@ { "result": { - "item": "botania:pavement", - "data": 2 + "item": "botania:black_pavement" }, "pattern": [ "Q", @@ -10,8 +9,7 @@ "type": "minecraft:crafting_shaped", "key": { "Q": { - "item": "botania:pavement2slab", - "data": 0 + "item": "botania:black_pavement_slab" } } } \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/slab_recombine/pavement_3.json b/src/main/resources/data/botania/recipes/slab_recombine/blue_pavement.json similarity index 56% rename from src/main/resources/data/botania/recipes/slab_recombine/pavement_3.json rename to src/main/resources/data/botania/recipes/slab_recombine/blue_pavement.json index b2ee9cc40..874d6127e 100644 --- a/src/main/resources/data/botania/recipes/slab_recombine/pavement_3.json +++ b/src/main/resources/data/botania/recipes/slab_recombine/blue_pavement.json @@ -1,7 +1,6 @@ { "result": { - "item": "botania:pavement", - "data": 3 + "item": "botania:blue_pavement" }, "pattern": [ "Q", @@ -10,8 +9,7 @@ "type": "minecraft:crafting_shaped", "key": { "Q": { - "item": "botania:pavement3slab", - "data": 0 + "item": "botania:blue_pavement_slab" } } } \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/slab_recombine/pavement_0.json b/src/main/resources/data/botania/recipes/slab_recombine/dreamwood.json similarity index 56% rename from src/main/resources/data/botania/recipes/slab_recombine/pavement_0.json rename to src/main/resources/data/botania/recipes/slab_recombine/dreamwood.json index f1366019b..d62324431 100644 --- a/src/main/resources/data/botania/recipes/slab_recombine/pavement_0.json +++ b/src/main/resources/data/botania/recipes/slab_recombine/dreamwood.json @@ -1,7 +1,6 @@ { "result": { - "item": "botania:pavement", - "data": 0 + "item": "botania:dreamwood" }, "pattern": [ "Q", @@ -10,8 +9,7 @@ "type": "minecraft:crafting_shaped", "key": { "Q": { - "item": "botania:pavement0slab", - "data": 0 + "item": "botania:dreamwood_slab" } } } \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/slab_recombine/pavement_1.json b/src/main/resources/data/botania/recipes/slab_recombine/dreamwood_planks.json similarity index 56% rename from src/main/resources/data/botania/recipes/slab_recombine/pavement_1.json rename to src/main/resources/data/botania/recipes/slab_recombine/dreamwood_planks.json index 2a2c729d6..dcac5df90 100644 --- a/src/main/resources/data/botania/recipes/slab_recombine/pavement_1.json +++ b/src/main/resources/data/botania/recipes/slab_recombine/dreamwood_planks.json @@ -1,7 +1,6 @@ { "result": { - "item": "botania:pavement", - "data": 1 + "item": "botania:dreamwood_planks" }, "pattern": [ "Q", @@ -10,8 +9,7 @@ "type": "minecraft:crafting_shaped", "key": { "Q": { - "item": "botania:pavement1slab", - "data": 0 + "item": "botania:dreamwood_planks_slab" } } } \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/slab_recombine/green_pavement.json b/src/main/resources/data/botania/recipes/slab_recombine/green_pavement.json new file mode 100644 index 000000000..aa11a3091 --- /dev/null +++ b/src/main/resources/data/botania/recipes/slab_recombine/green_pavement.json @@ -0,0 +1,15 @@ +{ + "result": { + "item": "botania:green_pavement" + }, + "pattern": [ + "Q", + "Q" + ], + "type": "minecraft:crafting_shaped", + "key": { + "Q": { + "item": "botania:green_pavement_slab" + } + } +} \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/slab_recombine/livingrock.json b/src/main/resources/data/botania/recipes/slab_recombine/livingrock.json new file mode 100644 index 000000000..cb63d9dd4 --- /dev/null +++ b/src/main/resources/data/botania/recipes/slab_recombine/livingrock.json @@ -0,0 +1,15 @@ +{ + "result": { + "item": "botania:livingrock" + }, + "pattern": [ + "Q", + "Q" + ], + "type": "minecraft:crafting_shaped", + "key": { + "Q": { + "item": "botania:livingrock_slab" + } + } +} \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/slab_recombine/livingrock_1.json b/src/main/resources/data/botania/recipes/slab_recombine/livingrock_1.json deleted file mode 100644 index 5c93b787c..000000000 --- a/src/main/resources/data/botania/recipes/slab_recombine/livingrock_1.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "result": { - "item": "botania:livingrock", - "data": 1 - }, - "pattern": [ - "Q", - "Q" - ], - "type": "minecraft:crafting_shaped", - "key": { - "Q": { - "item": "botania:livingrock1slab", - "data": 0 - } - } -} \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/slab_recombine/livingrock_brick.json b/src/main/resources/data/botania/recipes/slab_recombine/livingrock_brick.json new file mode 100644 index 000000000..30a1dd16a --- /dev/null +++ b/src/main/resources/data/botania/recipes/slab_recombine/livingrock_brick.json @@ -0,0 +1,15 @@ +{ + "result": { + "item": "botania:livingrock_brick" + }, + "pattern": [ + "Q", + "Q" + ], + "type": "minecraft:crafting_shaped", + "key": { + "Q": { + "item": "botania:livingrock_brick_slab" + } + } +} \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/slab_recombine/biomestonea_0.json b/src/main/resources/data/botania/recipes/slab_recombine/metamoprhic_mountain_bricks.json similarity index 54% rename from src/main/resources/data/botania/recipes/slab_recombine/biomestonea_0.json rename to src/main/resources/data/botania/recipes/slab_recombine/metamoprhic_mountain_bricks.json index 0b44a1465..b4a58e9fc 100644 --- a/src/main/resources/data/botania/recipes/slab_recombine/biomestonea_0.json +++ b/src/main/resources/data/botania/recipes/slab_recombine/metamoprhic_mountain_bricks.json @@ -1,7 +1,6 @@ { "result": { - "item": "botania:biomestonea", - "data": 0 + "item": "botania:metamorphic_mountain_bricks" }, "pattern": [ "Q", @@ -10,8 +9,7 @@ "type": "minecraft:crafting_shaped", "key": { "Q": { - "item": "botania:biomestonea0slab", - "data": 0 + "item": "botania:metamorphic_mountain_bricks_slab" } } } \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/slab_recombine/dreamwood_0.json b/src/main/resources/data/botania/recipes/slab_recombine/metamorphic_desert_bricks.json similarity index 55% rename from src/main/resources/data/botania/recipes/slab_recombine/dreamwood_0.json rename to src/main/resources/data/botania/recipes/slab_recombine/metamorphic_desert_bricks.json index 3de16bfbc..2e1103d98 100644 --- a/src/main/resources/data/botania/recipes/slab_recombine/dreamwood_0.json +++ b/src/main/resources/data/botania/recipes/slab_recombine/metamorphic_desert_bricks.json @@ -1,7 +1,6 @@ { "result": { - "item": "botania:dreamwood", - "data": 0 + "item": "botania:metamorphic_desert_bricks" }, "pattern": [ "Q", @@ -10,8 +9,7 @@ "type": "minecraft:crafting_shaped", "key": { "Q": { - "item": "botania:dreamwood0slab", - "data": 0 + "item": "botania:metamorphic_desert_bricks_slab" } } } \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/slab_recombine/metamorphic_desert_cobblestone.json b/src/main/resources/data/botania/recipes/slab_recombine/metamorphic_desert_cobblestone.json new file mode 100644 index 000000000..8be54ed2c --- /dev/null +++ b/src/main/resources/data/botania/recipes/slab_recombine/metamorphic_desert_cobblestone.json @@ -0,0 +1,15 @@ +{ + "result": { + "item": "botania:metamorphic_desert_cobblestone" + }, + "pattern": [ + "Q", + "Q" + ], + "type": "minecraft:crafting_shaped", + "key": { + "Q": { + "item": "botania:metamorphic_desert_cobblestone_slab" + } + } +} \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/slab_recombine/metamorphic_desert_stone.json b/src/main/resources/data/botania/recipes/slab_recombine/metamorphic_desert_stone.json new file mode 100644 index 000000000..8e5688f43 --- /dev/null +++ b/src/main/resources/data/botania/recipes/slab_recombine/metamorphic_desert_stone.json @@ -0,0 +1,15 @@ +{ + "result": { + "item": "botania:metamorphic_desert_stone" + }, + "pattern": [ + "Q", + "Q" + ], + "type": "minecraft:crafting_shaped", + "key": { + "Q": { + "item": "botania:metamorphic_desert_stone_slab" + } + } +} \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/slab_recombine/dreamwood_1.json b/src/main/resources/data/botania/recipes/slab_recombine/metamorphic_forest_bricks.json similarity index 55% rename from src/main/resources/data/botania/recipes/slab_recombine/dreamwood_1.json rename to src/main/resources/data/botania/recipes/slab_recombine/metamorphic_forest_bricks.json index e195840d7..6215e8756 100644 --- a/src/main/resources/data/botania/recipes/slab_recombine/dreamwood_1.json +++ b/src/main/resources/data/botania/recipes/slab_recombine/metamorphic_forest_bricks.json @@ -1,7 +1,6 @@ { "result": { - "item": "botania:dreamwood", - "data": 1 + "item": "botania:metamorphic_forest_bricks" }, "pattern": [ "Q", @@ -10,8 +9,7 @@ "type": "minecraft:crafting_shaped", "key": { "Q": { - "item": "botania:dreamwood1slab", - "data": 0 + "item": "botania:metamorphic_forest_bricks_slab" } } } \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/slab_recombine/metamorphic_forest_cobblestone.json b/src/main/resources/data/botania/recipes/slab_recombine/metamorphic_forest_cobblestone.json new file mode 100644 index 000000000..ff77b72f2 --- /dev/null +++ b/src/main/resources/data/botania/recipes/slab_recombine/metamorphic_forest_cobblestone.json @@ -0,0 +1,15 @@ +{ + "result": { + "item": "botania:metamorphic_forest_cobblestone" + }, + "pattern": [ + "Q", + "Q" + ], + "type": "minecraft:crafting_shaped", + "key": { + "Q": { + "item": "botania:metamorphic_forest_cobblestone_slab" + } + } +} \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/slab_recombine/metamorphic_forest_stone.json b/src/main/resources/data/botania/recipes/slab_recombine/metamorphic_forest_stone.json new file mode 100644 index 000000000..c4fc74450 --- /dev/null +++ b/src/main/resources/data/botania/recipes/slab_recombine/metamorphic_forest_stone.json @@ -0,0 +1,15 @@ +{ + "result": { + "item": "botania:metamorphic_forest_stone" + }, + "pattern": [ + "Q", + "Q" + ], + "type": "minecraft:crafting_shaped", + "key": { + "Q": { + "item": "botania:metamorphic_forest_stone_slab" + } + } +} \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/slab_recombine/metamorphic_fungal_bricks.json b/src/main/resources/data/botania/recipes/slab_recombine/metamorphic_fungal_bricks.json new file mode 100644 index 000000000..15a062014 --- /dev/null +++ b/src/main/resources/data/botania/recipes/slab_recombine/metamorphic_fungal_bricks.json @@ -0,0 +1,15 @@ +{ + "result": { + "item": "botania:metamorphic_fungal_bricks" + }, + "pattern": [ + "Q", + "Q" + ], + "type": "minecraft:crafting_shaped", + "key": { + "Q": { + "item": "botania:metamorphic_fungal_bricks_slab" + } + } +} \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/slab_recombine/metamorphic_fungal_cobblestone.json b/src/main/resources/data/botania/recipes/slab_recombine/metamorphic_fungal_cobblestone.json new file mode 100644 index 000000000..10372a638 --- /dev/null +++ b/src/main/resources/data/botania/recipes/slab_recombine/metamorphic_fungal_cobblestone.json @@ -0,0 +1,15 @@ +{ + "result": { + "item": "botania:metamorphic_fungal_cobblestone" + }, + "pattern": [ + "Q", + "Q" + ], + "type": "minecraft:crafting_shaped", + "key": { + "Q": { + "item": "botania:metamorphic_fungal_cobblestone_slab" + } + } +} \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/slab_recombine/metamorphic_fungal_stone.json b/src/main/resources/data/botania/recipes/slab_recombine/metamorphic_fungal_stone.json new file mode 100644 index 000000000..1dbf416b1 --- /dev/null +++ b/src/main/resources/data/botania/recipes/slab_recombine/metamorphic_fungal_stone.json @@ -0,0 +1,15 @@ +{ + "result": { + "item": "botania:metamorphic_fungal_stone" + }, + "pattern": [ + "Q", + "Q" + ], + "type": "minecraft:crafting_shaped", + "key": { + "Q": { + "item": "botania:metamorphic_fungal_stone_slab" + } + } +} \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/slab_recombine/metamorphic_mesa_bricks.json b/src/main/resources/data/botania/recipes/slab_recombine/metamorphic_mesa_bricks.json new file mode 100644 index 000000000..06d76029e --- /dev/null +++ b/src/main/resources/data/botania/recipes/slab_recombine/metamorphic_mesa_bricks.json @@ -0,0 +1,15 @@ +{ + "result": { + "item": "botania:metamorphic_mesa_bricks" + }, + "pattern": [ + "Q", + "Q" + ], + "type": "minecraft:crafting_shaped", + "key": { + "Q": { + "item": "botania:metamorphic_mesa_bricks_slab" + } + } +} \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/slab_recombine/biomestonea_1.json b/src/main/resources/data/botania/recipes/slab_recombine/metamorphic_mesa_cobblestone.json similarity index 54% rename from src/main/resources/data/botania/recipes/slab_recombine/biomestonea_1.json rename to src/main/resources/data/botania/recipes/slab_recombine/metamorphic_mesa_cobblestone.json index 11e95a473..ae34bd691 100644 --- a/src/main/resources/data/botania/recipes/slab_recombine/biomestonea_1.json +++ b/src/main/resources/data/botania/recipes/slab_recombine/metamorphic_mesa_cobblestone.json @@ -1,7 +1,6 @@ { "result": { - "item": "botania:biomestonea", - "data": 1 + "item": "botania:metamorphic_mesa_cobblestone" }, "pattern": [ "Q", @@ -10,8 +9,7 @@ "type": "minecraft:crafting_shaped", "key": { "Q": { - "item": "botania:biomestonea1slab", - "data": 0 + "item": "botania:metamorphic_mesa_cobblestone_slab" } } } \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/slab_recombine/metamorphic_mesa_stone.json b/src/main/resources/data/botania/recipes/slab_recombine/metamorphic_mesa_stone.json new file mode 100644 index 000000000..90ac82d1d --- /dev/null +++ b/src/main/resources/data/botania/recipes/slab_recombine/metamorphic_mesa_stone.json @@ -0,0 +1,15 @@ +{ + "result": { + "item": "botania:metamorphic_mesa_stone" + }, + "pattern": [ + "Q", + "Q" + ], + "type": "minecraft:crafting_shaped", + "key": { + "Q": { + "item": "botania:metamorphic_mesa_stone_slab" + } + } +} \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/slab_recombine/metamorphic_mountain_cobblestone.json b/src/main/resources/data/botania/recipes/slab_recombine/metamorphic_mountain_cobblestone.json new file mode 100644 index 000000000..0c4b4783a --- /dev/null +++ b/src/main/resources/data/botania/recipes/slab_recombine/metamorphic_mountain_cobblestone.json @@ -0,0 +1,15 @@ +{ + "result": { + "item": "botania:metamorphic_mountain_cobblestone" + }, + "pattern": [ + "Q", + "Q" + ], + "type": "minecraft:crafting_shaped", + "key": { + "Q": { + "item": "botania:metamorphic_mountain_cobblestone_slab" + } + } +} \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/slab_recombine/livingrock_0.json b/src/main/resources/data/botania/recipes/slab_recombine/metamorphic_mountain_stone.json similarity index 55% rename from src/main/resources/data/botania/recipes/slab_recombine/livingrock_0.json rename to src/main/resources/data/botania/recipes/slab_recombine/metamorphic_mountain_stone.json index 7df27f115..9e7b91f63 100644 --- a/src/main/resources/data/botania/recipes/slab_recombine/livingrock_0.json +++ b/src/main/resources/data/botania/recipes/slab_recombine/metamorphic_mountain_stone.json @@ -1,7 +1,6 @@ { "result": { - "item": "botania:livingrock", - "data": 0 + "item": "botania:metamorphic_mountain_stone" }, "pattern": [ "Q", @@ -10,8 +9,7 @@ "type": "minecraft:crafting_shaped", "key": { "Q": { - "item": "botania:livingrock0slab", - "data": 0 + "item": "botania:metamorphic_mountain_stone_slab" } } } \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/slab_recombine/metamorphic_plains_bricks.json b/src/main/resources/data/botania/recipes/slab_recombine/metamorphic_plains_bricks.json new file mode 100644 index 000000000..36f24bfa2 --- /dev/null +++ b/src/main/resources/data/botania/recipes/slab_recombine/metamorphic_plains_bricks.json @@ -0,0 +1,15 @@ +{ + "result": { + "item": "botania:metamorphic_plains_bricks" + }, + "pattern": [ + "Q", + "Q" + ], + "type": "minecraft:crafting_shaped", + "key": { + "Q": { + "item": "botania:metamorphic_plains_bricks_slab" + } + } +} \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/slab_recombine/metamorphic_plains_cobblestone.json b/src/main/resources/data/botania/recipes/slab_recombine/metamorphic_plains_cobblestone.json new file mode 100644 index 000000000..1b04d2574 --- /dev/null +++ b/src/main/resources/data/botania/recipes/slab_recombine/metamorphic_plains_cobblestone.json @@ -0,0 +1,15 @@ +{ + "result": { + "item": "botania:metamorphic_plains_cobblestone" + }, + "pattern": [ + "Q", + "Q" + ], + "type": "minecraft:crafting_shaped", + "key": { + "Q": { + "item": "botania:metamorphic_plains_cobblestone_slab" + } + } +} \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/slab_recombine/metamorphic_plains_stone.json b/src/main/resources/data/botania/recipes/slab_recombine/metamorphic_plains_stone.json new file mode 100644 index 000000000..52e7d4815 --- /dev/null +++ b/src/main/resources/data/botania/recipes/slab_recombine/metamorphic_plains_stone.json @@ -0,0 +1,15 @@ +{ + "result": { + "item": "botania:metamorphic_plains_stone" + }, + "pattern": [ + "Q", + "Q" + ], + "type": "minecraft:crafting_shaped", + "key": { + "Q": { + "item": "botania:metamorphic_plains_stone_slab" + } + } +} \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/slab_recombine/metamorphic_swamp_bricks.json b/src/main/resources/data/botania/recipes/slab_recombine/metamorphic_swamp_bricks.json new file mode 100644 index 000000000..872706e34 --- /dev/null +++ b/src/main/resources/data/botania/recipes/slab_recombine/metamorphic_swamp_bricks.json @@ -0,0 +1,15 @@ +{ + "result": { + "item": "botania:metamorphic_swamp_bricks" + }, + "pattern": [ + "Q", + "Q" + ], + "type": "minecraft:crafting_shaped", + "key": { + "Q": { + "item": "botania:metamorphic_swamp_bricks_slab" + } + } +} \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/slab_recombine/biomestonea_10.json b/src/main/resources/data/botania/recipes/slab_recombine/metamorphic_swamp_cobblestone.json similarity index 53% rename from src/main/resources/data/botania/recipes/slab_recombine/biomestonea_10.json rename to src/main/resources/data/botania/recipes/slab_recombine/metamorphic_swamp_cobblestone.json index 5c81655dc..22c857581 100644 --- a/src/main/resources/data/botania/recipes/slab_recombine/biomestonea_10.json +++ b/src/main/resources/data/botania/recipes/slab_recombine/metamorphic_swamp_cobblestone.json @@ -1,7 +1,6 @@ { "result": { - "item": "botania:biomestonea", - "data": 10 + "item": "botania:metamorphic_swamp_cobblestone" }, "pattern": [ "Q", @@ -10,8 +9,7 @@ "type": "minecraft:crafting_shaped", "key": { "Q": { - "item": "botania:biomestonea10slab", - "data": 0 + "item": "botania:metamorphic_swamp_cobblestone_slab" } } } \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/slab_recombine/metamorphic_swamp_stone.json b/src/main/resources/data/botania/recipes/slab_recombine/metamorphic_swamp_stone.json new file mode 100644 index 000000000..a335fc788 --- /dev/null +++ b/src/main/resources/data/botania/recipes/slab_recombine/metamorphic_swamp_stone.json @@ -0,0 +1,15 @@ +{ + "result": { + "item": "botania:metamorphic_swamp_stone" + }, + "pattern": [ + "Q", + "Q" + ], + "type": "minecraft:crafting_shaped", + "key": { + "Q": { + "item": "botania:metamorphic_swamp_stone_slab" + } + } +} \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/slab_recombine/metamorphic_taiga_bricks.json b/src/main/resources/data/botania/recipes/slab_recombine/metamorphic_taiga_bricks.json new file mode 100644 index 000000000..3c044df86 --- /dev/null +++ b/src/main/resources/data/botania/recipes/slab_recombine/metamorphic_taiga_bricks.json @@ -0,0 +1,15 @@ +{ + "result": { + "item": "botania:metamorphic_taiga_bricks" + }, + "pattern": [ + "Q", + "Q" + ], + "type": "minecraft:crafting_shaped", + "key": { + "Q": { + "item": "botania:metamorphic_taiga_bricks_slab" + } + } +} \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/slab_recombine/biomestonea_11.json b/src/main/resources/data/botania/recipes/slab_recombine/metamorphic_taiga_cobblestone.json similarity index 53% rename from src/main/resources/data/botania/recipes/slab_recombine/biomestonea_11.json rename to src/main/resources/data/botania/recipes/slab_recombine/metamorphic_taiga_cobblestone.json index 1663fec18..51c133d36 100644 --- a/src/main/resources/data/botania/recipes/slab_recombine/biomestonea_11.json +++ b/src/main/resources/data/botania/recipes/slab_recombine/metamorphic_taiga_cobblestone.json @@ -1,7 +1,6 @@ { "result": { - "item": "botania:biomestonea", - "data": 11 + "item": "botania:metamorphic_taiga_cobblestone" }, "pattern": [ "Q", @@ -10,8 +9,7 @@ "type": "minecraft:crafting_shaped", "key": { "Q": { - "item": "botania:biomestonea11slab", - "data": 0 + "item": "botania:metamorphic_taiga_cobblestone_slab" } } } \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/slab_recombine/metamorphic_taiga_stone.json b/src/main/resources/data/botania/recipes/slab_recombine/metamorphic_taiga_stone.json new file mode 100644 index 000000000..154bed59d --- /dev/null +++ b/src/main/resources/data/botania/recipes/slab_recombine/metamorphic_taiga_stone.json @@ -0,0 +1,15 @@ +{ + "result": { + "item": "botania:metamorphic_taiga_stone" + }, + "pattern": [ + "Q", + "Q" + ], + "type": "minecraft:crafting_shaped", + "key": { + "Q": { + "item": "botania:metamorphic_taiga_stone_slab" + } + } +} \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/slab_recombine/pavement_4.json b/src/main/resources/data/botania/recipes/slab_recombine/pavement_4.json deleted file mode 100644 index fbf4b6e66..000000000 --- a/src/main/resources/data/botania/recipes/slab_recombine/pavement_4.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "result": { - "item": "botania:pavement", - "data": 4 - }, - "pattern": [ - "Q", - "Q" - ], - "type": "minecraft:crafting_shaped", - "key": { - "Q": { - "item": "botania:pavement4slab", - "data": 0 - } - } -} \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/slab_recombine/pavement_5.json b/src/main/resources/data/botania/recipes/slab_recombine/pavement_5.json deleted file mode 100644 index 8f7f3b464..000000000 --- a/src/main/resources/data/botania/recipes/slab_recombine/pavement_5.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "result": { - "item": "botania:pavement", - "data": 5 - }, - "pattern": [ - "Q", - "Q" - ], - "type": "minecraft:crafting_shaped", - "key": { - "Q": { - "item": "botania:pavement5slab", - "data": 0 - } - } -} \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/slab_recombine/red_pavement.json b/src/main/resources/data/botania/recipes/slab_recombine/red_pavement.json new file mode 100644 index 000000000..36b0ae210 --- /dev/null +++ b/src/main/resources/data/botania/recipes/slab_recombine/red_pavement.json @@ -0,0 +1,15 @@ +{ + "result": { + "item": "botania:red_pavement" + }, + "pattern": [ + "Q", + "Q" + ], + "type": "minecraft:crafting_shaped", + "key": { + "Q": { + "item": "botania:red_pavement_slab" + } + } +} \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/slab_recombine/shimmerrock.json b/src/main/resources/data/botania/recipes/slab_recombine/shimmerrock.json index 7cbac7054..1515515e0 100644 --- a/src/main/resources/data/botania/recipes/slab_recombine/shimmerrock.json +++ b/src/main/resources/data/botania/recipes/slab_recombine/shimmerrock.json @@ -9,8 +9,7 @@ "type": "minecraft:crafting_shaped", "key": { "Q": { - "item": "botania:shimmerrock0slab", - "data": 0 + "item": "botania:shimmerrock_slab" } } } \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/slab_recombine/shimmerwood_planks.json b/src/main/resources/data/botania/recipes/slab_recombine/shimmerwood_planks.json new file mode 100644 index 000000000..117ef90d8 --- /dev/null +++ b/src/main/resources/data/botania/recipes/slab_recombine/shimmerwood_planks.json @@ -0,0 +1,15 @@ +{ + "result": { + "item": "botania:shimmerwood_planks" + }, + "pattern": [ + "Q", + "Q" + ], + "type": "minecraft:crafting_shaped", + "key": { + "Q": { + "item": "botania:shimmerwood_planks_slab" + } + } +} \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/slab_recombine/shimmerwoodplanks.json b/src/main/resources/data/botania/recipes/slab_recombine/shimmerwoodplanks.json deleted file mode 100644 index d4fd8d0bd..000000000 --- a/src/main/resources/data/botania/recipes/slab_recombine/shimmerwoodplanks.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "result": { - "item": "botania:shimmerwoodplanks" - }, - "pattern": [ - "Q", - "Q" - ], - "type": "minecraft:crafting_shaped", - "key": { - "Q": { - "item": "botania:shimmerwoodplanks0slab", - "data": 0 - } - } -} \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/slab_recombine/white_pavement.json b/src/main/resources/data/botania/recipes/slab_recombine/white_pavement.json new file mode 100644 index 000000000..52abe019b --- /dev/null +++ b/src/main/resources/data/botania/recipes/slab_recombine/white_pavement.json @@ -0,0 +1,15 @@ +{ + "result": { + "item": "botania:white_pavement" + }, + "pattern": [ + "Q", + "Q" + ], + "type": "minecraft:crafting_shaped", + "key": { + "Q": { + "item": "botania:white_pavement_slab" + } + } +} \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/slab_recombine/yellow_pavement.json b/src/main/resources/data/botania/recipes/slab_recombine/yellow_pavement.json new file mode 100644 index 000000000..0fd9bc10f --- /dev/null +++ b/src/main/resources/data/botania/recipes/slab_recombine/yellow_pavement.json @@ -0,0 +1,15 @@ +{ + "result": { + "item": "botania:yellow_pavement" + }, + "pattern": [ + "Q", + "Q" + ], + "type": "minecraft:crafting_shaped", + "key": { + "Q": { + "item": "botania:yellow_pavement_slab" + } + } +} \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/slimebottle.json b/src/main/resources/data/botania/recipes/slimebottle.json index df4c05793..1b2db3f44 100644 --- a/src/main/resources/data/botania/recipes/slimebottle.json +++ b/src/main/resources/data/botania/recipes/slimebottle.json @@ -8,7 +8,7 @@ "ESE", " E " ], - "type": "forge:ore_shaped", + "type": "minecraft:crafting_shaped", "key": { "S": { "item": "minecraft:slime_ball" diff --git a/src/main/resources/data/botania/recipes/slingshot.json b/src/main/resources/data/botania/recipes/slingshot.json index 82e845290..1dd349f66 100644 --- a/src/main/resources/data/botania/recipes/slingshot.json +++ b/src/main/resources/data/botania/recipes/slingshot.json @@ -7,7 +7,7 @@ " TT", "T " ], - "type": "forge:ore_shaped", + "type": "minecraft:crafting_shaped", "key": { "A": { "tag": "botania:runes/air" diff --git a/src/main/resources/data/botania/recipes/smeltrod.json b/src/main/resources/data/botania/recipes/smeltrod.json index f3eb6b590..55f581f3d 100644 --- a/src/main/resources/data/botania/recipes/smeltrod.json +++ b/src/main/resources/data/botania/recipes/smeltrod.json @@ -7,7 +7,7 @@ " TB", "T " ], - "type": "forge:ore_shaped", + "type": "minecraft:crafting_shaped", "key": { "B": { "item": "minecraft:blaze_rod" diff --git a/src/main/resources/data/botania/recipes/spark.json b/src/main/resources/data/botania/recipes/spark.json index ea43a2e88..55fc90dfe 100644 --- a/src/main/resources/data/botania/recipes/spark.json +++ b/src/main/resources/data/botania/recipes/spark.json @@ -7,7 +7,7 @@ "BNB", " P " ], - "type": "forge:ore_shaped", + "type": "minecraft:crafting_shaped", "key": { "P": [ { @@ -35,7 +35,7 @@ "tag": "botania:petals/gray" }, { - "tag": "botania:petals/lightgray" + "tag": "botania:petals/light_gray" }, { "tag": "botania:petals/cyan" diff --git a/src/main/resources/data/botania/recipes/spark_upgrade_dispersive.json b/src/main/resources/data/botania/recipes/spark_upgrade_dispersive.json index 5d0fc9bf9..30c98c523 100644 --- a/src/main/resources/data/botania/recipes/spark_upgrade_dispersive.json +++ b/src/main/resources/data/botania/recipes/spark_upgrade_dispersive.json @@ -14,5 +14,5 @@ "tag": "botania:runes/water" } ], - "type": "forge:ore_shapeless" + "type": "minecraft:crafting_shapeless" } \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/spark_upgrade_dominant.json b/src/main/resources/data/botania/recipes/spark_upgrade_dominant.json index d93cc6489..aa47acb84 100644 --- a/src/main/resources/data/botania/recipes/spark_upgrade_dominant.json +++ b/src/main/resources/data/botania/recipes/spark_upgrade_dominant.json @@ -14,5 +14,5 @@ "tag": "botania:runes/fire" } ], - "type": "forge:ore_shapeless" + "type": "minecraft:crafting_shapeless" } \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/spark_upgrade_isolated.json b/src/main/resources/data/botania/recipes/spark_upgrade_isolated.json index a8dad2a52..3cff7447f 100644 --- a/src/main/resources/data/botania/recipes/spark_upgrade_isolated.json +++ b/src/main/resources/data/botania/recipes/spark_upgrade_isolated.json @@ -14,5 +14,5 @@ "tag": "botania:runes/air" } ], - "type": "forge:ore_shapeless" + "type": "minecraft:crafting_shapeless" } \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/spark_upgrade_recessive.json b/src/main/resources/data/botania/recipes/spark_upgrade_recessive.json index 2e76c2f18..86d9131c6 100644 --- a/src/main/resources/data/botania/recipes/spark_upgrade_recessive.json +++ b/src/main/resources/data/botania/recipes/spark_upgrade_recessive.json @@ -14,5 +14,5 @@ "tag": "botania:runes/earth" } ], - "type": "forge:ore_shapeless" + "type": "minecraft:crafting_shapeless" } \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/sparkchanger.json b/src/main/resources/data/botania/recipes/sparkchanger.json index e9df03297..efe9eae9f 100644 --- a/src/main/resources/data/botania/recipes/sparkchanger.json +++ b/src/main/resources/data/botania/recipes/sparkchanger.json @@ -6,7 +6,7 @@ "ESE", "SRS" ], - "type": "forge:ore_shaped", + "type": "minecraft:crafting_shaped", "key": { "R": { "tag": "forge:dusts/redstone" diff --git a/src/main/resources/data/botania/recipes/spawnerclaw.json b/src/main/resources/data/botania/recipes/spawnerclaw.json index 7aa1ceb42..f32a1dbbc 100644 --- a/src/main/resources/data/botania/recipes/spawnerclaw.json +++ b/src/main/resources/data/botania/recipes/spawnerclaw.json @@ -7,7 +7,7 @@ "PMP", "PEP" ], - "type": "forge:ore_shaped", + "type": "minecraft:crafting_shaped", "key": { "P": { "item": "minecraft:prismarine", diff --git a/src/main/resources/data/botania/recipes/spawnermover.json b/src/main/resources/data/botania/recipes/spawnermover.json index cbca9e021..bd8ca7869 100644 --- a/src/main/resources/data/botania/recipes/spawnermover.json +++ b/src/main/resources/data/botania/recipes/spawnermover.json @@ -7,7 +7,7 @@ "ADA", "EIE" ], - "type": "forge:ore_shaped", + "type": "minecraft:crafting_shaped", "key": { "A": { "item": "botania:ender_air_bottle" diff --git a/src/main/resources/data/botania/recipes/spectral_platform.json b/src/main/resources/data/botania/recipes/spectral_platform.json index adf7be419..7543d223e 100644 --- a/src/main/resources/data/botania/recipes/spectral_platform.json +++ b/src/main/resources/data/botania/recipes/spectral_platform.json @@ -7,7 +7,7 @@ "343", "0D0" ], - "type": "forge:ore_shaped", + "type": "minecraft:crafting_shaped", "key": { "0": { "item": "botania:dreamwood", diff --git a/src/main/resources/data/botania/recipes/spellcloth.json b/src/main/resources/data/botania/recipes/spellcloth.json index 1678375ce..021d2532c 100644 --- a/src/main/resources/data/botania/recipes/spellcloth.json +++ b/src/main/resources/data/botania/recipes/spellcloth.json @@ -7,7 +7,7 @@ "CPC", " C " ], - "type": "forge:ore_shaped", + "type": "minecraft:crafting_shaped", "key": { "P": { "item": "botania:mana_pearl" diff --git a/src/main/resources/data/botania/recipes/starfield.json b/src/main/resources/data/botania/recipes/starfield.json index 0e884e984..474fef13a 100644 --- a/src/main/resources/data/botania/recipes/starfield.json +++ b/src/main/resources/data/botania/recipes/starfield.json @@ -6,7 +6,7 @@ "EPE", "EOE" ], - "type": "forge:ore_shaped", + "type": "minecraft:crafting_shaped", "key": { "P": { "item": "botania:pixie_dust" diff --git a/src/main/resources/data/botania/recipes/starsword.json b/src/main/resources/data/botania/recipes/starsword.json index 570132006..0d5d93858 100644 --- a/src/main/resources/data/botania/recipes/starsword.json +++ b/src/main/resources/data/botania/recipes/starsword.json @@ -7,7 +7,7 @@ "AD ", "TA " ], - "type": "forge:ore_shaped", + "type": "minecraft:crafting_shaped", "key": { "A": { "item": "botania:ender_air_bottle" diff --git a/src/main/resources/data/botania/recipes/supercloudpendant.json b/src/main/resources/data/botania/recipes/supercloudpendant.json index fcbe420bd..34367a827 100644 --- a/src/main/resources/data/botania/recipes/supercloudpendant.json +++ b/src/main/resources/data/botania/recipes/supercloudpendant.json @@ -7,7 +7,7 @@ "BPB", "NGN" ], - "type": "forge:ore_shaped", + "type": "minecraft:crafting_shaped", "key": { "P": { "item": "botania:cloudpendant" diff --git a/src/main/resources/data/botania/recipes/superlavapendant.json b/src/main/resources/data/botania/recipes/superlavapendant.json index d8efaed1a..274a2748d 100644 --- a/src/main/resources/data/botania/recipes/superlavapendant.json +++ b/src/main/resources/data/botania/recipes/superlavapendant.json @@ -7,7 +7,7 @@ "BPB", "NGN" ], - "type": "forge:ore_shaped", + "type": "minecraft:crafting_shaped", "key": { "P": { "item": "botania:lavapendant" diff --git a/src/main/resources/data/botania/recipes/supertravelbelt.json b/src/main/resources/data/botania/recipes/supertravelbelt.json index 038648f20..bca6419a4 100644 --- a/src/main/resources/data/botania/recipes/supertravelbelt.json +++ b/src/main/resources/data/botania/recipes/supertravelbelt.json @@ -7,7 +7,7 @@ " S ", "L E" ], - "type": "forge:ore_shaped", + "type": "minecraft:crafting_shaped", "key": { "S": { "item": "botania:travelbelt" diff --git a/src/main/resources/data/botania/recipes/swapring.json b/src/main/resources/data/botania/recipes/swapring.json index 160e37d35..dca3d1efa 100644 --- a/src/main/resources/data/botania/recipes/swapring.json +++ b/src/main/resources/data/botania/recipes/swapring.json @@ -7,7 +7,7 @@ "M M", " M " ], - "type": "forge:ore_shaped", + "type": "minecraft:crafting_shaped", "key": { "C": { "item": "minecraft:clay" diff --git a/src/main/resources/data/botania/recipes/temperancestone.json b/src/main/resources/data/botania/recipes/temperancestone.json index d4631fe82..9a2306f1b 100644 --- a/src/main/resources/data/botania/recipes/temperancestone.json +++ b/src/main/resources/data/botania/recipes/temperancestone.json @@ -8,7 +8,7 @@ "SRS", " S " ], - "type": "forge:ore_shaped", + "type": "minecraft:crafting_shaped", "key": { "R": { "tag": "botania:runes/earth" diff --git a/src/main/resources/data/botania/recipes/terraaxe.json b/src/main/resources/data/botania/recipes/terraaxe.json index 85096de38..e508b8b9f 100644 --- a/src/main/resources/data/botania/recipes/terraaxe.json +++ b/src/main/resources/data/botania/recipes/terraaxe.json @@ -7,7 +7,7 @@ "TST", " S " ], - "type": "forge:ore_shaped", + "type": "minecraft:crafting_shaped", "key": { "S": { "item": "botania:livingwood_twig" diff --git a/src/main/resources/data/botania/recipes/terraformrod.json b/src/main/resources/data/botania/recipes/terraformrod.json index 03ad454c1..c62de6885 100644 --- a/src/main/resources/data/botania/recipes/terraformrod.json +++ b/src/main/resources/data/botania/recipes/terraformrod.json @@ -7,7 +7,7 @@ "ARS", "GM " ], - "type": "forge:ore_shaped", + "type": "minecraft:crafting_shaped", "key": { "A": { "tag": "botania:runes/autumn" diff --git a/src/main/resources/data/botania/recipes/terraplate.json b/src/main/resources/data/botania/recipes/terraplate.json index 09803afac..72da677e7 100644 --- a/src/main/resources/data/botania/recipes/terraplate.json +++ b/src/main/resources/data/botania/recipes/terraplate.json @@ -7,7 +7,7 @@ "0M1", "283" ], - "type": "forge:ore_shaped", + "type": "minecraft:crafting_shaped", "key": { "0": { "tag": "botania:runes/water" diff --git a/src/main/resources/data/botania/recipes/terrasteel_block.json b/src/main/resources/data/botania/recipes/terrasteel_block.json index e275f43fc..65d4b47a5 100644 --- a/src/main/resources/data/botania/recipes/terrasteel_block.json +++ b/src/main/resources/data/botania/recipes/terrasteel_block.json @@ -7,7 +7,7 @@ "III", "III" ], - "type": "forge:ore_shaped", + "type": "minecraft:crafting_shaped", "key": { "I": { "tag": "forge:ingots/terrasteel" diff --git a/src/main/resources/data/botania/recipes/terrasword.json b/src/main/resources/data/botania/recipes/terrasword.json index 3359cff84..60876f9e9 100644 --- a/src/main/resources/data/botania/recipes/terrasword.json +++ b/src/main/resources/data/botania/recipes/terrasword.json @@ -7,7 +7,7 @@ "I", "S" ], - "type": "forge:ore_shaped", + "type": "minecraft:crafting_shaped", "key": { "S": { "item": "botania:livingwood_twig" diff --git a/src/main/resources/data/botania/recipes/teruterubozu.json b/src/main/resources/data/botania/recipes/teruterubozu.json index 3b0f8cc96..b208426ba 100644 --- a/src/main/resources/data/botania/recipes/teruterubozu.json +++ b/src/main/resources/data/botania/recipes/teruterubozu.json @@ -7,7 +7,7 @@ "C", "S" ], - "type": "forge:ore_shaped", + "type": "minecraft:crafting_shaped", "key": { "C": { "item": "botania:manaweave_cloth" diff --git a/src/main/resources/data/botania/recipes/thirdeye.json b/src/main/resources/data/botania/recipes/thirdeye.json index 980601165..e60cfd8e8 100644 --- a/src/main/resources/data/botania/recipes/thirdeye.json +++ b/src/main/resources/data/botania/recipes/thirdeye.json @@ -7,7 +7,7 @@ "QEQ", "RDR" ], - "type": "forge:ore_shaped", + "type": "minecraft:crafting_shaped", "key": { "Q": { "item": "minecraft:quartz_block", diff --git a/src/main/resources/data/botania/recipes/thorn_chakram.json b/src/main/resources/data/botania/recipes/thorn_chakram.json index fc825a6d4..37e4bc3be 100644 --- a/src/main/resources/data/botania/recipes/thorn_chakram.json +++ b/src/main/resources/data/botania/recipes/thorn_chakram.json @@ -8,7 +8,7 @@ "VTV", "VVV" ], - "type": "forge:ore_shaped", + "type": "minecraft:crafting_shaped", "key": { "T": { "tag": "forge:ingots/terrasteel" diff --git a/src/main/resources/data/botania/recipes/thundersword.json b/src/main/resources/data/botania/recipes/thundersword.json index 22ae02ff6..09a49b69c 100644 --- a/src/main/resources/data/botania/recipes/thundersword.json +++ b/src/main/resources/data/botania/recipes/thundersword.json @@ -7,7 +7,7 @@ "AD ", "TA " ], - "type": "forge:ore_shaped", + "type": "minecraft:crafting_shaped", "key": { "A": { "item": "botania:ender_air_bottle" diff --git a/src/main/resources/data/botania/recipes/tinyplanet.json b/src/main/resources/data/botania/recipes/tinyplanet.json index 9ae1fcb71..64d6a2ec2 100644 --- a/src/main/resources/data/botania/recipes/tinyplanet.json +++ b/src/main/resources/data/botania/recipes/tinyplanet.json @@ -7,7 +7,7 @@ "SPS", "LSL" ], - "type": "forge:ore_shaped", + "type": "minecraft:crafting_shaped", "key": { "P": { "item": "botania:mana_pearl" diff --git a/src/main/resources/data/botania/recipes/tinyplanetblock.json b/src/main/resources/data/botania/recipes/tinyplanetblock.json index e35507dd3..7ef94c63c 100644 --- a/src/main/resources/data/botania/recipes/tinyplanetblock.json +++ b/src/main/resources/data/botania/recipes/tinyplanetblock.json @@ -7,7 +7,7 @@ "SPS", "SSS" ], - "type": "forge:ore_shaped", + "type": "minecraft:crafting_shaped", "key": { "P": { "item": "botania:tinyplanet" diff --git a/src/main/resources/data/botania/recipes/tornadorod.json b/src/main/resources/data/botania/recipes/tornadorod.json index b6d3c1f7b..7b65859c9 100644 --- a/src/main/resources/data/botania/recipes/tornadorod.json +++ b/src/main/resources/data/botania/recipes/tornadorod.json @@ -7,7 +7,7 @@ " T ", "R " ], - "type": "forge:ore_shaped", + "type": "minecraft:crafting_shaped", "key": { "R": { "tag": "botania:runes/air" diff --git a/src/main/resources/data/botania/recipes/travelbelt.json b/src/main/resources/data/botania/recipes/travelbelt.json index 1c0da8ec9..ef334fcd2 100644 --- a/src/main/resources/data/botania/recipes/travelbelt.json +++ b/src/main/resources/data/botania/recipes/travelbelt.json @@ -7,7 +7,7 @@ "L L", "SLA" ], - "type": "forge:ore_shaped", + "type": "minecraft:crafting_shaped", "key": { "A": { "tag": "botania:runes/air" diff --git a/src/main/resources/data/botania/recipes/turntable.json b/src/main/resources/data/botania/recipes/turntable.json index 72539dcdc..2e3882c23 100644 --- a/src/main/resources/data/botania/recipes/turntable.json +++ b/src/main/resources/data/botania/recipes/turntable.json @@ -7,7 +7,7 @@ "WPW", "WWW" ], - "type": "forge:ore_shaped", + "type": "minecraft:crafting_shaped", "key": { "P": { "item": "minecraft:sticky_piston" diff --git a/src/main/resources/data/botania/recipes/unholycloak.json b/src/main/resources/data/botania/recipes/unholycloak.json index 5e49996fa..0b4a29e8d 100644 --- a/src/main/resources/data/botania/recipes/unholycloak.json +++ b/src/main/resources/data/botania/recipes/unholycloak.json @@ -7,7 +7,7 @@ "RWR", "RSR" ], - "type": "forge:ore_shaped", + "type": "minecraft:crafting_shaped", "key": { "R": { "tag": "forge:dusts/redstone" diff --git a/src/main/resources/data/botania/recipes/virus_necrodermal.json b/src/main/resources/data/botania/recipes/virus_necrodermal.json index d85be7f7c..5d04cc4c4 100644 --- a/src/main/resources/data/botania/recipes/virus_necrodermal.json +++ b/src/main/resources/data/botania/recipes/virus_necrodermal.json @@ -23,5 +23,5 @@ "data": 2 } ], - "type": "forge:ore_shapeless" + "type": "minecraft:crafting_shapeless" } \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/virus_nullodermal.json b/src/main/resources/data/botania/recipes/virus_nullodermal.json index ed11be2f3..00b4136f3 100644 --- a/src/main/resources/data/botania/recipes/virus_nullodermal.json +++ b/src/main/resources/data/botania/recipes/virus_nullodermal.json @@ -23,5 +23,5 @@ "data": 0 } ], - "type": "forge:ore_shapeless" + "type": "minecraft:crafting_shapeless" } \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_black_black.json b/src/main/resources/data/botania/recipes/wands/twigwand_black_black.json index c0e7605c5..ebc1c5e65 100644 --- a/src/main/resources/data/botania/recipes/wands/twigwand_black_black.json +++ b/src/main/resources/data/botania/recipes/wands/twigwand_black_black.json @@ -1,6 +1,6 @@ { "result": { - "item": "botania:twigwand", + "item": "botania:twig_wand", "data": 0, "nbt": "{color1:15,color2:15}" }, @@ -9,7 +9,7 @@ " SB", "S " ], - "type": "forge:ore_shaped", + "type": "minecraft:crafting_shaped", "key": { "A": { "tag": "botania:petals/black" @@ -21,5 +21,5 @@ "item": "botania:livingwood_twig" } }, - "group": "botania:twigwand" + "group": "botania:twig_wand" } \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_black_blue.json b/src/main/resources/data/botania/recipes/wands/twigwand_black_blue.json index 329c0bce1..b0da4c32f 100644 --- a/src/main/resources/data/botania/recipes/wands/twigwand_black_blue.json +++ b/src/main/resources/data/botania/recipes/wands/twigwand_black_blue.json @@ -1,6 +1,6 @@ { "result": { - "item": "botania:twigwand", + "item": "botania:twig_wand", "data": 0, "nbt": "{color1:15,color2:11}" }, @@ -9,7 +9,7 @@ " SB", "S " ], - "type": "forge:ore_shaped", + "type": "minecraft:crafting_shaped", "key": { "A": { "tag": "botania:petals/black" @@ -21,5 +21,5 @@ "item": "botania:livingwood_twig" } }, - "group": "botania:twigwand" + "group": "botania:twig_wand" } \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_black_brown.json b/src/main/resources/data/botania/recipes/wands/twigwand_black_brown.json index a157c71b8..327b96f44 100644 --- a/src/main/resources/data/botania/recipes/wands/twigwand_black_brown.json +++ b/src/main/resources/data/botania/recipes/wands/twigwand_black_brown.json @@ -1,6 +1,6 @@ { "result": { - "item": "botania:twigwand", + "item": "botania:twig_wand", "data": 0, "nbt": "{color1:15,color2:12}" }, @@ -9,7 +9,7 @@ " SB", "S " ], - "type": "forge:ore_shaped", + "type": "minecraft:crafting_shaped", "key": { "A": { "tag": "botania:petals/black" @@ -21,5 +21,5 @@ "item": "botania:livingwood_twig" } }, - "group": "botania:twigwand" + "group": "botania:twig_wand" } \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_black_cyan.json b/src/main/resources/data/botania/recipes/wands/twigwand_black_cyan.json index 08cd7343e..e704d2e5c 100644 --- a/src/main/resources/data/botania/recipes/wands/twigwand_black_cyan.json +++ b/src/main/resources/data/botania/recipes/wands/twigwand_black_cyan.json @@ -1,6 +1,6 @@ { "result": { - "item": "botania:twigwand", + "item": "botania:twig_wand", "data": 0, "nbt": "{color1:15,color2:9}" }, @@ -9,7 +9,7 @@ " SB", "S " ], - "type": "forge:ore_shaped", + "type": "minecraft:crafting_shaped", "key": { "A": { "tag": "botania:petals/black" @@ -21,5 +21,5 @@ "item": "botania:livingwood_twig" } }, - "group": "botania:twigwand" + "group": "botania:twig_wand" } \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_black_gray.json b/src/main/resources/data/botania/recipes/wands/twigwand_black_gray.json index 2402e928c..6bcc7b307 100644 --- a/src/main/resources/data/botania/recipes/wands/twigwand_black_gray.json +++ b/src/main/resources/data/botania/recipes/wands/twigwand_black_gray.json @@ -1,6 +1,6 @@ { "result": { - "item": "botania:twigwand", + "item": "botania:twig_wand", "data": 0, "nbt": "{color1:15,color2:7}" }, @@ -9,7 +9,7 @@ " SB", "S " ], - "type": "forge:ore_shaped", + "type": "minecraft:crafting_shaped", "key": { "A": { "tag": "botania:petals/black" @@ -21,5 +21,5 @@ "item": "botania:livingwood_twig" } }, - "group": "botania:twigwand" + "group": "botania:twig_wand" } \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_black_green.json b/src/main/resources/data/botania/recipes/wands/twigwand_black_green.json index 8989940a8..317bbf532 100644 --- a/src/main/resources/data/botania/recipes/wands/twigwand_black_green.json +++ b/src/main/resources/data/botania/recipes/wands/twigwand_black_green.json @@ -1,6 +1,6 @@ { "result": { - "item": "botania:twigwand", + "item": "botania:twig_wand", "data": 0, "nbt": "{color1:15,color2:13}" }, @@ -9,7 +9,7 @@ " SB", "S " ], - "type": "forge:ore_shaped", + "type": "minecraft:crafting_shaped", "key": { "A": { "tag": "botania:petals/black" @@ -21,5 +21,5 @@ "item": "botania:livingwood_twig" } }, - "group": "botania:twigwand" + "group": "botania:twig_wand" } \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_black_light_blue.json b/src/main/resources/data/botania/recipes/wands/twigwand_black_light_blue.json index f4090def3..45b1189cc 100644 --- a/src/main/resources/data/botania/recipes/wands/twigwand_black_light_blue.json +++ b/src/main/resources/data/botania/recipes/wands/twigwand_black_light_blue.json @@ -1,6 +1,6 @@ { "result": { - "item": "botania:twigwand", + "item": "botania:twig_wand", "data": 0, "nbt": "{color1:15,color2:3}" }, @@ -9,7 +9,7 @@ " SB", "S " ], - "type": "forge:ore_shaped", + "type": "minecraft:crafting_shaped", "key": { "A": { "tag": "botania:petals/black" @@ -21,5 +21,5 @@ "item": "botania:livingwood_twig" } }, - "group": "botania:twigwand" + "group": "botania:twig_wand" } \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_black_lime.json b/src/main/resources/data/botania/recipes/wands/twigwand_black_lime.json index c7629a1b6..81a829569 100644 --- a/src/main/resources/data/botania/recipes/wands/twigwand_black_lime.json +++ b/src/main/resources/data/botania/recipes/wands/twigwand_black_lime.json @@ -1,6 +1,6 @@ { "result": { - "item": "botania:twigwand", + "item": "botania:twig_wand", "data": 0, "nbt": "{color1:15,color2:5}" }, @@ -9,7 +9,7 @@ " SB", "S " ], - "type": "forge:ore_shaped", + "type": "minecraft:crafting_shaped", "key": { "A": { "tag": "botania:petals/black" @@ -21,5 +21,5 @@ "item": "botania:livingwood_twig" } }, - "group": "botania:twigwand" + "group": "botania:twig_wand" } \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_black_magenta.json b/src/main/resources/data/botania/recipes/wands/twigwand_black_magenta.json index 45a510ea7..671b799e7 100644 --- a/src/main/resources/data/botania/recipes/wands/twigwand_black_magenta.json +++ b/src/main/resources/data/botania/recipes/wands/twigwand_black_magenta.json @@ -1,6 +1,6 @@ { "result": { - "item": "botania:twigwand", + "item": "botania:twig_wand", "data": 0, "nbt": "{color1:15,color2:2}" }, @@ -9,7 +9,7 @@ " SB", "S " ], - "type": "forge:ore_shaped", + "type": "minecraft:crafting_shaped", "key": { "A": { "tag": "botania:petals/black" @@ -21,5 +21,5 @@ "item": "botania:livingwood_twig" } }, - "group": "botania:twigwand" + "group": "botania:twig_wand" } \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_black_orange.json b/src/main/resources/data/botania/recipes/wands/twigwand_black_orange.json index cdf34fc5b..de2727dd0 100644 --- a/src/main/resources/data/botania/recipes/wands/twigwand_black_orange.json +++ b/src/main/resources/data/botania/recipes/wands/twigwand_black_orange.json @@ -1,6 +1,6 @@ { "result": { - "item": "botania:twigwand", + "item": "botania:twig_wand", "data": 0, "nbt": "{color1:15,color2:1}" }, @@ -9,7 +9,7 @@ " SB", "S " ], - "type": "forge:ore_shaped", + "type": "minecraft:crafting_shaped", "key": { "A": { "tag": "botania:petals/black" @@ -21,5 +21,5 @@ "item": "botania:livingwood_twig" } }, - "group": "botania:twigwand" + "group": "botania:twig_wand" } \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_black_pink.json b/src/main/resources/data/botania/recipes/wands/twigwand_black_pink.json index 66f089d67..9c5672882 100644 --- a/src/main/resources/data/botania/recipes/wands/twigwand_black_pink.json +++ b/src/main/resources/data/botania/recipes/wands/twigwand_black_pink.json @@ -1,6 +1,6 @@ { "result": { - "item": "botania:twigwand", + "item": "botania:twig_wand", "data": 0, "nbt": "{color1:15,color2:6}" }, @@ -9,7 +9,7 @@ " SB", "S " ], - "type": "forge:ore_shaped", + "type": "minecraft:crafting_shaped", "key": { "A": { "tag": "botania:petals/black" @@ -21,5 +21,5 @@ "item": "botania:livingwood_twig" } }, - "group": "botania:twigwand" + "group": "botania:twig_wand" } \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_black_purple.json b/src/main/resources/data/botania/recipes/wands/twigwand_black_purple.json index aa3c9eb5e..5e6be6093 100644 --- a/src/main/resources/data/botania/recipes/wands/twigwand_black_purple.json +++ b/src/main/resources/data/botania/recipes/wands/twigwand_black_purple.json @@ -1,6 +1,6 @@ { "result": { - "item": "botania:twigwand", + "item": "botania:twig_wand", "data": 0, "nbt": "{color1:15,color2:10}" }, @@ -9,7 +9,7 @@ " SB", "S " ], - "type": "forge:ore_shaped", + "type": "minecraft:crafting_shaped", "key": { "A": { "tag": "botania:petals/black" @@ -21,5 +21,5 @@ "item": "botania:livingwood_twig" } }, - "group": "botania:twigwand" + "group": "botania:twig_wand" } \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_black_red.json b/src/main/resources/data/botania/recipes/wands/twigwand_black_red.json index 619e912ba..b76569807 100644 --- a/src/main/resources/data/botania/recipes/wands/twigwand_black_red.json +++ b/src/main/resources/data/botania/recipes/wands/twigwand_black_red.json @@ -1,6 +1,6 @@ { "result": { - "item": "botania:twigwand", + "item": "botania:twig_wand", "data": 0, "nbt": "{color1:15,color2:14}" }, @@ -9,7 +9,7 @@ " SB", "S " ], - "type": "forge:ore_shaped", + "type": "minecraft:crafting_shaped", "key": { "A": { "tag": "botania:petals/black" @@ -21,5 +21,5 @@ "item": "botania:livingwood_twig" } }, - "group": "botania:twigwand" + "group": "botania:twig_wand" } \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_black_silver.json b/src/main/resources/data/botania/recipes/wands/twigwand_black_silver.json index fd0f60aef..a29951009 100644 --- a/src/main/resources/data/botania/recipes/wands/twigwand_black_silver.json +++ b/src/main/resources/data/botania/recipes/wands/twigwand_black_silver.json @@ -1,6 +1,6 @@ { "result": { - "item": "botania:twigwand", + "item": "botania:twig_wand", "data": 0, "nbt": "{color1:15,color2:8}" }, @@ -9,17 +9,17 @@ " SB", "S " ], - "type": "forge:ore_shaped", + "type": "minecraft:crafting_shaped", "key": { "A": { "tag": "botania:petals/black" }, "B": { - "tag": "botania:petals/lightgray" + "tag": "botania:petals/light_gray" }, "S": { "item": "botania:livingwood_twig" } }, - "group": "botania:twigwand" + "group": "botania:twig_wand" } \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_black_white.json b/src/main/resources/data/botania/recipes/wands/twigwand_black_white.json index ed7c69fc6..18a5fc21c 100644 --- a/src/main/resources/data/botania/recipes/wands/twigwand_black_white.json +++ b/src/main/resources/data/botania/recipes/wands/twigwand_black_white.json @@ -1,6 +1,6 @@ { "result": { - "item": "botania:twigwand", + "item": "botania:twig_wand", "data": 0, "nbt": "{color1:15,color2:0}" }, @@ -9,7 +9,7 @@ " SB", "S " ], - "type": "forge:ore_shaped", + "type": "minecraft:crafting_shaped", "key": { "A": { "tag": "botania:petals/black" @@ -21,5 +21,5 @@ "item": "botania:livingwood_twig" } }, - "group": "botania:twigwand" + "group": "botania:twig_wand" } \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_black_yellow.json b/src/main/resources/data/botania/recipes/wands/twigwand_black_yellow.json index 43b8c90c0..96f63cf55 100644 --- a/src/main/resources/data/botania/recipes/wands/twigwand_black_yellow.json +++ b/src/main/resources/data/botania/recipes/wands/twigwand_black_yellow.json @@ -1,6 +1,6 @@ { "result": { - "item": "botania:twigwand", + "item": "botania:twig_wand", "data": 0, "nbt": "{color1:15,color2:4}" }, @@ -9,7 +9,7 @@ " SB", "S " ], - "type": "forge:ore_shaped", + "type": "minecraft:crafting_shaped", "key": { "A": { "tag": "botania:petals/black" @@ -21,5 +21,5 @@ "item": "botania:livingwood_twig" } }, - "group": "botania:twigwand" + "group": "botania:twig_wand" } \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_blue_black.json b/src/main/resources/data/botania/recipes/wands/twigwand_blue_black.json index ba0c148f9..a066fa67f 100644 --- a/src/main/resources/data/botania/recipes/wands/twigwand_blue_black.json +++ b/src/main/resources/data/botania/recipes/wands/twigwand_blue_black.json @@ -1,6 +1,6 @@ { "result": { - "item": "botania:twigwand", + "item": "botania:twig_wand", "data": 0, "nbt": "{color1:11,color2:15}" }, @@ -9,7 +9,7 @@ " SB", "S " ], - "type": "forge:ore_shaped", + "type": "minecraft:crafting_shaped", "key": { "A": { "tag": "botania:petals/blue" @@ -21,5 +21,5 @@ "item": "botania:livingwood_twig" } }, - "group": "botania:twigwand" + "group": "botania:twig_wand" } \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_blue_blue.json b/src/main/resources/data/botania/recipes/wands/twigwand_blue_blue.json index 6ce5c2465..6c7a9ccac 100644 --- a/src/main/resources/data/botania/recipes/wands/twigwand_blue_blue.json +++ b/src/main/resources/data/botania/recipes/wands/twigwand_blue_blue.json @@ -1,6 +1,6 @@ { "result": { - "item": "botania:twigwand", + "item": "botania:twig_wand", "data": 0, "nbt": "{color1:11,color2:11}" }, @@ -9,7 +9,7 @@ " SB", "S " ], - "type": "forge:ore_shaped", + "type": "minecraft:crafting_shaped", "key": { "A": { "tag": "botania:petals/blue" @@ -21,5 +21,5 @@ "item": "botania:livingwood_twig" } }, - "group": "botania:twigwand" + "group": "botania:twig_wand" } \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_blue_brown.json b/src/main/resources/data/botania/recipes/wands/twigwand_blue_brown.json index 51d3163ef..494402c38 100644 --- a/src/main/resources/data/botania/recipes/wands/twigwand_blue_brown.json +++ b/src/main/resources/data/botania/recipes/wands/twigwand_blue_brown.json @@ -1,6 +1,6 @@ { "result": { - "item": "botania:twigwand", + "item": "botania:twig_wand", "data": 0, "nbt": "{color1:11,color2:12}" }, @@ -9,7 +9,7 @@ " SB", "S " ], - "type": "forge:ore_shaped", + "type": "minecraft:crafting_shaped", "key": { "A": { "tag": "botania:petals/blue" @@ -21,5 +21,5 @@ "item": "botania:livingwood_twig" } }, - "group": "botania:twigwand" + "group": "botania:twig_wand" } \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_blue_cyan.json b/src/main/resources/data/botania/recipes/wands/twigwand_blue_cyan.json index 15491f7d4..4e74e507c 100644 --- a/src/main/resources/data/botania/recipes/wands/twigwand_blue_cyan.json +++ b/src/main/resources/data/botania/recipes/wands/twigwand_blue_cyan.json @@ -1,6 +1,6 @@ { "result": { - "item": "botania:twigwand", + "item": "botania:twig_wand", "data": 0, "nbt": "{color1:11,color2:9}" }, @@ -9,7 +9,7 @@ " SB", "S " ], - "type": "forge:ore_shaped", + "type": "minecraft:crafting_shaped", "key": { "A": { "tag": "botania:petals/blue" @@ -21,5 +21,5 @@ "item": "botania:livingwood_twig" } }, - "group": "botania:twigwand" + "group": "botania:twig_wand" } \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_blue_gray.json b/src/main/resources/data/botania/recipes/wands/twigwand_blue_gray.json index 227f86347..1ff7c7a61 100644 --- a/src/main/resources/data/botania/recipes/wands/twigwand_blue_gray.json +++ b/src/main/resources/data/botania/recipes/wands/twigwand_blue_gray.json @@ -1,6 +1,6 @@ { "result": { - "item": "botania:twigwand", + "item": "botania:twig_wand", "data": 0, "nbt": "{color1:11,color2:7}" }, @@ -9,7 +9,7 @@ " SB", "S " ], - "type": "forge:ore_shaped", + "type": "minecraft:crafting_shaped", "key": { "A": { "tag": "botania:petals/blue" @@ -21,5 +21,5 @@ "item": "botania:livingwood_twig" } }, - "group": "botania:twigwand" + "group": "botania:twig_wand" } \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_blue_green.json b/src/main/resources/data/botania/recipes/wands/twigwand_blue_green.json index de7d4eb22..6f824e49f 100644 --- a/src/main/resources/data/botania/recipes/wands/twigwand_blue_green.json +++ b/src/main/resources/data/botania/recipes/wands/twigwand_blue_green.json @@ -1,6 +1,6 @@ { "result": { - "item": "botania:twigwand", + "item": "botania:twig_wand", "data": 0, "nbt": "{color1:11,color2:13}" }, @@ -9,7 +9,7 @@ " SB", "S " ], - "type": "forge:ore_shaped", + "type": "minecraft:crafting_shaped", "key": { "A": { "tag": "botania:petals/blue" @@ -21,5 +21,5 @@ "item": "botania:livingwood_twig" } }, - "group": "botania:twigwand" + "group": "botania:twig_wand" } \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_blue_light_blue.json b/src/main/resources/data/botania/recipes/wands/twigwand_blue_light_blue.json index 7c9fa123c..dd81ac6fe 100644 --- a/src/main/resources/data/botania/recipes/wands/twigwand_blue_light_blue.json +++ b/src/main/resources/data/botania/recipes/wands/twigwand_blue_light_blue.json @@ -1,6 +1,6 @@ { "result": { - "item": "botania:twigwand", + "item": "botania:twig_wand", "data": 0, "nbt": "{color1:11,color2:3}" }, @@ -9,7 +9,7 @@ " SB", "S " ], - "type": "forge:ore_shaped", + "type": "minecraft:crafting_shaped", "key": { "A": { "tag": "botania:petals/blue" @@ -21,5 +21,5 @@ "item": "botania:livingwood_twig" } }, - "group": "botania:twigwand" + "group": "botania:twig_wand" } \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_blue_lime.json b/src/main/resources/data/botania/recipes/wands/twigwand_blue_lime.json index d3b288e34..f6fb14563 100644 --- a/src/main/resources/data/botania/recipes/wands/twigwand_blue_lime.json +++ b/src/main/resources/data/botania/recipes/wands/twigwand_blue_lime.json @@ -1,6 +1,6 @@ { "result": { - "item": "botania:twigwand", + "item": "botania:twig_wand", "data": 0, "nbt": "{color1:11,color2:5}" }, @@ -9,7 +9,7 @@ " SB", "S " ], - "type": "forge:ore_shaped", + "type": "minecraft:crafting_shaped", "key": { "A": { "tag": "botania:petals/blue" @@ -21,5 +21,5 @@ "item": "botania:livingwood_twig" } }, - "group": "botania:twigwand" + "group": "botania:twig_wand" } \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_blue_magenta.json b/src/main/resources/data/botania/recipes/wands/twigwand_blue_magenta.json index acf472a5c..cf53193df 100644 --- a/src/main/resources/data/botania/recipes/wands/twigwand_blue_magenta.json +++ b/src/main/resources/data/botania/recipes/wands/twigwand_blue_magenta.json @@ -1,6 +1,6 @@ { "result": { - "item": "botania:twigwand", + "item": "botania:twig_wand", "data": 0, "nbt": "{color1:11,color2:2}" }, @@ -9,7 +9,7 @@ " SB", "S " ], - "type": "forge:ore_shaped", + "type": "minecraft:crafting_shaped", "key": { "A": { "tag": "botania:petals/blue" @@ -21,5 +21,5 @@ "item": "botania:livingwood_twig" } }, - "group": "botania:twigwand" + "group": "botania:twig_wand" } \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_blue_orange.json b/src/main/resources/data/botania/recipes/wands/twigwand_blue_orange.json index 4d994d308..e0d597fed 100644 --- a/src/main/resources/data/botania/recipes/wands/twigwand_blue_orange.json +++ b/src/main/resources/data/botania/recipes/wands/twigwand_blue_orange.json @@ -1,6 +1,6 @@ { "result": { - "item": "botania:twigwand", + "item": "botania:twig_wand", "data": 0, "nbt": "{color1:11,color2:1}" }, @@ -9,7 +9,7 @@ " SB", "S " ], - "type": "forge:ore_shaped", + "type": "minecraft:crafting_shaped", "key": { "A": { "tag": "botania:petals/blue" @@ -21,5 +21,5 @@ "item": "botania:livingwood_twig" } }, - "group": "botania:twigwand" + "group": "botania:twig_wand" } \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_blue_pink.json b/src/main/resources/data/botania/recipes/wands/twigwand_blue_pink.json index 3c941c2e4..2d481a691 100644 --- a/src/main/resources/data/botania/recipes/wands/twigwand_blue_pink.json +++ b/src/main/resources/data/botania/recipes/wands/twigwand_blue_pink.json @@ -1,6 +1,6 @@ { "result": { - "item": "botania:twigwand", + "item": "botania:twig_wand", "data": 0, "nbt": "{color1:11,color2:6}" }, @@ -9,7 +9,7 @@ " SB", "S " ], - "type": "forge:ore_shaped", + "type": "minecraft:crafting_shaped", "key": { "A": { "tag": "botania:petals/blue" @@ -21,5 +21,5 @@ "item": "botania:livingwood_twig" } }, - "group": "botania:twigwand" + "group": "botania:twig_wand" } \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_blue_purple.json b/src/main/resources/data/botania/recipes/wands/twigwand_blue_purple.json index 211311a1c..1a0b49075 100644 --- a/src/main/resources/data/botania/recipes/wands/twigwand_blue_purple.json +++ b/src/main/resources/data/botania/recipes/wands/twigwand_blue_purple.json @@ -1,6 +1,6 @@ { "result": { - "item": "botania:twigwand", + "item": "botania:twig_wand", "data": 0, "nbt": "{color1:11,color2:10}" }, @@ -9,7 +9,7 @@ " SB", "S " ], - "type": "forge:ore_shaped", + "type": "minecraft:crafting_shaped", "key": { "A": { "tag": "botania:petals/blue" @@ -21,5 +21,5 @@ "item": "botania:livingwood_twig" } }, - "group": "botania:twigwand" + "group": "botania:twig_wand" } \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_blue_red.json b/src/main/resources/data/botania/recipes/wands/twigwand_blue_red.json index fc8ce8bd9..ce89b6034 100644 --- a/src/main/resources/data/botania/recipes/wands/twigwand_blue_red.json +++ b/src/main/resources/data/botania/recipes/wands/twigwand_blue_red.json @@ -1,6 +1,6 @@ { "result": { - "item": "botania:twigwand", + "item": "botania:twig_wand", "data": 0, "nbt": "{color1:11,color2:14}" }, @@ -9,7 +9,7 @@ " SB", "S " ], - "type": "forge:ore_shaped", + "type": "minecraft:crafting_shaped", "key": { "A": { "tag": "botania:petals/blue" @@ -21,5 +21,5 @@ "item": "botania:livingwood_twig" } }, - "group": "botania:twigwand" + "group": "botania:twig_wand" } \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_blue_silver.json b/src/main/resources/data/botania/recipes/wands/twigwand_blue_silver.json index b4b76c037..f8a0e6579 100644 --- a/src/main/resources/data/botania/recipes/wands/twigwand_blue_silver.json +++ b/src/main/resources/data/botania/recipes/wands/twigwand_blue_silver.json @@ -1,6 +1,6 @@ { "result": { - "item": "botania:twigwand", + "item": "botania:twig_wand", "data": 0, "nbt": "{color1:11,color2:8}" }, @@ -9,17 +9,17 @@ " SB", "S " ], - "type": "forge:ore_shaped", + "type": "minecraft:crafting_shaped", "key": { "A": { "tag": "botania:petals/blue" }, "B": { - "tag": "botania:petals/lightgray" + "tag": "botania:petals/light_gray" }, "S": { "item": "botania:livingwood_twig" } }, - "group": "botania:twigwand" + "group": "botania:twig_wand" } \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_blue_white.json b/src/main/resources/data/botania/recipes/wands/twigwand_blue_white.json index 3c5506f46..96a4a9a2f 100644 --- a/src/main/resources/data/botania/recipes/wands/twigwand_blue_white.json +++ b/src/main/resources/data/botania/recipes/wands/twigwand_blue_white.json @@ -1,6 +1,6 @@ { "result": { - "item": "botania:twigwand", + "item": "botania:twig_wand", "data": 0, "nbt": "{color1:11,color2:0}" }, @@ -9,7 +9,7 @@ " SB", "S " ], - "type": "forge:ore_shaped", + "type": "minecraft:crafting_shaped", "key": { "A": { "tag": "botania:petals/blue" @@ -21,5 +21,5 @@ "item": "botania:livingwood_twig" } }, - "group": "botania:twigwand" + "group": "botania:twig_wand" } \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_blue_yellow.json b/src/main/resources/data/botania/recipes/wands/twigwand_blue_yellow.json index c9d842a24..882bb546a 100644 --- a/src/main/resources/data/botania/recipes/wands/twigwand_blue_yellow.json +++ b/src/main/resources/data/botania/recipes/wands/twigwand_blue_yellow.json @@ -1,6 +1,6 @@ { "result": { - "item": "botania:twigwand", + "item": "botania:twig_wand", "data": 0, "nbt": "{color1:11,color2:4}" }, @@ -9,7 +9,7 @@ " SB", "S " ], - "type": "forge:ore_shaped", + "type": "minecraft:crafting_shaped", "key": { "A": { "tag": "botania:petals/blue" @@ -21,5 +21,5 @@ "item": "botania:livingwood_twig" } }, - "group": "botania:twigwand" + "group": "botania:twig_wand" } \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_brown_black.json b/src/main/resources/data/botania/recipes/wands/twigwand_brown_black.json index 0ee0a3d50..3c5e74bc7 100644 --- a/src/main/resources/data/botania/recipes/wands/twigwand_brown_black.json +++ b/src/main/resources/data/botania/recipes/wands/twigwand_brown_black.json @@ -1,6 +1,6 @@ { "result": { - "item": "botania:twigwand", + "item": "botania:twig_wand", "data": 0, "nbt": "{color1:12,color2:15}" }, @@ -9,7 +9,7 @@ " SB", "S " ], - "type": "forge:ore_shaped", + "type": "minecraft:crafting_shaped", "key": { "A": { "tag": "botania:petals/brown" @@ -21,5 +21,5 @@ "item": "botania:livingwood_twig" } }, - "group": "botania:twigwand" + "group": "botania:twig_wand" } \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_brown_blue.json b/src/main/resources/data/botania/recipes/wands/twigwand_brown_blue.json index 6ec944b81..a087063f5 100644 --- a/src/main/resources/data/botania/recipes/wands/twigwand_brown_blue.json +++ b/src/main/resources/data/botania/recipes/wands/twigwand_brown_blue.json @@ -1,6 +1,6 @@ { "result": { - "item": "botania:twigwand", + "item": "botania:twig_wand", "data": 0, "nbt": "{color1:12,color2:11}" }, @@ -9,7 +9,7 @@ " SB", "S " ], - "type": "forge:ore_shaped", + "type": "minecraft:crafting_shaped", "key": { "A": { "tag": "botania:petals/brown" @@ -21,5 +21,5 @@ "item": "botania:livingwood_twig" } }, - "group": "botania:twigwand" + "group": "botania:twig_wand" } \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_brown_brown.json b/src/main/resources/data/botania/recipes/wands/twigwand_brown_brown.json index 3fd200a97..063acccaf 100644 --- a/src/main/resources/data/botania/recipes/wands/twigwand_brown_brown.json +++ b/src/main/resources/data/botania/recipes/wands/twigwand_brown_brown.json @@ -1,6 +1,6 @@ { "result": { - "item": "botania:twigwand", + "item": "botania:twig_wand", "data": 0, "nbt": "{color1:12,color2:12}" }, @@ -9,7 +9,7 @@ " SB", "S " ], - "type": "forge:ore_shaped", + "type": "minecraft:crafting_shaped", "key": { "A": { "tag": "botania:petals/brown" @@ -21,5 +21,5 @@ "item": "botania:livingwood_twig" } }, - "group": "botania:twigwand" + "group": "botania:twig_wand" } \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_brown_cyan.json b/src/main/resources/data/botania/recipes/wands/twigwand_brown_cyan.json index 6be8fc3c1..f0499ce8d 100644 --- a/src/main/resources/data/botania/recipes/wands/twigwand_brown_cyan.json +++ b/src/main/resources/data/botania/recipes/wands/twigwand_brown_cyan.json @@ -1,6 +1,6 @@ { "result": { - "item": "botania:twigwand", + "item": "botania:twig_wand", "data": 0, "nbt": "{color1:12,color2:9}" }, @@ -9,7 +9,7 @@ " SB", "S " ], - "type": "forge:ore_shaped", + "type": "minecraft:crafting_shaped", "key": { "A": { "tag": "botania:petals/brown" @@ -21,5 +21,5 @@ "item": "botania:livingwood_twig" } }, - "group": "botania:twigwand" + "group": "botania:twig_wand" } \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_brown_gray.json b/src/main/resources/data/botania/recipes/wands/twigwand_brown_gray.json index f04ffacc6..c4b634d55 100644 --- a/src/main/resources/data/botania/recipes/wands/twigwand_brown_gray.json +++ b/src/main/resources/data/botania/recipes/wands/twigwand_brown_gray.json @@ -1,6 +1,6 @@ { "result": { - "item": "botania:twigwand", + "item": "botania:twig_wand", "data": 0, "nbt": "{color1:12,color2:7}" }, @@ -9,7 +9,7 @@ " SB", "S " ], - "type": "forge:ore_shaped", + "type": "minecraft:crafting_shaped", "key": { "A": { "tag": "botania:petals/brown" @@ -21,5 +21,5 @@ "item": "botania:livingwood_twig" } }, - "group": "botania:twigwand" + "group": "botania:twig_wand" } \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_brown_green.json b/src/main/resources/data/botania/recipes/wands/twigwand_brown_green.json index 72f409cdd..4d4cfec44 100644 --- a/src/main/resources/data/botania/recipes/wands/twigwand_brown_green.json +++ b/src/main/resources/data/botania/recipes/wands/twigwand_brown_green.json @@ -1,6 +1,6 @@ { "result": { - "item": "botania:twigwand", + "item": "botania:twig_wand", "data": 0, "nbt": "{color1:12,color2:13}" }, @@ -9,7 +9,7 @@ " SB", "S " ], - "type": "forge:ore_shaped", + "type": "minecraft:crafting_shaped", "key": { "A": { "tag": "botania:petals/brown" @@ -21,5 +21,5 @@ "item": "botania:livingwood_twig" } }, - "group": "botania:twigwand" + "group": "botania:twig_wand" } \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_brown_light_blue.json b/src/main/resources/data/botania/recipes/wands/twigwand_brown_light_blue.json index 7303ce738..39cfd8836 100644 --- a/src/main/resources/data/botania/recipes/wands/twigwand_brown_light_blue.json +++ b/src/main/resources/data/botania/recipes/wands/twigwand_brown_light_blue.json @@ -1,6 +1,6 @@ { "result": { - "item": "botania:twigwand", + "item": "botania:twig_wand", "data": 0, "nbt": "{color1:12,color2:3}" }, @@ -9,7 +9,7 @@ " SB", "S " ], - "type": "forge:ore_shaped", + "type": "minecraft:crafting_shaped", "key": { "A": { "tag": "botania:petals/brown" @@ -21,5 +21,5 @@ "item": "botania:livingwood_twig" } }, - "group": "botania:twigwand" + "group": "botania:twig_wand" } \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_brown_lime.json b/src/main/resources/data/botania/recipes/wands/twigwand_brown_lime.json index e2fbd09a1..4dcd455ff 100644 --- a/src/main/resources/data/botania/recipes/wands/twigwand_brown_lime.json +++ b/src/main/resources/data/botania/recipes/wands/twigwand_brown_lime.json @@ -1,6 +1,6 @@ { "result": { - "item": "botania:twigwand", + "item": "botania:twig_wand", "data": 0, "nbt": "{color1:12,color2:5}" }, @@ -9,7 +9,7 @@ " SB", "S " ], - "type": "forge:ore_shaped", + "type": "minecraft:crafting_shaped", "key": { "A": { "tag": "botania:petals/brown" @@ -21,5 +21,5 @@ "item": "botania:livingwood_twig" } }, - "group": "botania:twigwand" + "group": "botania:twig_wand" } \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_brown_magenta.json b/src/main/resources/data/botania/recipes/wands/twigwand_brown_magenta.json index 209065334..1b85b2e86 100644 --- a/src/main/resources/data/botania/recipes/wands/twigwand_brown_magenta.json +++ b/src/main/resources/data/botania/recipes/wands/twigwand_brown_magenta.json @@ -1,6 +1,6 @@ { "result": { - "item": "botania:twigwand", + "item": "botania:twig_wand", "data": 0, "nbt": "{color1:12,color2:2}" }, @@ -9,7 +9,7 @@ " SB", "S " ], - "type": "forge:ore_shaped", + "type": "minecraft:crafting_shaped", "key": { "A": { "tag": "botania:petals/brown" @@ -21,5 +21,5 @@ "item": "botania:livingwood_twig" } }, - "group": "botania:twigwand" + "group": "botania:twig_wand" } \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_brown_orange.json b/src/main/resources/data/botania/recipes/wands/twigwand_brown_orange.json index b37cef460..bec834571 100644 --- a/src/main/resources/data/botania/recipes/wands/twigwand_brown_orange.json +++ b/src/main/resources/data/botania/recipes/wands/twigwand_brown_orange.json @@ -1,6 +1,6 @@ { "result": { - "item": "botania:twigwand", + "item": "botania:twig_wand", "data": 0, "nbt": "{color1:12,color2:1}" }, @@ -9,7 +9,7 @@ " SB", "S " ], - "type": "forge:ore_shaped", + "type": "minecraft:crafting_shaped", "key": { "A": { "tag": "botania:petals/brown" @@ -21,5 +21,5 @@ "item": "botania:livingwood_twig" } }, - "group": "botania:twigwand" + "group": "botania:twig_wand" } \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_brown_pink.json b/src/main/resources/data/botania/recipes/wands/twigwand_brown_pink.json index f204e3c32..f2bf2cd49 100644 --- a/src/main/resources/data/botania/recipes/wands/twigwand_brown_pink.json +++ b/src/main/resources/data/botania/recipes/wands/twigwand_brown_pink.json @@ -1,6 +1,6 @@ { "result": { - "item": "botania:twigwand", + "item": "botania:twig_wand", "data": 0, "nbt": "{color1:12,color2:6}" }, @@ -9,7 +9,7 @@ " SB", "S " ], - "type": "forge:ore_shaped", + "type": "minecraft:crafting_shaped", "key": { "A": { "tag": "botania:petals/brown" @@ -21,5 +21,5 @@ "item": "botania:livingwood_twig" } }, - "group": "botania:twigwand" + "group": "botania:twig_wand" } \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_brown_purple.json b/src/main/resources/data/botania/recipes/wands/twigwand_brown_purple.json index f42af3b0b..53db09024 100644 --- a/src/main/resources/data/botania/recipes/wands/twigwand_brown_purple.json +++ b/src/main/resources/data/botania/recipes/wands/twigwand_brown_purple.json @@ -1,6 +1,6 @@ { "result": { - "item": "botania:twigwand", + "item": "botania:twig_wand", "data": 0, "nbt": "{color1:12,color2:10}" }, @@ -9,7 +9,7 @@ " SB", "S " ], - "type": "forge:ore_shaped", + "type": "minecraft:crafting_shaped", "key": { "A": { "tag": "botania:petals/brown" @@ -21,5 +21,5 @@ "item": "botania:livingwood_twig" } }, - "group": "botania:twigwand" + "group": "botania:twig_wand" } \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_brown_red.json b/src/main/resources/data/botania/recipes/wands/twigwand_brown_red.json index 76e346704..76a89dc52 100644 --- a/src/main/resources/data/botania/recipes/wands/twigwand_brown_red.json +++ b/src/main/resources/data/botania/recipes/wands/twigwand_brown_red.json @@ -1,6 +1,6 @@ { "result": { - "item": "botania:twigwand", + "item": "botania:twig_wand", "data": 0, "nbt": "{color1:12,color2:14}" }, @@ -9,7 +9,7 @@ " SB", "S " ], - "type": "forge:ore_shaped", + "type": "minecraft:crafting_shaped", "key": { "A": { "tag": "botania:petals/brown" @@ -21,5 +21,5 @@ "item": "botania:livingwood_twig" } }, - "group": "botania:twigwand" + "group": "botania:twig_wand" } \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_brown_silver.json b/src/main/resources/data/botania/recipes/wands/twigwand_brown_silver.json index 28695b33f..eaa744d89 100644 --- a/src/main/resources/data/botania/recipes/wands/twigwand_brown_silver.json +++ b/src/main/resources/data/botania/recipes/wands/twigwand_brown_silver.json @@ -1,6 +1,6 @@ { "result": { - "item": "botania:twigwand", + "item": "botania:twig_wand", "data": 0, "nbt": "{color1:12,color2:8}" }, @@ -9,17 +9,17 @@ " SB", "S " ], - "type": "forge:ore_shaped", + "type": "minecraft:crafting_shaped", "key": { "A": { "tag": "botania:petals/brown" }, "B": { - "tag": "botania:petals/lightgray" + "tag": "botania:petals/light_gray" }, "S": { "item": "botania:livingwood_twig" } }, - "group": "botania:twigwand" + "group": "botania:twig_wand" } \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_brown_white.json b/src/main/resources/data/botania/recipes/wands/twigwand_brown_white.json index 4033137b5..8f6651ffe 100644 --- a/src/main/resources/data/botania/recipes/wands/twigwand_brown_white.json +++ b/src/main/resources/data/botania/recipes/wands/twigwand_brown_white.json @@ -1,6 +1,6 @@ { "result": { - "item": "botania:twigwand", + "item": "botania:twig_wand", "data": 0, "nbt": "{color1:12,color2:0}" }, @@ -9,7 +9,7 @@ " SB", "S " ], - "type": "forge:ore_shaped", + "type": "minecraft:crafting_shaped", "key": { "A": { "tag": "botania:petals/brown" @@ -21,5 +21,5 @@ "item": "botania:livingwood_twig" } }, - "group": "botania:twigwand" + "group": "botania:twig_wand" } \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_brown_yellow.json b/src/main/resources/data/botania/recipes/wands/twigwand_brown_yellow.json index f3a714fa4..b42eb8254 100644 --- a/src/main/resources/data/botania/recipes/wands/twigwand_brown_yellow.json +++ b/src/main/resources/data/botania/recipes/wands/twigwand_brown_yellow.json @@ -1,6 +1,6 @@ { "result": { - "item": "botania:twigwand", + "item": "botania:twig_wand", "data": 0, "nbt": "{color1:12,color2:4}" }, @@ -9,7 +9,7 @@ " SB", "S " ], - "type": "forge:ore_shaped", + "type": "minecraft:crafting_shaped", "key": { "A": { "tag": "botania:petals/brown" @@ -21,5 +21,5 @@ "item": "botania:livingwood_twig" } }, - "group": "botania:twigwand" + "group": "botania:twig_wand" } \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_cyan_black.json b/src/main/resources/data/botania/recipes/wands/twigwand_cyan_black.json index a2b6f1476..89f1f4920 100644 --- a/src/main/resources/data/botania/recipes/wands/twigwand_cyan_black.json +++ b/src/main/resources/data/botania/recipes/wands/twigwand_cyan_black.json @@ -1,6 +1,6 @@ { "result": { - "item": "botania:twigwand", + "item": "botania:twig_wand", "data": 0, "nbt": "{color1:9,color2:15}" }, @@ -9,7 +9,7 @@ " SB", "S " ], - "type": "forge:ore_shaped", + "type": "minecraft:crafting_shaped", "key": { "A": { "tag": "botania:petals/cyan" @@ -21,5 +21,5 @@ "item": "botania:livingwood_twig" } }, - "group": "botania:twigwand" + "group": "botania:twig_wand" } \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_cyan_blue.json b/src/main/resources/data/botania/recipes/wands/twigwand_cyan_blue.json index 48cd7b708..caaf2f99c 100644 --- a/src/main/resources/data/botania/recipes/wands/twigwand_cyan_blue.json +++ b/src/main/resources/data/botania/recipes/wands/twigwand_cyan_blue.json @@ -1,6 +1,6 @@ { "result": { - "item": "botania:twigwand", + "item": "botania:twig_wand", "data": 0, "nbt": "{color1:9,color2:11}" }, @@ -9,7 +9,7 @@ " SB", "S " ], - "type": "forge:ore_shaped", + "type": "minecraft:crafting_shaped", "key": { "A": { "tag": "botania:petals/cyan" @@ -21,5 +21,5 @@ "item": "botania:livingwood_twig" } }, - "group": "botania:twigwand" + "group": "botania:twig_wand" } \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_cyan_brown.json b/src/main/resources/data/botania/recipes/wands/twigwand_cyan_brown.json index 77000b02f..6b4e8d254 100644 --- a/src/main/resources/data/botania/recipes/wands/twigwand_cyan_brown.json +++ b/src/main/resources/data/botania/recipes/wands/twigwand_cyan_brown.json @@ -1,6 +1,6 @@ { "result": { - "item": "botania:twigwand", + "item": "botania:twig_wand", "data": 0, "nbt": "{color1:9,color2:12}" }, @@ -9,7 +9,7 @@ " SB", "S " ], - "type": "forge:ore_shaped", + "type": "minecraft:crafting_shaped", "key": { "A": { "tag": "botania:petals/cyan" @@ -21,5 +21,5 @@ "item": "botania:livingwood_twig" } }, - "group": "botania:twigwand" + "group": "botania:twig_wand" } \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_cyan_cyan.json b/src/main/resources/data/botania/recipes/wands/twigwand_cyan_cyan.json index 6019d3c34..86c1491da 100644 --- a/src/main/resources/data/botania/recipes/wands/twigwand_cyan_cyan.json +++ b/src/main/resources/data/botania/recipes/wands/twigwand_cyan_cyan.json @@ -1,6 +1,6 @@ { "result": { - "item": "botania:twigwand", + "item": "botania:twig_wand", "data": 0, "nbt": "{color1:9,color2:9}" }, @@ -9,7 +9,7 @@ " SB", "S " ], - "type": "forge:ore_shaped", + "type": "minecraft:crafting_shaped", "key": { "A": { "tag": "botania:petals/cyan" @@ -21,5 +21,5 @@ "item": "botania:livingwood_twig" } }, - "group": "botania:twigwand" + "group": "botania:twig_wand" } \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_cyan_gray.json b/src/main/resources/data/botania/recipes/wands/twigwand_cyan_gray.json index 58a2f7f7f..8879be1fd 100644 --- a/src/main/resources/data/botania/recipes/wands/twigwand_cyan_gray.json +++ b/src/main/resources/data/botania/recipes/wands/twigwand_cyan_gray.json @@ -1,6 +1,6 @@ { "result": { - "item": "botania:twigwand", + "item": "botania:twig_wand", "data": 0, "nbt": "{color1:9,color2:7}" }, @@ -9,7 +9,7 @@ " SB", "S " ], - "type": "forge:ore_shaped", + "type": "minecraft:crafting_shaped", "key": { "A": { "tag": "botania:petals/cyan" @@ -21,5 +21,5 @@ "item": "botania:livingwood_twig" } }, - "group": "botania:twigwand" + "group": "botania:twig_wand" } \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_cyan_green.json b/src/main/resources/data/botania/recipes/wands/twigwand_cyan_green.json index 7c21a19a9..cde4a6b1e 100644 --- a/src/main/resources/data/botania/recipes/wands/twigwand_cyan_green.json +++ b/src/main/resources/data/botania/recipes/wands/twigwand_cyan_green.json @@ -1,6 +1,6 @@ { "result": { - "item": "botania:twigwand", + "item": "botania:twig_wand", "data": 0, "nbt": "{color1:9,color2:13}" }, @@ -9,7 +9,7 @@ " SB", "S " ], - "type": "forge:ore_shaped", + "type": "minecraft:crafting_shaped", "key": { "A": { "tag": "botania:petals/cyan" @@ -21,5 +21,5 @@ "item": "botania:livingwood_twig" } }, - "group": "botania:twigwand" + "group": "botania:twig_wand" } \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_cyan_light_blue.json b/src/main/resources/data/botania/recipes/wands/twigwand_cyan_light_blue.json index 2f5a033d9..e7f1e0b95 100644 --- a/src/main/resources/data/botania/recipes/wands/twigwand_cyan_light_blue.json +++ b/src/main/resources/data/botania/recipes/wands/twigwand_cyan_light_blue.json @@ -1,6 +1,6 @@ { "result": { - "item": "botania:twigwand", + "item": "botania:twig_wand", "data": 0, "nbt": "{color1:9,color2:3}" }, @@ -9,7 +9,7 @@ " SB", "S " ], - "type": "forge:ore_shaped", + "type": "minecraft:crafting_shaped", "key": { "A": { "tag": "botania:petals/cyan" @@ -21,5 +21,5 @@ "item": "botania:livingwood_twig" } }, - "group": "botania:twigwand" + "group": "botania:twig_wand" } \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_cyan_lime.json b/src/main/resources/data/botania/recipes/wands/twigwand_cyan_lime.json index 1da308256..6b3ed6ac5 100644 --- a/src/main/resources/data/botania/recipes/wands/twigwand_cyan_lime.json +++ b/src/main/resources/data/botania/recipes/wands/twigwand_cyan_lime.json @@ -1,6 +1,6 @@ { "result": { - "item": "botania:twigwand", + "item": "botania:twig_wand", "data": 0, "nbt": "{color1:9,color2:5}" }, @@ -9,7 +9,7 @@ " SB", "S " ], - "type": "forge:ore_shaped", + "type": "minecraft:crafting_shaped", "key": { "A": { "tag": "botania:petals/cyan" @@ -21,5 +21,5 @@ "item": "botania:livingwood_twig" } }, - "group": "botania:twigwand" + "group": "botania:twig_wand" } \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_cyan_magenta.json b/src/main/resources/data/botania/recipes/wands/twigwand_cyan_magenta.json index 44c03e460..735a00bdb 100644 --- a/src/main/resources/data/botania/recipes/wands/twigwand_cyan_magenta.json +++ b/src/main/resources/data/botania/recipes/wands/twigwand_cyan_magenta.json @@ -1,6 +1,6 @@ { "result": { - "item": "botania:twigwand", + "item": "botania:twig_wand", "data": 0, "nbt": "{color1:9,color2:2}" }, @@ -9,7 +9,7 @@ " SB", "S " ], - "type": "forge:ore_shaped", + "type": "minecraft:crafting_shaped", "key": { "A": { "tag": "botania:petals/cyan" @@ -21,5 +21,5 @@ "item": "botania:livingwood_twig" } }, - "group": "botania:twigwand" + "group": "botania:twig_wand" } \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_cyan_orange.json b/src/main/resources/data/botania/recipes/wands/twigwand_cyan_orange.json index 38ede78c6..6c647edc9 100644 --- a/src/main/resources/data/botania/recipes/wands/twigwand_cyan_orange.json +++ b/src/main/resources/data/botania/recipes/wands/twigwand_cyan_orange.json @@ -1,6 +1,6 @@ { "result": { - "item": "botania:twigwand", + "item": "botania:twig_wand", "data": 0, "nbt": "{color1:9,color2:1}" }, @@ -9,7 +9,7 @@ " SB", "S " ], - "type": "forge:ore_shaped", + "type": "minecraft:crafting_shaped", "key": { "A": { "tag": "botania:petals/cyan" @@ -21,5 +21,5 @@ "item": "botania:livingwood_twig" } }, - "group": "botania:twigwand" + "group": "botania:twig_wand" } \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_cyan_pink.json b/src/main/resources/data/botania/recipes/wands/twigwand_cyan_pink.json index ace5d39e1..9b05498b9 100644 --- a/src/main/resources/data/botania/recipes/wands/twigwand_cyan_pink.json +++ b/src/main/resources/data/botania/recipes/wands/twigwand_cyan_pink.json @@ -1,6 +1,6 @@ { "result": { - "item": "botania:twigwand", + "item": "botania:twig_wand", "data": 0, "nbt": "{color1:9,color2:6}" }, @@ -9,7 +9,7 @@ " SB", "S " ], - "type": "forge:ore_shaped", + "type": "minecraft:crafting_shaped", "key": { "A": { "tag": "botania:petals/cyan" @@ -21,5 +21,5 @@ "item": "botania:livingwood_twig" } }, - "group": "botania:twigwand" + "group": "botania:twig_wand" } \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_cyan_purple.json b/src/main/resources/data/botania/recipes/wands/twigwand_cyan_purple.json index 34347d2b7..fed88ca53 100644 --- a/src/main/resources/data/botania/recipes/wands/twigwand_cyan_purple.json +++ b/src/main/resources/data/botania/recipes/wands/twigwand_cyan_purple.json @@ -1,6 +1,6 @@ { "result": { - "item": "botania:twigwand", + "item": "botania:twig_wand", "data": 0, "nbt": "{color1:9,color2:10}" }, @@ -9,7 +9,7 @@ " SB", "S " ], - "type": "forge:ore_shaped", + "type": "minecraft:crafting_shaped", "key": { "A": { "tag": "botania:petals/cyan" @@ -21,5 +21,5 @@ "item": "botania:livingwood_twig" } }, - "group": "botania:twigwand" + "group": "botania:twig_wand" } \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_cyan_red.json b/src/main/resources/data/botania/recipes/wands/twigwand_cyan_red.json index e62316248..8c9d01f2b 100644 --- a/src/main/resources/data/botania/recipes/wands/twigwand_cyan_red.json +++ b/src/main/resources/data/botania/recipes/wands/twigwand_cyan_red.json @@ -1,6 +1,6 @@ { "result": { - "item": "botania:twigwand", + "item": "botania:twig_wand", "data": 0, "nbt": "{color1:9,color2:14}" }, @@ -9,7 +9,7 @@ " SB", "S " ], - "type": "forge:ore_shaped", + "type": "minecraft:crafting_shaped", "key": { "A": { "tag": "botania:petals/cyan" @@ -21,5 +21,5 @@ "item": "botania:livingwood_twig" } }, - "group": "botania:twigwand" + "group": "botania:twig_wand" } \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_cyan_silver.json b/src/main/resources/data/botania/recipes/wands/twigwand_cyan_silver.json index 9ebe6f9a0..e4ba66ee5 100644 --- a/src/main/resources/data/botania/recipes/wands/twigwand_cyan_silver.json +++ b/src/main/resources/data/botania/recipes/wands/twigwand_cyan_silver.json @@ -1,6 +1,6 @@ { "result": { - "item": "botania:twigwand", + "item": "botania:twig_wand", "data": 0, "nbt": "{color1:9,color2:8}" }, @@ -9,17 +9,17 @@ " SB", "S " ], - "type": "forge:ore_shaped", + "type": "minecraft:crafting_shaped", "key": { "A": { "tag": "botania:petals/cyan" }, "B": { - "tag": "botania:petals/lightgray" + "tag": "botania:petals/light_gray" }, "S": { "item": "botania:livingwood_twig" } }, - "group": "botania:twigwand" + "group": "botania:twig_wand" } \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_cyan_white.json b/src/main/resources/data/botania/recipes/wands/twigwand_cyan_white.json index 28041f0f7..7828de8a9 100644 --- a/src/main/resources/data/botania/recipes/wands/twigwand_cyan_white.json +++ b/src/main/resources/data/botania/recipes/wands/twigwand_cyan_white.json @@ -1,6 +1,6 @@ { "result": { - "item": "botania:twigwand", + "item": "botania:twig_wand", "data": 0, "nbt": "{color1:9,color2:0}" }, @@ -9,7 +9,7 @@ " SB", "S " ], - "type": "forge:ore_shaped", + "type": "minecraft:crafting_shaped", "key": { "A": { "tag": "botania:petals/cyan" @@ -21,5 +21,5 @@ "item": "botania:livingwood_twig" } }, - "group": "botania:twigwand" + "group": "botania:twig_wand" } \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_cyan_yellow.json b/src/main/resources/data/botania/recipes/wands/twigwand_cyan_yellow.json index 4475d6a05..177fcd3b8 100644 --- a/src/main/resources/data/botania/recipes/wands/twigwand_cyan_yellow.json +++ b/src/main/resources/data/botania/recipes/wands/twigwand_cyan_yellow.json @@ -1,6 +1,6 @@ { "result": { - "item": "botania:twigwand", + "item": "botania:twig_wand", "data": 0, "nbt": "{color1:9,color2:4}" }, @@ -9,7 +9,7 @@ " SB", "S " ], - "type": "forge:ore_shaped", + "type": "minecraft:crafting_shaped", "key": { "A": { "tag": "botania:petals/cyan" @@ -21,5 +21,5 @@ "item": "botania:livingwood_twig" } }, - "group": "botania:twigwand" + "group": "botania:twig_wand" } \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_gray_black.json b/src/main/resources/data/botania/recipes/wands/twigwand_gray_black.json index 9e320386f..ff3dfdc79 100644 --- a/src/main/resources/data/botania/recipes/wands/twigwand_gray_black.json +++ b/src/main/resources/data/botania/recipes/wands/twigwand_gray_black.json @@ -1,6 +1,6 @@ { "result": { - "item": "botania:twigwand", + "item": "botania:twig_wand", "data": 0, "nbt": "{color1:7,color2:15}" }, @@ -9,7 +9,7 @@ " SB", "S " ], - "type": "forge:ore_shaped", + "type": "minecraft:crafting_shaped", "key": { "A": { "tag": "botania:petals/gray" @@ -21,5 +21,5 @@ "item": "botania:livingwood_twig" } }, - "group": "botania:twigwand" + "group": "botania:twig_wand" } \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_gray_blue.json b/src/main/resources/data/botania/recipes/wands/twigwand_gray_blue.json index ced0613be..5c38d33d6 100644 --- a/src/main/resources/data/botania/recipes/wands/twigwand_gray_blue.json +++ b/src/main/resources/data/botania/recipes/wands/twigwand_gray_blue.json @@ -1,6 +1,6 @@ { "result": { - "item": "botania:twigwand", + "item": "botania:twig_wand", "data": 0, "nbt": "{color1:7,color2:11}" }, @@ -9,7 +9,7 @@ " SB", "S " ], - "type": "forge:ore_shaped", + "type": "minecraft:crafting_shaped", "key": { "A": { "tag": "botania:petals/gray" @@ -21,5 +21,5 @@ "item": "botania:livingwood_twig" } }, - "group": "botania:twigwand" + "group": "botania:twig_wand" } \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_gray_brown.json b/src/main/resources/data/botania/recipes/wands/twigwand_gray_brown.json index 8d31b9c05..7ea96b07c 100644 --- a/src/main/resources/data/botania/recipes/wands/twigwand_gray_brown.json +++ b/src/main/resources/data/botania/recipes/wands/twigwand_gray_brown.json @@ -1,6 +1,6 @@ { "result": { - "item": "botania:twigwand", + "item": "botania:twig_wand", "data": 0, "nbt": "{color1:7,color2:12}" }, @@ -9,7 +9,7 @@ " SB", "S " ], - "type": "forge:ore_shaped", + "type": "minecraft:crafting_shaped", "key": { "A": { "tag": "botania:petals/gray" @@ -21,5 +21,5 @@ "item": "botania:livingwood_twig" } }, - "group": "botania:twigwand" + "group": "botania:twig_wand" } \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_gray_cyan.json b/src/main/resources/data/botania/recipes/wands/twigwand_gray_cyan.json index e3ee2ec6b..3399b3d31 100644 --- a/src/main/resources/data/botania/recipes/wands/twigwand_gray_cyan.json +++ b/src/main/resources/data/botania/recipes/wands/twigwand_gray_cyan.json @@ -1,6 +1,6 @@ { "result": { - "item": "botania:twigwand", + "item": "botania:twig_wand", "data": 0, "nbt": "{color1:7,color2:9}" }, @@ -9,7 +9,7 @@ " SB", "S " ], - "type": "forge:ore_shaped", + "type": "minecraft:crafting_shaped", "key": { "A": { "tag": "botania:petals/gray" @@ -21,5 +21,5 @@ "item": "botania:livingwood_twig" } }, - "group": "botania:twigwand" + "group": "botania:twig_wand" } \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_gray_gray.json b/src/main/resources/data/botania/recipes/wands/twigwand_gray_gray.json index 045c31143..11b6635d2 100644 --- a/src/main/resources/data/botania/recipes/wands/twigwand_gray_gray.json +++ b/src/main/resources/data/botania/recipes/wands/twigwand_gray_gray.json @@ -1,6 +1,6 @@ { "result": { - "item": "botania:twigwand", + "item": "botania:twig_wand", "data": 0, "nbt": "{color1:7,color2:7}" }, @@ -9,7 +9,7 @@ " SB", "S " ], - "type": "forge:ore_shaped", + "type": "minecraft:crafting_shaped", "key": { "A": { "tag": "botania:petals/gray" @@ -21,5 +21,5 @@ "item": "botania:livingwood_twig" } }, - "group": "botania:twigwand" + "group": "botania:twig_wand" } \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_gray_green.json b/src/main/resources/data/botania/recipes/wands/twigwand_gray_green.json index 2ad7eb453..999b10423 100644 --- a/src/main/resources/data/botania/recipes/wands/twigwand_gray_green.json +++ b/src/main/resources/data/botania/recipes/wands/twigwand_gray_green.json @@ -1,6 +1,6 @@ { "result": { - "item": "botania:twigwand", + "item": "botania:twig_wand", "data": 0, "nbt": "{color1:7,color2:13}" }, @@ -9,7 +9,7 @@ " SB", "S " ], - "type": "forge:ore_shaped", + "type": "minecraft:crafting_shaped", "key": { "A": { "tag": "botania:petals/gray" @@ -21,5 +21,5 @@ "item": "botania:livingwood_twig" } }, - "group": "botania:twigwand" + "group": "botania:twig_wand" } \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_gray_light_blue.json b/src/main/resources/data/botania/recipes/wands/twigwand_gray_light_blue.json index d761a4787..3f461e4cb 100644 --- a/src/main/resources/data/botania/recipes/wands/twigwand_gray_light_blue.json +++ b/src/main/resources/data/botania/recipes/wands/twigwand_gray_light_blue.json @@ -1,6 +1,6 @@ { "result": { - "item": "botania:twigwand", + "item": "botania:twig_wand", "data": 0, "nbt": "{color1:7,color2:3}" }, @@ -9,7 +9,7 @@ " SB", "S " ], - "type": "forge:ore_shaped", + "type": "minecraft:crafting_shaped", "key": { "A": { "tag": "botania:petals/gray" @@ -21,5 +21,5 @@ "item": "botania:livingwood_twig" } }, - "group": "botania:twigwand" + "group": "botania:twig_wand" } \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_gray_lime.json b/src/main/resources/data/botania/recipes/wands/twigwand_gray_lime.json index fefe778f0..62c8095d2 100644 --- a/src/main/resources/data/botania/recipes/wands/twigwand_gray_lime.json +++ b/src/main/resources/data/botania/recipes/wands/twigwand_gray_lime.json @@ -1,6 +1,6 @@ { "result": { - "item": "botania:twigwand", + "item": "botania:twig_wand", "data": 0, "nbt": "{color1:7,color2:5}" }, @@ -9,7 +9,7 @@ " SB", "S " ], - "type": "forge:ore_shaped", + "type": "minecraft:crafting_shaped", "key": { "A": { "tag": "botania:petals/gray" @@ -21,5 +21,5 @@ "item": "botania:livingwood_twig" } }, - "group": "botania:twigwand" + "group": "botania:twig_wand" } \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_gray_magenta.json b/src/main/resources/data/botania/recipes/wands/twigwand_gray_magenta.json index cc0a19895..5a6e00b08 100644 --- a/src/main/resources/data/botania/recipes/wands/twigwand_gray_magenta.json +++ b/src/main/resources/data/botania/recipes/wands/twigwand_gray_magenta.json @@ -1,6 +1,6 @@ { "result": { - "item": "botania:twigwand", + "item": "botania:twig_wand", "data": 0, "nbt": "{color1:7,color2:2}" }, @@ -9,7 +9,7 @@ " SB", "S " ], - "type": "forge:ore_shaped", + "type": "minecraft:crafting_shaped", "key": { "A": { "tag": "botania:petals/gray" @@ -21,5 +21,5 @@ "item": "botania:livingwood_twig" } }, - "group": "botania:twigwand" + "group": "botania:twig_wand" } \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_gray_orange.json b/src/main/resources/data/botania/recipes/wands/twigwand_gray_orange.json index 3883114a6..df7be2e16 100644 --- a/src/main/resources/data/botania/recipes/wands/twigwand_gray_orange.json +++ b/src/main/resources/data/botania/recipes/wands/twigwand_gray_orange.json @@ -1,6 +1,6 @@ { "result": { - "item": "botania:twigwand", + "item": "botania:twig_wand", "data": 0, "nbt": "{color1:7,color2:1}" }, @@ -9,7 +9,7 @@ " SB", "S " ], - "type": "forge:ore_shaped", + "type": "minecraft:crafting_shaped", "key": { "A": { "tag": "botania:petals/gray" @@ -21,5 +21,5 @@ "item": "botania:livingwood_twig" } }, - "group": "botania:twigwand" + "group": "botania:twig_wand" } \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_gray_pink.json b/src/main/resources/data/botania/recipes/wands/twigwand_gray_pink.json index b339df765..15f2c3683 100644 --- a/src/main/resources/data/botania/recipes/wands/twigwand_gray_pink.json +++ b/src/main/resources/data/botania/recipes/wands/twigwand_gray_pink.json @@ -1,6 +1,6 @@ { "result": { - "item": "botania:twigwand", + "item": "botania:twig_wand", "data": 0, "nbt": "{color1:7,color2:6}" }, @@ -9,7 +9,7 @@ " SB", "S " ], - "type": "forge:ore_shaped", + "type": "minecraft:crafting_shaped", "key": { "A": { "tag": "botania:petals/gray" @@ -21,5 +21,5 @@ "item": "botania:livingwood_twig" } }, - "group": "botania:twigwand" + "group": "botania:twig_wand" } \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_gray_purple.json b/src/main/resources/data/botania/recipes/wands/twigwand_gray_purple.json index bd698c03a..1f417d460 100644 --- a/src/main/resources/data/botania/recipes/wands/twigwand_gray_purple.json +++ b/src/main/resources/data/botania/recipes/wands/twigwand_gray_purple.json @@ -1,6 +1,6 @@ { "result": { - "item": "botania:twigwand", + "item": "botania:twig_wand", "data": 0, "nbt": "{color1:7,color2:10}" }, @@ -9,7 +9,7 @@ " SB", "S " ], - "type": "forge:ore_shaped", + "type": "minecraft:crafting_shaped", "key": { "A": { "tag": "botania:petals/gray" @@ -21,5 +21,5 @@ "item": "botania:livingwood_twig" } }, - "group": "botania:twigwand" + "group": "botania:twig_wand" } \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_gray_red.json b/src/main/resources/data/botania/recipes/wands/twigwand_gray_red.json index 5ad31230f..23fc4534d 100644 --- a/src/main/resources/data/botania/recipes/wands/twigwand_gray_red.json +++ b/src/main/resources/data/botania/recipes/wands/twigwand_gray_red.json @@ -1,6 +1,6 @@ { "result": { - "item": "botania:twigwand", + "item": "botania:twig_wand", "data": 0, "nbt": "{color1:7,color2:14}" }, @@ -9,7 +9,7 @@ " SB", "S " ], - "type": "forge:ore_shaped", + "type": "minecraft:crafting_shaped", "key": { "A": { "tag": "botania:petals/gray" @@ -21,5 +21,5 @@ "item": "botania:livingwood_twig" } }, - "group": "botania:twigwand" + "group": "botania:twig_wand" } \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_gray_silver.json b/src/main/resources/data/botania/recipes/wands/twigwand_gray_silver.json index 25764fd42..948392213 100644 --- a/src/main/resources/data/botania/recipes/wands/twigwand_gray_silver.json +++ b/src/main/resources/data/botania/recipes/wands/twigwand_gray_silver.json @@ -1,6 +1,6 @@ { "result": { - "item": "botania:twigwand", + "item": "botania:twig_wand", "data": 0, "nbt": "{color1:7,color2:8}" }, @@ -9,17 +9,17 @@ " SB", "S " ], - "type": "forge:ore_shaped", + "type": "minecraft:crafting_shaped", "key": { "A": { "tag": "botania:petals/gray" }, "B": { - "tag": "botania:petals/lightgray" + "tag": "botania:petals/light_gray" }, "S": { "item": "botania:livingwood_twig" } }, - "group": "botania:twigwand" + "group": "botania:twig_wand" } \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_gray_white.json b/src/main/resources/data/botania/recipes/wands/twigwand_gray_white.json index 3b02236e4..d47dea695 100644 --- a/src/main/resources/data/botania/recipes/wands/twigwand_gray_white.json +++ b/src/main/resources/data/botania/recipes/wands/twigwand_gray_white.json @@ -1,6 +1,6 @@ { "result": { - "item": "botania:twigwand", + "item": "botania:twig_wand", "data": 0, "nbt": "{color1:7,color2:0}" }, @@ -9,7 +9,7 @@ " SB", "S " ], - "type": "forge:ore_shaped", + "type": "minecraft:crafting_shaped", "key": { "A": { "tag": "botania:petals/gray" @@ -21,5 +21,5 @@ "item": "botania:livingwood_twig" } }, - "group": "botania:twigwand" + "group": "botania:twig_wand" } \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_gray_yellow.json b/src/main/resources/data/botania/recipes/wands/twigwand_gray_yellow.json index cf85675b7..ed7e55ca3 100644 --- a/src/main/resources/data/botania/recipes/wands/twigwand_gray_yellow.json +++ b/src/main/resources/data/botania/recipes/wands/twigwand_gray_yellow.json @@ -1,6 +1,6 @@ { "result": { - "item": "botania:twigwand", + "item": "botania:twig_wand", "data": 0, "nbt": "{color1:7,color2:4}" }, @@ -9,7 +9,7 @@ " SB", "S " ], - "type": "forge:ore_shaped", + "type": "minecraft:crafting_shaped", "key": { "A": { "tag": "botania:petals/gray" @@ -21,5 +21,5 @@ "item": "botania:livingwood_twig" } }, - "group": "botania:twigwand" + "group": "botania:twig_wand" } \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_green_black.json b/src/main/resources/data/botania/recipes/wands/twigwand_green_black.json index 5f11ca2a1..9fdcf092a 100644 --- a/src/main/resources/data/botania/recipes/wands/twigwand_green_black.json +++ b/src/main/resources/data/botania/recipes/wands/twigwand_green_black.json @@ -1,6 +1,6 @@ { "result": { - "item": "botania:twigwand", + "item": "botania:twig_wand", "data": 0, "nbt": "{color1:13,color2:15}" }, @@ -9,7 +9,7 @@ " SB", "S " ], - "type": "forge:ore_shaped", + "type": "minecraft:crafting_shaped", "key": { "A": { "tag": "botania:petals/green" @@ -21,5 +21,5 @@ "item": "botania:livingwood_twig" } }, - "group": "botania:twigwand" + "group": "botania:twig_wand" } \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_green_blue.json b/src/main/resources/data/botania/recipes/wands/twigwand_green_blue.json index 36f9017cc..577a70d93 100644 --- a/src/main/resources/data/botania/recipes/wands/twigwand_green_blue.json +++ b/src/main/resources/data/botania/recipes/wands/twigwand_green_blue.json @@ -1,6 +1,6 @@ { "result": { - "item": "botania:twigwand", + "item": "botania:twig_wand", "data": 0, "nbt": "{color1:13,color2:11}" }, @@ -9,7 +9,7 @@ " SB", "S " ], - "type": "forge:ore_shaped", + "type": "minecraft:crafting_shaped", "key": { "A": { "tag": "botania:petals/green" @@ -21,5 +21,5 @@ "item": "botania:livingwood_twig" } }, - "group": "botania:twigwand" + "group": "botania:twig_wand" } \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_green_brown.json b/src/main/resources/data/botania/recipes/wands/twigwand_green_brown.json index a282b40e4..e18bd82cd 100644 --- a/src/main/resources/data/botania/recipes/wands/twigwand_green_brown.json +++ b/src/main/resources/data/botania/recipes/wands/twigwand_green_brown.json @@ -1,6 +1,6 @@ { "result": { - "item": "botania:twigwand", + "item": "botania:twig_wand", "data": 0, "nbt": "{color1:13,color2:12}" }, @@ -9,7 +9,7 @@ " SB", "S " ], - "type": "forge:ore_shaped", + "type": "minecraft:crafting_shaped", "key": { "A": { "tag": "botania:petals/green" @@ -21,5 +21,5 @@ "item": "botania:livingwood_twig" } }, - "group": "botania:twigwand" + "group": "botania:twig_wand" } \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_green_cyan.json b/src/main/resources/data/botania/recipes/wands/twigwand_green_cyan.json index 06828f83d..192650766 100644 --- a/src/main/resources/data/botania/recipes/wands/twigwand_green_cyan.json +++ b/src/main/resources/data/botania/recipes/wands/twigwand_green_cyan.json @@ -1,6 +1,6 @@ { "result": { - "item": "botania:twigwand", + "item": "botania:twig_wand", "data": 0, "nbt": "{color1:13,color2:9}" }, @@ -9,7 +9,7 @@ " SB", "S " ], - "type": "forge:ore_shaped", + "type": "minecraft:crafting_shaped", "key": { "A": { "tag": "botania:petals/green" @@ -21,5 +21,5 @@ "item": "botania:livingwood_twig" } }, - "group": "botania:twigwand" + "group": "botania:twig_wand" } \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_green_gray.json b/src/main/resources/data/botania/recipes/wands/twigwand_green_gray.json index 9c1011ed0..95b8eadd3 100644 --- a/src/main/resources/data/botania/recipes/wands/twigwand_green_gray.json +++ b/src/main/resources/data/botania/recipes/wands/twigwand_green_gray.json @@ -1,6 +1,6 @@ { "result": { - "item": "botania:twigwand", + "item": "botania:twig_wand", "data": 0, "nbt": "{color1:13,color2:7}" }, @@ -9,7 +9,7 @@ " SB", "S " ], - "type": "forge:ore_shaped", + "type": "minecraft:crafting_shaped", "key": { "A": { "tag": "botania:petals/green" @@ -21,5 +21,5 @@ "item": "botania:livingwood_twig" } }, - "group": "botania:twigwand" + "group": "botania:twig_wand" } \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_green_green.json b/src/main/resources/data/botania/recipes/wands/twigwand_green_green.json index 18df2e123..7a2cdc63a 100644 --- a/src/main/resources/data/botania/recipes/wands/twigwand_green_green.json +++ b/src/main/resources/data/botania/recipes/wands/twigwand_green_green.json @@ -1,6 +1,6 @@ { "result": { - "item": "botania:twigwand", + "item": "botania:twig_wand", "data": 0, "nbt": "{color1:13,color2:13}" }, @@ -9,7 +9,7 @@ " SB", "S " ], - "type": "forge:ore_shaped", + "type": "minecraft:crafting_shaped", "key": { "A": { "tag": "botania:petals/green" @@ -21,5 +21,5 @@ "item": "botania:livingwood_twig" } }, - "group": "botania:twigwand" + "group": "botania:twig_wand" } \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_green_light_blue.json b/src/main/resources/data/botania/recipes/wands/twigwand_green_light_blue.json index 5543a9d2f..e9c8f36fc 100644 --- a/src/main/resources/data/botania/recipes/wands/twigwand_green_light_blue.json +++ b/src/main/resources/data/botania/recipes/wands/twigwand_green_light_blue.json @@ -1,6 +1,6 @@ { "result": { - "item": "botania:twigwand", + "item": "botania:twig_wand", "data": 0, "nbt": "{color1:13,color2:3}" }, @@ -9,7 +9,7 @@ " SB", "S " ], - "type": "forge:ore_shaped", + "type": "minecraft:crafting_shaped", "key": { "A": { "tag": "botania:petals/green" @@ -21,5 +21,5 @@ "item": "botania:livingwood_twig" } }, - "group": "botania:twigwand" + "group": "botania:twig_wand" } \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_green_lime.json b/src/main/resources/data/botania/recipes/wands/twigwand_green_lime.json index 53ce54a24..dfcd2fc5a 100644 --- a/src/main/resources/data/botania/recipes/wands/twigwand_green_lime.json +++ b/src/main/resources/data/botania/recipes/wands/twigwand_green_lime.json @@ -1,6 +1,6 @@ { "result": { - "item": "botania:twigwand", + "item": "botania:twig_wand", "data": 0, "nbt": "{color1:13,color2:5}" }, @@ -9,7 +9,7 @@ " SB", "S " ], - "type": "forge:ore_shaped", + "type": "minecraft:crafting_shaped", "key": { "A": { "tag": "botania:petals/green" @@ -21,5 +21,5 @@ "item": "botania:livingwood_twig" } }, - "group": "botania:twigwand" + "group": "botania:twig_wand" } \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_green_magenta.json b/src/main/resources/data/botania/recipes/wands/twigwand_green_magenta.json index b71a30e5d..3d6719d3c 100644 --- a/src/main/resources/data/botania/recipes/wands/twigwand_green_magenta.json +++ b/src/main/resources/data/botania/recipes/wands/twigwand_green_magenta.json @@ -1,6 +1,6 @@ { "result": { - "item": "botania:twigwand", + "item": "botania:twig_wand", "data": 0, "nbt": "{color1:13,color2:2}" }, @@ -9,7 +9,7 @@ " SB", "S " ], - "type": "forge:ore_shaped", + "type": "minecraft:crafting_shaped", "key": { "A": { "tag": "botania:petals/green" @@ -21,5 +21,5 @@ "item": "botania:livingwood_twig" } }, - "group": "botania:twigwand" + "group": "botania:twig_wand" } \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_green_orange.json b/src/main/resources/data/botania/recipes/wands/twigwand_green_orange.json index 8fc647267..aca60f8fa 100644 --- a/src/main/resources/data/botania/recipes/wands/twigwand_green_orange.json +++ b/src/main/resources/data/botania/recipes/wands/twigwand_green_orange.json @@ -1,6 +1,6 @@ { "result": { - "item": "botania:twigwand", + "item": "botania:twig_wand", "data": 0, "nbt": "{color1:13,color2:1}" }, @@ -9,7 +9,7 @@ " SB", "S " ], - "type": "forge:ore_shaped", + "type": "minecraft:crafting_shaped", "key": { "A": { "tag": "botania:petals/green" @@ -21,5 +21,5 @@ "item": "botania:livingwood_twig" } }, - "group": "botania:twigwand" + "group": "botania:twig_wand" } \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_green_pink.json b/src/main/resources/data/botania/recipes/wands/twigwand_green_pink.json index 13226377e..4f42a138b 100644 --- a/src/main/resources/data/botania/recipes/wands/twigwand_green_pink.json +++ b/src/main/resources/data/botania/recipes/wands/twigwand_green_pink.json @@ -1,6 +1,6 @@ { "result": { - "item": "botania:twigwand", + "item": "botania:twig_wand", "data": 0, "nbt": "{color1:13,color2:6}" }, @@ -9,7 +9,7 @@ " SB", "S " ], - "type": "forge:ore_shaped", + "type": "minecraft:crafting_shaped", "key": { "A": { "tag": "botania:petals/green" @@ -21,5 +21,5 @@ "item": "botania:livingwood_twig" } }, - "group": "botania:twigwand" + "group": "botania:twig_wand" } \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_green_purple.json b/src/main/resources/data/botania/recipes/wands/twigwand_green_purple.json index bf5ba0390..ad634aa21 100644 --- a/src/main/resources/data/botania/recipes/wands/twigwand_green_purple.json +++ b/src/main/resources/data/botania/recipes/wands/twigwand_green_purple.json @@ -1,6 +1,6 @@ { "result": { - "item": "botania:twigwand", + "item": "botania:twig_wand", "data": 0, "nbt": "{color1:13,color2:10}" }, @@ -9,7 +9,7 @@ " SB", "S " ], - "type": "forge:ore_shaped", + "type": "minecraft:crafting_shaped", "key": { "A": { "tag": "botania:petals/green" @@ -21,5 +21,5 @@ "item": "botania:livingwood_twig" } }, - "group": "botania:twigwand" + "group": "botania:twig_wand" } \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_green_red.json b/src/main/resources/data/botania/recipes/wands/twigwand_green_red.json index eb94b02f5..fda0fc1ea 100644 --- a/src/main/resources/data/botania/recipes/wands/twigwand_green_red.json +++ b/src/main/resources/data/botania/recipes/wands/twigwand_green_red.json @@ -1,6 +1,6 @@ { "result": { - "item": "botania:twigwand", + "item": "botania:twig_wand", "data": 0, "nbt": "{color1:13,color2:14}" }, @@ -9,7 +9,7 @@ " SB", "S " ], - "type": "forge:ore_shaped", + "type": "minecraft:crafting_shaped", "key": { "A": { "tag": "botania:petals/green" @@ -21,5 +21,5 @@ "item": "botania:livingwood_twig" } }, - "group": "botania:twigwand" + "group": "botania:twig_wand" } \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_green_silver.json b/src/main/resources/data/botania/recipes/wands/twigwand_green_silver.json index a22ec4baf..c08fd23a0 100644 --- a/src/main/resources/data/botania/recipes/wands/twigwand_green_silver.json +++ b/src/main/resources/data/botania/recipes/wands/twigwand_green_silver.json @@ -1,6 +1,6 @@ { "result": { - "item": "botania:twigwand", + "item": "botania:twig_wand", "data": 0, "nbt": "{color1:13,color2:8}" }, @@ -9,17 +9,17 @@ " SB", "S " ], - "type": "forge:ore_shaped", + "type": "minecraft:crafting_shaped", "key": { "A": { "tag": "botania:petals/green" }, "B": { - "tag": "botania:petals/lightgray" + "tag": "botania:petals/light_gray" }, "S": { "item": "botania:livingwood_twig" } }, - "group": "botania:twigwand" + "group": "botania:twig_wand" } \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_green_white.json b/src/main/resources/data/botania/recipes/wands/twigwand_green_white.json index 459a953f6..c227e3214 100644 --- a/src/main/resources/data/botania/recipes/wands/twigwand_green_white.json +++ b/src/main/resources/data/botania/recipes/wands/twigwand_green_white.json @@ -1,6 +1,6 @@ { "result": { - "item": "botania:twigwand", + "item": "botania:twig_wand", "data": 0, "nbt": "{color1:13,color2:0}" }, @@ -9,7 +9,7 @@ " SB", "S " ], - "type": "forge:ore_shaped", + "type": "minecraft:crafting_shaped", "key": { "A": { "tag": "botania:petals/green" @@ -21,5 +21,5 @@ "item": "botania:livingwood_twig" } }, - "group": "botania:twigwand" + "group": "botania:twig_wand" } \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_green_yellow.json b/src/main/resources/data/botania/recipes/wands/twigwand_green_yellow.json index a54d798bc..04a496071 100644 --- a/src/main/resources/data/botania/recipes/wands/twigwand_green_yellow.json +++ b/src/main/resources/data/botania/recipes/wands/twigwand_green_yellow.json @@ -1,6 +1,6 @@ { "result": { - "item": "botania:twigwand", + "item": "botania:twig_wand", "data": 0, "nbt": "{color1:13,color2:4}" }, @@ -9,7 +9,7 @@ " SB", "S " ], - "type": "forge:ore_shaped", + "type": "minecraft:crafting_shaped", "key": { "A": { "tag": "botania:petals/green" @@ -21,5 +21,5 @@ "item": "botania:livingwood_twig" } }, - "group": "botania:twigwand" + "group": "botania:twig_wand" } \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_light_blue_black.json b/src/main/resources/data/botania/recipes/wands/twigwand_light_blue_black.json index a579c40fc..3f87aaa38 100644 --- a/src/main/resources/data/botania/recipes/wands/twigwand_light_blue_black.json +++ b/src/main/resources/data/botania/recipes/wands/twigwand_light_blue_black.json @@ -1,6 +1,6 @@ { "result": { - "item": "botania:twigwand", + "item": "botania:twig_wand", "data": 0, "nbt": "{color1:3,color2:15}" }, @@ -9,7 +9,7 @@ " SB", "S " ], - "type": "forge:ore_shaped", + "type": "minecraft:crafting_shaped", "key": { "A": { "tag": "botania:petals/lightblue" @@ -21,5 +21,5 @@ "item": "botania:livingwood_twig" } }, - "group": "botania:twigwand" + "group": "botania:twig_wand" } \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_light_blue_blue.json b/src/main/resources/data/botania/recipes/wands/twigwand_light_blue_blue.json index 2241893a3..4a216a782 100644 --- a/src/main/resources/data/botania/recipes/wands/twigwand_light_blue_blue.json +++ b/src/main/resources/data/botania/recipes/wands/twigwand_light_blue_blue.json @@ -1,6 +1,6 @@ { "result": { - "item": "botania:twigwand", + "item": "botania:twig_wand", "data": 0, "nbt": "{color1:3,color2:11}" }, @@ -9,7 +9,7 @@ " SB", "S " ], - "type": "forge:ore_shaped", + "type": "minecraft:crafting_shaped", "key": { "A": { "tag": "botania:petals/lightblue" @@ -21,5 +21,5 @@ "item": "botania:livingwood_twig" } }, - "group": "botania:twigwand" + "group": "botania:twig_wand" } \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_light_blue_brown.json b/src/main/resources/data/botania/recipes/wands/twigwand_light_blue_brown.json index 2566fa9df..3ae907473 100644 --- a/src/main/resources/data/botania/recipes/wands/twigwand_light_blue_brown.json +++ b/src/main/resources/data/botania/recipes/wands/twigwand_light_blue_brown.json @@ -1,6 +1,6 @@ { "result": { - "item": "botania:twigwand", + "item": "botania:twig_wand", "data": 0, "nbt": "{color1:3,color2:12}" }, @@ -9,7 +9,7 @@ " SB", "S " ], - "type": "forge:ore_shaped", + "type": "minecraft:crafting_shaped", "key": { "A": { "tag": "botania:petals/lightblue" @@ -21,5 +21,5 @@ "item": "botania:livingwood_twig" } }, - "group": "botania:twigwand" + "group": "botania:twig_wand" } \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_light_blue_cyan.json b/src/main/resources/data/botania/recipes/wands/twigwand_light_blue_cyan.json index 7a4e3bfa2..c94924a93 100644 --- a/src/main/resources/data/botania/recipes/wands/twigwand_light_blue_cyan.json +++ b/src/main/resources/data/botania/recipes/wands/twigwand_light_blue_cyan.json @@ -1,6 +1,6 @@ { "result": { - "item": "botania:twigwand", + "item": "botania:twig_wand", "data": 0, "nbt": "{color1:3,color2:9}" }, @@ -9,7 +9,7 @@ " SB", "S " ], - "type": "forge:ore_shaped", + "type": "minecraft:crafting_shaped", "key": { "A": { "tag": "botania:petals/lightblue" @@ -21,5 +21,5 @@ "item": "botania:livingwood_twig" } }, - "group": "botania:twigwand" + "group": "botania:twig_wand" } \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_light_blue_gray.json b/src/main/resources/data/botania/recipes/wands/twigwand_light_blue_gray.json index 8352fb5d7..834083612 100644 --- a/src/main/resources/data/botania/recipes/wands/twigwand_light_blue_gray.json +++ b/src/main/resources/data/botania/recipes/wands/twigwand_light_blue_gray.json @@ -1,6 +1,6 @@ { "result": { - "item": "botania:twigwand", + "item": "botania:twig_wand", "data": 0, "nbt": "{color1:3,color2:7}" }, @@ -9,7 +9,7 @@ " SB", "S " ], - "type": "forge:ore_shaped", + "type": "minecraft:crafting_shaped", "key": { "A": { "tag": "botania:petals/lightblue" @@ -21,5 +21,5 @@ "item": "botania:livingwood_twig" } }, - "group": "botania:twigwand" + "group": "botania:twig_wand" } \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_light_blue_green.json b/src/main/resources/data/botania/recipes/wands/twigwand_light_blue_green.json index 84f4481f1..5cdd03631 100644 --- a/src/main/resources/data/botania/recipes/wands/twigwand_light_blue_green.json +++ b/src/main/resources/data/botania/recipes/wands/twigwand_light_blue_green.json @@ -1,6 +1,6 @@ { "result": { - "item": "botania:twigwand", + "item": "botania:twig_wand", "data": 0, "nbt": "{color1:3,color2:13}" }, @@ -9,7 +9,7 @@ " SB", "S " ], - "type": "forge:ore_shaped", + "type": "minecraft:crafting_shaped", "key": { "A": { "tag": "botania:petals/lightblue" @@ -21,5 +21,5 @@ "item": "botania:livingwood_twig" } }, - "group": "botania:twigwand" + "group": "botania:twig_wand" } \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_light_blue_light_blue.json b/src/main/resources/data/botania/recipes/wands/twigwand_light_blue_light_blue.json index 803ed5151..dd5a4224a 100644 --- a/src/main/resources/data/botania/recipes/wands/twigwand_light_blue_light_blue.json +++ b/src/main/resources/data/botania/recipes/wands/twigwand_light_blue_light_blue.json @@ -1,6 +1,6 @@ { "result": { - "item": "botania:twigwand", + "item": "botania:twig_wand", "data": 0, "nbt": "{color1:3,color2:3}" }, @@ -9,7 +9,7 @@ " SB", "S " ], - "type": "forge:ore_shaped", + "type": "minecraft:crafting_shaped", "key": { "A": { "tag": "botania:petals/lightblue" @@ -21,5 +21,5 @@ "item": "botania:livingwood_twig" } }, - "group": "botania:twigwand" + "group": "botania:twig_wand" } \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_light_blue_lime.json b/src/main/resources/data/botania/recipes/wands/twigwand_light_blue_lime.json index d7cfeb419..7747c6d45 100644 --- a/src/main/resources/data/botania/recipes/wands/twigwand_light_blue_lime.json +++ b/src/main/resources/data/botania/recipes/wands/twigwand_light_blue_lime.json @@ -1,6 +1,6 @@ { "result": { - "item": "botania:twigwand", + "item": "botania:twig_wand", "data": 0, "nbt": "{color1:3,color2:5}" }, @@ -9,7 +9,7 @@ " SB", "S " ], - "type": "forge:ore_shaped", + "type": "minecraft:crafting_shaped", "key": { "A": { "tag": "botania:petals/lightblue" @@ -21,5 +21,5 @@ "item": "botania:livingwood_twig" } }, - "group": "botania:twigwand" + "group": "botania:twig_wand" } \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_light_blue_magenta.json b/src/main/resources/data/botania/recipes/wands/twigwand_light_blue_magenta.json index 25d760da1..cdb49d7df 100644 --- a/src/main/resources/data/botania/recipes/wands/twigwand_light_blue_magenta.json +++ b/src/main/resources/data/botania/recipes/wands/twigwand_light_blue_magenta.json @@ -1,6 +1,6 @@ { "result": { - "item": "botania:twigwand", + "item": "botania:twig_wand", "data": 0, "nbt": "{color1:3,color2:2}" }, @@ -9,7 +9,7 @@ " SB", "S " ], - "type": "forge:ore_shaped", + "type": "minecraft:crafting_shaped", "key": { "A": { "tag": "botania:petals/lightblue" @@ -21,5 +21,5 @@ "item": "botania:livingwood_twig" } }, - "group": "botania:twigwand" + "group": "botania:twig_wand" } \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_light_blue_orange.json b/src/main/resources/data/botania/recipes/wands/twigwand_light_blue_orange.json index f7ec72e06..203eefe96 100644 --- a/src/main/resources/data/botania/recipes/wands/twigwand_light_blue_orange.json +++ b/src/main/resources/data/botania/recipes/wands/twigwand_light_blue_orange.json @@ -1,6 +1,6 @@ { "result": { - "item": "botania:twigwand", + "item": "botania:twig_wand", "data": 0, "nbt": "{color1:3,color2:1}" }, @@ -9,7 +9,7 @@ " SB", "S " ], - "type": "forge:ore_shaped", + "type": "minecraft:crafting_shaped", "key": { "A": { "tag": "botania:petals/lightblue" @@ -21,5 +21,5 @@ "item": "botania:livingwood_twig" } }, - "group": "botania:twigwand" + "group": "botania:twig_wand" } \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_light_blue_pink.json b/src/main/resources/data/botania/recipes/wands/twigwand_light_blue_pink.json index a20b9ada0..50564289d 100644 --- a/src/main/resources/data/botania/recipes/wands/twigwand_light_blue_pink.json +++ b/src/main/resources/data/botania/recipes/wands/twigwand_light_blue_pink.json @@ -1,6 +1,6 @@ { "result": { - "item": "botania:twigwand", + "item": "botania:twig_wand", "data": 0, "nbt": "{color1:3,color2:6}" }, @@ -9,7 +9,7 @@ " SB", "S " ], - "type": "forge:ore_shaped", + "type": "minecraft:crafting_shaped", "key": { "A": { "tag": "botania:petals/lightblue" @@ -21,5 +21,5 @@ "item": "botania:livingwood_twig" } }, - "group": "botania:twigwand" + "group": "botania:twig_wand" } \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_light_blue_purple.json b/src/main/resources/data/botania/recipes/wands/twigwand_light_blue_purple.json index 194d50687..e0593a359 100644 --- a/src/main/resources/data/botania/recipes/wands/twigwand_light_blue_purple.json +++ b/src/main/resources/data/botania/recipes/wands/twigwand_light_blue_purple.json @@ -1,6 +1,6 @@ { "result": { - "item": "botania:twigwand", + "item": "botania:twig_wand", "data": 0, "nbt": "{color1:3,color2:10}" }, @@ -9,7 +9,7 @@ " SB", "S " ], - "type": "forge:ore_shaped", + "type": "minecraft:crafting_shaped", "key": { "A": { "tag": "botania:petals/lightblue" @@ -21,5 +21,5 @@ "item": "botania:livingwood_twig" } }, - "group": "botania:twigwand" + "group": "botania:twig_wand" } \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_light_blue_red.json b/src/main/resources/data/botania/recipes/wands/twigwand_light_blue_red.json index 870a19fe9..2c63e1450 100644 --- a/src/main/resources/data/botania/recipes/wands/twigwand_light_blue_red.json +++ b/src/main/resources/data/botania/recipes/wands/twigwand_light_blue_red.json @@ -1,6 +1,6 @@ { "result": { - "item": "botania:twigwand", + "item": "botania:twig_wand", "data": 0, "nbt": "{color1:3,color2:14}" }, @@ -9,7 +9,7 @@ " SB", "S " ], - "type": "forge:ore_shaped", + "type": "minecraft:crafting_shaped", "key": { "A": { "tag": "botania:petals/lightblue" @@ -21,5 +21,5 @@ "item": "botania:livingwood_twig" } }, - "group": "botania:twigwand" + "group": "botania:twig_wand" } \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_light_blue_silver.json b/src/main/resources/data/botania/recipes/wands/twigwand_light_blue_silver.json index 4c59bf6c1..368106c12 100644 --- a/src/main/resources/data/botania/recipes/wands/twigwand_light_blue_silver.json +++ b/src/main/resources/data/botania/recipes/wands/twigwand_light_blue_silver.json @@ -1,6 +1,6 @@ { "result": { - "item": "botania:twigwand", + "item": "botania:twig_wand", "data": 0, "nbt": "{color1:3,color2:8}" }, @@ -9,17 +9,17 @@ " SB", "S " ], - "type": "forge:ore_shaped", + "type": "minecraft:crafting_shaped", "key": { "A": { "tag": "botania:petals/lightblue" }, "B": { - "tag": "botania:petals/lightgray" + "tag": "botania:petals/light_gray" }, "S": { "item": "botania:livingwood_twig" } }, - "group": "botania:twigwand" + "group": "botania:twig_wand" } \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_light_blue_white.json b/src/main/resources/data/botania/recipes/wands/twigwand_light_blue_white.json index 16dff6c21..bb7ce1d85 100644 --- a/src/main/resources/data/botania/recipes/wands/twigwand_light_blue_white.json +++ b/src/main/resources/data/botania/recipes/wands/twigwand_light_blue_white.json @@ -1,6 +1,6 @@ { "result": { - "item": "botania:twigwand", + "item": "botania:twig_wand", "data": 0, "nbt": "{color1:3,color2:0}" }, @@ -9,7 +9,7 @@ " SB", "S " ], - "type": "forge:ore_shaped", + "type": "minecraft:crafting_shaped", "key": { "A": { "tag": "botania:petals/lightblue" @@ -21,5 +21,5 @@ "item": "botania:livingwood_twig" } }, - "group": "botania:twigwand" + "group": "botania:twig_wand" } \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_light_blue_yellow.json b/src/main/resources/data/botania/recipes/wands/twigwand_light_blue_yellow.json index 3f160a8cb..c6e101aae 100644 --- a/src/main/resources/data/botania/recipes/wands/twigwand_light_blue_yellow.json +++ b/src/main/resources/data/botania/recipes/wands/twigwand_light_blue_yellow.json @@ -1,6 +1,6 @@ { "result": { - "item": "botania:twigwand", + "item": "botania:twig_wand", "data": 0, "nbt": "{color1:3,color2:4}" }, @@ -9,7 +9,7 @@ " SB", "S " ], - "type": "forge:ore_shaped", + "type": "minecraft:crafting_shaped", "key": { "A": { "tag": "botania:petals/lightblue" @@ -21,5 +21,5 @@ "item": "botania:livingwood_twig" } }, - "group": "botania:twigwand" + "group": "botania:twig_wand" } \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_lime_black.json b/src/main/resources/data/botania/recipes/wands/twigwand_lime_black.json index 23ac75c11..a3205abc0 100644 --- a/src/main/resources/data/botania/recipes/wands/twigwand_lime_black.json +++ b/src/main/resources/data/botania/recipes/wands/twigwand_lime_black.json @@ -1,6 +1,6 @@ { "result": { - "item": "botania:twigwand", + "item": "botania:twig_wand", "data": 0, "nbt": "{color1:5,color2:15}" }, @@ -9,7 +9,7 @@ " SB", "S " ], - "type": "forge:ore_shaped", + "type": "minecraft:crafting_shaped", "key": { "A": { "tag": "botania:petals/lime" @@ -21,5 +21,5 @@ "item": "botania:livingwood_twig" } }, - "group": "botania:twigwand" + "group": "botania:twig_wand" } \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_lime_blue.json b/src/main/resources/data/botania/recipes/wands/twigwand_lime_blue.json index ef03f3b15..619cd888b 100644 --- a/src/main/resources/data/botania/recipes/wands/twigwand_lime_blue.json +++ b/src/main/resources/data/botania/recipes/wands/twigwand_lime_blue.json @@ -1,6 +1,6 @@ { "result": { - "item": "botania:twigwand", + "item": "botania:twig_wand", "data": 0, "nbt": "{color1:5,color2:11}" }, @@ -9,7 +9,7 @@ " SB", "S " ], - "type": "forge:ore_shaped", + "type": "minecraft:crafting_shaped", "key": { "A": { "tag": "botania:petals/lime" @@ -21,5 +21,5 @@ "item": "botania:livingwood_twig" } }, - "group": "botania:twigwand" + "group": "botania:twig_wand" } \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_lime_brown.json b/src/main/resources/data/botania/recipes/wands/twigwand_lime_brown.json index 991755db1..e19458fa5 100644 --- a/src/main/resources/data/botania/recipes/wands/twigwand_lime_brown.json +++ b/src/main/resources/data/botania/recipes/wands/twigwand_lime_brown.json @@ -1,6 +1,6 @@ { "result": { - "item": "botania:twigwand", + "item": "botania:twig_wand", "data": 0, "nbt": "{color1:5,color2:12}" }, @@ -9,7 +9,7 @@ " SB", "S " ], - "type": "forge:ore_shaped", + "type": "minecraft:crafting_shaped", "key": { "A": { "tag": "botania:petals/lime" @@ -21,5 +21,5 @@ "item": "botania:livingwood_twig" } }, - "group": "botania:twigwand" + "group": "botania:twig_wand" } \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_lime_cyan.json b/src/main/resources/data/botania/recipes/wands/twigwand_lime_cyan.json index 524ea4442..3546623a2 100644 --- a/src/main/resources/data/botania/recipes/wands/twigwand_lime_cyan.json +++ b/src/main/resources/data/botania/recipes/wands/twigwand_lime_cyan.json @@ -1,6 +1,6 @@ { "result": { - "item": "botania:twigwand", + "item": "botania:twig_wand", "data": 0, "nbt": "{color1:5,color2:9}" }, @@ -9,7 +9,7 @@ " SB", "S " ], - "type": "forge:ore_shaped", + "type": "minecraft:crafting_shaped", "key": { "A": { "tag": "botania:petals/lime" @@ -21,5 +21,5 @@ "item": "botania:livingwood_twig" } }, - "group": "botania:twigwand" + "group": "botania:twig_wand" } \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_lime_gray.json b/src/main/resources/data/botania/recipes/wands/twigwand_lime_gray.json index 841e87fda..65fed29e8 100644 --- a/src/main/resources/data/botania/recipes/wands/twigwand_lime_gray.json +++ b/src/main/resources/data/botania/recipes/wands/twigwand_lime_gray.json @@ -1,6 +1,6 @@ { "result": { - "item": "botania:twigwand", + "item": "botania:twig_wand", "data": 0, "nbt": "{color1:5,color2:7}" }, @@ -9,7 +9,7 @@ " SB", "S " ], - "type": "forge:ore_shaped", + "type": "minecraft:crafting_shaped", "key": { "A": { "tag": "botania:petals/lime" @@ -21,5 +21,5 @@ "item": "botania:livingwood_twig" } }, - "group": "botania:twigwand" + "group": "botania:twig_wand" } \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_lime_green.json b/src/main/resources/data/botania/recipes/wands/twigwand_lime_green.json index 93eee6eb8..ae03ce1fe 100644 --- a/src/main/resources/data/botania/recipes/wands/twigwand_lime_green.json +++ b/src/main/resources/data/botania/recipes/wands/twigwand_lime_green.json @@ -1,6 +1,6 @@ { "result": { - "item": "botania:twigwand", + "item": "botania:twig_wand", "data": 0, "nbt": "{color1:5,color2:13}" }, @@ -9,7 +9,7 @@ " SB", "S " ], - "type": "forge:ore_shaped", + "type": "minecraft:crafting_shaped", "key": { "A": { "tag": "botania:petals/lime" @@ -21,5 +21,5 @@ "item": "botania:livingwood_twig" } }, - "group": "botania:twigwand" + "group": "botania:twig_wand" } \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_lime_light_blue.json b/src/main/resources/data/botania/recipes/wands/twigwand_lime_light_blue.json index f5049d10f..34b14f82c 100644 --- a/src/main/resources/data/botania/recipes/wands/twigwand_lime_light_blue.json +++ b/src/main/resources/data/botania/recipes/wands/twigwand_lime_light_blue.json @@ -1,6 +1,6 @@ { "result": { - "item": "botania:twigwand", + "item": "botania:twig_wand", "data": 0, "nbt": "{color1:5,color2:3}" }, @@ -9,7 +9,7 @@ " SB", "S " ], - "type": "forge:ore_shaped", + "type": "minecraft:crafting_shaped", "key": { "A": { "tag": "botania:petals/lime" @@ -21,5 +21,5 @@ "item": "botania:livingwood_twig" } }, - "group": "botania:twigwand" + "group": "botania:twig_wand" } \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_lime_lime.json b/src/main/resources/data/botania/recipes/wands/twigwand_lime_lime.json index adb4913b5..65b2aa244 100644 --- a/src/main/resources/data/botania/recipes/wands/twigwand_lime_lime.json +++ b/src/main/resources/data/botania/recipes/wands/twigwand_lime_lime.json @@ -1,6 +1,6 @@ { "result": { - "item": "botania:twigwand", + "item": "botania:twig_wand", "data": 0, "nbt": "{color1:5,color2:5}" }, @@ -9,7 +9,7 @@ " SB", "S " ], - "type": "forge:ore_shaped", + "type": "minecraft:crafting_shaped", "key": { "A": { "tag": "botania:petals/lime" @@ -21,5 +21,5 @@ "item": "botania:livingwood_twig" } }, - "group": "botania:twigwand" + "group": "botania:twig_wand" } \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_lime_magenta.json b/src/main/resources/data/botania/recipes/wands/twigwand_lime_magenta.json index 0bb507978..fec745ca5 100644 --- a/src/main/resources/data/botania/recipes/wands/twigwand_lime_magenta.json +++ b/src/main/resources/data/botania/recipes/wands/twigwand_lime_magenta.json @@ -1,6 +1,6 @@ { "result": { - "item": "botania:twigwand", + "item": "botania:twig_wand", "data": 0, "nbt": "{color1:5,color2:2}" }, @@ -9,7 +9,7 @@ " SB", "S " ], - "type": "forge:ore_shaped", + "type": "minecraft:crafting_shaped", "key": { "A": { "tag": "botania:petals/lime" @@ -21,5 +21,5 @@ "item": "botania:livingwood_twig" } }, - "group": "botania:twigwand" + "group": "botania:twig_wand" } \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_lime_orange.json b/src/main/resources/data/botania/recipes/wands/twigwand_lime_orange.json index cbc1a8b00..a0ff7eebd 100644 --- a/src/main/resources/data/botania/recipes/wands/twigwand_lime_orange.json +++ b/src/main/resources/data/botania/recipes/wands/twigwand_lime_orange.json @@ -1,6 +1,6 @@ { "result": { - "item": "botania:twigwand", + "item": "botania:twig_wand", "data": 0, "nbt": "{color1:5,color2:1}" }, @@ -9,7 +9,7 @@ " SB", "S " ], - "type": "forge:ore_shaped", + "type": "minecraft:crafting_shaped", "key": { "A": { "tag": "botania:petals/lime" @@ -21,5 +21,5 @@ "item": "botania:livingwood_twig" } }, - "group": "botania:twigwand" + "group": "botania:twig_wand" } \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_lime_pink.json b/src/main/resources/data/botania/recipes/wands/twigwand_lime_pink.json index 6d0bdffe4..062cc0461 100644 --- a/src/main/resources/data/botania/recipes/wands/twigwand_lime_pink.json +++ b/src/main/resources/data/botania/recipes/wands/twigwand_lime_pink.json @@ -1,6 +1,6 @@ { "result": { - "item": "botania:twigwand", + "item": "botania:twig_wand", "data": 0, "nbt": "{color1:5,color2:6}" }, @@ -9,7 +9,7 @@ " SB", "S " ], - "type": "forge:ore_shaped", + "type": "minecraft:crafting_shaped", "key": { "A": { "tag": "botania:petals/lime" @@ -21,5 +21,5 @@ "item": "botania:livingwood_twig" } }, - "group": "botania:twigwand" + "group": "botania:twig_wand" } \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_lime_purple.json b/src/main/resources/data/botania/recipes/wands/twigwand_lime_purple.json index f693bae25..a5daebcf4 100644 --- a/src/main/resources/data/botania/recipes/wands/twigwand_lime_purple.json +++ b/src/main/resources/data/botania/recipes/wands/twigwand_lime_purple.json @@ -1,6 +1,6 @@ { "result": { - "item": "botania:twigwand", + "item": "botania:twig_wand", "data": 0, "nbt": "{color1:5,color2:10}" }, @@ -9,7 +9,7 @@ " SB", "S " ], - "type": "forge:ore_shaped", + "type": "minecraft:crafting_shaped", "key": { "A": { "tag": "botania:petals/lime" @@ -21,5 +21,5 @@ "item": "botania:livingwood_twig" } }, - "group": "botania:twigwand" + "group": "botania:twig_wand" } \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_lime_red.json b/src/main/resources/data/botania/recipes/wands/twigwand_lime_red.json index 0aef118bf..c2d81b817 100644 --- a/src/main/resources/data/botania/recipes/wands/twigwand_lime_red.json +++ b/src/main/resources/data/botania/recipes/wands/twigwand_lime_red.json @@ -1,6 +1,6 @@ { "result": { - "item": "botania:twigwand", + "item": "botania:twig_wand", "data": 0, "nbt": "{color1:5,color2:14}" }, @@ -9,7 +9,7 @@ " SB", "S " ], - "type": "forge:ore_shaped", + "type": "minecraft:crafting_shaped", "key": { "A": { "tag": "botania:petals/lime" @@ -21,5 +21,5 @@ "item": "botania:livingwood_twig" } }, - "group": "botania:twigwand" + "group": "botania:twig_wand" } \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_lime_silver.json b/src/main/resources/data/botania/recipes/wands/twigwand_lime_silver.json index 3a20c724b..4813ad12e 100644 --- a/src/main/resources/data/botania/recipes/wands/twigwand_lime_silver.json +++ b/src/main/resources/data/botania/recipes/wands/twigwand_lime_silver.json @@ -1,6 +1,6 @@ { "result": { - "item": "botania:twigwand", + "item": "botania:twig_wand", "data": 0, "nbt": "{color1:5,color2:8}" }, @@ -9,17 +9,17 @@ " SB", "S " ], - "type": "forge:ore_shaped", + "type": "minecraft:crafting_shaped", "key": { "A": { "tag": "botania:petals/lime" }, "B": { - "tag": "botania:petals/lightgray" + "tag": "botania:petals/light_gray" }, "S": { "item": "botania:livingwood_twig" } }, - "group": "botania:twigwand" + "group": "botania:twig_wand" } \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_lime_white.json b/src/main/resources/data/botania/recipes/wands/twigwand_lime_white.json index f3de40851..bcaafd981 100644 --- a/src/main/resources/data/botania/recipes/wands/twigwand_lime_white.json +++ b/src/main/resources/data/botania/recipes/wands/twigwand_lime_white.json @@ -1,6 +1,6 @@ { "result": { - "item": "botania:twigwand", + "item": "botania:twig_wand", "data": 0, "nbt": "{color1:5,color2:0}" }, @@ -9,7 +9,7 @@ " SB", "S " ], - "type": "forge:ore_shaped", + "type": "minecraft:crafting_shaped", "key": { "A": { "tag": "botania:petals/lime" @@ -21,5 +21,5 @@ "item": "botania:livingwood_twig" } }, - "group": "botania:twigwand" + "group": "botania:twig_wand" } \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_lime_yellow.json b/src/main/resources/data/botania/recipes/wands/twigwand_lime_yellow.json index 78802fdfa..46be1fb45 100644 --- a/src/main/resources/data/botania/recipes/wands/twigwand_lime_yellow.json +++ b/src/main/resources/data/botania/recipes/wands/twigwand_lime_yellow.json @@ -1,6 +1,6 @@ { "result": { - "item": "botania:twigwand", + "item": "botania:twig_wand", "data": 0, "nbt": "{color1:5,color2:4}" }, @@ -9,7 +9,7 @@ " SB", "S " ], - "type": "forge:ore_shaped", + "type": "minecraft:crafting_shaped", "key": { "A": { "tag": "botania:petals/lime" @@ -21,5 +21,5 @@ "item": "botania:livingwood_twig" } }, - "group": "botania:twigwand" + "group": "botania:twig_wand" } \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_magenta_black.json b/src/main/resources/data/botania/recipes/wands/twigwand_magenta_black.json index 253c8bb6c..7699af42b 100644 --- a/src/main/resources/data/botania/recipes/wands/twigwand_magenta_black.json +++ b/src/main/resources/data/botania/recipes/wands/twigwand_magenta_black.json @@ -1,6 +1,6 @@ { "result": { - "item": "botania:twigwand", + "item": "botania:twig_wand", "data": 0, "nbt": "{color1:2,color2:15}" }, @@ -9,7 +9,7 @@ " SB", "S " ], - "type": "forge:ore_shaped", + "type": "minecraft:crafting_shaped", "key": { "A": { "tag": "botania:petals/magenta" @@ -21,5 +21,5 @@ "item": "botania:livingwood_twig" } }, - "group": "botania:twigwand" + "group": "botania:twig_wand" } \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_magenta_blue.json b/src/main/resources/data/botania/recipes/wands/twigwand_magenta_blue.json index 0475e2041..7ad52efb3 100644 --- a/src/main/resources/data/botania/recipes/wands/twigwand_magenta_blue.json +++ b/src/main/resources/data/botania/recipes/wands/twigwand_magenta_blue.json @@ -1,6 +1,6 @@ { "result": { - "item": "botania:twigwand", + "item": "botania:twig_wand", "data": 0, "nbt": "{color1:2,color2:11}" }, @@ -9,7 +9,7 @@ " SB", "S " ], - "type": "forge:ore_shaped", + "type": "minecraft:crafting_shaped", "key": { "A": { "tag": "botania:petals/magenta" @@ -21,5 +21,5 @@ "item": "botania:livingwood_twig" } }, - "group": "botania:twigwand" + "group": "botania:twig_wand" } \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_magenta_brown.json b/src/main/resources/data/botania/recipes/wands/twigwand_magenta_brown.json index a02b1e7c1..ed0e29f9e 100644 --- a/src/main/resources/data/botania/recipes/wands/twigwand_magenta_brown.json +++ b/src/main/resources/data/botania/recipes/wands/twigwand_magenta_brown.json @@ -1,6 +1,6 @@ { "result": { - "item": "botania:twigwand", + "item": "botania:twig_wand", "data": 0, "nbt": "{color1:2,color2:12}" }, @@ -9,7 +9,7 @@ " SB", "S " ], - "type": "forge:ore_shaped", + "type": "minecraft:crafting_shaped", "key": { "A": { "tag": "botania:petals/magenta" @@ -21,5 +21,5 @@ "item": "botania:livingwood_twig" } }, - "group": "botania:twigwand" + "group": "botania:twig_wand" } \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_magenta_cyan.json b/src/main/resources/data/botania/recipes/wands/twigwand_magenta_cyan.json index 0584f1dcc..8d24facdd 100644 --- a/src/main/resources/data/botania/recipes/wands/twigwand_magenta_cyan.json +++ b/src/main/resources/data/botania/recipes/wands/twigwand_magenta_cyan.json @@ -1,6 +1,6 @@ { "result": { - "item": "botania:twigwand", + "item": "botania:twig_wand", "data": 0, "nbt": "{color1:2,color2:9}" }, @@ -9,7 +9,7 @@ " SB", "S " ], - "type": "forge:ore_shaped", + "type": "minecraft:crafting_shaped", "key": { "A": { "tag": "botania:petals/magenta" @@ -21,5 +21,5 @@ "item": "botania:livingwood_twig" } }, - "group": "botania:twigwand" + "group": "botania:twig_wand" } \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_magenta_gray.json b/src/main/resources/data/botania/recipes/wands/twigwand_magenta_gray.json index 2c5859e75..aa0b6b66d 100644 --- a/src/main/resources/data/botania/recipes/wands/twigwand_magenta_gray.json +++ b/src/main/resources/data/botania/recipes/wands/twigwand_magenta_gray.json @@ -1,6 +1,6 @@ { "result": { - "item": "botania:twigwand", + "item": "botania:twig_wand", "data": 0, "nbt": "{color1:2,color2:7}" }, @@ -9,7 +9,7 @@ " SB", "S " ], - "type": "forge:ore_shaped", + "type": "minecraft:crafting_shaped", "key": { "A": { "tag": "botania:petals/magenta" @@ -21,5 +21,5 @@ "item": "botania:livingwood_twig" } }, - "group": "botania:twigwand" + "group": "botania:twig_wand" } \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_magenta_green.json b/src/main/resources/data/botania/recipes/wands/twigwand_magenta_green.json index b825447dd..8427f9a33 100644 --- a/src/main/resources/data/botania/recipes/wands/twigwand_magenta_green.json +++ b/src/main/resources/data/botania/recipes/wands/twigwand_magenta_green.json @@ -1,6 +1,6 @@ { "result": { - "item": "botania:twigwand", + "item": "botania:twig_wand", "data": 0, "nbt": "{color1:2,color2:13}" }, @@ -9,7 +9,7 @@ " SB", "S " ], - "type": "forge:ore_shaped", + "type": "minecraft:crafting_shaped", "key": { "A": { "tag": "botania:petals/magenta" @@ -21,5 +21,5 @@ "item": "botania:livingwood_twig" } }, - "group": "botania:twigwand" + "group": "botania:twig_wand" } \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_magenta_light_blue.json b/src/main/resources/data/botania/recipes/wands/twigwand_magenta_light_blue.json index 1067990df..00292f967 100644 --- a/src/main/resources/data/botania/recipes/wands/twigwand_magenta_light_blue.json +++ b/src/main/resources/data/botania/recipes/wands/twigwand_magenta_light_blue.json @@ -1,6 +1,6 @@ { "result": { - "item": "botania:twigwand", + "item": "botania:twig_wand", "data": 0, "nbt": "{color1:2,color2:3}" }, @@ -9,7 +9,7 @@ " SB", "S " ], - "type": "forge:ore_shaped", + "type": "minecraft:crafting_shaped", "key": { "A": { "tag": "botania:petals/magenta" @@ -21,5 +21,5 @@ "item": "botania:livingwood_twig" } }, - "group": "botania:twigwand" + "group": "botania:twig_wand" } \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_magenta_lime.json b/src/main/resources/data/botania/recipes/wands/twigwand_magenta_lime.json index d7021f79e..b3abd258f 100644 --- a/src/main/resources/data/botania/recipes/wands/twigwand_magenta_lime.json +++ b/src/main/resources/data/botania/recipes/wands/twigwand_magenta_lime.json @@ -1,6 +1,6 @@ { "result": { - "item": "botania:twigwand", + "item": "botania:twig_wand", "data": 0, "nbt": "{color1:2,color2:5}" }, @@ -9,7 +9,7 @@ " SB", "S " ], - "type": "forge:ore_shaped", + "type": "minecraft:crafting_shaped", "key": { "A": { "tag": "botania:petals/magenta" @@ -21,5 +21,5 @@ "item": "botania:livingwood_twig" } }, - "group": "botania:twigwand" + "group": "botania:twig_wand" } \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_magenta_magenta.json b/src/main/resources/data/botania/recipes/wands/twigwand_magenta_magenta.json index e8cc6da24..96ac59bf4 100644 --- a/src/main/resources/data/botania/recipes/wands/twigwand_magenta_magenta.json +++ b/src/main/resources/data/botania/recipes/wands/twigwand_magenta_magenta.json @@ -1,6 +1,6 @@ { "result": { - "item": "botania:twigwand", + "item": "botania:twig_wand", "data": 0, "nbt": "{color1:2,color2:2}" }, @@ -9,7 +9,7 @@ " SB", "S " ], - "type": "forge:ore_shaped", + "type": "minecraft:crafting_shaped", "key": { "A": { "tag": "botania:petals/magenta" @@ -21,5 +21,5 @@ "item": "botania:livingwood_twig" } }, - "group": "botania:twigwand" + "group": "botania:twig_wand" } \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_magenta_orange.json b/src/main/resources/data/botania/recipes/wands/twigwand_magenta_orange.json index 19c7a13b8..83df3558a 100644 --- a/src/main/resources/data/botania/recipes/wands/twigwand_magenta_orange.json +++ b/src/main/resources/data/botania/recipes/wands/twigwand_magenta_orange.json @@ -1,6 +1,6 @@ { "result": { - "item": "botania:twigwand", + "item": "botania:twig_wand", "data": 0, "nbt": "{color1:2,color2:1}" }, @@ -9,7 +9,7 @@ " SB", "S " ], - "type": "forge:ore_shaped", + "type": "minecraft:crafting_shaped", "key": { "A": { "tag": "botania:petals/magenta" @@ -21,5 +21,5 @@ "item": "botania:livingwood_twig" } }, - "group": "botania:twigwand" + "group": "botania:twig_wand" } \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_magenta_pink.json b/src/main/resources/data/botania/recipes/wands/twigwand_magenta_pink.json index 9c8812092..c24728e40 100644 --- a/src/main/resources/data/botania/recipes/wands/twigwand_magenta_pink.json +++ b/src/main/resources/data/botania/recipes/wands/twigwand_magenta_pink.json @@ -1,6 +1,6 @@ { "result": { - "item": "botania:twigwand", + "item": "botania:twig_wand", "data": 0, "nbt": "{color1:2,color2:6}" }, @@ -9,7 +9,7 @@ " SB", "S " ], - "type": "forge:ore_shaped", + "type": "minecraft:crafting_shaped", "key": { "A": { "tag": "botania:petals/magenta" @@ -21,5 +21,5 @@ "item": "botania:livingwood_twig" } }, - "group": "botania:twigwand" + "group": "botania:twig_wand" } \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_magenta_purple.json b/src/main/resources/data/botania/recipes/wands/twigwand_magenta_purple.json index 8ef2cd428..31ec9bac6 100644 --- a/src/main/resources/data/botania/recipes/wands/twigwand_magenta_purple.json +++ b/src/main/resources/data/botania/recipes/wands/twigwand_magenta_purple.json @@ -1,6 +1,6 @@ { "result": { - "item": "botania:twigwand", + "item": "botania:twig_wand", "data": 0, "nbt": "{color1:2,color2:10}" }, @@ -9,7 +9,7 @@ " SB", "S " ], - "type": "forge:ore_shaped", + "type": "minecraft:crafting_shaped", "key": { "A": { "tag": "botania:petals/magenta" @@ -21,5 +21,5 @@ "item": "botania:livingwood_twig" } }, - "group": "botania:twigwand" + "group": "botania:twig_wand" } \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_magenta_red.json b/src/main/resources/data/botania/recipes/wands/twigwand_magenta_red.json index 8c19572b6..a78b56257 100644 --- a/src/main/resources/data/botania/recipes/wands/twigwand_magenta_red.json +++ b/src/main/resources/data/botania/recipes/wands/twigwand_magenta_red.json @@ -1,6 +1,6 @@ { "result": { - "item": "botania:twigwand", + "item": "botania:twig_wand", "data": 0, "nbt": "{color1:2,color2:14}" }, @@ -9,7 +9,7 @@ " SB", "S " ], - "type": "forge:ore_shaped", + "type": "minecraft:crafting_shaped", "key": { "A": { "tag": "botania:petals/magenta" @@ -21,5 +21,5 @@ "item": "botania:livingwood_twig" } }, - "group": "botania:twigwand" + "group": "botania:twig_wand" } \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_magenta_silver.json b/src/main/resources/data/botania/recipes/wands/twigwand_magenta_silver.json index 04ac5b549..f5d1344df 100644 --- a/src/main/resources/data/botania/recipes/wands/twigwand_magenta_silver.json +++ b/src/main/resources/data/botania/recipes/wands/twigwand_magenta_silver.json @@ -1,6 +1,6 @@ { "result": { - "item": "botania:twigwand", + "item": "botania:twig_wand", "data": 0, "nbt": "{color1:2,color2:8}" }, @@ -9,17 +9,17 @@ " SB", "S " ], - "type": "forge:ore_shaped", + "type": "minecraft:crafting_shaped", "key": { "A": { "tag": "botania:petals/magenta" }, "B": { - "tag": "botania:petals/lightgray" + "tag": "botania:petals/light_gray" }, "S": { "item": "botania:livingwood_twig" } }, - "group": "botania:twigwand" + "group": "botania:twig_wand" } \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_magenta_white.json b/src/main/resources/data/botania/recipes/wands/twigwand_magenta_white.json index 558cac0de..482a6bb8b 100644 --- a/src/main/resources/data/botania/recipes/wands/twigwand_magenta_white.json +++ b/src/main/resources/data/botania/recipes/wands/twigwand_magenta_white.json @@ -1,6 +1,6 @@ { "result": { - "item": "botania:twigwand", + "item": "botania:twig_wand", "data": 0, "nbt": "{color1:2,color2:0}" }, @@ -9,7 +9,7 @@ " SB", "S " ], - "type": "forge:ore_shaped", + "type": "minecraft:crafting_shaped", "key": { "A": { "tag": "botania:petals/magenta" @@ -21,5 +21,5 @@ "item": "botania:livingwood_twig" } }, - "group": "botania:twigwand" + "group": "botania:twig_wand" } \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_magenta_yellow.json b/src/main/resources/data/botania/recipes/wands/twigwand_magenta_yellow.json index 10f4aed41..41f743bc8 100644 --- a/src/main/resources/data/botania/recipes/wands/twigwand_magenta_yellow.json +++ b/src/main/resources/data/botania/recipes/wands/twigwand_magenta_yellow.json @@ -1,6 +1,6 @@ { "result": { - "item": "botania:twigwand", + "item": "botania:twig_wand", "data": 0, "nbt": "{color1:2,color2:4}" }, @@ -9,7 +9,7 @@ " SB", "S " ], - "type": "forge:ore_shaped", + "type": "minecraft:crafting_shaped", "key": { "A": { "tag": "botania:petals/magenta" @@ -21,5 +21,5 @@ "item": "botania:livingwood_twig" } }, - "group": "botania:twigwand" + "group": "botania:twig_wand" } \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_orange_black.json b/src/main/resources/data/botania/recipes/wands/twigwand_orange_black.json index dc79ef2cf..bba974209 100644 --- a/src/main/resources/data/botania/recipes/wands/twigwand_orange_black.json +++ b/src/main/resources/data/botania/recipes/wands/twigwand_orange_black.json @@ -1,6 +1,6 @@ { "result": { - "item": "botania:twigwand", + "item": "botania:twig_wand", "data": 0, "nbt": "{color1:1,color2:15}" }, @@ -9,7 +9,7 @@ " SB", "S " ], - "type": "forge:ore_shaped", + "type": "minecraft:crafting_shaped", "key": { "A": { "tag": "botania:petals/orange" @@ -21,5 +21,5 @@ "item": "botania:livingwood_twig" } }, - "group": "botania:twigwand" + "group": "botania:twig_wand" } \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_orange_blue.json b/src/main/resources/data/botania/recipes/wands/twigwand_orange_blue.json index 519f786dc..0a390242d 100644 --- a/src/main/resources/data/botania/recipes/wands/twigwand_orange_blue.json +++ b/src/main/resources/data/botania/recipes/wands/twigwand_orange_blue.json @@ -1,6 +1,6 @@ { "result": { - "item": "botania:twigwand", + "item": "botania:twig_wand", "data": 0, "nbt": "{color1:1,color2:11}" }, @@ -9,7 +9,7 @@ " SB", "S " ], - "type": "forge:ore_shaped", + "type": "minecraft:crafting_shaped", "key": { "A": { "tag": "botania:petals/orange" @@ -21,5 +21,5 @@ "item": "botania:livingwood_twig" } }, - "group": "botania:twigwand" + "group": "botania:twig_wand" } \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_orange_brown.json b/src/main/resources/data/botania/recipes/wands/twigwand_orange_brown.json index 11bf906e6..8bfb6cef9 100644 --- a/src/main/resources/data/botania/recipes/wands/twigwand_orange_brown.json +++ b/src/main/resources/data/botania/recipes/wands/twigwand_orange_brown.json @@ -1,6 +1,6 @@ { "result": { - "item": "botania:twigwand", + "item": "botania:twig_wand", "data": 0, "nbt": "{color1:1,color2:12}" }, @@ -9,7 +9,7 @@ " SB", "S " ], - "type": "forge:ore_shaped", + "type": "minecraft:crafting_shaped", "key": { "A": { "tag": "botania:petals/orange" @@ -21,5 +21,5 @@ "item": "botania:livingwood_twig" } }, - "group": "botania:twigwand" + "group": "botania:twig_wand" } \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_orange_cyan.json b/src/main/resources/data/botania/recipes/wands/twigwand_orange_cyan.json index 6189a60b0..f13493825 100644 --- a/src/main/resources/data/botania/recipes/wands/twigwand_orange_cyan.json +++ b/src/main/resources/data/botania/recipes/wands/twigwand_orange_cyan.json @@ -1,6 +1,6 @@ { "result": { - "item": "botania:twigwand", + "item": "botania:twig_wand", "data": 0, "nbt": "{color1:1,color2:9}" }, @@ -9,7 +9,7 @@ " SB", "S " ], - "type": "forge:ore_shaped", + "type": "minecraft:crafting_shaped", "key": { "A": { "tag": "botania:petals/orange" @@ -21,5 +21,5 @@ "item": "botania:livingwood_twig" } }, - "group": "botania:twigwand" + "group": "botania:twig_wand" } \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_orange_gray.json b/src/main/resources/data/botania/recipes/wands/twigwand_orange_gray.json index c6def14c9..aecbe3467 100644 --- a/src/main/resources/data/botania/recipes/wands/twigwand_orange_gray.json +++ b/src/main/resources/data/botania/recipes/wands/twigwand_orange_gray.json @@ -1,6 +1,6 @@ { "result": { - "item": "botania:twigwand", + "item": "botania:twig_wand", "data": 0, "nbt": "{color1:1,color2:7}" }, @@ -9,7 +9,7 @@ " SB", "S " ], - "type": "forge:ore_shaped", + "type": "minecraft:crafting_shaped", "key": { "A": { "tag": "botania:petals/orange" @@ -21,5 +21,5 @@ "item": "botania:livingwood_twig" } }, - "group": "botania:twigwand" + "group": "botania:twig_wand" } \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_orange_green.json b/src/main/resources/data/botania/recipes/wands/twigwand_orange_green.json index 94c242d7a..907f6c4ff 100644 --- a/src/main/resources/data/botania/recipes/wands/twigwand_orange_green.json +++ b/src/main/resources/data/botania/recipes/wands/twigwand_orange_green.json @@ -1,6 +1,6 @@ { "result": { - "item": "botania:twigwand", + "item": "botania:twig_wand", "data": 0, "nbt": "{color1:1,color2:13}" }, @@ -9,7 +9,7 @@ " SB", "S " ], - "type": "forge:ore_shaped", + "type": "minecraft:crafting_shaped", "key": { "A": { "tag": "botania:petals/orange" @@ -21,5 +21,5 @@ "item": "botania:livingwood_twig" } }, - "group": "botania:twigwand" + "group": "botania:twig_wand" } \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_orange_light_blue.json b/src/main/resources/data/botania/recipes/wands/twigwand_orange_light_blue.json index 141af5d8e..f7c09bc26 100644 --- a/src/main/resources/data/botania/recipes/wands/twigwand_orange_light_blue.json +++ b/src/main/resources/data/botania/recipes/wands/twigwand_orange_light_blue.json @@ -1,6 +1,6 @@ { "result": { - "item": "botania:twigwand", + "item": "botania:twig_wand", "data": 0, "nbt": "{color1:1,color2:3}" }, @@ -9,7 +9,7 @@ " SB", "S " ], - "type": "forge:ore_shaped", + "type": "minecraft:crafting_shaped", "key": { "A": { "tag": "botania:petals/orange" @@ -21,5 +21,5 @@ "item": "botania:livingwood_twig" } }, - "group": "botania:twigwand" + "group": "botania:twig_wand" } \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_orange_lime.json b/src/main/resources/data/botania/recipes/wands/twigwand_orange_lime.json index bc006c68b..341260dff 100644 --- a/src/main/resources/data/botania/recipes/wands/twigwand_orange_lime.json +++ b/src/main/resources/data/botania/recipes/wands/twigwand_orange_lime.json @@ -1,6 +1,6 @@ { "result": { - "item": "botania:twigwand", + "item": "botania:twig_wand", "data": 0, "nbt": "{color1:1,color2:5}" }, @@ -9,7 +9,7 @@ " SB", "S " ], - "type": "forge:ore_shaped", + "type": "minecraft:crafting_shaped", "key": { "A": { "tag": "botania:petals/orange" @@ -21,5 +21,5 @@ "item": "botania:livingwood_twig" } }, - "group": "botania:twigwand" + "group": "botania:twig_wand" } \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_orange_magenta.json b/src/main/resources/data/botania/recipes/wands/twigwand_orange_magenta.json index 7e1433b45..4a8589c37 100644 --- a/src/main/resources/data/botania/recipes/wands/twigwand_orange_magenta.json +++ b/src/main/resources/data/botania/recipes/wands/twigwand_orange_magenta.json @@ -1,6 +1,6 @@ { "result": { - "item": "botania:twigwand", + "item": "botania:twig_wand", "data": 0, "nbt": "{color1:1,color2:2}" }, @@ -9,7 +9,7 @@ " SB", "S " ], - "type": "forge:ore_shaped", + "type": "minecraft:crafting_shaped", "key": { "A": { "tag": "botania:petals/orange" @@ -21,5 +21,5 @@ "item": "botania:livingwood_twig" } }, - "group": "botania:twigwand" + "group": "botania:twig_wand" } \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_orange_orange.json b/src/main/resources/data/botania/recipes/wands/twigwand_orange_orange.json index 82fbfedfb..7834cfba0 100644 --- a/src/main/resources/data/botania/recipes/wands/twigwand_orange_orange.json +++ b/src/main/resources/data/botania/recipes/wands/twigwand_orange_orange.json @@ -1,6 +1,6 @@ { "result": { - "item": "botania:twigwand", + "item": "botania:twig_wand", "data": 0, "nbt": "{color1:1,color2:1}" }, @@ -9,7 +9,7 @@ " SB", "S " ], - "type": "forge:ore_shaped", + "type": "minecraft:crafting_shaped", "key": { "A": { "tag": "botania:petals/orange" @@ -21,5 +21,5 @@ "item": "botania:livingwood_twig" } }, - "group": "botania:twigwand" + "group": "botania:twig_wand" } \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_orange_pink.json b/src/main/resources/data/botania/recipes/wands/twigwand_orange_pink.json index 298a285b7..1e7bda151 100644 --- a/src/main/resources/data/botania/recipes/wands/twigwand_orange_pink.json +++ b/src/main/resources/data/botania/recipes/wands/twigwand_orange_pink.json @@ -1,6 +1,6 @@ { "result": { - "item": "botania:twigwand", + "item": "botania:twig_wand", "data": 0, "nbt": "{color1:1,color2:6}" }, @@ -9,7 +9,7 @@ " SB", "S " ], - "type": "forge:ore_shaped", + "type": "minecraft:crafting_shaped", "key": { "A": { "tag": "botania:petals/orange" @@ -21,5 +21,5 @@ "item": "botania:livingwood_twig" } }, - "group": "botania:twigwand" + "group": "botania:twig_wand" } \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_orange_purple.json b/src/main/resources/data/botania/recipes/wands/twigwand_orange_purple.json index db0644a46..5c318d25f 100644 --- a/src/main/resources/data/botania/recipes/wands/twigwand_orange_purple.json +++ b/src/main/resources/data/botania/recipes/wands/twigwand_orange_purple.json @@ -1,6 +1,6 @@ { "result": { - "item": "botania:twigwand", + "item": "botania:twig_wand", "data": 0, "nbt": "{color1:1,color2:10}" }, @@ -9,7 +9,7 @@ " SB", "S " ], - "type": "forge:ore_shaped", + "type": "minecraft:crafting_shaped", "key": { "A": { "tag": "botania:petals/orange" @@ -21,5 +21,5 @@ "item": "botania:livingwood_twig" } }, - "group": "botania:twigwand" + "group": "botania:twig_wand" } \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_orange_red.json b/src/main/resources/data/botania/recipes/wands/twigwand_orange_red.json index 3803821b1..e7f9ab1df 100644 --- a/src/main/resources/data/botania/recipes/wands/twigwand_orange_red.json +++ b/src/main/resources/data/botania/recipes/wands/twigwand_orange_red.json @@ -1,6 +1,6 @@ { "result": { - "item": "botania:twigwand", + "item": "botania:twig_wand", "data": 0, "nbt": "{color1:1,color2:14}" }, @@ -9,7 +9,7 @@ " SB", "S " ], - "type": "forge:ore_shaped", + "type": "minecraft:crafting_shaped", "key": { "A": { "tag": "botania:petals/orange" @@ -21,5 +21,5 @@ "item": "botania:livingwood_twig" } }, - "group": "botania:twigwand" + "group": "botania:twig_wand" } \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_orange_silver.json b/src/main/resources/data/botania/recipes/wands/twigwand_orange_silver.json index a676c5daa..c8bc564c3 100644 --- a/src/main/resources/data/botania/recipes/wands/twigwand_orange_silver.json +++ b/src/main/resources/data/botania/recipes/wands/twigwand_orange_silver.json @@ -1,6 +1,6 @@ { "result": { - "item": "botania:twigwand", + "item": "botania:twig_wand", "data": 0, "nbt": "{color1:1,color2:8}" }, @@ -9,17 +9,17 @@ " SB", "S " ], - "type": "forge:ore_shaped", + "type": "minecraft:crafting_shaped", "key": { "A": { "tag": "botania:petals/orange" }, "B": { - "tag": "botania:petals/lightgray" + "tag": "botania:petals/light_gray" }, "S": { "item": "botania:livingwood_twig" } }, - "group": "botania:twigwand" + "group": "botania:twig_wand" } \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_orange_white.json b/src/main/resources/data/botania/recipes/wands/twigwand_orange_white.json index 32d3dc6ab..b01d5b0d7 100644 --- a/src/main/resources/data/botania/recipes/wands/twigwand_orange_white.json +++ b/src/main/resources/data/botania/recipes/wands/twigwand_orange_white.json @@ -1,6 +1,6 @@ { "result": { - "item": "botania:twigwand", + "item": "botania:twig_wand", "data": 0, "nbt": "{color1:1,color2:0}" }, @@ -9,7 +9,7 @@ " SB", "S " ], - "type": "forge:ore_shaped", + "type": "minecraft:crafting_shaped", "key": { "A": { "tag": "botania:petals/orange" @@ -21,5 +21,5 @@ "item": "botania:livingwood_twig" } }, - "group": "botania:twigwand" + "group": "botania:twig_wand" } \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_orange_yellow.json b/src/main/resources/data/botania/recipes/wands/twigwand_orange_yellow.json index 6fa30e03c..69bc864a1 100644 --- a/src/main/resources/data/botania/recipes/wands/twigwand_orange_yellow.json +++ b/src/main/resources/data/botania/recipes/wands/twigwand_orange_yellow.json @@ -1,6 +1,6 @@ { "result": { - "item": "botania:twigwand", + "item": "botania:twig_wand", "data": 0, "nbt": "{color1:1,color2:4}" }, @@ -9,7 +9,7 @@ " SB", "S " ], - "type": "forge:ore_shaped", + "type": "minecraft:crafting_shaped", "key": { "A": { "tag": "botania:petals/orange" @@ -21,5 +21,5 @@ "item": "botania:livingwood_twig" } }, - "group": "botania:twigwand" + "group": "botania:twig_wand" } \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_pink_black.json b/src/main/resources/data/botania/recipes/wands/twigwand_pink_black.json index 638fb0f64..566223b80 100644 --- a/src/main/resources/data/botania/recipes/wands/twigwand_pink_black.json +++ b/src/main/resources/data/botania/recipes/wands/twigwand_pink_black.json @@ -1,6 +1,6 @@ { "result": { - "item": "botania:twigwand", + "item": "botania:twig_wand", "data": 0, "nbt": "{color1:6,color2:15}" }, @@ -9,7 +9,7 @@ " SB", "S " ], - "type": "forge:ore_shaped", + "type": "minecraft:crafting_shaped", "key": { "A": { "tag": "botania:petals/pink" @@ -21,5 +21,5 @@ "item": "botania:livingwood_twig" } }, - "group": "botania:twigwand" + "group": "botania:twig_wand" } \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_pink_blue.json b/src/main/resources/data/botania/recipes/wands/twigwand_pink_blue.json index f473be5bd..316dd616b 100644 --- a/src/main/resources/data/botania/recipes/wands/twigwand_pink_blue.json +++ b/src/main/resources/data/botania/recipes/wands/twigwand_pink_blue.json @@ -1,6 +1,6 @@ { "result": { - "item": "botania:twigwand", + "item": "botania:twig_wand", "data": 0, "nbt": "{color1:6,color2:11}" }, @@ -9,7 +9,7 @@ " SB", "S " ], - "type": "forge:ore_shaped", + "type": "minecraft:crafting_shaped", "key": { "A": { "tag": "botania:petals/pink" @@ -21,5 +21,5 @@ "item": "botania:livingwood_twig" } }, - "group": "botania:twigwand" + "group": "botania:twig_wand" } \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_pink_brown.json b/src/main/resources/data/botania/recipes/wands/twigwand_pink_brown.json index 1654b8b6e..1acf7edb6 100644 --- a/src/main/resources/data/botania/recipes/wands/twigwand_pink_brown.json +++ b/src/main/resources/data/botania/recipes/wands/twigwand_pink_brown.json @@ -1,6 +1,6 @@ { "result": { - "item": "botania:twigwand", + "item": "botania:twig_wand", "data": 0, "nbt": "{color1:6,color2:12}" }, @@ -9,7 +9,7 @@ " SB", "S " ], - "type": "forge:ore_shaped", + "type": "minecraft:crafting_shaped", "key": { "A": { "tag": "botania:petals/pink" @@ -21,5 +21,5 @@ "item": "botania:livingwood_twig" } }, - "group": "botania:twigwand" + "group": "botania:twig_wand" } \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_pink_cyan.json b/src/main/resources/data/botania/recipes/wands/twigwand_pink_cyan.json index e9c1066e5..0952244f6 100644 --- a/src/main/resources/data/botania/recipes/wands/twigwand_pink_cyan.json +++ b/src/main/resources/data/botania/recipes/wands/twigwand_pink_cyan.json @@ -1,6 +1,6 @@ { "result": { - "item": "botania:twigwand", + "item": "botania:twig_wand", "data": 0, "nbt": "{color1:6,color2:9}" }, @@ -9,7 +9,7 @@ " SB", "S " ], - "type": "forge:ore_shaped", + "type": "minecraft:crafting_shaped", "key": { "A": { "tag": "botania:petals/pink" @@ -21,5 +21,5 @@ "item": "botania:livingwood_twig" } }, - "group": "botania:twigwand" + "group": "botania:twig_wand" } \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_pink_gray.json b/src/main/resources/data/botania/recipes/wands/twigwand_pink_gray.json index 8556ce44e..243a6d9a3 100644 --- a/src/main/resources/data/botania/recipes/wands/twigwand_pink_gray.json +++ b/src/main/resources/data/botania/recipes/wands/twigwand_pink_gray.json @@ -1,6 +1,6 @@ { "result": { - "item": "botania:twigwand", + "item": "botania:twig_wand", "data": 0, "nbt": "{color1:6,color2:7}" }, @@ -9,7 +9,7 @@ " SB", "S " ], - "type": "forge:ore_shaped", + "type": "minecraft:crafting_shaped", "key": { "A": { "tag": "botania:petals/pink" @@ -21,5 +21,5 @@ "item": "botania:livingwood_twig" } }, - "group": "botania:twigwand" + "group": "botania:twig_wand" } \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_pink_green.json b/src/main/resources/data/botania/recipes/wands/twigwand_pink_green.json index 6b043bfa7..34cc5cd8a 100644 --- a/src/main/resources/data/botania/recipes/wands/twigwand_pink_green.json +++ b/src/main/resources/data/botania/recipes/wands/twigwand_pink_green.json @@ -1,6 +1,6 @@ { "result": { - "item": "botania:twigwand", + "item": "botania:twig_wand", "data": 0, "nbt": "{color1:6,color2:13}" }, @@ -9,7 +9,7 @@ " SB", "S " ], - "type": "forge:ore_shaped", + "type": "minecraft:crafting_shaped", "key": { "A": { "tag": "botania:petals/pink" @@ -21,5 +21,5 @@ "item": "botania:livingwood_twig" } }, - "group": "botania:twigwand" + "group": "botania:twig_wand" } \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_pink_light_blue.json b/src/main/resources/data/botania/recipes/wands/twigwand_pink_light_blue.json index c97c94340..ef6863d01 100644 --- a/src/main/resources/data/botania/recipes/wands/twigwand_pink_light_blue.json +++ b/src/main/resources/data/botania/recipes/wands/twigwand_pink_light_blue.json @@ -1,6 +1,6 @@ { "result": { - "item": "botania:twigwand", + "item": "botania:twig_wand", "data": 0, "nbt": "{color1:6,color2:3}" }, @@ -9,7 +9,7 @@ " SB", "S " ], - "type": "forge:ore_shaped", + "type": "minecraft:crafting_shaped", "key": { "A": { "tag": "botania:petals/pink" @@ -21,5 +21,5 @@ "item": "botania:livingwood_twig" } }, - "group": "botania:twigwand" + "group": "botania:twig_wand" } \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_pink_lime.json b/src/main/resources/data/botania/recipes/wands/twigwand_pink_lime.json index 91626b927..147bee29a 100644 --- a/src/main/resources/data/botania/recipes/wands/twigwand_pink_lime.json +++ b/src/main/resources/data/botania/recipes/wands/twigwand_pink_lime.json @@ -1,6 +1,6 @@ { "result": { - "item": "botania:twigwand", + "item": "botania:twig_wand", "data": 0, "nbt": "{color1:6,color2:5}" }, @@ -9,7 +9,7 @@ " SB", "S " ], - "type": "forge:ore_shaped", + "type": "minecraft:crafting_shaped", "key": { "A": { "tag": "botania:petals/pink" @@ -21,5 +21,5 @@ "item": "botania:livingwood_twig" } }, - "group": "botania:twigwand" + "group": "botania:twig_wand" } \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_pink_magenta.json b/src/main/resources/data/botania/recipes/wands/twigwand_pink_magenta.json index 8761c1320..97c2fac29 100644 --- a/src/main/resources/data/botania/recipes/wands/twigwand_pink_magenta.json +++ b/src/main/resources/data/botania/recipes/wands/twigwand_pink_magenta.json @@ -1,6 +1,6 @@ { "result": { - "item": "botania:twigwand", + "item": "botania:twig_wand", "data": 0, "nbt": "{color1:6,color2:2}" }, @@ -9,7 +9,7 @@ " SB", "S " ], - "type": "forge:ore_shaped", + "type": "minecraft:crafting_shaped", "key": { "A": { "tag": "botania:petals/pink" @@ -21,5 +21,5 @@ "item": "botania:livingwood_twig" } }, - "group": "botania:twigwand" + "group": "botania:twig_wand" } \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_pink_orange.json b/src/main/resources/data/botania/recipes/wands/twigwand_pink_orange.json index 7c7fa3cc2..a502b2807 100644 --- a/src/main/resources/data/botania/recipes/wands/twigwand_pink_orange.json +++ b/src/main/resources/data/botania/recipes/wands/twigwand_pink_orange.json @@ -1,6 +1,6 @@ { "result": { - "item": "botania:twigwand", + "item": "botania:twig_wand", "data": 0, "nbt": "{color1:6,color2:1}" }, @@ -9,7 +9,7 @@ " SB", "S " ], - "type": "forge:ore_shaped", + "type": "minecraft:crafting_shaped", "key": { "A": { "tag": "botania:petals/pink" @@ -21,5 +21,5 @@ "item": "botania:livingwood_twig" } }, - "group": "botania:twigwand" + "group": "botania:twig_wand" } \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_pink_pink.json b/src/main/resources/data/botania/recipes/wands/twigwand_pink_pink.json index 8c11bd984..43124ebb0 100644 --- a/src/main/resources/data/botania/recipes/wands/twigwand_pink_pink.json +++ b/src/main/resources/data/botania/recipes/wands/twigwand_pink_pink.json @@ -1,6 +1,6 @@ { "result": { - "item": "botania:twigwand", + "item": "botania:twig_wand", "data": 0, "nbt": "{color1:6,color2:6}" }, @@ -9,7 +9,7 @@ " SB", "S " ], - "type": "forge:ore_shaped", + "type": "minecraft:crafting_shaped", "key": { "A": { "tag": "botania:petals/pink" @@ -21,5 +21,5 @@ "item": "botania:livingwood_twig" } }, - "group": "botania:twigwand" + "group": "botania:twig_wand" } \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_pink_purple.json b/src/main/resources/data/botania/recipes/wands/twigwand_pink_purple.json index f1ee45f56..84a9ded13 100644 --- a/src/main/resources/data/botania/recipes/wands/twigwand_pink_purple.json +++ b/src/main/resources/data/botania/recipes/wands/twigwand_pink_purple.json @@ -1,6 +1,6 @@ { "result": { - "item": "botania:twigwand", + "item": "botania:twig_wand", "data": 0, "nbt": "{color1:6,color2:10}" }, @@ -9,7 +9,7 @@ " SB", "S " ], - "type": "forge:ore_shaped", + "type": "minecraft:crafting_shaped", "key": { "A": { "tag": "botania:petals/pink" @@ -21,5 +21,5 @@ "item": "botania:livingwood_twig" } }, - "group": "botania:twigwand" + "group": "botania:twig_wand" } \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_pink_red.json b/src/main/resources/data/botania/recipes/wands/twigwand_pink_red.json index db63ef394..9cac4c89b 100644 --- a/src/main/resources/data/botania/recipes/wands/twigwand_pink_red.json +++ b/src/main/resources/data/botania/recipes/wands/twigwand_pink_red.json @@ -1,6 +1,6 @@ { "result": { - "item": "botania:twigwand", + "item": "botania:twig_wand", "data": 0, "nbt": "{color1:6,color2:14}" }, @@ -9,7 +9,7 @@ " SB", "S " ], - "type": "forge:ore_shaped", + "type": "minecraft:crafting_shaped", "key": { "A": { "tag": "botania:petals/pink" @@ -21,5 +21,5 @@ "item": "botania:livingwood_twig" } }, - "group": "botania:twigwand" + "group": "botania:twig_wand" } \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_pink_silver.json b/src/main/resources/data/botania/recipes/wands/twigwand_pink_silver.json index 7e80a7044..a69fbf133 100644 --- a/src/main/resources/data/botania/recipes/wands/twigwand_pink_silver.json +++ b/src/main/resources/data/botania/recipes/wands/twigwand_pink_silver.json @@ -1,6 +1,6 @@ { "result": { - "item": "botania:twigwand", + "item": "botania:twig_wand", "data": 0, "nbt": "{color1:6,color2:8}" }, @@ -9,17 +9,17 @@ " SB", "S " ], - "type": "forge:ore_shaped", + "type": "minecraft:crafting_shaped", "key": { "A": { "tag": "botania:petals/pink" }, "B": { - "tag": "botania:petals/lightgray" + "tag": "botania:petals/light_gray" }, "S": { "item": "botania:livingwood_twig" } }, - "group": "botania:twigwand" + "group": "botania:twig_wand" } \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_pink_white.json b/src/main/resources/data/botania/recipes/wands/twigwand_pink_white.json index d11d2cfa3..2346dc917 100644 --- a/src/main/resources/data/botania/recipes/wands/twigwand_pink_white.json +++ b/src/main/resources/data/botania/recipes/wands/twigwand_pink_white.json @@ -1,6 +1,6 @@ { "result": { - "item": "botania:twigwand", + "item": "botania:twig_wand", "data": 0, "nbt": "{color1:6,color2:0}" }, @@ -9,7 +9,7 @@ " SB", "S " ], - "type": "forge:ore_shaped", + "type": "minecraft:crafting_shaped", "key": { "A": { "tag": "botania:petals/pink" @@ -21,5 +21,5 @@ "item": "botania:livingwood_twig" } }, - "group": "botania:twigwand" + "group": "botania:twig_wand" } \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_pink_yellow.json b/src/main/resources/data/botania/recipes/wands/twigwand_pink_yellow.json index 5e55edf4a..0769cf4d1 100644 --- a/src/main/resources/data/botania/recipes/wands/twigwand_pink_yellow.json +++ b/src/main/resources/data/botania/recipes/wands/twigwand_pink_yellow.json @@ -1,6 +1,6 @@ { "result": { - "item": "botania:twigwand", + "item": "botania:twig_wand", "data": 0, "nbt": "{color1:6,color2:4}" }, @@ -9,7 +9,7 @@ " SB", "S " ], - "type": "forge:ore_shaped", + "type": "minecraft:crafting_shaped", "key": { "A": { "tag": "botania:petals/pink" @@ -21,5 +21,5 @@ "item": "botania:livingwood_twig" } }, - "group": "botania:twigwand" + "group": "botania:twig_wand" } \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_purple_black.json b/src/main/resources/data/botania/recipes/wands/twigwand_purple_black.json index a246d14c4..6fd6caa68 100644 --- a/src/main/resources/data/botania/recipes/wands/twigwand_purple_black.json +++ b/src/main/resources/data/botania/recipes/wands/twigwand_purple_black.json @@ -1,6 +1,6 @@ { "result": { - "item": "botania:twigwand", + "item": "botania:twig_wand", "data": 0, "nbt": "{color1:10,color2:15}" }, @@ -9,7 +9,7 @@ " SB", "S " ], - "type": "forge:ore_shaped", + "type": "minecraft:crafting_shaped", "key": { "A": { "tag": "botania:petals/purple" @@ -21,5 +21,5 @@ "item": "botania:livingwood_twig" } }, - "group": "botania:twigwand" + "group": "botania:twig_wand" } \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_purple_blue.json b/src/main/resources/data/botania/recipes/wands/twigwand_purple_blue.json index 358878138..f73a71938 100644 --- a/src/main/resources/data/botania/recipes/wands/twigwand_purple_blue.json +++ b/src/main/resources/data/botania/recipes/wands/twigwand_purple_blue.json @@ -1,6 +1,6 @@ { "result": { - "item": "botania:twigwand", + "item": "botania:twig_wand", "data": 0, "nbt": "{color1:10,color2:11}" }, @@ -9,7 +9,7 @@ " SB", "S " ], - "type": "forge:ore_shaped", + "type": "minecraft:crafting_shaped", "key": { "A": { "tag": "botania:petals/purple" @@ -21,5 +21,5 @@ "item": "botania:livingwood_twig" } }, - "group": "botania:twigwand" + "group": "botania:twig_wand" } \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_purple_brown.json b/src/main/resources/data/botania/recipes/wands/twigwand_purple_brown.json index 3287f77fe..b5c0ee8a0 100644 --- a/src/main/resources/data/botania/recipes/wands/twigwand_purple_brown.json +++ b/src/main/resources/data/botania/recipes/wands/twigwand_purple_brown.json @@ -1,6 +1,6 @@ { "result": { - "item": "botania:twigwand", + "item": "botania:twig_wand", "data": 0, "nbt": "{color1:10,color2:12}" }, @@ -9,7 +9,7 @@ " SB", "S " ], - "type": "forge:ore_shaped", + "type": "minecraft:crafting_shaped", "key": { "A": { "tag": "botania:petals/purple" @@ -21,5 +21,5 @@ "item": "botania:livingwood_twig" } }, - "group": "botania:twigwand" + "group": "botania:twig_wand" } \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_purple_cyan.json b/src/main/resources/data/botania/recipes/wands/twigwand_purple_cyan.json index 96450d3fd..eaa3c717b 100644 --- a/src/main/resources/data/botania/recipes/wands/twigwand_purple_cyan.json +++ b/src/main/resources/data/botania/recipes/wands/twigwand_purple_cyan.json @@ -1,6 +1,6 @@ { "result": { - "item": "botania:twigwand", + "item": "botania:twig_wand", "data": 0, "nbt": "{color1:10,color2:9}" }, @@ -9,7 +9,7 @@ " SB", "S " ], - "type": "forge:ore_shaped", + "type": "minecraft:crafting_shaped", "key": { "A": { "tag": "botania:petals/purple" @@ -21,5 +21,5 @@ "item": "botania:livingwood_twig" } }, - "group": "botania:twigwand" + "group": "botania:twig_wand" } \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_purple_gray.json b/src/main/resources/data/botania/recipes/wands/twigwand_purple_gray.json index 1334b0269..12706ede9 100644 --- a/src/main/resources/data/botania/recipes/wands/twigwand_purple_gray.json +++ b/src/main/resources/data/botania/recipes/wands/twigwand_purple_gray.json @@ -1,6 +1,6 @@ { "result": { - "item": "botania:twigwand", + "item": "botania:twig_wand", "data": 0, "nbt": "{color1:10,color2:7}" }, @@ -9,7 +9,7 @@ " SB", "S " ], - "type": "forge:ore_shaped", + "type": "minecraft:crafting_shaped", "key": { "A": { "tag": "botania:petals/purple" @@ -21,5 +21,5 @@ "item": "botania:livingwood_twig" } }, - "group": "botania:twigwand" + "group": "botania:twig_wand" } \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_purple_green.json b/src/main/resources/data/botania/recipes/wands/twigwand_purple_green.json index abace96d9..064f1be29 100644 --- a/src/main/resources/data/botania/recipes/wands/twigwand_purple_green.json +++ b/src/main/resources/data/botania/recipes/wands/twigwand_purple_green.json @@ -1,6 +1,6 @@ { "result": { - "item": "botania:twigwand", + "item": "botania:twig_wand", "data": 0, "nbt": "{color1:10,color2:13}" }, @@ -9,7 +9,7 @@ " SB", "S " ], - "type": "forge:ore_shaped", + "type": "minecraft:crafting_shaped", "key": { "A": { "tag": "botania:petals/purple" @@ -21,5 +21,5 @@ "item": "botania:livingwood_twig" } }, - "group": "botania:twigwand" + "group": "botania:twig_wand" } \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_purple_light_blue.json b/src/main/resources/data/botania/recipes/wands/twigwand_purple_light_blue.json index 232137290..100a1a7a7 100644 --- a/src/main/resources/data/botania/recipes/wands/twigwand_purple_light_blue.json +++ b/src/main/resources/data/botania/recipes/wands/twigwand_purple_light_blue.json @@ -1,6 +1,6 @@ { "result": { - "item": "botania:twigwand", + "item": "botania:twig_wand", "data": 0, "nbt": "{color1:10,color2:3}" }, @@ -9,7 +9,7 @@ " SB", "S " ], - "type": "forge:ore_shaped", + "type": "minecraft:crafting_shaped", "key": { "A": { "tag": "botania:petals/purple" @@ -21,5 +21,5 @@ "item": "botania:livingwood_twig" } }, - "group": "botania:twigwand" + "group": "botania:twig_wand" } \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_purple_lime.json b/src/main/resources/data/botania/recipes/wands/twigwand_purple_lime.json index 2c375cd6e..acafa6525 100644 --- a/src/main/resources/data/botania/recipes/wands/twigwand_purple_lime.json +++ b/src/main/resources/data/botania/recipes/wands/twigwand_purple_lime.json @@ -1,6 +1,6 @@ { "result": { - "item": "botania:twigwand", + "item": "botania:twig_wand", "data": 0, "nbt": "{color1:10,color2:5}" }, @@ -9,7 +9,7 @@ " SB", "S " ], - "type": "forge:ore_shaped", + "type": "minecraft:crafting_shaped", "key": { "A": { "tag": "botania:petals/purple" @@ -21,5 +21,5 @@ "item": "botania:livingwood_twig" } }, - "group": "botania:twigwand" + "group": "botania:twig_wand" } \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_purple_magenta.json b/src/main/resources/data/botania/recipes/wands/twigwand_purple_magenta.json index 001860a91..43a6f846a 100644 --- a/src/main/resources/data/botania/recipes/wands/twigwand_purple_magenta.json +++ b/src/main/resources/data/botania/recipes/wands/twigwand_purple_magenta.json @@ -1,6 +1,6 @@ { "result": { - "item": "botania:twigwand", + "item": "botania:twig_wand", "data": 0, "nbt": "{color1:10,color2:2}" }, @@ -9,7 +9,7 @@ " SB", "S " ], - "type": "forge:ore_shaped", + "type": "minecraft:crafting_shaped", "key": { "A": { "tag": "botania:petals/purple" @@ -21,5 +21,5 @@ "item": "botania:livingwood_twig" } }, - "group": "botania:twigwand" + "group": "botania:twig_wand" } \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_purple_orange.json b/src/main/resources/data/botania/recipes/wands/twigwand_purple_orange.json index 134ff117b..d5a4d4b8a 100644 --- a/src/main/resources/data/botania/recipes/wands/twigwand_purple_orange.json +++ b/src/main/resources/data/botania/recipes/wands/twigwand_purple_orange.json @@ -1,6 +1,6 @@ { "result": { - "item": "botania:twigwand", + "item": "botania:twig_wand", "data": 0, "nbt": "{color1:10,color2:1}" }, @@ -9,7 +9,7 @@ " SB", "S " ], - "type": "forge:ore_shaped", + "type": "minecraft:crafting_shaped", "key": { "A": { "tag": "botania:petals/purple" @@ -21,5 +21,5 @@ "item": "botania:livingwood_twig" } }, - "group": "botania:twigwand" + "group": "botania:twig_wand" } \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_purple_pink.json b/src/main/resources/data/botania/recipes/wands/twigwand_purple_pink.json index 29363aa11..0a0f470c9 100644 --- a/src/main/resources/data/botania/recipes/wands/twigwand_purple_pink.json +++ b/src/main/resources/data/botania/recipes/wands/twigwand_purple_pink.json @@ -1,6 +1,6 @@ { "result": { - "item": "botania:twigwand", + "item": "botania:twig_wand", "data": 0, "nbt": "{color1:10,color2:6}" }, @@ -9,7 +9,7 @@ " SB", "S " ], - "type": "forge:ore_shaped", + "type": "minecraft:crafting_shaped", "key": { "A": { "tag": "botania:petals/purple" @@ -21,5 +21,5 @@ "item": "botania:livingwood_twig" } }, - "group": "botania:twigwand" + "group": "botania:twig_wand" } \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_purple_purple.json b/src/main/resources/data/botania/recipes/wands/twigwand_purple_purple.json index 8b704613a..4b12909b6 100644 --- a/src/main/resources/data/botania/recipes/wands/twigwand_purple_purple.json +++ b/src/main/resources/data/botania/recipes/wands/twigwand_purple_purple.json @@ -1,6 +1,6 @@ { "result": { - "item": "botania:twigwand", + "item": "botania:twig_wand", "data": 0, "nbt": "{color1:10,color2:10}" }, @@ -9,7 +9,7 @@ " SB", "S " ], - "type": "forge:ore_shaped", + "type": "minecraft:crafting_shaped", "key": { "A": { "tag": "botania:petals/purple" @@ -21,5 +21,5 @@ "item": "botania:livingwood_twig" } }, - "group": "botania:twigwand" + "group": "botania:twig_wand" } \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_purple_red.json b/src/main/resources/data/botania/recipes/wands/twigwand_purple_red.json index 06951470b..b2088356d 100644 --- a/src/main/resources/data/botania/recipes/wands/twigwand_purple_red.json +++ b/src/main/resources/data/botania/recipes/wands/twigwand_purple_red.json @@ -1,6 +1,6 @@ { "result": { - "item": "botania:twigwand", + "item": "botania:twig_wand", "data": 0, "nbt": "{color1:10,color2:14}" }, @@ -9,7 +9,7 @@ " SB", "S " ], - "type": "forge:ore_shaped", + "type": "minecraft:crafting_shaped", "key": { "A": { "tag": "botania:petals/purple" @@ -21,5 +21,5 @@ "item": "botania:livingwood_twig" } }, - "group": "botania:twigwand" + "group": "botania:twig_wand" } \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_purple_silver.json b/src/main/resources/data/botania/recipes/wands/twigwand_purple_silver.json index 160ead033..397f63891 100644 --- a/src/main/resources/data/botania/recipes/wands/twigwand_purple_silver.json +++ b/src/main/resources/data/botania/recipes/wands/twigwand_purple_silver.json @@ -1,6 +1,6 @@ { "result": { - "item": "botania:twigwand", + "item": "botania:twig_wand", "data": 0, "nbt": "{color1:10,color2:8}" }, @@ -9,17 +9,17 @@ " SB", "S " ], - "type": "forge:ore_shaped", + "type": "minecraft:crafting_shaped", "key": { "A": { "tag": "botania:petals/purple" }, "B": { - "tag": "botania:petals/lightgray" + "tag": "botania:petals/light_gray" }, "S": { "item": "botania:livingwood_twig" } }, - "group": "botania:twigwand" + "group": "botania:twig_wand" } \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_purple_white.json b/src/main/resources/data/botania/recipes/wands/twigwand_purple_white.json index 362936f2b..b770bccb4 100644 --- a/src/main/resources/data/botania/recipes/wands/twigwand_purple_white.json +++ b/src/main/resources/data/botania/recipes/wands/twigwand_purple_white.json @@ -1,6 +1,6 @@ { "result": { - "item": "botania:twigwand", + "item": "botania:twig_wand", "data": 0, "nbt": "{color1:10,color2:0}" }, @@ -9,7 +9,7 @@ " SB", "S " ], - "type": "forge:ore_shaped", + "type": "minecraft:crafting_shaped", "key": { "A": { "tag": "botania:petals/purple" @@ -21,5 +21,5 @@ "item": "botania:livingwood_twig" } }, - "group": "botania:twigwand" + "group": "botania:twig_wand" } \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_purple_yellow.json b/src/main/resources/data/botania/recipes/wands/twigwand_purple_yellow.json index 0c199e96f..819d52619 100644 --- a/src/main/resources/data/botania/recipes/wands/twigwand_purple_yellow.json +++ b/src/main/resources/data/botania/recipes/wands/twigwand_purple_yellow.json @@ -1,6 +1,6 @@ { "result": { - "item": "botania:twigwand", + "item": "botania:twig_wand", "data": 0, "nbt": "{color1:10,color2:4}" }, @@ -9,7 +9,7 @@ " SB", "S " ], - "type": "forge:ore_shaped", + "type": "minecraft:crafting_shaped", "key": { "A": { "tag": "botania:petals/purple" @@ -21,5 +21,5 @@ "item": "botania:livingwood_twig" } }, - "group": "botania:twigwand" + "group": "botania:twig_wand" } \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_red_black.json b/src/main/resources/data/botania/recipes/wands/twigwand_red_black.json index cd3376bc8..30d3b2fc1 100644 --- a/src/main/resources/data/botania/recipes/wands/twigwand_red_black.json +++ b/src/main/resources/data/botania/recipes/wands/twigwand_red_black.json @@ -1,6 +1,6 @@ { "result": { - "item": "botania:twigwand", + "item": "botania:twig_wand", "data": 0, "nbt": "{color1:14,color2:15}" }, @@ -9,7 +9,7 @@ " SB", "S " ], - "type": "forge:ore_shaped", + "type": "minecraft:crafting_shaped", "key": { "A": { "tag": "botania:petals/red" @@ -21,5 +21,5 @@ "item": "botania:livingwood_twig" } }, - "group": "botania:twigwand" + "group": "botania:twig_wand" } \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_red_blue.json b/src/main/resources/data/botania/recipes/wands/twigwand_red_blue.json index 757cb5588..552de328b 100644 --- a/src/main/resources/data/botania/recipes/wands/twigwand_red_blue.json +++ b/src/main/resources/data/botania/recipes/wands/twigwand_red_blue.json @@ -1,6 +1,6 @@ { "result": { - "item": "botania:twigwand", + "item": "botania:twig_wand", "data": 0, "nbt": "{color1:14,color2:11}" }, @@ -9,7 +9,7 @@ " SB", "S " ], - "type": "forge:ore_shaped", + "type": "minecraft:crafting_shaped", "key": { "A": { "tag": "botania:petals/red" @@ -21,5 +21,5 @@ "item": "botania:livingwood_twig" } }, - "group": "botania:twigwand" + "group": "botania:twig_wand" } \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_red_brown.json b/src/main/resources/data/botania/recipes/wands/twigwand_red_brown.json index 1550e095d..9c8a65dd6 100644 --- a/src/main/resources/data/botania/recipes/wands/twigwand_red_brown.json +++ b/src/main/resources/data/botania/recipes/wands/twigwand_red_brown.json @@ -1,6 +1,6 @@ { "result": { - "item": "botania:twigwand", + "item": "botania:twig_wand", "data": 0, "nbt": "{color1:14,color2:12}" }, @@ -9,7 +9,7 @@ " SB", "S " ], - "type": "forge:ore_shaped", + "type": "minecraft:crafting_shaped", "key": { "A": { "tag": "botania:petals/red" @@ -21,5 +21,5 @@ "item": "botania:livingwood_twig" } }, - "group": "botania:twigwand" + "group": "botania:twig_wand" } \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_red_cyan.json b/src/main/resources/data/botania/recipes/wands/twigwand_red_cyan.json index 4dc2198e4..9c3154710 100644 --- a/src/main/resources/data/botania/recipes/wands/twigwand_red_cyan.json +++ b/src/main/resources/data/botania/recipes/wands/twigwand_red_cyan.json @@ -1,6 +1,6 @@ { "result": { - "item": "botania:twigwand", + "item": "botania:twig_wand", "data": 0, "nbt": "{color1:14,color2:9}" }, @@ -9,7 +9,7 @@ " SB", "S " ], - "type": "forge:ore_shaped", + "type": "minecraft:crafting_shaped", "key": { "A": { "tag": "botania:petals/red" @@ -21,5 +21,5 @@ "item": "botania:livingwood_twig" } }, - "group": "botania:twigwand" + "group": "botania:twig_wand" } \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_red_gray.json b/src/main/resources/data/botania/recipes/wands/twigwand_red_gray.json index 2359db007..7037b1338 100644 --- a/src/main/resources/data/botania/recipes/wands/twigwand_red_gray.json +++ b/src/main/resources/data/botania/recipes/wands/twigwand_red_gray.json @@ -1,6 +1,6 @@ { "result": { - "item": "botania:twigwand", + "item": "botania:twig_wand", "data": 0, "nbt": "{color1:14,color2:7}" }, @@ -9,7 +9,7 @@ " SB", "S " ], - "type": "forge:ore_shaped", + "type": "minecraft:crafting_shaped", "key": { "A": { "tag": "botania:petals/red" @@ -21,5 +21,5 @@ "item": "botania:livingwood_twig" } }, - "group": "botania:twigwand" + "group": "botania:twig_wand" } \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_red_green.json b/src/main/resources/data/botania/recipes/wands/twigwand_red_green.json index aeef71e71..e8302ca24 100644 --- a/src/main/resources/data/botania/recipes/wands/twigwand_red_green.json +++ b/src/main/resources/data/botania/recipes/wands/twigwand_red_green.json @@ -1,6 +1,6 @@ { "result": { - "item": "botania:twigwand", + "item": "botania:twig_wand", "data": 0, "nbt": "{color1:14,color2:13}" }, @@ -9,7 +9,7 @@ " SB", "S " ], - "type": "forge:ore_shaped", + "type": "minecraft:crafting_shaped", "key": { "A": { "tag": "botania:petals/red" @@ -21,5 +21,5 @@ "item": "botania:livingwood_twig" } }, - "group": "botania:twigwand" + "group": "botania:twig_wand" } \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_red_light_blue.json b/src/main/resources/data/botania/recipes/wands/twigwand_red_light_blue.json index 96a12b167..b58a5608a 100644 --- a/src/main/resources/data/botania/recipes/wands/twigwand_red_light_blue.json +++ b/src/main/resources/data/botania/recipes/wands/twigwand_red_light_blue.json @@ -1,6 +1,6 @@ { "result": { - "item": "botania:twigwand", + "item": "botania:twig_wand", "data": 0, "nbt": "{color1:14,color2:3}" }, @@ -9,7 +9,7 @@ " SB", "S " ], - "type": "forge:ore_shaped", + "type": "minecraft:crafting_shaped", "key": { "A": { "tag": "botania:petals/red" @@ -21,5 +21,5 @@ "item": "botania:livingwood_twig" } }, - "group": "botania:twigwand" + "group": "botania:twig_wand" } \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_red_lime.json b/src/main/resources/data/botania/recipes/wands/twigwand_red_lime.json index 57b513069..0b81edb98 100644 --- a/src/main/resources/data/botania/recipes/wands/twigwand_red_lime.json +++ b/src/main/resources/data/botania/recipes/wands/twigwand_red_lime.json @@ -1,6 +1,6 @@ { "result": { - "item": "botania:twigwand", + "item": "botania:twig_wand", "data": 0, "nbt": "{color1:14,color2:5}" }, @@ -9,7 +9,7 @@ " SB", "S " ], - "type": "forge:ore_shaped", + "type": "minecraft:crafting_shaped", "key": { "A": { "tag": "botania:petals/red" @@ -21,5 +21,5 @@ "item": "botania:livingwood_twig" } }, - "group": "botania:twigwand" + "group": "botania:twig_wand" } \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_red_magenta.json b/src/main/resources/data/botania/recipes/wands/twigwand_red_magenta.json index 190b603df..5cd97a2ed 100644 --- a/src/main/resources/data/botania/recipes/wands/twigwand_red_magenta.json +++ b/src/main/resources/data/botania/recipes/wands/twigwand_red_magenta.json @@ -1,6 +1,6 @@ { "result": { - "item": "botania:twigwand", + "item": "botania:twig_wand", "data": 0, "nbt": "{color1:14,color2:2}" }, @@ -9,7 +9,7 @@ " SB", "S " ], - "type": "forge:ore_shaped", + "type": "minecraft:crafting_shaped", "key": { "A": { "tag": "botania:petals/red" @@ -21,5 +21,5 @@ "item": "botania:livingwood_twig" } }, - "group": "botania:twigwand" + "group": "botania:twig_wand" } \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_red_orange.json b/src/main/resources/data/botania/recipes/wands/twigwand_red_orange.json index d1a3a6350..178ce386a 100644 --- a/src/main/resources/data/botania/recipes/wands/twigwand_red_orange.json +++ b/src/main/resources/data/botania/recipes/wands/twigwand_red_orange.json @@ -1,6 +1,6 @@ { "result": { - "item": "botania:twigwand", + "item": "botania:twig_wand", "data": 0, "nbt": "{color1:14,color2:1}" }, @@ -9,7 +9,7 @@ " SB", "S " ], - "type": "forge:ore_shaped", + "type": "minecraft:crafting_shaped", "key": { "A": { "tag": "botania:petals/red" @@ -21,5 +21,5 @@ "item": "botania:livingwood_twig" } }, - "group": "botania:twigwand" + "group": "botania:twig_wand" } \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_red_pink.json b/src/main/resources/data/botania/recipes/wands/twigwand_red_pink.json index 13a4812b7..13f40018d 100644 --- a/src/main/resources/data/botania/recipes/wands/twigwand_red_pink.json +++ b/src/main/resources/data/botania/recipes/wands/twigwand_red_pink.json @@ -1,6 +1,6 @@ { "result": { - "item": "botania:twigwand", + "item": "botania:twig_wand", "data": 0, "nbt": "{color1:14,color2:6}" }, @@ -9,7 +9,7 @@ " SB", "S " ], - "type": "forge:ore_shaped", + "type": "minecraft:crafting_shaped", "key": { "A": { "tag": "botania:petals/red" @@ -21,5 +21,5 @@ "item": "botania:livingwood_twig" } }, - "group": "botania:twigwand" + "group": "botania:twig_wand" } \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_red_purple.json b/src/main/resources/data/botania/recipes/wands/twigwand_red_purple.json index cdef60ba8..0ddc2c4e6 100644 --- a/src/main/resources/data/botania/recipes/wands/twigwand_red_purple.json +++ b/src/main/resources/data/botania/recipes/wands/twigwand_red_purple.json @@ -1,6 +1,6 @@ { "result": { - "item": "botania:twigwand", + "item": "botania:twig_wand", "data": 0, "nbt": "{color1:14,color2:10}" }, @@ -9,7 +9,7 @@ " SB", "S " ], - "type": "forge:ore_shaped", + "type": "minecraft:crafting_shaped", "key": { "A": { "tag": "botania:petals/red" @@ -21,5 +21,5 @@ "item": "botania:livingwood_twig" } }, - "group": "botania:twigwand" + "group": "botania:twig_wand" } \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_red_red.json b/src/main/resources/data/botania/recipes/wands/twigwand_red_red.json index 11b29dffd..bb59b8476 100644 --- a/src/main/resources/data/botania/recipes/wands/twigwand_red_red.json +++ b/src/main/resources/data/botania/recipes/wands/twigwand_red_red.json @@ -1,6 +1,6 @@ { "result": { - "item": "botania:twigwand", + "item": "botania:twig_wand", "data": 0, "nbt": "{color1:14,color2:14}" }, @@ -9,7 +9,7 @@ " SB", "S " ], - "type": "forge:ore_shaped", + "type": "minecraft:crafting_shaped", "key": { "A": { "tag": "botania:petals/red" @@ -21,5 +21,5 @@ "item": "botania:livingwood_twig" } }, - "group": "botania:twigwand" + "group": "botania:twig_wand" } \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_red_silver.json b/src/main/resources/data/botania/recipes/wands/twigwand_red_silver.json index a090d8d41..ac061466e 100644 --- a/src/main/resources/data/botania/recipes/wands/twigwand_red_silver.json +++ b/src/main/resources/data/botania/recipes/wands/twigwand_red_silver.json @@ -1,6 +1,6 @@ { "result": { - "item": "botania:twigwand", + "item": "botania:twig_wand", "data": 0, "nbt": "{color1:14,color2:8}" }, @@ -9,17 +9,17 @@ " SB", "S " ], - "type": "forge:ore_shaped", + "type": "minecraft:crafting_shaped", "key": { "A": { "tag": "botania:petals/red" }, "B": { - "tag": "botania:petals/lightgray" + "tag": "botania:petals/light_gray" }, "S": { "item": "botania:livingwood_twig" } }, - "group": "botania:twigwand" + "group": "botania:twig_wand" } \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_red_white.json b/src/main/resources/data/botania/recipes/wands/twigwand_red_white.json index 99ef09ece..164624206 100644 --- a/src/main/resources/data/botania/recipes/wands/twigwand_red_white.json +++ b/src/main/resources/data/botania/recipes/wands/twigwand_red_white.json @@ -1,6 +1,6 @@ { "result": { - "item": "botania:twigwand", + "item": "botania:twig_wand", "data": 0, "nbt": "{color1:14,color2:0}" }, @@ -9,7 +9,7 @@ " SB", "S " ], - "type": "forge:ore_shaped", + "type": "minecraft:crafting_shaped", "key": { "A": { "tag": "botania:petals/red" @@ -21,5 +21,5 @@ "item": "botania:livingwood_twig" } }, - "group": "botania:twigwand" + "group": "botania:twig_wand" } \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_red_yellow.json b/src/main/resources/data/botania/recipes/wands/twigwand_red_yellow.json index 6b057044b..49fbe587b 100644 --- a/src/main/resources/data/botania/recipes/wands/twigwand_red_yellow.json +++ b/src/main/resources/data/botania/recipes/wands/twigwand_red_yellow.json @@ -1,6 +1,6 @@ { "result": { - "item": "botania:twigwand", + "item": "botania:twig_wand", "data": 0, "nbt": "{color1:14,color2:4}" }, @@ -9,7 +9,7 @@ " SB", "S " ], - "type": "forge:ore_shaped", + "type": "minecraft:crafting_shaped", "key": { "A": { "tag": "botania:petals/red" @@ -21,5 +21,5 @@ "item": "botania:livingwood_twig" } }, - "group": "botania:twigwand" + "group": "botania:twig_wand" } \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_silver_black.json b/src/main/resources/data/botania/recipes/wands/twigwand_silver_black.json index 71df0bd91..b84cd6f9e 100644 --- a/src/main/resources/data/botania/recipes/wands/twigwand_silver_black.json +++ b/src/main/resources/data/botania/recipes/wands/twigwand_silver_black.json @@ -1,6 +1,6 @@ { "result": { - "item": "botania:twigwand", + "item": "botania:twig_wand", "data": 0, "nbt": "{color1:8,color2:15}" }, @@ -9,10 +9,10 @@ " SB", "S " ], - "type": "forge:ore_shaped", + "type": "minecraft:crafting_shaped", "key": { "A": { - "tag": "botania:petals/lightgray" + "tag": "botania:petals/light_gray" }, "B": { "tag": "botania:petals/black" @@ -21,5 +21,5 @@ "item": "botania:livingwood_twig" } }, - "group": "botania:twigwand" + "group": "botania:twig_wand" } \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_silver_blue.json b/src/main/resources/data/botania/recipes/wands/twigwand_silver_blue.json index f8e33188c..8eb82a4c3 100644 --- a/src/main/resources/data/botania/recipes/wands/twigwand_silver_blue.json +++ b/src/main/resources/data/botania/recipes/wands/twigwand_silver_blue.json @@ -1,6 +1,6 @@ { "result": { - "item": "botania:twigwand", + "item": "botania:twig_wand", "data": 0, "nbt": "{color1:8,color2:11}" }, @@ -9,10 +9,10 @@ " SB", "S " ], - "type": "forge:ore_shaped", + "type": "minecraft:crafting_shaped", "key": { "A": { - "tag": "botania:petals/lightgray" + "tag": "botania:petals/light_gray" }, "B": { "tag": "botania:petals/blue" @@ -21,5 +21,5 @@ "item": "botania:livingwood_twig" } }, - "group": "botania:twigwand" + "group": "botania:twig_wand" } \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_silver_brown.json b/src/main/resources/data/botania/recipes/wands/twigwand_silver_brown.json index cec5423ff..373913bda 100644 --- a/src/main/resources/data/botania/recipes/wands/twigwand_silver_brown.json +++ b/src/main/resources/data/botania/recipes/wands/twigwand_silver_brown.json @@ -1,6 +1,6 @@ { "result": { - "item": "botania:twigwand", + "item": "botania:twig_wand", "data": 0, "nbt": "{color1:8,color2:12}" }, @@ -9,10 +9,10 @@ " SB", "S " ], - "type": "forge:ore_shaped", + "type": "minecraft:crafting_shaped", "key": { "A": { - "tag": "botania:petals/lightgray" + "tag": "botania:petals/light_gray" }, "B": { "tag": "botania:petals/brown" @@ -21,5 +21,5 @@ "item": "botania:livingwood_twig" } }, - "group": "botania:twigwand" + "group": "botania:twig_wand" } \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_silver_cyan.json b/src/main/resources/data/botania/recipes/wands/twigwand_silver_cyan.json index 7eb5914ee..7bc1c15d1 100644 --- a/src/main/resources/data/botania/recipes/wands/twigwand_silver_cyan.json +++ b/src/main/resources/data/botania/recipes/wands/twigwand_silver_cyan.json @@ -1,6 +1,6 @@ { "result": { - "item": "botania:twigwand", + "item": "botania:twig_wand", "data": 0, "nbt": "{color1:8,color2:9}" }, @@ -9,10 +9,10 @@ " SB", "S " ], - "type": "forge:ore_shaped", + "type": "minecraft:crafting_shaped", "key": { "A": { - "tag": "botania:petals/lightgray" + "tag": "botania:petals/light_gray" }, "B": { "tag": "botania:petals/cyan" @@ -21,5 +21,5 @@ "item": "botania:livingwood_twig" } }, - "group": "botania:twigwand" + "group": "botania:twig_wand" } \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_silver_gray.json b/src/main/resources/data/botania/recipes/wands/twigwand_silver_gray.json index 693a0eba1..4c02da5ae 100644 --- a/src/main/resources/data/botania/recipes/wands/twigwand_silver_gray.json +++ b/src/main/resources/data/botania/recipes/wands/twigwand_silver_gray.json @@ -1,6 +1,6 @@ { "result": { - "item": "botania:twigwand", + "item": "botania:twig_wand", "data": 0, "nbt": "{color1:8,color2:7}" }, @@ -9,10 +9,10 @@ " SB", "S " ], - "type": "forge:ore_shaped", + "type": "minecraft:crafting_shaped", "key": { "A": { - "tag": "botania:petals/lightgray" + "tag": "botania:petals/light_gray" }, "B": { "tag": "botania:petals/gray" @@ -21,5 +21,5 @@ "item": "botania:livingwood_twig" } }, - "group": "botania:twigwand" + "group": "botania:twig_wand" } \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_silver_green.json b/src/main/resources/data/botania/recipes/wands/twigwand_silver_green.json index 5fae4b599..56ce7c950 100644 --- a/src/main/resources/data/botania/recipes/wands/twigwand_silver_green.json +++ b/src/main/resources/data/botania/recipes/wands/twigwand_silver_green.json @@ -1,6 +1,6 @@ { "result": { - "item": "botania:twigwand", + "item": "botania:twig_wand", "data": 0, "nbt": "{color1:8,color2:13}" }, @@ -9,10 +9,10 @@ " SB", "S " ], - "type": "forge:ore_shaped", + "type": "minecraft:crafting_shaped", "key": { "A": { - "tag": "botania:petals/lightgray" + "tag": "botania:petals/light_gray" }, "B": { "tag": "botania:petals/green" @@ -21,5 +21,5 @@ "item": "botania:livingwood_twig" } }, - "group": "botania:twigwand" + "group": "botania:twig_wand" } \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_silver_light_blue.json b/src/main/resources/data/botania/recipes/wands/twigwand_silver_light_blue.json index 2382a88e1..ed63eb31f 100644 --- a/src/main/resources/data/botania/recipes/wands/twigwand_silver_light_blue.json +++ b/src/main/resources/data/botania/recipes/wands/twigwand_silver_light_blue.json @@ -1,6 +1,6 @@ { "result": { - "item": "botania:twigwand", + "item": "botania:twig_wand", "data": 0, "nbt": "{color1:8,color2:3}" }, @@ -9,10 +9,10 @@ " SB", "S " ], - "type": "forge:ore_shaped", + "type": "minecraft:crafting_shaped", "key": { "A": { - "tag": "botania:petals/lightgray" + "tag": "botania:petals/light_gray" }, "B": { "tag": "botania:petals/lightblue" @@ -21,5 +21,5 @@ "item": "botania:livingwood_twig" } }, - "group": "botania:twigwand" + "group": "botania:twig_wand" } \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_silver_lime.json b/src/main/resources/data/botania/recipes/wands/twigwand_silver_lime.json index f4bd69a38..a1b87b268 100644 --- a/src/main/resources/data/botania/recipes/wands/twigwand_silver_lime.json +++ b/src/main/resources/data/botania/recipes/wands/twigwand_silver_lime.json @@ -1,6 +1,6 @@ { "result": { - "item": "botania:twigwand", + "item": "botania:twig_wand", "data": 0, "nbt": "{color1:8,color2:5}" }, @@ -9,10 +9,10 @@ " SB", "S " ], - "type": "forge:ore_shaped", + "type": "minecraft:crafting_shaped", "key": { "A": { - "tag": "botania:petals/lightgray" + "tag": "botania:petals/light_gray" }, "B": { "tag": "botania:petals/lime" @@ -21,5 +21,5 @@ "item": "botania:livingwood_twig" } }, - "group": "botania:twigwand" + "group": "botania:twig_wand" } \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_silver_magenta.json b/src/main/resources/data/botania/recipes/wands/twigwand_silver_magenta.json index 06c2d6613..41885541c 100644 --- a/src/main/resources/data/botania/recipes/wands/twigwand_silver_magenta.json +++ b/src/main/resources/data/botania/recipes/wands/twigwand_silver_magenta.json @@ -1,6 +1,6 @@ { "result": { - "item": "botania:twigwand", + "item": "botania:twig_wand", "data": 0, "nbt": "{color1:8,color2:2}" }, @@ -9,10 +9,10 @@ " SB", "S " ], - "type": "forge:ore_shaped", + "type": "minecraft:crafting_shaped", "key": { "A": { - "tag": "botania:petals/lightgray" + "tag": "botania:petals/light_gray" }, "B": { "tag": "botania:petals/magenta" @@ -21,5 +21,5 @@ "item": "botania:livingwood_twig" } }, - "group": "botania:twigwand" + "group": "botania:twig_wand" } \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_silver_orange.json b/src/main/resources/data/botania/recipes/wands/twigwand_silver_orange.json index 0a52ee89f..03f71c428 100644 --- a/src/main/resources/data/botania/recipes/wands/twigwand_silver_orange.json +++ b/src/main/resources/data/botania/recipes/wands/twigwand_silver_orange.json @@ -1,6 +1,6 @@ { "result": { - "item": "botania:twigwand", + "item": "botania:twig_wand", "data": 0, "nbt": "{color1:8,color2:1}" }, @@ -9,10 +9,10 @@ " SB", "S " ], - "type": "forge:ore_shaped", + "type": "minecraft:crafting_shaped", "key": { "A": { - "tag": "botania:petals/lightgray" + "tag": "botania:petals/light_gray" }, "B": { "tag": "botania:petals/orange" @@ -21,5 +21,5 @@ "item": "botania:livingwood_twig" } }, - "group": "botania:twigwand" + "group": "botania:twig_wand" } \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_silver_pink.json b/src/main/resources/data/botania/recipes/wands/twigwand_silver_pink.json index 9f013f378..8a67aaaa9 100644 --- a/src/main/resources/data/botania/recipes/wands/twigwand_silver_pink.json +++ b/src/main/resources/data/botania/recipes/wands/twigwand_silver_pink.json @@ -1,6 +1,6 @@ { "result": { - "item": "botania:twigwand", + "item": "botania:twig_wand", "data": 0, "nbt": "{color1:8,color2:6}" }, @@ -9,10 +9,10 @@ " SB", "S " ], - "type": "forge:ore_shaped", + "type": "minecraft:crafting_shaped", "key": { "A": { - "tag": "botania:petals/lightgray" + "tag": "botania:petals/light_gray" }, "B": { "tag": "botania:petals/pink" @@ -21,5 +21,5 @@ "item": "botania:livingwood_twig" } }, - "group": "botania:twigwand" + "group": "botania:twig_wand" } \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_silver_purple.json b/src/main/resources/data/botania/recipes/wands/twigwand_silver_purple.json index 306ecf705..38350a84c 100644 --- a/src/main/resources/data/botania/recipes/wands/twigwand_silver_purple.json +++ b/src/main/resources/data/botania/recipes/wands/twigwand_silver_purple.json @@ -1,6 +1,6 @@ { "result": { - "item": "botania:twigwand", + "item": "botania:twig_wand", "data": 0, "nbt": "{color1:8,color2:10}" }, @@ -9,10 +9,10 @@ " SB", "S " ], - "type": "forge:ore_shaped", + "type": "minecraft:crafting_shaped", "key": { "A": { - "tag": "botania:petals/lightgray" + "tag": "botania:petals/light_gray" }, "B": { "tag": "botania:petals/purple" @@ -21,5 +21,5 @@ "item": "botania:livingwood_twig" } }, - "group": "botania:twigwand" + "group": "botania:twig_wand" } \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_silver_red.json b/src/main/resources/data/botania/recipes/wands/twigwand_silver_red.json index ce469463b..96dd3037b 100644 --- a/src/main/resources/data/botania/recipes/wands/twigwand_silver_red.json +++ b/src/main/resources/data/botania/recipes/wands/twigwand_silver_red.json @@ -1,6 +1,6 @@ { "result": { - "item": "botania:twigwand", + "item": "botania:twig_wand", "data": 0, "nbt": "{color1:8,color2:14}" }, @@ -9,10 +9,10 @@ " SB", "S " ], - "type": "forge:ore_shaped", + "type": "minecraft:crafting_shaped", "key": { "A": { - "tag": "botania:petals/lightgray" + "tag": "botania:petals/light_gray" }, "B": { "tag": "botania:petals/red" @@ -21,5 +21,5 @@ "item": "botania:livingwood_twig" } }, - "group": "botania:twigwand" + "group": "botania:twig_wand" } \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_silver_silver.json b/src/main/resources/data/botania/recipes/wands/twigwand_silver_silver.json index b70cdc972..19e3eac9d 100644 --- a/src/main/resources/data/botania/recipes/wands/twigwand_silver_silver.json +++ b/src/main/resources/data/botania/recipes/wands/twigwand_silver_silver.json @@ -1,6 +1,6 @@ { "result": { - "item": "botania:twigwand", + "item": "botania:twig_wand", "data": 0, "nbt": "{color1:8,color2:8}" }, @@ -9,17 +9,17 @@ " SB", "S " ], - "type": "forge:ore_shaped", + "type": "minecraft:crafting_shaped", "key": { "A": { - "tag": "botania:petals/lightgray" + "tag": "botania:petals/light_gray" }, "B": { - "tag": "botania:petals/lightgray" + "tag": "botania:petals/light_gray" }, "S": { "item": "botania:livingwood_twig" } }, - "group": "botania:twigwand" + "group": "botania:twig_wand" } \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_silver_white.json b/src/main/resources/data/botania/recipes/wands/twigwand_silver_white.json index 8bac616a9..94de4b1ac 100644 --- a/src/main/resources/data/botania/recipes/wands/twigwand_silver_white.json +++ b/src/main/resources/data/botania/recipes/wands/twigwand_silver_white.json @@ -1,6 +1,6 @@ { "result": { - "item": "botania:twigwand", + "item": "botania:twig_wand", "data": 0, "nbt": "{color1:8,color2:0}" }, @@ -9,10 +9,10 @@ " SB", "S " ], - "type": "forge:ore_shaped", + "type": "minecraft:crafting_shaped", "key": { "A": { - "tag": "botania:petals/lightgray" + "tag": "botania:petals/light_gray" }, "B": { "tag": "botania:petals/white" @@ -21,5 +21,5 @@ "item": "botania:livingwood_twig" } }, - "group": "botania:twigwand" + "group": "botania:twig_wand" } \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_silver_yellow.json b/src/main/resources/data/botania/recipes/wands/twigwand_silver_yellow.json index 79d8bd4a6..963ffbf47 100644 --- a/src/main/resources/data/botania/recipes/wands/twigwand_silver_yellow.json +++ b/src/main/resources/data/botania/recipes/wands/twigwand_silver_yellow.json @@ -1,6 +1,6 @@ { "result": { - "item": "botania:twigwand", + "item": "botania:twig_wand", "data": 0, "nbt": "{color1:8,color2:4}" }, @@ -9,10 +9,10 @@ " SB", "S " ], - "type": "forge:ore_shaped", + "type": "minecraft:crafting_shaped", "key": { "A": { - "tag": "botania:petals/lightgray" + "tag": "botania:petals/light_gray" }, "B": { "tag": "botania:petals/yellow" @@ -21,5 +21,5 @@ "item": "botania:livingwood_twig" } }, - "group": "botania:twigwand" + "group": "botania:twig_wand" } \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_white_black.json b/src/main/resources/data/botania/recipes/wands/twigwand_white_black.json index 9b1a3af0f..d05f64591 100644 --- a/src/main/resources/data/botania/recipes/wands/twigwand_white_black.json +++ b/src/main/resources/data/botania/recipes/wands/twigwand_white_black.json @@ -1,6 +1,6 @@ { "result": { - "item": "botania:twigwand", + "item": "botania:twig_wand", "data": 0, "nbt": "{color1:0,color2:15}" }, @@ -9,7 +9,7 @@ " SB", "S " ], - "type": "forge:ore_shaped", + "type": "minecraft:crafting_shaped", "key": { "A": { "tag": "botania:petals/white" @@ -21,5 +21,5 @@ "item": "botania:livingwood_twig" } }, - "group": "botania:twigwand" + "group": "botania:twig_wand" } \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_white_blue.json b/src/main/resources/data/botania/recipes/wands/twigwand_white_blue.json index 03b1c44f1..b30b41ef3 100644 --- a/src/main/resources/data/botania/recipes/wands/twigwand_white_blue.json +++ b/src/main/resources/data/botania/recipes/wands/twigwand_white_blue.json @@ -1,6 +1,6 @@ { "result": { - "item": "botania:twigwand", + "item": "botania:twig_wand", "data": 0, "nbt": "{color1:0,color2:11}" }, @@ -9,7 +9,7 @@ " SB", "S " ], - "type": "forge:ore_shaped", + "type": "minecraft:crafting_shaped", "key": { "A": { "tag": "botania:petals/white" @@ -21,5 +21,5 @@ "item": "botania:livingwood_twig" } }, - "group": "botania:twigwand" + "group": "botania:twig_wand" } \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_white_brown.json b/src/main/resources/data/botania/recipes/wands/twigwand_white_brown.json index e6d5c8894..ca732eeab 100644 --- a/src/main/resources/data/botania/recipes/wands/twigwand_white_brown.json +++ b/src/main/resources/data/botania/recipes/wands/twigwand_white_brown.json @@ -1,6 +1,6 @@ { "result": { - "item": "botania:twigwand", + "item": "botania:twig_wand", "data": 0, "nbt": "{color1:0,color2:12}" }, @@ -9,7 +9,7 @@ " SB", "S " ], - "type": "forge:ore_shaped", + "type": "minecraft:crafting_shaped", "key": { "A": { "tag": "botania:petals/white" @@ -21,5 +21,5 @@ "item": "botania:livingwood_twig" } }, - "group": "botania:twigwand" + "group": "botania:twig_wand" } \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_white_cyan.json b/src/main/resources/data/botania/recipes/wands/twigwand_white_cyan.json index 26be03e67..166652805 100644 --- a/src/main/resources/data/botania/recipes/wands/twigwand_white_cyan.json +++ b/src/main/resources/data/botania/recipes/wands/twigwand_white_cyan.json @@ -1,6 +1,6 @@ { "result": { - "item": "botania:twigwand", + "item": "botania:twig_wand", "data": 0, "nbt": "{color1:0,color2:9}" }, @@ -9,7 +9,7 @@ " SB", "S " ], - "type": "forge:ore_shaped", + "type": "minecraft:crafting_shaped", "key": { "A": { "tag": "botania:petals/white" @@ -21,5 +21,5 @@ "item": "botania:livingwood_twig" } }, - "group": "botania:twigwand" + "group": "botania:twig_wand" } \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_white_gray.json b/src/main/resources/data/botania/recipes/wands/twigwand_white_gray.json index 0a659b93d..00fc6b38a 100644 --- a/src/main/resources/data/botania/recipes/wands/twigwand_white_gray.json +++ b/src/main/resources/data/botania/recipes/wands/twigwand_white_gray.json @@ -1,6 +1,6 @@ { "result": { - "item": "botania:twigwand", + "item": "botania:twig_wand", "data": 0, "nbt": "{color1:0,color2:7}" }, @@ -9,7 +9,7 @@ " SB", "S " ], - "type": "forge:ore_shaped", + "type": "minecraft:crafting_shaped", "key": { "A": { "tag": "botania:petals/white" @@ -21,5 +21,5 @@ "item": "botania:livingwood_twig" } }, - "group": "botania:twigwand" + "group": "botania:twig_wand" } \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_white_green.json b/src/main/resources/data/botania/recipes/wands/twigwand_white_green.json index a4cdd3dc4..89669f14f 100644 --- a/src/main/resources/data/botania/recipes/wands/twigwand_white_green.json +++ b/src/main/resources/data/botania/recipes/wands/twigwand_white_green.json @@ -1,6 +1,6 @@ { "result": { - "item": "botania:twigwand", + "item": "botania:twig_wand", "data": 0, "nbt": "{color1:0,color2:13}" }, @@ -9,7 +9,7 @@ " SB", "S " ], - "type": "forge:ore_shaped", + "type": "minecraft:crafting_shaped", "key": { "A": { "tag": "botania:petals/white" @@ -21,5 +21,5 @@ "item": "botania:livingwood_twig" } }, - "group": "botania:twigwand" + "group": "botania:twig_wand" } \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_white_light_blue.json b/src/main/resources/data/botania/recipes/wands/twigwand_white_light_blue.json index 02e668cc5..13546978d 100644 --- a/src/main/resources/data/botania/recipes/wands/twigwand_white_light_blue.json +++ b/src/main/resources/data/botania/recipes/wands/twigwand_white_light_blue.json @@ -1,6 +1,6 @@ { "result": { - "item": "botania:twigwand", + "item": "botania:twig_wand", "data": 0, "nbt": "{color1:0,color2:3}" }, @@ -9,7 +9,7 @@ " SB", "S " ], - "type": "forge:ore_shaped", + "type": "minecraft:crafting_shaped", "key": { "A": { "tag": "botania:petals/white" @@ -21,5 +21,5 @@ "item": "botania:livingwood_twig" } }, - "group": "botania:twigwand" + "group": "botania:twig_wand" } \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_white_lime.json b/src/main/resources/data/botania/recipes/wands/twigwand_white_lime.json index 7885dbd00..86e69ea05 100644 --- a/src/main/resources/data/botania/recipes/wands/twigwand_white_lime.json +++ b/src/main/resources/data/botania/recipes/wands/twigwand_white_lime.json @@ -1,6 +1,6 @@ { "result": { - "item": "botania:twigwand", + "item": "botania:twig_wand", "data": 0, "nbt": "{color1:0,color2:5}" }, @@ -9,7 +9,7 @@ " SB", "S " ], - "type": "forge:ore_shaped", + "type": "minecraft:crafting_shaped", "key": { "A": { "tag": "botania:petals/white" @@ -21,5 +21,5 @@ "item": "botania:livingwood_twig" } }, - "group": "botania:twigwand" + "group": "botania:twig_wand" } \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_white_magenta.json b/src/main/resources/data/botania/recipes/wands/twigwand_white_magenta.json index 0232043f8..c53404b6a 100644 --- a/src/main/resources/data/botania/recipes/wands/twigwand_white_magenta.json +++ b/src/main/resources/data/botania/recipes/wands/twigwand_white_magenta.json @@ -1,6 +1,6 @@ { "result": { - "item": "botania:twigwand", + "item": "botania:twig_wand", "data": 0, "nbt": "{color1:0,color2:2}" }, @@ -9,7 +9,7 @@ " SB", "S " ], - "type": "forge:ore_shaped", + "type": "minecraft:crafting_shaped", "key": { "A": { "tag": "botania:petals/white" @@ -21,5 +21,5 @@ "item": "botania:livingwood_twig" } }, - "group": "botania:twigwand" + "group": "botania:twig_wand" } \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_white_orange.json b/src/main/resources/data/botania/recipes/wands/twigwand_white_orange.json index 5942eab6f..041fe40e3 100644 --- a/src/main/resources/data/botania/recipes/wands/twigwand_white_orange.json +++ b/src/main/resources/data/botania/recipes/wands/twigwand_white_orange.json @@ -1,6 +1,6 @@ { "result": { - "item": "botania:twigwand", + "item": "botania:twig_wand", "data": 0, "nbt": "{color1:0,color2:1}" }, @@ -9,7 +9,7 @@ " SB", "S " ], - "type": "forge:ore_shaped", + "type": "minecraft:crafting_shaped", "key": { "A": { "tag": "botania:petals/white" @@ -21,5 +21,5 @@ "item": "botania:livingwood_twig" } }, - "group": "botania:twigwand" + "group": "botania:twig_wand" } \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_white_pink.json b/src/main/resources/data/botania/recipes/wands/twigwand_white_pink.json index cfd448949..369618c10 100644 --- a/src/main/resources/data/botania/recipes/wands/twigwand_white_pink.json +++ b/src/main/resources/data/botania/recipes/wands/twigwand_white_pink.json @@ -1,6 +1,6 @@ { "result": { - "item": "botania:twigwand", + "item": "botania:twig_wand", "data": 0, "nbt": "{color1:0,color2:6}" }, @@ -9,7 +9,7 @@ " SB", "S " ], - "type": "forge:ore_shaped", + "type": "minecraft:crafting_shaped", "key": { "A": { "tag": "botania:petals/white" @@ -21,5 +21,5 @@ "item": "botania:livingwood_twig" } }, - "group": "botania:twigwand" + "group": "botania:twig_wand" } \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_white_purple.json b/src/main/resources/data/botania/recipes/wands/twigwand_white_purple.json index e6208ee8a..426eb872e 100644 --- a/src/main/resources/data/botania/recipes/wands/twigwand_white_purple.json +++ b/src/main/resources/data/botania/recipes/wands/twigwand_white_purple.json @@ -1,6 +1,6 @@ { "result": { - "item": "botania:twigwand", + "item": "botania:twig_wand", "data": 0, "nbt": "{color1:0,color2:10}" }, @@ -9,7 +9,7 @@ " SB", "S " ], - "type": "forge:ore_shaped", + "type": "minecraft:crafting_shaped", "key": { "A": { "tag": "botania:petals/white" @@ -21,5 +21,5 @@ "item": "botania:livingwood_twig" } }, - "group": "botania:twigwand" + "group": "botania:twig_wand" } \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_white_red.json b/src/main/resources/data/botania/recipes/wands/twigwand_white_red.json index 12e980f03..5ae7006a9 100644 --- a/src/main/resources/data/botania/recipes/wands/twigwand_white_red.json +++ b/src/main/resources/data/botania/recipes/wands/twigwand_white_red.json @@ -1,6 +1,6 @@ { "result": { - "item": "botania:twigwand", + "item": "botania:twig_wand", "data": 0, "nbt": "{color1:0,color2:14}" }, @@ -9,7 +9,7 @@ " SB", "S " ], - "type": "forge:ore_shaped", + "type": "minecraft:crafting_shaped", "key": { "A": { "tag": "botania:petals/white" @@ -21,5 +21,5 @@ "item": "botania:livingwood_twig" } }, - "group": "botania:twigwand" + "group": "botania:twig_wand" } \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_white_silver.json b/src/main/resources/data/botania/recipes/wands/twigwand_white_silver.json index 11bc22fd4..363438898 100644 --- a/src/main/resources/data/botania/recipes/wands/twigwand_white_silver.json +++ b/src/main/resources/data/botania/recipes/wands/twigwand_white_silver.json @@ -1,6 +1,6 @@ { "result": { - "item": "botania:twigwand", + "item": "botania:twig_wand", "data": 0, "nbt": "{color1:0,color2:8}" }, @@ -9,17 +9,17 @@ " SB", "S " ], - "type": "forge:ore_shaped", + "type": "minecraft:crafting_shaped", "key": { "A": { "tag": "botania:petals/white" }, "B": { - "tag": "botania:petals/lightgray" + "tag": "botania:petals/light_gray" }, "S": { "item": "botania:livingwood_twig" } }, - "group": "botania:twigwand" + "group": "botania:twig_wand" } \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_white_white.json b/src/main/resources/data/botania/recipes/wands/twigwand_white_white.json index 7b5fd3cbf..978391187 100644 --- a/src/main/resources/data/botania/recipes/wands/twigwand_white_white.json +++ b/src/main/resources/data/botania/recipes/wands/twigwand_white_white.json @@ -1,6 +1,6 @@ { "result": { - "item": "botania:twigwand", + "item": "botania:twig_wand", "data": 0, "nbt": "{color1:0,color2:0}" }, @@ -9,7 +9,7 @@ " SB", "S " ], - "type": "forge:ore_shaped", + "type": "minecraft:crafting_shaped", "key": { "A": { "tag": "botania:petals/white" @@ -21,5 +21,5 @@ "item": "botania:livingwood_twig" } }, - "group": "botania:twigwand" + "group": "botania:twig_wand" } \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_white_yellow.json b/src/main/resources/data/botania/recipes/wands/twigwand_white_yellow.json index 64c7bcfe7..66274669f 100644 --- a/src/main/resources/data/botania/recipes/wands/twigwand_white_yellow.json +++ b/src/main/resources/data/botania/recipes/wands/twigwand_white_yellow.json @@ -1,6 +1,6 @@ { "result": { - "item": "botania:twigwand", + "item": "botania:twig_wand", "data": 0, "nbt": "{color1:0,color2:4}" }, @@ -9,7 +9,7 @@ " SB", "S " ], - "type": "forge:ore_shaped", + "type": "minecraft:crafting_shaped", "key": { "A": { "tag": "botania:petals/white" @@ -21,5 +21,5 @@ "item": "botania:livingwood_twig" } }, - "group": "botania:twigwand" + "group": "botania:twig_wand" } \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_yellow_black.json b/src/main/resources/data/botania/recipes/wands/twigwand_yellow_black.json index 6ea79b9b4..a3e521815 100644 --- a/src/main/resources/data/botania/recipes/wands/twigwand_yellow_black.json +++ b/src/main/resources/data/botania/recipes/wands/twigwand_yellow_black.json @@ -1,6 +1,6 @@ { "result": { - "item": "botania:twigwand", + "item": "botania:twig_wand", "data": 0, "nbt": "{color1:4,color2:15}" }, @@ -9,7 +9,7 @@ " SB", "S " ], - "type": "forge:ore_shaped", + "type": "minecraft:crafting_shaped", "key": { "A": { "tag": "botania:petals/yellow" @@ -21,5 +21,5 @@ "item": "botania:livingwood_twig" } }, - "group": "botania:twigwand" + "group": "botania:twig_wand" } \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_yellow_blue.json b/src/main/resources/data/botania/recipes/wands/twigwand_yellow_blue.json index 9e31d8c52..84255ea14 100644 --- a/src/main/resources/data/botania/recipes/wands/twigwand_yellow_blue.json +++ b/src/main/resources/data/botania/recipes/wands/twigwand_yellow_blue.json @@ -1,6 +1,6 @@ { "result": { - "item": "botania:twigwand", + "item": "botania:twig_wand", "data": 0, "nbt": "{color1:4,color2:11}" }, @@ -9,7 +9,7 @@ " SB", "S " ], - "type": "forge:ore_shaped", + "type": "minecraft:crafting_shaped", "key": { "A": { "tag": "botania:petals/yellow" @@ -21,5 +21,5 @@ "item": "botania:livingwood_twig" } }, - "group": "botania:twigwand" + "group": "botania:twig_wand" } \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_yellow_brown.json b/src/main/resources/data/botania/recipes/wands/twigwand_yellow_brown.json index 36848d78d..b6028a762 100644 --- a/src/main/resources/data/botania/recipes/wands/twigwand_yellow_brown.json +++ b/src/main/resources/data/botania/recipes/wands/twigwand_yellow_brown.json @@ -1,6 +1,6 @@ { "result": { - "item": "botania:twigwand", + "item": "botania:twig_wand", "data": 0, "nbt": "{color1:4,color2:12}" }, @@ -9,7 +9,7 @@ " SB", "S " ], - "type": "forge:ore_shaped", + "type": "minecraft:crafting_shaped", "key": { "A": { "tag": "botania:petals/yellow" @@ -21,5 +21,5 @@ "item": "botania:livingwood_twig" } }, - "group": "botania:twigwand" + "group": "botania:twig_wand" } \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_yellow_cyan.json b/src/main/resources/data/botania/recipes/wands/twigwand_yellow_cyan.json index 6f0dcf2fc..d2198b0e5 100644 --- a/src/main/resources/data/botania/recipes/wands/twigwand_yellow_cyan.json +++ b/src/main/resources/data/botania/recipes/wands/twigwand_yellow_cyan.json @@ -1,6 +1,6 @@ { "result": { - "item": "botania:twigwand", + "item": "botania:twig_wand", "data": 0, "nbt": "{color1:4,color2:9}" }, @@ -9,7 +9,7 @@ " SB", "S " ], - "type": "forge:ore_shaped", + "type": "minecraft:crafting_shaped", "key": { "A": { "tag": "botania:petals/yellow" @@ -21,5 +21,5 @@ "item": "botania:livingwood_twig" } }, - "group": "botania:twigwand" + "group": "botania:twig_wand" } \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_yellow_gray.json b/src/main/resources/data/botania/recipes/wands/twigwand_yellow_gray.json index 89ba7b52b..1c913f5a4 100644 --- a/src/main/resources/data/botania/recipes/wands/twigwand_yellow_gray.json +++ b/src/main/resources/data/botania/recipes/wands/twigwand_yellow_gray.json @@ -1,6 +1,6 @@ { "result": { - "item": "botania:twigwand", + "item": "botania:twig_wand", "data": 0, "nbt": "{color1:4,color2:7}" }, @@ -9,7 +9,7 @@ " SB", "S " ], - "type": "forge:ore_shaped", + "type": "minecraft:crafting_shaped", "key": { "A": { "tag": "botania:petals/yellow" @@ -21,5 +21,5 @@ "item": "botania:livingwood_twig" } }, - "group": "botania:twigwand" + "group": "botania:twig_wand" } \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_yellow_green.json b/src/main/resources/data/botania/recipes/wands/twigwand_yellow_green.json index 020b6fb02..9fe5e9bd7 100644 --- a/src/main/resources/data/botania/recipes/wands/twigwand_yellow_green.json +++ b/src/main/resources/data/botania/recipes/wands/twigwand_yellow_green.json @@ -1,6 +1,6 @@ { "result": { - "item": "botania:twigwand", + "item": "botania:twig_wand", "data": 0, "nbt": "{color1:4,color2:13}" }, @@ -9,7 +9,7 @@ " SB", "S " ], - "type": "forge:ore_shaped", + "type": "minecraft:crafting_shaped", "key": { "A": { "tag": "botania:petals/yellow" @@ -21,5 +21,5 @@ "item": "botania:livingwood_twig" } }, - "group": "botania:twigwand" + "group": "botania:twig_wand" } \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_yellow_light_blue.json b/src/main/resources/data/botania/recipes/wands/twigwand_yellow_light_blue.json index a739a9c55..0cda422f2 100644 --- a/src/main/resources/data/botania/recipes/wands/twigwand_yellow_light_blue.json +++ b/src/main/resources/data/botania/recipes/wands/twigwand_yellow_light_blue.json @@ -1,6 +1,6 @@ { "result": { - "item": "botania:twigwand", + "item": "botania:twig_wand", "data": 0, "nbt": "{color1:4,color2:3}" }, @@ -9,7 +9,7 @@ " SB", "S " ], - "type": "forge:ore_shaped", + "type": "minecraft:crafting_shaped", "key": { "A": { "tag": "botania:petals/yellow" @@ -21,5 +21,5 @@ "item": "botania:livingwood_twig" } }, - "group": "botania:twigwand" + "group": "botania:twig_wand" } \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_yellow_lime.json b/src/main/resources/data/botania/recipes/wands/twigwand_yellow_lime.json index 993335f3f..4a749b1a3 100644 --- a/src/main/resources/data/botania/recipes/wands/twigwand_yellow_lime.json +++ b/src/main/resources/data/botania/recipes/wands/twigwand_yellow_lime.json @@ -1,6 +1,6 @@ { "result": { - "item": "botania:twigwand", + "item": "botania:twig_wand", "data": 0, "nbt": "{color1:4,color2:5}" }, @@ -9,7 +9,7 @@ " SB", "S " ], - "type": "forge:ore_shaped", + "type": "minecraft:crafting_shaped", "key": { "A": { "tag": "botania:petals/yellow" @@ -21,5 +21,5 @@ "item": "botania:livingwood_twig" } }, - "group": "botania:twigwand" + "group": "botania:twig_wand" } \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_yellow_magenta.json b/src/main/resources/data/botania/recipes/wands/twigwand_yellow_magenta.json index 40222fdcf..01bd22875 100644 --- a/src/main/resources/data/botania/recipes/wands/twigwand_yellow_magenta.json +++ b/src/main/resources/data/botania/recipes/wands/twigwand_yellow_magenta.json @@ -1,6 +1,6 @@ { "result": { - "item": "botania:twigwand", + "item": "botania:twig_wand", "data": 0, "nbt": "{color1:4,color2:2}" }, @@ -9,7 +9,7 @@ " SB", "S " ], - "type": "forge:ore_shaped", + "type": "minecraft:crafting_shaped", "key": { "A": { "tag": "botania:petals/yellow" @@ -21,5 +21,5 @@ "item": "botania:livingwood_twig" } }, - "group": "botania:twigwand" + "group": "botania:twig_wand" } \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_yellow_orange.json b/src/main/resources/data/botania/recipes/wands/twigwand_yellow_orange.json index c44373b21..64c323045 100644 --- a/src/main/resources/data/botania/recipes/wands/twigwand_yellow_orange.json +++ b/src/main/resources/data/botania/recipes/wands/twigwand_yellow_orange.json @@ -1,6 +1,6 @@ { "result": { - "item": "botania:twigwand", + "item": "botania:twig_wand", "data": 0, "nbt": "{color1:4,color2:1}" }, @@ -9,7 +9,7 @@ " SB", "S " ], - "type": "forge:ore_shaped", + "type": "minecraft:crafting_shaped", "key": { "A": { "tag": "botania:petals/yellow" @@ -21,5 +21,5 @@ "item": "botania:livingwood_twig" } }, - "group": "botania:twigwand" + "group": "botania:twig_wand" } \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_yellow_pink.json b/src/main/resources/data/botania/recipes/wands/twigwand_yellow_pink.json index 32e39a98e..8bb204fad 100644 --- a/src/main/resources/data/botania/recipes/wands/twigwand_yellow_pink.json +++ b/src/main/resources/data/botania/recipes/wands/twigwand_yellow_pink.json @@ -1,6 +1,6 @@ { "result": { - "item": "botania:twigwand", + "item": "botania:twig_wand", "data": 0, "nbt": "{color1:4,color2:6}" }, @@ -9,7 +9,7 @@ " SB", "S " ], - "type": "forge:ore_shaped", + "type": "minecraft:crafting_shaped", "key": { "A": { "tag": "botania:petals/yellow" @@ -21,5 +21,5 @@ "item": "botania:livingwood_twig" } }, - "group": "botania:twigwand" + "group": "botania:twig_wand" } \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_yellow_purple.json b/src/main/resources/data/botania/recipes/wands/twigwand_yellow_purple.json index 6dbcb2d34..d7141a706 100644 --- a/src/main/resources/data/botania/recipes/wands/twigwand_yellow_purple.json +++ b/src/main/resources/data/botania/recipes/wands/twigwand_yellow_purple.json @@ -1,6 +1,6 @@ { "result": { - "item": "botania:twigwand", + "item": "botania:twig_wand", "data": 0, "nbt": "{color1:4,color2:10}" }, @@ -9,7 +9,7 @@ " SB", "S " ], - "type": "forge:ore_shaped", + "type": "minecraft:crafting_shaped", "key": { "A": { "tag": "botania:petals/yellow" @@ -21,5 +21,5 @@ "item": "botania:livingwood_twig" } }, - "group": "botania:twigwand" + "group": "botania:twig_wand" } \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_yellow_red.json b/src/main/resources/data/botania/recipes/wands/twigwand_yellow_red.json index 617692dcc..91c1383e3 100644 --- a/src/main/resources/data/botania/recipes/wands/twigwand_yellow_red.json +++ b/src/main/resources/data/botania/recipes/wands/twigwand_yellow_red.json @@ -1,6 +1,6 @@ { "result": { - "item": "botania:twigwand", + "item": "botania:twig_wand", "data": 0, "nbt": "{color1:4,color2:14}" }, @@ -9,7 +9,7 @@ " SB", "S " ], - "type": "forge:ore_shaped", + "type": "minecraft:crafting_shaped", "key": { "A": { "tag": "botania:petals/yellow" @@ -21,5 +21,5 @@ "item": "botania:livingwood_twig" } }, - "group": "botania:twigwand" + "group": "botania:twig_wand" } \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_yellow_silver.json b/src/main/resources/data/botania/recipes/wands/twigwand_yellow_silver.json index a2b0ae566..8a5eb6c01 100644 --- a/src/main/resources/data/botania/recipes/wands/twigwand_yellow_silver.json +++ b/src/main/resources/data/botania/recipes/wands/twigwand_yellow_silver.json @@ -1,6 +1,6 @@ { "result": { - "item": "botania:twigwand", + "item": "botania:twig_wand", "data": 0, "nbt": "{color1:4,color2:8}" }, @@ -9,17 +9,17 @@ " SB", "S " ], - "type": "forge:ore_shaped", + "type": "minecraft:crafting_shaped", "key": { "A": { "tag": "botania:petals/yellow" }, "B": { - "tag": "botania:petals/lightgray" + "tag": "botania:petals/light_gray" }, "S": { "item": "botania:livingwood_twig" } }, - "group": "botania:twigwand" + "group": "botania:twig_wand" } \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_yellow_white.json b/src/main/resources/data/botania/recipes/wands/twigwand_yellow_white.json index 07453ca2c..91cae1bce 100644 --- a/src/main/resources/data/botania/recipes/wands/twigwand_yellow_white.json +++ b/src/main/resources/data/botania/recipes/wands/twigwand_yellow_white.json @@ -1,6 +1,6 @@ { "result": { - "item": "botania:twigwand", + "item": "botania:twig_wand", "data": 0, "nbt": "{color1:4,color2:0}" }, @@ -9,7 +9,7 @@ " SB", "S " ], - "type": "forge:ore_shaped", + "type": "minecraft:crafting_shaped", "key": { "A": { "tag": "botania:petals/yellow" @@ -21,5 +21,5 @@ "item": "botania:livingwood_twig" } }, - "group": "botania:twigwand" + "group": "botania:twig_wand" } \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_yellow_yellow.json b/src/main/resources/data/botania/recipes/wands/twigwand_yellow_yellow.json index 270dfc0fe..672ddf4b8 100644 --- a/src/main/resources/data/botania/recipes/wands/twigwand_yellow_yellow.json +++ b/src/main/resources/data/botania/recipes/wands/twigwand_yellow_yellow.json @@ -1,6 +1,6 @@ { "result": { - "item": "botania:twigwand", + "item": "botania:twig_wand", "data": 0, "nbt": "{color1:4,color2:4}" }, @@ -9,7 +9,7 @@ " SB", "S " ], - "type": "forge:ore_shaped", + "type": "minecraft:crafting_shaped", "key": { "A": { "tag": "botania:petals/yellow" @@ -21,5 +21,5 @@ "item": "botania:livingwood_twig" } }, - "group": "botania:twigwand" + "group": "botania:twig_wand" } \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/waterring.json b/src/main/resources/data/botania/recipes/waterring.json index eb9831216..b646ceec3 100644 --- a/src/main/resources/data/botania/recipes/waterring.json +++ b/src/main/resources/data/botania/recipes/waterring.json @@ -7,7 +7,7 @@ "M M", "SM " ], - "type": "forge:ore_shaped", + "type": "minecraft:crafting_shaped", "key": { "P": { "item": "minecraft:fish", diff --git a/src/main/resources/data/botania/recipes/waterrod.json b/src/main/resources/data/botania/recipes/waterrod.json index 2a9538668..c555f4f42 100644 --- a/src/main/resources/data/botania/recipes/waterrod.json +++ b/src/main/resources/data/botania/recipes/waterrod.json @@ -7,7 +7,7 @@ " T ", "R " ], - "type": "forge:ore_shaped", + "type": "minecraft:crafting_shaped", "key": { "B": { "type": "minecraft:item_nbt", diff --git a/src/main/resources/data/botania/recipes/web.json b/src/main/resources/data/botania/recipes/web.json index 8429e3a2b..892cca67c 100644 --- a/src/main/resources/data/botania/recipes/web.json +++ b/src/main/resources/data/botania/recipes/web.json @@ -7,7 +7,7 @@ " M ", "S S" ], - "type": "forge:ore_shaped", + "type": "minecraft:crafting_shaped", "key": { "S": { "item": "minecraft:string" diff --git a/src/main/resources/data/botania/recipes/white_petal_block.json b/src/main/resources/data/botania/recipes/white_petal_block.json index 2a871005c..f08d4c410 100644 --- a/src/main/resources/data/botania/recipes/white_petal_block.json +++ b/src/main/resources/data/botania/recipes/white_petal_block.json @@ -7,7 +7,7 @@ "PPP", "PPP" ], - "type": "forge:ore_shaped", + "type": "minecraft:crafting_shaped", "group": "botania:petal_block", "key": { "P": { diff --git a/src/main/resources/data/botania/recipes/worldseed.json b/src/main/resources/data/botania/recipes/worldseed.json index 4215ade4d..332ded671 100644 --- a/src/main/resources/data/botania/recipes/worldseed.json +++ b/src/main/resources/data/botania/recipes/worldseed.json @@ -8,7 +8,7 @@ "S", "D" ], - "type": "forge:ore_shaped", + "type": "minecraft:crafting_shaped", "key": { "S": { "item": "minecraft:wheat_seeds" diff --git a/src/main/resources/data/botania/recipes/yellow_petal_block.json b/src/main/resources/data/botania/recipes/yellow_petal_block.json index 1dde8ee52..72268ebdd 100644 --- a/src/main/resources/data/botania/recipes/yellow_petal_block.json +++ b/src/main/resources/data/botania/recipes/yellow_petal_block.json @@ -7,7 +7,7 @@ "PPP", "PPP" ], - "type": "forge:ore_shaped", + "type": "minecraft:crafting_shaped", "group": "botania:petal_block", "key": { "P": {