fixing many compiler errors for configs

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/FishingCommand.java

@@ -1,5 +1,7 @@
 package com.gmail.nossr50.commands.skills;
 
+import com.gmail.nossr50.config.AdvancedConfig;
+import com.gmail.nossr50.config.treasure.FishingTreasureConfig;
 import com.gmail.nossr50.datatypes.skills.PrimarySkillType;
 import com.gmail.nossr50.datatypes.skills.SubSkillType;
 import com.gmail.nossr50.datatypes.treasure.Rarity;
@@ -56,19 +58,19 @@ public class FishingCommand extends SkillCommand {
             lootTier = fishingManager.getLootTier();
 
             // Item drop rates
-            commonTreasure = percent.format(TreasureConfig.getInstance().getItemDropRate(lootTier, Rarity.COMMON) / 100.0);
+            commonTreasure = percent.format(FishingTreasureConfig.getInstance().getItemDropRate(lootTier, Rarity.COMMON) / 100.0);
-            uncommonTreasure = percent.format(TreasureConfig.getInstance().getItemDropRate(lootTier, Rarity.UNCOMMON) / 100.0);
+            uncommonTreasure = percent.format(FishingTreasureConfig.getInstance().getItemDropRate(lootTier, Rarity.UNCOMMON) / 100.0);
-            rareTreasure = percent.format(TreasureConfig.getInstance().getItemDropRate(lootTier, Rarity.RARE) / 100.0);
+            rareTreasure = percent.format(FishingTreasureConfig.getInstance().getItemDropRate(lootTier, Rarity.RARE) / 100.0);
-            epicTreasure = percent.format(TreasureConfig.getInstance().getItemDropRate(lootTier, Rarity.EPIC) / 100.0);
+            epicTreasure = percent.format(FishingTreasureConfig.getInstance().getItemDropRate(lootTier, Rarity.EPIC) / 100.0);
-            legendaryTreasure = percent.format(TreasureConfig.getInstance().getItemDropRate(lootTier, Rarity.LEGENDARY) / 100.0);
+            legendaryTreasure = percent.format(FishingTreasureConfig.getInstance().getItemDropRate(lootTier, Rarity.LEGENDARY) / 100.0);
-            recordTreasure = percent.format(TreasureConfig.getInstance().getItemDropRate(lootTier, Rarity.RECORD) / 100.0);
+            recordTreasure = percent.format(FishingTreasureConfig.getInstance().getItemDropRate(lootTier, Rarity.RECORD) / 100.0);
 
             // Magic hunter drop rates
             double totalEnchantChance = 0;
 
             for (Rarity rarity : Rarity.values()) {
                 if (rarity != Rarity.RECORD) {
-                    totalEnchantChance += TreasureConfig.getInstance().getEnchantmentDropRate(lootTier, rarity);
+                    totalEnchantChance += FishingTreasureConfig.getInstance().getEnchantmentDropRate(lootTier, rarity);
                 }
             }
 

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

@@ -93,7 +93,7 @@ public class HerbalismCommand extends SkillCommand {
         canGreenThumbPlants = RankUtils.hasUnlockedSubskill(player, SubSkillType.HERBALISM_GREEN_THUMB) && (Permissions.greenThumbPlant(player, Material.WHEAT) || Permissions.greenThumbPlant(player, Material.CARROT) || Permissions.greenThumbPlant(player, Material.POTATO) || Permissions.greenThumbPlant(player, Material.BEETROOT) || Permissions.greenThumbPlant(player, Material.NETHER_WART) || Permissions.greenThumbPlant(player, Material.COCOA));
         canGreenThumbBlocks = RankUtils.hasUnlockedSubskill(player, SubSkillType.HERBALISM_GREEN_THUMB) && (Permissions.greenThumbBlock(player, Material.DIRT) || Permissions.greenThumbBlock(player, Material.COBBLESTONE) || Permissions.greenThumbBlock(player, Material.COBBLESTONE_WALL) || Permissions.greenThumbBlock(player, Material.STONE_BRICKS));
         canFarmersDiet = canUseSubskill(player, SubSkillType.HERBALISM_FARMERS_DIET);
-        canDoubleDrop = canUseSubskill(player, SubSkillType.HERBALISM_DOUBLE_DROPS) && !skill.getDoubleDropsDisabled();
+        canDoubleDrop = canUseSubskill(player, SubSkillType.HERBALISM_DOUBLE_DROPS);
         canShroomThumb = canUseSubskill(player, SubSkillType.HERBALISM_SHROOM_THUMB);
     }
 

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

@@ -72,7 +72,7 @@ public class MiningCommand extends SkillCommand {
         canBiggerBombs = RankUtils.hasUnlockedSubskill(player, SubSkillType.MINING_BIGGER_BOMBS) && Permissions.biggerBombs(player);
         canBlast = RankUtils.hasUnlockedSubskill(player, SubSkillType.MINING_BLAST_MINING) && Permissions.remoteDetonation(player);
         canDemoExpert = RankUtils.hasUnlockedSubskill(player, SubSkillType.MINING_DEMOLITIONS_EXPERTISE) && Permissions.demolitionsExpertise(player);
-        canDoubleDrop = Permissions.isSubSkillEnabled(player, SubSkillType.MINING_DOUBLE_DROPS) && !skill.getDoubleDropsDisabled();
+        canDoubleDrop = Permissions.isSubSkillEnabled(player, SubSkillType.MINING_DOUBLE_DROPS);
         canSuperBreaker = RankUtils.hasUnlockedSubskill(player, SubSkillType.MINING_SUPER_BREAKER) && Permissions.superBreaker(player);
     }
 

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

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

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/commands/skills/WoodcuttingCommand.java

@@ -54,7 +54,7 @@ public class WoodcuttingCommand extends SkillCommand {
     @Override
     protected void permissionsCheck(Player player) {
         canTreeFell = RankUtils.hasUnlockedSubskill(player, SubSkillType.WOODCUTTING_TREE_FELLER) && Permissions.treeFeller(player);
-        canDoubleDrop = canUseSubskill(player, SubSkillType.WOODCUTTING_HARVEST_LUMBER) && !skill.getDoubleDropsDisabled() && RankUtils.getRank(player, SubSkillType.WOODCUTTING_HARVEST_LUMBER) >= 1;
+        canDoubleDrop = canUseSubskill(player, SubSkillType.WOODCUTTING_HARVEST_LUMBER) && RankUtils.getRank(player, SubSkillType.WOODCUTTING_HARVEST_LUMBER) >= 1;
         canLeafBlow = canUseSubskill(player, SubSkillType.WOODCUTTING_LEAF_BLOWER);
         /*canSplinter = canUseSubskill(player, SubSkillType.WOODCUTTING_SPLINTER);
         canBarkSurgeon = canUseSubskill(player, SubSkillType.WOODCUTTING_BARK_SURGEON);

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

@@ -3,6 +3,7 @@ package com.gmail.nossr50.config;
 import com.gmail.nossr50.mcMMO;
 import com.google.common.io.Files;
 import com.google.common.reflect.TypeToken;
+import ninja.leaping.configurate.ConfigurationNode;
 import ninja.leaping.configurate.commented.CommentedConfigurationNode;
 import ninja.leaping.configurate.loader.ConfigurationLoader;
 import ninja.leaping.configurate.objectmapping.ObjectMappingException;
@@ -33,8 +34,11 @@ public abstract class Config implements VersionedConfig, Unload {
 
     /* LOADERS */
 
-    private ConfigurationLoader<CommentedConfigurationNode> defaultCopyLoader;
+    private YAMLConfigurationLoader defaultCopyLoader;
-    private ConfigurationLoader<CommentedConfigurationNode> userCopyLoader;
+    private YAMLConfigurationLoader userCopyLoader;
+
+    //private ConfigurationLoader<CommentedConfigurationNode> defaultCopyLoader;
+    //private ConfigurationLoader<CommentedConfigurationNode> userCopyLoader;
 
     /* CONFIG FILES */
 
@@ -43,8 +47,8 @@ public abstract class Config implements VersionedConfig, Unload {
 
     /* ROOT NODES */
 
-    private CommentedConfigurationNode userRootNode = null;
+    private ConfigurationNode userRootNode = null;
-    private CommentedConfigurationNode defaultRootNode = null;
+    private ConfigurationNode defaultRootNode = null;
 
     /* CONFIG MANAGER */
     //private ConfigurationLoader<CommentedConfigurationNode> configManager;
@@ -124,10 +128,10 @@ public abstract class Config implements VersionedConfig, Unload {
     private void loadConfig()
     {
         try {
-            final CommentedConfigurationNode defaultConfig = this.defaultCopyLoader.load();
+            final ConfigurationNode defaultConfig = this.defaultCopyLoader.load();
             defaultRootNode = defaultConfig;
 
-            final CommentedConfigurationNode userConfig = this.userCopyLoader.load();
+            final ConfigurationNode userConfig = this.userCopyLoader.load();
             userRootNode = userConfig;
 
         } catch (IOException e) {
@@ -311,7 +315,7 @@ public abstract class Config implements VersionedConfig, Unload {
         if(!removeOldKeys)
             return;
 
-        for(CommentedConfigurationNode configurationNode : defaultRootNode.getChildrenList())
+        for(ConfigurationNode configurationNode : defaultRootNode.getChildrenList())
         {
 
         }
@@ -340,7 +344,7 @@ public abstract class Config implements VersionedConfig, Unload {
      * Returns the root node of this config
      * @return the root node of this config
      */
-    protected CommentedConfigurationNode getUserRootNode() {
+    protected ConfigurationNode getUserRootNode() {
         return userRootNode;
     }
 

src/main/java/com/gmail/nossr50/config/collectionconfigs/MultiConfigContainer.java

@@ -45,7 +45,7 @@ public class MultiConfigContainer<T> implements Unload {
         //Load Configs
 
         //Vanilla Config
-        initConfigAndAddCollection(mcMMO.p.getDataFolder().getAbsolutePath(),getVanillaConfigName(configPrefix), false, true, false);
+        initConfigAndAddCollection(getVanillaConfigName(configPrefix), false, true);
 
         //Custom Configs
         loadCustomCollections(configPrefix);
@@ -90,20 +90,19 @@ public class MultiConfigContainer<T> implements Unload {
 
     /**
      * Initializes a config and attempts to load add its collection
-     * @param parentFolderPath Path to the "parent" folder on disk
+     * @param fileName
-     * @param relativePath Path to the config relative to the "parent" folder, this should mirror internal structure of resource files
+     * @param merge
-     * @param mergeNewKeys if true, the users config will add keys found in the internal file that are missing from the users file during load
      * @param copyDefaults if true, the users config file when it is first made will be a copy of an internal resource file of the same name and path
-     * @param removeOldKeys if true, the users config file will have keys not found in the internal default resource file of the same name and path removed
      */
-    private void initConfigAndAddCollection(String parentFolderPath, String relativePath, boolean mergeNewKeys, boolean copyDefaults, boolean removeOldKeys)
+    private void initConfigAndAddCollection(String fileName, boolean merge, boolean copyDefaults)
     {
-        mcMMO.p.getLogger().info("Reading from collection config - "+relativePath);
+        mcMMO.p.getLogger().info("Reading from collection config - "+fileName);
         ConfigCollection configCollection = null;
 
         try {
             //String parentFolderPath, String relativePath, boolean mergeNewKeys, boolean copyDefaults, boolean removeOldKeys
-            configCollection = (ConfigCollection) getConfigClass(collectionClassType).getConstructor(String.class, String.class, Boolean.class, Boolean.class, Boolean.class).newInstance(parentFolderPath, relativePath, mergeNewKeys, copyDefaults, removeOldKeys);
+            //String fileName, boolean merge, boolean copyDefaults
+            configCollection = (ConfigCollection) getConfigClass(collectionClassType).getConstructor(String.class, Boolean.class, Boolean.class).newInstance(fileName, merge, copyDefaults);
         } catch (InstantiationException e) {
             e.printStackTrace();
         } catch (IllegalAccessException e) {
@@ -150,7 +149,7 @@ public class MultiConfigContainer<T> implements Unload {
                 continue;
 
             //Load and add the collections
-            initConfigAndAddCollection(dataFolder.getAbsolutePath(), fileName, false, false, false);
+            initConfigAndAddCollection(fileName, false, false);
         }
     }
 

src/main/java/com/gmail/nossr50/config/collectionconfigs/RepairConfig.java

@@ -31,9 +31,9 @@ public class RepairConfig extends ConfigCollection {
     public static final String MINIMUM_LEVEL = "MinimumLevel";
     public static final String MINIMUM_QUANTITY = "MinimumQuantity";
 
-    public RepairConfig(String fileName, boolean merge) {
+    public RepairConfig(String fileName, boolean merge, boolean copyDefaults) {
         //super(McmmoCore.getDataFolderPath().getAbsoluteFile(), fileName, false);
-        super(mcMMO.p.getDataFolder().getAbsoluteFile(), fileName, false, merge);
+        super(mcMMO.p.getDataFolder().getAbsoluteFile(), fileName, merge, copyDefaults, false);
     }
 
     /**

src/main/java/com/gmail/nossr50/config/collectionconfigs/SalvageConfig.java

@@ -27,9 +27,9 @@ public class SalvageConfig extends ConfigCollection {
     public static final String XP_MULTIPLIER = "XpMultiplier";
     public static final String MAXIMUM_QUANTITY = "MaximumQuantity";
 
-    public SalvageConfig(String fileName, boolean merge) {
+    public SalvageConfig(String fileName, boolean merge, boolean copyDefaults) {
         //super(McmmoCore.getDataFolderPath().getAbsoluteFile(), fileName, false);
-        super(mcMMO.p.getDataFolder().getAbsoluteFile(), fileName, false, merge);
+        super(mcMMO.p.getDataFolder().getAbsoluteFile(), fileName, merge, copyDefaults, false);
     }
 
     /**

src/main/java/com/gmail/nossr50/config/skills/alchemy/PotionConfig.java

@@ -1,5 +1,6 @@
 package com.gmail.nossr50.config.skills.alchemy;
 
+import com.gmail.nossr50.config.AdvancedConfig;
 import com.gmail.nossr50.config.ConfigCollection;
 import com.gmail.nossr50.datatypes.skills.alchemy.AlchemyPotion;
 import com.gmail.nossr50.mcMMO;
@@ -67,6 +68,18 @@ public class PotionConfig extends ConfigCollection {
         register();
     }
 
+    /**
+     * This grabs an instance of this config class from the Config Manager
+     * This method is deprecated and will be removed in the future
+     * @see mcMMO#getConfigManager()
+     * @return the instance of this config
+     * @deprecated Please use mcMMO.getConfigManager() to grab a specific config instead
+     */
+    @Deprecated
+    public static PotionConfig getInstance() {
+        return mcMMO.getConfigManager().getPotionConfig();
+    }
+
     /**
      * The version of this config
      *

src/main/java/com/gmail/nossr50/config/treasure/FishingTreasureConfig.java

@@ -3,14 +3,16 @@ package com.gmail.nossr50.config.treasure;
 import com.gmail.nossr50.config.Config;
 import com.gmail.nossr50.config.Registers;
 import com.gmail.nossr50.config.UnsafeValueValidation;
-import com.gmail.nossr50.datatypes.treasure.*;
+import com.gmail.nossr50.datatypes.treasure.EnchantmentTreasure;
+import com.gmail.nossr50.datatypes.treasure.FishingTreasure;
+import com.gmail.nossr50.datatypes.treasure.Rarity;
+import com.gmail.nossr50.datatypes.treasure.ShakeTreasure;
 import com.gmail.nossr50.mcMMO;
 import com.gmail.nossr50.util.EnchantmentUtils;
 import com.google.common.reflect.TypeToken;
 import ninja.leaping.configurate.ConfigurationNode;
 import ninja.leaping.configurate.objectmapping.ObjectMappingException;
 import org.bukkit.Material;
-import org.bukkit.configuration.ConfigurationSection;
 import org.bukkit.enchantments.Enchantment;
 import org.bukkit.entity.EntityType;
 

src/main/java/com/gmail/nossr50/config/treasure/TreasureFactory.java

@@ -11,9 +11,6 @@ import org.bukkit.ChatColor;
 import org.bukkit.Material;
 import org.bukkit.inventory.ItemStack;
 import org.bukkit.inventory.meta.ItemMeta;
-import org.bukkit.inventory.meta.PotionMeta;
-import org.bukkit.potion.PotionData;
-import org.bukkit.potion.PotionType;
 
 import java.util.ArrayList;
 import java.util.List;

src/main/java/com/gmail/nossr50/database/FlatfileDatabaseManager.java

@@ -1,5 +1,6 @@
 package com.gmail.nossr50.database;
 
+import com.gmail.nossr50.config.AdvancedConfig;
 import com.gmail.nossr50.config.MainConfig;
 import com.gmail.nossr50.datatypes.MobHealthbarType;
 import com.gmail.nossr50.datatypes.database.DatabaseType;
@@ -10,7 +11,6 @@ import com.gmail.nossr50.datatypes.player.UniqueDataType;
 import com.gmail.nossr50.datatypes.skills.PrimarySkillType;
 import com.gmail.nossr50.datatypes.skills.SuperAbilityType;
 import com.gmail.nossr50.mcMMO;
-import com.gmail.nossr50.runnables.database.UUIDUpdateAsyncTask;
 import com.gmail.nossr50.util.Misc;
 import com.gmail.nossr50.util.StringUtils;
 import org.bukkit.OfflinePlayer;
@@ -32,9 +32,9 @@ public final class FlatfileDatabaseManager implements DatabaseManager {
         checkStructure();
         updateLeaderboards();
 
-        if (mcMMO.getUpgradeManager().shouldUpgrade(UpgradeType.ADD_UUIDS)) {
+        /*if (mcMMO.getUpgradeManager().shouldUpgrade(UpgradeType.ADD_UUIDS)) {
             new UUIDUpdateAsyncTask(mcMMO.p, getStoredUsers()).runTaskAsynchronously(mcMMO.p);
-        }
+        }*/
     }
 
     public void purgePowerlessUsers() {
@@ -1079,13 +1079,13 @@ public final class FlatfileDatabaseManager implements DatabaseManager {
                 }
             }
 
-            mcMMO.getUpgradeManager().setUpgradeCompleted(UpgradeType.ADD_FISHING);
+            /*mcMMO.getUpgradeManager().setUpgradeCompleted(UpgradeType.ADD_FISHING);
             mcMMO.getUpgradeManager().setUpgradeCompleted(UpgradeType.ADD_BLAST_MINING_COOLDOWN);
             mcMMO.getUpgradeManager().setUpgradeCompleted(UpgradeType.ADD_SQL_INDEXES);
             mcMMO.getUpgradeManager().setUpgradeCompleted(UpgradeType.ADD_MOB_HEALTHBARS);
             mcMMO.getUpgradeManager().setUpgradeCompleted(UpgradeType.DROP_SQL_PARTY_NAMES);
             mcMMO.getUpgradeManager().setUpgradeCompleted(UpgradeType.DROP_SPOUT);
-            mcMMO.getUpgradeManager().setUpgradeCompleted(UpgradeType.ADD_ALCHEMY);
+            mcMMO.getUpgradeManager().setUpgradeCompleted(UpgradeType.ADD_ALCHEMY);*/
             return;
         }
 

src/main/java/com/gmail/nossr50/database/SQLDatabaseManager.java

@@ -1,5 +1,6 @@
 package com.gmail.nossr50.database;
 
+import com.gmail.nossr50.config.AdvancedConfig;
 import com.gmail.nossr50.config.MainConfig;
 import com.gmail.nossr50.datatypes.MobHealthbarType;
 import com.gmail.nossr50.datatypes.database.DatabaseType;
@@ -10,11 +11,9 @@ import com.gmail.nossr50.datatypes.player.UniqueDataType;
 import com.gmail.nossr50.datatypes.skills.PrimarySkillType;
 import com.gmail.nossr50.datatypes.skills.SuperAbilityType;
 import com.gmail.nossr50.mcMMO;
-import com.gmail.nossr50.runnables.database.UUIDUpdateAsyncTask;
 import com.gmail.nossr50.util.Misc;
 import org.apache.tomcat.jdbc.pool.DataSource;
 import org.apache.tomcat.jdbc.pool.PoolProperties;
-import org.bukkit.scheduler.BukkitRunnable;
 
 import java.sql.*;
 import java.util.*;
@@ -949,10 +948,10 @@ public final class SQLDatabaseManager implements DatabaseManager {
      * @param upgrade Upgrade to attempt to apply
      */
     private void checkDatabaseStructure(Connection connection, UpgradeType upgrade) {
-        if (!mcMMO.getUpgradeManager().shouldUpgrade(upgrade)) {
+        /*if (!mcMMO.getUpgradeManager().shouldUpgrade(upgrade)) {
             mcMMO.p.debug("Skipping " + upgrade.name() + " upgrade (unneeded)");
             return;
-        }
+        }*/
 
         Statement statement = null;
 
@@ -1012,7 +1011,7 @@ public final class SQLDatabaseManager implements DatabaseManager {
 
             }
 
-            mcMMO.getUpgradeManager().setUpgradeCompleted(upgrade);
+            //mcMMO.getUpgradeManager().setUpgradeCompleted(upgrade);
         }
         catch (SQLException ex) {
             printErrors(ex);
@@ -1293,10 +1292,10 @@ public final class SQLDatabaseManager implements DatabaseManager {
             tryClose(resultSet);
         }
 
-        new GetUUIDUpdatesRequired().runTaskLaterAsynchronously(mcMMO.p, 100); // wait until after first purge
+        //new GetUUIDUpdatesRequired().runTaskLaterAsynchronously(mcMMO.p, 100); // wait until after first purge
     }
 
-    private class GetUUIDUpdatesRequired extends BukkitRunnable {
+    /*private class GetUUIDUpdatesRequired extends BukkitRunnable {
         public void run() {
             massUpdateLock.lock();
             List<String> names = new ArrayList<String>();
@@ -1327,7 +1326,7 @@ public final class SQLDatabaseManager implements DatabaseManager {
                 massUpdateLock.unlock();
             }
         }
-    }
+    }*/
 
     private void checkUpgradeDropPartyNames(final Statement statement) {
         ResultSet resultSet = null;

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/party/Party.java

@@ -1,6 +1,7 @@
 package com.gmail.nossr50.datatypes.party;
 
 import com.gmail.nossr50.config.MainConfig;
+import com.gmail.nossr50.config.experience.ExperienceConfig;
 import com.gmail.nossr50.datatypes.experience.FormulaType;
 import com.gmail.nossr50.locale.LocaleLoader;
 import com.gmail.nossr50.mcMMO;

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

@@ -1,5 +1,6 @@
 package com.gmail.nossr50.datatypes.skills.alchemy;
 
+import com.gmail.nossr50.config.skills.alchemy.PotionConfig;
 import org.bukkit.Color;
 import org.bukkit.Material;
 import org.bukkit.inventory.ItemStack;

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

@@ -853,7 +853,6 @@ public class EntityListener implements Listener {
             case TROPICAL_FISH:
             case COOKED_COD:
             case COOKED_SALMON:
-
                 if (Permissions.isSubSkillEnabled(player, SubSkillType.FISHING_FISHERMANS_DIET)) {
                     event.setFoodLevel(UserManager.getPlayer(player).getFishingManager().handleFishermanDiet(newFoodLevel));
                 }

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

@@ -5,6 +5,7 @@ import com.gmail.nossr50.chat.ChatManagerFactory;
 import com.gmail.nossr50.chat.PartyChatManager;
 import com.gmail.nossr50.config.MainConfig;
 import com.gmail.nossr50.config.WorldBlacklist;
+import com.gmail.nossr50.config.experience.ExperienceConfig;
 import com.gmail.nossr50.datatypes.chat.ChatMode;
 import com.gmail.nossr50.datatypes.party.Party;
 import com.gmail.nossr50.datatypes.player.McMMOPlayer;

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

@@ -1,6 +1,7 @@
 package com.gmail.nossr50.listeners;
 
 import com.gmail.nossr50.config.MainConfig;
+import com.gmail.nossr50.config.experience.ExperienceConfig;
 import com.gmail.nossr50.datatypes.experience.XPGainReason;
 import com.gmail.nossr50.datatypes.player.McMMOPlayer;
 import com.gmail.nossr50.datatypes.skills.PrimarySkillType;

src/main/java/com/gmail/nossr50/party/PartyManager.java

@@ -549,10 +549,10 @@ public final class PartyManager {
             return;
         }
 
-        if (mcMMO.getUpgradeManager().shouldUpgrade(UpgradeType.ADD_UUIDS_PARTY)) {
+        /*if (mcMMO.getUpgradeManager().shouldUpgrade(UpgradeType.ADD_UUIDS_PARTY)) {
             loadAndUpgradeParties();
             return;
-        }
+        }*/
 
         YamlConfiguration partiesFile = YamlConfiguration.loadConfiguration(partyFile);
 
@@ -648,7 +648,7 @@ public final class PartyManager {
         }
     }
 
-    private static void loadAndUpgradeParties() {
+    /*private static void loadAndUpgradeParties() {
         YamlConfiguration partiesFile = YamlConfiguration.loadConfiguration(partyFile);
 
         if (!partyFile.renameTo(new File(mcMMO.getFlatFileDirectory() + "parties.yml.converted"))) {
@@ -712,8 +712,8 @@ public final class PartyManager {
             party.setAlly(PartyManager.getParty(partiesFile.getString(party.getName() + ".Ally")));
         }
 
-        mcMMO.getUpgradeManager().setUpgradeCompleted(UpgradeType.ADD_UUIDS_PARTY);
+        //mcMMO.getUpgradeManager().setUpgradeCompleted(UpgradeType.ADD_UUIDS_PARTY);
-    }
+    }*/
 
     /**
      * Handle party change event.

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/database/UUIDUpdateAsyncTask.java

@@ -1,5 +1,7 @@
+/*
 package com.gmail.nossr50.runnables.database;
 
+import com.gmail.nossr50.config.ChunkConversionOptions;
 import com.gmail.nossr50.database.DatabaseManager;
 import com.gmail.nossr50.datatypes.database.UpgradeType;
 import com.gmail.nossr50.mcMMO;
@@ -15,9 +17,9 @@ import java.util.logging.Level;
 
 public class UUIDUpdateAsyncTask extends BukkitRunnable {
     private mcMMO plugin;
-    private static final int MAX_LOOKUP = Math.max(HiddenConfig.getInstance().getUUIDConvertAmount(), 100);
+    private static final int MAX_LOOKUP = Math.max(ChunkConversionOptions.getUUIDConvertAmount(), 100);
-    private static final int RATE_LIMIT = HiddenConfig.getInstance().getMojangRateLimit();
+    private static final int RATE_LIMIT = ChunkConversionOptions.getMojangRateLimit();
-    private static final long LIMIT_PERIOD = HiddenConfig.getInstance().getMojangLimitPeriod();
+    private static final long LIMIT_PERIOD = ChunkConversionOptions.getMojangLimitPeriod();
     private static final int BATCH_SIZE = MAX_LOOKUP * 3;
 
     private List<String> userNames;
@@ -99,3 +101,4 @@ public class UUIDUpdateAsyncTask extends BukkitRunnable {
         }
     }
 }
+*/

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/acrobatics/Acrobatics.java

@@ -1,6 +1,8 @@
 package com.gmail.nossr50.skills.acrobatics;
 
+import com.gmail.nossr50.config.AdvancedConfig;
 import com.gmail.nossr50.config.MainConfig;
+import com.gmail.nossr50.config.experience.ExperienceConfig;
 
 public final class Acrobatics {
     public static double dodgeDamageModifier   = AdvancedConfig.getInstance().getDodgeDamageModifier();

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;

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;

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;

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;
@@ -14,11 +15,11 @@ public class Axes {
     public static double criticalHitPVEModifier   = AdvancedConfig.getInstance().getCriticalStrikesPVEModifier();
 
     public static int    impactIncreaseLevel         = AdvancedConfig.getInstance().getArmorImpactIncreaseLevel();
-    public static double impactChance                = AdvancedConfig.getInstance().getImpactChance();
+    //public static double impactChance                = AdvancedConfig.getInstance().getImpactChance();
     public static double impactMaxDurabilityModifier = AdvancedConfig.getInstance().getArmorImpactMaxDurabilityDamage() / 100D;
 
     public static double greaterImpactBonusDamage         = AdvancedConfig.getInstance().getGreaterImpactBonusDamage();
-    public static double greaterImpactChance              = AdvancedConfig.getInstance().getGreaterImpactChance();
+    //public static double greaterImpactChance              = AdvancedConfig.getInstance().getGreaterImpactChance();
     public static double greaterImpactKnockbackMultiplier = AdvancedConfig.getInstance().getGreaterImpactModifier();
 
     public static double skullSplitterModifier = AdvancedConfig.getInstance().getSkullSplitterModifier();

src/main/java/com/gmail/nossr50/skills/excavation/Excavation.java

@@ -1,7 +1,7 @@
 package com.gmail.nossr50.skills.excavation;
 
 import com.gmail.nossr50.config.experience.ExperienceConfig;
-import com.gmail.nossr50.config.treasure.TreasureConfig;
+import com.gmail.nossr50.config.treasure.ExcavationTreasureConfig;
 import com.gmail.nossr50.datatypes.skills.PrimarySkillType;
 import com.gmail.nossr50.datatypes.treasure.ExcavationTreasure;
 import com.gmail.nossr50.util.StringUtils;
@@ -19,8 +19,8 @@ public class Excavation {
      */
     protected static List<ExcavationTreasure> getTreasures(BlockState blockState) {
         String friendly = StringUtils.getFriendlyConfigBlockDataString(blockState.getBlockData());
-        if (TreasureConfig.getInstance().excavationMap.containsKey(friendly))
+        if (ExcavationTreasureConfig.getInstance().excavationMap.containsKey(friendly))
-            return TreasureConfig.getInstance().excavationMap.get(friendly);
+            return ExcavationTreasureConfig.getInstance().excavationMap.get(friendly);
         return new ArrayList<ExcavationTreasure>();
     }
 

src/main/java/com/gmail/nossr50/skills/fishing/Fishing.java

@@ -1,5 +1,7 @@
 package com.gmail.nossr50.skills.fishing;
 
+import com.gmail.nossr50.config.AdvancedConfig;
+import com.gmail.nossr50.config.treasure.FishingTreasureConfig;
 import com.gmail.nossr50.datatypes.treasure.ShakeTreasure;
 import com.gmail.nossr50.util.Misc;
 import com.gmail.nossr50.util.adapter.BiomeAdapter;
@@ -17,6 +19,10 @@ public final class Fishing {
 
     protected static final HashMap<Material, List<Enchantment>> ENCHANTABLE_CACHE = new HashMap<Material, List<Enchantment>>();
 
+    /*public static int fishermansDietRankLevel1 = AdvancedConfig.getInstance().getFishermanDietRankChange();
+    public static int fishermansDietRankLevel2 = fishermansDietRankLevel1 * 2;
+    public static int fishermansDietMaxLevel   = fishermansDietRankLevel1 * 5;*/
+
     public static Set<Biome> masterAnglerBiomes = BiomeAdapter.WATER_BIOMES;
     public static Set<Biome> iceFishingBiomes   = BiomeAdapter.ICE_BIOMES;
 
@@ -30,8 +36,8 @@ public final class Fishing {
      * @return possibleDrops List of ItemStack that can be dropped
      */
     protected static List<ShakeTreasure> findPossibleDrops(LivingEntity target) {
-        if (TreasureConfig.getInstance().shakeMap.containsKey(target.getType()))
+        if (FishingTreasureConfig.getInstance().shakeMap.containsKey(target.getType()))
-            return TreasureConfig.getInstance().shakeMap.get(target.getType());
+            return FishingTreasureConfig.getInstance().shakeMap.get(target.getType());
 
         return null;
     }

src/main/java/com/gmail/nossr50/skills/fishing/FishingManager.java

@@ -370,7 +370,7 @@ public class FishingManager extends SkillManager {
                             break;
 
                         case BEDROCK:
-                            if (TreasureConfig.getInstance().getInventoryStealEnabled()) {
+                            if (FishingTreasureConfig.getInstance().getInventoryStealEnabled()) {
                                 PlayerInventory inventory = targetPlayer.getInventory();
                                 int length = inventory.getContents().length;
                                 int slot = Misc.getRandom().nextInt(length);
@@ -380,7 +380,7 @@ public class FishingManager extends SkillManager {
                                     break;
                                 }
 
-                                if (TreasureConfig.getInstance().getInventoryStealStacks()) {
+                                if (FishingTreasureConfig.getInstance().getInventoryStealStacks()) {
                                     inventory.setItem(slot, null);
                                 }
                                 else {
@@ -448,7 +448,7 @@ public class FishingManager extends SkillManager {
         FishingTreasure treasure = null;
 
         for (Rarity rarity : Rarity.values()) {
-            double dropRate = TreasureConfig.getInstance().getItemDropRate(getLootTier(), rarity);
+            double dropRate = FishingTreasureConfig.getInstance().getItemDropRate(getLootTier(), rarity);
 
             if (diceRoll <= dropRate) {
                 /*if (rarity == Rarity.TRAP) {
@@ -507,7 +507,7 @@ public class FishingManager extends SkillManager {
                 continue;
             }
 
-            double dropRate = TreasureConfig.getInstance().getEnchantmentDropRate(getLootTier(), rarity);
+            double dropRate = FishingTreasureConfig.getInstance().getEnchantmentDropRate(getLootTier(), rarity);
 
             if (diceRoll <= dropRate) {
                 // Make sure enchanted books always get some kind of enchantment.  --hoorigan
@@ -515,7 +515,7 @@ public class FishingManager extends SkillManager {
                     diceRoll = dropRate + 1;
                     continue;
                 }
-                fishingEnchantments = TreasureConfig.getInstance().fishingEnchantments.get(rarity);
+                fishingEnchantments = FishingTreasureConfig.getInstance().fishingEnchantments.get(rarity);
                 break;
             }
 

src/main/java/com/gmail/nossr50/skills/herbalism/HerbalismManager.java

@@ -2,7 +2,7 @@ package com.gmail.nossr50.skills.herbalism;
 
 import com.gmail.nossr50.config.MainConfig;
 import com.gmail.nossr50.config.experience.ExperienceConfig;
-import com.gmail.nossr50.config.treasure.TreasureConfig;
+import com.gmail.nossr50.config.treasure.HerbalismTreasureConfig;
 import com.gmail.nossr50.datatypes.experience.XPGainReason;
 import com.gmail.nossr50.datatypes.interactions.NotificationType;
 import com.gmail.nossr50.datatypes.player.McMMOPlayer;
@@ -211,9 +211,9 @@ public class HerbalismManager extends SkillManager {
         }
 
         String friendly = StringUtils.getFriendlyConfigBlockDataString(blockState.getBlockData());
-        if (!TreasureConfig.getInstance().hylianMap.containsKey(friendly))
+        if (!HerbalismTreasureConfig.getInstance().hylianMap.containsKey(friendly))
             return false;
-        List<HylianTreasure> treasures = TreasureConfig.getInstance().hylianMap.get(friendly);
+        List<HylianTreasure> treasures = HerbalismTreasureConfig.getInstance().hylianMap.get(friendly);
 
         Player player = getPlayer();
 

src/main/java/com/gmail/nossr50/skills/mining/BlastMining.java

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

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

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

src/main/java/com/gmail/nossr50/skills/salvage/Salvage.java

@@ -1,5 +1,6 @@
 package com.gmail.nossr50.skills.salvage;
 
+import com.gmail.nossr50.config.AdvancedConfig;
 import com.gmail.nossr50.config.MainConfig;
 import org.bukkit.Material;
 

src/main/java/com/gmail/nossr50/skills/swords/Swords.java

@@ -1,5 +1,7 @@
 package com.gmail.nossr50.skills.swords;
 
+import com.gmail.nossr50.config.AdvancedConfig;
+
 public class Swords {
     public static int    bleedMaxTicks      = AdvancedConfig.getInstance().getRuptureMaxTicks();
 

src/main/java/com/gmail/nossr50/skills/taming/Taming.java

@@ -1,5 +1,6 @@
 package com.gmail.nossr50.skills.taming;
 
+import com.gmail.nossr50.config.AdvancedConfig;
 import org.bukkit.EntityEffect;
 import org.bukkit.entity.*;
 

src/main/java/com/gmail/nossr50/skills/taming/TamingManager.java

@@ -1,6 +1,8 @@
 package com.gmail.nossr50.skills.taming;
 
+import com.gmail.nossr50.config.AdvancedConfig;
 import com.gmail.nossr50.config.MainConfig;
+import com.gmail.nossr50.config.experience.ExperienceConfig;
 import com.gmail.nossr50.datatypes.experience.XPGainReason;
 import com.gmail.nossr50.datatypes.interactions.NotificationType;
 import com.gmail.nossr50.datatypes.player.McMMOPlayer;

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/TextComponentFactory.java

@@ -1,6 +1,7 @@
 package com.gmail.nossr50.util;
 
 import com.gmail.nossr50.config.MainConfig;
+import com.gmail.nossr50.config.RankConfig;
 import com.gmail.nossr50.datatypes.interactions.NotificationType;
 import com.gmail.nossr50.datatypes.json.McMMOUrl;
 import com.gmail.nossr50.datatypes.json.McMMOWebLinks;

src/main/java/com/gmail/nossr50/util/blockmeta/ChunkletManagerFactory.java

@@ -1,15 +1,7 @@
 package com.gmail.nossr50.util.blockmeta;
 
-import com.gmail.nossr50.config.HiddenConfig;
-
 public class ChunkletManagerFactory {
     public static ChunkletManager getChunkletManager() {
-        HiddenConfig hConfig = HiddenConfig.getInstance();
+        return new HashChunkletManager();
-
-        if (hConfig.getChunkletsEnabled()) {
-            return new HashChunkletManager();
-        }
-
-        return new NullChunkletManager();
     }
 }

src/main/java/com/gmail/nossr50/util/blockmeta/chunkmeta/ChunkManagerFactory.java

@@ -1,15 +1,7 @@
 package com.gmail.nossr50.util.blockmeta.chunkmeta;
 
-import com.gmail.nossr50.config.HiddenConfig;
-
 public class ChunkManagerFactory {
     public static ChunkManager getChunkManager() {
-        HiddenConfig hConfig = HiddenConfig.getInstance();
+        return new HashChunkManager();
-
-        if (hConfig.getChunkletsEnabled()) {
-            return new HashChunkManager();
-        }
-
-        return new NullChunkManager();
     }
 }

src/main/java/com/gmail/nossr50/util/blockmeta/conversion/BlockStoreConversionMain.java

@@ -1,5 +1,6 @@
 package com.gmail.nossr50.util.blockmeta.conversion;
 
+import com.gmail.nossr50.config.ChunkConversionOptions;
 import com.gmail.nossr50.mcMMO;
 import org.bukkit.scheduler.BukkitScheduler;
 
@@ -18,7 +19,7 @@ public class BlockStoreConversionMain implements Runnable {
         this.world = world;
         this.scheduler = mcMMO.p.getServer().getScheduler();
         this.dataDir = new File(this.world.getWorldFolder(), "mcmmo_data");
-        this.converters = new BlockStoreConversionXDirectory[HiddenConfig.getInstance().getConversionRate()];
+        this.converters = new BlockStoreConversionXDirectory[ChunkConversionOptions.getConversionRate()];
     }
 
     public void start() {
@@ -51,7 +52,7 @@ public class BlockStoreConversionMain implements Runnable {
 
         this.xDirs = this.dataDir.listFiles();
 
-        for (this.i = 0; (this.i < HiddenConfig.getInstance().getConversionRate()) && (this.i < this.xDirs.length); this.i++) {
+        for (this.i = 0; (this.i < ChunkConversionOptions.getConversionRate()) && (this.i < this.xDirs.length); this.i++) {
             if (this.converters[this.i] == null) {
                 this.converters[this.i] = new BlockStoreConversionXDirectory();
             }

src/main/java/com/gmail/nossr50/util/blockmeta/conversion/BlockStoreConversionXDirectory.java

@@ -1,5 +1,6 @@
 package com.gmail.nossr50.util.blockmeta.conversion;
 
+import com.gmail.nossr50.config.ChunkConversionOptions;
 import com.gmail.nossr50.mcMMO;
 import org.bukkit.scheduler.BukkitScheduler;
 
@@ -20,7 +21,7 @@ public class BlockStoreConversionXDirectory implements Runnable {
     public void start(org.bukkit.World world, File dataDir) {
         this.world = world;
         this.scheduler = mcMMO.p.getServer().getScheduler();
-        this.converters = new BlockStoreConversionZDirectory[HiddenConfig.getInstance().getConversionRate()];
+        this.converters = new BlockStoreConversionZDirectory[ChunkConversionOptions.getConversionRate()];
         this.dataDir = dataDir;
 
         if (this.taskID >= 0) {
@@ -52,7 +53,7 @@ public class BlockStoreConversionXDirectory implements Runnable {
 
         this.zDirs = this.dataDir.listFiles();
 
-        for (this.i = 0; (this.i < HiddenConfig.getInstance().getConversionRate()) && (this.i < this.zDirs.length); this.i++) {
+        for (this.i = 0; (this.i < ChunkConversionOptions.getConversionRate()) && (this.i < this.zDirs.length); this.i++) {
             if (this.converters[this.i] == null) {
                 this.converters[this.i] = new BlockStoreConversionZDirectory();
             }

src/main/java/com/gmail/nossr50/util/commands/CommandRegistrationManager.java

@@ -11,8 +11,6 @@ import com.gmail.nossr50.commands.experience.AddlevelsCommand;
 import com.gmail.nossr50.commands.experience.AddxpCommand;
 import com.gmail.nossr50.commands.experience.MmoeditCommand;
 import com.gmail.nossr50.commands.experience.SkillresetCommand;
-import com.gmail.nossr50.commands.hardcore.HardcoreCommand;
-import com.gmail.nossr50.commands.hardcore.VampirismCommand;
 import com.gmail.nossr50.commands.party.PartyCommand;
 import com.gmail.nossr50.commands.party.teleport.PtpCommand;
 import com.gmail.nossr50.commands.player.*;
@@ -343,7 +341,7 @@ public final class CommandRegistrationManager {
         command.setExecutor(new PtpCommand());
     }
 
-    private static void registerHardcoreCommand() {
+    /*private static void registerHardcoreCommand() {
         PluginCommand command = mcMMO.p.getCommand("hardcore");
         command.setDescription(LocaleLoader.getString("Commands.Description.hardcore"));
         command.setPermission("mcmmo.commands.hardcore;mcmmo.commands.hardcore.toggle;mcmmo.commands.hardcore.modify");
@@ -361,7 +359,7 @@ public final class CommandRegistrationManager {
         command.setUsage(LocaleLoader.getString("Commands.Usage.1", "vampirism", "[on|off]"));
         command.setUsage(command.getUsage() + "\n" + LocaleLoader.getString("Commands.Usage.1", "vampirism", "<" + LocaleLoader.getString("Commands.Usage.Rate") + ">"));
         command.setExecutor(new VampirismCommand());
-    }
+    }*/
 
     private static void registerMcnotifyCommand() {
         PluginCommand command = mcMMO.p.getCommand("mcnotify");
@@ -431,8 +429,8 @@ public final class CommandRegistrationManager {
         registerSkillresetCommand();
 
         // Hardcore Commands
-        registerHardcoreCommand();
+        /*registerHardcoreCommand();
-        registerVampirismCommand();
+        registerVampirismCommand();*/
 
         // Party Commands
         registerPartyCommand();

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/RandomChanceSkill.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.util.Permissions;

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;

src/main/java/net/shatteredlands/shatt/backup/ZipLibrary.java

@@ -1,6 +1,5 @@
 package net.shatteredlands.shatt.backup;
 
-import com.gmail.nossr50.config.Config;
 import com.gmail.nossr50.config.MainConfig;
 import com.gmail.nossr50.mcMMO;