Code cleanup part 1

src/main/java/com/gmail/nossr50/commands/XprateCommand.java

@@ -1,5 +1,7 @@
 package com.gmail.nossr50.commands;
 
+import com.gmail.nossr50.config.AdvancedConfig;
+import com.gmail.nossr50.config.experience.ExperienceConfig;
 import com.gmail.nossr50.locale.LocaleLoader;
 import com.gmail.nossr50.mcMMO;
 import com.gmail.nossr50.util.Permissions;

src/main/java/com/gmail/nossr50/commands/skills/AprilCommand.java

@@ -1,203 +0,0 @@
-package com.gmail.nossr50.commands.skills;
-
-import com.gmail.nossr50.locale.LocaleLoader;
-import com.gmail.nossr50.util.HolidayManager.FakeSkillType;
-import com.gmail.nossr50.util.Misc;
-import com.gmail.nossr50.util.StringUtils;
-import com.gmail.nossr50.util.commands.CommandUtils;
-import com.google.common.collect.ImmutableList;
-import org.bukkit.command.Command;
-import org.bukkit.command.CommandSender;
-import org.bukkit.command.TabExecutor;
-import org.bukkit.entity.Player;
-
-import java.text.DecimalFormat;
-import java.util.ArrayList;
-import java.util.List;
-
-public class AprilCommand implements TabExecutor {
-    private String skillName;
-
-    protected DecimalFormat percent = new DecimalFormat("##0.00%");
-    protected DecimalFormat decimal = new DecimalFormat("##0.00");
-
-    @Override
-    public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
-        if (CommandUtils.noConsoleUsage(sender)) {
-            return true;
-        }
-
-        skillName = StringUtils.getCapitalized(label);
-
-        switch (args.length) {
-            case 0:
-                Player player = (Player) sender;
-                FakeSkillType fakeSkillType = FakeSkillType.getByName(skillName);
-
-                float skillValue = Misc.getRandom().nextInt(99);
-
-                player.sendMessage(LocaleLoader.getString("Skills.Header", skillName));
-                player.sendMessage(LocaleLoader.getString("Commands.XPGain", getXPGainString(fakeSkillType)));
-                player.sendMessage(LocaleLoader.getString("Effects.Level", (int) skillValue, Misc.getRandom().nextInt(1000), 1000 + Misc.getRandom().nextInt(1000)));
-
-
-                List<String> effectMessages = effectsDisplay(fakeSkillType);
-
-                if (!effectMessages.isEmpty()) {
-                    player.sendMessage(LocaleLoader.getString("Skills.Header", LocaleLoader.getString("Effects.Effects")));
-
-                    for (String message : effectMessages) {
-                        player.sendMessage(message);
-                    }
-                }
-
-                List<String> statsMessages = statsDisplay(fakeSkillType);
-
-                if (!statsMessages.isEmpty()) {
-                    player.sendMessage(LocaleLoader.getString("Skills.Header", LocaleLoader.getString("Commands.Stats.Self")));
-
-                    for (String message : statsMessages) {
-                        player.sendMessage(message);
-                    }
-                }
-
-                player.sendMessage(LocaleLoader.formatString("[[DARK_AQUA]]Guide for {0} available - type /APRIL FOOLS ! :D", skillName));
-                return true;
-
-            default:
-                return true;
-        }
-    }
-
-    private String getXPGainString(FakeSkillType fakeSkillType) {
-        switch (fakeSkillType) {
-            case MACHO:
-                return "Get beaten up";
-            case JUMPING:
-                return "Kris Kross will make ya Jump Jump";
-            case THROWING:
-                return "Chuck your items on the floor";
-            case WRECKING:
-                return "I'M GONNA WRECK IT!";
-            case CRAFTING:
-                return "Craft apple pies";
-            case WALKING:
-                return "Walk around the park";
-            case SWIMMING:
-                return "Like a fish on a bicycle";
-            case FALLING:
-                return "Faceplant the floor, headbutt the ground";
-            case CLIMBING:
-                return "Climb the highest mountain";
-            case FLYING:
-                return "I believe I can fly";
-            case DIVING:
-                return "Scuba club 4000";
-            case PIGGY:
-                return "OINK! OINK!";
-            default:
-                return "Sit and wait?";
-        }
-    }
-
-    @Override
-    public List<String> onTabComplete(CommandSender sender, Command command, String alias, String[] args) {
-        switch (args.length) {
-            case 1:
-                return ImmutableList.of("?");
-            default:
-                return ImmutableList.of();
-        }
-    }
-
-    private List<String> effectsDisplay(FakeSkillType fakeSkillType) {
-        List<String> messages = new ArrayList<String>();
-
-        switch (fakeSkillType) {
-            case MACHO:
-                messages.add(LocaleLoader.getString("Effects.Template", "Punching bag", "Absorb damage, like a bag of sand"));
-                break;
-            case JUMPING:
-                messages.add(LocaleLoader.getString("Effects.Template", "Jump", "PRESS SPACE TO JUMP"));
-                messages.add(LocaleLoader.getString("Effects.Template", "Jump Twice", "PRESS SPACE TWICE TO JUMP TWICE"));
-                break;
-            case THROWING:
-                messages.add(LocaleLoader.getString("Effects.Template", "Drop Item", "Randomly drop items, at random"));
-                break;
-            case WRECKING:
-                messages.add(LocaleLoader.getString("Effects.Template", "Ralphinator", "Smash windows with your fists"));
-                break;
-            case CRAFTING:
-                messages.add(LocaleLoader.getString("Effects.Template", "Crafting", "Chance of successful craft"));
-                break;
-            case WALKING:
-                messages.add(LocaleLoader.getString("Effects.Template", "Walk", "Traveling gracefully by foot"));
-                break;
-            case SWIMMING:
-                messages.add(LocaleLoader.getString("Effects.Template", "Swim", "Just keep swimming, swimming, swimming"));
-                break;
-            case FALLING:
-                messages.add(LocaleLoader.getString("Effects.Template", "Skydiving", "Go jump of a cliff. No, seriously."));
-                break;
-            case CLIMBING:
-                messages.add(LocaleLoader.getString("Effects.Template", "Rock Climber", "Use string to climb mountains faster"));
-                break;
-            case FLYING:
-                messages.add(LocaleLoader.getString("Effects.Template", "Fly", "Throw yourself at the ground and miss"));
-                break;
-            case DIVING:
-                messages.add(LocaleLoader.getString("Effects.Template", "Hold Breath", "Press shift to hold your breath longer"));
-                break;
-            case PIGGY:
-                messages.add(LocaleLoader.getString("Effects.Template", "Carrot Turbo", "Supercharge your pigs with carrots"));
-                break;
-        }
-
-        return messages;
-    }
-
-    private List<String> statsDisplay(FakeSkillType fakeSkillType) {
-        List<String> messages = new ArrayList<String>();
-
-        switch (fakeSkillType) {
-            case MACHO:
-                messages.add(LocaleLoader.formatString("[[RED]]Damage Taken: [[YELLOW]]{0}%", decimal.format(Misc.getRandom().nextInt(77))));
-                break;
-            case JUMPING:
-                messages.add(LocaleLoader.formatString("[[RED]]Double Jump Chance: [[YELLOW]]{0}%", decimal.format(Misc.getRandom().nextInt(27))));
-                break;
-            case THROWING:
-                messages.add(LocaleLoader.formatString("[[RED]]Drop Item Chance: [[YELLOW]]{0}%", decimal.format(Misc.getRandom().nextInt(87))));
-                break;
-            case WRECKING:
-                messages.add(LocaleLoader.formatString("[[RED]]Wrecking Chance: [[YELLOW]]{0}%", decimal.format(Misc.getRandom().nextInt(14))));
-                break;
-            case CRAFTING:
-                messages.add(LocaleLoader.formatString("[[RED]]Crafting Success: [[YELLOW]]{0}%", decimal.format(Misc.getRandom().nextInt(27))));
-                break;
-            case WALKING:
-                messages.add(LocaleLoader.formatString("[[RED]]Walk Chance: [[YELLOW]]{0}%", decimal.format(Misc.getRandom().nextInt(27))));
-                break;
-            case SWIMMING:
-                messages.add(LocaleLoader.formatString("[[RED]]Swim Chance: [[YELLOW]]{0}%", decimal.format(Misc.getRandom().nextInt(27))));
-                break;
-            case FALLING:
-                messages.add(LocaleLoader.formatString("[[RED]]Skydiving Success: [[YELLOW]]{0}%", decimal.format(Misc.getRandom().nextInt(37))));
-                break;
-            case CLIMBING:
-                messages.add(LocaleLoader.formatString("[[RED]]Rock Climber Chance: [[YELLOW]]{0}%", decimal.format(Misc.getRandom().nextInt(27))));
-                break;
-            case FLYING:
-                messages.add(LocaleLoader.formatString("[[RED]]Fly Chance: [[YELLOW]]{0}%", decimal.format(Misc.getRandom().nextInt(27))));
-                break;
-            case DIVING:
-                messages.add(LocaleLoader.formatString("[[RED]]Hold Breath Chance: [[YELLOW]]{0}%", decimal.format(Misc.getRandom().nextInt(27))));
-                break;
-            case PIGGY:
-                messages.add(LocaleLoader.formatString("[[RED]]Carrot Turbo Boost: [[YELLOW]]{0}%", decimal.format(Misc.getRandom().nextInt(80)) + 10));
-                break;
-        }
-
-        return messages;
-    }
-}

src/main/java/com/gmail/nossr50/commands/skills/RepairCommand.java

@@ -6,7 +6,6 @@ import com.gmail.nossr50.datatypes.skills.PrimarySkillType;
 import com.gmail.nossr50.datatypes.skills.SubSkillType;
 import com.gmail.nossr50.locale.LocaleLoader;
 import com.gmail.nossr50.mcMMO;
-import com.gmail.nossr50.skills.repair.ArcaneForging;
 import com.gmail.nossr50.skills.repair.RepairManager;
 import com.gmail.nossr50.skills.repair.repairables.Repairable;
 import com.gmail.nossr50.util.Permissions;
@@ -101,7 +100,7 @@ public class RepairCommand extends SkillCommand {
                     String.valueOf(RankUtils.getRank(player, SubSkillType.REPAIR_ARCANE_FORGING)),
                     RankUtils.getHighestRankStr(SubSkillType.REPAIR_ARCANE_FORGING)));
 
-            if (ArcaneForging.arcaneForgingEnchantLoss || ArcaneForging.arcaneForgingDowngrades) {
+            if (mcMMO.getConfigManager().getConfigRepair().getArcaneForging().isDowngradesEnabled() || mcMMO.getConfigManager().getConfigRepair().getArcaneForging().isMayLoseEnchants()) {
                 messages.add(getStatMessage(true, true, SubSkillType.REPAIR_ARCANE_FORGING,
                         String.valueOf(arcaneBypass ? 100 : repairManager.getKeepEnchantChance()),
                         String.valueOf(arcaneBypass ? 0 : repairManager.getDowngradeEnchantChance()))); //Jesus those parentheses

src/main/java/com/gmail/nossr50/commands/skills/SwordsCommand.java

@@ -1,5 +1,6 @@
 package com.gmail.nossr50.commands.skills;
 
+import com.gmail.nossr50.config.AdvancedConfig;
 import com.gmail.nossr50.datatypes.skills.PrimarySkillType;
 import com.gmail.nossr50.datatypes.skills.SubSkillType;
 import com.gmail.nossr50.locale.LocaleLoader;

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

@@ -1,19 +1,19 @@
-package com.gmail.nossr50.config;
-
-import java.io.File;
-
-/**
- * Represents a config file that registers keys after its initialized
- */
-public abstract class ConfigCollections extends Config implements RegistersKeys, ConfigCollection {
-
-    public ConfigCollections(String pathToParentFolder, String relativePath, boolean mergeNewKeys) {
-        super(pathToParentFolder, relativePath, mergeNewKeys);
-        loadKeys();
-    }
-
-    public ConfigCollections(File pathToParentFolder, String relativePath, boolean mergeNewKeys) {
-        super(pathToParentFolder, relativePath, mergeNewKeys);
-        loadKeys();
-    }
-}
+//package com.gmail.nossr50.config;
+//
+//import java.io.File;
+//
+///**
+// * Represents a config file that registers keys after its initialized
+// */
+//public abstract class ConfigCollections extends Config implements RegistersKeys, ConfigCollection {
+//
+//    public ConfigCollections(String pathToParentFolder, String relativePath, boolean mergeNewKeys) {
+//        super(pathToParentFolder, relativePath, mergeNewKeys);
+//        loadKeys();
+//    }
+//
+//    public ConfigCollections(File pathToParentFolder, String relativePath, boolean mergeNewKeys) {
+//        super(pathToParentFolder, relativePath, mergeNewKeys);
+//        loadKeys();
+//    }
+//}

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

@@ -380,8 +380,8 @@ public final class ConfigManager {
     public void registerBonusDrops()
     {
         bonusDropManager.addToWhitelistByNameID(getConfigMining().getBonusDrops());
-        bonusDropManager.addToWhitelistByNameID(configHerbalism.getBonusDrops());
-        bonusDropManager.addToWhitelistByNameID(configWoodcutting.getBonusDrops());
+//        bonusDropManager.addToWhitelistByNameID(configHerbalism.getBonusDrops());
+//        bonusDropManager.addToWhitelistByNameID(configWoodcutting.getBonusDrops());
     }
 
     public void validateConfigs()
@@ -598,6 +598,17 @@ public final class ConfigManager {
         return bonusDropManager;
     }
 
+    /**
+     * Checks if this plugin is using retro mode
+     * Retro mode is a 0-1000 skill system
+     * Standard mode is scaled for 1-100
+     * @return true if retro mode is enabled
+     */
+    public boolean isRetroMode()
+    {
+        return getConfigLeveling().getConfigSectionLevelingGeneral().getConfigSectionLevelScaling().isRetroModeEnabled();
+    }
+
     public boolean isBonusDropsEnabled(Material material)
     {
         return getBonusDropManager().isBonusDropWhitelisted(material);

src/main/java/com/gmail/nossr50/datatypes/experience/SkillXpGain.java

@@ -1,5 +1,6 @@
 package com.gmail.nossr50.datatypes.experience;
 
+import com.gmail.nossr50.config.experience.ExperienceConfig;
 import com.gmail.nossr50.datatypes.skills.PrimarySkillType;
 
 import java.util.concurrent.Delayed;

src/main/java/com/gmail/nossr50/datatypes/skills/alchemy/AlchemyPotion.java

@@ -122,7 +122,7 @@ public class AlchemyPotion {
         if (!children.isEmpty()) {
             for (Entry<ItemStack, String> child : children.entrySet()) {
                 if (ingredient.isSimilar(child.getKey())) {
-                    return PotionMainConfig.getInstance().getPotion(child.getValue());
+                    return PotionConfig.getInstance().getPotion(child.getValue());
                 }
             }
         }

src/main/java/com/gmail/nossr50/datatypes/skills/subskills/AbstractSubSkill.java

@@ -1,5 +1,6 @@
 package com.gmail.nossr50.datatypes.skills.subskills;
 
+import com.gmail.nossr50.config.CoreSkillsConfig;
 import com.gmail.nossr50.datatypes.skills.SubSkillType;
 import com.gmail.nossr50.datatypes.skills.subskills.interfaces.Interaction;
 import com.gmail.nossr50.datatypes.skills.subskills.interfaces.Rank;
@@ -41,7 +42,7 @@ public abstract class AbstractSubSkill implements SubSkill, Interaction, Rank, S
     @Override @Deprecated
     public boolean isEnabled() {
         //TODO: This might be troublesome...
-        return CoreSkillsMainConfig.getInstance().isSkillEnabled(this);
+        return CoreSkillsConfig.getInstance().isSkillEnabled(this);
     }
 
     /**

src/main/java/com/gmail/nossr50/listeners/BlockListener.java

@@ -64,9 +64,9 @@ public class BlockListener implements Listener {
             if(is.getAmount() <= 0)
                 continue;
 
-            if(!Config.getInstance().getDoubleDropsEnabled(PrimarySkillType.MINING, is.getType())
-                    && !Config.getInstance().getDoubleDropsEnabled(PrimarySkillType.HERBALISM, is.getType())
-                        && !Config.getInstance().getDoubleDropsEnabled(PrimarySkillType.WOODCUTTING, is.getType()))
+            if(!MainConfig.getInstance().getDoubleDropsEnabled(PrimarySkillType.MINING, is.getType())
+                    && !MainConfig.getInstance().getDoubleDropsEnabled(PrimarySkillType.HERBALISM, is.getType())
+                        && !MainConfig.getInstance().getDoubleDropsEnabled(PrimarySkillType.WOODCUTTING, is.getType()))
                 continue;
 
             if(event.getBlock().getState().getMetadata(mcMMO.doubleDrops).size() > 0)
@@ -245,7 +245,7 @@ public class BlockListener implements Listener {
 
         McMMOPlayer mcMMOPlayer = UserManager.getPlayer(player);
 
-        if (blockState.getType() == Repair.anvilMaterial && PrimarySkillType.REPAIR.getPermissions(player)) {
+        if (blockState.getType() == Repair.getInstance().getAnvilMaterial() && PrimarySkillType.REPAIR.getPermissions(player)) {
             mcMMOPlayer.getRepairManager().placedAnvilCheck();
         }
         else if (blockState.getType() == Salvage.anvilMaterial && PrimarySkillType.SALVAGE.getPermissions(player)) {

src/main/java/com/gmail/nossr50/listeners/EntityListener.java

@@ -895,13 +895,10 @@ public class EntityListener implements Listener {
         }
 
 
-        if(!event.isCancelled())
-        {
-            if(mcMMO.getConfigManager().getConfigExploitPrevention().doTamedEntitiesGiveXP())
-                entity.setMetadata(mcMMO.entityMetadataKey, mcMMO.metadataValue);
+        if(mcMMO.getConfigManager().getConfigExploitPrevention().doTamedEntitiesGiveXP())
+            entity.setMetadata(mcMMO.entityMetadataKey, mcMMO.metadataValue);
 
-            UserManager.getPlayer(player).getTamingManager().awardTamingXP(entity);
-        }
+        UserManager.getPlayer(player).getTamingManager().awardTamingXP(entity);
 
     }
 

src/main/java/com/gmail/nossr50/listeners/PlayerListener.java

@@ -439,10 +439,7 @@ public class PlayerListener implements Listener {
             if (!drop.hasMetadata(mcMMO.droppedItemKey) && mcMMOPlayer.inParty() && ItemUtils.isSharable(dropStack)) {
                 event.setCancelled(ShareHandler.handleItemShare(drop, mcMMOPlayer));
 
-                if (event.isCancelled()) {
-                    SoundManager.sendSound(player, player.getLocation(), SoundType.POP);
-                    return;
-                }
+                SoundManager.sendSound(player, player.getLocation(), SoundType.POP);
             }
 
             /*if (player.getInventory().getItemInMainHand().getType() == Material.AIR) {

src/main/java/com/gmail/nossr50/mcMMO.java

@@ -16,7 +16,6 @@ import com.gmail.nossr50.datatypes.skills.PrimarySkillType;
 import com.gmail.nossr50.datatypes.skills.subskills.acrobatics.Roll;
 import com.gmail.nossr50.listeners.*;
 import com.gmail.nossr50.party.PartyManager;
-import com.gmail.nossr50.runnables.CheckDateTask;
 import com.gmail.nossr50.runnables.SaveTimerTask;
 import com.gmail.nossr50.runnables.backups.CleanBackupsTask;
 import com.gmail.nossr50.runnables.database.UserPurgeTask;
@@ -28,7 +27,10 @@ import com.gmail.nossr50.runnables.skills.BleedTimerTask;
 import com.gmail.nossr50.skills.alchemy.Alchemy;
 import com.gmail.nossr50.skills.repair.repairables.RepairableManager;
 import com.gmail.nossr50.skills.salvage.salvageables.SalvageableManager;
-import com.gmail.nossr50.util.*;
+import com.gmail.nossr50.util.ChimaeraWing;
+import com.gmail.nossr50.util.LogFilter;
+import com.gmail.nossr50.util.Misc;
+import com.gmail.nossr50.util.Permissions;
 import com.gmail.nossr50.util.blockmeta.chunkmeta.ChunkManager;
 import com.gmail.nossr50.util.blockmeta.chunkmeta.ChunkManagerFactory;
 import com.gmail.nossr50.util.commands.CommandRegistrationManager;
@@ -60,7 +62,7 @@ public class mcMMO extends JavaPlugin {
     //private static ModManager         modManager;
     private static DatabaseManager    databaseManager;
     private static FormulaManager     formulaManager;
-    private static HolidayManager     holidayManager;
+    /*private static HolidayManager     holidayManager;*/
     //private static UpgradeManager     upgradeManager;
 
     /* File Paths */
@@ -153,7 +155,7 @@ public class mcMMO extends JavaPlugin {
                 PartyManager.loadParties();
 
             formulaManager = new FormulaManager();
-            holidayManager = new HolidayManager();
+            /*holidayManager = new HolidayManager();*/
 
             for (Player player : getServer().getOnlinePlayers()) {
                 new PlayerProfileLoadingTask(player).runTaskLaterAsynchronously(mcMMO.p, 1); // 1 Tick delay to ensure the player is marked as online before we begin loading
@@ -273,7 +275,7 @@ public class mcMMO extends JavaPlugin {
                 ScoreboardManager.teardownAll();
 
             formulaManager.saveFormula();
-            holidayManager.saveAnniversaryFiles();
+            /*holidayManager.saveAnniversaryFiles();*/
             placeStore.saveAll();       // Save our metadata
             placeStore.cleanUp();       // Cleanup empty metadata stores
         }
@@ -348,9 +350,9 @@ public class mcMMO extends JavaPlugin {
         return formulaManager;
     }
 
-    public static HolidayManager getHolidayManager() {
+    /*public static HolidayManager getHolidayManager() {
         return holidayManager;
-    }
+    }*/
 
     public static ChunkManager getPlaceStore() {
         return placeStore;
@@ -584,9 +586,9 @@ public class mcMMO extends JavaPlugin {
         // Update power level tag scoreboards
         new PowerLevelUpdatingTask().runTaskTimer(this, 2 * Misc.TICK_CONVERSION_FACTOR, 2 * Misc.TICK_CONVERSION_FACTOR);
 
-        if (getHolidayManager().nearingAprilFirst()) {
+        /*if (getHolidayManager().nearingAprilFirst()) {
             new CheckDateTask().runTaskTimer(this, 10L * Misc.TICK_CONVERSION_FACTOR, 1L * 60L * 60L * Misc.TICK_CONVERSION_FACTOR);
-        }
+        }*/
 
         // Clear the registered XP data so players can earn XP again
         if (ExperienceConfig.getInstance().getDiminishedReturnsEnabled()) {
@@ -623,7 +625,7 @@ public class mcMMO extends JavaPlugin {
      * @return true if retro mode is enabled
      */
     public static boolean isRetroModeEnabled() {
-        return getPlayerLevelingSettings().getConfigSectionLevelingGeneral().getConfigSectionLevelScaling().isRetroModeEnabled();
+        return configManager.isRetroMode();
     }
 
     public static ConfigManager getConfigManager() {

src/main/java/com/gmail/nossr50/runnables/database/FormulaConversionTask.java

@@ -1,5 +1,6 @@
 package com.gmail.nossr50.runnables.database;
 
+import com.gmail.nossr50.config.experience.ExperienceConfig;
 import com.gmail.nossr50.database.DatabaseManager;
 import com.gmail.nossr50.datatypes.experience.FormulaType;
 import com.gmail.nossr50.datatypes.player.McMMOPlayer;

src/main/java/com/gmail/nossr50/runnables/skills/AprilTask.java

@@ -1,56 +0,0 @@
-package com.gmail.nossr50.runnables.skills;
-
-import com.gmail.nossr50.mcMMO;
-import com.gmail.nossr50.util.HolidayManager;
-import com.gmail.nossr50.util.Misc;
-import com.gmail.nossr50.util.sounds.SoundManager;
-import com.gmail.nossr50.util.sounds.SoundType;
-import org.bukkit.ChatColor;
-import org.bukkit.Statistic;
-import org.bukkit.entity.Player;
-import org.bukkit.scheduler.BukkitRunnable;
-
-public class AprilTask extends BukkitRunnable {
-
-    @Override
-    public void run() {
-        if (!mcMMO.getHolidayManager().isAprilFirst()) {
-            this.cancel();
-            return;
-        }
-
-        for (Player player : mcMMO.p.getServer().getOnlinePlayers()) {
-            int random = Misc.getRandom().nextInt(40) + 11;
-            int betterRandom = Misc.getRandom().nextInt(2000);
-            if (betterRandom == 0) {
-                SoundManager.sendSound(player, player.getLocation(), SoundType.LEVEL_UP);
-                player.sendMessage(unknown("superskill") + " skill increased by 1. Total (" + unknown("12") + ")");
-//                fireworksShow(player);
-            }
-
-            for (Statistic statistic : mcMMO.getHolidayManager().movementStatistics) {
-                if (player.getStatistic(statistic) > 0 && player.getStatistic(statistic) % random == 0) {
-                    mcMMO.getHolidayManager().levelUpApril(player, HolidayManager.FakeSkillType.getByStatistic(statistic));
-                    break;
-                }
-            }
-        }
-    }
-
-    /*private void fireworksShow(final Player player) {
-        final int firework_amount = 10;
-        for (int i = 0; i < firework_amount; i++) {
-            int delay = (int) (Misc.getRandom().nextDouble() * 3 * Misc.TICK_CONVERSION_FACTOR) + 4;
-            mcMMO.p.getServer().getScheduler().runTaskLater(mcMMO.p, new Runnable() {
-                @Override
-                public void run() {
-                    mcMMO.getHolidayManager().spawnFireworks(player);
-                }
-            }, delay);
-        }
-    }*/
-
-    private String unknown(String string) {
-        return ChatColor.MAGIC + string + ChatColor.RESET + ChatColor.YELLOW;
-    }
-}

src/main/java/com/gmail/nossr50/runnables/skills/BleedTimerTask.java

@@ -1,5 +1,6 @@
 package com.gmail.nossr50.runnables.skills;
 
+import com.gmail.nossr50.config.AdvancedConfig;
 import com.gmail.nossr50.datatypes.interactions.NotificationType;
 import com.gmail.nossr50.mcMMO;
 import com.gmail.nossr50.util.MobHealthbarUtils;

src/main/java/com/gmail/nossr50/skills/alchemy/Alchemy.java

@@ -1,5 +1,6 @@
 package com.gmail.nossr50.skills.alchemy;
 
+import com.gmail.nossr50.config.AdvancedConfig;
 import com.gmail.nossr50.datatypes.skills.SubSkillType;
 import com.gmail.nossr50.mcMMO;
 import com.gmail.nossr50.runnables.skills.AlchemyBrewTask;

src/main/java/com/gmail/nossr50/skills/alchemy/AlchemyManager.java

@@ -1,5 +1,7 @@
 package com.gmail.nossr50.skills.alchemy;
 
+import com.gmail.nossr50.config.experience.ExperienceConfig;
+import com.gmail.nossr50.config.skills.alchemy.PotionConfig;
 import com.gmail.nossr50.datatypes.experience.XPGainReason;
 import com.gmail.nossr50.datatypes.experience.XPGainSource;
 import com.gmail.nossr50.datatypes.player.McMMOPlayer;
@@ -25,7 +27,7 @@ public class AlchemyManager extends SkillManager {
     }
 
     public List<ItemStack> getIngredients() {
-        return PotionMainConfig.getInstance().getIngredients(getTier());
+        return PotionConfig.getInstance().getIngredients(getTier());
     }
 
     public String getIngredientList() {

src/main/java/com/gmail/nossr50/skills/alchemy/AlchemyPotionBrewer.java

@@ -1,5 +1,6 @@
 package com.gmail.nossr50.skills.alchemy;
 
+import com.gmail.nossr50.config.skills.alchemy.PotionConfig;
 import com.gmail.nossr50.datatypes.skills.SubSkillType;
 import com.gmail.nossr50.datatypes.skills.alchemy.AlchemyPotion;
 import com.gmail.nossr50.datatypes.skills.alchemy.PotionStage;
@@ -34,7 +35,7 @@ public final class AlchemyPotionBrewer {
                 continue;
             }
 
-            if (getChildPotion(PotionMainConfig.getInstance().getPotion(contents[i]), contents[Alchemy.INGREDIENT_SLOT]) != null) {
+            if (getChildPotion(PotionConfig.getInstance().getPotion(contents[i]), contents[Alchemy.INGREDIENT_SLOT]) != null) {
                 return true;
             }
         }
@@ -92,7 +93,7 @@ public final class AlchemyPotionBrewer {
     }
 
     private static List<ItemStack> getValidIngredients(Player player) {
-        return PotionMainConfig.getInstance().getIngredients((player == null || !Permissions.isSubSkillEnabled(player, SubSkillType.ALCHEMY_CONCOCTIONS)) ? 1 : UserManager.getPlayer(player).getAlchemyManager().getTier());
+        return PotionConfig.getInstance().getIngredients((player == null || !Permissions.isSubSkillEnabled(player, SubSkillType.ALCHEMY_CONCOCTIONS)) ? 1 : UserManager.getPlayer(player).getAlchemyManager().getTier());
     }
 
     public static void finishBrewing(BlockState brewingStand, Player player, boolean forced) {
@@ -112,11 +113,11 @@ public final class AlchemyPotionBrewer {
         for (int i = 0; i < 3; i++) {
             ItemStack item = inventory.getItem(i);
 
-            if (isEmpty(item) || item.getType() == Material.GLASS_BOTTLE || !PotionMainConfig.getInstance().isValidPotion(item)) {
+            if (isEmpty(item) || item.getType() == Material.GLASS_BOTTLE || !PotionConfig.getInstance().isValidPotion(item)) {
                 continue;
             }
 
-            AlchemyPotion input = PotionMainConfig.getInstance().getPotion(item);
+            AlchemyPotion input = PotionConfig.getInstance().getPotion(item);
             AlchemyPotion output = input.getChild(ingredient);
 
             inputList.add(input);

src/main/java/com/gmail/nossr50/skills/archery/Archery.java

@@ -1,5 +1,7 @@
 package com.gmail.nossr50.skills.archery;
 
+import com.gmail.nossr50.config.AdvancedConfig;
+import com.gmail.nossr50.config.experience.ExperienceConfig;
 import com.gmail.nossr50.datatypes.skills.SubSkillType;
 import com.gmail.nossr50.util.Misc;
 import com.gmail.nossr50.util.skills.RankUtils;
@@ -13,13 +15,24 @@ import java.util.Iterator;
 import java.util.List;
 
 public class Archery {
-    private static List<TrackedEntity> trackedEntities = new ArrayList<TrackedEntity>();
+    private static List<TrackedEntity> trackedEntities;
 
-    public static double skillShotMaxBonusDamage     = AdvancedConfig.getInstance().getSkillShotDamageMax();
+    public static double skillShotMaxBonusDamage;
 
-    public static double dazeBonusDamage = AdvancedConfig.getInstance().getDazeBonusDamage();
+    public static double dazeBonusDamage;
 
-    public static final double DISTANCE_XP_MULTIPLIER = ExperienceConfig.getInstance().getArcheryDistanceMultiplier();
+    public static double DISTANCE_XP_MULTIPLIER;
+
+    public Archery()
+    {
+        List<TrackedEntity> trackedEntities = new ArrayList<TrackedEntity>();
+
+        skillShotMaxBonusDamage     = AdvancedConfig.getInstance().getSkillShotDamageMax();
+
+        dazeBonusDamage = AdvancedConfig.getInstance().getDazeBonusDamage();
+
+        DISTANCE_XP_MULTIPLIER = ExperienceConfig.getInstance().getArcheryDistanceMultiplier();
+    }
 
     protected static void incrementTrackerValue(LivingEntity livingEntity) {
         for (TrackedEntity trackedEntity : trackedEntities) {

src/main/java/com/gmail/nossr50/skills/axes/Axes.java

@@ -1,5 +1,6 @@
 package com.gmail.nossr50.skills.axes;
 
+import com.gmail.nossr50.config.AdvancedConfig;
 import com.gmail.nossr50.datatypes.skills.SubSkillType;
 import com.gmail.nossr50.util.ItemUtils;
 import com.gmail.nossr50.util.skills.RankUtils;

src/main/java/com/gmail/nossr50/skills/repair/ArcaneForging.java

@@ -1,7 +1,9 @@
+/*
 package com.gmail.nossr50.skills.repair;
 
+import com.gmail.nossr50.config.AdvancedConfig;
+
 public class ArcaneForging {
 
-    public static boolean arcaneForgingDowngrades  = AdvancedConfig.getInstance().getArcaneForgingDowngradeEnabled();
-    public static boolean arcaneForgingEnchantLoss = AdvancedConfig.getInstance().getArcaneForgingEnchantLossEnabled();
 }
+*/

src/main/java/com/gmail/nossr50/skills/repair/Repair.java

@@ -4,14 +4,41 @@ import com.gmail.nossr50.mcMMO;
 import org.bukkit.Material;
 
 public class Repair {
-    public static Material anvilMaterial;
+    private static Repair instance;
+    private Material anvilMaterial;
+    private double repairMasteryMaxBonus;
+    private double repairMasteryMaxBonusLevel;
 
     public Repair() {
         anvilMaterial = mcMMO.getConfigManager().getConfigRepair().getRepairGeneral().getRepairAnvilMaterial();
+
+        if(mcMMO.isRetroModeEnabled())
+        {
+            repairMasteryMaxBonus = mcMMO.getConfigManager().getConfigRepair().getRepairSubSkills().getRepairMastery().getSettings().getRetro().getMaxBonusPercentage();
+            repairMasteryMaxBonusLevel = mcMMO.getConfigManager().getConfigRepair().getRepairSubSkills().getRepairMastery().getSettings().getRetro().getMaxBonusLevel();
+        } else {
+            repairMasteryMaxBonus = mcMMO.getConfigManager().getConfigRepair().getRepairSubSkills().getRepairMastery().getSettings().getStandard().getMaxBonusPercentage();
+            repairMasteryMaxBonusLevel = mcMMO.getConfigManager().getConfigRepair().getRepairSubSkills().getRepairMastery().getSettings().getStandard().getMaxBonusLevel();
+        }
     }
 
-    public static Material getRepairAnvilMaterial()
+    public static Repair getInstance()
     {
+        if(instance == null)
+            instance = new Repair();
+
+        return instance;
+    }
+
+    public Material getAnvilMaterial() {
         return anvilMaterial;
     }
+
+    public double getRepairMasteryMaxBonus() {
+        return repairMasteryMaxBonus;
+    }
+
+    public double getRepairMasteryMaxBonusLevel() {
+        return repairMasteryMaxBonusLevel;
+    }
 }

src/main/java/com/gmail/nossr50/skills/repair/RepairManager.java

@@ -147,7 +147,8 @@ public class RepairManager extends SkillManager {
         }
 
         // Handle the enchants
-        if (ArcaneForging.arcaneForgingEnchantLoss) {
+//        if (ArcaneForging.arcaneForgingEnchantLoss) {
+        if (mcMMO.getConfigManager().getConfigRepair().getArcaneForging().isMayLoseEnchants()) {
             addEnchants(item);
         }
 
@@ -273,8 +274,8 @@ public class RepairManager extends SkillManager {
         if (Permissions.isSubSkillEnabled(player, SubSkillType.REPAIR_REPAIR_MASTERY)
                 && RankUtils.hasUnlockedSubskill(getPlayer(), SubSkillType.REPAIR_REPAIR_MASTERY)) {
 
-            double maxBonusCalc = Repair.repairMasteryMaxBonus / 100.0D;
-            double skillLevelBonusCalc = (Repair.repairMasteryMaxBonus / Repair.repairMasteryMaxBonusLevel) * (getSkillLevel() / 100.0D);
+            double maxBonusCalc = Repair.getInstance().getRepairMasteryMaxBonus() / 100.0D;
+            double skillLevelBonusCalc = (Repair.getInstance().getRepairMasteryMaxBonus() / Repair.getInstance().getRepairMasteryMaxBonusLevel()) * (getSkillLevel() / 100.0D);
             double bonus = repairAmount * Math.min(skillLevelBonusCalc, maxBonusCalc);
 
             repairAmount += bonus;
@@ -344,7 +345,7 @@ public class RepairManager extends SkillManager {
             if (RandomChanceUtil.checkRandomChanceExecutionSuccess(new RandomChanceSkillStatic(getKeepEnchantChance(), getPlayer(), SubSkillType.REPAIR_ARCANE_FORGING))) {
                 int enchantLevel = enchant.getValue();
 
-                if (ArcaneForging.arcaneForgingDowngrades && enchantLevel > 1
+                if (mcMMO.getConfigManager().getConfigRepair().getArcaneForging().isDowngradesEnabled() && enchantLevel > 1
                         && (!RandomChanceUtil.checkRandomChanceExecutionSuccess(new RandomChanceSkillStatic(100 - getDowngradeEnchantChance(), getPlayer(), SubSkillType.REPAIR_ARCANE_FORGING)))) {
                     item.addUnsafeEnchantment(enchantment, enchantLevel - 1);
                     downgraded = true;

src/main/java/com/gmail/nossr50/skills/unarmed/UnarmedManager.java

@@ -1,5 +1,6 @@
 package com.gmail.nossr50.skills.unarmed;
 
+import com.gmail.nossr50.config.AdvancedConfig;
 import com.gmail.nossr50.datatypes.interactions.NotificationType;
 import com.gmail.nossr50.datatypes.player.McMMOPlayer;
 import com.gmail.nossr50.datatypes.skills.PrimarySkillType;

src/main/java/com/gmail/nossr50/util/HolidayManager.java

@@ -1,383 +1,383 @@
-package com.gmail.nossr50.util;
-
-import com.gmail.nossr50.commands.skills.AprilCommand;
-import com.gmail.nossr50.config.Config;
-import com.gmail.nossr50.datatypes.interactions.NotificationType;
-import com.gmail.nossr50.datatypes.skills.PrimarySkillType;
-import com.gmail.nossr50.locale.LocaleLoader;
-import com.gmail.nossr50.mcMMO;
-import com.gmail.nossr50.util.player.NotificationManager;
-import com.gmail.nossr50.util.player.UserManager;
-import com.gmail.nossr50.util.sounds.SoundManager;
-import com.gmail.nossr50.util.sounds.SoundType;
-import com.google.common.collect.ImmutableList;
-import org.bukkit.ChatColor;
-import org.bukkit.Color;
-import org.bukkit.Statistic;
-import org.bukkit.command.CommandSender;
-import org.bukkit.command.PluginCommand;
-import org.bukkit.entity.Player;
-import org.bukkit.event.player.PlayerStatisticIncrementEvent;
-
-import java.io.*;
-import java.util.*;
-import java.util.regex.Pattern;
-
-public final class HolidayManager {
-    private ArrayList<String> hasCelebrated;
-    private int currentYear;
-    private static final int START_YEAR = 2011;
-
-    private static final List<Color> ALL_COLORS;
-    private static final List<ChatColor> ALL_CHAT_COLORS;
-    private static final List<ChatColor> CHAT_FORMATS;
-
-    public enum FakeSkillType {
-        MACHO,
-        JUMPING,
-        THROWING,
-        WRECKING,
-        CRAFTING,
-        WALKING,
-        SWIMMING,
-        FALLING,
-        CLIMBING,
-        FLYING,
-        DIVING,
-        PIGGY,
-        UNKNOWN;
-
-        public static FakeSkillType getByName(String skillName) {
-            for (FakeSkillType type : values()) {
-                if (type.name().equalsIgnoreCase(skillName)) {
-                    return type;
-                }
-            }
-            return null;
-        }
-
-        public static FakeSkillType getByStatistic(Statistic statistic) {
-            switch (statistic) {
-                case DAMAGE_TAKEN:
-                    return FakeSkillType.MACHO;
-                case JUMP:
-                    return FakeSkillType.JUMPING;
-                case DROP:
-                    return FakeSkillType.THROWING;
-                case MINE_BLOCK:
-                case BREAK_ITEM:
-                    return FakeSkillType.WRECKING;
-                case CRAFT_ITEM:
-                    return FakeSkillType.CRAFTING;
-                case WALK_ONE_CM:
-                    return FakeSkillType.WALKING;
-                case SWIM_ONE_CM:
-                    return FakeSkillType.SWIMMING;
-                case FALL_ONE_CM:
-                    return FakeSkillType.FALLING;
-                case CLIMB_ONE_CM:
-                    return FakeSkillType.CLIMBING;
-                case FLY_ONE_CM:
-                    return FakeSkillType.FLYING;
-                case WALK_UNDER_WATER_ONE_CM:
-                    return FakeSkillType.DIVING;
-                case PIG_ONE_CM:
-                    return FakeSkillType.PIGGY;
-                default:
-                    return FakeSkillType.UNKNOWN;
-            }
-        }
-    }
-
-    public final Set<Statistic> movementStatistics = EnumSet.of(
-            Statistic.WALK_ONE_CM, Statistic.SWIM_ONE_CM, Statistic.FALL_ONE_CM,
-            Statistic.CLIMB_ONE_CM, Statistic.FLY_ONE_CM, Statistic.WALK_UNDER_WATER_ONE_CM,
-            Statistic.PIG_ONE_CM);
-
-    static {
-        List<Color> colors = new ArrayList<Color>();
-        List<ChatColor> chatColors = new ArrayList<ChatColor>();
-        List<ChatColor> chatFormats = new ArrayList<ChatColor>();
-
-        for (ChatColor color : ChatColor.values()) {
-            if (color.isColor()) {
-                chatColors.add(color);
-            }
-            else {
-                chatFormats.add(color);
-            }
-        }
-
-//        for (DyeColor color : DyeColor.values()) {
-//            colors.add(color.getFireworkColor());
+//package com.gmail.nossr50.util;
+//
+//import com.gmail.nossr50.commands.skills.AprilCommand;
+//import com.gmail.nossr50.config.Config;
+//import com.gmail.nossr50.datatypes.interactions.NotificationType;
+//import com.gmail.nossr50.datatypes.skills.PrimarySkillType;
+//import com.gmail.nossr50.locale.LocaleLoader;
+//import com.gmail.nossr50.mcMMO;
+//import com.gmail.nossr50.util.player.NotificationManager;
+//import com.gmail.nossr50.util.player.UserManager;
+//import com.gmail.nossr50.util.sounds.SoundManager;
+//import com.gmail.nossr50.util.sounds.SoundType;
+//import com.google.common.collect.ImmutableList;
+//import org.bukkit.ChatColor;
+//import org.bukkit.Color;
+//import org.bukkit.Statistic;
+//import org.bukkit.command.CommandSender;
+//import org.bukkit.command.PluginCommand;
+//import org.bukkit.entity.Player;
+//import org.bukkit.event.player.PlayerStatisticIncrementEvent;
+//
+//import java.io.*;
+//import java.util.*;
+//import java.util.regex.Pattern;
+//
+//public final class HolidayManager {
+//    private ArrayList<String> hasCelebrated;
+//    private int currentYear;
+//    private static final int START_YEAR = 2011;
+//
+//    private static final List<Color> ALL_COLORS;
+//    private static final List<ChatColor> ALL_CHAT_COLORS;
+//    private static final List<ChatColor> CHAT_FORMATS;
+//
+//    public enum FakeSkillType {
+//        MACHO,
+//        JUMPING,
+//        THROWING,
+//        WRECKING,
+//        CRAFTING,
+//        WALKING,
+//        SWIMMING,
+//        FALLING,
+//        CLIMBING,
+//        FLYING,
+//        DIVING,
+//        PIGGY,
+//        UNKNOWN;
+//
+//        public static FakeSkillType getByName(String skillName) {
+//            for (FakeSkillType type : values()) {
+//                if (type.name().equalsIgnoreCase(skillName)) {
+//                    return type;
+//                }
+//            }
+//            return null;
+//        }
+//
+//        public static FakeSkillType getByStatistic(Statistic statistic) {
+//            switch (statistic) {
+//                case DAMAGE_TAKEN:
+//                    return FakeSkillType.MACHO;
+//                case JUMP:
+//                    return FakeSkillType.JUMPING;
+//                case DROP:
+//                    return FakeSkillType.THROWING;
+//                case MINE_BLOCK:
+//                case BREAK_ITEM:
+//                    return FakeSkillType.WRECKING;
+//                case CRAFT_ITEM:
+//                    return FakeSkillType.CRAFTING;
+//                case WALK_ONE_CM:
+//                    return FakeSkillType.WALKING;
+//                case SWIM_ONE_CM:
+//                    return FakeSkillType.SWIMMING;
+//                case FALL_ONE_CM:
+//                    return FakeSkillType.FALLING;
+//                case CLIMB_ONE_CM:
+//                    return FakeSkillType.CLIMBING;
+//                case FLY_ONE_CM:
+//                    return FakeSkillType.FLYING;
+//                case WALK_UNDER_WATER_ONE_CM:
+//                    return FakeSkillType.DIVING;
+//                case PIG_ONE_CM:
+//                    return FakeSkillType.PIGGY;
+//                default:
+//                    return FakeSkillType.UNKNOWN;
+//            }
+//        }
+//    }
+//
+//    public final Set<Statistic> movementStatistics = EnumSet.of(
+//            Statistic.WALK_ONE_CM, Statistic.SWIM_ONE_CM, Statistic.FALL_ONE_CM,
+//            Statistic.CLIMB_ONE_CM, Statistic.FLY_ONE_CM, Statistic.WALK_UNDER_WATER_ONE_CM,
+//            Statistic.PIG_ONE_CM);
+//
+//    static {
+//        List<Color> colors = new ArrayList<Color>();
+//        List<ChatColor> chatColors = new ArrayList<ChatColor>();
+//        List<ChatColor> chatFormats = new ArrayList<ChatColor>();
+//
+//        for (ChatColor color : ChatColor.values()) {
+//            if (color.isColor()) {
+//                chatColors.add(color);
+//            }
+//            else {
+//                chatFormats.add(color);
+//            }
+//        }
+//
+////        for (DyeColor color : DyeColor.values()) {
+////            colors.add(color.getFireworkColor());
+////        }
+//
+//        Collections.shuffle(chatColors, Misc.getRandom());
+//        Collections.shuffle(colors, Misc.getRandom());
+//        Collections.shuffle(chatFormats, Misc.getRandom());
+//
+//        ALL_CHAT_COLORS = ImmutableList.copyOf(chatColors);
+//        ALL_COLORS = ImmutableList.copyOf(colors);
+//        CHAT_FORMATS = ImmutableList.copyOf(chatFormats);
+//    }
+//
+//    // This gets called onEnable
+//    public HolidayManager() {
+//        currentYear = Calendar.getInstance().get(Calendar.YEAR);
+//
+//        File anniversaryFile = new File(mcMMO.getFlatFileDirectory(), "anniversary." + currentYear + ".yml");
+//
+//        if (!anniversaryFile.exists()) {
+//            try {
+//                anniversaryFile.createNewFile();
+//            }
+//            catch (IOException ex) {
+//                mcMMO.p.getLogger().severe(ex.toString());
+//            }
+//        }
+//
+//        hasCelebrated = new ArrayList<String>();
+//
+//        try {
+//            hasCelebrated.clear();
+//            BufferedReader reader = new BufferedReader(new FileReader(anniversaryFile.getPath()));
+//            String line = reader.readLine();
+//
+//            while (line != null) {
+//                hasCelebrated.add(line);
+//                line = reader.readLine();
+//            }
+//
+//            reader.close();
+//        }
+//        catch (Exception ex) {
+//            mcMMO.p.getLogger().severe(ex.toString());
+//        }
+//
+//        cleanupFiles();
+//    }
+//
+//    private void cleanupFiles() {
+//        File FlatFileDir = new File(mcMMO.getFlatFileDirectory());
+//        File legacy = new File(FlatFileDir, "anniversary.yml");
+//        List<File> toDelete = new ArrayList<File>();
+//
+//        if (legacy.exists()) {
+//            toDelete.add(legacy);
+//        }
+//
+//        Pattern pattern = Pattern.compile("anniversary\\.(?:.+)\\.yml");
+//
+//        for (String fileName : FlatFileDir.list()) {
+//            if (!pattern.matcher(fileName).matches() || fileName.equals("anniversary." + currentYear + ".yml")) {
+//                continue;
+//            }
+//
+//            File file = new File(FlatFileDir, fileName);
+//
+//            if (file.isDirectory()) {
+//                continue;
+//            }
+//
+//            toDelete.add(file);
+//        }
+//
+//        for (File file : toDelete) {
+//            if (file.delete()) {
+//                mcMMO.p.debug("Deleted: " + file.getName());
+//            }
+//        }
+//    }
+//
+//    // This gets called onDisable
+//    public void saveAnniversaryFiles() {
+//        mcMMO.p.debug("Saving anniversary files...");
+//        String anniversaryFilePath = mcMMO.getFlatFileDirectory() + "anniversary." + currentYear + ".yml";
+//
+//        try {
+//            BufferedWriter writer = new BufferedWriter(new FileWriter(anniversaryFilePath));
+//            for (String player : hasCelebrated) {
+//                writer.write(player);
+//                writer.newLine();
+//            }
+//            writer.close();
 //        }
-
-        Collections.shuffle(chatColors, Misc.getRandom());
-        Collections.shuffle(colors, Misc.getRandom());
-        Collections.shuffle(chatFormats, Misc.getRandom());
-
-        ALL_CHAT_COLORS = ImmutableList.copyOf(chatColors);
-        ALL_COLORS = ImmutableList.copyOf(colors);
-        CHAT_FORMATS = ImmutableList.copyOf(chatFormats);
-    }
-
-    // This gets called onEnable
-    public HolidayManager() {
-        currentYear = Calendar.getInstance().get(Calendar.YEAR);
-
-        File anniversaryFile = new File(mcMMO.getFlatFileDirectory(), "anniversary." + currentYear + ".yml");
-
-        if (!anniversaryFile.exists()) {
-            try {
-                anniversaryFile.createNewFile();
-            }
-            catch (IOException ex) {
-                mcMMO.p.getLogger().severe(ex.toString());
-            }
-        }
-
-        hasCelebrated = new ArrayList<String>();
-
-        try {
-            hasCelebrated.clear();
-            BufferedReader reader = new BufferedReader(new FileReader(anniversaryFile.getPath()));
-            String line = reader.readLine();
-
-            while (line != null) {
-                hasCelebrated.add(line);
-                line = reader.readLine();
-            }
-
-            reader.close();
-        }
-        catch (Exception ex) {
-            mcMMO.p.getLogger().severe(ex.toString());
-        }
-
-        cleanupFiles();
-    }
-
-    private void cleanupFiles() {
-        File FlatFileDir = new File(mcMMO.getFlatFileDirectory());
-        File legacy = new File(FlatFileDir, "anniversary.yml");
-        List<File> toDelete = new ArrayList<File>();
-
-        if (legacy.exists()) {
-            toDelete.add(legacy);
-        }
-
-        Pattern pattern = Pattern.compile("anniversary\\.(?:.+)\\.yml");
-
-        for (String fileName : FlatFileDir.list()) {
-            if (!pattern.matcher(fileName).matches() || fileName.equals("anniversary." + currentYear + ".yml")) {
-                continue;
-            }
-
-            File file = new File(FlatFileDir, fileName);
-
-            if (file.isDirectory()) {
-                continue;
-            }
-
-            toDelete.add(file);
-        }
-
-        for (File file : toDelete) {
-            if (file.delete()) {
-                mcMMO.p.debug("Deleted: " + file.getName());
-            }
-        }
-    }
-
-    // This gets called onDisable
-    public void saveAnniversaryFiles() {
-        mcMMO.p.debug("Saving anniversary files...");
-        String anniversaryFilePath = mcMMO.getFlatFileDirectory() + "anniversary." + currentYear + ".yml";
-
-        try {
-            BufferedWriter writer = new BufferedWriter(new FileWriter(anniversaryFilePath));
-            for (String player : hasCelebrated) {
-                writer.write(player);
-                writer.newLine();
-            }
-            writer.close();
-        }
-        catch (Exception ex) {
-            mcMMO.p.getLogger().severe(ex.toString());
-        }
-    }
-
-    // This gets called from /mcmmo command
-    public void anniversaryCheck(final CommandSender sender) {
-        GregorianCalendar anniversaryStart = new GregorianCalendar(currentYear, Calendar.FEBRUARY, 3);
-        GregorianCalendar anniversaryEnd = new GregorianCalendar(currentYear, Calendar.FEBRUARY, 6);
-        GregorianCalendar day = new GregorianCalendar();
-
-        if (hasCelebrated.contains(sender.getName())) {
-            return;
-        }
-
-        if (!getDateRange(day.getTime(), anniversaryStart.getTime(), anniversaryEnd.getTime())) {
-            return;
-        }
-
-        sender.sendMessage(LocaleLoader.getString("Holiday.Anniversary", (currentYear - START_YEAR)));
-        /*if (sender instanceof Player) {
-            final int firework_amount = 10;
-            for (int i = 0; i < firework_amount; i++) {
-                int delay = (int) (Misc.getRandom().nextDouble() * 3 * Misc.TICK_CONVERSION_FACTOR) + 4;
-                mcMMO.p.getServer().getScheduler().runTaskLater(mcMMO.p, new Runnable() {
-                    @Override
-                    public void run() {
-                        spawnFireworks((Player) sender);
-                    }
-                }, delay);
-            }
-        }*/
-//        else {
-                /*
-                 * Credit: http://www.geocities.com/spunk1111/
-                 *  (good luck finding that in 3 years heh)
-                 *       .''.      .        *''*    :_\/_:     .
-                 *      :_\/_:   _\(/_  .:.*_\/_*   : /\ :  .'.:.'.
-                 *  .''.: /\ :    /)\   ':'* /\ *  : '..'.  -=:o:=-
-                 * :_\/_:'.:::.    ' *''*    * '.\'/.'_\(/_ '.':'.'
-                 * : /\ : :::::     *_\/_*     -= o =- /)\     '
-                 *  '..'  ':::'     * /\ *     .'/.\'.  '      *
-                 *      *            *..*         :           *
-                 *       *                        *          *
-                 *       *                        *          *
-                 */
-
-                /*
-                 * Color map
-                 *       AAAA      D        GGGG    JJJJJJ     K
-                 *      AAAAAA   DDDDD  EEEGGGGGG   JJJJJJ  KKKKKKK
-                 *  BBBBAAAAAA    DDD   EEEGGGGGG  I JJJJJ  KKKKKKK
-                 * BBBBBBACCCCC    D FFFF    G IIIIIIIHHHHH KKKKKKK
-                 * BBBBBB CCCCC     FFFFFF     IIIIIII HHH     K
-                 *  BBBB  CCCCC     FFFFFF     IIIIIII  H      k
-                 *      b            FFFF         I           k
-                 *       b                        i          k
-                 *       b                        i          k
-                 */
-            Object[] colorParams = new Object[]{chatColorChoose(), chatColorChoose(), chatColorChoose(), chatColorChoose(), chatColorChoose(), chatColorChoose(), chatColorChoose(), chatColorChoose(), chatColorChoose(), chatColorChoose(), chatColorChoose()};
-            sender.sendMessage(String.format("      %1$s.''.      %4$s.        %7$s*''*    %10$s:_\\/_:     %11$s.", colorParams));
-            sender.sendMessage(String.format("     %1$s:_\\/_:   %4$s_\\(/_  %5$s.:.%7$s*_\\/_*   %10$s: /\\ :  %11$s.'.:.'.", colorParams));
-            sender.sendMessage(String.format(" %2$s.''.%1$s: /\\ :    %4$s/)\\   %5$s':'%7$s* /\\ *  %9$s: %10$s'..'.  %11$s-=:o:=-", colorParams));
-            sender.sendMessage(String.format("%2$s:_\\/_:%1$s'%3$s.:::.    %4$s' %6$s*''*    %7$s* %9$s'.\\'/.'%8$s_\\(/_ %11$s'.':'.'", colorParams));
-            sender.sendMessage(String.format("%2$s: /\\ : %3$s:::::     %6$s*_\\/_*     %9$s-= o =-%8$s /)\\     %11$s'", colorParams));
-            sender.sendMessage(String.format(" %2$s'..'  %3$s':::'     %6$s* /\\ *     %9$s.'/.\\'.  %8$s'      %11$s*", colorParams));
-            sender.sendMessage(String.format("     %2$s*            %6$s*..*         %9$s:           %11$s*", colorParams));
-            sender.sendMessage(String.format("      %2$s*                        %9$s*          %11$s*", colorParams));
-            sender.sendMessage(String.format("      %2$s*                        %9$s*          %11$s*", colorParams));
+//        catch (Exception ex) {
+//            mcMMO.p.getLogger().severe(ex.toString());
+//        }
+//    }
+//
+//    // This gets called from /mcmmo command
+//    public void anniversaryCheck(final CommandSender sender) {
+//        GregorianCalendar anniversaryStart = new GregorianCalendar(currentYear, Calendar.FEBRUARY, 3);
+//        GregorianCalendar anniversaryEnd = new GregorianCalendar(currentYear, Calendar.FEBRUARY, 6);
+//        GregorianCalendar day = new GregorianCalendar();
+//
+//        if (hasCelebrated.contains(sender.getName())) {
+//            return;
+//        }
+//
+//        if (!getDateRange(day.getTime(), anniversaryStart.getTime(), anniversaryEnd.getTime())) {
+//            return;
+//        }
+//
+//        sender.sendMessage(LocaleLoader.getString("Holiday.Anniversary", (currentYear - START_YEAR)));
+//        /*if (sender instanceof Player) {
+//            final int firework_amount = 10;
+//            for (int i = 0; i < firework_amount; i++) {
+//                int delay = (int) (Misc.getRandom().nextDouble() * 3 * Misc.TICK_CONVERSION_FACTOR) + 4;
+//                mcMMO.p.getServer().getScheduler().runTaskLater(mcMMO.p, new Runnable() {
+//                    @Override
+//                    public void run() {
+//                        spawnFireworks((Player) sender);
+//                    }
+//                }, delay);
+//            }
+//        }*/
+////        else {
+//                /*
+//                 * Credit: http://www.geocities.com/spunk1111/
+//                 *  (good luck finding that in 3 years heh)
+//                 *       .''.      .        *''*    :_\/_:     .
+//                 *      :_\/_:   _\(/_  .:.*_\/_*   : /\ :  .'.:.'.
+//                 *  .''.: /\ :    /)\   ':'* /\ *  : '..'.  -=:o:=-
+//                 * :_\/_:'.:::.    ' *''*    * '.\'/.'_\(/_ '.':'.'
+//                 * : /\ : :::::     *_\/_*     -= o =- /)\     '
+//                 *  '..'  ':::'     * /\ *     .'/.\'.  '      *
+//                 *      *            *..*         :           *
+//                 *       *                        *          *
+//                 *       *                        *          *
+//                 */
+//
+//                /*
+//                 * Color map
+//                 *       AAAA      D        GGGG    JJJJJJ     K
+//                 *      AAAAAA   DDDDD  EEEGGGGGG   JJJJJJ  KKKKKKK
+//                 *  BBBBAAAAAA    DDD   EEEGGGGGG  I JJJJJ  KKKKKKK
+//                 * BBBBBBACCCCC    D FFFF    G IIIIIIIHHHHH KKKKKKK
+//                 * BBBBBB CCCCC     FFFFFF     IIIIIII HHH     K
+//                 *  BBBB  CCCCC     FFFFFF     IIIIIII  H      k
+//                 *      b            FFFF         I           k
+//                 *       b                        i          k
+//                 *       b                        i          k
+//                 */
+//            Object[] colorParams = new Object[]{chatColorChoose(), chatColorChoose(), chatColorChoose(), chatColorChoose(), chatColorChoose(), chatColorChoose(), chatColorChoose(), chatColorChoose(), chatColorChoose(), chatColorChoose(), chatColorChoose()};
+//            sender.sendMessage(String.format("      %1$s.''.      %4$s.        %7$s*''*    %10$s:_\\/_:     %11$s.", colorParams));
+//            sender.sendMessage(String.format("     %1$s:_\\/_:   %4$s_\\(/_  %5$s.:.%7$s*_\\/_*   %10$s: /\\ :  %11$s.'.:.'.", colorParams));
+//            sender.sendMessage(String.format(" %2$s.''.%1$s: /\\ :    %4$s/)\\   %5$s':'%7$s* /\\ *  %9$s: %10$s'..'.  %11$s-=:o:=-", colorParams));
+//            sender.sendMessage(String.format("%2$s:_\\/_:%1$s'%3$s.:::.    %4$s' %6$s*''*    %7$s* %9$s'.\\'/.'%8$s_\\(/_ %11$s'.':'.'", colorParams));
+//            sender.sendMessage(String.format("%2$s: /\\ : %3$s:::::     %6$s*_\\/_*     %9$s-= o =-%8$s /)\\     %11$s'", colorParams));
+//            sender.sendMessage(String.format(" %2$s'..'  %3$s':::'     %6$s* /\\ *     %9$s.'/.\\'.  %8$s'      %11$s*", colorParams));
+//            sender.sendMessage(String.format("     %2$s*            %6$s*..*         %9$s:           %11$s*", colorParams));
+//            sender.sendMessage(String.format("      %2$s*                        %9$s*          %11$s*", colorParams));
+//            sender.sendMessage(String.format("      %2$s*                        %9$s*          %11$s*", colorParams));
+////        }
+//
+//        hasCelebrated.add(sender.getName());
+//    }
+//
+//    public boolean getDateRange(Date date, Date start, Date end) {
+//        return !(date.before(start) || date.after(end));
+//    }
+//
+////    public void spawnFireworks(Player player) {
+////        int power = Misc.getRandom().nextInt(3) + 1;
+////        Type fireworkType = Type.values()[Misc.getRandom().nextInt(Type.values().length)];
+////        double varX = Misc.getRandom().nextGaussian() * 3;
+////        double varZ = Misc.getRandom().nextGaussian() * 3;
+////
+////        Firework fireworks = (Firework) player.getWorld().spawnEntity(player.getLocation().add(varX, 0, varZ), EntityType.FIREWORK);
+////        FireworkMeta fireworkmeta = fireworks.getFireworkMeta();
+////        FireworkEffect effect = FireworkEffect.builder().flicker(Misc.getRandom().nextBoolean()).withColor(colorChoose()).withFade(colorChoose()).with(fireworkType).trail(Misc.getRandom().nextBoolean()).build();
+////        fireworkmeta.addEffect(effect);
+////        fireworkmeta.setPower(power);
+////        fireworks.setFireworkMeta(fireworkmeta);
+////    }
+//
+//    private static List<Color> colorChoose() {
+//        return ALL_COLORS.subList(0, Math.max(Misc.getRandom().nextInt(ALL_COLORS.size() + 1), 1));
+//    }
+//
+//    private static String chatColorChoose() {
+//        StringBuilder ret = new StringBuilder(ALL_CHAT_COLORS.get(Misc.getRandom().nextInt(ALL_CHAT_COLORS.size())).toString());
+//
+//        for (ChatColor chatFormat : CHAT_FORMATS) {
+//            if (Misc.getRandom().nextInt(CHAT_FORMATS.size()) == 0) {
+//                ret.append(chatFormat);
+//            }
 //        }
-
-        hasCelebrated.add(sender.getName());
-    }
-
-    public boolean getDateRange(Date date, Date start, Date end) {
-        return !(date.before(start) || date.after(end));
-    }
-
-//    public void spawnFireworks(Player player) {
-//        int power = Misc.getRandom().nextInt(3) + 1;
-//        Type fireworkType = Type.values()[Misc.getRandom().nextInt(Type.values().length)];
-//        double varX = Misc.getRandom().nextGaussian() * 3;
-//        double varZ = Misc.getRandom().nextGaussian() * 3;
-//
-//        Firework fireworks = (Firework) player.getWorld().spawnEntity(player.getLocation().add(varX, 0, varZ), EntityType.FIREWORK);
-//        FireworkMeta fireworkmeta = fireworks.getFireworkMeta();
-//        FireworkEffect effect = FireworkEffect.builder().flicker(Misc.getRandom().nextBoolean()).withColor(colorChoose()).withFade(colorChoose()).with(fireworkType).trail(Misc.getRandom().nextBoolean()).build();
-//        fireworkmeta.addEffect(effect);
-//        fireworkmeta.setPower(power);
-//        fireworks.setFireworkMeta(fireworkmeta);
+//
+//        return ret.toString();
+//    }
+//
+//    public boolean isAprilFirst() {
+//        if(!Config.getInstance().isAprilFoolsAllowed())
+//            return false;
+//
+//        GregorianCalendar aprilFirst = new GregorianCalendar(currentYear, Calendar.APRIL, 1);
+//        GregorianCalendar aprilSecond = new GregorianCalendar(currentYear, Calendar.APRIL, 2);
+//        GregorianCalendar day = new GregorianCalendar();
+//        return getDateRange(day.getTime(), aprilFirst.getTime(), aprilSecond.getTime());
+//    }
+//
+//    public boolean nearingAprilFirst() {
+//        if(!Config.getInstance().isAprilFoolsAllowed())
+//            return false;
+//
+//        GregorianCalendar start = new GregorianCalendar(Calendar.getInstance().get(Calendar.YEAR), Calendar.MARCH, 28);
+//        GregorianCalendar end = new GregorianCalendar(Calendar.getInstance().get(Calendar.YEAR), Calendar.APRIL, 2);
+//        GregorianCalendar day = new GregorianCalendar();
+//
+//        return mcMMO.getHolidayManager().getDateRange(day.getTime(), start.getTime(), end.getTime());
+//    }
+//
+//    public void handleStatisticEvent(PlayerStatisticIncrementEvent event) {
+//        Player player = event.getPlayer();
+//        Statistic statistic = event.getStatistic();
+//        int newValue = event.getNewValue();
+//
+//        int modifier;
+//        switch (statistic) {
+//            case DAMAGE_TAKEN:
+//                modifier = 500;
+//                break;
+//            case JUMP:
+//                modifier = 500;
+//                break;
+//            case DROP:
+//                modifier = 200;
+//                break;
+//            case MINE_BLOCK:
+//            case BREAK_ITEM:
+//                modifier = 500;
+//                break;
+//            case CRAFT_ITEM:
+//                modifier = 100;
+//                break;
+//            default:
+//                return;
+//        }
+//
+//        if (newValue % modifier == 0) {
+//            mcMMO.getHolidayManager().levelUpApril(player, FakeSkillType.getByStatistic(statistic));
+//        }
+//    }
+//
+//    public void levelUpApril(Player player, FakeSkillType fakeSkillType) {
+//        if(!Config.getInstance().isAprilFoolsAllowed())
+//            return;
+//
+//        int levelTotal = Misc.getRandom().nextInt(1 + UserManager.getPlayer(player).getSkillLevel(PrimarySkillType.MINING)) + 1;
+//        SoundManager.sendSound(player, player.getLocation(), SoundType.LEVEL_UP);
+//        NotificationManager.sendPlayerInformation(player, NotificationType.HOLIDAY, "Holiday.AprilFools.Levelup", StringUtils.getCapitalized(fakeSkillType.toString()), String.valueOf(levelTotal));
+////        ParticleEffectUtils.fireworkParticleShower(player, ALL_COLORS.get(Misc.getRandom().nextInt(ALL_COLORS.size())));
+//    }
+//
+//    public void registerAprilCommand() {
+//        if(!Config.getInstance().isAprilFoolsAllowed())
+//            return;
+//
+//        PluginCommand command = mcMMO.p.getCommand("mcfools");
+//        command.setExecutor(new AprilCommand());
 //    }
-
-    private static List<Color> colorChoose() {
-        return ALL_COLORS.subList(0, Math.max(Misc.getRandom().nextInt(ALL_COLORS.size() + 1), 1));
-    }
-
-    private static String chatColorChoose() {
-        StringBuilder ret = new StringBuilder(ALL_CHAT_COLORS.get(Misc.getRandom().nextInt(ALL_CHAT_COLORS.size())).toString());
-
-        for (ChatColor chatFormat : CHAT_FORMATS) {
-            if (Misc.getRandom().nextInt(CHAT_FORMATS.size()) == 0) {
-                ret.append(chatFormat);
-            }
-        }
-
-        return ret.toString();
-    }
-
-    public boolean isAprilFirst() {
-        if(!Config.getInstance().isAprilFoolsAllowed())
-            return false;
-
-        GregorianCalendar aprilFirst = new GregorianCalendar(currentYear, Calendar.APRIL, 1);
-        GregorianCalendar aprilSecond = new GregorianCalendar(currentYear, Calendar.APRIL, 2);
-        GregorianCalendar day = new GregorianCalendar();
-        return getDateRange(day.getTime(), aprilFirst.getTime(), aprilSecond.getTime());
-    }
-
-    public boolean nearingAprilFirst() {
-        if(!Config.getInstance().isAprilFoolsAllowed())
-            return false;
-
-        GregorianCalendar start = new GregorianCalendar(Calendar.getInstance().get(Calendar.YEAR), Calendar.MARCH, 28);
-        GregorianCalendar end = new GregorianCalendar(Calendar.getInstance().get(Calendar.YEAR), Calendar.APRIL, 2);
-        GregorianCalendar day = new GregorianCalendar();
-
-        return mcMMO.getHolidayManager().getDateRange(day.getTime(), start.getTime(), end.getTime());
-    }
-
-    public void handleStatisticEvent(PlayerStatisticIncrementEvent event) {
-        Player player = event.getPlayer();
-        Statistic statistic = event.getStatistic();
-        int newValue = event.getNewValue();
-
-        int modifier;
-        switch (statistic) {
-            case DAMAGE_TAKEN:
-                modifier = 500;
-                break;
-            case JUMP:
-                modifier = 500;
-                break;
-            case DROP:
-                modifier = 200;
-                break;
-            case MINE_BLOCK:
-            case BREAK_ITEM:
-                modifier = 500;
-                break;
-            case CRAFT_ITEM:
-                modifier = 100;
-                break;
-            default:
-                return;
-        }
-
-        if (newValue % modifier == 0) {
-            mcMMO.getHolidayManager().levelUpApril(player, FakeSkillType.getByStatistic(statistic));
-        }
-    }
-
-    public void levelUpApril(Player player, FakeSkillType fakeSkillType) {
-        if(!Config.getInstance().isAprilFoolsAllowed())
-            return;
-
-        int levelTotal = Misc.getRandom().nextInt(1 + UserManager.getPlayer(player).getSkillLevel(PrimarySkillType.MINING)) + 1;
-        SoundManager.sendSound(player, player.getLocation(), SoundType.LEVEL_UP);
-        NotificationManager.sendPlayerInformation(player, NotificationType.HOLIDAY, "Holiday.AprilFools.Levelup", StringUtils.getCapitalized(fakeSkillType.toString()), String.valueOf(levelTotal));
-//        ParticleEffectUtils.fireworkParticleShower(player, ALL_COLORS.get(Misc.getRandom().nextInt(ALL_COLORS.size())));
-    }
-
-    public void registerAprilCommand() {
-        if(!Config.getInstance().isAprilFoolsAllowed())
-            return;
-
-        PluginCommand command = mcMMO.p.getCommand("mcfools");
-        command.setExecutor(new AprilCommand());
-    }
-}
+//}

src/main/java/com/gmail/nossr50/util/experience/ExperienceBarManager.java

@@ -1,5 +1,6 @@
 package com.gmail.nossr50.util.experience;
 
+import com.gmail.nossr50.config.experience.ExperienceConfig;
 import com.gmail.nossr50.datatypes.player.McMMOPlayer;
 import com.gmail.nossr50.datatypes.skills.PrimarySkillType;
 import com.gmail.nossr50.runnables.skills.ExperienceBarHideTask;

src/main/java/com/gmail/nossr50/util/experience/ExperienceBarWrapper.java

@@ -1,5 +1,6 @@
 package com.gmail.nossr50.util.experience;
 
+import com.gmail.nossr50.config.experience.ExperienceConfig;
 import com.gmail.nossr50.datatypes.player.McMMOPlayer;
 import com.gmail.nossr50.datatypes.skills.PrimarySkillType;
 import com.gmail.nossr50.locale.LocaleLoader;

src/main/java/com/gmail/nossr50/util/player/NotificationManager.java

@@ -1,5 +1,6 @@
 package com.gmail.nossr50.util.player;
 
+import com.gmail.nossr50.config.AdvancedConfig;
 import com.gmail.nossr50.datatypes.interactions.NotificationType;
 import com.gmail.nossr50.datatypes.player.McMMOPlayer;
 import com.gmail.nossr50.datatypes.skills.PrimarySkillType;

src/main/java/com/gmail/nossr50/util/random/RandomChanceUtil.java

@@ -1,5 +1,6 @@
 package com.gmail.nossr50.util.random;
 
+import com.gmail.nossr50.config.AdvancedConfig;
 import com.gmail.nossr50.datatypes.skills.PrimarySkillType;
 import com.gmail.nossr50.datatypes.skills.SubSkillType;
 import com.gmail.nossr50.datatypes.skills.subskills.AbstractSubSkill;

src/main/java/com/gmail/nossr50/util/skills/PerksUtils.java

@@ -1,5 +1,6 @@
 package com.gmail.nossr50.util.skills;
 
+import com.gmail.nossr50.config.experience.ExperienceConfig;
 import com.gmail.nossr50.datatypes.skills.PrimarySkillType;
 import com.gmail.nossr50.util.Permissions;
 import org.bukkit.entity.Player;

src/main/java/com/gmail/nossr50/util/skills/RankUtils.java

@@ -1,5 +1,6 @@
 package com.gmail.nossr50.util.skills;
 
+import com.gmail.nossr50.config.RankConfig;
 import com.gmail.nossr50.datatypes.player.McMMOPlayer;
 import com.gmail.nossr50.datatypes.skills.PrimarySkillType;
 import com.gmail.nossr50.datatypes.skills.SubSkillType;

src/main/java/com/gmail/nossr50/util/sounds/SoundManager.java

@@ -1,5 +1,6 @@
 package com.gmail.nossr50.util.sounds;
 
+import com.gmail.nossr50.config.SoundConfig;
 import com.gmail.nossr50.util.Misc;
 import org.bukkit.Location;
 import org.bukkit.Sound;
@@ -14,13 +15,13 @@ public class SoundManager {
      */
     public static void sendSound(Player player, Location location, SoundType soundType)
     {
-        if(SoundMainConfig.getInstance().getIsEnabled(soundType))
+        if(SoundConfig.getInstance().getIsEnabled(soundType))
             player.playSound(location, getSound(soundType), SoundCategory.MASTER, getVolume(soundType), getPitch(soundType));
     }
 
     public static void sendCategorizedSound(Player player, Location location, SoundType soundType, SoundCategory soundCategory)
     {
-        if(SoundMainConfig.getInstance().getIsEnabled(soundType))
+        if(SoundConfig.getInstance().getIsEnabled(soundType))
             player.playSound(location, getSound(soundType), soundCategory, getVolume(soundType), getPitch(soundType));
     }
 
@@ -28,13 +29,13 @@ public class SoundManager {
     {
         float totalPitch = Math.min(2.0F, (getPitch(soundType) + pitchModifier));
 
-        if(SoundMainConfig.getInstance().getIsEnabled(soundType))
+        if(SoundConfig.getInstance().getIsEnabled(soundType))
             player.playSound(location, getSound(soundType), soundCategory, getVolume(soundType), totalPitch);
     }
 
     public static void worldSendSound(World world, Location location, SoundType soundType)
     {
-        if(SoundMainConfig.getInstance().getIsEnabled(soundType))
+        if(SoundConfig.getInstance().getIsEnabled(soundType))
             world.playSound(location, getSound(soundType), getVolume(soundType), getPitch(soundType));
     }
 
@@ -45,7 +46,7 @@ public class SoundManager {
      */
     private static float getVolume(SoundType soundType)
     {
-        return SoundMainConfig.getInstance().getVolume(soundType) * SoundMainConfig.getInstance().getMasterVolume();
+        return SoundConfig.getInstance().getVolume(soundType) * SoundConfig.getInstance().getMasterVolume();
     }
 
     private static float getPitch(SoundType soundType)
@@ -55,7 +56,7 @@ public class SoundManager {
         else if (soundType == SoundType.POP)
             return getPopPitch();
         else
-            return SoundMainConfig.getInstance().getPitch(soundType);
+            return SoundConfig.getInstance().getPitch(soundType);
     }
 
     private static Sound getSound(SoundType soundType)