From 8989c6fa7b42774d3d27d106277716b76cd20977 Mon Sep 17 00:00:00 2001 From: Robotgiggle Date: Wed, 4 Dec 2024 20:30:02 -0500 Subject: [PATCH 1/2] Remove "brew a vanilla potion" from potion unlocks --- .../spectrum/advancements/unlocks/potions/darkness.json | 6 ------ .../advancements/unlocks/potions/deadly_poison.json | 6 ------ .../spectrum/advancements/unlocks/potions/levitation.json | 4 ---- .../spectrum/advancements/unlocks/potions/life_drain.json | 6 ------ .../data/spectrum/advancements/unlocks/potions/luck.json | 4 ---- .../spectrum/advancements/unlocks/potions/resistance.json | 4 ---- .../data/spectrum/advancements/unlocks/potions/scarred.json | 6 ------ .../advancements/unlocks/potions/strong_sleep_effects.json | 6 ------ .../spectrum/advancements/unlocks/potions/toughness.json | 6 ------ .../advancements/unlocks/potions/weak_sleep_effects.json | 6 ------ .../data/spectrum/advancements/unlocks/potions/wither.json | 4 ---- 11 files changed, 58 deletions(-) diff --git a/src/main/resources/data/spectrum/advancements/unlocks/potions/darkness.json b/src/main/resources/data/spectrum/advancements/unlocks/potions/darkness.json index 1813cc4d0d..81ce8a88e2 100644 --- a/src/main/resources/data/spectrum/advancements/unlocks/potions/darkness.json +++ b/src/main/resources/data/spectrum/advancements/unlocks/potions/darkness.json @@ -1,11 +1,5 @@ { "criteria": { - "crafted_potion_in_potion_brewery": { - "trigger": "revelationary:advancement_gotten", - "conditions": { - "advancement_identifier": "spectrum:midgame/brew_potion_in_potion_workshop" - } - }, "collected_echo_shard": { "trigger": "revelationary:advancement_gotten", "conditions": { diff --git a/src/main/resources/data/spectrum/advancements/unlocks/potions/deadly_poison.json b/src/main/resources/data/spectrum/advancements/unlocks/potions/deadly_poison.json index a26d5548b4..edb4c2139b 100644 --- a/src/main/resources/data/spectrum/advancements/unlocks/potions/deadly_poison.json +++ b/src/main/resources/data/spectrum/advancements/unlocks/potions/deadly_poison.json @@ -1,11 +1,5 @@ { "criteria": { - "crafted_potion_in_potion_brewery": { - "trigger": "revelationary:advancement_gotten", - "conditions": { - "advancement_identifier": "spectrum:midgame/brew_potion_in_potion_workshop" - } - }, "collected_dragonbone": { "trigger": "revelationary:advancement_gotten", "conditions": { diff --git a/src/main/resources/data/spectrum/advancements/unlocks/potions/levitation.json b/src/main/resources/data/spectrum/advancements/unlocks/potions/levitation.json index c226a5878c..28159de34c 100644 --- a/src/main/resources/data/spectrum/advancements/unlocks/potions/levitation.json +++ b/src/main/resources/data/spectrum/advancements/unlocks/potions/levitation.json @@ -1,9 +1,5 @@ { "criteria": { - "crafted_potion_in_potion_brewery": { - "trigger":"revelationary:advancement_gotten", - "conditions": { "advancement_identifier": "spectrum:midgame/brew_potion_in_potion_workshop" } - }, "collected_paltaeria": { "trigger":"revelationary:advancement_gotten", "conditions": { "advancement_identifier": "spectrum:lategame/collect_paltaeria" } diff --git a/src/main/resources/data/spectrum/advancements/unlocks/potions/life_drain.json b/src/main/resources/data/spectrum/advancements/unlocks/potions/life_drain.json index ad5bfb038f..56f49f6961 100644 --- a/src/main/resources/data/spectrum/advancements/unlocks/potions/life_drain.json +++ b/src/main/resources/data/spectrum/advancements/unlocks/potions/life_drain.json @@ -1,11 +1,5 @@ { "criteria": { - "crafted_potion_in_potion_brewery": { - "trigger": "revelationary:advancement_gotten", - "conditions": { - "advancement_identifier": "spectrum:midgame/brew_potion_in_potion_workshop" - } - }, "collected_downstone_fragments": { "trigger": "revelationary:advancement_gotten", "conditions": { diff --git a/src/main/resources/data/spectrum/advancements/unlocks/potions/luck.json b/src/main/resources/data/spectrum/advancements/unlocks/potions/luck.json index 0c18be1252..5946d6c226 100644 --- a/src/main/resources/data/spectrum/advancements/unlocks/potions/luck.json +++ b/src/main/resources/data/spectrum/advancements/unlocks/potions/luck.json @@ -1,9 +1,5 @@ { "criteria": { - "crafted_potion_in_potion_brewery": { - "trigger":"revelationary:advancement_gotten", - "conditions": { "advancement_identifier": "spectrum:midgame/brew_potion_in_potion_workshop" } - }, "collected_four_leaf_clover": { "trigger":"revelationary:advancement_gotten", "conditions": { "advancement_identifier": "spectrum:collect_four_leaf_clover" } diff --git a/src/main/resources/data/spectrum/advancements/unlocks/potions/resistance.json b/src/main/resources/data/spectrum/advancements/unlocks/potions/resistance.json index e98fc0342e..4b98fa5cda 100644 --- a/src/main/resources/data/spectrum/advancements/unlocks/potions/resistance.json +++ b/src/main/resources/data/spectrum/advancements/unlocks/potions/resistance.json @@ -1,9 +1,5 @@ { "criteria": { - "crafted_potion_in_potion_brewery": { - "trigger":"revelationary:advancement_gotten", - "conditions": { "advancement_identifier": "spectrum:midgame/brew_potion_in_potion_workshop" } - }, "collected_moonstone": { "trigger":"revelationary:advancement_gotten", "conditions": { diff --git a/src/main/resources/data/spectrum/advancements/unlocks/potions/scarred.json b/src/main/resources/data/spectrum/advancements/unlocks/potions/scarred.json index a26d5548b4..edb4c2139b 100644 --- a/src/main/resources/data/spectrum/advancements/unlocks/potions/scarred.json +++ b/src/main/resources/data/spectrum/advancements/unlocks/potions/scarred.json @@ -1,11 +1,5 @@ { "criteria": { - "crafted_potion_in_potion_brewery": { - "trigger": "revelationary:advancement_gotten", - "conditions": { - "advancement_identifier": "spectrum:midgame/brew_potion_in_potion_workshop" - } - }, "collected_dragonbone": { "trigger": "revelationary:advancement_gotten", "conditions": { diff --git a/src/main/resources/data/spectrum/advancements/unlocks/potions/strong_sleep_effects.json b/src/main/resources/data/spectrum/advancements/unlocks/potions/strong_sleep_effects.json index f4618919e2..d887e4eeeb 100644 --- a/src/main/resources/data/spectrum/advancements/unlocks/potions/strong_sleep_effects.json +++ b/src/main/resources/data/spectrum/advancements/unlocks/potions/strong_sleep_effects.json @@ -1,11 +1,5 @@ { "criteria": { - "crafted_potion_in_potion_brewery": { - "trigger": "revelationary:advancement_gotten", - "conditions": { - "advancement_identifier": "spectrum:midgame/brew_potion_in_potion_workshop" - } - }, "eat_burgeon": { "trigger": "minecraft:consume_item", "conditions": { diff --git a/src/main/resources/data/spectrum/advancements/unlocks/potions/toughness.json b/src/main/resources/data/spectrum/advancements/unlocks/potions/toughness.json index 707f915c37..43379b210e 100644 --- a/src/main/resources/data/spectrum/advancements/unlocks/potions/toughness.json +++ b/src/main/resources/data/spectrum/advancements/unlocks/potions/toughness.json @@ -1,11 +1,5 @@ { "criteria": { - "crafted_potion_in_potion_brewery": { - "trigger": "revelationary:advancement_gotten", - "conditions": { - "advancement_identifier": "spectrum:midgame/brew_potion_in_potion_workshop" - } - }, "collected_glass_peach": { "trigger": "revelationary:advancement_gotten", "conditions": { diff --git a/src/main/resources/data/spectrum/advancements/unlocks/potions/weak_sleep_effects.json b/src/main/resources/data/spectrum/advancements/unlocks/potions/weak_sleep_effects.json index 2c5c18603f..63ba6d6874 100644 --- a/src/main/resources/data/spectrum/advancements/unlocks/potions/weak_sleep_effects.json +++ b/src/main/resources/data/spectrum/advancements/unlocks/potions/weak_sleep_effects.json @@ -1,11 +1,5 @@ { "criteria": { - "crafted_potion_in_potion_brewery": { - "trigger": "revelationary:advancement_gotten", - "conditions": { - "advancement_identifier": "spectrum:midgame/brew_potion_in_potion_workshop" - } - }, "eat_sprout": { "trigger": "minecraft:consume_item", "conditions": { diff --git a/src/main/resources/data/spectrum/advancements/unlocks/potions/wither.json b/src/main/resources/data/spectrum/advancements/unlocks/potions/wither.json index 682c1530d7..1648cd3944 100644 --- a/src/main/resources/data/spectrum/advancements/unlocks/potions/wither.json +++ b/src/main/resources/data/spectrum/advancements/unlocks/potions/wither.json @@ -1,9 +1,5 @@ { "criteria": { - "crafted_potion_in_potion_brewery": { - "trigger":"revelationary:advancement_gotten", - "conditions": { "advancement_identifier": "spectrum:midgame/brew_potion_in_potion_workshop" } - }, "collected_midnight_chip": { "trigger":"revelationary:advancement_gotten", "conditions": { "advancement_identifier": "spectrum:midgame/collect_midnight_chip" } From 2e0579977258244daf95b98c446b0484ee7927b2 Mon Sep 17 00:00:00 2001 From: Robotgiggle Date: Wed, 4 Dec 2024 21:01:15 -0500 Subject: [PATCH 2/2] Remove it even harder --- .../unlocks/potions/darkness.json | 10 ------ .../unlocks/potions/deadly_poison.json | 10 ------ .../unlocks/potions/levitation.json | 8 ----- .../unlocks/potions/life_drain.json | 10 ------ .../advancements/unlocks/potions/luck.json | 8 ----- .../unlocks/potions/resistance.json | 10 ------ .../advancements/unlocks/potions/scarred.json | 10 ------ .../unlocks/potions/toughness.json | 10 ------ .../advancements/unlocks/potions/wither.json | 8 ----- .../brewing/potion_workshop_brewing.json | 34 +++++-------------- .../mod_integration/02_04_hexcasting.json | 4 --- .../mod_integration/06_00_botania.json | 28 --------------- .../entries/mod_integration/06_06_victus.json | 8 ----- .../distilled_spirit_resistance.json | 2 +- .../potion_workshop_brewing/alt_luck.json | 2 +- .../potion_workshop_brewing/heartbleed.json | 1 - .../potion_workshop_brewing/resurgence.json | 1 - .../potion_workshop_brewing/absorption.json | 1 - .../potion_workshop_brewing/darkness.json | 2 +- .../deadly_poison.json | 2 +- .../potion_workshop_brewing/glowing.json | 1 - .../potion_workshop_brewing/haste.json | 1 - .../potion_workshop_brewing/hunger.json | 1 - .../potion_workshop_brewing/levitation.json | 2 +- .../potion_workshop_brewing/life_drain.json | 2 +- .../recipes/potion_workshop_brewing/luck.json | 2 +- .../mining_fatigue.json | 1 - .../potion_workshop_brewing/resistance.json | 2 +- .../potion_workshop_brewing/saturation.json | 1 - .../potion_workshop_brewing/scarred.json | 2 +- .../potion_workshop_brewing/toughness.json | 2 +- .../potion_workshop_brewing/unluck.json | 2 +- .../potion_workshop_brewing/wither.json | 2 +- 33 files changed, 21 insertions(+), 169 deletions(-) delete mode 100644 src/main/resources/data/spectrum/advancements/unlocks/potions/darkness.json delete mode 100644 src/main/resources/data/spectrum/advancements/unlocks/potions/deadly_poison.json delete mode 100644 src/main/resources/data/spectrum/advancements/unlocks/potions/levitation.json delete mode 100644 src/main/resources/data/spectrum/advancements/unlocks/potions/life_drain.json delete mode 100644 src/main/resources/data/spectrum/advancements/unlocks/potions/luck.json delete mode 100644 src/main/resources/data/spectrum/advancements/unlocks/potions/resistance.json delete mode 100644 src/main/resources/data/spectrum/advancements/unlocks/potions/scarred.json delete mode 100644 src/main/resources/data/spectrum/advancements/unlocks/potions/toughness.json delete mode 100644 src/main/resources/data/spectrum/advancements/unlocks/potions/wither.json diff --git a/src/main/resources/data/spectrum/advancements/unlocks/potions/darkness.json b/src/main/resources/data/spectrum/advancements/unlocks/potions/darkness.json deleted file mode 100644 index 81ce8a88e2..0000000000 --- a/src/main/resources/data/spectrum/advancements/unlocks/potions/darkness.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "criteria": { - "collected_echo_shard": { - "trigger": "revelationary:advancement_gotten", - "conditions": { - "advancement_identifier": "spectrum:hidden/collect_vanilla/echo_shard" - } - } - } -} \ No newline at end of file diff --git a/src/main/resources/data/spectrum/advancements/unlocks/potions/deadly_poison.json b/src/main/resources/data/spectrum/advancements/unlocks/potions/deadly_poison.json deleted file mode 100644 index edb4c2139b..0000000000 --- a/src/main/resources/data/spectrum/advancements/unlocks/potions/deadly_poison.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "criteria": { - "collected_dragonbone": { - "trigger": "revelationary:advancement_gotten", - "conditions": { - "advancement_identifier": "spectrum:break_cracked_dragonbone" - } - } - } -} \ No newline at end of file diff --git a/src/main/resources/data/spectrum/advancements/unlocks/potions/levitation.json b/src/main/resources/data/spectrum/advancements/unlocks/potions/levitation.json deleted file mode 100644 index 28159de34c..0000000000 --- a/src/main/resources/data/spectrum/advancements/unlocks/potions/levitation.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "criteria": { - "collected_paltaeria": { - "trigger":"revelationary:advancement_gotten", - "conditions": { "advancement_identifier": "spectrum:lategame/collect_paltaeria" } - } - } -} \ No newline at end of file diff --git a/src/main/resources/data/spectrum/advancements/unlocks/potions/life_drain.json b/src/main/resources/data/spectrum/advancements/unlocks/potions/life_drain.json deleted file mode 100644 index 56f49f6961..0000000000 --- a/src/main/resources/data/spectrum/advancements/unlocks/potions/life_drain.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "criteria": { - "collected_downstone_fragments": { - "trigger": "revelationary:advancement_gotten", - "conditions": { - "advancement_identifier": "spectrum:collect_downstone_fragments" - } - } - } -} \ No newline at end of file diff --git a/src/main/resources/data/spectrum/advancements/unlocks/potions/luck.json b/src/main/resources/data/spectrum/advancements/unlocks/potions/luck.json deleted file mode 100644 index 5946d6c226..0000000000 --- a/src/main/resources/data/spectrum/advancements/unlocks/potions/luck.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "criteria": { - "collected_four_leaf_clover": { - "trigger":"revelationary:advancement_gotten", - "conditions": { "advancement_identifier": "spectrum:collect_four_leaf_clover" } - } - } -} \ No newline at end of file diff --git a/src/main/resources/data/spectrum/advancements/unlocks/potions/resistance.json b/src/main/resources/data/spectrum/advancements/unlocks/potions/resistance.json deleted file mode 100644 index 4b98fa5cda..0000000000 --- a/src/main/resources/data/spectrum/advancements/unlocks/potions/resistance.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "criteria": { - "collected_moonstone": { - "trigger":"revelationary:advancement_gotten", - "conditions": { - "advancement_identifier": "spectrum:lategame/collect_moonstone" - } - } - } -} \ No newline at end of file diff --git a/src/main/resources/data/spectrum/advancements/unlocks/potions/scarred.json b/src/main/resources/data/spectrum/advancements/unlocks/potions/scarred.json deleted file mode 100644 index edb4c2139b..0000000000 --- a/src/main/resources/data/spectrum/advancements/unlocks/potions/scarred.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "criteria": { - "collected_dragonbone": { - "trigger": "revelationary:advancement_gotten", - "conditions": { - "advancement_identifier": "spectrum:break_cracked_dragonbone" - } - } - } -} \ No newline at end of file diff --git a/src/main/resources/data/spectrum/advancements/unlocks/potions/toughness.json b/src/main/resources/data/spectrum/advancements/unlocks/potions/toughness.json deleted file mode 100644 index 43379b210e..0000000000 --- a/src/main/resources/data/spectrum/advancements/unlocks/potions/toughness.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "criteria": { - "collected_glass_peach": { - "trigger": "revelationary:advancement_gotten", - "conditions": { - "advancement_identifier": "spectrum:hidden/collect_glass_peach" - } - } - } -} \ No newline at end of file diff --git a/src/main/resources/data/spectrum/advancements/unlocks/potions/wither.json b/src/main/resources/data/spectrum/advancements/unlocks/potions/wither.json deleted file mode 100644 index 1648cd3944..0000000000 --- a/src/main/resources/data/spectrum/advancements/unlocks/potions/wither.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "criteria": { - "collected_midnight_chip": { - "trigger":"revelationary:advancement_gotten", - "conditions": { "advancement_identifier": "spectrum:midgame/collect_midnight_chip" } - } - } -} \ No newline at end of file diff --git a/src/main/resources/data/spectrum/modonomicon/books/guidebook/entries/brewing/potion_workshop_brewing.json b/src/main/resources/data/spectrum/modonomicon/books/guidebook/entries/brewing/potion_workshop_brewing.json index 3aa27e2843..0e1803b15b 100644 --- a/src/main/resources/data/spectrum/modonomicon/books/guidebook/entries/brewing/potion_workshop_brewing.json +++ b/src/main/resources/data/spectrum/modonomicon/books/guidebook/entries/brewing/potion_workshop_brewing.json @@ -47,38 +47,22 @@ { "type": "spectrum:potion_workshop_brewing", "title": "effect.minecraft.absorption", - "condition": { - "type": "modonomicon:advancement", - "advancement_id": "spectrum:midgame/brew_potion_in_potion_workshop" - }, "recipe_id": "spectrum:potion_workshop_brewing/absorption" }, { "type": "spectrum:potion_workshop_brewing", "title": "effect.minecraft.glowing", - "condition": { - "type": "modonomicon:advancement", - "advancement_id": "spectrum:midgame/brew_potion_in_potion_workshop" - }, "recipe_id": "spectrum:potion_workshop_brewing/glowing" }, { "type": "spectrum:potion_workshop_brewing", "title": "effect.minecraft.haste", - "condition": { - "type": "modonomicon:advancement", - "advancement_id": "spectrum:midgame/brew_potion_in_potion_workshop" - }, "recipe_id": "spectrum:potion_workshop_brewing/haste", "text": "book.spectrum.guidebook.potion_workshop_brewing.page4.text" }, { "type": "spectrum:potion_workshop_brewing", "title": "effect.minecraft.saturation", - "condition": { - "type": "modonomicon:advancement", - "advancement_id": "spectrum:midgame/brew_potion_in_potion_workshop" - }, "recipe_id": "spectrum:potion_workshop_brewing/saturation", "text": "book.spectrum.guidebook.potion_workshop_brewing.page5.text" }, @@ -87,7 +71,7 @@ "title": "effect.minecraft.levitation", "condition": { "type": "modonomicon:advancement", - "advancement_id": "spectrum:unlocks/potions/levitation" + "advancement_id": "spectrum:lategame/collect_paltaeria" }, "recipe_id": "spectrum:potion_workshop_brewing/levitation" }, @@ -96,7 +80,7 @@ "title": "effect.minecraft.luck", "condition": { "type": "modonomicon:advancement", - "advancement_id": "spectrum:unlocks/potions/luck" + "advancement_id": "spectrum:collect_four_leaf_clover" }, "recipe_id": "spectrum:potion_workshop_brewing/luck", "text": "book.spectrum.guidebook.potion_workshop_brewing.page7.text" @@ -106,7 +90,7 @@ "title": "effect.minecraft.resistance", "condition": { "type": "modonomicon:advancement", - "advancement_id": "spectrum:unlocks/potions/resistance" + "advancement_id": "spectrum:lategame/collect_moonstone" }, "recipe_id": "spectrum:potion_workshop_brewing/resistance", "text": "book.spectrum.guidebook.potion_workshop_brewing.low_potency_mod" @@ -116,7 +100,7 @@ "title": "effect.minecraft.wither", "condition": { "type": "modonomicon:advancement", - "advancement_id": "spectrum:unlocks/potions/wither" + "advancement_id": "spectrum:midgame/collect_midnight_chip" }, "recipe_id": "spectrum:potion_workshop_brewing/wither", "text": "book.spectrum.guidebook.potion_workshop_brewing.low_potency_mod" @@ -126,7 +110,7 @@ "title": "effect.minecraft.darkness", "condition": { "type": "modonomicon:advancement", - "advancement_id": "spectrum:unlocks/potions/darkness" + "advancement_id": "spectrum:hidden/collect_vanilla/echo_shard" }, "recipe_id": "spectrum:potion_workshop_brewing/darkness" }, @@ -135,7 +119,7 @@ "title": "effect.spectrum.toughness", "condition": { "type": "modonomicon:advancement", - "advancement_id": "spectrum:unlocks/potions/toughness" + "advancement_id": "spectrum:hidden/collect_glass_peach" }, "recipe_id": "spectrum:potion_workshop_brewing/toughness", "text": "book.spectrum.guidebook.potion_workshop_brewing.low_potency_mod" @@ -145,7 +129,7 @@ "title": "effect.spectrum.deadly_poison", "condition": { "type": "modonomicon:advancement", - "advancement_id": "spectrum:unlocks/potions/deadly_poison" + "advancement_id": "spectrum:break_cracked_dragonbone" }, "recipe_id": "spectrum:potion_workshop_brewing/deadly_poison" }, @@ -154,7 +138,7 @@ "title": "effect.spectrum.life_drain", "condition": { "type": "modonomicon:advancement", - "advancement_id": "spectrum:unlocks/potions/life_drain" + "advancement_id": "spectrum:collect_downstone_fragments" }, "recipe_id": "spectrum:potion_workshop_brewing/life_drain" }, @@ -163,7 +147,7 @@ "title": "effect.spectrum.scarred", "condition": { "type": "modonomicon:advancement", - "advancement_id": "spectrum:unlocks/potions/scarred" + "advancement_id": "spectrum:break_cracked_dragonbone" }, "recipe_id": "spectrum:potion_workshop_brewing/scarred" }, diff --git a/src/main/resources/data/spectrum/modonomicon/books/guidebook/entries/mod_integration/02_04_hexcasting.json b/src/main/resources/data/spectrum/modonomicon/books/guidebook/entries/mod_integration/02_04_hexcasting.json index 15ca1052d1..3324e0b07d 100644 --- a/src/main/resources/data/spectrum/modonomicon/books/guidebook/entries/mod_integration/02_04_hexcasting.json +++ b/src/main/resources/data/spectrum/modonomicon/books/guidebook/entries/mod_integration/02_04_hexcasting.json @@ -67,10 +67,6 @@ }, { "type": "spectrum:potion_workshop_brewing", - "condition": { - "type": "modonomicon:advancement", - "advancement_id": "spectrum:midgame/brew_potion_in_potion_workshop" - }, "text": "book.spectrum.guidebook.mod_integration.hexcasting.page5.text", "title": "effect.hexcasting.enlarge_grid", "recipe_id": "spectrum:mod_integration/hexcasting/potion_workshop_brewing/hexcasting_enlarge_grid" diff --git a/src/main/resources/data/spectrum/modonomicon/books/guidebook/entries/mod_integration/06_00_botania.json b/src/main/resources/data/spectrum/modonomicon/books/guidebook/entries/mod_integration/06_00_botania.json index 98b70b3e23..077e19817c 100644 --- a/src/main/resources/data/spectrum/modonomicon/books/guidebook/entries/mod_integration/06_00_botania.json +++ b/src/main/resources/data/spectrum/modonomicon/books/guidebook/entries/mod_integration/06_00_botania.json @@ -101,10 +101,6 @@ { "type": "modonomicon:spotlight", "title": "book.spectrum.guidebook.potion_reagent", - "condition": { - "type": "modonomicon:advancement", - "advancement_id": "spectrum:midgame/brew_potion_in_potion_workshop" - }, "item": { "item": "botania:black_lotus" }, @@ -113,10 +109,6 @@ { "type": "modonomicon:spotlight", "title": "book.spectrum.guidebook.potion_reagent", - "condition": { - "type": "modonomicon:advancement", - "advancement_id": "spectrum:midgame/brew_potion_in_potion_workshop" - }, "item": { "item": "botania:blacker_lotus" }, @@ -125,10 +117,6 @@ { "type": "modonomicon:spotlight", "title": "book.spectrum.guidebook.potion_reagent", - "condition": { - "type": "modonomicon:advancement", - "advancement_id": "spectrum:midgame/brew_potion_in_potion_workshop" - }, "item": { "item": "spectrum:blackest_lotus" }, @@ -137,10 +125,6 @@ { "type": "modonomicon:spotlight", "title": "book.spectrum.guidebook.potion_reagent", - "condition": { - "type": "modonomicon:advancement", - "advancement_id": "spectrum:midgame/brew_potion_in_potion_workshop" - }, "item": { "item": "spectrum:least_black_lotus" }, @@ -149,10 +133,6 @@ { "type": "modonomicon:spotlight", "title": "book.spectrum.guidebook.potion_reagent", - "condition": { - "type": "modonomicon:advancement", - "advancement_id": "spectrum:midgame/brew_potion_in_potion_workshop" - }, "item": { "item": "botania:life_essence" }, @@ -161,10 +141,6 @@ { "type": "modonomicon:spotlight", "title": "book.spectrum.guidebook.potion_reagent", - "condition": { - "type": "modonomicon:advancement", - "advancement_id": "spectrum:midgame/brew_potion_in_potion_workshop" - }, "item": { "item": "botania:mana_powder" }, @@ -173,10 +149,6 @@ { "type": "modonomicon:spotlight", "title": "book.spectrum.guidebook.potion_reagent", - "condition": { - "type": "modonomicon:advancement", - "advancement_id": "spectrum:midgame/brew_potion_in_potion_workshop" - }, "item": { "item": "botania:pixie_dust" }, diff --git a/src/main/resources/data/spectrum/modonomicon/books/guidebook/entries/mod_integration/06_06_victus.json b/src/main/resources/data/spectrum/modonomicon/books/guidebook/entries/mod_integration/06_06_victus.json index 0a1b808fca..af0e8ec69d 100644 --- a/src/main/resources/data/spectrum/modonomicon/books/guidebook/entries/mod_integration/06_06_victus.json +++ b/src/main/resources/data/spectrum/modonomicon/books/guidebook/entries/mod_integration/06_06_victus.json @@ -30,19 +30,11 @@ { "type": "spectrum:potion_workshop_brewing", "title": "book.spectrum.guidebook.mod_integration.victus.page1.title", - "condition": { - "type": "modonomicon:advancement", - "advancement_id": "spectrum:midgame/brew_potion_in_potion_workshop" - }, "recipe_id": "spectrum:mod_integration/victus/potion_workshop_brewing/resurgence" }, { "type": "spectrum:potion_workshop_brewing", "title": "book.spectrum.guidebook.mod_integration.victus.page2.title", - "condition": { - "type": "modonomicon:advancement", - "advancement_id": "spectrum:midgame/brew_potion_in_potion_workshop" - }, "recipe_id": "spectrum:mod_integration/victus/potion_workshop_brewing/heartbleed" } ] diff --git a/src/main/resources/data/spectrum/recipes/mod_integration/conjuring/potion_workshop_brewing/distilled_spirit_resistance.json b/src/main/resources/data/spectrum/recipes/mod_integration/conjuring/potion_workshop_brewing/distilled_spirit_resistance.json index 19e51c8ec9..f1ab1b5444 100644 --- a/src/main/resources/data/spectrum/recipes/mod_integration/conjuring/potion_workshop_brewing/distilled_spirit_resistance.json +++ b/src/main/resources/data/spectrum/recipes/mod_integration/conjuring/potion_workshop_brewing/distilled_spirit_resistance.json @@ -13,7 +13,7 @@ "applicable_to_potions": true, "applicable_to_tipped_arrows": true, "applicable_to_potion_fillables": true, - "required_advancement": "spectrum:unlocks/potions/resistance", + "required_advancement": "spectrum:lategame/collect_moonstone", "ink_color": "spectrum:blue", "ink_cost": 8, "potency_hard_cap": 3, diff --git a/src/main/resources/data/spectrum/recipes/mod_integration/the_bumblezone/potion_workshop_brewing/alt_luck.json b/src/main/resources/data/spectrum/recipes/mod_integration/the_bumblezone/potion_workshop_brewing/alt_luck.json index daf825c8eb..2a5655d062 100644 --- a/src/main/resources/data/spectrum/recipes/mod_integration/the_bumblezone/potion_workshop_brewing/alt_luck.json +++ b/src/main/resources/data/spectrum/recipes/mod_integration/the_bumblezone/potion_workshop_brewing/alt_luck.json @@ -13,7 +13,7 @@ "applicable_to_potions": true, "applicable_to_tipped_arrows": true, "applicable_to_potion_fillables": true, - "required_advancement": "spectrum:unlocks/potions/luck", + "required_advancement": "spectrum:collect_four_leaf_clover", "ink_color": "spectrum:light_blue", "ink_cost": 2, "fabric:load_conditions": [ diff --git a/src/main/resources/data/spectrum/recipes/mod_integration/victus/potion_workshop_brewing/heartbleed.json b/src/main/resources/data/spectrum/recipes/mod_integration/victus/potion_workshop_brewing/heartbleed.json index 8bec89fe21..aea09bfa50 100644 --- a/src/main/resources/data/spectrum/recipes/mod_integration/victus/potion_workshop_brewing/heartbleed.json +++ b/src/main/resources/data/spectrum/recipes/mod_integration/victus/potion_workshop_brewing/heartbleed.json @@ -15,7 +15,6 @@ "applicable_to_potions": true, "applicable_to_tipped_arrows": true, "applicable_to_potion_fillables": false, - "required_advancement": "spectrum:midgame/brew_potion_in_potion_workshop", "ink_color": "spectrum:pink", "ink_cost": 8, "fabric:load_conditions": [ diff --git a/src/main/resources/data/spectrum/recipes/mod_integration/victus/potion_workshop_brewing/resurgence.json b/src/main/resources/data/spectrum/recipes/mod_integration/victus/potion_workshop_brewing/resurgence.json index 4e8aed74e0..69d443e7fa 100644 --- a/src/main/resources/data/spectrum/recipes/mod_integration/victus/potion_workshop_brewing/resurgence.json +++ b/src/main/resources/data/spectrum/recipes/mod_integration/victus/potion_workshop_brewing/resurgence.json @@ -15,7 +15,6 @@ "applicable_to_potions": true, "applicable_to_tipped_arrows": true, "applicable_to_potion_fillables": true, - "required_advancement": "spectrum:midgame/brew_potion_in_potion_workshop", "ink_color": "spectrum:red", "ink_cost": 8, "fabric:load_conditions": [ diff --git a/src/main/resources/data/spectrum/recipes/potion_workshop_brewing/absorption.json b/src/main/resources/data/spectrum/recipes/potion_workshop_brewing/absorption.json index 4c784744aa..aee452105f 100644 --- a/src/main/resources/data/spectrum/recipes/potion_workshop_brewing/absorption.json +++ b/src/main/resources/data/spectrum/recipes/potion_workshop_brewing/absorption.json @@ -12,7 +12,6 @@ "applicable_to_potions": true, "applicable_to_tipped_arrows": true, "applicable_to_potion_fillables": false, - "required_advancement": "spectrum:midgame/brew_potion_in_potion_workshop", "ink_color": "spectrum:blue", "ink_cost": 4 } \ No newline at end of file diff --git a/src/main/resources/data/spectrum/recipes/potion_workshop_brewing/darkness.json b/src/main/resources/data/spectrum/recipes/potion_workshop_brewing/darkness.json index dfa95bb1fd..1a0a229112 100644 --- a/src/main/resources/data/spectrum/recipes/potion_workshop_brewing/darkness.json +++ b/src/main/resources/data/spectrum/recipes/potion_workshop_brewing/darkness.json @@ -15,7 +15,7 @@ "applicable_to_potions": true, "applicable_to_tipped_arrows": true, "applicable_to_potion_fillables": true, - "required_advancement": "spectrum:unlocks/potions/darkness", + "required_advancement": "spectrum:hidden/collect_vanilla/echo_shard", "ink_color": "spectrum:black", "ink_cost": 8 } \ No newline at end of file diff --git a/src/main/resources/data/spectrum/recipes/potion_workshop_brewing/deadly_poison.json b/src/main/resources/data/spectrum/recipes/potion_workshop_brewing/deadly_poison.json index f2007be221..0dfb938e1e 100644 --- a/src/main/resources/data/spectrum/recipes/potion_workshop_brewing/deadly_poison.json +++ b/src/main/resources/data/spectrum/recipes/potion_workshop_brewing/deadly_poison.json @@ -15,7 +15,7 @@ "applicable_to_potions": true, "applicable_to_tipped_arrows": true, "applicable_to_potion_fillables": true, - "required_advancement": "spectrum:unlocks/potions/deadly_poison", + "required_advancement": "spectrum:break_cracked_dragonbone", "ink_color": "spectrum:green", "ink_cost": 4 } \ No newline at end of file diff --git a/src/main/resources/data/spectrum/recipes/potion_workshop_brewing/glowing.json b/src/main/resources/data/spectrum/recipes/potion_workshop_brewing/glowing.json index b086a8a559..2b0a3d91dd 100644 --- a/src/main/resources/data/spectrum/recipes/potion_workshop_brewing/glowing.json +++ b/src/main/resources/data/spectrum/recipes/potion_workshop_brewing/glowing.json @@ -12,7 +12,6 @@ "applicable_to_potions": true, "applicable_to_tipped_arrows": true, "applicable_to_potion_fillables": true, - "required_advancement": "spectrum:midgame/brew_potion_in_potion_workshop", "ink_color": "spectrum:green", "ink_cost": 1 } \ No newline at end of file diff --git a/src/main/resources/data/spectrum/recipes/potion_workshop_brewing/haste.json b/src/main/resources/data/spectrum/recipes/potion_workshop_brewing/haste.json index aa687def1b..73836516ad 100644 --- a/src/main/resources/data/spectrum/recipes/potion_workshop_brewing/haste.json +++ b/src/main/resources/data/spectrum/recipes/potion_workshop_brewing/haste.json @@ -12,7 +12,6 @@ "applicable_to_potions": true, "applicable_to_tipped_arrows": true, "applicable_to_potion_fillables": true, - "required_advancement": "spectrum:midgame/brew_potion_in_potion_workshop", "ink_color": "spectrum:magenta", "ink_cost": 4 } \ No newline at end of file diff --git a/src/main/resources/data/spectrum/recipes/potion_workshop_brewing/hunger.json b/src/main/resources/data/spectrum/recipes/potion_workshop_brewing/hunger.json index ded010fec9..835778dcca 100644 --- a/src/main/resources/data/spectrum/recipes/potion_workshop_brewing/hunger.json +++ b/src/main/resources/data/spectrum/recipes/potion_workshop_brewing/hunger.json @@ -15,7 +15,6 @@ "applicable_to_potions": true, "applicable_to_tipped_arrows": true, "applicable_to_potion_fillables": true, - "required_advancement": "spectrum:midgame/brew_potion_in_potion_workshop", "ink_color": "spectrum:lime", "ink_cost": 2 } \ No newline at end of file diff --git a/src/main/resources/data/spectrum/recipes/potion_workshop_brewing/levitation.json b/src/main/resources/data/spectrum/recipes/potion_workshop_brewing/levitation.json index 3a6aafc1ae..7f0aaf449b 100644 --- a/src/main/resources/data/spectrum/recipes/potion_workshop_brewing/levitation.json +++ b/src/main/resources/data/spectrum/recipes/potion_workshop_brewing/levitation.json @@ -12,7 +12,7 @@ "applicable_to_potions": true, "applicable_to_tipped_arrows": true, "applicable_to_potion_fillables": true, - "required_advancement": "spectrum:unlocks/potions/levitation", + "required_advancement": "spectrum:lategame/collect_paltaeria", "ink_color": "spectrum:brown", "ink_cost": 8 } \ No newline at end of file diff --git a/src/main/resources/data/spectrum/recipes/potion_workshop_brewing/life_drain.json b/src/main/resources/data/spectrum/recipes/potion_workshop_brewing/life_drain.json index 10b76c0a07..6e36e0b0c6 100644 --- a/src/main/resources/data/spectrum/recipes/potion_workshop_brewing/life_drain.json +++ b/src/main/resources/data/spectrum/recipes/potion_workshop_brewing/life_drain.json @@ -15,7 +15,7 @@ "applicable_to_potions": true, "applicable_to_tipped_arrows": true, "applicable_to_potion_fillables": true, - "required_advancement": "spectrum:unlocks/potions/life_drain", + "required_advancement": "spectrum:collect_downstone_fragments", "ink_color": "spectrum:gray", "ink_cost": 16 } \ No newline at end of file diff --git a/src/main/resources/data/spectrum/recipes/potion_workshop_brewing/luck.json b/src/main/resources/data/spectrum/recipes/potion_workshop_brewing/luck.json index 2f14177a24..8bb72ca4a9 100644 --- a/src/main/resources/data/spectrum/recipes/potion_workshop_brewing/luck.json +++ b/src/main/resources/data/spectrum/recipes/potion_workshop_brewing/luck.json @@ -12,7 +12,7 @@ "applicable_to_potions": true, "applicable_to_tipped_arrows": true, "applicable_to_potion_fillables": true, - "required_advancement": "spectrum:unlocks/potions/luck", + "required_advancement": "spectrum:collect_four_leaf_clover", "ink_color": "spectrum:light_blue", "ink_cost": 2 } \ No newline at end of file diff --git a/src/main/resources/data/spectrum/recipes/potion_workshop_brewing/mining_fatigue.json b/src/main/resources/data/spectrum/recipes/potion_workshop_brewing/mining_fatigue.json index b519e3e67b..6746f30add 100644 --- a/src/main/resources/data/spectrum/recipes/potion_workshop_brewing/mining_fatigue.json +++ b/src/main/resources/data/spectrum/recipes/potion_workshop_brewing/mining_fatigue.json @@ -15,7 +15,6 @@ "applicable_to_potions": true, "applicable_to_tipped_arrows": true, "applicable_to_potion_fillables": true, - "required_advancement": "spectrum:midgame/brew_potion_in_potion_workshop", "ink_color": "spectrum:magenta", "ink_cost": 4 } \ No newline at end of file diff --git a/src/main/resources/data/spectrum/recipes/potion_workshop_brewing/resistance.json b/src/main/resources/data/spectrum/recipes/potion_workshop_brewing/resistance.json index 1cecf1e6f2..b1b81cb1dc 100644 --- a/src/main/resources/data/spectrum/recipes/potion_workshop_brewing/resistance.json +++ b/src/main/resources/data/spectrum/recipes/potion_workshop_brewing/resistance.json @@ -13,7 +13,7 @@ "applicable_to_potions": true, "applicable_to_tipped_arrows": true, "applicable_to_potion_fillables": true, - "required_advancement": "spectrum:unlocks/potions/resistance", + "required_advancement": "spectrum:lategame/collect_moonstone", "ink_color": "spectrum:blue", "ink_cost": 8, "potency_hard_cap": 3, diff --git a/src/main/resources/data/spectrum/recipes/potion_workshop_brewing/saturation.json b/src/main/resources/data/spectrum/recipes/potion_workshop_brewing/saturation.json index b23c5c4735..3bb6982a93 100644 --- a/src/main/resources/data/spectrum/recipes/potion_workshop_brewing/saturation.json +++ b/src/main/resources/data/spectrum/recipes/potion_workshop_brewing/saturation.json @@ -12,7 +12,6 @@ "applicable_to_potions": true, "applicable_to_tipped_arrows": true, "applicable_to_potion_fillables": true, - "required_advancement": "spectrum:midgame/brew_potion_in_potion_workshop", "ink_color": "spectrum:lime", "ink_cost": 8 } \ No newline at end of file diff --git a/src/main/resources/data/spectrum/recipes/potion_workshop_brewing/scarred.json b/src/main/resources/data/spectrum/recipes/potion_workshop_brewing/scarred.json index 4a8124504c..cf91799d1f 100644 --- a/src/main/resources/data/spectrum/recipes/potion_workshop_brewing/scarred.json +++ b/src/main/resources/data/spectrum/recipes/potion_workshop_brewing/scarred.json @@ -12,7 +12,7 @@ "applicable_to_potions": true, "applicable_to_tipped_arrows": true, "applicable_to_potion_fillables": true, - "required_advancement": "spectrum:unlocks/potions/scarred", + "required_advancement": "spectrum:break_cracked_dragonbone", "ink_color": "spectrum:gray", "ink_cost": 4 } \ No newline at end of file diff --git a/src/main/resources/data/spectrum/recipes/potion_workshop_brewing/toughness.json b/src/main/resources/data/spectrum/recipes/potion_workshop_brewing/toughness.json index e3b09d4837..822639ba8f 100644 --- a/src/main/resources/data/spectrum/recipes/potion_workshop_brewing/toughness.json +++ b/src/main/resources/data/spectrum/recipes/potion_workshop_brewing/toughness.json @@ -14,5 +14,5 @@ "applicable_to_potion_fillables": true, "ink_color": "spectrum:pink", "ink_cost": 8, - "required_advancement": "spectrum:unlocks/potions/toughness" + "required_advancement": "spectrum:hidden/collect_glass_peach" } \ No newline at end of file diff --git a/src/main/resources/data/spectrum/recipes/potion_workshop_brewing/unluck.json b/src/main/resources/data/spectrum/recipes/potion_workshop_brewing/unluck.json index 71537c1f2e..9557d079a7 100644 --- a/src/main/resources/data/spectrum/recipes/potion_workshop_brewing/unluck.json +++ b/src/main/resources/data/spectrum/recipes/potion_workshop_brewing/unluck.json @@ -15,7 +15,7 @@ "applicable_to_potions": true, "applicable_to_tipped_arrows": true, "applicable_to_potion_fillables": true, - "required_advancement": "spectrum:unlocks/potions/luck", + "required_advancement": "spectrum:collect_four_leaf_clover", "ink_color": "spectrum:light_blue", "ink_cost": 2 } \ No newline at end of file diff --git a/src/main/resources/data/spectrum/recipes/potion_workshop_brewing/wither.json b/src/main/resources/data/spectrum/recipes/potion_workshop_brewing/wither.json index 85a5dc8b73..a0ac6f9cb0 100644 --- a/src/main/resources/data/spectrum/recipes/potion_workshop_brewing/wither.json +++ b/src/main/resources/data/spectrum/recipes/potion_workshop_brewing/wither.json @@ -15,7 +15,7 @@ "applicable_to_potions": true, "applicable_to_tipped_arrows": true, "applicable_to_potion_fillables": true, - "required_advancement": "spectrum:unlocks/potions/wither", + "required_advancement": "spectrum:midgame/collect_midnight_chip", "ink_color": "spectrum:black", "ink_cost": 16 } \ No newline at end of file