From e76559a3f790cfcbb9d5003e29b50f57c95721cf Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Thu, 21 Mar 2019 17:12:49 -0500 Subject: [PATCH] Fix more recipes --- .../data/botania/recipes/_constants.json | 32 +++++++++---------- ...emycatalyst.json => alchemy_catalyst.json} | 2 +- ...alfheimportal.json => alfheim_portal.json} | 2 +- ...animatedtorch.json => animated_torch.json} | 2 +- .../botania/recipes/apotehcary_desert.json | 3 +- .../botania/recipes/apothecary_forest.json | 3 +- .../botania/recipes/apothecary_fungal.json | 3 +- .../data/botania/recipes/apothecary_mesa.json | 3 +- .../botania/recipes/apothecary_mountain.json | 3 +- .../botania/recipes/apothecary_plains.json | 3 +- .../botania/recipes/apothecary_swamp.json | 3 +- .../botania/recipes/apothecary_taiga.json | 3 +- .../recipes/{auraring.json => aura_ring.json} | 2 +- ...inggreater.json => aura_ring_greater.json} | 2 +- ...ftinghalo.json => auto_crafting_halo.json} | 4 +-- .../blue_petal_block_deconstruct.json | 2 +- .../brown_petal_block_deconstruct.json | 2 +- .../cyan_petal_block_deconstruct.json | 2 +- .../gray_petal_block_deconstruct.json | 2 +- .../green_petal_block_deconstruct.json | 2 +- .../light_blue_petal_block_deconstruct.json | 2 +- .../lime_petal_block_deconstruct.json | 2 +- .../magenta_petal_block_deconstruct.json | 2 +- .../orange_petal_block_deconstruct.json | 2 +- .../pink_petal_block_deconstruct.json | 2 +- .../purple_petal_block_deconstruct.json | 2 +- .../red_petal_block_deconstruct.json | 2 +- .../silver_petal_block_deconstruct.json | 2 +- .../white_petal_block_deconstruct.json | 2 +- .../yellow_petal_block_deconstruct.json | 2 +- .../recipes/cosmetic_alien_antenna.json | 2 +- .../recipes/cosmetic_anaglyph_glasses.json | 2 +- .../recipes/cosmetic_ancient_mask.json | 2 +- .../recipes/cosmetic_botanist_emblem.json | 2 +- .../botania/recipes/cosmetic_clock_eye.json | 2 +- .../botania/recipes/cosmetic_devil_horns.json | 2 +- .../botania/recipes/cosmetic_eerie_mask.json | 2 +- .../recipes/cosmetic_four_leaf_clover.json | 2 +- .../recipes/cosmetic_groucho_glasses.json | 2 +- .../botania/recipes/cosmetic_hyper_plus.json | 2 +- .../recipes/cosmetic_lusitanic_shield.json | 2 +- .../recipes/cosmetic_orange_shades.json | 2 +- .../recipes/cosmetic_questgiver_mark.json | 2 +- .../recipes/cosmetic_thick_eyebrows.json | 2 +- ...ic_32.json => cosmetic_thinking_hand.json} | 5 ++- .../recipes/cosmetic_tiny_potato_mask.json | 2 +- .../recipes/cosmetic_unicorn_horn.json | 2 +- .../data/botania/recipes/dye_black.json | 2 +- .../data/botania/recipes/dye_blue.json | 2 +- .../data/botania/recipes/dye_brown.json | 2 +- .../data/botania/recipes/dye_cyan.json | 2 +- .../data/botania/recipes/dye_gray.json | 2 +- .../data/botania/recipes/dye_green.json | 2 +- .../data/botania/recipes/dye_light_blue.json | 2 +- .../data/botania/recipes/dye_lime.json | 2 +- .../data/botania/recipes/dye_magenta.json | 2 +- .../botania/recipes/dye_magenta_double.json | 2 +- .../data/botania/recipes/dye_orange.json | 2 +- .../data/botania/recipes/dye_pink.json | 2 +- .../data/botania/recipes/dye_pink_double.json | 2 +- .../data/botania/recipes/dye_purple.json | 2 +- .../data/botania/recipes/dye_red.json | 2 +- .../data/botania/recipes/dye_red_double.json | 2 +- .../data/botania/recipes/dye_silver.json | 2 +- .../data/botania/recipes/dye_white.json | 2 +- .../data/botania/recipes/dye_yellow.json | 2 +- .../botania/recipes/dye_yellow_double.json | 2 +- .../data/botania/recipes/mushroom_0.json | 2 +- .../data/botania/recipes/mushroom_1.json | 2 +- .../data/botania/recipes/mushroom_10.json | 2 +- .../data/botania/recipes/mushroom_11.json | 2 +- .../data/botania/recipes/mushroom_12.json | 2 +- .../data/botania/recipes/mushroom_13.json | 2 +- .../data/botania/recipes/mushroom_14.json | 2 +- .../data/botania/recipes/mushroom_15.json | 2 +- .../data/botania/recipes/mushroom_2.json | 2 +- .../data/botania/recipes/mushroom_3.json | 2 +- .../data/botania/recipes/mushroom_4.json | 2 +- .../data/botania/recipes/mushroom_5.json | 2 +- .../data/botania/recipes/mushroom_6.json | 2 +- .../data/botania/recipes/mushroom_7.json | 2 +- .../data/botania/recipes/mushroom_8.json | 2 +- .../data/botania/recipes/mushroom_9.json | 2 +- .../recipes/{swapring.json => swap_ring.json} | 2 +- ...erancestone.json => temperance_stone.json} | 3 +- .../recipes/{terraaxe.json => terra_axe.json} | 2 +- .../{terraplate.json => terra_plate.json} | 2 +- .../{terrasword.json => terra_sword.json} | 2 +- .../{terraformrod.json => terraform_rod.json} | 4 +-- ...{teruterubozu.json => teru_teru_bozu.json} | 2 +- .../recipes/{thirdeye.json => third_eye.json} | 2 +- .../{thundersword.json => thunder_sword.json} | 4 +-- .../{tinyplanet.json => tiny_planet.json} | 2 +- ...lanetblock.json => tiny_planet_block.json} | 4 +-- .../{tornadorod.json => tornado_rod.json} | 2 +- .../{travelbelt.json => travel_belt.json} | 2 +- .../{unholycloak.json => unholy_cloak.json} | 2 +- .../resources/data/botania/recipes/vial.json | 1 - .../recipes/{vineball.json => vine_ball.json} | 2 +- .../{waterring.json => water_ring.json} | 2 +- .../recipes/{waterrod.json => water_rod.json} | 2 +- .../{worldseed.json => world_seed.json} | 2 +- 102 files changed, 121 insertions(+), 132 deletions(-) rename src/main/resources/data/botania/recipes/{alchemycatalyst.json => alchemy_catalyst.json} (89%) rename src/main/resources/data/botania/recipes/{alfheimportal.json => alfheim_portal.json} (86%) rename src/main/resources/data/botania/recipes/{animatedtorch.json => animated_torch.json} (85%) rename src/main/resources/data/botania/recipes/{auraring.json => aura_ring.json} (88%) rename src/main/resources/data/botania/recipes/{auraringgreater.json => aura_ring_greater.json} (82%) rename src/main/resources/data/botania/recipes/{autocraftinghalo.json => auto_crafting_halo.json} (65%) rename src/main/resources/data/botania/recipes/{cosmetic_32.json => cosmetic_thinking_hand.json} (70%) rename src/main/resources/data/botania/recipes/{swapring.json => swap_ring.json} (87%) rename src/main/resources/data/botania/recipes/{temperancestone.json => temperance_stone.json} (80%) rename src/main/resources/data/botania/recipes/{terraaxe.json => terra_axe.json} (90%) rename src/main/resources/data/botania/recipes/{terraplate.json => terra_plate.json} (93%) rename src/main/resources/data/botania/recipes/{terrasword.json => terra_sword.json} (87%) rename src/main/resources/data/botania/recipes/{terraformrod.json => terraform_rod.json} (87%) rename src/main/resources/data/botania/recipes/{teruterubozu.json => teru_teru_bozu.json} (87%) rename src/main/resources/data/botania/recipes/{thirdeye.json => third_eye.json} (92%) rename src/main/resources/data/botania/recipes/{thundersword.json => thunder_sword.json} (81%) rename src/main/resources/data/botania/recipes/{tinyplanet.json => tiny_planet.json} (89%) rename src/main/resources/data/botania/recipes/{tinyplanetblock.json => tiny_planet_block.json} (71%) rename src/main/resources/data/botania/recipes/{tornadorod.json => tornado_rod.json} (89%) rename src/main/resources/data/botania/recipes/{travelbelt.json => travel_belt.json} (90%) rename src/main/resources/data/botania/recipes/{unholycloak.json => unholy_cloak.json} (89%) rename src/main/resources/data/botania/recipes/{vineball.json => vine_ball.json} (84%) rename src/main/resources/data/botania/recipes/{waterring.json => water_ring.json} (91%) rename src/main/resources/data/botania/recipes/{waterrod.json => water_rod.json} (92%) rename src/main/resources/data/botania/recipes/{worldseed.json => world_seed.json} (89%) diff --git a/src/main/resources/data/botania/recipes/_constants.json b/src/main/resources/data/botania/recipes/_constants.json index c7216a81a..29849f0ef 100644 --- a/src/main/resources/data/botania/recipes/_constants.json +++ b/src/main/resources/data/botania/recipes/_constants.json @@ -1,22 +1,22 @@ [ { "ingredient": [ - { "item": "botania:dye_white" }, - { "item": "botania:dye_orange" }, - { "item": "botania:dye_magenta" }, - { "item": "botania:dye_light_blue" }, - { "item": "botania:dye_yellow" }, - { "item": "botania:dye_lime" }, - { "item": "botania:dye_pink" }, - { "item": "botania:dye_gray" }, - { "item": "botania:dye_silver" }, - { "item": "botania:dye_cyan" }, - { "item": "botania:dye_purple" }, - { "item": "botania:dye_blue" }, - { "item": "botania:dye_brown" }, - { "item": "botania:dye_green" }, - { "item": "botania:dye_red" }, - { "item": "botania:dye_black" } + { "item": "botania:white_dye" }, + { "item": "botania:orange_dye" }, + { "item": "botania:magenta_dye" }, + { "item": "botania:light_blue_dye" }, + { "item": "botania:yellow_dye" }, + { "item": "botania:lime_dye" }, + { "item": "botania:pink_dye" }, + { "item": "botania:gray_dye" }, + { "item": "botania:silver_dye" }, + { "item": "botania:cyan_dye" }, + { "item": "botania:purple_dye" }, + { "item": "botania:blue_dye" }, + { "item": "botania:brown_dye" }, + { "item": "botania:green_dye" }, + { "item": "botania:red_dye" }, + { "item": "botania:black_dye" } ], "name": "all_dyes" }, diff --git a/src/main/resources/data/botania/recipes/alchemycatalyst.json b/src/main/resources/data/botania/recipes/alchemy_catalyst.json similarity index 89% rename from src/main/resources/data/botania/recipes/alchemycatalyst.json rename to src/main/resources/data/botania/recipes/alchemy_catalyst.json index 536aafbc8..f521229b6 100644 --- a/src/main/resources/data/botania/recipes/alchemycatalyst.json +++ b/src/main/resources/data/botania/recipes/alchemy_catalyst.json @@ -1,6 +1,6 @@ { "result": { - "item": "botania:alchemycatalyst" + "item": "botania:alchemy_catalyst" }, "pattern": [ "SGS", diff --git a/src/main/resources/data/botania/recipes/alfheimportal.json b/src/main/resources/data/botania/recipes/alfheim_portal.json similarity index 86% rename from src/main/resources/data/botania/recipes/alfheimportal.json rename to src/main/resources/data/botania/recipes/alfheim_portal.json index 2e64d36c3..b98aa9c2e 100644 --- a/src/main/resources/data/botania/recipes/alfheimportal.json +++ b/src/main/resources/data/botania/recipes/alfheim_portal.json @@ -1,6 +1,6 @@ { "result": { - "item": "botania:alfheimportal" + "item": "botania:alfheim_portal" }, "pattern": [ "WTW", diff --git a/src/main/resources/data/botania/recipes/animatedtorch.json b/src/main/resources/data/botania/recipes/animated_torch.json similarity index 85% rename from src/main/resources/data/botania/recipes/animatedtorch.json rename to src/main/resources/data/botania/recipes/animated_torch.json index 96e321e74..fb62a32a8 100644 --- a/src/main/resources/data/botania/recipes/animatedtorch.json +++ b/src/main/resources/data/botania/recipes/animated_torch.json @@ -1,6 +1,6 @@ { "result": { - "item": "botania:animatedtorch" + "item": "botania:animated_torch" }, "pattern": [ "D", diff --git a/src/main/resources/data/botania/recipes/apotehcary_desert.json b/src/main/resources/data/botania/recipes/apotehcary_desert.json index 02db1bead..08df5ea6f 100644 --- a/src/main/resources/data/botania/recipes/apotehcary_desert.json +++ b/src/main/resources/data/botania/recipes/apotehcary_desert.json @@ -14,8 +14,7 @@ "item": "botania:apothecary_default" }, "S": { - "item": "botania:biomestonea", - "data": 13 + "item": "botania:metamorphic_desert_cobblestone" } } } \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/apothecary_forest.json b/src/main/resources/data/botania/recipes/apothecary_forest.json index 5f8093df9..45573f26e 100644 --- a/src/main/resources/data/botania/recipes/apothecary_forest.json +++ b/src/main/resources/data/botania/recipes/apothecary_forest.json @@ -14,8 +14,7 @@ "item": "botania:apothecary_default" }, "S": { - "item": "botania:biomestonea", - "data": 8 + "item": "botania:metamorphic_forest_cobblestone" } } } \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/apothecary_fungal.json b/src/main/resources/data/botania/recipes/apothecary_fungal.json index 35f32e44c..7dbde57aa 100644 --- a/src/main/resources/data/botania/recipes/apothecary_fungal.json +++ b/src/main/resources/data/botania/recipes/apothecary_fungal.json @@ -14,8 +14,7 @@ "item": "botania:apothecary_default" }, "S": { - "item": "botania:biomestonea", - "data": 11 + "item": "botania:metamorphic_fungal_cobblestone" } } } \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/apothecary_mesa.json b/src/main/resources/data/botania/recipes/apothecary_mesa.json index 8cd49ae7f..2fe79d947 100644 --- a/src/main/resources/data/botania/recipes/apothecary_mesa.json +++ b/src/main/resources/data/botania/recipes/apothecary_mesa.json @@ -14,8 +14,7 @@ "item": "botania:apothecary_default" }, "S": { - "item": "botania:biomestonea", - "data": 15 + "item": "botania:metamorphic_mesa_cobblestone" } } } \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/apothecary_mountain.json b/src/main/resources/data/botania/recipes/apothecary_mountain.json index 72a89e7ea..a6c6c4cb5 100644 --- a/src/main/resources/data/botania/recipes/apothecary_mountain.json +++ b/src/main/resources/data/botania/recipes/apothecary_mountain.json @@ -14,8 +14,7 @@ "item": "botania:apothecary_default" }, "S": { - "item": "botania:biomestonea", - "data": 10 + "item": "botania:metamorphic_mountain_cobblestone" } } } \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/apothecary_plains.json b/src/main/resources/data/botania/recipes/apothecary_plains.json index 9a16a4691..25492ddc8 100644 --- a/src/main/resources/data/botania/recipes/apothecary_plains.json +++ b/src/main/resources/data/botania/recipes/apothecary_plains.json @@ -14,8 +14,7 @@ "item": "botania:apothecary_default" }, "S": { - "item": "botania:biomestonea", - "data": 9 + "item": "botania:metamorphic_plains_cobblestone" } } } \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/apothecary_swamp.json b/src/main/resources/data/botania/recipes/apothecary_swamp.json index 05d12afcf..45dd90267 100644 --- a/src/main/resources/data/botania/recipes/apothecary_swamp.json +++ b/src/main/resources/data/botania/recipes/apothecary_swamp.json @@ -14,8 +14,7 @@ "item": "botania:apothecary_default" }, "S": { - "item": "botania:biomestonea", - "data": 12 + "item": "botania:metamorphic_swamp_cobblestone" } } } \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/apothecary_taiga.json b/src/main/resources/data/botania/recipes/apothecary_taiga.json index 8c8ec6f7b..33ee07d4e 100644 --- a/src/main/resources/data/botania/recipes/apothecary_taiga.json +++ b/src/main/resources/data/botania/recipes/apothecary_taiga.json @@ -14,8 +14,7 @@ "item": "botania:apothecary_default" }, "S": { - "item": "botania:biomestonea", - "data": 14 + "item": "botania:metamorphic_taiga_cobblestone" } } } \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/auraring.json b/src/main/resources/data/botania/recipes/aura_ring.json similarity index 88% rename from src/main/resources/data/botania/recipes/auraring.json rename to src/main/resources/data/botania/recipes/aura_ring.json index 94f583bd8..d3fea0304 100644 --- a/src/main/resources/data/botania/recipes/auraring.json +++ b/src/main/resources/data/botania/recipes/aura_ring.json @@ -1,6 +1,6 @@ { "result": { - "item": "botania:auraring" + "item": "botania:aura_ring" }, "pattern": [ "RI ", diff --git a/src/main/resources/data/botania/recipes/auraringgreater.json b/src/main/resources/data/botania/recipes/aura_ring_greater.json similarity index 82% rename from src/main/resources/data/botania/recipes/auraringgreater.json rename to src/main/resources/data/botania/recipes/aura_ring_greater.json index 84bfefb94..1ad4f6bd8 100644 --- a/src/main/resources/data/botania/recipes/auraringgreater.json +++ b/src/main/resources/data/botania/recipes/aura_ring_greater.json @@ -1,6 +1,6 @@ { "result": { - "item": "botania:auraringgreater" + "item": "botania:aura_ring_greater" }, "ingredients": [ { diff --git a/src/main/resources/data/botania/recipes/autocraftinghalo.json b/src/main/resources/data/botania/recipes/auto_crafting_halo.json similarity index 65% rename from src/main/resources/data/botania/recipes/autocraftinghalo.json rename to src/main/resources/data/botania/recipes/auto_crafting_halo.json index 665fda0eb..7cfdd4148 100644 --- a/src/main/resources/data/botania/recipes/autocraftinghalo.json +++ b/src/main/resources/data/botania/recipes/auto_crafting_halo.json @@ -1,10 +1,10 @@ { "result": { - "item": "botania:autocraftinghalo" + "item": "botania:auto_crafting_halo" }, "ingredients": [ { - "item": "botania:craftinghalo" + "item": "botania:crafting_halo" }, { "tag": "forge:gems/mana_diamond" 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 96cfe552e..68abf7bb9 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": "blue_petal", + "item": "botania: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 b4b25fa99..d818446c6 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": "brown_petal", + "item": "botania: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 52ff851fa..6a92d0427 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": "cyan_petal", + "item": "botania:cyan_petal", "count": 9 }, "group": "botania:petal_block_deconstruct", 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 ea5ca3970..b7b27d03f 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": "gray_petal", + "item": "botania: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 a0786775a..432af08db 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": "green_petal", + "item": "botania: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 b4abaa0b6..230e00159 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": "light_blue_petal", + "item": "botania: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 2c7d6ef5b..5cf445219 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": "lime_petal", + "item": "botania: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 5ff1a809b..d8cfd8439 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": "magenta_petal", + "item": "botania:magenta_petal", "count": 9 }, "group": "botania:petal_block_deconstruct", 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 34f16125f..a3068f38f 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": "orange_petal", + "item": "botania: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 037000df0..b02149066 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": "pink_petal", + "item": "botania: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 d59c29933..3ba5f6dab 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": "purple_petal", + "item": "botania: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 b84a31d6e..d3689f0d3 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": "red_petal", + "item": "botania: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 177d4fc8d..27eec5a5e 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": "silver_petal", + "item": "botania:silver_petal", "count": 9 }, "group": "botania:petal_block_deconstruct", 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 5e8a640c2..ed46f6bc5 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": "white_petal", + "item": "botania: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 ebb24ec5e..9cc2d7745 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": "yellow_petal", + "item": "botania:yellow_petal", "count": 9 }, "group": "botania:petal_block_deconstruct", 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 da600854e..0f46a4e3a 100644 --- a/src/main/resources/data/botania/recipes/cosmetic_alien_antenna.json +++ b/src/main/resources/data/botania/recipes/cosmetic_alien_antenna.json @@ -10,7 +10,7 @@ "type": "minecraft:crafting_shaped", "key": { "P": { - "item": "botania:dye_silver" + "item": "botania:silver_dye" }, "S": { "item": "botania:mana_string" 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 60bc8bf39..7c5ce7a7d 100644 --- a/src/main/resources/data/botania/recipes/cosmetic_anaglyph_glasses.json +++ b/src/main/resources/data/botania/recipes/cosmetic_anaglyph_glasses.json @@ -10,7 +10,7 @@ "type": "minecraft:crafting_shaped", "key": { "P": { - "item": "botania:dye_cyan" + "item": "botania:cyan_dye" }, "S": { "item": "botania:mana_string" 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 94a096404..2edb2a918 100644 --- a/src/main/resources/data/botania/recipes/cosmetic_ancient_mask.json +++ b/src/main/resources/data/botania/recipes/cosmetic_ancient_mask.json @@ -10,7 +10,7 @@ "type": "minecraft:crafting_shaped", "key": { "P": { - "item": "botania:dye_pink" + "item": "botania:pink_dye" }, "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 400ccee95..ff203d1e0 100644 --- a/src/main/resources/data/botania/recipes/cosmetic_botanist_emblem.json +++ b/src/main/resources/data/botania/recipes/cosmetic_botanist_emblem.json @@ -10,7 +10,7 @@ "type": "minecraft:crafting_shaped", "key": { "P": { - "item": "botania:dye_lime" + "item": "botania:lime_dye" }, "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 5789ee8c7..e79892859 100644 --- a/src/main/resources/data/botania/recipes/cosmetic_clock_eye.json +++ b/src/main/resources/data/botania/recipes/cosmetic_clock_eye.json @@ -10,7 +10,7 @@ "type": "minecraft:crafting_shaped", "key": { "P": { - "item": "botania:dye_orange" + "item": "botania:orange_dye" }, "S": { "item": "botania:mana_string" 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 f6a97462b..555a5b33d 100644 --- a/src/main/resources/data/botania/recipes/cosmetic_devil_horns.json +++ b/src/main/resources/data/botania/recipes/cosmetic_devil_horns.json @@ -10,7 +10,7 @@ "type": "minecraft:crafting_shaped", "key": { "P": { - "item": "botania:dye_light_blue" + "item": "botania:light_blue_dye" }, "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 07f4936bd..9783bf0a7 100644 --- a/src/main/resources/data/botania/recipes/cosmetic_eerie_mask.json +++ b/src/main/resources/data/botania/recipes/cosmetic_eerie_mask.json @@ -10,7 +10,7 @@ "type": "minecraft:crafting_shaped", "key": { "P": { - "item": "botania:dye_gray" + "item": "botania:gray_dye" }, "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 b112fe60c..7d317e8e0 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 @@ -10,7 +10,7 @@ "type": "minecraft:crafting_shaped", "key": { "P": { - "item": "botania:dye_white" + "item": "botania:white_dye" }, "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 4290e328b..3fec5ee4c 100644 --- a/src/main/resources/data/botania/recipes/cosmetic_groucho_glasses.json +++ b/src/main/resources/data/botania/recipes/cosmetic_groucho_glasses.json @@ -10,7 +10,7 @@ "type": "minecraft:crafting_shaped", "key": { "P": { - "item": "botania:dye_blue" + "item": "botania:blue_dye" }, "S": { "item": "botania:mana_string" 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 16f8c048e..1c3bf96ab 100644 --- a/src/main/resources/data/botania/recipes/cosmetic_hyper_plus.json +++ b/src/main/resources/data/botania/recipes/cosmetic_hyper_plus.json @@ -10,7 +10,7 @@ "type": "minecraft:crafting_shaped", "key": { "P": { - "item": "botania:dye_yellow" + "item": "botania:yellow_dye" }, "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 e0938106d..a9b38b0e1 100644 --- a/src/main/resources/data/botania/recipes/cosmetic_lusitanic_shield.json +++ b/src/main/resources/data/botania/recipes/cosmetic_lusitanic_shield.json @@ -10,7 +10,7 @@ "type": "minecraft:crafting_shaped", "key": { "P": { - "item": "botania:dye_green" + "item": "botania:green_dye" }, "S": { "item": "botania:mana_string" 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 9f959b971..8235b1462 100644 --- a/src/main/resources/data/botania/recipes/cosmetic_orange_shades.json +++ b/src/main/resources/data/botania/recipes/cosmetic_orange_shades.json @@ -10,7 +10,7 @@ "type": "minecraft:crafting_shaped", "key": { "P": { - "item": "botania:dye_purple" + "item": "botania:purple_dye" }, "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 092e6feb5..5c5bc7a1b 100644 --- a/src/main/resources/data/botania/recipes/cosmetic_questgiver_mark.json +++ b/src/main/resources/data/botania/recipes/cosmetic_questgiver_mark.json @@ -10,7 +10,7 @@ "type": "minecraft:crafting_shaped", "key": { "P": { - "item": "botania:dye_black" + "item": "botania:black_dye" }, "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 ea0bc348c..ade1ff716 100644 --- a/src/main/resources/data/botania/recipes/cosmetic_thick_eyebrows.json +++ b/src/main/resources/data/botania/recipes/cosmetic_thick_eyebrows.json @@ -10,7 +10,7 @@ "type": "minecraft:crafting_shaped", "key": { "P": { - "item": "botania:dye_brown" + "item": "botania:brown_dye" }, "S": { "item": "botania:mana_string" diff --git a/src/main/resources/data/botania/recipes/cosmetic_32.json b/src/main/resources/data/botania/recipes/cosmetic_thinking_hand.json similarity index 70% rename from src/main/resources/data/botania/recipes/cosmetic_32.json rename to src/main/resources/data/botania/recipes/cosmetic_thinking_hand.json index 7e9469846..8f90d73fa 100644 --- a/src/main/resources/data/botania/recipes/cosmetic_32.json +++ b/src/main/resources/data/botania/recipes/cosmetic_thinking_hand.json @@ -1,7 +1,6 @@ { "result": { - "item": "botania:cosmetic", - "data": 32 + "item": "botania:cosmetic_thinking_hand" }, "pattern": [ "PPP", @@ -11,7 +10,7 @@ "type": "minecraft:crafting_shaped", "key": { "P": { - "item": "botania:tinypotato" + "item": "botania:tiny_potato" }, "S": { "item": "botania:mana_string" 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 65109a373..796ec9950 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 @@ -10,7 +10,7 @@ "type": "minecraft:crafting_shaped", "key": { "P": { - "item": "botania:dye_red" + "item": "botania:red_dye" }, "S": { "item": "botania:mana_string" 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 2a8a71b5b..fdb113e8e 100644 --- a/src/main/resources/data/botania/recipes/cosmetic_unicorn_horn.json +++ b/src/main/resources/data/botania/recipes/cosmetic_unicorn_horn.json @@ -10,7 +10,7 @@ "type": "minecraft:crafting_shaped", "key": { "P": { - "item": "botania:dye_magenta" + "item": "botania:magenta_dye" }, "S": { "item": "botania:mana_string" diff --git a/src/main/resources/data/botania/recipes/dye_black.json b/src/main/resources/data/botania/recipes/dye_black.json index f2e14318f..6028d8269 100644 --- a/src/main/resources/data/botania/recipes/dye_black.json +++ b/src/main/resources/data/botania/recipes/dye_black.json @@ -1,6 +1,6 @@ { "result": { - "item": "botania:dye_black" + "item": "botania:black_dye" }, "group": "botania:dye", "ingredients": [ diff --git a/src/main/resources/data/botania/recipes/dye_blue.json b/src/main/resources/data/botania/recipes/dye_blue.json index 07441cd9e..0f870ea5e 100644 --- a/src/main/resources/data/botania/recipes/dye_blue.json +++ b/src/main/resources/data/botania/recipes/dye_blue.json @@ -1,6 +1,6 @@ { "result": { - "item": "botania:dye_blue" + "item": "botania:blue_dye" }, "group": "botania:dye", "ingredients": [ diff --git a/src/main/resources/data/botania/recipes/dye_brown.json b/src/main/resources/data/botania/recipes/dye_brown.json index d2291f240..02b4c7f7e 100644 --- a/src/main/resources/data/botania/recipes/dye_brown.json +++ b/src/main/resources/data/botania/recipes/dye_brown.json @@ -1,6 +1,6 @@ { "result": { - "item": "botania:dye_brown" + "item": "botania:brown_dye" }, "group": "botania:dye", "ingredients": [ diff --git a/src/main/resources/data/botania/recipes/dye_cyan.json b/src/main/resources/data/botania/recipes/dye_cyan.json index 63e2869ae..13bd08ea2 100644 --- a/src/main/resources/data/botania/recipes/dye_cyan.json +++ b/src/main/resources/data/botania/recipes/dye_cyan.json @@ -1,6 +1,6 @@ { "result": { - "item": "botania:dye_cyan" + "item": "botania:cyan_dye" }, "group": "botania:dye", "ingredients": [ diff --git a/src/main/resources/data/botania/recipes/dye_gray.json b/src/main/resources/data/botania/recipes/dye_gray.json index 3aa96929c..215cbc7a2 100644 --- a/src/main/resources/data/botania/recipes/dye_gray.json +++ b/src/main/resources/data/botania/recipes/dye_gray.json @@ -1,6 +1,6 @@ { "result": { - "item": "botania:dye_gray" + "item": "botania:gray_dye" }, "group": "botania:dye", "ingredients": [ diff --git a/src/main/resources/data/botania/recipes/dye_green.json b/src/main/resources/data/botania/recipes/dye_green.json index d3972b4d2..bab8da8af 100644 --- a/src/main/resources/data/botania/recipes/dye_green.json +++ b/src/main/resources/data/botania/recipes/dye_green.json @@ -1,6 +1,6 @@ { "result": { - "item": "botania:dye_green" + "item": "botania:green_dye" }, "group": "botania:dye", "ingredients": [ 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 1bbb1ca25..942695c4a 100644 --- a/src/main/resources/data/botania/recipes/dye_light_blue.json +++ b/src/main/resources/data/botania/recipes/dye_light_blue.json @@ -1,6 +1,6 @@ { "result": { - "item": "botania:dye_light_blue" + "item": "botania:light_blue_dye" }, "group": "botania:dye", "ingredients": [ diff --git a/src/main/resources/data/botania/recipes/dye_lime.json b/src/main/resources/data/botania/recipes/dye_lime.json index 9707e157d..69ca6456f 100644 --- a/src/main/resources/data/botania/recipes/dye_lime.json +++ b/src/main/resources/data/botania/recipes/dye_lime.json @@ -1,6 +1,6 @@ { "result": { - "item": "botania:dye_lime" + "item": "botania:lime_dye" }, "group": "botania:dye", "ingredients": [ diff --git a/src/main/resources/data/botania/recipes/dye_magenta.json b/src/main/resources/data/botania/recipes/dye_magenta.json index b3980e868..d6042f19a 100644 --- a/src/main/resources/data/botania/recipes/dye_magenta.json +++ b/src/main/resources/data/botania/recipes/dye_magenta.json @@ -1,6 +1,6 @@ { "result": { - "item": "botania:dye_magenta" + "item": "botania:magenta_dye" }, "group": "botania:dye", "ingredients": [ 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 7c5057b04..52ea2301d 100644 --- a/src/main/resources/data/botania/recipes/dye_magenta_double.json +++ b/src/main/resources/data/botania/recipes/dye_magenta_double.json @@ -1,6 +1,6 @@ { "result": { - "item": "botania:dye_magenta", + "item": "botania:magenta_dye", "count": 2 }, "group": "botania:dye_double", diff --git a/src/main/resources/data/botania/recipes/dye_orange.json b/src/main/resources/data/botania/recipes/dye_orange.json index b1676b8ea..9a09d5fbd 100644 --- a/src/main/resources/data/botania/recipes/dye_orange.json +++ b/src/main/resources/data/botania/recipes/dye_orange.json @@ -1,6 +1,6 @@ { "result": { - "item": "botania:dye_orange" + "item": "botania:orange_dye" }, "group": "botania:dye", "ingredients": [ diff --git a/src/main/resources/data/botania/recipes/dye_pink.json b/src/main/resources/data/botania/recipes/dye_pink.json index df504e995..61735ac4a 100644 --- a/src/main/resources/data/botania/recipes/dye_pink.json +++ b/src/main/resources/data/botania/recipes/dye_pink.json @@ -1,6 +1,6 @@ { "result": { - "item": "botania:dye_pink" + "item": "botania:pink_dye" }, "group": "botania:dye", "ingredients": [ 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 48a4cefae..7de7a4d5d 100644 --- a/src/main/resources/data/botania/recipes/dye_pink_double.json +++ b/src/main/resources/data/botania/recipes/dye_pink_double.json @@ -1,6 +1,6 @@ { "result": { - "item": "botania:dye_pink", + "item": "botania:pink_dye", "count": 2 }, "group": "botania:dye_double", diff --git a/src/main/resources/data/botania/recipes/dye_purple.json b/src/main/resources/data/botania/recipes/dye_purple.json index f7935d64b..b5246b6d4 100644 --- a/src/main/resources/data/botania/recipes/dye_purple.json +++ b/src/main/resources/data/botania/recipes/dye_purple.json @@ -1,6 +1,6 @@ { "result": { - "item": "botania:dye_purple" + "item": "botania:purple_dye" }, "group": "botania:dye", "ingredients": [ diff --git a/src/main/resources/data/botania/recipes/dye_red.json b/src/main/resources/data/botania/recipes/dye_red.json index 4db3b464e..401a6eb04 100644 --- a/src/main/resources/data/botania/recipes/dye_red.json +++ b/src/main/resources/data/botania/recipes/dye_red.json @@ -1,6 +1,6 @@ { "result": { - "item": "botania:dye_red" + "item": "botania:red_dye" }, "group": "botania:dye", "ingredients": [ 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 a099f82fd..2df4411b6 100644 --- a/src/main/resources/data/botania/recipes/dye_red_double.json +++ b/src/main/resources/data/botania/recipes/dye_red_double.json @@ -1,6 +1,6 @@ { "result": { - "item": "botania:dye_red", + "item": "botania:red_dye", "count": 2 }, "group": "botania:dye_double", diff --git a/src/main/resources/data/botania/recipes/dye_silver.json b/src/main/resources/data/botania/recipes/dye_silver.json index 96f9b9cbc..b81302c3d 100644 --- a/src/main/resources/data/botania/recipes/dye_silver.json +++ b/src/main/resources/data/botania/recipes/dye_silver.json @@ -1,6 +1,6 @@ { "result": { - "item": "botania:dye_silver" + "item": "botania:silver_dye" }, "group": "botania:dye", "ingredients": [ diff --git a/src/main/resources/data/botania/recipes/dye_white.json b/src/main/resources/data/botania/recipes/dye_white.json index 9bded71a3..6dc6b0d2c 100644 --- a/src/main/resources/data/botania/recipes/dye_white.json +++ b/src/main/resources/data/botania/recipes/dye_white.json @@ -1,6 +1,6 @@ { "result": { - "item": "botania:dye_white" + "item": "botania:white_dye" }, "group": "botania:dye", "ingredients": [ diff --git a/src/main/resources/data/botania/recipes/dye_yellow.json b/src/main/resources/data/botania/recipes/dye_yellow.json index abc63cebf..1823655c4 100644 --- a/src/main/resources/data/botania/recipes/dye_yellow.json +++ b/src/main/resources/data/botania/recipes/dye_yellow.json @@ -1,6 +1,6 @@ { "result": { - "item": "botania:dye_yellow" + "item": "botania:yellow_dye" }, "group": "botania:dye", "ingredients": [ 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 b77f7bd73..3ce6739aa 100644 --- a/src/main/resources/data/botania/recipes/dye_yellow_double.json +++ b/src/main/resources/data/botania/recipes/dye_yellow_double.json @@ -1,6 +1,6 @@ { "result": { - "item": "botania:dye_yellow", + "item": "botania:yellow_dye", "count": 2 }, "group": "botania:dye_double", diff --git a/src/main/resources/data/botania/recipes/mushroom_0.json b/src/main/resources/data/botania/recipes/mushroom_0.json index 9e474a252..645951b0f 100644 --- a/src/main/resources/data/botania/recipes/mushroom_0.json +++ b/src/main/resources/data/botania/recipes/mushroom_0.json @@ -14,7 +14,7 @@ } ], { - "item": "botania:dye_white" + "item": "botania:white_dye" } ], "type": "minecraft:crafting_shapeless" diff --git a/src/main/resources/data/botania/recipes/mushroom_1.json b/src/main/resources/data/botania/recipes/mushroom_1.json index 249b89121..bae44030e 100644 --- a/src/main/resources/data/botania/recipes/mushroom_1.json +++ b/src/main/resources/data/botania/recipes/mushroom_1.json @@ -14,7 +14,7 @@ } ], { - "item": "botania:dye_orange" + "item": "botania:orange_dye" } ], "type": "minecraft:crafting_shapeless" diff --git a/src/main/resources/data/botania/recipes/mushroom_10.json b/src/main/resources/data/botania/recipes/mushroom_10.json index fa04c331c..f26741d08 100644 --- a/src/main/resources/data/botania/recipes/mushroom_10.json +++ b/src/main/resources/data/botania/recipes/mushroom_10.json @@ -14,7 +14,7 @@ } ], { - "item": "botania:dye_purple" + "item": "botania:purple_dye" } ], "type": "minecraft:crafting_shapeless" diff --git a/src/main/resources/data/botania/recipes/mushroom_11.json b/src/main/resources/data/botania/recipes/mushroom_11.json index 68ab18758..3bd929ef1 100644 --- a/src/main/resources/data/botania/recipes/mushroom_11.json +++ b/src/main/resources/data/botania/recipes/mushroom_11.json @@ -14,7 +14,7 @@ } ], { - "item": "botania:dye_blue" + "item": "botania:blue_dye" } ], "type": "minecraft:crafting_shapeless" diff --git a/src/main/resources/data/botania/recipes/mushroom_12.json b/src/main/resources/data/botania/recipes/mushroom_12.json index f13b5e43a..41683e0dd 100644 --- a/src/main/resources/data/botania/recipes/mushroom_12.json +++ b/src/main/resources/data/botania/recipes/mushroom_12.json @@ -14,7 +14,7 @@ } ], { - "item": "botania:dye_brown" + "item": "botania:brown_dye" } ], "type": "minecraft:crafting_shapeless" diff --git a/src/main/resources/data/botania/recipes/mushroom_13.json b/src/main/resources/data/botania/recipes/mushroom_13.json index 1afcd29e1..1dddba8ef 100644 --- a/src/main/resources/data/botania/recipes/mushroom_13.json +++ b/src/main/resources/data/botania/recipes/mushroom_13.json @@ -14,7 +14,7 @@ } ], { - "item": "botania:dye_green" + "item": "botania:green_dye" } ], "type": "minecraft:crafting_shapeless" diff --git a/src/main/resources/data/botania/recipes/mushroom_14.json b/src/main/resources/data/botania/recipes/mushroom_14.json index f52c8cef8..a07bf1c90 100644 --- a/src/main/resources/data/botania/recipes/mushroom_14.json +++ b/src/main/resources/data/botania/recipes/mushroom_14.json @@ -14,7 +14,7 @@ } ], { - "item": "botania:dye_red" + "item": "botania:red_dye" } ], "type": "minecraft:crafting_shapeless" diff --git a/src/main/resources/data/botania/recipes/mushroom_15.json b/src/main/resources/data/botania/recipes/mushroom_15.json index 27b8a8628..55ef32921 100644 --- a/src/main/resources/data/botania/recipes/mushroom_15.json +++ b/src/main/resources/data/botania/recipes/mushroom_15.json @@ -14,7 +14,7 @@ } ], { - "item": "botania:dye_black" + "item": "botania:black_dye" } ], "type": "minecraft:crafting_shapeless" diff --git a/src/main/resources/data/botania/recipes/mushroom_2.json b/src/main/resources/data/botania/recipes/mushroom_2.json index 92197c0c9..779664055 100644 --- a/src/main/resources/data/botania/recipes/mushroom_2.json +++ b/src/main/resources/data/botania/recipes/mushroom_2.json @@ -14,7 +14,7 @@ } ], { - "item": "botania:dye_magenta" + "item": "botania:magenta_dye" } ], "type": "minecraft:crafting_shapeless" diff --git a/src/main/resources/data/botania/recipes/mushroom_3.json b/src/main/resources/data/botania/recipes/mushroom_3.json index 0c383ca1e..8a0de38eb 100644 --- a/src/main/resources/data/botania/recipes/mushroom_3.json +++ b/src/main/resources/data/botania/recipes/mushroom_3.json @@ -14,7 +14,7 @@ } ], { - "item": "botania:dye_light_blue" + "item": "botania:light_blue_dye" } ], "type": "minecraft:crafting_shapeless" diff --git a/src/main/resources/data/botania/recipes/mushroom_4.json b/src/main/resources/data/botania/recipes/mushroom_4.json index 537d881c8..790a44917 100644 --- a/src/main/resources/data/botania/recipes/mushroom_4.json +++ b/src/main/resources/data/botania/recipes/mushroom_4.json @@ -14,7 +14,7 @@ } ], { - "item": "botania:dye_yellow" + "item": "botania:yellow_dye" } ], "type": "minecraft:crafting_shapeless" diff --git a/src/main/resources/data/botania/recipes/mushroom_5.json b/src/main/resources/data/botania/recipes/mushroom_5.json index 53e67b803..258789a82 100644 --- a/src/main/resources/data/botania/recipes/mushroom_5.json +++ b/src/main/resources/data/botania/recipes/mushroom_5.json @@ -14,7 +14,7 @@ } ], { - "item": "botania:dye_lime" + "item": "botania:lime_dye" } ], "type": "minecraft:crafting_shapeless" diff --git a/src/main/resources/data/botania/recipes/mushroom_6.json b/src/main/resources/data/botania/recipes/mushroom_6.json index 275bd5eac..0d76d5d3a 100644 --- a/src/main/resources/data/botania/recipes/mushroom_6.json +++ b/src/main/resources/data/botania/recipes/mushroom_6.json @@ -14,7 +14,7 @@ } ], { - "item": "botania:dye_pink" + "item": "botania:pink_dye" } ], "type": "minecraft:crafting_shapeless" diff --git a/src/main/resources/data/botania/recipes/mushroom_7.json b/src/main/resources/data/botania/recipes/mushroom_7.json index 9750b3e2b..bedb2bae6 100644 --- a/src/main/resources/data/botania/recipes/mushroom_7.json +++ b/src/main/resources/data/botania/recipes/mushroom_7.json @@ -14,7 +14,7 @@ } ], { - "item": "botania:dye_gray" + "item": "botania:gray_dye" } ], "type": "minecraft:crafting_shapeless" diff --git a/src/main/resources/data/botania/recipes/mushroom_8.json b/src/main/resources/data/botania/recipes/mushroom_8.json index 74f3a9f89..fbcfbce91 100644 --- a/src/main/resources/data/botania/recipes/mushroom_8.json +++ b/src/main/resources/data/botania/recipes/mushroom_8.json @@ -14,7 +14,7 @@ } ], { - "item": "botania:dye_silver" + "item": "botania:silver_dye" } ], "type": "minecraft:crafting_shapeless" diff --git a/src/main/resources/data/botania/recipes/mushroom_9.json b/src/main/resources/data/botania/recipes/mushroom_9.json index 443caddd5..cba422514 100644 --- a/src/main/resources/data/botania/recipes/mushroom_9.json +++ b/src/main/resources/data/botania/recipes/mushroom_9.json @@ -14,7 +14,7 @@ } ], { - "item": "botania:dye_cyan" + "item": "botania:cyan_dye" } ], "type": "minecraft:crafting_shapeless" diff --git a/src/main/resources/data/botania/recipes/swapring.json b/src/main/resources/data/botania/recipes/swap_ring.json similarity index 87% rename from src/main/resources/data/botania/recipes/swapring.json rename to src/main/resources/data/botania/recipes/swap_ring.json index dca3d1efa..70fc7553c 100644 --- a/src/main/resources/data/botania/recipes/swapring.json +++ b/src/main/resources/data/botania/recipes/swap_ring.json @@ -1,6 +1,6 @@ { "result": { - "item": "botania:swapring" + "item": "botania:swap_ring" }, "pattern": [ "CM ", diff --git a/src/main/resources/data/botania/recipes/temperancestone.json b/src/main/resources/data/botania/recipes/temperance_stone.json similarity index 80% rename from src/main/resources/data/botania/recipes/temperancestone.json rename to src/main/resources/data/botania/recipes/temperance_stone.json index 9a2306f1b..aedfa2862 100644 --- a/src/main/resources/data/botania/recipes/temperancestone.json +++ b/src/main/resources/data/botania/recipes/temperance_stone.json @@ -1,7 +1,6 @@ { "result": { - "item": "botania:temperancestone", - "data": 0 + "item": "botania:temperance_stone" }, "pattern": [ " S ", diff --git a/src/main/resources/data/botania/recipes/terraaxe.json b/src/main/resources/data/botania/recipes/terra_axe.json similarity index 90% rename from src/main/resources/data/botania/recipes/terraaxe.json rename to src/main/resources/data/botania/recipes/terra_axe.json index e508b8b9f..da1e55534 100644 --- a/src/main/resources/data/botania/recipes/terraaxe.json +++ b/src/main/resources/data/botania/recipes/terra_axe.json @@ -1,6 +1,6 @@ { "result": { - "item": "botania:terraaxe" + "item": "botania:terra_axe" }, "pattern": [ "TTG", diff --git a/src/main/resources/data/botania/recipes/terraplate.json b/src/main/resources/data/botania/recipes/terra_plate.json similarity index 93% rename from src/main/resources/data/botania/recipes/terraplate.json rename to src/main/resources/data/botania/recipes/terra_plate.json index 72da677e7..feab83ef3 100644 --- a/src/main/resources/data/botania/recipes/terraplate.json +++ b/src/main/resources/data/botania/recipes/terra_plate.json @@ -1,6 +1,6 @@ { "result": { - "item": "botania:terraplate" + "item": "botania:terra_plate" }, "pattern": [ "LLL", diff --git a/src/main/resources/data/botania/recipes/terrasword.json b/src/main/resources/data/botania/recipes/terra_sword.json similarity index 87% rename from src/main/resources/data/botania/recipes/terrasword.json rename to src/main/resources/data/botania/recipes/terra_sword.json index 60876f9e9..b5b79297e 100644 --- a/src/main/resources/data/botania/recipes/terrasword.json +++ b/src/main/resources/data/botania/recipes/terra_sword.json @@ -1,6 +1,6 @@ { "result": { - "item": "botania:terrasword" + "item": "botania:terra_sword" }, "pattern": [ "I", diff --git a/src/main/resources/data/botania/recipes/terraformrod.json b/src/main/resources/data/botania/recipes/terraform_rod.json similarity index 87% rename from src/main/resources/data/botania/recipes/terraformrod.json rename to src/main/resources/data/botania/recipes/terraform_rod.json index c62de6885..6f33f58af 100644 --- a/src/main/resources/data/botania/recipes/terraformrod.json +++ b/src/main/resources/data/botania/recipes/terraform_rod.json @@ -1,6 +1,6 @@ { "result": { - "item": "botania:terraformrod" + "item": "botania:terraform_rod" }, "pattern": [ " WT", @@ -13,7 +13,7 @@ "tag": "botania:runes/autumn" }, "R": { - "item": "botania:dirtrod" + "item": "botania:dirt_rod" }, "S": { "tag": "botania:runes/spring" diff --git a/src/main/resources/data/botania/recipes/teruterubozu.json b/src/main/resources/data/botania/recipes/teru_teru_bozu.json similarity index 87% rename from src/main/resources/data/botania/recipes/teruterubozu.json rename to src/main/resources/data/botania/recipes/teru_teru_bozu.json index b208426ba..512af1a2d 100644 --- a/src/main/resources/data/botania/recipes/teruterubozu.json +++ b/src/main/resources/data/botania/recipes/teru_teru_bozu.json @@ -1,6 +1,6 @@ { "result": { - "item": "botania:teruterubozu" + "item": "botania:teru_teru_bozu" }, "pattern": [ "C", diff --git a/src/main/resources/data/botania/recipes/thirdeye.json b/src/main/resources/data/botania/recipes/third_eye.json similarity index 92% rename from src/main/resources/data/botania/recipes/thirdeye.json rename to src/main/resources/data/botania/recipes/third_eye.json index e60cfd8e8..a7ea51709 100644 --- a/src/main/resources/data/botania/recipes/thirdeye.json +++ b/src/main/resources/data/botania/recipes/third_eye.json @@ -1,6 +1,6 @@ { "result": { - "item": "botania:thirdeye" + "item": "botania:third_eye" }, "pattern": [ "RSR", diff --git a/src/main/resources/data/botania/recipes/thundersword.json b/src/main/resources/data/botania/recipes/thunder_sword.json similarity index 81% rename from src/main/resources/data/botania/recipes/thundersword.json rename to src/main/resources/data/botania/recipes/thunder_sword.json index 09a49b69c..086f9cb2e 100644 --- a/src/main/resources/data/botania/recipes/thundersword.json +++ b/src/main/resources/data/botania/recipes/thunder_sword.json @@ -1,6 +1,6 @@ { "result": { - "item": "botania:thundersword" + "item": "botania:thunder_sword" }, "pattern": [ " I", @@ -16,7 +16,7 @@ "tag": "forge:gems/mana_diamond" }, "T": { - "item": "botania:terrasword" + "item": "botania:terra_sword" }, "I": { "tag": "forge:ingots/elementium" diff --git a/src/main/resources/data/botania/recipes/tinyplanet.json b/src/main/resources/data/botania/recipes/tiny_planet.json similarity index 89% rename from src/main/resources/data/botania/recipes/tinyplanet.json rename to src/main/resources/data/botania/recipes/tiny_planet.json index 64d6a2ec2..2fddedf1d 100644 --- a/src/main/resources/data/botania/recipes/tinyplanet.json +++ b/src/main/resources/data/botania/recipes/tiny_planet.json @@ -1,6 +1,6 @@ { "result": { - "item": "botania:tinyplanet" + "item": "botania:tiny_planet" }, "pattern": [ "LSL", diff --git a/src/main/resources/data/botania/recipes/tinyplanetblock.json b/src/main/resources/data/botania/recipes/tiny_planet_block.json similarity index 71% rename from src/main/resources/data/botania/recipes/tinyplanetblock.json rename to src/main/resources/data/botania/recipes/tiny_planet_block.json index 7ef94c63c..c1dad94b3 100644 --- a/src/main/resources/data/botania/recipes/tinyplanetblock.json +++ b/src/main/resources/data/botania/recipes/tiny_planet_block.json @@ -1,6 +1,6 @@ { "result": { - "item": "botania:tinyplanetblock" + "item": "botania:tiny_planet_block" }, "pattern": [ "SSS", @@ -10,7 +10,7 @@ "type": "minecraft:crafting_shaped", "key": { "P": { - "item": "botania:tinyplanet" + "item": "botania:tiny_planet" }, "S": { "tag": "forge:stone" diff --git a/src/main/resources/data/botania/recipes/tornadorod.json b/src/main/resources/data/botania/recipes/tornado_rod.json similarity index 89% rename from src/main/resources/data/botania/recipes/tornadorod.json rename to src/main/resources/data/botania/recipes/tornado_rod.json index 7b65859c9..de73f3b42 100644 --- a/src/main/resources/data/botania/recipes/tornadorod.json +++ b/src/main/resources/data/botania/recipes/tornado_rod.json @@ -1,6 +1,6 @@ { "result": { - "item": "botania:tornadorod" + "item": "botania:tornado_rod" }, "pattern": [ " F", diff --git a/src/main/resources/data/botania/recipes/travelbelt.json b/src/main/resources/data/botania/recipes/travel_belt.json similarity index 90% rename from src/main/resources/data/botania/recipes/travelbelt.json rename to src/main/resources/data/botania/recipes/travel_belt.json index ef334fcd2..eebcdf943 100644 --- a/src/main/resources/data/botania/recipes/travelbelt.json +++ b/src/main/resources/data/botania/recipes/travel_belt.json @@ -1,6 +1,6 @@ { "result": { - "item": "botania:travelbelt" + "item": "botania:travel_belt" }, "pattern": [ "EL ", diff --git a/src/main/resources/data/botania/recipes/unholycloak.json b/src/main/resources/data/botania/recipes/unholy_cloak.json similarity index 89% rename from src/main/resources/data/botania/recipes/unholycloak.json rename to src/main/resources/data/botania/recipes/unholy_cloak.json index 0b4a29e8d..a638c6f74 100644 --- a/src/main/resources/data/botania/recipes/unholycloak.json +++ b/src/main/resources/data/botania/recipes/unholy_cloak.json @@ -1,6 +1,6 @@ { "result": { - "item": "botania:unholycloak" + "item": "botania:unholy_cloak" }, "pattern": [ "WWW", diff --git a/src/main/resources/data/botania/recipes/vial.json b/src/main/resources/data/botania/recipes/vial.json index bd54b197f..07f2a98b0 100644 --- a/src/main/resources/data/botania/recipes/vial.json +++ b/src/main/resources/data/botania/recipes/vial.json @@ -1,7 +1,6 @@ { "result": { "item": "botania:vial", - "data": 0, "count": 3 }, "pattern": [ diff --git a/src/main/resources/data/botania/recipes/vineball.json b/src/main/resources/data/botania/recipes/vine_ball.json similarity index 84% rename from src/main/resources/data/botania/recipes/vineball.json rename to src/main/resources/data/botania/recipes/vine_ball.json index b6a844009..1768b1957 100644 --- a/src/main/resources/data/botania/recipes/vineball.json +++ b/src/main/resources/data/botania/recipes/vine_ball.json @@ -1,6 +1,6 @@ { "result": { - "item": "botania:vineball" + "item": "botania:vine_ball" }, "pattern": [ "VVV", diff --git a/src/main/resources/data/botania/recipes/waterring.json b/src/main/resources/data/botania/recipes/water_ring.json similarity index 91% rename from src/main/resources/data/botania/recipes/waterring.json rename to src/main/resources/data/botania/recipes/water_ring.json index b646ceec3..2b83a887d 100644 --- a/src/main/resources/data/botania/recipes/waterring.json +++ b/src/main/resources/data/botania/recipes/water_ring.json @@ -1,6 +1,6 @@ { "result": { - "item": "botania:waterring" + "item": "botania:water_ring" }, "pattern": [ "WMP", diff --git a/src/main/resources/data/botania/recipes/waterrod.json b/src/main/resources/data/botania/recipes/water_rod.json similarity index 92% rename from src/main/resources/data/botania/recipes/waterrod.json rename to src/main/resources/data/botania/recipes/water_rod.json index c555f4f42..ae6e96455 100644 --- a/src/main/resources/data/botania/recipes/waterrod.json +++ b/src/main/resources/data/botania/recipes/water_rod.json @@ -1,6 +1,6 @@ { "result": { - "item": "botania:waterrod" + "item": "botania:water_rod" }, "pattern": [ " B", diff --git a/src/main/resources/data/botania/recipes/worldseed.json b/src/main/resources/data/botania/recipes/world_seed.json similarity index 89% rename from src/main/resources/data/botania/recipes/worldseed.json rename to src/main/resources/data/botania/recipes/world_seed.json index 332ded671..4588d939e 100644 --- a/src/main/resources/data/botania/recipes/worldseed.json +++ b/src/main/resources/data/botania/recipes/world_seed.json @@ -1,6 +1,6 @@ { "result": { - "item": "botania:worldseed", + "item": "botania:world_seed", "count": 4 }, "pattern": [