From 5e35e53eb3235c37a59c2af35f90d08cbabf38f6 Mon Sep 17 00:00:00 2001
From: Electroblob77 <35599699+Electroblob77@users.noreply.github.com>
Date: Tue, 20 Oct 2020 00:14:03 +0100
Subject: [PATCH] Update artefact advancements with new artefacts

---
 .../advancements/all_artefacts.json           | 70 +++++++++++++++++
 .../ebwizardry/advancements/artefact.json     | 77 +++++++++++++++++++
 2 files changed, 147 insertions(+)

diff --git a/src/main/resources/assets/ebwizardry/advancements/all_artefacts.json b/src/main/resources/assets/ebwizardry/advancements/all_artefacts.json
index b572fe77..741f7cd0 100644
--- a/src/main/resources/assets/ebwizardry/advancements/all_artefacts.json
+++ b/src/main/resources/assets/ebwizardry/advancements/all_artefacts.json
@@ -83,6 +83,16 @@
 				]
 			}
 		},
+		"ring_meteor": {
+			"trigger": "minecraft:inventory_changed",
+			"conditions": {
+				"items": [
+					{
+						"item": "ebwizardry:ring_meteor"
+					}
+				]
+			}
+		},
 		"ring_ice_melee": {
 			"trigger": "minecraft:inventory_changed",
 			"conditions": {
@@ -163,6 +173,16 @@
 				]
 			}
 		},
+		"ring_stormcloud": {
+			"trigger": "minecraft:inventory_changed",
+			"conditions": {
+				"items": [
+					{
+						"item": "ebwizardry:ring_stormcloud"
+					}
+				]
+			}
+		},
 		"ring_soulbinding": {
 			"trigger": "minecraft:inventory_changed",
 			"conditions": {
@@ -243,6 +263,16 @@
 				]
 			}
 		},
+		"ring_evoker": {
+			"trigger": "minecraft:inventory_changed",
+			"conditions": {
+				"items": [
+					{
+						"item": "ebwizardry:ring_evoker"
+					}
+				]
+			}
+		},
 		"ring_extraction": {
 			"trigger": "minecraft:inventory_changed",
 			"conditions": {
@@ -383,6 +413,16 @@
 				]
 			}
 		},
+		"amulet_frost_warding": {
+			"trigger": "minecraft:inventory_changed",
+			"conditions": {
+				"items": [
+					{
+						"item": "ebwizardry:amulet_frost_warding"
+					}
+				]
+			}
+		},
 		"amulet_potential": {
 			"trigger": "minecraft:inventory_changed",
 			"conditions": {
@@ -593,6 +633,26 @@
 				]
 			}
 		},
+		"charm_undead_helmets": {
+			"trigger": "minecraft:inventory_changed",
+			"conditions": {
+				"items": [
+					{
+						"item": "ebwizardry:charm_undead_helmets"
+					}
+				]
+			}
+		},
+		"charm_hunger_casting": {
+			"trigger": "minecraft:inventory_changed",
+			"conditions": {
+				"items": [
+					{
+						"item": "ebwizardry:charm_hunger_casting"
+					}
+				]
+			}
+		},
 		"charm_flight": {
 			"trigger": "minecraft:inventory_changed",
 			"conditions": {
@@ -633,6 +693,16 @@
 				]
 			}
 		},
+		"charm_sixth_sense": {
+			"trigger": "minecraft:inventory_changed",
+			"conditions": {
+				"items": [
+					{
+						"item": "ebwizardry:charm_sixth_sense"
+					}
+				]
+			}
+		},
 		"charm_stop_time": {
 			"trigger": "minecraft:inventory_changed",
 			"conditions": {
diff --git a/src/main/resources/assets/ebwizardry/advancements/artefact.json b/src/main/resources/assets/ebwizardry/advancements/artefact.json
index 6c9c0131..e8e23c66 100644
--- a/src/main/resources/assets/ebwizardry/advancements/artefact.json
+++ b/src/main/resources/assets/ebwizardry/advancements/artefact.json
@@ -82,6 +82,16 @@
 				]
 			}
 		},
+		"ring_meteor": {
+			"trigger": "minecraft:inventory_changed",
+			"conditions": {
+				"items": [
+					{
+						"item": "ebwizardry:ring_meteor"
+					}
+				]
+			}
+		},
 		"ring_ice_melee": {
 			"trigger": "minecraft:inventory_changed",
 			"conditions": {
@@ -162,6 +172,16 @@
 				]
 			}
 		},
+		"ring_stormcloud": {
+			"trigger": "minecraft:inventory_changed",
+			"conditions": {
+				"items": [
+					{
+						"item": "ebwizardry:ring_stormcloud"
+					}
+				]
+			}
+		},
 		"ring_soulbinding": {
 			"trigger": "minecraft:inventory_changed",
 			"conditions": {
@@ -242,6 +262,16 @@
 				]
 			}
 		},
+		"ring_evoker": {
+			"trigger": "minecraft:inventory_changed",
+			"conditions": {
+				"items": [
+					{
+						"item": "ebwizardry:ring_evoker"
+					}
+				]
+			}
+		},
 		"ring_extraction": {
 			"trigger": "minecraft:inventory_changed",
 			"conditions": {
@@ -382,6 +412,16 @@
 				]
 			}
 		},
+		"amulet_frost_warding": {
+			"trigger": "minecraft:inventory_changed",
+			"conditions": {
+				"items": [
+					{
+						"item": "ebwizardry:amulet_frost_warding"
+					}
+				]
+			}
+		},
 		"amulet_potential": {
 			"trigger": "minecraft:inventory_changed",
 			"conditions": {
@@ -592,6 +632,26 @@
 				]
 			}
 		},
+		"charm_undead_helmets": {
+			"trigger": "minecraft:inventory_changed",
+			"conditions": {
+				"items": [
+					{
+						"item": "ebwizardry:charm_undead_helmets"
+					}
+				]
+			}
+		},
+		"charm_hunger_casting": {
+			"trigger": "minecraft:inventory_changed",
+			"conditions": {
+				"items": [
+					{
+						"item": "ebwizardry:charm_hunger_casting"
+					}
+				]
+			}
+		},
 		"charm_flight": {
 			"trigger": "minecraft:inventory_changed",
 			"conditions": {
@@ -632,6 +692,16 @@
 				]
 			}
 		},
+		"charm_sixth_sense": {
+			"trigger": "minecraft:inventory_changed",
+			"conditions": {
+				"items": [
+					{
+						"item": "ebwizardry:charm_sixth_sense"
+					}
+				]
+			}
+		},
 		"charm_stop_time": {
 			"trigger": "minecraft:inventory_changed",
 			"conditions": {
@@ -702,6 +772,7 @@
 			"ring_fire_melee",
 			"ring_fire_biome",
 			"ring_disintegration",
+			"ring_meteor",
 			"ring_ice_melee",
 			"ring_ice_biome",
 			"ring_arcane_frost",
@@ -710,6 +781,7 @@
 			"ring_storm",
 			"ring_seeking",
 			"ring_hammer",
+			"ring_stormcloud",
 			"ring_soulbinding",
 			"ring_leeching",
 			"ring_necromancy_melee",
@@ -718,6 +790,7 @@
 			"ring_earth_melee",
 			"ring_earth_biome",
 			"ring_full_moon",
+			"ring_evoker",
 			"ring_extraction",
 			"ring_mana_return",
 			"ring_blockwrangler",
@@ -732,6 +805,7 @@
 			"amulet_fire_cloaking",
 			"amulet_ice_immunity",
 			"amulet_ice_protection",
+			"amulet_frost_warding",
 			"amulet_potential",
 			"amulet_channeling",
 			"amulet_lich",
@@ -753,10 +827,13 @@
 			"charm_storm",
 			"charm_minion_health",
 			"charm_minion_variants",
+			"charm_undead_helmets",
+			"charm_hunger_casting",
 			"charm_flight",
 			"charm_growth",
 			"charm_abseiling",
 			"charm_silk_touch",
+			"charm_sixth_sense",
 			"charm_stop_time",
 			"charm_light",
 			"charm_transportation",