I redid all the advancements and also started work on the second Offence2 ability

61 files changed, 323 insertions, 173 deletions

diff --git a/src/main/generated/data/minecraft/advancements/ygasi/druidry.json b/src/main/generated/data/ygasi/advancements/druidry/druidry.json
index fa73a5e..6a7f771 100644
--- a/src/main/generated/data/minecraft/advancements/ygasi/druidry.json
+++ b/src/main/generated/data/ygasi/advancements/druidry/druidry.json
@@ -1,9 +1,9 @@
 {
-  "parent": "minecraft:ygasi/root",
+  "parent": "ygasi:root",
   "criteria": {
     "gotten_previous": {
       "conditions": {
-        "advancement_identifier": "minecraft:ygasi/root"
+        "advancement_identifier": "ygasi:root"
       },
       "trigger": "revelationary:advancement_gotten"
     },
diff --git a/src/main/generated/data/minecraft/advancements/ygasi/nature1.json b/src/main/generated/data/ygasi/advancements/druidry/nature1.json
index 46f1aa7..699fafc 100644
--- a/src/main/generated/data/minecraft/advancements/ygasi/nature1.json
+++ b/src/main/generated/data/ygasi/advancements/druidry/nature1.json
@@ -1,9 +1,9 @@
 {
-  "parent": "minecraft:ygasi/druidry",
+  "parent": "ygasi:druidry/druidry",
   "criteria": {
     "gotten_previous": {
       "conditions": {
-        "advancement_identifier": "minecraft:ygasi/druidry"
+        "advancement_identifier": "ygasi:druidry/druidry"
       },
       "trigger": "revelationary:advancement_gotten"
     },
diff --git a/src/main/generated/data/minecraft/advancements/ygasi/nature2.json b/src/main/generated/data/ygasi/advancements/druidry/nature2.json
index f70c0a3..a4d4d99 100644
--- a/src/main/generated/data/minecraft/advancements/ygasi/nature2.json
+++ b/src/main/generated/data/ygasi/advancements/druidry/nature2.json
@@ -1,9 +1,9 @@
 {
-  "parent": "minecraft:ygasi/nature1",
+  "parent": "ygasi:druidry/nature1",
   "criteria": {
     "gotten_previous": {
       "conditions": {
-        "advancement_identifier": "minecraft:ygasi/nature1"
+        "advancement_identifier": "ygasi:druidry/nature1"
       },
       "trigger": "revelationary:advancement_gotten"
     },
diff --git a/src/main/generated/data/minecraft/advancements/ygasi/nature3.json b/src/main/generated/data/ygasi/advancements/druidry/nature3.json
index f198e1e..446e547 100644
--- a/src/main/generated/data/minecraft/advancements/ygasi/nature3.json
+++ b/src/main/generated/data/ygasi/advancements/druidry/nature3.json
@@ -1,9 +1,9 @@
 {
-  "parent": "minecraft:ygasi/nature2",
+  "parent": "ygasi:druidry/nature2",
   "criteria": {
     "gotten_previous": {
       "conditions": {
-        "advancement_identifier": "minecraft:ygasi/nature2"
+        "advancement_identifier": "ygasi:druidry/nature2"
       },
       "trigger": "revelationary:advancement_gotten"
     },
diff --git a/src/main/generated/data/minecraft/advancements/ygasi/necromancy1.json b/src/main/generated/data/ygasi/advancements/druidry/necromancy1.json
index d8afc8f..9b7e65b 100644
--- a/src/main/generated/data/minecraft/advancements/ygasi/necromancy1.json
+++ b/src/main/generated/data/ygasi/advancements/druidry/necromancy1.json
@@ -1,9 +1,9 @@
 {
-  "parent": "minecraft:ygasi/druidry",
+  "parent": "ygasi:druidry/druidry",
   "criteria": {
     "gotten_previous": {
       "conditions": {
-        "advancement_identifier": "minecraft:ygasi/druidry"
+        "advancement_identifier": "ygasi:druidry/druidry"
       },
       "trigger": "revelationary:advancement_gotten"
     },
diff --git a/src/main/generated/data/minecraft/advancements/ygasi/necromancy2.json b/src/main/generated/data/ygasi/advancements/druidry/necromancy2.json
index 7840604..07417af 100644
--- a/src/main/generated/data/minecraft/advancements/ygasi/necromancy2.json
+++ b/src/main/generated/data/ygasi/advancements/druidry/necromancy2.json
@@ -1,9 +1,9 @@
 {
-  "parent": "minecraft:ygasi/necromancy1",
+  "parent": "ygasi:druidry/necromancy1",
   "criteria": {
     "gotten_previous": {
       "conditions": {
-        "advancement_identifier": "minecraft:ygasi/necromancy1"
+        "advancement_identifier": "ygasi:druidry/necromancy1"
       },
       "trigger": "revelationary:advancement_gotten"
     },
diff --git a/src/main/generated/data/minecraft/advancements/ygasi/necromancy3.json b/src/main/generated/data/ygasi/advancements/druidry/necromancy3.json
index 39295bf..b87d156 100644
--- a/src/main/generated/data/minecraft/advancements/ygasi/necromancy3.json
+++ b/src/main/generated/data/ygasi/advancements/druidry/necromancy3.json
@@ -1,9 +1,9 @@
 {
-  "parent": "minecraft:ygasi/necromancy2",
+  "parent": "ygasi:druidry/necromancy2",
   "criteria": {
     "gotten_previous": {
       "conditions": {
-        "advancement_identifier": "minecraft:ygasi/necromancy2"
+        "advancement_identifier": "ygasi:druidry/necromancy2"
       },
       "trigger": "revelationary:advancement_gotten"
     },
diff --git a/src/main/generated/data/minecraft/advancements/ygasi/protean1.json b/src/main/generated/data/ygasi/advancements/druidry/protean1.json
index 0ff6471..9f8d0aa 100644
--- a/src/main/generated/data/minecraft/advancements/ygasi/protean1.json
+++ b/src/main/generated/data/ygasi/advancements/druidry/protean1.json
@@ -1,9 +1,9 @@
 {
-  "parent": "minecraft:ygasi/druidry",
+  "parent": "ygasi:druidry/druidry",
   "criteria": {
     "gotten_previous": {
       "conditions": {
-        "advancement_identifier": "minecraft:ygasi/druidry"
+        "advancement_identifier": "ygasi:druidry/druidry"
       },
       "trigger": "revelationary:advancement_gotten"
     },
diff --git a/src/main/generated/data/minecraft/advancements/ygasi/protean2.json b/src/main/generated/data/ygasi/advancements/druidry/protean2.json
index eb99cac..c374b55 100644
--- a/src/main/generated/data/minecraft/advancements/ygasi/protean2.json
+++ b/src/main/generated/data/ygasi/advancements/druidry/protean2.json
@@ -1,9 +1,9 @@
 {
-  "parent": "minecraft:ygasi/protean1",
+  "parent": "ygasi:druidry/protean1",
   "criteria": {
     "gotten_previous": {
       "conditions": {
-        "advancement_identifier": "minecraft:ygasi/protean1"
+        "advancement_identifier": "ygasi:druidry/protean1"
       },
       "trigger": "revelationary:advancement_gotten"
     },
diff --git a/src/main/generated/data/minecraft/advancements/ygasi/protean3.json b/src/main/generated/data/ygasi/advancements/druidry/protean3.json
index a4b7054..c3dea82 100644
--- a/src/main/generated/data/minecraft/advancements/ygasi/protean3.json
+++ b/src/main/generated/data/ygasi/advancements/druidry/protean3.json
@@ -1,9 +1,9 @@
 {
-  "parent": "minecraft:ygasi/protean2",
+  "parent": "ygasi:druidry/protean2",
   "criteria": {
     "gotten_previous": {
       "conditions": {
-        "advancement_identifier": "minecraft:ygasi/protean2"
+        "advancement_identifier": "ygasi:druidry/protean2"
       },
       "trigger": "revelationary:advancement_gotten"
     },
diff --git a/src/main/generated/data/minecraft/advancements/ygasi/extra.json b/src/main/generated/data/ygasi/advancements/extra/extra.json
index c4ae6f2..87942dc 100644
--- a/src/main/generated/data/minecraft/advancements/ygasi/extra.json
+++ b/src/main/generated/data/ygasi/advancements/extra/extra.json
@@ -1,9 +1,9 @@
 {
-  "parent": "minecraft:ygasi/root",
+  "parent": "ygasi:root",
   "criteria": {
     "gotten_previous": {
       "conditions": {
-        "advancement_identifier": "minecraft:ygasi/root"
+        "advancement_identifier": "ygasi:root"
       },
       "trigger": "revelationary:advancement_gotten"
     },
diff --git a/src/main/generated/data/minecraft/advancements/ygasi/defence1.json b/src/main/generated/data/ygasi/advancements/mercenary/defence1.json
index bdfcdc0..4a2b6fd 100644
--- a/src/main/generated/data/minecraft/advancements/ygasi/defence1.json
+++ b/src/main/generated/data/ygasi/advancements/mercenary/defence1.json
@@ -1,9 +1,9 @@
 {
-  "parent": "minecraft:ygasi/mercenary",
+  "parent": "ygasi:mercenary/mercenary",
   "criteria": {
     "gotten_previous": {
       "conditions": {
-        "advancement_identifier": "minecraft:ygasi/mercenary"
+        "advancement_identifier": "ygasi:mercenary/mercenary"
       },
       "trigger": "revelationary:advancement_gotten"
     },
diff --git a/src/main/generated/data/minecraft/advancements/ygasi/defence2.json b/src/main/generated/data/ygasi/advancements/mercenary/defence2.json
index d6e66a0..a2a3f6f 100644
--- a/src/main/generated/data/minecraft/advancements/ygasi/defence2.json
+++ b/src/main/generated/data/ygasi/advancements/mercenary/defence2.json
@@ -1,9 +1,9 @@
 {
-  "parent": "minecraft:ygasi/defence1",
+  "parent": "ygasi:mercenary/defence1",
   "criteria": {
     "gotten_previous": {
       "conditions": {
-        "advancement_identifier": "minecraft:ygasi/defence1"
+        "advancement_identifier": "ygasi:mercenary/defence1"
       },
       "trigger": "revelationary:advancement_gotten"
     },
diff --git a/src/main/generated/data/minecraft/advancements/ygasi/defence3.json b/src/main/generated/data/ygasi/advancements/mercenary/defence3.json
index 5567889..698eb53 100644
--- a/src/main/generated/data/minecraft/advancements/ygasi/defence3.json
+++ b/src/main/generated/data/ygasi/advancements/mercenary/defence3.json
@@ -1,9 +1,9 @@
 {
-  "parent": "minecraft:ygasi/defence2",
+  "parent": "ygasi:mercenary/defence2",
   "criteria": {
     "gotten_previous": {
       "conditions": {
-        "advancement_identifier": "minecraft:ygasi/defence2"
+        "advancement_identifier": "ygasi:mercenary/defence2"
       },
       "trigger": "revelationary:advancement_gotten"
     },
diff --git a/src/main/generated/data/minecraft/advancements/ygasi/mercenary.json b/src/main/generated/data/ygasi/advancements/mercenary/mercenary.json
index 85339ae..8950609 100644
--- a/src/main/generated/data/minecraft/advancements/ygasi/mercenary.json
+++ b/src/main/generated/data/ygasi/advancements/mercenary/mercenary.json
@@ -1,9 +1,9 @@
 {
-  "parent": "minecraft:ygasi/root",
+  "parent": "ygasi:root",
   "criteria": {
     "gotten_previous": {
       "conditions": {
-        "advancement_identifier": "minecraft:ygasi/root"
+        "advancement_identifier": "ygasi:root"
       },
       "trigger": "revelationary:advancement_gotten"
     },
diff --git a/src/main/generated/data/minecraft/advancements/ygasi/ninja1.json b/src/main/generated/data/ygasi/advancements/mercenary/ninja1.json
index eaf63a0..dbc4ae4 100644
--- a/src/main/generated/data/minecraft/advancements/ygasi/ninja1.json
+++ b/src/main/generated/data/ygasi/advancements/mercenary/ninja1.json
@@ -1,9 +1,9 @@
 {
-  "parent": "minecraft:ygasi/mercenary",
+  "parent": "ygasi:mercenary/mercenary",
   "criteria": {
     "gotten_previous": {
       "conditions": {
-        "advancement_identifier": "minecraft:ygasi/mercenary"
+        "advancement_identifier": "ygasi:mercenary/mercenary"
       },
       "trigger": "revelationary:advancement_gotten"
     },
diff --git a/src/main/generated/data/minecraft/advancements/ygasi/ninja2.json b/src/main/generated/data/ygasi/advancements/mercenary/ninja2.json
index a3d229b..d9e8469 100644
--- a/src/main/generated/data/minecraft/advancements/ygasi/ninja2.json
+++ b/src/main/generated/data/ygasi/advancements/mercenary/ninja2.json
@@ -1,9 +1,9 @@
 {
-  "parent": "minecraft:ygasi/ninja1",
+  "parent": "ygasi:mercenary/ninja1",
   "criteria": {
     "gotten_previous": {
       "conditions": {
-        "advancement_identifier": "minecraft:ygasi/ninja1"
+        "advancement_identifier": "ygasi:mercenary/ninja1"
       },
       "trigger": "revelationary:advancement_gotten"
     },
diff --git a/src/main/generated/data/minecraft/advancements/ygasi/ninja3.json b/src/main/generated/data/ygasi/advancements/mercenary/ninja3.json
index f3435ce..97d5fd7 100644
--- a/src/main/generated/data/minecraft/advancements/ygasi/ninja3.json
+++ b/src/main/generated/data/ygasi/advancements/mercenary/ninja3.json
@@ -1,9 +1,9 @@
 {
-  "parent": "minecraft:ygasi/ninja2",
+  "parent": "ygasi:mercenary/ninja2",
   "criteria": {
     "gotten_previous": {
       "conditions": {
-        "advancement_identifier": "minecraft:ygasi/ninja2"
+        "advancement_identifier": "ygasi:mercenary/ninja2"
       },
       "trigger": "revelationary:advancement_gotten"
     },
diff --git a/src/main/generated/data/minecraft/advancements/ygasi/offence1.json b/src/main/generated/data/ygasi/advancements/mercenary/offence1.json
index ede1593..5c1298e 100644
--- a/src/main/generated/data/minecraft/advancements/ygasi/offence1.json
+++ b/src/main/generated/data/ygasi/advancements/mercenary/offence1.json
@@ -1,9 +1,9 @@
 {
-  "parent": "minecraft:ygasi/mercenary",
+  "parent": "ygasi:mercenary/mercenary",
   "criteria": {
     "gotten_previous": {
       "conditions": {
-        "advancement_identifier": "minecraft:ygasi/mercenary"
+        "advancement_identifier": "ygasi:mercenary/mercenary"
       },
       "trigger": "revelationary:advancement_gotten"
     },
diff --git a/src/main/generated/data/minecraft/advancements/ygasi/offence2.json b/src/main/generated/data/ygasi/advancements/mercenary/offence2.json
index 7d3a72e..659d52b 100644
--- a/src/main/generated/data/minecraft/advancements/ygasi/offence2.json
+++ b/src/main/generated/data/ygasi/advancements/mercenary/offence2.json
@@ -1,9 +1,9 @@
 {
-  "parent": "minecraft:ygasi/offence1",
+  "parent": "ygasi:mercenary/offence1",
   "criteria": {
     "gotten_previous": {
       "conditions": {
-        "advancement_identifier": "minecraft:ygasi/offence1"
+        "advancement_identifier": "ygasi:mercenary/offence1"
       },
       "trigger": "revelationary:advancement_gotten"
     },
diff --git a/src/main/generated/data/minecraft/advancements/ygasi/offence3.json b/src/main/generated/data/ygasi/advancements/mercenary/offence3.json
index b70eeae..c8ff8cd 100644
--- a/src/main/generated/data/minecraft/advancements/ygasi/offence3.json
+++ b/src/main/generated/data/ygasi/advancements/mercenary/offence3.json
@@ -1,9 +1,9 @@
 {
-  "parent": "minecraft:ygasi/offence2",
+  "parent": "ygasi:mercenary/offence2",
   "criteria": {
     "gotten_previous": {
       "conditions": {
-        "advancement_identifier": "minecraft:ygasi/offence2"
+        "advancement_identifier": "ygasi:mercenary/offence2"
       },
       "trigger": "revelationary:advancement_gotten"
     },
diff --git a/src/main/generated/data/minecraft/advancements/ygasi/root.json b/src/main/generated/data/ygasi/advancements/root.json
index c23d33c..8527500 100644
--- a/