From 41d3c62eb9c827296e3892ac50e0a642c6c55b8f Mon Sep 17 00:00:00 2001 From: ToMe25 <38815969+ToMe25@users.noreply.github.com> Date: Thu, 30 Jan 2020 17:11:43 +0100 Subject: [PATCH 1/6] Add a Recipe for Sweet Berries (#3160) * Add a Recipe for Sweet Berries * Add back the unused import to prevent merging issues. also how did this lang change sneak in here? * rename translation to manaAlchemy28 as its no longer used by #3157 * Merge branch 'master' into ToMe25-patch-16 * Revert "Merge branch 'master' into ToMe25-patch-16" (#5) This reverts commit 5d9c68d4bbf30261ef2f0f708e0dd21b273f912b. --- .../botania/common/crafting/ModManaAlchemyRecipes.java | 2 ++ src/main/resources/assets/botania/lang/en_us.json | 1 + .../lexicon/en_us/entries/devices/mana_alchemy.json | 5 +++++ 3 files changed, 8 insertions(+) diff --git a/src/main/java/vazkii/botania/common/crafting/ModManaAlchemyRecipes.java b/src/main/java/vazkii/botania/common/crafting/ModManaAlchemyRecipes.java index 5d7a05187..a763ce693 100644 --- a/src/main/java/vazkii/botania/common/crafting/ModManaAlchemyRecipes.java +++ b/src/main/java/vazkii/botania/common/crafting/ModManaAlchemyRecipes.java @@ -98,6 +98,8 @@ public final class ModManaAlchemyRecipes { evt.manaInfusion().accept(RecipeManaInfusion.alchemy(prefix("chorus_fruit_to_flower"), new ItemStack(Blocks.CHORUS_FLOWER), Ingredient.fromItems(Items.POPPED_CHORUS_FRUIT), 10000)); + cycle(evt.manaInfusion(), 240, "botania:berry_cycle", Items.APPLE, Items.SWEET_BERRIES); + if(Botania.gardenOfGlassLoaded) { evt.manaInfusion().accept(RecipeManaInfusion.alchemy(prefix("prismarine_shard_gog"), new ItemStack(Items.PRISMARINE_SHARD), Ingredient.fromItems(Items.QUARTZ), 1000)); evt.manaInfusion().accept(RecipeManaInfusion.alchemy(prefix("prismarine_crystals_gog"), new ItemStack(Items.PRISMARINE_CRYSTALS), Ingredient.fromItems(Items.PRISMARINE_SHARD), 500)); diff --git a/src/main/resources/assets/botania/lang/en_us.json b/src/main/resources/assets/botania/lang/en_us.json index 724c474a9..1c03178ff 100644 --- a/src/main/resources/assets/botania/lang/en_us.json +++ b/src/main/resources/assets/botania/lang/en_us.json @@ -2294,6 +2294,7 @@ "botania.page.manaAlchemy25": "Transmuting mundane flowers", "botania.page.manaAlchemy26": "Transmuting stones", "botania.page.manaAlchemy27": "Converting $(item)Chorus Fruit$(0) into $(item)Chorus Flowers$(0)", + "botania.page.manaAlchemy28": "Converting between $(item)Apples$(0) and $(item)Sweet Berries$(0)", "botania.entry.brewery": "Botanical Brewery", "botania.tagline.brewery": "Create brews: better potions", diff --git a/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/devices/mana_alchemy.json b/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/devices/mana_alchemy.json index f12bc5ae5..c701538fd 100644 --- a/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/devices/mana_alchemy.json +++ b/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/devices/mana_alchemy.json @@ -142,6 +142,11 @@ "type": "mana_infusion", "text": "botania.page.manaAlchemy23", "recipes": "botania:coarse_dirt" + }, + { + "type": "mana_infusion", + "text": "botania.page.manaAlchemy28", + "group": "botania:berry_cycle" } ] } \ No newline at end of file From ac609c9e8204ce0aff2346e1e4e87937bdce0dcf Mon Sep 17 00:00:00 2001 From: ToMe25 <38815969+ToMe25@users.noreply.github.com> Date: Thu, 30 Jan 2020 17:12:08 +0100 Subject: [PATCH 2/6] Fix the "bleeding-edge lang file" link (#3163) Fix the website lexicon page "bleeding-edge lang file" link to the github lang file, as it still linkes to a not existing en_US.lang one. --- web/module/lexicon.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/module/lexicon.php b/web/module/lexicon.php index 4ea01049c..0e784c4b9 100644 --- a/web/module/lexicon.php +++ b/web/module/lexicon.php @@ -6,7 +6,7 @@
From 7cbe19271caa7a7ebf250482d6f56ec032af4f54 Mon Sep 17 00:00:00 2001 From: Hubry Date: Thu, 30 Jan 2020 18:54:47 +0100 Subject: [PATCH 3/6] Fix terra blade bursts ignoring players you can damage I had this one check wrong --- .../common/item/equipment/tool/terrasteel/ItemTerraSword.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/vazkii/botania/common/item/equipment/tool/terrasteel/ItemTerraSword.java b/src/main/java/vazkii/botania/common/item/equipment/tool/terrasteel/ItemTerraSword.java index 7f4e1f36d..6d3e84001 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/tool/terrasteel/ItemTerraSword.java +++ b/src/main/java/vazkii/botania/common/item/equipment/tool/terrasteel/ItemTerraSword.java @@ -108,7 +108,7 @@ public class ItemTerraSword extends ItemManasteelSword implements ILensEffect { for(LivingEntity living : entities) { if(living == thrower || living instanceof PlayerEntity && thrower instanceof PlayerEntity - && ((PlayerEntity) thrower).canAttackPlayer(((PlayerEntity) living))) + && !((PlayerEntity) thrower).canAttackPlayer(((PlayerEntity) living))) continue; if(living.hurtTime == 0) { From 12e67ab39496d81e5b2cb1f3c0868b07c1e38813 Mon Sep 17 00:00:00 2001 From: Hubry Date: Thu, 30 Jan 2020 18:59:14 +0100 Subject: [PATCH 4/6] Replace 256 wand of the forest recipe jsons with one custom recipe type Prevents flooding JEI with tons of irrelevant recipes, and recipe book buttons going offscreen if you look at all the variants of the wand. Side effect is not showing the colored wands in JEI/Patchouli, but that's fine. --- .../integration/jei/JEIBotaniaPlugin.java | 2 - .../common/block/decor/BlockModMushroom.java | 2 +- .../crafting/recipe/TwigWandRecipe.java | 137 ++++++++++++++++++ .../vazkii/botania/common/item/ModItems.java | 19 +-- .../data/botania/recipes/twig_wand.json | 20 +++ .../recipes/wands/twigwand_black_black.json | 24 --- .../recipes/wands/twigwand_black_blue.json | 24 --- .../recipes/wands/twigwand_black_brown.json | 24 --- .../recipes/wands/twigwand_black_cyan.json | 24 --- .../recipes/wands/twigwand_black_gray.json | 24 --- .../recipes/wands/twigwand_black_green.json | 24 --- .../wands/twigwand_black_light_blue.json | 24 --- .../recipes/wands/twigwand_black_lime.json | 24 --- .../recipes/wands/twigwand_black_magenta.json | 24 --- .../recipes/wands/twigwand_black_orange.json | 24 --- .../recipes/wands/twigwand_black_pink.json | 24 --- .../recipes/wands/twigwand_black_purple.json | 24 --- .../recipes/wands/twigwand_black_red.json | 24 --- .../recipes/wands/twigwand_black_silver.json | 24 --- .../recipes/wands/twigwand_black_white.json | 24 --- .../recipes/wands/twigwand_black_yellow.json | 24 --- .../recipes/wands/twigwand_blue_black.json | 24 --- .../recipes/wands/twigwand_blue_blue.json | 24 --- .../recipes/wands/twigwand_blue_brown.json | 24 --- .../recipes/wands/twigwand_blue_cyan.json | 24 --- .../recipes/wands/twigwand_blue_gray.json | 24 --- .../recipes/wands/twigwand_blue_green.json | 24 --- .../wands/twigwand_blue_light_blue.json | 24 --- .../recipes/wands/twigwand_blue_lime.json | 24 --- .../recipes/wands/twigwand_blue_magenta.json | 24 --- .../recipes/wands/twigwand_blue_orange.json | 24 --- .../recipes/wands/twigwand_blue_pink.json | 24 --- .../recipes/wands/twigwand_blue_purple.json | 24 --- .../recipes/wands/twigwand_blue_red.json | 24 --- .../recipes/wands/twigwand_blue_silver.json | 24 --- .../recipes/wands/twigwand_blue_white.json | 24 --- .../recipes/wands/twigwand_blue_yellow.json | 24 --- .../recipes/wands/twigwand_brown_black.json | 24 --- .../recipes/wands/twigwand_brown_blue.json | 24 --- .../recipes/wands/twigwand_brown_brown.json | 24 --- .../recipes/wands/twigwand_brown_cyan.json | 24 --- .../recipes/wands/twigwand_brown_gray.json | 24 --- .../recipes/wands/twigwand_brown_green.json | 24 --- .../wands/twigwand_brown_light_blue.json | 24 --- .../recipes/wands/twigwand_brown_lime.json | 24 --- .../recipes/wands/twigwand_brown_magenta.json | 24 --- .../recipes/wands/twigwand_brown_orange.json | 24 --- .../recipes/wands/twigwand_brown_pink.json | 24 --- .../recipes/wands/twigwand_brown_purple.json | 24 --- .../recipes/wands/twigwand_brown_red.json | 24 --- .../recipes/wands/twigwand_brown_silver.json | 24 --- .../recipes/wands/twigwand_brown_white.json | 24 --- .../recipes/wands/twigwand_brown_yellow.json | 24 --- .../recipes/wands/twigwand_cyan_black.json | 24 --- .../recipes/wands/twigwand_cyan_blue.json | 24 --- .../recipes/wands/twigwand_cyan_brown.json | 24 --- .../recipes/wands/twigwand_cyan_cyan.json | 24 --- .../recipes/wands/twigwand_cyan_gray.json | 24 --- .../recipes/wands/twigwand_cyan_green.json | 24 --- .../wands/twigwand_cyan_light_blue.json | 24 --- .../recipes/wands/twigwand_cyan_lime.json | 24 --- .../recipes/wands/twigwand_cyan_magenta.json | 24 --- .../recipes/wands/twigwand_cyan_orange.json | 24 --- .../recipes/wands/twigwand_cyan_pink.json | 24 --- .../recipes/wands/twigwand_cyan_purple.json | 24 --- .../recipes/wands/twigwand_cyan_red.json | 24 --- .../recipes/wands/twigwand_cyan_silver.json | 24 --- .../recipes/wands/twigwand_cyan_white.json | 24 --- .../recipes/wands/twigwand_cyan_yellow.json | 24 --- .../recipes/wands/twigwand_gray_black.json | 24 --- .../recipes/wands/twigwand_gray_blue.json | 24 --- .../recipes/wands/twigwand_gray_brown.json | 24 --- .../recipes/wands/twigwand_gray_cyan.json | 24 --- .../recipes/wands/twigwand_gray_gray.json | 24 --- .../recipes/wands/twigwand_gray_green.json | 24 --- .../wands/twigwand_gray_light_blue.json | 24 --- .../recipes/wands/twigwand_gray_lime.json | 24 --- .../recipes/wands/twigwand_gray_magenta.json | 24 --- .../recipes/wands/twigwand_gray_orange.json | 24 --- .../recipes/wands/twigwand_gray_pink.json | 24 --- .../recipes/wands/twigwand_gray_purple.json | 24 --- .../recipes/wands/twigwand_gray_red.json | 24 --- .../recipes/wands/twigwand_gray_silver.json | 24 --- .../recipes/wands/twigwand_gray_white.json | 24 --- .../recipes/wands/twigwand_gray_yellow.json | 24 --- .../recipes/wands/twigwand_green_black.json | 24 --- .../recipes/wands/twigwand_green_blue.json | 24 --- .../recipes/wands/twigwand_green_brown.json | 24 --- .../recipes/wands/twigwand_green_cyan.json | 24 --- .../recipes/wands/twigwand_green_gray.json | 24 --- .../recipes/wands/twigwand_green_green.json | 24 --- .../wands/twigwand_green_light_blue.json | 24 --- .../recipes/wands/twigwand_green_lime.json | 24 --- .../recipes/wands/twigwand_green_magenta.json | 24 --- .../recipes/wands/twigwand_green_orange.json | 24 --- .../recipes/wands/twigwand_green_pink.json | 24 --- .../recipes/wands/twigwand_green_purple.json | 24 --- .../recipes/wands/twigwand_green_red.json | 24 --- .../recipes/wands/twigwand_green_silver.json | 24 --- .../recipes/wands/twigwand_green_white.json | 24 --- .../recipes/wands/twigwand_green_yellow.json | 24 --- .../wands/twigwand_light_blue_black.json | 24 --- .../wands/twigwand_light_blue_blue.json | 24 --- .../wands/twigwand_light_blue_brown.json | 24 --- .../wands/twigwand_light_blue_cyan.json | 24 --- .../wands/twigwand_light_blue_gray.json | 24 --- .../wands/twigwand_light_blue_green.json | 24 --- .../wands/twigwand_light_blue_light_blue.json | 24 --- .../wands/twigwand_light_blue_lime.json | 24 --- .../wands/twigwand_light_blue_magenta.json | 24 --- .../wands/twigwand_light_blue_orange.json | 24 --- .../wands/twigwand_light_blue_pink.json | 24 --- .../wands/twigwand_light_blue_purple.json | 24 --- .../wands/twigwand_light_blue_red.json | 24 --- .../wands/twigwand_light_blue_silver.json | 24 --- .../wands/twigwand_light_blue_white.json | 24 --- .../wands/twigwand_light_blue_yellow.json | 24 --- .../recipes/wands/twigwand_lime_black.json | 24 --- .../recipes/wands/twigwand_lime_blue.json | 24 --- .../recipes/wands/twigwand_lime_brown.json | 24 --- .../recipes/wands/twigwand_lime_cyan.json | 24 --- .../recipes/wands/twigwand_lime_gray.json | 24 --- .../recipes/wands/twigwand_lime_green.json | 24 --- .../wands/twigwand_lime_light_blue.json | 24 --- .../recipes/wands/twigwand_lime_lime.json | 24 --- .../recipes/wands/twigwand_lime_magenta.json | 24 --- .../recipes/wands/twigwand_lime_orange.json | 24 --- .../recipes/wands/twigwand_lime_pink.json | 24 --- .../recipes/wands/twigwand_lime_purple.json | 24 --- .../recipes/wands/twigwand_lime_red.json | 24 --- .../recipes/wands/twigwand_lime_silver.json | 24 --- .../recipes/wands/twigwand_lime_white.json | 24 --- .../recipes/wands/twigwand_lime_yellow.json | 24 --- .../recipes/wands/twigwand_magenta_black.json | 24 --- .../recipes/wands/twigwand_magenta_blue.json | 24 --- .../recipes/wands/twigwand_magenta_brown.json | 24 --- .../recipes/wands/twigwand_magenta_cyan.json | 24 --- .../recipes/wands/twigwand_magenta_gray.json | 24 --- .../recipes/wands/twigwand_magenta_green.json | 24 --- .../wands/twigwand_magenta_light_blue.json | 24 --- .../recipes/wands/twigwand_magenta_lime.json | 24 --- .../wands/twigwand_magenta_magenta.json | 24 --- .../wands/twigwand_magenta_orange.json | 24 --- .../recipes/wands/twigwand_magenta_pink.json | 24 --- .../wands/twigwand_magenta_purple.json | 24 --- .../recipes/wands/twigwand_magenta_red.json | 24 --- .../wands/twigwand_magenta_silver.json | 24 --- .../recipes/wands/twigwand_magenta_white.json | 24 --- .../wands/twigwand_magenta_yellow.json | 24 --- .../recipes/wands/twigwand_orange_black.json | 24 --- .../recipes/wands/twigwand_orange_blue.json | 24 --- .../recipes/wands/twigwand_orange_brown.json | 24 --- .../recipes/wands/twigwand_orange_cyan.json | 24 --- .../recipes/wands/twigwand_orange_gray.json | 24 --- .../recipes/wands/twigwand_orange_green.json | 24 --- .../wands/twigwand_orange_light_blue.json | 24 --- .../recipes/wands/twigwand_orange_lime.json | 24 --- .../wands/twigwand_orange_magenta.json | 24 --- .../recipes/wands/twigwand_orange_orange.json | 24 --- .../recipes/wands/twigwand_orange_pink.json | 24 --- .../recipes/wands/twigwand_orange_purple.json | 24 --- .../recipes/wands/twigwand_orange_red.json | 24 --- .../recipes/wands/twigwand_orange_silver.json | 24 --- .../recipes/wands/twigwand_orange_white.json | 24 --- .../recipes/wands/twigwand_orange_yellow.json | 24 --- .../recipes/wands/twigwand_pink_black.json | 24 --- .../recipes/wands/twigwand_pink_blue.json | 24 --- .../recipes/wands/twigwand_pink_brown.json | 24 --- .../recipes/wands/twigwand_pink_cyan.json | 24 --- .../recipes/wands/twigwand_pink_gray.json | 24 --- .../recipes/wands/twigwand_pink_green.json | 24 --- .../wands/twigwand_pink_light_blue.json | 24 --- .../recipes/wands/twigwand_pink_lime.json | 24 --- .../recipes/wands/twigwand_pink_magenta.json | 24 --- .../recipes/wands/twigwand_pink_orange.json | 24 --- .../recipes/wands/twigwand_pink_pink.json | 24 --- .../recipes/wands/twigwand_pink_purple.json | 24 --- .../recipes/wands/twigwand_pink_red.json | 24 --- .../recipes/wands/twigwand_pink_silver.json | 24 --- .../recipes/wands/twigwand_pink_white.json | 24 --- .../recipes/wands/twigwand_pink_yellow.json | 24 --- .../recipes/wands/twigwand_purple_black.json | 24 --- .../recipes/wands/twigwand_purple_blue.json | 24 --- .../recipes/wands/twigwand_purple_brown.json | 24 --- .../recipes/wands/twigwand_purple_cyan.json | 24 --- .../recipes/wands/twigwand_purple_gray.json | 24 --- .../recipes/wands/twigwand_purple_green.json | 24 --- .../wands/twigwand_purple_light_blue.json | 24 --- .../recipes/wands/twigwand_purple_lime.json | 24 --- .../wands/twigwand_purple_magenta.json | 24 --- .../recipes/wands/twigwand_purple_orange.json | 24 --- .../recipes/wands/twigwand_purple_pink.json | 24 --- .../recipes/wands/twigwand_purple_purple.json | 24 --- .../recipes/wands/twigwand_purple_red.json | 24 --- .../recipes/wands/twigwand_purple_silver.json | 24 --- .../recipes/wands/twigwand_purple_white.json | 24 --- .../recipes/wands/twigwand_purple_yellow.json | 24 --- .../recipes/wands/twigwand_red_black.json | 24 --- .../recipes/wands/twigwand_red_blue.json | 24 --- .../recipes/wands/twigwand_red_brown.json | 24 --- .../recipes/wands/twigwand_red_cyan.json | 24 --- .../recipes/wands/twigwand_red_gray.json | 24 --- .../recipes/wands/twigwand_red_green.json | 24 --- .../wands/twigwand_red_light_blue.json | 24 --- .../recipes/wands/twigwand_red_lime.json | 24 --- .../recipes/wands/twigwand_red_magenta.json | 24 --- .../recipes/wands/twigwand_red_orange.json | 24 --- .../recipes/wands/twigwand_red_pink.json | 24 --- .../recipes/wands/twigwand_red_purple.json | 24 --- .../recipes/wands/twigwand_red_red.json | 24 --- .../recipes/wands/twigwand_red_silver.json | 24 --- .../recipes/wands/twigwand_red_white.json | 24 --- .../recipes/wands/twigwand_red_yellow.json | 24 --- .../recipes/wands/twigwand_silver_black.json | 24 --- .../recipes/wands/twigwand_silver_blue.json | 24 --- .../recipes/wands/twigwand_silver_brown.json | 24 --- .../recipes/wands/twigwand_silver_cyan.json | 24 --- .../recipes/wands/twigwand_silver_gray.json | 24 --- .../recipes/wands/twigwand_silver_green.json | 24 --- .../wands/twigwand_silver_light_blue.json | 24 --- .../recipes/wands/twigwand_silver_lime.json | 24 --- .../wands/twigwand_silver_magenta.json | 24 --- .../recipes/wands/twigwand_silver_orange.json | 24 --- .../recipes/wands/twigwand_silver_pink.json | 24 --- .../recipes/wands/twigwand_silver_purple.json | 24 --- .../recipes/wands/twigwand_silver_red.json | 24 --- .../recipes/wands/twigwand_silver_silver.json | 24 --- .../recipes/wands/twigwand_silver_white.json | 24 --- .../recipes/wands/twigwand_silver_yellow.json | 24 --- .../recipes/wands/twigwand_white_black.json | 24 --- .../recipes/wands/twigwand_white_blue.json | 24 --- .../recipes/wands/twigwand_white_brown.json | 24 --- .../recipes/wands/twigwand_white_cyan.json | 24 --- .../recipes/wands/twigwand_white_gray.json | 24 --- .../recipes/wands/twigwand_white_green.json | 24 --- .../wands/twigwand_white_light_blue.json | 24 --- .../recipes/wands/twigwand_white_lime.json | 24 --- .../recipes/wands/twigwand_white_magenta.json | 24 --- .../recipes/wands/twigwand_white_orange.json | 24 --- .../recipes/wands/twigwand_white_pink.json | 24 --- .../recipes/wands/twigwand_white_purple.json | 24 --- .../recipes/wands/twigwand_white_red.json | 24 --- .../recipes/wands/twigwand_white_silver.json | 24 --- .../recipes/wands/twigwand_white_white.json | 24 --- .../recipes/wands/twigwand_white_yellow.json | 24 --- .../recipes/wands/twigwand_yellow_black.json | 24 --- .../recipes/wands/twigwand_yellow_blue.json | 24 --- .../recipes/wands/twigwand_yellow_brown.json | 24 --- .../recipes/wands/twigwand_yellow_cyan.json | 24 --- .../recipes/wands/twigwand_yellow_gray.json | 24 --- .../recipes/wands/twigwand_yellow_green.json | 24 --- .../wands/twigwand_yellow_light_blue.json | 24 --- .../recipes/wands/twigwand_yellow_lime.json | 24 --- .../wands/twigwand_yellow_magenta.json | 24 --- .../recipes/wands/twigwand_yellow_orange.json | 24 --- .../recipes/wands/twigwand_yellow_pink.json | 24 --- .../recipes/wands/twigwand_yellow_purple.json | 24 --- .../recipes/wands/twigwand_yellow_red.json | 24 --- .../recipes/wands/twigwand_yellow_silver.json | 24 --- .../recipes/wands/twigwand_yellow_white.json | 24 --- .../recipes/wands/twigwand_yellow_yellow.json | 24 --- 261 files changed, 160 insertions(+), 6164 deletions(-) create mode 100644 src/main/java/vazkii/botania/common/crafting/recipe/TwigWandRecipe.java create mode 100644 src/main/resources/data/botania/recipes/twig_wand.json delete mode 100644 src/main/resources/data/botania/recipes/wands/twigwand_black_black.json delete mode 100644 src/main/resources/data/botania/recipes/wands/twigwand_black_blue.json delete mode 100644 src/main/resources/data/botania/recipes/wands/twigwand_black_brown.json delete mode 100644 src/main/resources/data/botania/recipes/wands/twigwand_black_cyan.json delete mode 100644 src/main/resources/data/botania/recipes/wands/twigwand_black_gray.json delete mode 100644 src/main/resources/data/botania/recipes/wands/twigwand_black_green.json delete mode 100644 src/main/resources/data/botania/recipes/wands/twigwand_black_light_blue.json delete mode 100644 src/main/resources/data/botania/recipes/wands/twigwand_black_lime.json delete mode 100644 src/main/resources/data/botania/recipes/wands/twigwand_black_magenta.json delete mode 100644 src/main/resources/data/botania/recipes/wands/twigwand_black_orange.json delete mode 100644 src/main/resources/data/botania/recipes/wands/twigwand_black_pink.json delete mode 100644 src/main/resources/data/botania/recipes/wands/twigwand_black_purple.json delete mode 100644 src/main/resources/data/botania/recipes/wands/twigwand_black_red.json delete mode 100644 src/main/resources/data/botania/recipes/wands/twigwand_black_silver.json delete mode 100644 src/main/resources/data/botania/recipes/wands/twigwand_black_white.json delete mode 100644 src/main/resources/data/botania/recipes/wands/twigwand_black_yellow.json delete mode 100644 src/main/resources/data/botania/recipes/wands/twigwand_blue_black.json delete mode 100644 src/main/resources/data/botania/recipes/wands/twigwand_blue_blue.json delete mode 100644 src/main/resources/data/botania/recipes/wands/twigwand_blue_brown.json delete mode 100644 src/main/resources/data/botania/recipes/wands/twigwand_blue_cyan.json delete mode 100644 src/main/resources/data/botania/recipes/wands/twigwand_blue_gray.json delete mode 100644 src/main/resources/data/botania/recipes/wands/twigwand_blue_green.json delete mode 100644 src/main/resources/data/botania/recipes/wands/twigwand_blue_light_blue.json delete mode 100644 src/main/resources/data/botania/recipes/wands/twigwand_blue_lime.json delete mode 100644 src/main/resources/data/botania/recipes/wands/twigwand_blue_magenta.json delete mode 100644 src/main/resources/data/botania/recipes/wands/twigwand_blue_orange.json delete mode 100644 src/main/resources/data/botania/recipes/wands/twigwand_blue_pink.json delete mode 100644 src/main/resources/data/botania/recipes/wands/twigwand_blue_purple.json delete mode 100644 src/main/resources/data/botania/recipes/wands/twigwand_blue_red.json delete mode 100644 src/main/resources/data/botania/recipes/wands/twigwand_blue_silver.json delete mode 100644 src/main/resources/data/botania/recipes/wands/twigwand_blue_white.json delete mode 100644 src/main/resources/data/botania/recipes/wands/twigwand_blue_yellow.json delete mode 100644 src/main/resources/data/botania/recipes/wands/twigwand_brown_black.json delete mode 100644 src/main/resources/data/botania/recipes/wands/twigwand_brown_blue.json delete mode 100644 src/main/resources/data/botania/recipes/wands/twigwand_brown_brown.json delete mode 100644 src/main/resources/data/botania/recipes/wands/twigwand_brown_cyan.json delete mode 100644 src/main/resources/data/botania/recipes/wands/twigwand_brown_gray.json delete mode 100644 src/main/resources/data/botania/recipes/wands/twigwand_brown_green.json delete mode 100644 src/main/resources/data/botania/recipes/wands/twigwand_brown_light_blue.json delete mode 100644 src/main/resources/data/botania/recipes/wands/twigwand_brown_lime.json delete mode 100644 src/main/resources/data/botania/recipes/wands/twigwand_brown_magenta.json delete mode 100644 src/main/resources/data/botania/recipes/wands/twigwand_brown_orange.json delete mode 100644 src/main/resources/data/botania/recipes/wands/twigwand_brown_pink.json delete mode 100644 src/main/resources/data/botania/recipes/wands/twigwand_brown_purple.json delete mode 100644 src/main/resources/data/botania/recipes/wands/twigwand_brown_red.json delete mode 100644 src/main/resources/data/botania/recipes/wands/twigwand_brown_silver.json delete mode 100644 src/main/resources/data/botania/recipes/wands/twigwand_brown_white.json delete mode 100644 src/main/resources/data/botania/recipes/wands/twigwand_brown_yellow.json delete mode 100644 src/main/resources/data/botania/recipes/wands/twigwand_cyan_black.json delete mode 100644 src/main/resources/data/botania/recipes/wands/twigwand_cyan_blue.json delete mode 100644 src/main/resources/data/botania/recipes/wands/twigwand_cyan_brown.json delete mode 100644 src/main/resources/data/botania/recipes/wands/twigwand_cyan_cyan.json delete mode 100644 src/main/resources/data/botania/recipes/wands/twigwand_cyan_gray.json delete mode 100644 src/main/resources/data/botania/recipes/wands/twigwand_cyan_green.json delete mode 100644 src/main/resources/data/botania/recipes/wands/twigwand_cyan_light_blue.json delete mode 100644 src/main/resources/data/botania/recipes/wands/twigwand_cyan_lime.json delete mode 100644 src/main/resources/data/botania/recipes/wands/twigwand_cyan_magenta.json delete mode 100644 src/main/resources/data/botania/recipes/wands/twigwand_cyan_orange.json delete mode 100644 src/main/resources/data/botania/recipes/wands/twigwand_cyan_pink.json delete mode 100644 src/main/resources/data/botania/recipes/wands/twigwand_cyan_purple.json delete mode 100644 src/main/resources/data/botania/recipes/wands/twigwand_cyan_red.json delete mode 100644 src/main/resources/data/botania/recipes/wands/twigwand_cyan_silver.json delete mode 100644 src/main/resources/data/botania/recipes/wands/twigwand_cyan_white.json delete mode 100644 src/main/resources/data/botania/recipes/wands/twigwand_cyan_yellow.json delete mode 100644 src/main/resources/data/botania/recipes/wands/twigwand_gray_black.json delete mode 100644 src/main/resources/data/botania/recipes/wands/twigwand_gray_blue.json delete mode 100644 src/main/resources/data/botania/recipes/wands/twigwand_gray_brown.json delete mode 100644 src/main/resources/data/botania/recipes/wands/twigwand_gray_cyan.json delete mode 100644 src/main/resources/data/botania/recipes/wands/twigwand_gray_gray.json delete mode 100644 src/main/resources/data/botania/recipes/wands/twigwand_gray_green.json delete mode 100644 src/main/resources/data/botania/recipes/wands/twigwand_gray_light_blue.json delete mode 100644 src/main/resources/data/botania/recipes/wands/twigwand_gray_lime.json delete mode 100644 src/main/resources/data/botania/recipes/wands/twigwand_gray_magenta.json delete mode 100644 src/main/resources/data/botania/recipes/wands/twigwand_gray_orange.json delete mode 100644 src/main/resources/data/botania/recipes/wands/twigwand_gray_pink.json delete mode 100644 src/main/resources/data/botania/recipes/wands/twigwand_gray_purple.json delete mode 100644 src/main/resources/data/botania/recipes/wands/twigwand_gray_red.json delete mode 100644 src/main/resources/data/botania/recipes/wands/twigwand_gray_silver.json delete mode 100644 src/main/resources/data/botania/recipes/wands/twigwand_gray_white.json delete mode 100644 src/main/resources/data/botania/recipes/wands/twigwand_gray_yellow.json delete mode 100644 src/main/resources/data/botania/recipes/wands/twigwand_green_black.json delete mode 100644 src/main/resources/data/botania/recipes/wands/twigwand_green_blue.json delete mode 100644 src/main/resources/data/botania/recipes/wands/twigwand_green_brown.json delete mode 100644 src/main/resources/data/botania/recipes/wands/twigwand_green_cyan.json delete mode 100644 src/main/resources/data/botania/recipes/wands/twigwand_green_gray.json delete mode 100644 src/main/resources/data/botania/recipes/wands/twigwand_green_green.json delete mode 100644 src/main/resources/data/botania/recipes/wands/twigwand_green_light_blue.json delete mode 100644 src/main/resources/data/botania/recipes/wands/twigwand_green_lime.json delete mode 100644 src/main/resources/data/botania/recipes/wands/twigwand_green_magenta.json delete mode 100644 src/main/resources/data/botania/recipes/wands/twigwand_green_orange.json delete mode 100644 src/main/resources/data/botania/recipes/wands/twigwand_green_pink.json delete mode 100644 src/main/resources/data/botania/recipes/wands/twigwand_green_purple.json delete mode 100644 src/main/resources/data/botania/recipes/wands/twigwand_green_red.json delete mode 100644 src/main/resources/data/botania/recipes/wands/twigwand_green_silver.json delete mode 100644 src/main/resources/data/botania/recipes/wands/twigwand_green_white.json delete mode 100644 src/main/resources/data/botania/recipes/wands/twigwand_green_yellow.json delete mode 100644 src/main/resources/data/botania/recipes/wands/twigwand_light_blue_black.json delete mode 100644 src/main/resources/data/botania/recipes/wands/twigwand_light_blue_blue.json delete mode 100644 src/main/resources/data/botania/recipes/wands/twigwand_light_blue_brown.json delete mode 100644 src/main/resources/data/botania/recipes/wands/twigwand_light_blue_cyan.json delete mode 100644 src/main/resources/data/botania/recipes/wands/twigwand_light_blue_gray.json delete mode 100644 src/main/resources/data/botania/recipes/wands/twigwand_light_blue_green.json delete mode 100644 src/main/resources/data/botania/recipes/wands/twigwand_light_blue_light_blue.json delete mode 100644 src/main/resources/data/botania/recipes/wands/twigwand_light_blue_lime.json delete mode 100644 src/main/resources/data/botania/recipes/wands/twigwand_light_blue_magenta.json delete mode 100644 src/main/resources/data/botania/recipes/wands/twigwand_light_blue_orange.json delete mode 100644 src/main/resources/data/botania/recipes/wands/twigwand_light_blue_pink.json delete mode 100644 src/main/resources/data/botania/recipes/wands/twigwand_light_blue_purple.json delete mode 100644 src/main/resources/data/botania/recipes/wands/twigwand_light_blue_red.json delete mode 100644 src/main/resources/data/botania/recipes/wands/twigwand_light_blue_silver.json delete mode 100644 src/main/resources/data/botania/recipes/wands/twigwand_light_blue_white.json delete mode 100644 src/main/resources/data/botania/recipes/wands/twigwand_light_blue_yellow.json delete mode 100644 src/main/resources/data/botania/recipes/wands/twigwand_lime_black.json delete mode 100644 src/main/resources/data/botania/recipes/wands/twigwand_lime_blue.json delete mode 100644 src/main/resources/data/botania/recipes/wands/twigwand_lime_brown.json delete mode 100644 src/main/resources/data/botania/recipes/wands/twigwand_lime_cyan.json delete mode 100644 src/main/resources/data/botania/recipes/wands/twigwand_lime_gray.json delete mode 100644 src/main/resources/data/botania/recipes/wands/twigwand_lime_green.json delete mode 100644 src/main/resources/data/botania/recipes/wands/twigwand_lime_light_blue.json delete mode 100644 src/main/resources/data/botania/recipes/wands/twigwand_lime_lime.json delete mode 100644 src/main/resources/data/botania/recipes/wands/twigwand_lime_magenta.json delete mode 100644 src/main/resources/data/botania/recipes/wands/twigwand_lime_orange.json delete mode 100644 src/main/resources/data/botania/recipes/wands/twigwand_lime_pink.json delete mode 100644 src/main/resources/data/botania/recipes/wands/twigwand_lime_purple.json delete mode 100644 src/main/resources/data/botania/recipes/wands/twigwand_lime_red.json delete mode 100644 src/main/resources/data/botania/recipes/wands/twigwand_lime_silver.json delete mode 100644 src/main/resources/data/botania/recipes/wands/twigwand_lime_white.json delete mode 100644 src/main/resources/data/botania/recipes/wands/twigwand_lime_yellow.json delete mode 100644 src/main/resources/data/botania/recipes/wands/twigwand_magenta_black.json delete mode 100644 src/main/resources/data/botania/recipes/wands/twigwand_magenta_blue.json delete mode 100644 src/main/resources/data/botania/recipes/wands/twigwand_magenta_brown.json delete mode 100644 src/main/resources/data/botania/recipes/wands/twigwand_magenta_cyan.json delete mode 100644 src/main/resources/data/botania/recipes/wands/twigwand_magenta_gray.json delete mode 100644 src/main/resources/data/botania/recipes/wands/twigwand_magenta_green.json delete mode 100644 src/main/resources/data/botania/recipes/wands/twigwand_magenta_light_blue.json delete mode 100644 src/main/resources/data/botania/recipes/wands/twigwand_magenta_lime.json delete mode 100644 src/main/resources/data/botania/recipes/wands/twigwand_magenta_magenta.json delete mode 100644 src/main/resources/data/botania/recipes/wands/twigwand_magenta_orange.json delete mode 100644 src/main/resources/data/botania/recipes/wands/twigwand_magenta_pink.json delete mode 100644 src/main/resources/data/botania/recipes/wands/twigwand_magenta_purple.json delete mode 100644 src/main/resources/data/botania/recipes/wands/twigwand_magenta_red.json delete mode 100644 src/main/resources/data/botania/recipes/wands/twigwand_magenta_silver.json delete mode 100644 src/main/resources/data/botania/recipes/wands/twigwand_magenta_white.json delete mode 100644 src/main/resources/data/botania/recipes/wands/twigwand_magenta_yellow.json delete mode 100644 src/main/resources/data/botania/recipes/wands/twigwand_orange_black.json delete mode 100644 src/main/resources/data/botania/recipes/wands/twigwand_orange_blue.json delete mode 100644 src/main/resources/data/botania/recipes/wands/twigwand_orange_brown.json delete mode 100644 src/main/resources/data/botania/recipes/wands/twigwand_orange_cyan.json delete mode 100644 src/main/resources/data/botania/recipes/wands/twigwand_orange_gray.json delete mode 100644 src/main/resources/data/botania/recipes/wands/twigwand_orange_green.json delete mode 100644 src/main/resources/data/botania/recipes/wands/twigwand_orange_light_blue.json delete mode 100644 src/main/resources/data/botania/recipes/wands/twigwand_orange_lime.json delete mode 100644 src/main/resources/data/botania/recipes/wands/twigwand_orange_magenta.json delete mode 100644 src/main/resources/data/botania/recipes/wands/twigwand_orange_orange.json delete mode 100644 src/main/resources/data/botania/recipes/wands/twigwand_orange_pink.json delete mode 100644 src/main/resources/data/botania/recipes/wands/twigwand_orange_purple.json delete mode 100644 src/main/resources/data/botania/recipes/wands/twigwand_orange_red.json delete mode 100644 src/main/resources/data/botania/recipes/wands/twigwand_orange_silver.json delete mode 100644 src/main/resources/data/botania/recipes/wands/twigwand_orange_white.json delete mode 100644 src/main/resources/data/botania/recipes/wands/twigwand_orange_yellow.json delete mode 100644 src/main/resources/data/botania/recipes/wands/twigwand_pink_black.json delete mode 100644 src/main/resources/data/botania/recipes/wands/twigwand_pink_blue.json delete mode 100644 src/main/resources/data/botania/recipes/wands/twigwand_pink_brown.json delete mode 100644 src/main/resources/data/botania/recipes/wands/twigwand_pink_cyan.json delete mode 100644 src/main/resources/data/botania/recipes/wands/twigwand_pink_gray.json delete mode 100644 src/main/resources/data/botania/recipes/wands/twigwand_pink_green.json delete mode 100644 src/main/resources/data/botania/recipes/wands/twigwand_pink_light_blue.json delete mode 100644 src/main/resources/data/botania/recipes/wands/twigwand_pink_lime.json delete mode 100644 src/main/resources/data/botania/recipes/wands/twigwand_pink_magenta.json delete mode 100644 src/main/resources/data/botania/recipes/wands/twigwand_pink_orange.json delete mode 100644 src/main/resources/data/botania/recipes/wands/twigwand_pink_pink.json delete mode 100644 src/main/resources/data/botania/recipes/wands/twigwand_pink_purple.json delete mode 100644 src/main/resources/data/botania/recipes/wands/twigwand_pink_red.json delete mode 100644 src/main/resources/data/botania/recipes/wands/twigwand_pink_silver.json delete mode 100644 src/main/resources/data/botania/recipes/wands/twigwand_pink_white.json delete mode 100644 src/main/resources/data/botania/recipes/wands/twigwand_pink_yellow.json delete mode 100644 src/main/resources/data/botania/recipes/wands/twigwand_purple_black.json delete mode 100644 src/main/resources/data/botania/recipes/wands/twigwand_purple_blue.json delete mode 100644 src/main/resources/data/botania/recipes/wands/twigwand_purple_brown.json delete mode 100644 src/main/resources/data/botania/recipes/wands/twigwand_purple_cyan.json delete mode 100644 src/main/resources/data/botania/recipes/wands/twigwand_purple_gray.json delete mode 100644 src/main/resources/data/botania/recipes/wands/twigwand_purple_green.json delete mode 100644 src/main/resources/data/botania/recipes/wands/twigwand_purple_light_blue.json delete mode 100644 src/main/resources/data/botania/recipes/wands/twigwand_purple_lime.json delete mode 100644 src/main/resources/data/botania/recipes/wands/twigwand_purple_magenta.json delete mode 100644 src/main/resources/data/botania/recipes/wands/twigwand_purple_orange.json delete mode 100644 src/main/resources/data/botania/recipes/wands/twigwand_purple_pink.json delete mode 100644 src/main/resources/data/botania/recipes/wands/twigwand_purple_purple.json delete mode 100644 src/main/resources/data/botania/recipes/wands/twigwand_purple_red.json delete mode 100644 src/main/resources/data/botania/recipes/wands/twigwand_purple_silver.json delete mode 100644 src/main/resources/data/botania/recipes/wands/twigwand_purple_white.json delete mode 100644 src/main/resources/data/botania/recipes/wands/twigwand_purple_yellow.json delete mode 100644 src/main/resources/data/botania/recipes/wands/twigwand_red_black.json delete mode 100644 src/main/resources/data/botania/recipes/wands/twigwand_red_blue.json delete mode 100644 src/main/resources/data/botania/recipes/wands/twigwand_red_brown.json delete mode 100644 src/main/resources/data/botania/recipes/wands/twigwand_red_cyan.json delete mode 100644 src/main/resources/data/botania/recipes/wands/twigwand_red_gray.json delete mode 100644 src/main/resources/data/botania/recipes/wands/twigwand_red_green.json delete mode 100644 src/main/resources/data/botania/recipes/wands/twigwand_red_light_blue.json delete mode 100644 src/main/resources/data/botania/recipes/wands/twigwand_red_lime.json delete mode 100644 src/main/resources/data/botania/recipes/wands/twigwand_red_magenta.json delete mode 100644 src/main/resources/data/botania/recipes/wands/twigwand_red_orange.json delete mode 100644 src/main/resources/data/botania/recipes/wands/twigwand_red_pink.json delete mode 100644 src/main/resources/data/botania/recipes/wands/twigwand_red_purple.json delete mode 100644 src/main/resources/data/botania/recipes/wands/twigwand_red_red.json delete mode 100644 src/main/resources/data/botania/recipes/wands/twigwand_red_silver.json delete mode 100644 src/main/resources/data/botania/recipes/wands/twigwand_red_white.json delete mode 100644 src/main/resources/data/botania/recipes/wands/twigwand_red_yellow.json delete mode 100644 src/main/resources/data/botania/recipes/wands/twigwand_silver_black.json delete mode 100644 src/main/resources/data/botania/recipes/wands/twigwand_silver_blue.json delete mode 100644 src/main/resources/data/botania/recipes/wands/twigwand_silver_brown.json delete mode 100644 src/main/resources/data/botania/recipes/wands/twigwand_silver_cyan.json delete mode 100644 src/main/resources/data/botania/recipes/wands/twigwand_silver_gray.json delete mode 100644 src/main/resources/data/botania/recipes/wands/twigwand_silver_green.json delete mode 100644 src/main/resources/data/botania/recipes/wands/twigwand_silver_light_blue.json delete mode 100644 src/main/resources/data/botania/recipes/wands/twigwand_silver_lime.json delete mode 100644 src/main/resources/data/botania/recipes/wands/twigwand_silver_magenta.json delete mode 100644 src/main/resources/data/botania/recipes/wands/twigwand_silver_orange.json delete mode 100644 src/main/resources/data/botania/recipes/wands/twigwand_silver_pink.json delete mode 100644 src/main/resources/data/botania/recipes/wands/twigwand_silver_purple.json delete mode 100644 src/main/resources/data/botania/recipes/wands/twigwand_silver_red.json delete mode 100644 src/main/resources/data/botania/recipes/wands/twigwand_silver_silver.json delete mode 100644 src/main/resources/data/botania/recipes/wands/twigwand_silver_white.json delete mode 100644 src/main/resources/data/botania/recipes/wands/twigwand_silver_yellow.json delete mode 100644 src/main/resources/data/botania/recipes/wands/twigwand_white_black.json delete mode 100644 src/main/resources/data/botania/recipes/wands/twigwand_white_blue.json delete mode 100644 src/main/resources/data/botania/recipes/wands/twigwand_white_brown.json delete mode 100644 src/main/resources/data/botania/recipes/wands/twigwand_white_cyan.json delete mode 100644 src/main/resources/data/botania/recipes/wands/twigwand_white_gray.json delete mode 100644 src/main/resources/data/botania/recipes/wands/twigwand_white_green.json delete mode 100644 src/main/resources/data/botania/recipes/wands/twigwand_white_light_blue.json delete mode 100644 src/main/resources/data/botania/recipes/wands/twigwand_white_lime.json delete mode 100644 src/main/resources/data/botania/recipes/wands/twigwand_white_magenta.json delete mode 100644 src/main/resources/data/botania/recipes/wands/twigwand_white_orange.json delete mode 100644 src/main/resources/data/botania/recipes/wands/twigwand_white_pink.json delete mode 100644 src/main/resources/data/botania/recipes/wands/twigwand_white_purple.json delete mode 100644 src/main/resources/data/botania/recipes/wands/twigwand_white_red.json delete mode 100644 src/main/resources/data/botania/recipes/wands/twigwand_white_silver.json delete mode 100644 src/main/resources/data/botania/recipes/wands/twigwand_white_white.json delete mode 100644 src/main/resources/data/botania/recipes/wands/twigwand_white_yellow.json delete mode 100644 src/main/resources/data/botania/recipes/wands/twigwand_yellow_black.json delete mode 100644 src/main/resources/data/botania/recipes/wands/twigwand_yellow_blue.json delete mode 100644 src/main/resources/data/botania/recipes/wands/twigwand_yellow_brown.json delete mode 100644 src/main/resources/data/botania/recipes/wands/twigwand_yellow_cyan.json delete mode 100644 src/main/resources/data/botania/recipes/wands/twigwand_yellow_gray.json delete mode 100644 src/main/resources/data/botania/recipes/wands/twigwand_yellow_green.json delete mode 100644 src/main/resources/data/botania/recipes/wands/twigwand_yellow_light_blue.json delete mode 100644 src/main/resources/data/botania/recipes/wands/twigwand_yellow_lime.json delete mode 100644 src/main/resources/data/botania/recipes/wands/twigwand_yellow_magenta.json delete mode 100644 src/main/resources/data/botania/recipes/wands/twigwand_yellow_orange.json delete mode 100644 src/main/resources/data/botania/recipes/wands/twigwand_yellow_pink.json delete mode 100644 src/main/resources/data/botania/recipes/wands/twigwand_yellow_purple.json delete mode 100644 src/main/resources/data/botania/recipes/wands/twigwand_yellow_red.json delete mode 100644 src/main/resources/data/botania/recipes/wands/twigwand_yellow_silver.json delete mode 100644 src/main/resources/data/botania/recipes/wands/twigwand_yellow_white.json delete mode 100644 src/main/resources/data/botania/recipes/wands/twigwand_yellow_yellow.json diff --git a/src/main/java/vazkii/botania/client/integration/jei/JEIBotaniaPlugin.java b/src/main/java/vazkii/botania/client/integration/jei/JEIBotaniaPlugin.java index cfb9eeb6a..74f9e9553 100644 --- a/src/main/java/vazkii/botania/client/integration/jei/JEIBotaniaPlugin.java +++ b/src/main/java/vazkii/botania/client/integration/jei/JEIBotaniaPlugin.java @@ -54,7 +54,6 @@ import vazkii.botania.common.crafting.recipe.TerraPickTippingRecipe; import vazkii.botania.common.item.ItemLaputaShard; import vazkii.botania.common.item.ItemLexicon; import vazkii.botania.common.item.ItemManaTablet; -import vazkii.botania.common.item.ItemTwigWand; import vazkii.botania.common.item.ModItems; import vazkii.botania.common.item.brew.ItemBrewBase; import vazkii.botania.common.item.equipment.bauble.ItemFlightTiara; @@ -76,7 +75,6 @@ public class JEIBotaniaPlugin implements IModPlugin { registry.registerSubtypeInterpreter(ModItems.incenseStick, ItemBrewBase::getSubtype); registry.registerSubtypeInterpreter(ModItems.bloodPendant, ItemBrewBase::getSubtype); - registry.registerSubtypeInterpreter(ModItems.twigWand, stack -> ItemTwigWand.getColor1(stack) + "_" + ItemTwigWand.getColor2(stack)); registry.registerSubtypeInterpreter(ModItems.flightTiara, stack -> String.valueOf(ItemFlightTiara.getVariant(stack))); registry.registerSubtypeInterpreter(ModItems.lexicon, stack -> String.valueOf(ItemNBTHelper.getBoolean(stack, ItemLexicon.TAG_ELVEN_UNLOCK, false))); registry.registerSubtypeInterpreter(ModItems.laputaShard, stack -> String.valueOf(ItemLaputaShard.getShardLevel(stack))); diff --git a/src/main/java/vazkii/botania/common/block/decor/BlockModMushroom.java b/src/main/java/vazkii/botania/common/block/decor/BlockModMushroom.java index 126ec0321..60f468444 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockModMushroom.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockModMushroom.java @@ -36,7 +36,7 @@ import java.util.Random; public class BlockModMushroom extends MushroomBlock implements IHornHarvestable, ICustomApothecaryColor { private static final VoxelShape SHAPE = makeCuboidShape(4.8, 0, 4.8, 12.8, 16, 12.8); - private final DyeColor color; + public final DyeColor color; public BlockModMushroom(DyeColor color, Properties builder) { super(builder); diff --git a/src/main/java/vazkii/botania/common/crafting/recipe/TwigWandRecipe.java b/src/main/java/vazkii/botania/common/crafting/recipe/TwigWandRecipe.java new file mode 100644 index 000000000..5a08b3fdd --- /dev/null +++ b/src/main/java/vazkii/botania/common/crafting/recipe/TwigWandRecipe.java @@ -0,0 +1,137 @@ +/** + * This class was created by . It's distributed as + * part of the Botania Mod. Get the Source Code in github: + * https://github.com/Vazkii/Botania + * + * Botania is Open Source and distributed under the + * Botania License: http://botaniamod.net/license.php + * + * File Created @ [2020-01-30, 17:20 (UTC+2)] + */ +package vazkii.botania.common.crafting.recipe; + +import com.google.gson.JsonObject; +import net.minecraft.inventory.CraftingInventory; +import net.minecraft.item.BlockItem; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; +import net.minecraft.item.crafting.ICraftingRecipe; +import net.minecraft.item.crafting.IRecipeSerializer; +import net.minecraft.item.crafting.Ingredient; +import net.minecraft.item.crafting.ShapedRecipe; +import net.minecraft.network.PacketBuffer; +import net.minecraft.util.NonNullList; +import net.minecraft.util.ResourceLocation; +import net.minecraft.world.World; +import net.minecraftforge.registries.ForgeRegistryEntry; +import vazkii.botania.common.block.decor.BlockModMushroom; +import vazkii.botania.common.item.ItemTwigWand; +import vazkii.botania.common.item.ModItems; +import vazkii.botania.common.item.material.ItemPetal; + +import javax.annotation.Nonnull; +import javax.annotation.Nullable; + +public class TwigWandRecipe implements ICraftingRecipe { + public static final IRecipeSerializer SERIALIZER = new Serializer(); + private final ShapedRecipe compose; + + public TwigWandRecipe(ShapedRecipe compose) { + this.compose = compose; + } + + @Override + public boolean matches(@Nonnull CraftingInventory inv, @Nonnull World worldIn) { + return compose.matches(inv, worldIn); + } + + @Nonnull + @Override + public ItemStack getCraftingResult(CraftingInventory inv) { + int first = -1; + for (int i = 0; i < inv.getSizeInventory(); i++) { + ItemStack stack = inv.getStackInSlot(i); + Item item = stack.getItem(); + + int colorId; + if (item instanceof ItemPetal) { + colorId = ((ItemPetal) item).color.getId(); + } else if (item instanceof BlockItem && ((BlockItem) item).getBlock() instanceof BlockModMushroom) { + colorId = ((BlockModMushroom) ((BlockItem) item).getBlock()).color.getId(); + } else { + continue; + } + if (first == -1) + first = colorId; + else + return ItemTwigWand.forColors(first, colorId); + } + return ItemTwigWand.forColors(first != -1 ? first : 0, 0); + } + + @Override + public boolean canFit(int width, int height) { + return compose.canFit(width, height); + } + + @Nonnull + @Override + public ItemStack getRecipeOutput() { + return new ItemStack(ModItems.twigWand); + } + + @Nonnull + @Override + public ResourceLocation getId() { + return compose.getId(); + } + + @Nonnull + @Override + public NonNullList getRemainingItems(CraftingInventory inv) { + return compose.getRemainingItems(inv); + } + + @Nonnull + @Override + public NonNullList getIngredients() { + return compose.getIngredients(); + } + + @Nonnull + @Override + public String getGroup() { + return compose.getGroup(); + } + + @Nonnull + @Override + public ItemStack getIcon() { + return compose.getIcon(); + } + + @Nonnull + @Override + public IRecipeSerializer getSerializer() { + return SERIALIZER; + } + + private static class Serializer extends ForgeRegistryEntry> implements IRecipeSerializer { + @Nonnull + @Override + public TwigWandRecipe read(@Nonnull ResourceLocation recipeId, @Nonnull JsonObject json) { + return new TwigWandRecipe(CRAFTING_SHAPED.read(recipeId, json)); + } + + @Nullable + @Override + public TwigWandRecipe read(@Nonnull ResourceLocation recipeId, @Nonnull PacketBuffer buffer) { + return new TwigWandRecipe(CRAFTING_SHAPED.read(recipeId, buffer)); + } + + @Override + public void write(@Nonnull PacketBuffer buffer, @Nonnull TwigWandRecipe recipe) { + CRAFTING_SHAPED.write(buffer, recipe.compose); + } + } +} diff --git a/src/main/java/vazkii/botania/common/item/ModItems.java b/src/main/java/vazkii/botania/common/item/ModItems.java index 171cb8b1b..6bea01a1e 100644 --- a/src/main/java/vazkii/botania/common/item/ModItems.java +++ b/src/main/java/vazkii/botania/common/item/ModItems.java @@ -39,23 +39,7 @@ import vazkii.botania.client.gui.box.GuiBaubleBox; import vazkii.botania.common.block.ModBlocks; import vazkii.botania.common.core.BotaniaCreativeTab; import vazkii.botania.common.core.handler.ModSounds; -import vazkii.botania.common.crafting.recipe.AncientWillRecipe; -import vazkii.botania.common.crafting.recipe.ArmorUpgradeRecipe; -import vazkii.botania.common.crafting.recipe.BlackHoleTalismanExtractRecipe; -import vazkii.botania.common.crafting.recipe.CompositeLensRecipe; -import vazkii.botania.common.crafting.recipe.CosmeticAttachRecipe; -import vazkii.botania.common.crafting.recipe.CosmeticRemoveRecipe; -import vazkii.botania.common.crafting.recipe.HelmRevealingRecipe; -import vazkii.botania.common.crafting.recipe.KeepIvyRecipe; -import vazkii.botania.common.crafting.recipe.LensDyeingRecipe; -import vazkii.botania.common.crafting.recipe.ManaGunClipRecipe; -import vazkii.botania.common.crafting.recipe.ManaGunLensRecipe; -import vazkii.botania.common.crafting.recipe.ManaGunRemoveLensRecipe; -import vazkii.botania.common.crafting.recipe.ManaUpgradeRecipe; -import vazkii.botania.common.crafting.recipe.PhantomInkRecipe; -import vazkii.botania.common.crafting.recipe.ShapelessManaUpgradeRecipe; -import vazkii.botania.common.crafting.recipe.SpellClothRecipe; -import vazkii.botania.common.crafting.recipe.TerraPickTippingRecipe; +import vazkii.botania.common.crafting.recipe.*; import vazkii.botania.common.item.brew.ItemBrewBase; import vazkii.botania.common.item.brew.ItemIncenseStick; import vazkii.botania.common.item.brew.ItemVial; @@ -744,6 +728,7 @@ public final class ModItems { register(r, PhantomInkRecipe.SERIALIZER, "phantom_ink_apply"); register(r, SpellClothRecipe.SERIALIZER, "spell_cloth_apply"); register(r, TerraPickTippingRecipe.SERIALIZER, "terra_pick_tipping"); + register(r, TwigWandRecipe.SERIALIZER, "twig_wand"); } @SubscribeEvent diff --git a/src/main/resources/data/botania/recipes/twig_wand.json b/src/main/resources/data/botania/recipes/twig_wand.json new file mode 100644 index 000000000..b6caa9435 --- /dev/null +++ b/src/main/resources/data/botania/recipes/twig_wand.json @@ -0,0 +1,20 @@ +{ + "type": "botania:twig_wand", + "result": { + "item": "botania:twig_wand" + }, + "pattern": [ + " PS", + " SP", + "S " + ], + "key": { + "P": { + "tag": "botania:petals" + }, + "S": { + "item": "botania:livingwood_twig" + } + }, + "group": "botania:twig_wand" +} \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_black_black.json b/src/main/resources/data/botania/recipes/wands/twigwand_black_black.json deleted file mode 100644 index 7aaacb162..000000000 --- a/src/main/resources/data/botania/recipes/wands/twigwand_black_black.json +++ /dev/null @@ -1,24 +0,0 @@ -{ - "result": { - "item": "botania:twig_wand", - "nbt": "{color1:15,color2:15}" - }, - "pattern": [ - " AS", - " SB", - "S " - ], - "type": "minecraft:crafting_shaped", - "key": { - "A": { - "tag": "botania:petals/black" - }, - "B": { - "tag": "botania:petals/black" - }, - "S": { - "item": "botania:livingwood_twig" - } - }, - "group": "botania:twig_wand" -} \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_black_blue.json b/src/main/resources/data/botania/recipes/wands/twigwand_black_blue.json deleted file mode 100644 index 122c0cc8a..000000000 --- a/src/main/resources/data/botania/recipes/wands/twigwand_black_blue.json +++ /dev/null @@ -1,24 +0,0 @@ -{ - "result": { - "item": "botania:twig_wand", - "nbt": "{color1:15,color2:11}" - }, - "pattern": [ - " AS", - " SB", - "S " - ], - "type": "minecraft:crafting_shaped", - "key": { - "A": { - "tag": "botania:petals/black" - }, - "B": { - "tag": "botania:petals/blue" - }, - "S": { - "item": "botania:livingwood_twig" - } - }, - "group": "botania:twig_wand" -} \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_black_brown.json b/src/main/resources/data/botania/recipes/wands/twigwand_black_brown.json deleted file mode 100644 index 05aaea4cd..000000000 --- a/src/main/resources/data/botania/recipes/wands/twigwand_black_brown.json +++ /dev/null @@ -1,24 +0,0 @@ -{ - "result": { - "item": "botania:twig_wand", - "nbt": "{color1:15,color2:12}" - }, - "pattern": [ - " AS", - " SB", - "S " - ], - "type": "minecraft:crafting_shaped", - "key": { - "A": { - "tag": "botania:petals/black" - }, - "B": { - "tag": "botania:petals/brown" - }, - "S": { - "item": "botania:livingwood_twig" - } - }, - "group": "botania:twig_wand" -} \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_black_cyan.json b/src/main/resources/data/botania/recipes/wands/twigwand_black_cyan.json deleted file mode 100644 index 9651bcb2a..000000000 --- a/src/main/resources/data/botania/recipes/wands/twigwand_black_cyan.json +++ /dev/null @@ -1,24 +0,0 @@ -{ - "result": { - "item": "botania:twig_wand", - "nbt": "{color1:15,color2:9}" - }, - "pattern": [ - " AS", - " SB", - "S " - ], - "type": "minecraft:crafting_shaped", - "key": { - "A": { - "tag": "botania:petals/black" - }, - "B": { - "tag": "botania:petals/cyan" - }, - "S": { - "item": "botania:livingwood_twig" - } - }, - "group": "botania:twig_wand" -} \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_black_gray.json b/src/main/resources/data/botania/recipes/wands/twigwand_black_gray.json deleted file mode 100644 index be364a369..000000000 --- a/src/main/resources/data/botania/recipes/wands/twigwand_black_gray.json +++ /dev/null @@ -1,24 +0,0 @@ -{ - "result": { - "item": "botania:twig_wand", - "nbt": "{color1:15,color2:7}" - }, - "pattern": [ - " AS", - " SB", - "S " - ], - "type": "minecraft:crafting_shaped", - "key": { - "A": { - "tag": "botania:petals/black" - }, - "B": { - "tag": "botania:petals/gray" - }, - "S": { - "item": "botania:livingwood_twig" - } - }, - "group": "botania:twig_wand" -} \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_black_green.json b/src/main/resources/data/botania/recipes/wands/twigwand_black_green.json deleted file mode 100644 index 6e51c9571..000000000 --- a/src/main/resources/data/botania/recipes/wands/twigwand_black_green.json +++ /dev/null @@ -1,24 +0,0 @@ -{ - "result": { - "item": "botania:twig_wand", - "nbt": "{color1:15,color2:13}" - }, - "pattern": [ - " AS", - " SB", - "S " - ], - "type": "minecraft:crafting_shaped", - "key": { - "A": { - "tag": "botania:petals/black" - }, - "B": { - "tag": "botania:petals/green" - }, - "S": { - "item": "botania:livingwood_twig" - } - }, - "group": "botania:twig_wand" -} \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_black_light_blue.json b/src/main/resources/data/botania/recipes/wands/twigwand_black_light_blue.json deleted file mode 100644 index 5250a1b29..000000000 --- a/src/main/resources/data/botania/recipes/wands/twigwand_black_light_blue.json +++ /dev/null @@ -1,24 +0,0 @@ -{ - "result": { - "item": "botania:twig_wand", - "nbt": "{color1:15,color2:3}" - }, - "pattern": [ - " AS", - " SB", - "S " - ], - "type": "minecraft:crafting_shaped", - "key": { - "A": { - "tag": "botania:petals/black" - }, - "B": { - "tag": "botania:petals/light_blue" - }, - "S": { - "item": "botania:livingwood_twig" - } - }, - "group": "botania:twig_wand" -} \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_black_lime.json b/src/main/resources/data/botania/recipes/wands/twigwand_black_lime.json deleted file mode 100644 index 10d7520fc..000000000 --- a/src/main/resources/data/botania/recipes/wands/twigwand_black_lime.json +++ /dev/null @@ -1,24 +0,0 @@ -{ - "result": { - "item": "botania:twig_wand", - "nbt": "{color1:15,color2:5}" - }, - "pattern": [ - " AS", - " SB", - "S " - ], - "type": "minecraft:crafting_shaped", - "key": { - "A": { - "tag": "botania:petals/black" - }, - "B": { - "tag": "botania:petals/lime" - }, - "S": { - "item": "botania:livingwood_twig" - } - }, - "group": "botania:twig_wand" -} \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_black_magenta.json b/src/main/resources/data/botania/recipes/wands/twigwand_black_magenta.json deleted file mode 100644 index f9a86c5cf..000000000 --- a/src/main/resources/data/botania/recipes/wands/twigwand_black_magenta.json +++ /dev/null @@ -1,24 +0,0 @@ -{ - "result": { - "item": "botania:twig_wand", - "nbt": "{color1:15,color2:2}" - }, - "pattern": [ - " AS", - " SB", - "S " - ], - "type": "minecraft:crafting_shaped", - "key": { - "A": { - "tag": "botania:petals/black" - }, - "B": { - "tag": "botania:petals/magenta" - }, - "S": { - "item": "botania:livingwood_twig" - } - }, - "group": "botania:twig_wand" -} \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_black_orange.json b/src/main/resources/data/botania/recipes/wands/twigwand_black_orange.json deleted file mode 100644 index 234fe9871..000000000 --- a/src/main/resources/data/botania/recipes/wands/twigwand_black_orange.json +++ /dev/null @@ -1,24 +0,0 @@ -{ - "result": { - "item": "botania:twig_wand", - "nbt": "{color1:15,color2:1}" - }, - "pattern": [ - " AS", - " SB", - "S " - ], - "type": "minecraft:crafting_shaped", - "key": { - "A": { - "tag": "botania:petals/black" - }, - "B": { - "tag": "botania:petals/orange" - }, - "S": { - "item": "botania:livingwood_twig" - } - }, - "group": "botania:twig_wand" -} \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_black_pink.json b/src/main/resources/data/botania/recipes/wands/twigwand_black_pink.json deleted file mode 100644 index bd427410e..000000000 --- a/src/main/resources/data/botania/recipes/wands/twigwand_black_pink.json +++ /dev/null @@ -1,24 +0,0 @@ -{ - "result": { - "item": "botania:twig_wand", - "nbt": "{color1:15,color2:6}" - }, - "pattern": [ - " AS", - " SB", - "S " - ], - "type": "minecraft:crafting_shaped", - "key": { - "A": { - "tag": "botania:petals/black" - }, - "B": { - "tag": "botania:petals/pink" - }, - "S": { - "item": "botania:livingwood_twig" - } - }, - "group": "botania:twig_wand" -} \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_black_purple.json b/src/main/resources/data/botania/recipes/wands/twigwand_black_purple.json deleted file mode 100644 index 13c4a60cf..000000000 --- a/src/main/resources/data/botania/recipes/wands/twigwand_black_purple.json +++ /dev/null @@ -1,24 +0,0 @@ -{ - "result": { - "item": "botania:twig_wand", - "nbt": "{color1:15,color2:10}" - }, - "pattern": [ - " AS", - " SB", - "S " - ], - "type": "minecraft:crafting_shaped", - "key": { - "A": { - "tag": "botania:petals/black" - }, - "B": { - "tag": "botania:petals/purple" - }, - "S": { - "item": "botania:livingwood_twig" - } - }, - "group": "botania:twig_wand" -} \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_black_red.json b/src/main/resources/data/botania/recipes/wands/twigwand_black_red.json deleted file mode 100644 index d843ab42f..000000000 --- a/src/main/resources/data/botania/recipes/wands/twigwand_black_red.json +++ /dev/null @@ -1,24 +0,0 @@ -{ - "result": { - "item": "botania:twig_wand", - "nbt": "{color1:15,color2:14}" - }, - "pattern": [ - " AS", - " SB", - "S " - ], - "type": "minecraft:crafting_shaped", - "key": { - "A": { - "tag": "botania:petals/black" - }, - "B": { - "tag": "botania:petals/red" - }, - "S": { - "item": "botania:livingwood_twig" - } - }, - "group": "botania:twig_wand" -} \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_black_silver.json b/src/main/resources/data/botania/recipes/wands/twigwand_black_silver.json deleted file mode 100644 index 719c33d86..000000000 --- a/src/main/resources/data/botania/recipes/wands/twigwand_black_silver.json +++ /dev/null @@ -1,24 +0,0 @@ -{ - "result": { - "item": "botania:twig_wand", - "nbt": "{color1:15,color2:8}" - }, - "pattern": [ - " AS", - " SB", - "S " - ], - "type": "minecraft:crafting_shaped", - "key": { - "A": { - "tag": "botania:petals/black" - }, - "B": { - "tag": "botania:petals/light_gray" - }, - "S": { - "item": "botania:livingwood_twig" - } - }, - "group": "botania:twig_wand" -} \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_black_white.json b/src/main/resources/data/botania/recipes/wands/twigwand_black_white.json deleted file mode 100644 index dde7f6dcf..000000000 --- a/src/main/resources/data/botania/recipes/wands/twigwand_black_white.json +++ /dev/null @@ -1,24 +0,0 @@ -{ - "result": { - "item": "botania:twig_wand", - "nbt": "{color1:15,color2:0}" - }, - "pattern": [ - " AS", - " SB", - "S " - ], - "type": "minecraft:crafting_shaped", - "key": { - "A": { - "tag": "botania:petals/black" - }, - "B": { - "tag": "botania:petals/white" - }, - "S": { - "item": "botania:livingwood_twig" - } - }, - "group": "botania:twig_wand" -} \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_black_yellow.json b/src/main/resources/data/botania/recipes/wands/twigwand_black_yellow.json deleted file mode 100644 index ed0c99c4c..000000000 --- a/src/main/resources/data/botania/recipes/wands/twigwand_black_yellow.json +++ /dev/null @@ -1,24 +0,0 @@ -{ - "result": { - "item": "botania:twig_wand", - "nbt": "{color1:15,color2:4}" - }, - "pattern": [ - " AS", - " SB", - "S " - ], - "type": "minecraft:crafting_shaped", - "key": { - "A": { - "tag": "botania:petals/black" - }, - "B": { - "tag": "botania:petals/yellow" - }, - "S": { - "item": "botania:livingwood_twig" - } - }, - "group": "botania:twig_wand" -} \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_blue_black.json b/src/main/resources/data/botania/recipes/wands/twigwand_blue_black.json deleted file mode 100644 index 852412710..000000000 --- a/src/main/resources/data/botania/recipes/wands/twigwand_blue_black.json +++ /dev/null @@ -1,24 +0,0 @@ -{ - "result": { - "item": "botania:twig_wand", - "nbt": "{color1:11,color2:15}" - }, - "pattern": [ - " AS", - " SB", - "S " - ], - "type": "minecraft:crafting_shaped", - "key": { - "A": { - "tag": "botania:petals/blue" - }, - "B": { - "tag": "botania:petals/black" - }, - "S": { - "item": "botania:livingwood_twig" - } - }, - "group": "botania:twig_wand" -} \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_blue_blue.json b/src/main/resources/data/botania/recipes/wands/twigwand_blue_blue.json deleted file mode 100644 index 82b21ad3e..000000000 --- a/src/main/resources/data/botania/recipes/wands/twigwand_blue_blue.json +++ /dev/null @@ -1,24 +0,0 @@ -{ - "result": { - "item": "botania:twig_wand", - "nbt": "{color1:11,color2:11}" - }, - "pattern": [ - " AS", - " SB", - "S " - ], - "type": "minecraft:crafting_shaped", - "key": { - "A": { - "tag": "botania:petals/blue" - }, - "B": { - "tag": "botania:petals/blue" - }, - "S": { - "item": "botania:livingwood_twig" - } - }, - "group": "botania:twig_wand" -} \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_blue_brown.json b/src/main/resources/data/botania/recipes/wands/twigwand_blue_brown.json deleted file mode 100644 index 3edac430c..000000000 --- a/src/main/resources/data/botania/recipes/wands/twigwand_blue_brown.json +++ /dev/null @@ -1,24 +0,0 @@ -{ - "result": { - "item": "botania:twig_wand", - "nbt": "{color1:11,color2:12}" - }, - "pattern": [ - " AS", - " SB", - "S " - ], - "type": "minecraft:crafting_shaped", - "key": { - "A": { - "tag": "botania:petals/blue" - }, - "B": { - "tag": "botania:petals/brown" - }, - "S": { - "item": "botania:livingwood_twig" - } - }, - "group": "botania:twig_wand" -} \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_blue_cyan.json b/src/main/resources/data/botania/recipes/wands/twigwand_blue_cyan.json deleted file mode 100644 index d0718678f..000000000 --- a/src/main/resources/data/botania/recipes/wands/twigwand_blue_cyan.json +++ /dev/null @@ -1,24 +0,0 @@ -{ - "result": { - "item": "botania:twig_wand", - "nbt": "{color1:11,color2:9}" - }, - "pattern": [ - " AS", - " SB", - "S " - ], - "type": "minecraft:crafting_shaped", - "key": { - "A": { - "tag": "botania:petals/blue" - }, - "B": { - "tag": "botania:petals/cyan" - }, - "S": { - "item": "botania:livingwood_twig" - } - }, - "group": "botania:twig_wand" -} \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_blue_gray.json b/src/main/resources/data/botania/recipes/wands/twigwand_blue_gray.json deleted file mode 100644 index 3a9562745..000000000 --- a/src/main/resources/data/botania/recipes/wands/twigwand_blue_gray.json +++ /dev/null @@ -1,24 +0,0 @@ -{ - "result": { - "item": "botania:twig_wand", - "nbt": "{color1:11,color2:7}" - }, - "pattern": [ - " AS", - " SB", - "S " - ], - "type": "minecraft:crafting_shaped", - "key": { - "A": { - "tag": "botania:petals/blue" - }, - "B": { - "tag": "botania:petals/gray" - }, - "S": { - "item": "botania:livingwood_twig" - } - }, - "group": "botania:twig_wand" -} \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_blue_green.json b/src/main/resources/data/botania/recipes/wands/twigwand_blue_green.json deleted file mode 100644 index c7f87204b..000000000 --- a/src/main/resources/data/botania/recipes/wands/twigwand_blue_green.json +++ /dev/null @@ -1,24 +0,0 @@ -{ - "result": { - "item": "botania:twig_wand", - "nbt": "{color1:11,color2:13}" - }, - "pattern": [ - " AS", - " SB", - "S " - ], - "type": "minecraft:crafting_shaped", - "key": { - "A": { - "tag": "botania:petals/blue" - }, - "B": { - "tag": "botania:petals/green" - }, - "S": { - "item": "botania:livingwood_twig" - } - }, - "group": "botania:twig_wand" -} \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_blue_light_blue.json b/src/main/resources/data/botania/recipes/wands/twigwand_blue_light_blue.json deleted file mode 100644 index b1cbc4792..000000000 --- a/src/main/resources/data/botania/recipes/wands/twigwand_blue_light_blue.json +++ /dev/null @@ -1,24 +0,0 @@ -{ - "result": { - "item": "botania:twig_wand", - "nbt": "{color1:11,color2:3}" - }, - "pattern": [ - " AS", - " SB", - "S " - ], - "type": "minecraft:crafting_shaped", - "key": { - "A": { - "tag": "botania:petals/blue" - }, - "B": { - "tag": "botania:petals/light_blue" - }, - "S": { - "item": "botania:livingwood_twig" - } - }, - "group": "botania:twig_wand" -} \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_blue_lime.json b/src/main/resources/data/botania/recipes/wands/twigwand_blue_lime.json deleted file mode 100644 index a55159650..000000000 --- a/src/main/resources/data/botania/recipes/wands/twigwand_blue_lime.json +++ /dev/null @@ -1,24 +0,0 @@ -{ - "result": { - "item": "botania:twig_wand", - "nbt": "{color1:11,color2:5}" - }, - "pattern": [ - " AS", - " SB", - "S " - ], - "type": "minecraft:crafting_shaped", - "key": { - "A": { - "tag": "botania:petals/blue" - }, - "B": { - "tag": "botania:petals/lime" - }, - "S": { - "item": "botania:livingwood_twig" - } - }, - "group": "botania:twig_wand" -} \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_blue_magenta.json b/src/main/resources/data/botania/recipes/wands/twigwand_blue_magenta.json deleted file mode 100644 index 8df061a36..000000000 --- a/src/main/resources/data/botania/recipes/wands/twigwand_blue_magenta.json +++ /dev/null @@ -1,24 +0,0 @@ -{ - "result": { - "item": "botania:twig_wand", - "nbt": "{color1:11,color2:2}" - }, - "pattern": [ - " AS", - " SB", - "S " - ], - "type": "minecraft:crafting_shaped", - "key": { - "A": { - "tag": "botania:petals/blue" - }, - "B": { - "tag": "botania:petals/magenta" - }, - "S": { - "item": "botania:livingwood_twig" - } - }, - "group": "botania:twig_wand" -} \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_blue_orange.json b/src/main/resources/data/botania/recipes/wands/twigwand_blue_orange.json deleted file mode 100644 index 89a3b7a32..000000000 --- a/src/main/resources/data/botania/recipes/wands/twigwand_blue_orange.json +++ /dev/null @@ -1,24 +0,0 @@ -{ - "result": { - "item": "botania:twig_wand", - "nbt": "{color1:11,color2:1}" - }, - "pattern": [ - " AS", - " SB", - "S " - ], - "type": "minecraft:crafting_shaped", - "key": { - "A": { - "tag": "botania:petals/blue" - }, - "B": { - "tag": "botania:petals/orange" - }, - "S": { - "item": "botania:livingwood_twig" - } - }, - "group": "botania:twig_wand" -} \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_blue_pink.json b/src/main/resources/data/botania/recipes/wands/twigwand_blue_pink.json deleted file mode 100644 index c71f3fe31..000000000 --- a/src/main/resources/data/botania/recipes/wands/twigwand_blue_pink.json +++ /dev/null @@ -1,24 +0,0 @@ -{ - "result": { - "item": "botania:twig_wand", - "nbt": "{color1:11,color2:6}" - }, - "pattern": [ - " AS", - " SB", - "S " - ], - "type": "minecraft:crafting_shaped", - "key": { - "A": { - "tag": "botania:petals/blue" - }, - "B": { - "tag": "botania:petals/pink" - }, - "S": { - "item": "botania:livingwood_twig" - } - }, - "group": "botania:twig_wand" -} \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_blue_purple.json b/src/main/resources/data/botania/recipes/wands/twigwand_blue_purple.json deleted file mode 100644 index cc9f32882..000000000 --- a/src/main/resources/data/botania/recipes/wands/twigwand_blue_purple.json +++ /dev/null @@ -1,24 +0,0 @@ -{ - "result": { - "item": "botania:twig_wand", - "nbt": "{color1:11,color2:10}" - }, - "pattern": [ - " AS", - " SB", - "S " - ], - "type": "minecraft:crafting_shaped", - "key": { - "A": { - "tag": "botania:petals/blue" - }, - "B": { - "tag": "botania:petals/purple" - }, - "S": { - "item": "botania:livingwood_twig" - } - }, - "group": "botania:twig_wand" -} \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_blue_red.json b/src/main/resources/data/botania/recipes/wands/twigwand_blue_red.json deleted file mode 100644 index 48e293e6e..000000000 --- a/src/main/resources/data/botania/recipes/wands/twigwand_blue_red.json +++ /dev/null @@ -1,24 +0,0 @@ -{ - "result": { - "item": "botania:twig_wand", - "nbt": "{color1:11,color2:14}" - }, - "pattern": [ - " AS", - " SB", - "S " - ], - "type": "minecraft:crafting_shaped", - "key": { - "A": { - "tag": "botania:petals/blue" - }, - "B": { - "tag": "botania:petals/red" - }, - "S": { - "item": "botania:livingwood_twig" - } - }, - "group": "botania:twig_wand" -} \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_blue_silver.json b/src/main/resources/data/botania/recipes/wands/twigwand_blue_silver.json deleted file mode 100644 index fc67bd55e..000000000 --- a/src/main/resources/data/botania/recipes/wands/twigwand_blue_silver.json +++ /dev/null @@ -1,24 +0,0 @@ -{ - "result": { - "item": "botania:twig_wand", - "nbt": "{color1:11,color2:8}" - }, - "pattern": [ - " AS", - " SB", - "S " - ], - "type": "minecraft:crafting_shaped", - "key": { - "A": { - "tag": "botania:petals/blue" - }, - "B": { - "tag": "botania:petals/light_gray" - }, - "S": { - "item": "botania:livingwood_twig" - } - }, - "group": "botania:twig_wand" -} \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_blue_white.json b/src/main/resources/data/botania/recipes/wands/twigwand_blue_white.json deleted file mode 100644 index 30de9fe73..000000000 --- a/src/main/resources/data/botania/recipes/wands/twigwand_blue_white.json +++ /dev/null @@ -1,24 +0,0 @@ -{ - "result": { - "item": "botania:twig_wand", - "nbt": "{color1:11,color2:0}" - }, - "pattern": [ - " AS", - " SB", - "S " - ], - "type": "minecraft:crafting_shaped", - "key": { - "A": { - "tag": "botania:petals/blue" - }, - "B": { - "tag": "botania:petals/white" - }, - "S": { - "item": "botania:livingwood_twig" - } - }, - "group": "botania:twig_wand" -} \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_blue_yellow.json b/src/main/resources/data/botania/recipes/wands/twigwand_blue_yellow.json deleted file mode 100644 index 5b6453cfc..000000000 --- a/src/main/resources/data/botania/recipes/wands/twigwand_blue_yellow.json +++ /dev/null @@ -1,24 +0,0 @@ -{ - "result": { - "item": "botania:twig_wand", - "nbt": "{color1:11,color2:4}" - }, - "pattern": [ - " AS", - " SB", - "S " - ], - "type": "minecraft:crafting_shaped", - "key": { - "A": { - "tag": "botania:petals/blue" - }, - "B": { - "tag": "botania:petals/yellow" - }, - "S": { - "item": "botania:livingwood_twig" - } - }, - "group": "botania:twig_wand" -} \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_brown_black.json b/src/main/resources/data/botania/recipes/wands/twigwand_brown_black.json deleted file mode 100644 index 2efbe5e2f..000000000 --- a/src/main/resources/data/botania/recipes/wands/twigwand_brown_black.json +++ /dev/null @@ -1,24 +0,0 @@ -{ - "result": { - "item": "botania:twig_wand", - "nbt": "{color1:12,color2:15}" - }, - "pattern": [ - " AS", - " SB", - "S " - ], - "type": "minecraft:crafting_shaped", - "key": { - "A": { - "tag": "botania:petals/brown" - }, - "B": { - "tag": "botania:petals/black" - }, - "S": { - "item": "botania:livingwood_twig" - } - }, - "group": "botania:twig_wand" -} \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_brown_blue.json b/src/main/resources/data/botania/recipes/wands/twigwand_brown_blue.json deleted file mode 100644 index a0bec5f72..000000000 --- a/src/main/resources/data/botania/recipes/wands/twigwand_brown_blue.json +++ /dev/null @@ -1,24 +0,0 @@ -{ - "result": { - "item": "botania:twig_wand", - "nbt": "{color1:12,color2:11}" - }, - "pattern": [ - " AS", - " SB", - "S " - ], - "type": "minecraft:crafting_shaped", - "key": { - "A": { - "tag": "botania:petals/brown" - }, - "B": { - "tag": "botania:petals/blue" - }, - "S": { - "item": "botania:livingwood_twig" - } - }, - "group": "botania:twig_wand" -} \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_brown_brown.json b/src/main/resources/data/botania/recipes/wands/twigwand_brown_brown.json deleted file mode 100644 index 091b11cc5..000000000 --- a/src/main/resources/data/botania/recipes/wands/twigwand_brown_brown.json +++ /dev/null @@ -1,24 +0,0 @@ -{ - "result": { - "item": "botania:twig_wand", - "nbt": "{color1:12,color2:12}" - }, - "pattern": [ - " AS", - " SB", - "S " - ], - "type": "minecraft:crafting_shaped", - "key": { - "A": { - "tag": "botania:petals/brown" - }, - "B": { - "tag": "botania:petals/brown" - }, - "S": { - "item": "botania:livingwood_twig" - } - }, - "group": "botania:twig_wand" -} \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_brown_cyan.json b/src/main/resources/data/botania/recipes/wands/twigwand_brown_cyan.json deleted file mode 100644 index 4fff6a074..000000000 --- a/src/main/resources/data/botania/recipes/wands/twigwand_brown_cyan.json +++ /dev/null @@ -1,24 +0,0 @@ -{ - "result": { - "item": "botania:twig_wand", - "nbt": "{color1:12,color2:9}" - }, - "pattern": [ - " AS", - " SB", - "S " - ], - "type": "minecraft:crafting_shaped", - "key": { - "A": { - "tag": "botania:petals/brown" - }, - "B": { - "tag": "botania:petals/cyan" - }, - "S": { - "item": "botania:livingwood_twig" - } - }, - "group": "botania:twig_wand" -} \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_brown_gray.json b/src/main/resources/data/botania/recipes/wands/twigwand_brown_gray.json deleted file mode 100644 index 22deb23a6..000000000 --- a/src/main/resources/data/botania/recipes/wands/twigwand_brown_gray.json +++ /dev/null @@ -1,24 +0,0 @@ -{ - "result": { - "item": "botania:twig_wand", - "nbt": "{color1:12,color2:7}" - }, - "pattern": [ - " AS", - " SB", - "S " - ], - "type": "minecraft:crafting_shaped", - "key": { - "A": { - "tag": "botania:petals/brown" - }, - "B": { - "tag": "botania:petals/gray" - }, - "S": { - "item": "botania:livingwood_twig" - } - }, - "group": "botania:twig_wand" -} \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_brown_green.json b/src/main/resources/data/botania/recipes/wands/twigwand_brown_green.json deleted file mode 100644 index e1cad5379..000000000 --- a/src/main/resources/data/botania/recipes/wands/twigwand_brown_green.json +++ /dev/null @@ -1,24 +0,0 @@ -{ - "result": { - "item": "botania:twig_wand", - "nbt": "{color1:12,color2:13}" - }, - "pattern": [ - " AS", - " SB", - "S " - ], - "type": "minecraft:crafting_shaped", - "key": { - "A": { - "tag": "botania:petals/brown" - }, - "B": { - "tag": "botania:petals/green" - }, - "S": { - "item": "botania:livingwood_twig" - } - }, - "group": "botania:twig_wand" -} \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_brown_light_blue.json b/src/main/resources/data/botania/recipes/wands/twigwand_brown_light_blue.json deleted file mode 100644 index c83d3e7cc..000000000 --- a/src/main/resources/data/botania/recipes/wands/twigwand_brown_light_blue.json +++ /dev/null @@ -1,24 +0,0 @@ -{ - "result": { - "item": "botania:twig_wand", - "nbt": "{color1:12,color2:3}" - }, - "pattern": [ - " AS", - " SB", - "S " - ], - "type": "minecraft:crafting_shaped", - "key": { - "A": { - "tag": "botania:petals/brown" - }, - "B": { - "tag": "botania:petals/light_blue" - }, - "S": { - "item": "botania:livingwood_twig" - } - }, - "group": "botania:twig_wand" -} \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_brown_lime.json b/src/main/resources/data/botania/recipes/wands/twigwand_brown_lime.json deleted file mode 100644 index e5fa698fd..000000000 --- a/src/main/resources/data/botania/recipes/wands/twigwand_brown_lime.json +++ /dev/null @@ -1,24 +0,0 @@ -{ - "result": { - "item": "botania:twig_wand", - "nbt": "{color1:12,color2:5}" - }, - "pattern": [ - " AS", - " SB", - "S " - ], - "type": "minecraft:crafting_shaped", - "key": { - "A": { - "tag": "botania:petals/brown" - }, - "B": { - "tag": "botania:petals/lime" - }, - "S": { - "item": "botania:livingwood_twig" - } - }, - "group": "botania:twig_wand" -} \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_brown_magenta.json b/src/main/resources/data/botania/recipes/wands/twigwand_brown_magenta.json deleted file mode 100644 index 365281518..000000000 --- a/src/main/resources/data/botania/recipes/wands/twigwand_brown_magenta.json +++ /dev/null @@ -1,24 +0,0 @@ -{ - "result": { - "item": "botania:twig_wand", - "nbt": "{color1:12,color2:2}" - }, - "pattern": [ - " AS", - " SB", - "S " - ], - "type": "minecraft:crafting_shaped", - "key": { - "A": { - "tag": "botania:petals/brown" - }, - "B": { - "tag": "botania:petals/magenta" - }, - "S": { - "item": "botania:livingwood_twig" - } - }, - "group": "botania:twig_wand" -} \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_brown_orange.json b/src/main/resources/data/botania/recipes/wands/twigwand_brown_orange.json deleted file mode 100644 index d35565ca5..000000000 --- a/src/main/resources/data/botania/recipes/wands/twigwand_brown_orange.json +++ /dev/null @@ -1,24 +0,0 @@ -{ - "result": { - "item": "botania:twig_wand", - "nbt": "{color1:12,color2:1}" - }, - "pattern": [ - " AS", - " SB", - "S " - ], - "type": "minecraft:crafting_shaped", - "key": { - "A": { - "tag": "botania:petals/brown" - }, - "B": { - "tag": "botania:petals/orange" - }, - "S": { - "item": "botania:livingwood_twig" - } - }, - "group": "botania:twig_wand" -} \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_brown_pink.json b/src/main/resources/data/botania/recipes/wands/twigwand_brown_pink.json deleted file mode 100644 index 91f41352b..000000000 --- a/src/main/resources/data/botania/recipes/wands/twigwand_brown_pink.json +++ /dev/null @@ -1,24 +0,0 @@ -{ - "result": { - "item": "botania:twig_wand", - "nbt": "{color1:12,color2:6}" - }, - "pattern": [ - " AS", - " SB", - "S " - ], - "type": "minecraft:crafting_shaped", - "key": { - "A": { - "tag": "botania:petals/brown" - }, - "B": { - "tag": "botania:petals/pink" - }, - "S": { - "item": "botania:livingwood_twig" - } - }, - "group": "botania:twig_wand" -} \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_brown_purple.json b/src/main/resources/data/botania/recipes/wands/twigwand_brown_purple.json deleted file mode 100644 index 7be2a8ba2..000000000 --- a/src/main/resources/data/botania/recipes/wands/twigwand_brown_purple.json +++ /dev/null @@ -1,24 +0,0 @@ -{ - "result": { - "item": "botania:twig_wand", - "nbt": "{color1:12,color2:10}" - }, - "pattern": [ - " AS", - " SB", - "S " - ], - "type": "minecraft:crafting_shaped", - "key": { - "A": { - "tag": "botania:petals/brown" - }, - "B": { - "tag": "botania:petals/purple" - }, - "S": { - "item": "botania:livingwood_twig" - } - }, - "group": "botania:twig_wand" -} \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_brown_red.json b/src/main/resources/data/botania/recipes/wands/twigwand_brown_red.json deleted file mode 100644 index 068ffeb34..000000000 --- a/src/main/resources/data/botania/recipes/wands/twigwand_brown_red.json +++ /dev/null @@ -1,24 +0,0 @@ -{ - "result": { - "item": "botania:twig_wand", - "nbt": "{color1:12,color2:14}" - }, - "pattern": [ - " AS", - " SB", - "S " - ], - "type": "minecraft:crafting_shaped", - "key": { - "A": { - "tag": "botania:petals/brown" - }, - "B": { - "tag": "botania:petals/red" - }, - "S": { - "item": "botania:livingwood_twig" - } - }, - "group": "botania:twig_wand" -} \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_brown_silver.json b/src/main/resources/data/botania/recipes/wands/twigwand_brown_silver.json deleted file mode 100644 index f8a240fbb..000000000 --- a/src/main/resources/data/botania/recipes/wands/twigwand_brown_silver.json +++ /dev/null @@ -1,24 +0,0 @@ -{ - "result": { - "item": "botania:twig_wand", - "nbt": "{color1:12,color2:8}" - }, - "pattern": [ - " AS", - " SB", - "S " - ], - "type": "minecraft:crafting_shaped", - "key": { - "A": { - "tag": "botania:petals/brown" - }, - "B": { - "tag": "botania:petals/light_gray" - }, - "S": { - "item": "botania:livingwood_twig" - } - }, - "group": "botania:twig_wand" -} \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_brown_white.json b/src/main/resources/data/botania/recipes/wands/twigwand_brown_white.json deleted file mode 100644 index eb373e547..000000000 --- a/src/main/resources/data/botania/recipes/wands/twigwand_brown_white.json +++ /dev/null @@ -1,24 +0,0 @@ -{ - "result": { - "item": "botania:twig_wand", - "nbt": "{color1:12,color2:0}" - }, - "pattern": [ - " AS", - " SB", - "S " - ], - "type": "minecraft:crafting_shaped", - "key": { - "A": { - "tag": "botania:petals/brown" - }, - "B": { - "tag": "botania:petals/white" - }, - "S": { - "item": "botania:livingwood_twig" - } - }, - "group": "botania:twig_wand" -} \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_brown_yellow.json b/src/main/resources/data/botania/recipes/wands/twigwand_brown_yellow.json deleted file mode 100644 index ec55e6072..000000000 --- a/src/main/resources/data/botania/recipes/wands/twigwand_brown_yellow.json +++ /dev/null @@ -1,24 +0,0 @@ -{ - "result": { - "item": "botania:twig_wand", - "nbt": "{color1:12,color2:4}" - }, - "pattern": [ - " AS", - " SB", - "S " - ], - "type": "minecraft:crafting_shaped", - "key": { - "A": { - "tag": "botania:petals/brown" - }, - "B": { - "tag": "botania:petals/yellow" - }, - "S": { - "item": "botania:livingwood_twig" - } - }, - "group": "botania:twig_wand" -} \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_cyan_black.json b/src/main/resources/data/botania/recipes/wands/twigwand_cyan_black.json deleted file mode 100644 index 2e6042463..000000000 --- a/src/main/resources/data/botania/recipes/wands/twigwand_cyan_black.json +++ /dev/null @@ -1,24 +0,0 @@ -{ - "result": { - "item": "botania:twig_wand", - "nbt": "{color1:9,color2:15}" - }, - "pattern": [ - " AS", - " SB", - "S " - ], - "type": "minecraft:crafting_shaped", - "key": { - "A": { - "tag": "botania:petals/cyan" - }, - "B": { - "tag": "botania:petals/black" - }, - "S": { - "item": "botania:livingwood_twig" - } - }, - "group": "botania:twig_wand" -} \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_cyan_blue.json b/src/main/resources/data/botania/recipes/wands/twigwand_cyan_blue.json deleted file mode 100644 index be6c8324f..000000000 --- a/src/main/resources/data/botania/recipes/wands/twigwand_cyan_blue.json +++ /dev/null @@ -1,24 +0,0 @@ -{ - "result": { - "item": "botania:twig_wand", - "nbt": "{color1:9,color2:11}" - }, - "pattern": [ - " AS", - " SB", - "S " - ], - "type": "minecraft:crafting_shaped", - "key": { - "A": { - "tag": "botania:petals/cyan" - }, - "B": { - "tag": "botania:petals/blue" - }, - "S": { - "item": "botania:livingwood_twig" - } - }, - "group": "botania:twig_wand" -} \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_cyan_brown.json b/src/main/resources/data/botania/recipes/wands/twigwand_cyan_brown.json deleted file mode 100644 index 670ed703b..000000000 --- a/src/main/resources/data/botania/recipes/wands/twigwand_cyan_brown.json +++ /dev/null @@ -1,24 +0,0 @@ -{ - "result": { - "item": "botania:twig_wand", - "nbt": "{color1:9,color2:12}" - }, - "pattern": [ - " AS", - " SB", - "S " - ], - "type": "minecraft:crafting_shaped", - "key": { - "A": { - "tag": "botania:petals/cyan" - }, - "B": { - "tag": "botania:petals/brown" - }, - "S": { - "item": "botania:livingwood_twig" - } - }, - "group": "botania:twig_wand" -} \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_cyan_cyan.json b/src/main/resources/data/botania/recipes/wands/twigwand_cyan_cyan.json deleted file mode 100644 index 9c6a8d189..000000000 --- a/src/main/resources/data/botania/recipes/wands/twigwand_cyan_cyan.json +++ /dev/null @@ -1,24 +0,0 @@ -{ - "result": { - "item": "botania:twig_wand", - "nbt": "{color1:9,color2:9}" - }, - "pattern": [ - " AS", - " SB", - "S " - ], - "type": "minecraft:crafting_shaped", - "key": { - "A": { - "tag": "botania:petals/cyan" - }, - "B": { - "tag": "botania:petals/cyan" - }, - "S": { - "item": "botania:livingwood_twig" - } - }, - "group": "botania:twig_wand" -} \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_cyan_gray.json b/src/main/resources/data/botania/recipes/wands/twigwand_cyan_gray.json deleted file mode 100644 index e47f662f0..000000000 --- a/src/main/resources/data/botania/recipes/wands/twigwand_cyan_gray.json +++ /dev/null @@ -1,24 +0,0 @@ -{ - "result": { - "item": "botania:twig_wand", - "nbt": "{color1:9,color2:7}" - }, - "pattern": [ - " AS", - " SB", - "S " - ], - "type": "minecraft:crafting_shaped", - "key": { - "A": { - "tag": "botania:petals/cyan" - }, - "B": { - "tag": "botania:petals/gray" - }, - "S": { - "item": "botania:livingwood_twig" - } - }, - "group": "botania:twig_wand" -} \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_cyan_green.json b/src/main/resources/data/botania/recipes/wands/twigwand_cyan_green.json deleted file mode 100644 index 464772da2..000000000 --- a/src/main/resources/data/botania/recipes/wands/twigwand_cyan_green.json +++ /dev/null @@ -1,24 +0,0 @@ -{ - "result": { - "item": "botania:twig_wand", - "nbt": "{color1:9,color2:13}" - }, - "pattern": [ - " AS", - " SB", - "S " - ], - "type": "minecraft:crafting_shaped", - "key": { - "A": { - "tag": "botania:petals/cyan" - }, - "B": { - "tag": "botania:petals/green" - }, - "S": { - "item": "botania:livingwood_twig" - } - }, - "group": "botania:twig_wand" -} \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_cyan_light_blue.json b/src/main/resources/data/botania/recipes/wands/twigwand_cyan_light_blue.json deleted file mode 100644 index f7f7c8dc1..000000000 --- a/src/main/resources/data/botania/recipes/wands/twigwand_cyan_light_blue.json +++ /dev/null @@ -1,24 +0,0 @@ -{ - "result": { - "item": "botania:twig_wand", - "nbt": "{color1:9,color2:3}" - }, - "pattern": [ - " AS", - " SB", - "S " - ], - "type": "minecraft:crafting_shaped", - "key": { - "A": { - "tag": "botania:petals/cyan" - }, - "B": { - "tag": "botania:petals/light_blue" - }, - "S": { - "item": "botania:livingwood_twig" - } - }, - "group": "botania:twig_wand" -} \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_cyan_lime.json b/src/main/resources/data/botania/recipes/wands/twigwand_cyan_lime.json deleted file mode 100644 index 6ce31a448..000000000 --- a/src/main/resources/data/botania/recipes/wands/twigwand_cyan_lime.json +++ /dev/null @@ -1,24 +0,0 @@ -{ - "result": { - "item": "botania:twig_wand", - "nbt": "{color1:9,color2:5}" - }, - "pattern": [ - " AS", - " SB", - "S " - ], - "type": "minecraft:crafting_shaped", - "key": { - "A": { - "tag": "botania:petals/cyan" - }, - "B": { - "tag": "botania:petals/lime" - }, - "S": { - "item": "botania:livingwood_twig" - } - }, - "group": "botania:twig_wand" -} \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_cyan_magenta.json b/src/main/resources/data/botania/recipes/wands/twigwand_cyan_magenta.json deleted file mode 100644 index 1f80e7134..000000000 --- a/src/main/resources/data/botania/recipes/wands/twigwand_cyan_magenta.json +++ /dev/null @@ -1,24 +0,0 @@ -{ - "result": { - "item": "botania:twig_wand", - "nbt": "{color1:9,color2:2}" - }, - "pattern": [ - " AS", - " SB", - "S " - ], - "type": "minecraft:crafting_shaped", - "key": { - "A": { - "tag": "botania:petals/cyan" - }, - "B": { - "tag": "botania:petals/magenta" - }, - "S": { - "item": "botania:livingwood_twig" - } - }, - "group": "botania:twig_wand" -} \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_cyan_orange.json b/src/main/resources/data/botania/recipes/wands/twigwand_cyan_orange.json deleted file mode 100644 index 1018580fa..000000000 --- a/src/main/resources/data/botania/recipes/wands/twigwand_cyan_orange.json +++ /dev/null @@ -1,24 +0,0 @@ -{ - "result": { - "item": "botania:twig_wand", - "nbt": "{color1:9,color2:1}" - }, - "pattern": [ - " AS", - " SB", - "S " - ], - "type": "minecraft:crafting_shaped", - "key": { - "A": { - "tag": "botania:petals/cyan" - }, - "B": { - "tag": "botania:petals/orange" - }, - "S": { - "item": "botania:livingwood_twig" - } - }, - "group": "botania:twig_wand" -} \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_cyan_pink.json b/src/main/resources/data/botania/recipes/wands/twigwand_cyan_pink.json deleted file mode 100644 index 2ac01c79f..000000000 --- a/src/main/resources/data/botania/recipes/wands/twigwand_cyan_pink.json +++ /dev/null @@ -1,24 +0,0 @@ -{ - "result": { - "item": "botania:twig_wand", - "nbt": "{color1:9,color2:6}" - }, - "pattern": [ - " AS", - " SB", - "S " - ], - "type": "minecraft:crafting_shaped", - "key": { - "A": { - "tag": "botania:petals/cyan" - }, - "B": { - "tag": "botania:petals/pink" - }, - "S": { - "item": "botania:livingwood_twig" - } - }, - "group": "botania:twig_wand" -} \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_cyan_purple.json b/src/main/resources/data/botania/recipes/wands/twigwand_cyan_purple.json deleted file mode 100644 index b4a119e12..000000000 --- a/src/main/resources/data/botania/recipes/wands/twigwand_cyan_purple.json +++ /dev/null @@ -1,24 +0,0 @@ -{ - "result": { - "item": "botania:twig_wand", - "nbt": "{color1:9,color2:10}" - }, - "pattern": [ - " AS", - " SB", - "S " - ], - "type": "minecraft:crafting_shaped", - "key": { - "A": { - "tag": "botania:petals/cyan" - }, - "B": { - "tag": "botania:petals/purple" - }, - "S": { - "item": "botania:livingwood_twig" - } - }, - "group": "botania:twig_wand" -} \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_cyan_red.json b/src/main/resources/data/botania/recipes/wands/twigwand_cyan_red.json deleted file mode 100644 index 6e35c15e2..000000000 --- a/src/main/resources/data/botania/recipes/wands/twigwand_cyan_red.json +++ /dev/null @@ -1,24 +0,0 @@ -{ - "result": { - "item": "botania:twig_wand", - "nbt": "{color1:9,color2:14}" - }, - "pattern": [ - " AS", - " SB", - "S " - ], - "type": "minecraft:crafting_shaped", - "key": { - "A": { - "tag": "botania:petals/cyan" - }, - "B": { - "tag": "botania:petals/red" - }, - "S": { - "item": "botania:livingwood_twig" - } - }, - "group": "botania:twig_wand" -} \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_cyan_silver.json b/src/main/resources/data/botania/recipes/wands/twigwand_cyan_silver.json deleted file mode 100644 index 582b90f53..000000000 --- a/src/main/resources/data/botania/recipes/wands/twigwand_cyan_silver.json +++ /dev/null @@ -1,24 +0,0 @@ -{ - "result": { - "item": "botania:twig_wand", - "nbt": "{color1:9,color2:8}" - }, - "pattern": [ - " AS", - " SB", - "S " - ], - "type": "minecraft:crafting_shaped", - "key": { - "A": { - "tag": "botania:petals/cyan" - }, - "B": { - "tag": "botania:petals/light_gray" - }, - "S": { - "item": "botania:livingwood_twig" - } - }, - "group": "botania:twig_wand" -} \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_cyan_white.json b/src/main/resources/data/botania/recipes/wands/twigwand_cyan_white.json deleted file mode 100644 index 057f74c63..000000000 --- a/src/main/resources/data/botania/recipes/wands/twigwand_cyan_white.json +++ /dev/null @@ -1,24 +0,0 @@ -{ - "result": { - "item": "botania:twig_wand", - "nbt": "{color1:9,color2:0}" - }, - "pattern": [ - " AS", - " SB", - "S " - ], - "type": "minecraft:crafting_shaped", - "key": { - "A": { - "tag": "botania:petals/cyan" - }, - "B": { - "tag": "botania:petals/white" - }, - "S": { - "item": "botania:livingwood_twig" - } - }, - "group": "botania:twig_wand" -} \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_cyan_yellow.json b/src/main/resources/data/botania/recipes/wands/twigwand_cyan_yellow.json deleted file mode 100644 index 79eae4511..000000000 --- a/src/main/resources/data/botania/recipes/wands/twigwand_cyan_yellow.json +++ /dev/null @@ -1,24 +0,0 @@ -{ - "result": { - "item": "botania:twig_wand", - "nbt": "{color1:9,color2:4}" - }, - "pattern": [ - " AS", - " SB", - "S " - ], - "type": "minecraft:crafting_shaped", - "key": { - "A": { - "tag": "botania:petals/cyan" - }, - "B": { - "tag": "botania:petals/yellow" - }, - "S": { - "item": "botania:livingwood_twig" - } - }, - "group": "botania:twig_wand" -} \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_gray_black.json b/src/main/resources/data/botania/recipes/wands/twigwand_gray_black.json deleted file mode 100644 index 3d3a37b48..000000000 --- a/src/main/resources/data/botania/recipes/wands/twigwand_gray_black.json +++ /dev/null @@ -1,24 +0,0 @@ -{ - "result": { - "item": "botania:twig_wand", - "nbt": "{color1:7,color2:15}" - }, - "pattern": [ - " AS", - " SB", - "S " - ], - "type": "minecraft:crafting_shaped", - "key": { - "A": { - "tag": "botania:petals/gray" - }, - "B": { - "tag": "botania:petals/black" - }, - "S": { - "item": "botania:livingwood_twig" - } - }, - "group": "botania:twig_wand" -} \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_gray_blue.json b/src/main/resources/data/botania/recipes/wands/twigwand_gray_blue.json deleted file mode 100644 index 7d3f90dbd..000000000 --- a/src/main/resources/data/botania/recipes/wands/twigwand_gray_blue.json +++ /dev/null @@ -1,24 +0,0 @@ -{ - "result": { - "item": "botania:twig_wand", - "nbt": "{color1:7,color2:11}" - }, - "pattern": [ - " AS", - " SB", - "S " - ], - "type": "minecraft:crafting_shaped", - "key": { - "A": { - "tag": "botania:petals/gray" - }, - "B": { - "tag": "botania:petals/blue" - }, - "S": { - "item": "botania:livingwood_twig" - } - }, - "group": "botania:twig_wand" -} \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_gray_brown.json b/src/main/resources/data/botania/recipes/wands/twigwand_gray_brown.json deleted file mode 100644 index 4d99820e4..000000000 --- a/src/main/resources/data/botania/recipes/wands/twigwand_gray_brown.json +++ /dev/null @@ -1,24 +0,0 @@ -{ - "result": { - "item": "botania:twig_wand", - "nbt": "{color1:7,color2:12}" - }, - "pattern": [ - " AS", - " SB", - "S " - ], - "type": "minecraft:crafting_shaped", - "key": { - "A": { - "tag": "botania:petals/gray" - }, - "B": { - "tag": "botania:petals/brown" - }, - "S": { - "item": "botania:livingwood_twig" - } - }, - "group": "botania:twig_wand" -} \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_gray_cyan.json b/src/main/resources/data/botania/recipes/wands/twigwand_gray_cyan.json deleted file mode 100644 index 7ef2201c6..000000000 --- a/src/main/resources/data/botania/recipes/wands/twigwand_gray_cyan.json +++ /dev/null @@ -1,24 +0,0 @@ -{ - "result": { - "item": "botania:twig_wand", - "nbt": "{color1:7,color2:9}" - }, - "pattern": [ - " AS", - " SB", - "S " - ], - "type": "minecraft:crafting_shaped", - "key": { - "A": { - "tag": "botania:petals/gray" - }, - "B": { - "tag": "botania:petals/cyan" - }, - "S": { - "item": "botania:livingwood_twig" - } - }, - "group": "botania:twig_wand" -} \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_gray_gray.json b/src/main/resources/data/botania/recipes/wands/twigwand_gray_gray.json deleted file mode 100644 index f8920b61a..000000000 --- a/src/main/resources/data/botania/recipes/wands/twigwand_gray_gray.json +++ /dev/null @@ -1,24 +0,0 @@ -{ - "result": { - "item": "botania:twig_wand", - "nbt": "{color1:7,color2:7}" - }, - "pattern": [ - " AS", - " SB", - "S " - ], - "type": "minecraft:crafting_shaped", - "key": { - "A": { - "tag": "botania:petals/gray" - }, - "B": { - "tag": "botania:petals/gray" - }, - "S": { - "item": "botania:livingwood_twig" - } - }, - "group": "botania:twig_wand" -} \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_gray_green.json b/src/main/resources/data/botania/recipes/wands/twigwand_gray_green.json deleted file mode 100644 index 316bfaf33..000000000 --- a/src/main/resources/data/botania/recipes/wands/twigwand_gray_green.json +++ /dev/null @@ -1,24 +0,0 @@ -{ - "result": { - "item": "botania:twig_wand", - "nbt": "{color1:7,color2:13}" - }, - "pattern": [ - " AS", - " SB", - "S " - ], - "type": "minecraft:crafting_shaped", - "key": { - "A": { - "tag": "botania:petals/gray" - }, - "B": { - "tag": "botania:petals/green" - }, - "S": { - "item": "botania:livingwood_twig" - } - }, - "group": "botania:twig_wand" -} \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_gray_light_blue.json b/src/main/resources/data/botania/recipes/wands/twigwand_gray_light_blue.json deleted file mode 100644 index a95935304..000000000 --- a/src/main/resources/data/botania/recipes/wands/twigwand_gray_light_blue.json +++ /dev/null @@ -1,24 +0,0 @@ -{ - "result": { - "item": "botania:twig_wand", - "nbt": "{color1:7,color2:3}" - }, - "pattern": [ - " AS", - " SB", - "S " - ], - "type": "minecraft:crafting_shaped", - "key": { - "A": { - "tag": "botania:petals/gray" - }, - "B": { - "tag": "botania:petals/light_blue" - }, - "S": { - "item": "botania:livingwood_twig" - } - }, - "group": "botania:twig_wand" -} \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_gray_lime.json b/src/main/resources/data/botania/recipes/wands/twigwand_gray_lime.json deleted file mode 100644 index 28f6ff5a8..000000000 --- a/src/main/resources/data/botania/recipes/wands/twigwand_gray_lime.json +++ /dev/null @@ -1,24 +0,0 @@ -{ - "result": { - "item": "botania:twig_wand", - "nbt": "{color1:7,color2:5}" - }, - "pattern": [ - " AS", - " SB", - "S " - ], - "type": "minecraft:crafting_shaped", - "key": { - "A": { - "tag": "botania:petals/gray" - }, - "B": { - "tag": "botania:petals/lime" - }, - "S": { - "item": "botania:livingwood_twig" - } - }, - "group": "botania:twig_wand" -} \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_gray_magenta.json b/src/main/resources/data/botania/recipes/wands/twigwand_gray_magenta.json deleted file mode 100644 index 31d32518e..000000000 --- a/src/main/resources/data/botania/recipes/wands/twigwand_gray_magenta.json +++ /dev/null @@ -1,24 +0,0 @@ -{ - "result": { - "item": "botania:twig_wand", - "nbt": "{color1:7,color2:2}" - }, - "pattern": [ - " AS", - " SB", - "S " - ], - "type": "minecraft:crafting_shaped", - "key": { - "A": { - "tag": "botania:petals/gray" - }, - "B": { - "tag": "botania:petals/magenta" - }, - "S": { - "item": "botania:livingwood_twig" - } - }, - "group": "botania:twig_wand" -} \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_gray_orange.json b/src/main/resources/data/botania/recipes/wands/twigwand_gray_orange.json deleted file mode 100644 index 179ea7fa9..000000000 --- a/src/main/resources/data/botania/recipes/wands/twigwand_gray_orange.json +++ /dev/null @@ -1,24 +0,0 @@ -{ - "result": { - "item": "botania:twig_wand", - "nbt": "{color1:7,color2:1}" - }, - "pattern": [ - " AS", - " SB", - "S " - ], - "type": "minecraft:crafting_shaped", - "key": { - "A": { - "tag": "botania:petals/gray" - }, - "B": { - "tag": "botania:petals/orange" - }, - "S": { - "item": "botania:livingwood_twig" - } - }, - "group": "botania:twig_wand" -} \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_gray_pink.json b/src/main/resources/data/botania/recipes/wands/twigwand_gray_pink.json deleted file mode 100644 index 82c4df153..000000000 --- a/src/main/resources/data/botania/recipes/wands/twigwand_gray_pink.json +++ /dev/null @@ -1,24 +0,0 @@ -{ - "result": { - "item": "botania:twig_wand", - "nbt": "{color1:7,color2:6}" - }, - "pattern": [ - " AS", - " SB", - "S " - ], - "type": "minecraft:crafting_shaped", - "key": { - "A": { - "tag": "botania:petals/gray" - }, - "B": { - "tag": "botania:petals/pink" - }, - "S": { - "item": "botania:livingwood_twig" - } - }, - "group": "botania:twig_wand" -} \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_gray_purple.json b/src/main/resources/data/botania/recipes/wands/twigwand_gray_purple.json deleted file mode 100644 index 87cc86b99..000000000 --- a/src/main/resources/data/botania/recipes/wands/twigwand_gray_purple.json +++ /dev/null @@ -1,24 +0,0 @@ -{ - "result": { - "item": "botania:twig_wand", - "nbt": "{color1:7,color2:10}" - }, - "pattern": [ - " AS", - " SB", - "S " - ], - "type": "minecraft:crafting_shaped", - "key": { - "A": { - "tag": "botania:petals/gray" - }, - "B": { - "tag": "botania:petals/purple" - }, - "S": { - "item": "botania:livingwood_twig" - } - }, - "group": "botania:twig_wand" -} \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_gray_red.json b/src/main/resources/data/botania/recipes/wands/twigwand_gray_red.json deleted file mode 100644 index 71b82d3ef..000000000 --- a/src/main/resources/data/botania/recipes/wands/twigwand_gray_red.json +++ /dev/null @@ -1,24 +0,0 @@ -{ - "result": { - "item": "botania:twig_wand", - "nbt": "{color1:7,color2:14}" - }, - "pattern": [ - " AS", - " SB", - "S " - ], - "type": "minecraft:crafting_shaped", - "key": { - "A": { - "tag": "botania:petals/gray" - }, - "B": { - "tag": "botania:petals/red" - }, - "S": { - "item": "botania:livingwood_twig" - } - }, - "group": "botania:twig_wand" -} \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_gray_silver.json b/src/main/resources/data/botania/recipes/wands/twigwand_gray_silver.json deleted file mode 100644 index 784fb2639..000000000 --- a/src/main/resources/data/botania/recipes/wands/twigwand_gray_silver.json +++ /dev/null @@ -1,24 +0,0 @@ -{ - "result": { - "item": "botania:twig_wand", - "nbt": "{color1:7,color2:8}" - }, - "pattern": [ - " AS", - " SB", - "S " - ], - "type": "minecraft:crafting_shaped", - "key": { - "A": { - "tag": "botania:petals/gray" - }, - "B": { - "tag": "botania:petals/light_gray" - }, - "S": { - "item": "botania:livingwood_twig" - } - }, - "group": "botania:twig_wand" -} \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_gray_white.json b/src/main/resources/data/botania/recipes/wands/twigwand_gray_white.json deleted file mode 100644 index a57e6d352..000000000 --- a/src/main/resources/data/botania/recipes/wands/twigwand_gray_white.json +++ /dev/null @@ -1,24 +0,0 @@ -{ - "result": { - "item": "botania:twig_wand", - "nbt": "{color1:7,color2:0}" - }, - "pattern": [ - " AS", - " SB", - "S " - ], - "type": "minecraft:crafting_shaped", - "key": { - "A": { - "tag": "botania:petals/gray" - }, - "B": { - "tag": "botania:petals/white" - }, - "S": { - "item": "botania:livingwood_twig" - } - }, - "group": "botania:twig_wand" -} \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_gray_yellow.json b/src/main/resources/data/botania/recipes/wands/twigwand_gray_yellow.json deleted file mode 100644 index 9ca6b33b6..000000000 --- a/src/main/resources/data/botania/recipes/wands/twigwand_gray_yellow.json +++ /dev/null @@ -1,24 +0,0 @@ -{ - "result": { - "item": "botania:twig_wand", - "nbt": "{color1:7,color2:4}" - }, - "pattern": [ - " AS", - " SB", - "S " - ], - "type": "minecraft:crafting_shaped", - "key": { - "A": { - "tag": "botania:petals/gray" - }, - "B": { - "tag": "botania:petals/yellow" - }, - "S": { - "item": "botania:livingwood_twig" - } - }, - "group": "botania:twig_wand" -} \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_green_black.json b/src/main/resources/data/botania/recipes/wands/twigwand_green_black.json deleted file mode 100644 index 54fa66ea4..000000000 --- a/src/main/resources/data/botania/recipes/wands/twigwand_green_black.json +++ /dev/null @@ -1,24 +0,0 @@ -{ - "result": { - "item": "botania:twig_wand", - "nbt": "{color1:13,color2:15}" - }, - "pattern": [ - " AS", - " SB", - "S " - ], - "type": "minecraft:crafting_shaped", - "key": { - "A": { - "tag": "botania:petals/green" - }, - "B": { - "tag": "botania:petals/black" - }, - "S": { - "item": "botania:livingwood_twig" - } - }, - "group": "botania:twig_wand" -} \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_green_blue.json b/src/main/resources/data/botania/recipes/wands/twigwand_green_blue.json deleted file mode 100644 index 89402db49..000000000 --- a/src/main/resources/data/botania/recipes/wands/twigwand_green_blue.json +++ /dev/null @@ -1,24 +0,0 @@ -{ - "result": { - "item": "botania:twig_wand", - "nbt": "{color1:13,color2:11}" - }, - "pattern": [ - " AS", - " SB", - "S " - ], - "type": "minecraft:crafting_shaped", - "key": { - "A": { - "tag": "botania:petals/green" - }, - "B": { - "tag": "botania:petals/blue" - }, - "S": { - "item": "botania:livingwood_twig" - } - }, - "group": "botania:twig_wand" -} \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_green_brown.json b/src/main/resources/data/botania/recipes/wands/twigwand_green_brown.json deleted file mode 100644 index 622cfb4b4..000000000 --- a/src/main/resources/data/botania/recipes/wands/twigwand_green_brown.json +++ /dev/null @@ -1,24 +0,0 @@ -{ - "result": { - "item": "botania:twig_wand", - "nbt": "{color1:13,color2:12}" - }, - "pattern": [ - " AS", - " SB", - "S " - ], - "type": "minecraft:crafting_shaped", - "key": { - "A": { - "tag": "botania:petals/green" - }, - "B": { - "tag": "botania:petals/brown" - }, - "S": { - "item": "botania:livingwood_twig" - } - }, - "group": "botania:twig_wand" -} \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_green_cyan.json b/src/main/resources/data/botania/recipes/wands/twigwand_green_cyan.json deleted file mode 100644 index 582760521..000000000 --- a/src/main/resources/data/botania/recipes/wands/twigwand_green_cyan.json +++ /dev/null @@ -1,24 +0,0 @@ -{ - "result": { - "item": "botania:twig_wand", - "nbt": "{color1:13,color2:9}" - }, - "pattern": [ - " AS", - " SB", - "S " - ], - "type": "minecraft:crafting_shaped", - "key": { - "A": { - "tag": "botania:petals/green" - }, - "B": { - "tag": "botania:petals/cyan" - }, - "S": { - "item": "botania:livingwood_twig" - } - }, - "group": "botania:twig_wand" -} \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_green_gray.json b/src/main/resources/data/botania/recipes/wands/twigwand_green_gray.json deleted file mode 100644 index c3d93170a..000000000 --- a/src/main/resources/data/botania/recipes/wands/twigwand_green_gray.json +++ /dev/null @@ -1,24 +0,0 @@ -{ - "result": { - "item": "botania:twig_wand", - "nbt": "{color1:13,color2:7}" - }, - "pattern": [ - " AS", - " SB", - "S " - ], - "type": "minecraft:crafting_shaped", - "key": { - "A": { - "tag": "botania:petals/green" - }, - "B": { - "tag": "botania:petals/gray" - }, - "S": { - "item": "botania:livingwood_twig" - } - }, - "group": "botania:twig_wand" -} \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_green_green.json b/src/main/resources/data/botania/recipes/wands/twigwand_green_green.json deleted file mode 100644 index dd034fffc..000000000 --- a/src/main/resources/data/botania/recipes/wands/twigwand_green_green.json +++ /dev/null @@ -1,24 +0,0 @@ -{ - "result": { - "item": "botania:twig_wand", - "nbt": "{color1:13,color2:13}" - }, - "pattern": [ - " AS", - " SB", - "S " - ], - "type": "minecraft:crafting_shaped", - "key": { - "A": { - "tag": "botania:petals/green" - }, - "B": { - "tag": "botania:petals/green" - }, - "S": { - "item": "botania:livingwood_twig" - } - }, - "group": "botania:twig_wand" -} \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_green_light_blue.json b/src/main/resources/data/botania/recipes/wands/twigwand_green_light_blue.json deleted file mode 100644 index b59d0dbab..000000000 --- a/src/main/resources/data/botania/recipes/wands/twigwand_green_light_blue.json +++ /dev/null @@ -1,24 +0,0 @@ -{ - "result": { - "item": "botania:twig_wand", - "nbt": "{color1:13,color2:3}" - }, - "pattern": [ - " AS", - " SB", - "S " - ], - "type": "minecraft:crafting_shaped", - "key": { - "A": { - "tag": "botania:petals/green" - }, - "B": { - "tag": "botania:petals/light_blue" - }, - "S": { - "item": "botania:livingwood_twig" - } - }, - "group": "botania:twig_wand" -} \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_green_lime.json b/src/main/resources/data/botania/recipes/wands/twigwand_green_lime.json deleted file mode 100644 index d7c4779de..000000000 --- a/src/main/resources/data/botania/recipes/wands/twigwand_green_lime.json +++ /dev/null @@ -1,24 +0,0 @@ -{ - "result": { - "item": "botania:twig_wand", - "nbt": "{color1:13,color2:5}" - }, - "pattern": [ - " AS", - " SB", - "S " - ], - "type": "minecraft:crafting_shaped", - "key": { - "A": { - "tag": "botania:petals/green" - }, - "B": { - "tag": "botania:petals/lime" - }, - "S": { - "item": "botania:livingwood_twig" - } - }, - "group": "botania:twig_wand" -} \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_green_magenta.json b/src/main/resources/data/botania/recipes/wands/twigwand_green_magenta.json deleted file mode 100644 index 26f28a5ca..000000000 --- a/src/main/resources/data/botania/recipes/wands/twigwand_green_magenta.json +++ /dev/null @@ -1,24 +0,0 @@ -{ - "result": { - "item": "botania:twig_wand", - "nbt": "{color1:13,color2:2}" - }, - "pattern": [ - " AS", - " SB", - "S " - ], - "type": "minecraft:crafting_shaped", - "key": { - "A": { - "tag": "botania:petals/green" - }, - "B": { - "tag": "botania:petals/magenta" - }, - "S": { - "item": "botania:livingwood_twig" - } - }, - "group": "botania:twig_wand" -} \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_green_orange.json b/src/main/resources/data/botania/recipes/wands/twigwand_green_orange.json deleted file mode 100644 index 6cfb98bd2..000000000 --- a/src/main/resources/data/botania/recipes/wands/twigwand_green_orange.json +++ /dev/null @@ -1,24 +0,0 @@ -{ - "result": { - "item": "botania:twig_wand", - "nbt": "{color1:13,color2:1}" - }, - "pattern": [ - " AS", - " SB", - "S " - ], - "type": "minecraft:crafting_shaped", - "key": { - "A": { - "tag": "botania:petals/green" - }, - "B": { - "tag": "botania:petals/orange" - }, - "S": { - "item": "botania:livingwood_twig" - } - }, - "group": "botania:twig_wand" -} \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_green_pink.json b/src/main/resources/data/botania/recipes/wands/twigwand_green_pink.json deleted file mode 100644 index 8277363b5..000000000 --- a/src/main/resources/data/botania/recipes/wands/twigwand_green_pink.json +++ /dev/null @@ -1,24 +0,0 @@ -{ - "result": { - "item": "botania:twig_wand", - "nbt": "{color1:13,color2:6}" - }, - "pattern": [ - " AS", - " SB", - "S " - ], - "type": "minecraft:crafting_shaped", - "key": { - "A": { - "tag": "botania:petals/green" - }, - "B": { - "tag": "botania:petals/pink" - }, - "S": { - "item": "botania:livingwood_twig" - } - }, - "group": "botania:twig_wand" -} \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_green_purple.json b/src/main/resources/data/botania/recipes/wands/twigwand_green_purple.json deleted file mode 100644 index 76337ea0e..000000000 --- a/src/main/resources/data/botania/recipes/wands/twigwand_green_purple.json +++ /dev/null @@ -1,24 +0,0 @@ -{ - "result": { - "item": "botania:twig_wand", - "nbt": "{color1:13,color2:10}" - }, - "pattern": [ - " AS", - " SB", - "S " - ], - "type": "minecraft:crafting_shaped", - "key": { - "A": { - "tag": "botania:petals/green" - }, - "B": { - "tag": "botania:petals/purple" - }, - "S": { - "item": "botania:livingwood_twig" - } - }, - "group": "botania:twig_wand" -} \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_green_red.json b/src/main/resources/data/botania/recipes/wands/twigwand_green_red.json deleted file mode 100644 index 0e9b70d59..000000000 --- a/src/main/resources/data/botania/recipes/wands/twigwand_green_red.json +++ /dev/null @@ -1,24 +0,0 @@ -{ - "result": { - "item": "botania:twig_wand", - "nbt": "{color1:13,color2:14}" - }, - "pattern": [ - " AS", - " SB", - "S " - ], - "type": "minecraft:crafting_shaped", - "key": { - "A": { - "tag": "botania:petals/green" - }, - "B": { - "tag": "botania:petals/red" - }, - "S": { - "item": "botania:livingwood_twig" - } - }, - "group": "botania:twig_wand" -} \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_green_silver.json b/src/main/resources/data/botania/recipes/wands/twigwand_green_silver.json deleted file mode 100644 index 37a5cb677..000000000 --- a/src/main/resources/data/botania/recipes/wands/twigwand_green_silver.json +++ /dev/null @@ -1,24 +0,0 @@ -{ - "result": { - "item": "botania:twig_wand", - "nbt": "{color1:13,color2:8}" - }, - "pattern": [ - " AS", - " SB", - "S " - ], - "type": "minecraft:crafting_shaped", - "key": { - "A": { - "tag": "botania:petals/green" - }, - "B": { - "tag": "botania:petals/light_gray" - }, - "S": { - "item": "botania:livingwood_twig" - } - }, - "group": "botania:twig_wand" -} \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_green_white.json b/src/main/resources/data/botania/recipes/wands/twigwand_green_white.json deleted file mode 100644 index 9c8ef723f..000000000 --- a/src/main/resources/data/botania/recipes/wands/twigwand_green_white.json +++ /dev/null @@ -1,24 +0,0 @@ -{ - "result": { - "item": "botania:twig_wand", - "nbt": "{color1:13,color2:0}" - }, - "pattern": [ - " AS", - " SB", - "S " - ], - "type": "minecraft:crafting_shaped", - "key": { - "A": { - "tag": "botania:petals/green" - }, - "B": { - "tag": "botania:petals/white" - }, - "S": { - "item": "botania:livingwood_twig" - } - }, - "group": "botania:twig_wand" -} \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_green_yellow.json b/src/main/resources/data/botania/recipes/wands/twigwand_green_yellow.json deleted file mode 100644 index c97b8c9fd..000000000 --- a/src/main/resources/data/botania/recipes/wands/twigwand_green_yellow.json +++ /dev/null @@ -1,24 +0,0 @@ -{ - "result": { - "item": "botania:twig_wand", - "nbt": "{color1:13,color2:4}" - }, - "pattern": [ - " AS", - " SB", - "S " - ], - "type": "minecraft:crafting_shaped", - "key": { - "A": { - "tag": "botania:petals/green" - }, - "B": { - "tag": "botania:petals/yellow" - }, - "S": { - "item": "botania:livingwood_twig" - } - }, - "group": "botania:twig_wand" -} \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_light_blue_black.json b/src/main/resources/data/botania/recipes/wands/twigwand_light_blue_black.json deleted file mode 100644 index e2b7ffad8..000000000 --- a/src/main/resources/data/botania/recipes/wands/twigwand_light_blue_black.json +++ /dev/null @@ -1,24 +0,0 @@ -{ - "result": { - "item": "botania:twig_wand", - "nbt": "{color1:3,color2:15}" - }, - "pattern": [ - " AS", - " SB", - "S " - ], - "type": "minecraft:crafting_shaped", - "key": { - "A": { - "tag": "botania:petals/light_blue" - }, - "B": { - "tag": "botania:petals/black" - }, - "S": { - "item": "botania:livingwood_twig" - } - }, - "group": "botania:twig_wand" -} \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_light_blue_blue.json b/src/main/resources/data/botania/recipes/wands/twigwand_light_blue_blue.json deleted file mode 100644 index 2a148f9c9..000000000 --- a/src/main/resources/data/botania/recipes/wands/twigwand_light_blue_blue.json +++ /dev/null @@ -1,24 +0,0 @@ -{ - "result": { - "item": "botania:twig_wand", - "nbt": "{color1:3,color2:11}" - }, - "pattern": [ - " AS", - " SB", - "S " - ], - "type": "minecraft:crafting_shaped", - "key": { - "A": { - "tag": "botania:petals/light_blue" - }, - "B": { - "tag": "botania:petals/blue" - }, - "S": { - "item": "botania:livingwood_twig" - } - }, - "group": "botania:twig_wand" -} \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_light_blue_brown.json b/src/main/resources/data/botania/recipes/wands/twigwand_light_blue_brown.json deleted file mode 100644 index bf5df7e0d..000000000 --- a/src/main/resources/data/botania/recipes/wands/twigwand_light_blue_brown.json +++ /dev/null @@ -1,24 +0,0 @@ -{ - "result": { - "item": "botania:twig_wand", - "nbt": "{color1:3,color2:12}" - }, - "pattern": [ - " AS", - " SB", - "S " - ], - "type": "minecraft:crafting_shaped", - "key": { - "A": { - "tag": "botania:petals/light_blue" - }, - "B": { - "tag": "botania:petals/brown" - }, - "S": { - "item": "botania:livingwood_twig" - } - }, - "group": "botania:twig_wand" -} \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_light_blue_cyan.json b/src/main/resources/data/botania/recipes/wands/twigwand_light_blue_cyan.json deleted file mode 100644 index c78e45a3a..000000000 --- a/src/main/resources/data/botania/recipes/wands/twigwand_light_blue_cyan.json +++ /dev/null @@ -1,24 +0,0 @@ -{ - "result": { - "item": "botania:twig_wand", - "nbt": "{color1:3,color2:9}" - }, - "pattern": [ - " AS", - " SB", - "S " - ], - "type": "minecraft:crafting_shaped", - "key": { - "A": { - "tag": "botania:petals/light_blue" - }, - "B": { - "tag": "botania:petals/cyan" - }, - "S": { - "item": "botania:livingwood_twig" - } - }, - "group": "botania:twig_wand" -} \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_light_blue_gray.json b/src/main/resources/data/botania/recipes/wands/twigwand_light_blue_gray.json deleted file mode 100644 index 1367d41c8..000000000 --- a/src/main/resources/data/botania/recipes/wands/twigwand_light_blue_gray.json +++ /dev/null @@ -1,24 +0,0 @@ -{ - "result": { - "item": "botania:twig_wand", - "nbt": "{color1:3,color2:7}" - }, - "pattern": [ - " AS", - " SB", - "S " - ], - "type": "minecraft:crafting_shaped", - "key": { - "A": { - "tag": "botania:petals/light_blue" - }, - "B": { - "tag": "botania:petals/gray" - }, - "S": { - "item": "botania:livingwood_twig" - } - }, - "group": "botania:twig_wand" -} \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_light_blue_green.json b/src/main/resources/data/botania/recipes/wands/twigwand_light_blue_green.json deleted file mode 100644 index 016dbb07a..000000000 --- a/src/main/resources/data/botania/recipes/wands/twigwand_light_blue_green.json +++ /dev/null @@ -1,24 +0,0 @@ -{ - "result": { - "item": "botania:twig_wand", - "nbt": "{color1:3,color2:13}" - }, - "pattern": [ - " AS", - " SB", - "S " - ], - "type": "minecraft:crafting_shaped", - "key": { - "A": { - "tag": "botania:petals/light_blue" - }, - "B": { - "tag": "botania:petals/green" - }, - "S": { - "item": "botania:livingwood_twig" - } - }, - "group": "botania:twig_wand" -} \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_light_blue_light_blue.json b/src/main/resources/data/botania/recipes/wands/twigwand_light_blue_light_blue.json deleted file mode 100644 index 3874b17ad..000000000 --- a/src/main/resources/data/botania/recipes/wands/twigwand_light_blue_light_blue.json +++ /dev/null @@ -1,24 +0,0 @@ -{ - "result": { - "item": "botania:twig_wand", - "nbt": "{color1:3,color2:3}" - }, - "pattern": [ - " AS", - " SB", - "S " - ], - "type": "minecraft:crafting_shaped", - "key": { - "A": { - "tag": "botania:petals/light_blue" - }, - "B": { - "tag": "botania:petals/light_blue" - }, - "S": { - "item": "botania:livingwood_twig" - } - }, - "group": "botania:twig_wand" -} \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_light_blue_lime.json b/src/main/resources/data/botania/recipes/wands/twigwand_light_blue_lime.json deleted file mode 100644 index 6dd2861db..000000000 --- a/src/main/resources/data/botania/recipes/wands/twigwand_light_blue_lime.json +++ /dev/null @@ -1,24 +0,0 @@ -{ - "result": { - "item": "botania:twig_wand", - "nbt": "{color1:3,color2:5}" - }, - "pattern": [ - " AS", - " SB", - "S " - ], - "type": "minecraft:crafting_shaped", - "key": { - "A": { - "tag": "botania:petals/light_blue" - }, - "B": { - "tag": "botania:petals/lime" - }, - "S": { - "item": "botania:livingwood_twig" - } - }, - "group": "botania:twig_wand" -} \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_light_blue_magenta.json b/src/main/resources/data/botania/recipes/wands/twigwand_light_blue_magenta.json deleted file mode 100644 index 8f9fbf681..000000000 --- a/src/main/resources/data/botania/recipes/wands/twigwand_light_blue_magenta.json +++ /dev/null @@ -1,24 +0,0 @@ -{ - "result": { - "item": "botania:twig_wand", - "nbt": "{color1:3,color2:2}" - }, - "pattern": [ - " AS", - " SB", - "S " - ], - "type": "minecraft:crafting_shaped", - "key": { - "A": { - "tag": "botania:petals/light_blue" - }, - "B": { - "tag": "botania:petals/magenta" - }, - "S": { - "item": "botania:livingwood_twig" - } - }, - "group": "botania:twig_wand" -} \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_light_blue_orange.json b/src/main/resources/data/botania/recipes/wands/twigwand_light_blue_orange.json deleted file mode 100644 index 9f5dc3a2d..000000000 --- a/src/main/resources/data/botania/recipes/wands/twigwand_light_blue_orange.json +++ /dev/null @@ -1,24 +0,0 @@ -{ - "result": { - "item": "botania:twig_wand", - "nbt": "{color1:3,color2:1}" - }, - "pattern": [ - " AS", - " SB", - "S " - ], - "type": "minecraft:crafting_shaped", - "key": { - "A": { - "tag": "botania:petals/light_blue" - }, - "B": { - "tag": "botania:petals/orange" - }, - "S": { - "item": "botania:livingwood_twig" - } - }, - "group": "botania:twig_wand" -} \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_light_blue_pink.json b/src/main/resources/data/botania/recipes/wands/twigwand_light_blue_pink.json deleted file mode 100644 index 07608d1e7..000000000 --- a/src/main/resources/data/botania/recipes/wands/twigwand_light_blue_pink.json +++ /dev/null @@ -1,24 +0,0 @@ -{ - "result": { - "item": "botania:twig_wand", - "nbt": "{color1:3,color2:6}" - }, - "pattern": [ - " AS", - " SB", - "S " - ], - "type": "minecraft:crafting_shaped", - "key": { - "A": { - "tag": "botania:petals/light_blue" - }, - "B": { - "tag": "botania:petals/pink" - }, - "S": { - "item": "botania:livingwood_twig" - } - }, - "group": "botania:twig_wand" -} \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_light_blue_purple.json b/src/main/resources/data/botania/recipes/wands/twigwand_light_blue_purple.json deleted file mode 100644 index 91b9aa6fc..000000000 --- a/src/main/resources/data/botania/recipes/wands/twigwand_light_blue_purple.json +++ /dev/null @@ -1,24 +0,0 @@ -{ - "result": { - "item": "botania:twig_wand", - "nbt": "{color1:3,color2:10}" - }, - "pattern": [ - " AS", - " SB", - "S " - ], - "type": "minecraft:crafting_shaped", - "key": { - "A": { - "tag": "botania:petals/light_blue" - }, - "B": { - "tag": "botania:petals/purple" - }, - "S": { - "item": "botania:livingwood_twig" - } - }, - "group": "botania:twig_wand" -} \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_light_blue_red.json b/src/main/resources/data/botania/recipes/wands/twigwand_light_blue_red.json deleted file mode 100644 index 5065deed8..000000000 --- a/src/main/resources/data/botania/recipes/wands/twigwand_light_blue_red.json +++ /dev/null @@ -1,24 +0,0 @@ -{ - "result": { - "item": "botania:twig_wand", - "nbt": "{color1:3,color2:14}" - }, - "pattern": [ - " AS", - " SB", - "S " - ], - "type": "minecraft:crafting_shaped", - "key": { - "A": { - "tag": "botania:petals/light_blue" - }, - "B": { - "tag": "botania:petals/red" - }, - "S": { - "item": "botania:livingwood_twig" - } - }, - "group": "botania:twig_wand" -} \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_light_blue_silver.json b/src/main/resources/data/botania/recipes/wands/twigwand_light_blue_silver.json deleted file mode 100644 index 1f5766ed1..000000000 --- a/src/main/resources/data/botania/recipes/wands/twigwand_light_blue_silver.json +++ /dev/null @@ -1,24 +0,0 @@ -{ - "result": { - "item": "botania:twig_wand", - "nbt": "{color1:3,color2:8}" - }, - "pattern": [ - " AS", - " SB", - "S " - ], - "type": "minecraft:crafting_shaped", - "key": { - "A": { - "tag": "botania:petals/light_blue" - }, - "B": { - "tag": "botania:petals/light_gray" - }, - "S": { - "item": "botania:livingwood_twig" - } - }, - "group": "botania:twig_wand" -} \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_light_blue_white.json b/src/main/resources/data/botania/recipes/wands/twigwand_light_blue_white.json deleted file mode 100644 index 03ea509b6..000000000 --- a/src/main/resources/data/botania/recipes/wands/twigwand_light_blue_white.json +++ /dev/null @@ -1,24 +0,0 @@ -{ - "result": { - "item": "botania:twig_wand", - "nbt": "{color1:3,color2:0}" - }, - "pattern": [ - " AS", - " SB", - "S " - ], - "type": "minecraft:crafting_shaped", - "key": { - "A": { - "tag": "botania:petals/light_blue" - }, - "B": { - "tag": "botania:petals/white" - }, - "S": { - "item": "botania:livingwood_twig" - } - }, - "group": "botania:twig_wand" -} \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_light_blue_yellow.json b/src/main/resources/data/botania/recipes/wands/twigwand_light_blue_yellow.json deleted file mode 100644 index 658f6daf3..000000000 --- a/src/main/resources/data/botania/recipes/wands/twigwand_light_blue_yellow.json +++ /dev/null @@ -1,24 +0,0 @@ -{ - "result": { - "item": "botania:twig_wand", - "nbt": "{color1:3,color2:4}" - }, - "pattern": [ - " AS", - " SB", - "S " - ], - "type": "minecraft:crafting_shaped", - "key": { - "A": { - "tag": "botania:petals/light_blue" - }, - "B": { - "tag": "botania:petals/yellow" - }, - "S": { - "item": "botania:livingwood_twig" - } - }, - "group": "botania:twig_wand" -} \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_lime_black.json b/src/main/resources/data/botania/recipes/wands/twigwand_lime_black.json deleted file mode 100644 index fc371a459..000000000 --- a/src/main/resources/data/botania/recipes/wands/twigwand_lime_black.json +++ /dev/null @@ -1,24 +0,0 @@ -{ - "result": { - "item": "botania:twig_wand", - "nbt": "{color1:5,color2:15}" - }, - "pattern": [ - " AS", - " SB", - "S " - ], - "type": "minecraft:crafting_shaped", - "key": { - "A": { - "tag": "botania:petals/lime" - }, - "B": { - "tag": "botania:petals/black" - }, - "S": { - "item": "botania:livingwood_twig" - } - }, - "group": "botania:twig_wand" -} \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_lime_blue.json b/src/main/resources/data/botania/recipes/wands/twigwand_lime_blue.json deleted file mode 100644 index 126a7f8de..000000000 --- a/src/main/resources/data/botania/recipes/wands/twigwand_lime_blue.json +++ /dev/null @@ -1,24 +0,0 @@ -{ - "result": { - "item": "botania:twig_wand", - "nbt": "{color1:5,color2:11}" - }, - "pattern": [ - " AS", - " SB", - "S " - ], - "type": "minecraft:crafting_shaped", - "key": { - "A": { - "tag": "botania:petals/lime" - }, - "B": { - "tag": "botania:petals/blue" - }, - "S": { - "item": "botania:livingwood_twig" - } - }, - "group": "botania:twig_wand" -} \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_lime_brown.json b/src/main/resources/data/botania/recipes/wands/twigwand_lime_brown.json deleted file mode 100644 index 0fcfcb5a0..000000000 --- a/src/main/resources/data/botania/recipes/wands/twigwand_lime_brown.json +++ /dev/null @@ -1,24 +0,0 @@ -{ - "result": { - "item": "botania:twig_wand", - "nbt": "{color1:5,color2:12}" - }, - "pattern": [ - " AS", - " SB", - "S " - ], - "type": "minecraft:crafting_shaped", - "key": { - "A": { - "tag": "botania:petals/lime" - }, - "B": { - "tag": "botania:petals/brown" - }, - "S": { - "item": "botania:livingwood_twig" - } - }, - "group": "botania:twig_wand" -} \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_lime_cyan.json b/src/main/resources/data/botania/recipes/wands/twigwand_lime_cyan.json deleted file mode 100644 index 6815b809b..000000000 --- a/src/main/resources/data/botania/recipes/wands/twigwand_lime_cyan.json +++ /dev/null @@ -1,24 +0,0 @@ -{ - "result": { - "item": "botania:twig_wand", - "nbt": "{color1:5,color2:9}" - }, - "pattern": [ - " AS", - " SB", - "S " - ], - "type": "minecraft:crafting_shaped", - "key": { - "A": { - "tag": "botania:petals/lime" - }, - "B": { - "tag": "botania:petals/cyan" - }, - "S": { - "item": "botania:livingwood_twig" - } - }, - "group": "botania:twig_wand" -} \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_lime_gray.json b/src/main/resources/data/botania/recipes/wands/twigwand_lime_gray.json deleted file mode 100644 index ab6e13391..000000000 --- a/src/main/resources/data/botania/recipes/wands/twigwand_lime_gray.json +++ /dev/null @@ -1,24 +0,0 @@ -{ - "result": { - "item": "botania:twig_wand", - "nbt": "{color1:5,color2:7}" - }, - "pattern": [ - " AS", - " SB", - "S " - ], - "type": "minecraft:crafting_shaped", - "key": { - "A": { - "tag": "botania:petals/lime" - }, - "B": { - "tag": "botania:petals/gray" - }, - "S": { - "item": "botania:livingwood_twig" - } - }, - "group": "botania:twig_wand" -} \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_lime_green.json b/src/main/resources/data/botania/recipes/wands/twigwand_lime_green.json deleted file mode 100644 index a1c21b535..000000000 --- a/src/main/resources/data/botania/recipes/wands/twigwand_lime_green.json +++ /dev/null @@ -1,24 +0,0 @@ -{ - "result": { - "item": "botania:twig_wand", - "nbt": "{color1:5,color2:13}" - }, - "pattern": [ - " AS", - " SB", - "S " - ], - "type": "minecraft:crafting_shaped", - "key": { - "A": { - "tag": "botania:petals/lime" - }, - "B": { - "tag": "botania:petals/green" - }, - "S": { - "item": "botania:livingwood_twig" - } - }, - "group": "botania:twig_wand" -} \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_lime_light_blue.json b/src/main/resources/data/botania/recipes/wands/twigwand_lime_light_blue.json deleted file mode 100644 index 9787ec866..000000000 --- a/src/main/resources/data/botania/recipes/wands/twigwand_lime_light_blue.json +++ /dev/null @@ -1,24 +0,0 @@ -{ - "result": { - "item": "botania:twig_wand", - "nbt": "{color1:5,color2:3}" - }, - "pattern": [ - " AS", - " SB", - "S " - ], - "type": "minecraft:crafting_shaped", - "key": { - "A": { - "tag": "botania:petals/lime" - }, - "B": { - "tag": "botania:petals/light_blue" - }, - "S": { - "item": "botania:livingwood_twig" - } - }, - "group": "botania:twig_wand" -} \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_lime_lime.json b/src/main/resources/data/botania/recipes/wands/twigwand_lime_lime.json deleted file mode 100644 index 9f54a09d4..000000000 --- a/src/main/resources/data/botania/recipes/wands/twigwand_lime_lime.json +++ /dev/null @@ -1,24 +0,0 @@ -{ - "result": { - "item": "botania:twig_wand", - "nbt": "{color1:5,color2:5}" - }, - "pattern": [ - " AS", - " SB", - "S " - ], - "type": "minecraft:crafting_shaped", - "key": { - "A": { - "tag": "botania:petals/lime" - }, - "B": { - "tag": "botania:petals/lime" - }, - "S": { - "item": "botania:livingwood_twig" - } - }, - "group": "botania:twig_wand" -} \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_lime_magenta.json b/src/main/resources/data/botania/recipes/wands/twigwand_lime_magenta.json deleted file mode 100644 index ecb6f1a7e..000000000 --- a/src/main/resources/data/botania/recipes/wands/twigwand_lime_magenta.json +++ /dev/null @@ -1,24 +0,0 @@ -{ - "result": { - "item": "botania:twig_wand", - "nbt": "{color1:5,color2:2}" - }, - "pattern": [ - " AS", - " SB", - "S " - ], - "type": "minecraft:crafting_shaped", - "key": { - "A": { - "tag": "botania:petals/lime" - }, - "B": { - "tag": "botania:petals/magenta" - }, - "S": { - "item": "botania:livingwood_twig" - } - }, - "group": "botania:twig_wand" -} \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_lime_orange.json b/src/main/resources/data/botania/recipes/wands/twigwand_lime_orange.json deleted file mode 100644 index 48090b292..000000000 --- a/src/main/resources/data/botania/recipes/wands/twigwand_lime_orange.json +++ /dev/null @@ -1,24 +0,0 @@ -{ - "result": { - "item": "botania:twig_wand", - "nbt": "{color1:5,color2:1}" - }, - "pattern": [ - " AS", - " SB", - "S " - ], - "type": "minecraft:crafting_shaped", - "key": { - "A": { - "tag": "botania:petals/lime" - }, - "B": { - "tag": "botania:petals/orange" - }, - "S": { - "item": "botania:livingwood_twig" - } - }, - "group": "botania:twig_wand" -} \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_lime_pink.json b/src/main/resources/data/botania/recipes/wands/twigwand_lime_pink.json deleted file mode 100644 index 4fd78e69c..000000000 --- a/src/main/resources/data/botania/recipes/wands/twigwand_lime_pink.json +++ /dev/null @@ -1,24 +0,0 @@ -{ - "result": { - "item": "botania:twig_wand", - "nbt": "{color1:5,color2:6}" - }, - "pattern": [ - " AS", - " SB", - "S " - ], - "type": "minecraft:crafting_shaped", - "key": { - "A": { - "tag": "botania:petals/lime" - }, - "B": { - "tag": "botania:petals/pink" - }, - "S": { - "item": "botania:livingwood_twig" - } - }, - "group": "botania:twig_wand" -} \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_lime_purple.json b/src/main/resources/data/botania/recipes/wands/twigwand_lime_purple.json deleted file mode 100644 index 6df42c703..000000000 --- a/src/main/resources/data/botania/recipes/wands/twigwand_lime_purple.json +++ /dev/null @@ -1,24 +0,0 @@ -{ - "result": { - "item": "botania:twig_wand", - "nbt": "{color1:5,color2:10}" - }, - "pattern": [ - " AS", - " SB", - "S " - ], - "type": "minecraft:crafting_shaped", - "key": { - "A": { - "tag": "botania:petals/lime" - }, - "B": { - "tag": "botania:petals/purple" - }, - "S": { - "item": "botania:livingwood_twig" - } - }, - "group": "botania:twig_wand" -} \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_lime_red.json b/src/main/resources/data/botania/recipes/wands/twigwand_lime_red.json deleted file mode 100644 index 43cb3a1dd..000000000 --- a/src/main/resources/data/botania/recipes/wands/twigwand_lime_red.json +++ /dev/null @@ -1,24 +0,0 @@ -{ - "result": { - "item": "botania:twig_wand", - "nbt": "{color1:5,color2:14}" - }, - "pattern": [ - " AS", - " SB", - "S " - ], - "type": "minecraft:crafting_shaped", - "key": { - "A": { - "tag": "botania:petals/lime" - }, - "B": { - "tag": "botania:petals/red" - }, - "S": { - "item": "botania:livingwood_twig" - } - }, - "group": "botania:twig_wand" -} \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_lime_silver.json b/src/main/resources/data/botania/recipes/wands/twigwand_lime_silver.json deleted file mode 100644 index 49f3ec771..000000000 --- a/src/main/resources/data/botania/recipes/wands/twigwand_lime_silver.json +++ /dev/null @@ -1,24 +0,0 @@ -{ - "result": { - "item": "botania:twig_wand", - "nbt": "{color1:5,color2:8}" - }, - "pattern": [ - " AS", - " SB", - "S " - ], - "type": "minecraft:crafting_shaped", - "key": { - "A": { - "tag": "botania:petals/lime" - }, - "B": { - "tag": "botania:petals/light_gray" - }, - "S": { - "item": "botania:livingwood_twig" - } - }, - "group": "botania:twig_wand" -} \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_lime_white.json b/src/main/resources/data/botania/recipes/wands/twigwand_lime_white.json deleted file mode 100644 index 8e19ae44a..000000000 --- a/src/main/resources/data/botania/recipes/wands/twigwand_lime_white.json +++ /dev/null @@ -1,24 +0,0 @@ -{ - "result": { - "item": "botania:twig_wand", - "nbt": "{color1:5,color2:0}" - }, - "pattern": [ - " AS", - " SB", - "S " - ], - "type": "minecraft:crafting_shaped", - "key": { - "A": { - "tag": "botania:petals/lime" - }, - "B": { - "tag": "botania:petals/white" - }, - "S": { - "item": "botania:livingwood_twig" - } - }, - "group": "botania:twig_wand" -} \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_lime_yellow.json b/src/main/resources/data/botania/recipes/wands/twigwand_lime_yellow.json deleted file mode 100644 index 30687e1a7..000000000 --- a/src/main/resources/data/botania/recipes/wands/twigwand_lime_yellow.json +++ /dev/null @@ -1,24 +0,0 @@ -{ - "result": { - "item": "botania:twig_wand", - "nbt": "{color1:5,color2:4}" - }, - "pattern": [ - " AS", - " SB", - "S " - ], - "type": "minecraft:crafting_shaped", - "key": { - "A": { - "tag": "botania:petals/lime" - }, - "B": { - "tag": "botania:petals/yellow" - }, - "S": { - "item": "botania:livingwood_twig" - } - }, - "group": "botania:twig_wand" -} \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_magenta_black.json b/src/main/resources/data/botania/recipes/wands/twigwand_magenta_black.json deleted file mode 100644 index 25a5b562f..000000000 --- a/src/main/resources/data/botania/recipes/wands/twigwand_magenta_black.json +++ /dev/null @@ -1,24 +0,0 @@ -{ - "result": { - "item": "botania:twig_wand", - "nbt": "{color1:2,color2:15}" - }, - "pattern": [ - " AS", - " SB", - "S " - ], - "type": "minecraft:crafting_shaped", - "key": { - "A": { - "tag": "botania:petals/magenta" - }, - "B": { - "tag": "botania:petals/black" - }, - "S": { - "item": "botania:livingwood_twig" - } - }, - "group": "botania:twig_wand" -} \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_magenta_blue.json b/src/main/resources/data/botania/recipes/wands/twigwand_magenta_blue.json deleted file mode 100644 index 6c32e4e27..000000000 --- a/src/main/resources/data/botania/recipes/wands/twigwand_magenta_blue.json +++ /dev/null @@ -1,24 +0,0 @@ -{ - "result": { - "item": "botania:twig_wand", - "nbt": "{color1:2,color2:11}" - }, - "pattern": [ - " AS", - " SB", - "S " - ], - "type": "minecraft:crafting_shaped", - "key": { - "A": { - "tag": "botania:petals/magenta" - }, - "B": { - "tag": "botania:petals/blue" - }, - "S": { - "item": "botania:livingwood_twig" - } - }, - "group": "botania:twig_wand" -} \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_magenta_brown.json b/src/main/resources/data/botania/recipes/wands/twigwand_magenta_brown.json deleted file mode 100644 index 1f820b119..000000000 --- a/src/main/resources/data/botania/recipes/wands/twigwand_magenta_brown.json +++ /dev/null @@ -1,24 +0,0 @@ -{ - "result": { - "item": "botania:twig_wand", - "nbt": "{color1:2,color2:12}" - }, - "pattern": [ - " AS", - " SB", - "S " - ], - "type": "minecraft:crafting_shaped", - "key": { - "A": { - "tag": "botania:petals/magenta" - }, - "B": { - "tag": "botania:petals/brown" - }, - "S": { - "item": "botania:livingwood_twig" - } - }, - "group": "botania:twig_wand" -} \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_magenta_cyan.json b/src/main/resources/data/botania/recipes/wands/twigwand_magenta_cyan.json deleted file mode 100644 index 068fb8f9e..000000000 --- a/src/main/resources/data/botania/recipes/wands/twigwand_magenta_cyan.json +++ /dev/null @@ -1,24 +0,0 @@ -{ - "result": { - "item": "botania:twig_wand", - "nbt": "{color1:2,color2:9}" - }, - "pattern": [ - " AS", - " SB", - "S " - ], - "type": "minecraft:crafting_shaped", - "key": { - "A": { - "tag": "botania:petals/magenta" - }, - "B": { - "tag": "botania:petals/cyan" - }, - "S": { - "item": "botania:livingwood_twig" - } - }, - "group": "botania:twig_wand" -} \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_magenta_gray.json b/src/main/resources/data/botania/recipes/wands/twigwand_magenta_gray.json deleted file mode 100644 index 865c6bf49..000000000 --- a/src/main/resources/data/botania/recipes/wands/twigwand_magenta_gray.json +++ /dev/null @@ -1,24 +0,0 @@ -{ - "result": { - "item": "botania:twig_wand", - "nbt": "{color1:2,color2:7}" - }, - "pattern": [ - " AS", - " SB", - "S " - ], - "type": "minecraft:crafting_shaped", - "key": { - "A": { - "tag": "botania:petals/magenta" - }, - "B": { - "tag": "botania:petals/gray" - }, - "S": { - "item": "botania:livingwood_twig" - } - }, - "group": "botania:twig_wand" -} \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_magenta_green.json b/src/main/resources/data/botania/recipes/wands/twigwand_magenta_green.json deleted file mode 100644 index f7f0ba122..000000000 --- a/src/main/resources/data/botania/recipes/wands/twigwand_magenta_green.json +++ /dev/null @@ -1,24 +0,0 @@ -{ - "result": { - "item": "botania:twig_wand", - "nbt": "{color1:2,color2:13}" - }, - "pattern": [ - " AS", - " SB", - "S " - ], - "type": "minecraft:crafting_shaped", - "key": { - "A": { - "tag": "botania:petals/magenta" - }, - "B": { - "tag": "botania:petals/green" - }, - "S": { - "item": "botania:livingwood_twig" - } - }, - "group": "botania:twig_wand" -} \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_magenta_light_blue.json b/src/main/resources/data/botania/recipes/wands/twigwand_magenta_light_blue.json deleted file mode 100644 index 6c89cecc4..000000000 --- a/src/main/resources/data/botania/recipes/wands/twigwand_magenta_light_blue.json +++ /dev/null @@ -1,24 +0,0 @@ -{ - "result": { - "item": "botania:twig_wand", - "nbt": "{color1:2,color2:3}" - }, - "pattern": [ - " AS", - " SB", - "S " - ], - "type": "minecraft:crafting_shaped", - "key": { - "A": { - "tag": "botania:petals/magenta" - }, - "B": { - "tag": "botania:petals/light_blue" - }, - "S": { - "item": "botania:livingwood_twig" - } - }, - "group": "botania:twig_wand" -} \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_magenta_lime.json b/src/main/resources/data/botania/recipes/wands/twigwand_magenta_lime.json deleted file mode 100644 index 2ba68dc39..000000000 --- a/src/main/resources/data/botania/recipes/wands/twigwand_magenta_lime.json +++ /dev/null @@ -1,24 +0,0 @@ -{ - "result": { - "item": "botania:twig_wand", - "nbt": "{color1:2,color2:5}" - }, - "pattern": [ - " AS", - " SB", - "S " - ], - "type": "minecraft:crafting_shaped", - "key": { - "A": { - "tag": "botania:petals/magenta" - }, - "B": { - "tag": "botania:petals/lime" - }, - "S": { - "item": "botania:livingwood_twig" - } - }, - "group": "botania:twig_wand" -} \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_magenta_magenta.json b/src/main/resources/data/botania/recipes/wands/twigwand_magenta_magenta.json deleted file mode 100644 index 1ee3e599c..000000000 --- a/src/main/resources/data/botania/recipes/wands/twigwand_magenta_magenta.json +++ /dev/null @@ -1,24 +0,0 @@ -{ - "result": { - "item": "botania:twig_wand", - "nbt": "{color1:2,color2:2}" - }, - "pattern": [ - " AS", - " SB", - "S " - ], - "type": "minecraft:crafting_shaped", - "key": { - "A": { - "tag": "botania:petals/magenta" - }, - "B": { - "tag": "botania:petals/magenta" - }, - "S": { - "item": "botania:livingwood_twig" - } - }, - "group": "botania:twig_wand" -} \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_magenta_orange.json b/src/main/resources/data/botania/recipes/wands/twigwand_magenta_orange.json deleted file mode 100644 index 3dc8b3793..000000000 --- a/src/main/resources/data/botania/recipes/wands/twigwand_magenta_orange.json +++ /dev/null @@ -1,24 +0,0 @@ -{ - "result": { - "item": "botania:twig_wand", - "nbt": "{color1:2,color2:1}" - }, - "pattern": [ - " AS", - " SB", - "S " - ], - "type": "minecraft:crafting_shaped", - "key": { - "A": { - "tag": "botania:petals/magenta" - }, - "B": { - "tag": "botania:petals/orange" - }, - "S": { - "item": "botania:livingwood_twig" - } - }, - "group": "botania:twig_wand" -} \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_magenta_pink.json b/src/main/resources/data/botania/recipes/wands/twigwand_magenta_pink.json deleted file mode 100644 index 33486368d..000000000 --- a/src/main/resources/data/botania/recipes/wands/twigwand_magenta_pink.json +++ /dev/null @@ -1,24 +0,0 @@ -{ - "result": { - "item": "botania:twig_wand", - "nbt": "{color1:2,color2:6}" - }, - "pattern": [ - " AS", - " SB", - "S " - ], - "type": "minecraft:crafting_shaped", - "key": { - "A": { - "tag": "botania:petals/magenta" - }, - "B": { - "tag": "botania:petals/pink" - }, - "S": { - "item": "botania:livingwood_twig" - } - }, - "group": "botania:twig_wand" -} \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_magenta_purple.json b/src/main/resources/data/botania/recipes/wands/twigwand_magenta_purple.json deleted file mode 100644 index aadf03c82..000000000 --- a/src/main/resources/data/botania/recipes/wands/twigwand_magenta_purple.json +++ /dev/null @@ -1,24 +0,0 @@ -{ - "result": { - "item": "botania:twig_wand", - "nbt": "{color1:2,color2:10}" - }, - "pattern": [ - " AS", - " SB", - "S " - ], - "type": "minecraft:crafting_shaped", - "key": { - "A": { - "tag": "botania:petals/magenta" - }, - "B": { - "tag": "botania:petals/purple" - }, - "S": { - "item": "botania:livingwood_twig" - } - }, - "group": "botania:twig_wand" -} \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_magenta_red.json b/src/main/resources/data/botania/recipes/wands/twigwand_magenta_red.json deleted file mode 100644 index 6b43e1c0d..000000000 --- a/src/main/resources/data/botania/recipes/wands/twigwand_magenta_red.json +++ /dev/null @@ -1,24 +0,0 @@ -{ - "result": { - "item": "botania:twig_wand", - "nbt": "{color1:2,color2:14}" - }, - "pattern": [ - " AS", - " SB", - "S " - ], - "type": "minecraft:crafting_shaped", - "key": { - "A": { - "tag": "botania:petals/magenta" - }, - "B": { - "tag": "botania:petals/red" - }, - "S": { - "item": "botania:livingwood_twig" - } - }, - "group": "botania:twig_wand" -} \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_magenta_silver.json b/src/main/resources/data/botania/recipes/wands/twigwand_magenta_silver.json deleted file mode 100644 index 2217e1685..000000000 --- a/src/main/resources/data/botania/recipes/wands/twigwand_magenta_silver.json +++ /dev/null @@ -1,24 +0,0 @@ -{ - "result": { - "item": "botania:twig_wand", - "nbt": "{color1:2,color2:8}" - }, - "pattern": [ - " AS", - " SB", - "S " - ], - "type": "minecraft:crafting_shaped", - "key": { - "A": { - "tag": "botania:petals/magenta" - }, - "B": { - "tag": "botania:petals/light_gray" - }, - "S": { - "item": "botania:livingwood_twig" - } - }, - "group": "botania:twig_wand" -} \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_magenta_white.json b/src/main/resources/data/botania/recipes/wands/twigwand_magenta_white.json deleted file mode 100644 index 8ac8baa1e..000000000 --- a/src/main/resources/data/botania/recipes/wands/twigwand_magenta_white.json +++ /dev/null @@ -1,24 +0,0 @@ -{ - "result": { - "item": "botania:twig_wand", - "nbt": "{color1:2,color2:0}" - }, - "pattern": [ - " AS", - " SB", - "S " - ], - "type": "minecraft:crafting_shaped", - "key": { - "A": { - "tag": "botania:petals/magenta" - }, - "B": { - "tag": "botania:petals/white" - }, - "S": { - "item": "botania:livingwood_twig" - } - }, - "group": "botania:twig_wand" -} \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_magenta_yellow.json b/src/main/resources/data/botania/recipes/wands/twigwand_magenta_yellow.json deleted file mode 100644 index 7b70e6f31..000000000 --- a/src/main/resources/data/botania/recipes/wands/twigwand_magenta_yellow.json +++ /dev/null @@ -1,24 +0,0 @@ -{ - "result": { - "item": "botania:twig_wand", - "nbt": "{color1:2,color2:4}" - }, - "pattern": [ - " AS", - " SB", - "S " - ], - "type": "minecraft:crafting_shaped", - "key": { - "A": { - "tag": "botania:petals/magenta" - }, - "B": { - "tag": "botania:petals/yellow" - }, - "S": { - "item": "botania:livingwood_twig" - } - }, - "group": "botania:twig_wand" -} \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_orange_black.json b/src/main/resources/data/botania/recipes/wands/twigwand_orange_black.json deleted file mode 100644 index c75fa0488..000000000 --- a/src/main/resources/data/botania/recipes/wands/twigwand_orange_black.json +++ /dev/null @@ -1,24 +0,0 @@ -{ - "result": { - "item": "botania:twig_wand", - "nbt": "{color1:1,color2:15}" - }, - "pattern": [ - " AS", - " SB", - "S " - ], - "type": "minecraft:crafting_shaped", - "key": { - "A": { - "tag": "botania:petals/orange" - }, - "B": { - "tag": "botania:petals/black" - }, - "S": { - "item": "botania:livingwood_twig" - } - }, - "group": "botania:twig_wand" -} \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_orange_blue.json b/src/main/resources/data/botania/recipes/wands/twigwand_orange_blue.json deleted file mode 100644 index c153de3d1..000000000 --- a/src/main/resources/data/botania/recipes/wands/twigwand_orange_blue.json +++ /dev/null @@ -1,24 +0,0 @@ -{ - "result": { - "item": "botania:twig_wand", - "nbt": "{color1:1,color2:11}" - }, - "pattern": [ - " AS", - " SB", - "S " - ], - "type": "minecraft:crafting_shaped", - "key": { - "A": { - "tag": "botania:petals/orange" - }, - "B": { - "tag": "botania:petals/blue" - }, - "S": { - "item": "botania:livingwood_twig" - } - }, - "group": "botania:twig_wand" -} \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_orange_brown.json b/src/main/resources/data/botania/recipes/wands/twigwand_orange_brown.json deleted file mode 100644 index dd2e5362d..000000000 --- a/src/main/resources/data/botania/recipes/wands/twigwand_orange_brown.json +++ /dev/null @@ -1,24 +0,0 @@ -{ - "result": { - "item": "botania:twig_wand", - "nbt": "{color1:1,color2:12}" - }, - "pattern": [ - " AS", - " SB", - "S " - ], - "type": "minecraft:crafting_shaped", - "key": { - "A": { - "tag": "botania:petals/orange" - }, - "B": { - "tag": "botania:petals/brown" - }, - "S": { - "item": "botania:livingwood_twig" - } - }, - "group": "botania:twig_wand" -} \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_orange_cyan.json b/src/main/resources/data/botania/recipes/wands/twigwand_orange_cyan.json deleted file mode 100644 index 9296fa5d7..000000000 --- a/src/main/resources/data/botania/recipes/wands/twigwand_orange_cyan.json +++ /dev/null @@ -1,24 +0,0 @@ -{ - "result": { - "item": "botania:twig_wand", - "nbt": "{color1:1,color2:9}" - }, - "pattern": [ - " AS", - " SB", - "S " - ], - "type": "minecraft:crafting_shaped", - "key": { - "A": { - "tag": "botania:petals/orange" - }, - "B": { - "tag": "botania:petals/cyan" - }, - "S": { - "item": "botania:livingwood_twig" - } - }, - "group": "botania:twig_wand" -} \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_orange_gray.json b/src/main/resources/data/botania/recipes/wands/twigwand_orange_gray.json deleted file mode 100644 index a2b2297d0..000000000 --- a/src/main/resources/data/botania/recipes/wands/twigwand_orange_gray.json +++ /dev/null @@ -1,24 +0,0 @@ -{ - "result": { - "item": "botania:twig_wand", - "nbt": "{color1:1,color2:7}" - }, - "pattern": [ - " AS", - " SB", - "S " - ], - "type": "minecraft:crafting_shaped", - "key": { - "A": { - "tag": "botania:petals/orange" - }, - "B": { - "tag": "botania:petals/gray" - }, - "S": { - "item": "botania:livingwood_twig" - } - }, - "group": "botania:twig_wand" -} \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_orange_green.json b/src/main/resources/data/botania/recipes/wands/twigwand_orange_green.json deleted file mode 100644 index 8c6c9acba..000000000 --- a/src/main/resources/data/botania/recipes/wands/twigwand_orange_green.json +++ /dev/null @@ -1,24 +0,0 @@ -{ - "result": { - "item": "botania:twig_wand", - "nbt": "{color1:1,color2:13}" - }, - "pattern": [ - " AS", - " SB", - "S " - ], - "type": "minecraft:crafting_shaped", - "key": { - "A": { - "tag": "botania:petals/orange" - }, - "B": { - "tag": "botania:petals/green" - }, - "S": { - "item": "botania:livingwood_twig" - } - }, - "group": "botania:twig_wand" -} \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_orange_light_blue.json b/src/main/resources/data/botania/recipes/wands/twigwand_orange_light_blue.json deleted file mode 100644 index cc76c396d..000000000 --- a/src/main/resources/data/botania/recipes/wands/twigwand_orange_light_blue.json +++ /dev/null @@ -1,24 +0,0 @@ -{ - "result": { - "item": "botania:twig_wand", - "nbt": "{color1:1,color2:3}" - }, - "pattern": [ - " AS", - " SB", - "S " - ], - "type": "minecraft:crafting_shaped", - "key": { - "A": { - "tag": "botania:petals/orange" - }, - "B": { - "tag": "botania:petals/light_blue" - }, - "S": { - "item": "botania:livingwood_twig" - } - }, - "group": "botania:twig_wand" -} \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_orange_lime.json b/src/main/resources/data/botania/recipes/wands/twigwand_orange_lime.json deleted file mode 100644 index 325d8aeaf..000000000 --- a/src/main/resources/data/botania/recipes/wands/twigwand_orange_lime.json +++ /dev/null @@ -1,24 +0,0 @@ -{ - "result": { - "item": "botania:twig_wand", - "nbt": "{color1:1,color2:5}" - }, - "pattern": [ - " AS", - " SB", - "S " - ], - "type": "minecraft:crafting_shaped", - "key": { - "A": { - "tag": "botania:petals/orange" - }, - "B": { - "tag": "botania:petals/lime" - }, - "S": { - "item": "botania:livingwood_twig" - } - }, - "group": "botania:twig_wand" -} \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_orange_magenta.json b/src/main/resources/data/botania/recipes/wands/twigwand_orange_magenta.json deleted file mode 100644 index c750a0d37..000000000 --- a/src/main/resources/data/botania/recipes/wands/twigwand_orange_magenta.json +++ /dev/null @@ -1,24 +0,0 @@ -{ - "result": { - "item": "botania:twig_wand", - "nbt": "{color1:1,color2:2}" - }, - "pattern": [ - " AS", - " SB", - "S " - ], - "type": "minecraft:crafting_shaped", - "key": { - "A": { - "tag": "botania:petals/orange" - }, - "B": { - "tag": "botania:petals/magenta" - }, - "S": { - "item": "botania:livingwood_twig" - } - }, - "group": "botania:twig_wand" -} \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_orange_orange.json b/src/main/resources/data/botania/recipes/wands/twigwand_orange_orange.json deleted file mode 100644 index 9e258d257..000000000 --- a/src/main/resources/data/botania/recipes/wands/twigwand_orange_orange.json +++ /dev/null @@ -1,24 +0,0 @@ -{ - "result": { - "item": "botania:twig_wand", - "nbt": "{color1:1,color2:1}" - }, - "pattern": [ - " AS", - " SB", - "S " - ], - "type": "minecraft:crafting_shaped", - "key": { - "A": { - "tag": "botania:petals/orange" - }, - "B": { - "tag": "botania:petals/orange" - }, - "S": { - "item": "botania:livingwood_twig" - } - }, - "group": "botania:twig_wand" -} \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_orange_pink.json b/src/main/resources/data/botania/recipes/wands/twigwand_orange_pink.json deleted file mode 100644 index 2f0bb3a1b..000000000 --- a/src/main/resources/data/botania/recipes/wands/twigwand_orange_pink.json +++ /dev/null @@ -1,24 +0,0 @@ -{ - "result": { - "item": "botania:twig_wand", - "nbt": "{color1:1,color2:6}" - }, - "pattern": [ - " AS", - " SB", - "S " - ], - "type": "minecraft:crafting_shaped", - "key": { - "A": { - "tag": "botania:petals/orange" - }, - "B": { - "tag": "botania:petals/pink" - }, - "S": { - "item": "botania:livingwood_twig" - } - }, - "group": "botania:twig_wand" -} \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_orange_purple.json b/src/main/resources/data/botania/recipes/wands/twigwand_orange_purple.json deleted file mode 100644 index b55849f37..000000000 --- a/src/main/resources/data/botania/recipes/wands/twigwand_orange_purple.json +++ /dev/null @@ -1,24 +0,0 @@ -{ - "result": { - "item": "botania:twig_wand", - "nbt": "{color1:1,color2:10}" - }, - "pattern": [ - " AS", - " SB", - "S " - ], - "type": "minecraft:crafting_shaped", - "key": { - "A": { - "tag": "botania:petals/orange" - }, - "B": { - "tag": "botania:petals/purple" - }, - "S": { - "item": "botania:livingwood_twig" - } - }, - "group": "botania:twig_wand" -} \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_orange_red.json b/src/main/resources/data/botania/recipes/wands/twigwand_orange_red.json deleted file mode 100644 index f0adb6bca..000000000 --- a/src/main/resources/data/botania/recipes/wands/twigwand_orange_red.json +++ /dev/null @@ -1,24 +0,0 @@ -{ - "result": { - "item": "botania:twig_wand", - "nbt": "{color1:1,color2:14}" - }, - "pattern": [ - " AS", - " SB", - "S " - ], - "type": "minecraft:crafting_shaped", - "key": { - "A": { - "tag": "botania:petals/orange" - }, - "B": { - "tag": "botania:petals/red" - }, - "S": { - "item": "botania:livingwood_twig" - } - }, - "group": "botania:twig_wand" -} \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_orange_silver.json b/src/main/resources/data/botania/recipes/wands/twigwand_orange_silver.json deleted file mode 100644 index ad316852c..000000000 --- a/src/main/resources/data/botania/recipes/wands/twigwand_orange_silver.json +++ /dev/null @@ -1,24 +0,0 @@ -{ - "result": { - "item": "botania:twig_wand", - "nbt": "{color1:1,color2:8}" - }, - "pattern": [ - " AS", - " SB", - "S " - ], - "type": "minecraft:crafting_shaped", - "key": { - "A": { - "tag": "botania:petals/orange" - }, - "B": { - "tag": "botania:petals/light_gray" - }, - "S": { - "item": "botania:livingwood_twig" - } - }, - "group": "botania:twig_wand" -} \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_orange_white.json b/src/main/resources/data/botania/recipes/wands/twigwand_orange_white.json deleted file mode 100644 index d4affa8ca..000000000 --- a/src/main/resources/data/botania/recipes/wands/twigwand_orange_white.json +++ /dev/null @@ -1,24 +0,0 @@ -{ - "result": { - "item": "botania:twig_wand", - "nbt": "{color1:1,color2:0}" - }, - "pattern": [ - " AS", - " SB", - "S " - ], - "type": "minecraft:crafting_shaped", - "key": { - "A": { - "tag": "botania:petals/orange" - }, - "B": { - "tag": "botania:petals/white" - }, - "S": { - "item": "botania:livingwood_twig" - } - }, - "group": "botania:twig_wand" -} \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_orange_yellow.json b/src/main/resources/data/botania/recipes/wands/twigwand_orange_yellow.json deleted file mode 100644 index e90fcfe31..000000000 --- a/src/main/resources/data/botania/recipes/wands/twigwand_orange_yellow.json +++ /dev/null @@ -1,24 +0,0 @@ -{ - "result": { - "item": "botania:twig_wand", - "nbt": "{color1:1,color2:4}" - }, - "pattern": [ - " AS", - " SB", - "S " - ], - "type": "minecraft:crafting_shaped", - "key": { - "A": { - "tag": "botania:petals/orange" - }, - "B": { - "tag": "botania:petals/yellow" - }, - "S": { - "item": "botania:livingwood_twig" - } - }, - "group": "botania:twig_wand" -} \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_pink_black.json b/src/main/resources/data/botania/recipes/wands/twigwand_pink_black.json deleted file mode 100644 index 48b3ed41d..000000000 --- a/src/main/resources/data/botania/recipes/wands/twigwand_pink_black.json +++ /dev/null @@ -1,24 +0,0 @@ -{ - "result": { - "item": "botania:twig_wand", - "nbt": "{color1:6,color2:15}" - }, - "pattern": [ - " AS", - " SB", - "S " - ], - "type": "minecraft:crafting_shaped", - "key": { - "A": { - "tag": "botania:petals/pink" - }, - "B": { - "tag": "botania:petals/black" - }, - "S": { - "item": "botania:livingwood_twig" - } - }, - "group": "botania:twig_wand" -} \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_pink_blue.json b/src/main/resources/data/botania/recipes/wands/twigwand_pink_blue.json deleted file mode 100644 index eb2e808f2..000000000 --- a/src/main/resources/data/botania/recipes/wands/twigwand_pink_blue.json +++ /dev/null @@ -1,24 +0,0 @@ -{ - "result": { - "item": "botania:twig_wand", - "nbt": "{color1:6,color2:11}" - }, - "pattern": [ - " AS", - " SB", - "S " - ], - "type": "minecraft:crafting_shaped", - "key": { - "A": { - "tag": "botania:petals/pink" - }, - "B": { - "tag": "botania:petals/blue" - }, - "S": { - "item": "botania:livingwood_twig" - } - }, - "group": "botania:twig_wand" -} \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_pink_brown.json b/src/main/resources/data/botania/recipes/wands/twigwand_pink_brown.json deleted file mode 100644 index 1878cbdd9..000000000 --- a/src/main/resources/data/botania/recipes/wands/twigwand_pink_brown.json +++ /dev/null @@ -1,24 +0,0 @@ -{ - "result": { - "item": "botania:twig_wand", - "nbt": "{color1:6,color2:12}" - }, - "pattern": [ - " AS", - " SB", - "S " - ], - "type": "minecraft:crafting_shaped", - "key": { - "A": { - "tag": "botania:petals/pink" - }, - "B": { - "tag": "botania:petals/brown" - }, - "S": { - "item": "botania:livingwood_twig" - } - }, - "group": "botania:twig_wand" -} \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_pink_cyan.json b/src/main/resources/data/botania/recipes/wands/twigwand_pink_cyan.json deleted file mode 100644 index 4a85e3527..000000000 --- a/src/main/resources/data/botania/recipes/wands/twigwand_pink_cyan.json +++ /dev/null @@ -1,24 +0,0 @@ -{ - "result": { - "item": "botania:twig_wand", - "nbt": "{color1:6,color2:9}" - }, - "pattern": [ - " AS", - " SB", - "S " - ], - "type": "minecraft:crafting_shaped", - "key": { - "A": { - "tag": "botania:petals/pink" - }, - "B": { - "tag": "botania:petals/cyan" - }, - "S": { - "item": "botania:livingwood_twig" - } - }, - "group": "botania:twig_wand" -} \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_pink_gray.json b/src/main/resources/data/botania/recipes/wands/twigwand_pink_gray.json deleted file mode 100644 index f0b8670ae..000000000 --- a/src/main/resources/data/botania/recipes/wands/twigwand_pink_gray.json +++ /dev/null @@ -1,24 +0,0 @@ -{ - "result": { - "item": "botania:twig_wand", - "nbt": "{color1:6,color2:7}" - }, - "pattern": [ - " AS", - " SB", - "S " - ], - "type": "minecraft:crafting_shaped", - "key": { - "A": { - "tag": "botania:petals/pink" - }, - "B": { - "tag": "botania:petals/gray" - }, - "S": { - "item": "botania:livingwood_twig" - } - }, - "group": "botania:twig_wand" -} \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_pink_green.json b/src/main/resources/data/botania/recipes/wands/twigwand_pink_green.json deleted file mode 100644 index f7120dc99..000000000 --- a/src/main/resources/data/botania/recipes/wands/twigwand_pink_green.json +++ /dev/null @@ -1,24 +0,0 @@ -{ - "result": { - "item": "botania:twig_wand", - "nbt": "{color1:6,color2:13}" - }, - "pattern": [ - " AS", - " SB", - "S " - ], - "type": "minecraft:crafting_shaped", - "key": { - "A": { - "tag": "botania:petals/pink" - }, - "B": { - "tag": "botania:petals/green" - }, - "S": { - "item": "botania:livingwood_twig" - } - }, - "group": "botania:twig_wand" -} \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_pink_light_blue.json b/src/main/resources/data/botania/recipes/wands/twigwand_pink_light_blue.json deleted file mode 100644 index 8fae540cf..000000000 --- a/src/main/resources/data/botania/recipes/wands/twigwand_pink_light_blue.json +++ /dev/null @@ -1,24 +0,0 @@ -{ - "result": { - "item": "botania:twig_wand", - "nbt": "{color1:6,color2:3}" - }, - "pattern": [ - " AS", - " SB", - "S " - ], - "type": "minecraft:crafting_shaped", - "key": { - "A": { - "tag": "botania:petals/pink" - }, - "B": { - "tag": "botania:petals/light_blue" - }, - "S": { - "item": "botania:livingwood_twig" - } - }, - "group": "botania:twig_wand" -} \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_pink_lime.json b/src/main/resources/data/botania/recipes/wands/twigwand_pink_lime.json deleted file mode 100644 index 7b46bb2f4..000000000 --- a/src/main/resources/data/botania/recipes/wands/twigwand_pink_lime.json +++ /dev/null @@ -1,24 +0,0 @@ -{ - "result": { - "item": "botania:twig_wand", - "nbt": "{color1:6,color2:5}" - }, - "pattern": [ - " AS", - " SB", - "S " - ], - "type": "minecraft:crafting_shaped", - "key": { - "A": { - "tag": "botania:petals/pink" - }, - "B": { - "tag": "botania:petals/lime" - }, - "S": { - "item": "botania:livingwood_twig" - } - }, - "group": "botania:twig_wand" -} \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_pink_magenta.json b/src/main/resources/data/botania/recipes/wands/twigwand_pink_magenta.json deleted file mode 100644 index 7f4237f15..000000000 --- a/src/main/resources/data/botania/recipes/wands/twigwand_pink_magenta.json +++ /dev/null @@ -1,24 +0,0 @@ -{ - "result": { - "item": "botania:twig_wand", - "nbt": "{color1:6,color2:2}" - }, - "pattern": [ - " AS", - " SB", - "S " - ], - "type": "minecraft:crafting_shaped", - "key": { - "A": { - "tag": "botania:petals/pink" - }, - "B": { - "tag": "botania:petals/magenta" - }, - "S": { - "item": "botania:livingwood_twig" - } - }, - "group": "botania:twig_wand" -} \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_pink_orange.json b/src/main/resources/data/botania/recipes/wands/twigwand_pink_orange.json deleted file mode 100644 index 733f470f8..000000000 --- a/src/main/resources/data/botania/recipes/wands/twigwand_pink_orange.json +++ /dev/null @@ -1,24 +0,0 @@ -{ - "result": { - "item": "botania:twig_wand", - "nbt": "{color1:6,color2:1}" - }, - "pattern": [ - " AS", - " SB", - "S " - ], - "type": "minecraft:crafting_shaped", - "key": { - "A": { - "tag": "botania:petals/pink" - }, - "B": { - "tag": "botania:petals/orange" - }, - "S": { - "item": "botania:livingwood_twig" - } - }, - "group": "botania:twig_wand" -} \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_pink_pink.json b/src/main/resources/data/botania/recipes/wands/twigwand_pink_pink.json deleted file mode 100644 index 144aa6ae0..000000000 --- a/src/main/resources/data/botania/recipes/wands/twigwand_pink_pink.json +++ /dev/null @@ -1,24 +0,0 @@ -{ - "result": { - "item": "botania:twig_wand", - "nbt": "{color1:6,color2:6}" - }, - "pattern": [ - " AS", - " SB", - "S " - ], - "type": "minecraft:crafting_shaped", - "key": { - "A": { - "tag": "botania:petals/pink" - }, - "B": { - "tag": "botania:petals/pink" - }, - "S": { - "item": "botania:livingwood_twig" - } - }, - "group": "botania:twig_wand" -} \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_pink_purple.json b/src/main/resources/data/botania/recipes/wands/twigwand_pink_purple.json deleted file mode 100644 index c74b8cc3d..000000000 --- a/src/main/resources/data/botania/recipes/wands/twigwand_pink_purple.json +++ /dev/null @@ -1,24 +0,0 @@ -{ - "result": { - "item": "botania:twig_wand", - "nbt": "{color1:6,color2:10}" - }, - "pattern": [ - " AS", - " SB", - "S " - ], - "type": "minecraft:crafting_shaped", - "key": { - "A": { - "tag": "botania:petals/pink" - }, - "B": { - "tag": "botania:petals/purple" - }, - "S": { - "item": "botania:livingwood_twig" - } - }, - "group": "botania:twig_wand" -} \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_pink_red.json b/src/main/resources/data/botania/recipes/wands/twigwand_pink_red.json deleted file mode 100644 index d34f43a9a..000000000 --- a/src/main/resources/data/botania/recipes/wands/twigwand_pink_red.json +++ /dev/null @@ -1,24 +0,0 @@ -{ - "result": { - "item": "botania:twig_wand", - "nbt": "{color1:6,color2:14}" - }, - "pattern": [ - " AS", - " SB", - "S " - ], - "type": "minecraft:crafting_shaped", - "key": { - "A": { - "tag": "botania:petals/pink" - }, - "B": { - "tag": "botania:petals/red" - }, - "S": { - "item": "botania:livingwood_twig" - } - }, - "group": "botania:twig_wand" -} \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_pink_silver.json b/src/main/resources/data/botania/recipes/wands/twigwand_pink_silver.json deleted file mode 100644 index d6e9064b9..000000000 --- a/src/main/resources/data/botania/recipes/wands/twigwand_pink_silver.json +++ /dev/null @@ -1,24 +0,0 @@ -{ - "result": { - "item": "botania:twig_wand", - "nbt": "{color1:6,color2:8}" - }, - "pattern": [ - " AS", - " SB", - "S " - ], - "type": "minecraft:crafting_shaped", - "key": { - "A": { - "tag": "botania:petals/pink" - }, - "B": { - "tag": "botania:petals/light_gray" - }, - "S": { - "item": "botania:livingwood_twig" - } - }, - "group": "botania:twig_wand" -} \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_pink_white.json b/src/main/resources/data/botania/recipes/wands/twigwand_pink_white.json deleted file mode 100644 index 8a4336400..000000000 --- a/src/main/resources/data/botania/recipes/wands/twigwand_pink_white.json +++ /dev/null @@ -1,24 +0,0 @@ -{ - "result": { - "item": "botania:twig_wand", - "nbt": "{color1:6,color2:0}" - }, - "pattern": [ - " AS", - " SB", - "S " - ], - "type": "minecraft:crafting_shaped", - "key": { - "A": { - "tag": "botania:petals/pink" - }, - "B": { - "tag": "botania:petals/white" - }, - "S": { - "item": "botania:livingwood_twig" - } - }, - "group": "botania:twig_wand" -} \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_pink_yellow.json b/src/main/resources/data/botania/recipes/wands/twigwand_pink_yellow.json deleted file mode 100644 index 5f565eebf..000000000 --- a/src/main/resources/data/botania/recipes/wands/twigwand_pink_yellow.json +++ /dev/null @@ -1,24 +0,0 @@ -{ - "result": { - "item": "botania:twig_wand", - "nbt": "{color1:6,color2:4}" - }, - "pattern": [ - " AS", - " SB", - "S " - ], - "type": "minecraft:crafting_shaped", - "key": { - "A": { - "tag": "botania:petals/pink" - }, - "B": { - "tag": "botania:petals/yellow" - }, - "S": { - "item": "botania:livingwood_twig" - } - }, - "group": "botania:twig_wand" -} \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_purple_black.json b/src/main/resources/data/botania/recipes/wands/twigwand_purple_black.json deleted file mode 100644 index 8954c4e31..000000000 --- a/src/main/resources/data/botania/recipes/wands/twigwand_purple_black.json +++ /dev/null @@ -1,24 +0,0 @@ -{ - "result": { - "item": "botania:twig_wand", - "nbt": "{color1:10,color2:15}" - }, - "pattern": [ - " AS", - " SB", - "S " - ], - "type": "minecraft:crafting_shaped", - "key": { - "A": { - "tag": "botania:petals/purple" - }, - "B": { - "tag": "botania:petals/black" - }, - "S": { - "item": "botania:livingwood_twig" - } - }, - "group": "botania:twig_wand" -} \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_purple_blue.json b/src/main/resources/data/botania/recipes/wands/twigwand_purple_blue.json deleted file mode 100644 index 696c41adb..000000000 --- a/src/main/resources/data/botania/recipes/wands/twigwand_purple_blue.json +++ /dev/null @@ -1,24 +0,0 @@ -{ - "result": { - "item": "botania:twig_wand", - "nbt": "{color1:10,color2:11}" - }, - "pattern": [ - " AS", - " SB", - "S " - ], - "type": "minecraft:crafting_shaped", - "key": { - "A": { - "tag": "botania:petals/purple" - }, - "B": { - "tag": "botania:petals/blue" - }, - "S": { - "item": "botania:livingwood_twig" - } - }, - "group": "botania:twig_wand" -} \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_purple_brown.json b/src/main/resources/data/botania/recipes/wands/twigwand_purple_brown.json deleted file mode 100644 index 1d39d8f86..000000000 --- a/src/main/resources/data/botania/recipes/wands/twigwand_purple_brown.json +++ /dev/null @@ -1,24 +0,0 @@ -{ - "result": { - "item": "botania:twig_wand", - "nbt": "{color1:10,color2:12}" - }, - "pattern": [ - " AS", - " SB", - "S " - ], - "type": "minecraft:crafting_shaped", - "key": { - "A": { - "tag": "botania:petals/purple" - }, - "B": { - "tag": "botania:petals/brown" - }, - "S": { - "item": "botania:livingwood_twig" - } - }, - "group": "botania:twig_wand" -} \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_purple_cyan.json b/src/main/resources/data/botania/recipes/wands/twigwand_purple_cyan.json deleted file mode 100644 index 676a95cdd..000000000 --- a/src/main/resources/data/botania/recipes/wands/twigwand_purple_cyan.json +++ /dev/null @@ -1,24 +0,0 @@ -{ - "result": { - "item": "botania:twig_wand", - "nbt": "{color1:10,color2:9}" - }, - "pattern": [ - " AS", - " SB", - "S " - ], - "type": "minecraft:crafting_shaped", - "key": { - "A": { - "tag": "botania:petals/purple" - }, - "B": { - "tag": "botania:petals/cyan" - }, - "S": { - "item": "botania:livingwood_twig" - } - }, - "group": "botania:twig_wand" -} \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_purple_gray.json b/src/main/resources/data/botania/recipes/wands/twigwand_purple_gray.json deleted file mode 100644 index 933178c07..000000000 --- a/src/main/resources/data/botania/recipes/wands/twigwand_purple_gray.json +++ /dev/null @@ -1,24 +0,0 @@ -{ - "result": { - "item": "botania:twig_wand", - "nbt": "{color1:10,color2:7}" - }, - "pattern": [ - " AS", - " SB", - "S " - ], - "type": "minecraft:crafting_shaped", - "key": { - "A": { - "tag": "botania:petals/purple" - }, - "B": { - "tag": "botania:petals/gray" - }, - "S": { - "item": "botania:livingwood_twig" - } - }, - "group": "botania:twig_wand" -} \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_purple_green.json b/src/main/resources/data/botania/recipes/wands/twigwand_purple_green.json deleted file mode 100644 index 169f1ff92..000000000 --- a/src/main/resources/data/botania/recipes/wands/twigwand_purple_green.json +++ /dev/null @@ -1,24 +0,0 @@ -{ - "result": { - "item": "botania:twig_wand", - "nbt": "{color1:10,color2:13}" - }, - "pattern": [ - " AS", - " SB", - "S " - ], - "type": "minecraft:crafting_shaped", - "key": { - "A": { - "tag": "botania:petals/purple" - }, - "B": { - "tag": "botania:petals/green" - }, - "S": { - "item": "botania:livingwood_twig" - } - }, - "group": "botania:twig_wand" -} \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_purple_light_blue.json b/src/main/resources/data/botania/recipes/wands/twigwand_purple_light_blue.json deleted file mode 100644 index a437e2b49..000000000 --- a/src/main/resources/data/botania/recipes/wands/twigwand_purple_light_blue.json +++ /dev/null @@ -1,24 +0,0 @@ -{ - "result": { - "item": "botania:twig_wand", - "nbt": "{color1:10,color2:3}" - }, - "pattern": [ - " AS", - " SB", - "S " - ], - "type": "minecraft:crafting_shaped", - "key": { - "A": { - "tag": "botania:petals/purple" - }, - "B": { - "tag": "botania:petals/light_blue" - }, - "S": { - "item": "botania:livingwood_twig" - } - }, - "group": "botania:twig_wand" -} \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_purple_lime.json b/src/main/resources/data/botania/recipes/wands/twigwand_purple_lime.json deleted file mode 100644 index 6b9076f40..000000000 --- a/src/main/resources/data/botania/recipes/wands/twigwand_purple_lime.json +++ /dev/null @@ -1,24 +0,0 @@ -{ - "result": { - "item": "botania:twig_wand", - "nbt": "{color1:10,color2:5}" - }, - "pattern": [ - " AS", - " SB", - "S " - ], - "type": "minecraft:crafting_shaped", - "key": { - "A": { - "tag": "botania:petals/purple" - }, - "B": { - "tag": "botania:petals/lime" - }, - "S": { - "item": "botania:livingwood_twig" - } - }, - "group": "botania:twig_wand" -} \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_purple_magenta.json b/src/main/resources/data/botania/recipes/wands/twigwand_purple_magenta.json deleted file mode 100644 index 8b8f674ba..000000000 --- a/src/main/resources/data/botania/recipes/wands/twigwand_purple_magenta.json +++ /dev/null @@ -1,24 +0,0 @@ -{ - "result": { - "item": "botania:twig_wand", - "nbt": "{color1:10,color2:2}" - }, - "pattern": [ - " AS", - " SB", - "S " - ], - "type": "minecraft:crafting_shaped", - "key": { - "A": { - "tag": "botania:petals/purple" - }, - "B": { - "tag": "botania:petals/magenta" - }, - "S": { - "item": "botania:livingwood_twig" - } - }, - "group": "botania:twig_wand" -} \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_purple_orange.json b/src/main/resources/data/botania/recipes/wands/twigwand_purple_orange.json deleted file mode 100644 index f8969b2d3..000000000 --- a/src/main/resources/data/botania/recipes/wands/twigwand_purple_orange.json +++ /dev/null @@ -1,24 +0,0 @@ -{ - "result": { - "item": "botania:twig_wand", - "nbt": "{color1:10,color2:1}" - }, - "pattern": [ - " AS", - " SB", - "S " - ], - "type": "minecraft:crafting_shaped", - "key": { - "A": { - "tag": "botania:petals/purple" - }, - "B": { - "tag": "botania:petals/orange" - }, - "S": { - "item": "botania:livingwood_twig" - } - }, - "group": "botania:twig_wand" -} \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_purple_pink.json b/src/main/resources/data/botania/recipes/wands/twigwand_purple_pink.json deleted file mode 100644 index c4c8805e8..000000000 --- a/src/main/resources/data/botania/recipes/wands/twigwand_purple_pink.json +++ /dev/null @@ -1,24 +0,0 @@ -{ - "result": { - "item": "botania:twig_wand", - "nbt": "{color1:10,color2:6}" - }, - "pattern": [ - " AS", - " SB", - "S " - ], - "type": "minecraft:crafting_shaped", - "key": { - "A": { - "tag": "botania:petals/purple" - }, - "B": { - "tag": "botania:petals/pink" - }, - "S": { - "item": "botania:livingwood_twig" - } - }, - "group": "botania:twig_wand" -} \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_purple_purple.json b/src/main/resources/data/botania/recipes/wands/twigwand_purple_purple.json deleted file mode 100644 index 6ab90e7e7..000000000 --- a/src/main/resources/data/botania/recipes/wands/twigwand_purple_purple.json +++ /dev/null @@ -1,24 +0,0 @@ -{ - "result": { - "item": "botania:twig_wand", - "nbt": "{color1:10,color2:10}" - }, - "pattern": [ - " AS", - " SB", - "S " - ], - "type": "minecraft:crafting_shaped", - "key": { - "A": { - "tag": "botania:petals/purple" - }, - "B": { - "tag": "botania:petals/purple" - }, - "S": { - "item": "botania:livingwood_twig" - } - }, - "group": "botania:twig_wand" -} \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_purple_red.json b/src/main/resources/data/botania/recipes/wands/twigwand_purple_red.json deleted file mode 100644 index cfc485c9b..000000000 --- a/src/main/resources/data/botania/recipes/wands/twigwand_purple_red.json +++ /dev/null @@ -1,24 +0,0 @@ -{ - "result": { - "item": "botania:twig_wand", - "nbt": "{color1:10,color2:14}" - }, - "pattern": [ - " AS", - " SB", - "S " - ], - "type": "minecraft:crafting_shaped", - "key": { - "A": { - "tag": "botania:petals/purple" - }, - "B": { - "tag": "botania:petals/red" - }, - "S": { - "item": "botania:livingwood_twig" - } - }, - "group": "botania:twig_wand" -} \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_purple_silver.json b/src/main/resources/data/botania/recipes/wands/twigwand_purple_silver.json deleted file mode 100644 index 2ed7f5575..000000000 --- a/src/main/resources/data/botania/recipes/wands/twigwand_purple_silver.json +++ /dev/null @@ -1,24 +0,0 @@ -{ - "result": { - "item": "botania:twig_wand", - "nbt": "{color1:10,color2:8}" - }, - "pattern": [ - " AS", - " SB", - "S " - ], - "type": "minecraft:crafting_shaped", - "key": { - "A": { - "tag": "botania:petals/purple" - }, - "B": { - "tag": "botania:petals/light_gray" - }, - "S": { - "item": "botania:livingwood_twig" - } - }, - "group": "botania:twig_wand" -} \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_purple_white.json b/src/main/resources/data/botania/recipes/wands/twigwand_purple_white.json deleted file mode 100644 index 27f4dd023..000000000 --- a/src/main/resources/data/botania/recipes/wands/twigwand_purple_white.json +++ /dev/null @@ -1,24 +0,0 @@ -{ - "result": { - "item": "botania:twig_wand", - "nbt": "{color1:10,color2:0}" - }, - "pattern": [ - " AS", - " SB", - "S " - ], - "type": "minecraft:crafting_shaped", - "key": { - "A": { - "tag": "botania:petals/purple" - }, - "B": { - "tag": "botania:petals/white" - }, - "S": { - "item": "botania:livingwood_twig" - } - }, - "group": "botania:twig_wand" -} \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_purple_yellow.json b/src/main/resources/data/botania/recipes/wands/twigwand_purple_yellow.json deleted file mode 100644 index 984cc170d..000000000 --- a/src/main/resources/data/botania/recipes/wands/twigwand_purple_yellow.json +++ /dev/null @@ -1,24 +0,0 @@ -{ - "result": { - "item": "botania:twig_wand", - "nbt": "{color1:10,color2:4}" - }, - "pattern": [ - " AS", - " SB", - "S " - ], - "type": "minecraft:crafting_shaped", - "key": { - "A": { - "tag": "botania:petals/purple" - }, - "B": { - "tag": "botania:petals/yellow" - }, - "S": { - "item": "botania:livingwood_twig" - } - }, - "group": "botania:twig_wand" -} \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_red_black.json b/src/main/resources/data/botania/recipes/wands/twigwand_red_black.json deleted file mode 100644 index 44bf78d97..000000000 --- a/src/main/resources/data/botania/recipes/wands/twigwand_red_black.json +++ /dev/null @@ -1,24 +0,0 @@ -{ - "result": { - "item": "botania:twig_wand", - "nbt": "{color1:14,color2:15}" - }, - "pattern": [ - " AS", - " SB", - "S " - ], - "type": "minecraft:crafting_shaped", - "key": { - "A": { - "tag": "botania:petals/red" - }, - "B": { - "tag": "botania:petals/black" - }, - "S": { - "item": "botania:livingwood_twig" - } - }, - "group": "botania:twig_wand" -} \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_red_blue.json b/src/main/resources/data/botania/recipes/wands/twigwand_red_blue.json deleted file mode 100644 index 77f713f30..000000000 --- a/src/main/resources/data/botania/recipes/wands/twigwand_red_blue.json +++ /dev/null @@ -1,24 +0,0 @@ -{ - "result": { - "item": "botania:twig_wand", - "nbt": "{color1:14,color2:11}" - }, - "pattern": [ - " AS", - " SB", - "S " - ], - "type": "minecraft:crafting_shaped", - "key": { - "A": { - "tag": "botania:petals/red" - }, - "B": { - "tag": "botania:petals/blue" - }, - "S": { - "item": "botania:livingwood_twig" - } - }, - "group": "botania:twig_wand" -} \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_red_brown.json b/src/main/resources/data/botania/recipes/wands/twigwand_red_brown.json deleted file mode 100644 index 086d4016d..000000000 --- a/src/main/resources/data/botania/recipes/wands/twigwand_red_brown.json +++ /dev/null @@ -1,24 +0,0 @@ -{ - "result": { - "item": "botania:twig_wand", - "nbt": "{color1:14,color2:12}" - }, - "pattern": [ - " AS", - " SB", - "S " - ], - "type": "minecraft:crafting_shaped", - "key": { - "A": { - "tag": "botania:petals/red" - }, - "B": { - "tag": "botania:petals/brown" - }, - "S": { - "item": "botania:livingwood_twig" - } - }, - "group": "botania:twig_wand" -} \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_red_cyan.json b/src/main/resources/data/botania/recipes/wands/twigwand_red_cyan.json deleted file mode 100644 index fe1982956..000000000 --- a/src/main/resources/data/botania/recipes/wands/twigwand_red_cyan.json +++ /dev/null @@ -1,24 +0,0 @@ -{ - "result": { - "item": "botania:twig_wand", - "nbt": "{color1:14,color2:9}" - }, - "pattern": [ - " AS", - " SB", - "S " - ], - "type": "minecraft:crafting_shaped", - "key": { - "A": { - "tag": "botania:petals/red" - }, - "B": { - "tag": "botania:petals/cyan" - }, - "S": { - "item": "botania:livingwood_twig" - } - }, - "group": "botania:twig_wand" -} \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_red_gray.json b/src/main/resources/data/botania/recipes/wands/twigwand_red_gray.json deleted file mode 100644 index a04f224e3..000000000 --- a/src/main/resources/data/botania/recipes/wands/twigwand_red_gray.json +++ /dev/null @@ -1,24 +0,0 @@ -{ - "result": { - "item": "botania:twig_wand", - "nbt": "{color1:14,color2:7}" - }, - "pattern": [ - " AS", - " SB", - "S " - ], - "type": "minecraft:crafting_shaped", - "key": { - "A": { - "tag": "botania:petals/red" - }, - "B": { - "tag": "botania:petals/gray" - }, - "S": { - "item": "botania:livingwood_twig" - } - }, - "group": "botania:twig_wand" -} \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_red_green.json b/src/main/resources/data/botania/recipes/wands/twigwand_red_green.json deleted file mode 100644 index a4773dbc8..000000000 --- a/src/main/resources/data/botania/recipes/wands/twigwand_red_green.json +++ /dev/null @@ -1,24 +0,0 @@ -{ - "result": { - "item": "botania:twig_wand", - "nbt": "{color1:14,color2:13}" - }, - "pattern": [ - " AS", - " SB", - "S " - ], - "type": "minecraft:crafting_shaped", - "key": { - "A": { - "tag": "botania:petals/red" - }, - "B": { - "tag": "botania:petals/green" - }, - "S": { - "item": "botania:livingwood_twig" - } - }, - "group": "botania:twig_wand" -} \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_red_light_blue.json b/src/main/resources/data/botania/recipes/wands/twigwand_red_light_blue.json deleted file mode 100644 index c472ebdc4..000000000 --- a/src/main/resources/data/botania/recipes/wands/twigwand_red_light_blue.json +++ /dev/null @@ -1,24 +0,0 @@ -{ - "result": { - "item": "botania:twig_wand", - "nbt": "{color1:14,color2:3}" - }, - "pattern": [ - " AS", - " SB", - "S " - ], - "type": "minecraft:crafting_shaped", - "key": { - "A": { - "tag": "botania:petals/red" - }, - "B": { - "tag": "botania:petals/light_blue" - }, - "S": { - "item": "botania:livingwood_twig" - } - }, - "group": "botania:twig_wand" -} \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_red_lime.json b/src/main/resources/data/botania/recipes/wands/twigwand_red_lime.json deleted file mode 100644 index 3babaa158..000000000 --- a/src/main/resources/data/botania/recipes/wands/twigwand_red_lime.json +++ /dev/null @@ -1,24 +0,0 @@ -{ - "result": { - "item": "botania:twig_wand", - "nbt": "{color1:14,color2:5}" - }, - "pattern": [ - " AS", - " SB", - "S " - ], - "type": "minecraft:crafting_shaped", - "key": { - "A": { - "tag": "botania:petals/red" - }, - "B": { - "tag": "botania:petals/lime" - }, - "S": { - "item": "botania:livingwood_twig" - } - }, - "group": "botania:twig_wand" -} \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_red_magenta.json b/src/main/resources/data/botania/recipes/wands/twigwand_red_magenta.json deleted file mode 100644 index 6d0a1658d..000000000 --- a/src/main/resources/data/botania/recipes/wands/twigwand_red_magenta.json +++ /dev/null @@ -1,24 +0,0 @@ -{ - "result": { - "item": "botania:twig_wand", - "nbt": "{color1:14,color2:2}" - }, - "pattern": [ - " AS", - " SB", - "S " - ], - "type": "minecraft:crafting_shaped", - "key": { - "A": { - "tag": "botania:petals/red" - }, - "B": { - "tag": "botania:petals/magenta" - }, - "S": { - "item": "botania:livingwood_twig" - } - }, - "group": "botania:twig_wand" -} \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_red_orange.json b/src/main/resources/data/botania/recipes/wands/twigwand_red_orange.json deleted file mode 100644 index ed72f0a10..000000000 --- a/src/main/resources/data/botania/recipes/wands/twigwand_red_orange.json +++ /dev/null @@ -1,24 +0,0 @@ -{ - "result": { - "item": "botania:twig_wand", - "nbt": "{color1:14,color2:1}" - }, - "pattern": [ - " AS", - " SB", - "S " - ], - "type": "minecraft:crafting_shaped", - "key": { - "A": { - "tag": "botania:petals/red" - }, - "B": { - "tag": "botania:petals/orange" - }, - "S": { - "item": "botania:livingwood_twig" - } - }, - "group": "botania:twig_wand" -} \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_red_pink.json b/src/main/resources/data/botania/recipes/wands/twigwand_red_pink.json deleted file mode 100644 index 53f685d06..000000000 --- a/src/main/resources/data/botania/recipes/wands/twigwand_red_pink.json +++ /dev/null @@ -1,24 +0,0 @@ -{ - "result": { - "item": "botania:twig_wand", - "nbt": "{color1:14,color2:6}" - }, - "pattern": [ - " AS", - " SB", - "S " - ], - "type": "minecraft:crafting_shaped", - "key": { - "A": { - "tag": "botania:petals/red" - }, - "B": { - "tag": "botania:petals/pink" - }, - "S": { - "item": "botania:livingwood_twig" - } - }, - "group": "botania:twig_wand" -} \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_red_purple.json b/src/main/resources/data/botania/recipes/wands/twigwand_red_purple.json deleted file mode 100644 index d66269967..000000000 --- a/src/main/resources/data/botania/recipes/wands/twigwand_red_purple.json +++ /dev/null @@ -1,24 +0,0 @@ -{ - "result": { - "item": "botania:twig_wand", - "nbt": "{color1:14,color2:10}" - }, - "pattern": [ - " AS", - " SB", - "S " - ], - "type": "minecraft:crafting_shaped", - "key": { - "A": { - "tag": "botania:petals/red" - }, - "B": { - "tag": "botania:petals/purple" - }, - "S": { - "item": "botania:livingwood_twig" - } - }, - "group": "botania:twig_wand" -} \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_red_red.json b/src/main/resources/data/botania/recipes/wands/twigwand_red_red.json deleted file mode 100644 index 0c14fed64..000000000 --- a/src/main/resources/data/botania/recipes/wands/twigwand_red_red.json +++ /dev/null @@ -1,24 +0,0 @@ -{ - "result": { - "item": "botania:twig_wand", - "nbt": "{color1:14,color2:14}" - }, - "pattern": [ - " AS", - " SB", - "S " - ], - "type": "minecraft:crafting_shaped", - "key": { - "A": { - "tag": "botania:petals/red" - }, - "B": { - "tag": "botania:petals/red" - }, - "S": { - "item": "botania:livingwood_twig" - } - }, - "group": "botania:twig_wand" -} \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_red_silver.json b/src/main/resources/data/botania/recipes/wands/twigwand_red_silver.json deleted file mode 100644 index 4d7b56c52..000000000 --- a/src/main/resources/data/botania/recipes/wands/twigwand_red_silver.json +++ /dev/null @@ -1,24 +0,0 @@ -{ - "result": { - "item": "botania:twig_wand", - "nbt": "{color1:14,color2:8}" - }, - "pattern": [ - " AS", - " SB", - "S " - ], - "type": "minecraft:crafting_shaped", - "key": { - "A": { - "tag": "botania:petals/red" - }, - "B": { - "tag": "botania:petals/light_gray" - }, - "S": { - "item": "botania:livingwood_twig" - } - }, - "group": "botania:twig_wand" -} \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_red_white.json b/src/main/resources/data/botania/recipes/wands/twigwand_red_white.json deleted file mode 100644 index 058accf3c..000000000 --- a/src/main/resources/data/botania/recipes/wands/twigwand_red_white.json +++ /dev/null @@ -1,24 +0,0 @@ -{ - "result": { - "item": "botania:twig_wand", - "nbt": "{color1:14,color2:0}" - }, - "pattern": [ - " AS", - " SB", - "S " - ], - "type": "minecraft:crafting_shaped", - "key": { - "A": { - "tag": "botania:petals/red" - }, - "B": { - "tag": "botania:petals/white" - }, - "S": { - "item": "botania:livingwood_twig" - } - }, - "group": "botania:twig_wand" -} \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_red_yellow.json b/src/main/resources/data/botania/recipes/wands/twigwand_red_yellow.json deleted file mode 100644 index 3085974b2..000000000 --- a/src/main/resources/data/botania/recipes/wands/twigwand_red_yellow.json +++ /dev/null @@ -1,24 +0,0 @@ -{ - "result": { - "item": "botania:twig_wand", - "nbt": "{color1:14,color2:4}" - }, - "pattern": [ - " AS", - " SB", - "S " - ], - "type": "minecraft:crafting_shaped", - "key": { - "A": { - "tag": "botania:petals/red" - }, - "B": { - "tag": "botania:petals/yellow" - }, - "S": { - "item": "botania:livingwood_twig" - } - }, - "group": "botania:twig_wand" -} \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_silver_black.json b/src/main/resources/data/botania/recipes/wands/twigwand_silver_black.json deleted file mode 100644 index 88ba5ec80..000000000 --- a/src/main/resources/data/botania/recipes/wands/twigwand_silver_black.json +++ /dev/null @@ -1,24 +0,0 @@ -{ - "result": { - "item": "botania:twig_wand", - "nbt": "{color1:8,color2:15}" - }, - "pattern": [ - " AS", - " SB", - "S " - ], - "type": "minecraft:crafting_shaped", - "key": { - "A": { - "tag": "botania:petals/light_gray" - }, - "B": { - "tag": "botania:petals/black" - }, - "S": { - "item": "botania:livingwood_twig" - } - }, - "group": "botania:twig_wand" -} \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_silver_blue.json b/src/main/resources/data/botania/recipes/wands/twigwand_silver_blue.json deleted file mode 100644 index b1455d55d..000000000 --- a/src/main/resources/data/botania/recipes/wands/twigwand_silver_blue.json +++ /dev/null @@ -1,24 +0,0 @@ -{ - "result": { - "item": "botania:twig_wand", - "nbt": "{color1:8,color2:11}" - }, - "pattern": [ - " AS", - " SB", - "S " - ], - "type": "minecraft:crafting_shaped", - "key": { - "A": { - "tag": "botania:petals/light_gray" - }, - "B": { - "tag": "botania:petals/blue" - }, - "S": { - "item": "botania:livingwood_twig" - } - }, - "group": "botania:twig_wand" -} \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_silver_brown.json b/src/main/resources/data/botania/recipes/wands/twigwand_silver_brown.json deleted file mode 100644 index bea933f61..000000000 --- a/src/main/resources/data/botania/recipes/wands/twigwand_silver_brown.json +++ /dev/null @@ -1,24 +0,0 @@ -{ - "result": { - "item": "botania:twig_wand", - "nbt": "{color1:8,color2:12}" - }, - "pattern": [ - " AS", - " SB", - "S " - ], - "type": "minecraft:crafting_shaped", - "key": { - "A": { - "tag": "botania:petals/light_gray" - }, - "B": { - "tag": "botania:petals/brown" - }, - "S": { - "item": "botania:livingwood_twig" - } - }, - "group": "botania:twig_wand" -} \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_silver_cyan.json b/src/main/resources/data/botania/recipes/wands/twigwand_silver_cyan.json deleted file mode 100644 index 679c6a4fe..000000000 --- a/src/main/resources/data/botania/recipes/wands/twigwand_silver_cyan.json +++ /dev/null @@ -1,24 +0,0 @@ -{ - "result": { - "item": "botania:twig_wand", - "nbt": "{color1:8,color2:9}" - }, - "pattern": [ - " AS", - " SB", - "S " - ], - "type": "minecraft:crafting_shaped", - "key": { - "A": { - "tag": "botania:petals/light_gray" - }, - "B": { - "tag": "botania:petals/cyan" - }, - "S": { - "item": "botania:livingwood_twig" - } - }, - "group": "botania:twig_wand" -} \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_silver_gray.json b/src/main/resources/data/botania/recipes/wands/twigwand_silver_gray.json deleted file mode 100644 index 99ee0992a..000000000 --- a/src/main/resources/data/botania/recipes/wands/twigwand_silver_gray.json +++ /dev/null @@ -1,24 +0,0 @@ -{ - "result": { - "item": "botania:twig_wand", - "nbt": "{color1:8,color2:7}" - }, - "pattern": [ - " AS", - " SB", - "S " - ], - "type": "minecraft:crafting_shaped", - "key": { - "A": { - "tag": "botania:petals/light_gray" - }, - "B": { - "tag": "botania:petals/gray" - }, - "S": { - "item": "botania:livingwood_twig" - } - }, - "group": "botania:twig_wand" -} \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_silver_green.json b/src/main/resources/data/botania/recipes/wands/twigwand_silver_green.json deleted file mode 100644 index 2e6cfc7b6..000000000 --- a/src/main/resources/data/botania/recipes/wands/twigwand_silver_green.json +++ /dev/null @@ -1,24 +0,0 @@ -{ - "result": { - "item": "botania:twig_wand", - "nbt": "{color1:8,color2:13}" - }, - "pattern": [ - " AS", - " SB", - "S " - ], - "type": "minecraft:crafting_shaped", - "key": { - "A": { - "tag": "botania:petals/light_gray" - }, - "B": { - "tag": "botania:petals/green" - }, - "S": { - "item": "botania:livingwood_twig" - } - }, - "group": "botania:twig_wand" -} \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_silver_light_blue.json b/src/main/resources/data/botania/recipes/wands/twigwand_silver_light_blue.json deleted file mode 100644 index 2232bd5fd..000000000 --- a/src/main/resources/data/botania/recipes/wands/twigwand_silver_light_blue.json +++ /dev/null @@ -1,24 +0,0 @@ -{ - "result": { - "item": "botania:twig_wand", - "nbt": "{color1:8,color2:3}" - }, - "pattern": [ - " AS", - " SB", - "S " - ], - "type": "minecraft:crafting_shaped", - "key": { - "A": { - "tag": "botania:petals/light_gray" - }, - "B": { - "tag": "botania:petals/light_blue" - }, - "S": { - "item": "botania:livingwood_twig" - } - }, - "group": "botania:twig_wand" -} \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_silver_lime.json b/src/main/resources/data/botania/recipes/wands/twigwand_silver_lime.json deleted file mode 100644 index 55450ccb3..000000000 --- a/src/main/resources/data/botania/recipes/wands/twigwand_silver_lime.json +++ /dev/null @@ -1,24 +0,0 @@ -{ - "result": { - "item": "botania:twig_wand", - "nbt": "{color1:8,color2:5}" - }, - "pattern": [ - " AS", - " SB", - "S " - ], - "type": "minecraft:crafting_shaped", - "key": { - "A": { - "tag": "botania:petals/light_gray" - }, - "B": { - "tag": "botania:petals/lime" - }, - "S": { - "item": "botania:livingwood_twig" - } - }, - "group": "botania:twig_wand" -} \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_silver_magenta.json b/src/main/resources/data/botania/recipes/wands/twigwand_silver_magenta.json deleted file mode 100644 index 9d59dbb29..000000000 --- a/src/main/resources/data/botania/recipes/wands/twigwand_silver_magenta.json +++ /dev/null @@ -1,24 +0,0 @@ -{ - "result": { - "item": "botania:twig_wand", - "nbt": "{color1:8,color2:2}" - }, - "pattern": [ - " AS", - " SB", - "S " - ], - "type": "minecraft:crafting_shaped", - "key": { - "A": { - "tag": "botania:petals/light_gray" - }, - "B": { - "tag": "botania:petals/magenta" - }, - "S": { - "item": "botania:livingwood_twig" - } - }, - "group": "botania:twig_wand" -} \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_silver_orange.json b/src/main/resources/data/botania/recipes/wands/twigwand_silver_orange.json deleted file mode 100644 index b79679445..000000000 --- a/src/main/resources/data/botania/recipes/wands/twigwand_silver_orange.json +++ /dev/null @@ -1,24 +0,0 @@ -{ - "result": { - "item": "botania:twig_wand", - "nbt": "{color1:8,color2:1}" - }, - "pattern": [ - " AS", - " SB", - "S " - ], - "type": "minecraft:crafting_shaped", - "key": { - "A": { - "tag": "botania:petals/light_gray" - }, - "B": { - "tag": "botania:petals/orange" - }, - "S": { - "item": "botania:livingwood_twig" - } - }, - "group": "botania:twig_wand" -} \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_silver_pink.json b/src/main/resources/data/botania/recipes/wands/twigwand_silver_pink.json deleted file mode 100644 index 6c1e9c01a..000000000 --- a/src/main/resources/data/botania/recipes/wands/twigwand_silver_pink.json +++ /dev/null @@ -1,24 +0,0 @@ -{ - "result": { - "item": "botania:twig_wand", - "nbt": "{color1:8,color2:6}" - }, - "pattern": [ - " AS", - " SB", - "S " - ], - "type": "minecraft:crafting_shaped", - "key": { - "A": { - "tag": "botania:petals/light_gray" - }, - "B": { - "tag": "botania:petals/pink" - }, - "S": { - "item": "botania:livingwood_twig" - } - }, - "group": "botania:twig_wand" -} \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_silver_purple.json b/src/main/resources/data/botania/recipes/wands/twigwand_silver_purple.json deleted file mode 100644 index 68848b3e7..000000000 --- a/src/main/resources/data/botania/recipes/wands/twigwand_silver_purple.json +++ /dev/null @@ -1,24 +0,0 @@ -{ - "result": { - "item": "botania:twig_wand", - "nbt": "{color1:8,color2:10}" - }, - "pattern": [ - " AS", - " SB", - "S " - ], - "type": "minecraft:crafting_shaped", - "key": { - "A": { - "tag": "botania:petals/light_gray" - }, - "B": { - "tag": "botania:petals/purple" - }, - "S": { - "item": "botania:livingwood_twig" - } - }, - "group": "botania:twig_wand" -} \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_silver_red.json b/src/main/resources/data/botania/recipes/wands/twigwand_silver_red.json deleted file mode 100644 index 8cc208580..000000000 --- a/src/main/resources/data/botania/recipes/wands/twigwand_silver_red.json +++ /dev/null @@ -1,24 +0,0 @@ -{ - "result": { - "item": "botania:twig_wand", - "nbt": "{color1:8,color2:14}" - }, - "pattern": [ - " AS", - " SB", - "S " - ], - "type": "minecraft:crafting_shaped", - "key": { - "A": { - "tag": "botania:petals/light_gray" - }, - "B": { - "tag": "botania:petals/red" - }, - "S": { - "item": "botania:livingwood_twig" - } - }, - "group": "botania:twig_wand" -} \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_silver_silver.json b/src/main/resources/data/botania/recipes/wands/twigwand_silver_silver.json deleted file mode 100644 index 060938f44..000000000 --- a/src/main/resources/data/botania/recipes/wands/twigwand_silver_silver.json +++ /dev/null @@ -1,24 +0,0 @@ -{ - "result": { - "item": "botania:twig_wand", - "nbt": "{color1:8,color2:8}" - }, - "pattern": [ - " AS", - " SB", - "S " - ], - "type": "minecraft:crafting_shaped", - "key": { - "A": { - "tag": "botania:petals/light_gray" - }, - "B": { - "tag": "botania:petals/light_gray" - }, - "S": { - "item": "botania:livingwood_twig" - } - }, - "group": "botania:twig_wand" -} \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_silver_white.json b/src/main/resources/data/botania/recipes/wands/twigwand_silver_white.json deleted file mode 100644 index 6699de46d..000000000 --- a/src/main/resources/data/botania/recipes/wands/twigwand_silver_white.json +++ /dev/null @@ -1,24 +0,0 @@ -{ - "result": { - "item": "botania:twig_wand", - "nbt": "{color1:8,color2:0}" - }, - "pattern": [ - " AS", - " SB", - "S " - ], - "type": "minecraft:crafting_shaped", - "key": { - "A": { - "tag": "botania:petals/light_gray" - }, - "B": { - "tag": "botania:petals/white" - }, - "S": { - "item": "botania:livingwood_twig" - } - }, - "group": "botania:twig_wand" -} \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_silver_yellow.json b/src/main/resources/data/botania/recipes/wands/twigwand_silver_yellow.json deleted file mode 100644 index 2e2c6bb11..000000000 --- a/src/main/resources/data/botania/recipes/wands/twigwand_silver_yellow.json +++ /dev/null @@ -1,24 +0,0 @@ -{ - "result": { - "item": "botania:twig_wand", - "nbt": "{color1:8,color2:4}" - }, - "pattern": [ - " AS", - " SB", - "S " - ], - "type": "minecraft:crafting_shaped", - "key": { - "A": { - "tag": "botania:petals/light_gray" - }, - "B": { - "tag": "botania:petals/yellow" - }, - "S": { - "item": "botania:livingwood_twig" - } - }, - "group": "botania:twig_wand" -} \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_white_black.json b/src/main/resources/data/botania/recipes/wands/twigwand_white_black.json deleted file mode 100644 index 757b09535..000000000 --- a/src/main/resources/data/botania/recipes/wands/twigwand_white_black.json +++ /dev/null @@ -1,24 +0,0 @@ -{ - "result": { - "item": "botania:twig_wand", - "nbt": "{color1:0,color2:15}" - }, - "pattern": [ - " AS", - " SB", - "S " - ], - "type": "minecraft:crafting_shaped", - "key": { - "A": { - "tag": "botania:petals/white" - }, - "B": { - "tag": "botania:petals/black" - }, - "S": { - "item": "botania:livingwood_twig" - } - }, - "group": "botania:twig_wand" -} \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_white_blue.json b/src/main/resources/data/botania/recipes/wands/twigwand_white_blue.json deleted file mode 100644 index e00e7923d..000000000 --- a/src/main/resources/data/botania/recipes/wands/twigwand_white_blue.json +++ /dev/null @@ -1,24 +0,0 @@ -{ - "result": { - "item": "botania:twig_wand", - "nbt": "{color1:0,color2:11}" - }, - "pattern": [ - " AS", - " SB", - "S " - ], - "type": "minecraft:crafting_shaped", - "key": { - "A": { - "tag": "botania:petals/white" - }, - "B": { - "tag": "botania:petals/blue" - }, - "S": { - "item": "botania:livingwood_twig" - } - }, - "group": "botania:twig_wand" -} \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_white_brown.json b/src/main/resources/data/botania/recipes/wands/twigwand_white_brown.json deleted file mode 100644 index b2adfcb45..000000000 --- a/src/main/resources/data/botania/recipes/wands/twigwand_white_brown.json +++ /dev/null @@ -1,24 +0,0 @@ -{ - "result": { - "item": "botania:twig_wand", - "nbt": "{color1:0,color2:12}" - }, - "pattern": [ - " AS", - " SB", - "S " - ], - "type": "minecraft:crafting_shaped", - "key": { - "A": { - "tag": "botania:petals/white" - }, - "B": { - "tag": "botania:petals/brown" - }, - "S": { - "item": "botania:livingwood_twig" - } - }, - "group": "botania:twig_wand" -} \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_white_cyan.json b/src/main/resources/data/botania/recipes/wands/twigwand_white_cyan.json deleted file mode 100644 index c9ac28d90..000000000 --- a/src/main/resources/data/botania/recipes/wands/twigwand_white_cyan.json +++ /dev/null @@ -1,24 +0,0 @@ -{ - "result": { - "item": "botania:twig_wand", - "nbt": "{color1:0,color2:9}" - }, - "pattern": [ - " AS", - " SB", - "S " - ], - "type": "minecraft:crafting_shaped", - "key": { - "A": { - "tag": "botania:petals/white" - }, - "B": { - "tag": "botania:petals/cyan" - }, - "S": { - "item": "botania:livingwood_twig" - } - }, - "group": "botania:twig_wand" -} \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_white_gray.json b/src/main/resources/data/botania/recipes/wands/twigwand_white_gray.json deleted file mode 100644 index c453d7344..000000000 --- a/src/main/resources/data/botania/recipes/wands/twigwand_white_gray.json +++ /dev/null @@ -1,24 +0,0 @@ -{ - "result": { - "item": "botania:twig_wand", - "nbt": "{color1:0,color2:7}" - }, - "pattern": [ - " AS", - " SB", - "S " - ], - "type": "minecraft:crafting_shaped", - "key": { - "A": { - "tag": "botania:petals/white" - }, - "B": { - "tag": "botania:petals/gray" - }, - "S": { - "item": "botania:livingwood_twig" - } - }, - "group": "botania:twig_wand" -} \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_white_green.json b/src/main/resources/data/botania/recipes/wands/twigwand_white_green.json deleted file mode 100644 index df5508b2d..000000000 --- a/src/main/resources/data/botania/recipes/wands/twigwand_white_green.json +++ /dev/null @@ -1,24 +0,0 @@ -{ - "result": { - "item": "botania:twig_wand", - "nbt": "{color1:0,color2:13}" - }, - "pattern": [ - " AS", - " SB", - "S " - ], - "type": "minecraft:crafting_shaped", - "key": { - "A": { - "tag": "botania:petals/white" - }, - "B": { - "tag": "botania:petals/green" - }, - "S": { - "item": "botania:livingwood_twig" - } - }, - "group": "botania:twig_wand" -} \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_white_light_blue.json b/src/main/resources/data/botania/recipes/wands/twigwand_white_light_blue.json deleted file mode 100644 index 013a521ef..000000000 --- a/src/main/resources/data/botania/recipes/wands/twigwand_white_light_blue.json +++ /dev/null @@ -1,24 +0,0 @@ -{ - "result": { - "item": "botania:twig_wand", - "nbt": "{color1:0,color2:3}" - }, - "pattern": [ - " AS", - " SB", - "S " - ], - "type": "minecraft:crafting_shaped", - "key": { - "A": { - "tag": "botania:petals/white" - }, - "B": { - "tag": "botania:petals/light_blue" - }, - "S": { - "item": "botania:livingwood_twig" - } - }, - "group": "botania:twig_wand" -} \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_white_lime.json b/src/main/resources/data/botania/recipes/wands/twigwand_white_lime.json deleted file mode 100644 index c678ba56d..000000000 --- a/src/main/resources/data/botania/recipes/wands/twigwand_white_lime.json +++ /dev/null @@ -1,24 +0,0 @@ -{ - "result": { - "item": "botania:twig_wand", - "nbt": "{color1:0,color2:5}" - }, - "pattern": [ - " AS", - " SB", - "S " - ], - "type": "minecraft:crafting_shaped", - "key": { - "A": { - "tag": "botania:petals/white" - }, - "B": { - "tag": "botania:petals/lime" - }, - "S": { - "item": "botania:livingwood_twig" - } - }, - "group": "botania:twig_wand" -} \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_white_magenta.json b/src/main/resources/data/botania/recipes/wands/twigwand_white_magenta.json deleted file mode 100644 index 04a8b0647..000000000 --- a/src/main/resources/data/botania/recipes/wands/twigwand_white_magenta.json +++ /dev/null @@ -1,24 +0,0 @@ -{ - "result": { - "item": "botania:twig_wand", - "nbt": "{color1:0,color2:2}" - }, - "pattern": [ - " AS", - " SB", - "S " - ], - "type": "minecraft:crafting_shaped", - "key": { - "A": { - "tag": "botania:petals/white" - }, - "B": { - "tag": "botania:petals/magenta" - }, - "S": { - "item": "botania:livingwood_twig" - } - }, - "group": "botania:twig_wand" -} \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_white_orange.json b/src/main/resources/data/botania/recipes/wands/twigwand_white_orange.json deleted file mode 100644 index c1f25f679..000000000 --- a/src/main/resources/data/botania/recipes/wands/twigwand_white_orange.json +++ /dev/null @@ -1,24 +0,0 @@ -{ - "result": { - "item": "botania:twig_wand", - "nbt": "{color1:0,color2:1}" - }, - "pattern": [ - " AS", - " SB", - "S " - ], - "type": "minecraft:crafting_shaped", - "key": { - "A": { - "tag": "botania:petals/white" - }, - "B": { - "tag": "botania:petals/orange" - }, - "S": { - "item": "botania:livingwood_twig" - } - }, - "group": "botania:twig_wand" -} \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_white_pink.json b/src/main/resources/data/botania/recipes/wands/twigwand_white_pink.json deleted file mode 100644 index 6bd8521fc..000000000 --- a/src/main/resources/data/botania/recipes/wands/twigwand_white_pink.json +++ /dev/null @@ -1,24 +0,0 @@ -{ - "result": { - "item": "botania:twig_wand", - "nbt": "{color1:0,color2:6}" - }, - "pattern": [ - " AS", - " SB", - "S " - ], - "type": "minecraft:crafting_shaped", - "key": { - "A": { - "tag": "botania:petals/white" - }, - "B": { - "tag": "botania:petals/pink" - }, - "S": { - "item": "botania:livingwood_twig" - } - }, - "group": "botania:twig_wand" -} \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_white_purple.json b/src/main/resources/data/botania/recipes/wands/twigwand_white_purple.json deleted file mode 100644 index bba3ae910..000000000 --- a/src/main/resources/data/botania/recipes/wands/twigwand_white_purple.json +++ /dev/null @@ -1,24 +0,0 @@ -{ - "result": { - "item": "botania:twig_wand", - "nbt": "{color1:0,color2:10}" - }, - "pattern": [ - " AS", - " SB", - "S " - ], - "type": "minecraft:crafting_shaped", - "key": { - "A": { - "tag": "botania:petals/white" - }, - "B": { - "tag": "botania:petals/purple" - }, - "S": { - "item": "botania:livingwood_twig" - } - }, - "group": "botania:twig_wand" -} \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_white_red.json b/src/main/resources/data/botania/recipes/wands/twigwand_white_red.json deleted file mode 100644 index 9d8a08215..000000000 --- a/src/main/resources/data/botania/recipes/wands/twigwand_white_red.json +++ /dev/null @@ -1,24 +0,0 @@ -{ - "result": { - "item": "botania:twig_wand", - "nbt": "{color1:0,color2:14}" - }, - "pattern": [ - " AS", - " SB", - "S " - ], - "type": "minecraft:crafting_shaped", - "key": { - "A": { - "tag": "botania:petals/white" - }, - "B": { - "tag": "botania:petals/red" - }, - "S": { - "item": "botania:livingwood_twig" - } - }, - "group": "botania:twig_wand" -} \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_white_silver.json b/src/main/resources/data/botania/recipes/wands/twigwand_white_silver.json deleted file mode 100644 index 63cf59c78..000000000 --- a/src/main/resources/data/botania/recipes/wands/twigwand_white_silver.json +++ /dev/null @@ -1,24 +0,0 @@ -{ - "result": { - "item": "botania:twig_wand", - "nbt": "{color1:0,color2:8}" - }, - "pattern": [ - " AS", - " SB", - "S " - ], - "type": "minecraft:crafting_shaped", - "key": { - "A": { - "tag": "botania:petals/white" - }, - "B": { - "tag": "botania:petals/light_gray" - }, - "S": { - "item": "botania:livingwood_twig" - } - }, - "group": "botania:twig_wand" -} \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_white_white.json b/src/main/resources/data/botania/recipes/wands/twigwand_white_white.json deleted file mode 100644 index 83e23694b..000000000 --- a/src/main/resources/data/botania/recipes/wands/twigwand_white_white.json +++ /dev/null @@ -1,24 +0,0 @@ -{ - "result": { - "item": "botania:twig_wand", - "nbt": "{color1:0,color2:0}" - }, - "pattern": [ - " AS", - " SB", - "S " - ], - "type": "minecraft:crafting_shaped", - "key": { - "A": { - "tag": "botania:petals/white" - }, - "B": { - "tag": "botania:petals/white" - }, - "S": { - "item": "botania:livingwood_twig" - } - }, - "group": "botania:twig_wand" -} \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_white_yellow.json b/src/main/resources/data/botania/recipes/wands/twigwand_white_yellow.json deleted file mode 100644 index ad03863c1..000000000 --- a/src/main/resources/data/botania/recipes/wands/twigwand_white_yellow.json +++ /dev/null @@ -1,24 +0,0 @@ -{ - "result": { - "item": "botania:twig_wand", - "nbt": "{color1:0,color2:4}" - }, - "pattern": [ - " AS", - " SB", - "S " - ], - "type": "minecraft:crafting_shaped", - "key": { - "A": { - "tag": "botania:petals/white" - }, - "B": { - "tag": "botania:petals/yellow" - }, - "S": { - "item": "botania:livingwood_twig" - } - }, - "group": "botania:twig_wand" -} \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_yellow_black.json b/src/main/resources/data/botania/recipes/wands/twigwand_yellow_black.json deleted file mode 100644 index d213bd641..000000000 --- a/src/main/resources/data/botania/recipes/wands/twigwand_yellow_black.json +++ /dev/null @@ -1,24 +0,0 @@ -{ - "result": { - "item": "botania:twig_wand", - "nbt": "{color1:4,color2:15}" - }, - "pattern": [ - " AS", - " SB", - "S " - ], - "type": "minecraft:crafting_shaped", - "key": { - "A": { - "tag": "botania:petals/yellow" - }, - "B": { - "tag": "botania:petals/black" - }, - "S": { - "item": "botania:livingwood_twig" - } - }, - "group": "botania:twig_wand" -} \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_yellow_blue.json b/src/main/resources/data/botania/recipes/wands/twigwand_yellow_blue.json deleted file mode 100644 index 9ebd7cf43..000000000 --- a/src/main/resources/data/botania/recipes/wands/twigwand_yellow_blue.json +++ /dev/null @@ -1,24 +0,0 @@ -{ - "result": { - "item": "botania:twig_wand", - "nbt": "{color1:4,color2:11}" - }, - "pattern": [ - " AS", - " SB", - "S " - ], - "type": "minecraft:crafting_shaped", - "key": { - "A": { - "tag": "botania:petals/yellow" - }, - "B": { - "tag": "botania:petals/blue" - }, - "S": { - "item": "botania:livingwood_twig" - } - }, - "group": "botania:twig_wand" -} \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_yellow_brown.json b/src/main/resources/data/botania/recipes/wands/twigwand_yellow_brown.json deleted file mode 100644 index 82e3bf179..000000000 --- a/src/main/resources/data/botania/recipes/wands/twigwand_yellow_brown.json +++ /dev/null @@ -1,24 +0,0 @@ -{ - "result": { - "item": "botania:twig_wand", - "nbt": "{color1:4,color2:12}" - }, - "pattern": [ - " AS", - " SB", - "S " - ], - "type": "minecraft:crafting_shaped", - "key": { - "A": { - "tag": "botania:petals/yellow" - }, - "B": { - "tag": "botania:petals/brown" - }, - "S": { - "item": "botania:livingwood_twig" - } - }, - "group": "botania:twig_wand" -} \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_yellow_cyan.json b/src/main/resources/data/botania/recipes/wands/twigwand_yellow_cyan.json deleted file mode 100644 index 90584de00..000000000 --- a/src/main/resources/data/botania/recipes/wands/twigwand_yellow_cyan.json +++ /dev/null @@ -1,24 +0,0 @@ -{ - "result": { - "item": "botania:twig_wand", - "nbt": "{color1:4,color2:9}" - }, - "pattern": [ - " AS", - " SB", - "S " - ], - "type": "minecraft:crafting_shaped", - "key": { - "A": { - "tag": "botania:petals/yellow" - }, - "B": { - "tag": "botania:petals/cyan" - }, - "S": { - "item": "botania:livingwood_twig" - } - }, - "group": "botania:twig_wand" -} \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_yellow_gray.json b/src/main/resources/data/botania/recipes/wands/twigwand_yellow_gray.json deleted file mode 100644 index b9502ad77..000000000 --- a/src/main/resources/data/botania/recipes/wands/twigwand_yellow_gray.json +++ /dev/null @@ -1,24 +0,0 @@ -{ - "result": { - "item": "botania:twig_wand", - "nbt": "{color1:4,color2:7}" - }, - "pattern": [ - " AS", - " SB", - "S " - ], - "type": "minecraft:crafting_shaped", - "key": { - "A": { - "tag": "botania:petals/yellow" - }, - "B": { - "tag": "botania:petals/gray" - }, - "S": { - "item": "botania:livingwood_twig" - } - }, - "group": "botania:twig_wand" -} \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_yellow_green.json b/src/main/resources/data/botania/recipes/wands/twigwand_yellow_green.json deleted file mode 100644 index 72c2b6b57..000000000 --- a/src/main/resources/data/botania/recipes/wands/twigwand_yellow_green.json +++ /dev/null @@ -1,24 +0,0 @@ -{ - "result": { - "item": "botania:twig_wand", - "nbt": "{color1:4,color2:13}" - }, - "pattern": [ - " AS", - " SB", - "S " - ], - "type": "minecraft:crafting_shaped", - "key": { - "A": { - "tag": "botania:petals/yellow" - }, - "B": { - "tag": "botania:petals/green" - }, - "S": { - "item": "botania:livingwood_twig" - } - }, - "group": "botania:twig_wand" -} \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_yellow_light_blue.json b/src/main/resources/data/botania/recipes/wands/twigwand_yellow_light_blue.json deleted file mode 100644 index 971b901e8..000000000 --- a/src/main/resources/data/botania/recipes/wands/twigwand_yellow_light_blue.json +++ /dev/null @@ -1,24 +0,0 @@ -{ - "result": { - "item": "botania:twig_wand", - "nbt": "{color1:4,color2:3}" - }, - "pattern": [ - " AS", - " SB", - "S " - ], - "type": "minecraft:crafting_shaped", - "key": { - "A": { - "tag": "botania:petals/yellow" - }, - "B": { - "tag": "botania:petals/light_blue" - }, - "S": { - "item": "botania:livingwood_twig" - } - }, - "group": "botania:twig_wand" -} \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_yellow_lime.json b/src/main/resources/data/botania/recipes/wands/twigwand_yellow_lime.json deleted file mode 100644 index bd41d7e04..000000000 --- a/src/main/resources/data/botania/recipes/wands/twigwand_yellow_lime.json +++ /dev/null @@ -1,24 +0,0 @@ -{ - "result": { - "item": "botania:twig_wand", - "nbt": "{color1:4,color2:5}" - }, - "pattern": [ - " AS", - " SB", - "S " - ], - "type": "minecraft:crafting_shaped", - "key": { - "A": { - "tag": "botania:petals/yellow" - }, - "B": { - "tag": "botania:petals/lime" - }, - "S": { - "item": "botania:livingwood_twig" - } - }, - "group": "botania:twig_wand" -} \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_yellow_magenta.json b/src/main/resources/data/botania/recipes/wands/twigwand_yellow_magenta.json deleted file mode 100644 index f60158c05..000000000 --- a/src/main/resources/data/botania/recipes/wands/twigwand_yellow_magenta.json +++ /dev/null @@ -1,24 +0,0 @@ -{ - "result": { - "item": "botania:twig_wand", - "nbt": "{color1:4,color2:2}" - }, - "pattern": [ - " AS", - " SB", - "S " - ], - "type": "minecraft:crafting_shaped", - "key": { - "A": { - "tag": "botania:petals/yellow" - }, - "B": { - "tag": "botania:petals/magenta" - }, - "S": { - "item": "botania:livingwood_twig" - } - }, - "group": "botania:twig_wand" -} \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_yellow_orange.json b/src/main/resources/data/botania/recipes/wands/twigwand_yellow_orange.json deleted file mode 100644 index dee86c3be..000000000 --- a/src/main/resources/data/botania/recipes/wands/twigwand_yellow_orange.json +++ /dev/null @@ -1,24 +0,0 @@ -{ - "result": { - "item": "botania:twig_wand", - "nbt": "{color1:4,color2:1}" - }, - "pattern": [ - " AS", - " SB", - "S " - ], - "type": "minecraft:crafting_shaped", - "key": { - "A": { - "tag": "botania:petals/yellow" - }, - "B": { - "tag": "botania:petals/orange" - }, - "S": { - "item": "botania:livingwood_twig" - } - }, - "group": "botania:twig_wand" -} \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_yellow_pink.json b/src/main/resources/data/botania/recipes/wands/twigwand_yellow_pink.json deleted file mode 100644 index 7e39dac01..000000000 --- a/src/main/resources/data/botania/recipes/wands/twigwand_yellow_pink.json +++ /dev/null @@ -1,24 +0,0 @@ -{ - "result": { - "item": "botania:twig_wand", - "nbt": "{color1:4,color2:6}" - }, - "pattern": [ - " AS", - " SB", - "S " - ], - "type": "minecraft:crafting_shaped", - "key": { - "A": { - "tag": "botania:petals/yellow" - }, - "B": { - "tag": "botania:petals/pink" - }, - "S": { - "item": "botania:livingwood_twig" - } - }, - "group": "botania:twig_wand" -} \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_yellow_purple.json b/src/main/resources/data/botania/recipes/wands/twigwand_yellow_purple.json deleted file mode 100644 index f2d208249..000000000 --- a/src/main/resources/data/botania/recipes/wands/twigwand_yellow_purple.json +++ /dev/null @@ -1,24 +0,0 @@ -{ - "result": { - "item": "botania:twig_wand", - "nbt": "{color1:4,color2:10}" - }, - "pattern": [ - " AS", - " SB", - "S " - ], - "type": "minecraft:crafting_shaped", - "key": { - "A": { - "tag": "botania:petals/yellow" - }, - "B": { - "tag": "botania:petals/purple" - }, - "S": { - "item": "botania:livingwood_twig" - } - }, - "group": "botania:twig_wand" -} \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_yellow_red.json b/src/main/resources/data/botania/recipes/wands/twigwand_yellow_red.json deleted file mode 100644 index a481f63da..000000000 --- a/src/main/resources/data/botania/recipes/wands/twigwand_yellow_red.json +++ /dev/null @@ -1,24 +0,0 @@ -{ - "result": { - "item": "botania:twig_wand", - "nbt": "{color1:4,color2:14}" - }, - "pattern": [ - " AS", - " SB", - "S " - ], - "type": "minecraft:crafting_shaped", - "key": { - "A": { - "tag": "botania:petals/yellow" - }, - "B": { - "tag": "botania:petals/red" - }, - "S": { - "item": "botania:livingwood_twig" - } - }, - "group": "botania:twig_wand" -} \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_yellow_silver.json b/src/main/resources/data/botania/recipes/wands/twigwand_yellow_silver.json deleted file mode 100644 index e06293b03..000000000 --- a/src/main/resources/data/botania/recipes/wands/twigwand_yellow_silver.json +++ /dev/null @@ -1,24 +0,0 @@ -{ - "result": { - "item": "botania:twig_wand", - "nbt": "{color1:4,color2:8}" - }, - "pattern": [ - " AS", - " SB", - "S " - ], - "type": "minecraft:crafting_shaped", - "key": { - "A": { - "tag": "botania:petals/yellow" - }, - "B": { - "tag": "botania:petals/light_gray" - }, - "S": { - "item": "botania:livingwood_twig" - } - }, - "group": "botania:twig_wand" -} \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_yellow_white.json b/src/main/resources/data/botania/recipes/wands/twigwand_yellow_white.json deleted file mode 100644 index c578d6cc9..000000000 --- a/src/main/resources/data/botania/recipes/wands/twigwand_yellow_white.json +++ /dev/null @@ -1,24 +0,0 @@ -{ - "result": { - "item": "botania:twig_wand", - "nbt": "{color1:4,color2:0}" - }, - "pattern": [ - " AS", - " SB", - "S " - ], - "type": "minecraft:crafting_shaped", - "key": { - "A": { - "tag": "botania:petals/yellow" - }, - "B": { - "tag": "botania:petals/white" - }, - "S": { - "item": "botania:livingwood_twig" - } - }, - "group": "botania:twig_wand" -} \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_yellow_yellow.json b/src/main/resources/data/botania/recipes/wands/twigwand_yellow_yellow.json deleted file mode 100644 index ad18a7902..000000000 --- a/src/main/resources/data/botania/recipes/wands/twigwand_yellow_yellow.json +++ /dev/null @@ -1,24 +0,0 @@ -{ - "result": { - "item": "botania:twig_wand", - "nbt": "{color1:4,color2:4}" - }, - "pattern": [ - " AS", - " SB", - "S " - ], - "type": "minecraft:crafting_shaped", - "key": { - "A": { - "tag": "botania:petals/yellow" - }, - "B": { - "tag": "botania:petals/yellow" - }, - "S": { - "item": "botania:livingwood_twig" - } - }, - "group": "botania:twig_wand" -} \ No newline at end of file From 4f5adbe99286deb2c1eb647be73a520e1cd4b3ee Mon Sep 17 00:00:00 2001 From: Hubry Date: Thu, 30 Jan 2020 19:50:05 +0100 Subject: [PATCH 5/6] Fix dispensers checking valid cocoa directions on own pos, closes #3159 --- .../botania/common/block/dispenser/BehaviourCocoaBeans.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/vazkii/botania/common/block/dispenser/BehaviourCocoaBeans.java b/src/main/java/vazkii/botania/common/block/dispenser/BehaviourCocoaBeans.java index beedf8a71..ff40c6a03 100644 --- a/src/main/java/vazkii/botania/common/block/dispenser/BehaviourCocoaBeans.java +++ b/src/main/java/vazkii/botania/common/block/dispenser/BehaviourCocoaBeans.java @@ -33,7 +33,7 @@ public class BehaviourCocoaBeans extends DefaultDispenseItemBehavior { Direction facing = source.getBlockState().get(DispenserBlock.FACING); BlockPos pos = source.getBlockPos().offset(facing); World world = source.getWorld(); - BlockItemUseContext ctx = new DirectionalPlaceContext(source.getWorld(), source.getBlockPos(), facing, new ItemStack(block), facing.getOpposite()); + BlockItemUseContext ctx = new DirectionalPlaceContext(source.getWorld(), source.getBlockPos().offset(facing), facing, new ItemStack(block), facing.getOpposite()); BlockState cocoa = block.getStateForPlacement(ctx); if(cocoa != null && world.isAirBlock(pos)) { world.setBlockState(pos, cocoa); From 04ebd8c077e274e1f412bbdc062a42729f62e112 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Fri, 31 Jan 2020 13:10:23 -0600 Subject: [PATCH 6/6] Github CI: Build with --no-daemon --- .github/workflows/gradle.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/gradle.yml b/.github/workflows/gradle.yml index 66c5baa5f..4aba5ec45 100644 --- a/.github/workflows/gradle.yml +++ b/.github/workflows/gradle.yml @@ -19,4 +19,4 @@ jobs: path: ~/.gradle/caches key: ${{ runner.os }}-gradle-${{ hashFiles('build.gradle') }} - name: Build with Gradle - run: ./gradlew build + run: ./gradlew build --no-daemon