From 89a5ae404b2e99506d619b6773a305ede13b9bd3 Mon Sep 17 00:00:00 2001
From: Archy-X <archydevelopment@gmail.com>
Date: Thu, 16 May 2024 17:06:57 -0700
Subject: [PATCH] Only update menu files with specifically added keys

---
 .../bukkit/menus/MenuFileManager.java         |  45 ++-
 .../bukkit/menus/MenuFileUpdates.java         |  52 +++
 .../resources/menus/level_progression.yml     | 303 ++++++++++--------
 bukkit/src/main/resources/menus/skills.yml    | 173 ++++++----
 4 files changed, 375 insertions(+), 198 deletions(-)
 create mode 100644 bukkit/src/main/java/dev/aurelium/auraskills/bukkit/menus/MenuFileUpdates.java

diff --git a/bukkit/src/main/java/dev/aurelium/auraskills/bukkit/menus/MenuFileManager.java b/bukkit/src/main/java/dev/aurelium/auraskills/bukkit/menus/MenuFileManager.java
index e37fa9c86..8a3ac8658 100644
--- a/bukkit/src/main/java/dev/aurelium/auraskills/bukkit/menus/MenuFileManager.java
+++ b/bukkit/src/main/java/dev/aurelium/auraskills/bukkit/menus/MenuFileManager.java
@@ -11,6 +11,8 @@
 
 import java.io.File;
 import java.io.IOException;
+import java.util.ArrayList;
+import java.util.List;
 
 public class MenuFileManager {
 
@@ -50,7 +52,7 @@ public void updateMenus() {
                 ConfigurationNode embeddedConfig = FileUtil.loadEmbeddedYamlFile("menus/" + menuName + ".yml", plugin);
                 ConfigurationNode userConfig = FileUtil.loadYamlFile(userFile);
 
-                updateAndSave(embeddedConfig, userConfig, userFile);
+                updateAndSave(menuName, embeddedConfig, userConfig, userFile);
             } catch (IOException e) {
                 plugin.logger().warn("Error updating menu file " + userFile.getName());
                 e.printStackTrace();
@@ -58,16 +60,35 @@ public void updateMenus() {
         }
     }
 
-    private void updateAndSave(ConfigurationNode embedded, ConfigurationNode user, File userFile) throws SerializationException {
-        int changed = 0;
-        changed += updateConfigSection("items", embedded, user);
-        changed += updateConfigSection("templates", embedded, user);
-        changed += updateConfigSection("components", embedded, user);
-        changed += updateStringSection("formats", embedded, user);
+    private void updateAndSave(String menuName, ConfigurationNode embedded, ConfigurationNode user, File userFile) throws SerializationException {
+        // Files that don't have updating enabled yet, since they haven't had changes
+        if (embedded.node("file_version").virtual()) return;
+
+        int embVersion = embedded.node("file_version").getInt();
+        int userVersion = user.node("file_version").getInt(0);
 
-        if (changed <= 0) {
+        // User file is already up-to-date
+        if (userVersion >= embVersion) {
             return;
         }
+
+        List<MenuFileUpdates> updates = MenuFileUpdates.getUpdates(menuName, userVersion, embVersion);
+        if (updates.isEmpty()) return;
+
+        int changed = 0;
+        for (MenuFileUpdates update : updates) {
+            List<String> addedItems = update.getAddedKeys().getOrDefault("items", new ArrayList<>());
+            changed += updateConfigSection("items", embedded, user, addedItems);
+            List<String> addedTemplates = update.getAddedKeys().getOrDefault("templates", new ArrayList<>());
+            changed += updateConfigSection("templates", embedded, user, addedTemplates);
+            List<String> addedComponents = update.getAddedKeys().getOrDefault("components", new ArrayList<>());
+            changed += updateConfigSection("components", embedded, user, addedComponents);
+            List<String> addedFormats = update.getAddedKeys().getOrDefault("formats", new ArrayList<>());
+            changed += updateStringSection("formats", embedded, user, addedFormats);
+        }
+
+        user.node("file_version").set(embVersion);
+
         try {
             YamlConfigurationLoader loader = YamlConfigurationLoader.builder()
                     .file(userFile)
@@ -83,12 +104,14 @@ private void updateAndSave(ConfigurationNode embedded, ConfigurationNode user, F
         }
     }
 
-    private int updateConfigSection(String name, ConfigurationNode embedded, ConfigurationNode user) throws SerializationException {
+    private int updateConfigSection(String name, ConfigurationNode embedded, ConfigurationNode user, List<String> keys) throws SerializationException {
+        if (keys.isEmpty()) return 0;
         int changed = 0;
         if (!embedded.node(name).virtual() && !user.node(name).virtual()) {
             for (ConfigurationNode embSec : embedded.node(name).childrenMap().values()) {
                 String key = (String) embSec.key();
                 if (key == null) continue;
+                if (!keys.contains(key)) continue; // Only update sections passed in the keys list
                 if (!embSec.isMap()) continue;
                 // User file does not have embedded key
                 if (user.node(name).node(key).virtual()) {
@@ -100,12 +123,14 @@ private int updateConfigSection(String name, ConfigurationNode embedded, Configu
         return changed;
     }
 
-    private int updateStringSection(String name, ConfigurationNode embedded, ConfigurationNode user) throws SerializationException {
+    private int updateStringSection(String name, ConfigurationNode embedded, ConfigurationNode user, List<String> keys) throws SerializationException {
+        if (keys.isEmpty()) return 0;
         int changed = 0;
         if (!embedded.node(name).virtual() && !user.node(name).virtual()) {
             for (ConfigurationNode embSec : embedded.node(name).childrenMap().values()) {
                 String key = (String) embSec.key();
                 if (key == null) continue;
+                if (!keys.contains(key)) continue;
 
                 String value = embSec.getString();
                 if (value == null) continue;
diff --git a/bukkit/src/main/java/dev/aurelium/auraskills/bukkit/menus/MenuFileUpdates.java b/bukkit/src/main/java/dev/aurelium/auraskills/bukkit/menus/MenuFileUpdates.java
new file mode 100644
index 000000000..480220137
--- /dev/null
+++ b/bukkit/src/main/java/dev/aurelium/auraskills/bukkit/menus/MenuFileUpdates.java
@@ -0,0 +1,52 @@
+package dev.aurelium.auraskills.bukkit.menus;
+
+import java.util.ArrayList;
+import java.util.Comparator;
+import java.util.List;
+import java.util.Map;
+
+public enum MenuFileUpdates {
+
+    SKILLS_1("skills", 1, Map.of(
+            "components", List.of("skill_job_active"))),
+    LEVEL_PROGRESSION_1("level_progression", 1, Map.of(
+            "items", List.of("job"),
+            "components", List.of("job_select", "job_active", "job_limit")));
+
+    private final String menu;
+    private final int version;
+    private final Map<String, List<String>> addedKeys;
+
+    MenuFileUpdates(String menu, int version, Map<String, List<String>> addedKeys) {
+        this.menu = menu;
+        this.version = version;
+        this.addedKeys = addedKeys;
+    }
+
+    public String getMenu() {
+        return menu;
+    }
+
+    public int getVersion() {
+        return version;
+    }
+
+    public Map<String, List<String>> getAddedKeys() {
+        return addedKeys;
+    }
+
+    public static List<MenuFileUpdates> getUpdates(String menu, int currentVersion, int updatedVersion) {
+        List<MenuFileUpdates> updates = new ArrayList<>();
+        for (MenuFileUpdates update : MenuFileUpdates.values()) {
+            if (!update.getMenu().equals(menu)) continue;
+
+            if (update.getVersion() > currentVersion && update.getVersion() <= updatedVersion) {
+                updates.add(update);
+            }
+        }
+        // Sort by increasing version
+        updates.sort(Comparator.comparingInt(MenuFileUpdates::getVersion));
+        return updates;
+    }
+
+}
diff --git a/bukkit/src/main/resources/menus/level_progression.yml b/bukkit/src/main/resources/menus/level_progression.yml
index 1dc1428c1..783f4d754 100644
--- a/bukkit/src/main/resources/menus/level_progression.yml
+++ b/bukkit/src/main/resources/menus/level_progression.yml
@@ -9,22 +9,22 @@ items:
     material: paper
     display_name: '<gold>{{your_ranking}}'
     lore:
-      - text: '{{rank_out_of}}'
-        styles:
-          1: '<white>'
-          2: '<gold>'
-      - text: '{{rank_percent}}'
-        styles:
-          1: '<white>'
-          2: '<gold>'
-      - ' '
-      - '<yellow>{{leaderboard_click}}'
+    - text: '{{rank_out_of}}'
+      styles:
+        1: '<white>'
+        2: '<gold>'
+    - text: '{{rank_percent}}'
+      styles:
+        1: '<white>'
+        2: '<gold>'
+    - ' '
+    - '<yellow>{{leaderboard_click}}'
   back:
     pos: 5,0
     material: arrow
     display_name: '<green>{{back}}'
     lore:
-      - '<gray>{{back_click}}'
+    - '<gray>{{back_click}}'
   close:
     pos: 5,1
     material: barrier
@@ -34,203 +34,237 @@ items:
     material: arrow
     display_name: '<gold>{{next_page}}'
     lore:
-      - '<yellow>{{next_page_click}}'
+    - '<yellow>{{next_page_click}}'
   previous_page:
     pos: 5,7
     material: arrow
     display_name: '<gold>{{previous_page}}'
     lore:
-      - '<yellow>{{previous_page_click}}'
+    - '<yellow>{{previous_page_click}}'
   sources:
     pos: 0,2
     material: experience_bottle
     display_name: '<green>{{sources}}'
     lore:
-      - text: '{{sources_desc}}'
-        wrap: true
-        style: '<gray>'
-      - ' '
-      - '<yellow>{{sources_click}}'
+    - text: '{{sources_desc}}'
+      wrap: true
+      style: '<gray>'
+    - ' '
+    - '<yellow>{{sources_click}}'
   abilities:
     pos: 0,3
     material: light_blue_dye
     display_name: '<red>{{abilities}}'
     lore:
-      - text: '{{abilities_desc}} {{mana_abilities_desc}}'
-        wrap: true
-        wrap_style: 1
-        styles:
-          1: '<gray>'
-          2: '<aqua>'
-          3: '<light_purple>'
-      - ' '
-      - '<yellow>{{abilities_click}}'
+    - text: '{{abilities_desc}} {{mana_abilities_desc}}'
+      wrap: true
+      wrap_style: 1
+      styles:
+        1: '<gray>'
+        2: '<aqua>'
+        3: '<light_purple>'
+    - ' '
+    - '<yellow>{{abilities_click}}'
   job:
     pos: 0,4
     material: gold_ingot
     display_name: '<yellow>{{job}}'
     lore:
-      - text: '{{job_desc}}'
-        wrap: true
-        style: '<gray>'
-      - ' '
-      - component: job_select
-      - component: job_active
-      - component: job_limit
+    - text: '{{job_desc}}'
+      wrap: true
+      style: '<gray>'
+    - ' '
+    - component: job_select
+    - component: job_active
+    - component: job_limit
 templates:
   skill:
     pos: 0,0
     contexts:
-      farming: {material: diamond_hoe, flags: [hide_attributes]}
-      foraging: {material: stone_axe, flags: [hide_attributes]}
-      mining: {material: iron_pickaxe, flags: [hide_attributes]}
-      fishing: {material: fishing_rod}
-      excavation: {material: golden_shovel, flags: [hide_attributes]}
-      archery: {material: bow}
-      defense: {material: chainmail_chestplate, flags: [hide_attributes]}
-      fighting: {material: diamond_sword, flags: [hide_attributes]}
-      endurance: {material: golden_apple}
-      agility: {material: feather}
-      alchemy: {material: potion, potion_data: {type: instant_heal}, flags: [hide_potion_effects]}
-      enchanting: {material: enchanting_table}
-      sorcery: {material: blaze_rod}
-      healing: {material: splash_potion, potion_data: {type: instant_heal}, flags: [hide_potion_effects]}
-      forging: {material: anvil}
+      farming:
+        material: iron_hoe
+        flags:
+        - hide_attributes
+      foraging:
+        material: iron_axe
+        flags:
+        - hide_attributes
+      mining:
+        material: iron_pickaxe
+        flags:
+        - hide_attributes
+      fishing:
+        material: fishing_rod
+      excavation:
+        material: iron_shovel
+        flags:
+        - hide_attributes
+      archery:
+        material: bow
+      defense:
+        material: chainmail_chestplate
+        flags:
+        - hide_attributes
+      fighting:
+        material: iron_sword
+        flags:
+        - hide_attributes
+      endurance:
+        material: golden_apple
+      agility:
+        material: feather
+      alchemy:
+        material: potion
+        potion_data:
+          type: regen
+        flags:
+        - hide_potion_effects
+      enchanting:
+        material: enchanting_table
+      sorcery:
+        material: blaze_rod
+      healing:
+        material: splash_potion
+        potion_data:
+          type: instant_heal
+        flags: hide_potion_effects
+      forging:
+        material: anvil
     display_name: '<aqua>{skill} <dark_aqua>{level}'
     lore:
-      - text: '{desc}'
-        wrap: true
-        style: '<gray>'
-      - component: stats_leveled
-      - component: ability_levels
-      - component: mana_ability_info
-      - ' '
-      - component: progress
-      - component: max_level
+    - text: '{desc}'
+      wrap: true
+      style: '<gray>'
+    - component: stats_leveled
+    - component: ability_levels
+    - component: mana_ability_info
+    - ' '
+    - component: progress
+    - component: max_level
   unlocked:
     material: lime_stained_glass_pane
     display_name: '<green>{{level}} {level}'
     lore:
-      - '<gray>{{level}} <white>{level}'
-      - component: rewards
-      - component: ability_unlock
-      - component: ability_level
-      - component: mana_ability_unlock
-      - component: mana_ability_level
-      - ' '
-      - '<green>{{unlocked}}'
+    - '<gray>{{level}} <white>{level}'
+    - component: rewards
+    - component: ability_unlock
+    - component: ability_level
+    - component: mana_ability_unlock
+    - component: mana_ability_level
+    - ' '
+    - '<green>{{unlocked}}'
   in_progress:
     material: yellow_stained_glass_pane
     display_name: '<yellow>{{level}} {level}'
     lore:
-      - '<gray>{{level}} <white>{level}'
-      - component: rewards
-      - component: ability_unlock
-      - component: ability_level
-      - component: mana_ability_unlock
-      - component: mana_ability_level
-      - ' '
-      - '<gray>{{progress}}: <yellow>{percent}%'
-      - '{bar}'
-      - '<gray>{current_xp}/{level_xp} {xp_unit}'
-      - ' '
-      - '<yellow>{{in_progress}}'
+    - '<gray>{{level}} <white>{level}'
+    - component: rewards
+    - component: ability_unlock
+    - component: ability_level
+    - component: mana_ability_unlock
+    - component: mana_ability_level
+    - ' '
+    - '<gray>{{progress}}: <yellow>{percent}%'
+    - '{bar}'
+    - '<gray>{current_xp}/{level_xp} {xp_unit}'
+    - ' '
+    - '<yellow>{{in_progress}}'
   locked:
     material: red_stained_glass_pane
     display_name: '<red>{{level}} {level}'
     lore:
-      - '<gray>{{level}} <white>{level}'
-      - component: rewards
-      - component: ability_unlock
-      - component: ability_level
-      - component: mana_ability_unlock
-      - component: mana_ability_level
-      - ' '
-      - '<red>{{locked}}'
+    - '<gray>{{level}} <white>{level}'
+    - component: rewards
+    - component: ability_unlock
+    - component: ability_level
+    - component: mana_ability_unlock
+    - component: mana_ability_level
+    - ' '
+    - '<red>{{locked}}'
 components:
   stats_leveled:
     context: Skill
     lore:
-      - ' '
-      - '<gray>{{stats_leveled}}: {entries[<gray>, ]}'
+    - ' '
+    - '<gray>{{stats_leveled}}: {entries[<gray>, ]}'
   ability_levels:
     context: Skill
     lore:
-      - ' '
-      - '<gray>{{ability_levels}}: {entries[]}'
+    - ' '
+    - '<gray>{{ability_levels}}: {entries[]}'
   mana_ability_info:
     context: Skill
     lore:
-      - ' '
-      - '<light_purple><bold>{{mana_ability}}</bold> <blue>{name} {level}'
-      - '  {entries[\n  ](3)}'
+    - ' '
+    - '<light_purple><bold>{{mana_ability}}</bold> <blue>{name} {level}'
+    - '  {entries[\n  ](3)}'
   progress:
     context: Skill
     lore:
-      - '<gray>{{progress_to_level}} {next_level}: <yellow>{percent}%'
-      - '{bar}'
-      - '<gray>{current_xp}/{level_xp} {xp_unit}'
+    - '<gray>{{progress_to_level}} {next_level}: <yellow>{percent}%'
+    - '{bar}'
+    - '<gray>{current_xp}/{level_xp} {xp_unit}'
   max_level:
     context: Skill
     lore:
-      - '<gold>{{max_level}}'
+    - '<gold>{{max_level}}'
   rewards:
     context: Integer
     lore:
-      - '<gray>{{rewards}}: {entries[]}'
+    - '<gray>{{rewards}}: {entries[]}'
   ability_unlock:
     context: Integer
     lore:
-      - ' '
-      - '<gold>{name} <green><bold>{{ability_unlock}}'
-      - text: '{desc}'
-        wrap: true
-        wrap_indent: '  '
-        style: '<gray>'
+    - ' '
+    - '<gold>{name} <green><bold>{{ability_unlock}}'
+    - text: '{desc}'
+      wrap: true
+      wrap_indent: '  '
+      style: '<gray>'
   ability_level:
     context: Integer
     lore:
-      - ' '
-      - '<gold>{name} {level}'
-      - text: '{desc}'
-        wrap: true
-        wrap_indent: '  '
-        style: '<gray>'
+    - ' '
+    - '<gold>{name} {level}'
+    - text: '{desc}'
+      wrap: true
+      wrap_indent: '  '
+      style: '<gray>'
   mana_ability_unlock:
     context: Integer
     lore:
-      - ' '
-      - '<blue>{name} <light_purple><bold>{{mana_ability_unlock}}'
-      - text: '{desc}'
-        wrap: true
-        wrap_indent: '  '
-        styles:
-          0: '<gray>'
-          1: '<yellow>'
+    - ' '
+    - '<blue>{name} <light_purple><bold>{{mana_ability_unlock}}'
+    - text: '{desc}'
+      wrap: true
+      wrap_indent: '  '
+      styles:
+        0: '<gray>'
+        1: '<yellow>'
   mana_ability_level:
     context: Integer
     lore:
-      - ' '
-      - '<blue>{name} {level}'
-      - text: '{desc}'
-        wrap: true
-        wrap_indent: '  '
-        styles:
-          0: '<gray>'
-          1: '<yellow>'
+    - ' '
+    - '<blue>{name} {level}'
+    - text: '{desc}'
+      wrap: true
+      wrap_indent: '  '
+      styles:
+        0: '<gray>'
+        1: '<yellow>'
   job_select:
     lore:
-      - '<yellow>{{job_select}}'
+    - '<yellow>{{job_select}}'
   job_active:
     lore:
-      - '<green>{{job_active}}'
-      - ' '
-      - '<red>{{job_quit}}'
+    - '<green>{{job_active}}'
+    - ' '
+    - '<red>{{job_quit}}'
   job_limit:
     lore:
-      - text: '{{job_limit}}'
-        wrap: true
-        style: '<red>'
+    - text: '{{job_limit}}'
+      wrap: true
+      style: '<red>'
 formats:
   stat_leveled_entry: '{color}{stat}<gray>'
   unlocked_ability_entry: '\n  <gold>{name} {level} <dark_gray>({info})'
@@ -249,4 +283,5 @@ options:
   over_max_stack_amount: 1
   items_per_page: 24
   start_level: 1
-  track: [9, 18, 27, 36, 37, 38, 29, 20, 11, 12, 13, 22, 31, 40, 41, 42, 33, 24, 15, 16, 17, 26, 35, 44]
\ No newline at end of file
+  track: [9, 18, 27, 36, 37, 38, 29, 20, 11, 12, 13, 22, 31, 40, 41, 42, 33, 24, 15, 16, 17, 26, 35, 44]
+file_version: 1
\ No newline at end of file
diff --git a/bukkit/src/main/resources/menus/skills.yml b/bukkit/src/main/resources/menus/skills.yml
index f92fd4476..515bc260d 100644
--- a/bukkit/src/main/resources/menus/skills.yml
+++ b/bukkit/src/main/resources/menus/skills.yml
@@ -11,16 +11,16 @@ items:
       base64: eyJ0ZXh0dXJlcyI6eyJTS0lOIjp7InVybCI6Imh0dHA6Ly90ZXh0dXJlcy5taW5lY3JhZnQubmV0L3RleHR1cmUvMjcwNWZkOTRhMGM0MzE5MjdmYjRlNjM5YjBmY2ZiNDk3MTdlNDEyMjg1YTAyYjQzOWUwMTEyZGEyMmIyZTJlYyJ9fX0=
     display_name: '<aqua>{{your_skills}} - <gold>{player}'
     lore:
-      - text: '{{your_skills_desc}}'
-        wrap: true
-        style: '<gray>'
-      - ' '
-      - text: '{{your_skills_hover}}'
-        wrap: true
-        style: '<yellow>'
-      - text: '{{your_skills_click}}'
-        wrap: true
-        style: '<yellow>'
+    - text: '{{your_skills_desc}}'
+      wrap: true
+      style: '<gray>'
+    - ' '
+    - text: '{{your_skills_hover}}'
+      wrap: true
+      style: '<yellow>'
+    - text: '{{your_skills_click}}'
+      wrap: true
+      style: '<yellow>'
   close:
     pos: 4,8
     material: barrier
@@ -30,27 +30,91 @@ items:
     material: player_head
     display_name: '<aqua>{{stats}}'
     lore:
-      - '<gray>{{stats_desc}}'
-      - ' '
-      - '<yellow>{{stats_click}}'
+    - '<gray>{{stats_desc}}'
+    - ' '
+    - '<yellow>{{stats_click}}'
 templates:
   skill:
     contexts:
-      archery: { group: first_row, order: 1, material: bow }
-      fighting: { group: first_row, order: 2, material: iron_sword, flags: [ hide_attributes ] }
-      defense: { group: first_row, order: 3, material: chainmail_chestplate, flags: [ hide_attributes ] }
-      endurance: {group: first_row, order: 4, material: golden_apple}
-      farming: {group: second_row, order: 1, material: iron_hoe, flags: [hide_attributes]}
-      foraging: {group: second_row, order: 2, material: iron_axe, flags: [hide_attributes]}
-      mining: {group: second_row, order: 3, material: iron_pickaxe, flags: [hide_attributes]}
-      fishing: {group: second_row, order: 4, material: fishing_rod}
-      excavation: {group: second_row, order: 5, material: iron_shovel, flags: [hide_attributes]}
-      agility: {group: third_row, order: 1, material: feather}
-      alchemy: {group: third_row, order: 2, material: potion, potion_data: {type: regen}, flags: [hide_potion_effects]}
-      enchanting: {group: third_row, order: 3, material: enchanting_table}
-      sorcery: {group: third_row, order: 4, material: blaze_rod}
-      healing: {group: third_row, order: 5, material: splash_potion, potion_data: {type: instant_heal}, flags: [hide_potion_effects]}
-      forging: {group: third_row, order: 6, material: anvil}
+      archery:
+        group: first_row
+        order: 1
+        material: bow
+      fighting:
+        group: first_row
+        order: 2
+        material: iron_sword
+        flags:
+          - hide_attributes
+      defense:
+        group: first_row
+        order: 3
+        material: chainmail_chestplate
+        flags: hide_attributes
+      endurance:
+        group: first_row
+        order: 4
+        material: golden_apple
+      farming:
+        group: second_row
+        order: 1
+        material: iron_hoe
+        flags:
+          - hide_attributes
+      foraging:
+        group: second_row
+        order: 2
+        material: iron_axe
+        flags:
+          - hide_attributes
+      mining:
+        group: second_row
+        order: 3
+        material: iron_pickaxe
+        flags:
+          - hide_attributes
+      fishing:
+        group: second_row
+        order: 4
+        material: fishing_rod
+      excavation:
+        group: second_row
+        order: 5
+        material: iron_shovel
+        flags:
+          - hide_attributes
+      agility:
+        group: third_row
+        order: 1
+        material: feather
+      alchemy:
+        group: third_row
+        order: 2
+        material: potion
+        potion_data:
+          type: regen
+        flags:
+          - hide_potion_effects
+      enchanting:
+        group: third_row
+        order: 3
+        material: enchanting_table
+      sorcery:
+        group: third_row
+        order: 4
+        material: blaze_rod
+      healing:
+        group: third_row
+        order: 5
+        material: splash_potion
+        potion_data:
+          type: instant_heal
+        flags:
+          - hide_potion_effects
+      forging:
+        group: third_row
+        order: 6
+        material: anvil
     groups:
       first_row:
         start: 1,0
@@ -66,50 +130,50 @@ templates:
         align: center
     display_name: '<aqua>{skill} <dark_aqua>{level}'
     lore:
-      - text: '{desc}'
-        wrap: true
-        style: '<gray>'
-      - component: stats_leveled
-      - component: ability_levels
-      - component: mana_ability_info
-      - ' '
-      - component: progress
-      - component: max_level
-      - component: skill_job_active
-      - ' '
-      - '<yellow>{{skill_click}}'
+    - text: '{desc}'
+      wrap: true
+      style: '<gray>'
+    - component: stats_leveled
+    - component: ability_levels
+    - component: mana_ability_info
+    - ' '
+    - component: progress
+    - component: max_level
+    - component: skill_job_active
+    - ' '
+    - '<yellow>{{skill_click}}'
 components:
   stats_leveled:
     context: Skill
     lore:
-      - ' '
-      - '<gray>{{stats_leveled}}: {entries[<gray>, ]}'
+    - ' '
+    - '<gray>{{stats_leveled}}: {entries[<gray>, ]}'
   ability_levels:
     context: Skill
     lore:
-      - ' '
-      - '<gray>{{ability_levels}}: {entries[]}'
+    - ' '
+    - '<gray>{{ability_levels}}: {entries[]}'
   mana_ability_info:
     context: Skill
     lore:
-      - ' '
-      - '<light_purple><bold>{{mana_ability}}</bold> <blue>{name} {level}'
-      - '  {entries[\n  ](3)}'
+    - ' '
+    - '<light_purple><bold>{{mana_ability}}</bold> <blue>{name} {level}'
+    - '  {entries[\n  ](3)}'
   progress:
     context: Skill
     lore:
-      - '<gray>{{progress_to_level}} {next_level}: <yellow>{percent}%'
-      - '{bar}'
-      - '<gray>{current_xp}/{level_xp} {xp_unit}'
+    - '<gray>{{progress_to_level}} {next_level}: <yellow>{percent}%'
+    - '{bar}'
+    - '<gray>{current_xp}/{level_xp} {xp_unit}'
   max_level:
     context: Skill
     lore:
-      - '<gold>{{max_level}}'
+    - '<gold>{{max_level}}'
   skill_job_active:
     context: Skill
     lore:
-      - ' '
-      - '<dark_gray>▶ <green>{{active_job}}'
+    - ' '
+    - '<dark_gray>▶ <green>{{active_job}}'
 formats:
   stat_leveled_entry: '{color}{stat}<gray>'
   unlocked_ability_entry: '\n  <gold>{name} {level} <dark_gray>({info})'
@@ -125,4 +189,5 @@ formats:
   bar_current: '<yellow>■'
   bar_remaining: '<gray>■'
 options:
-  bar_length: 20
\ No newline at end of file
+  bar_length: 20
+file_version: 1
\ No newline at end of file