From 0e73ef6f08d272cf8115bef3a1758c0eee3ce137 Mon Sep 17 00:00:00 2001 From: Hubry Date: Mon, 17 Feb 2020 18:40:25 +0100 Subject: [PATCH] Minor patchouli corrections, remove old TC recipes/integration pages --- .../lexicon/en_us/entries/basics/wand.json | 4 +- .../en_us/entries/misc/tc_integration.json | 41 ------------------- .../en_us/entries/tools/mana_gear.json | 2 +- .../dynamic/elementium_helmet_revealing.json | 17 -------- .../dynamic/manasteel_helmet_revealing.json | 17 -------- .../dynamic/terrasteel_helmet_revealing.json | 17 -------- 6 files changed, 3 insertions(+), 95 deletions(-) delete mode 100644 src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/misc/tc_integration.json delete mode 100644 src/main/resources/data/botania/recipes/dynamic/elementium_helmet_revealing.json delete mode 100644 src/main/resources/data/botania/recipes/dynamic/manasteel_helmet_revealing.json delete mode 100644 src/main/resources/data/botania/recipes/dynamic/terrasteel_helmet_revealing.json diff --git a/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/basics/wand.json b/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/basics/wand.json index bbd4859f5..b770c6301 100644 --- a/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/basics/wand.json +++ b/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/basics/wand.json @@ -18,9 +18,9 @@ "text": "botania.page.wand2" }, { - "type": "crafting_multi", + "type": "crafting", "text": "botania.page.wand3", - "recipes": "botania:wands/twigwand_magenta_lime;botania:wands/twigwand_purple_green;botania:wands/twigwand_orange_pink;botania:wands/twigwand_orange_green;botania:wands/twigwand_brown_red;botania:wands/twigwand_blue_silver;botania:wands/twigwand_light_blue_light_blue;botania:wands/twigwand_light_blue_silver;botania:wands/twigwand_light_blue_magenta;botania:wands/twigwand_magenta_blue;botania:wands/twigwand_silver_magenta;botania:wands/twigwand_purple_purple;botania:wands/twigwand_white_green;botania:wands/twigwand_green_magenta;botania:wands/twigwand_gray_silver;botania:wands/twigwand_lime_cyan;botania:wands/twigwand_green_silver;botania:wands/twigwand_orange_blue;botania:wands/twigwand_blue_light_blue;botania:wands/twigwand_cyan_pink;botania:wands/twigwand_yellow_orange;botania:wands/twigwand_purple_orange;botania:wands/twigwand_purple_black;botania:wands/twigwand_yellow_pink;botania:wands/twigwand_green_lime;botania:wands/twigwand_red_light_blue;botania:wands/twigwand_white_yellow;botania:wands/twigwand_cyan_magenta;botania:wands/twigwand_silver_cyan;botania:wands/twigwand_lime_red;botania:wands/twigwand_white_purple;botania:wands/twigwand_yellow_red;botania:wands/twigwand_orange_cyan;botania:wands/twigwand_silver_light_blue;botania:wands/twigwand_white_red;botania:wands/twigwand_green_blue;botania:wands/twigwand_silver_yellow;botania:wands/twigwand_red_gray;botania:wands/twigwand_red_purple;botania:wands/twigwand_yellow_lime;botania:wands/twigwand_black_black;botania:wands/twigwand_blue_brown;botania:wands/twigwand_pink_white;botania:wands/twigwand_cyan_cyan;botania:wands/twigwand_yellow_blue;botania:wands/twigwand_purple_gray;botania:wands/twigwand_red_magenta;botania:wands/twigwand_light_blue_black;botania:wands/twigwand_yellow_purple;botania:wands/twigwand_purple_red;botania:wands/twigwand_blue_green;botania:wands/twigwand_pink_gray;botania:wands/twigwand_green_pink;botania:wands/twigwand_black_cyan;botania:wands/twigwand_light_blue_red;botania:wands/twigwand_gray_light_blue;botania:wands/twigwand_light_blue_green;botania:wands/twigwand_cyan_light_blue;botania:wands/twigwand_brown_gray;botania:wands/twigwand_silver_red;botania:wands/twigwand_black_brown;botania:wands/twigwand_blue_black;botania:wands/twigwand_cyan_orange;botania:wands/twigwand_silver_orange;botania:wands/twigwand_light_blue_gray;botania:wands/twigwand_silver_purple;botania:wands/twigwand_magenta_magenta;botania:wands/twigwand_pink_cyan;botania:wands/twigwand_magenta_purple;botania:wands/twigwand_orange_white;botania:wands/twigwand_blue_lime;botania:wands/twigwand_gray_red;botania:wands/twigwand_black_magenta;botania:wands/twigwand_white_gray;botania:wands/twigwand_brown_white;botania:wands/twigwand_blue_blue;botania:wands/twigwand_blue_white;botania:wands/twigwand_green_white;botania:wands/twigwand_light_blue_brown;botania:wands/twigwand_green_cyan;botania:wands/twigwand_green_orange;botania:wands/twigwand_cyan_red;botania:wands/twigwand_green_purple;botania:wands/twigwand_white_light_blue;botania:wands/twigwand_pink_magenta;botania:wands/twigwand_lime_lime;botania:wands/twigwand_black_green;botania:wands/twigwand_orange_light_blue;botania:wands/twigwand_green_red;botania:wands/twigwand_pink_silver;botania:wands/twigwand_cyan_yellow;botania:wands/twigwand_brown_blue;botania:wands/twigwand_blue_red;botania:wands/twigwand_orange_magenta;botania:wands/twigwand_silver_lime;botania:wands/twigwand_brown_silver;botania:wands/twigwand_lime_blue;botania:wands/twigwand_blue_pink;botania:wands/twigwand_lime_silver;botania:wands/twigwand_magenta_gray;botania:wands/twigwand_brown_lime;botania:wands/twigwand_red_orange;botania:wands/twigwand_orange_red;botania:wands/twigwand_magenta_silver;botania:wands/twigwand_purple_brown;botania:wands/twigwand_orange_lime;botania:wands/twigwand_orange_black;botania:wands/twigwand_white_orange;botania:wands/twigwand_silver_blue;botania:wands/twigwand_pink_purple;botania:wands/twigwand_lime_purple;botania:wands/twigwand_orange_brown;botania:wands/twigwand_lime_magenta;botania:wands/twigwand_lime_pink;botania:wands/twigwand_purple_yellow;botania:wands/twigwand_silver_silver;botania:wands/twigwand_green_green;botania:wands/twigwand_brown_green;botania:wands/twigwand_gray_gray;botania:wands/twigwand_silver_pink;botania:wands/twigwand_red_yellow;botania:wands/twigwand_yellow_cyan;botania:wands/twigwand_blue_magenta;botania:wands/twigwand_black_white;botania:wands/twigwand_blue_cyan;botania:wands/twigwand_pink_brown;botania:wands/twigwand_brown_orange;botania:wands/twigwand_yellow_black;botania:wands/twigwand_yellow_silver;botania:wands/twigwand_lime_gray;botania:wands/twigwand_brown_black;botania:wands/twigwand_green_black;botania:wands/twigwand_gray_orange;botania:wands/twigwand_red_red;botania:wands/twigwand_yellow_gray;botania:wands/twigwand_silver_gray;botania:wands/twigwand_lime_orange;botania:wands/twigwand_pink_lime;botania:wands/twigwand_green_yellow;botania:wands/twigwand_silver_black;botania:wands/twigwand_gray_purple;botania:wands/twigwand_light_blue_yellow;botania:wands/twigwand_brown_pink;botania:wands/twigwand_blue_yellow;botania:wands/twigwand_brown_brown;botania:wands/twigwand_lime_green;botania:wands/twigwand_green_brown;botania:wands/twigwand_white_silver;botania:wands/twigwand_pink_blue;botania:wands/twigwand_blue_purple;botania:wands/twigwand_pink_black;botania:wands/twigwand_magenta_red;botania:wands/twigwand_yellow_brown;botania:wands/twigwand_brown_magenta;botania:wands/twigwand_magenta_brown;botania:wands/twigwand_brown_purple;botania:wands/twigwand_gray_yellow;botania:wands/twigwand_cyan_gray;botania:wands/twigwand_purple_cyan;botania:wands/twigwand_light_blue_orange;botania:wands/twigwand_purple_magenta;botania:wands/twigwand_light_blue_purple;botania:wands/twigwand_lime_black;botania:wands/twigwand_silver_brown;botania:wands/twigwand_black_gray;botania:wands/twigwand_silver_green;botania:wands/twigwand_light_blue_blue;botania:wands/twigwand_magenta_yellow;botania:wands/twigwand_green_light_blue;botania:wands/twigwand_magenta_green;botania:wands/twigwand_brown_light_blue;botania:wands/twigwand_lime_brown;botania:wands/twigwand_light_blue_lime;botania:wands/twigwand_pink_green;botania:wands/twigwand_brown_yellow;botania:wands/twigwand_pink_pink;botania:wands/twigwand_red_cyan;botania:wands/twigwand_gray_white;botania:wands/twigwand_purple_pink;botania:wands/twigwand_cyan_white;botania:wands/twigwand_brown_cyan;botania:wands/twigwand_blue_orange;botania:wands/twigwand_orange_silver;botania:wands/twigwand_purple_silver;botania:wands/twigwand_orange_gray;botania:wands/twigwand_black_yellow;botania:wands/twigwand_red_silver;botania:wands/twigwand_light_blue_pink;botania:wands/twigwand_yellow_green;botania:wands/twigwand_pink_orange;botania:wands/twigwand_pink_light_blue;botania:wands/twigwand_magenta_black;botania:wands/twigwand_red_white;botania:wands/twigwand_lime_yellow;botania:wands/twigwand_gray_black;botania:wands/twigwand_black_blue;botania:wands/twigwand_green_gray;botania:wands/twigwand_lime_light_blue;botania:wands/twigwand_white_cyan;botania:wands/twigwand_gray_blue;botania:wands/twigwand_magenta_orange;botania:wands/twigwand_magenta_light_blue;botania:wands/twigwand_orange_purple;botania:wands/twigwand_yellow_light_blue;botania:wands/twigwand_purple_light_blue;botania:wands/twigwand_black_lime;botania:wands/twigwand_gray_magenta;botania:wands/twigwand_purple_white;botania:wands/twigwand_gray_pink;botania:wands/twigwand_white_brown;botania:wands/twigwand_black_orange;botania:wands/twigwand_purple_blue;botania:wands/twigwand_white_white;botania:wands/twigwand_gray_lime;botania:wands/twigwand_black_pink;botania:wands/twigwand_light_blue_white;botania:wands/twigwand_red_pink;botania:wands/twigwand_cyan_green;botania:wands/twigwand_purple_lime;botania:wands/twigwand_yellow_white;botania:wands/twigwand_magenta_white;botania:wands/twigwand_red_green;botania:wands/twigwand_cyan_silver;botania:wands/twigwand_white_magenta;botania:wands/twigwand_pink_yellow;botania:wands/twigwand_magenta_cyan;botania:wands/twigwand_silver_white;botania:wands/twigwand_white_pink;botania:wands/twigwand_cyan_purple;botania:wands/twigwand_light_blue_cyan;botania:wands/twigwand_gray_green;botania:wands/twigwand_cyan_black;botania:wands/twigwand_black_silver;botania:wands/twigwand_white_black;botania:wands/twigwand_black_light_blue;botania:wands/twigwand_magenta_pink;botania:wands/twigwand_orange_yellow;botania:wands/twigwand_red_black;botania:wands/twigwand_white_blue;botania:wands/twigwand_black_purple;botania:wands/twigwand_blue_gray;botania:wands/twigwand_cyan_lime;botania:wands/twigwand_pink_red;botania:wands/twigwand_red_lime;botania:wands/twigwand_black_red;botania:wands/twigwand_cyan_brown;botania:wands/twigwand_lime_white;botania:wands/twigwand_yellow_magenta;botania:wands/twigwand_white_lime;botania:wands/twigwand_gray_cyan;botania:wands/twigwand_orange_orange;botania:wands/twigwand_cyan_blue;botania:wands/twigwand_red_blue;botania:wands/twigwand_yellow_yellow;botania:wands/twigwand_gray_brown;botania:wands/twigwand_red_brown" + "recipe": "botania:twig_wand" } ] } \ No newline at end of file diff --git a/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/misc/tc_integration.json b/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/misc/tc_integration.json deleted file mode 100644 index 90c787262..000000000 --- a/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/misc/tc_integration.json +++ /dev/null @@ -1,41 +0,0 @@ -{ - "name": "botania.entry.tcIntegration", - "category": "misc", - "icon": "botania:mana_inkwell", - "flag": "|debug,mod:thaumcraft", - "advancement": "botania:main/mana_pool_pickup", - "pages": [ - { - "type": "text", - "text": "botania.page.tcIntegration0" - }, - { - "type": "text", - "text": "botania.page.tcIntegration1" - }, - { - "type": "crafting", - "text": "botania.page.tcIntegration2", - "recipe": "botania:terrasteel_helmet_revealing" - }, - { - "type": "text", - "text": "botania.page.tcIntegration3" - }, - { - "type": "mana_infusion", - "text": "botania.page.tcIntegration4", - "recipes": "botania:dummy" - }, - { - "type": "text", - "text": "botania.page.tcIntegration5" - }, - { - "type": "brew", - "text": "botania.page.tcIntegration6a", - "flavor": "botania.page.tcIntegration6b", - "recipe": "botania:dummy" - } - ] -} \ No newline at end of file diff --git a/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/tools/mana_gear.json b/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/tools/mana_gear.json index 4c9407bec..480cbc4e7 100644 --- a/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/tools/mana_gear.json +++ b/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/tools/mana_gear.json @@ -16,7 +16,7 @@ { "type": "crafting", "text": "botania.page.manaGear1", - "recipe": "botania:manasteel_pickaxe" + "recipe": "botania:manasteel_pick" }, { "type": "crafting", diff --git a/src/main/resources/data/botania/recipes/dynamic/elementium_helmet_revealing.json b/src/main/resources/data/botania/recipes/dynamic/elementium_helmet_revealing.json deleted file mode 100644 index 86fdba355..000000000 --- a/src/main/resources/data/botania/recipes/dynamic/elementium_helmet_revealing.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "thaumcraft" - } - ], - "type": "botania:helm_revealing", - "output": { - "item": "botania:elementium_helmet_revealing" - }, - "group": "botania:helm_revealing", - "ingredients": [ - { "item": "botania:elementium_helmet" }, - { "item": "thaumcraft:goggles" } - ] -} diff --git a/src/main/resources/data/botania/recipes/dynamic/manasteel_helmet_revealing.json b/src/main/resources/data/botania/recipes/dynamic/manasteel_helmet_revealing.json deleted file mode 100644 index ebb8cd2eb..000000000 --- a/src/main/resources/data/botania/recipes/dynamic/manasteel_helmet_revealing.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "thaumcraft" - } - ], - "type": "botania:helm_revealing", - "output": { - "item": "botania:manasteel_helmet_revealing" - }, - "group": "botania:helm_revealing", - "ingredients": [ - { "item": "botania:manasteel_helmet" }, - { "item": "thaumcraft:goggles" } - ] -} diff --git a/src/main/resources/data/botania/recipes/dynamic/terrasteel_helmet_revealing.json b/src/main/resources/data/botania/recipes/dynamic/terrasteel_helmet_revealing.json deleted file mode 100644 index ff9408fba..000000000 --- a/src/main/resources/data/botania/recipes/dynamic/terrasteel_helmet_revealing.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "thaumcraft" - } - ], - "type": "botania:helm_revealing", - "output": { - "item": "botania:terrasteel_helmet_revealing" - }, - "group": "botania:helm_revealing", - "ingredients": [ - { "item": "botania:terrasteel_helmet" }, - { "item": "thaumcraft:goggles" } - ] -}