Potion unlocking rework (v2)

src/main/java/de/dafuqs/spectrum/blocks/potion_workshop/PotionWorkshopBlockEntity.java

@@ -210,8 +210,10 @@ private static boolean hasUniqueReagents(PotionWorkshopBlockEntity potionWorksho
 
 	private static boolean isBrewingRecipeApplicable(PotionWorkshopBrewingRecipe recipe, ItemStack baseIngredient, PotionWorkshopBlockEntity potionWorkshopBlockEntity) {
 		PotionMod potionMod = getPotionModFromReagents(potionWorkshopBlockEntity);
-		return hasUniqueReagents(potionWorkshopBlockEntity) && recipe.recipeData.isApplicableTo(baseIngredient, potionMod)
-		       && !(potionMod.incurable && SpectrumStatusEffectTags.cannotBeIncurable(recipe.recipeData.statusEffect()));
+		return hasUniqueReagents(potionWorkshopBlockEntity) 
+		    && canPlayerUseReagents(potionWorkshopBlockEntity)
+		    && recipe.recipeData.isApplicableTo(baseIngredient, potionMod)
+			&& !(potionMod.incurable && SpectrumStatusEffectTags.cannotBeIncurable(recipe.recipeData.statusEffect()));
 	}
 
 	private static void craftRecipe(PotionWorkshopBlockEntity potionWorkshopBlockEntity, PotionWorkshopCraftingRecipe recipe) {
@@ -325,6 +327,18 @@ private static void fillPotionFillable(PotionWorkshopBlockEntity potionWorkshopB
 			potionWorkshopBlockEntity.lastBrewedRecipe = brewingRecipe;
 		}
 	}
+
+	private static boolean canPlayerUseReagents(PotionWorkshopBlockEntity potionWorkshopBlockEntity) {
+		World world = potionWorkshopBlockEntity.getWorld();
+		List<PotionWorkshopReactingRecipe> reagentRecipes = world.getRecipeManager().getAllMatches(SpectrumRecipeTypes.POTION_WORKSHOP_REACTING, potionWorkshopBlockEntity, world);
+		SpectrumCommon.logError("Found "+reagentRecipes.size()+" matching reagent recipes");
+		for (PotionWorkshopReactingRecipe recipe : reagentRecipes) {
+			if (!recipe.canPlayerCraft(potionWorkshopBlockEntity.getOwnerIfOnline())) {
+				return false;
+			}
+		}
+		return true;
+	}
 
 	private static PotionMod getPotionModFromReagents(PotionWorkshopBlockEntity potionWorkshopBlockEntity) {
 		World world = potionWorkshopBlockEntity.getWorld();

src/main/java/de/dafuqs/spectrum/recipe/potion_workshop/PotionWorkshopReactingRecipe.java

@@ -3,6 +3,7 @@
 import de.dafuqs.spectrum.api.recipe.*;
 import de.dafuqs.spectrum.recipe.*;
 import de.dafuqs.spectrum.registries.*;
+import de.dafuqs.spectrum.blocks.potion_workshop.*;
 import net.minecraft.inventory.*;
 import net.minecraft.item.*;
 import net.minecraft.recipe.*;
@@ -35,6 +36,12 @@ public PotionWorkshopReactingRecipe(Identifier id, String group, boolean secret,
 
 	@Override
 	public boolean matches(@NotNull Inventory inv, World world) {
+		for (int i : PotionWorkshopBlockEntity.REAGENT_SLOTS) {
+			ItemStack itemStack = inv.getStack(i);
+			if (!itemStack.isEmpty() && itemStack.getItem() == item) {
+				return true;
+			}
+		}
 		return false;
 	}
 

src/main/resources/assets/spectrum/lang/en_us.json

@@ -3586,8 +3586,8 @@
   "book.spectrum.guidebook.potion_workshop_crafting.page9.title": "Bottles o' Enchanting",
   "book.spectrum.guidebook.potion_workshop_reagents.name": "Using Reagents",
   "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",

src/main/resources/data/spectrum/advancements/mod_integration/malum/visited_well.json → src/main/resources/data/spectrum/advancements/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": [

src/main/resources/data/spectrum/advancements/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"
+        }
+      }
+    }
+}

src/main/resources/data/spectrum/advancements/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"
+        }
+      }
+    }
+}

src/main/resources/data/spectrum/advancements/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"
+        }
+      }
+    }
+}

src/main/resources/data/spectrum/advancements/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"
+        }
+      }
+    }
+}

src/main/resources/data/spectrum/advancements/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"
+        }
+      }
+    }
+}

src/main/resources/data/spectrum/advancements/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"
+        }
+      }
+    }
+}

src/main/resources/data/spectrum/advancements/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"
+        }
+      }
+    }
+}

src/main/resources/data/spectrum/advancements/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"
+        }
+      }
+    }
+}

src/main/resources/data/spectrum/advancements/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"
+        }
+      }
+    }
+}