More stuff! The Mercenary gui is basically done other than the translations, I tried and failed to add modrinth publishing thing to gradle, I redid some stuff, I added stuff, I removed stuff and mainly... I broke the reset command (it works but says it broke) and I have no idea how to fix it!

27 files changed, 429 insertions, 123 deletions

diff --git a/src/main/generated/data/minecraft/advancements/ygasi/root.json b/src/main/generated/data/minecraft/advancements/ygasi/root.json
index 8527500..c23d33c 100644
--- a/src/main/generated/data/minecraft/advancements/ygasi/root.json
+++ b/src/main/generated/data/minecraft/advancements/ygasi/root.json
@@ -15,7 +15,7 @@
     "icon": {
       "item": "minecraft:diamond"
     },
-    "show_toast": true,
+    "show_toast": false,
     "title": {
       "translate": "advancements.ygasi.root.title"
     }
diff --git a/src/main/generated/data/ygasi/advancements/recipes/minecraft_ygasi/skill_book.json b/src/main/generated/data/ygasi/advancements/recipes/misc/skill_book.json
index b44f4de..b44f4de 100644
--- a/src/main/generated/data/ygasi/advancements/recipes/minecraft_ygasi/skill_book.json
+++ b/src/main/generated/data/ygasi/advancements/recipes/misc/skill_book.json
diff --git a/src/main/generated/data/ygasi/recipes/skill_book.json b/src/main/generated/data/ygasi/recipes/skill_book.json
index 046fc1e..f0b00af 100644
--- a/src/main/generated/data/ygasi/recipes/skill_book.json
+++ b/src/main/generated/data/ygasi/recipes/skill_book.json
@@ -1,5 +1,6 @@
 {
   "type": "minecraft:crafting_shapeless",
+  "category": "misc",
   "ingredients": [
     {
       "item": "minecraft:book"
diff --git a/src/main/java/dev/mayaqq/ygasi/abilities/mercenary/Defence1.java b/src/main/java/dev/mayaqq/ygasi/abilities/mercenary/Defence1.java
new file mode 100644
index 0000000..22ec265
--- /dev/null
+++ b/src/main/java/dev/mayaqq/ygasi/abilities/mercenary/Defence1.java
@@ -0,0 +1,18 @@
+package dev.mayaqq.ygasi.abilities.mercenary;
+
+import dev.mayaqq.ygasi.util.AdvUtils;
+import net.minecraft.server.network.ServerPlayerEntity;
+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");
+        }
+    }
+    public static void revoke(ServerPlayerEntity player) {
+        if (AdvUtils.getAdvancementProgress(player, "minecraft", "ygasi/defence1")) {
+            AdvUtils.revokeAllAdvancements(player, "minecraft", "ygasi/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
new file mode 100644
index 0000000..3a47e89
--- /dev/null
+++ b/src/main/java/dev/mayaqq/ygasi/abilities/mercenary/Defence2.java
@@ -0,0 +1,18 @@
+package dev.mayaqq.ygasi.abilities.mercenary;
+
+import dev.mayaqq.ygasi.util.AdvUtils;
+import net.minecraft.server.network.ServerPlayerEntity;
+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");
+        }
+    }
+    public static void revoke(ServerPlayerEntity player) {
+        if (AdvUtils.getAdvancementProgress(player, "minecraft", "ygasi/defence2")) {
+            AdvUtils.revokeAllAdvancements(player, "minecraft", "ygasi/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
new file mode 100644
index 0000000..39241aa
--- /dev/null
+++ b/src/main/java/dev/mayaqq/ygasi/abilities/mercenary/Defence3.java
@@ -0,0 +1,18 @@
+package dev.mayaqq.ygasi.abilities.mercenary;
+
+import dev.mayaqq.ygasi.util.AdvUtils;
+import net.minecraft.server.network.ServerPlayerEntity;
+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");
+        }
+    }
+    public static void revoke(ServerPlayerEntity player) {
+        if (AdvUtils.getAdvancementProgress(player, "minecraft", "ygasi/defence3")) {
+            AdvUtils.revokeAllAdvancements(player, "minecraft", "ygasi/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
new file mode 100644
index 0000000..09ac5b2
--- /dev/null
+++ b/src/main/java/dev/mayaqq/ygasi/abilities/mercenary/Ninja1.java
@@ -0,0 +1,18 @@
+package dev.mayaqq.ygasi.abilities.mercenary;
+
+import dev.mayaqq.ygasi.util.AdvUtils;
+import net.minecraft.server.network.ServerPlayerEntity;
+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");
+        }
+    }
+    public static void revoke(ServerPlayerEntity player) {
+        if (AdvUtils.getAdvancementProgress(player, "minecraft", "ygasi/ninja1")) {
+            AdvUtils.revokeAllAdvancements(player, "minecraft", "ygasi/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
new file mode 100644
index 0000000..e673d83
--- /dev/null
+++ b/src/main/java/dev/mayaqq/ygasi/abilities/mercenary/Ninja2.java
@@ -0,0 +1,18 @@
+package dev.mayaqq.ygasi.abilities.mercenary;
+
+import dev.mayaqq.ygasi.util.AdvUtils;
+import net.minecraft.server.network.ServerPlayerEntity;
+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");
+        }
+    }
+    public static void revoke(ServerPlayerEntity player) {
+        if (AdvUtils.getAdvancementProgress(player, "minecraft", "ygasi/ninja2")) {
+            AdvUtils.revokeAllAdvancements(player, "minecraft", "ygasi/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
new file mode 100644
index 0000000..818da0f
--- /dev/null
+++ b/src/main/java/dev/mayaqq/ygasi/abilities/mercenary/Ninja3.java
@@ -0,0 +1,18 @@
+package dev.mayaqq.ygasi.abilities.mercenary;
+
+import dev.mayaqq.ygasi.util.AdvUtils;
+import net.minecraft.server.network.ServerPlayerEntity;
+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");
+        }
+    }
+    public static void revoke(ServerPlayerEntity player) {
+        if (AdvUtils.getAdvancementProgress(player, "minecraft", "ygasi/ninja3")) {
+            AdvUtils.revokeAllAdvancements(player, "minecraft", "ygasi/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
new file mode 100644
index 0000000..73b99e0
--- /dev/null
+++ b/src/main/java/dev/mayaqq/ygasi/abilities/mercenary/Offence1.java
@@ -0,0 +1,22 @@
+package dev.mayaqq.ygasi.abilities.mercenary;
+
+import dev.mayaqq.ygasi.registry.ConfigRegistry;
+import dev.mayaqq.ygasi.util.AdvUtils;
+import net.minecraft.entity.attribute.EntityAttributes;
+import net.minecraft.server.network.ServerPlayerEntity;
+import net.minecraft.util.Identifier;
+
+public class Offence1 {
+    public static void give(ServerPlayerEntity player) {
+        if (!AdvUtils.getAdvancementProgress(player, "minecraft", "ygasi/offence1")) {
+            player.getAttributeInstance(EntityAttributes.GENERIC_ATTACK_DAMAGE).setBaseValue(player.getAttributeInstance(EntityAttributes.GENERIC_ATTACK_DAMAGE).getBaseValue() + ConfigRegistry.CONFIG.offence1DefIncrease);
+            AdvUtils.grantAdvancementCriterion(player, new Identifier("minecraft", "ygasi/offence1"), "unlocked_offence1");
+        }
+    }
+    public static void revoke(ServerPlayerEntity player) {
+        if (AdvUtils.getAdvancementProgress(player, "minecraft", "ygasi/offence1")) {
+            player.getAttributeInstance(EntityAttributes.GENERIC_ATTACK_DAMAGE).setBaseValue(player.getAttributeInstance(EntityAttributes.GENERIC_ATTACK_DAMAGE).getBaseValue() - ConfigRegistry.CONFIG.offence1DefIncrease);
+            AdvUtils.revokeAllAdvancements(player, "minecraft", "ygasi/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
new file mode 100644
index 0000000..9b99592
--- /dev/null
+++ b/src/main/java/dev/mayaqq/ygasi/abilities/mercenary/Offence2.java
@@ -0,0 +1,18 @@
+package dev.mayaqq.ygasi.abilities.mercenary;
+
+import dev.mayaqq.ygasi.util.AdvUtils;
+import net.minecraft.server.network.ServerPlayerEntity;
+import net.minecraft.util.Identifier;
+
+public class Offence2 {
+    public static void give(ServerPlayerEntity player) {
+        if (!AdvUtils.getAdvancementProgress(player, "minecraft", "ygasi/offence2")) {
+            AdvUtils.grantAdvancementCriterion(player, new Identifier("minecraft", "ygasi/offence2"), "unlocked_offence2");
+        }
+    }
+    public static void revoke(ServerPlayerEntity player) {
+        if (AdvUtils.getAdvancementProgress(player, "minecraft", "ygasi/offence2")) {
+            AdvUtils.revokeAllAdvancements(player, "minecraft", "ygasi/offence2");
+        }
+    }
+}
diff --git a/src/main/java/dev/mayaqq/ygasi/abilities/mercenary/Offence3.java b/src/main/java/dev/mayaqq/ygasi/abilities/mercenary/Offence3.java
new file mode 100644
index 0000000..86efbc6
--- /dev/null
+++ b/src/main/java/dev/mayaqq/ygasi/abilities/mercenary/Offence3.java
@@ -0,0 +1,18 @@
+package dev.mayaqq.ygasi.abilities.mercenary;
+
+import dev.mayaqq.ygasi.util.AdvUtils;
+import net.minecraft.server.network.ServerPlayerEntity;
+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");
+        }
+    }
+    public static void revoke(ServerPlayerEntity player) {
+        if (AdvUtils.getAdvancementProgress(player, "minecraft", "ygasi/offence3")) {
+            AdvUtils.revokeAllAdvancements(player, "minecraft", "ygasi/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 70fc642..e95ce6f 100644
--- a/src/main/java/dev/mayaqq/ygasi/dataGen/advancements/YgasiAdvancements.java
+++ b/src/main/java/dev/mayaqq/ygasi/dataGen/advancements/YgasiAdvancements.java
@@ -22,7 +22,7 @@ public class YgasiAdvancements implements Consumer<Consumer<Advancement>> {
                 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
-                true, // Show toast top right
+                false, // 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");
diff --git a/src/main/java/dev/mayaqq/ygasi/events/PlayerConnectEvent.java b/src/main/java/dev/mayaqq/ygasi/events/PlayerConnectEvent.java
index 34f5f46..52b3047 100644
--- a/src/main/java/dev/mayaqq/ygasi/events/PlayerConnectEvent.java
+++ b/src/main/java/dev/mayaqq/ygasi/events/PlayerConnectEvent.java
@@ -2,17 +2,16 @@ package dev.mayaqq.ygasi.events;
 
 import dev.mayaqq.ygasi.registry.ConfigRegistry;
 import dev.mayaqq.ygasi.util.AdvUtils;
-import eu.pb4.polymer.resourcepack.api.PolymerResourcePackUtils;
 import net.fabricmc.fabric.api.networking.v1.ServerPlayConnectionEvents;
 import net.minecraft.item.ItemStack;
 import net.minecraft.util.Identifier;
 
-import static dev.mayaqq.ygasi.Ygasi.LOGGER;
 import static dev.mayaqq.ygasi.registry.ItemRegistry.SKILL_BOOK;
 
 public class PlayerConnectEvent {
     public static void onPlayerConnect() {
         ServerPlayConnectionEvents.JOIN.register((handler, sender, server) -> {
+            //if the player has not joined yet, they will get a skill book if the option is turned on
             if (!handler.player.getScoreboardTags().contains("skill_book_unlocked") && ConfigRegistry.CONFIG.enableSkillBook) {
                 handler.player.addScoreboardTag("skill_book_unlocked");
                 handler.player.getInventory().offerOrDrop(new ItemStack(SKILL_BOOK));
diff --git a/src/main/java/dev/mayaqq/ygasi/gui/BranchGui.java b/src/main/java/dev/mayaqq/ygasi/gui/BranchGui.java
index eca0226..4180771 100644
--- a/src/main/java/dev/mayaqq/ygasi/gui/BranchGui.java
+++ b/src/main/java/dev/mayaqq/ygasi/gui/BranchGui.java
@@ -1,5 +1,6 @@
 package dev.mayaqq.ygasi.gui;
 
+import dev.mayaqq.ygasi.gui.common.SkillGui;
 import dev.mayaqq.ygasi.util.AdvUtils;
 import eu.pb4.sgui.api.elements.*;
 
@@ -7,6 +8,8 @@ import net.minecraft.item.ItemStack;
 import net.minecraft.item.Items;
 import net.minecraft.screen.ScreenHandlerType;
 import net.minecraft.server.network.ServerPlayerEntity;
+import net.minecraft.sound.SoundCategory;
+import net.minecraft.sound.SoundEvents;
 import net.minecraft.stat.Stats;
 import net.minecraft.text.Text;
 import net.minecraft.util.Formatting;
@@ -16,13 +19,17 @@ import static dev.mayaqq.ygasi.registry.StatRegistry.SKILL_POINTS;
 import dev.mayaqq.ygasi.registry.ConfigRegistry;
 import net.minecraft.util.Identifier;
 
+import java.lang.reflect.Method;
+import java.util.HashMap;
+import java.util.Map;
+
 public class BranchGui {
     public static void gui(ServerPlayerEntity player) {
         Text cost = Text.of("§3" + ConfigRegistry.CONFIG.branchCost);
         try {
             SkillGui gui = new SkillGui(ScreenHandlerType.GENERIC_9X3, player, false) {};
             //the title of the gui
-            gui.setTitle(Text.translatable("gui.ygasi.branch.title", player.getStatHandler().getStat(Stats.CUSTOM.getOrCreateStat(SKILL_POINTS))).formatted(Formatting.DARK_AQUA));
+            gui.setTitle(Text.translatable("gui.ygasi.branch.title", Text.of("§3" + player.getStatHandler().getStat(Stats.CUSTOM.getOrCreateStat(SKILL_POINTS)))));
 
             //background items
             for (int x = 0; x <= 26; x++) {
@@ -133,6 +140,7 @@ public class BranchGui {
                     .setName(Text.translatable("gui.ygasi.branch.reset.title"))
                     .addLoreLine(Text.translatable("gui.ygasi.branch.reset.lore"))
                     .addLoreLine(Text.translatable("gui.ygasi.branch.reset.lore2"))
+                    .addLoreLine(Text.translatable("gui.ygasi.branch.reset.lore3", Text.of("§8" + ConfigRegistry.CONFIG.resetCost)))
                     .setCallback((index, clickType, actionType) -> ResetGui.gui(player))
             );
 
@@ -162,51 +170,47 @@ public class BranchGui {
             }
         //the rest of the branches
         } else {
-            //same code as in extra
             if (player.getStatHandler().getStat(Stats.CUSTOM.getOrCreateStat(SKILL_POINTS)) >= ConfigRegistry.CONFIG.branchCost) {
                 //grant the player the advancement of the branch they unlocked
-                switch (branch) {
-                    case "mercenary" -> {
-                        if (hasWizadry || hasDrudiry) {
-                            player.sendMessage(Text.translatable("gui.ygasi.branch.no.unlock"), true);
-                        } else {
-                            hasMercenary = true;
-                            AdvUtils.grantAdvancementCriterion(player, new Identifier("minecraft", "ygasi/mercenary"), "unlocked_mercenary");
-                            MercenaryGui.gui(player);
-                            unlockSuccess(player, branchName);
-                        }
-                    }
-                    case "wizardry" -> {
-                        if (hasMercenary || hasDrudiry) {
-                            player.sendMessage(Text.translatable("gui.ygasi.branch.no.unlock"), true);
-                        } else {
-                            hasWizadry = true;
-                            AdvUtils.grantAdvancementCriterion(player, new Identifier("minecraft", "ygasi/wizardry"), "unlocked_wizardry");
-                            WizardryGui.gui(player);
-                            unlockSuccess(player, branchName);
-                        }
-                    }
-                    case "druidry" -> {
-                        if (hasMercenary || hasWizadry) {
-                            player.sendMessage(Text.translatable("gui.ygasi.branch.no.unlock"), true);
-                        } else {
-                            hasDrudiry = true;
-                            AdvUtils.grantAdvancementCriterion(player, new Identifier("minecraft", "ygasi/druidry"), "unlocked_druidry");
-                            DruidryGui.gui(player);
-                            unlockSuccess(player, branchName);
-                        }
+                final Map<String, Class<?>> BRANCH_TO_GUI = new HashMap<>() {{
+                    put("mercenary", MercenaryGui.class);
+                    put("wizardry", WizardryGui.class);
+                    put("druidry", DruidryGui.class);
+                }};
+
+                final Map<String, String> BRANCH_TO_ADVANCEMENT = new HashMap<>() {{
+                    put("mercenary", "unlocked_mercenary");
+                    put("wizardry", "unlocked_wizardry");
+                    put("druidry", "unlocked_druidry");
+                }};
+
+                Identifier advancementId = new Identifier("minecraft", "ygasi/" + branch);
+                String advancementCriterion = BRANCH_TO_ADVANCEMENT.get(branch);
+                Class<?> guiClass = BRANCH_TO_GUI.get(branch);
+                if (hasMercenary || hasWizadry || hasDrudiry) {
+                    player.sendMessage(Text.translatable("gui.ygasi.branch.no.unlock"), true);
+                    player.closeHandledScreen();
+                } else {
+                    AdvUtils.grantAdvancementCriterion(player, advancementId, advancementCriterion);
+                    unlockSuccess(player, branchName);
+                    try {
+                        Method guiMethod = guiClass.getMethod("gui", ServerPlayerEntity.class);
+                        guiMethod.invoke(null, player);
+                    } catch (Exception e) {
+                        e.printStackTrace();
                     }
                 }
-                player.closeHandledScreen();
+
             //if the player doesn't have enough skill points
             } else {
-                player.sendMessage(Text.translatable("gui.ygasi.branch.no.skill"), false);
+                player.sendMessage(Text.translatable("gui.ygasi.branch.no.skill"), true);
                 player.closeHandledScreen();
             }
         }
     }
     private static void unlockSuccess(ServerPlayerEntity player, String branchName) {
-        player.sendMessage(Text.translatable("gui.ygasi.branch.unlock", Text.translatable(branchName)), false);
+        player.playSound(SoundEvents.BLOCK_ENCHANTMENT_TABLE_USE, SoundCategory.PLAYERS, 1.0F, 1.0F);
+        player.sendMessage(Text.translatable("gui.ygasi.branch.unlock", Text.translatable(branchName)), true);
         //remove the spent skill points
         player.getStatHandler().setStat(player, Stats.CUSTOM.getOrCreateStat(SKILL_POINTS), player.getStatHandler().getStat(Stats.CUSTOM.getOrCreateStat(SKILL_POINTS)) - ConfigRegistry.CONFIG.branchCost);
     }
diff --git a/src/main/java/dev/mayaqq/ygasi/gui/ConfigGui.java b/src/main/java/dev/mayaqq/ygasi/gui/ConfigGui.java
index 74c1c5e..21934a8 100644
--- a/src/main/java/dev/mayaqq/ygasi/gui/ConfigGui.java
+++ b/src/main/java/dev/mayaqq/ygasi/gui/ConfigGui.java
@@ -11,6 +11,8 @@ import net.minecraft.sound.SoundCategory;
 import net.minecraft.sound.SoundEvent;
 import net.minecraft.text.Text;
 
+import java.lang.reflect.Field;
+
 import static dev.mayaqq.ygasi.Ygasi.click;
 
 public class ConfigGui {
@@ -57,6 +59,15 @@ public class ConfigGui {
         );
 
         gui.setSlot(3, new GuiElementBuilder()
+                .setItem(Items.RED_TERRACOTTA)
+                .setName(Text.translatable("config.ygasi.resetCost.title"))
+                .addLoreLine(Text.translatable("config.ygasi.current").append(Text.of(String.valueOf(ConfigRegistry.CONFIG.resetCost))))
+                .setCallback((index, clickType, actionType) -> {
+                    textInput(player, "resetCost");
+                })
+        );
+
+        gui.setSlot(4, new GuiElementBuilder()
                 .setItem(Items.STICK)
                 .setName(Text.translatable("config.ygasi.T1Cost.title"))
                 .addLoreLine(Text.translatable("config.ygasi.current").append(Text.of(String.valueOf(ConfigRegistry.CONFIG.T1Cost))))
@@ -65,7 +76,7 @@ public class ConfigGui {
                 })
         );
 
-        gui.setSlot(4, new GuiElementBuilder()
+        gui.setSlot(5, new GuiElementBuilder()
                 .setItem(Items.STICK)
                 .setCount(2)
                 .setName(Text.translatable("config.ygasi.T2Cost.title"))
@@ -75,7 +86,7 @@ public class ConfigGui {
                 })
         );
 
-        gui.setSlot(5, new GuiElementBuilder()
+        gui.setSlot(6, new GuiElementBuilder()
                 .setItem(Items.STICK)
                 .setCount(3)
                 .setName(Text.translatable("config.ygasi.T3Cost.title"))
@@ -94,42 +105,12 @@ public class ConfigGui {
             SignGui gui = new SignGui(player) {
                 @Override
                 public void onClose() {
-                    switch (option) {
-                        case "pointsRewarded" -> {
-                            try {
-                                ConfigRegistry.CONFIG.pointsRewarded = Integer.parseInt(this.getLine(0).getString());
-                            } catch (NumberFormatException e) {
-                                player.sendMessage(Text.translatable("config.ygasi.invalid.number"), true);
-                            }
-                        }
-                        case "branchCost" -> {
-                            try {
-                                ConfigRegistry.CONFIG.branchCost = Integer.parseInt(this.getLine(0).getString());
-                            } catch (NumberFormatException e) {
-                                player.sendMessage(Text.translatable("config.ygasi.invalid.number"), true);
-                            }
-                        }
-                        case "T1Cost" -> {
-                            try {
-                                ConfigRegistry.CONFIG.T1Cost = Integer.parseInt(this.getLine(0).getString());
-                            } catch (NumberFormatException e) {
-                                player.sendMessage(Text.translatable("config.ygasi.invalid.number"), true);
-                            }
-                        }
-                        case "T2Cost" -> {
-                            try {
-                                ConfigRegistry.CONFIG.T2Cost = Integer.parseInt(this.getLine(0).getString());
-                            } catch (NumberFormatException e) {
-                                player.sendMessage(Text.translatable("config.ygasi.invalid.number"), true);
-                            }
-                        }
-                        case "T3Cost" -> {
-                            try {
-                                ConfigRegistry.CONFIG.T3Cost = Integer.parseInt(this.getLine(0).getString());
-                            } catch (NumberFormatException e) {
-                                player.sendMessage(Text.translatable("config.ygasi.invalid.number"), true);
-                            }
-                        }
+                    try {
+                        Field field = ConfigRegistry.CONFIG.getClass().getDeclaredField(option);
+                        field.setAccessible(true);
+                        field.set(ConfigRegistry.CONFIG, Integer.parseInt(this.getLine(0).getString()));
+                    } catch (Exception e) {
+                        player.sendMessage(Text.translatable("config.ygasi.invalid.number"), true);
                     }
                     gui(player);
                 }
diff --git a/src/main/java/dev/mayaqq/ygasi/gui/DruidryGui.java b/src/main/java/dev/mayaqq/ygasi/gui/DruidryGui.java
index 7c3e0fd..d9896ae 100644
--- a/src/main/java/dev/mayaqq/ygasi/gui/DruidryGui.java
+++ b/src/main/java/dev/mayaqq/ygasi/gui/DruidryGui.java
@@ -1,5 +1,6 @@
 package dev.mayaqq.ygasi.gui;
 
+import dev.mayaqq.ygasi.gui.common.SkillGui;
 import dev.mayaqq.ygasi.util.AdvUtils;
 import eu.pb4.sgui.api.elements.GuiElementBuilder;
 import net.minecraft.item.Items;
diff --git a/src/main/java/dev/mayaqq/ygasi/gui/ExtraGui.java b/src/main/java/dev/mayaqq/ygasi/gui/ExtraGui.java
index 89905d7..2715952 100644
--- a/src/main/java/dev/mayaqq/ygasi/gui/ExtraGui.java
+++ b/src/main/java/dev/mayaqq/ygasi/gui/ExtraGui.java
@@ -1,5 +1,6 @@
 package dev.mayaqq.ygasi.gui;
 
+import dev.mayaqq.ygasi.gui.common.SkillGui;
 import dev.mayaqq.ygasi.util.AdvUtils;
 import eu.pb4.sgui.api.elements.GuiElementBuilder;
 import net.minecraft.item.Items;
diff --git a/src/main/java/dev/mayaqq/ygasi/gui/MercenaryGui.java b/src/main/java/dev/mayaqq/ygasi/gui/MercenaryGui.java
index 9eb0122..c88d2de 100644
--- a/src/main/java/dev/mayaqq/ygasi/gui/MercenaryGui.java
+++ b/src/main/java/dev/mayaqq/ygasi/gui/MercenaryGui.java
@@ -1,49 +1,86 @@
 package dev.mayaqq.ygasi.gui;
 
+import dev.mayaqq.ygasi.abilities.mercenary.*;
+import dev.mayaqq.ygasi.gui.common.GuiCommon;
+import dev.mayaqq.ygasi.gui.common.SkillGui;
+import dev.mayaqq.ygasi.registry.ConfigRegistry;
 import dev.mayaqq.ygasi.util.AdvUtils;
 import eu.pb4.sgui.api.elements.GuiElementBuilder;
 import net.minecraft.item.Items;
 import net.minecraft.screen.ScreenHandlerType;
 import net.minecraft.server.network.ServerPlayerEntity;
+import net.minecraft.sound.SoundCategory;
+import net.minecraft.sound.SoundEvents;
 import net.minecraft.stat.Stats;
 import net.minecraft.text.Text;
-import net.minecraft.util.Formatting;
 
 import static dev.mayaqq.ygasi.registry.StatRegistry.SKILL_POINTS;
 
 public class MercenaryGui {
     public static void gui(ServerPlayerEntity player) {
-        String title = Text.translatable("gui.ygasi.branch.mercenary.title").getString() + " " + Text.translatable("gui.ygasi.branch.title", player.getStatHandler().getStat(Stats.CUSTOM.getOrCreateStat(SKILL_POINTS))).formatted(Formatting.DARK_AQUA).getString();
+        String title = Text.translatable("gui.ygasi.branch.mercenary.title").getString() + " " + Text.translatable("gui.ygasi.branch.title", Text.of("§3" + player.getStatHandler().getStat(Stats.CUSTOM.getOrCreateStat(SKILL_POINTS)))).getString();
         try {
             if (!AdvUtils.getAdvancementProgress(player, "minecraft", "ygasi/mercenary")) {
-                player.sendMessage(Text.translatable("gui.ygasi.branches.fail"), false);
+                player.sendMessage(Text.translatable("gui.ygasi.branches.fail"), true);
                 BranchGui.gui(player);
             } else {
-                SkillGui gui = new SkillGui(ScreenHandlerType.GENERIC_9X6, player, false) {};
+                SkillGui gui = new SkillGui(ScreenHandlerType.GENERIC_9X6, player, false) {
+                    @Override
+                    public void onClose() {
+                        super.onClose();
+                        BranchGui.gui(player);
+                    }
+                };
 
                 gui.setTitle(Text.of(title));
                 //background items
-                for (int x = 0; x <= 53; x++) {
-                    gui.setSlot(x, new GuiElementBuilder()
-                            .setItem(Items.GRAY_STAINED_GLASS_PANE)
-                            .setName(Text.of(" "))
-                    );
-                }
+                GuiCommon.background(gui);
 
-                //skill items
                 gui.setSlot(49, new GuiElementBuilder()
                         .setItem(Items.DIAMOND_BLOCK)
                         .setName(Text.of("§c§lMercenary Unlocked!"))
                         .addLoreLine(Text.of("§3Skill Points: " + player.getStatHandler().getStat(Stats.CUSTOM.getOrCreateStat(SKILL_POINTS))))
                 );
 
-                if (!AdvUtils.getAdvancementProgress(player, "minecraft"