From 43690ace298764ae6bb1e2ec109355e44a35d0b7 Mon Sep 17 00:00:00 2001
From: Electroblob77 <35599699+Electroblob77@users.noreply.github.com>
Date: Thu, 25 Jun 2020 11:24:28 +0100
Subject: [PATCH] Trigger unlock of tiers handbook section when a wand levels
 up, in addition to finding a tome of arcana

---
 src/main/java/electroblob/wizardry/item/ItemWand.java          | 1 +
 .../wizardry/registry/WizardryAdvancementTriggers.java         | 2 ++
 .../ebwizardry/advancements/handbook/tome_of_arcana.json       | 3 +++
 3 files changed, 6 insertions(+)

diff --git a/src/main/java/electroblob/wizardry/item/ItemWand.java b/src/main/java/electroblob/wizardry/item/ItemWand.java
index f6ea7a7a..c2ef0808 100644
--- a/src/main/java/electroblob/wizardry/item/ItemWand.java
+++ b/src/main/java/electroblob/wizardry/item/ItemWand.java
@@ -498,6 +498,7 @@ public class ItemWand extends Item implements IWorkbenchItem, ISpellCastingItem,
 					if(excess >= 0 && excess < progression){
 						// ...display a message above the player's hotbar
 						caster.playSound(WizardrySounds.ITEM_WAND_LEVELUP, 1.25f, 1);
+						WizardryAdvancementTriggers.wand_levelup.triggerFor(caster);
 						if(!world.isRemote)
 							caster.sendMessage(new TextComponentTranslation("item." + Wizardry.MODID + ":wand.levelup",
 									this.getItemStackDisplayName(stack), nextTier.getNameForTranslationFormatted()));
diff --git a/src/main/java/electroblob/wizardry/registry/WizardryAdvancementTriggers.java b/src/main/java/electroblob/wizardry/registry/WizardryAdvancementTriggers.java
index f5cc4aef..91bfa64b 100644
--- a/src/main/java/electroblob/wizardry/registry/WizardryAdvancementTriggers.java
+++ b/src/main/java/electroblob/wizardry/registry/WizardryAdvancementTriggers.java
@@ -24,6 +24,7 @@ public final class WizardryAdvancementTriggers {
     public static final CustomAdvancementTrigger buy_master_spell = new CustomAdvancementTrigger("trigger_buy_master_spell");
   	public static final CustomAdvancementTrigger wizard_trade = new CustomAdvancementTrigger("trigger_wizard_trade");
 	public static final CustomAdvancementTrigger spell_failure = new CustomAdvancementTrigger("trigger_spell_failure");
+	public static final CustomAdvancementTrigger wand_levelup = new CustomAdvancementTrigger("trigger_wand_levelup");
 
 	public static final StructureTrigger visit_structure = new StructureTrigger(new ResourceLocation(Wizardry.MODID, "visit_structure"));
 	public static final ArcaneWorkbenchTrigger arcane_workbench = new ArcaneWorkbenchTrigger(new ResourceLocation(Wizardry.MODID, "arcane_workbench"));
@@ -39,6 +40,7 @@ public final class WizardryAdvancementTriggers {
 		CriteriaTriggers.register(buy_master_spell);
 		CriteriaTriggers.register(wizard_trade);
 		CriteriaTriggers.register(spell_failure);
+		CriteriaTriggers.register(wand_levelup);
 
 		CriteriaTriggers.register(visit_structure);
 		CriteriaTriggers.register(arcane_workbench);
diff --git a/src/main/resources/assets/ebwizardry/advancements/handbook/tome_of_arcana.json b/src/main/resources/assets/ebwizardry/advancements/handbook/tome_of_arcana.json
index 40ee0c46..806ac654 100644
--- a/src/main/resources/assets/ebwizardry/advancements/handbook/tome_of_arcana.json
+++ b/src/main/resources/assets/ebwizardry/advancements/handbook/tome_of_arcana.json
@@ -9,6 +9,9 @@
                     }
                 ]
             }
+        },
+        "criteria_1": {
+            "trigger": "ebwizardry:trigger_wand_levelup"
         }
     }
 }
\ No newline at end of file