From 48b52a9a86017e0a4e0a591a7c54633ac4596d7d Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Thu, 11 Apr 2019 23:50:32 -0500 Subject: [PATCH] Fix more recipes --- .../core/handler/CorporeaInputHandler.java | 2 +- .../{baublebox.json => bauble_box.json} | 2 +- .../{bloodpendant.json => blood_pendant.json} | 2 +- .../{cellblock.json => cell_block.json} | 2 +- ..._4.json => chiseled_livingrock_bricks.json} | 6 ++---- .../{cloudpendant.json => cloud_pendant.json} | 2 +- .../{cobblerod.json => cobble_rod.json} | 2 +- .../resources/data/botania/recipes/cocoon.json | 2 +- ...catalyst.json => conjuration_catalyst.json} | 4 ++-- ...talcube.json => corporea_crystal_cube.json} | 4 ++-- ...orporeafunnel.json => corporea_funnel.json} | 2 +- ...{corporeaindex.json => corporea_index.json} | 2 +- ...erceptor.json => corporea_interceptor.json} | 2 +- ...rearetainer.json => corporea_retainer.json} | 2 +- ...k_3.json => cracked_livingrock_bricks.json} | 6 ++---- .../{craftinghalo.json => crafting_halo.json} | 2 +- .../{crystalbow.json => crystal_bow.json} | 2 +- .../{divacharm.json => diva_charm.json} | 4 ++-- .../{diviningrod.json => divining_rod.json} | 2 +- .../{dodgering.json => dodge_ring.json} | 2 +- ...{dreamwood_1.json => dreamwood_planks.json} | 3 +-- ...1slab_0.json => dreamwood_planks_slab.json} | 6 ++---- ...tairs.json => dreamwood_planks_stairs.json} | 5 ++--- ...{elementiumaxe.json => elementium_axe.json} | 2 +- ...mentiumboots.json => elementium_boots.json} | 2 +- ...umchest.json => elementium_chestplate.json} | 2 +- ...mentiumhelm.json => elementium_helmet.json} | 2 +- ...ntiumlegs.json => elementium_leggings.json} | 2 +- ...entiumpick.json => elementium_pickaxe.json} | 2 +- ...ntiumshears.json => elementium_shears.json} | 2 +- ...ntiumshovel.json => elementium_shovel.json} | 2 +- ...mentiumsword.json => elementium_sword.json} | 2 +- .../resources/data/botania/recipes/flask.json | 2 +- .../data/botania/recipes/flower_bag.json | 2 +- ...{dreamwood_3.json => framed_dreamwood.json} | 6 ++---- ...ivingwood_3.json => framed_livingwood.json} | 6 ++---- .../data/botania/recipes/gaia_pylon.json | 2 +- ...amwood_5.json => glimmering_dreamwood.json} | 3 +-- ...gwood_5.json => glimmering_livingwood.json} | 3 +-- .../{goddesscharm.json => goddess_charm.json} | 2 +- ...{knockbackbelt.json => knockback_belt.json} | 2 +- ...ivingrock_1.json => livingrock_bricks.json} | 3 +-- ...slab_0.json => livingrock_bricks_slab.json} | 6 ++---- ...airs.json => livingrock_bricks_stairs.json} | 5 ++--- .../botania/recipes/livingwood1slab_0.json | 17 ----------------- .../botania/recipes/livingwood1stairs.json | 18 ------------------ ...ivingwood_1.json => livingwood_planks.json} | 3 +-- ...slab_0.json => livingwood_planks_slab.json} | 6 ++---- ...airs.json => livingwood_planks_stairs.json} | 5 ++--- ...pavement_slab.json => livingwood_slab.json} | 4 ++-- ...ment_stairs.json => livingwood_stairs.json} | 4 ++-- ...vingwood0wall.json => livingwood_wall.json} | 5 ++--- .../recipes/{manabomb.json => mana_bomb.json} | 2 +- .../{manadetector.json => mana_detector.json} | 2 +- ...{distributor.json => mana_distributor.json} | 2 +- .../{manatablet.json => mana_tablet.json} | 2 +- .../recipes/{manavoid.json => mana_void.json} | 2 +- .../{manasteelaxe.json => manasteel_axe.json} | 2 +- ...anasteelboots.json => manasteel_boots.json} | 2 +- ...eelchest.json => manasteel_chestplate.json} | 2 +- ...anasteelhelm.json => manasteel_helmet.json} | 2 +- ...asteellegs.json => manasteel_leggings.json} | 2 +- ...nasteelpick.json => manasteel_pickaxe.json} | 2 +- ...asteelshears.json => manasteel_shears.json} | 2 +- ...asteelshovel.json => manasteel_shovel.json} | 2 +- ...anasteelsword.json => manasteel_sword.json} | 2 +- ...anaweaveboots.json => manaweave_boots.json} | 2 +- ...avechest.json => manaweave_chestplate.json} | 2 +- ...anaweavehelm.json => manaweave_helmet.json} | 2 +- ...aweavelegs.json => manaweave_leggings.json} | 2 +- .../metamorphic_desert_bricks_stairs.json | 4 ++-- .../metamorphic_desert_cobblestone_stairs.json | 4 ++-- .../metamorphic_desert_stone_stairs.json | 4 ++-- .../metamorphic_forest_bricks_stairs.json | 4 ++-- .../metamorphic_forest_cobblestone_stairs.json | 4 ++-- .../metamorphic_forest_stone_stairs.json | 4 ++-- .../metamorphic_fungal_bricks_stairs.json | 4 ++-- .../metamorphic_fungal_cobblestone_stairs.json | 4 ++-- .../metamorphic_fungal_stone_stairs.json | 4 ++-- .../metamorphic_mesa_bricks_stairs.json | 4 ++-- .../metamorphic_mesa_cobblestone_stairs.json | 4 ++-- .../recipes/metamorphic_mesa_stone_stairs.json | 4 ++-- .../metamorphic_mountain_bricks_stairs.json | 4 ++-- ...etamorphic_mountain_cobblestone_stairs.json | 4 ++-- .../metamorphic_mountain_stone_stairs.json | 4 ++-- .../metamorphic_plains_bricks_stairs.json | 4 ++-- .../metamorphic_plains_cobblestone_stairs.json | 4 ++-- .../metamorphic_plains_stone_stairs.json | 4 ++-- .../metamorphic_swamp_bricks_stairs.json | 4 ++-- .../metamorphic_swamp_cobblestone_stairs.json | 4 ++-- .../metamorphic_swamp_stone_stairs.json | 4 ++-- .../metamorphic_taiga_bricks_stairs.json | 4 ++-- .../metamorphic_taiga_cobblestone_stairs.json | 4 ++-- .../metamorphic_taiga_stone_stairs.json | 4 ++-- .../{miningring.json => mining_ring.json} | 2 +- .../{missilerod.json => missile_rod.json} | 2 +- ...wood_2.json => mossy_dreamwood_planks.json} | 6 ++---- ...ock_2.json => mossy_livingrock_bricks.json} | 6 ++---- ...ood_2.json => mossy_livingwood_planks.json} | 6 ++---- .../data/botania/recipes/natura_pylon.json | 2 +- ...bediencestick.json => obedience_stick.json} | 2 +- .../{openbucket.json => open_bucket.json} | 2 +- .../{opencrate.json => open_crate.json} | 5 ++--- ...od_4.json => pattern_framed_dreamwood.json} | 6 ++---- ...d_4.json => pattern_framed_livingwood.json} | 6 ++---- ...leandmortar.json => pestle_and_mortar.json} | 2 +- .../{phantomink.json => phtanom_ink.json} | 4 ++-- .../livingwood.json} | 6 ++---- .../livingwood_planks.json} | 6 ++---- .../botania/recipes/white_pavement_stairs.json | 17 +++++++++++++++++ 110 files changed, 173 insertions(+), 229 deletions(-) rename src/main/resources/data/botania/recipes/{baublebox.json => bauble_box.json} (89%) rename src/main/resources/data/botania/recipes/{bloodpendant.json => blood_pendant.json} (89%) rename src/main/resources/data/botania/recipes/{cellblock.json => cell_block.json} (91%) rename src/main/resources/data/botania/recipes/{livingrock_4.json => chiseled_livingrock_bricks.json} (59%) rename src/main/resources/data/botania/recipes/{cloudpendant.json => cloud_pendant.json} (90%) rename src/main/resources/data/botania/recipes/{cobblerod.json => cobble_rod.json} (91%) rename src/main/resources/data/botania/recipes/{conjurationcatalyst.json => conjuration_catalyst.json} (78%) rename src/main/resources/data/botania/recipes/{corporeacrystalcube.json => corporea_crystal_cube.json} (76%) rename src/main/resources/data/botania/recipes/{corporeafunnel.json => corporea_funnel.json} (82%) rename src/main/resources/data/botania/recipes/{corporeaindex.json => corporea_index.json} (90%) rename src/main/resources/data/botania/recipes/{corporeainterceptor.json => corporea_interceptor.json} (82%) rename src/main/resources/data/botania/recipes/{corporearetainer.json => corporea_retainer.json} (82%) rename src/main/resources/data/botania/recipes/{livingrock_3.json => cracked_livingrock_bricks.json} (61%) rename src/main/resources/data/botania/recipes/{craftinghalo.json => crafting_halo.json} (89%) rename src/main/resources/data/botania/recipes/{crystalbow.json => crystal_bow.json} (89%) rename src/main/resources/data/botania/recipes/{divacharm.json => diva_charm.json} (81%) rename src/main/resources/data/botania/recipes/{diviningrod.json => divining_rod.json} (87%) rename src/main/resources/data/botania/recipes/{dodgering.json => dodge_ring.json} (89%) rename src/main/resources/data/botania/recipes/{dreamwood_1.json => dreamwood_planks.json} (75%) rename src/main/resources/data/botania/recipes/{dreamwood1slab_0.json => dreamwood_planks_slab.json} (57%) rename src/main/resources/data/botania/recipes/{dreamwood1stairs.json => dreamwood_planks_stairs.json} (63%) rename src/main/resources/data/botania/recipes/{elementiumaxe.json => elementium_axe.json} (86%) rename src/main/resources/data/botania/recipes/{elementiumboots.json => elementium_boots.json} (81%) rename src/main/resources/data/botania/recipes/{elementiumchest.json => elementium_chestplate.json} (80%) rename src/main/resources/data/botania/recipes/{elementiumhelm.json => elementium_helmet.json} (81%) rename src/main/resources/data/botania/recipes/{elementiumlegs.json => elementium_leggings.json} (81%) rename src/main/resources/data/botania/recipes/{elementiumpick.json => elementium_pickaxe.json} (85%) rename src/main/resources/data/botania/recipes/{elementiumshears.json => elementium_shears.json} (81%) rename src/main/resources/data/botania/recipes/{elementiumshovel.json => elementium_shovel.json} (85%) rename src/main/resources/data/botania/recipes/{elementiumsword.json => elementium_sword.json} (85%) rename src/main/resources/data/botania/recipes/{dreamwood_3.json => framed_dreamwood.json} (59%) rename src/main/resources/data/botania/recipes/{livingwood_3.json => framed_livingwood.json} (59%) rename src/main/resources/data/botania/recipes/{dreamwood_5.json => glimmering_dreamwood.json} (79%) rename src/main/resources/data/botania/recipes/{livingwood_5.json => glimmering_livingwood.json} (79%) rename src/main/resources/data/botania/recipes/{goddesscharm.json => goddess_charm.json} (90%) rename src/main/resources/data/botania/recipes/{knockbackbelt.json => knockback_belt.json} (90%) rename src/main/resources/data/botania/recipes/{livingrock_1.json => livingrock_bricks.json} (78%) rename src/main/resources/data/botania/recipes/{livingwood0slab_0.json => livingrock_bricks_slab.json} (56%) rename src/main/resources/data/botania/recipes/{livingrock1stairs.json => livingrock_bricks_stairs.json} (63%) delete mode 100644 src/main/resources/data/botania/recipes/livingwood1slab_0.json delete mode 100644 src/main/resources/data/botania/recipes/livingwood1stairs.json rename src/main/resources/data/botania/recipes/{livingwood_1.json => livingwood_planks.json} (75%) rename src/main/resources/data/botania/recipes/{livingrock1slab_0.json => livingwood_planks_slab.json} (56%) rename src/main/resources/data/botania/recipes/{livingwood0stairs.json => livingwood_planks_stairs.json} (63%) rename src/main/resources/data/botania/recipes/{cwhite_pavement_slab.json => livingwood_slab.json} (62%) rename src/main/resources/data/botania/recipes/{cwhite_pavement_stairs.json => livingwood_stairs.json} (65%) rename src/main/resources/data/botania/recipes/{livingwood0wall.json => livingwood_wall.json} (62%) rename src/main/resources/data/botania/recipes/{manabomb.json => mana_bomb.json} (89%) rename src/main/resources/data/botania/recipes/{manadetector.json => mana_detector.json} (88%) rename src/main/resources/data/botania/recipes/{distributor.json => mana_distributor.json} (85%) rename src/main/resources/data/botania/recipes/{manatablet.json => mana_tablet.json} (90%) rename src/main/resources/data/botania/recipes/{manavoid.json => mana_void.json} (87%) rename src/main/resources/data/botania/recipes/{manasteelaxe.json => manasteel_axe.json} (86%) rename src/main/resources/data/botania/recipes/{manasteelboots.json => manasteel_boots.json} (81%) rename src/main/resources/data/botania/recipes/{manasteelchest.json => manasteel_chestplate.json} (80%) rename src/main/resources/data/botania/recipes/{manasteelhelm.json => manasteel_helmet.json} (81%) rename src/main/resources/data/botania/recipes/{manasteellegs.json => manasteel_leggings.json} (81%) rename src/main/resources/data/botania/recipes/{manasteelpick.json => manasteel_pickaxe.json} (85%) rename src/main/resources/data/botania/recipes/{manasteelshears.json => manasteel_shears.json} (81%) rename src/main/resources/data/botania/recipes/{manasteelshovel.json => manasteel_shovel.json} (85%) rename src/main/resources/data/botania/recipes/{manasteelsword.json => manasteel_sword.json} (86%) rename src/main/resources/data/botania/recipes/{manaweaveboots.json => manaweave_boots.json} (82%) rename src/main/resources/data/botania/recipes/{manaweavechest.json => manaweave_chestplate.json} (81%) rename src/main/resources/data/botania/recipes/{manaweavehelm.json => manaweave_helmet.json} (81%) rename src/main/resources/data/botania/recipes/{manaweavelegs.json => manaweave_leggings.json} (81%) rename src/main/resources/data/botania/recipes/{miningring.json => mining_ring.json} (89%) rename src/main/resources/data/botania/recipes/{missilerod.json => missile_rod.json} (89%) rename src/main/resources/data/botania/recipes/{dreamwood_2.json => mossy_dreamwood_planks.json} (60%) rename src/main/resources/data/botania/recipes/{livingrock_2.json => mossy_livingrock_bricks.json} (60%) rename src/main/resources/data/botania/recipes/{livingwood_2.json => mossy_livingwood_planks.json} (60%) rename src/main/resources/data/botania/recipes/{obediencestick.json => obedience_stick.json} (86%) rename src/main/resources/data/botania/recipes/{openbucket.json => open_bucket.json} (83%) rename src/main/resources/data/botania/recipes/{opencrate.json => open_crate.json} (63%) rename src/main/resources/data/botania/recipes/{dreamwood_4.json => pattern_framed_dreamwood.json} (61%) rename src/main/resources/data/botania/recipes/{livingwood_4.json => pattern_framed_livingwood.json} (61%) rename src/main/resources/data/botania/recipes/{pestleandmortar.json => pestle_and_mortar.json} (87%) rename src/main/resources/data/botania/recipes/{phantomink.json => phtanom_ink.json} (85%) rename src/main/resources/data/botania/recipes/{livingwood_1_alt.json => slab_recombine/livingwood.json} (55%) rename src/main/resources/data/botania/recipes/{livingwood_0.json => slab_recombine/livingwood_planks.json} (55%) create mode 100644 src/main/resources/data/botania/recipes/white_pavement_stairs.json diff --git a/src/main/java/vazkii/botania/client/core/handler/CorporeaInputHandler.java b/src/main/java/vazkii/botania/client/core/handler/CorporeaInputHandler.java index 94e72f12a..502184b39 100644 --- a/src/main/java/vazkii/botania/client/core/handler/CorporeaInputHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/CorporeaInputHandler.java @@ -38,7 +38,7 @@ public class CorporeaInputHandler { public static Predicate supportedGuiFilter = gui -> gui instanceof GuiContainer; @SubscribeEvent - public static void buttonPressed(GuiScreenEvent.KeyboardKeyPressedEvent event) { + public static void buttonPressed(GuiScreenEvent.KeyboardKeyPressedEvent.Pre event) { Minecraft mc = Minecraft.getInstance(); if(mc.world == null || !supportedGuiFilter.test(mc.currentScreen) || ClientProxy.CORPOREA_REQUEST.isActiveAndMatches(InputMappings.getInputByCode(event.getKeyCode(), event.getScanCode())) diff --git a/src/main/resources/data/botania/recipes/baublebox.json b/src/main/resources/data/botania/recipes/bauble_box.json similarity index 89% rename from src/main/resources/data/botania/recipes/baublebox.json rename to src/main/resources/data/botania/recipes/bauble_box.json index 6b57bada2..f1ef0ba6b 100644 --- a/src/main/resources/data/botania/recipes/baublebox.json +++ b/src/main/resources/data/botania/recipes/bauble_box.json @@ -1,6 +1,6 @@ { "result": { - "item": "botania:baublebox" + "item": "botania:bauble_box" }, "pattern": [ " M ", diff --git a/src/main/resources/data/botania/recipes/bloodpendant.json b/src/main/resources/data/botania/recipes/blood_pendant.json similarity index 89% rename from src/main/resources/data/botania/recipes/bloodpendant.json rename to src/main/resources/data/botania/recipes/blood_pendant.json index b1e57e080..19faad4f7 100644 --- a/src/main/resources/data/botania/recipes/bloodpendant.json +++ b/src/main/resources/data/botania/recipes/blood_pendant.json @@ -1,6 +1,6 @@ { "result": { - "item": "botania:bloodpendant" + "item": "botania:blood_pendant" }, "pattern": [ " P ", diff --git a/src/main/resources/data/botania/recipes/cellblock.json b/src/main/resources/data/botania/recipes/cell_block.json similarity index 91% rename from src/main/resources/data/botania/recipes/cellblock.json rename to src/main/resources/data/botania/recipes/cell_block.json index 91b8bb829..c6a383103 100644 --- a/src/main/resources/data/botania/recipes/cellblock.json +++ b/src/main/resources/data/botania/recipes/cell_block.json @@ -1,6 +1,6 @@ { "result": { - "item": "botania:cellblock", + "item": "botania:cell_block", "count": 3 }, "ingredients": [ diff --git a/src/main/resources/data/botania/recipes/livingrock_4.json b/src/main/resources/data/botania/recipes/chiseled_livingrock_bricks.json similarity index 59% rename from src/main/resources/data/botania/recipes/livingrock_4.json rename to src/main/resources/data/botania/recipes/chiseled_livingrock_bricks.json index 5d1a3522a..3aefe0d08 100644 --- a/src/main/resources/data/botania/recipes/livingrock_4.json +++ b/src/main/resources/data/botania/recipes/chiseled_livingrock_bricks.json @@ -1,7 +1,6 @@ { "result": { - "item": "botania:livingrock", - "data": 4, + "item": "botania:chiseled_livingrock_bricks", "count": 4 }, "pattern": [ @@ -11,8 +10,7 @@ "type": "minecraft:crafting_shaped", "key": { "R": { - "item": "botania:livingrock", - "data": 1 + "item": "botania:livingrock_bricks" } } } \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/cloudpendant.json b/src/main/resources/data/botania/recipes/cloud_pendant.json similarity index 90% rename from src/main/resources/data/botania/recipes/cloudpendant.json rename to src/main/resources/data/botania/recipes/cloud_pendant.json index 03035616c..5b34eb125 100644 --- a/src/main/resources/data/botania/recipes/cloudpendant.json +++ b/src/main/resources/data/botania/recipes/cloud_pendant.json @@ -1,6 +1,6 @@ { "result": { - "item": "botania:cloudpendant" + "item": "botania:cloud_pendant" }, "pattern": [ "MS ", diff --git a/src/main/resources/data/botania/recipes/cobblerod.json b/src/main/resources/data/botania/recipes/cobble_rod.json similarity index 91% rename from src/main/resources/data/botania/recipes/cobblerod.json rename to src/main/resources/data/botania/recipes/cobble_rod.json index 2f52f73c9..0e26d7916 100644 --- a/src/main/resources/data/botania/recipes/cobblerod.json +++ b/src/main/resources/data/botania/recipes/cobble_rod.json @@ -1,6 +1,6 @@ { "result": { - "item": "botania:cobblerod" + "item": "botania:cobble_rod" }, "pattern": [ " FC", diff --git a/src/main/resources/data/botania/recipes/cocoon.json b/src/main/resources/data/botania/recipes/cocoon.json index eea9d8aaf..4801eba2a 100644 --- a/src/main/resources/data/botania/recipes/cocoon.json +++ b/src/main/resources/data/botania/recipes/cocoon.json @@ -25,7 +25,7 @@ "item": "botania:manaweave_cloth" }, "P": { - "item": "botania:felpumpkin" + "item": "botania:fel_pumpkin" }, "D": { "item": "botania:pixie_dust" diff --git a/src/main/resources/data/botania/recipes/conjurationcatalyst.json b/src/main/resources/data/botania/recipes/conjuration_catalyst.json similarity index 78% rename from src/main/resources/data/botania/recipes/conjurationcatalyst.json rename to src/main/resources/data/botania/recipes/conjuration_catalyst.json index 33971dea9..f5754c326 100644 --- a/src/main/resources/data/botania/recipes/conjurationcatalyst.json +++ b/src/main/resources/data/botania/recipes/conjuration_catalyst.json @@ -1,6 +1,6 @@ { "result": { - "item": "botania:conjurationcatalyst" + "item": "botania:conjuration_catalyst" }, "pattern": [ "SBS", @@ -10,7 +10,7 @@ "type": "minecraft:crafting_shaped", "key": { "P": { - "item": "botania:alchemycatalyst" + "item": "botania:alchemy_catalyst" }, "B": { "item": "botania:pixie_dust" diff --git a/src/main/resources/data/botania/recipes/corporeacrystalcube.json b/src/main/resources/data/botania/recipes/corporea_crystal_cube.json similarity index 76% rename from src/main/resources/data/botania/recipes/corporeacrystalcube.json rename to src/main/resources/data/botania/recipes/corporea_crystal_cube.json index a83c367a9..2032b0073 100644 --- a/src/main/resources/data/botania/recipes/corporeacrystalcube.json +++ b/src/main/resources/data/botania/recipes/corporea_crystal_cube.json @@ -1,6 +1,6 @@ { "result": { - "item": "botania:corporeacrystalcube" + "item": "botania:corporea_crystal_cube" }, "pattern": [ "C", @@ -13,7 +13,7 @@ "item": "botania:corporea_spark" }, "G": { - "item": "botania:elfglass" + "item": "botania:elf_glass" }, "W": { "item": "botania:dreamwood" diff --git a/src/main/resources/data/botania/recipes/corporeafunnel.json b/src/main/resources/data/botania/recipes/corporea_funnel.json similarity index 82% rename from src/main/resources/data/botania/recipes/corporeafunnel.json rename to src/main/resources/data/botania/recipes/corporea_funnel.json index 37a44b46e..88d1aa980 100644 --- a/src/main/resources/data/botania/recipes/corporeafunnel.json +++ b/src/main/resources/data/botania/recipes/corporea_funnel.json @@ -1,6 +1,6 @@ { "result": { - "item": "botania:corporeafunnel" + "item": "botania:corporea_funnel" }, "ingredients": [ { diff --git a/src/main/resources/data/botania/recipes/corporeaindex.json b/src/main/resources/data/botania/recipes/corporea_index.json similarity index 90% rename from src/main/resources/data/botania/recipes/corporeaindex.json rename to src/main/resources/data/botania/recipes/corporea_index.json index ca771acc9..4fa120934 100644 --- a/src/main/resources/data/botania/recipes/corporeaindex.json +++ b/src/main/resources/data/botania/recipes/corporea_index.json @@ -1,6 +1,6 @@ { "result": { - "item": "botania:corporeaindex" + "item": "botania:corporea_index" }, "pattern": [ "AOA", diff --git a/src/main/resources/data/botania/recipes/corporeainterceptor.json b/src/main/resources/data/botania/recipes/corporea_interceptor.json similarity index 82% rename from src/main/resources/data/botania/recipes/corporeainterceptor.json rename to src/main/resources/data/botania/recipes/corporea_interceptor.json index 0a0ef83d0..73a792d5d 100644 --- a/src/main/resources/data/botania/recipes/corporeainterceptor.json +++ b/src/main/resources/data/botania/recipes/corporea_interceptor.json @@ -1,6 +1,6 @@ { "result": { - "item": "botania:corporeainterceptor" + "item": "botania:corporea_interceptor" }, "ingredients": [ { diff --git a/src/main/resources/data/botania/recipes/corporearetainer.json b/src/main/resources/data/botania/recipes/corporea_retainer.json similarity index 82% rename from src/main/resources/data/botania/recipes/corporearetainer.json rename to src/main/resources/data/botania/recipes/corporea_retainer.json index 4b300d329..663045623 100644 --- a/src/main/resources/data/botania/recipes/corporearetainer.json +++ b/src/main/resources/data/botania/recipes/corporea_retainer.json @@ -1,6 +1,6 @@ { "result": { - "item": "botania:corporearetainer" + "item": "botania:corporea_retainer" }, "ingredients": [ { diff --git a/src/main/resources/data/botania/recipes/livingrock_3.json b/src/main/resources/data/botania/recipes/cracked_livingrock_bricks.json similarity index 61% rename from src/main/resources/data/botania/recipes/livingrock_3.json rename to src/main/resources/data/botania/recipes/cracked_livingrock_bricks.json index 306e9928a..71b74de0a 100644 --- a/src/main/resources/data/botania/recipes/livingrock_3.json +++ b/src/main/resources/data/botania/recipes/cracked_livingrock_bricks.json @@ -1,13 +1,11 @@ { "result": { - "item": "botania:livingrock", - "data": 3, + "item": "botania:cracked_livingrock_bricks", "count": 2 }, "ingredients": [ { - "item": "botania:livingrock", - "data": 1 + "item": "botania:livingrock_bricks" }, { "tag": "forge:cobblestone" diff --git a/src/main/resources/data/botania/recipes/craftinghalo.json b/src/main/resources/data/botania/recipes/crafting_halo.json similarity index 89% rename from src/main/resources/data/botania/recipes/craftinghalo.json rename to src/main/resources/data/botania/recipes/crafting_halo.json index 0c5b72a39..2575fe961 100644 --- a/src/main/resources/data/botania/recipes/craftinghalo.json +++ b/src/main/resources/data/botania/recipes/crafting_halo.json @@ -1,6 +1,6 @@ { "result": { - "item": "botania:craftinghalo" + "item": "botania:crafting_halo" }, "pattern": [ " P ", diff --git a/src/main/resources/data/botania/recipes/crystalbow.json b/src/main/resources/data/botania/recipes/crystal_bow.json similarity index 89% rename from src/main/resources/data/botania/recipes/crystalbow.json rename to src/main/resources/data/botania/recipes/crystal_bow.json index 673f4502d..1860ef7ff 100644 --- a/src/main/resources/data/botania/recipes/crystalbow.json +++ b/src/main/resources/data/botania/recipes/crystal_bow.json @@ -1,6 +1,6 @@ { "result": { - "item": "botania:crystalbow" + "item": "botania:crystal_bow" }, "pattern": [ " DS", diff --git a/src/main/resources/data/botania/recipes/divacharm.json b/src/main/resources/data/botania/recipes/diva_charm.json similarity index 81% rename from src/main/resources/data/botania/recipes/divacharm.json rename to src/main/resources/data/botania/recipes/diva_charm.json index c6da9e5c9..d1023ac31 100644 --- a/src/main/resources/data/botania/recipes/divacharm.json +++ b/src/main/resources/data/botania/recipes/diva_charm.json @@ -1,6 +1,6 @@ { "result": { - "item": "botania:divacharm" + "item": "botania:diva_charm" }, "pattern": [ "LGP", @@ -10,7 +10,7 @@ "type": "minecraft:crafting_shaped", "key": { "P": { - "item": "botania:tinyplanet" + "item": "botania:tiny_planet" }, "G": { "tag": "forge:ingots/gold" diff --git a/src/main/resources/data/botania/recipes/diviningrod.json b/src/main/resources/data/botania/recipes/divining_rod.json similarity index 87% rename from src/main/resources/data/botania/recipes/diviningrod.json rename to src/main/resources/data/botania/recipes/divining_rod.json index 4c2bac1ff..99863fab2 100644 --- a/src/main/resources/data/botania/recipes/diviningrod.json +++ b/src/main/resources/data/botania/recipes/divining_rod.json @@ -1,6 +1,6 @@ { "result": { - "item": "botania:diviningrod" + "item": "botania:divining_rod" }, "pattern": [ " TD", diff --git a/src/main/resources/data/botania/recipes/dodgering.json b/src/main/resources/data/botania/recipes/dodge_ring.json similarity index 89% rename from src/main/resources/data/botania/recipes/dodgering.json rename to src/main/resources/data/botania/recipes/dodge_ring.json index 36201e870..094249130 100644 --- a/src/main/resources/data/botania/recipes/dodgering.json +++ b/src/main/resources/data/botania/recipes/dodge_ring.json @@ -1,6 +1,6 @@ { "result": { - "item": "botania:dodgering" + "item": "botania:dodge_ring" }, "pattern": [ "EM ", diff --git a/src/main/resources/data/botania/recipes/dreamwood_1.json b/src/main/resources/data/botania/recipes/dreamwood_planks.json similarity index 75% rename from src/main/resources/data/botania/recipes/dreamwood_1.json rename to src/main/resources/data/botania/recipes/dreamwood_planks.json index 9190109aa..67b1509fa 100644 --- a/src/main/resources/data/botania/recipes/dreamwood_1.json +++ b/src/main/resources/data/botania/recipes/dreamwood_planks.json @@ -1,7 +1,6 @@ { "result": { - "item": "botania:dreamwood", - "data": 1, + "item": "botania:dreamwood_planks", "count": 4 }, "ingredients": [ diff --git a/src/main/resources/data/botania/recipes/dreamwood1slab_0.json b/src/main/resources/data/botania/recipes/dreamwood_planks_slab.json similarity index 57% rename from src/main/resources/data/botania/recipes/dreamwood1slab_0.json rename to src/main/resources/data/botania/recipes/dreamwood_planks_slab.json index cbffb5940..479155577 100644 --- a/src/main/resources/data/botania/recipes/dreamwood1slab_0.json +++ b/src/main/resources/data/botania/recipes/dreamwood_planks_slab.json @@ -1,7 +1,6 @@ { "result": { - "item": "botania:dreamwood1slab", - "data": 0, + "item": "botania:dreamwood_planks_slab", "count": 6 }, "pattern": [ @@ -10,8 +9,7 @@ "type": "minecraft:crafting_shaped", "key": { "Q": { - "item": "botania:dreamwood", - "data": 1 + "item": "botania:dreamwood_planks" } } } \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/dreamwood1stairs.json b/src/main/resources/data/botania/recipes/dreamwood_planks_stairs.json similarity index 63% rename from src/main/resources/data/botania/recipes/dreamwood1stairs.json rename to src/main/resources/data/botania/recipes/dreamwood_planks_stairs.json index 86c7660c5..06ab89a54 100644 --- a/src/main/resources/data/botania/recipes/dreamwood1stairs.json +++ b/src/main/resources/data/botania/recipes/dreamwood_planks_stairs.json @@ -1,6 +1,6 @@ { "result": { - "item": "botania:dreamwood1stairs", + "item": "botania:dreamwood_planks_stairs", "count": 4 }, "pattern": [ @@ -11,8 +11,7 @@ "type": "minecraft:crafting_shaped", "key": { "Q": { - "item": "botania:dreamwood", - "data": 1 + "item": "botania:dreamwood_planks" } } } \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/elementiumaxe.json b/src/main/resources/data/botania/recipes/elementium_axe.json similarity index 86% rename from src/main/resources/data/botania/recipes/elementiumaxe.json rename to src/main/resources/data/botania/recipes/elementium_axe.json index 734194fcb..097cb7646 100644 --- a/src/main/resources/data/botania/recipes/elementiumaxe.json +++ b/src/main/resources/data/botania/recipes/elementium_axe.json @@ -1,6 +1,6 @@ { "result": { - "item": "botania:elementiumaxe" + "item": "botania:elementium_axe" }, "pattern": [ "SS", diff --git a/src/main/resources/data/botania/recipes/elementiumboots.json b/src/main/resources/data/botania/recipes/elementium_boots.json similarity index 81% rename from src/main/resources/data/botania/recipes/elementiumboots.json rename to src/main/resources/data/botania/recipes/elementium_boots.json index 7dc2d1e21..b1c3deec9 100644 --- a/src/main/resources/data/botania/recipes/elementiumboots.json +++ b/src/main/resources/data/botania/recipes/elementium_boots.json @@ -1,6 +1,6 @@ { "result": { - "item": "botania:elementiumboots" + "item": "botania:elementium_boots" }, "pattern": [ "S S", diff --git a/src/main/resources/data/botania/recipes/elementiumchest.json b/src/main/resources/data/botania/recipes/elementium_chestplate.json similarity index 80% rename from src/main/resources/data/botania/recipes/elementiumchest.json rename to src/main/resources/data/botania/recipes/elementium_chestplate.json index 1883026f1..ef722573e 100644 --- a/src/main/resources/data/botania/recipes/elementiumchest.json +++ b/src/main/resources/data/botania/recipes/elementium_chestplate.json @@ -1,6 +1,6 @@ { "result": { - "item": "botania:elementiumchest" + "item": "botania:elementium_chestplate" }, "pattern": [ "S S", diff --git a/src/main/resources/data/botania/recipes/elementiumhelm.json b/src/main/resources/data/botania/recipes/elementium_helmet.json similarity index 81% rename from src/main/resources/data/botania/recipes/elementiumhelm.json rename to src/main/resources/data/botania/recipes/elementium_helmet.json index 6a6746648..214778d9e 100644 --- a/src/main/resources/data/botania/recipes/elementiumhelm.json +++ b/src/main/resources/data/botania/recipes/elementium_helmet.json @@ -1,6 +1,6 @@ { "result": { - "item": "botania:elementiumhelm" + "item": "botania:elementium_helmet" }, "pattern": [ "SSS", diff --git a/src/main/resources/data/botania/recipes/elementiumlegs.json b/src/main/resources/data/botania/recipes/elementium_leggings.json similarity index 81% rename from src/main/resources/data/botania/recipes/elementiumlegs.json rename to src/main/resources/data/botania/recipes/elementium_leggings.json index 99ba92d83..aaae2a07f 100644 --- a/src/main/resources/data/botania/recipes/elementiumlegs.json +++ b/src/main/resources/data/botania/recipes/elementium_leggings.json @@ -1,6 +1,6 @@ { "result": { - "item": "botania:elementiumlegs" + "item": "botania:elementium_leggings" }, "pattern": [ "SSS", diff --git a/src/main/resources/data/botania/recipes/elementiumpick.json b/src/main/resources/data/botania/recipes/elementium_pickaxe.json similarity index 85% rename from src/main/resources/data/botania/recipes/elementiumpick.json rename to src/main/resources/data/botania/recipes/elementium_pickaxe.json index b4a835b1a..9681f946e 100644 --- a/src/main/resources/data/botania/recipes/elementiumpick.json +++ b/src/main/resources/data/botania/recipes/elementium_pickaxe.json @@ -1,6 +1,6 @@ { "result": { - "item": "botania:elementiumpick" + "item": "botania:elementium_pickaxe" }, "pattern": [ "SSS", diff --git a/src/main/resources/data/botania/recipes/elementiumshears.json b/src/main/resources/data/botania/recipes/elementium_shears.json similarity index 81% rename from src/main/resources/data/botania/recipes/elementiumshears.json rename to src/main/resources/data/botania/recipes/elementium_shears.json index 46fa8e6da..f9c508145 100644 --- a/src/main/resources/data/botania/recipes/elementiumshears.json +++ b/src/main/resources/data/botania/recipes/elementium_shears.json @@ -1,6 +1,6 @@ { "result": { - "item": "botania:elementiumshears" + "item": "botania:elementium_shears" }, "pattern": [ "S ", diff --git a/src/main/resources/data/botania/recipes/elementiumshovel.json b/src/main/resources/data/botania/recipes/elementium_shovel.json similarity index 85% rename from src/main/resources/data/botania/recipes/elementiumshovel.json rename to src/main/resources/data/botania/recipes/elementium_shovel.json index 3de958a3f..1d1ff8487 100644 --- a/src/main/resources/data/botania/recipes/elementiumshovel.json +++ b/src/main/resources/data/botania/recipes/elementium_shovel.json @@ -1,6 +1,6 @@ { "result": { - "item": "botania:elementiumshovel" + "item": "botania:elementium_shovel" }, "pattern": [ "S", diff --git a/src/main/resources/data/botania/recipes/elementiumsword.json b/src/main/resources/data/botania/recipes/elementium_sword.json similarity index 85% rename from src/main/resources/data/botania/recipes/elementiumsword.json rename to src/main/resources/data/botania/recipes/elementium_sword.json index c6c53c73d..2e157e6b8 100644 --- a/src/main/resources/data/botania/recipes/elementiumsword.json +++ b/src/main/resources/data/botania/recipes/elementium_sword.json @@ -1,6 +1,6 @@ { "result": { - "item": "botania:elementiumsword" + "item": "botania:elementium_sword" }, "pattern": [ "S", diff --git a/src/main/resources/data/botania/recipes/flask.json b/src/main/resources/data/botania/recipes/flask.json index 4e7f92bd5..35d55ec3e 100644 --- a/src/main/resources/data/botania/recipes/flask.json +++ b/src/main/resources/data/botania/recipes/flask.json @@ -10,7 +10,7 @@ "type": "minecraft:crafting_shaped", "key": { "G": { - "item": "botania:elfglass" + "item": "botania:elf_glass" } } } \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/flower_bag.json b/src/main/resources/data/botania/recipes/flower_bag.json index d69fbff52..a899d6920 100644 --- a/src/main/resources/data/botania/recipes/flower_bag.json +++ b/src/main/resources/data/botania/recipes/flower_bag.json @@ -13,7 +13,7 @@ "tag": "botania:petals" }, "W": { - "tag": "minecraft:wools" + "tag": "minecraft:wool" } } } \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/dreamwood_3.json b/src/main/resources/data/botania/recipes/framed_dreamwood.json similarity index 59% rename from src/main/resources/data/botania/recipes/dreamwood_3.json rename to src/main/resources/data/botania/recipes/framed_dreamwood.json index a93e7ec14..f5e9fb1ac 100644 --- a/src/main/resources/data/botania/recipes/dreamwood_3.json +++ b/src/main/resources/data/botania/recipes/framed_dreamwood.json @@ -1,7 +1,6 @@ { "result": { - "item": "botania:dreamwood", - "data": 3, + "item": "botania:framed_dreamwood", "count": 4 }, "pattern": [ @@ -11,8 +10,7 @@ "type": "minecraft:crafting_shaped", "key": { "W": { - "item": "botania:dreamwood", - "data": 1 + "item": "botania:dreamwood_planks" } } } \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/livingwood_3.json b/src/main/resources/data/botania/recipes/framed_livingwood.json similarity index 59% rename from src/main/resources/data/botania/recipes/livingwood_3.json rename to src/main/resources/data/botania/recipes/framed_livingwood.json index 127cae3c9..6237c5d5a 100644 --- a/src/main/resources/data/botania/recipes/livingwood_3.json +++ b/src/main/resources/data/botania/recipes/framed_livingwood.json @@ -1,7 +1,6 @@ { "result": { - "item": "botania:livingwood", - "data": 3, + "item": "botania:framed_livingwood", "count": 4 }, "pattern": [ @@ -11,8 +10,7 @@ "type": "minecraft:crafting_shaped", "key": { "W": { - "item": "botania:livingwood", - "data": 1 + "item": "botania:livingwood_planks" } } } \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/gaia_pylon.json b/src/main/resources/data/botania/recipes/gaia_pylon.json index 48080751e..cb0cbc8b7 100644 --- a/src/main/resources/data/botania/recipes/gaia_pylon.json +++ b/src/main/resources/data/botania/recipes/gaia_pylon.json @@ -10,7 +10,7 @@ "type": "minecraft:crafting_shaped", "key": { "P": { - "item": "botania:pylon_mana" + "item": "botania:mana_pylon" }, "D": { "item": "botania:pixie_dust" diff --git a/src/main/resources/data/botania/recipes/dreamwood_5.json b/src/main/resources/data/botania/recipes/glimmering_dreamwood.json similarity index 79% rename from src/main/resources/data/botania/recipes/dreamwood_5.json rename to src/main/resources/data/botania/recipes/glimmering_dreamwood.json index 2af13ea0e..69523e74a 100644 --- a/src/main/resources/data/botania/recipes/dreamwood_5.json +++ b/src/main/resources/data/botania/recipes/glimmering_dreamwood.json @@ -1,7 +1,6 @@ { "result": { - "item": "botania:dreamwood", - "data": 5 + "item": "botania:glimmering_dreamwood" }, "ingredients": [ { diff --git a/src/main/resources/data/botania/recipes/livingwood_5.json b/src/main/resources/data/botania/recipes/glimmering_livingwood.json similarity index 79% rename from src/main/resources/data/botania/recipes/livingwood_5.json rename to src/main/resources/data/botania/recipes/glimmering_livingwood.json index b44cce48b..030bdf514 100644 --- a/src/main/resources/data/botania/recipes/livingwood_5.json +++ b/src/main/resources/data/botania/recipes/glimmering_livingwood.json @@ -1,7 +1,6 @@ { "result": { - "item": "botania:livingwood", - "data": 5 + "item": "botania:glimmering_livingwood" }, "ingredients": [ { diff --git a/src/main/resources/data/botania/recipes/goddesscharm.json b/src/main/resources/data/botania/recipes/goddess_charm.json similarity index 90% rename from src/main/resources/data/botania/recipes/goddesscharm.json rename to src/main/resources/data/botania/recipes/goddess_charm.json index 73c584f8a..3aab84f0f 100644 --- a/src/main/resources/data/botania/recipes/goddesscharm.json +++ b/src/main/resources/data/botania/recipes/goddess_charm.json @@ -1,6 +1,6 @@ { "result": { - "item": "botania:goddesscharm" + "item": "botania:goddess_charm" }, "pattern": [ " P ", diff --git a/src/main/resources/data/botania/recipes/knockbackbelt.json b/src/main/resources/data/botania/recipes/knockback_belt.json similarity index 90% rename from src/main/resources/data/botania/recipes/knockbackbelt.json rename to src/main/resources/data/botania/recipes/knockback_belt.json index 5f471e5ac..ebdae1a89 100644 --- a/src/main/resources/data/botania/recipes/knockbackbelt.json +++ b/src/main/resources/data/botania/recipes/knockback_belt.json @@ -1,6 +1,6 @@ { "result": { - "item": "botania:knockbackbelt" + "item": "botania:knockback_belt" }, "pattern": [ "AL ", diff --git a/src/main/resources/data/botania/recipes/livingrock_1.json b/src/main/resources/data/botania/recipes/livingrock_bricks.json similarity index 78% rename from src/main/resources/data/botania/recipes/livingrock_1.json rename to src/main/resources/data/botania/recipes/livingrock_bricks.json index da3d15f04..705c6dc9f 100644 --- a/src/main/resources/data/botania/recipes/livingrock_1.json +++ b/src/main/resources/data/botania/recipes/livingrock_bricks.json @@ -1,7 +1,6 @@ { "result": { - "item": "botania:livingrock", - "data": 1, + "item": "botania:livingrock_bricks", "count": 4 }, "pattern": [ diff --git a/src/main/resources/data/botania/recipes/livingwood0slab_0.json b/src/main/resources/data/botania/recipes/livingrock_bricks_slab.json similarity index 56% rename from src/main/resources/data/botania/recipes/livingwood0slab_0.json rename to src/main/resources/data/botania/recipes/livingrock_bricks_slab.json index 0e3b47605..9a26ae666 100644 --- a/src/main/resources/data/botania/recipes/livingwood0slab_0.json +++ b/src/main/resources/data/botania/recipes/livingrock_bricks_slab.json @@ -1,7 +1,6 @@ { "result": { - "item": "botania:livingwood0slab", - "data": 0, + "item": "botania:livingrock_bricks_slab", "count": 6 }, "pattern": [ @@ -10,8 +9,7 @@ "type": "minecraft:crafting_shaped", "key": { "Q": { - "item": "botania:livingwood", - "data": 0 + "item": "botania:livingrock_bricks" } } } \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/livingrock1stairs.json b/src/main/resources/data/botania/recipes/livingrock_bricks_stairs.json similarity index 63% rename from src/main/resources/data/botania/recipes/livingrock1stairs.json rename to src/main/resources/data/botania/recipes/livingrock_bricks_stairs.json index 64af85cf9..b12c358a3 100644 --- a/src/main/resources/data/botania/recipes/livingrock1stairs.json +++ b/src/main/resources/data/botania/recipes/livingrock_bricks_stairs.json @@ -1,6 +1,6 @@ { "result": { - "item": "botania:livingrock1stairs", + "item": "botania:livingrock_bricks_stairs", "count": 4 }, "pattern": [ @@ -11,8 +11,7 @@ "type": "minecraft:crafting_shaped", "key": { "Q": { - "item": "botania:livingrock", - "data": 1 + "item": "botania:livingrock_bricks" } } } \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/livingwood1slab_0.json b/src/main/resources/data/botania/recipes/livingwood1slab_0.json deleted file mode 100644 index 023fc4972..000000000 --- a/src/main/resources/data/botania/recipes/livingwood1slab_0.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "result": { - "item": "botania:livingwood1slab", - "data": 0, - "count": 6 - }, - "pattern": [ - "QQQ" - ], - "type": "minecraft:crafting_shaped", - "key": { - "Q": { - "item": "botania:livingwood", - "data": 1 - } - } -} \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/livingwood1stairs.json b/src/main/resources/data/botania/recipes/livingwood1stairs.json deleted file mode 100644 index 3a4a3ce08..000000000 --- a/src/main/resources/data/botania/recipes/livingwood1stairs.json +++ /dev/null @@ -1,18 +0,0 @@ -{ - "result": { - "item": "botania:livingwood1stairs", - "count": 4 - }, - "pattern": [ - " Q", - " QQ", - "QQQ" - ], - "type": "minecraft:crafting_shaped", - "key": { - "Q": { - "item": "botania:livingwood", - "data": 1 - } - } -} \ 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_planks.json similarity index 75% rename from src/main/resources/data/botania/recipes/livingwood_1.json rename to src/main/resources/data/botania/recipes/livingwood_planks.json index 63667c718..028b02053 100644 --- a/src/main/resources/data/botania/recipes/livingwood_1.json +++ b/src/main/resources/data/botania/recipes/livingwood_planks.json @@ -1,7 +1,6 @@ { "result": { - "item": "botania:livingwood", - "data": 1, + "item": "botania:livingwood_planks", "count": 4 }, "ingredients": [ diff --git a/src/main/resources/data/botania/recipes/livingrock1slab_0.json b/src/main/resources/data/botania/recipes/livingwood_planks_slab.json similarity index 56% rename from src/main/resources/data/botania/recipes/livingrock1slab_0.json rename to src/main/resources/data/botania/recipes/livingwood_planks_slab.json index 2dc1b0215..1ea164cc9 100644 --- a/src/main/resources/data/botania/recipes/livingrock1slab_0.json +++ b/src/main/resources/data/botania/recipes/livingwood_planks_slab.json @@ -1,7 +1,6 @@ { "result": { - "item": "botania:livingrock1slab", - "data": 0, + "item": "botania:livingwood_planks_slab", "count": 6 }, "pattern": [ @@ -10,8 +9,7 @@ "type": "minecraft:crafting_shaped", "key": { "Q": { - "item": "botania:livingrock", - "data": 1 + "item": "botania:livingwood_planks" } } } \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/livingwood0stairs.json b/src/main/resources/data/botania/recipes/livingwood_planks_stairs.json similarity index 63% rename from src/main/resources/data/botania/recipes/livingwood0stairs.json rename to src/main/resources/data/botania/recipes/livingwood_planks_stairs.json index 7c550a9e3..f5652eced 100644 --- a/src/main/resources/data/botania/recipes/livingwood0stairs.json +++ b/src/main/resources/data/botania/recipes/livingwood_planks_stairs.json @@ -1,6 +1,6 @@ { "result": { - "item": "botania:livingwood0stairs", + "item": "botania:livingwood_planks_stairs", "count": 4 }, "pattern": [ @@ -11,8 +11,7 @@ "type": "minecraft:crafting_shaped", "key": { "Q": { - "item": "botania:livingwood", - "data": 0 + "item": "botania:livingwood_planks" } } } \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/cwhite_pavement_slab.json b/src/main/resources/data/botania/recipes/livingwood_slab.json similarity index 62% rename from src/main/resources/data/botania/recipes/cwhite_pavement_slab.json rename to src/main/resources/data/botania/recipes/livingwood_slab.json index 74b640ef2..4e2b084c1 100644 --- a/src/main/resources/data/botania/recipes/cwhite_pavement_slab.json +++ b/src/main/resources/data/botania/recipes/livingwood_slab.json @@ -1,6 +1,6 @@ { "result": { - "item": "botania:cwhite_pavement_slab", + "item": "botania:livingwood_slab", "count": 6 }, "pattern": [ @@ -9,7 +9,7 @@ "type": "minecraft:crafting_shaped", "key": { "Q": { - "item": "botania:cwhite_pavement" + "item": "botania:livingwood" } } } \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/cwhite_pavement_stairs.json b/src/main/resources/data/botania/recipes/livingwood_stairs.json similarity index 65% rename from src/main/resources/data/botania/recipes/cwhite_pavement_stairs.json rename to src/main/resources/data/botania/recipes/livingwood_stairs.json index 15cbf2289..f73c60f72 100644 --- a/src/main/resources/data/botania/recipes/cwhite_pavement_stairs.json +++ b/src/main/resources/data/botania/recipes/livingwood_stairs.json @@ -1,6 +1,6 @@ { "result": { - "item": "botania:cwhite_pavement_stairs", + "item": "botania:livingwood_stairs", "count": 4 }, "pattern": [ @@ -11,7 +11,7 @@ "type": "minecraft:crafting_shaped", "key": { "Q": { - "item": "botania:cwhite_pavement" + "item": "botania:livingwood" } } } \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/livingwood0wall.json b/src/main/resources/data/botania/recipes/livingwood_wall.json similarity index 62% rename from src/main/resources/data/botania/recipes/livingwood0wall.json rename to src/main/resources/data/botania/recipes/livingwood_wall.json index e0dd78f20..499d4dca2 100644 --- a/src/main/resources/data/botania/recipes/livingwood0wall.json +++ b/src/main/resources/data/botania/recipes/livingwood_wall.json @@ -1,6 +1,6 @@ { "result": { - "item": "botania:livingwood0wall", + "item": "botania:livingwood_wall", "count": 6 }, "pattern": [ @@ -10,8 +10,7 @@ "type": "minecraft:crafting_shaped", "key": { "B": { - "item": "botania:livingwood", - "data": 0 + "item": "botania:livingwood" } } } \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/manabomb.json b/src/main/resources/data/botania/recipes/mana_bomb.json similarity index 89% rename from src/main/resources/data/botania/recipes/manabomb.json rename to src/main/resources/data/botania/recipes/mana_bomb.json index b8a9b8593..ca3da0779 100644 --- a/src/main/resources/data/botania/recipes/manabomb.json +++ b/src/main/resources/data/botania/recipes/mana_bomb.json @@ -1,6 +1,6 @@ { "result": { - "item": "botania:manabomb" + "item": "botania:mana_bomb" }, "pattern": [ "LTL", diff --git a/src/main/resources/data/botania/recipes/manadetector.json b/src/main/resources/data/botania/recipes/mana_detector.json similarity index 88% rename from src/main/resources/data/botania/recipes/manadetector.json rename to src/main/resources/data/botania/recipes/mana_detector.json index e1cb58339..d99dde670 100644 --- a/src/main/resources/data/botania/recipes/manadetector.json +++ b/src/main/resources/data/botania/recipes/mana_detector.json @@ -1,6 +1,6 @@ { "result": { - "item": "botania:manadetector" + "item": "botania:mana_detector" }, "pattern": [ "RSR", diff --git a/src/main/resources/data/botania/recipes/distributor.json b/src/main/resources/data/botania/recipes/mana_distributor.json similarity index 85% rename from src/main/resources/data/botania/recipes/distributor.json rename to src/main/resources/data/botania/recipes/mana_distributor.json index d324fbdfb..88874603b 100644 --- a/src/main/resources/data/botania/recipes/distributor.json +++ b/src/main/resources/data/botania/recipes/mana_distributor.json @@ -1,6 +1,6 @@ { "result": { - "item": "botania:distributor" + "item": "botania:mana_distributor" }, "pattern": [ "RRR", diff --git a/src/main/resources/data/botania/recipes/manatablet.json b/src/main/resources/data/botania/recipes/mana_tablet.json similarity index 90% rename from src/main/resources/data/botania/recipes/manatablet.json rename to src/main/resources/data/botania/recipes/mana_tablet.json index 1c641bd78..24f205b45 100644 --- a/src/main/resources/data/botania/recipes/manatablet.json +++ b/src/main/resources/data/botania/recipes/mana_tablet.json @@ -1,6 +1,6 @@ { "result": { - "item": "botania:manatablet" + "item": "botania:mana_tablet" }, "pattern": [ "SSS", diff --git a/src/main/resources/data/botania/recipes/manavoid.json b/src/main/resources/data/botania/recipes/mana_void.json similarity index 87% rename from src/main/resources/data/botania/recipes/manavoid.json rename to src/main/resources/data/botania/recipes/mana_void.json index df3188ae4..d4ccf02ee 100644 --- a/src/main/resources/data/botania/recipes/manavoid.json +++ b/src/main/resources/data/botania/recipes/mana_void.json @@ -1,6 +1,6 @@ { "result": { - "item": "botania:manavoid" + "item": "botania:mana_void" }, "pattern": [ "SSS", diff --git a/src/main/resources/data/botania/recipes/manasteelaxe.json b/src/main/resources/data/botania/recipes/manasteel_axe.json similarity index 86% rename from src/main/resources/data/botania/recipes/manasteelaxe.json rename to src/main/resources/data/botania/recipes/manasteel_axe.json index af4a72c79..6dca33a2a 100644 --- a/src/main/resources/data/botania/recipes/manasteelaxe.json +++ b/src/main/resources/data/botania/recipes/manasteel_axe.json @@ -1,6 +1,6 @@ { "result": { - "item": "botania:manasteelaxe" + "item": "botania:manasteel_axe" }, "pattern": [ "SS", diff --git a/src/main/resources/data/botania/recipes/manasteelboots.json b/src/main/resources/data/botania/recipes/manasteel_boots.json similarity index 81% rename from src/main/resources/data/botania/recipes/manasteelboots.json rename to src/main/resources/data/botania/recipes/manasteel_boots.json index e3dc1286b..a03e617a3 100644 --- a/src/main/resources/data/botania/recipes/manasteelboots.json +++ b/src/main/resources/data/botania/recipes/manasteel_boots.json @@ -1,6 +1,6 @@ { "result": { - "item": "botania:manasteelboots" + "item": "botania:manasteel_boots" }, "pattern": [ "S S", diff --git a/src/main/resources/data/botania/recipes/manasteelchest.json b/src/main/resources/data/botania/recipes/manasteel_chestplate.json similarity index 80% rename from src/main/resources/data/botania/recipes/manasteelchest.json rename to src/main/resources/data/botania/recipes/manasteel_chestplate.json index c9d366c94..0a782105b 100644 --- a/src/main/resources/data/botania/recipes/manasteelchest.json +++ b/src/main/resources/data/botania/recipes/manasteel_chestplate.json @@ -1,6 +1,6 @@ { "result": { - "item": "botania:manasteelchest" + "item": "botania:manasteel_chestplate" }, "pattern": [ "S S", diff --git a/src/main/resources/data/botania/recipes/manasteelhelm.json b/src/main/resources/data/botania/recipes/manasteel_helmet.json similarity index 81% rename from src/main/resources/data/botania/recipes/manasteelhelm.json rename to src/main/resources/data/botania/recipes/manasteel_helmet.json index eb3573eb3..7a4cb9174 100644 --- a/src/main/resources/data/botania/recipes/manasteelhelm.json +++ b/src/main/resources/data/botania/recipes/manasteel_helmet.json @@ -1,6 +1,6 @@ { "result": { - "item": "botania:manasteelhelm" + "item": "botania:manasteel_helmet" }, "pattern": [ "SSS", diff --git a/src/main/resources/data/botania/recipes/manasteellegs.json b/src/main/resources/data/botania/recipes/manasteel_leggings.json similarity index 81% rename from src/main/resources/data/botania/recipes/manasteellegs.json rename to src/main/resources/data/botania/recipes/manasteel_leggings.json index 6da1250aa..0477ba123 100644 --- a/src/main/resources/data/botania/recipes/manasteellegs.json +++ b/src/main/resources/data/botania/recipes/manasteel_leggings.json @@ -1,6 +1,6 @@ { "result": { - "item": "botania:manasteellegs" + "item": "botania:manasteel_leggings" }, "pattern": [ "SSS", diff --git a/src/main/resources/data/botania/recipes/manasteelpick.json b/src/main/resources/data/botania/recipes/manasteel_pickaxe.json similarity index 85% rename from src/main/resources/data/botania/recipes/manasteelpick.json rename to src/main/resources/data/botania/recipes/manasteel_pickaxe.json index d4a663ab5..cd108178e 100644 --- a/src/main/resources/data/botania/recipes/manasteelpick.json +++ b/src/main/resources/data/botania/recipes/manasteel_pickaxe.json @@ -1,6 +1,6 @@ { "result": { - "item": "botania:manasteelpick" + "item": "botania:manasteel_pickaxe" }, "pattern": [ "SSS", diff --git a/src/main/resources/data/botania/recipes/manasteelshears.json b/src/main/resources/data/botania/recipes/manasteel_shears.json similarity index 81% rename from src/main/resources/data/botania/recipes/manasteelshears.json rename to src/main/resources/data/botania/recipes/manasteel_shears.json index f2f866361..73b92310b 100644 --- a/src/main/resources/data/botania/recipes/manasteelshears.json +++ b/src/main/resources/data/botania/recipes/manasteel_shears.json @@ -1,6 +1,6 @@ { "result": { - "item": "botania:manasteelshears" + "item": "botania:manasteel_shears" }, "pattern": [ "S ", diff --git a/src/main/resources/data/botania/recipes/manasteelshovel.json b/src/main/resources/data/botania/recipes/manasteel_shovel.json similarity index 85% rename from src/main/resources/data/botania/recipes/manasteelshovel.json rename to src/main/resources/data/botania/recipes/manasteel_shovel.json index 09360c575..40b0d012e 100644 --- a/src/main/resources/data/botania/recipes/manasteelshovel.json +++ b/src/main/resources/data/botania/recipes/manasteel_shovel.json @@ -1,6 +1,6 @@ { "result": { - "item": "botania:manasteelshovel" + "item": "botania:manasteel_shovel" }, "pattern": [ "S", diff --git a/src/main/resources/data/botania/recipes/manasteelsword.json b/src/main/resources/data/botania/recipes/manasteel_sword.json similarity index 86% rename from src/main/resources/data/botania/recipes/manasteelsword.json rename to src/main/resources/data/botania/recipes/manasteel_sword.json index d6e445285..477741166 100644 --- a/src/main/resources/data/botania/recipes/manasteelsword.json +++ b/src/main/resources/data/botania/recipes/manasteel_sword.json @@ -1,6 +1,6 @@ { "result": { - "item": "botania:manasteelsword" + "item": "botania:manasteel_sword" }, "pattern": [ "S", diff --git a/src/main/resources/data/botania/recipes/manaweaveboots.json b/src/main/resources/data/botania/recipes/manaweave_boots.json similarity index 82% rename from src/main/resources/data/botania/recipes/manaweaveboots.json rename to src/main/resources/data/botania/recipes/manaweave_boots.json index b0cac8667..ffc76f44f 100644 --- a/src/main/resources/data/botania/recipes/manaweaveboots.json +++ b/src/main/resources/data/botania/recipes/manaweave_boots.json @@ -1,6 +1,6 @@ { "result": { - "item": "botania:manaweaveboots" + "item": "botania:manaweave_boots" }, "pattern": [ "S S", diff --git a/src/main/resources/data/botania/recipes/manaweavechest.json b/src/main/resources/data/botania/recipes/manaweave_chestplate.json similarity index 81% rename from src/main/resources/data/botania/recipes/manaweavechest.json rename to src/main/resources/data/botania/recipes/manaweave_chestplate.json index 67ede1460..08754a371 100644 --- a/src/main/resources/data/botania/recipes/manaweavechest.json +++ b/src/main/resources/data/botania/recipes/manaweave_chestplate.json @@ -1,6 +1,6 @@ { "result": { - "item": "botania:manaweavechest" + "item": "botania:manaweave_chestplate" }, "pattern": [ "S S", diff --git a/src/main/resources/data/botania/recipes/manaweavehelm.json b/src/main/resources/data/botania/recipes/manaweave_helmet.json similarity index 81% rename from src/main/resources/data/botania/recipes/manaweavehelm.json rename to src/main/resources/data/botania/recipes/manaweave_helmet.json index 1ec111bf4..c93a11563 100644 --- a/src/main/resources/data/botania/recipes/manaweavehelm.json +++ b/src/main/resources/data/botania/recipes/manaweave_helmet.json @@ -1,6 +1,6 @@ { "result": { - "item": "botania:manaweavehelm" + "item": "botania:manaweave_helmet" }, "pattern": [ "SSS", diff --git a/src/main/resources/data/botania/recipes/manaweavelegs.json b/src/main/resources/data/botania/recipes/manaweave_leggings.json similarity index 81% rename from src/main/resources/data/botania/recipes/manaweavelegs.json rename to src/main/resources/data/botania/recipes/manaweave_leggings.json index 7ff541141..f97c9608e 100644 --- a/src/main/resources/data/botania/recipes/manaweavelegs.json +++ b/src/main/resources/data/botania/recipes/manaweave_leggings.json @@ -1,6 +1,6 @@ { "result": { - "item": "botania:manaweavelegs" + "item": "botania:manaweave_leggings" }, "pattern": [ "SSS", diff --git a/src/main/resources/data/botania/recipes/metamorphic_desert_bricks_stairs.json b/src/main/resources/data/botania/recipes/metamorphic_desert_bricks_stairs.json index e7c6f6d10..fafbd5038 100644 --- a/src/main/resources/data/botania/recipes/metamorphic_desert_bricks_stairs.json +++ b/src/main/resources/data/botania/recipes/metamorphic_desert_bricks_stairs.json @@ -4,8 +4,8 @@ "count": 4 }, "pattern": [ - " S" - " SS" + " S", + " SS", "SSS" ], "type": "minecraft:crafting_shaped", diff --git a/src/main/resources/data/botania/recipes/metamorphic_desert_cobblestone_stairs.json b/src/main/resources/data/botania/recipes/metamorphic_desert_cobblestone_stairs.json index 3db2a0edb..0687dbfd5 100644 --- a/src/main/resources/data/botania/recipes/metamorphic_desert_cobblestone_stairs.json +++ b/src/main/resources/data/botania/recipes/metamorphic_desert_cobblestone_stairs.json @@ -4,8 +4,8 @@ "count": 4 }, "pattern": [ - " S" - " SS" + " S", + " SS", "SSS" ], "type": "minecraft:crafting_shaped", diff --git a/src/main/resources/data/botania/recipes/metamorphic_desert_stone_stairs.json b/src/main/resources/data/botania/recipes/metamorphic_desert_stone_stairs.json index bca4c34e1..c09c73729 100644 --- a/src/main/resources/data/botania/recipes/metamorphic_desert_stone_stairs.json +++ b/src/main/resources/data/botania/recipes/metamorphic_desert_stone_stairs.json @@ -4,8 +4,8 @@ "count": 4 }, "pattern": [ - " S" - " SS" + " S", + " SS", "SSS" ], "type": "minecraft:crafting_shaped", diff --git a/src/main/resources/data/botania/recipes/metamorphic_forest_bricks_stairs.json b/src/main/resources/data/botania/recipes/metamorphic_forest_bricks_stairs.json index 2794a9ab7..b6d562d64 100644 --- a/src/main/resources/data/botania/recipes/metamorphic_forest_bricks_stairs.json +++ b/src/main/resources/data/botania/recipes/metamorphic_forest_bricks_stairs.json @@ -4,8 +4,8 @@ "count": 4 }, "pattern": [ - " S" - " SS" + " S", + " SS", "SSS" ], "type": "minecraft:crafting_shaped", diff --git a/src/main/resources/data/botania/recipes/metamorphic_forest_cobblestone_stairs.json b/src/main/resources/data/botania/recipes/metamorphic_forest_cobblestone_stairs.json index 87658bf4c..cc4c88221 100644 --- a/src/main/resources/data/botania/recipes/metamorphic_forest_cobblestone_stairs.json +++ b/src/main/resources/data/botania/recipes/metamorphic_forest_cobblestone_stairs.json @@ -4,8 +4,8 @@ "count": 4 }, "pattern": [ - " S" - " SS" + " S", + " SS", "SSS" ], "type": "minecraft:crafting_shaped", diff --git a/src/main/resources/data/botania/recipes/metamorphic_forest_stone_stairs.json b/src/main/resources/data/botania/recipes/metamorphic_forest_stone_stairs.json index 2357c2407..f164e96ac 100644 --- a/src/main/resources/data/botania/recipes/metamorphic_forest_stone_stairs.json +++ b/src/main/resources/data/botania/recipes/metamorphic_forest_stone_stairs.json @@ -4,8 +4,8 @@ "count": 4 }, "pattern": [ - " S" - " SS" + " S", + " SS", "SSS" ], "type": "minecraft:crafting_shaped", diff --git a/src/main/resources/data/botania/recipes/metamorphic_fungal_bricks_stairs.json b/src/main/resources/data/botania/recipes/metamorphic_fungal_bricks_stairs.json index c1b1cadc0..11caf0ad5 100644 --- a/src/main/resources/data/botania/recipes/metamorphic_fungal_bricks_stairs.json +++ b/src/main/resources/data/botania/recipes/metamorphic_fungal_bricks_stairs.json @@ -4,8 +4,8 @@ "count": 4 }, "pattern": [ - " S" - " SS" + " S", + " SS", "SSS" ], "type": "minecraft:crafting_shaped", diff --git a/src/main/resources/data/botania/recipes/metamorphic_fungal_cobblestone_stairs.json b/src/main/resources/data/botania/recipes/metamorphic_fungal_cobblestone_stairs.json index 74a9b269b..fc9cb079f 100644 --- a/src/main/resources/data/botania/recipes/metamorphic_fungal_cobblestone_stairs.json +++ b/src/main/resources/data/botania/recipes/metamorphic_fungal_cobblestone_stairs.json @@ -4,8 +4,8 @@ "count": 4 }, "pattern": [ - " S" - " SS" + " S", + " SS", "SSS" ], "type": "minecraft:crafting_shaped", diff --git a/src/main/resources/data/botania/recipes/metamorphic_fungal_stone_stairs.json b/src/main/resources/data/botania/recipes/metamorphic_fungal_stone_stairs.json index 383f0e4aa..0a77c5db6 100644 --- a/src/main/resources/data/botania/recipes/metamorphic_fungal_stone_stairs.json +++ b/src/main/resources/data/botania/recipes/metamorphic_fungal_stone_stairs.json @@ -4,8 +4,8 @@ "count": 4 }, "pattern": [ - " S" - " SS" + " S", + " SS", "SSS" ], "type": "minecraft:crafting_shaped", diff --git a/src/main/resources/data/botania/recipes/metamorphic_mesa_bricks_stairs.json b/src/main/resources/data/botania/recipes/metamorphic_mesa_bricks_stairs.json index 75cedb362..e5e77d2fd 100644 --- a/src/main/resources/data/botania/recipes/metamorphic_mesa_bricks_stairs.json +++ b/src/main/resources/data/botania/recipes/metamorphic_mesa_bricks_stairs.json @@ -4,8 +4,8 @@ "count": 4 }, "pattern": [ - " S" - " SS" + " S", + " SS", "SSS" ], "type": "minecraft:crafting_shaped", diff --git a/src/main/resources/data/botania/recipes/metamorphic_mesa_cobblestone_stairs.json b/src/main/resources/data/botania/recipes/metamorphic_mesa_cobblestone_stairs.json index 40c029156..95bf0c6bc 100644 --- a/src/main/resources/data/botania/recipes/metamorphic_mesa_cobblestone_stairs.json +++ b/src/main/resources/data/botania/recipes/metamorphic_mesa_cobblestone_stairs.json @@ -4,8 +4,8 @@ "count": 4 }, "pattern": [ - " S" - " SS" + " S", + " SS", "SSS" ], "type": "minecraft:crafting_shaped", diff --git a/src/main/resources/data/botania/recipes/metamorphic_mesa_stone_stairs.json b/src/main/resources/data/botania/recipes/metamorphic_mesa_stone_stairs.json index 86d3f2f07..058ac95fd 100644 --- a/src/main/resources/data/botania/recipes/metamorphic_mesa_stone_stairs.json +++ b/src/main/resources/data/botania/recipes/metamorphic_mesa_stone_stairs.json @@ -4,8 +4,8 @@ "count": 4 }, "pattern": [ - " S" - " SS" + " S", + " SS", "SSS" ], "type": "minecraft:crafting_shaped", diff --git a/src/main/resources/data/botania/recipes/metamorphic_mountain_bricks_stairs.json b/src/main/resources/data/botania/recipes/metamorphic_mountain_bricks_stairs.json index 1db1bb7f9..ab0e3f8b2 100644 --- a/src/main/resources/data/botania/recipes/metamorphic_mountain_bricks_stairs.json +++ b/src/main/resources/data/botania/recipes/metamorphic_mountain_bricks_stairs.json @@ -4,8 +4,8 @@ "count": 4 }, "pattern": [ - " S" - " SS" + " S", + " SS", "SSS" ], "type": "minecraft:crafting_shaped", diff --git a/src/main/resources/data/botania/recipes/metamorphic_mountain_cobblestone_stairs.json b/src/main/resources/data/botania/recipes/metamorphic_mountain_cobblestone_stairs.json index d46a5abd4..39d1a7579 100644 --- a/src/main/resources/data/botania/recipes/metamorphic_mountain_cobblestone_stairs.json +++ b/src/main/resources/data/botania/recipes/metamorphic_mountain_cobblestone_stairs.json @@ -4,8 +4,8 @@ "count": 4 }, "pattern": [ - " S" - " SS" + " S", + " SS", "SSS" ], "type": "minecraft:crafting_shaped", diff --git a/src/main/resources/data/botania/recipes/metamorphic_mountain_stone_stairs.json b/src/main/resources/data/botania/recipes/metamorphic_mountain_stone_stairs.json index 14b9393ba..6aba8bdab 100644 --- a/src/main/resources/data/botania/recipes/metamorphic_mountain_stone_stairs.json +++ b/src/main/resources/data/botania/recipes/metamorphic_mountain_stone_stairs.json @@ -4,8 +4,8 @@ "count": 4 }, "pattern": [ - " S" - " SS" + " S", + " SS", "SSS" ], "type": "minecraft:crafting_shaped", diff --git a/src/main/resources/data/botania/recipes/metamorphic_plains_bricks_stairs.json b/src/main/resources/data/botania/recipes/metamorphic_plains_bricks_stairs.json index 71a9509d0..f44528530 100644 --- a/src/main/resources/data/botania/recipes/metamorphic_plains_bricks_stairs.json +++ b/src/main/resources/data/botania/recipes/metamorphic_plains_bricks_stairs.json @@ -4,8 +4,8 @@ "count": 4 }, "pattern": [ - " S" - " SS" + " S", + " SS", "SSS" ], "type": "minecraft:crafting_shaped", diff --git a/src/main/resources/data/botania/recipes/metamorphic_plains_cobblestone_stairs.json b/src/main/resources/data/botania/recipes/metamorphic_plains_cobblestone_stairs.json index e27a1d12c..fa19ef6e3 100644 --- a/src/main/resources/data/botania/recipes/metamorphic_plains_cobblestone_stairs.json +++ b/src/main/resources/data/botania/recipes/metamorphic_plains_cobblestone_stairs.json @@ -4,8 +4,8 @@ "count": 4 }, "pattern": [ - " S" - " SS" + " S", + " SS", "SSS" ], "type": "minecraft:crafting_shaped", diff --git a/src/main/resources/data/botania/recipes/metamorphic_plains_stone_stairs.json b/src/main/resources/data/botania/recipes/metamorphic_plains_stone_stairs.json index 8d8d740bc..394ddbc26 100644 --- a/src/main/resources/data/botania/recipes/metamorphic_plains_stone_stairs.json +++ b/src/main/resources/data/botania/recipes/metamorphic_plains_stone_stairs.json @@ -4,8 +4,8 @@ "count": 4 }, "pattern": [ - " S" - " SS" + " S", + " SS", "SSS" ], "type": "minecraft:crafting_shaped", diff --git a/src/main/resources/data/botania/recipes/metamorphic_swamp_bricks_stairs.json b/src/main/resources/data/botania/recipes/metamorphic_swamp_bricks_stairs.json index 84bac8ee9..0ca8df501 100644 --- a/src/main/resources/data/botania/recipes/metamorphic_swamp_bricks_stairs.json +++ b/src/main/resources/data/botania/recipes/metamorphic_swamp_bricks_stairs.json @@ -4,8 +4,8 @@ "count": 4 }, "pattern": [ - " S" - " SS" + " S", + " SS", "SSS" ], "type": "minecraft:crafting_shaped", diff --git a/src/main/resources/data/botania/recipes/metamorphic_swamp_cobblestone_stairs.json b/src/main/resources/data/botania/recipes/metamorphic_swamp_cobblestone_stairs.json index 438125e89..45bb76455 100644 --- a/src/main/resources/data/botania/recipes/metamorphic_swamp_cobblestone_stairs.json +++ b/src/main/resources/data/botania/recipes/metamorphic_swamp_cobblestone_stairs.json @@ -4,8 +4,8 @@ "count": 4 }, "pattern": [ - " S" - " SS" + " S", + " SS", "SSS" ], "type": "minecraft:crafting_shaped", diff --git a/src/main/resources/data/botania/recipes/metamorphic_swamp_stone_stairs.json b/src/main/resources/data/botania/recipes/metamorphic_swamp_stone_stairs.json index 38dfcf683..731df830e 100644 --- a/src/main/resources/data/botania/recipes/metamorphic_swamp_stone_stairs.json +++ b/src/main/resources/data/botania/recipes/metamorphic_swamp_stone_stairs.json @@ -4,8 +4,8 @@ "count": 4 }, "pattern": [ - " S" - " SS" + " S", + " SS", "SSS" ], "type": "minecraft:crafting_shaped", diff --git a/src/main/resources/data/botania/recipes/metamorphic_taiga_bricks_stairs.json b/src/main/resources/data/botania/recipes/metamorphic_taiga_bricks_stairs.json index bd063bbe1..02af5814d 100644 --- a/src/main/resources/data/botania/recipes/metamorphic_taiga_bricks_stairs.json +++ b/src/main/resources/data/botania/recipes/metamorphic_taiga_bricks_stairs.json @@ -4,8 +4,8 @@ "count": 4 }, "pattern": [ - " S" - " SS" + " S", + " SS", "SSS" ], "type": "minecraft:crafting_shaped", diff --git a/src/main/resources/data/botania/recipes/metamorphic_taiga_cobblestone_stairs.json b/src/main/resources/data/botania/recipes/metamorphic_taiga_cobblestone_stairs.json index a4227fcaf..6626284af 100644 --- a/src/main/resources/data/botania/recipes/metamorphic_taiga_cobblestone_stairs.json +++ b/src/main/resources/data/botania/recipes/metamorphic_taiga_cobblestone_stairs.json @@ -4,8 +4,8 @@ "count": 4 }, "pattern": [ - " S" - " SS" + " S", + " SS", "SSS" ], "type": "minecraft:crafting_shaped", diff --git a/src/main/resources/data/botania/recipes/metamorphic_taiga_stone_stairs.json b/src/main/resources/data/botania/recipes/metamorphic_taiga_stone_stairs.json index 69023d2be..231749219 100644 --- a/src/main/resources/data/botania/recipes/metamorphic_taiga_stone_stairs.json +++ b/src/main/resources/data/botania/recipes/metamorphic_taiga_stone_stairs.json @@ -4,8 +4,8 @@ "count": 4 }, "pattern": [ - " S" - " SS" + " S", + " SS", "SSS" ], "type": "minecraft:crafting_shaped", diff --git a/src/main/resources/data/botania/recipes/miningring.json b/src/main/resources/data/botania/recipes/mining_ring.json similarity index 89% rename from src/main/resources/data/botania/recipes/miningring.json rename to src/main/resources/data/botania/recipes/mining_ring.json index bc05ef662..10ec08d4e 100644 --- a/src/main/resources/data/botania/recipes/miningring.json +++ b/src/main/resources/data/botania/recipes/mining_ring.json @@ -1,6 +1,6 @@ { "result": { - "item": "botania:miningring" + "item": "botania:mining_ring" }, "pattern": [ "EMP", diff --git a/src/main/resources/data/botania/recipes/missilerod.json b/src/main/resources/data/botania/recipes/missile_rod.json similarity index 89% rename from src/main/resources/data/botania/recipes/missilerod.json rename to src/main/resources/data/botania/recipes/missile_rod.json index 7e7da5f9f..285971214 100644 --- a/src/main/resources/data/botania/recipes/missilerod.json +++ b/src/main/resources/data/botania/recipes/missile_rod.json @@ -1,6 +1,6 @@ { "result": { - "item": "botania:missilerod" + "item": "botania:missile_rod" }, "pattern": [ "GDD", diff --git a/src/main/resources/data/botania/recipes/dreamwood_2.json b/src/main/resources/data/botania/recipes/mossy_dreamwood_planks.json similarity index 60% rename from src/main/resources/data/botania/recipes/dreamwood_2.json rename to src/main/resources/data/botania/recipes/mossy_dreamwood_planks.json index 3d8bf0136..a93f3d802 100644 --- a/src/main/resources/data/botania/recipes/dreamwood_2.json +++ b/src/main/resources/data/botania/recipes/mossy_dreamwood_planks.json @@ -1,12 +1,10 @@ { "result": { - "item": "botania:dreamwood", - "data": 2 + "item": "botania:mossy_dreamwood_planks" }, "ingredients": [ { - "item": "botania:dreamwood", - "data": 1 + "item": "botania:dreamwood_planks" }, { "item": "minecraft:wheat_seeds" diff --git a/src/main/resources/data/botania/recipes/livingrock_2.json b/src/main/resources/data/botania/recipes/mossy_livingrock_bricks.json similarity index 60% rename from src/main/resources/data/botania/recipes/livingrock_2.json rename to src/main/resources/data/botania/recipes/mossy_livingrock_bricks.json index cf460c816..7a2e9e81a 100644 --- a/src/main/resources/data/botania/recipes/livingrock_2.json +++ b/src/main/resources/data/botania/recipes/mossy_livingrock_bricks.json @@ -1,12 +1,10 @@ { "result": { - "item": "botania:livingrock", - "data": 2 + "item": "botania:mossy_livingrock_bricks" }, "ingredients": [ { - "item": "botania:livingrock", - "data": 1 + "item": "botania:livingrock_bricks" }, { "item": "minecraft:wheat_seeds" diff --git a/src/main/resources/data/botania/recipes/livingwood_2.json b/src/main/resources/data/botania/recipes/mossy_livingwood_planks.json similarity index 60% rename from src/main/resources/data/botania/recipes/livingwood_2.json rename to src/main/resources/data/botania/recipes/mossy_livingwood_planks.json index 723dbc120..ef2bafbb6 100644 --- a/src/main/resources/data/botania/recipes/livingwood_2.json +++ b/src/main/resources/data/botania/recipes/mossy_livingwood_planks.json @@ -1,12 +1,10 @@ { "result": { - "item": "botania:livingwood", - "data": 2 + "item": "botania:mossy_livingwood_planks" }, "ingredients": [ { - "item": "botania:livingwood", - "data": 1 + "item": "botania:livingwood_planks" }, { "item": "minecraft:wheat_seeds" diff --git a/src/main/resources/data/botania/recipes/natura_pylon.json b/src/main/resources/data/botania/recipes/natura_pylon.json index ebc69055d..d362998ac 100644 --- a/src/main/resources/data/botania/recipes/natura_pylon.json +++ b/src/main/resources/data/botania/recipes/natura_pylon.json @@ -10,7 +10,7 @@ "type": "minecraft:crafting_shaped", "key": { "P": { - "item": "botania:pylon_mana" + "item": "botania:mana_pylon" }, "T": { "tag": "forge:nuggets/terrasteel" diff --git a/src/main/resources/data/botania/recipes/obediencestick.json b/src/main/resources/data/botania/recipes/obedience_stick.json similarity index 86% rename from src/main/resources/data/botania/recipes/obediencestick.json rename to src/main/resources/data/botania/recipes/obedience_stick.json index 5a9ee5234..5ddc70bfd 100644 --- a/src/main/resources/data/botania/recipes/obediencestick.json +++ b/src/main/resources/data/botania/recipes/obedience_stick.json @@ -1,6 +1,6 @@ { "result": { - "item": "botania:obediencestick" + "item": "botania:obedience_stick" }, "pattern": [ " M", diff --git a/src/main/resources/data/botania/recipes/openbucket.json b/src/main/resources/data/botania/recipes/open_bucket.json similarity index 83% rename from src/main/resources/data/botania/recipes/openbucket.json rename to src/main/resources/data/botania/recipes/open_bucket.json index 09fd66e51..dbd848609 100644 --- a/src/main/resources/data/botania/recipes/openbucket.json +++ b/src/main/resources/data/botania/recipes/open_bucket.json @@ -1,6 +1,6 @@ { "result": { - "item": "botania:openbucket" + "item": "botania:open_bucket" }, "pattern": [ "E E", diff --git a/src/main/resources/data/botania/recipes/opencrate.json b/src/main/resources/data/botania/recipes/open_crate.json similarity index 63% rename from src/main/resources/data/botania/recipes/opencrate.json rename to src/main/resources/data/botania/recipes/open_crate.json index 74a3cc2cd..d28f157c4 100644 --- a/src/main/resources/data/botania/recipes/opencrate.json +++ b/src/main/resources/data/botania/recipes/open_crate.json @@ -1,6 +1,6 @@ { "result": { - "item": "botania:opencrate" + "item": "botania:open_crate" }, "pattern": [ "WWW", @@ -10,8 +10,7 @@ "type": "minecraft:crafting_shaped", "key": { "W": { - "item": "botania:livingwood", - "data": 1 + "item": "botania:livingwood_planks" } } } \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/dreamwood_4.json b/src/main/resources/data/botania/recipes/pattern_framed_dreamwood.json similarity index 61% rename from src/main/resources/data/botania/recipes/dreamwood_4.json rename to src/main/resources/data/botania/recipes/pattern_framed_dreamwood.json index 6e0e2ef83..60a8c2011 100644 --- a/src/main/resources/data/botania/recipes/dreamwood_4.json +++ b/src/main/resources/data/botania/recipes/pattern_framed_dreamwood.json @@ -1,7 +1,6 @@ { "result": { - "item": "botania:dreamwood", - "data": 4, + "item": "botania:pattern_framed_dreamwood", "count": 4 }, "pattern": [ @@ -12,8 +11,7 @@ "type": "minecraft:crafting_shaped", "key": { "W": { - "item": "botania:dreamwood", - "data": 1 + "item": "botania:dreamwood_planks" } } } \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/livingwood_4.json b/src/main/resources/data/botania/recipes/pattern_framed_livingwood.json similarity index 61% rename from src/main/resources/data/botania/recipes/livingwood_4.json rename to src/main/resources/data/botania/recipes/pattern_framed_livingwood.json index 8808a8efb..7503f627e 100644 --- a/src/main/resources/data/botania/recipes/livingwood_4.json +++ b/src/main/resources/data/botania/recipes/pattern_framed_livingwood.json @@ -1,7 +1,6 @@ { "result": { - "item": "botania:livingwood", - "data": 4, + "item": "botania:pattern_framed_livingwood", "count": 4 }, "pattern": [ @@ -12,8 +11,7 @@ "type": "minecraft:crafting_shaped", "key": { "W": { - "item": "botania:livingwood", - "data": 1 + "item": "botania:livingwood_planks" } } } \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/pestleandmortar.json b/src/main/resources/data/botania/recipes/pestle_and_mortar.json similarity index 87% rename from src/main/resources/data/botania/recipes/pestleandmortar.json rename to src/main/resources/data/botania/recipes/pestle_and_mortar.json index f23961a93..0d127e820 100644 --- a/src/main/resources/data/botania/recipes/pestleandmortar.json +++ b/src/main/resources/data/botania/recipes/pestle_and_mortar.json @@ -1,6 +1,6 @@ { "result": { - "item": "botania:pestleandmortar" + "item": "botania:pestle_and_mortar" }, "pattern": [ " S", diff --git a/src/main/resources/data/botania/recipes/phantomink.json b/src/main/resources/data/botania/recipes/phtanom_ink.json similarity index 85% rename from src/main/resources/data/botania/recipes/phantomink.json rename to src/main/resources/data/botania/recipes/phtanom_ink.json index 2678e2e33..97d1962fe 100644 --- a/src/main/resources/data/botania/recipes/phantomink.json +++ b/src/main/resources/data/botania/recipes/phtanom_ink.json @@ -1,6 +1,6 @@ { "result": { - "item": "botania:phantomink", + "item": "botania:phantom_ink", "count": 4 }, "ingredients": [ @@ -11,7 +11,7 @@ "tag": "forge:dyes" }, { - "constants": "botania:glass" + "constant": "botania:glass" }, { "item": "minecraft:glass_bottle" diff --git a/src/main/resources/data/botania/recipes/livingwood_1_alt.json b/src/main/resources/data/botania/recipes/slab_recombine/livingwood.json similarity index 55% rename from src/main/resources/data/botania/recipes/livingwood_1_alt.json rename to src/main/resources/data/botania/recipes/slab_recombine/livingwood.json index 39c82d71e..b826578d7 100644 --- a/src/main/resources/data/botania/recipes/livingwood_1_alt.json +++ b/src/main/resources/data/botania/recipes/slab_recombine/livingwood.json @@ -1,7 +1,6 @@ { "result": { - "item": "botania:livingwood", - "data": 1 + "item": "botania:livingwood" }, "pattern": [ "Q", @@ -10,8 +9,7 @@ "type": "minecraft:crafting_shaped", "key": { "Q": { - "item": "botania:livingwood1slab", - "data": 0 + "item": "botania:livingwood_slab" } } } \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/livingwood_0.json b/src/main/resources/data/botania/recipes/slab_recombine/livingwood_planks.json similarity index 55% rename from src/main/resources/data/botania/recipes/livingwood_0.json rename to src/main/resources/data/botania/recipes/slab_recombine/livingwood_planks.json index ac8ea4a11..ba2419a96 100644 --- a/src/main/resources/data/botania/recipes/livingwood_0.json +++ b/src/main/resources/data/botania/recipes/slab_recombine/livingwood_planks.json @@ -1,7 +1,6 @@ { "result": { - "item": "botania:livingwood", - "data": 0 + "item": "botania:livingwood_planks" }, "pattern": [ "Q", @@ -10,8 +9,7 @@ "type": "minecraft:crafting_shaped", "key": { "Q": { - "item": "botania:livingwood0slab", - "data": 0 + "item": "botania:livingwood_planks_slab" } } } \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/white_pavement_stairs.json b/src/main/resources/data/botania/recipes/white_pavement_stairs.json new file mode 100644 index 000000000..77d030bdd --- /dev/null +++ b/src/main/resources/data/botania/recipes/white_pavement_stairs.json @@ -0,0 +1,17 @@ +{ + "result": { + "item": "botania:white_pavement_stairs", + "count": 4 + }, + "pattern": [ + " Q", + " QQ", + "QQQ" + ], + "type": "minecraft:crafting_shaped", + "key": { + "Q": { + "item": "botania:white_pavement" + } + } +} \ No newline at end of file