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

26 files changed, 249 insertions, 110 deletions

diff --git a/src/main/java/dev/mayaqq/ygasi/abilities/mercenary/Defence1.java b/src/main/java/dev/mayaqq/ygasi/abilities/mercenary/Defence1.java
index 22ec265..05708d3 100644
--- a/src/main/java/dev/mayaqq/ygasi/abilities/mercenary/Defence1.java
+++ b/src/main/java/dev/mayaqq/ygasi/abilities/mercenary/Defence1.java
@@ -6,13 +6,13 @@ import net.minecraft.util.Identifier;
 
 public class Defence1 {
     public static void give(ServerPlayerEntity player) {
-        if (!AdvUtils.getAdvancementProgress(player, "minecraft", "ygasi/defence1")) {
-            AdvUtils.grantAdvancementCriterion(player, new Identifier("minecraft", "ygasi/defence1"), "unlocked_defence1");
+        if (!AdvUtils.getAdvancementProgress(player, "ygasi", "mercenary/defence1")) {
+            AdvUtils.grantAdvancementCriterion(player, new Identifier("ygasi", "mercenary/defence1"), "unlocked_defence1");
         }
     }
     public static void revoke(ServerPlayerEntity player) {
-        if (AdvUtils.getAdvancementProgress(player, "minecraft", "ygasi/defence1")) {
-            AdvUtils.revokeAllAdvancements(player, "minecraft", "ygasi/defence1");
+        if (AdvUtils.getAdvancementProgress(player, "ygasi", "mercenary/defence1")) {
+            AdvUtils.revokeAllAdvancements(player, "ygasi", "mercenary/defence1");
         }
     }
 }
diff --git a/src/main/java/dev/mayaqq/ygasi/abilities/mercenary/Defence2.java b/src/main/java/dev/mayaqq/ygasi/abilities/mercenary/Defence2.java
index 3a47e89..56996fa 100644
--- a/src/main/java/dev/mayaqq/ygasi/abilities/mercenary/Defence2.java
+++ b/src/main/java/dev/mayaqq/ygasi/abilities/mercenary/Defence2.java
@@ -6,13 +6,13 @@ import net.minecraft.util.Identifier;
 
 public class Defence2 {
     public static void give(ServerPlayerEntity player) {
-        if (!AdvUtils.getAdvancementProgress(player, "minecraft", "ygasi/defence2")) {
-            AdvUtils.grantAdvancementCriterion(player, new Identifier("minecraft", "ygasi/defence2"), "unlocked_defence2");
+        if (!AdvUtils.getAdvancementProgress(player, "ygasi", "mercenary/defence2")) {
+            AdvUtils.grantAdvancementCriterion(player, new Identifier("ygasi", "mercenary/defence2"), "unlocked_defence2");
         }
     }
     public static void revoke(ServerPlayerEntity player) {
-        if (AdvUtils.getAdvancementProgress(player, "minecraft", "ygasi/defence2")) {
-            AdvUtils.revokeAllAdvancements(player, "minecraft", "ygasi/defence2");
+        if (AdvUtils.getAdvancementProgress(player, "ygasi", "mercenary/defence2")) {
+            AdvUtils.revokeAllAdvancements(player, "ygasi", "mercenary/defence2");
         }
     }
 }
diff --git a/src/main/java/dev/mayaqq/ygasi/abilities/mercenary/Defence3.java b/src/main/java/dev/mayaqq/ygasi/abilities/mercenary/Defence3.java
index 39241aa..4f16549 100644
--- a/src/main/java/dev/mayaqq/ygasi/abilities/mercenary/Defence3.java
+++ b/src/main/java/dev/mayaqq/ygasi/abilities/mercenary/Defence3.java
@@ -6,13 +6,13 @@ import net.minecraft.util.Identifier;
 
 public class Defence3 {
     public static void give(ServerPlayerEntity player) {
-        if (!AdvUtils.getAdvancementProgress(player, "minecraft", "ygasi/defence3")) {
-            AdvUtils.grantAdvancementCriterion(player, new Identifier("minecraft", "ygasi/defence3"), "unlocked_defence3");
+        if (!AdvUtils.getAdvancementProgress(player, "ygasi", "mercenary/defence3")) {
+            AdvUtils.grantAdvancementCriterion(player, new Identifier("ygasi", "mercenary/defence3"), "unlocked_defence3");
         }
     }
     public static void revoke(ServerPlayerEntity player) {
-        if (AdvUtils.getAdvancementProgress(player, "minecraft", "ygasi/defence3")) {
-            AdvUtils.revokeAllAdvancements(player, "minecraft", "ygasi/defence3");
+        if (AdvUtils.getAdvancementProgress(player, "ygasi", "mercenary/defence3")) {
+            AdvUtils.revokeAllAdvancements(player, "ygasi", "mercenary/defence3");
         }
     }
 }
diff --git a/src/main/java/dev/mayaqq/ygasi/abilities/mercenary/Ninja1.java b/src/main/java/dev/mayaqq/ygasi/abilities/mercenary/Ninja1.java
index 09ac5b2..c0d3664 100644
--- a/src/main/java/dev/mayaqq/ygasi/abilities/mercenary/Ninja1.java
+++ b/src/main/java/dev/mayaqq/ygasi/abilities/mercenary/Ninja1.java
@@ -6,13 +6,13 @@ import net.minecraft.util.Identifier;
 
 public class Ninja1 {
     public static void give(ServerPlayerEntity player) {
-        if (!AdvUtils.getAdvancementProgress(player, "minecraft", "ygasi/ninja1")) {
-            AdvUtils.grantAdvancementCriterion(player, new Identifier("minecraft", "ygasi/ninja1"), "unlocked_ninja1");
+        if (!AdvUtils.getAdvancementProgress(player, "ygasi", "mercenary/ninja1")) {
+            AdvUtils.grantAdvancementCriterion(player, new Identifier("ygasi", "mercenary/ninja1"), "unlocked_ninja1");
         }
     }
     public static void revoke(ServerPlayerEntity player) {
-        if (AdvUtils.getAdvancementProgress(player, "minecraft", "ygasi/ninja1")) {
-            AdvUtils.revokeAllAdvancements(player, "minecraft", "ygasi/ninja1");
+        if (AdvUtils.getAdvancementProgress(player, "ygasi", "mercenary/ninja1")) {
+            AdvUtils.revokeAllAdvancements(player, "ygasi", "mercenary/ninja1");
         }
     }
 }
diff --git a/src/main/java/dev/mayaqq/ygasi/abilities/mercenary/Ninja2.java b/src/main/java/dev/mayaqq/ygasi/abilities/mercenary/Ninja2.java
index e673d83..308c84a 100644
--- a/src/main/java/dev/mayaqq/ygasi/abilities/mercenary/Ninja2.java
+++ b/src/main/java/dev/mayaqq/ygasi/abilities/mercenary/Ninja2.java
@@ -6,13 +6,13 @@ import net.minecraft.util.Identifier;
 
 public class Ninja2 {
     public static void give(ServerPlayerEntity player) {
-        if (!AdvUtils.getAdvancementProgress(player, "minecraft", "ygasi/ninja2")) {
-            AdvUtils.grantAdvancementCriterion(player, new Identifier("minecraft", "ygasi/ninja2"), "unlocked_ninja2");
+        if (!AdvUtils.getAdvancementProgress(player, "ygasi", "mercenary/ninja2")) {
+            AdvUtils.grantAdvancementCriterion(player, new Identifier("ygasi", "mercenary/ninja2"), "unlocked_ninja2");
         }
     }
     public static void revoke(ServerPlayerEntity player) {
-        if (AdvUtils.getAdvancementProgress(player, "minecraft", "ygasi/ninja2")) {
-            AdvUtils.revokeAllAdvancements(player, "minecraft", "ygasi/ninja2");
+        if (AdvUtils.getAdvancementProgress(player, "ygasi", "mercenary/ninja2")) {
+            AdvUtils.revokeAllAdvancements(player, "ygasi", "mercenary/ninja2");
         }
     }
 }
diff --git a/src/main/java/dev/mayaqq/ygasi/abilities/mercenary/Ninja3.java b/src/main/java/dev/mayaqq/ygasi/abilities/mercenary/Ninja3.java
index 818da0f..037ec0d 100644
--- a/src/main/java/dev/mayaqq/ygasi/abilities/mercenary/Ninja3.java
+++ b/src/main/java/dev/mayaqq/ygasi/abilities/mercenary/Ninja3.java
@@ -6,13 +6,13 @@ import net.minecraft.util.Identifier;
 
 public class Ninja3 {
     public static void give(ServerPlayerEntity player) {
-        if (!AdvUtils.getAdvancementProgress(player, "minecraft", "ygasi/ninja3")) {
-            AdvUtils.grantAdvancementCriterion(player, new Identifier("minecraft", "ygasi/ninja3"), "unlocked_ninja3");
+        if (!AdvUtils.getAdvancementProgress(player, "ygasi", "mercenary/ninja3")) {
+            AdvUtils.grantAdvancementCriterion(player, new Identifier("ygasi", "mercenary/ninja3"), "unlocked_ninja3");
         }
     }
     public static void revoke(ServerPlayerEntity player) {
-        if (AdvUtils.getAdvancementProgress(player, "minecraft", "ygasi/ninja3")) {
-            AdvUtils.revokeAllAdvancements(player, "minecraft", "ygasi/ninja3");
+        if (AdvUtils.getAdvancementProgress(player, "ygasi", "mercenary/ninja3")) {
+            AdvUtils.revokeAllAdvancements(player, "ygasi", "mercenary/ninja3");
         }
     }
 }
diff --git a/src/main/java/dev/mayaqq/ygasi/abilities/mercenary/Offence1.java b/src/main/java/dev/mayaqq/ygasi/abilities/mercenary/Offence1.java
index 506fa18..135dff0 100644
--- a/src/main/java/dev/mayaqq/ygasi/abilities/mercenary/Offence1.java
+++ b/src/main/java/dev/mayaqq/ygasi/abilities/mercenary/Offence1.java
@@ -12,13 +12,13 @@ public class Offence1 {
     public static Map<String, Boolean> attackList = new HashMap<>();
 
     public static void give(ServerPlayerEntity player) {
-        if (!AdvUtils.getAdvancementProgress(player, "minecraft", "ygasi/offence1")) {
-            AdvUtils.grantAdvancementCriterion(player, new Identifier("minecraft", "ygasi/offence1"), "unlocked_offence1");
+        if (!AdvUtils.getAdvancementProgress(player, "ygasi", "mercenary/offence1")) {
+            AdvUtils.grantAdvancementCriterion(player, new Identifier("ygasi", "mercenary/offence1"), "unlocked_offence1");
         }
     }
     public static void revoke(ServerPlayerEntity player) {
-        if (AdvUtils.getAdvancementProgress(player, "minecraft", "ygasi/offence1")) {
-            AdvUtils.revokeAllAdvancements(player, "minecraft", "ygasi/offence1");
+        if (AdvUtils.getAdvancementProgress(player, "ygasi", "mercenary/offence1")) {
+            AdvUtils.revokeAllAdvancements(player, "ygasi", "mercenary/offence1");
         }
     }
 }
\ No newline at end of file
diff --git a/src/main/java/dev/mayaqq/ygasi/abilities/mercenary/Offence2.java b/src/main/java/dev/mayaqq/ygasi/abilities/mercenary/Offence2.java
index 9b99592..19ffd49 100644
--- a/src/main/java/dev/mayaqq/ygasi/abilities/mercenary/Offence2.java
+++ b/src/main/java/dev/mayaqq/ygasi/abilities/mercenary/Offence2.java
@@ -1,18 +1,54 @@
 package dev.mayaqq.ygasi.abilities.mercenary;
 
 import dev.mayaqq.ygasi.util.AdvUtils;
+import net.minecraft.entity.Entity;
+import net.minecraft.entity.EntityData;
+import net.minecraft.entity.EntityType;
+import net.minecraft.entity.SpawnReason;
+import net.minecraft.entity.decoration.ArmorStandEntity;
+import net.minecraft.entity.mob.MobEntity;
+import net.minecraft.nbt.NbtCompound;
+import net.minecraft.server.command.SummonCommand;
 import net.minecraft.server.network.ServerPlayerEntity;
+import net.minecraft.server.world.ServerWorld;
+import net.minecraft.text.Text;
+import net.minecraft.util.Hand;
 import net.minecraft.util.Identifier;
+import net.minecraft.util.math.BlockPos;
+import net.minecraft.util.math.Vec3d;
+import net.minecraft.world.World;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
 
 public class Offence2 {
+    public static Map<String, ArrayList<String>> playerSwords = new HashMap<>();
     public static void give(ServerPlayerEntity player) {
-        if (!AdvUtils.getAdvancementProgress(player, "minecraft", "ygasi/offence2")) {
-            AdvUtils.grantAdvancementCriterion(player, new Identifier("minecraft", "ygasi/offence2"), "unlocked_offence2");
+        if (!AdvUtils.getAdvancementProgress(player, "ygasi", "mercenary/offence2")) {
+            AdvUtils.grantAdvancementCriterion(player, new Identifier("ygasi", "mercenary/offence2"), "unlocked_offence2");
         }
     }
     public static void revoke(ServerPlayerEntity player) {
-        if (AdvUtils.getAdvancementProgress(player, "minecraft", "ygasi/offence2")) {
-            AdvUtils.revokeAllAdvancements(player, "minecraft", "ygasi/offence2");
+        if (AdvUtils.getAdvancementProgress(player, "ygasi", "mercenary/offence2")) {
+            AdvUtils.revokeAllAdvancements(player, "ygasi", "mercenary/offence2");
+        }
+    }
+    public static void summonStand(ServerPlayerEntity player, Integer sword) {
+        BlockPos pos = player.getBlockPos();
+        ServerWorld world = player.getWorld();
+        ArmorStandEntity armorStand = new ArmorStandEntity(world, pos.getX(), pos.getY(), pos.getZ());
+        armorStand.setCustomName(Text.of(armorStand.getUuidAsString()));
+        armorStand.setCustomNameVisible(true);
+        armorStand.setStackInHand(Hand.MAIN_HAND, player.getMainHandStack());
+        if (playerSwords.get(player.getUuidAsString()) != null) {
+            playerSwords.get(player.getUuidAsString()).add(armorStand.getUuidAsString());
+        } else {
+            ArrayList<String> swords = new ArrayList<>();
+            swords.add(armorStand.getUuidAsString());
+            playerSwords.put(player.getUuidAsString(), swords);
         }
+        world.spawnEntity(armorStand);
     }
 }
diff --git a/src/main/java/dev/mayaqq/ygasi/abilities/mercenary/Offence3.java b/src/main/java/dev/mayaqq/ygasi/abilities/mercenary/Offence3.java
index 86efbc6..85b4c3c 100644
--- a/src/main/java/dev/mayaqq/ygasi/abilities/mercenary/Offence3.java
+++ b/src/main/java/dev/mayaqq/ygasi/abilities/mercenary/Offence3.java
@@ -6,13 +6,13 @@ import net.minecraft.util.Identifier;
 
 public class Offence3 {
     public static void give(ServerPlayerEntity player) {
-        if (!AdvUtils.getAdvancementProgress(player, "minecraft", "ygasi/offence3")) {
-            AdvUtils.grantAdvancementCriterion(player, new Identifier("minecraft", "ygasi/offence3"), "unlocked_offence3");
+        if (!AdvUtils.getAdvancementProgress(player, "ygasi", "mercenary/offence3")) {
+            AdvUtils.grantAdvancementCriterion(player, new Identifier("ygasi", "mercenary/offence3"), "unlocked_offence3");
         }
     }
     public static void revoke(ServerPlayerEntity player) {
-        if (AdvUtils.getAdvancementProgress(player, "minecraft", "ygasi/offence3")) {
-            AdvUtils.revokeAllAdvancements(player, "minecraft", "ygasi/offence3");
+        if (AdvUtils.getAdvancementProgress(player, "ygasi", "mercenary/offence3")) {
+            AdvUtils.revokeAllAdvancements(player, "ygasi", "mercenary/offence3");
         }
     }
 }
diff --git a/src/main/java/dev/mayaqq/ygasi/dataGen/advancements/YgasiAdvancements.java b/src/main/java/dev/mayaqq/ygasi/dataGen/advancements/YgasiAdvancements.java
index e95ce6f..6d66a7c 100644
--- a/src/main/java/dev/mayaqq/ygasi/dataGen/advancements/YgasiAdvancements.java
+++ b/src/main/java/dev/mayaqq/ygasi/dataGen/advancements/YgasiAdvancements.java
@@ -16,157 +16,162 @@ public class YgasiAdvancements implements Consumer<Consumer<Advancement>> {
 
     @Override
     public void accept(Consumer<Advancement> consumer) {
+        String mercenaryPath = "ygasi:mercenary/";
+        String wizardryPath =  "ygasi:wizardry/";
+        String druidryPath = "ygasi:druidry/";
+        String extraPath = "ygasi:extra/";
+
         //main root advancement
         Advancement rootAdvancement = Advancement.Builder.create().display(Items.DIAMOND, // The display icon
                 Text.translatable("advancements.ygasi.root.title"), // The title
                 Text.translatable("advancements.ygasi.root.description"), // The description
                 new Identifier("textures/block/sculk_catalyst_top.png"), // Background image used
                 AdvancementFrame.CHALLENGE, // Options: TASK, CHALLENGE, GOAL
-                false, // Show toast top right
+                true, // Show toast top right
                 false, // Announce to chat
                 false // Hidden in the advancement tab
-        ).criterion("opened_skill_menu", new ImpossibleCriterion.Conditions()).rewards(AdvancementRewards.Builder.experience(1)).build(consumer, "ygasi" + "/root");
+        ).criterion("opened_skill_menu", new ImpossibleCriterion.Conditions()).rewards(AdvancementRewards.Builder.experience(1)).build(consumer, "ygasi:root");
 
         //branch advancements
         Advancement mercenary = Advancement.Builder.create().parent(rootAdvancement)
                 .display(Items.DIAMOND_SWORD, Text.translatable("advancements.ygasi.mercenary.title"), Text.translatable("advancements.ygasi.mercenary.description"), null, AdvancementFrame.GOAL, false, false, false)
                 .criterion("unlocked_mercenary", new ImpossibleCriterion.Conditions()).criterion("gotten_previous", new AdvancementGottenCriterion.Conditions(EntityPredicate.Extended.EMPTY, rootAdvancement.getId()))
-                .rewards(AdvancementRewards.Builder.experience(1)).build(consumer, "ygasi" + "/mercenary");
+                .rewards(AdvancementRewards.Builder.experience(1)).build(consumer, mercenaryPath + "mercenary");
         Advancement wizardry = Advancement.Builder.create().parent(rootAdvancement)
                 .display(Items.BLAZE_ROD, Text.translatable("advancements.ygasi.wizardry.title"), Text.translatable("advancements.ygasi.wizardry.description"), null, AdvancementFrame.GOAL, false, false, false)
                 .criterion("unlocked_wizardry", new ImpossibleCriterion.Conditions()).criterion("gotten_previous", new AdvancementGottenCriterion.Conditions(EntityPredicate.Extended.EMPTY, rootAdvancement.getId()))
-                .rewards(AdvancementRewards.Builder.experience(1)).build(consumer, "ygasi" + "/wizardry");
+                .rewards(AdvancementRewards.Builder.experience(1)).build(consumer, wizardryPath + "wizardry");
         Advancement druidry = Advancement.Builder.create().parent(rootAdvancement)
                 .display(Items.OAK_SAPLING, Text.translatable("advancements.ygasi.druidry.title"), Text.translatable("advancements.ygasi.druidry.description"), null, AdvancementFrame.GOAL, false, false, false)
                 .criterion("unlocked_druidry", new ImpossibleCriterion.Conditions()).criterion("gotten_previous", new AdvancementGottenCriterion.Conditions(EntityPredicate.Extended.EMPTY, rootAdvancement.getId()))
-                .rewards(AdvancementRewards.Builder.experience(1)).build(consumer, "ygasi" + "/druidry");
+                .rewards(AdvancementRewards.Builder.experience(1)).build(consumer, druidryPath + "druidry");
         Advancement extra = Advancement.Builder.create().parent(rootAdvancement)
                 .display(Items.EMERALD, Text.translatable("advancements.ygasi.extra.title"), Text.translatable("advancements.ygasi.extra.description"), null, AdvancementFrame.GOAL, false, false, false)
                 .criterion("unlocked_extra", new ImpossibleCriterion.Conditions()).criterion("gotten_previous", new AdvancementGottenCriterion.Conditions(EntityPredicate.Extended.EMPTY, rootAdvancement.getId()))
-                .rewards(AdvancementRewards.Builder.experience(1)).build(consumer, "ygasi" + "/extra");
+                .rewards(AdvancementRewards.Builder.experience(1)).build(consumer, extraPath + "extra");
 
         //mercenary skills
 
         Advancement offence1 = Advancement.Builder.create().parent(mercenary)
                 .display(Items.IRON_SWORD, Text.translatable("advancements.ygasi.mercenary.offence1.title"), Text.translatable("advancements.ygasi.mercenary.offence1.description"), null, AdvancementFrame.TASK, false, false, true)
                 .criterion("unlocked_offence1", new ImpossibleCriterion.Conditions()).criterion("gotten_previous", new AdvancementGottenCriterion.Conditions(EntityPredicate.Extended.EMPTY, mercenary.getId()))
-                .rewards(AdvancementRewards.Builder.experience(1)).build(consumer, "ygasi" + "/offence1");
+                .rewards(AdvancementRewards.Builder.experience(1)).build(consumer, mercenaryPath + "offence1");
         Advancement offence2 = Advancement.Builder.create().parent(offence1)
                 .display(Items.IRON_SWORD, Text.translatable("advancements.ygasi.mercenary.offence2.title"), Text.translatable("advancements.ygasi.mercenary.offence2.description"), null, AdvancementFrame.TASK, false, false, true)
                 .criterion("unlocked_offence2", new ImpossibleCriterion.Conditions()).criterion("gotten_previous", new AdvancementGottenCriterion.Conditions(EntityPredicate.Extended.EMPTY, offence1.getId()))
-                .rewards(AdvancementRewards.Builder.experience(1)).build(consumer, "ygasi" + "/offence2");
+                .rewards(AdvancementRewards.Builder.experience(1)).build(consumer, mercenaryPath + "offence2");
         Advancement offence3 = Advancement.Builder.create().parent(offence2)
                 .display(Items.IRON_SWORD, Text.translatable("advancements.ygasi.mercenary.offence3.title"), Text.translatable("advancements.ygasi.mercenary.offence3.description"), null, AdvancementFrame.TASK, false, false, true)
                 .criterion("unlocked_offence3", new ImpossibleCriterion.Conditions()).criterion("gotten_previous", new AdvancementGottenCriterion.Conditions(EntityPredicate.Extended.EMPTY, offence2.getId()))
-                .rewards(AdvancementRewards.Builder.experience(1)).build(consumer, "ygasi" + "/offence3");
+                .rewards(AdvancementRewards.Builder.experience(1)).build(consumer, mercenaryPath + "offence3");
 
         Advancement ninja1 = Advancement.Builder.create().parent(mercenary)
                 .display(Items.BAMBOO, Text.translatable("advancements.ygasi.mercenary.ninja1.title"), Text.translatable("advancements.ygasi.mercenary.ninja1.description"), null, AdvancementFrame.TASK, false, false, true)
                 .criterion("unlocked_ninja1", new ImpossibleCriterion.Conditions()).criterion("gotten_previous", new AdvancementGottenCriterion.Conditions(EntityPredicate.Extended.EMPTY, mercenary.getId()))
-                .rewards(AdvancementRewards.Builder.experience(1)).build(consumer, "ygasi" + "/ninja1");
+                .rewards(AdvancementRewards.Builder.experience(1)).build(consumer, mercenaryPath + "ninja1");
         Advancement ninja2 = Advancement.Builder.create().parent(ninja1)
                 .display(Items.BAMBOO, Text.translatable("advancements.ygasi.mercenary.ninja2.title"), Text.translatable("advancements.ygasi.mercenary.ninja2.description"), null, AdvancementFrame.TASK, false, false, true)
                 .criterion("unlocked_ninja2", new ImpossibleCriterion.Conditions()).criterion("gotten_previous", new AdvancementGottenCriterion.Conditions(EntityPredicate.Extended.EMPTY, ninja1.getId()))
-                .rewards(AdvancementRewards.Builder.experience(1)).build(consumer, "ygasi" + "/ninja2");
+                .rewards(AdvancementRewards.Builder.experience(1)).build(consumer, mercenaryPath + "ninja2");
         Advancement ninja3 = Advancement.Builder.create().parent(ninja2)
                 .display(Items.BAMBOO, Text.translatable("advancements.ygasi.mercenary.ninja3.title"), Text.translatable("advancements.ygasi.mercenary.ninja3.description"), null, AdvancementFrame.TASK, false, false, true)
                 .criterion("unlocked_ninja3", new ImpossibleCriterion.Conditions()).criterion("gotten_previous", new AdvancementGottenCriterion.Conditions(EntityPredicate.Extended.EMPTY, ninja2.getId()))
-                .rewards(AdvancementRewards.Builder.experience(1)).build(consumer, "ygasi" + "/ninja3");
+                .rewards(AdvancementRewards.Builder.experience(1)).build(consumer, mercenaryPath + "ninja3");
 
         Advancement defence1 = Advancement.Builder.create().parent(mercenary)
                 .display(Items.IRON_CHESTPLATE, Text.translatable("advancements.ygasi.mercenary.defence1.title"), Text.translatable("advancements.ygasi.mercenary.defence1.description"), null, AdvancementFrame.TASK, false, false, true)
                 .criterion("unlocked_defence1", new ImpossibleCriterion.Conditions()).criterion("gotten_previous", new AdvancementGottenCriterion.Conditions(EntityPredicate.Extended.EMPTY, mercenary.getId()))
-                .rewards(AdvancementRewards.Builder.experience(1)).build(consumer, "ygasi" + "/defence1");
+                .rewards(AdvancementRewards.Builder.experience(1)).build(consumer, mercenaryPath + "defence1");
         Advancement defence2 = Advancement.Builder.create().parent(defence1)
                 .display(Items.IRON_CHESTPLATE, Text.translatable("advancements.ygasi.mercenary.defence2.title"), Text.translatable("advancements.ygasi.mercenary.defence2.description"), null, AdvancementFrame.TASK, false, false, true)
                 .criterion("unlocked_defence2", new ImpossibleCriterion.Conditions()).criterion("gotten_previous", new AdvancementGottenCriterion.Conditions(EntityPredicate.Extended.EMPTY, defence1.getId()))
-                .rewards(AdvancementRewards.Builder.experience(1)).build(consumer, "ygasi" + "/defence2");
+                .rewards(AdvancementRewards.Builder.experience(1)).build(consumer, mercenaryPath + "defence2");
         Advancement defence3 = Advancement.Builder.create().parent(defence2)
                 .display(Items.IRON_CHESTPLATE, Text.translatable("advancements.ygasi.mercenary.defence3.title"), Text.translatable("advancements.ygasi.mercenary.defence3.description"), null, AdvancementFrame.TASK, false, false, true)
                 .criterion("unlocked_defence3", new ImpossibleCriterion.Conditions()).criterion("gotten_previous", new AdvancementGottenCriterion.Conditions(EntityPredicate.Extended.EMPTY, defence2.getId()))
-                .rewards(AdvancementRewards.Builder.experience(1)).build(consumer, "ygasi" + "/defence3");
+                .rewards(AdvancementRewards.Builder.experience(1)).build(consumer, mercenaryPath + "defence3");
 
         //wizardry skills
 
         Advancement fight1 = Advancement.Builder.create().parent(wizardry)
                 .display(Items.BLAZE_POWDER, Text.translatable("advancements.ygasi.wizardry.fight1.title"), Text.translatable("advancements.ygasi.wizardry.fight1.description"), null, AdvancementFrame.TASK, false, false, true)
                 .criterion("unlocked_fight1", new ImpossibleCriterion.Conditions()).criterion("gotten_previous", new AdvancementGottenCriterion.Conditions(EntityPredicate.Extended.EMPTY, wizardry.getId()))
-                .rewards(AdvancementRewards.Builder.experience(1)).build(consumer, "ygasi" + "/fight1");
+                .rewards(AdvancementRewards.Builder.experience(1)).build(consumer,  wizardryPath + "fight1");
         Advancement fight2 = Advancement.Builder.create().parent(fight1)
                 .display(Items.BLAZE_POWDER, Text.translatable("advancements.ygasi.wizardry.fight2.title"), Text.translatable("advancements.ygasi.wizardry.fight2.description"), null, AdvancementFrame.TASK, false, false, true)
                 .criterion("unlocked_fight2", new ImpossibleCriterion.Conditions()).criterion("gotten_previous", new AdvancementGottenCriterion.Conditions(EntityPredicate.Extended.EMPTY, fight1.getId()))
-                .rewards(AdvancementRewards.Builder.experience(1)).build(consumer, "ygasi" + "/fight2");
+                .rewards(AdvancementRewards.Builder.experience(1)).build(consumer, wizardryPath + "fight2");
         Advancement fight3 = Advancement.Builder.create().parent(fight2)
                 .display(Items.BLAZE_POWDER, Text.translatable("advancements.ygasi.wizardry.fight3.title"), Text.translatable("advancements.ygasi.wizardry.fight3.description"), null, AdvancementFrame.TASK, false, false, true)
                 .criterion("unlocked_fight3", new ImpossibleCriterion.Conditions()).criterion("gotten_previous", new AdvancementGottenCriterion.Conditions(EntityPredicate.Extended.EMPTY, fight2.getId()))
-                .rewards(AdvancementRewards.Builder.experience(1)).build(consumer, "ygasi" + "/fight3");
+                .rewards(AdvancementRewards.Builder.experience(1)).build(consumer, wizardryPath + "fight3");
 
         Advancement element1 = Advancement.Builder.create().parent(wizardry)
                 .display(Items.FIRE_CHARGE, Text.translatable("advancements.ygasi.wizardry.element1.title"), Text.translatable("advancements.ygasi.wizardry.element1.description"), null, AdvancementFrame.TASK, false, false, true)
                 .criterion("unlocked_element1", new ImpossibleCriterion.Conditions()).criterion("gotten_previous", new AdvancementGottenCriterion.Conditions(EntityPredicate.Extended.EMPTY, wizardry.getId()))
-                .rewards(AdvancementRewards.Builder.experience(1)).build(consumer, "ygasi" + "/element1");
+                .rewards(AdvancementRewards.Builder.experience(1)).build(consumer, wizardryPath + "element1");
         Advancement element2 = Advancement.Builder.create().parent(element1)
                 .display(Items.FIRE_CHARGE, Text.translatable("advancements.ygasi.wizardry.element2.title"), Text.translatable("advancements.ygasi.wizardry.element2.description"), null, AdvancementFrame.TASK, false, false, true)
                 .criterion("unlocked_element2", new ImpossibleCriterion.Conditions()).criterion("gotten_previous", new AdvancementGottenCriterion.Conditions(EntityPredicate.Extended.EMPTY, element1.getId()))
-                .rewards(AdvancementRewards.Builder.experience(1)).build(consumer, "ygasi" + "/element2");
+                .rewards(AdvancementRewards.Builder.experience(1)).build(consumer, wizardryPath + "element2");
         Advancement element3 = Advancement.Builder.create().parent(element2)
                 .display(Items.FIRE_CHARGE, Text.translatable("advancements.ygasi.wizardry.element3.title"), Text.translatable("advancements.ygasi.wizardry.element3.description"), null, AdvancementFrame.TASK, false, false, true)
                 .criterion("unlocked_element3", new ImpossibleCriterion.Conditions()).criterion("gotten_previous", new AdvancementGottenCriterion.Conditions(EntityPredicate.Extended.EMPTY, element2.getId()))
-                .rewards(AdvancementRewards.Builder.experience(1)).build(consumer, "ygasi" + "/element3");
+                .rewards(AdvancementRewards.Builder.experience(1)).build(consumer, wizardryPath + "element3");
 
         Advancement force1 = Advancement.Builder.create().parent(wizardry)
                 .display(Items.ENDER_PEARL, Text.translatable("advancements.ygasi.wizardry.force1.title"), Text.translatable("advancements.ygasi.wizardry.force1.description"), null, AdvancementFrame.TASK, false, false, true)
                 .criterion("unlocked_force1", new ImpossibleCriterion.Conditions()).criterion("gotten_previous", new AdvancementGottenCriterion.Conditions(EntityPredicate.Extended.EMPTY, wizardry.getId()))
-                .rewards(AdvancementRewards.Builder.experience(1)).build(consumer, "ygasi" + "/force1");
+                .rewards(AdvancementRewards.Builder.experience(1)).build(consumer, wizardryPath + "force1");
         Advancement force2 = Advancement.Builder.create().parent(force1)
                 .display(Items.ENDER_PEARL, Text.translatable("advancements.ygasi.wizardry.force2.title"), Text.translatable("advancements.ygasi.wizardry.force2.description"), null, AdvancementFrame.TASK, false, false, true)
                 .criterion("unlocked_force2", new ImpossibleCriterion.Conditions()).criterion("gotten_previous", new AdvancementGottenCriterion.Conditions(EntityPredicate.Extended.EMPTY, force1.getId()))
-                .rewards(AdvancementRewards.Builder.experience(1)).build(consumer, "ygasi" + "/force2");
+                .rewards(AdvancementRewards.Builder.experience(1)).build(consumer, wizardryPath + "force2");
         Advancement force3 = Advancement.Builder.create().parent(force2)
                 .display(Items.ENDER_PEARL, Text.translatable("advancements.ygasi.wizardry.force3.title"), Text.translatable("advancements.ygasi.wizardry.force3.description"), null, AdvancementFrame.TASK, false, false, true)
                 .criterion("unlocked_force3", new ImpossibleCriterion.Conditions()).criterion("gotten_previous", new AdvancementGottenCriterion.Conditions(EntityPredicate.Extended.EMPTY, force2.getId()))
-                .rewards(AdvancementRewards.Builder.experience(1)).build(consumer, "ygasi" + "/force3");
+                .rewards(AdvancementRewards.Builder.experience(1)).build(consumer, wizardryPath + "force3");
 
         //druidry skills
 
         Advancement necromancy1 = Advancement.Builder.create().parent(druidry)
                 .display(Items.BONE, Text.translatable("advancements.ygasi.druidry.necromancy1.title"), Text.translatable("advancements.ygasi.druidry.necromancy1.description"), null, AdvancementFrame.TASK, false, false, true)
                 .criterion("unlocked_necromancy1", new ImpossibleCriterion.Conditions()).criterion("gotten_previous", new AdvancementGottenCriterion.Conditions(EntityPredicate.Extended.EMPTY, druidry.getId()))
-                .rewards(AdvancementRewards.Builder.experience(1)).build(consumer, "ygasi" + "/necromancy1");
+                .rewards(AdvancementRewards.Builder.experience(1)).build(consumer, druidryPath + "necromancy1");
         Advancement necromancy2 = Advancement.Builder.create().parent(necromancy1)
                 .display(Items.BONE, Text.translatable("advancements.ygasi.druidry.necromancy2.title"), Text.translatable("advancements.ygasi.druidry.necromancy2.description"), null, AdvancementFrame.TASK, false, false, true)
                 .criterion("unlocked_necromancy2", new ImpossibleCriterion.Conditions()).criterion("gotten_previous", new AdvancementGottenCriterion.Conditions(EntityPredicate.Extended.EMPTY, necromancy1.getId()))
-                .rewards(AdvancementRewards.Builder.experience(1)).build(consumer, "ygasi" + "/necromancy2");
+                .rewards(AdvancementRewards.Builder.experience(1)).build(consumer, druidryPath + "necromancy2");
         Advancement necromancy3 = Advancement.Builder.create().parent(necromancy2)
                 .display(Items.BONE, Text.translatable("advancements.ygasi.druidry.necromancy3.title"), Text.translatable("advancements.ygasi.druidry.necromancy3.description"), null, AdvancementFrame.TASK, false, false, true)
                 .criterion("unlocked_necromancy3", new ImpossibleCriterion.Conditions()).criterion("gotten_previous", new AdvancementGottenCriterion.Conditions(EntityPredicate.Extended.EMPTY, necromancy2.getId()))
-                .rewards(AdvancementRewards.Builder.experience(1)).build(consumer, "ygasi" + "/necromancy3");
+                .rewards(AdvancementRewards.Builder.experience(1)).build(consumer, druidryPath + "necromancy3");
 
         Advancement nature1 = Advancement.Builder.create().parent(druidry)
                 .display(Items.GRASS_BLOCK, Text.translatable("advancements.ygasi.druidry.nature1.title"), Text.translatable("advancements.ygasi.druidry.nature1.description"), null, AdvancementFrame.TASK, false, false, true)
                 .criterion("unlocked_nature1", new ImpossibleCriterion.Conditions()).criterion("gotten_previous", new AdvancementGottenCriterion.Conditions(EntityPredicate.Extended.EMPTY, druidry.getId()))
-                .rewards(AdvancementRewards.Builder.experience(1)).build(consumer, "ygasi" + "/nature1");
+                .rewards(AdvancementRewards.Builder.experience(1)).build(consumer, drui