From 7feea17302f6a4e461c24adb6f1f7393a2245421 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Tue, 27 Jun 2017 21:26:48 -0500 Subject: [PATCH] Update forge and fix compiles, and cleanup some recipes --- build.properties | 2 +- .../client/core/handler/DebugHandler.java | 4 ++-- .../botania/client/core/proxy/GuiFactory.java | 11 ---------- .../client/model/FloatingFlowerModel.java | 11 ++++------ .../vazkii/botania/client/model/GunModel.java | 13 +++++------ .../botania/client/model/LexiconModel.java | 5 ++--- .../botania/client/model/ModelPylon.java | 4 ++-- .../client/model/SpecialFlowerModel.java | 13 +++++------ .../botania/common/item/ItemCacophonium.java | 2 +- .../item/material/ItemManaResource.java | 2 +- .../assets/botania/recipes/altar_0.json | 1 + .../assets/botania/recipes/altar_1.json | 1 + .../assets/botania/recipes/altar_2.json | 1 + .../assets/botania/recipes/altar_3.json | 1 + .../assets/botania/recipes/altar_4.json | 1 + .../assets/botania/recipes/altar_5.json | 1 + .../assets/botania/recipes/altar_6.json | 1 + .../assets/botania/recipes/altar_7.json | 1 + .../assets/botania/recipes/altar_8.json | 1 + .../assets/botania/recipes/blazeblock.json | 2 +- .../assets/botania/recipes/cocoon.json | 2 +- .../conversions/blazeblock_deconstruct.json | 2 +- .../elementium_block_deconstruct.json} | 0 .../manasteel_block_deconstruct.json} | 0 .../petal_block_deconstruct_0.json} | 0 .../petal_block_deconstruct_1.json} | 1 + .../petal_block_deconstruct_10.json} | 1 + .../petal_block_deconstruct_11.json} | 1 + .../petal_block_deconstruct_12.json} | 1 + .../petal_block_deconstruct_13.json} | 1 + .../petal_block_deconstruct_14.json} | 1 + .../petal_block_deconstruct_15.json} | 1 + .../petal_block_deconstruct_2.json} | 1 + .../petal_block_deconstruct_3.json} | 1 + .../petal_block_deconstruct_4.json} | 1 + .../petal_block_deconstruct_5.json} | 1 + .../petal_block_deconstruct_6.json} | 1 + .../petal_block_deconstruct_7.json} | 1 + .../petal_block_deconstruct_8.json} | 1 + .../petal_block_deconstruct_9.json} | 1 + .../terrasteel_block_deconstruct.json} | 0 .../botania/recipes/craftpattern_0.json | 1 + .../botania/recipes/craftpattern_1.json | 1 + .../botania/recipes/craftpattern_2.json | 1 + .../botania/recipes/craftpattern_3.json | 1 + .../botania/recipes/craftpattern_4.json | 1 + .../botania/recipes/craftpattern_5.json | 1 + .../botania/recipes/craftpattern_6.json | 1 + .../botania/recipes/craftpattern_7.json | 1 + .../botania/recipes/craftpattern_8.json | 1 + .../botania/recipes/fertilizer_powder.json | 2 +- .../recipes/garden_of_glass/blazeblock.json | 2 +- .../blazeblock_deconstruct.json | 2 +- .../recipes/garden_of_glass/cocoon.json | 2 +- .../garden_of_glass/end_portal_frame.json | 2 +- .../garden_of_glass/fertilizer_powder.json | 2 +- .../magma_cream_to_slime_ball.json | 2 +- .../pebble_to_cobblestone.json | 2 +- .../garden_of_glass/root_to_fertilizer.json | 2 +- .../garden_of_glass/root_to_sapling.json | 2 +- .../recipes/garden_of_glass/spreader_0.json | 2 +- ...ens_0_alt.json => lens_0_glass_block.json} | 0 .../{lens_0.json => lens_0_glass_pane.json} | 0 .../assets/botania/recipes/miniisland_0.json | 1 + .../assets/botania/recipes/miniisland_1.json | 1 + .../assets/botania/recipes/miniisland_10.json | 1 + .../assets/botania/recipes/miniisland_11.json | 1 + .../assets/botania/recipes/miniisland_12.json | 1 + .../assets/botania/recipes/miniisland_13.json | 1 + .../assets/botania/recipes/miniisland_14.json | 1 + .../assets/botania/recipes/miniisland_15.json | 1 + .../assets/botania/recipes/miniisland_2.json | 1 + .../assets/botania/recipes/miniisland_3.json | 1 + .../assets/botania/recipes/miniisland_4.json | 1 + .../assets/botania/recipes/miniisland_5.json | 1 + .../assets/botania/recipes/miniisland_6.json | 1 + .../assets/botania/recipes/miniisland_7.json | 1 + .../assets/botania/recipes/miniisland_8.json | 1 + .../assets/botania/recipes/miniisland_9.json | 1 + .../assets/botania/recipes/mushroom_0.json | 11 +++++++--- .../botania/recipes/mushroom_0_alt.json | 16 -------------- .../assets/botania/recipes/mushroom_1.json | 11 +++++++--- .../assets/botania/recipes/mushroom_10.json | 11 +++++++--- .../botania/recipes/mushroom_10_alt.json | 16 -------------- .../assets/botania/recipes/mushroom_11.json | 11 +++++++--- .../botania/recipes/mushroom_11_alt.json | 16 -------------- .../assets/botania/recipes/mushroom_12.json | 11 +++++++--- .../botania/recipes/mushroom_12_alt.json | 16 -------------- .../assets/botania/recipes/mushroom_13.json | 11 +++++++--- .../botania/recipes/mushroom_13_alt.json | 16 -------------- .../assets/botania/recipes/mushroom_14.json | 11 +++++++--- .../botania/recipes/mushroom_14_alt.json | 16 -------------- .../assets/botania/recipes/mushroom_15.json | 11 +++++++--- .../botania/recipes/mushroom_15_alt.json | 16 -------------- .../botania/recipes/mushroom_1_alt.json | 16 -------------- .../assets/botania/recipes/mushroom_2.json | 11 +++++++--- .../botania/recipes/mushroom_2_alt.json | 16 -------------- .../assets/botania/recipes/mushroom_3.json | 11 +++++++--- .../botania/recipes/mushroom_3_alt.json | 16 -------------- .../assets/botania/recipes/mushroom_4.json | 11 +++++++--- .../botania/recipes/mushroom_4_alt.json | 16 -------------- .../assets/botania/recipes/mushroom_5.json | 11 +++++++--- .../botania/recipes/mushroom_5_alt.json | 16 -------------- .../assets/botania/recipes/mushroom_6.json | 11 +++++++--- .../botania/recipes/mushroom_6_alt.json | 16 -------------- .../assets/botania/recipes/mushroom_7.json | 11 +++++++--- .../botania/recipes/mushroom_7_alt.json | 16 -------------- .../assets/botania/recipes/mushroom_8.json | 11 +++++++--- .../botania/recipes/mushroom_8_alt.json | 16 -------------- .../assets/botania/recipes/mushroom_9.json | 11 +++++++--- .../botania/recipes/mushroom_9_alt.json | 16 -------------- .../assets/botania/recipes/pavement_0.json | 1 + .../assets/botania/recipes/pavement_1.json | 1 + .../assets/botania/recipes/pavement_2.json | 1 + .../assets/botania/recipes/pavement_3.json | 1 + .../assets/botania/recipes/pavement_4.json | 1 + .../assets/botania/recipes/pavement_5.json | 1 + ...tal_0_alt_alt.json => petal_0_double.json} | 0 ...l_10_alt_alt.json => petal_10_double.json} | 0 ...l_11_alt_alt.json => petal_11_double.json} | 0 ...l_12_alt_alt.json => petal_12_double.json} | 0 ...l_13_alt_alt.json => petal_13_double.json} | 0 ...l_14_alt_alt.json => petal_14_double.json} | 0 ...l_15_alt_alt.json => petal_15_double.json} | 0 ...tal_1_alt_alt.json => petal_1_double.json} | 0 ...tal_2_alt_alt.json => petal_2_double.json} | 0 ...tal_3_alt_alt.json => petal_3_double.json} | 0 ...tal_4_alt_alt.json => petal_4_double.json} | 0 ...tal_5_alt_alt.json => petal_5_double.json} | 0 ...tal_6_alt_alt.json => petal_6_double.json} | 0 ...tal_7_alt_alt.json => petal_7_double.json} | 0 ...tal_8_alt_alt.json => petal_8_double.json} | 0 ...tal_9_alt_alt.json => petal_9_double.json} | 0 .../assets/botania/recipes/petalblock_0.json | 1 + .../assets/botania/recipes/petalblock_1.json | 1 + .../assets/botania/recipes/petalblock_10.json | 1 + .../assets/botania/recipes/petalblock_11.json | 1 + .../assets/botania/recipes/petalblock_12.json | 1 + .../assets/botania/recipes/petalblock_13.json | 1 + .../assets/botania/recipes/petalblock_14.json | 1 + .../assets/botania/recipes/petalblock_15.json | 1 + .../assets/botania/recipes/petalblock_2.json | 1 + .../assets/botania/recipes/petalblock_3.json | 1 + .../assets/botania/recipes/petalblock_4.json | 1 + .../assets/botania/recipes/petalblock_5.json | 1 + .../assets/botania/recipes/petalblock_6.json | 1 + .../assets/botania/recipes/petalblock_7.json | 1 + .../assets/botania/recipes/petalblock_8.json | 1 + .../assets/botania/recipes/petalblock_9.json | 1 + .../assets/botania/recipes/quartz_0.json | 14 ++++++++---- .../assets/botania/recipes/quartz_0_alt.json | 22 ------------------- .../assets/botania/recipes/quartz_3.json | 22 +++++++++++++++---- .../assets/botania/recipes/quartz_3_alt.json | 22 ------------------- .../botania/recipes/quartz_3_alt_alt.json | 22 ------------------- .../botania/recipes/quartz_3_alt_alt_alt.json | 22 ------------------- .../assets/botania/recipes/shinyflower_0.json | 1 + .../assets/botania/recipes/shinyflower_1.json | 1 + .../botania/recipes/shinyflower_10.json | 1 + .../botania/recipes/shinyflower_11.json | 1 + .../botania/recipes/shinyflower_12.json | 1 + .../botania/recipes/shinyflower_13.json | 1 + .../botania/recipes/shinyflower_14.json | 1 + .../botania/recipes/shinyflower_15.json | 1 + .../assets/botania/recipes/shinyflower_2.json | 1 + .../assets/botania/recipes/shinyflower_3.json | 1 + .../assets/botania/recipes/shinyflower_4.json | 1 + .../assets/botania/recipes/shinyflower_5.json | 1 + .../assets/botania/recipes/shinyflower_6.json | 1 + .../assets/botania/recipes/shinyflower_7.json | 1 + .../assets/botania/recipes/shinyflower_8.json | 1 + .../assets/botania/recipes/shinyflower_9.json | 1 + .../{ => slab_recombine}/biomestonea_0.json | 0 .../{ => slab_recombine}/biomestonea_1.json | 0 .../{ => slab_recombine}/biomestonea_10.json | 0 .../{ => slab_recombine}/biomestonea_11.json | 0 .../{ => slab_recombine}/biomestonea_12.json | 0 .../{ => slab_recombine}/biomestonea_13.json | 0 .../{ => slab_recombine}/biomestonea_14.json | 0 .../{ => slab_recombine}/biomestonea_15.json | 0 .../{ => slab_recombine}/biomestonea_2.json | 0 .../{ => slab_recombine}/biomestonea_3.json | 0 .../{ => slab_recombine}/biomestonea_4.json | 0 .../{ => slab_recombine}/biomestonea_5.json | 0 .../{ => slab_recombine}/biomestonea_6.json | 0 .../{ => slab_recombine}/biomestonea_7.json | 0 .../{ => slab_recombine}/biomestonea_8.json | 0 .../{ => slab_recombine}/biomestonea_9.json | 0 .../biomestoneb_0.json} | 0 .../biomestoneb_1.json} | 0 .../biomestoneb_2.json} | 0 .../biomestoneb_3.json} | 0 .../biomestoneb_4.json} | 0 .../biomestoneb_5.json} | 0 .../biomestoneb_6.json} | 0 .../biomestoneb_7.json} | 0 .../{ => slab_recombine}/dreamwood_0.json | 0 .../dreamwood_1.json} | 0 .../{ => slab_recombine}/livingrock_0.json | 0 .../livingrock_1.json} | 0 .../pavement_0.json} | 0 .../pavement_1.json} | 0 .../pavement_2.json} | 0 .../pavement_3.json} | 0 .../pavement_4.json} | 0 .../pavement_5.json} | 0 .../quartztypeblaze_0.json} | 0 .../quartztypedark_0.json} | 0 .../quartztypeelf_0.json} | 0 .../quartztypelavender_0.json} | 0 .../quartztypemana_0.json} | 0 .../quartztypered_0.json} | 0 .../quartztypesunny_0.json} | 0 .../shimmerrock.json} | 0 .../shimmerwoodplanks.json} | 0 .../{slimebottle_0.json => slimebottle.json} | 0 .../assets/botania/recipes/spreader_0.json | 2 +- ...rancestone_0.json => temperancestone.json} | 0 217 files changed, 282 insertions(+), 458 deletions(-) rename src/main/resources/assets/botania/recipes/{manaresource_7.json => conversions/elementium_block_deconstruct.json} (100%) rename src/main/resources/assets/botania/recipes/{manaresource_0.json => conversions/manasteel_block_deconstruct.json} (100%) rename src/main/resources/assets/botania/recipes/{petal_0_alt.json => conversions/petal_block_deconstruct_0.json} (100%) rename src/main/resources/assets/botania/recipes/{petal_1_alt.json => conversions/petal_block_deconstruct_1.json} (82%) rename src/main/resources/assets/botania/recipes/{petal_10_alt.json => conversions/petal_block_deconstruct_10.json} (82%) rename src/main/resources/assets/botania/recipes/{petal_11_alt.json => conversions/petal_block_deconstruct_11.json} (82%) rename src/main/resources/assets/botania/recipes/{petal_12_alt.json => conversions/petal_block_deconstruct_12.json} (82%) rename src/main/resources/assets/botania/recipes/{petal_13_alt.json => conversions/petal_block_deconstruct_13.json} (82%) rename src/main/resources/assets/botania/recipes/{petal_14_alt.json => conversions/petal_block_deconstruct_14.json} (82%) rename src/main/resources/assets/botania/recipes/{petal_15_alt.json => conversions/petal_block_deconstruct_15.json} (82%) rename src/main/resources/assets/botania/recipes/{petal_2_alt.json => conversions/petal_block_deconstruct_2.json} (82%) rename src/main/resources/assets/botania/recipes/{petal_3_alt.json => conversions/petal_block_deconstruct_3.json} (82%) rename src/main/resources/assets/botania/recipes/{petal_4_alt.json => conversions/petal_block_deconstruct_4.json} (82%) rename src/main/resources/assets/botania/recipes/{petal_5_alt.json => conversions/petal_block_deconstruct_5.json} (82%) rename src/main/resources/assets/botania/recipes/{petal_6_alt.json => conversions/petal_block_deconstruct_6.json} (82%) rename src/main/resources/assets/botania/recipes/{petal_7_alt.json => conversions/petal_block_deconstruct_7.json} (82%) rename src/main/resources/assets/botania/recipes/{petal_8_alt.json => conversions/petal_block_deconstruct_8.json} (82%) rename src/main/resources/assets/botania/recipes/{petal_9_alt.json => conversions/petal_block_deconstruct_9.json} (82%) rename src/main/resources/assets/botania/recipes/{manaresource_4.json => conversions/terrasteel_block_deconstruct.json} (100%) rename src/main/resources/assets/botania/recipes/{lens_0_alt.json => lens_0_glass_block.json} (100%) rename src/main/resources/assets/botania/recipes/{lens_0.json => lens_0_glass_pane.json} (100%) delete mode 100644 src/main/resources/assets/botania/recipes/mushroom_0_alt.json delete mode 100644 src/main/resources/assets/botania/recipes/mushroom_10_alt.json delete mode 100644 src/main/resources/assets/botania/recipes/mushroom_11_alt.json delete mode 100644 src/main/resources/assets/botania/recipes/mushroom_12_alt.json delete mode 100644 src/main/resources/assets/botania/recipes/mushroom_13_alt.json delete mode 100644 src/main/resources/assets/botania/recipes/mushroom_14_alt.json delete mode 100644 src/main/resources/assets/botania/recipes/mushroom_15_alt.json delete mode 100644 src/main/resources/assets/botania/recipes/mushroom_1_alt.json delete mode 100644 src/main/resources/assets/botania/recipes/mushroom_2_alt.json delete mode 100644 src/main/resources/assets/botania/recipes/mushroom_3_alt.json delete mode 100644 src/main/resources/assets/botania/recipes/mushroom_4_alt.json delete mode 100644 src/main/resources/assets/botania/recipes/mushroom_5_alt.json delete mode 100644 src/main/resources/assets/botania/recipes/mushroom_6_alt.json delete mode 100644 src/main/resources/assets/botania/recipes/mushroom_7_alt.json delete mode 100644 src/main/resources/assets/botania/recipes/mushroom_8_alt.json delete mode 100644 src/main/resources/assets/botania/recipes/mushroom_9_alt.json rename src/main/resources/assets/botania/recipes/{petal_0_alt_alt.json => petal_0_double.json} (100%) rename src/main/resources/assets/botania/recipes/{petal_10_alt_alt.json => petal_10_double.json} (100%) rename src/main/resources/assets/botania/recipes/{petal_11_alt_alt.json => petal_11_double.json} (100%) rename src/main/resources/assets/botania/recipes/{petal_12_alt_alt.json => petal_12_double.json} (100%) rename src/main/resources/assets/botania/recipes/{petal_13_alt_alt.json => petal_13_double.json} (100%) rename src/main/resources/assets/botania/recipes/{petal_14_alt_alt.json => petal_14_double.json} (100%) rename src/main/resources/assets/botania/recipes/{petal_15_alt_alt.json => petal_15_double.json} (100%) rename src/main/resources/assets/botania/recipes/{petal_1_alt_alt.json => petal_1_double.json} (100%) rename src/main/resources/assets/botania/recipes/{petal_2_alt_alt.json => petal_2_double.json} (100%) rename src/main/resources/assets/botania/recipes/{petal_3_alt_alt.json => petal_3_double.json} (100%) rename src/main/resources/assets/botania/recipes/{petal_4_alt_alt.json => petal_4_double.json} (100%) rename src/main/resources/assets/botania/recipes/{petal_5_alt_alt.json => petal_5_double.json} (100%) rename src/main/resources/assets/botania/recipes/{petal_6_alt_alt.json => petal_6_double.json} (100%) rename src/main/resources/assets/botania/recipes/{petal_7_alt_alt.json => petal_7_double.json} (100%) rename src/main/resources/assets/botania/recipes/{petal_8_alt_alt.json => petal_8_double.json} (100%) rename src/main/resources/assets/botania/recipes/{petal_9_alt_alt.json => petal_9_double.json} (100%) delete mode 100644 src/main/resources/assets/botania/recipes/quartz_0_alt.json delete mode 100644 src/main/resources/assets/botania/recipes/quartz_3_alt.json delete mode 100644 src/main/resources/assets/botania/recipes/quartz_3_alt_alt.json delete mode 100644 src/main/resources/assets/botania/recipes/quartz_3_alt_alt_alt.json rename src/main/resources/assets/botania/recipes/{ => slab_recombine}/biomestonea_0.json (100%) rename src/main/resources/assets/botania/recipes/{ => slab_recombine}/biomestonea_1.json (100%) rename src/main/resources/assets/botania/recipes/{ => slab_recombine}/biomestonea_10.json (100%) rename src/main/resources/assets/botania/recipes/{ => slab_recombine}/biomestonea_11.json (100%) rename src/main/resources/assets/botania/recipes/{ => slab_recombine}/biomestonea_12.json (100%) rename src/main/resources/assets/botania/recipes/{ => slab_recombine}/biomestonea_13.json (100%) rename src/main/resources/assets/botania/recipes/{ => slab_recombine}/biomestonea_14.json (100%) rename src/main/resources/assets/botania/recipes/{ => slab_recombine}/biomestonea_15.json (100%) rename src/main/resources/assets/botania/recipes/{ => slab_recombine}/biomestonea_2.json (100%) rename src/main/resources/assets/botania/recipes/{ => slab_recombine}/biomestonea_3.json (100%) rename src/main/resources/assets/botania/recipes/{ => slab_recombine}/biomestonea_4.json (100%) rename src/main/resources/assets/botania/recipes/{ => slab_recombine}/biomestonea_5.json (100%) rename src/main/resources/assets/botania/recipes/{ => slab_recombine}/biomestonea_6.json (100%) rename src/main/resources/assets/botania/recipes/{ => slab_recombine}/biomestonea_7.json (100%) rename src/main/resources/assets/botania/recipes/{ => slab_recombine}/biomestonea_8.json (100%) rename src/main/resources/assets/botania/recipes/{ => slab_recombine}/biomestonea_9.json (100%) rename src/main/resources/assets/botania/recipes/{biomestoneb_0_alt.json => slab_recombine/biomestoneb_0.json} (100%) rename src/main/resources/assets/botania/recipes/{biomestoneb_1_alt.json => slab_recombine/biomestoneb_1.json} (100%) rename src/main/resources/assets/botania/recipes/{biomestoneb_2_alt.json => slab_recombine/biomestoneb_2.json} (100%) rename src/main/resources/assets/botania/recipes/{biomestoneb_3_alt.json => slab_recombine/biomestoneb_3.json} (100%) rename src/main/resources/assets/botania/recipes/{biomestoneb_4_alt.json => slab_recombine/biomestoneb_4.json} (100%) rename src/main/resources/assets/botania/recipes/{biomestoneb_5_alt.json => slab_recombine/biomestoneb_5.json} (100%) rename src/main/resources/assets/botania/recipes/{biomestoneb_6_alt.json => slab_recombine/biomestoneb_6.json} (100%) rename src/main/resources/assets/botania/recipes/{biomestoneb_7_alt.json => slab_recombine/biomestoneb_7.json} (100%) rename src/main/resources/assets/botania/recipes/{ => slab_recombine}/dreamwood_0.json (100%) rename src/main/resources/assets/botania/recipes/{dreamwood_1_alt.json => slab_recombine/dreamwood_1.json} (100%) rename src/main/resources/assets/botania/recipes/{ => slab_recombine}/livingrock_0.json (100%) rename src/main/resources/assets/botania/recipes/{livingrock_1_alt.json => slab_recombine/livingrock_1.json} (100%) rename src/main/resources/assets/botania/recipes/{pavement_0_alt.json => slab_recombine/pavement_0.json} (100%) rename src/main/resources/assets/botania/recipes/{pavement_1_alt.json => slab_recombine/pavement_1.json} (100%) rename src/main/resources/assets/botania/recipes/{pavement_2_alt.json => slab_recombine/pavement_2.json} (100%) rename src/main/resources/assets/botania/recipes/{pavement_3_alt.json => slab_recombine/pavement_3.json} (100%) rename src/main/resources/assets/botania/recipes/{pavement_4_alt.json => slab_recombine/pavement_4.json} (100%) rename src/main/resources/assets/botania/recipes/{pavement_5_alt.json => slab_recombine/pavement_5.json} (100%) rename src/main/resources/assets/botania/recipes/{quartztypeblaze_0_alt.json => slab_recombine/quartztypeblaze_0.json} (100%) rename src/main/resources/assets/botania/recipes/{quartztypedark_0_alt.json => slab_recombine/quartztypedark_0.json} (100%) rename src/main/resources/assets/botania/recipes/{quartztypeelf_0_alt.json => slab_recombine/quartztypeelf_0.json} (100%) rename src/main/resources/assets/botania/recipes/{quartztypelavender_0_alt.json => slab_recombine/quartztypelavender_0.json} (100%) rename src/main/resources/assets/botania/recipes/{quartztypemana_0_alt.json => slab_recombine/quartztypemana_0.json} (100%) rename src/main/resources/assets/botania/recipes/{quartztypered_0_alt.json => slab_recombine/quartztypered_0.json} (100%) rename src/main/resources/assets/botania/recipes/{quartztypesunny_0_alt.json => slab_recombine/quartztypesunny_0.json} (100%) rename src/main/resources/assets/botania/recipes/{shimmerrock_alt.json => slab_recombine/shimmerrock.json} (100%) rename src/main/resources/assets/botania/recipes/{shimmerwoodplanks_alt.json => slab_recombine/shimmerwoodplanks.json} (100%) rename src/main/resources/assets/botania/recipes/{slimebottle_0.json => slimebottle.json} (100%) rename src/main/resources/assets/botania/recipes/{temperancestone_0.json => temperancestone.json} (100%) diff --git a/build.properties b/build.properties index f42abfa4f..b5a1ce79d 100644 --- a/build.properties +++ b/build.properties @@ -2,7 +2,7 @@ #Tue Jun 13 14:30:58 BST 2017 mod_name=Botania cf_meta_version=1.12 -forge_version=14.21.0.2362 +forge_version=14.21.0.2379 dir_repo=./ mc_mappings=snapshot_20170624 version=r1.9 diff --git a/src/main/java/vazkii/botania/client/core/handler/DebugHandler.java b/src/main/java/vazkii/botania/client/core/handler/DebugHandler.java index 53b968f25..29976e77e 100644 --- a/src/main/java/vazkii/botania/client/core/handler/DebugHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/DebugHandler.java @@ -10,7 +10,6 @@ */ package vazkii.botania.client.core.handler; -import com.google.common.base.Optional; import net.minecraft.block.state.IBlockState; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.GuiScreen; @@ -33,6 +32,7 @@ import vazkii.botania.common.core.handler.ManaNetworkHandler; import vazkii.botania.common.lib.LibMisc; import java.util.Map; +import java.util.Optional; import java.util.UUID; public final class DebugHandler { @@ -86,7 +86,7 @@ public final class DebugHandler { if (state instanceof IExtendedBlockState) { try { for (Map.Entry, Optional> e : ((IExtendedBlockState) state).getUnlistedProperties().entrySet()) { - event.getRight().add(TextFormatting.LIGHT_PURPLE + e.getKey().getName() + ": " + TextFormatting.RESET + e.getValue().orNull()); + event.getRight().add(TextFormatting.LIGHT_PURPLE + e.getKey().getName() + ": " + TextFormatting.RESET + e.getValue().orElse(null)); } } catch (Throwable t) { event.getRight().add("Error getting extended state"); diff --git a/src/main/java/vazkii/botania/client/core/proxy/GuiFactory.java b/src/main/java/vazkii/botania/client/core/proxy/GuiFactory.java index 0e52aff9e..223958bb1 100644 --- a/src/main/java/vazkii/botania/client/core/proxy/GuiFactory.java +++ b/src/main/java/vazkii/botania/client/core/proxy/GuiFactory.java @@ -32,19 +32,8 @@ public class GuiFactory implements IModGuiFactory { return new GuiBotaniaConfig(parentScreen); } - @Override - public Class mainConfigGuiClass() { - return null; - } - @Override public Set runtimeGuiCategories() { return null; } - - @Override - public RuntimeOptionGuiHandler getHandlerFor(RuntimeOptionCategoryElement element) { - return null; - } - } diff --git a/src/main/java/vazkii/botania/client/model/FloatingFlowerModel.java b/src/main/java/vazkii/botania/client/model/FloatingFlowerModel.java index 71e46bc08..2aa9b0ec9 100644 --- a/src/main/java/vazkii/botania/client/model/FloatingFlowerModel.java +++ b/src/main/java/vazkii/botania/client/model/FloatingFlowerModel.java @@ -26,7 +26,6 @@ import net.minecraft.entity.EntityLivingBase; import net.minecraft.item.ItemStack; import net.minecraft.util.EnumFacing; import net.minecraft.world.World; -import net.minecraftforge.client.model.IPerspectiveAwareModel; import net.minecraftforge.client.model.ModelLoader; import net.minecraftforge.client.model.ModelLoaderRegistry; import net.minecraftforge.client.model.pipeline.IVertexConsumer; @@ -147,7 +146,7 @@ public class FloatingFlowerModel implements IBakedModel { @Nonnull @Override public TextureAtlasSprite getParticleTexture() { return Minecraft.getMinecraft().getTextureMapBlocks().getAtlasSprite("minecraft:blocks/dirt"); } @Nonnull @Override public ItemCameraTransforms getItemCameraTransforms() { return ItemCameraTransforms.DEFAULT; } - private static class CompositeBakedModel implements IPerspectiveAwareModel { + private static class CompositeBakedModel implements IBakedModel { private final IBakedModel flower; private final IBakedModel island; @@ -203,11 +202,9 @@ public class FloatingFlowerModel implements IBakedModel { @Override public Pair handlePerspective(ItemCameraTransforms.TransformType cameraTransformType) { - if(island instanceof IPerspectiveAwareModel) { - Pair pair = ((IPerspectiveAwareModel) island).handlePerspective(cameraTransformType); - if(pair != null && pair.getRight() != null) - return Pair.of(this, pair.getRight()); - } + Pair pair = island.handlePerspective(cameraTransformType); + if(pair != null && pair.getRight() != null) + return Pair.of(this, pair.getRight()); return Pair.of(this, TRSRTransformation.identity().getMatrix()); } } diff --git a/src/main/java/vazkii/botania/client/model/GunModel.java b/src/main/java/vazkii/botania/client/model/GunModel.java index 4f678890e..1eed1fe7f 100644 --- a/src/main/java/vazkii/botania/client/model/GunModel.java +++ b/src/main/java/vazkii/botania/client/model/GunModel.java @@ -15,7 +15,6 @@ import net.minecraft.entity.EntityLivingBase; import net.minecraft.item.ItemStack; import net.minecraft.util.EnumFacing; import net.minecraft.world.World; -import net.minecraftforge.client.model.IPerspectiveAwareModel; import net.minecraftforge.client.model.pipeline.IVertexConsumer; import net.minecraftforge.client.model.pipeline.UnpackedBakedQuad; import net.minecraftforge.client.model.pipeline.VertexTransformer; @@ -106,7 +105,7 @@ public class GunModel implements IBakedModel { return builder.build(); } - private static class CompositeBakedModel implements IPerspectiveAwareModel { + private static class CompositeBakedModel implements IBakedModel { private final IBakedModel gun; private final List genQuads; @@ -151,12 +150,10 @@ public class GunModel implements IBakedModel { @Nonnull @Override public ItemOverrideList getOverrides() { return ItemOverrideList.NONE; } @Override - public Pair handlePerspective(ItemCameraTransforms.TransformType cameraTransformType) { - if(gun instanceof IPerspectiveAwareModel) { - Pair pair = ((IPerspectiveAwareModel) gun).handlePerspective(cameraTransformType); - if(pair != null && pair.getRight() != null) - return Pair.of(this, pair.getRight()); - } + public Pair handlePerspective(@Nonnull ItemCameraTransforms.TransformType cameraTransformType) { + Pair pair = gun.handlePerspective(cameraTransformType); + if(pair != null && pair.getRight() != null) + return Pair.of(this, pair.getRight()); return Pair.of(this, TRSRTransformation.identity().getMatrix()); } } diff --git a/src/main/java/vazkii/botania/client/model/LexiconModel.java b/src/main/java/vazkii/botania/client/model/LexiconModel.java index 34a6abcc9..fd73cbba6 100644 --- a/src/main/java/vazkii/botania/client/model/LexiconModel.java +++ b/src/main/java/vazkii/botania/client/model/LexiconModel.java @@ -10,7 +10,6 @@ import net.minecraft.client.renderer.block.model.ItemOverrideList; import net.minecraft.client.renderer.block.model.ModelResourceLocation; import net.minecraft.client.renderer.texture.TextureAtlasSprite; import net.minecraft.util.EnumFacing; -import net.minecraftforge.client.model.IPerspectiveAwareModel; import org.apache.commons.lang3.tuple.Pair; import vazkii.botania.common.core.handler.ConfigHandler; @@ -19,7 +18,7 @@ import javax.vecmath.Matrix4f; import java.util.List; @SuppressWarnings("deprecation") -public class LexiconModel implements IPerspectiveAwareModel { +public class LexiconModel implements IBakedModel { private static final ModelResourceLocation path = new ModelResourceLocation("botania:lexicon_default", "inventory"); @@ -30,7 +29,7 @@ public class LexiconModel implements IPerspectiveAwareModel { || cameraTransformType == ItemCameraTransforms.TransformType.FIRST_PERSON_LEFT_HAND) && ConfigHandler.lexicon3dModel) return Pair.of(this, null); - return ((IPerspectiveAwareModel) original).handlePerspective(cameraTransformType); + return original.handlePerspective(cameraTransformType); } @Nonnull @Override public List getQuads(IBlockState state, EnumFacing side, long rand) { return ImmutableList.of(); } diff --git a/src/main/java/vazkii/botania/client/model/ModelPylon.java b/src/main/java/vazkii/botania/client/model/ModelPylon.java index 38876f373..1efc6af69 100644 --- a/src/main/java/vazkii/botania/client/model/ModelPylon.java +++ b/src/main/java/vazkii/botania/client/model/ModelPylon.java @@ -10,7 +10,6 @@ */ package vazkii.botania.client.model; -import com.google.common.base.Optional; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; import net.minecraft.client.renderer.BufferBuilder; @@ -37,6 +36,7 @@ import vazkii.botania.api.state.enums.PylonVariant; import java.util.ArrayList; import java.util.List; +import java.util.Optional; public class ModelPylon implements IPylonModel { @@ -154,7 +154,7 @@ public class ModelPylon implements IPylonModel { } } - return Optional.absent(); + return Optional.empty(); }; } diff --git a/src/main/java/vazkii/botania/client/model/SpecialFlowerModel.java b/src/main/java/vazkii/botania/client/model/SpecialFlowerModel.java index f1e3eb43e..209f477f6 100644 --- a/src/main/java/vazkii/botania/client/model/SpecialFlowerModel.java +++ b/src/main/java/vazkii/botania/client/model/SpecialFlowerModel.java @@ -8,7 +8,6 @@ */ package vazkii.botania.client.model; -import com.google.common.base.Function; import com.google.common.cache.CacheBuilder; import com.google.common.cache.CacheLoader; import com.google.common.cache.LoadingCache; @@ -36,10 +35,9 @@ import net.minecraft.util.ResourceLocation; import net.minecraft.world.World; import net.minecraftforge.client.model.ICustomModelLoader; import net.minecraftforge.client.model.IModel; -import net.minecraftforge.client.model.IModelCustomData; -import net.minecraftforge.client.model.IPerspectiveAwareModel; import net.minecraftforge.client.model.ModelLoader; import net.minecraftforge.client.model.ModelLoaderRegistry; +import net.minecraftforge.client.model.PerspectiveMapWrapper; import net.minecraftforge.client.model.SimpleModelState; import net.minecraftforge.common.model.IModelState; import net.minecraftforge.common.model.TRSRTransformation; @@ -58,8 +56,9 @@ import java.util.Collection; import java.util.List; import java.util.Map; import java.util.Optional; +import java.util.function.Function; -public class SpecialFlowerModel implements IModelCustomData { +public class SpecialFlowerModel implements IModel { // SpecialFlowerModel for when there are no blockModels registered for a subtile public static final SpecialFlowerModel INSTANCE = new SpecialFlowerModel(ImmutableMap.of(), ImmutableMap.of()); @@ -93,7 +92,7 @@ public class SpecialFlowerModel implements IModelCustomData { @Override public IBakedModel bake(IModelState state, VertexFormat format, Function bakedTextureGetter) { // "Bake" the SpecialFlowerModel (in reality, just create another wrapper for all the delegate blockModels) - return new SpecialFlowerBakedModel(blockModels, itemModels, IPerspectiveAwareModel.MapWrapper.getTransforms(state)); + return new SpecialFlowerBakedModel(blockModels, itemModels, PerspectiveMapWrapper.getTransforms(state)); } @Override @@ -157,7 +156,7 @@ public class SpecialFlowerModel implements IModelCustomData { } } - private static class SpecialFlowerBakedModel implements IPerspectiveAwareModel { + private static class SpecialFlowerBakedModel implements IBakedModel { private final ImmutableMap transforms; private final ImmutableMap, ModelResourceLocation> blockModels; @@ -277,7 +276,7 @@ public class SpecialFlowerModel implements IModelCustomData { @Override public Pair handlePerspective(ItemCameraTransforms.TransformType cameraTransformType) { - return IPerspectiveAwareModel.MapWrapper.handlePerspective(this, transforms, cameraTransformType); + return PerspectiveMapWrapper.handlePerspective(this, transforms, cameraTransformType); } } diff --git a/src/main/java/vazkii/botania/common/item/ItemCacophonium.java b/src/main/java/vazkii/botania/common/item/ItemCacophonium.java index 99c310762..00c8603b8 100644 --- a/src/main/java/vazkii/botania/common/item/ItemCacophonium.java +++ b/src/main/java/vazkii/botania/common/item/ItemCacophonium.java @@ -70,7 +70,7 @@ public class ItemCacophonium extends ItemMod { sound = ((EntitySlime) living).isSmallSlime() ? SoundEvents.ENTITY_SMALL_SLIME_SQUISH : SoundEvents.ENTITY_SLIME_SQUISH; else { try { - sound = (SoundEvent) ReflectionHelper.findMethod(EntityLiving.class, living, LibObfuscation.GET_LIVING_SOUND).invoke(living); + sound = (SoundEvent) ReflectionHelper.findMethod(EntityLiving.class, LibObfuscation.GET_LIVING_SOUND[0], LibObfuscation.GET_LIVING_SOUND[1]).invoke(living); } catch (InvocationTargetException | IllegalAccessException ignored) { Botania.LOGGER.debug("Couldn't get living sound"); } diff --git a/src/main/java/vazkii/botania/common/item/material/ItemManaResource.java b/src/main/java/vazkii/botania/common/item/material/ItemManaResource.java index 6fc3255c8..b2c46a84f 100644 --- a/src/main/java/vazkii/botania/common/item/material/ItemManaResource.java +++ b/src/main/java/vazkii/botania/common/item/material/ItemManaResource.java @@ -82,7 +82,7 @@ public class ItemManaResource extends ItemMod implements IFlowerComponent, IElve if(stack.getItemDamage() == 4 || stack.getItemDamage() == 14) return EntityDoppleganger.spawn(player, stack, world, pos, stack.getItemDamage() == 14) ? EnumActionResult.SUCCESS : EnumActionResult.FAIL; - else if(stack.getItemDamage() == 20 && net.minecraft.item.ItemDye.applyBonemeal(stack, world, pos, player)) { + else if(stack.getItemDamage() == 20 && net.minecraft.item.ItemDye.applyBonemeal(stack, world, pos, player, hand)) { if(!world.isRemote) world.playEvent(2005, pos, 0); diff --git a/src/main/resources/assets/botania/recipes/altar_0.json b/src/main/resources/assets/botania/recipes/altar_0.json index 5b70d95ff..f1b76d54b 100644 --- a/src/main/resources/assets/botania/recipes/altar_0.json +++ b/src/main/resources/assets/botania/recipes/altar_0.json @@ -9,6 +9,7 @@ "CCC" ], "type": "forge:ore_shaped", + "group": "botania:petal_apothecary", "key": { "P": [ { diff --git a/src/main/resources/assets/botania/recipes/altar_1.json b/src/main/resources/assets/botania/recipes/altar_1.json index 679d4560d..b02e71760 100644 --- a/src/main/resources/assets/botania/recipes/altar_1.json +++ b/src/main/resources/assets/botania/recipes/altar_1.json @@ -9,6 +9,7 @@ "SSS" ], "type": "minecraft:crafting_shaped", + "group": "botania:petal_apothecary", "key": { "A": { "item": "botania:altar", diff --git a/src/main/resources/assets/botania/recipes/altar_2.json b/src/main/resources/assets/botania/recipes/altar_2.json index 49f7a45b8..9a77b8e08 100644 --- a/src/main/resources/assets/botania/recipes/altar_2.json +++ b/src/main/resources/assets/botania/recipes/altar_2.json @@ -9,6 +9,7 @@ "SSS" ], "type": "minecraft:crafting_shaped", + "group": "botania:petal_apothecary", "key": { "A": { "item": "botania:altar", diff --git a/src/main/resources/assets/botania/recipes/altar_3.json b/src/main/resources/assets/botania/recipes/altar_3.json index 736d60429..2cfa4f1a5 100644 --- a/src/main/resources/assets/botania/recipes/altar_3.json +++ b/src/main/resources/assets/botania/recipes/altar_3.json @@ -9,6 +9,7 @@ "SSS" ], "type": "minecraft:crafting_shaped", + "group": "botania:petal_apothecary", "key": { "A": { "item": "botania:altar", diff --git a/src/main/resources/assets/botania/recipes/altar_4.json b/src/main/resources/assets/botania/recipes/altar_4.json index 0ef2af1ed..c28a2e8e5 100644 --- a/src/main/resources/assets/botania/recipes/altar_4.json +++ b/src/main/resources/assets/botania/recipes/altar_4.json @@ -9,6 +9,7 @@ "SSS" ], "type": "minecraft:crafting_shaped", + "group": "botania:petal_apothecary", "key": { "A": { "item": "botania:altar", diff --git a/src/main/resources/assets/botania/recipes/altar_5.json b/src/main/resources/assets/botania/recipes/altar_5.json index b36aea161..5f51a916f 100644 --- a/src/main/resources/assets/botania/recipes/altar_5.json +++ b/src/main/resources/assets/botania/recipes/altar_5.json @@ -9,6 +9,7 @@ "SSS" ], "type": "minecraft:crafting_shaped", + "group": "botania:petal_apothecary", "key": { "A": { "item": "botania:altar", diff --git a/src/main/resources/assets/botania/recipes/altar_6.json b/src/main/resources/assets/botania/recipes/altar_6.json index 861a4c09b..3386d0129 100644 --- a/src/main/resources/assets/botania/recipes/altar_6.json +++ b/src/main/resources/assets/botania/recipes/altar_6.json @@ -9,6 +9,7 @@ "SSS" ], "type": "minecraft:crafting_shaped", + "group": "botania:petal_apothecary", "key": { "A": { "item": "botania:altar", diff --git a/src/main/resources/assets/botania/recipes/altar_7.json b/src/main/resources/assets/botania/recipes/altar_7.json index 9a26f47e6..d50eefef1 100644 --- a/src/main/resources/assets/botania/recipes/altar_7.json +++ b/src/main/resources/assets/botania/recipes/altar_7.json @@ -9,6 +9,7 @@ "SSS" ], "type": "minecraft:crafting_shaped", + "group": "botania:petal_apothecary", "key": { "A": { "item": "botania:altar", diff --git a/src/main/resources/assets/botania/recipes/altar_8.json b/src/main/resources/assets/botania/recipes/altar_8.json index 37f198540..fc8719d26 100644 --- a/src/main/resources/assets/botania/recipes/altar_8.json +++ b/src/main/resources/assets/botania/recipes/altar_8.json @@ -9,6 +9,7 @@ "SSS" ], "type": "minecraft:crafting_shaped", + "group": "botania:petal_apothecary", "key": { "A": { "item": "botania:altar", diff --git a/src/main/resources/assets/botania/recipes/blazeblock.json b/src/main/resources/assets/botania/recipes/blazeblock.json index 024de1409..332348294 100644 --- a/src/main/resources/assets/botania/recipes/blazeblock.json +++ b/src/main/resources/assets/botania/recipes/blazeblock.json @@ -2,7 +2,7 @@ "conditions": [ { "type": "botania:garden_of_glass", - "value": "false" + "value": false } ], "result": { diff --git a/src/main/resources/assets/botania/recipes/cocoon.json b/src/main/resources/assets/botania/recipes/cocoon.json index f5b210471..048bd13f0 100644 --- a/src/main/resources/assets/botania/recipes/cocoon.json +++ b/src/main/resources/assets/botania/recipes/cocoon.json @@ -2,7 +2,7 @@ "conditions": [ { "type": "botania:garden_of_glass", - "value": "false" + "value": false } ], "result": { diff --git a/src/main/resources/assets/botania/recipes/conversions/blazeblock_deconstruct.json b/src/main/resources/assets/botania/recipes/conversions/blazeblock_deconstruct.json index 836492f72..5101e3afc 100644 --- a/src/main/resources/assets/botania/recipes/conversions/blazeblock_deconstruct.json +++ b/src/main/resources/assets/botania/recipes/conversions/blazeblock_deconstruct.json @@ -2,7 +2,7 @@ "conditions": [ { "type": "botania:garden_of_glass", - "value": "false" + "value": false } ], "result": { diff --git a/src/main/resources/assets/botania/recipes/manaresource_7.json b/src/main/resources/assets/botania/recipes/conversions/elementium_block_deconstruct.json similarity index 100% rename from src/main/resources/assets/botania/recipes/manaresource_7.json rename to src/main/resources/assets/botania/recipes/conversions/elementium_block_deconstruct.json diff --git a/src/main/resources/assets/botania/recipes/manaresource_0.json b/src/main/resources/assets/botania/recipes/conversions/manasteel_block_deconstruct.json similarity index 100% rename from src/main/resources/assets/botania/recipes/manaresource_0.json rename to src/main/resources/assets/botania/recipes/conversions/manasteel_block_deconstruct.json diff --git a/src/main/resources/assets/botania/recipes/petal_0_alt.json b/src/main/resources/assets/botania/recipes/conversions/petal_block_deconstruct_0.json similarity index 100% rename from src/main/resources/assets/botania/recipes/petal_0_alt.json rename to src/main/resources/assets/botania/recipes/conversions/petal_block_deconstruct_0.json diff --git a/src/main/resources/assets/botania/recipes/petal_1_alt.json b/src/main/resources/assets/botania/recipes/conversions/petal_block_deconstruct_1.json similarity index 82% rename from src/main/resources/assets/botania/recipes/petal_1_alt.json rename to src/main/resources/assets/botania/recipes/conversions/petal_block_deconstruct_1.json index 357883e6e..be63fc2c6 100644 --- a/src/main/resources/assets/botania/recipes/petal_1_alt.json +++ b/src/main/resources/assets/botania/recipes/conversions/petal_block_deconstruct_1.json @@ -4,6 +4,7 @@ "data": 1, "count": 9 }, + "group": "botania:petal_block_deconstruct", "ingredients": [ { "item": "botania:petalblock", diff --git a/src/main/resources/assets/botania/recipes/petal_10_alt.json b/src/main/resources/assets/botania/recipes/conversions/petal_block_deconstruct_10.json similarity index 82% rename from src/main/resources/assets/botania/recipes/petal_10_alt.json rename to src/main/resources/assets/botania/recipes/conversions/petal_block_deconstruct_10.json index 07c5e5e6b..06be5903b 100644 --- a/src/main/resources/assets/botania/recipes/petal_10_alt.json +++ b/src/main/resources/assets/botania/recipes/conversions/petal_block_deconstruct_10.json @@ -4,6 +4,7 @@ "data": 10, "count": 9 }, + "group": "botania:petal_block_deconstruct", "ingredients": [ { "item": "botania:petalblock", diff --git a/src/main/resources/assets/botania/recipes/petal_11_alt.json b/src/main/resources/assets/botania/recipes/conversions/petal_block_deconstruct_11.json similarity index 82% rename from src/main/resources/assets/botania/recipes/petal_11_alt.json rename to src/main/resources/assets/botania/recipes/conversions/petal_block_deconstruct_11.json index d2cb0bf02..6c986faa3 100644 --- a/src/main/resources/assets/botania/recipes/petal_11_alt.json +++ b/src/main/resources/assets/botania/recipes/conversions/petal_block_deconstruct_11.json @@ -4,6 +4,7 @@ "data": 11, "count": 9 }, + "group": "botania:petal_block_deconstruct", "ingredients": [ { "item": "botania:petalblock", diff --git a/src/main/resources/assets/botania/recipes/petal_12_alt.json b/src/main/resources/assets/botania/recipes/conversions/petal_block_deconstruct_12.json similarity index 82% rename from src/main/resources/assets/botania/recipes/petal_12_alt.json rename to src/main/resources/assets/botania/recipes/conversions/petal_block_deconstruct_12.json index c11af557c..a25e1266b 100644 --- a/src/main/resources/assets/botania/recipes/petal_12_alt.json +++ b/src/main/resources/assets/botania/recipes/conversions/petal_block_deconstruct_12.json @@ -4,6 +4,7 @@ "data": 12, "count": 9 }, + "group": "botania:petal_block_deconstruct", "ingredients": [ { "item": "botania:petalblock", diff --git a/src/main/resources/assets/botania/recipes/petal_13_alt.json b/src/main/resources/assets/botania/recipes/conversions/petal_block_deconstruct_13.json similarity index 82% rename from src/main/resources/assets/botania/recipes/petal_13_alt.json rename to src/main/resources/assets/botania/recipes/conversions/petal_block_deconstruct_13.json index ad9f81aae..8666dfdbf 100644 --- a/src/main/resources/assets/botania/recipes/petal_13_alt.json +++ b/src/main/resources/assets/botania/recipes/conversions/petal_block_deconstruct_13.json @@ -4,6 +4,7 @@ "data": 13, "count": 9 }, + "group": "botania:petal_block_deconstruct", "ingredients": [ { "item": "botania:petalblock", diff --git a/src/main/resources/assets/botania/recipes/petal_14_alt.json b/src/main/resources/assets/botania/recipes/conversions/petal_block_deconstruct_14.json similarity index 82% rename from src/main/resources/assets/botania/recipes/petal_14_alt.json rename to src/main/resources/assets/botania/recipes/conversions/petal_block_deconstruct_14.json index d365713b7..dadcef4c2 100644 --- a/src/main/resources/assets/botania/recipes/petal_14_alt.json +++ b/src/main/resources/assets/botania/recipes/conversions/petal_block_deconstruct_14.json @@ -4,6 +4,7 @@ "data": 14, "count": 9 }, + "group": "botania:petal_block_deconstruct", "ingredients": [ { "item": "botania:petalblock", diff --git a/src/main/resources/assets/botania/recipes/petal_15_alt.json b/src/main/resources/assets/botania/recipes/conversions/petal_block_deconstruct_15.json similarity index 82% rename from src/main/resources/assets/botania/recipes/petal_15_alt.json rename to src/main/resources/assets/botania/recipes/conversions/petal_block_deconstruct_15.json index 6eda025a8..1f99b501d 100644 --- a/src/main/resources/assets/botania/recipes/petal_15_alt.json +++ b/src/main/resources/assets/botania/recipes/conversions/petal_block_deconstruct_15.json @@ -4,6 +4,7 @@ "data": 15, "count": 9 }, + "group": "botania:petal_block_deconstruct", "ingredients": [ { "item": "botania:petalblock", diff --git a/src/main/resources/assets/botania/recipes/petal_2_alt.json b/src/main/resources/assets/botania/recipes/conversions/petal_block_deconstruct_2.json similarity index 82% rename from src/main/resources/assets/botania/recipes/petal_2_alt.json rename to src/main/resources/assets/botania/recipes/conversions/petal_block_deconstruct_2.json index a351883b6..66751b1c1 100644 --- a/src/main/resources/assets/botania/recipes/petal_2_alt.json +++ b/src/main/resources/assets/botania/recipes/conversions/petal_block_deconstruct_2.json @@ -4,6 +4,7 @@ "data": 2, "count": 9 }, + "group": "botania:petal_block_deconstruct", "ingredients": [ { "item": "botania:petalblock", diff --git a/src/main/resources/assets/botania/recipes/petal_3_alt.json b/src/main/resources/assets/botania/recipes/conversions/petal_block_deconstruct_3.json similarity index 82% rename from src/main/resources/assets/botania/recipes/petal_3_alt.json rename to src/main/resources/assets/botania/recipes/conversions/petal_block_deconstruct_3.json index 123511f9d..3ab6ac784 100644 --- a/src/main/resources/assets/botania/recipes/petal_3_alt.json +++ b/src/main/resources/assets/botania/recipes/conversions/petal_block_deconstruct_3.json @@ -4,6 +4,7 @@ "data": 3, "count": 9 }, + "group": "botania:petal_block_deconstruct", "ingredients": [ { "item": "botania:petalblock", diff --git a/src/main/resources/assets/botania/recipes/petal_4_alt.json b/src/main/resources/assets/botania/recipes/conversions/petal_block_deconstruct_4.json similarity index 82% rename from src/main/resources/assets/botania/recipes/petal_4_alt.json rename to src/main/resources/assets/botania/recipes/conversions/petal_block_deconstruct_4.json index fc7827b7c..fc9e9d7a7 100644 --- a/src/main/resources/assets/botania/recipes/petal_4_alt.json +++ b/src/main/resources/assets/botania/recipes/conversions/petal_block_deconstruct_4.json @@ -4,6 +4,7 @@ "data": 4, "count": 9 }, + "group": "botania:petal_block_deconstruct", "ingredients": [ { "item": "botania:petalblock", diff --git a/src/main/resources/assets/botania/recipes/petal_5_alt.json b/src/main/resources/assets/botania/recipes/conversions/petal_block_deconstruct_5.json similarity index 82% rename from src/main/resources/assets/botania/recipes/petal_5_alt.json rename to src/main/resources/assets/botania/recipes/conversions/petal_block_deconstruct_5.json index 08f197204..3415e7b81 100644 --- a/src/main/resources/assets/botania/recipes/petal_5_alt.json +++ b/src/main/resources/assets/botania/recipes/conversions/petal_block_deconstruct_5.json @@ -4,6 +4,7 @@ "data": 5, "count": 9 }, + "group": "botania:petal_block_deconstruct", "ingredients": [ { "item": "botania:petalblock", diff --git a/src/main/resources/assets/botania/recipes/petal_6_alt.json b/src/main/resources/assets/botania/recipes/conversions/petal_block_deconstruct_6.json similarity index 82% rename from src/main/resources/assets/botania/recipes/petal_6_alt.json rename to src/main/resources/assets/botania/recipes/conversions/petal_block_deconstruct_6.json index f95f5a43e..1024a308b 100644 --- a/src/main/resources/assets/botania/recipes/petal_6_alt.json +++ b/src/main/resources/assets/botania/recipes/conversions/petal_block_deconstruct_6.json @@ -4,6 +4,7 @@ "data": 6, "count": 9 }, + "group": "botania:petal_block_deconstruct", "ingredients": [ { "item": "botania:petalblock", diff --git a/src/main/resources/assets/botania/recipes/petal_7_alt.json b/src/main/resources/assets/botania/recipes/conversions/petal_block_deconstruct_7.json similarity index 82% rename from src/main/resources/assets/botania/recipes/petal_7_alt.json rename to src/main/resources/assets/botania/recipes/conversions/petal_block_deconstruct_7.json index 9e247b687..9ea1ecaf9 100644 --- a/src/main/resources/assets/botania/recipes/petal_7_alt.json +++ b/src/main/resources/assets/botania/recipes/conversions/petal_block_deconstruct_7.json @@ -4,6 +4,7 @@ "data": 7, "count": 9 }, + "group": "botania:petal_block_deconstruct", "ingredients": [ { "item": "botania:petalblock", diff --git a/src/main/resources/assets/botania/recipes/petal_8_alt.json b/src/main/resources/assets/botania/recipes/conversions/petal_block_deconstruct_8.json similarity index 82% rename from src/main/resources/assets/botania/recipes/petal_8_alt.json rename to src/main/resources/assets/botania/recipes/conversions/petal_block_deconstruct_8.json index 56cf124b5..badb241b7 100644 --- a/src/main/resources/assets/botania/recipes/petal_8_alt.json +++ b/src/main/resources/assets/botania/recipes/conversions/petal_block_deconstruct_8.json @@ -4,6 +4,7 @@ "data": 8, "count": 9 }, + "group": "botania:petal_block_deconstruct", "ingredients": [ { "item": "botania:petalblock", diff --git a/src/main/resources/assets/botania/recipes/petal_9_alt.json b/src/main/resources/assets/botania/recipes/conversions/petal_block_deconstruct_9.json similarity index 82% rename from src/main/resources/assets/botania/recipes/petal_9_alt.json rename to src/main/resources/assets/botania/recipes/conversions/petal_block_deconstruct_9.json index bf7598179..9a0a6b55c 100644 --- a/src/main/resources/assets/botania/recipes/petal_9_alt.json +++ b/src/main/resources/assets/botania/recipes/conversions/petal_block_deconstruct_9.json @@ -4,6 +4,7 @@ "data": 9, "count": 9 }, + "group": "botania:petal_block_deconstruct", "ingredients": [ { "item": "botania:petalblock", diff --git a/src/main/resources/assets/botania/recipes/manaresource_4.json b/src/main/resources/assets/botania/recipes/conversions/terrasteel_block_deconstruct.json similarity index 100% rename from src/main/resources/assets/botania/recipes/manaresource_4.json rename to src/main/resources/assets/botania/recipes/conversions/terrasteel_block_deconstruct.json diff --git a/src/main/resources/assets/botania/recipes/craftpattern_0.json b/src/main/resources/assets/botania/recipes/craftpattern_0.json index 838a18d9c..13f7c06b2 100644 --- a/src/main/resources/assets/botania/recipes/craftpattern_0.json +++ b/src/main/resources/assets/botania/recipes/craftpattern_0.json @@ -9,6 +9,7 @@ "PPP" ], "type": "forge:ore_shaped", + "group": "botania:craftpattern", "key": { "P": { "item": "#BPLACEHOLDER" diff --git a/src/main/resources/assets/botania/recipes/craftpattern_1.json b/src/main/resources/assets/botania/recipes/craftpattern_1.json index cc1ded5a1..002c8115a 100644 --- a/src/main/resources/assets/botania/recipes/craftpattern_1.json +++ b/src/main/resources/assets/botania/recipes/craftpattern_1.json @@ -9,6 +9,7 @@ "PPP" ], "type": "forge:ore_shaped", + "group": "botania:craftpattern", "key": { "P": { "item": "#BPLACEHOLDER" diff --git a/src/main/resources/assets/botania/recipes/craftpattern_2.json b/src/main/resources/assets/botania/recipes/craftpattern_2.json index 540c8d6ea..ca94dbe32 100644 --- a/src/main/resources/assets/botania/recipes/craftpattern_2.json +++ b/src/main/resources/assets/botania/recipes/craftpattern_2.json @@ -9,6 +9,7 @@ "PPP" ], "type": "forge:ore_shaped", + "group": "botania:craftpattern", "key": { "P": { "item": "#BPLACEHOLDER" diff --git a/src/main/resources/assets/botania/recipes/craftpattern_3.json b/src/main/resources/assets/botania/recipes/craftpattern_3.json index cf7f9bd1a..41f1cd390 100644 --- a/src/main/resources/assets/botania/recipes/craftpattern_3.json +++ b/src/main/resources/assets/botania/recipes/craftpattern_3.json @@ -9,6 +9,7 @@ "PPP" ], "type": "forge:ore_shaped", + "group": "botania:craftpattern", "key": { "P": { "item": "#BPLACEHOLDER" diff --git a/src/main/resources/assets/botania/recipes/craftpattern_4.json b/src/main/resources/assets/botania/recipes/craftpattern_4.json index 095b0254b..fee6e0574 100644 --- a/src/main/resources/assets/botania/recipes/craftpattern_4.json +++ b/src/main/resources/assets/botania/recipes/craftpattern_4.json @@ -9,6 +9,7 @@ "RPP" ], "type": "forge:ore_shaped", + "group": "botania:craftpattern", "key": { "P": { "item": "#BPLACEHOLDER" diff --git a/src/main/resources/assets/botania/recipes/craftpattern_5.json b/src/main/resources/assets/botania/recipes/craftpattern_5.json index 4d84704e5..a40db7bce 100644 --- a/src/main/resources/assets/botania/recipes/craftpattern_5.json +++ b/src/main/resources/assets/botania/recipes/craftpattern_5.json @@ -9,6 +9,7 @@ "PPP" ], "type": "forge:ore_shaped", + "group": "botania:craftpattern", "key": { "P": { "item": "#BPLACEHOLDER" diff --git a/src/main/resources/assets/botania/recipes/craftpattern_6.json b/src/main/resources/assets/botania/recipes/craftpattern_6.json index d48d22c18..caa5cd286 100644 --- a/src/main/resources/assets/botania/recipes/craftpattern_6.json +++ b/src/main/resources/assets/botania/recipes/craftpattern_6.json @@ -9,6 +9,7 @@ "RRP" ], "type": "forge:ore_shaped", + "group": "botania:craftpattern", "key": { "P": { "item": "#BPLACEHOLDER" diff --git a/src/main/resources/assets/botania/recipes/craftpattern_7.json b/src/main/resources/assets/botania/recipes/craftpattern_7.json index 6f06ede84..e98e2619c 100644 --- a/src/main/resources/assets/botania/recipes/craftpattern_7.json +++ b/src/main/resources/assets/botania/recipes/craftpattern_7.json @@ -9,6 +9,7 @@ "PPP" ], "type": "forge:ore_shaped", + "group": "botania:craftpattern", "key": { "P": { "item": "#BPLACEHOLDER" diff --git a/src/main/resources/assets/botania/recipes/craftpattern_8.json b/src/main/resources/assets/botania/recipes/craftpattern_8.json index 9937b2f99..4b44890f9 100644 --- a/src/main/resources/assets/botania/recipes/craftpattern_8.json +++ b/src/main/resources/assets/botania/recipes/craftpattern_8.json @@ -9,6 +9,7 @@ "RRR" ], "type": "forge:ore_shaped", + "group": "botania:craftpattern", "key": { "P": { "item": "#BPLACEHOLDER" diff --git a/src/main/resources/assets/botania/recipes/fertilizer_powder.json b/src/main/resources/assets/botania/recipes/fertilizer_powder.json index 5515d2df0..8cca33265 100644 --- a/src/main/resources/assets/botania/recipes/fertilizer_powder.json +++ b/src/main/resources/assets/botania/recipes/fertilizer_powder.json @@ -2,7 +2,7 @@ "conditions": [ { "type": "botania:garden_of_glass", - "value": "false" + "value": false } ], "result": { diff --git a/src/main/resources/assets/botania/recipes/garden_of_glass/blazeblock.json b/src/main/resources/assets/botania/recipes/garden_of_glass/blazeblock.json index 8b21ffda5..9a26c0ef4 100644 --- a/src/main/resources/assets/botania/recipes/garden_of_glass/blazeblock.json +++ b/src/main/resources/assets/botania/recipes/garden_of_glass/blazeblock.json @@ -2,7 +2,7 @@ "conditions": [ { "type": "botania:garden_of_glass", - "value": "true" + "value": true } ], "result": { diff --git a/src/main/resources/assets/botania/recipes/garden_of_glass/blazeblock_deconstruct.json b/src/main/resources/assets/botania/recipes/garden_of_glass/blazeblock_deconstruct.json index 045915a49..69061bb8b 100644 --- a/src/main/resources/assets/botania/recipes/garden_of_glass/blazeblock_deconstruct.json +++ b/src/main/resources/assets/botania/recipes/garden_of_glass/blazeblock_deconstruct.json @@ -2,7 +2,7 @@ "conditions": [ { "type": "botania:garden_of_glass", - "value": "true" + "value": true } ], "result": { diff --git a/src/main/resources/assets/botania/recipes/garden_of_glass/cocoon.json b/src/main/resources/assets/botania/recipes/garden_of_glass/cocoon.json index 15042ba98..52031baa6 100644 --- a/src/main/resources/assets/botania/recipes/garden_of_glass/cocoon.json +++ b/src/main/resources/assets/botania/recipes/garden_of_glass/cocoon.json @@ -2,7 +2,7 @@ "conditions": [ { "type": "botania:garden_of_glass", - "value": "true" + "value": true } ], "result": { diff --git a/src/main/resources/assets/botania/recipes/garden_of_glass/end_portal_frame.json b/src/main/resources/assets/botania/recipes/garden_of_glass/end_portal_frame.json index 73aa069b4..27dbc6368 100644 --- a/src/main/resources/assets/botania/recipes/garden_of_glass/end_portal_frame.json +++ b/src/main/resources/assets/botania/recipes/garden_of_glass/end_portal_frame.json @@ -2,7 +2,7 @@ "conditions": [ { "type": "botania:garden_of_glass", - "value": "true" + "value": true } ], "result": { diff --git a/src/main/resources/assets/botania/recipes/garden_of_glass/fertilizer_powder.json b/src/main/resources/assets/botania/recipes/garden_of_glass/fertilizer_powder.json index e1fcd3505..84134c26a 100644 --- a/src/main/resources/assets/botania/recipes/garden_of_glass/fertilizer_powder.json +++ b/src/main/resources/assets/botania/recipes/garden_of_glass/fertilizer_powder.json @@ -2,7 +2,7 @@ "conditions": [ { "type": "botania:garden_of_glass", - "value": "true" + "value": true } ], "result": { diff --git a/src/main/resources/assets/botania/recipes/garden_of_glass/magma_cream_to_slime_ball.json b/src/main/resources/assets/botania/recipes/garden_of_glass/magma_cream_to_slime_ball.json index 2726d6f0d..502b41a69 100644 --- a/src/main/resources/assets/botania/recipes/garden_of_glass/magma_cream_to_slime_ball.json +++ b/src/main/resources/assets/botania/recipes/garden_of_glass/magma_cream_to_slime_ball.json @@ -2,7 +2,7 @@ "conditions": [ { "type": "botania:garden_of_glass", - "value": "true" + "value": true } ], "result": { diff --git a/src/main/resources/assets/botania/recipes/garden_of_glass/pebble_to_cobblestone.json b/src/main/resources/assets/botania/recipes/garden_of_glass/pebble_to_cobblestone.json index 2a10ca32f..7ba051b81 100644 --- a/src/main/resources/assets/botania/recipes/garden_of_glass/pebble_to_cobblestone.json +++ b/src/main/resources/assets/botania/recipes/garden_of_glass/pebble_to_cobblestone.json @@ -2,7 +2,7 @@ "conditions": [ { "type": "botania:garden_of_glass", - "value": "true" + "value": true } ], "result": { diff --git a/src/main/resources/assets/botania/recipes/garden_of_glass/root_to_fertilizer.json b/src/main/resources/assets/botania/recipes/garden_of_glass/root_to_fertilizer.json index 5d4bb51ef..46e53b3c2 100644 --- a/src/main/resources/assets/botania/recipes/garden_of_glass/root_to_fertilizer.json +++ b/src/main/resources/assets/botania/recipes/garden_of_glass/root_to_fertilizer.json @@ -2,7 +2,7 @@ "conditions": [ { "type": "botania:garden_of_glass", - "value": "true" + "value": true } ], "result": { diff --git a/src/main/resources/assets/botania/recipes/garden_of_glass/root_to_sapling.json b/src/main/resources/assets/botania/recipes/garden_of_glass/root_to_sapling.json index dba59b646..10b7b01ff 100644 --- a/src/main/resources/assets/botania/recipes/garden_of_glass/root_to_sapling.json +++ b/src/main/resources/assets/botania/recipes/garden_of_glass/root_to_sapling.json @@ -2,7 +2,7 @@ "conditions": [ { "type": "botania:garden_of_glass", - "value": "true" + "value": true } ], "result": { diff --git a/src/main/resources/assets/botania/recipes/garden_of_glass/spreader_0.json b/src/main/resources/assets/botania/recipes/garden_of_glass/spreader_0.json index 8ef6bab5a..08940642f 100644 --- a/src/main/resources/assets/botania/recipes/garden_of_glass/spreader_0.json +++ b/src/main/resources/assets/botania/recipes/garden_of_glass/spreader_0.json @@ -2,7 +2,7 @@ "conditions": [ { "type": "botania:garden_of_glass", - "value": "true" + "value": true } ], "result": { diff --git a/src/main/resources/assets/botania/recipes/lens_0_alt.json b/src/main/resources/assets/botania/recipes/lens_0_glass_block.json similarity index 100% rename from src/main/resources/assets/botania/recipes/lens_0_alt.json rename to src/main/resources/assets/botania/recipes/lens_0_glass_block.json diff --git a/src/main/resources/assets/botania/recipes/lens_0.json b/src/main/resources/assets/botania/recipes/lens_0_glass_pane.json similarity index 100% rename from src/main/resources/assets/botania/recipes/lens_0.json rename to src/main/resources/assets/botania/recipes/lens_0_glass_pane.json diff --git a/src/main/resources/assets/botania/recipes/miniisland_0.json b/src/main/resources/assets/botania/recipes/miniisland_0.json index e39620dba..2cdc5fcbd 100644 --- a/src/main/resources/assets/botania/recipes/miniisland_0.json +++ b/src/main/resources/assets/botania/recipes/miniisland_0.json @@ -9,6 +9,7 @@ "D" ], "type": "minecraft:crafting_shaped", + "group": "botania:miniisland", "key": { "S": { "item": "botania:grassseeds", diff --git a/src/main/resources/assets/botania/recipes/miniisland_1.json b/src/main/resources/assets/botania/recipes/miniisland_1.json index ceaab1be9..e307743cb 100644 --- a/src/main/resources/assets/botania/recipes/miniisland_1.json +++ b/src/main/resources/assets/botania/recipes/miniisland_1.json @@ -9,6 +9,7 @@ "D" ], "type": "minecraft:crafting_shaped", + "group": "botania:miniisland", "key": { "S": { "item": "botania:grassseeds", diff --git a/src/main/resources/assets/botania/recipes/miniisland_10.json b/src/main/resources/assets/botania/recipes/miniisland_10.json index 7c1eca5e7..9b8d992db 100644 --- a/src/main/resources/assets/botania/recipes/miniisland_10.json +++ b/src/main/resources/assets/botania/recipes/miniisland_10.json @@ -9,6 +9,7 @@ "D" ], "type": "minecraft:crafting_shaped", + "group": "botania:miniisland", "key": { "S": { "item": "botania:grassseeds", diff --git a/src/main/resources/assets/botania/recipes/miniisland_11.json b/src/main/resources/assets/botania/recipes/miniisland_11.json index 272f86c5b..75e4c1107 100644 --- a/src/main/resources/assets/botania/recipes/miniisland_11.json +++ b/src/main/resources/assets/botania/recipes/miniisland_11.json @@ -9,6 +9,7 @@ "D" ], "type": "minecraft:crafting_shaped", + "group": "botania:miniisland", "key": { "S": { "item": "botania:grassseeds", diff --git a/src/main/resources/assets/botania/recipes/miniisland_12.json b/src/main/resources/assets/botania/recipes/miniisland_12.json index cf9ee8b42..d866cda47 100644 --- a/src/main/resources/assets/botania/recipes/miniisland_12.json +++ b/src/main/resources/assets/botania/recipes/miniisland_12.json @@ -9,6 +9,7 @@ "D" ], "type": "minecraft:crafting_shaped", + "group": "botania:miniisland", "key": { "S": { "item": "botania:grassseeds", diff --git a/src/main/resources/assets/botania/recipes/miniisland_13.json b/src/main/resources/assets/botania/recipes/miniisland_13.json index 539923e50..fc5487b5b 100644 --- a/src/main/resources/assets/botania/recipes/miniisland_13.json +++ b/src/main/resources/assets/botania/recipes/miniisland_13.json @@ -9,6 +9,7 @@ "D" ], "type": "minecraft:crafting_shaped", + "group": "botania:miniisland", "key": { "S": { "item": "botania:grassseeds", diff --git a/src/main/resources/assets/botania/recipes/miniisland_14.json b/src/main/resources/assets/botania/recipes/miniisland_14.json index c7d75977e..759f1a493 100644 --- a/src/main/resources/assets/botania/recipes/miniisland_14.json +++ b/src/main/resources/assets/botania/recipes/miniisland_14.json @@ -9,6 +9,7 @@ "D" ], "type": "minecraft:crafting_shaped", + "group": "botania:miniisland", "key": { "S": { "item": "botania:grassseeds", diff --git a/src/main/resources/assets/botania/recipes/miniisland_15.json b/src/main/resources/assets/botania/recipes/miniisland_15.json index c82082011..6a35dd18a 100644 --- a/src/main/resources/assets/botania/recipes/miniisland_15.json +++ b/src/main/resources/assets/botania/recipes/miniisland_15.json @@ -9,6 +9,7 @@ "D" ], "type": "minecraft:crafting_shaped", + "group": "botania:miniisland", "key": { "S": { "item": "botania:grassseeds", diff --git a/src/main/resources/assets/botania/recipes/miniisland_2.json b/src/main/resources/assets/botania/recipes/miniisland_2.json index 2e08f9c13..e8a785488 100644 --- a/src/main/resources/assets/botania/recipes/miniisland_2.json +++ b/src/main/resources/assets/botania/recipes/miniisland_2.json @@ -9,6 +9,7 @@ "D" ], "type": "minecraft:crafting_shaped", + "group": "botania:miniisland", "key": { "S": { "item": "botania:grassseeds", diff --git a/src/main/resources/assets/botania/recipes/miniisland_3.json b/src/main/resources/assets/botania/recipes/miniisland_3.json index 6a6b7fe67..e6d01f0af 100644 --- a/src/main/resources/assets/botania/recipes/miniisland_3.json +++ b/src/main/resources/assets/botania/recipes/miniisland_3.json @@ -9,6 +9,7 @@ "D" ], "type": "minecraft:crafting_shaped", + "group": "botania:miniisland", "key": { "S": { "item": "botania:grassseeds", diff --git a/src/main/resources/assets/botania/recipes/miniisland_4.json b/src/main/resources/assets/botania/recipes/miniisland_4.json index a1071001b..9bd59ee26 100644 --- a/src/main/resources/assets/botania/recipes/miniisland_4.json +++ b/src/main/resources/assets/botania/recipes/miniisland_4.json @@ -9,6 +9,7 @@ "D" ], "type": "minecraft:crafting_shaped", + "group": "botania:miniisland", "key": { "S": { "item": "botania:grassseeds", diff --git a/src/main/resources/assets/botania/recipes/miniisland_5.json b/src/main/resources/assets/botania/recipes/miniisland_5.json index 3dde23fd5..3d3058413 100644 --- a/src/main/resources/assets/botania/recipes/miniisland_5.json +++ b/src/main/resources/assets/botania/recipes/miniisland_5.json @@ -9,6 +9,7 @@ "D" ], "type": "minecraft:crafting_shaped", + "group": "botania:miniisland", "key": { "S": { "item": "botania:grassseeds", diff --git a/src/main/resources/assets/botania/recipes/miniisland_6.json b/src/main/resources/assets/botania/recipes/miniisland_6.json index dfb54129f..82c18c4d1 100644 --- a/src/main/resources/assets/botania/recipes/miniisland_6.json +++ b/src/main/resources/assets/botania/recipes/miniisland_6.json @@ -9,6 +9,7 @@ "D" ], "type": "minecraft:crafting_shaped", + "group": "botania:miniisland", "key": { "S": { "item": "botania:grassseeds", diff --git a/src/main/resources/assets/botania/recipes/miniisland_7.json b/src/main/resources/assets/botania/recipes/miniisland_7.json index 5a0cf258e..f6c3e20e9 100644 --- a/src/main/resources/assets/botania/recipes/miniisland_7.json +++ b/src/main/resources/assets/botania/recipes/miniisland_7.json @@ -9,6 +9,7 @@ "D" ], "type": "minecraft:crafting_shaped", + "group": "botania:miniisland", "key": { "S": { "item": "botania:grassseeds", diff --git a/src/main/resources/assets/botania/recipes/miniisland_8.json b/src/main/resources/assets/botania/recipes/miniisland_8.json index 4a001fe72..38c12bbd9 100644 --- a/src/main/resources/assets/botania/recipes/miniisland_8.json +++ b/src/main/resources/assets/botania/recipes/miniisland_8.json @@ -9,6 +9,7 @@ "D" ], "type": "minecraft:crafting_shaped", + "group": "botania:miniisland", "key": { "S": { "item": "botania:grassseeds", diff --git a/src/main/resources/assets/botania/recipes/miniisland_9.json b/src/main/resources/assets/botania/recipes/miniisland_9.json index ce8649ef0..cb9f19367 100644 --- a/src/main/resources/assets/botania/recipes/miniisland_9.json +++ b/src/main/resources/assets/botania/recipes/miniisland_9.json @@ -9,6 +9,7 @@ "D" ], "type": "minecraft:crafting_shaped", + "group": "botania:miniisland", "key": { "S": { "item": "botania:grassseeds", diff --git a/src/main/resources/assets/botania/recipes/mushroom_0.json b/src/main/resources/assets/botania/recipes/mushroom_0.json index cdf5b3ccd..d574a1dd7 100644 --- a/src/main/resources/assets/botania/recipes/mushroom_0.json +++ b/src/main/resources/assets/botania/recipes/mushroom_0.json @@ -4,9 +4,14 @@ "data": 0 }, "ingredients": [ - { - "item": "minecraft:red_mushroom" - }, + [ + { + "item": "minecraft:red_mushroom" + }, + { + "item": "minecraft:brown_mushroom" + } + ], { "item": "botania:dye", "data": 0 diff --git a/src/main/resources/assets/botania/recipes/mushroom_0_alt.json b/src/main/resources/assets/botania/recipes/mushroom_0_alt.json deleted file mode 100644 index 5b85f7f09..000000000 --- a/src/main/resources/assets/botania/recipes/mushroom_0_alt.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "result": { - "item": "botania:mushroom", - "data": 0 - }, - "ingredients": [ - { - "item": "minecraft:brown_mushroom" - }, - { - "item": "botania:dye", - "data": 0 - } - ], - "type": "minecraft:crafting_shapeless" -} \ No newline at end of file diff --git a/src/main/resources/assets/botania/recipes/mushroom_1.json b/src/main/resources/assets/botania/recipes/mushroom_1.json index 5adbcded8..15cca1621 100644 --- a/src/main/resources/assets/botania/recipes/mushroom_1.json +++ b/src/main/resources/assets/botania/recipes/mushroom_1.json @@ -4,9 +4,14 @@ "data": 1 }, "ingredients": [ - { - "item": "minecraft:red_mushroom" - }, + [ + { + "item": "minecraft:red_mushroom" + }, + { + "item": "minecraft:brown_mushroom" + } + ], { "item": "botania:dye", "data": 1 diff --git a/src/main/resources/assets/botania/recipes/mushroom_10.json b/src/main/resources/assets/botania/recipes/mushroom_10.json index 68599899b..ccab824f0 100644 --- a/src/main/resources/assets/botania/recipes/mushroom_10.json +++ b/src/main/resources/assets/botania/recipes/mushroom_10.json @@ -4,9 +4,14 @@ "data": 10 }, "ingredients": [ - { - "item": "minecraft:red_mushroom" - }, + [ + { + "item": "minecraft:red_mushroom" + }, + { + "item": "minecraft:brown_mushroom" + } + ], { "item": "botania:dye", "data": 10 diff --git a/src/main/resources/assets/botania/recipes/mushroom_10_alt.json b/src/main/resources/assets/botania/recipes/mushroom_10_alt.json deleted file mode 100644 index 96e1acd20..000000000 --- a/src/main/resources/assets/botania/recipes/mushroom_10_alt.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "result": { - "item": "botania:mushroom", - "data": 10 - }, - "ingredients": [ - { - "item": "minecraft:brown_mushroom" - }, - { - "item": "botania:dye", - "data": 10 - } - ], - "type": "minecraft:crafting_shapeless" -} \ No newline at end of file diff --git a/src/main/resources/assets/botania/recipes/mushroom_11.json b/src/main/resources/assets/botania/recipes/mushroom_11.json index 6ba9f7eb9..f577004dd 100644 --- a/src/main/resources/assets/botania/recipes/mushroom_11.json +++ b/src/main/resources/assets/botania/recipes/mushroom_11.json @@ -4,9 +4,14 @@ "data": 11 }, "ingredients": [ - { - "item": "minecraft:red_mushroom" - }, + [ + { + "item": "minecraft:red_mushroom" + }, + { + "item": "minecraft:brown_mushroom" + } + ], { "item": "botania:dye", "data": 11 diff --git a/src/main/resources/assets/botania/recipes/mushroom_11_alt.json b/src/main/resources/assets/botania/recipes/mushroom_11_alt.json deleted file mode 100644 index b8bb48158..000000000 --- a/src/main/resources/assets/botania/recipes/mushroom_11_alt.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "result": { - "item": "botania:mushroom", - "data": 11 - }, - "ingredients": [ - { - "item": "minecraft:brown_mushroom" - }, - { - "item": "botania:dye", - "data": 11 - } - ], - "type": "minecraft:crafting_shapeless" -} \ No newline at end of file diff --git a/src/main/resources/assets/botania/recipes/mushroom_12.json b/src/main/resources/assets/botania/recipes/mushroom_12.json index b2c27e5fa..859ed96c7 100644 --- a/src/main/resources/assets/botania/recipes/mushroom_12.json +++ b/src/main/resources/assets/botania/recipes/mushroom_12.json @@ -4,9 +4,14 @@ "data": 12 }, "ingredients": [ - { - "item": "minecraft:red_mushroom" - }, + [ + { + "item": "minecraft:red_mushroom" + }, + { + "item": "minecraft:brown_mushroom" + } + ], { "item": "botania:dye", "data": 12 diff --git a/src/main/resources/assets/botania/recipes/mushroom_12_alt.json b/src/main/resources/assets/botania/recipes/mushroom_12_alt.json deleted file mode 100644 index 1ca24505c..000000000 --- a/src/main/resources/assets/botania/recipes/mushroom_12_alt.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "result": { - "item": "botania:mushroom", - "data": 12 - }, - "ingredients": [ - { - "item": "minecraft:brown_mushroom" - }, - { - "item": "botania:dye", - "data": 12 - } - ], - "type": "minecraft:crafting_shapeless" -} \ No newline at end of file diff --git a/src/main/resources/assets/botania/recipes/mushroom_13.json b/src/main/resources/assets/botania/recipes/mushroom_13.json index 56fe3134f..3d9e3ff48 100644 --- a/src/main/resources/assets/botania/recipes/mushroom_13.json +++ b/src/main/resources/assets/botania/recipes/mushroom_13.json @@ -4,9 +4,14 @@ "data": 13 }, "ingredients": [ - { - "item": "minecraft:red_mushroom" - }, + [ + { + "item": "minecraft:red_mushroom" + }, + { + "item": "minecraft:brown_mushroom" + } + ], { "item": "botania:dye", "data": 13 diff --git a/src/main/resources/assets/botania/recipes/mushroom_13_alt.json b/src/main/resources/assets/botania/recipes/mushroom_13_alt.json deleted file mode 100644 index 6964b571a..000000000 --- a/src/main/resources/assets/botania/recipes/mushroom_13_alt.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "result": { - "item": "botania:mushroom", - "data": 13 - }, - "ingredients": [ - { - "item": "minecraft:brown_mushroom" - }, - { - "item": "botania:dye", - "data": 13 - } - ], - "type": "minecraft:crafting_shapeless" -} \ No newline at end of file diff --git a/src/main/resources/assets/botania/recipes/mushroom_14.json b/src/main/resources/assets/botania/recipes/mushroom_14.json index 374ab367b..91637e7fd 100644 --- a/src/main/resources/assets/botania/recipes/mushroom_14.json +++ b/src/main/resources/assets/botania/recipes/mushroom_14.json @@ -4,9 +4,14 @@ "data": 14 }, "ingredients": [ - { - "item": "minecraft:red_mushroom" - }, + [ + { + "item": "minecraft:red_mushroom" + }, + { + "item": "minecraft:brown_mushroom" + } + ], { "item": "botania:dye", "data": 14 diff --git a/src/main/resources/assets/botania/recipes/mushroom_14_alt.json b/src/main/resources/assets/botania/recipes/mushroom_14_alt.json deleted file mode 100644 index 866cf8f02..000000000 --- a/src/main/resources/assets/botania/recipes/mushroom_14_alt.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "result": { - "item": "botania:mushroom", - "data": 14 - }, - "ingredients": [ - { - "item": "minecraft:brown_mushroom" - }, - { - "item": "botania:dye", - "data": 14 - } - ], - "type": "minecraft:crafting_shapeless" -} \ No newline at end of file diff --git a/src/main/resources/assets/botania/recipes/mushroom_15.json b/src/main/resources/assets/botania/recipes/mushroom_15.json index e5bfa6e1e..c32a0fcac 100644 --- a/src/main/resources/assets/botania/recipes/mushroom_15.json +++ b/src/main/resources/assets/botania/recipes/mushroom_15.json @@ -4,9 +4,14 @@ "data": 15 }, "ingredients": [ - { - "item": "minecraft:red_mushroom" - }, + [ + { + "item": "minecraft:red_mushroom" + }, + { + "item": "minecraft:brown_mushroom" + } + ], { "item": "botania:dye", "data": 15 diff --git a/src/main/resources/assets/botania/recipes/mushroom_15_alt.json b/src/main/resources/assets/botania/recipes/mushroom_15_alt.json deleted file mode 100644 index be51df51c..000000000 --- a/src/main/resources/assets/botania/recipes/mushroom_15_alt.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "result": { - "item": "botania:mushroom", - "data": 15 - }, - "ingredients": [ - { - "item": "minecraft:brown_mushroom" - }, - { - "item": "botania:dye", - "data": 15 - } - ], - "type": "minecraft:crafting_shapeless" -} \ No newline at end of file diff --git a/src/main/resources/assets/botania/recipes/mushroom_1_alt.json b/src/main/resources/assets/botania/recipes/mushroom_1_alt.json deleted file mode 100644 index 88f7160de..000000000 --- a/src/main/resources/assets/botania/recipes/mushroom_1_alt.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "result": { - "item": "botania:mushroom", - "data": 1 - }, - "ingredients": [ - { - "item": "minecraft:brown_mushroom" - }, - { - "item": "botania:dye", - "data": 1 - } - ], - "type": "minecraft:crafting_shapeless" -} \ No newline at end of file diff --git a/src/main/resources/assets/botania/recipes/mushroom_2.json b/src/main/resources/assets/botania/recipes/mushroom_2.json index 93714933f..1ddbf16d6 100644 --- a/src/main/resources/assets/botania/recipes/mushroom_2.json +++ b/src/main/resources/assets/botania/recipes/mushroom_2.json @@ -4,9 +4,14 @@ "data": 2 }, "ingredients": [ - { - "item": "minecraft:red_mushroom" - }, + [ + { + "item": "minecraft:red_mushroom" + }, + { + "item": "minecraft:brown_mushroom" + } + ], { "item": "botania:dye", "data": 2 diff --git a/src/main/resources/assets/botania/recipes/mushroom_2_alt.json b/src/main/resources/assets/botania/recipes/mushroom_2_alt.json deleted file mode 100644 index 65e1a0336..000000000 --- a/src/main/resources/assets/botania/recipes/mushroom_2_alt.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "result": { - "item": "botania:mushroom", - "data": 2 - }, - "ingredients": [ - { - "item": "minecraft:brown_mushroom" - }, - { - "item": "botania:dye", - "data": 2 - } - ], - "type": "minecraft:crafting_shapeless" -} \ No newline at end of file diff --git a/src/main/resources/assets/botania/recipes/mushroom_3.json b/src/main/resources/assets/botania/recipes/mushroom_3.json index 54893179d..632e0356a 100644 --- a/src/main/resources/assets/botania/recipes/mushroom_3.json +++ b/src/main/resources/assets/botania/recipes/mushroom_3.json @@ -4,9 +4,14 @@ "data": 3 }, "ingredients": [ - { - "item": "minecraft:red_mushroom" - }, + [ + { + "item": "minecraft:red_mushroom" + }, + { + "item": "minecraft:brown_mushroom" + } + ], { "item": "botania:dye", "data": 3 diff --git a/src/main/resources/assets/botania/recipes/mushroom_3_alt.json b/src/main/resources/assets/botania/recipes/mushroom_3_alt.json deleted file mode 100644 index 8c8c08315..000000000 --- a/src/main/resources/assets/botania/recipes/mushroom_3_alt.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "result": { - "item": "botania:mushroom", - "data": 3 - }, - "ingredients": [ - { - "item": "minecraft:brown_mushroom" - }, - { - "item": "botania:dye", - "data": 3 - } - ], - "type": "minecraft:crafting_shapeless" -} \ No newline at end of file diff --git a/src/main/resources/assets/botania/recipes/mushroom_4.json b/src/main/resources/assets/botania/recipes/mushroom_4.json index c76daa15e..0c07f4800 100644 --- a/src/main/resources/assets/botania/recipes/mushroom_4.json +++ b/src/main/resources/assets/botania/recipes/mushroom_4.json @@ -4,9 +4,14 @@ "data": 4 }, "ingredients": [ - { - "item": "minecraft:red_mushroom" - }, + [ + { + "item": "minecraft:red_mushroom" + }, + { + "item": "minecraft:brown_mushroom" + } + ], { "item": "botania:dye", "data": 4 diff --git a/src/main/resources/assets/botania/recipes/mushroom_4_alt.json b/src/main/resources/assets/botania/recipes/mushroom_4_alt.json deleted file mode 100644 index 85906bbab..000000000 --- a/src/main/resources/assets/botania/recipes/mushroom_4_alt.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "result": { - "item": "botania:mushroom", - "data": 4 - }, - "ingredients": [ - { - "item": "minecraft:brown_mushroom" - }, - { - "item": "botania:dye", - "data": 4 - } - ], - "type": "minecraft:crafting_shapeless" -} \ No newline at end of file diff --git a/src/main/resources/assets/botania/recipes/mushroom_5.json b/src/main/resources/assets/botania/recipes/mushroom_5.json index c53c1c0cd..648b5490f 100644 --- a/src/main/resources/assets/botania/recipes/mushroom_5.json +++ b/src/main/resources/assets/botania/recipes/mushroom_5.json @@ -4,9 +4,14 @@ "data": 5 }, "ingredients": [ - { - "item": "minecraft:red_mushroom" - }, + [ + { + "item": "minecraft:red_mushroom" + }, + { + "item": "minecraft:brown_mushroom" + } + ], { "item": "botania:dye", "data": 5 diff --git a/src/main/resources/assets/botania/recipes/mushroom_5_alt.json b/src/main/resources/assets/botania/recipes/mushroom_5_alt.json deleted file mode 100644 index cd1160231..000000000 --- a/src/main/resources/assets/botania/recipes/mushroom_5_alt.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "result": { - "item": "botania:mushroom", - "data": 5 - }, - "ingredients": [ - { - "item": "minecraft:brown_mushroom" - }, - { - "item": "botania:dye", - "data": 5 - } - ], - "type": "minecraft:crafting_shapeless" -} \ No newline at end of file diff --git a/src/main/resources/assets/botania/recipes/mushroom_6.json b/src/main/resources/assets/botania/recipes/mushroom_6.json index 92eedf12d..bf758fe0f 100644 --- a/src/main/resources/assets/botania/recipes/mushroom_6.json +++ b/src/main/resources/assets/botania/recipes/mushroom_6.json @@ -4,9 +4,14 @@ "data": 6 }, "ingredients": [ - { - "item": "minecraft:red_mushroom" - }, + [ + { + "item": "minecraft:red_mushroom" + }, + { + "item": "minecraft:brown_mushroom" + } + ], { "item": "botania:dye", "data": 6 diff --git a/src/main/resources/assets/botania/recipes/mushroom_6_alt.json b/src/main/resources/assets/botania/recipes/mushroom_6_alt.json deleted file mode 100644 index 2fdb58599..000000000 --- a/src/main/resources/assets/botania/recipes/mushroom_6_alt.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "result": { - "item": "botania:mushroom", - "data": 6 - }, - "ingredients": [ - { - "item": "minecraft:brown_mushroom" - }, - { - "item": "botania:dye", - "data": 6 - } - ], - "type": "minecraft:crafting_shapeless" -} \ No newline at end of file diff --git a/src/main/resources/assets/botania/recipes/mushroom_7.json b/src/main/resources/assets/botania/recipes/mushroom_7.json index d492cf03c..d3f2239e5 100644 --- a/src/main/resources/assets/botania/recipes/mushroom_7.json +++ b/src/main/resources/assets/botania/recipes/mushroom_7.json @@ -4,9 +4,14 @@ "data": 7 }, "ingredients": [ - { - "item": "minecraft:red_mushroom" - }, + [ + { + "item": "minecraft:red_mushroom" + }, + { + "item": "minecraft:brown_mushroom" + } + ], { "item": "botania:dye", "data": 7 diff --git a/src/main/resources/assets/botania/recipes/mushroom_7_alt.json b/src/main/resources/assets/botania/recipes/mushroom_7_alt.json deleted file mode 100644 index bd2a4eba4..000000000 --- a/src/main/resources/assets/botania/recipes/mushroom_7_alt.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "result": { - "item": "botania:mushroom", - "data": 7 - }, - "ingredients": [ - { - "item": "minecraft:brown_mushroom" - }, - { - "item": "botania:dye", - "data": 7 - } - ], - "type": "minecraft:crafting_shapeless" -} \ No newline at end of file diff --git a/src/main/resources/assets/botania/recipes/mushroom_8.json b/src/main/resources/assets/botania/recipes/mushroom_8.json index 964eea8a7..5cf12aa8e 100644 --- a/src/main/resources/assets/botania/recipes/mushroom_8.json +++ b/src/main/resources/assets/botania/recipes/mushroom_8.json @@ -4,9 +4,14 @@ "data": 8 }, "ingredients": [ - { - "item": "minecraft:red_mushroom" - }, + [ + { + "item": "minecraft:red_mushroom" + }, + { + "item": "minecraft:brown_mushroom" + } + ], { "item": "botania:dye", "data": 8 diff --git a/src/main/resources/assets/botania/recipes/mushroom_8_alt.json b/src/main/resources/assets/botania/recipes/mushroom_8_alt.json deleted file mode 100644 index 804979865..000000000 --- a/src/main/resources/assets/botania/recipes/mushroom_8_alt.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "result": { - "item": "botania:mushroom", - "data": 8 - }, - "ingredients": [ - { - "item": "minecraft:brown_mushroom" - }, - { - "item": "botania:dye", - "data": 8 - } - ], - "type": "minecraft:crafting_shapeless" -} \ No newline at end of file diff --git a/src/main/resources/assets/botania/recipes/mushroom_9.json b/src/main/resources/assets/botania/recipes/mushroom_9.json index 50a17ace6..68797d335 100644 --- a/src/main/resources/assets/botania/recipes/mushroom_9.json +++ b/src/main/resources/assets/botania/recipes/mushroom_9.json @@ -4,9 +4,14 @@ "data": 9 }, "ingredients": [ - { - "item": "minecraft:red_mushroom" - }, + [ + { + "item": "minecraft:red_mushroom" + }, + { + "item": "minecraft:brown_mushroom" + } + ], { "item": "botania:dye", "data": 9 diff --git a/src/main/resources/assets/botania/recipes/mushroom_9_alt.json b/src/main/resources/assets/botania/recipes/mushroom_9_alt.json deleted file mode 100644 index b259e3e73..000000000 --- a/src/main/resources/assets/botania/recipes/mushroom_9_alt.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "result": { - "item": "botania:mushroom", - "data": 9 - }, - "ingredients": [ - { - "item": "minecraft:brown_mushroom" - }, - { - "item": "botania:dye", - "data": 9 - } - ], - "type": "minecraft:crafting_shapeless" -} \ No newline at end of file diff --git a/src/main/resources/assets/botania/recipes/pavement_0.json b/src/main/resources/assets/botania/recipes/pavement_0.json index 769c7f4f3..cbc85e9c4 100644 --- a/src/main/resources/assets/botania/recipes/pavement_0.json +++ b/src/main/resources/assets/botania/recipes/pavement_0.json @@ -4,6 +4,7 @@ "data": 0, "count": 3 }, + "group": "botania:pavement", "ingredients": [ { "item": "#LIVINGROCK" diff --git a/src/main/resources/assets/botania/recipes/pavement_1.json b/src/main/resources/assets/botania/recipes/pavement_1.json index 9d826c59f..adc619531 100644 --- a/src/main/resources/assets/botania/recipes/pavement_1.json +++ b/src/main/resources/assets/botania/recipes/pavement_1.json @@ -4,6 +4,7 @@ "data": 1, "count": 3 }, + "group": "botania:pavement", "ingredients": [ { "item": "#LIVINGROCK" diff --git a/src/main/resources/assets/botania/recipes/pavement_2.json b/src/main/resources/assets/botania/recipes/pavement_2.json index d6bb5e740..86b7b6255 100644 --- a/src/main/resources/assets/botania/recipes/pavement_2.json +++ b/src/main/resources/assets/botania/recipes/pavement_2.json @@ -4,6 +4,7 @@ "data": 2, "count": 3 }, + "group": "botania:pavement", "ingredients": [ { "item": "#LIVINGROCK" diff --git a/src/main/resources/assets/botania/recipes/pavement_3.json b/src/main/resources/assets/botania/recipes/pavement_3.json index cdc6584e4..1cdbc7630 100644 --- a/src/main/resources/assets/botania/recipes/pavement_3.json +++ b/src/main/resources/assets/botania/recipes/pavement_3.json @@ -4,6 +4,7 @@ "data": 3, "count": 3 }, + "group": "botania:pavement", "ingredients": [ { "item": "#LIVINGROCK" diff --git a/src/main/resources/assets/botania/recipes/pavement_4.json b/src/main/resources/assets/botania/recipes/pavement_4.json index 015a7d1a9..a8b6e47ca 100644 --- a/src/main/resources/assets/botania/recipes/pavement_4.json +++ b/src/main/resources/assets/botania/recipes/pavement_4.json @@ -4,6 +4,7 @@ "data": 4, "count": 3 }, + "group": "botania:pavement", "ingredients": [ { "item": "#LIVINGROCK" diff --git a/src/main/resources/assets/botania/recipes/pavement_5.json b/src/main/resources/assets/botania/recipes/pavement_5.json index 39e2cfd97..456290c73 100644 --- a/src/main/resources/assets/botania/recipes/pavement_5.json +++ b/src/main/resources/assets/botania/recipes/pavement_5.json @@ -4,6 +4,7 @@ "data": 5, "count": 3 }, + "group": "botania:pavement", "ingredients": [ { "item": "#LIVINGROCK" diff --git a/src/main/resources/assets/botania/recipes/petal_0_alt_alt.json b/src/main/resources/assets/botania/recipes/petal_0_double.json similarity index 100% rename from src/main/resources/assets/botania/recipes/petal_0_alt_alt.json rename to src/main/resources/assets/botania/recipes/petal_0_double.json diff --git a/src/main/resources/assets/botania/recipes/petal_10_alt_alt.json b/src/main/resources/assets/botania/recipes/petal_10_double.json similarity index 100% rename from src/main/resources/assets/botania/recipes/petal_10_alt_alt.json rename to src/main/resources/assets/botania/recipes/petal_10_double.json diff --git a/src/main/resources/assets/botania/recipes/petal_11_alt_alt.json b/src/main/resources/assets/botania/recipes/petal_11_double.json similarity index 100% rename from src/main/resources/assets/botania/recipes/petal_11_alt_alt.json rename to src/main/resources/assets/botania/recipes/petal_11_double.json diff --git a/src/main/resources/assets/botania/recipes/petal_12_alt_alt.json b/src/main/resources/assets/botania/recipes/petal_12_double.json similarity index 100% rename from src/main/resources/assets/botania/recipes/petal_12_alt_alt.json rename to src/main/resources/assets/botania/recipes/petal_12_double.json diff --git a/src/main/resources/assets/botania/recipes/petal_13_alt_alt.json b/src/main/resources/assets/botania/recipes/petal_13_double.json similarity index 100% rename from src/main/resources/assets/botania/recipes/petal_13_alt_alt.json rename to src/main/resources/assets/botania/recipes/petal_13_double.json diff --git a/src/main/resources/assets/botania/recipes/petal_14_alt_alt.json b/src/main/resources/assets/botania/recipes/petal_14_double.json similarity index 100% rename from src/main/resources/assets/botania/recipes/petal_14_alt_alt.json rename to src/main/resources/assets/botania/recipes/petal_14_double.json diff --git a/src/main/resources/assets/botania/recipes/petal_15_alt_alt.json b/src/main/resources/assets/botania/recipes/petal_15_double.json similarity index 100% rename from src/main/resources/assets/botania/recipes/petal_15_alt_alt.json rename to src/main/resources/assets/botania/recipes/petal_15_double.json diff --git a/src/main/resources/assets/botania/recipes/petal_1_alt_alt.json b/src/main/resources/assets/botania/recipes/petal_1_double.json similarity index 100% rename from src/main/resources/assets/botania/recipes/petal_1_alt_alt.json rename to src/main/resources/assets/botania/recipes/petal_1_double.json diff --git a/src/main/resources/assets/botania/recipes/petal_2_alt_alt.json b/src/main/resources/assets/botania/recipes/petal_2_double.json similarity index 100% rename from src/main/resources/assets/botania/recipes/petal_2_alt_alt.json rename to src/main/resources/assets/botania/recipes/petal_2_double.json diff --git a/src/main/resources/assets/botania/recipes/petal_3_alt_alt.json b/src/main/resources/assets/botania/recipes/petal_3_double.json similarity index 100% rename from src/main/resources/assets/botania/recipes/petal_3_alt_alt.json rename to src/main/resources/assets/botania/recipes/petal_3_double.json diff --git a/src/main/resources/assets/botania/recipes/petal_4_alt_alt.json b/src/main/resources/assets/botania/recipes/petal_4_double.json similarity index 100% rename from src/main/resources/assets/botania/recipes/petal_4_alt_alt.json rename to src/main/resources/assets/botania/recipes/petal_4_double.json diff --git a/src/main/resources/assets/botania/recipes/petal_5_alt_alt.json b/src/main/resources/assets/botania/recipes/petal_5_double.json similarity index 100% rename from src/main/resources/assets/botania/recipes/petal_5_alt_alt.json rename to src/main/resources/assets/botania/recipes/petal_5_double.json diff --git a/src/main/resources/assets/botania/recipes/petal_6_alt_alt.json b/src/main/resources/assets/botania/recipes/petal_6_double.json similarity index 100% rename from src/main/resources/assets/botania/recipes/petal_6_alt_alt.json rename to src/main/resources/assets/botania/recipes/petal_6_double.json diff --git a/src/main/resources/assets/botania/recipes/petal_7_alt_alt.json b/src/main/resources/assets/botania/recipes/petal_7_double.json similarity index 100% rename from src/main/resources/assets/botania/recipes/petal_7_alt_alt.json rename to src/main/resources/assets/botania/recipes/petal_7_double.json diff --git a/src/main/resources/assets/botania/recipes/petal_8_alt_alt.json b/src/main/resources/assets/botania/recipes/petal_8_double.json similarity index 100% rename from src/main/resources/assets/botania/recipes/petal_8_alt_alt.json rename to src/main/resources/assets/botania/recipes/petal_8_double.json diff --git a/src/main/resources/assets/botania/recipes/petal_9_alt_alt.json b/src/main/resources/assets/botania/recipes/petal_9_double.json similarity index 100% rename from src/main/resources/assets/botania/recipes/petal_9_alt_alt.json rename to src/main/resources/assets/botania/recipes/petal_9_double.json diff --git a/src/main/resources/assets/botania/recipes/petalblock_0.json b/src/main/resources/assets/botania/recipes/petalblock_0.json index 04162a57a..049ba764a 100644 --- a/src/main/resources/assets/botania/recipes/petalblock_0.json +++ b/src/main/resources/assets/botania/recipes/petalblock_0.json @@ -9,6 +9,7 @@ "PPP" ], "type": "forge:ore_shaped", + "group": "botania:petalblock", "key": { "P": { "item": "#PETALWHITE" diff --git a/src/main/resources/assets/botania/recipes/petalblock_1.json b/src/main/resources/assets/botania/recipes/petalblock_1.json index b2a328582..8977df4ad 100644 --- a/src/main/resources/assets/botania/recipes/petalblock_1.json +++ b/src/main/resources/assets/botania/recipes/petalblock_1.json @@ -9,6 +9,7 @@ "PPP" ], "type": "forge:ore_shaped", + "group": "botania:petalblock", "key": { "P": { "item": "#PETALORANGE" diff --git a/src/main/resources/assets/botania/recipes/petalblock_10.json b/src/main/resources/assets/botania/recipes/petalblock_10.json index 559fd884b..40542d250 100644 --- a/src/main/resources/assets/botania/recipes/petalblock_10.json +++ b/src/main/resources/assets/botania/recipes/petalblock_10.json @@ -9,6 +9,7 @@ "PPP" ], "type": "forge:ore_shaped", + "group": "botania:petalblock", "key": { "P": { "item": "#PETALPURPLE" diff --git a/src/main/resources/assets/botania/recipes/petalblock_11.json b/src/main/resources/assets/botania/recipes/petalblock_11.json index 23849e1e4..d1363e300 100644 --- a/src/main/resources/assets/botania/recipes/petalblock_11.json +++ b/src/main/resources/assets/botania/recipes/petalblock_11.json @@ -9,6 +9,7 @@ "PPP" ], "type": "forge:ore_shaped", + "group": "botania:petalblock", "key": { "P": { "item": "#PETALBLUE" diff --git a/src/main/resources/assets/botania/recipes/petalblock_12.json b/src/main/resources/assets/botania/recipes/petalblock_12.json index 89a99e443..eb31b746b 100644 --- a/src/main/resources/assets/botania/recipes/petalblock_12.json +++ b/src/main/resources/assets/botania/recipes/petalblock_12.json @@ -9,6 +9,7 @@ "PPP" ], "type": "forge:ore_shaped", + "group": "botania:petalblock", "key": { "P": { "item": "#PETALBROWN" diff --git a/src/main/resources/assets/botania/recipes/petalblock_13.json b/src/main/resources/assets/botania/recipes/petalblock_13.json index 358833042..5cf1afaa2 100644 --- a/src/main/resources/assets/botania/recipes/petalblock_13.json +++ b/src/main/resources/assets/botania/recipes/petalblock_13.json @@ -9,6 +9,7 @@ "PPP" ], "type": "forge:ore_shaped", + "group": "botania:petalblock", "key": { "P": { "item": "#PETALGREEN" diff --git a/src/main/resources/assets/botania/recipes/petalblock_14.json b/src/main/resources/assets/botania/recipes/petalblock_14.json index 08db1cb98..8ccd22dff 100644 --- a/src/main/resources/assets/botania/recipes/petalblock_14.json +++ b/src/main/resources/assets/botania/recipes/petalblock_14.json @@ -9,6 +9,7 @@ "PPP" ], "type": "forge:ore_shaped", + "group": "botania:petalblock", "key": { "P": { "item": "#PETALRED" diff --git a/src/main/resources/assets/botania/recipes/petalblock_15.json b/src/main/resources/assets/botania/recipes/petalblock_15.json index fa23a9d2e..85f7c20e6 100644 --- a/src/main/resources/assets/botania/recipes/petalblock_15.json +++ b/src/main/resources/assets/botania/recipes/petalblock_15.json @@ -9,6 +9,7 @@ "PPP" ], "type": "forge:ore_shaped", + "group": "botania:petalblock", "key": { "P": { "item": "#PETALBLACK" diff --git a/src/main/resources/assets/botania/recipes/petalblock_2.json b/src/main/resources/assets/botania/recipes/petalblock_2.json index 8e458e8b9..6cceebc31 100644 --- a/src/main/resources/assets/botania/recipes/petalblock_2.json +++ b/src/main/resources/assets/botania/recipes/petalblock_2.json @@ -9,6 +9,7 @@ "PPP" ], "type": "forge:ore_shaped", + "group": "botania:petalblock", "key": { "P": { "item": "#PETALMAGENTA" diff --git a/src/main/resources/assets/botania/recipes/petalblock_3.json b/src/main/resources/assets/botania/recipes/petalblock_3.json index 6f0aaad18..b6b0adf63 100644 --- a/src/main/resources/assets/botania/recipes/petalblock_3.json +++ b/src/main/resources/assets/botania/recipes/petalblock_3.json @@ -9,6 +9,7 @@ "PPP" ], "type": "forge:ore_shaped", + "group": "botania:petalblock", "key": { "P": { "item": "#PETALLIGHTBLUE" diff --git a/src/main/resources/assets/botania/recipes/petalblock_4.json b/src/main/resources/assets/botania/recipes/petalblock_4.json index 5adac25a0..e61a0410f 100644 --- a/src/main/resources/assets/botania/recipes/petalblock_4.json +++ b/src/main/resources/assets/botania/recipes/petalblock_4.json @@ -9,6 +9,7 @@ "PPP" ], "type": "forge:ore_shaped", + "group": "botania:petalblock", "key": { "P": { "item": "#PETALYELLOW" diff --git a/src/main/resources/assets/botania/recipes/petalblock_5.json b/src/main/resources/assets/botania/recipes/petalblock_5.json index d67c80a27..1203e4857 100644 --- a/src/main/resources/assets/botania/recipes/petalblock_5.json +++ b/src/main/resources/assets/botania/recipes/petalblock_5.json @@ -9,6 +9,7 @@ "PPP" ], "type": "forge:ore_shaped", + "group": "botania:petalblock", "key": { "P": { "item": "#PETALLIME" diff --git a/src/main/resources/assets/botania/recipes/petalblock_6.json b/src/main/resources/assets/botania/recipes/petalblock_6.json index 79ca3fa2a..ee41a07ac 100644 --- a/src/main/resources/assets/botania/recipes/petalblock_6.json +++ b/src/main/resources/assets/botania/recipes/petalblock_6.json @@ -9,6 +9,7 @@ "PPP" ], "type": "forge:ore_shaped", + "group": "botania:petalblock", "key": { "P": { "item": "#PETALPINK" diff --git a/src/main/resources/assets/botania/recipes/petalblock_7.json b/src/main/resources/assets/botania/recipes/petalblock_7.json index d2c4b7097..b36cca901 100644 --- a/src/main/resources/assets/botania/recipes/petalblock_7.json +++ b/src/main/resources/assets/botania/recipes/petalblock_7.json @@ -9,6 +9,7 @@ "PPP" ], "type": "forge:ore_shaped", + "group": "botania:petalblock", "key": { "P": { "item": "#PETALGRAY" diff --git a/src/main/resources/assets/botania/recipes/petalblock_8.json b/src/main/resources/assets/botania/recipes/petalblock_8.json index 949dbe711..4327e322c 100644 --- a/src/main/resources/assets/botania/recipes/petalblock_8.json +++ b/src/main/resources/assets/botania/recipes/petalblock_8.json @@ -9,6 +9,7 @@ "PPP" ], "type": "forge:ore_shaped", + "group": "botania:petalblock", "key": { "P": { "item": "#PETALLIGHTGRAY" diff --git a/src/main/resources/assets/botania/recipes/petalblock_9.json b/src/main/resources/assets/botania/recipes/petalblock_9.json index 389edcceb..fa3a05eac 100644 --- a/src/main/resources/assets/botania/recipes/petalblock_9.json +++ b/src/main/resources/assets/botania/recipes/petalblock_9.json @@ -9,6 +9,7 @@ "PPP" ], "type": "forge:ore_shaped", + "group": "botania:petalblock", "key": { "P": { "item": "#PETALCYAN" diff --git a/src/main/resources/assets/botania/recipes/quartz_0.json b/src/main/resources/assets/botania/recipes/quartz_0.json index c1a1702ff..3185d721e 100644 --- a/src/main/resources/assets/botania/recipes/quartz_0.json +++ b/src/main/resources/assets/botania/recipes/quartz_0.json @@ -14,9 +14,15 @@ "Q": { "item": "#GEMQUARTZ" }, - "C": { - "item": "minecraft:coal", - "data": 1 - } + "C": [ + { + "item": "minecraft:coal", + "data": 0 + }, + { + "item": "minecraft:coal", + "data": 1 + } + ] } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/recipes/quartz_0_alt.json b/src/main/resources/assets/botania/recipes/quartz_0_alt.json deleted file mode 100644 index 654e5780f..000000000 --- a/src/main/resources/assets/botania/recipes/quartz_0_alt.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "result": { - "item": "botania:quartz", - "data": 0, - "count": 8 - }, - "pattern": [ - "QQQ", - "QCQ", - "QQQ" - ], - "type": "forge:ore_shaped", - "key": { - "Q": { - "item": "#GEMQUARTZ" - }, - "C": { - "item": "minecraft:coal", - "data": 0 - } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/botania/recipes/quartz_3.json b/src/main/resources/assets/botania/recipes/quartz_3.json index 5d88e0857..cbccc463c 100644 --- a/src/main/resources/assets/botania/recipes/quartz_3.json +++ b/src/main/resources/assets/botania/recipes/quartz_3.json @@ -14,9 +14,23 @@ "Q": { "item": "#GEMQUARTZ" }, - "C": { - "item": "minecraft:red_flower", - "data": 2 - } + "C": [ + { + "item": "minecraft:red_flower", + "data": 2 + }, + { + "item": "minecraft:red_flower", + "data": 7 + }, + { + "item": "minecraft:double_plant", + "data": 1 + }, + { + "item": "minecraft:double_plant", + "data": 5 + } + ] } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/recipes/quartz_3_alt.json b/src/main/resources/assets/botania/recipes/quartz_3_alt.json deleted file mode 100644 index c6f852666..000000000 --- a/src/main/resources/assets/botania/recipes/quartz_3_alt.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "result": { - "item": "botania:quartz", - "data": 3, - "count": 8 - }, - "pattern": [ - "QQQ", - "QCQ", - "QQQ" - ], - "type": "forge:ore_shaped", - "key": { - "Q": { - "item": "#GEMQUARTZ" - }, - "C": { - "item": "minecraft:red_flower", - "data": 7 - } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/botania/recipes/quartz_3_alt_alt.json b/src/main/resources/assets/botania/recipes/quartz_3_alt_alt.json deleted file mode 100644 index 9424eed32..000000000 --- a/src/main/resources/assets/botania/recipes/quartz_3_alt_alt.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "result": { - "item": "botania:quartz", - "data": 3, - "count": 8 - }, - "pattern": [ - "QQQ", - "QCQ", - "QQQ" - ], - "type": "forge:ore_shaped", - "key": { - "Q": { - "item": "#GEMQUARTZ" - }, - "C": { - "item": "minecraft:double_plant", - "data": 1 - } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/botania/recipes/quartz_3_alt_alt_alt.json b/src/main/resources/assets/botania/recipes/quartz_3_alt_alt_alt.json deleted file mode 100644 index ae5e65c05..000000000 --- a/src/main/resources/assets/botania/recipes/quartz_3_alt_alt_alt.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "result": { - "item": "botania:quartz", - "data": 3, - "count": 8 - }, - "pattern": [ - "QQQ", - "QCQ", - "QQQ" - ], - "type": "forge:ore_shaped", - "key": { - "Q": { - "item": "#GEMQUARTZ" - }, - "C": { - "item": "minecraft:double_plant", - "data": 5 - } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/botania/recipes/shinyflower_0.json b/src/main/resources/assets/botania/recipes/shinyflower_0.json index d1e43e661..503818ec0 100644 --- a/src/main/resources/assets/botania/recipes/shinyflower_0.json +++ b/src/main/resources/assets/botania/recipes/shinyflower_0.json @@ -3,6 +3,7 @@ "item": "botania:shinyflower", "data": 0 }, + "group": "botania:shinyflower", "ingredients": [ { "item": "#DUSTGLOWSTONE" diff --git a/src/main/resources/assets/botania/recipes/shinyflower_1.json b/src/main/resources/assets/botania/recipes/shinyflower_1.json index 8620c57ac..06eef0217 100644 --- a/src/main/resources/assets/botania/recipes/shinyflower_1.json +++ b/src/main/resources/assets/botania/recipes/shinyflower_1.json @@ -3,6 +3,7 @@ "item": "botania:shinyflower", "data": 1 }, + "group": "botania:shinyflower", "ingredients": [ { "item": "#DUSTGLOWSTONE" diff --git a/src/main/resources/assets/botania/recipes/shinyflower_10.json b/src/main/resources/assets/botania/recipes/shinyflower_10.json index 1a09ec793..e2f7e3255 100644 --- a/src/main/resources/assets/botania/recipes/shinyflower_10.json +++ b/src/main/resources/assets/botania/recipes/shinyflower_10.json @@ -3,6 +3,7 @@ "item": "botania:shinyflower", "data": 10 }, + "group": "botania:shinyflower", "ingredients": [ { "item": "#DUSTGLOWSTONE" diff --git a/src/main/resources/assets/botania/recipes/shinyflower_11.json b/src/main/resources/assets/botania/recipes/shinyflower_11.json index 930e4e51c..4c9cfb83b 100644 --- a/src/main/resources/assets/botania/recipes/shinyflower_11.json +++ b/src/main/resources/assets/botania/recipes/shinyflower_11.json @@ -3,6 +3,7 @@ "item": "botania:shinyflower", "data": 11 }, + "group": "botania:shinyflower", "ingredients": [ { "item": "#DUSTGLOWSTONE" diff --git a/src/main/resources/assets/botania/recipes/shinyflower_12.json b/src/main/resources/assets/botania/recipes/shinyflower_12.json index 20e913272..a7221c2dd 100644 --- a/src/main/resources/assets/botania/recipes/shinyflower_12.json +++ b/src/main/resources/assets/botania/recipes/shinyflower_12.json @@ -3,6 +3,7 @@ "item": "botania:shinyflower", "data": 12 }, + "group": "botania:shinyflower", "ingredients": [ { "item": "#DUSTGLOWSTONE" diff --git a/src/main/resources/assets/botania/recipes/shinyflower_13.json b/src/main/resources/assets/botania/recipes/shinyflower_13.json index 8e81dece0..7058fe28b 100644 --- a/src/main/resources/assets/botania/recipes/shinyflower_13.json +++ b/src/main/resources/assets/botania/recipes/shinyflower_13.json @@ -3,6 +3,7 @@ "item": "botania:shinyflower", "data": 13 }, + "group": "botania:shinyflower", "ingredients": [ { "item": "#DUSTGLOWSTONE" diff --git a/src/main/resources/assets/botania/recipes/shinyflower_14.json b/src/main/resources/assets/botania/recipes/shinyflower_14.json index 27aa4ff86..99141e199 100644 --- a/src/main/resources/assets/botania/recipes/shinyflower_14.json +++ b/src/main/resources/assets/botania/recipes/shinyflower_14.json @@ -3,6 +3,7 @@ "item": "botania:shinyflower", "data": 14 }, + "group": "botania:shinyflower", "ingredients": [ { "item": "#DUSTGLOWSTONE" diff --git a/src/main/resources/assets/botania/recipes/shinyflower_15.json b/src/main/resources/assets/botania/recipes/shinyflower_15.json index 4680e1122..6f547f084 100644 --- a/src/main/resources/assets/botania/recipes/shinyflower_15.json +++ b/src/main/resources/assets/botania/recipes/shinyflower_15.json @@ -3,6 +3,7 @@ "item": "botania:shinyflower", "data": 15 }, + "group": "botania:shinyflower", "ingredients": [ { "item": "#DUSTGLOWSTONE" diff --git a/src/main/resources/assets/botania/recipes/shinyflower_2.json b/src/main/resources/assets/botania/recipes/shinyflower_2.json index 2346c90a2..47942dd52 100644 --- a/src/main/resources/assets/botania/recipes/shinyflower_2.json +++ b/src/main/resources/assets/botania/recipes/shinyflower_2.json @@ -3,6 +3,7 @@ "item": "botania:shinyflower", "data": 2 }, + "group": "botania:shinyflower", "ingredients": [ { "item": "#DUSTGLOWSTONE" diff --git a/src/main/resources/assets/botania/recipes/shinyflower_3.json b/src/main/resources/assets/botania/recipes/shinyflower_3.json index 7391ea9c8..8ac275719 100644 --- a/src/main/resources/assets/botania/recipes/shinyflower_3.json +++ b/src/main/resources/assets/botania/recipes/shinyflower_3.json @@ -3,6 +3,7 @@ "item": "botania:shinyflower", "data": 3 }, + "group": "botania:shinyflower", "ingredients": [ { "item": "#DUSTGLOWSTONE" diff --git a/src/main/resources/assets/botania/recipes/shinyflower_4.json b/src/main/resources/assets/botania/recipes/shinyflower_4.json index d906ae876..9471a8915 100644 --- a/src/main/resources/assets/botania/recipes/shinyflower_4.json +++ b/src/main/resources/assets/botania/recipes/shinyflower_4.json @@ -3,6 +3,7 @@ "item": "botania:shinyflower", "data": 4 }, + "group": "botania:shinyflower", "ingredients": [ { "item": "#DUSTGLOWSTONE" diff --git a/src/main/resources/assets/botania/recipes/shinyflower_5.json b/src/main/resources/assets/botania/recipes/shinyflower_5.json index fe0b8b419..23ee5dfb1 100644 --- a/src/main/resources/assets/botania/recipes/shinyflower_5.json +++ b/src/main/resources/assets/botania/recipes/shinyflower_5.json @@ -3,6 +3,7 @@ "item": "botania:shinyflower", "data": 5 }, + "group": "botania:shinyflower", "ingredients": [ { "item": "#DUSTGLOWSTONE" diff --git a/src/main/resources/assets/botania/recipes/shinyflower_6.json b/src/main/resources/assets/botania/recipes/shinyflower_6.json index ab1d8d110..b3f9e1a16 100644 --- a/src/main/resources/assets/botania/recipes/shinyflower_6.json +++ b/src/main/resources/assets/botania/recipes/shinyflower_6.json @@ -3,6 +3,7 @@ "item": "botania:shinyflower", "data": 6 }, + "group": "botania:shinyflower", "ingredients": [ { "item": "#DUSTGLOWSTONE" diff --git a/src/main/resources/assets/botania/recipes/shinyflower_7.json b/src/main/resources/assets/botania/recipes/shinyflower_7.json index 38dcebe62..b53dbe3b1 100644 --- a/src/main/resources/assets/botania/recipes/shinyflower_7.json +++ b/src/main/resources/assets/botania/recipes/shinyflower_7.json @@ -3,6 +3,7 @@ "item": "botania:shinyflower", "data": 7 }, + "group": "botania:shinyflower", "ingredients": [ { "item": "#DUSTGLOWSTONE" diff --git a/src/main/resources/assets/botania/recipes/shinyflower_8.json b/src/main/resources/assets/botania/recipes/shinyflower_8.json index b835d91a3..51726b164 100644 --- a/src/main/resources/assets/botania/recipes/shinyflower_8.json +++ b/src/main/resources/assets/botania/recipes/shinyflower_8.json @@ -3,6 +3,7 @@ "item": "botania:shinyflower", "data": 8 }, + "group": "botania:shinyflower", "ingredients": [ { "item": "#DUSTGLOWSTONE" diff --git a/src/main/resources/assets/botania/recipes/shinyflower_9.json b/src/main/resources/assets/botania/recipes/shinyflower_9.json index 70072b4ff..4aad4bf01 100644 --- a/src/main/resources/assets/botania/recipes/shinyflower_9.json +++ b/src/main/resources/assets/botania/recipes/shinyflower_9.json @@ -3,6 +3,7 @@ "item": "botania:shinyflower", "data": 9 }, + "group": "botania:shinyflower", "ingredients": [ { "item": "#DUSTGLOWSTONE" diff --git a/src/main/resources/assets/botania/recipes/biomestonea_0.json b/src/main/resources/assets/botania/recipes/slab_recombine/biomestonea_0.json similarity index 100% rename from src/main/resources/assets/botania/recipes/biomestonea_0.json rename to src/main/resources/assets/botania/recipes/slab_recombine/biomestonea_0.json diff --git a/src/main/resources/assets/botania/recipes/biomestonea_1.json b/src/main/resources/assets/botania/recipes/slab_recombine/biomestonea_1.json similarity index 100% rename from src/main/resources/assets/botania/recipes/biomestonea_1.json rename to src/main/resources/assets/botania/recipes/slab_recombine/biomestonea_1.json diff --git a/src/main/resources/assets/botania/recipes/biomestonea_10.json b/src/main/resources/assets/botania/recipes/slab_recombine/biomestonea_10.json similarity index 100% rename from src/main/resources/assets/botania/recipes/biomestonea_10.json rename to src/main/resources/assets/botania/recipes/slab_recombine/biomestonea_10.json diff --git a/src/main/resources/assets/botania/recipes/biomestonea_11.json b/src/main/resources/assets/botania/recipes/slab_recombine/biomestonea_11.json similarity index 100% rename from src/main/resources/assets/botania/recipes/biomestonea_11.json rename to src/main/resources/assets/botania/recipes/slab_recombine/biomestonea_11.json diff --git a/src/main/resources/assets/botania/recipes/biomestonea_12.json b/src/main/resources/assets/botania/recipes/slab_recombine/biomestonea_12.json similarity index 100% rename from src/main/resources/assets/botania/recipes/biomestonea_12.json rename to src/main/resources/assets/botania/recipes/slab_recombine/biomestonea_12.json diff --git a/src/main/resources/assets/botania/recipes/biomestonea_13.json b/src/main/resources/assets/botania/recipes/slab_recombine/biomestonea_13.json similarity index 100% rename from src/main/resources/assets/botania/recipes/biomestonea_13.json rename to src/main/resources/assets/botania/recipes/slab_recombine/biomestonea_13.json diff --git a/src/main/resources/assets/botania/recipes/biomestonea_14.json b/src/main/resources/assets/botania/recipes/slab_recombine/biomestonea_14.json similarity index 100% rename from src/main/resources/assets/botania/recipes/biomestonea_14.json rename to src/main/resources/assets/botania/recipes/slab_recombine/biomestonea_14.json diff --git a/src/main/resources/assets/botania/recipes/biomestonea_15.json b/src/main/resources/assets/botania/recipes/slab_recombine/biomestonea_15.json similarity index 100% rename from src/main/resources/assets/botania/recipes/biomestonea_15.json rename to src/main/resources/assets/botania/recipes/slab_recombine/biomestonea_15.json diff --git a/src/main/resources/assets/botania/recipes/biomestonea_2.json b/src/main/resources/assets/botania/recipes/slab_recombine/biomestonea_2.json similarity index 100% rename from src/main/resources/assets/botania/recipes/biomestonea_2.json rename to src/main/resources/assets/botania/recipes/slab_recombine/biomestonea_2.json diff --git a/src/main/resources/assets/botania/recipes/biomestonea_3.json b/src/main/resources/assets/botania/recipes/slab_recombine/biomestonea_3.json similarity index 100% rename from src/main/resources/assets/botania/recipes/biomestonea_3.json rename to src/main/resources/assets/botania/recipes/slab_recombine/biomestonea_3.json diff --git a/src/main/resources/assets/botania/recipes/biomestonea_4.json b/src/main/resources/assets/botania/recipes/slab_recombine/biomestonea_4.json similarity index 100% rename from src/main/resources/assets/botania/recipes/biomestonea_4.json rename to src/main/resources/assets/botania/recipes/slab_recombine/biomestonea_4.json diff --git a/src/main/resources/assets/botania/recipes/biomestonea_5.json b/src/main/resources/assets/botania/recipes/slab_recombine/biomestonea_5.json similarity index 100% rename from src/main/resources/assets/botania/recipes/biomestonea_5.json rename to src/main/resources/assets/botania/recipes/slab_recombine/biomestonea_5.json diff --git a/src/main/resources/assets/botania/recipes/biomestonea_6.json b/src/main/resources/assets/botania/recipes/slab_recombine/biomestonea_6.json similarity index 100% rename from src/main/resources/assets/botania/recipes/biomestonea_6.json rename to src/main/resources/assets/botania/recipes/slab_recombine/biomestonea_6.json diff --git a/src/main/resources/assets/botania/recipes/biomestonea_7.json b/src/main/resources/assets/botania/recipes/slab_recombine/biomestonea_7.json similarity index 100% rename from src/main/resources/assets/botania/recipes/biomestonea_7.json rename to src/main/resources/assets/botania/recipes/slab_recombine/biomestonea_7.json diff --git a/src/main/resources/assets/botania/recipes/biomestonea_8.json b/src/main/resources/assets/botania/recipes/slab_recombine/biomestonea_8.json similarity index 100% rename from src/main/resources/assets/botania/recipes/biomestonea_8.json rename to src/main/resources/assets/botania/recipes/slab_recombine/biomestonea_8.json diff --git a/src/main/resources/assets/botania/recipes/biomestonea_9.json b/src/main/resources/assets/botania/recipes/slab_recombine/biomestonea_9.json similarity index 100% rename from src/main/resources/assets/botania/recipes/biomestonea_9.json rename to src/main/resources/assets/botania/recipes/slab_recombine/biomestonea_9.json diff --git a/src/main/resources/assets/botania/recipes/biomestoneb_0_alt.json b/src/main/resources/assets/botania/recipes/slab_recombine/biomestoneb_0.json similarity index 100% rename from src/main/resources/assets/botania/recipes/biomestoneb_0_alt.json rename to src/main/resources/assets/botania/recipes/slab_recombine/biomestoneb_0.json diff --git a/src/main/resources/assets/botania/recipes/biomestoneb_1_alt.json b/src/main/resources/assets/botania/recipes/slab_recombine/biomestoneb_1.json similarity index 100% rename from src/main/resources/assets/botania/recipes/biomestoneb_1_alt.json rename to src/main/resources/assets/botania/recipes/slab_recombine/biomestoneb_1.json diff --git a/src/main/resources/assets/botania/recipes/biomestoneb_2_alt.json b/src/main/resources/assets/botania/recipes/slab_recombine/biomestoneb_2.json similarity index 100% rename from src/main/resources/assets/botania/recipes/biomestoneb_2_alt.json rename to src/main/resources/assets/botania/recipes/slab_recombine/biomestoneb_2.json diff --git a/src/main/resources/assets/botania/recipes/biomestoneb_3_alt.json b/src/main/resources/assets/botania/recipes/slab_recombine/biomestoneb_3.json similarity index 100% rename from src/main/resources/assets/botania/recipes/biomestoneb_3_alt.json rename to src/main/resources/assets/botania/recipes/slab_recombine/biomestoneb_3.json diff --git a/src/main/resources/assets/botania/recipes/biomestoneb_4_alt.json b/src/main/resources/assets/botania/recipes/slab_recombine/biomestoneb_4.json similarity index 100% rename from src/main/resources/assets/botania/recipes/biomestoneb_4_alt.json rename to src/main/resources/assets/botania/recipes/slab_recombine/biomestoneb_4.json diff --git a/src/main/resources/assets/botania/recipes/biomestoneb_5_alt.json b/src/main/resources/assets/botania/recipes/slab_recombine/biomestoneb_5.json similarity index 100% rename from src/main/resources/assets/botania/recipes/biomestoneb_5_alt.json rename to src/main/resources/assets/botania/recipes/slab_recombine/biomestoneb_5.json diff --git a/src/main/resources/assets/botania/recipes/biomestoneb_6_alt.json b/src/main/resources/assets/botania/recipes/slab_recombine/biomestoneb_6.json similarity index 100% rename from src/main/resources/assets/botania/recipes/biomestoneb_6_alt.json rename to src/main/resources/assets/botania/recipes/slab_recombine/biomestoneb_6.json diff --git a/src/main/resources/assets/botania/recipes/biomestoneb_7_alt.json b/src/main/resources/assets/botania/recipes/slab_recombine/biomestoneb_7.json similarity index 100% rename from src/main/resources/assets/botania/recipes/biomestoneb_7_alt.json rename to src/main/resources/assets/botania/recipes/slab_recombine/biomestoneb_7.json diff --git a/src/main/resources/assets/botania/recipes/dreamwood_0.json b/src/main/resources/assets/botania/recipes/slab_recombine/dreamwood_0.json similarity index 100% rename from src/main/resources/assets/botania/recipes/dreamwood_0.json rename to src/main/resources/assets/botania/recipes/slab_recombine/dreamwood_0.json diff --git a/src/main/resources/assets/botania/recipes/dreamwood_1_alt.json b/src/main/resources/assets/botania/recipes/slab_recombine/dreamwood_1.json similarity index 100% rename from src/main/resources/assets/botania/recipes/dreamwood_1_alt.json rename to src/main/resources/assets/botania/recipes/slab_recombine/dreamwood_1.json diff --git a/src/main/resources/assets/botania/recipes/livingrock_0.json b/src/main/resources/assets/botania/recipes/slab_recombine/livingrock_0.json similarity index 100% rename from src/main/resources/assets/botania/recipes/livingrock_0.json rename to src/main/resources/assets/botania/recipes/slab_recombine/livingrock_0.json diff --git a/src/main/resources/assets/botania/recipes/livingrock_1_alt.json b/src/main/resources/assets/botania/recipes/slab_recombine/livingrock_1.json similarity index 100% rename from src/main/resources/assets/botania/recipes/livingrock_1_alt.json rename to src/main/resources/assets/botania/recipes/slab_recombine/livingrock_1.json diff --git a/src/main/resources/assets/botania/recipes/pavement_0_alt.json b/src/main/resources/assets/botania/recipes/slab_recombine/pavement_0.json similarity index 100% rename from src/main/resources/assets/botania/recipes/pavement_0_alt.json rename to src/main/resources/assets/botania/recipes/slab_recombine/pavement_0.json diff --git a/src/main/resources/assets/botania/recipes/pavement_1_alt.json b/src/main/resources/assets/botania/recipes/slab_recombine/pavement_1.json similarity index 100% rename from src/main/resources/assets/botania/recipes/pavement_1_alt.json rename to src/main/resources/assets/botania/recipes/slab_recombine/pavement_1.json diff --git a/src/main/resources/assets/botania/recipes/pavement_2_alt.json b/src/main/resources/assets/botania/recipes/slab_recombine/pavement_2.json similarity index 100% rename from src/main/resources/assets/botania/recipes/pavement_2_alt.json rename to src/main/resources/assets/botania/recipes/slab_recombine/pavement_2.json diff --git a/src/main/resources/assets/botania/recipes/pavement_3_alt.json b/src/main/resources/assets/botania/recipes/slab_recombine/pavement_3.json similarity index 100% rename from src/main/resources/assets/botania/recipes/pavement_3_alt.json rename to src/main/resources/assets/botania/recipes/slab_recombine/pavement_3.json diff --git a/src/main/resources/assets/botania/recipes/pavement_4_alt.json b/src/main/resources/assets/botania/recipes/slab_recombine/pavement_4.json similarity index 100% rename from src/main/resources/assets/botania/recipes/pavement_4_alt.json rename to src/main/resources/assets/botania/recipes/slab_recombine/pavement_4.json diff --git a/src/main/resources/assets/botania/recipes/pavement_5_alt.json b/src/main/resources/assets/botania/recipes/slab_recombine/pavement_5.json similarity index 100% rename from src/main/resources/assets/botania/recipes/pavement_5_alt.json rename to src/main/resources/assets/botania/recipes/slab_recombine/pavement_5.json diff --git a/src/main/resources/assets/botania/recipes/quartztypeblaze_0_alt.json b/src/main/resources/assets/botania/recipes/slab_recombine/quartztypeblaze_0.json similarity index 100% rename from src/main/resources/assets/botania/recipes/quartztypeblaze_0_alt.json rename to src/main/resources/assets/botania/recipes/slab_recombine/quartztypeblaze_0.json diff --git a/src/main/resources/assets/botania/recipes/quartztypedark_0_alt.json b/src/main/resources/assets/botania/recipes/slab_recombine/quartztypedark_0.json similarity index 100% rename from src/main/resources/assets/botania/recipes/quartztypedark_0_alt.json rename to src/main/resources/assets/botania/recipes/slab_recombine/quartztypedark_0.json diff --git a/src/main/resources/assets/botania/recipes/quartztypeelf_0_alt.json b/src/main/resources/assets/botania/recipes/slab_recombine/quartztypeelf_0.json similarity index 100% rename from src/main/resources/assets/botania/recipes/quartztypeelf_0_alt.json rename to src/main/resources/assets/botania/recipes/slab_recombine/quartztypeelf_0.json diff --git a/src/main/resources/assets/botania/recipes/quartztypelavender_0_alt.json b/src/main/resources/assets/botania/recipes/slab_recombine/quartztypelavender_0.json similarity index 100% rename from src/main/resources/assets/botania/recipes/quartztypelavender_0_alt.json rename to src/main/resources/assets/botania/recipes/slab_recombine/quartztypelavender_0.json diff --git a/src/main/resources/assets/botania/recipes/quartztypemana_0_alt.json b/src/main/resources/assets/botania/recipes/slab_recombine/quartztypemana_0.json similarity index 100% rename from src/main/resources/assets/botania/recipes/quartztypemana_0_alt.json rename to src/main/resources/assets/botania/recipes/slab_recombine/quartztypemana_0.json diff --git a/src/main/resources/assets/botania/recipes/quartztypered_0_alt.json b/src/main/resources/assets/botania/recipes/slab_recombine/quartztypered_0.json similarity index 100% rename from src/main/resources/assets/botania/recipes/quartztypered_0_alt.json rename to src/main/resources/assets/botania/recipes/slab_recombine/quartztypered_0.json diff --git a/src/main/resources/assets/botania/recipes/quartztypesunny_0_alt.json b/src/main/resources/assets/botania/recipes/slab_recombine/quartztypesunny_0.json similarity index 100% rename from src/main/resources/assets/botania/recipes/quartztypesunny_0_alt.json rename to src/main/resources/assets/botania/recipes/slab_recombine/quartztypesunny_0.json diff --git a/src/main/resources/assets/botania/recipes/shimmerrock_alt.json b/src/main/resources/assets/botania/recipes/slab_recombine/shimmerrock.json similarity index 100% rename from src/main/resources/assets/botania/recipes/shimmerrock_alt.json rename to src/main/resources/assets/botania/recipes/slab_recombine/shimmerrock.json diff --git a/src/main/resources/assets/botania/recipes/shimmerwoodplanks_alt.json b/src/main/resources/assets/botania/recipes/slab_recombine/shimmerwoodplanks.json similarity index 100% rename from src/main/resources/assets/botania/recipes/shimmerwoodplanks_alt.json rename to src/main/resources/assets/botania/recipes/slab_recombine/shimmerwoodplanks.json diff --git a/src/main/resources/assets/botania/recipes/slimebottle_0.json b/src/main/resources/assets/botania/recipes/slimebottle.json similarity index 100% rename from src/main/resources/assets/botania/recipes/slimebottle_0.json rename to src/main/resources/assets/botania/recipes/slimebottle.json diff --git a/src/main/resources/assets/botania/recipes/spreader_0.json b/src/main/resources/assets/botania/recipes/spreader_0.json index 864ec0587..7df50147a 100644 --- a/src/main/resources/assets/botania/recipes/spreader_0.json +++ b/src/main/resources/assets/botania/recipes/spreader_0.json @@ -2,7 +2,7 @@ "conditions": [ { "type": "botania:garden_of_glass", - "value": "false" + "value": false } ], "result": { diff --git a/src/main/resources/assets/botania/recipes/temperancestone_0.json b/src/main/resources/assets/botania/recipes/temperancestone.json similarity index 100% rename from src/main/resources/assets/botania/recipes/temperancestone_0.json rename to src/main/resources/assets/botania/recipes/temperancestone.json