From c1de1b0618feec5932b0556b96d959094fa8a7e8 Mon Sep 17 00:00:00 2001 From: Robotgiggle Date: Tue, 8 Apr 2025 18:38:17 -0400 Subject: [PATCH 1/5] Make reagent locking work --- .../potion_workshop/PotionWorkshopBlockEntity.java | 12 ++++++++++++ .../PotionWorkshopReactingRecipe.java | 7 +++++++ 2 files changed, 19 insertions(+) diff --git a/src/main/java/de/dafuqs/spectrum/blocks/potion_workshop/PotionWorkshopBlockEntity.java b/src/main/java/de/dafuqs/spectrum/blocks/potion_workshop/PotionWorkshopBlockEntity.java index 6bc24ead9f..2ba56a1c2b 100644 --- a/src/main/java/de/dafuqs/spectrum/blocks/potion_workshop/PotionWorkshopBlockEntity.java +++ b/src/main/java/de/dafuqs/spectrum/blocks/potion_workshop/PotionWorkshopBlockEntity.java @@ -216,6 +216,7 @@ private static boolean hasUniqueReagents(PotionWorkshopBlockEntity potionWorksho private static boolean isBrewingRecipeApplicable(PotionWorkshopBrewingRecipe recipe, ItemStack baseIngredient, PotionWorkshopBlockEntity potionWorkshopBlockEntity) { PotionMod potionMod = getPotionModFromReagents(potionWorkshopBlockEntity); return hasUniqueReagents(potionWorkshopBlockEntity) + && canPlayerUseReagents(potionWorkshopBlockEntity) && recipe.recipeData.isApplicableTo(baseIngredient, potionMod) && !(potionMod.flags().incurable() && recipe.recipeData.statusEffect().isIn(SpectrumStatusEffectTags.CANNOT_BE_INCURABLE)); } @@ -335,6 +336,17 @@ private static void fillPotionFillable(PotionWorkshopBlockEntity potionWorkshopB potionWorkshopBlockEntity.lastBrewedRecipe = brewingRecipe; } } + + private static boolean canPlayerUseReagents(PotionWorkshopBlockEntity potionWorkshopBlockEntity) { + World world = potionWorkshopBlockEntity.getWorld(); + List reagentRecipes = world.getRecipeManager().getAllMatches(SpectrumRecipeTypes.POTION_WORKSHOP_REACTING, potionWorkshopBlockEntity, world); + for (PotionWorkshopReactingRecipe recipe : reagentRecipes) { + if (!recipe.canPlayerCraft(potionWorkshopBlockEntity.getOwnerIfOnline())) { + return false; + } + } + return true; + } private static PotionMod getPotionModFromReagents(PotionWorkshopBlockEntity potionWorkshopBlockEntity) { World world = potionWorkshopBlockEntity.getWorld(); diff --git a/src/main/java/de/dafuqs/spectrum/recipe/potion_workshop/PotionWorkshopReactingRecipe.java b/src/main/java/de/dafuqs/spectrum/recipe/potion_workshop/PotionWorkshopReactingRecipe.java index 140527d375..a022c68b08 100644 --- a/src/main/java/de/dafuqs/spectrum/recipe/potion_workshop/PotionWorkshopReactingRecipe.java +++ b/src/main/java/de/dafuqs/spectrum/recipe/potion_workshop/PotionWorkshopReactingRecipe.java @@ -6,6 +6,7 @@ import de.dafuqs.spectrum.helpers.*; import de.dafuqs.spectrum.recipe.*; import de.dafuqs.spectrum.registries.*; +import de.dafuqs.spectrum.blocks.potion_workshop.*; import net.minecraft.item.*; import net.minecraft.network.*; import net.minecraft.network.codec.*; @@ -40,6 +41,12 @@ public PotionWorkshopReactingRecipe(String group, boolean secret, Optional Date: Tue, 8 Apr 2025 18:39:50 -0400 Subject: [PATCH 2/5] Update reagent chapter intro --- src/main/resources/assets/spectrum/lang/en_us.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/resources/assets/spectrum/lang/en_us.json b/src/main/resources/assets/spectrum/lang/en_us.json index 058b65ec01..1c72d23544 100644 --- a/src/main/resources/assets/spectrum/lang/en_us.json +++ b/src/main/resources/assets/spectrum/lang/en_us.json @@ -3605,8 +3605,8 @@ "book.spectrum.guidebook.potion_workshop_reagents.pure_lapis.text": "- +1 yield", "book.spectrum.guidebook.potion_workshop_reagents.pure_echo.text": "- always adds the main effect of the previously brewed potion", "book.spectrum.guidebook.potion_workshop_reagents.page0.name": "Reagents", - "book.spectrum.guidebook.potion_workshop_reagents.page0.text": "Instead of adding ingredients to the potion bit by bit, as in the [#](bb00bb)Brewing Stand[#](), I experimented with dissolving all the ingredients in the liquid contained in [Mermaid's Gems](entry://general/mermaids_brush) all at once and adding some of my magical collectibles as reagents.\\\n**Breakthrough!**\\\n\\\nEach reagent will have an unique effect on the [#](bb00bb)Potion[#]().", - "book.spectrum.guidebook.potion_workshop_reagents.page1.text": "- the order in which I arrange the reagents will not matter\n- flat bonuses get applied first, percentage-based bonuses modify that value afterwards\n- the same reagent cannot be stacked", + "book.spectrum.guidebook.potion_workshop_reagents.page0.text": "Instead of adding ingredients to the potion bit by bit, as in the [#](bb00bb)Brewing Stand[#](), I can dissolve all the ingredients at once in the liquid contained in [Mermaid's Gems](entry://general/mermaids_brush). This includes the reagents!\\\n\\\nThe [Potion Workshop](entry://brewing/potion_workshop) has multiple reagent slots, allowing me to apply a variety of improvements at once, but I can only use each reagent once per brew.", + "book.spectrum.guidebook.potion_workshop_reagents.page1.text": "**Breakthrough!** I can use my magical collectibles as reagents, for a wide array of additional bonuses.\\\n\\\nWhen combining them, the following rules apply:\n- the order of the reagents does not matter\n- flat bonuses apply first, percentage-based bonuses modify that value afterwards", "book.spectrum.guidebook.potion_workshop_reagents.page1.title": "Rules of Application", "book.spectrum.guidebook.potion_workshop_reagents.redstone.text": "- +100%% duration", "book.spectrum.guidebook.potion_workshop_reagents.pure_redstone.text": "- +200%% duration\n- -50%% potency\n- -1 yield", From fa696f640d41fcb17415365bb6b831a860eb84d3 Mon Sep 17 00:00:00 2001 From: Robotgiggle Date: Tue, 8 Apr 2025 19:40:10 -0400 Subject: [PATCH 3/5] Rework potion recipe unlocks --- .../advancement/unlocks/potions/darkness.json | 16 --------- .../unlocks/potions/deadly_poison.json | 16 --------- .../unlocks/potions/levitation.json | 16 --------- .../unlocks/potions/life_drain.json | 16 --------- .../advancement/unlocks/potions/luck.json | 16 --------- .../unlocks/potions/resistance.json | 16 --------- .../advancement/unlocks/potions/scarred.json | 16 --------- .../unlocks/potions/toughness.json | 16 --------- .../advancement/unlocks/potions/wither.json | 16 --------- .../brewing/potion_workshop_brewing.json | 34 +++++-------------- .../mod_integration/02_04_hexcasting.json | 4 --- .../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 - .../recipe/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 +- .../recipe/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 +- 32 files changed, 21 insertions(+), 201 deletions(-) delete mode 100644 src/main/resources/data/spectrum/advancement/unlocks/potions/darkness.json delete mode 100644 src/main/resources/data/spectrum/advancement/unlocks/potions/deadly_poison.json delete mode 100644 src/main/resources/data/spectrum/advancement/unlocks/potions/levitation.json delete mode 100644 src/main/resources/data/spectrum/advancement/unlocks/potions/life_drain.json delete mode 100644 src/main/resources/data/spectrum/advancement/unlocks/potions/luck.json delete mode 100644 src/main/resources/data/spectrum/advancement/unlocks/potions/resistance.json delete mode 100644 src/main/resources/data/spectrum/advancement/unlocks/potions/scarred.json delete mode 100644 src/main/resources/data/spectrum/advancement/unlocks/potions/toughness.json delete mode 100644 src/main/resources/data/spectrum/advancement/unlocks/potions/wither.json diff --git a/src/main/resources/data/spectrum/advancement/unlocks/potions/darkness.json b/src/main/resources/data/spectrum/advancement/unlocks/potions/darkness.json deleted file mode 100644 index 1813cc4d0d..0000000000 --- a/src/main/resources/data/spectrum/advancement/unlocks/potions/darkness.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "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": { - "advancement_identifier": "spectrum:hidden/collect_vanilla/echo_shard" - } - } - } -} \ No newline at end of file diff --git a/src/main/resources/data/spectrum/advancement/unlocks/potions/deadly_poison.json b/src/main/resources/data/spectrum/advancement/unlocks/potions/deadly_poison.json deleted file mode 100644 index a26d5548b4..0000000000 --- a/src/main/resources/data/spectrum/advancement/unlocks/potions/deadly_poison.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "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": { - "advancement_identifier": "spectrum:break_cracked_dragonbone" - } - } - } -} \ No newline at end of file diff --git a/src/main/resources/data/spectrum/advancement/unlocks/potions/levitation.json b/src/main/resources/data/spectrum/advancement/unlocks/potions/levitation.json deleted file mode 100644 index 70e3bbec38..0000000000 --- a/src/main/resources/data/spectrum/advancement/unlocks/potions/levitation.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "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" - } - } - } -} \ No newline at end of file diff --git a/src/main/resources/data/spectrum/advancement/unlocks/potions/life_drain.json b/src/main/resources/data/spectrum/advancement/unlocks/potions/life_drain.json deleted file mode 100644 index 80bc9251a1..0000000000 --- a/src/main/resources/data/spectrum/advancement/unlocks/potions/life_drain.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "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": { - "advancement_identifier": "spectrum:lategame/collect_downstone_fragments" - } - } - } -} \ No newline at end of file diff --git a/src/main/resources/data/spectrum/advancement/unlocks/potions/luck.json b/src/main/resources/data/spectrum/advancement/unlocks/potions/luck.json deleted file mode 100644 index cd37a107a6..0000000000 --- a/src/main/resources/data/spectrum/advancement/unlocks/potions/luck.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "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" - } - } - } -} \ No newline at end of file diff --git a/src/main/resources/data/spectrum/advancement/unlocks/potions/resistance.json b/src/main/resources/data/spectrum/advancement/unlocks/potions/resistance.json deleted file mode 100644 index 21a84a54db..0000000000 --- a/src/main/resources/data/spectrum/advancement/unlocks/potions/resistance.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "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": { - "advancement_identifier": "spectrum:lategame/collect_moonstone" - } - } - } -} \ No newline at end of file diff --git a/src/main/resources/data/spectrum/advancement/unlocks/potions/scarred.json b/src/main/resources/data/spectrum/advancement/unlocks/potions/scarred.json deleted file mode 100644 index a26d5548b4..0000000000 --- a/src/main/resources/data/spectrum/advancement/unlocks/potions/scarred.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "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": { - "advancement_identifier": "spectrum:break_cracked_dragonbone" - } - } - } -} \ No newline at end of file diff --git a/src/main/resources/data/spectrum/advancement/unlocks/potions/toughness.json b/src/main/resources/data/spectrum/advancement/unlocks/potions/toughness.json deleted file mode 100644 index 707f915c37..0000000000 --- a/src/main/resources/data/spectrum/advancement/unlocks/potions/toughness.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "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": { - "advancement_identifier": "spectrum:hidden/collect_glass_peach" - } - } - } -} \ No newline at end of file diff --git a/src/main/resources/data/spectrum/advancement/unlocks/potions/wither.json b/src/main/resources/data/spectrum/advancement/unlocks/potions/wither.json deleted file mode 100644 index f91527b995..0000000000 --- a/src/main/resources/data/spectrum/advancement/unlocks/potions/wither.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "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" - } - } - } -} \ 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 75157fdd8f..da3ecf721b 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 @@ -49,38 +49,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" }, @@ -89,7 +73,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" }, @@ -98,7 +82,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" @@ -108,7 +92,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" @@ -118,7 +102,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" @@ -128,7 +112,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" }, @@ -137,7 +121,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" @@ -147,7 +131,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" }, @@ -156,7 +140,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" }, @@ -165,7 +149,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 5c09bb3f47..d95241f7e6 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 @@ -69,10 +69,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_06_victus.json b/src/main/resources/data/spectrum/modonomicon/books/guidebook/entries/mod_integration/06_06_victus.json index b9543e05cd..4789fa6baa 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 @@ -32,19 +32,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/recipe/mod_integration/conjuring/potion_workshop_brewing/distilled_spirit_resistance.json b/src/main/resources/data/spectrum/recipe/mod_integration/conjuring/potion_workshop_brewing/distilled_spirit_resistance.json index be5f66e907..8a30b9807a 100644 --- a/src/main/resources/data/spectrum/recipe/mod_integration/conjuring/potion_workshop_brewing/distilled_spirit_resistance.json +++ b/src/main/resources/data/spectrum/recipe/mod_integration/conjuring/potion_workshop_brewing/distilled_spirit_resistance.json @@ -9,7 +9,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/recipe/mod_integration/the_bumblezone/potion_workshop_brewing/alt_luck.json b/src/main/resources/data/spectrum/recipe/mod_integration/the_bumblezone/potion_workshop_brewing/alt_luck.json index 2bc2e96796..ae44ce5ac1 100644 --- a/src/main/resources/data/spectrum/recipe/mod_integration/the_bumblezone/potion_workshop_brewing/alt_luck.json +++ b/src/main/resources/data/spectrum/recipe/mod_integration/the_bumblezone/potion_workshop_brewing/alt_luck.json @@ -11,7 +11,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/recipe/mod_integration/victus/potion_workshop_brewing/heartbleed.json b/src/main/resources/data/spectrum/recipe/mod_integration/victus/potion_workshop_brewing/heartbleed.json index a7c22df919..503694536d 100644 --- a/src/main/resources/data/spectrum/recipe/mod_integration/victus/potion_workshop_brewing/heartbleed.json +++ b/src/main/resources/data/spectrum/recipe/mod_integration/victus/potion_workshop_brewing/heartbleed.json @@ -9,7 +9,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/recipe/mod_integration/victus/potion_workshop_brewing/resurgence.json b/src/main/resources/data/spectrum/recipe/mod_integration/victus/potion_workshop_brewing/resurgence.json index c65d7cf7cf..23c7350a71 100644 --- a/src/main/resources/data/spectrum/recipe/mod_integration/victus/potion_workshop_brewing/resurgence.json +++ b/src/main/resources/data/spectrum/recipe/mod_integration/victus/potion_workshop_brewing/resurgence.json @@ -9,7 +9,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/recipe/potion_workshop_brewing/absorption.json b/src/main/resources/data/spectrum/recipe/potion_workshop_brewing/absorption.json index 8dcc927356..614eb7ab8a 100644 --- a/src/main/resources/data/spectrum/recipe/potion_workshop_brewing/absorption.json +++ b/src/main/resources/data/spectrum/recipe/potion_workshop_brewing/absorption.json @@ -8,7 +8,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/recipe/potion_workshop_brewing/darkness.json b/src/main/resources/data/spectrum/recipe/potion_workshop_brewing/darkness.json index f62a417584..3e0bc2b5d7 100644 --- a/src/main/resources/data/spectrum/recipe/potion_workshop_brewing/darkness.json +++ b/src/main/resources/data/spectrum/recipe/potion_workshop_brewing/darkness.json @@ -9,7 +9,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/recipe/potion_workshop_brewing/deadly_poison.json b/src/main/resources/data/spectrum/recipe/potion_workshop_brewing/deadly_poison.json index d63f72482a..611e53cc8c 100644 --- a/src/main/resources/data/spectrum/recipe/potion_workshop_brewing/deadly_poison.json +++ b/src/main/resources/data/spectrum/recipe/potion_workshop_brewing/deadly_poison.json @@ -9,7 +9,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/recipe/potion_workshop_brewing/glowing.json b/src/main/resources/data/spectrum/recipe/potion_workshop_brewing/glowing.json index e688003812..4b2827b000 100644 --- a/src/main/resources/data/spectrum/recipe/potion_workshop_brewing/glowing.json +++ b/src/main/resources/data/spectrum/recipe/potion_workshop_brewing/glowing.json @@ -8,7 +8,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/recipe/potion_workshop_brewing/haste.json b/src/main/resources/data/spectrum/recipe/potion_workshop_brewing/haste.json index 38380d598d..bb5495687a 100644 --- a/src/main/resources/data/spectrum/recipe/potion_workshop_brewing/haste.json +++ b/src/main/resources/data/spectrum/recipe/potion_workshop_brewing/haste.json @@ -8,7 +8,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/recipe/potion_workshop_brewing/hunger.json b/src/main/resources/data/spectrum/recipe/potion_workshop_brewing/hunger.json index 0622a6fb3f..11433520cc 100644 --- a/src/main/resources/data/spectrum/recipe/potion_workshop_brewing/hunger.json +++ b/src/main/resources/data/spectrum/recipe/potion_workshop_brewing/hunger.json @@ -9,7 +9,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/recipe/potion_workshop_brewing/levitation.json b/src/main/resources/data/spectrum/recipe/potion_workshop_brewing/levitation.json index 6cbe5cdc36..3c7852bf30 100644 --- a/src/main/resources/data/spectrum/recipe/potion_workshop_brewing/levitation.json +++ b/src/main/resources/data/spectrum/recipe/potion_workshop_brewing/levitation.json @@ -8,7 +8,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/recipe/potion_workshop_brewing/life_drain.json b/src/main/resources/data/spectrum/recipe/potion_workshop_brewing/life_drain.json index dc8a4cf374..8511a40df4 100644 --- a/src/main/resources/data/spectrum/recipe/potion_workshop_brewing/life_drain.json +++ b/src/main/resources/data/spectrum/recipe/potion_workshop_brewing/life_drain.json @@ -9,7 +9,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/recipe/potion_workshop_brewing/luck.json b/src/main/resources/data/spectrum/recipe/potion_workshop_brewing/luck.json index be2b0b80a0..47a7e743d4 100644 --- a/src/main/resources/data/spectrum/recipe/potion_workshop_brewing/luck.json +++ b/src/main/resources/data/spectrum/recipe/potion_workshop_brewing/luck.json @@ -8,7 +8,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/recipe/potion_workshop_brewing/mining_fatigue.json b/src/main/resources/data/spectrum/recipe/potion_workshop_brewing/mining_fatigue.json index 6f8acc135e..14e616f54d 100644 --- a/src/main/resources/data/spectrum/recipe/potion_workshop_brewing/mining_fatigue.json +++ b/src/main/resources/data/spectrum/recipe/potion_workshop_brewing/mining_fatigue.json @@ -9,7 +9,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/recipe/potion_workshop_brewing/resistance.json b/src/main/resources/data/spectrum/recipe/potion_workshop_brewing/resistance.json index 91d3e7eb0f..5812a24bc3 100644 --- a/src/main/resources/data/spectrum/recipe/potion_workshop_brewing/resistance.json +++ b/src/main/resources/data/spectrum/recipe/potion_workshop_brewing/resistance.json @@ -9,7 +9,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/recipe/potion_workshop_brewing/saturation.json b/src/main/resources/data/spectrum/recipe/potion_workshop_brewing/saturation.json index eb9bebbfa9..091168ba5e 100644 --- a/src/main/resources/data/spectrum/recipe/potion_workshop_brewing/saturation.json +++ b/src/main/resources/data/spectrum/recipe/potion_workshop_brewing/saturation.json @@ -8,7 +8,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/recipe/potion_workshop_brewing/scarred.json b/src/main/resources/data/spectrum/recipe/potion_workshop_brewing/scarred.json index c37a25b421..6bc995cce8 100644 --- a/src/main/resources/data/spectrum/recipe/potion_workshop_brewing/scarred.json +++ b/src/main/resources/data/spectrum/recipe/potion_workshop_brewing/scarred.json @@ -8,7 +8,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/recipe/potion_workshop_brewing/toughness.json b/src/main/resources/data/spectrum/recipe/potion_workshop_brewing/toughness.json index 7abccf47ca..74c524077a 100644 --- a/src/main/resources/data/spectrum/recipe/potion_workshop_brewing/toughness.json +++ b/src/main/resources/data/spectrum/recipe/potion_workshop_brewing/toughness.json @@ -10,5 +10,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/recipe/potion_workshop_brewing/unluck.json b/src/main/resources/data/spectrum/recipe/potion_workshop_brewing/unluck.json index e9bb8a88ca..bc7e55a415 100644 --- a/src/main/resources/data/spectrum/recipe/potion_workshop_brewing/unluck.json +++ b/src/main/resources/data/spectrum/recipe/potion_workshop_brewing/unluck.json @@ -9,7 +9,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/recipe/potion_workshop_brewing/wither.json b/src/main/resources/data/spectrum/recipe/potion_workshop_brewing/wither.json index 363b13d65d..a3458ac369 100644 --- a/src/main/resources/data/spectrum/recipe/potion_workshop_brewing/wither.json +++ b/src/main/resources/data/spectrum/recipe/potion_workshop_brewing/wither.json @@ -9,7 +9,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 From 1d5e416843a42d21febc5121b765ad2fb1e9fcd1 Mon Sep 17 00:00:00 2001 From: Robotgiggle Date: Tue, 8 Apr 2025 20:12:21 -0400 Subject: [PATCH 4/5] Rework reagent recipe unlocks --- ....json => unlocked_void_salts_reagent.json} | 6 ++ .../unlocks/reagents/ash_flakes.json | 16 ++++ .../unlocks/reagents/bedrock_dust.json | 16 ++++ .../unlocks/reagents/bismuth_flake.json | 16 ++++ .../unlocks/reagents/bone_ash.json | 16 ++++ .../unlocks/reagents/fissure_plum.json | 16 ++++ .../unlocks/reagents/four_leaf_clover.json | 16 ++++ .../unlocks/reagents/jadeite_petals.json | 16 ++++ .../unlocks/reagents/midnight_chip.json | 16 ++++ .../unlocks/reagents/moonstone_powder.json | 16 ++++ .../unlocks/reagents/moonstruck_nectar.json | 16 ++++ .../unlocks/reagents/nectardew_burgeon.json | 16 ++++ .../advancement/unlocks/reagents/neolith.json | 16 ++++ .../unlocks/reagents/nightdew_sprout.json | 16 ++++ .../unlocks/reagents/paltaeria_fragments.json | 16 ++++ .../unlocks/reagents/prickly_bayleaf.json | 16 ++++ .../unlocks/reagents/pure_resources.json | 16 ++++ .../unlocks/reagents/raw_azurite.json | 16 ++++ .../unlocks/reagents/raw_bloodstone.json | 16 ++++ .../unlocks/reagents/raw_malachite.json | 16 ++++ .../unlocks/reagents/star_fragment.json | 16 ++++ .../unlocks/reagents/stardust.json | 16 ++++ .../unlocks/reagents/storm_stone.json | 16 ++++ .../brewing/potion_workshop_reagents.json | 86 ++++++++++++------- .../mod_integration/02_04_hexcasting.json | 2 +- .../entries/mod_integration/09_05_malum.json | 2 +- .../potion_workshop_reacting/black_lotus.json | 1 + .../blacker_lotus.json | 1 + .../blackest_lotus.json | 1 + .../least_black_lotus.json | 1 + .../life_essence.json | 1 + .../potion_workshop_reacting/mana_powder.json | 1 + .../potion_workshop_reacting/pixie_dust.json | 1 + .../charged_amethyst.json | 1 + .../potion_workshop_reacting/void_salts.json | 2 +- .../amethyst_powder.json | 2 +- .../potion_workshop_reacting/ash_flakes.json | 2 +- .../bedrock_dust.json | 2 +- .../bismuth_flake.json | 2 +- .../potion_workshop_reacting/bone_ash.json | 2 +- .../citrine_powder.json | 2 +- .../potion_workshop_reacting/echo_shard.json | 3 +- .../fissure_plum.json | 2 +- .../four_leaf_clover.json | 2 +- .../jadeite_petals.json | 2 +- .../lapis_lazuli.json | 3 +- .../midnight_chip.json | 2 +- .../moonstone_powder.json | 2 +- .../moonstruck_nectar.json | 2 +- .../nectardew_burgeon.json | 2 +- .../potion_workshop_reacting/neolith.json | 2 +- .../nightdew_sprout.json | 2 +- .../potion_workshop_reacting/onyx_powder.json | 2 +- .../paltaeria_fragments.json | 2 +- .../prickly_bayleaf.json | 2 +- .../potion_workshop_reacting/pure_echo.json | 2 +- .../pure_glowstone.json | 2 +- .../potion_workshop_reacting/pure_lapis.json | 2 +- .../pure_redstone.json | 2 +- .../quitoxic_powder.json | 2 +- .../potion_workshop_reacting/raw_azurite.json | 2 +- .../raw_bloodstone.json | 2 +- .../raw_malachite.json | 2 +- .../shimmerstone_gem.json | 2 +- .../star_fragment.json | 2 +- .../potion_workshop_reacting/stardust.json | 2 +- .../potion_workshop_reacting/storm_stone.json | 2 +- .../stratine_fragments.json | 2 +- .../topaz_powder.json | 2 +- .../potion_workshop_reacting/vegetal.json | 2 +- 70 files changed, 463 insertions(+), 67 deletions(-) rename src/main/resources/data/spectrum/advancement/mod_integration/malum/{visited_well.json => unlocked_void_salts_reagent.json} (70%) create mode 100644 src/main/resources/data/spectrum/advancement/unlocks/reagents/ash_flakes.json create mode 100644 src/main/resources/data/spectrum/advancement/unlocks/reagents/bedrock_dust.json create mode 100644 src/main/resources/data/spectrum/advancement/unlocks/reagents/bismuth_flake.json create mode 100644 src/main/resources/data/spectrum/advancement/unlocks/reagents/bone_ash.json create mode 100644 src/main/resources/data/spectrum/advancement/unlocks/reagents/fissure_plum.json create mode 100644 src/main/resources/data/spectrum/advancement/unlocks/reagents/four_leaf_clover.json create mode 100644 src/main/resources/data/spectrum/advancement/unlocks/reagents/jadeite_petals.json create mode 100644 src/main/resources/data/spectrum/advancement/unlocks/reagents/midnight_chip.json create mode 100644 src/main/resources/data/spectrum/advancement/unlocks/reagents/moonstone_powder.json create mode 100644 src/main/resources/data/spectrum/advancement/unlocks/reagents/moonstruck_nectar.json create mode 100644 src/main/resources/data/spectrum/advancement/unlocks/reagents/nectardew_burgeon.json create mode 100644 src/main/resources/data/spectrum/advancement/unlocks/reagents/neolith.json create mode 100644 src/main/resources/data/spectrum/advancement/unlocks/reagents/nightdew_sprout.json create mode 100644 src/main/resources/data/spectrum/advancement/unlocks/reagents/paltaeria_fragments.json create mode 100644 src/main/resources/data/spectrum/advancement/unlocks/reagents/prickly_bayleaf.json create mode 100644 src/main/resources/data/spectrum/advancement/unlocks/reagents/pure_resources.json create mode 100644 src/main/resources/data/spectrum/advancement/unlocks/reagents/raw_azurite.json create mode 100644 src/main/resources/data/spectrum/advancement/unlocks/reagents/raw_bloodstone.json create mode 100644 src/main/resources/data/spectrum/advancement/unlocks/reagents/raw_malachite.json create mode 100644 src/main/resources/data/spectrum/advancement/unlocks/reagents/star_fragment.json create mode 100644 src/main/resources/data/spectrum/advancement/unlocks/reagents/stardust.json create mode 100644 src/main/resources/data/spectrum/advancement/unlocks/reagents/storm_stone.json diff --git a/src/main/resources/data/spectrum/advancement/mod_integration/malum/visited_well.json b/src/main/resources/data/spectrum/advancement/mod_integration/malum/unlocked_void_salts_reagent.json similarity index 70% rename from src/main/resources/data/spectrum/advancement/mod_integration/malum/visited_well.json rename to src/main/resources/data/spectrum/advancement/mod_integration/malum/unlocked_void_salts_reagent.json index 8134bcc026..cf541c4275 100644 --- a/src/main/resources/data/spectrum/advancement/mod_integration/malum/visited_well.json +++ b/src/main/resources/data/spectrum/advancement/mod_integration/malum/unlocked_void_salts_reagent.json @@ -15,6 +15,12 @@ } ] } + }, + "crafted_potion_in_potion_brewery": { + "trigger": "revelationary:advancement_gotten", + "conditions": { + "advancement_identifier": "spectrum:midgame/brew_potion_in_potion_workshop" + } } }, "fabric:load_conditions": [ diff --git a/src/main/resources/data/spectrum/advancement/unlocks/reagents/ash_flakes.json b/src/main/resources/data/spectrum/advancement/unlocks/reagents/ash_flakes.json new file mode 100644 index 0000000000..cd0ea7d6d0 --- /dev/null +++ b/src/main/resources/data/spectrum/advancement/unlocks/reagents/ash_flakes.json @@ -0,0 +1,16 @@ +{ + "criteria": { + "crafted_potion_in_potion_brewery": { + "trigger": "revelationary:advancement_gotten", + "conditions": { + "advancement_identifier": "spectrum:midgame/brew_potion_in_potion_workshop" + } + }, + "obtained_ash_flakes": { + "trigger": "revelationary:advancement_gotten", + "conditions": { + "advancement_identifier": "spectrum:hidden/collect_ash" + } + } + } +} \ No newline at end of file diff --git a/src/main/resources/data/spectrum/advancement/unlocks/reagents/bedrock_dust.json b/src/main/resources/data/spectrum/advancement/unlocks/reagents/bedrock_dust.json new file mode 100644 index 0000000000..9f7699d536 --- /dev/null +++ b/src/main/resources/data/spectrum/advancement/unlocks/reagents/bedrock_dust.json @@ -0,0 +1,16 @@ +{ + "criteria": { + "crafted_potion_in_potion_brewery": { + "trigger": "revelationary:advancement_gotten", + "conditions": { + "advancement_identifier": "spectrum:midgame/brew_potion_in_potion_workshop" + } + }, + "broke_decayed_bedrock": { + "trigger": "revelationary:advancement_gotten", + "conditions": { + "advancement_identifier": "spectrum:midgame/break_decayed_bedrock" + } + } + } +} \ No newline at end of file diff --git a/src/main/resources/data/spectrum/advancement/unlocks/reagents/bismuth_flake.json b/src/main/resources/data/spectrum/advancement/unlocks/reagents/bismuth_flake.json new file mode 100644 index 0000000000..e313eee220 --- /dev/null +++ b/src/main/resources/data/spectrum/advancement/unlocks/reagents/bismuth_flake.json @@ -0,0 +1,16 @@ +{ + "criteria": { + "crafted_potion_in_potion_brewery": { + "trigger": "revelationary:advancement_gotten", + "conditions": { + "advancement_identifier": "spectrum:midgame/brew_potion_in_potion_workshop" + } + }, + "obtained_bismuth": { + "trigger": "revelationary:advancement_gotten", + "conditions": { + "advancement_identifier": "spectrum:lategame/collect_bismuth" + } + } + } +} \ No newline at end of file diff --git a/src/main/resources/data/spectrum/advancement/unlocks/reagents/bone_ash.json b/src/main/resources/data/spectrum/advancement/unlocks/reagents/bone_ash.json new file mode 100644 index 0000000000..da387940ab --- /dev/null +++ b/src/main/resources/data/spectrum/advancement/unlocks/reagents/bone_ash.json @@ -0,0 +1,16 @@ +{ + "criteria": { + "crafted_potion_in_potion_brewery": { + "trigger": "revelationary:advancement_gotten", + "conditions": { + "advancement_identifier": "spectrum:midgame/brew_potion_in_potion_workshop" + } + }, + "broke_cracked_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/advancement/unlocks/reagents/fissure_plum.json b/src/main/resources/data/spectrum/advancement/unlocks/reagents/fissure_plum.json new file mode 100644 index 0000000000..47c3eed041 --- /dev/null +++ b/src/main/resources/data/spectrum/advancement/unlocks/reagents/fissure_plum.json @@ -0,0 +1,16 @@ +{ + "criteria": { + "crafted_potion_in_potion_brewery": { + "trigger": "revelationary:advancement_gotten", + "conditions": { + "advancement_identifier": "spectrum:midgame/brew_potion_in_potion_workshop" + } + }, + "obtained_fissure_plum": { + "trigger": "revelationary:advancement_gotten", + "conditions": { + "advancement_identifier": "spectrum:hidden/collect_fissure_plum" + } + } + } +} \ No newline at end of file diff --git a/src/main/resources/data/spectrum/advancement/unlocks/reagents/four_leaf_clover.json b/src/main/resources/data/spectrum/advancement/unlocks/reagents/four_leaf_clover.json new file mode 100644 index 0000000000..6a07903a29 --- /dev/null +++ b/src/main/resources/data/spectrum/advancement/unlocks/reagents/four_leaf_clover.json @@ -0,0 +1,16 @@ +{ + "criteria": { + "crafted_potion_in_potion_brewery": { + "trigger": "revelationary:advancement_gotten", + "conditions": { + "advancement_identifier": "spectrum:midgame/brew_potion_in_potion_workshop" + } + }, + "obtained_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/advancement/unlocks/reagents/jadeite_petals.json b/src/main/resources/data/spectrum/advancement/unlocks/reagents/jadeite_petals.json new file mode 100644 index 0000000000..4d92823878 --- /dev/null +++ b/src/main/resources/data/spectrum/advancement/unlocks/reagents/jadeite_petals.json @@ -0,0 +1,16 @@ +{ + "criteria": { + "crafted_potion_in_potion_brewery": { + "trigger": "revelationary:advancement_gotten", + "conditions": { + "advancement_identifier": "spectrum:midgame/brew_potion_in_potion_workshop" + } + }, + "obtained_jadeite_petals": { + "trigger": "revelationary:advancement_gotten", + "conditions": { + "advancement_identifier": "spectrum:hidden/collect_jadeite" + } + } + } +} \ No newline at end of file diff --git a/src/main/resources/data/spectrum/advancement/unlocks/reagents/midnight_chip.json b/src/main/resources/data/spectrum/advancement/unlocks/reagents/midnight_chip.json new file mode 100644 index 0000000000..feeabb5703 --- /dev/null +++ b/src/main/resources/data/spectrum/advancement/unlocks/reagents/midnight_chip.json @@ -0,0 +1,16 @@ +{ + "criteria": { + "crafted_potion_in_potion_brewery": { + "trigger": "revelationary:advancement_gotten", + "conditions": { + "advancement_identifier": "spectrum:midgame/brew_potion_in_potion_workshop" + } + }, + "obtained_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/advancement/unlocks/reagents/moonstone_powder.json b/src/main/resources/data/spectrum/advancement/unlocks/reagents/moonstone_powder.json new file mode 100644 index 0000000000..ff561d7938 --- /dev/null +++ b/src/main/resources/data/spectrum/advancement/unlocks/reagents/moonstone_powder.json @@ -0,0 +1,16 @@ +{ + "criteria": { + "crafted_potion_in_potion_brewery": { + "trigger": "revelationary:advancement_gotten", + "conditions": { + "advancement_identifier": "spectrum:midgame/brew_potion_in_potion_workshop" + } + }, + "obtained_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/advancement/unlocks/reagents/moonstruck_nectar.json b/src/main/resources/data/spectrum/advancement/unlocks/reagents/moonstruck_nectar.json new file mode 100644 index 0000000000..5854cf9c66 --- /dev/null +++ b/src/main/resources/data/spectrum/advancement/unlocks/reagents/moonstruck_nectar.json @@ -0,0 +1,16 @@ +{ + "criteria": { + "crafted_potion_in_potion_brewery": { + "trigger": "revelationary:advancement_gotten", + "conditions": { + "advancement_identifier": "spectrum:midgame/brew_potion_in_potion_workshop" + } + }, + "": { + "trigger": "revelationary:advancement_gotten", + "conditions": { + "advancement_identifier": "spectrum:midgame/harvest_moonstruck_nectar" + } + } + } +} \ No newline at end of file diff --git a/src/main/resources/data/spectrum/advancement/unlocks/reagents/nectardew_burgeon.json b/src/main/resources/data/spectrum/advancement/unlocks/reagents/nectardew_burgeon.json new file mode 100644 index 0000000000..bf15771000 --- /dev/null +++ b/src/main/resources/data/spectrum/advancement/unlocks/reagents/nectardew_burgeon.json @@ -0,0 +1,16 @@ +{ + "criteria": { + "crafted_potion_in_potion_brewery": { + "trigger": "revelationary:advancement_gotten", + "conditions": { + "advancement_identifier": "spectrum:midgame/brew_potion_in_potion_workshop" + } + }, + "": { + "trigger": "revelationary:advancement_gotten", + "conditions": { + "advancement_identifier": "spectrum:lategame/collect_nectardew" + } + } + } +} \ No newline at end of file diff --git a/src/main/resources/data/spectrum/advancement/unlocks/reagents/neolith.json b/src/main/resources/data/spectrum/advancement/unlocks/reagents/neolith.json new file mode 100644 index 0000000000..72266a0eb9 --- /dev/null +++ b/src/main/resources/data/spectrum/advancement/unlocks/reagents/neolith.json @@ -0,0 +1,16 @@ +{ + "criteria": { + "crafted_potion_in_potion_brewery": { + "trigger": "revelationary:advancement_gotten", + "conditions": { + "advancement_identifier": "spectrum:midgame/brew_potion_in_potion_workshop" + } + }, + "obtained_neolith": { + "trigger": "revelationary:advancement_gotten", + "conditions": { + "advancement_identifier": "spectrum:midgame/collect_neolith" + } + } + } +} \ No newline at end of file diff --git a/src/main/resources/data/spectrum/advancement/unlocks/reagents/nightdew_sprout.json b/src/main/resources/data/spectrum/advancement/unlocks/reagents/nightdew_sprout.json new file mode 100644 index 0000000000..d4be067ad3 --- /dev/null +++ b/src/main/resources/data/spectrum/advancement/unlocks/reagents/nightdew_sprout.json @@ -0,0 +1,16 @@ +{ + "criteria": { + "crafted_potion_in_potion_brewery": { + "trigger": "revelationary:advancement_gotten", + "conditions": { + "advancement_identifier": "spectrum:midgame/brew_potion_in_potion_workshop" + } + }, + "obtained_nightdew_sprout": { + "trigger": "revelationary:advancement_gotten", + "conditions": { + "advancement_identifier": "spectrum:collect_nightdew" + } + } + } +} \ No newline at end of file diff --git a/src/main/resources/data/spectrum/advancement/unlocks/reagents/paltaeria_fragments.json b/src/main/resources/data/spectrum/advancement/unlocks/reagents/paltaeria_fragments.json new file mode 100644 index 0000000000..dcdcace536 --- /dev/null +++ b/src/main/resources/data/spectrum/advancement/unlocks/reagents/paltaeria_fragments.json @@ -0,0 +1,16 @@ +{ + "criteria": { + "crafted_potion_in_potion_brewery": { + "trigger": "revelationary:advancement_gotten", + "conditions": { + "advancement_identifier": "spectrum:midgame/brew_potion_in_potion_workshop" + } + }, + "obtained_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/advancement/unlocks/reagents/prickly_bayleaf.json b/src/main/resources/data/spectrum/advancement/unlocks/reagents/prickly_bayleaf.json new file mode 100644 index 0000000000..7681af6b06 --- /dev/null +++ b/src/main/resources/data/spectrum/advancement/unlocks/reagents/prickly_bayleaf.json @@ -0,0 +1,16 @@ +{ + "criteria": { + "crafted_potion_in_potion_brewery": { + "trigger": "revelationary:advancement_gotten", + "conditions": { + "advancement_identifier": "spectrum:midgame/brew_potion_in_potion_workshop" + } + }, + "obtained_prickly_bayleaf": { + "trigger": "revelationary:advancement_gotten", + "conditions": { + "advancement_identifier": "spectrum:lategame/collect_prickly_bayleaf" + } + } + } +} \ No newline at end of file diff --git a/src/main/resources/data/spectrum/advancement/unlocks/reagents/pure_resources.json b/src/main/resources/data/spectrum/advancement/unlocks/reagents/pure_resources.json new file mode 100644 index 0000000000..dc72c80522 --- /dev/null +++ b/src/main/resources/data/spectrum/advancement/unlocks/reagents/pure_resources.json @@ -0,0 +1,16 @@ +{ + "criteria": { + "crafted_potion_in_potion_brewery": { + "trigger": "revelationary:advancement_gotten", + "conditions": { + "advancement_identifier": "spectrum:midgame/brew_potion_in_potion_workshop" + } + }, + "obtained_pure_resource": { + "trigger": "revelationary:advancement_gotten", + "conditions": { + "advancement_identifier": "spectrum:lategame/collect_pure_resource" + } + } + } +} \ No newline at end of file diff --git a/src/main/resources/data/spectrum/advancement/unlocks/reagents/raw_azurite.json b/src/main/resources/data/spectrum/advancement/unlocks/reagents/raw_azurite.json new file mode 100644 index 0000000000..58a45fc7af --- /dev/null +++ b/src/main/resources/data/spectrum/advancement/unlocks/reagents/raw_azurite.json @@ -0,0 +1,16 @@ +{ + "criteria": { + "crafted_potion_in_potion_brewery": { + "trigger": "revelationary:advancement_gotten", + "conditions": { + "advancement_identifier": "spectrum:midgame/brew_potion_in_potion_workshop" + } + }, + "obtained_azurite": { + "trigger": "revelationary:advancement_gotten", + "conditions": { + "advancement_identifier": "spectrum:midgame/collect_azurite" + } + } + } +} \ No newline at end of file diff --git a/src/main/resources/data/spectrum/advancement/unlocks/reagents/raw_bloodstone.json b/src/main/resources/data/spectrum/advancement/unlocks/reagents/raw_bloodstone.json new file mode 100644 index 0000000000..2145ebea75 --- /dev/null +++ b/src/main/resources/data/spectrum/advancement/unlocks/reagents/raw_bloodstone.json @@ -0,0 +1,16 @@ +{ + "criteria": { + "crafted_potion_in_potion_brewery": { + "trigger": "revelationary:advancement_gotten", + "conditions": { + "advancement_identifier": "spectrum:midgame/brew_potion_in_potion_workshop" + } + }, + "obtained_bloodstone": { + "trigger": "revelationary:advancement_gotten", + "conditions": { + "advancement_identifier": "spectrum:hidden/collect_raw_bloodstone" + } + } + } +} \ No newline at end of file diff --git a/src/main/resources/data/spectrum/advancement/unlocks/reagents/raw_malachite.json b/src/main/resources/data/spectrum/advancement/unlocks/reagents/raw_malachite.json new file mode 100644 index 0000000000..31ce213938 --- /dev/null +++ b/src/main/resources/data/spectrum/advancement/unlocks/reagents/raw_malachite.json @@ -0,0 +1,16 @@ +{ + "criteria": { + "crafted_potion_in_potion_brewery": { + "trigger": "revelationary:advancement_gotten", + "conditions": { + "advancement_identifier": "spectrum:midgame/brew_potion_in_potion_workshop" + } + }, + "obtained_malachite": { + "trigger": "revelationary:advancement_gotten", + "conditions": { + "advancement_identifier": "spectrum:lategame/collect_malachite" + } + } + } +} \ No newline at end of file diff --git a/src/main/resources/data/spectrum/advancement/unlocks/reagents/star_fragment.json b/src/main/resources/data/spectrum/advancement/unlocks/reagents/star_fragment.json new file mode 100644 index 0000000000..3df4ef918f --- /dev/null +++ b/src/main/resources/data/spectrum/advancement/unlocks/reagents/star_fragment.json @@ -0,0 +1,16 @@ +{ + "criteria": { + "crafted_potion_in_potion_brewery": { + "trigger": "revelationary:advancement_gotten", + "conditions": { + "advancement_identifier": "spectrum:midgame/brew_potion_in_potion_workshop" + } + }, + "obtained_star_fragment": { + "trigger": "revelationary:advancement_gotten", + "conditions": { + "advancement_identifier": "spectrum:collect_star_fragment" + } + } + } +} \ No newline at end of file diff --git a/src/main/resources/data/spectrum/advancement/unlocks/reagents/stardust.json b/src/main/resources/data/spectrum/advancement/unlocks/reagents/stardust.json new file mode 100644 index 0000000000..037e5ff409 --- /dev/null +++ b/src/main/resources/data/spectrum/advancement/unlocks/reagents/stardust.json @@ -0,0 +1,16 @@ +{ + "criteria": { + "crafted_potion_in_potion_brewery": { + "trigger": "revelationary:advancement_gotten", + "conditions": { + "advancement_identifier": "spectrum:midgame/brew_potion_in_potion_workshop" + } + }, + "obtained_stardust": { + "trigger": "revelationary:advancement_gotten", + "conditions": { + "advancement_identifier": "spectrum:hidden/collect_stardust" + } + } + } +} \ No newline at end of file diff --git a/src/main/resources/data/spectrum/advancement/unlocks/reagents/storm_stone.json b/src/main/resources/data/spectrum/advancement/unlocks/reagents/storm_stone.json new file mode 100644 index 0000000000..90a781c7f7 --- /dev/null +++ b/src/main/resources/data/spectrum/advancement/unlocks/reagents/storm_stone.json @@ -0,0 +1,16 @@ +{ + "criteria": { + "crafted_potion_in_potion_brewery": { + "trigger": "revelationary:advancement_gotten", + "conditions": { + "advancement_identifier": "spectrum:midgame/brew_potion_in_potion_workshop" + } + }, + "obtained_storm_stone": { + "trigger": "revelationary:advancement_gotten", + "conditions": { + "advancement_identifier": "spectrum:midgame/collect_storm_stone" + } + } + } +} \ No newline at end of file diff --git a/src/main/resources/data/spectrum/modonomicon/books/guidebook/entries/brewing/potion_workshop_reagents.json b/src/main/resources/data/spectrum/modonomicon/books/guidebook/entries/brewing/potion_workshop_reagents.json index 874be1bbc8..2efe609077 100644 --- a/src/main/resources/data/spectrum/modonomicon/books/guidebook/entries/brewing/potion_workshop_reagents.json +++ b/src/main/resources/data/spectrum/modonomicon/books/guidebook/entries/brewing/potion_workshop_reagents.json @@ -27,6 +27,10 @@ }, { "type": "modonomicon:text", + "condition": { + "type": "modonomicon:advancement", + "advancement_id": "spectrum:midgame/brew_potion_in_potion_workshop" + }, "title": "book.spectrum.guidebook.potion_workshop_reagents.page1.title", "text": "book.spectrum.guidebook.potion_workshop_reagents.page1.text" }, @@ -45,7 +49,7 @@ "anchor": "pure_redstone", "condition": { "type": "modonomicon:advancement", - "advancement_id": "spectrum:lategame/collect_pure_resource" + "advancement_id": "spectrum:unlocks/reagents/pure_resources" }, "text": "book.spectrum.guidebook.potion_workshop_reagents.pure_redstone.text" }, @@ -64,7 +68,7 @@ "anchor": "pure_glowstone", "condition": { "type": "modonomicon:advancement", - "advancement_id": "spectrum:lategame/collect_pure_resource" + "advancement_id": "spectrum:unlocks/reagents/pure_resources" }, "text": "book.spectrum.guidebook.potion_workshop_reagents.pure_glowstone.text" }, @@ -73,6 +77,10 @@ "item": { "item": "minecraft:lapis_lazuli" }, + "condition": { + "type": "modonomicon:advancement", + "advancement_id": "spectrum:midgame/brew_potion_in_potion_workshop" + }, "text": "book.spectrum.guidebook.potion_workshop_reagents.lapis_lazuli.text" }, { @@ -83,7 +91,7 @@ "anchor": "pure_lapis", "condition": { "type": "modonomicon:advancement", - "advancement_id": "spectrum:lategame/collect_pure_resource" + "advancement_id": "spectrum:unlocks/reagents/pure_resources" }, "text": "book.spectrum.guidebook.potion_workshop_reagents.pure_lapis.text" }, @@ -112,7 +120,7 @@ }, "condition": { "type": "modonomicon:advancement", - "advancement_id": "spectrum:hidden/collect_vanilla/echo_shard" + "advancement_id": "spectrum:midgame/brew_potion_in_potion_workshop" }, "text": "book.spectrum.guidebook.potion_workshop_reagents.echo_shard.text" }, @@ -124,7 +132,7 @@ "anchor": "pure_echo", "condition": { "type": "modonomicon:advancement", - "advancement_id": "spectrum:lategame/collect_pure_resource" + "advancement_id": "spectrum:unlocks/reagents/pure_resources" }, "text": "book.spectrum.guidebook.potion_workshop_reagents.pure_echo.text" }, @@ -133,6 +141,10 @@ "item": { "item": "spectrum:topaz_powder" }, + "condition": { + "type": "modonomicon:advancement", + "advancement_id": "spectrum:midgame/brew_potion_in_potion_workshop" + }, "text": "book.spectrum.guidebook.potion_workshop_reagents.topaz_powder.text" }, { @@ -140,6 +152,10 @@ "item": { "item": "spectrum:amethyst_powder" }, + "condition": { + "type": "modonomicon:advancement", + "advancement_id": "spectrum:midgame/brew_potion_in_potion_workshop" + }, "text": "book.spectrum.guidebook.potion_workshop_reagents.amethyst_powder.text" }, { @@ -147,6 +163,10 @@ "item": { "item": "spectrum:citrine_powder" }, + "condition": { + "type": "modonomicon:advancement", + "advancement_id": "spectrum:midgame/brew_potion_in_potion_workshop" + }, "text": "book.spectrum.guidebook.potion_workshop_reagents.citrine_powder.text" }, { @@ -154,6 +174,10 @@ "item": { "item": "spectrum:onyx_powder" }, + "condition": { + "type": "modonomicon:advancement", + "advancement_id": "spectrum:midgame/brew_potion_in_potion_workshop" + }, "text": "book.spectrum.guidebook.potion_workshop_reagents.onyx_powder.text" }, { @@ -163,7 +187,7 @@ }, "condition": { "type": "modonomicon:advancement", - "advancement_id": "spectrum:lategame/collect_moonstone" + "advancement_id": "spectrum:unlocks/reagents/moonstone_powder" }, "text": "book.spectrum.guidebook.potion_workshop_reagents.moonstone_powder.text" }, @@ -172,6 +196,10 @@ "item": { "item": "spectrum:shimmerstone_gem" }, + "condition": { + "type": "modonomicon:advancement", + "advancement_id": "spectrum:midgame/brew_potion_in_potion_workshop" + }, "text": "book.spectrum.guidebook.potion_workshop_reagents.shimmerstone_gem.text" }, { @@ -181,7 +209,7 @@ }, "condition": { "type": "modonomicon:advancement", - "advancement_id": "spectrum:collect_quitoxic_reeds" + "advancement_id": "spectrum:midgame/brew_potion_in_potion_workshop" }, "text": "book.spectrum.guidebook.potion_workshop_reagents.quitoxic_powder.text" }, @@ -192,7 +220,7 @@ }, "condition": { "type": "modonomicon:advancement", - "advancement_id": "spectrum:midgame/collect_stratine" + "advancement_id": "spectrum:midgame/brew_potion_in_potion_workshop" }, "text": "book.spectrum.guidebook.potion_workshop_reagents.stratine_fragments.text" }, @@ -203,7 +231,7 @@ }, "condition": { "type": "modonomicon:advancement", - "advancement_id": "spectrum:lategame/collect_paltaeria" + "advancement_id": "spectrum:unlocks/reagents/paltaeria_fragments" }, "text": "book.spectrum.guidebook.potion_workshop_reagents.paltaeria_fragments.text" }, @@ -214,7 +242,7 @@ }, "condition": { "type": "modonomicon:advancement", - "advancement_id": "spectrum:hidden/collect_stardust" + "advancement_id": "spectrum:unlocks/reagents/stardust" }, "text": "book.spectrum.guidebook.potion_workshop_reagents.stardust.text" }, @@ -225,7 +253,7 @@ }, "condition": { "type": "modonomicon:advancement", - "advancement_id": "spectrum:collect_star_fragment" + "advancement_id": "spectrum:unlocks/reagents/star_fragment" }, "text": "book.spectrum.guidebook.potion_workshop_reagents.star_fragment.text" }, @@ -236,7 +264,7 @@ }, "condition": { "type": "modonomicon:advancement", - "advancement_id": "spectrum:midgame/collect_storm_stone" + "advancement_id": "spectrum:unlocks/reagents/storm_stone" }, "text": "book.spectrum.guidebook.potion_workshop_reagents.storm_stone.text" }, @@ -247,7 +275,7 @@ }, "condition": { "type": "modonomicon:advancement", - "advancement_id": "spectrum:midgame/collect_azurite" + "advancement_id": "spectrum:unlocks/reagents/raw_azurite" }, "text": "book.spectrum.guidebook.potion_workshop_reagents.raw_azurite.text" }, @@ -258,7 +286,7 @@ }, "condition": { "type": "modonomicon:advancement", - "advancement_id": "spectrum:collect_four_leaf_clover" + "advancement_id": "spectrum:unlocks/reagents/four_leaf_clover" }, "text": "book.spectrum.guidebook.potion_workshop_reagents.four_leaf_clover.text" }, @@ -269,7 +297,7 @@ }, "condition": { "type": "modonomicon:advancement", - "advancement_id": "spectrum:collect_vegetal" + "advancement_id": "spectrum:midgame/brew_potion_in_potion_workshop" }, "text": "book.spectrum.guidebook.potion_workshop_reagents.vegetal.text" }, @@ -280,7 +308,7 @@ }, "condition": { "type": "modonomicon:advancement", - "advancement_id": "spectrum:midgame/collect_neolith" + "advancement_id": "spectrum:unlocks/reagents/neolith" }, "text": "book.spectrum.guidebook.potion_workshop_reagents.neolith.text" }, @@ -291,7 +319,7 @@ }, "condition": { "type": "modonomicon:advancement", - "advancement_id": "spectrum:midgame/collect_midnight_chip" + "advancement_id": "spectrum:unlocks/reagents/midnight_chip" }, "text": "book.spectrum.guidebook.potion_workshop_reagents.midnight_chip.text" }, @@ -302,7 +330,7 @@ }, "condition": { "type": "modonomicon:advancement", - "advancement_id": "spectrum:midgame/harvest_moonstruck_nectar" + "advancement_id": "spectrum:unlocks/reagents/moonstruck_nectar" }, "text": "book.spectrum.guidebook.potion_workshop_reagents.moonstruck_nectar.text" }, @@ -313,7 +341,7 @@ }, "condition": { "type": "modonomicon:advancement", - "advancement_id": "spectrum:midgame/break_decayed_bedrock" + "advancement_id": "spectrum:unlocks/reagents/bedrock_dust" }, "text": "book.spectrum.guidebook.potion_workshop_reagents.bedrock_dust.text" }, @@ -324,7 +352,7 @@ }, "condition": { "type": "modonomicon:advancement", - "advancement_id": "spectrum:lategame/collect_bismuth" + "advancement_id": "spectrum:unlocks/reagents/bismuth_flake" }, "text": "book.spectrum.guidebook.potion_workshop_reagents.bismuth_flake.text" }, @@ -335,7 +363,7 @@ }, "condition": { "type": "modonomicon:advancement", - "advancement_id": "spectrum:lategame/collect_malachite" + "advancement_id": "spectrum:unlocks/reagents/raw_malachite" }, "text": "book.spectrum.guidebook.potion_workshop_reagents.raw_malachite.text" }, @@ -346,7 +374,7 @@ }, "condition": { "type": "modonomicon:advancement", - "advancement_id": "spectrum:hidden/collect_raw_bloodstone" + "advancement_id": "spectrum:unlocks/reagents/raw_bloodstone" }, "text": "book.spectrum.guidebook.potion_workshop_reagents.raw_bloodstone.text" }, @@ -358,7 +386,7 @@ "anchor": "prickly_bayleaf", "condition": { "type": "modonomicon:advancement", - "advancement_id": "spectrum:lategame/collect_prickly_bayleaf" + "advancement_id": "spectrum:unlocks/reagents/prickly_bayleaf" }, "text": "book.spectrum.guidebook.potion_workshop_reagents.prickly_bayleaf.text" }, @@ -370,7 +398,7 @@ "anchor": "jadeite_petals", "condition": { "type": "modonomicon:advancement", - "advancement_id": "spectrum:hidden/collect_jadeite" + "advancement_id": "spectrum:unlocks/reagents/jadeite_petals" }, "text": "book.spectrum.guidebook.potion_workshop_reagents.jadeite_petals.text" }, @@ -382,7 +410,7 @@ "anchor": "fissure_plum", "condition": { "type": "modonomicon:advancement", - "advancement_id": "spectrum:hidden/collect_fissure_plum" + "advancement_id": "spectrum:unlocks/reagents/fissure_plum" }, "text": "book.spectrum.guidebook.potion_workshop_reagents.fissure_plum.text" }, @@ -394,7 +422,7 @@ "anchor": "bone_ash", "condition": { "type": "modonomicon:advancement", - "advancement_id": "spectrum:break_cracked_dragonbone" + "advancement_id": "spectrum:unlocks/reagents/bone_ash" }, "text": "book.spectrum.guidebook.potion_workshop_reagents.bone_ash.text" }, @@ -406,7 +434,7 @@ "anchor": "ash_flakes", "condition": { "type": "modonomicon:advancement", - "advancement_id": "spectrum:hidden/collect_ash" + "advancement_id": "spectrum:unlocks/reagents/ash_flakes" }, "text": "book.spectrum.guidebook.potion_workshop_reagents.ash_flakes.text" }, @@ -430,7 +458,7 @@ "anchor": "nightdew_sprout", "condition": { "type": "modonomicon:advancement", - "advancement_id": "spectrum:collect_nightdew" + "advancement_id": "spectrum:unlocks/reagents/nightdew_sprout" }, "text": "book.spectrum.guidebook.potion_workshop_reagents.nightdew_sprout.text" }, @@ -442,7 +470,7 @@ "anchor": "nectardew_burgeon", "condition": { "type": "modonomicon:advancement", - "advancement_id": "spectrum:lategame/collect_nectardew" + "advancement_id": "spectrum:unlocks/reagents/nectardew_burgeon" }, "text": "book.spectrum.guidebook.potion_workshop_reagents.nectardew_burgeon.text" } 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 d95241f7e6..305300f844 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 @@ -60,7 +60,7 @@ "title": "book.spectrum.guidebook.potion_reagent", "condition": { "type": "modonomicon:advancement", - "advancement_id": "spectrum:unlocks/blocks/potion_workshop" + "advancement_id": "spectrum:midgame/brew_potion_in_potion_worksho" }, "item": { "item": "hexcasting:charged_amethyst" diff --git a/src/main/resources/data/spectrum/modonomicon/books/guidebook/entries/mod_integration/09_05_malum.json b/src/main/resources/data/spectrum/modonomicon/books/guidebook/entries/mod_integration/09_05_malum.json index eb095f0290..57c7e1b03b 100644 --- a/src/main/resources/data/spectrum/modonomicon/books/guidebook/entries/mod_integration/09_05_malum.json +++ b/src/main/resources/data/spectrum/modonomicon/books/guidebook/entries/mod_integration/09_05_malum.json @@ -119,7 +119,7 @@ "title": "book.spectrum.guidebook.potion_reagent", "condition": { "type": "modonomicon:advancement", - "advancement_id": "spectrum:mod_integration/malum/visited_well" + "advancement_id": "spectrum:mod_integration/malum/unlocked_void_salts_reagent" }, "item": { "item": "malum:void_salts" diff --git a/src/main/resources/data/spectrum/recipe/mod_integration/botania/potion_workshop_reacting/black_lotus.json b/src/main/resources/data/spectrum/recipe/mod_integration/botania/potion_workshop_reacting/black_lotus.json index 56bba7bcfc..655e7f12e9 100644 --- a/src/main/resources/data/spectrum/recipe/mod_integration/botania/potion_workshop_reacting/black_lotus.json +++ b/src/main/resources/data/spectrum/recipe/mod_integration/botania/potion_workshop_reacting/black_lotus.json @@ -6,6 +6,7 @@ "additional_random_negative_effect_count": 0.5, "unidentifiable": true }, + "required_advancement": "spectrum:midgame/brew_potion_in_potion_workshop", "fabric:load_conditions": [ { "condition": "fabric:all_mods_loaded", diff --git a/src/main/resources/data/spectrum/recipe/mod_integration/botania/potion_workshop_reacting/blacker_lotus.json b/src/main/resources/data/spectrum/recipe/mod_integration/botania/potion_workshop_reacting/blacker_lotus.json index 21052040e9..dad758ac01 100644 --- a/src/main/resources/data/spectrum/recipe/mod_integration/botania/potion_workshop_reacting/blacker_lotus.json +++ b/src/main/resources/data/spectrum/recipe/mod_integration/botania/potion_workshop_reacting/blacker_lotus.json @@ -6,6 +6,7 @@ "additional_random_negative_effect_count": 1.0, "unidentifiable": true }, + "required_advancement": "spectrum:midgame/brew_potion_in_potion_workshop", "fabric:load_conditions": [ { "condition": "fabric:all_mods_loaded", diff --git a/src/main/resources/data/spectrum/recipe/mod_integration/botania/potion_workshop_reacting/blackest_lotus.json b/src/main/resources/data/spectrum/recipe/mod_integration/botania/potion_workshop_reacting/blackest_lotus.json index e463fcdb3d..6d9c19fef3 100644 --- a/src/main/resources/data/spectrum/recipe/mod_integration/botania/potion_workshop_reacting/blackest_lotus.json +++ b/src/main/resources/data/spectrum/recipe/mod_integration/botania/potion_workshop_reacting/blackest_lotus.json @@ -6,6 +6,7 @@ "additional_random_negative_effect_count": 1.0, "unidentifiable": true }, + "required_advancement": "spectrum:midgame/brew_potion_in_potion_workshop", "fabric:load_conditions": [ { "condition": "fabric:all_mods_loaded", diff --git a/src/main/resources/data/spectrum/recipe/mod_integration/botania/potion_workshop_reacting/least_black_lotus.json b/src/main/resources/data/spectrum/recipe/mod_integration/botania/potion_workshop_reacting/least_black_lotus.json index e5ef40cdc4..cc50551c0a 100644 --- a/src/main/resources/data/spectrum/recipe/mod_integration/botania/potion_workshop_reacting/least_black_lotus.json +++ b/src/main/resources/data/spectrum/recipe/mod_integration/botania/potion_workshop_reacting/least_black_lotus.json @@ -6,6 +6,7 @@ "additional_random_negative_effect_count": 3.0, "unidentifiable": true }, + "required_advancement": "spectrum:midgame/brew_potion_in_potion_workshop", "fabric:load_conditions": [ { "condition": "fabric:all_mods_loaded", diff --git a/src/main/resources/data/spectrum/recipe/mod_integration/botania/potion_workshop_reacting/life_essence.json b/src/main/resources/data/spectrum/recipe/mod_integration/botania/potion_workshop_reacting/life_essence.json index f395977e02..8e4dd4fe33 100644 --- a/src/main/resources/data/spectrum/recipe/mod_integration/botania/potion_workshop_reacting/life_essence.json +++ b/src/main/resources/data/spectrum/recipe/mod_integration/botania/potion_workshop_reacting/life_essence.json @@ -5,6 +5,7 @@ "flat_potency_bonus": 2.5, "flat_yield_bonus": -3.0 }, + "required_advancement": "spectrum:midgame/brew_potion_in_potion_workshop", "fabric:load_conditions": [ { "condition": "fabric:all_mods_loaded", diff --git a/src/main/resources/data/spectrum/recipe/mod_integration/botania/potion_workshop_reacting/mana_powder.json b/src/main/resources/data/spectrum/recipe/mod_integration/botania/potion_workshop_reacting/mana_powder.json index 89d18b81bd..4afbe9e82c 100644 --- a/src/main/resources/data/spectrum/recipe/mod_integration/botania/potion_workshop_reacting/mana_powder.json +++ b/src/main/resources/data/spectrum/recipe/mod_integration/botania/potion_workshop_reacting/mana_powder.json @@ -5,6 +5,7 @@ "duration_multiplier": 1.25, "chance_to_add_last_effect": 0.15 }, + "required_advancement": "spectrum:midgame/brew_potion_in_potion_workshop", "fabric:load_conditions": [ { "condition": "fabric:all_mods_loaded", diff --git a/src/main/resources/data/spectrum/recipe/mod_integration/botania/potion_workshop_reacting/pixie_dust.json b/src/main/resources/data/spectrum/recipe/mod_integration/botania/potion_workshop_reacting/pixie_dust.json index 4696a4d252..80fb33d438 100644 --- a/src/main/resources/data/spectrum/recipe/mod_integration/botania/potion_workshop_reacting/pixie_dust.json +++ b/src/main/resources/data/spectrum/recipe/mod_integration/botania/potion_workshop_reacting/pixie_dust.json @@ -6,6 +6,7 @@ "make_lingering": true, "potency_multiplier": 0.75 }, + "required_advancement": "spectrum:midgame/brew_potion_in_potion_workshop", "fabric:load_conditions": [ { "condition": "fabric:all_mods_loaded", diff --git a/src/main/resources/data/spectrum/recipe/mod_integration/hexcasting/potion_workshop_reacting/charged_amethyst.json b/src/main/resources/data/spectrum/recipe/mod_integration/hexcasting/potion_workshop_reacting/charged_amethyst.json index d491ed9a0a..02882c410b 100644 --- a/src/main/resources/data/spectrum/recipe/mod_integration/hexcasting/potion_workshop_reacting/charged_amethyst.json +++ b/src/main/resources/data/spectrum/recipe/mod_integration/hexcasting/potion_workshop_reacting/charged_amethyst.json @@ -15,6 +15,7 @@ "flat_duration_bonus_ticks": 2400 } ], + "required_advancement": "spectrum:midgame/brew_potion_in_potion_workshop", "fabric:load_conditions": [ { "condition": "fabric:all_mods_loaded", diff --git a/src/main/resources/data/spectrum/recipe/mod_integration/malum/potion_workshop_reacting/void_salts.json b/src/main/resources/data/spectrum/recipe/mod_integration/malum/potion_workshop_reacting/void_salts.json index d9aedaaaab..1b7507148f 100644 --- a/src/main/resources/data/spectrum/recipe/mod_integration/malum/potion_workshop_reacting/void_salts.json +++ b/src/main/resources/data/spectrum/recipe/mod_integration/malum/potion_workshop_reacting/void_salts.json @@ -5,7 +5,7 @@ "duration_multiplier": 3.0, "flat_yield_bonus": -2.0 }, - "required_advancement": "spectrum:mod_integration/malum/visited_well", + "required_advancement": "spectrum:mod_integration/malum/unlocked_void_salts_reagent", "fabric:load_conditions": [ { "condition": "fabric:all_mods_loaded", diff --git a/src/main/resources/data/spectrum/recipe/potion_workshop_reacting/amethyst_powder.json b/src/main/resources/data/spectrum/recipe/potion_workshop_reacting/amethyst_powder.json index 42b5cac3a7..45fe9aa3e7 100644 --- a/src/main/resources/data/spectrum/recipe/potion_workshop_reacting/amethyst_powder.json +++ b/src/main/resources/data/spectrum/recipe/potion_workshop_reacting/amethyst_powder.json @@ -4,5 +4,5 @@ "modifiers": { "flat_duration_bonus_ticks": 1200 }, - "required_advancement": "spectrum:hidden/collect_shards/amethyst" + "required_advancement": "spectrum:midgame/brew_potion_in_potion_workshop" } \ No newline at end of file diff --git a/src/main/resources/data/spectrum/recipe/potion_workshop_reacting/ash_flakes.json b/src/main/resources/data/spectrum/recipe/potion_workshop_reacting/ash_flakes.json index 268c0787a5..c91eb9b57b 100644 --- a/src/main/resources/data/spectrum/recipe/potion_workshop_reacting/ash_flakes.json +++ b/src/main/resources/data/spectrum/recipe/potion_workshop_reacting/ash_flakes.json @@ -4,5 +4,5 @@ "modifiers": { "flat_duration_bonus_negative_effects": -2400 }, - "required_advancement": "spectrum:hidden/collect_ash" + "required_advancement": "spectrum:unlocks/reagents/ash_flakes" } \ No newline at end of file diff --git a/src/main/resources/data/spectrum/recipe/potion_workshop_reacting/bedrock_dust.json b/src/main/resources/data/spectrum/recipe/potion_workshop_reacting/bedrock_dust.json index f476a2978b..7d5b6be3a9 100644 --- a/src/main/resources/data/spectrum/recipe/potion_workshop_reacting/bedrock_dust.json +++ b/src/main/resources/data/spectrum/recipe/potion_workshop_reacting/bedrock_dust.json @@ -6,5 +6,5 @@ "potency_multiplier": 1.5, "flat_yield_bonus": -1.0 }, - "required_advancement": "spectrum:midgame/break_decayed_bedrock" + "required_advancement": "spectrum:unlocks/reagents/bedrock_dust" } \ No newline at end of file diff --git a/src/main/resources/data/spectrum/recipe/potion_workshop_reacting/bismuth_flake.json b/src/main/resources/data/spectrum/recipe/potion_workshop_reacting/bismuth_flake.json index e5d6c307c4..f3a41771a9 100644 --- a/src/main/resources/data/spectrum/recipe/potion_workshop_reacting/bismuth_flake.json +++ b/src/main/resources/data/spectrum/recipe/potion_workshop_reacting/bismuth_flake.json @@ -5,5 +5,5 @@ "flat_potency_bonus_positive_effects": 1.0, "random_color": true }, - "required_advancement": "spectrum:lategame/collect_bismuth" + "required_advancement": "spectrum:unlocks/reagents/bismuth_flake" } \ No newline at end of file diff --git a/src/main/resources/data/spectrum/recipe/potion_workshop_reacting/bone_ash.json b/src/main/resources/data/spectrum/recipe/potion_workshop_reacting/bone_ash.json index 3e360fbb50..6cd18de5fa 100644 --- a/src/main/resources/data/spectrum/recipe/potion_workshop_reacting/bone_ash.json +++ b/src/main/resources/data/spectrum/recipe/potion_workshop_reacting/bone_ash.json @@ -5,5 +5,5 @@ "last_effect_duration_modifier": 2.0, "last_effect_potency_modifier": 2.0 }, - "required_advancement": "spectrum:break_cracked_dragonbone" + "required_advancement": "spectrum:unlocks/reagents/bone_ash" } \ No newline at end of file diff --git a/src/main/resources/data/spectrum/recipe/potion_workshop_reacting/citrine_powder.json b/src/main/resources/data/spectrum/recipe/potion_workshop_reacting/citrine_powder.json index 906f7c8517..38483c449e 100644 --- a/src/main/resources/data/spectrum/recipe/potion_workshop_reacting/citrine_powder.json +++ b/src/main/resources/data/spectrum/recipe/potion_workshop_reacting/citrine_powder.json @@ -4,5 +4,5 @@ "modifiers": { "potency_multiplier": 1.25 }, - "required_advancement": "spectrum:hidden/collect_shards/citrine" + "required_advancement": "spectrum:midgame/brew_potion_in_potion_workshop" } \ No newline at end of file diff --git a/src/main/resources/data/spectrum/recipe/potion_workshop_reacting/echo_shard.json b/src/main/resources/data/spectrum/recipe/potion_workshop_reacting/echo_shard.json index 0c18d56031..b4b39bd7b6 100644 --- a/src/main/resources/data/spectrum/recipe/potion_workshop_reacting/echo_shard.json +++ b/src/main/resources/data/spectrum/recipe/potion_workshop_reacting/echo_shard.json @@ -3,5 +3,6 @@ "item": "minecraft:echo_shard", "modifiers": { "chance_to_add_last_effect": 0.5 - } + }, + "required_advancement": "spectrum:midgame/brew_potion_in_potion_workshop" } \ No newline at end of file diff --git a/src/main/resources/data/spectrum/recipe/potion_workshop_reacting/fissure_plum.json b/src/main/resources/data/spectrum/recipe/potion_workshop_reacting/fissure_plum.json index 9adccb3557..0281991158 100644 --- a/src/main/resources/data/spectrum/recipe/potion_workshop_reacting/fissure_plum.json +++ b/src/main/resources/data/spectrum/recipe/potion_workshop_reacting/fissure_plum.json @@ -8,5 +8,5 @@ "flat_duration_bonus_ticks_negative_effects": -600, "flat_yield_bonus": 0.5 }, - "required_advancement": "spectrum:hidden/collect_fissure_plum" + "required_advancement": "spectrum:unlocks/reagents/fissure_plum" } \ No newline at end of file diff --git a/src/main/resources/data/spectrum/recipe/potion_workshop_reacting/four_leaf_clover.json b/src/main/resources/data/spectrum/recipe/potion_workshop_reacting/four_leaf_clover.json index 374ff839ab..53c71a4342 100644 --- a/src/main/resources/data/spectrum/recipe/potion_workshop_reacting/four_leaf_clover.json +++ b/src/main/resources/data/spectrum/recipe/potion_workshop_reacting/four_leaf_clover.json @@ -18,5 +18,5 @@ "flat_yield_bonus": 3.0 } ], - "required_advancement": "spectrum:collect_four_leaf_clover" + "required_advancement": "spectrum:unlocks/reagents/four_leaf_clover" } \ No newline at end of file diff --git a/src/main/resources/data/spectrum/recipe/potion_workshop_reacting/jadeite_petals.json b/src/main/resources/data/spectrum/recipe/potion_workshop_reacting/jadeite_petals.json index 4110a0bb54..d370525a66 100644 --- a/src/main/resources/data/spectrum/recipe/potion_workshop_reacting/jadeite_petals.json +++ b/src/main/resources/data/spectrum/recipe/potion_workshop_reacting/jadeite_petals.json @@ -4,5 +4,5 @@ "modifiers": { "flat_duration_bonus_ticks_positive_effects": 2400 }, - "required_advancement": "spectrum:hidden/collect_jadeite" + "required_advancement": "spectrum:unlocks/reagents/jadeite_petals" } \ No newline at end of file diff --git a/src/main/resources/data/spectrum/recipe/potion_workshop_reacting/lapis_lazuli.json b/src/main/resources/data/spectrum/recipe/potion_workshop_reacting/lapis_lazuli.json index 087651ac10..9b879b3411 100644 --- a/src/main/resources/data/spectrum/recipe/potion_workshop_reacting/lapis_lazuli.json +++ b/src/main/resources/data/spectrum/recipe/potion_workshop_reacting/lapis_lazuli.json @@ -3,5 +3,6 @@ "item": "minecraft:lapis_lazuli", "modifiers": { "flat_yield_bonus": 0.5 - } + }, + "required_advancement": "spectrum:midgame/brew_potion_in_potion_workshop" } \ No newline at end of file diff --git a/src/main/resources/data/spectrum/recipe/potion_workshop_reacting/midnight_chip.json b/src/main/resources/data/spectrum/recipe/potion_workshop_reacting/midnight_chip.json index 5356041af7..aa55b09f25 100644 --- a/src/main/resources/data/spectrum/recipe/potion_workshop_reacting/midnight_chip.json +++ b/src/main/resources/data/spectrum/recipe/potion_workshop_reacting/midnight_chip.json @@ -6,5 +6,5 @@ "flat_potency_bonus": 1.0, "flat_yield_bonus": -2.0 }, - "required_advancement": "spectrum:midgame/collect_midnight_chip" + "required_advancement": "spectrum:unlocks/reagents/midnight_chip" } \ No newline at end of file diff --git a/src/main/resources/data/spectrum/recipe/potion_workshop_reacting/moonstone_powder.json b/src/main/resources/data/spectrum/recipe/potion_workshop_reacting/moonstone_powder.json index 2b30e30e88..35d7f8b1b6 100644 --- a/src/main/resources/data/spectrum/recipe/potion_workshop_reacting/moonstone_powder.json +++ b/src/main/resources/data/spectrum/recipe/potion_workshop_reacting/moonstone_powder.json @@ -4,5 +4,5 @@ "modifiers": { "make_effects_positive": true }, - "required_advancement": "spectrum:lategame/collect_moonstone" + "required_advancement": "spectrum:unlocks/reagents/moonstone_powder" } \ No newline at end of file diff --git a/src/main/resources/data/spectrum/recipe/potion_workshop_reacting/moonstruck_nectar.json b/src/main/resources/data/spectrum/recipe/potion_workshop_reacting/moonstruck_nectar.json index b28dde72cd..b7f28075af 100644 --- a/src/main/resources/data/spectrum/recipe/potion_workshop_reacting/moonstruck_nectar.json +++ b/src/main/resources/data/spectrum/recipe/potion_workshop_reacting/moonstruck_nectar.json @@ -4,5 +4,5 @@ "modifiers": { "additional_drink_duration_ticks": -28 }, - "required_advancement": "spectrum:midgame/harvest_moonstruck_nectar" + "required_advancement": "spectrum:unlocks/reagents/moonstruck_nectar" } \ No newline at end of file diff --git a/src/main/resources/data/spectrum/recipe/potion_workshop_reacting/nectardew_burgeon.json b/src/main/resources/data/spectrum/recipe/potion_workshop_reacting/nectardew_burgeon.json index d71157a15b..2ee777586e 100644 --- a/src/main/resources/data/spectrum/recipe/potion_workshop_reacting/nectardew_burgeon.json +++ b/src/main/resources/data/spectrum/recipe/potion_workshop_reacting/nectardew_burgeon.json @@ -32,5 +32,5 @@ } ] }, - "required_advancement": "spectrum:lategame/collect_nectardew" + "required_advancement": "spectrum:unlocks/reagents/nectardew_burgeon" } \ No newline at end of file diff --git a/src/main/resources/data/spectrum/recipe/potion_workshop_reacting/neolith.json b/src/main/resources/data/spectrum/recipe/potion_workshop_reacting/neolith.json index 1d120236ee..526e0a6975 100644 --- a/src/main/resources/data/spectrum/recipe/potion_workshop_reacting/neolith.json +++ b/src/main/resources/data/spectrum/recipe/potion_workshop_reacting/neolith.json @@ -4,5 +4,5 @@ "modifiers": { "unidentifiable": true }, - "required_advancement": "spectrum:midgame/collect_neolith" + "required_advancement": "spectrum:unlocks/reagents/neolith" } \ No newline at end of file diff --git a/src/main/resources/data/spectrum/recipe/potion_workshop_reacting/nightdew_sprout.json b/src/main/resources/data/spectrum/recipe/potion_workshop_reacting/nightdew_sprout.json index 990419fe42..e3783713b4 100644 --- a/src/main/resources/data/spectrum/recipe/potion_workshop_reacting/nightdew_sprout.json +++ b/src/main/resources/data/spectrum/recipe/potion_workshop_reacting/nightdew_sprout.json @@ -6,5 +6,5 @@ "duration_multiplier": 1.5, "flat_yield_bonus": -1.0 }, - "required_advancement": "spectrum:collect_nightdew" + "required_advancement": "spectrum:unlocks/reagents/nightdew_sprout" } \ No newline at end of file diff --git a/src/main/resources/data/spectrum/recipe/potion_workshop_reacting/onyx_powder.json b/src/main/resources/data/spectrum/recipe/potion_workshop_reacting/onyx_powder.json index aaef03456e..2aa86eb357 100644 --- a/src/main/resources/data/spectrum/recipe/potion_workshop_reacting/onyx_powder.json +++ b/src/main/resources/data/spectrum/recipe/potion_workshop_reacting/onyx_powder.json @@ -4,5 +4,5 @@ "modifiers": { "flat_yield_bonus": 2.0 }, - "required_advancement": "spectrum:create_onyx_shard" + "required_advancement": "spectrum:midgame/brew_potion_in_potion_workshop" } \ No newline at end of file diff --git a/src/main/resources/data/spectrum/recipe/potion_workshop_reacting/paltaeria_fragments.json b/src/main/resources/data/spectrum/recipe/potion_workshop_reacting/paltaeria_fragments.json index e974a4a718..197f09151a 100644 --- a/src/main/resources/data/spectrum/recipe/potion_workshop_reacting/paltaeria_fragments.json +++ b/src/main/resources/data/spectrum/recipe/potion_workshop_reacting/paltaeria_fragments.json @@ -4,5 +4,5 @@ "modifiers": { "additional_random_positive_effect_count": 1.0 }, - "required_advancement": "spectrum:lategame/collect_paltaeria" + "required_advancement": "spectrum:unlocks/reagents/paltaeria_fragments" } \ No newline at end of file diff --git a/src/main/resources/data/spectrum/recipe/potion_workshop_reacting/prickly_bayleaf.json b/src/main/resources/data/spectrum/recipe/potion_workshop_reacting/prickly_bayleaf.json index 07291879bc..e6f7a92355 100644 --- a/src/main/resources/data/spectrum/recipe/potion_workshop_reacting/prickly_bayleaf.json +++ b/src/main/resources/data/spectrum/recipe/potion_workshop_reacting/prickly_bayleaf.json @@ -4,5 +4,5 @@ "modifiers": { "flat_potency_bonus_negative_effects": -2.0 }, - "required_advancement": "spectrum:lategame/collect_prickly_bayleaf" + "required_advancement": "spectrum:unlocks/reagents/prickly_bayleaf" } \ No newline at end of file diff --git a/src/main/resources/data/spectrum/recipe/potion_workshop_reacting/pure_echo.json b/src/main/resources/data/spectrum/recipe/potion_workshop_reacting/pure_echo.json index 523fca36ce..8bbbf13178 100644 --- a/src/main/resources/data/spectrum/recipe/potion_workshop_reacting/pure_echo.json +++ b/src/main/resources/data/spectrum/recipe/potion_workshop_reacting/pure_echo.json @@ -4,5 +4,5 @@ "modifiers": { "chance_to_add_last_effect": 1.0 }, - "required_advancement": "spectrum:lategame/collect_pure_resource" + "required_advancement": "spectrum:unlocks/reagents/pure_resources" } \ No newline at end of file diff --git a/src/main/resources/data/spectrum/recipe/potion_workshop_reacting/pure_glowstone.json b/src/main/resources/data/spectrum/recipe/potion_workshop_reacting/pure_glowstone.json index e02cad0efe..9e75d528ee 100644 --- a/src/main/resources/data/spectrum/recipe/potion_workshop_reacting/pure_glowstone.json +++ b/src/main/resources/data/spectrum/recipe/potion_workshop_reacting/pure_glowstone.json @@ -6,5 +6,5 @@ "duration_multiplier": 0.5, "flat_yield_bonus": -1.0 }, - "required_advancement": "spectrum:lategame/collect_pure_resource" + "required_advancement": "spectrum:unlocks/reagents/pure_resources" } \ No newline at end of file diff --git a/src/main/resources/data/spectrum/recipe/potion_workshop_reacting/pure_lapis.json b/src/main/resources/data/spectrum/recipe/potion_workshop_reacting/pure_lapis.json index dc677bca26..868dadc3f0 100644 --- a/src/main/resources/data/spectrum/recipe/potion_workshop_reacting/pure_lapis.json +++ b/src/main/resources/data/spectrum/recipe/potion_workshop_reacting/pure_lapis.json @@ -4,5 +4,5 @@ "modifiers": { "flat_yield_bonus": 1.0 }, - "required_advancement": "spectrum:lategame/collect_pure_resource" + "required_advancement": "spectrum:unlocks/reagents/pure_resources" } \ No newline at end of file diff --git a/src/main/resources/data/spectrum/recipe/potion_workshop_reacting/pure_redstone.json b/src/main/resources/data/spectrum/recipe/potion_workshop_reacting/pure_redstone.json index cc79fca093..3d83052553 100644 --- a/src/main/resources/data/spectrum/recipe/potion_workshop_reacting/pure_redstone.json +++ b/src/main/resources/data/spectrum/recipe/potion_workshop_reacting/pure_redstone.json @@ -6,5 +6,5 @@ "potency_multiplier": 0.5, "flat_yield_bonus": -1.0 }, - "required_advancement": "spectrum:lategame/collect_pure_resource" + "required_advancement": "spectrum:unlocks/reagents/pure_resources" } \ No newline at end of file diff --git a/src/main/resources/data/spectrum/recipe/potion_workshop_reacting/quitoxic_powder.json b/src/main/resources/data/spectrum/recipe/potion_workshop_reacting/quitoxic_powder.json index ee4005dbe2..bb7a162e69 100644 --- a/src/main/resources/data/spectrum/recipe/potion_workshop_reacting/quitoxic_powder.json +++ b/src/main/resources/data/spectrum/recipe/potion_workshop_reacting/quitoxic_powder.json @@ -4,5 +4,5 @@ "modifiers": { "flat_potency_bonus_negative_effects": 1.0 }, - "required_advancement": "spectrum:collect_quitoxic_reeds" + "required_advancement": "spectrum:midgame/brew_potion_in_potion_workshop" } \ No newline at end of file diff --git a/src/main/resources/data/spectrum/recipe/potion_workshop_reacting/raw_azurite.json b/src/main/resources/data/spectrum/recipe/potion_workshop_reacting/raw_azurite.json index bc1c247bf5..4edbf19008 100644 --- a/src/main/resources/data/spectrum/recipe/potion_workshop_reacting/raw_azurite.json +++ b/src/main/resources/data/spectrum/recipe/potion_workshop_reacting/raw_azurite.json @@ -4,5 +4,5 @@ "modifiers": { "negate_decreasing_duration": true }, - "required_advancement": "spectrum:midgame/collect_azurite" + "required_advancement": "spectrum:unlocks/reagents/raw_azurite" } \ No newline at end of file diff --git a/src/main/resources/data/spectrum/recipe/potion_workshop_reacting/raw_bloodstone.json b/src/main/resources/data/spectrum/recipe/potion_workshop_reacting/raw_bloodstone.json index b8221aef27..9e497ed039 100644 --- a/src/main/resources/data/spectrum/recipe/potion_workshop_reacting/raw_bloodstone.json +++ b/src/main/resources/data/spectrum/recipe/potion_workshop_reacting/raw_bloodstone.json @@ -6,5 +6,5 @@ "additional_drink_duration_ticks": 54, "flat_yield_bonus": -2.0 }, - "required_advancement": "spectrum:pluck_resplendent_feather" + "required_advancement": "spectrum:unlocks/reagents/raw_bloodstone" } \ No newline at end of file diff --git a/src/main/resources/data/spectrum/recipe/potion_workshop_reacting/raw_malachite.json b/src/main/resources/data/spectrum/recipe/potion_workshop_reacting/raw_malachite.json index 3597d4c1af..abb2666cc5 100644 --- a/src/main/resources/data/spectrum/recipe/potion_workshop_reacting/raw_malachite.json +++ b/src/main/resources/data/spectrum/recipe/potion_workshop_reacting/raw_malachite.json @@ -6,5 +6,5 @@ "additional_drink_duration_ticks": 54, "flat_yield_bonus": -1.0 }, - "required_advancement": "spectrum:lategame/collect_malachite" + "required_advancement": "spectrum:unlocks/reagents/raw_malachite" } \ No newline at end of file diff --git a/src/main/resources/data/spectrum/recipe/potion_workshop_reacting/shimmerstone_gem.json b/src/main/resources/data/spectrum/recipe/potion_workshop_reacting/shimmerstone_gem.json index f6a610980d..9469c93e48 100644 --- a/src/main/resources/data/spectrum/recipe/potion_workshop_reacting/shimmerstone_gem.json +++ b/src/main/resources/data/spectrum/recipe/potion_workshop_reacting/shimmerstone_gem.json @@ -5,5 +5,5 @@ "duration_multiplier": 1.2, "potency_multiplier": 1.2 }, - "required_advancement": "spectrum:collect_shimmerstone" + "required_advancement": "spectrum:midgame/brew_potion_in_potion_workshop" } \ No newline at end of file diff --git a/src/main/resources/data/spectrum/recipe/potion_workshop_reacting/star_fragment.json b/src/main/resources/data/spectrum/recipe/potion_workshop_reacting/star_fragment.json index 449aa7b240..446c0b0b2f 100644 --- a/src/main/resources/data/spectrum/recipe/potion_workshop_reacting/star_fragment.json +++ b/src/main/resources/data/spectrum/recipe/potion_workshop_reacting/star_fragment.json @@ -6,5 +6,5 @@ "last_effect_duration_modifier": 0.667, "last_effect_potency_modifier": 2.0 }, - "required_advancement": "spectrum:collect_star_fragment" + "required_advancement": "spectrum:unlocks/reagents/star_fragment" } \ No newline at end of file diff --git a/src/main/resources/data/spectrum/recipe/potion_workshop_reacting/stardust.json b/src/main/resources/data/spectrum/recipe/potion_workshop_reacting/stardust.json index e5c8286542..5e5761abe4 100644 --- a/src/main/resources/data/spectrum/recipe/potion_workshop_reacting/stardust.json +++ b/src/main/resources/data/spectrum/recipe/potion_workshop_reacting/stardust.json @@ -5,5 +5,5 @@ "last_effect_duration_modifier": 1.5, "last_effect_potency_modifier": 1.5 }, - "required_advancement": "spectrum:hidden/collect_stardust" + "required_advancement": "spectrum:unlocks/reagents/stardust" } \ No newline at end of file diff --git a/src/main/resources/data/spectrum/recipe/potion_workshop_reacting/storm_stone.json b/src/main/resources/data/spectrum/recipe/potion_workshop_reacting/storm_stone.json index 4f37ec9734..20023b5dfd 100644 --- a/src/main/resources/data/spectrum/recipe/potion_workshop_reacting/storm_stone.json +++ b/src/main/resources/data/spectrum/recipe/potion_workshop_reacting/storm_stone.json @@ -4,5 +4,5 @@ "modifiers": { "potent_decreasing_effect": true }, - "required_advancement": "spectrum:midgame/collect_storm_stone" + "required_advancement": "spectrum:unlocks/reagents/storm_stone" } \ No newline at end of file diff --git a/src/main/resources/data/spectrum/recipe/potion_workshop_reacting/stratine_fragments.json b/src/main/resources/data/spectrum/recipe/potion_workshop_reacting/stratine_fragments.json index 5f299b9436..36d9e87e67 100644 --- a/src/main/resources/data/spectrum/recipe/potion_workshop_reacting/stratine_fragments.json +++ b/src/main/resources/data/spectrum/recipe/potion_workshop_reacting/stratine_fragments.json @@ -6,5 +6,5 @@ "additional_random_negative_effect_count": 1.0, "flat_yield_bonus": -1.0 }, - "required_advancement": "spectrum:midgame/collect_stratine" + "required_advancement": "spectrum:midgame/brew_potion_in_potion_workshop" } \ No newline at end of file diff --git a/src/main/resources/data/spectrum/recipe/potion_workshop_reacting/topaz_powder.json b/src/main/resources/data/spectrum/recipe/potion_workshop_reacting/topaz_powder.json index 52860a0e67..5841ae1435 100644 --- a/src/main/resources/data/spectrum/recipe/potion_workshop_reacting/topaz_powder.json +++ b/src/main/resources/data/spectrum/recipe/potion_workshop_reacting/topaz_powder.json @@ -4,5 +4,5 @@ "modifiers": { "no_particles": true }, - "required_advancement": "spectrum:hidden/collect_shards/topaz" + "required_advancement": "spectrum:midgame/brew_potion_in_potion_workshop" } \ No newline at end of file diff --git a/src/main/resources/data/spectrum/recipe/potion_workshop_reacting/vegetal.json b/src/main/resources/data/spectrum/recipe/potion_workshop_reacting/vegetal.json index 476480e8e1..82b3037de2 100644 --- a/src/main/resources/data/spectrum/recipe/potion_workshop_reacting/vegetal.json +++ b/src/main/resources/data/spectrum/recipe/potion_workshop_reacting/vegetal.json @@ -5,5 +5,5 @@ "duration_multiplier": 3.0, "potency_multiplier": 0.75 }, - "required_advancement": "spectrum:collect_vegetal" + "required_advancement": "spectrum:midgame/brew_potion_in_potion_workshop" } \ No newline at end of file From 5985dde43ba75654b6972a1bfd735853333154fa Mon Sep 17 00:00:00 2001 From: Robotgiggle Date: Tue, 8 Apr 2025 20:31:44 -0400 Subject: [PATCH 5/5] Update syntax for 1.21 --- .../blocks/potion_workshop/PotionWorkshopBlockEntity.java | 6 +++--- .../potion_workshop/PotionWorkshopReactingRecipe.java | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/main/java/de/dafuqs/spectrum/blocks/potion_workshop/PotionWorkshopBlockEntity.java b/src/main/java/de/dafuqs/spectrum/blocks/potion_workshop/PotionWorkshopBlockEntity.java index 2ba56a1c2b..b5edb5544e 100644 --- a/src/main/java/de/dafuqs/spectrum/blocks/potion_workshop/PotionWorkshopBlockEntity.java +++ b/src/main/java/de/dafuqs/spectrum/blocks/potion_workshop/PotionWorkshopBlockEntity.java @@ -339,9 +339,9 @@ private static void fillPotionFillable(PotionWorkshopBlockEntity potionWorkshopB private static boolean canPlayerUseReagents(PotionWorkshopBlockEntity potionWorkshopBlockEntity) { World world = potionWorkshopBlockEntity.getWorld(); - List reagentRecipes = world.getRecipeManager().getAllMatches(SpectrumRecipeTypes.POTION_WORKSHOP_REACTING, potionWorkshopBlockEntity, world); - for (PotionWorkshopReactingRecipe recipe : reagentRecipes) { - if (!recipe.canPlayerCraft(potionWorkshopBlockEntity.getOwnerIfOnline())) { + List> reagentRecipes = world.getRecipeManager().getAllMatches(SpectrumRecipeTypes.POTION_WORKSHOP_REACTING, potionWorkshopBlockEntity.getRecipeInput(), world); + for (RecipeEntry recipe : reagentRecipes) { + if (!recipe.value().canPlayerCraft(potionWorkshopBlockEntity.getOwnerIfOnline())) { return false; } } diff --git a/src/main/java/de/dafuqs/spectrum/recipe/potion_workshop/PotionWorkshopReactingRecipe.java b/src/main/java/de/dafuqs/spectrum/recipe/potion_workshop/PotionWorkshopReactingRecipe.java index a022c68b08..3ab3239fd7 100644 --- a/src/main/java/de/dafuqs/spectrum/recipe/potion_workshop/PotionWorkshopReactingRecipe.java +++ b/src/main/java/de/dafuqs/spectrum/recipe/potion_workshop/PotionWorkshopReactingRecipe.java @@ -42,7 +42,7 @@ public PotionWorkshopReactingRecipe(String group, boolean secret, Optional