Move Acrobatics XP settings to experience.yml

src/main/java/com/gmail/nossr50/config/AdvancedConfig.java

@@ -76,18 +76,6 @@ public class AdvancedConfig extends AutoUpdateConfigLoader {
             reason.add("Skills.Acrobatics.GracefulRoll.DamageThreshold should be at least 0!");
         }
 
-        if (getDodgeXPModifier() < 0) {
-            reason.add("Skills.Acrobatics.Dodge_XP_Modifier should be at least 0!");
-        }
-
-        if (getRollXPModifier() < 0) {
-            reason.add("Skills.Acrobatics.Roll_XP_Modifier should be at least 0!");
-        }
-
-        if (getFallXPModifier() < 0) {
-            reason.add("Skills.Acrobatics.Fall_XP_Modifier should be at least 0!");
-        }
-
         /* ARCHERY */
         if (getSkillShotIncreaseLevel() < 1) {
             reason.add("Skills.Archery.SkillShot.IncreaseLevel should be at least 1!");
@@ -625,12 +613,6 @@ public class AdvancedConfig extends AutoUpdateConfigLoader {
     public int getGracefulRollMaxBonusLevel() { return config.getInt("Skills.Acrobatics.GracefulRoll.MaxBonusLevel", 500); }
     public double getGracefulRollDamageThreshold() { return config.getDouble("Skills.Acrobatics.GracefulRoll.DamageThreshold", 14.0D); }
 
-    public int getDodgeXPModifier() { return config.getInt("Skills.Acrobatics.Dodge_XP_Modifier", 120); }
-    public int getRollXPModifier() { return config.getInt("Skills.Acrobatics.Roll_XP_Modifier", 80); }
-    public int getFallXPModifier() { return config.getInt("Skills.Acrobatics.Fall_XP_Modifier", 120); }
-
-    public double getFeatherFallXPModifier() { return config.getDouble("Skills.Acrobatics.FeatherFall_Multiplier", 2.0); }
-
     /* ARCHERY */
     public int getSkillShotIncreaseLevel() { return config.getInt("Skills.Archery.SkillShot.IncreaseLevel", 50); }
     public double getSkillShotIncreasePercentage() { return config.getDouble("Skills.Archery.SkillShot.IncreasePercentage", 0.1D); }

src/main/java/com/gmail/nossr50/config/experience/ExperienceConfig.java

@@ -85,6 +85,18 @@ public class ExperienceConfig extends AutoUpdateConfigLoader {
             reason.add("Experience.Combat.Multiplier.Wither_Skeleton should be at least 0!");
         }
 
+        if (getDodgeXPModifier() < 0) {
+            reason.add("Skills.Acrobatics.Dodge_XP_Modifier should be at least 0!");
+        }
+
+        if (getRollXPModifier() < 0) {
+            reason.add("Skills.Acrobatics.Roll_XP_Modifier should be at least 0!");
+        }
+
+        if (getFallXPModifier() < 0) {
+            reason.add("Skills.Acrobatics.Fall_XP_Modifier should be at least 0!");
+        }
+
         /* Fishing */
         if (getFishingBaseXP() <= 0) {
             reason.add("Experience.Fishing.Base should be greater than 0!");
@@ -176,6 +188,13 @@ public class ExperienceConfig extends AutoUpdateConfigLoader {
     /* Materials  */
     public int getXp(SkillType skill, Material material) { return config.getInt("Experience." + StringUtils.getCapitalized(skill.toString()) + "." + StringUtils.getPrettyItemString(material).replace(" ", "_")); }
 
+    /* Acrobatics */
+    public int getDodgeXPModifier() { return config.getInt("Experience.Acrobatics.Dodge", 120); }
+    public int getRollXPModifier() { return config.getInt("Experience.Acrobatics.Roll", 80); }
+    public int getFallXPModifier() { return config.getInt("Experience.Acrobatics.Fall", 120); }
+
+    public double getFeatherFallXPModifier() { return config.getDouble("Experience.Acrobatics.FeatherFall_Multiplier", 2.0); }
+
     /* Fishing */
     public int getFishingBaseXP() { return config.getInt("Experience.Fishing.Base", 800); }
 

src/main/java/com/gmail/nossr50/skills/acrobatics/Acrobatics.java

@@ -2,6 +2,7 @@ package com.gmail.nossr50.skills.acrobatics;
 
 import com.gmail.nossr50.config.AdvancedConfig;
 import com.gmail.nossr50.config.Config;
+import com.gmail.nossr50.config.experience.ExperienceConfig;
 
 public final class Acrobatics {
     public static int    dodgeMaxBonusLevel  = AdvancedConfig.getInstance().getDodgeMaxBonusLevel();
@@ -16,11 +17,11 @@ public final class Acrobatics {
     public static double gracefulRollThreshold     = AdvancedConfig.getInstance().getGracefulRollDamageThreshold();
     public static double gracefulRollMaxChance     = AdvancedConfig.getInstance().getGracefulRollChanceMax();
 
-    public static int dodgeXpModifier = AdvancedConfig.getInstance().getDodgeXPModifier();
+    public static int dodgeXpModifier = ExperienceConfig.getInstance().getDodgeXPModifier();
-    public static int rollXpModifier  = AdvancedConfig.getInstance().getRollXPModifier();
+    public static int rollXpModifier  = ExperienceConfig.getInstance().getRollXPModifier();
-    public static int fallXpModifier  = AdvancedConfig.getInstance().getFallXPModifier();
+    public static int fallXpModifier  = ExperienceConfig.getInstance().getFallXPModifier();
 
-    public static double featherFallXPModifier = AdvancedConfig.getInstance().getFeatherFallXPModifier();
+    public static double featherFallXPModifier = ExperienceConfig.getInstance().getFeatherFallXPModifier();
 
     public static boolean afkLevelingDisabled    = Config.getInstance().getAcrobaticsAFKDisabled();
     public static boolean dodgeLightningDisabled = Config.getInstance().getDodgeLightningDisabled();

src/main/resources/advanced.yml

@@ -47,14 +47,6 @@ Skills:
             ChanceMax: 100.0
             MaxBonusLevel: 500
             DamageThreshold: 14.0
-
-        # Amount of experience for performing a dodge, roll or fall
-        Dodge_XP_Modifier: 120
-        Roll_XP_Modifier: 80
-        Fall_XP_Modifier: 120
-
-        # FeatherFall_Multiplier: Multiply Acrobatics XP by this value when wearing boots with the Feather Fall enchant
-        FeatherFall_Multiplier: 2.0
     #
     #  Settings for Archery
     ###

src/main/resources/experience.yml

@@ -66,6 +66,13 @@ Conversion:
 Experience:
     PVP:
         Rewards: true
+    Acrobatics:
+        Dodge: 120
+        Roll: 80
+        Fall: 120
+
+        # FeatherFall_Multiplier: Multiply Acrobatics XP by this value when wearing boots with the Feather Fall enchant
+        FeatherFall_Multiplier: 2.0
     Fishing:
         Base: 800
     Excavation: