Update pom.xml for 1.4.07 beta release (finally!)

Fixes #1450

Changelog.txt

@@ -6,8 +6,51 @@ Key:
   = Fix
   ! Change
   - Removal
-  
-Version 1.4.06-dev
+
+Version 1.4.07-dev
+ + Added ability to summon horses via "Call of the Wild" using apples
+ + Added XP gain to Taming for horses
+ + Added new permission nodes to allow more control over Taming and "Call of the Wild"
+ + Added new experience.yml config file! Moved all experience related settings from config.yml to experience.yml
+ + Added support for EXPONENTIAL formula curves to experience.yml
+ + Added new /mcconvert command to convert players levels and experience from one formula curve to another.
+ + Added snow to Excavation blocks
+ + Added new experience curve option. Cumulative curve, calculates experience needed for next level using power level.
+ + Added extra settings to config.yml for "Call of the Wild" (Taming)
+ + Added a 5 second cooldown after teleporting before Acrobatics XP can be earned. Plus a config option to disable
+ + Added new API methods to ExperienceAPI to get a players rank on the leaderboards
+ + Added new McMMOPlayerDeathPenaltyEvent, fired when a player dies and would lose levels
+ + Added new McMMOPlayerLevelChangeEvent, fired when a players level changes
+ + Added new McMMOPlayerLevelDownEvent, fired when a player loses levels
+ = Fixed bug which allowed players to bypass fishing's exploit prevention
+ = Fixed bug where FakeEntityDamageByEntityEvent wasn't being fired
+ = Fixed bug with "Skull Splitter" not finding the locale string
+ = Fixed issue where locale strings could cause the scoreboard header to be longer than 16 characters.
+ = Fixed a bug with "Beast Lore" when the entity had no owner but was tamed.
+ = Fixed a bug where AbilityDeactivateEvent would throw an error if the player logged out before his ability ran out.
+ = Fixed a bug where LevelUpEvent would be called for an offline player.
+ = Fixed a bug where teleport location was never reset if warmup was set to 0 for "Chimaera Wing".
+ = Fixed a bug where the "Dodge" DamageModifier wasn't being read from advanced.yml
+ = Fixed a bug where squid were not awarding XP.
+ ! Changed various values to double in advanced.yml for the sake of consistency.
+ ! Nerfed Archery damage to eliminate constant one-hit kills.
+ ! Changed the way Repair hands out XP, also added config options to control Repair XP
+ ! Changed Swords "Counter Attack" ability from passive to active. Blocking is required to activate.
+ ! Hardcore mode can now be toggled for each skill individually
+ ! Vampirism can now be enabled without having Skill Death Penalty enabled
+ ! Admin and Party chat prefixes are now customizable
+ ! Changed the color of party leader names in Party chat
+ ! Improved profile saving
+ ! Improved partial name matcher
+ ! Slightly improved update checker feedback
+ ! Updated localization files
+ ! Party item share category states are now saved when the server shuts down.
+ ! When using "Super Breaker" or "Giga Driller" abilities extra tool durability is used (again)
+ - The /mmoupdate command has been removed. It is replaced by /mcconvert database
+ - Removed Abilities.Tools.Durability_Loss_Enabled, set Abilities.Tools.Durability_Loss to 0 to disable instead.
+
+Version 1.4.06
+ + Added "Ice Fishing" ability to Fishing
  + Added global scoreboards to track skill rankings (display using /mctop)
  + Added per-player scoreboard displays for the /inspect, /mcrank, /mcstats, and /<skillname> commands
  + Added tab-complete support for all commands
@@ -18,6 +61,22 @@ Version 1.4.06-dev
  + Added new permission node for /ptp; mcmmo.commands.ptp.send (enabled by default)
  + Added configurable cooldown and warmup times when using /ptp
  + Added a new Party item share category "Misc" which contains a list of configurable items. (By default all tools and armor)
+ + Added fishing exploit prevention
+ + Added permission node to bypass the fishing exploit prevention
+ + Added boosts to Fishing chance depending on conditions
+ + Added McMMOAbilityActivateEvent and McMMOAbilityDeactivateEvent
+ + Added config option to toggle the size of fireworks
+ + Added config option to multiply xp gains from mob spawner mobs
+ + Added multiplier to Archery XP based on bow force
+ + Added information about /party itemshare and /party expshare to the party help page
+ + Added option to use scoreboards for power level display instead of Spout.
+ + Added permission node to prevent inspecting hidden players
+ + Added SQL to Flatfile database conversion
+ + Added ability to use custom database managers and convert to/from them
+ = Fixed bug which could cause the server to hang for a minute when checking for updates. (Thanks to Riking)
+ = Fixed bug where spawned arrows could throw ArrayIndexOutOfBoundsException
+ = Fixed bug where custom Spout titles were overwritten by mcMMO.
+ = Fixed bug where Nether Quartz wasn't included in Smelting or item sharing
  = Fixed bug where players were able to join the same party multiple times
  = Fixed displaying partial names when trying to use /ptp
  = Fixed wolves from Call of the Wild only having 8 health
@@ -28,6 +87,19 @@ Version 1.4.06-dev
  = Fixed Fishing treasures always having the same enchants
  = Fixed Smelting returning ink sacs instead of Lapis when double-dropping
  = Fixed bug where players could remain in party chat after leaving or being kicked from a party.
+ = Fixed bug where non-player arrows couldn't be deflected.
+ = Fixed experience being applied even when the permission for a skill was denied
+ = Fixed possible item duplication bug with infinity bows
+ = Fixed bug with removing players from mySQL database
+ = Fixed bug with empty metadata lists and Smelting
+ = Fixed bug where Blast Mining would drop wrong items
+ = Fixed bug with Blast Mining where the Ability refreshed message was being send too early
+ = Fixed bug where the chance of a successful Gracefull Roll was twice as high as displayed
+ = Fixed bug where lucky perks where not working
+ = Fixed bug with Ice Fishing on a single block of ice
+ = Fixed bug with Ice Fishing which allowed players to break ice in protected areas
+ = Fixed a small bug with mob healthbars and bosses, such as EnderDragons and Withers
+ ! Changed Spout notification tiers to be stored in SpoutConfig instead of AdvancedConfig
  ! Changed Berserk to add items to inventory rather than denying pickup
  ! Changed Call of the Wild, newly summoned pet's will have a custom name. (added permission node to disable this)
  ! Changed Chimaera Wing's recipe result to use the ingredient Material
@@ -38,6 +110,7 @@ Version 1.4.06-dev
  ! Changed the amount of info messages in the console when enabling/disabling, enable Verbose_Logging to enable them again
  ! Items dropped by players are now being tracked and are not being shared with party members
  ! Optimized tracking of tool & ability cooldowns.
+ ! Updated the localization files
 
 Version 1.4.05
  + Added option to allow refreshing of chunks after block-breaking abilities. (Disabled by default)

README.md

@@ -5,9 +5,7 @@
 Our latest development builds are available [here](http://ci.mcmmo.info).
 
 ### Brief Description
-mcMMO takes core Minecraft game mechanics and expands them to add an extensive RPG experience, the goal of the project has always been a quality RPG experience. Everything in mcMMO is carefully thought out and is constantly improving. mcMMO adds eleven skills to train in and level in, while also offering a high level of customization for server admins. There are countless features, including custom sounds, graphical elements, and more added when running mcMMO in conjunction with Spout. I carefully read feedback and evaluate the mechanics of mcMMO in every update to provide an ever-evolving experience.
-
-If you want an original RPG experience like no other mod out there, mcMMO is for you.
+The goal of mcMMO is to take core Minecraft game mechanics and expand them into add an extensive and quality RPG experience. Everything in mcMMO has been carefully thought out and is constantly being improved upon. Currently, mcMMO adds thirteen unique skills to train and level in. Each of these skills is highly customizable through our configuration files, allowing server admins to tweak mcMMO to best suit the needs of his or her server. Additionally, when run in conjuction with SpoutPlugin, mcMMO also has a custom XP bar to allow for easy tracking of progress towards leveling up. Know that the mcMMO team is dedicated to providing an ever-evolving experience, and that we carefully read all feedback and bug reports in order to evaluate and balance the mechanics of mcMMO in every update.
 
 ## About the Team
 
@@ -29,7 +27,7 @@ mcMMO is currently developed by a team of individuals from all over the world.
 (https://github.com/shatteredbeam)
 [![TfT_02](http://www.gravatar.com/avatar/b8914f9970e1f6ffd5281ce4770e20a7.png)]
 (https://github.com/TfT-02)
-[![t00thpick1](http://www.gravatar.com/avatar/??.png)]
+[![t00thpick1](http://www.gravatar.com/avatar/ee23c7794a0c40120c3474287c7bce06.png)]
 (https://github.com/t00thpick1)
 
 ## Compiling
@@ -41,7 +39,7 @@ The typical command used to build mcMMO is: mvn clean package install
 Required Libraries:
 * Spout API
 * JUnit
-* Metrics
+* EMetrics
 * Bukkit
 
 http://dev.bukkit.org/server-mods/mcmmo for more up to date information.

pom.xml

@@ -2,7 +2,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>com.gmail.nossr50.mcMMO</groupId>
     <artifactId>mcMMO</artifactId>
-    <version>1.4.06-beta2</version>
+    <version>1.4.07-beta1</version>
     <name>mcMMO</name>
     <url>https://github.com/mcMMO-Dev/mcMMO</url>
     <issueManagement>
@@ -165,7 +165,7 @@
         <dependency>
             <groupId>com.turt2live.metrics</groupId>
             <artifactId>MetricsExtension</artifactId>
-            <version>0.0.4-SNAPSHOT</version>
+            <version>0.0.5-SNAPSHOT</version>
         </dependency>
     </dependencies>
     <distributionManagement>

src/main/java/com/gmail/nossr50/api/ChatAPI.java

@@ -4,6 +4,9 @@ import org.bukkit.entity.Player;
 import org.bukkit.plugin.Plugin;
 
 import com.gmail.nossr50.chat.ChatManager;
+import com.gmail.nossr50.chat.ChatManagerFactory;
+import com.gmail.nossr50.chat.PartyChatManager;
+import com.gmail.nossr50.datatypes.chat.ChatMode;
 import com.gmail.nossr50.party.PartyManager;
 import com.gmail.nossr50.util.player.UserManager;
 
@@ -22,7 +25,7 @@ public final class ChatAPI {
      * @param message The message to send
      */
     public static void sendPartyChat(Plugin plugin, String sender, String displayName, String party, String message) {
-        ChatManager.handlePartyChat(plugin, PartyManager.getParty(party), sender, displayName, message);
+        getPartyChatManager(plugin, party).handleChat(sender, displayName, message);
     }
 
     /**
@@ -36,7 +39,7 @@ public final class ChatAPI {
      * @param message The message to send
      */
     public static void sendPartyChat(Plugin plugin, String sender, String party, String message) {
-        ChatManager.handlePartyChat(plugin, PartyManager.getParty(party), sender, sender, message);
+        getPartyChatManager(plugin, party).handleChat(sender, message);
     }
 
     /**
@@ -50,7 +53,7 @@ public final class ChatAPI {
      * @param message The message to send
      */
     public static void sendAdminChat(Plugin plugin, String sender, String displayName, String message) {
-        ChatManager.handleAdminChat(plugin, sender, displayName, message);
+        ChatManagerFactory.getChatManager(plugin, ChatMode.ADMIN).handleChat(sender, displayName, message);
     }
 
     /**
@@ -63,7 +66,7 @@ public final class ChatAPI {
      * @param message The message to send
      */
     public static void sendAdminChat(Plugin plugin, String sender, String message) {
-        ChatManager.handleAdminChat(plugin, sender, sender, message);
+        ChatManagerFactory.getChatManager(plugin, ChatMode.ADMIN).handleChat(sender, message);
     }
 
     /**
@@ -73,7 +76,7 @@ public final class ChatAPI {
      * @return true if the player is using party chat, false otherwise
      */
     public static boolean isUsingPartyChat(Player player) {
-        return isUsingPartyChat(player.getName());
+        return UserManager.getPlayer(player).getPartyChatMode();
     }
 
     /**
@@ -93,7 +96,7 @@ public final class ChatAPI {
      * @return true if the player is using admin chat, false otherwise
      */
     public static boolean isUsingAdminChat(Player player) {
-        return isUsingAdminChat(player.getName());
+        return UserManager.getPlayer(player).getAdminChatMode();
     }
 
     /**
@@ -112,7 +115,7 @@ public final class ChatAPI {
      * @param player The player to toggle party chat on.
      */
     public static void togglePartyChat(Player player) {
-        togglePartyChat(player.getName());
+        UserManager.getPlayer(player).togglePartyChat();
     }
 
     /**
@@ -121,7 +124,7 @@ public final class ChatAPI {
      * @param playerName The name of the player to toggle party chat on.
      */
     public static void togglePartyChat(String playerName) {
-        UserManager.getPlayer(playerName).setPartyChat(!isUsingPartyChat(playerName));
+        UserManager.getPlayer(playerName).togglePartyChat();
     }
 
     /**
@@ -130,7 +133,7 @@ public final class ChatAPI {
      * @param player The player to toggle admin chat on.
      */
     public static void toggleAdminChat(Player player) {
-        toggleAdminChat(player.getName());
+        UserManager.getPlayer(player).toggleAdminChat();
     }
 
     /**
@@ -138,7 +141,14 @@ public final class ChatAPI {
      *
      * @param playerName The name of the player to toggle party chat on.
      */
-    public static void toggleAdminChat(String playerName){
-        UserManager.getPlayer(playerName).setAdminChat(!isUsingAdminChat(playerName));
+    public static void toggleAdminChat(String playerName) {
+        UserManager.getPlayer(playerName).toggleAdminChat();
+    }
+
+    private static ChatManager getPartyChatManager(Plugin plugin, String party) {
+        ChatManager chatManager = ChatManagerFactory.getChatManager(plugin, ChatMode.PARTY);
+        ((PartyChatManager) chatManager).setParty(PartyManager.getParty(party));
+
+        return chatManager;
     }
 }

src/main/java/com/gmail/nossr50/api/ExperienceAPI.java

@@ -4,9 +4,11 @@ import java.util.Set;
 
 import org.bukkit.entity.Player;
 
+import com.gmail.nossr50.mcMMO;
 import com.gmail.nossr50.api.exceptions.InvalidPlayerException;
 import com.gmail.nossr50.api.exceptions.InvalidSkillException;
 import com.gmail.nossr50.config.Config;
+import com.gmail.nossr50.config.experience.ExperienceConfig;
 import com.gmail.nossr50.datatypes.player.PlayerProfile;
 import com.gmail.nossr50.datatypes.skills.SkillType;
 import com.gmail.nossr50.skills.child.FamilyTree;
@@ -15,6 +17,37 @@ import com.gmail.nossr50.util.player.UserManager;
 public final class ExperienceAPI {
     private ExperienceAPI() {}
 
+    /**
+     * Returns whether given string is a valid type of skill suitable for the
+     * other API calls in this class.
+     * </br>
+     * This function is designed for API usage.
+     *
+     * @param skillType A string that may or may not be a skill
+     * @return true if this is a valid mcMMO skill
+     */
+    public static boolean isValidSkillType(String skillType) {
+        return SkillType.getSkill(skillType) != null;
+    }
+
+    /**
+     * Returns whether the given skill type string is both valid and not a
+     * child skill. (Child skills have no XP of their own, and their level is
+     * derived from the parent(s).)
+     * </br>
+     * This function is designed for API usage.
+     *
+     * @param skillType the skill to check
+     * @return true if this is a valid, non-child mcMMO skill
+     */
+    public static boolean isNonChildSkill(String skillType) {
+        SkillType skill = SkillType.getSkill(skillType);
+
+        if (skill == null) return false;
+
+        return !skill.isChildSkill();
+    }
+
     /**
      * Adds raw XP to the player.
      * </br>
@@ -27,13 +60,7 @@ public final class ExperienceAPI {
      * @throws InvalidSkillException if the given skill is not valid
      */
     public static void addRawXP(Player player, String skillType, int XP) {
-        SkillType skill = SkillType.getSkill(skillType);
-
-        if (skill == null) {
-            throw new InvalidSkillException();
-        }
-
-        UserManager.getPlayer(player).applyXpGain(skill, XP);
+        UserManager.getPlayer(player).applyXpGain(getSkillType(skillType), XP);
     }
 
     /**
@@ -49,13 +76,7 @@ public final class ExperienceAPI {
      * @throws InvalidPlayerException if the given player does not exist in the database
      */
     public static void addRawXPOffline(String playerName, String skillType, int XP) {
-        SkillType skill = SkillType.getSkill(skillType);
-
-        if (skill == null) {
-            throw new InvalidSkillException();
-        }
-
-        addOfflineXP(playerName, skill, XP);
+        addOfflineXP(playerName, getSkillType(skillType), XP);
     }
 
     /**
@@ -70,13 +91,7 @@ public final class ExperienceAPI {
      * @throws InvalidSkillException if the given skill is not valid
      */
     public static void addMultipliedXP(Player player, String skillType, int XP) {
-        SkillType skill = SkillType.getSkill(skillType);
-
-        if (skill == null) {
-            throw new InvalidSkillException();
-        }
-
-        UserManager.getPlayer(player).applyXpGain(skill, (int) (XP * Config.getInstance().getExperienceGainsGlobalMultiplier()));
+        UserManager.getPlayer(player).applyXpGain(getSkillType(skillType), (int) (XP * ExperienceConfig.getInstance().getExperienceGainsGlobalMultiplier()));
     }
 
     /**
@@ -92,13 +107,7 @@ public final class ExperienceAPI {
      * @throws InvalidPlayerException if the given player does not exist in the database
      */
     public static void addMultipliedXPOffline(String playerName, String skillType, int XP) {
-        SkillType skill = SkillType.getSkill(skillType);
-
-        if (skill == null) {
-            throw new InvalidSkillException();
-        }
-
-        addOfflineXP(playerName, skill, (int) (XP * Config.getInstance().getExperienceGainsGlobalMultiplier()));
+        addOfflineXP(playerName, getSkillType(skillType), (int) (XP * ExperienceConfig.getInstance().getExperienceGainsGlobalMultiplier()));
     }
 
     /**
@@ -113,13 +122,9 @@ public final class ExperienceAPI {
      * @throws InvalidSkillException if the given skill is not valid
      */
     public static void addModifiedXP(Player player, String skillType, int XP) {
-        SkillType skill = SkillType.getSkill(skillType);
+        SkillType skill = getSkillType(skillType);
 
-        if (skill == null) {
-            throw new InvalidSkillException();
-        }
-
-        UserManager.getPlayer(player).applyXpGain(skill, (int) (XP  / skill.getXpModifier() * Config.getInstance().getExperienceGainsGlobalMultiplier()));
+        UserManager.getPlayer(player).applyXpGain(skill, (int) (XP / skill.getXpModifier() * ExperienceConfig.getInstance().getExperienceGainsGlobalMultiplier()));
     }
 
     /**
@@ -135,17 +140,14 @@ public final class ExperienceAPI {
      * @throws InvalidPlayerException if the given player does not exist in the database
      */
     public static void addModifiedXPOffline(String playerName, String skillType, int XP) {
-        SkillType skill = SkillType.getSkill(skillType);
+        SkillType skill = getSkillType(skillType);
 
-        if (skill == null) {
-            throw new InvalidSkillException();
-        }
-
-        addOfflineXP(playerName, skill, (int) (XP / skill.getXpModifier() * Config.getInstance().getExperienceGainsGlobalMultiplier()));
+        addOfflineXP(playerName, skill, (int) (XP / skill.getXpModifier() * ExperienceConfig.getInstance().getExperienceGainsGlobalMultiplier()));
     }
 
     /**
-     * Adds XP to the player, calculates for XP Rate, skill modifiers and perks. May be shared with the party.
+     * Adds XP to the player, calculates for XP Rate, skill modifiers, perks, child skills,
+     * and party sharing.
      * </br>
      * This function is designed for API usage.
      *
@@ -156,13 +158,7 @@ public final class ExperienceAPI {
      * @throws InvalidSkillException if the given skill is not valid
      */
     public static void addXP(Player player, String skillType, int XP) {
-        SkillType skill = SkillType.getSkill(skillType);
-
-        if (skill == null) {
-            throw new InvalidSkillException();
-        }
-
-        UserManager.getPlayer(player).beginXpGain(skill, XP);
+        UserManager.getPlayer(player).beginXpGain(getSkillType(skillType), XP);
     }
 
     /**
@@ -175,15 +171,10 @@ public final class ExperienceAPI {
      * @return the amount of XP in a given skill
      *
      * @throws InvalidSkillException if the given skill is not valid
+     * @throws UnsupportedOperationException if the given skill is a child skill
      */
     public static int getXP(Player player, String skillType) {
-        SkillType skill = SkillType.getSkill(skillType);
-
-        if (skill == null) {
-            throw new InvalidSkillException();
-        }
-
-        return UserManager.getPlayer(player).getProfile().getSkillXpLevel(skill);
+        return UserManager.getPlayer(player).getProfile().getSkillXpLevel(getNonChildSkillType(skillType));
     }
 
     /**
@@ -197,15 +188,10 @@ public final class ExperienceAPI {
      *
      * @throws InvalidSkillException if the given skill is not valid
      * @throws InvalidPlayerException if the given player does not exist in the database
+     * @throws UnsupportedOperationException if the given skill is a child skill
      */
     public static int getOfflineXP(String playerName, String skillType) {
-        SkillType skill = SkillType.getSkill(skillType);
-
-        if (skill == null) {
-            throw new InvalidSkillException();
-        }
-
-        return getOfflineProfile(playerName).getSkillXpLevel(skill);
+        return getOfflineProfile(playerName).getSkillXpLevel(getNonChildSkillType(skillType));
     }
 
     /**
@@ -218,15 +204,10 @@ public final class ExperienceAPI {
      * @return the amount of XP in a given skill
      *
      * @throws InvalidSkillException if the given skill is not valid
+     * @throws UnsupportedOperationException if the given skill is a child skill
      */
     public static float getXPRaw(Player player, String skillType) {
-        SkillType skill = SkillType.getSkill(skillType);
-
-        if (skill == null) {
-            throw new InvalidSkillException();
-        }
-
-        return UserManager.getPlayer(player).getProfile().getSkillXpLevelRaw(skill);
+        return UserManager.getPlayer(player).getProfile().getSkillXpLevelRaw(getNonChildSkillType(skillType));
     }
 
     /**
@@ -240,36 +221,63 @@ public final class ExperienceAPI {
      *
      * @throws InvalidSkillException if the given skill is not valid
      * @throws InvalidPlayerException if the given player does not exist in the database
+     * @throws UnsupportedOperationException if the given skill is a child skill
      */
     public static float getOfflineXPRaw(String playerName, String skillType) {
-        SkillType skill = SkillType.getSkill(skillType);
-
-        if (skill == null) {
-            throw new InvalidSkillException();
-        }
-
-        return getOfflineProfile(playerName).getSkillXpLevelRaw(skill);
+        return getOfflineProfile(playerName).getSkillXpLevelRaw(getNonChildSkillType(skillType));
     }
 
     /**
-     * Get the amount of XP left before leveling up.
+     * Get the total amount of XP needed to reach the next level.
      * </br>
      * This function is designed for API usage.
      *
      * @param player The player to get the XP amount for
      * @param skillType The skill to get the XP amount for
-     * @return the amount of XP left before leveling up a specifc skill
+     * @return the total amount of XP needed to reach the next level
      *
      * @throws InvalidSkillException if the given skill is not valid
+     * @throws UnsupportedOperationException if the given skill is a child skill
      */
     public static int getXPToNextLevel(Player player, String skillType) {
-        SkillType skill = SkillType.getSkill(skillType);
+        return UserManager.getPlayer(player).getProfile().getXpToLevel(getNonChildSkillType(skillType));
+    }
 
-        if (skill == null) {
-            throw new InvalidSkillException();
-        }
+    /**
+     * Get the total amount of XP an offline player needs to reach the next level.
+     * </br>
+     * This function is designed for API usage.
+     *
+     * @param playerName The player to get XP for
+     * @param skillType The skill to get XP for
+     * @return the total amount of XP needed to reach the next level
+     *
+     * @throws InvalidSkillException if the given skill is not valid
+     * @throws InvalidPlayerException if the given player does not exist in the database
+     * @throws UnsupportedOperationException if the given skill is a child skill
+     */
+    public static int getOfflineXPToNextLevel(String playerName, String skillType) {
+        return getOfflineProfile(playerName).getXpToLevel(getNonChildSkillType(skillType));
+    }
 
-        return UserManager.getPlayer(player).getProfile().getXpToLevel(skill);
+    /**
+     * Get the amount of XP remaining until the next level.
+     * </br>
+     * This function is designed for API usage.
+     *
+     * @param player The player to get the XP amount for
+     * @param skillType The skill to get the XP amount for
+     * @return the amount of XP remaining until the next level
+     *
+     * @throws InvalidSkillException if the given skill is not valid
+     * @throws UnsupportedOperationException if the given skill is a child skill
+     */
+    public static int getXPRemaining(Player player, String skillType) {
+        SkillType skill = getNonChildSkillType(skillType);
+
+        PlayerProfile profile = UserManager.getPlayer(player).getProfile();
+
+        return profile.getXpToLevel(skill) - profile.getSkillXpLevel(skill);
     }
 
     /**
@@ -279,19 +287,18 @@ public final class ExperienceAPI {
      *
      * @param playerName The player to get XP for
      * @param skillType The skill to get XP for
-     * @return the amount of XP in a given skill
+     * @return the amount of XP needed to reach the next level
      *
      * @throws InvalidSkillException if the given skill is not valid
      * @throws InvalidPlayerException if the given player does not exist in the database
+     * @throws UnsupportedOperationException if the given skill is a child skill
      */
-    public static int getOfflineXPToNextLevel(String playerName, String skillType) {
-        SkillType skill = SkillType.getSkill(skillType);
+    public static int getOfflineXPRemaining(String playerName, String skillType) {
+        SkillType skill = getNonChildSkillType(skillType);
 
-        if (skill == null) {
-            throw new InvalidSkillException();
-        }
+        PlayerProfile profile = getOfflineProfile(playerName);
 
-        return getOfflineProfile(playerName).getXpToLevel(skill);
+        return profile.getXpToLevel(skill) - profile.getSkillXpLevel(skill);
     }
 
     /**
@@ -306,13 +313,7 @@ public final class ExperienceAPI {
      * @throws InvalidSkillException if the given skill is not valid
      */
     public static void addLevel(Player player, String skillType, int levels) {
-        SkillType skill = SkillType.getSkill(skillType);
-
-        if (skill == null) {
-            throw new InvalidSkillException();
-        }
-
-        UserManager.getPlayer(player).getProfile().addLevels(skill, levels);
+        UserManager.getPlayer(player).getProfile().addLevels(getSkillType(skillType), levels);
     }
 
     /**
@@ -329,11 +330,7 @@ public final class ExperienceAPI {
      */
     public static void addLevelOffline(String playerName, String skillType, int levels) {
         PlayerProfile profile = getOfflineProfile(playerName);
-        SkillType skill = SkillType.getSkill(skillType);
-
-        if (skill == null) {
-            throw new InvalidSkillException();
-        }
+        SkillType skill = getSkillType(skillType);
 
         if (skill.isChildSkill()) {
             Set<SkillType> parentSkills = FamilyTree.getParents(skill);
@@ -362,13 +359,7 @@ public final class ExperienceAPI {
      * @throws InvalidSkillException if the given skill is not valid
      */
     public static int getLevel(Player player, String skillType) {
-        SkillType skill = SkillType.getSkill(skillType);
-
-        if (skill == null) {
-            throw new InvalidSkillException();
-        }
-
-        return UserManager.getPlayer(player).getProfile().getSkillLevel(skill);
+        return UserManager.getPlayer(player).getProfile().getSkillLevel(getSkillType(skillType));
     }
 
     /**
@@ -384,13 +375,7 @@ public final class ExperienceAPI {
      * @throws InvalidPlayerException if the given player does not exist in the database
      */
     public static int getLevelOffline(String playerName, String skillType) {
-        SkillType skill = SkillType.getSkill(skillType);
-
-        if (skill == null) {
-            throw new InvalidSkillException();
-        }
-
-        return getOfflineProfile(playerName).getSkillLevel(skill);
+        return getOfflineProfile(playerName).getSkillLevel(getSkillType(skillType));
     }
 
     /**
@@ -419,11 +404,7 @@ public final class ExperienceAPI {
         int powerLevel = 0;
         PlayerProfile profile = getOfflineProfile(playerName);
 
-        for (SkillType type : SkillType.values()) {
-            if (type.isChildSkill()) {
-                continue;
-            }
-
+        for (SkillType type : SkillType.nonChildSkills()) {
             powerLevel += profile.getSkillLevel(type);
         }
 
@@ -441,13 +422,7 @@ public final class ExperienceAPI {
      * @throws InvalidSkillException if the given skill is not valid
      */
     public static int getLevelCap(String skillType) {
-        SkillType skill = SkillType.getSkill(skillType);
-
-        if (skill == null) {
-            throw new InvalidSkillException();
-        }
-
-        return Config.getInstance().getLevelCap(skill);
+        return Config.getInstance().getLevelCap(getSkillType(skillType));
     }
 
     /**
@@ -461,6 +436,40 @@ public final class ExperienceAPI {
         return Config.getInstance().getPowerLevelCap();
     }
 
+    /**
+     * Get the position on the leaderboard of a player.
+     * </br>
+     * This function is designed for API usage.
+     *
+     * @param playerName The name of the player to check
+     * @param skillType The skill to check
+     *
+     * @throws InvalidSkillException if the given skill is not valid
+     * @throws InvalidPlayerException if the given player does not exist in the database
+     * @throws UnsupportedOperationException if the given skill is a child skill
+     *
+     * @return the position on the leaderboard
+     */
+    public static int getPlayerRankSkill(String playerName, String skillType) {
+        return mcMMO.getDatabaseManager().readRank(getOfflineProfile(playerName).getPlayerName()).get(getNonChildSkillType(skillType).toString());
+    }
+
+
+    /**
+     * Get the position on the power level leaderboard of a player.
+     * </br>
+     * This function is designed for API usage.
+     *
+     * @param playerName The name of the player to check
+     *
+     * @throws InvalidPlayerException if the given player does not exist in the database
+     *
+     * @return the position on the power level leaderboard
+     */
+    public static int getPlayerRankOverall(String playerName) {
+        return mcMMO.getDatabaseManager().readRank(getOfflineProfile(playerName).getPlayerName()).get("ALL");
+    }
+
     /**
      * Sets the level of a player in a specific skill type.
      * </br>
@@ -473,13 +482,7 @@ public final class ExperienceAPI {
      * @throws InvalidSkillException if the given skill is not valid
      */
     public static void setLevel(Player player, String skillType, int skillLevel) {
-        SkillType skill = SkillType.getSkill(skillType);
-
-        if (skill == null) {
-            throw new InvalidSkillException();
-        }
-
-        UserManager.getPlayer(player).getProfile().modifySkill(skill, skillLevel);
+        UserManager.getPlayer(player).getProfile().modifySkill(getSkillType(skillType), skillLevel);
     }
 
     /**
@@ -495,13 +498,7 @@ public final class ExperienceAPI {
      * @throws InvalidPlayerException if the given player does not exist in the database
      */
     public static void setLevelOffline(String playerName, String skillType, int skillLevel) {
-        SkillType skill = SkillType.getSkill(skillType);
-
-        if (skill == null) {
-            throw new InvalidSkillException();
-        }
-
-        getOfflineProfile(playerName).modifySkill(skill, skillLevel);
+        getOfflineProfile(playerName).modifySkill(getSkillType(skillType), skillLevel);
     }
 
     /**
@@ -514,15 +511,10 @@ public final class ExperienceAPI {
      * @param newValue The value to set the XP to
      *
      * @throws InvalidSkillException if the given skill is not valid
+     * @throws UnsupportedOperationException if the given skill is a child skill
      */
     public static void setXP(Player player, String skillType, int newValue) {
-        SkillType skill = SkillType.getSkill(skillType);
-
-        if (skill == null) {
-            throw new InvalidSkillException();
-        }
-
-        UserManager.getPlayer(player).getProfile().setSkillXpLevel(skill, newValue);
+        UserManager.getPlayer(player).getProfile().setSkillXpLevel(getNonChildSkillType(skillType), newValue);
     }
 
     /**
@@ -536,15 +528,10 @@ public final class ExperienceAPI {
      *
      * @throws InvalidSkillException if the given skill is not valid
      * @throws InvalidPlayerException if the given player does not exist in the database
+     * @throws UnsupportedOperationException if the given skill is a child skill
      */
     public static void setXPOffline(String playerName, String skillType, int newValue) {
-        SkillType skill = SkillType.getSkill(skillType);
-
-        if (skill == null) {
-            throw new InvalidSkillException();
-        }
-
-        getOfflineProfile(playerName).setSkillXpLevel(skill, newValue);
+        getOfflineProfile(playerName).setSkillXpLevel(getNonChildSkillType(skillType), newValue);
     }
 
     /**
@@ -557,15 +544,10 @@ public final class ExperienceAPI {
      * @param xp The amount of XP to remove
      *
      * @throws InvalidSkillException if the given skill is not valid
+     * @throws UnsupportedOperationException if the given skill is a child skill
      */
     public static void removeXP(Player player, String skillType, int xp) {
-        SkillType skill = SkillType.getSkill(skillType);
-
-        if (skill == null) {
-            throw new InvalidSkillException();
-        }
-
-        UserManager.getPlayer(player).getProfile().removeXp(skill, xp);
+        UserManager.getPlayer(player).getProfile().removeXp(getNonChildSkillType(skillType), xp);
     }
 
     /**
@@ -579,24 +561,14 @@ public final class ExperienceAPI {
      *
      * @throws InvalidSkillException if the given skill is not valid
      * @throws InvalidPlayerException if the given player does not exist in the database
+     * @throws UnsupportedOperationException if the given skill is a child skill
      */
     public static void removeXPOffline(String playerName, String skillType, int xp) {
-        SkillType skill = SkillType.getSkill(skillType);
-
-        if (skill == null) {
-            throw new InvalidSkillException();
-        }
-
-        getOfflineProfile(playerName).removeXp(skill, xp);
+        getOfflineProfile(playerName).removeXp(getNonChildSkillType(skillType), xp);
     }
 
-    /**
-     * Add XP to an offline player.
-     *
-     * @param playerName The player to check
-     * @param skillType The skill to check
-     * @param XP The amount of XP to award.
-     */
+    // Utility methods follow.
+
     private static void addOfflineXP(String playerName, SkillType skill, int XP) {
         PlayerProfile profile = getOfflineProfile(playerName);
 
@@ -616,7 +588,7 @@ public final class ExperienceAPI {
     }
 
     private static PlayerProfile getOfflineProfile(String playerName) {
-        PlayerProfile profile = new PlayerProfile(playerName, false);
+        PlayerProfile profile = mcMMO.getDatabaseManager().loadPlayerProfile(playerName, false);
 
         if (!profile.isLoaded()) {
             throw new InvalidPlayerException();
@@ -624,4 +596,24 @@ public final class ExperienceAPI {
 
         return profile;
     }
+
+    private static SkillType getSkillType(String skillType) throws InvalidSkillException {
+        SkillType skill = SkillType.getSkill(skillType);
+
+        if (skill == null) {
+            throw new InvalidSkillException();
+        }
+
+        return skill;
+    }
+
+    private static SkillType getNonChildSkillType(String skillType) throws InvalidSkillException, UnsupportedOperationException {
+        SkillType skill = getSkillType(skillType);
+
+        if (skill.isChildSkill()) {
+            throw new UnsupportedOperationException("Child skills do not have XP");
+        }
+
+        return skill;
+    }
 }

src/main/java/com/gmail/nossr50/api/PartyAPI.java

@@ -79,12 +79,10 @@ public final class PartyAPI {
         Party party = PartyManager.getParty(partyName);
 
         if (party == null) {
-            party = new Party();
-            party.setName(partyName);
-            party.setLeader(player.getName());
+            party = new Party(player.getName(), partyName);
         }
 
-        PartyManager.addToParty(player, UserManager.getPlayer(player), party);
+        PartyManager.addToParty(UserManager.getPlayer(player), party);
     }
 
     /**
@@ -95,7 +93,7 @@ public final class PartyAPI {
      * @param player The player to remove
      */
     public static void removeFromParty(Player player) {
-        PartyManager.removeFromParty(player, UserManager.getPlayer(player).getParty());
+        PartyManager.removeFromParty(UserManager.getPlayer(player));
     }
 
     /**

src/main/java/com/gmail/nossr50/chat/AdminChatManager.java

@@ -0,0 +1,22 @@
+package com.gmail.nossr50.chat;
+
+import org.bukkit.plugin.Plugin;
+
+import com.gmail.nossr50.config.Config;
+import com.gmail.nossr50.events.chat.McMMOAdminChatEvent;
+
+public class AdminChatManager extends ChatManager {
+    protected AdminChatManager(Plugin plugin) {
+        super(plugin, Config.getInstance().getAdminDisplayNames(), Config.getInstance().getAdminChatPrefix());
+    }
+
+    @Override
+    public void handleChat(String senderName, String displayName, String message, boolean isAsync) {
+        handleChat(new McMMOAdminChatEvent(plugin, senderName, displayName, message, isAsync));
+    }
+
+    @Override
+    protected void sendMessage() {
+        plugin.getServer().broadcast(message, "mcmmo.chat.adminchat");
+    }
+}

src/main/java/com/gmail/nossr50/chat/ChatManager.java

@@ -1,78 +1,53 @@
 package com.gmail.nossr50.chat;
 
-import org.bukkit.ChatColor;
 import org.bukkit.entity.Player;
 import org.bukkit.plugin.Plugin;
 
-import com.gmail.nossr50.mcMMO;
-import com.gmail.nossr50.config.Config;
-import com.gmail.nossr50.datatypes.party.Party;
-import com.gmail.nossr50.events.chat.McMMOAdminChatEvent;
-import com.gmail.nossr50.events.chat.McMMOPartyChatEvent;
+import com.gmail.nossr50.events.chat.McMMOChatEvent;
 import com.gmail.nossr50.locale.LocaleLoader;
 
-public final class ChatManager {
-    public ChatManager () {}
+public abstract class ChatManager {
+    protected Plugin plugin;
+    protected boolean useDisplayNames;
+    protected String chatPrefix;
 
-    public static void handleAdminChat(Plugin plugin, String playerName, String displayName, String message, boolean isAsync) {
-        McMMOAdminChatEvent chatEvent = new McMMOAdminChatEvent(plugin, playerName, displayName, message, isAsync);
-        mcMMO.p.getServer().getPluginManager().callEvent(chatEvent);
+    protected String senderName;
+    protected String displayName;
+    protected String message;
 
-        if (chatEvent.isCancelled()) {
+    protected ChatManager(Plugin plugin, boolean useDisplayNames, String chatPrefix) {
+        this.plugin = plugin;
+        this.useDisplayNames = useDisplayNames;
+        this.chatPrefix = chatPrefix;
+    }
+
+    protected void handleChat(McMMOChatEvent event) {
+        plugin.getServer().getPluginManager().callEvent(event);
+
+        if (event.isCancelled()) {
             return;
         }
 
-        if (Config.getInstance().getAdminDisplayNames()) {
-            displayName = chatEvent.getDisplayName();
-        }
-        else {
-            displayName = chatEvent.getSender();
-        }
+        senderName = event.getSender();
+        displayName = useDisplayNames ? event.getDisplayName() : senderName;
+        message = LocaleLoader.formatString(chatPrefix, displayName) + " " + event.getMessage();
 
-        String adminMessage = chatEvent.getMessage();
-
-        mcMMO.p.getServer().broadcast(LocaleLoader.getString("Commands.AdminChat.Prefix", displayName) + adminMessage, "mcmmo.chat.adminchat");
+        sendMessage();
     }
 
-    public static void handleAdminChat(Plugin plugin, String senderName, String message) {
-        handleAdminChat(plugin, senderName, senderName, message);
+    public void handleChat(String senderName, String message) {
+        handleChat(senderName, senderName, message, false);
     }
 
-    public static void handleAdminChat(Plugin plugin, String playerName, String displayName, String message) {
-        handleAdminChat(plugin, playerName, displayName, message, false);
+    public void handleChat(Player player, String message, boolean isAsync) {
+        handleChat(player.getName(), player.getDisplayName(), message, isAsync);
     }
 
-    public static void handlePartyChat(Plugin plugin, Party party, String playerName, String displayName, String message, boolean isAsync) {
-        String partyName = party.getName();
-
-        McMMOPartyChatEvent chatEvent = new McMMOPartyChatEvent(plugin, playerName, displayName, partyName, message, isAsync);
-        mcMMO.p.getServer().getPluginManager().callEvent(chatEvent);
-
-        if (chatEvent.isCancelled()) {
-            return;
-        }
-
-        if (Config.getInstance().getPartyDisplayNames()) {
-            displayName = chatEvent.getDisplayName();
-        }
-        else {
-            displayName = chatEvent.getSender();
-        }
-
-        String partyMessage = chatEvent.getMessage();
-
-        for (Player member : party.getOnlineMembers()) {
-            member.sendMessage(LocaleLoader.getString("Commands.Party.Chat.Prefix", displayName) + partyMessage);
-        }
-
-        mcMMO.p.getLogger().info("[P](" + partyName + ")" + "<" + ChatColor.stripColor(displayName) + "> " + partyMessage);
+    public void handleChat(String senderName, String displayName, String message) {
+        handleChat(senderName, displayName, message, false);
     }
 
-    public static void handlePartyChat(Plugin plugin, Party party, String senderName, String message) {
-        handlePartyChat(plugin, party, senderName, senderName, message);
-    }
+    public abstract void handleChat(String senderName, String displayName, String message, boolean isAsync);
 
-    public static void handlePartyChat(Plugin plugin, Party party, String playerName, String displayName, String message) {
-        handlePartyChat(plugin, party, playerName, displayName, message, false);
-    }
+    protected abstract void sendMessage();
 }

src/main/java/com/gmail/nossr50/chat/ChatManagerFactory.java

@@ -0,0 +1,31 @@
+package com.gmail.nossr50.chat;
+
+import java.util.HashMap;
+
+import org.bukkit.plugin.Plugin;
+
+import com.gmail.nossr50.datatypes.chat.ChatMode;
+
+public class ChatManagerFactory {
+    private static final HashMap<Plugin, AdminChatManager> adminChatManagers = new HashMap<Plugin, AdminChatManager>();
+    private static final HashMap<Plugin, PartyChatManager> partyChatManagers = new HashMap<Plugin, PartyChatManager>();
+
+    public static ChatManager getChatManager(Plugin plugin, ChatMode mode) {
+        switch (mode) {
+            case ADMIN:
+                if (!adminChatManagers.containsKey(plugin)) {
+                    adminChatManagers.put(plugin, new AdminChatManager(plugin));
+                }
+
+                return adminChatManagers.get(plugin);
+            case PARTY:
+                if (!partyChatManagers.containsKey(plugin)) {
+                    partyChatManagers.put(plugin, new PartyChatManager(plugin));
+                }
+
+                return partyChatManagers.get(plugin);
+            default:
+                return null;
+        }
+    }
+}

src/main/java/com/gmail/nossr50/chat/PartyChatManager.java

@@ -0,0 +1,39 @@
+package com.gmail.nossr50.chat;
+
+import org.bukkit.ChatColor;
+import org.bukkit.entity.Player;
+import org.bukkit.plugin.Plugin;
+
+import com.gmail.nossr50.config.Config;
+import com.gmail.nossr50.datatypes.party.Party;
+import com.gmail.nossr50.events.chat.McMMOPartyChatEvent;
+
+public class PartyChatManager extends ChatManager {
+    private Party party;
+
+    protected PartyChatManager(Plugin plugin) {
+        super(plugin, Config.getInstance().getPartyDisplayNames(), Config.getInstance().getPartyChatPrefix());
+    }
+
+    public void setParty(Party party) {
+        this.party = party;
+    }
+
+    @Override
+    public void handleChat(String senderName, String displayName, String message, boolean isAsync) {
+        handleChat(new McMMOPartyChatEvent(plugin, senderName, displayName, party.getName(), message, isAsync));
+    }
+
+    @Override
+    protected void sendMessage() {
+        if (Config.getInstance().getPartyChatColorLeaderName() && senderName.equalsIgnoreCase(party.getLeader())) {
+            message = message.replaceAll(displayName, ChatColor.GOLD + displayName + ChatColor.RESET);
+        }
+
+        for (Player member : party.getOnlineMembers()) {
+            member.sendMessage(message);
+        }
+
+        plugin.getLogger().info("[P]<" + party.getName() + ">" + message);
+    }
+}

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

@@ -0,0 +1,69 @@
+package com.gmail.nossr50.commands;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Set;
+
+import org.bukkit.command.Command;
+import org.bukkit.command.CommandSender;
+import org.bukkit.command.TabExecutor;
+import org.bukkit.entity.Player;
+import org.bukkit.util.StringUtil;
+
+import com.gmail.nossr50.datatypes.player.McMMOPlayer;
+import com.gmail.nossr50.util.Misc;
+import com.gmail.nossr50.util.Permissions;
+import com.gmail.nossr50.util.commands.CommandUtils;
+import com.gmail.nossr50.util.player.UserManager;
+
+import com.google.common.collect.ImmutableList;
+
+public class KrakenCommand implements TabExecutor {
+    @Override
+    public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
+        switch (args.length) {
+            case 0:
+                if (CommandUtils.noConsoleUsage(sender)) {
+                    return true;
+                }
+
+                if (!Permissions.kraken(sender)) {
+                    sender.sendMessage(command.getPermissionMessage());
+                    return true;
+                }
+
+                UserManager.getPlayer((Player) sender).getFishingManager().unleashTheKraken();
+                return true;
+
+            case 1:
+                if (!Permissions.krakenOthers(sender)) {
+                    sender.sendMessage(command.getPermissionMessage());
+                    return true;
+                }
+
+                String playerName = Misc.getMatchedPlayerName(args[0]);
+                McMMOPlayer mcMMOPlayer = UserManager.getPlayer(playerName);
+
+                if (!CommandUtils.checkPlayerExistence(sender, playerName, mcMMOPlayer)) {
+                    return true;
+                }
+
+                mcMMOPlayer.getFishingManager().unleashTheKraken();
+                return true;
+
+            default:
+                return false;
+        }
+    }
+
+    @Override
+    public List<String> onTabComplete(CommandSender sender, Command command, String alias, String[] args) {
+        switch (args.length) {
+            case 1:
+                Set<String> playerNames = UserManager.getPlayerNames();
+                return StringUtil.copyPartialMatches(args[0], playerNames, new ArrayList<String>(playerNames.size()));
+            default:
+                return ImmutableList.of();
+        }
+    }
+}

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

@@ -1,17 +1,17 @@
 package com.gmail.nossr50.commands;
 
 import org.bukkit.ChatColor;
-import org.bukkit.Material;
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandExecutor;
 import org.bukkit.command.CommandSender;
-import org.getspout.spoutapi.player.SpoutPlayer;
+import org.bukkit.entity.Player;
 
 import com.gmail.nossr50.mcMMO;
 import com.gmail.nossr50.commands.party.PartySubcommandType;
 import com.gmail.nossr50.config.Config;
 import com.gmail.nossr50.locale.LocaleLoader;
 import com.gmail.nossr50.util.Permissions;
+import com.gmail.nossr50.util.spout.SpoutUtils;
 
 public class McmmoCommand implements CommandExecutor {
     @Override
@@ -28,13 +28,13 @@ public class McmmoCommand implements CommandExecutor {
                 sender.sendMessage(mcSplit);
 
                 if (Config.getInstance().getDonateMessageEnabled()) {
-                    if (mcMMO.spoutEnabled && sender instanceof SpoutPlayer) {
-                        SpoutPlayer spoutPlayer = (SpoutPlayer) sender;
-                        spoutPlayer.sendNotification(LocaleLoader.getString("Spout.Donate"), ChatColor.GREEN + "gjmcferrin@gmail.com", Material.DIAMOND);
+                    if (mcMMO.isSpoutEnabled() && sender instanceof Player) {
+                        SpoutUtils.sendDonationNotification((Player) sender);
+                    }
+                    else {
+                        sender.sendMessage(LocaleLoader.getString("MOTD.Donate"));
+                        sender.sendMessage(ChatColor.GOLD + " - " + ChatColor.GREEN + "gjmcferrin@gmail.com" + ChatColor.GOLD + " Paypal");
                     }
-
-                    sender.sendMessage(LocaleLoader.getString("MOTD.Donate"));
-                    sender.sendMessage(ChatColor.GOLD + " - " + ChatColor.GREEN + "gjmcferrin@gmail.com" + ChatColor.GOLD + " Paypal");
                 }
 
                 sender.sendMessage(LocaleLoader.getString("MOTD.Version", mcMMO.p.getDescription().getVersion()));
@@ -62,52 +62,52 @@ public class McmmoCommand implements CommandExecutor {
     private void displayPartyCommands(CommandSender sender) {
         if (Permissions.party(sender)) {
             sender.sendMessage(LocaleLoader.getString("Commands.Party.Commands"));
-            sender.sendMessage("/party create <" + LocaleLoader.getString("Commands.Usage.PartyName") + "> " + LocaleLoader.getString("Commands.Party1"));
-            sender.sendMessage("/party join <" + LocaleLoader.getString("Commands.Usage.Player") + "> " + LocaleLoader.getString("Commands.Party2"));
-            sender.sendMessage("/party quit " + LocaleLoader.getString("Commands.Party.Quit"));
+            sender.sendMessage(" /party create <" + LocaleLoader.getString("Commands.Usage.PartyName") + "> " + LocaleLoader.getString("Commands.Party1"));
+            sender.sendMessage(" /party join <" + LocaleLoader.getString("Commands.Usage.Player") + "> " + LocaleLoader.getString("Commands.Party2"));
+            sender.sendMessage(" /party quit " + LocaleLoader.getString("Commands.Party.Quit"));
 
             if (Permissions.partyChat(sender)) {
-                sender.sendMessage("/party chat " + LocaleLoader.getString("Commands.Party.Toggle"));
+                sender.sendMessage(" /party chat " + LocaleLoader.getString("Commands.Party.Toggle"));
             }
 
-            sender.sendMessage("/party invite <" + LocaleLoader.getString("Commands.Usage.Player") + "> " + LocaleLoader.getString("Commands.Party.Invite"));
-            sender.sendMessage("/party accept " + LocaleLoader.getString("Commands.Party.Accept"));
+            sender.sendMessage(" /party invite <" + LocaleLoader.getString("Commands.Usage.Player") + "> " + LocaleLoader.getString("Commands.Party.Invite"));
+            sender.sendMessage(" /party accept " + LocaleLoader.getString("Commands.Party.Accept"));
 
             if (Permissions.partySubcommand(sender, PartySubcommandType.TELEPORT)) {
-                sender.sendMessage("/party teleport " + LocaleLoader.getString("Commands.Party.Teleport"));
+                sender.sendMessage(" /party teleport " + LocaleLoader.getString("Commands.Party.Teleport"));
             }
         }
     }
 
     private void displayOtherCommands(CommandSender sender) {
         sender.sendMessage(LocaleLoader.getString("Commands.Other"));
-        sender.sendMessage("/mcstats " + LocaleLoader.getString("Commands.Stats"));
-        sender.sendMessage("/mctop " + LocaleLoader.getString("Commands.Leaderboards"));
+        sender.sendMessage(" /mcstats " + LocaleLoader.getString("Commands.Stats"));
+        sender.sendMessage(" /mctop " + LocaleLoader.getString("Commands.Leaderboards"));
 
         if (Permissions.skillreset(sender)) {
-            sender.sendMessage("/skillreset <skill|all> " + LocaleLoader.getString("Commands.Reset"));
+            sender.sendMessage(" /skillreset <skill|all> " + LocaleLoader.getString("Commands.Reset"));
         }
 
         if (Permissions.mcability(sender)) {
-            sender.sendMessage("/mcability " + LocaleLoader.getString("Commands.ToggleAbility"));
+            sender.sendMessage(" /mcability " + LocaleLoader.getString("Commands.ToggleAbility"));
         }
 
         if (Permissions.adminChat(sender)) {
-            sender.sendMessage("/adminchat " + LocaleLoader.getString("Commands.AdminToggle"));
+            sender.sendMessage(" /adminchat " + LocaleLoader.getString("Commands.AdminToggle"));
         }
 
         if (Permissions.inspect(sender)) {
-            sender.sendMessage("/inspect " + LocaleLoader.getString("Commands.Inspect"));
+            sender.sendMessage(" /inspect " + LocaleLoader.getString("Commands.Inspect"));
         }
 
         if (Permissions.mmoedit(sender)) {
-            sender.sendMessage("/mmoedit " + LocaleLoader.getString("Commands.mmoedit"));
+            sender.sendMessage(" /mmoedit " + LocaleLoader.getString("Commands.mmoedit"));
         }
 
         if (Permissions.mcgod(sender)) {
-            sender.sendMessage("/mcgod " + LocaleLoader.getString("Commands.mcgod"));
+            sender.sendMessage(" /mcgod " + LocaleLoader.getString("Commands.mcgod"));
         }
 
-        sender.sendMessage(LocaleLoader.getString("Commands.SkillInfo"));
+        sender.sendMessage(" /<skill>" + LocaleLoader.getString("Commands.SkillInfo"));
     }
 }

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

@@ -5,6 +5,7 @@ import java.util.List;
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandSender;
 import org.bukkit.command.TabExecutor;
+import org.bukkit.entity.Player;
 
 import com.gmail.nossr50.datatypes.player.McMMOPlayer;
 import com.gmail.nossr50.locale.LocaleLoader;
@@ -17,7 +18,7 @@ public class McnotifyCommand implements TabExecutor {
     public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
         switch (args.length) {
             case 0:
-                McMMOPlayer mcMMOPlayer = UserManager.getPlayer(sender.getName());
+                McMMOPlayer mcMMOPlayer = UserManager.getPlayer((Player) sender);
 
                 sender.sendMessage(LocaleLoader.getString("Commands.Notifications." + (mcMMOPlayer.useChatNotifications() ? "Off" : "On")));
                 mcMMOPlayer.toggleChatNotifications();

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

@@ -0,0 +1,142 @@
+package com.gmail.nossr50.commands;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.bukkit.command.Command;
+import org.bukkit.command.CommandSender;
+import org.bukkit.command.TabExecutor;
+import org.bukkit.entity.Player;
+import org.bukkit.util.StringUtil;
+
+import com.gmail.nossr50.mcMMO;
+import com.gmail.nossr50.config.Config;
+import com.gmail.nossr50.datatypes.skills.SkillType;
+import com.gmail.nossr50.util.StringUtils;
+import com.gmail.nossr50.util.commands.CommandUtils;
+import com.gmail.nossr50.util.player.UserManager;
+import com.gmail.nossr50.util.scoreboards.ScoreboardManager;
+
+import com.google.common.collect.ImmutableList;
+
+public class McscoreboardCommand implements TabExecutor {
+    private static final List<String> SCOREBOARD_TYPES = ImmutableList.of("clear", "rank", "stats", "top");
+
+    @Override
+    public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
+        if (CommandUtils.noConsoleUsage(sender)) {
+            return true;
+        }
+
+        Player player = (Player) sender;
+
+        switch (args.length) {
+            case 0:
+                clearScoreboard(player);
+                return true;
+
+            case 1:
+                if (args[0].equalsIgnoreCase("clear")) {
+                    clearScoreboard(player);
+                }
+                else if (args[0].equalsIgnoreCase("rank")) {
+                    if (!Config.getInstance().getMcrankScoreboardEnabled()) {
+                        sender.sendMessage("This scoreboard is not enabled."); //TODO: Localize
+                        return true;
+                    }
+
+                    ScoreboardManager.setupPlayerScoreboard(player.getName());
+                    ScoreboardManager.enablePlayerRankScoreboard(player);
+                }
+                else if (args[0].equalsIgnoreCase("stats")) {
+                    if (!Config.getInstance().getMcstatsScoreboardsEnabled()) {
+                        sender.sendMessage("This scoreboard is not enabled."); //TODO: Localize
+                        return true;
+                    }
+
+                    ScoreboardManager.setupPlayerScoreboard(player.getName());
+                    ScoreboardManager.enablePlayerStatsScoreboard(UserManager.getPlayer(player));
+                }
+                else if (args[0].equalsIgnoreCase("top")) {
+                    if (!Config.getInstance().getMctopScoreboardEnabled()) {
+                        sender.sendMessage("This scoreboard is not enabled."); //TODO: Localize
+                        return true;
+                    }
+
+                    ScoreboardManager.enableGlobalStatsScoreboard(player, "all", 1);
+                }
+                else {
+                    return false;
+                }
+
+                return true;
+
+            case 2:
+                if (!args[0].equalsIgnoreCase("top")) {
+                    return false;
+                }
+
+                if (!Config.getInstance().getMctopScoreboardEnabled()) {
+                    sender.sendMessage("This scoreboard is not enabled."); //TODO: Localize
+                    return true;
+                }
+
+                if (StringUtils.isInt(args[1])) {
+                    ScoreboardManager.enableGlobalStatsScoreboard(player, "all", Math.abs(Integer.parseInt(args[1])));
+                    return true;
+                }
+
+                if (CommandUtils.isInvalidSkill(sender, args[1])) {
+                    return true;
+                }
+
+                ScoreboardManager.enableGlobalStatsScoreboard(player, args[1], 1);
+                return true;
+
+            case 3:
+                if (!args[0].equalsIgnoreCase("top")) {
+                    return false;
+                }
+
+                if (!Config.getInstance().getMctopScoreboardEnabled()) {
+                    sender.sendMessage("This scoreboard is not enabled."); //TODO: Localize
+                    return true;
+                }
+
+                if (CommandUtils.isInvalidSkill(sender, args[1])) {
+                    return true;
+                }
+
+                if (CommandUtils.isInvalidInteger(sender, args[2])) {
+                    return true;
+                }
+
+                ScoreboardManager.enableGlobalStatsScoreboard(player, args[1], Math.abs(Integer.parseInt(args[2])));
+                return true;
+
+            default:
+                return false;
+        }
+    }
+
+    @Override
+    public List<String> onTabComplete(CommandSender sender, Command command, String alias, String[] args) {
+        switch (args.length) {
+            case 1:
+                return StringUtil.copyPartialMatches(args[0], SCOREBOARD_TYPES, new ArrayList<String>(SCOREBOARD_TYPES.size()));
+            case 2:
+                if (args[0].equalsIgnoreCase("top")) {
+                    return StringUtil.copyPartialMatches(args[1], SkillType.SKILL_NAMES, new ArrayList<String>(SkillType.SKILL_NAMES.size()));
+                }
+                // Fallthrough
+
+            default:
+                return ImmutableList.of();
+        }
+    }
+
+    private void clearScoreboard(Player player) {
+        player.setScoreboard(mcMMO.p.getServer().getScoreboardManager().getMainScoreboard());
+        player.sendMessage("Your scoreboard has been cleared!"); //TODO: Locale
+    }
+}

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

@@ -7,6 +7,7 @@ import java.util.List;
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandSender;
 import org.bukkit.command.TabExecutor;
+import org.bukkit.entity.Player;
 import org.bukkit.util.StringUtil;
 
 import com.gmail.nossr50.datatypes.MobHealthbarType;
@@ -38,7 +39,7 @@ public class MobhealthCommand implements TabExecutor {
 
         switch (args.length) {
             case 1:
-                PlayerProfile playerProfile = UserManager.getPlayer(sender.getName()).getProfile();
+                PlayerProfile playerProfile = UserManager.getPlayer((Player) sender).getProfile();
 
                 try {
                     MobHealthbarType type = MobHealthbarType.valueOf(args[0].toUpperCase().trim());

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

@@ -11,6 +11,7 @@ import org.bukkit.entity.Player;
 import org.bukkit.util.StringUtil;
 
 import com.gmail.nossr50.datatypes.player.McMMOPlayer;
+import com.gmail.nossr50.util.Misc;
 import com.gmail.nossr50.util.commands.CommandUtils;
 import com.gmail.nossr50.util.player.UserManager;
 
@@ -33,8 +34,8 @@ public abstract class ToggleCommand implements TabExecutor {
                     return true;
                 }
 
-                mcMMOPlayer = UserManager.getPlayer(sender.getName());
-                player = mcMMOPlayer.getPlayer();
+                player = (Player) sender;
+                mcMMOPlayer = UserManager.getPlayer(player);
 
                 applyCommandAction();
                 return true;
@@ -45,9 +46,10 @@ public abstract class ToggleCommand implements TabExecutor {
                     return true;
                 }
 
-                mcMMOPlayer = UserManager.getPlayer(args[0]);
+                String playerName = Misc.getMatchedPlayerName(args[0]);
+                mcMMOPlayer = UserManager.getPlayer(playerName);
 
-                if (!CommandUtils.checkPlayerExistence(sender, args[0], mcMMOPlayer)) {
+                if (!CommandUtils.checkPlayerExistence(sender, playerName, mcMMOPlayer)) {
                     return true;
                 }
 
@@ -70,7 +72,7 @@ public abstract class ToggleCommand implements TabExecutor {
     public List<String> onTabComplete(CommandSender sender, Command command, String alias, String[] args) {
         switch (args.length) {
             case 1:
-                Set<String> playerNames = UserManager.getPlayers().keySet();
+                Set<String> playerNames = UserManager.getPlayerNames();
                 return StringUtil.copyPartialMatches(args[0], playerNames, new ArrayList<String>(playerNames.size()));
             default:
                 return ImmutableList.of();

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

@@ -9,7 +9,7 @@ import org.bukkit.command.TabExecutor;
 import org.bukkit.util.StringUtil;
 
 import com.gmail.nossr50.mcMMO;
-import com.gmail.nossr50.config.Config;
+import com.gmail.nossr50.config.experience.ExperienceConfig;
 import com.gmail.nossr50.locale.LocaleLoader;
 import com.gmail.nossr50.util.Permissions;
 import com.gmail.nossr50.util.StringUtils;
@@ -21,7 +21,7 @@ public class XprateCommand implements TabExecutor {
     private double originalRate;
 
     public XprateCommand() {
-        originalRate = Config.getInstance().getExperienceGainsGlobalMultiplier();
+        originalRate = ExperienceConfig.getInstance().getExperienceGainsGlobalMultiplier();
     }
 
     @Override
@@ -42,7 +42,7 @@ public class XprateCommand implements TabExecutor {
                     mcMMO.p.toggleXpEventEnabled();
                 }
 
-                Config.getInstance().setExperienceGainsGlobalMultiplier(originalRate);
+                ExperienceConfig.getInstance().setExperienceGainsGlobalMultiplier(originalRate);
                 return true;
 
             case 2:
@@ -66,7 +66,7 @@ public class XprateCommand implements TabExecutor {
                 }
 
                 int newXpRate = Integer.parseInt(args[0]);
-                Config.getInstance().setExperienceGainsGlobalMultiplier(newXpRate);
+                ExperienceConfig.getInstance().setExperienceGainsGlobalMultiplier(newXpRate);
 
                 if (mcMMO.p.isXPEventEnabled()) {
                     mcMMO.p.getServer().broadcastMessage(LocaleLoader.getString("Commands.xprate.started.0"));

src/main/java/com/gmail/nossr50/commands/chat/AdminChatCommand.java

@@ -1,12 +1,8 @@
 package com.gmail.nossr50.commands.chat;
 
 import org.bukkit.command.CommandSender;
-import org.bukkit.entity.Player;
 
-import com.gmail.nossr50.mcMMO;
-import com.gmail.nossr50.chat.ChatManager;
-import com.gmail.nossr50.chat.ChatMode;
-import com.gmail.nossr50.locale.LocaleLoader;
+import com.gmail.nossr50.datatypes.chat.ChatMode;
 
 public class AdminChatCommand extends ChatCommand {
     public AdminChatCommand() {
@@ -15,12 +11,6 @@ public class AdminChatCommand extends ChatCommand {
 
     @Override
     protected void handleChatSending(CommandSender sender, String[] args) {
-        if (sender instanceof Player) {
-            Player player = (Player) sender;
-            ChatManager.handleAdminChat(mcMMO.p, player.getName(), player.getDisplayName(), buildChatMessage(args, 0));
-        }
-        else {
-            ChatManager.handleAdminChat(mcMMO.p, LocaleLoader.getString("Commands.Chat.Console"), buildChatMessage(args, 0));
-        }
+        chatManager.handleChat(sender.getName(), getDisplayName(sender), buildChatMessage(args, 0));
     }
 }

src/main/java/com/gmail/nossr50/commands/chat/ChatCommand.java

@@ -6,9 +6,13 @@ import java.util.List;
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandSender;
 import org.bukkit.command.TabExecutor;
+import org.bukkit.entity.Player;
 import org.bukkit.util.StringUtil;
 
-import com.gmail.nossr50.chat.ChatMode;
+import com.gmail.nossr50.mcMMO;
+import com.gmail.nossr50.chat.ChatManager;
+import com.gmail.nossr50.chat.ChatManagerFactory;
+import com.gmail.nossr50.datatypes.chat.ChatMode;
 import com.gmail.nossr50.datatypes.player.McMMOPlayer;
 import com.gmail.nossr50.locale.LocaleLoader;
 import com.gmail.nossr50.util.commands.CommandUtils;
@@ -18,10 +22,12 @@ import com.google.common.collect.ImmutableList;
 
 public abstract class ChatCommand implements TabExecutor {
     protected ChatMode chatMode;
+    protected ChatManager chatManager;
     private McMMOPlayer mcMMOPlayer;
 
     public ChatCommand(ChatMode chatMode) {
         this.chatMode = chatMode;
+        this.chatManager = ChatManagerFactory.getChatManager(mcMMO.p, chatMode);
     }
 
     @Override
@@ -32,7 +38,7 @@ public abstract class ChatCommand implements TabExecutor {
                     return true;
                 }
 
-                mcMMOPlayer = UserManager.getPlayer(sender.getName());
+                mcMMOPlayer = UserManager.getPlayer((Player) sender);
 
                 if (chatMode.isEnabled(mcMMOPlayer)) {
                     disableChatMode(sender);
@@ -49,7 +55,7 @@ public abstract class ChatCommand implements TabExecutor {
                         return true;
                     }
 
-                    mcMMOPlayer = UserManager.getPlayer(sender.getName());
+                    mcMMOPlayer = UserManager.getPlayer((Player) sender);
 
                     enableChatMode(sender);
                     return true;
@@ -60,7 +66,7 @@ public abstract class ChatCommand implements TabExecutor {
                         return true;
                     }
 
-                    mcMMOPlayer = UserManager.getPlayer(sender.getName());
+                    mcMMOPlayer = UserManager.getPlayer((Player) sender);
 
                     disableChatMode(sender);
                     return true;
@@ -96,6 +102,10 @@ public abstract class ChatCommand implements TabExecutor {
         return builder.toString();
     }
 
+    protected String getDisplayName(CommandSender sender) {
+        return (sender instanceof Player) ? ((Player) sender).getDisplayName() : LocaleLoader.getString("Commands.Chat.Console");
+    }
+
     protected abstract void handleChatSending(CommandSender sender, String[] args);
 
     private void enableChatMode(CommandSender sender) {

src/main/java/com/gmail/nossr50/commands/chat/PartyChatCommand.java

@@ -3,9 +3,8 @@ package com.gmail.nossr50.commands.chat;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 
-import com.gmail.nossr50.mcMMO;
-import com.gmail.nossr50.chat.ChatManager;
-import com.gmail.nossr50.chat.ChatMode;
+import com.gmail.nossr50.chat.PartyChatManager;
+import com.gmail.nossr50.datatypes.chat.ChatMode;
 import com.gmail.nossr50.datatypes.party.Party;
 import com.gmail.nossr50.locale.LocaleLoader;
 import com.gmail.nossr50.party.PartyManager;
@@ -18,16 +17,18 @@ public class PartyChatCommand extends ChatCommand {
 
     @Override
     protected void handleChatSending(CommandSender sender, String[] args) {
+        Party party;
+        String message;
+
         if (sender instanceof Player) {
-            Player player = (Player) sender;
-            Party party = UserManager.getPlayer(player).getParty();
+            party = UserManager.getPlayer((Player) sender).getParty();
 
             if (party == null) {
                 sender.sendMessage(LocaleLoader.getString("Commands.Party.None"));
                 return;
             }
 
-            ChatManager.handlePartyChat(mcMMO.p, party, player.getName(), player.getDisplayName(), buildChatMessage(args, 0));
+            message = buildChatMessage(args, 0);
         }
         else {
             if (args.length < 2) {
@@ -35,14 +36,17 @@ public class PartyChatCommand extends ChatCommand {
                 return;
             }
 
-            Party party = PartyManager.getParty(args[0]);
+            party = PartyManager.getParty(args[0]);
 
             if (party == null) {
                 sender.sendMessage(LocaleLoader.getString("Party.InvalidName"));
                 return;
             }
 
-            ChatManager.handlePartyChat(mcMMO.p, party, LocaleLoader.getString("Commands.Chat.Console"), buildChatMessage(args, 1));
+            message = buildChatMessage(args, 1);
         }
+
+        ((PartyChatManager) chatManager).setParty(party);
+        chatManager.handleChat(sender.getName(), getDisplayName(sender), message);
     }
 }

src/main/java/com/gmail/nossr50/commands/database/ConvertDatabaseCommand.java

@@ -0,0 +1,79 @@
+package com.gmail.nossr50.commands.database;
+
+import org.bukkit.command.Command;
+import org.bukkit.command.CommandExecutor;
+import org.bukkit.command.CommandSender;
+import org.bukkit.entity.Player;
+
+import com.gmail.nossr50.mcMMO;
+import com.gmail.nossr50.database.DatabaseManager;
+import com.gmail.nossr50.database.DatabaseManagerFactory;
+import com.gmail.nossr50.datatypes.database.DatabaseType;
+import com.gmail.nossr50.datatypes.player.PlayerProfile;
+import com.gmail.nossr50.locale.LocaleLoader;
+import com.gmail.nossr50.runnables.database.DatabaseConversionTask;
+import com.gmail.nossr50.util.player.UserManager;
+
+public class ConvertDatabaseCommand implements CommandExecutor {
+    @Override
+    public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
+        switch (args.length) {
+            case 2:
+                DatabaseType previousType = DatabaseType.getDatabaseType(args[1]);
+                DatabaseType newType = mcMMO.getDatabaseManager().getDatabaseType();
+
+                if ((newType == DatabaseType.CUSTOM && DatabaseManagerFactory.getCustomDatabaseManagerClass().getSimpleName().equalsIgnoreCase(args[1])) || previousType == newType) {
+                    sender.sendMessage(LocaleLoader.getString("Commands.mcconvert.Database.Same", newType.toString()));
+                    return true;
+                }
+
+                DatabaseManager oldDatabase = DatabaseManagerFactory.createDatabaseManager(previousType);
+
+                if (previousType == DatabaseType.CUSTOM) {
+                    Class<?> clazz;
+
+                    try {
+                        clazz = Class.forName(args[1]);
+
+                        if (!DatabaseManager.class.isAssignableFrom(clazz)) {
+                            sender.sendMessage(LocaleLoader.getString("Commands.mcconvert.Database.InvalidType", args[1]));
+                            return true;
+                        }
+                    }
+                    catch (Exception e) {
+                        sender.sendMessage(LocaleLoader.getString("Commands.mcconvert.Database.InvalidType", args[1]));
+                        return true;
+                    }
+
+                    try {
+                        oldDatabase = DatabaseManagerFactory.createCustomDatabaseManager((Class<? extends DatabaseManager>) clazz);
+                    }
+                    catch (Throwable t) {
+                        sender.sendMessage("An error occurred during the conversion process."); // TODO: Localize
+                        return true;
+                    }
+                }
+
+                sender.sendMessage(LocaleLoader.getString("Commands.mcconvert.Database.Start", previousType.toString(), newType.toString()));
+
+                UserManager.saveAll();
+                UserManager.clearAll();
+
+                for (Player player : mcMMO.p.getServer().getOnlinePlayers()) {
+                    PlayerProfile profile = oldDatabase.loadPlayerProfile(player.getName(), false);
+
+                    if (profile.isLoaded()) {
+                        mcMMO.getDatabaseManager().saveUser(profile);
+                    }
+
+                    UserManager.addUser(player);
+                }
+
+                new DatabaseConversionTask(oldDatabase, sender, previousType.toString(), newType.toString()).runTaskAsynchronously(mcMMO.p);
+                return true;
+
+            default:
+                return false;
+        }
+    }
+}

src/main/java/com/gmail/nossr50/commands/database/McconvertCommand.java

@@ -0,0 +1,94 @@
+package com.gmail.nossr50.commands.database;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+
+import org.bukkit.command.Command;
+import org.bukkit.command.CommandExecutor;
+import org.bukkit.command.CommandSender;
+import org.bukkit.command.TabExecutor;
+import org.bukkit.util.StringUtil;
+
+import com.gmail.nossr50.mcMMO;
+import com.gmail.nossr50.commands.experience.ConvertExperienceCommand;
+import com.gmail.nossr50.database.DatabaseManagerFactory;
+import com.gmail.nossr50.datatypes.database.DatabaseType;
+import com.gmail.nossr50.datatypes.experience.FormulaType;
+
+import com.google.common.collect.ImmutableList;
+
+public class McconvertCommand implements TabExecutor {
+    private static final List<String> FORMULA_TYPES;
+    private static final List<String> DATABASE_TYPES;
+    private static final List<String> SUBCOMMANDS = ImmutableList.of("database", "experience");
+
+    private CommandExecutor databaseConvertCommand   = new ConvertDatabaseCommand();
+    private CommandExecutor experienceConvertCommand = new ConvertExperienceCommand();
+
+    static {
+        ArrayList<String> formulaTypes = new ArrayList<String>();
+
+        for (FormulaType type : FormulaType.values()) {
+            formulaTypes.add(type.toString());
+        }
+
+        Collections.sort(formulaTypes);
+        FORMULA_TYPES = ImmutableList.copyOf(formulaTypes);
+    }
+
+    static {
+        ArrayList<String> databaseTypes = new ArrayList<String>();
+
+        for (DatabaseType type : DatabaseType.values()) {
+            databaseTypes.add(type.toString());
+        }
+
+        // Custom stuff
+        databaseTypes.remove(DatabaseType.CUSTOM);
+
+        if (mcMMO.getDatabaseManager().getDatabaseType() == DatabaseType.CUSTOM) {
+            databaseTypes.add(DatabaseManagerFactory.getCustomDatabaseManagerClass().getName());
+        }
+
+        Collections.sort(databaseTypes);
+        DATABASE_TYPES = ImmutableList.copyOf(databaseTypes);
+    }
+
+    @Override
+    public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
+        switch (args.length) {
+            case 2:
+                if (args[0].equalsIgnoreCase("database") || args[0].equalsIgnoreCase("db")) {
+                    return databaseConvertCommand.onCommand(sender, command, label, args);
+                }
+                else if (args[0].equalsIgnoreCase("experience") || args[0].equalsIgnoreCase("xp") || args[1].equalsIgnoreCase("exp")) {
+                    return experienceConvertCommand.onCommand(sender, command, label, args);
+                }
+
+                return false;
+            default:
+                return false;
+        }
+    }
+
+    @Override
+    public List<String> onTabComplete(CommandSender sender, Command command, String alias, String[] args) {
+        switch (args.length) {
+            case 1:
+                return StringUtil.copyPartialMatches(args[0], SUBCOMMANDS, new ArrayList<String>(SUBCOMMANDS.size()));
+            case 2:
+                if (args[0].equalsIgnoreCase("database") || args[0].equalsIgnoreCase("db")) {
+                    return StringUtil.copyPartialMatches(args[0], DATABASE_TYPES, new ArrayList<String>(DATABASE_TYPES.size()));
+                }
+
+                if (args[0].equalsIgnoreCase("experience") || args[0].equalsIgnoreCase("xp") || args[0].equalsIgnoreCase("exp")) {
+                    return StringUtil.copyPartialMatches(args[0], FORMULA_TYPES, new ArrayList<String>(FORMULA_TYPES.size()));
+                }
+
+                return ImmutableList.of();
+            default:
+                return ImmutableList.of();
+        }
+    }
+}

src/main/java/com/gmail/nossr50/commands/database/McpurgeCommand.java

@@ -9,18 +9,12 @@ import org.bukkit.command.TabExecutor;
 import com.gmail.nossr50.mcMMO;
 import com.gmail.nossr50.config.Config;
 import com.gmail.nossr50.locale.LocaleLoader;
-import com.gmail.nossr50.util.Permissions;
 
 import com.google.common.collect.ImmutableList;
 
 public class McpurgeCommand implements TabExecutor {
     @Override
     public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
-        if (!Permissions.mcpurge(sender)) {
-            sender.sendMessage(command.getPermissionMessage());
-            return true;
-        }
-
         switch (args.length) {
             case 0:
                 mcMMO.getDatabaseManager().purgePowerlessUsers();

src/main/java/com/gmail/nossr50/commands/database/McremoveCommand.java

@@ -10,9 +10,8 @@ import org.bukkit.command.TabExecutor;
 import org.bukkit.util.StringUtil;
 
 import com.gmail.nossr50.mcMMO;
-import com.gmail.nossr50.datatypes.player.PlayerProfile;
 import com.gmail.nossr50.locale.LocaleLoader;
-import com.gmail.nossr50.util.Permissions;
+import com.gmail.nossr50.util.Misc;
 import com.gmail.nossr50.util.commands.CommandUtils;
 import com.gmail.nossr50.util.player.UserManager;
 
@@ -21,22 +20,19 @@ import com.google.common.collect.ImmutableList;
 public class McremoveCommand implements TabExecutor {
     @Override
     public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
-        if (!Permissions.mcremove(sender)) {
-            sender.sendMessage(command.getPermissionMessage());
-            return true;
-        }
-
         switch (args.length) {
             case 1:
-                if (UserManager.getPlayer(args[0]) == null && CommandUtils.unloadedProfile(sender, new PlayerProfile(args[0], false))) {
+                String playerName = Misc.getMatchedPlayerName(args[0]);
+
+                if (UserManager.getPlayer(playerName, true) == null && CommandUtils.unloadedProfile(sender, mcMMO.getDatabaseManager().loadPlayerProfile(playerName, false))) {
                     return true;
                 }
 
-                if (mcMMO.getDatabaseManager().removeUser(args[0])) {
-                    sender.sendMessage(LocaleLoader.getString("Commands.mcremove.Success", args[0]));
+                if (mcMMO.getDatabaseManager().removeUser(playerName)) {
+                    sender.sendMessage(LocaleLoader.getString("Commands.mcremove.Success", playerName));
                 }
                 else {
-                    sender.sendMessage(args[0] + " could not be removed from the database."); // Pretty sure this should NEVER happen.
+                    sender.sendMessage(playerName + " could not be removed from the database."); // Pretty sure this should NEVER happen.
                 }
 
                 return true;
@@ -50,7 +46,7 @@ public class McremoveCommand implements TabExecutor {
     public List<String> onTabComplete(CommandSender sender, Command command, String alias, String[] args) {
         switch (args.length) {
             case 1:
-                Set<String> playerNames = UserManager.getPlayers().keySet();
+                Set<String> playerNames = UserManager.getPlayerNames();
                 return StringUtil.copyPartialMatches(args[0], playerNames, new ArrayList<String>(playerNames.size()));
             default:
                 return ImmutableList.of();

src/main/java/com/gmail/nossr50/commands/database/MmoshowdbCommand.java

@@ -0,0 +1,37 @@
+package com.gmail.nossr50.commands.database;
+
+import java.util.List;
+
+import org.bukkit.command.Command;
+import org.bukkit.command.CommandSender;
+import org.bukkit.command.TabExecutor;
+
+import com.gmail.nossr50.config.Config;
+import com.gmail.nossr50.database.DatabaseManagerFactory;
+import com.gmail.nossr50.locale.LocaleLoader;
+
+import com.google.common.collect.ImmutableList;
+
+public class MmoshowdbCommand implements TabExecutor {
+    @Override
+    public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
+        if (args.length != 0) {
+            return false;
+        }
+
+        Class<?> clazz = DatabaseManagerFactory.getCustomDatabaseManagerClass();
+
+        if (clazz != null) {
+            sender.sendMessage(LocaleLoader.getString("Commands.mmoshowdb", clazz.getName()));
+            return true;
+        }
+
+        sender.sendMessage(LocaleLoader.getString("Commands.mmoshowdb", (Config.getInstance().getUseMySQL() ? "sql" : "flatfile")));
+        return true;
+    }
+
+    @Override
+    public List<String> onTabComplete(CommandSender sender, Command command, String alias, String[] args) {
+        return ImmutableList.of();
+    }
+}

src/main/java/com/gmail/nossr50/commands/database/MmoupdateCommand.java

@@ -1,55 +0,0 @@
-package com.gmail.nossr50.commands.database;
-
-import java.util.List;
-
-import org.bukkit.command.Command;
-import org.bukkit.command.CommandSender;
-import org.bukkit.command.TabExecutor;
-import org.bukkit.entity.Player;
-
-import com.gmail.nossr50.mcMMO;
-import com.gmail.nossr50.config.Config;
-import com.gmail.nossr50.locale.LocaleLoader;
-import com.gmail.nossr50.runnables.database.SQLConversionTask;
-import com.gmail.nossr50.util.Permissions;
-import com.gmail.nossr50.util.player.UserManager;
-
-import com.google.common.collect.ImmutableList;
-
-public class MmoupdateCommand implements TabExecutor {
-    @Override
-    public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
-        if (!Permissions.mmoupdate(sender)) {
-            sender.sendMessage(command.getPermissionMessage());
-            return true;
-        }
-
-        if (!Config.getInstance().getUseMySQL()) {
-            sender.sendMessage("SQL Mode is not enabled."); // TODO: Localize
-            return true;
-        }
-
-        switch (args.length) {
-            case 0:
-                sender.sendMessage(LocaleLoader.getString("Commands.mmoupdate.Start"));
-                UserManager.saveAll();
-                UserManager.clearAll();
-                new SQLConversionTask().runTaskLaterAsynchronously(mcMMO.p, 1);
-
-                for (Player player : mcMMO.p.getServer().getOnlinePlayers()) {
-                    UserManager.addUser(player);
-                }
-
-                sender.sendMessage(LocaleLoader.getString("Commands.mmoupdate.Finish"));
-                return true;
-
-            default:
-                return false;
-        }
-    }
-
-    @Override
-    public List<String> onTabComplete(CommandSender sender, Command command, String alias, String[] args) {
-        return ImmutableList.of();
-    }
-}

src/main/java/com/gmail/nossr50/commands/experience/AddlevelsCommand.java

@@ -2,7 +2,9 @@ package com.gmail.nossr50.commands.experience;
 
 import org.bukkit.command.CommandSender;
 
+import com.gmail.nossr50.mcMMO;
 import com.gmail.nossr50.datatypes.skills.SkillType;
+import com.gmail.nossr50.events.experience.McMMOPlayerLevelUpEvent;
 import com.gmail.nossr50.locale.LocaleLoader;
 import com.gmail.nossr50.util.Permissions;
 import com.gmail.nossr50.util.skills.SkillUtils;
@@ -21,6 +23,10 @@ public class AddlevelsCommand extends ExperienceCommand {
     @Override
     protected void handleCommand(SkillType skill) {
         profile.addLevels(skill, value);
+
+        if (player != null) {
+            mcMMO.p.getServer().getPluginManager().callEvent(new McMMOPlayerLevelUpEvent(player, skill, value));
+        }
     }
 
     @Override

src/main/java/com/gmail/nossr50/commands/experience/ConvertExperienceCommand.java

@@ -0,0 +1,49 @@
+package com.gmail.nossr50.commands.experience;
+
+import org.bukkit.command.Command;
+import org.bukkit.command.CommandExecutor;
+import org.bukkit.command.CommandSender;
+import org.bukkit.entity.Player;
+
+import com.gmail.nossr50.mcMMO;
+import com.gmail.nossr50.datatypes.experience.FormulaType;
+import com.gmail.nossr50.locale.LocaleLoader;
+import com.gmail.nossr50.runnables.database.FormulaConversionTask;
+import com.gmail.nossr50.util.player.UserManager;
+
+public class ConvertExperienceCommand implements CommandExecutor {
+    @Override
+    public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
+        switch (args.length) {
+            case 2:
+                FormulaType previousType = mcMMO.getFormulaManager().getPreviousFormulaType();
+                FormulaType newType = FormulaType.getFormulaType(args[1].toUpperCase());
+
+                if (newType == FormulaType.UNKNOWN) {
+                    sender.sendMessage(LocaleLoader.getString("Commands.mcconvert.Experience.Invalid"));
+                    return true;
+                }
+
+                if (previousType == newType) {
+                    sender.sendMessage(LocaleLoader.getString("Commands.mcconvert.Experience.Same", newType.toString()));
+                    return true;
+                }
+
+                sender.sendMessage(LocaleLoader.getString("Commands.mcconvert.Experience.Start", previousType.toString(), newType.toString()));
+
+                UserManager.saveAll();
+                UserManager.clearAll();
+
+                new FormulaConversionTask(sender, newType).runTaskLater(mcMMO.p, 1);
+
+                for (Player player : mcMMO.p.getServer().getOnlinePlayers()) {
+                    UserManager.addUser(player);
+                }
+
+                return true;
+
+            default:
+                return false;
+        }
+    }
+}

src/main/java/com/gmail/nossr50/commands/experience/ExperienceCommand.java

@@ -10,10 +10,12 @@ import org.bukkit.command.TabExecutor;
 import org.bukkit.entity.Player;
 import org.bukkit.util.StringUtil;
 
+import com.gmail.nossr50.mcMMO;
 import com.gmail.nossr50.datatypes.player.McMMOPlayer;
 import com.gmail.nossr50.datatypes.player.PlayerProfile;
 import com.gmail.nossr50.datatypes.skills.SkillType;
 import com.gmail.nossr50.locale.LocaleLoader;
+import com.gmail.nossr50.util.Misc;
 import com.gmail.nossr50.util.commands.CommandUtils;
 import com.gmail.nossr50.util.player.UserManager;
 import com.gmail.nossr50.util.skills.SkillUtils;
@@ -46,12 +48,12 @@ public abstract class ExperienceCommand implements TabExecutor {
                     return true;
                 }
 
-                mcMMOPlayer = UserManager.getPlayer(sender.getName());
-                player = mcMMOPlayer.getPlayer();
+                player = (Player) sender;
+                mcMMOPlayer = UserManager.getPlayer(player);
                 profile = mcMMOPlayer.getProfile();
 
                 editValues();
-                allSkills = false;
+                cleanUp();
                 return true;
 
             case 3:
@@ -64,11 +66,12 @@ public abstract class ExperienceCommand implements TabExecutor {
                     return true;
                 }
 
-                mcMMOPlayer = UserManager.getPlayer(args[0]);
+                String playerName = Misc.getMatchedPlayerName(args[0]);
+                McMMOPlayer mcMMOPlayer = UserManager.getPlayer(playerName, true);
 
                 // If the mcMMOPlayer doesn't exist, create a temporary profile and check if it's present in the database. If it's not, abort the process.
                 if (mcMMOPlayer == null) {
-                    profile = new PlayerProfile(args[0], false);
+                    profile = mcMMO.getDatabaseManager().loadPlayerProfile(playerName, false);
 
                     if (CommandUtils.unloadedProfile(sender, profile)) {
                         return true;
@@ -83,8 +86,8 @@ public abstract class ExperienceCommand implements TabExecutor {
                     editValues();
                 }
 
-                handleSenderMessage(sender, args[0]);
-                allSkills = false;
+                handleSenderMessage(sender, playerName);
+                cleanUp();
                 return true;
 
             default:
@@ -96,7 +99,7 @@ public abstract class ExperienceCommand implements TabExecutor {
     public List<String> onTabComplete(CommandSender sender, Command command, String alias, String[] args) {
         switch (args.length) {
             case 1:
-                Set<String> playerNames = UserManager.getPlayers().keySet();
+                Set<String> playerNames = UserManager.getPlayerNames();
                 return StringUtil.copyPartialMatches(args[0], playerNames, new ArrayList<String>(playerNames.size()));
             case 2:
                 return StringUtil.copyPartialMatches(args[1], SkillType.SKILL_NAMES, new ArrayList<String>(SkillType.SKILL_NAMES.size()));
@@ -168,4 +171,9 @@ public abstract class ExperienceCommand implements TabExecutor {
             }
         }
     }
+
+    private void cleanUp() {
+        allSkills = false;
+        player = null;
+    }
 }

src/main/java/com/gmail/nossr50/commands/experience/MmoeditCommand.java

@@ -2,7 +2,10 @@ package com.gmail.nossr50.commands.experience;
 
 import org.bukkit.command.CommandSender;
 
+import com.gmail.nossr50.mcMMO;
 import com.gmail.nossr50.datatypes.skills.SkillType;
+import com.gmail.nossr50.events.experience.McMMOPlayerLevelDownEvent;
+import com.gmail.nossr50.events.experience.McMMOPlayerLevelUpEvent;
 import com.gmail.nossr50.locale.LocaleLoader;
 import com.gmail.nossr50.util.Permissions;
 import com.gmail.nossr50.util.skills.SkillUtils;
@@ -21,6 +24,19 @@ public class MmoeditCommand extends ExperienceCommand {
     @Override
     protected void handleCommand(SkillType skill) {
         profile.modifySkill(skill, value);
+
+        if (player == null) {
+            return;
+        }
+
+        int skillLevel = profile.getSkillLevel(skill);
+
+        if (value > skillLevel) {
+            mcMMO.p.getServer().getPluginManager().callEvent(new McMMOPlayerLevelUpEvent(player, skill, value - skillLevel));
+        }
+        else if (value < skillLevel) {
+            mcMMO.p.getServer().getPluginManager().callEvent(new McMMOPlayerLevelDownEvent(player, skill, skillLevel - value));
+        }
     }
 
     @Override

src/main/java/com/gmail/nossr50/commands/experience/SkillresetCommand.java

@@ -2,10 +2,13 @@ package com.gmail.nossr50.commands.experience;
 
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandSender;
+import org.bukkit.entity.Player;
 
-import com.gmail.nossr50.datatypes.player.PlayerProfile;
+import com.gmail.nossr50.mcMMO;
 import com.gmail.nossr50.datatypes.skills.SkillType;
+import com.gmail.nossr50.events.experience.McMMOPlayerLevelDownEvent;
 import com.gmail.nossr50.locale.LocaleLoader;
+import com.gmail.nossr50.util.Misc;
 import com.gmail.nossr50.util.Permissions;
 import com.gmail.nossr50.util.commands.CommandUtils;
 import com.gmail.nossr50.util.player.UserManager;
@@ -37,8 +40,8 @@ public class SkillresetCommand extends ExperienceCommand {
                     return true;
                 }
 
-                mcMMOPlayer = UserManager.getPlayer(sender.getName());
-                player = mcMMOPlayer.getPlayer();
+                player = (Player) sender;
+                mcMMOPlayer = UserManager.getPlayer(player);
                 profile = mcMMOPlayer.getProfile();
 
                 editValues();
@@ -54,11 +57,12 @@ public class SkillresetCommand extends ExperienceCommand {
                     return true;
                 }
 
-                mcMMOPlayer = UserManager.getPlayer(args[0]);
+                String playerName = Misc.getMatchedPlayerName(args[0]);
+                mcMMOPlayer = UserManager.getPlayer(playerName, true);
 
                 // If the mcMMOPlayer doesn't exist, create a temporary profile and check if it's present in the database. If it's not, abort the process.
                 if (mcMMOPlayer == null) {
-                    profile = new PlayerProfile(args[0], false);
+                    profile = mcMMO.getDatabaseManager().loadPlayerProfile(playerName, false);
 
                     if (CommandUtils.unloadedProfile(sender, profile)) {
                         return true;
@@ -74,7 +78,7 @@ public class SkillresetCommand extends ExperienceCommand {
                     editValues();
                 }
 
-                handleSenderMessage(sender, args[0]);
+                handleSenderMessage(sender, playerName);
                 return true;
 
             default:
@@ -84,13 +88,11 @@ public class SkillresetCommand extends ExperienceCommand {
 
     @Override
     protected boolean permissionsCheckSelf(CommandSender sender) {
-        // TODO Auto-generated method stub
         return false;
     }
 
     @Override
     protected boolean permissionsCheckOthers(CommandSender sender) {
-        // TODO Auto-generated method stub
         return false;
     }
 
@@ -102,6 +104,10 @@ public class SkillresetCommand extends ExperienceCommand {
         }
 
         profile.modifySkill(skill, 0);
+
+        if (player != null) {
+            mcMMO.p.getServer().getPluginManager().callEvent(new McMMOPlayerLevelDownEvent(player, skill, profile.getSkillLevel(skill)));
+        }
     }
 
     @Override

src/main/java/com/gmail/nossr50/commands/hardcore/HardcoreCommand.java

@@ -2,22 +2,11 @@ package com.gmail.nossr50.commands.hardcore;
 
 import com.gmail.nossr50.mcMMO;
 import com.gmail.nossr50.config.Config;
+import com.gmail.nossr50.datatypes.skills.SkillType;
 import com.gmail.nossr50.locale.LocaleLoader;
 import com.gmail.nossr50.util.Permissions;
 
 public class HardcoreCommand extends HardcoreModeCommand {
-    @Override
-    protected void disable() {
-        Config.getInstance().setHardcoreEnabled(false);
-        mcMMO.p.getServer().broadcastMessage(LocaleLoader.getString("Hardcore.Disabled"));
-    }
-
-    @Override
-    protected void enable() {
-        Config.getInstance().setHardcoreEnabled(true);
-        mcMMO.p.getServer().broadcastMessage(LocaleLoader.getString("Hardcore.Enabled"));
-    }
-
     @Override
     protected boolean checkTogglePermissions() {
         return Permissions.hardcoreToggle(sender);
@@ -29,13 +18,46 @@ public class HardcoreCommand extends HardcoreModeCommand {
     }
 
     @Override
-    protected boolean checkEnabled() {
-        return Config.getInstance().getHardcoreEnabled();
+    protected boolean checkEnabled(String skill) {
+        if (skill.equalsIgnoreCase("ALL")) {
+            for (SkillType skillType : SkillType.values()) {
+                if (!skillType.getHardcoreStatLossEnabled()) {
+                    return false;
+                }
+            }
+
+            return true;
+        }
+
+        return SkillType.getSkill(skill).getHardcoreStatLossEnabled();
+    }
+
+    @Override
+    protected void enable(String skill) {
+        toggle(true);
+    }
+
+    @Override
+    protected void disable(String skill) {
+        toggle(false);
     }
 
     @Override
     protected void modify() {
         Config.getInstance().setHardcoreDeathStatPenaltyPercentage(newPercent);
-        sender.sendMessage(LocaleLoader.getString("Hardcore.PercentageChanged", percent.format(newPercent / 100D)));
+        sender.sendMessage(LocaleLoader.getString("Hardcore.DeathStatLoss.PercentageChanged", percent.format(newPercent / 100D)));
+    }
+
+    private void toggle(boolean enable) {
+        if (skill.equalsIgnoreCase("ALL")) {
+            for (SkillType skillType : SkillType.nonChildSkills()) {
+                Config.getInstance().setHardcoreStatLossEnabled(skillType, enable);
+            }
+        }
+        else {
+            Config.getInstance().setHardcoreStatLossEnabled(SkillType.getSkill(skill), enable);
+        }
+
+        mcMMO.p.getServer().broadcastMessage(LocaleLoader.getString("Hardcore.Mode." + (enable ? "Enabled" : "Disabled"), LocaleLoader.getString("Hardcore.DeathStatLoss.Name"), skill));
     }
 }

src/main/java/com/gmail/nossr50/commands/hardcore/HardcoreModeCommand.java

@@ -9,6 +9,7 @@ import org.bukkit.command.CommandSender;
 import org.bukkit.command.TabExecutor;
 import org.bukkit.util.StringUtil;
 
+import com.gmail.nossr50.datatypes.skills.SkillType;
 import com.gmail.nossr50.util.Permissions;
 import com.gmail.nossr50.util.StringUtils;
 import com.gmail.nossr50.util.commands.CommandUtils;
@@ -19,6 +20,7 @@ public abstract class HardcoreModeCommand implements TabExecutor {
     protected CommandSender sender;
     protected double newPercent;
     protected DecimalFormat percent;
+    protected String skill;
 
     public HardcoreModeCommand() {
         percent = new DecimalFormat("##0.00%");
@@ -35,11 +37,11 @@ public abstract class HardcoreModeCommand implements TabExecutor {
                     return true;
                 }
 
-                if (checkEnabled()) {
-                    disable();
+                if (checkEnabled("ALL")) {
+                    disable("ALL");
                 }
                 else {
-                    enable();
+                    enable("ALL");
                 }
 
                 return true;
@@ -51,7 +53,7 @@ public abstract class HardcoreModeCommand implements TabExecutor {
                         return true;
                     }
 
-                    enable();
+                    enable("ALL");
                     return true;
                 }
 
@@ -61,7 +63,7 @@ public abstract class HardcoreModeCommand implements TabExecutor {
                         return true;
                     }
 
-                    disable();
+                    disable("ALL");
                     return true;
                 }
 
@@ -77,6 +79,36 @@ public abstract class HardcoreModeCommand implements TabExecutor {
                 modify();
                 return true;
 
+
+            case 2:
+                if (!args[0].equalsIgnoreCase("ALL") && CommandUtils.isChildSkill(sender, SkillType.getSkill(args[0]))) {
+                    return true;
+                }
+
+                skill = args[0];
+
+                if (CommandUtils.shouldEnableToggle(args[1])) {
+                    if (!Permissions.hardcoreToggle(sender)) {
+                        sender.sendMessage(command.getPermissionMessage());
+                        return true;
+                    }
+
+                    enable(skill);
+                    return true;
+                }
+
+                if (CommandUtils.shouldDisableToggle(args[1])) {
+                    if (!Permissions.hardcoreToggle(sender)) {
+                        sender.sendMessage(command.getPermissionMessage());
+                        return true;
+                    }
+
+                    disable(skill);
+                    return true;
+                }
+
+                return true;
+
             default:
                 return false;
         }
@@ -98,9 +130,9 @@ public abstract class HardcoreModeCommand implements TabExecutor {
 
     protected abstract boolean checkTogglePermissions();
     protected abstract boolean checkModifyPermissions();
-    protected abstract boolean checkEnabled();
-    protected abstract void enable();
-    protected abstract void disable();
+    protected abstract boolean checkEnabled(String skill);
+    protected abstract void enable(String skill);
+    protected abstract void disable(String skill);
     protected abstract void modify();
 
     private boolean isInvalidPercentage(CommandSender sender, String value) {

src/main/java/com/gmail/nossr50/commands/hardcore/VampirismCommand.java

@@ -2,6 +2,7 @@ package com.gmail.nossr50.commands.hardcore;
 
 import com.gmail.nossr50.mcMMO;
 import com.gmail.nossr50.config.Config;
+import com.gmail.nossr50.datatypes.skills.SkillType;
 import com.gmail.nossr50.locale.LocaleLoader;
 import com.gmail.nossr50.util.Permissions;
 
@@ -17,25 +18,46 @@ public class VampirismCommand extends HardcoreModeCommand {
     }
 
     @Override
-    protected boolean checkEnabled() {
-        return Config.getInstance().getHardcoreVampirismEnabled();
+    protected boolean checkEnabled(String skill) {
+        if (skill.equalsIgnoreCase("ALL")) {
+            for (SkillType skillType : SkillType.values()) {
+                if (!skillType.getHardcoreVampirismEnabled()) {
+                    return false;
+                }
+            }
+
+            return true;
+        }
+
+        return SkillType.getSkill(skill).getHardcoreVampirismEnabled();
     }
 
     @Override
-    protected void enable() {
-        Config.getInstance().setHardcoreVampirismEnabled(true);
-        mcMMO.p.getServer().broadcastMessage(LocaleLoader.getString("Vampirism.Enabled"));
+    protected void enable(String skill) {
+        toggle(true);
     }
 
     @Override
-    protected void disable() {
-        Config.getInstance().setHardcoreVampirismEnabled(false);
-        mcMMO.p.getServer().broadcastMessage(LocaleLoader.getString("Vampirism.Disabled"));
+    protected void disable(String skill) {
+        toggle(false);
     }
 
     @Override
     protected void modify() {
         Config.getInstance().setHardcoreVampirismStatLeechPercentage(newPercent);
-        sender.sendMessage(LocaleLoader.getString("Vampirism.PercentageChanged", percent.format(newPercent / 100D)));
+        sender.sendMessage(LocaleLoader.getString("Hardcore.Vampirism.PercentageChanged", percent.format(newPercent / 100D)));
+    }
+
+    private void toggle(boolean enabled) {
+        if (skill.equalsIgnoreCase("ALL")) {
+            for (SkillType skillType : SkillType.nonChildSkills()) {
+                Config.getInstance().setHardcoreVampirismEnabled(skillType, enabled);
+            }
+        }
+        else {
+            Config.getInstance().setHardcoreVampirismEnabled(SkillType.getSkill(skill), enabled);
+        }
+
+        mcMMO.p.getServer().broadcastMessage(LocaleLoader.getString("Hardcore.Mode." + (enabled ? "Enabled" : "Disabled"), LocaleLoader.getString("Hardcore.Vampirism.Name"), skill));
     }
 }

src/main/java/com/gmail/nossr50/commands/party/PartyAcceptCommand.java

@@ -15,8 +15,8 @@ public class PartyAcceptCommand implements CommandExecutor {
     public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
         switch (args.length) {
             case 1:
-                McMMOPlayer mcMMOPlayer = UserManager.getPlayer(sender.getName());
-                Player player = mcMMOPlayer.getPlayer();
+                Player player = (Player) sender;
+                McMMOPlayer mcMMOPlayer = UserManager.getPlayer(player);
 
                 if (!mcMMOPlayer.hasPartyInvite()) {
                     sender.sendMessage(LocaleLoader.getString("mcMMO.NoInvites"));
@@ -24,11 +24,11 @@ public class PartyAcceptCommand implements CommandExecutor {
                 }
 
                 // Changing parties
-                if (!PartyManager.changeOrJoinParty(mcMMOPlayer, player, mcMMOPlayer.getParty(), mcMMOPlayer.getPartyInvite().getName())) {
+                if (!PartyManager.changeOrJoinParty(mcMMOPlayer, mcMMOPlayer.getPartyInvite().getName())) {
                     return true;
                 }
 
-                PartyManager.joinInvitedParty(player, mcMMOPlayer);
+                PartyManager.joinInvitedParty(mcMMOPlayer);
                 return true;
 
             default:

src/main/java/com/gmail/nossr50/commands/party/PartyChangeOwnerCommand.java

@@ -3,10 +3,12 @@ package com.gmail.nossr50.commands.party;
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandExecutor;
 import org.bukkit.command.CommandSender;
+import org.bukkit.entity.Player;
 
 import com.gmail.nossr50.datatypes.party.Party;
 import com.gmail.nossr50.locale.LocaleLoader;
 import com.gmail.nossr50.party.PartyManager;
+import com.gmail.nossr50.util.Misc;
 import com.gmail.nossr50.util.player.UserManager;
 
 public class PartyChangeOwnerCommand implements CommandExecutor {
@@ -14,14 +16,15 @@ public class PartyChangeOwnerCommand implements CommandExecutor {
     public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
         switch (args.length) {
             case 2:
-                Party playerParty = UserManager.getPlayer(sender.getName()).getParty();
+                Party playerParty = UserManager.getPlayer((Player) sender).getParty();
+                String targetName = Misc.getMatchedPlayerName(args[1]);
 
-                if (!playerParty.getMembers().contains(args[1])) {
-                    sender.sendMessage(LocaleLoader.getString("Party.NotInYourParty", args[1]));
+                if (!playerParty.getMembers().contains(targetName)) {
+                    sender.sendMessage(LocaleLoader.getString("Party.NotInYourParty", targetName));
                     return true;
                 }
 
-                PartyManager.setPartyLeader(args[1], playerParty);
+                PartyManager.setPartyLeader(targetName, playerParty);
                 return true;
 
             default:

src/main/java/com/gmail/nossr50/commands/party/PartyChangePasswordCommand.java

@@ -3,6 +3,7 @@ package com.gmail.nossr50.commands.party;
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandExecutor;
 import org.bukkit.command.CommandSender;
+import org.bukkit.entity.Player;
 
 import com.gmail.nossr50.datatypes.party.Party;
 import com.gmail.nossr50.locale.LocaleLoader;
@@ -13,7 +14,7 @@ public class PartyChangePasswordCommand implements CommandExecutor {
 
     @Override
     public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
-        playerParty = UserManager.getPlayer(sender.getName()).getParty();
+        playerParty = UserManager.getPlayer((Player) sender).getParty();
 
         switch (args.length) {
             case 1:

src/main/java/com/gmail/nossr50/commands/party/PartyCommand.java

@@ -20,6 +20,7 @@ import com.gmail.nossr50.locale.LocaleLoader;
 import com.gmail.nossr50.util.Permissions;
 import com.gmail.nossr50.util.commands.CommandUtils;
 import com.gmail.nossr50.util.player.UserManager;
+
 import com.google.common.collect.ImmutableList;
 
 public class PartyCommand implements TabExecutor {
@@ -70,8 +71,8 @@ public class PartyCommand implements TabExecutor {
             return true;
         }
 
-        mcMMOPlayer = UserManager.getPlayer(sender.getName());
-        player = mcMMOPlayer.getPlayer();
+        player = (Player) sender;
+        mcMMOPlayer = UserManager.getPlayer(player);
 
         if (args.length < 1) {
             if (!mcMMOPlayer.inParty()) {
@@ -176,7 +177,7 @@ public class PartyCommand implements TabExecutor {
                     case INVITE:
                     case KICK:
                     case OWNER:
-                        Set<String> playerNames = UserManager.getPlayers().keySet();
+                        Set<String> playerNames = UserManager.getPlayerNames();
                         return StringUtil.copyPartialMatches(args[1], playerNames, new ArrayList<String>(playerNames.size()));
                     case EXPSHARE:
                         return StringUtil.copyPartialMatches(args[1], EXPSHARE_COMPLETIONS, new ArrayList<String>(EXPSHARE_COMPLETIONS.size()));
@@ -191,7 +192,7 @@ public class PartyCommand implements TabExecutor {
                         List<String> matches = StringUtil.copyPartialMatches(args[1], PtpCommand.TELEPORT_SUBCOMMANDS, new ArrayList<String>(PtpCommand.TELEPORT_SUBCOMMANDS.size()));
 
                         if (matches.size() == 0) {
-                            playerNames = UserManager.getPlayers().keySet();
+                            playerNames = UserManager.getPlayerNames();
                             return StringUtil.copyPartialMatches(args[1], playerNames, new ArrayList<String>(playerNames.size()));
                         }
 

src/main/java/com/gmail/nossr50/commands/party/PartyCreateCommand.java

@@ -5,7 +5,6 @@ import org.bukkit.command.CommandExecutor;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 
-import com.gmail.nossr50.datatypes.party.Party;
 import com.gmail.nossr50.datatypes.player.McMMOPlayer;
 import com.gmail.nossr50.locale.LocaleLoader;
 import com.gmail.nossr50.party.PartyManager;
@@ -17,22 +16,20 @@ public class PartyCreateCommand implements CommandExecutor {
         switch (args.length) {
             case 2:
             case 3:
-                Party newParty = PartyManager.getParty(args[1]);
-
-                McMMOPlayer mcMMOPlayer = UserManager.getPlayer(sender.getName());
-                Player player = mcMMOPlayer.getPlayer();
+                Player player = (Player) sender;
+                McMMOPlayer mcMMOPlayer = UserManager.getPlayer(player);
 
                 // Check to see if the party exists, and if it does cancel creating a new party
-                if (PartyManager.checkPartyExistence(player, newParty, args[1])) {
+                if (PartyManager.checkPartyExistence(player, args[1])) {
                     return true;
                 }
 
                 // Changing parties
-                if (!PartyManager.changeOrJoinParty(mcMMOPlayer, player, mcMMOPlayer.getParty(), args[1])) {
+                if (!PartyManager.changeOrJoinParty(mcMMOPlayer, args[1])) {
                     return true;
                 }
 
-                PartyManager.createParty(player, mcMMOPlayer, args[1], getPassword(args));
+                PartyManager.createParty(mcMMOPlayer, args[1], getPassword(args));
                 return true;
 
             default:

src/main/java/com/gmail/nossr50/commands/party/PartyDisbandCommand.java

@@ -16,7 +16,7 @@ public class PartyDisbandCommand implements CommandExecutor {
     public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
         switch (args.length) {
             case 1:
-                Party playerParty = UserManager.getPlayer(sender.getName()).getParty();
+                Party playerParty = UserManager.getPlayer((Player) sender).getParty();
                 String partyName = playerParty.getName();
 
                 for (Player member : playerParty.getOnlineMembers()) {

src/main/java/com/gmail/nossr50/commands/party/PartyExpShareCommand.java

@@ -7,9 +7,8 @@ import org.bukkit.entity.Player;
 
 import com.gmail.nossr50.config.Config;
 import com.gmail.nossr50.datatypes.party.Party;
+import com.gmail.nossr50.datatypes.party.ShareMode;
 import com.gmail.nossr50.locale.LocaleLoader;
-import com.gmail.nossr50.party.ShareHandler;
-import com.gmail.nossr50.party.ShareHandler.ShareMode;
 import com.gmail.nossr50.util.StringUtils;
 import com.gmail.nossr50.util.commands.CommandUtils;
 import com.gmail.nossr50.util.player.UserManager;
@@ -26,7 +25,7 @@ public class PartyExpShareCommand implements CommandExecutor {
 
         switch (args.length) {
             case 2:
-                playerParty = UserManager.getPlayer(sender.getName()).getParty();
+                playerParty = UserManager.getPlayer((Player) sender).getParty();
 
                 if (args[1].equalsIgnoreCase("none") || CommandUtils.shouldDisableToggle(args[1])) {
                     handleChangingShareMode(ShareMode.NONE);
@@ -46,7 +45,7 @@ public class PartyExpShareCommand implements CommandExecutor {
         }
     }
 
-    private void handleChangingShareMode(ShareHandler.ShareMode mode) {
+    private void handleChangingShareMode(ShareMode mode) {
         playerParty.setXpShareMode(mode);
 
         String changeModeMessage = LocaleLoader.getString("Commands.Party.SetSharing", LocaleLoader.getString("Party.ShareType.Exp"), LocaleLoader.getString("Party.ShareMode." + StringUtils.getCapitalized(mode.toString())));

src/main/java/com/gmail/nossr50/commands/party/PartyHelpCommand.java

@@ -19,6 +19,8 @@ public class PartyHelpCommand implements CommandExecutor {
                 sender.sendMessage(LocaleLoader.getString("Party.Help.6", "/party kick"));
                 sender.sendMessage(LocaleLoader.getString("Party.Help.7", "/party leader"));
                 sender.sendMessage(LocaleLoader.getString("Party.Help.8", "/party disband"));
+                sender.sendMessage(LocaleLoader.getString("Party.Help.9", "/party itemshare"));
+                sender.sendMessage(LocaleLoader.getString("Party.Help.10", "/party expshare"));
                 return true;
 
             default:

src/main/java/com/gmail/nossr50/commands/party/PartyInfoCommand.java

@@ -1,7 +1,6 @@
 package com.gmail.nossr50.commands.party;
 
 import org.bukkit.ChatColor;
-import org.bukkit.OfflinePlayer;
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandExecutor;
 import org.bukkit.command.CommandSender;
@@ -10,13 +9,14 @@ import org.bukkit.entity.Player;
 import com.gmail.nossr50.mcMMO;
 import com.gmail.nossr50.config.Config;
 import com.gmail.nossr50.datatypes.party.Party;
+import com.gmail.nossr50.datatypes.party.ShareMode;
 import com.gmail.nossr50.datatypes.player.McMMOPlayer;
 import com.gmail.nossr50.locale.LocaleLoader;
 import com.gmail.nossr50.party.PartyManager;
-import com.gmail.nossr50.party.ShareHandler;
 import com.gmail.nossr50.util.player.UserManager;
 
 public class PartyInfoCommand implements CommandExecutor {
+    private McMMOPlayer mcMMOPlayer;
     private Player player;
     private Party playerParty;
 
@@ -25,8 +25,8 @@ public class PartyInfoCommand implements CommandExecutor {
         switch (args.length) {
             case 0:
             case 1:
-                McMMOPlayer mcMMOPlayer = UserManager.getPlayer(sender.getName());
-                player = mcMMOPlayer.getPlayer();
+                player = (Player) sender;
+                mcMMOPlayer = UserManager.getPlayer(player);
                 playerParty = mcMMOPlayer.getParty();
 
                 displayPartyHeader();
@@ -43,12 +43,12 @@ public class PartyInfoCommand implements CommandExecutor {
         StringBuilder memberList = new StringBuilder();
 
         for (String memberName : playerParty.getMembers()) {
-            OfflinePlayer member = mcMMO.p.getServer().getOfflinePlayer(memberName);
+            Player member = mcMMO.p.getServer().getPlayerExact(memberName);
 
             if (playerParty.getLeader().equalsIgnoreCase(memberName)) {
                 memberList.append(ChatColor.GOLD);
             }
-            else if (member.isOnline()) {
+            else if (member != null) {
                 memberList.append(ChatColor.WHITE);
             }
             else {
@@ -64,7 +64,7 @@ public class PartyInfoCommand implements CommandExecutor {
     private void displayShareModeInfo() {
         boolean xpShareEnabled = Config.getInstance().getExpShareEnabled();
         boolean itemShareEnabled = Config.getInstance().getItemShareEnabled();
-        boolean itemSharingActive = (playerParty.getItemShareMode() != ShareHandler.ShareMode.NONE);
+        boolean itemSharingActive = (playerParty.getItemShareMode() != ShareMode.NONE);
 
         if (!xpShareEnabled && !itemShareEnabled) {
             return;
@@ -104,7 +104,7 @@ public class PartyInfoCommand implements CommandExecutor {
     }
 
     private void displayMemberInfo() {
-        int membersNear = PartyManager.getNearMembers(player, playerParty, Config.getInstance().getPartyShareRange()).size();
+        int membersNear = PartyManager.getNearMembers(mcMMOPlayer).size();
         int membersOnline = playerParty.getOnlineMembers().size() - 1;
 
         player.sendMessage(LocaleLoader.getString("Commands.Party.Members.Header"));

src/main/java/com/gmail/nossr50/commands/party/PartyInviteCommand.java

@@ -9,6 +9,7 @@ import com.gmail.nossr50.datatypes.party.Party;
 import com.gmail.nossr50.datatypes.player.McMMOPlayer;
 import com.gmail.nossr50.locale.LocaleLoader;
 import com.gmail.nossr50.party.PartyManager;
+import com.gmail.nossr50.util.Misc;
 import com.gmail.nossr50.util.commands.CommandUtils;
 import com.gmail.nossr50.util.player.UserManager;
 
@@ -17,15 +18,17 @@ public class PartyInviteCommand implements CommandExecutor {
     public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
         switch (args.length) {
             case 2:
-                McMMOPlayer mcMMOTarget = UserManager.getPlayer(args[1]);
+                String targetName = Misc.getMatchedPlayerName(args[1]);
+                McMMOPlayer mcMMOTarget = UserManager.getPlayer(targetName);
 
-                if (!CommandUtils.checkPlayerExistence(sender, args[1], mcMMOTarget)) {
+                if (!CommandUtils.checkPlayerExistence(sender, targetName, mcMMOTarget)) {
                     return false;
                 }
 
                 Player target = mcMMOTarget.getPlayer();
-                McMMOPlayer mcMMOPlayer = UserManager.getPlayer(sender.getName());
-                Player player = mcMMOPlayer.getPlayer();
+                Player player = (Player) sender;
+                McMMOPlayer mcMMOPlayer = UserManager.getPlayer(player);
+                String playerName = player.getName();
 
                 if (player.equals(target)) {
                     sender.sendMessage(LocaleLoader.getString("Party.Invite.Self"));
@@ -33,21 +36,20 @@ public class PartyInviteCommand implements CommandExecutor {
                 }
 
                 if (PartyManager.inSameParty(player, target)) {
-                    sender.sendMessage(LocaleLoader.getString("Party.Player.InSameParty", target.getName()));
+                    sender.sendMessage(LocaleLoader.getString("Party.Player.InSameParty", targetName));
                     return true;
                 }
 
-                Party playerParty = mcMMOPlayer.getParty();
-
-                if (!PartyManager.canInvite(player, playerParty)) {
+                if (!PartyManager.canInvite(mcMMOPlayer)) {
                     player.sendMessage(LocaleLoader.getString("Party.Locked"));
                     return true;
                 }
 
+                Party playerParty = mcMMOPlayer.getParty();
                 mcMMOTarget.setPartyInvite(playerParty);
 
                 sender.sendMessage(LocaleLoader.getString("Commands.Invite.Success"));
-                target.sendMessage(LocaleLoader.getString("Commands.Party.Invite.0", playerParty.getName(), player.getName()));
+                target.sendMessage(LocaleLoader.getString("Commands.Party.Invite.0", playerParty.getName(), playerName));
                 target.sendMessage(LocaleLoader.getString("Commands.Party.Invite.1"));
                 return true;
 

src/main/java/com/gmail/nossr50/commands/party/PartyItemShareCommand.java

@@ -8,8 +8,8 @@ import org.bukkit.entity.Player;
 import com.gmail.nossr50.config.Config;
 import com.gmail.nossr50.datatypes.party.ItemShareType;
 import com.gmail.nossr50.datatypes.party.Party;
+import com.gmail.nossr50.datatypes.party.ShareMode;
 import com.gmail.nossr50.locale.LocaleLoader;
-import com.gmail.nossr50.party.ShareHandler.ShareMode;
 import com.gmail.nossr50.util.StringUtils;
 import com.gmail.nossr50.util.commands.CommandUtils;
 import com.gmail.nossr50.util.player.UserManager;
@@ -26,7 +26,7 @@ public class PartyItemShareCommand implements CommandExecutor {
 
         switch (args.length) {
             case 2:
-                playerParty = UserManager.getPlayer(sender.getName()).getParty();
+                playerParty = UserManager.getPlayer((Player) sender).getParty();
                 ShareMode mode = ShareMode.getShareMode(args[1].toUpperCase());
 
                 if (mode == null) {
@@ -38,7 +38,7 @@ public class PartyItemShareCommand implements CommandExecutor {
                 return true;
 
             case 3:
-                playerParty = UserManager.getPlayer(sender.getName()).getParty();
+                playerParty = UserManager.getPlayer((Player) sender).getParty();
                 boolean toggle = false;
 
                 if (CommandUtils.shouldEnableToggle(args[2])) {

src/main/java/com/gmail/nossr50/commands/party/PartyJoinCommand.java

@@ -9,6 +9,7 @@ import com.gmail.nossr50.datatypes.party.Party;
 import com.gmail.nossr50.datatypes.player.McMMOPlayer;
 import com.gmail.nossr50.locale.LocaleLoader;
 import com.gmail.nossr50.party.PartyManager;
+import com.gmail.nossr50.util.Misc;
 import com.gmail.nossr50.util.commands.CommandUtils;
 import com.gmail.nossr50.util.player.UserManager;
 
@@ -19,7 +20,6 @@ public class PartyJoinCommand implements CommandExecutor {
 
     private McMMOPlayer mcMMOPlayer;
     private Player player;
-    private Party playerParty;
 
     @Override
     public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
@@ -41,12 +41,15 @@ public class PartyJoinCommand implements CommandExecutor {
                     return true;
                 }
 
+                String partyName = targetParty.getName();
+
                 // Changing parties
-                if (!PartyManager.changeOrJoinParty(mcMMOPlayer, player, playerParty, targetParty.getName())) {
+                if (!PartyManager.changeOrJoinParty(mcMMOPlayer, partyName)) {
                     return true;
                 }
 
-                PartyManager.joinParty(player, mcMMOPlayer, targetParty, password);
+                player.sendMessage(LocaleLoader.getString("Commands.Party.Join", partyName));
+                PartyManager.addToParty(mcMMOPlayer, targetParty);
                 return true;
 
             default:
@@ -64,6 +67,7 @@ public class PartyJoinCommand implements CommandExecutor {
     }
 
     private boolean canJoinParty(CommandSender sender, String targetName) {
+        targetName = Misc.getMatchedPlayerName(targetName);
         mcMMOTarget = UserManager.getPlayer(targetName);
 
         if (!CommandUtils.checkPlayerExistence(sender, targetName, mcMMOTarget)) {
@@ -77,13 +81,11 @@ public class PartyJoinCommand implements CommandExecutor {
             return false;
         }
 
-        mcMMOPlayer = UserManager.getPlayer(sender.getName());
-        player = mcMMOPlayer.getPlayer();
-
-        playerParty = mcMMOPlayer.getParty();
+        player = (Player) sender;
+        mcMMOPlayer = UserManager.getPlayer(player);
         targetParty = mcMMOTarget.getParty();
 
-        if (player.equals(target) || (mcMMOPlayer.inParty() && playerParty.equals(targetParty))) {
+        if (player.equals(target) || (mcMMOPlayer.inParty() && mcMMOPlayer.getParty().equals(targetParty))) {
             sender.sendMessage(LocaleLoader.getString("Party.Join.Self"));
             return false;
         }

src/main/java/com/gmail/nossr50/commands/party/PartyKickCommand.java

@@ -18,7 +18,7 @@ public class PartyKickCommand implements CommandExecutor {
     public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
         switch (args.length) {
             case 2:
-                Party playerParty = UserManager.getPlayer(sender.getName()).getParty();
+                Party playerParty = UserManager.getPlayer((Player) sender).getParty();
                 OfflinePlayer target = mcMMO.p.getServer().getOfflinePlayer(args[1]);
 
                 if (!playerParty.getMembers().contains(target.getName())) {

src/main/java/com/gmail/nossr50/commands/party/PartyLockCommand.java

@@ -3,6 +3,7 @@ package com.gmail.nossr50.commands.party;
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandExecutor;
 import org.bukkit.command.CommandSender;
+import org.bukkit.entity.Player;
 
 import com.gmail.nossr50.datatypes.party.Party;
 import com.gmail.nossr50.locale.LocaleLoader;
@@ -15,7 +16,7 @@ public class PartyLockCommand implements CommandExecutor {
 
     @Override
     public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
-        playerParty = UserManager.getPlayer(sender.getName()).getParty();
+        playerParty = UserManager.getPlayer((Player) sender).getParty();
 
         switch (args.length) {
             case 1:
@@ -72,8 +73,6 @@ public class PartyLockCommand implements CommandExecutor {
 
     /**
      * Handle unlocking a party.
-     *
-     * @return true if party is successfully unlocked, false otherwise.
      */
     private void unlockParty(CommandSender sender, String permissionMessage) {
         if (!Permissions.partySubcommand(sender, PartySubcommandType.UNLOCK)) {

src/main/java/com/gmail/nossr50/commands/party/PartyQuitCommand.java

@@ -6,6 +6,7 @@ import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 
 import com.gmail.nossr50.datatypes.party.Party;
+import com.gmail.nossr50.datatypes.player.McMMOPlayer;
 import com.gmail.nossr50.events.party.McMMOPartyChangeEvent.EventReason;
 import com.gmail.nossr50.locale.LocaleLoader;
 import com.gmail.nossr50.party.PartyManager;
@@ -17,13 +18,14 @@ public class PartyQuitCommand implements CommandExecutor {
         switch (args.length) {
             case 1:
                 Player player = (Player) sender;
-                Party playerParty = UserManager.getPlayer(player).getParty();
+                McMMOPlayer mcMMOPlayer = UserManager.getPlayer(player);
+                Party playerParty = mcMMOPlayer.getParty();
 
                 if (!PartyManager.handlePartyChangeEvent(player, playerParty.getName(), null, EventReason.LEFT_PARTY)) {
                     return true;
                 }
 
-                PartyManager.removeFromParty(player, playerParty);
+                PartyManager.removeFromParty(mcMMOPlayer);
                 sender.sendMessage(LocaleLoader.getString("Commands.Party.Leave"));
                 return true;
 

src/main/java/com/gmail/nossr50/commands/party/PartyRenameCommand.java

@@ -17,7 +17,7 @@ public class PartyRenameCommand implements CommandExecutor {
     public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
         switch (args.length) {
             case 2:
-                McMMOPlayer mcMMOPlayer = UserManager.getPlayer(sender.getName());
+                McMMOPlayer mcMMOPlayer = UserManager.getPlayer((Player) sender);
                 Party playerParty = mcMMOPlayer.getParty();
 
                 String oldPartyName = playerParty.getName();
@@ -30,10 +30,9 @@ public class PartyRenameCommand implements CommandExecutor {
                 }
 
                 Player player = mcMMOPlayer.getPlayer();
-                Party newParty = PartyManager.getParty(newPartyName);
 
                 // Check to see if the party exists, and if it does cancel renaming the party
-                if (PartyManager.checkPartyExistence(player, newParty, newPartyName)) {
+                if (PartyManager.checkPartyExistence(player, newPartyName)) {
                     return true;
                 }
 

src/main/java/com/gmail/nossr50/commands/party/teleport/PtpAcceptAnyCommand.java

@@ -18,8 +18,8 @@ public class PtpAcceptAnyCommand implements CommandExecutor {
             return true;
         }
 
-        McMMOPlayer mcMMOPlayer = UserManager.getPlayer(sender.getName());
-        Player player = mcMMOPlayer.getPlayer();
+        Player player = (Player) sender;
+        McMMOPlayer mcMMOPlayer = UserManager.getPlayer(player);
 
         if (mcMMOPlayer.getPtpConfirmRequired()) {
             player.sendMessage(LocaleLoader.getString("Commands.ptp.AcceptAny.Disabled"));

src/main/java/com/gmail/nossr50/commands/party/teleport/PtpAcceptCommand.java

@@ -21,8 +21,8 @@ public class PtpAcceptCommand implements CommandExecutor {
             return true;
         }
 
-        McMMOPlayer mcMMOPlayer = UserManager.getPlayer(sender.getName());
-        Player player = mcMMOPlayer.getPlayer();
+        Player player = (Player) sender;
+        McMMOPlayer mcMMOPlayer = UserManager.getPlayer(player);
 
         if (!mcMMOPlayer.hasPtpRequest()) {
             player.sendMessage(LocaleLoader.getString("Commands.ptp.NoRequests"));

src/main/java/com/gmail/nossr50/commands/party/teleport/PtpCommand.java

@@ -4,7 +4,6 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.Set;
 
-import org.bukkit.ChatColor;
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandExecutor;
 import org.bukkit.command.CommandSender;
@@ -24,6 +23,7 @@ import com.gmail.nossr50.util.Permissions;
 import com.gmail.nossr50.util.commands.CommandUtils;
 import com.gmail.nossr50.util.player.UserManager;
 import com.gmail.nossr50.util.skills.SkillUtils;
+
 import com.google.common.collect.ImmutableList;
 
 public class PtpCommand implements TabExecutor {
@@ -52,15 +52,19 @@ public class PtpCommand implements TabExecutor {
                     return ptpAcceptAnyCommand.onCommand(sender, command, label, args);
                 }
 
-                McMMOPlayer mcMMOPlayer = UserManager.getPlayer(sender.getName());
-                Player player = mcMMOPlayer.getPlayer();
+                Player player = (Player) sender;
+                McMMOPlayer mcMMOPlayer = UserManager.getPlayer(player);
 
                 long recentlyHurt = mcMMOPlayer.getRecentlyHurt();
-                int recentlyhurt_cooldown = Config.getInstance().getPTPCommandRecentlyHurtCooldown();
+                int hurtCooldown = Config.getInstance().getPTPCommandRecentlyHurtCooldown();
 
-                if (!SkillUtils.cooldownOver(recentlyHurt * Misc.TIME_CONVERSION_FACTOR, recentlyhurt_cooldown, player)) {
-                    player.sendMessage(LocaleLoader.getString("Item.Injured.Wait", SkillUtils.calculateTimeLeft(recentlyHurt * Misc.TIME_CONVERSION_FACTOR, recentlyhurt_cooldown, player)));
-                    return true;
+                if (hurtCooldown > 0) {
+                    int timeRemaining = SkillUtils.calculateTimeLeft(recentlyHurt * Misc.TIME_CONVERSION_FACTOR, hurtCooldown, player);
+
+                    if (timeRemaining > 0) {
+                        player.sendMessage(LocaleLoader.getString("Item.Injured.Wait", timeRemaining));
+                        return true;
+                    }
                 }
 
                 if (args[0].equalsIgnoreCase("accept")) {
@@ -73,14 +77,18 @@ public class PtpCommand implements TabExecutor {
                 }
 
                 int ptpCooldown = Config.getInstance().getPTPCommandCooldown();
-                long lastTeleport = mcMMOPlayer.getLastTeleport();
+                long ptpLastUse = mcMMOPlayer.getPtpLastUse();
 
-                if (!SkillUtils.cooldownOver(lastTeleport * Misc.TIME_CONVERSION_FACTOR, ptpCooldown, player)) {
-                    player.sendMessage(ChatColor.RED + "You need to wait before you can use this again! " + ChatColor.YELLOW + "(" + SkillUtils.calculateTimeLeft(lastTeleport * Misc.TIME_CONVERSION_FACTOR, ptpCooldown, player) + ")"); //TODO Locale!
-                    return true;
+                if (ptpCooldown > 0) {
+                    int timeRemaining = SkillUtils.calculateTimeLeft(ptpLastUse * Misc.TIME_CONVERSION_FACTOR, ptpCooldown, player);
+
+                    if (timeRemaining > 0) {
+                        player.sendMessage(LocaleLoader.getString("Item.Generic.Wait", timeRemaining));
+                        return true;
+                    }
                 }
 
-                sendTeleportRequest(sender, player, args[0]);
+                sendTeleportRequest(sender, player, Misc.getMatchedPlayerName(args[0]));
                 return true;
 
             default:
@@ -95,7 +103,7 @@ public class PtpCommand implements TabExecutor {
                 List<String> matches = StringUtil.copyPartialMatches(args[0], TELEPORT_SUBCOMMANDS, new ArrayList<String>(TELEPORT_SUBCOMMANDS.size()));
 
                 if (matches.size() == 0) {
-                    Set<String> playerNames = UserManager.getPlayers().keySet();
+                    Set<String> playerNames = UserManager.getPlayerNames();
                     return StringUtil.copyPartialMatches(args[0], playerNames, new ArrayList<String>(playerNames.size()));
                 }
 
@@ -132,7 +140,6 @@ public class PtpCommand implements TabExecutor {
         }
 
         target = mcMMOTarget.getPlayer();
-        targetName = target.getName();
 
         if (player.equals(target)) {
             player.sendMessage(LocaleLoader.getString("Party.Teleport.Self"));
@@ -166,7 +173,7 @@ public class PtpCommand implements TabExecutor {
         mcMMOPlayer.actualizeTeleportCommenceLocation(teleportingPlayer);
 
         if (warmup > 0) {
-            teleportingPlayer.sendMessage(ChatColor.GRAY + "Commencing teleport in " + ChatColor.GOLD + "(" + warmup + ")" + ChatColor.GRAY + " seconds, please stand still..."); //TODO Locale!
+            teleportingPlayer.sendMessage(LocaleLoader.getString("Teleport.Commencing", warmup));
             new TeleportationWarmup(mcMMOPlayer, mcMMOTarget).runTaskLater(mcMMO.p, 20 * warmup);
         }
         else {
@@ -189,6 +196,6 @@ public class PtpCommand implements TabExecutor {
         teleportingPlayer.sendMessage(LocaleLoader.getString("Party.Teleport.Player", targetPlayer.getName()));
         targetPlayer.sendMessage(LocaleLoader.getString("Party.Teleport.Target", teleportingPlayer.getName()));
 
-        mcMMOPlayer.actualizeRecentlyHurt();
+        mcMMOPlayer.actualizePtpLastUse();
     }
 }

src/main/java/com/gmail/nossr50/commands/party/teleport/PtpToggleCommand.java

@@ -18,8 +18,8 @@ public class PtpToggleCommand implements CommandExecutor {
             return true;
         }
 
-        McMMOPlayer mcMMOPlayer = UserManager.getPlayer(sender.getName());
-        Player player = mcMMOPlayer.getPlayer();
+        Player player = (Player) sender;
+        McMMOPlayer mcMMOPlayer = UserManager.getPlayer(player);
 
         if (mcMMOPlayer.getPtpEnabled()) {
             player.sendMessage(LocaleLoader.getString("Commands.ptp.Disabled"));

src/main/java/com/gmail/nossr50/commands/player/InspectCommand.java

@@ -10,11 +10,13 @@ import org.bukkit.command.TabExecutor;
 import org.bukkit.entity.Player;
 import org.bukkit.util.StringUtil;
 
+import com.gmail.nossr50.mcMMO;
 import com.gmail.nossr50.config.Config;
 import com.gmail.nossr50.datatypes.player.McMMOPlayer;
 import com.gmail.nossr50.datatypes.player.PlayerProfile;
 import com.gmail.nossr50.datatypes.skills.SkillType;
 import com.gmail.nossr50.locale.LocaleLoader;
+import com.gmail.nossr50.util.Misc;
 import com.gmail.nossr50.util.Permissions;
 import com.gmail.nossr50.util.commands.CommandUtils;
 import com.gmail.nossr50.util.player.UserManager;
@@ -31,11 +33,12 @@ public class InspectCommand implements TabExecutor {
                     ScoreboardManager.setupPlayerScoreboard(sender.getName());
                 }
 
-                McMMOPlayer mcMMOPlayer = UserManager.getPlayer(args[0]);
+                String playerName = Misc.getMatchedPlayerName(args[0]);
+                McMMOPlayer mcMMOPlayer = UserManager.getPlayer(playerName, true);
 
                 // If the mcMMOPlayer doesn't exist, create a temporary profile and check if it's present in the database. If it's not, abort the process.
                 if (mcMMOPlayer == null) {
-                    PlayerProfile profile = new PlayerProfile(args[0], false); // Temporary Profile
+                    PlayerProfile profile = mcMMO.getDatabaseManager().loadPlayerProfile(playerName, false); // Temporary Profile
 
                     if (CommandUtils.inspectOffline(sender, profile, Permissions.inspectOffline(sender))) {
                         return true;
@@ -46,7 +49,7 @@ public class InspectCommand implements TabExecutor {
                         return true;
                     }
 
-                    sender.sendMessage(LocaleLoader.getString("Inspect.OfflineStats", args[0]));
+                    sender.sendMessage(LocaleLoader.getString("Inspect.OfflineStats", playerName));
 
                     sender.sendMessage(LocaleLoader.getString("Stats.Header.Gathering"));
                     CommandUtils.displaySkill(sender, profile, SkillType.EXCAVATION);
@@ -69,7 +72,13 @@ public class InspectCommand implements TabExecutor {
                 else {
                     Player target = mcMMOPlayer.getPlayer();
 
-                    if (CommandUtils.tooFar(sender, target, Permissions.inspectFar(sender))) {
+                    if (CommandUtils.hidden(sender, target, Permissions.inspectHidden(sender))) {
+                        if (!Permissions.inspectOffline(sender)) {
+                            sender.sendMessage(LocaleLoader.getString("Inspect.Offline"));
+                            return true;
+                        }
+                    }
+                    else if (CommandUtils.tooFar(sender, target, Permissions.inspectFar(sender))) {
                         return true;
                     }
 
@@ -96,7 +105,7 @@ public class InspectCommand implements TabExecutor {
     public List<String> onTabComplete(CommandSender sender, Command command, String alias, String[] args) {
         switch (args.length) {
             case 1:
-                Set<String> playerNames = UserManager.getPlayers().keySet();
+                Set<String> playerNames = UserManager.getPlayerNames();
                 return StringUtil.copyPartialMatches(args[0], playerNames, new ArrayList<String>(playerNames.size()));
             default:
                 return ImmutableList.of();

src/main/java/com/gmail/nossr50/commands/player/McrankCommand.java

@@ -13,12 +13,13 @@ import org.bukkit.util.StringUtil;
 import com.gmail.nossr50.mcMMO;
 import com.gmail.nossr50.config.Config;
 import com.gmail.nossr50.datatypes.player.McMMOPlayer;
-import com.gmail.nossr50.datatypes.player.PlayerProfile;
 import com.gmail.nossr50.runnables.commands.McrankCommandAsyncTask;
+import com.gmail.nossr50.util.Misc;
 import com.gmail.nossr50.util.Permissions;
 import com.gmail.nossr50.util.commands.CommandUtils;
 import com.gmail.nossr50.util.player.UserManager;
 import com.gmail.nossr50.util.scoreboards.ScoreboardManager;
+
 import com.google.common.collect.ImmutableList;
 
 public class McrankCommand implements TabExecutor {
@@ -51,8 +52,8 @@ public class McrankCommand implements TabExecutor {
                     return true;
                 }
 
-                String playerName = args[0];
-                McMMOPlayer mcMMOPlayer = UserManager.getPlayer(playerName);
+                String playerName = Misc.getMatchedPlayerName(args[0]);
+                McMMOPlayer mcMMOPlayer = UserManager.getPlayer(playerName, true);
 
                 if (mcMMOPlayer != null) {
                     playerName = mcMMOPlayer.getPlayer().getName();
@@ -61,7 +62,7 @@ public class McrankCommand implements TabExecutor {
                         return true;
                     }
                 }
-                else if (CommandUtils.inspectOffline(sender, new PlayerProfile(playerName, false), Permissions.mcrankOffline(sender))) {
+                else if (CommandUtils.inspectOffline(sender, mcMMO.getDatabaseManager().loadPlayerProfile(playerName, false), Permissions.mcrankOffline(sender))) {
                     return true;
                 }
 
@@ -83,7 +84,7 @@ public class McrankCommand implements TabExecutor {
     public List<String> onTabComplete(CommandSender sender, Command command, String alias, String[] args) {
         switch (args.length) {
             case 1:
-                Set<String> playerNames = UserManager.getPlayers().keySet();
+                Set<String> playerNames = UserManager.getPlayerNames();
                 return StringUtil.copyPartialMatches(args[0], playerNames, new ArrayList<String>(playerNames.size()));
             default:
                 return ImmutableList.of();

src/main/java/com/gmail/nossr50/commands/player/McstatsCommand.java

@@ -13,6 +13,7 @@ import com.gmail.nossr50.locale.LocaleLoader;
 import com.gmail.nossr50.util.commands.CommandUtils;
 import com.gmail.nossr50.util.player.UserManager;
 import com.gmail.nossr50.util.scoreboards.ScoreboardManager;
+
 import com.google.common.collect.ImmutableList;
 
 public class McstatsCommand implements TabExecutor {
@@ -24,8 +25,8 @@ public class McstatsCommand implements TabExecutor {
 
         switch (args.length) {
             case 0:
-                McMMOPlayer mcMMOPlayer = UserManager.getPlayer(sender.getName());
-                Player player = mcMMOPlayer.getPlayer();
+                Player player = (Player) sender;
+                McMMOPlayer mcMMOPlayer = UserManager.getPlayer(player);
 
                 if (Config.getInstance().getMcstatsScoreboardsEnabled()) {
                     ScoreboardManager.setupPlayerScoreboard(player.getName());

src/main/java/com/gmail/nossr50/commands/player/MctopCommand.java

@@ -3,7 +3,6 @@ package com.gmail.nossr50.commands.player;
 import java.util.ArrayList;
 import java.util.List;
 
-import org.bukkit.ChatColor;
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandSender;
 import org.bukkit.command.TabExecutor;
@@ -12,10 +11,7 @@ import org.bukkit.util.StringUtil;
 
 import com.gmail.nossr50.mcMMO;
 import com.gmail.nossr50.config.Config;
-import com.gmail.nossr50.database.FlatfileDatabaseManager;
-import com.gmail.nossr50.datatypes.database.PlayerStat;
 import com.gmail.nossr50.datatypes.skills.SkillType;
-import com.gmail.nossr50.locale.LocaleLoader;
 import com.gmail.nossr50.runnables.commands.MctopCommandAsyncTask;
 import com.gmail.nossr50.util.Permissions;
 import com.gmail.nossr50.util.StringUtils;
@@ -84,39 +80,11 @@ public class MctopCommand implements TabExecutor {
             ScoreboardManager.enableGlobalStatsScoreboard((Player) sender, skill, page);
         }
         else {
-            if (Config.getInstance().getUseMySQL()) {
-                sqlDisplay(page, skill, sender);
-            }
-            else {
-                flatfileDisplay(page, skill, sender);
-            }
+            display(page, skill, sender);
         }
     }
 
-    private void flatfileDisplay(int page, String skill, CommandSender sender) {
-        FlatfileDatabaseManager.updateLeaderboards(); // Make sure we have the latest information
-
-        if (skill.equalsIgnoreCase("all")) {
-            sender.sendMessage(LocaleLoader.getString("Commands.PowerLevel.Leaderboard"));
-        }
-        else {
-            sender.sendMessage(LocaleLoader.getString("Commands.Skill.Leaderboard", StringUtils.getCapitalized(skill)));
-        }
-
-        int position = (page * 10) - 9;
-
-        for (PlayerStat stat : FlatfileDatabaseManager.retrieveInfo(skill, page, 10)) {
-            String digit = (position < 10) ? "0" : "" + String.valueOf(position);
-
-            // Format: 1. Playername - skill value
-            sender.sendMessage(digit + ". " + ChatColor.GREEN + stat.name + " - " + ChatColor.WHITE + stat.statVal);
-            position++;
-        }
-
-        sender.sendMessage(LocaleLoader.getString("Commands.mctop.Tip"));
-    }
-
-    private void sqlDisplay(int page, String query, CommandSender sender) {
+    private void display(int page, String query, CommandSender sender) {
         new MctopCommandAsyncTask(page, query, sender).runTaskAsynchronously(mcMMO.p);
     }
 

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

@@ -8,8 +8,8 @@ import com.gmail.nossr50.util.Permissions;
 public class AxesCommand extends SkillCommand {
     private String critChance;
     private String critChanceLucky;
-    private float bonusDamage;
-    private float impactDamage;
+    private double bonusDamage;
+    private double impactDamage;
     private String skullSplitterLength;
     private String skullSplitterLengthEndurance;
 

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

@@ -1,5 +1,8 @@
 package com.gmail.nossr50.commands.skills;
 
+import org.bukkit.block.Biome;
+import org.bukkit.entity.EntityType;
+
 import com.gmail.nossr50.config.AdvancedConfig;
 import com.gmail.nossr50.datatypes.skills.SkillType;
 import com.gmail.nossr50.locale.LocaleLoader;
@@ -22,6 +25,7 @@ public class FishingCommand extends SkillCommand {
     private boolean canShake;
     private boolean canFishermansDiet;
     private boolean canMasterAngler;
+    private boolean canIceFish;
 
     public FishingCommand() {
         super(SkillType.FISHING);
@@ -60,7 +64,18 @@ public class FishingCommand extends SkillCommand {
 
         // MASTER ANGLER
         if (canMasterAngler) {
-            biteChance = calculateAbilityDisplayValues(((Math.max((skillValue / 200.0), 1.0)) / (isStorming ? 300 : 500)) * 100.0)[0];
+            double rawBiteChance = ((Math.max((skillValue / 200.0), 1.0)) / (isStorming ? 300 : 500));
+            Biome biome = player.getLocation().getBlock().getBiome();
+
+            if (biome == Biome.RIVER || biome == Biome.OCEAN) {
+                rawBiteChance = rawBiteChance * 2.0;
+            }
+
+            if (player.isInsideVehicle() && player.getVehicle().getType() == EntityType.BOAT) {
+                rawBiteChance = rawBiteChance * 2.0;
+            }
+
+            biteChance = calculateAbilityDisplayValues(rawBiteChance * 100.0)[0];
         }
     }
 
@@ -71,11 +86,12 @@ public class FishingCommand extends SkillCommand {
         canShake = Permissions.shake(player);
         canFishermansDiet = Permissions.fishermansDiet(player);
         canMasterAngler = Permissions.masterAngler(player);
+        canIceFish = Permissions.iceFishing(player);
     }
 
     @Override
     protected boolean effectsHeaderPermissions() {
-        return canTreasureHunt || canMagicHunt || canShake || canMasterAngler || canFishermansDiet;
+        return canTreasureHunt || canMagicHunt || canShake || canMasterAngler || canFishermansDiet || canIceFish;
     }
 
     @Override
@@ -101,11 +117,15 @@ public class FishingCommand extends SkillCommand {
         if (canMasterAngler) {
             player.sendMessage(LocaleLoader.getString("Effects.Template", LocaleLoader.getString("Fishing.Effect.8"), LocaleLoader.getString("Fishing.Effect.9")));
         }
+
+        if (canIceFish) {
+            player.sendMessage(LocaleLoader.getString("Effects.Template", LocaleLoader.getString("Fishing.Effect.10"), LocaleLoader.getString("Fishing.Effect.11")));
+        }
     }
 
     @Override
     protected boolean statsHeaderPermissions() {
-        return canTreasureHunt || canMagicHunt || canShake || canMasterAngler || canFishermansDiet;
+        return canTreasureHunt || canMagicHunt || canShake || canMasterAngler || canFishermansDiet || canIceFish;
     }
 
     @Override
@@ -136,5 +156,16 @@ public class FishingCommand extends SkillCommand {
         if (canFishermansDiet) {
             player.sendMessage(LocaleLoader.getString("Fishing.Ability.FD", fishermansDietRank));
         }
+
+        if (canIceFish) {
+            int unlockLevel = AdvancedConfig.getInstance().getIceFishingUnlockLevel();
+
+            if (skillValue < unlockLevel) {
+                player.sendMessage(LocaleLoader.getString("Ability.Generic.Template.Lock", LocaleLoader.getString("Fishing.Ability.Locked.1", unlockLevel)));
+            }
+            else {
+                player.sendMessage(LocaleLoader.getString("Fishing.Ability.IceFishing"));
+            }
+        }
     }
 }

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

@@ -56,8 +56,8 @@ public abstract class SkillCommand implements TabExecutor {
             return true;
         }
 
-        mcMMOPlayer = UserManager.getPlayer(sender.getName());
-        player = mcMMOPlayer.getPlayer();
+        player = (Player) sender;
+        mcMMOPlayer = UserManager.getPlayer(player);
 
         switch (args.length) {
             case 0:

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

@@ -1,5 +1,7 @@
 package com.gmail.nossr50.commands.skills;
 
+import org.bukkit.entity.EntityType;
+
 import com.gmail.nossr50.config.Config;
 import com.gmail.nossr50.datatypes.skills.SkillType;
 import com.gmail.nossr50.locale.LocaleLoader;
@@ -36,7 +38,7 @@ public class TamingCommand extends SkillCommand {
     @Override
     protected void permissionsCheck() {
         canBeastLore = Permissions.beastLore(player);
-        canCallWild = Permissions.callOfTheWild(player);
+        canCallWild = Permissions.callOfTheWild(player, EntityType.WOLF) || Permissions.callOfTheWild(player, EntityType.OCELOT);
         canEnvironmentallyAware = Permissions.environmentallyAware(player);
         canFastFood = Permissions.fastFoodService(player);
         canGore = Permissions.gore(player);

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

@@ -14,7 +14,7 @@ public class UnarmedCommand extends SkillCommand {
     private String disarmChanceLucky;
     private String ironGripChance;
     private String ironGripChanceLucky;
-    private int ironArmBonus;
+    private double ironArmBonus;
 
     private boolean canBerserk;
     private boolean canDisarm;

src/main/java/com/gmail/nossr50/commands/spout/MchudCommand.java

@@ -10,6 +10,7 @@ import org.bukkit.util.StringUtil;
 
 import com.gmail.nossr50.datatypes.spout.huds.HudType;
 import com.gmail.nossr50.locale.LocaleLoader;
+
 import com.google.common.collect.ImmutableList;
 
 public class MchudCommand extends SpoutCommand {

src/main/java/com/gmail/nossr50/commands/spout/SpoutCommand.java

@@ -3,6 +3,7 @@ package com.gmail.nossr50.commands.spout;
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandSender;
 import org.bukkit.command.TabExecutor;
+import org.bukkit.entity.Player;
 
 import com.gmail.nossr50.mcMMO;
 import com.gmail.nossr50.config.spout.SpoutConfig;
@@ -22,12 +23,12 @@ public abstract class SpoutCommand implements TabExecutor {
             return true;
         }
 
-        if (!mcMMO.spoutEnabled || !SpoutConfig.getInstance().getXPBarEnabled()) {
+        if (!mcMMO.isSpoutEnabled() || !SpoutConfig.getInstance().getXPBarEnabled()) {
             sender.sendMessage(LocaleLoader.getString("Commands.Disabled"));
             return true;
         }
 
-        playerProfile = UserManager.getPlayer(sender.getName()).getProfile();
+        playerProfile = UserManager.getPlayer((Player) sender).getProfile();
         spoutHud = playerProfile.getSpoutHud();
 
         if (spoutHud == null) {

src/main/java/com/gmail/nossr50/commands/spout/XplockCommand.java

@@ -12,6 +12,7 @@ import com.gmail.nossr50.locale.LocaleLoader;
 import com.gmail.nossr50.util.Permissions;
 import com.gmail.nossr50.util.commands.CommandUtils;
 import com.gmail.nossr50.util.skills.SkillUtils;
+
 import com.google.common.collect.ImmutableList;
 
 public class XplockCommand extends SpoutCommand {

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

@@ -1,10 +1,14 @@
 package com.gmail.nossr50.config;
 
+import java.util.ArrayList;
+import java.util.List;
+
 public class AdvancedConfig extends AutoUpdateConfigLoader {
     private static AdvancedConfig instance;
 
     private AdvancedConfig() {
         super("advanced.yml");
+        validate();
     }
 
     public static AdvancedConfig getInstance() {
@@ -15,6 +19,766 @@ public class AdvancedConfig extends AutoUpdateConfigLoader {
         return instance;
     }
 
+    @Override
+    protected boolean validateKeys() {
+        // Validate all the settings!
+        List<String> reason = new ArrayList<String>();
+
+        /* GENERAL */
+        if (getAbilityLength() < 1) {
+            reason.add("Skills.General.Ability_IncreaseLevel should be at least 1!");
+        }
+
+        if (getEnchantBuff() < 1) {
+            reason.add("Skills.General.Ability_EnchantBuff should be at least 1!");
+        }
+
+        /* ACROBATICS */
+        if (getDodgeChanceMax() < 1) {
+            reason.add("Skills.Acrobatics.Dodge_ChanceMax should be at least 1!");
+        }
+
+        if (getDodgeMaxBonusLevel() < 1) {
+            reason.add("Skills.Acrobatics.Dodge_MaxBonusLevel should be at least 1!");
+        }
+
+        if (getDodgeDamageModifier() <= 1) {
+            reason.add("Skills.Acrobatics.Dodge_DamageModifier should be greater than 1!");
+        }
+
+        if (getRollChanceMax() < 1) {
+            reason.add("Skills.Acrobatics.Roll_ChanceMax should be at least 1!");
+        }
+
+        if (getRollMaxBonusLevel() < 1) {
+            reason.add("Skills.Acrobatics.Roll_MaxBonusLevel should be at least 1!");
+        }
+
+        if (getRollDamageThreshold() < 0) {
+            reason.add("Skills.Acrobatics.Roll_DamageThreshold should be at least 0!");
+        }
+
+        if (getGracefulRollChanceMax() < 1) {
+            reason.add("Skills.Acrobatics.GracefulRoll_ChanceMax should be at least 1!");
+        }
+
+        if (getGracefulRollMaxBonusLevel() < 1) {
+            reason.add("Skills.Acrobatics.GracefulRoll_MaxBonusLevel should be at least 1!");
+        }
+
+        if (getGracefulRollDamageThreshold() < 0) {
+            reason.add("Skills.Acrobatics.GracefulRoll_DamageThreshold should be at least 0!");
+        }
+
+        if (getDodgeXPModifier() < 0) {
+            reason.add("Skills.Acrobatics.Dodge_XP_Modifier should be at least 0!");
+        }
+
+        if (getRollXPModifier() < 0) {
+            reason.add("Skills.Acrobatics.Roll_XP_Modifier should be at least 0!");
+        }
+
+        if (getFallXPModifier() < 0) {
+            reason.add("Skills.Acrobatics.Fall_XP_Modifier should be at least 0!");
+        }
+
+        /* ARCHERY */
+        if (getSkillShotIncreaseLevel() < 1) {
+            reason.add("Skills.Archery.SkillShot_IncreaseLevel should be at least 1!");
+        }
+
+        if (getSkillShotIncreasePercentage() <= 0) {
+            reason.add("Skills.Archery.SkillShot_IncreasePercentage should be greater than 0!");
+        }
+
+        if (getSkillShotBonusMax() < 0) {
+            reason.add("Skills.Archery.SkillShot_MaxBonus should be at least 0!");
+        }
+
+        if (getDazeBonusMax() < 1) {
+            reason.add("Skills.Acrobatics.Daze_MaxChance should be at least 1!");
+        }
+
+        if (getDazeMaxBonusLevel() < 1) {
+            reason.add("Skills.Acrobatics.Daze_MaxBonusLevel should be at least 1!");
+        }
+
+        if (getDazeModifier() < 0) {
+            reason.add("Skills.Acrobatics.Daze_BonusDamage should be at least 0!");
+        }
+
+        if (getRetrieveChanceMax() < 1) {
+            reason.add("Skills.Acrobatics.Retrieve_MaxBonus should be at least 1!");
+        }
+
+        if (getRetrieveMaxBonusLevel() < 1) {
+            reason.add("Skills.Acrobatics.Retrieve_MaxBonusLevel should be at least 1!");
+        }
+
+        if (getForceMultiplier() < 0) {
+            reason.add("Skills.Acrobatics.Force_Multiplier should be at least 0!");
+        }
+
+        /* AXES */
+        if (getBonusDamageAxesBonusMax() < 1) {
+            reason.add("Skills.Axes.DamageIncrease_MaxBonus should be at least 1!");
+        }
+
+        if (getBonusDamageAxesMaxBonusLevel() < 1) {
+            reason.add("Skills.Axes.DamageIncrease_MaxBonusLevel should be at least 1!");
+        }
+
+        if (getAxesCriticalChance() < 1) {
+            reason.add("Skills.Axes.AxesCritical_MaxChance should be at least 1!");
+        }
+
+        if (getAxesCriticalMaxBonusLevel() < 1) {
+            reason.add("Skills.Axes.AxesCritical_MaxBonusLevel should be at least 1!");
+        }
+
+        if (getAxesCriticalPVPModifier() < 1) {
+            reason.add("Skills.Axes.AxesCritical_PVP_Modifier should be at least 1!");
+        }
+
+        if (getAxesCriticalPVEModifier() < 1) {
+            reason.add("Skills.Axes.AxesCritical_PVE_Modifier should be at least 1!");
+        }
+
+        if (getGreaterImpactChance() < 1) {
+            reason.add("Skills.Axes.GreaterImpact_Chance should be at least 1!");
+        }
+
+        if (getGreaterImpactModifier() < 1) {
+            reason.add("Skills.Axes.GreaterImpact_KnockbackModifier should be at least 1!");
+        }
+
+        if (getGreaterImpactBonusDamage() < 1) {
+            reason.add("Skills.Axes.GreaterImpact_BonusDamage should be at least 1!");
+        }
+
+        if (getArmorImpactIncreaseLevel() < 1) {
+            reason.add("Skills.Axes.ArmorImpact_IncreaseLevel should be at least 1!");
+        }
+
+        if (getImpactChance() < 1) {
+            reason.add("Skills.Axes.ArmorImpact_Chance should be at least 1!");
+        }
+
+        if (getArmorImpactMaxDurabilityDamage() < 1) {
+            reason.add("Skills.Axes.ArmorImpact_MaxPercentageDurabilityDamage should be at least 1!");
+        }
+
+        if (getSkullSplitterModifier() < 1) {
+            reason.add("Skills.Axes.SkullSplitter_DamagerModifier should be at least 1!");
+        }
+
+        /* FISHING */
+        if (getFishingTierLevelsTier1() >= getFishingTierLevelsTier2()) {
+            reason.add("Skills.Fishing.Tier_Levels.Tier1 should be less than Skills.Fishing.Tier_Levels.Tier2!");
+        }
+
+        if (getFishingTierLevelsTier2() >= getFishingTierLevelsTier3()) {
+            reason.add("Skills.Fishing.Tier_Levels.Tier2 should be less than Skills.Fishing.Tier_Levels.Tier3!");
+        }
+
+        if (getFishingTierLevelsTier3() >= getFishingTierLevelsTier4()) {
+            reason.add("Skills.Fishing.Tier_Levels.Tier3 should be less than Skills.Fishing.Tier_Levels.Tier4!");
+        }
+
+        if (getFishingTierLevelsTier4() >= getFishingTierLevelsTier5()) {
+            reason.add("Skills.Fishing.Tier_Levels.Tier4 should be less than Skills.Fishing.Tier_Levels.Tier5!");
+        }
+
+        if (getFishingMagicMultiplier() <= 0) {
+            reason.add("Skills.Fishing.MagicHunter_Multiplier should be greater than 0!");
+        }
+
+        if (getFishermanDietRankChange() < 1) {
+            reason.add("Skills.Fishing.Fisherman_Diet_RankChange should be at least 1!");
+        }
+
+        if (getIceFishingUnlockLevel() < 1) {
+            reason.add("Skills.Fishing.Ice_Fishing_UnlockLevel should be at least 1!");
+        }
+
+        if (getShakeUnlockLevel() < 1) {
+            reason.add("Skills.Fishing.Shake_UnlockLevel should be at least 1!");
+        }
+
+        if (getShakeChanceRank1() > getShakeChanceRank2()) {
+            reason.add("Skills.Fishing.Shake_Chance.Rank_1 should be less or equal to Skills.Fishing.Shake_Chance.Rank_2!");
+        }
+
+        if (getShakeChanceRank2() > getShakeChanceRank3()) {
+            reason.add("Skills.Fishing.Shake_Chance.Rank_2 should be less or equal to Skills.Fishing.Shake_Chance.Rank_3!");
+        }
+
+        if (getShakeChanceRank3() > getShakeChanceRank4()) {
+            reason.add("Skills.Fishing.Shake_Chance.Rank_3 should be less or equal to Skills.Fishing.Shake_Chance.Rank_4!");
+        }
+
+        if (getShakeChanceRank4() > getShakeChanceRank5()) {
+            reason.add("Skills.Fishing.Shake_Chance.Rank_4 should be less or equal to Skills.Fishing.Shake_Chance.Rank_5!");
+        }
+
+        if (getFishingVanillaXPModifierRank1() > getFishingVanillaXPModifierRank2()) {
+            reason.add("Skills.Fishing.VanillaXPBoost.Rank_1 should be less or equal to Skills.Fishing.VanillaXPBoost.Rank_2!");
+        }
+
+        if (getFishingVanillaXPModifierRank2() > getFishingVanillaXPModifierRank3()) {
+            reason.add("Skills.Fishing.VanillaXPBoost.Rank_2 should be less or equal to Skills.Fishing.VanillaXPBoost.Rank_3!");
+        }
+
+        if (getFishingVanillaXPModifierRank3() > getFishingVanillaXPModifierRank4()) {
+            reason.add("Skills.Fishing.VanillaXPBoost.Rank_3 should be less or equal to Skills.Fishing.VanillaXPBoost.Rank_4!");
+        }
+
+        if (getFishingVanillaXPModifierRank4() > getFishingVanillaXPModifierRank5()) {
+            reason.add("Skills.Fishing.VanillaXPBoost.Rank_4 should be less or equal to Skills.Fishing.VanillaXPBoost.Rank_5!");
+        }
+
+        if (getFishingVanillaXPModifierRank1() < 0) {
+            reason.add("Skills.Fishing.VanillaXPBoost.Rank_1 should be at least 0!");
+        }
+
+        if (getFishingVanillaXPModifierRank2() < 0) {
+            reason.add("Skills.Fishing.VanillaXPBoost.Rank_2 should be at least 0!");
+        }
+
+        if (getFishingVanillaXPModifierRank3() < 0) {
+            reason.add("Skills.Fishing.VanillaXPBoost.Rank_3 should be at least 0!");
+        }
+
+        if (getFishingVanillaXPModifierRank4() < 0) {
+            reason.add("Skills.Fishing.VanillaXPBoost.Rank_4 should be at least 0!");
+        }
+
+        if (getFishingVanillaXPModifierRank5() < 0) {
+            reason.add("Skills.Fishing.VanillaXPBoost.Rank_5 should be at least 0!");
+        }
+
+        /* HERBALISM */
+        if (getFarmerDietRankChange() < 1) {
+            reason.add("Skills.Herbalism.Farmer_Diet_RankChange should be at least 1!");
+        }
+
+        if (getGreenThumbStageChange() < 1) {
+            reason.add("Skills.Herbalism.GreenThumb_StageChange should be at least 1!");
+        }
+
+        if (getGreenThumbChanceMax() < 1) {
+            reason.add("Skills.Herbalism.GreenThumb_ChanceMax should be at least 1!");
+        }
+
+        if (getGreenThumbMaxLevel() < 1) {
+            reason.add("Skills.Herbalism.GreenThumb_MaxBonusLevel should be at least 1!");
+        }
+
+        if (getHerbalismDoubleDropsChanceMax() < 1) {
+            reason.add("Skills.Herbalism.DoubleDrops_ChanceMax should be at least 1!");
+        }
+
+        if (getHerbalismDoubleDropsMaxLevel() < 1) {
+            reason.add("Skills.Herbalism.DoubleDrops_MaxBonusLevel should be at least 1!");
+        }
+
+        if (getHylianLuckChanceMax() < 1) {
+            reason.add("Skills.Herbalism.HylianLuck_ChanceMax should be at least 1!");
+        }
+
+        if (getHylianLuckMaxLevel() < 1) {
+            reason.add("Skills.Herbalism.HylianLuck_MaxBonusLevel should be at least 1!");
+        }
+
+        if (getShroomThumbChanceMax() < 1) {
+            reason.add("Skills.Herbalism.ShroomThumb_ChanceMax should be at least 1!");
+        }
+
+        if (getShroomThumbMaxLevel() < 1) {
+            reason.add("Skills.Herbalism.ShroomThumb_MaxBonusLevel should be at least 1!");
+        }
+
+        /* MINING */
+        if (getMiningDoubleDropChance() < 1) {
+            reason.add("Skills.Mining.DoubleDrops_ChanceMax should be at least 1!");
+        }
+
+        if (getMiningDoubleDropMaxLevel() < 1) {
+            reason.add("Skills.Mining.DoubleDrops_MaxBonusLevel should be at least 1!");
+        }
+
+        if (getBlastMiningRank1() > getBlastMiningRank2()) {
+            reason.add("Skills.Mining.BlastMining_Rank1 should be less or equal to Skills.Mining.BlastMining_Rank2!");
+        }
+
+        if (getBlastMiningRank2() > getBlastMiningRank3()) {
+            reason.add("Skills.Mining.BlastMining_Rank2 should be less or equal to Skills.Mining.BlastMining_Rank3!");
+        }
+
+        if (getBlastMiningRank3() > getBlastMiningRank4()) {
+            reason.add("Skills.Mining.BlastMining_Rank3 should be less or equal to Skills.Mining.BlastMining_Rank4!");
+        }
+
+        if (getBlastMiningRank4() > getBlastMiningRank5()) {
+            reason.add("Skills.Mining.BlastMining_Rank4 should be less or equal to Skills.Mining.BlastMining_Rank5!");
+        }
+
+        if (getBlastMiningRank5() > getBlastMiningRank6()) {
+            reason.add("Skills.Mining.BlastMining_Rank5 should be less or equal to Skills.Mining.BlastMining_Rank6!");
+        }
+
+        if (getBlastMiningRank6() > getBlastMiningRank7()) {
+            reason.add("Skills.Mining.BlastMining_Rank6 should be less or equal to Skills.Mining.BlastMining_Rank7!");
+        }
+
+        if (getBlastMiningRank7() > getBlastMiningRank8()) {
+            reason.add("Skills.Mining.BlastMining_Rank7 should be less or equal to Skills.Mining.BlastMining_Rank8!");
+        }
+
+        if (getBlastDamageDecreaseRank1() > getBlastDamageDecreaseRank2()) {
+            reason.add("Skills.Mining.BlastDamageDecrease_Rank1 should be less or equal to Skills.Mining.BlastDamageDecrease_Rank2!");
+        }
+
+        if (getBlastDamageDecreaseRank2() > getBlastDamageDecreaseRank3()) {
+            reason.add("Skills.Mining.BlastDamageDecrease_Rank2 should be less or equal to Skills.Mining.BlastDamageDecrease_Rank3!");
+        }
+
+        if (getBlastDamageDecreaseRank3() > getBlastDamageDecreaseRank4()) {
+            reason.add("Skills.Mining.BlastDamageDecrease_Rank3 should be less or equal to Skills.Mining.BlastDamageDecrease_Rank4!");
+        }
+
+        if (getBlastDamageDecreaseRank4() > getBlastDamageDecreaseRank5()) {
+            reason.add("Skills.Mining.BlastDamageDecrease_Rank4 should be less or equal to Skills.Mining.BlastDamageDecrease_Rank5!");
+        }
+
+        if (getBlastDamageDecreaseRank5() > getBlastDamageDecreaseRank6()) {
+            reason.add("Skills.Mining.BlastDamageDecrease_Rank5 should be less or equal to Skills.Mining.BlastDamageDecrease_Rank6!");
+        }
+
+        if (getBlastDamageDecreaseRank6() > getBlastDamageDecreaseRank7()) {
+            reason.add("Skills.Mining.BlastDamageDecrease_Rank6 should be less or equal to Skills.Mining.BlastDamageDecrease_Rank7!");
+        }
+
+        if (getBlastDamageDecreaseRank7() > getBlastDamageDecreaseRank8()) {
+            reason.add("Skills.Mining.BlastDamageDecrease_Rank7 should be less or equal to Skills.Mining.BlastDamageDecrease_Rank8!");
+        }
+
+        if (getOreBonusRank1() > getOreBonusRank2()) {
+            reason.add("Skills.Mining.OreBonus_Rank1 should be less or equal to Skills.Mining.OreBonus_Rank2!");
+        }
+
+        if (getOreBonusRank2() > getOreBonusRank3()) {
+            reason.add("Skills.Mining.OreBonus_Rank2 should be less or equal to Skills.Mining.OreBonus_Rank3!");
+        }
+
+        if (getOreBonusRank3() > getOreBonusRank4()) {
+            reason.add("Skills.Mining.OreBonus_Rank3 should be less or equal to Skills.Mining.OreBonus_Rank4!");
+        }
+
+        if (getOreBonusRank4() > getOreBonusRank5()) {
+            reason.add("Skills.Mining.OreBonus_Rank4 should be less or equal to Skills.Mining.OreBonus_Rank5!");
+        }
+
+        if (getOreBonusRank5() > getOreBonusRank6()) {
+            reason.add("Skills.Mining.OreBonus_Rank5 should be less or equal to Skills.Mining.OreBonus_Rank6!");
+        }
+
+        if (getOreBonusRank6() > getOreBonusRank7()) {
+            reason.add("Skills.Mining.OreBonus_Rank6 should be less or equal to Skills.Mining.OreBonus_Rank7!");
+        }
+
+        if (getOreBonusRank7() > getOreBonusRank8()) {
+            reason.add("Skills.Mining.OreBonus_Rank7 should be less or equal to Skills.Mining.OreBonus_Rank8!");
+        }
+
+        if (getDebrisReductionRank1() > getDebrisReductionRank2()) {
+            reason.add("Skills.Mining.DebrisReduction_Rank1 should be less or equal to Skills.Mining.DebrisReduction_Rank2!");
+        }
+
+        if (getDebrisReductionRank2() > getDebrisReductionRank3()) {
+            reason.add("Skills.Mining.DebrisReduction_Rank2 should be less or equal to Skills.Mining.DebrisReduction_Rank3!");
+        }
+
+        if (getDebrisReductionRank3() > getDebrisReductionRank4()) {
+            reason.add("Skills.Mining.DebrisReduction_Rank3 should be less or equal to Skills.Mining.DebrisReduction_Rank4!");
+        }
+
+        if (getDebrisReductionRank4() > getDebrisReductionRank5()) {
+            reason.add("Skills.Mining.DebrisReduction_Rank4 should be less or equal to Skills.Mining.DebrisReduction_Rank5!");
+        }
+
+        if (getDebrisReductionRank5() > getDebrisReductionRank6()) {
+            reason.add("Skills.Mining.DebrisReduction_Rank5 should be less or equal to Skills.Mining.DebrisReduction_Rank6!");
+        }
+
+        if (getDebrisReductionRank6() > getDebrisReductionRank7()) {
+            reason.add("Skills.Mining.DebrisReduction_Rank6 should be less or equal to Skills.Mining.DebrisReduction_Rank7!");
+        }
+
+        if (getDebrisReductionRank7() > getDebrisReductionRank8()) {
+            reason.add("Skills.Mining.DebrisReduction_Rank7 should be less or equal to Skills.Mining.DebrisReduction_Rank8!");
+        }
+
+        if (getDropMultiplierRank1() > getDropMultiplierRank2()) {
+            reason.add("Skills.Mining.DropMultiplier_Rank1 should be less or equal to Skills.Mining.DropMultiplier_Rank2!");
+        }
+
+        if (getDropMultiplierRank2() > getDropMultiplierRank3()) {
+            reason.add("Skills.Mining.DropMultiplier_Rank2 should be less or equal to Skills.Mining.DropMultiplier_Rank3!");
+        }
+
+        if (getDropMultiplierRank3() > getDropMultiplierRank4()) {
+            reason.add("Skills.Mining.DropMultiplier_Rank3 should be less or equal to Skills.Mining.DropMultiplier_Rank4!");
+        }
+
+        if (getDropMultiplierRank4() > getDropMultiplierRank5()) {
+            reason.add("Skills.Mining.DropMultiplier_Rank4 should be less or equal to Skills.Mining.DropMultiplier_Rank5!");
+        }
+
+        if (getDropMultiplierRank5() > getDropMultiplierRank6()) {
+            reason.add("Skills.Mining.DropMultiplier_Rank5 should be less or equal to Skills.Mining.DropMultiplier_Rank6!");
+        }
+
+        if (getDropMultiplierRank6() > getDropMultiplierRank7()) {
+            reason.add("Skills.Mining.DropMultiplier_Rank6 should be less or equal to Skills.Mining.DropMultiplier_Rank7!");
+        }
+
+        if (getDropMultiplierRank7() > getDropMultiplierRank8()) {
+            reason.add("Skills.Mining.DropMultiplier_Rank7 should be less or equal to Skills.Mining.DropMultiplier_Rank8!");
+        }
+
+        if (getBlastRadiusModifierRank1() > getBlastRadiusModifierRank2()) {
+            reason.add("Skills.Mining.BlastRadiusModifier_Rank1 should be less or equal to Skills.Mining.BlastRadiusModifier_Rank2!");
+        }
+
+        if (getBlastRadiusModifierRank2() > getBlastRadiusModifierRank3()) {
+            reason.add("Skills.Mining.BlastRadiusModifier_Rank2 should be less or equal to Skills.Mining.BlastRadiusModifier_Rank3!");
+        }
+
+        if (getBlastRadiusModifierRank3() > getBlastRadiusModifierRank4()) {
+            reason.add("Skills.Mining.BlastRadiusModifier_Rank3 should be less or equal to Skills.Mining.BlastRadiusModifier_Rank4!");
+        }
+
+        if (getBlastRadiusModifierRank4() > getBlastRadiusModifierRank5()) {
+            reason.add("Skills.Mining.BlastRadiusModifier_Rank4 should be less or equal to Skills.Mining.BlastRadiusModifier_Rank5!");
+        }
+
+        if (getBlastRadiusModifierRank5() > getBlastRadiusModifierRank6()) {
+            reason.add("Skills.Mining.BlastRadiusModifier_Rank5 should be less or equal to Skills.Mining.BlastRadiusModifier_Rank6!");
+        }
+
+        if (getBlastRadiusModifierRank6() > getBlastRadiusModifierRank7()) {
+            reason.add("Skills.Mining.BlastRadiusModifier_Rank6 should be less or equal to Skills.Mining.BlastRadiusModifier_Rank7!");
+        }
+
+        if (getBlastRadiusModifierRank7() > getBlastRadiusModifierRank8()) {
+            reason.add("Skills.Mining.BlastRadiusModifier_Rank7 should be less or equal to Skills.Mining.BlastRadiusModifier_Rank8!");
+        }
+
+        /* REPAIR */
+        if (getRepairMasteryMaxBonus() < 1) {
+            reason.add("Skills.Repair.RepairMastery_MaxBonusPercentage should be at least 1!");
+        }
+
+        if (getRepairMasteryMaxLevel() < 1) {
+            reason.add("Skills.Repair.RepairMastery_MaxBonusLevel should be at least 1!");
+        }
+
+        if (getSuperRepairChanceMax() < 1) {
+            reason.add("Skills.Repair.SuperRepair_ChanceMax should be at least 1!");
+        }
+
+        if (getSuperRepairMaxLevel() < 1) {
+            reason.add("Skills.Repair.SuperRepair_MaxBonusLevel should be at least 1!");
+        }
+
+        if (getSalvageUnlockLevel() < 1) {
+            reason.add("Skills.Repair.Salvage_UnlockLevel should be at least 1!");
+        }
+
+        if (getArcaneForgingDowngradeChanceRank1() < 0 || getArcaneForgingDowngradeChanceRank1() > 100) {
+            reason.add("Skills.Repair.Arcane_Forging.Downgrades.Chance.Rank_1 only accepts values from 0 to 100!");
+        }
+
+        if (getArcaneForgingDowngradeChanceRank2() < 0 || getArcaneForgingDowngradeChanceRank2() > 100) {
+            reason.add("Skills.Repair.Arcane_Forging.Downgrades.Chance.Rank_2 only accepts values from 0 to 100!");
+        }
+
+        if (getArcaneForgingDowngradeChanceRank3() < 0 || getArcaneForgingDowngradeChanceRank3() > 100) {
+            reason.add("Skills.Repair.Arcane_Forging.Downgrades.Chance.Rank_3 only accepts values from 0 to 100!");
+        }
+
+        if (getArcaneForgingDowngradeChanceRank4() < 0 || getArcaneForgingDowngradeChanceRank4() > 100) {
+            reason.add("Skills.Repair.Arcane_Forging.Downgrades.Chance.Rank_4 only accepts values from 0 to 100!");
+        }
+
+        if (getArcaneForgingKeepEnchantsChanceRank1() < 0 || getArcaneForgingKeepEnchantsChanceRank1() > 100) {
+            reason.add("Skills.Repair.Arcane_Forging.Keep_Enchants.Chance.Rank_1 only accepts values from 0 to 100!");
+        }
+
+        if (getArcaneForgingKeepEnchantsChanceRank2() < 0 || getArcaneForgingKeepEnchantsChanceRank2() > 100) {
+            reason.add("Skills.Repair.Arcane_Forging.Keep_Enchants.Chance.Rank_2 only accepts values from 0 to 100!");
+        }
+
+        if (getArcaneForgingKeepEnchantsChanceRank3() < 0 || getArcaneForgingKeepEnchantsChanceRank3() > 100) {
+            reason.add("Skills.Repair.Arcane_Forging.Keep_Enchants.Chance.Rank_3 only accepts values from 0 to 100!");
+        }
+
+        if (getArcaneForgingKeepEnchantsChanceRank4() < 0 || getArcaneForgingKeepEnchantsChanceRank4() > 100) {
+            reason.add("Skills.Repair.Arcane_Forging.Keep_Enchants.Chance.Rank_4 only accepts values from 0 to 100!");
+        }
+
+        if (getArcaneForgingRankLevels1() < 0) {
+            reason.add("Skills.Repair.Arcane_Forging.Rank_Levels.Rank_1 should be at least 0!");
+        }
+
+        if (getArcaneForgingRankLevels2() < 0) {
+            reason.add("Skills.Repair.Arcane_Forging.Rank_Levels.Rank_2 should be at least 0!");
+        }
+
+        if (getArcaneForgingRankLevels3() < 0) {
+            reason.add("Skills.Repair.Arcane_Forging.Rank_Levels.Rank_3 should be at least 0!");
+        }
+
+        if (getArcaneForgingRankLevels4() < 0) {
+            reason.add("Skills.Repair.Arcane_Forging.Rank_Levels.Rank_4 should be at least 0!");
+        }
+
+        /* SMELTING */
+        if (getBurnModifierMaxLevel() < 1) {
+            reason.add("Skills.Smelting.FuelEfficiency_MaxBonusLevel should be at least 1!");
+        }
+
+        if (getBurnTimeMultiplier() < 1) {
+            reason.add("Skills.Smelting.FuelEfficiency_Multiplier should be at least 1!");
+        }
+
+        if (getSecondSmeltMaxLevel() < 1) {
+            reason.add("Skills.Smelting.SecondSmelt_MaxBonusLevel should be at least 1!");
+        }
+
+        if (getSecondSmeltMaxChance() < 1) {
+            reason.add("Skills.Smelting.SecondSmelt_MaxBonusChance should be at least 1!");
+        }
+
+        if (getFluxMiningUnlockLevel() < 1) {
+            reason.add("Skills.Smelting.FluxMining_UnlockLevel should be at least 1!");
+        }
+
+        if (getFluxMiningChance() < 1) {
+            reason.add("Skills.Smelting.FluxMining_Chance should be at least 1!");
+        }
+
+        if (getSmeltingVanillaXPBoostRank1Level() > getSmeltingVanillaXPBoostRank2Level()) {
+            reason.add("Skills.Smelting.VanillaXPBoost_Rank1Level should be less or equal to Skills.Smelting.VanillaXPBoost_Rank2Level!");
+        }
+
+        if (getSmeltingVanillaXPBoostRank2Level() > getSmeltingVanillaXPBoostRank3Level()) {
+            reason.add("Skills.Smelting.VanillaXPBoost_Rank2Level should be less or equal to Skills.Smelting.VanillaXPBoost_Rank3Level!");
+        }
+
+        if (getSmeltingVanillaXPBoostRank3Level() > getSmeltingVanillaXPBoostRank4Level()) {
+            reason.add("Skills.Smelting.VanillaXPBoost_Rank3Level should be less or equal to Skills.Smelting.VanillaXPBoost_Rank4Level!");
+        }
+
+        if (getSmeltingVanillaXPBoostRank4Level() > getSmeltingVanillaXPBoostRank5Level()) {
+            reason.add("Skills.Smelting.VanillaXPBoost_Rank4Level should be less or equal to Skills.Smelting.VanillaXPBoost_Rank5Level!");
+        }
+
+        if (getSmeltingVanillaXPBoostRank1Multiplier() < 1) {
+            reason.add("Skills.Smelting.VanillaXPBoost_Rank1Multiplier should be at least 1!");
+        }
+
+        if (getSmeltingVanillaXPBoostRank2Multiplier() < 1) {
+            reason.add("Skills.Smelting.VanillaXPBoost_Rank2Multiplier should be at least 1!");
+        }
+
+        if (getSmeltingVanillaXPBoostRank3Multiplier() < 1) {
+            reason.add("Skills.Smelting.VanillaXPBoost_Rank3Multiplier should be at least 1!");
+        }
+
+        if (getSmeltingVanillaXPBoostRank4Multiplier() < 1) {
+            reason.add("Skills.Smelting.VanillaXPBoost_Rank4Multiplier should be at least 1!");
+        }
+
+        if (getSmeltingVanillaXPBoostRank5Multiplier() < 1) {
+            reason.add("Skills.Smelting.VanillaXPBoost_Rank5Multiplier should be at least 1!");
+        }
+
+        /* SWORDS */
+        if (getBleedChanceMax() < 1) {
+            reason.add("Skills.Swords.Bleed_ChanceMax should be at least 1!");
+        }
+
+        if (getBleedMaxBonusLevel() < 1) {
+            reason.add("Skills.Swords.Bleed_MaxBonusLevel should be at least 1!");
+        }
+
+        if (getBleedMaxTicks() < 1) {
+            reason.add("Skills.Swords.Bleed_MaxTicks should be at least 1!");
+        }
+
+        if (getBleedMaxTicks() < getBleedBaseTicks()) {
+            reason.add("Skills.Swords.Bleed_MaxTicks should be at least Skills.Swords.Bleed_BaseTicks!");
+        }
+
+        if (getBleedBaseTicks() < 1) {
+            reason.add("Skills.Swords.Bleed_BaseTicks should be at least 1!");
+        }
+
+        if (getCounterChanceMax() < 1) {
+            reason.add("Skills.Swords.Counter_ChanceMax should be at least 1!");
+        }
+
+        if (getCounterMaxBonusLevel() < 1) {
+            reason.add("Skills.Swords.Counter_MaxBonusLevel should be at least 1!");
+        }
+
+        if (getCounterModifier() < 1) {
+            reason.add("Skills.Swords.Counter_DamageModifier should be at least 1!");
+        }
+
+        if (getSerratedStrikesModifier() < 1) {
+            reason.add("Skills.Swords.SerratedStrikes_DamageModifier should be at least 1!");
+        }
+
+        if (getSerratedStrikesTicks() < 1) {
+            reason.add("Skills.Swords.SerratedStrikes_BleedTicks should be at least 1!");
+        }
+
+        /* TAMING */
+
+        if (getGoreChanceMax() < 1) {
+            reason.add("Skills.Taming.Gore_ChanceMax should be at least 1!");
+        }
+
+        if (getGoreMaxBonusLevel() < 1) {
+            reason.add("Skills.Taming.Gore_MaxBonusLevel should be at least 1!");
+        }
+
+        if (getGoreBleedTicks() < 1) {
+            reason.add("Skills.Taming.Gore_BleedTicks should be at least 1!");
+        }
+
+        if (getGoreModifier() < 1) {
+            reason.add("Skills.Taming.Gore_Modifier should be at least 1!");
+        }
+
+        if (getFastFoodUnlock() < 1) {
+            reason.add("Skills.Taming.FastFood_UnlockLevel should be at least 1!");
+        }
+
+        if (getFastFoodChance() < 1) {
+            reason.add("Skills.Taming.FastFood_Chance should be at least 1!");
+        }
+
+        if (getEnviromentallyAwareUnlock() < 1) {
+            reason.add("Skills.Taming.EnvironmentallyAware_UnlockLevel should be at least 1!");
+        }
+
+        if (getThickFurUnlock() < 1) {
+            reason.add("Skills.Taming.ThickFur_UnlockLevel should be at least 1!");
+        }
+
+        if (getThickFurModifier() < 1) {
+            reason.add("Skills.Taming.ThickFur_Modifier should be at least 1!");
+        }
+
+        if (getHolyHoundUnlock() < 1) {
+            reason.add("Skills.Taming.HolyHound_UnlockLevel should be at least 1!");
+        }
+
+        if (getShockProofUnlock() < 1) {
+            reason.add("Skills.Taming.ShockProof_UnlockLevel should be at least 1!");
+        }
+
+        if (getShockProofModifier() < 1) {
+            reason.add("Skills.Taming.ShockProof_Modifier should be at least 1!");
+        }
+
+        if (getSharpenedClawsUnlock() < 1) {
+            reason.add("Skills.Taming.SharpenedClaws_UnlockLevel should be at least 1!");
+        }
+
+        if (getSharpenedClawsBonus() < 1) {
+            reason.add("Skills.Taming.SharpenedClaws_Bonus should be at least 1!");
+        }
+
+
+        /* UNARMED */
+        if (getDisarmChanceMax() < 1) {
+            reason.add("Skills.Unarmed.Disarm_ChanceMax should be at least 1!");
+        }
+
+        if (getDisarmMaxBonusLevel() < 1) {
+            reason.add("Skills.Unarmed.Disarm_MaxBonusLevel should be at least 1!");
+        }
+
+        if (getDeflectChanceMax() < 1) {
+            reason.add("Skills.Unarmed.Deflect_ChanceMax should be at least 1!");
+        }
+
+        if (getDeflectMaxBonusLevel() < 1) {
+            reason.add("Skills.Unarmed.Deflect_MaxBonusLevel should be at least 1!");
+        }
+
+        if (getIronGripChanceMax() < 1) {
+            reason.add("Skills.Unarmed.IronGrip_ChanceMax should be at least 1!");
+        }
+
+        if (getIronGripMaxBonusLevel() < 1) {
+            reason.add("Skills.Unarmed.IronGrip_MaxBonusLevel should be at least 1!");
+        }
+
+        if (getIronArmMinBonus() < 0) {
+            reason.add("Skills.Unarmed.IronArm_BonusMin should be at least 0!");
+        }
+
+        if (getIronArmMaxBonus() < 0) {
+            reason.add("Skills.Unarmed.IronArm_BonusMax should be at least 0!");
+        }
+
+        if (getIronArmMaxBonus() < getIronArmMinBonus()) {
+            reason.add("Skills.Unarmed.IronArm_BonusMax should be greater than or equal to Skills.Unarmed.IronArm_BonusMin!");
+        }
+
+        if (getIronArmIncreaseLevel() < 1) {
+            reason.add("Skills.Unarmed.IronArm_IncreaseLevel should be at least 1!");
+        }
+
+        /* WOODCUTTING */
+        if (getLeafBlowUnlockLevel() < 1) {
+            reason.add("Skills.Woodcutting.LeafBlower_UnlockLevel should be at least 1!");
+        }
+
+        if (getWoodcuttingDoubleDropChance() < 1) {
+            reason.add("Skills.Woodcutting.DoubleDrops_ChanceMax should be at least 1!");
+        }
+
+        if (getWoodcuttingDoubleDropMaxLevel() < 1) {
+            reason.add("Skills.Woodcutting.DoubleDrops_MaxBonusLevel should be at least 1!");
+        }
+
+        /* KRAKEN */
+        if (getKrakenTriesBeforeRelease() < 1) {
+            reason.add("Kraken.Tries_Before_Release should be at least 1!");
+        }
+
+        if (getKrakenHealth() < 1) {
+            reason.add("Kraken.Health should be at least 1!");
+        }
+
+        if (getKrakenAttackInterval() < 1) {
+            reason.add("Kraken.Attack_Interval_Seconds should be at least 1!");
+        }
+
+        if (getKrakenAttackDamage() < 1) {
+            reason.add("Kraken.Attack_Damage should be at least 1!");
+        }
+
+        return noErrorsInConfig(reason);
+    }
+
     @Override
     protected void loadKeys() {}
 
@@ -25,16 +789,15 @@ public class AdvancedConfig extends AutoUpdateConfigLoader {
     /* ACROBATICS */
     public double getDodgeChanceMax() { return config.getDouble("Skills.Acrobatics.Dodge_ChanceMax", 20.0D); }
     public int getDodgeMaxBonusLevel() { return config.getInt("Skills.Acrobatics.Dodge_MaxBonusLevel", 800); }
-    public int getDodgeDamageModifier() { return config.getInt("Skills.Acrobatics.Dodge_DamageModifer", 2); }
+    public double getDodgeDamageModifier() { return config.getDouble("Skills.Acrobatics.Dodge_DamageModifier", 2.0D); }
 
     public double getRollChanceMax() { return config.getDouble("Skills.Acrobatics.Roll_ChanceMax", 100.0D); }
     public int getRollMaxBonusLevel() { return config.getInt("Skills.Acrobatics.Roll_MaxBonusLevel", 1000); }
-    public int getRollDamageThreshold() { return config.getInt("Skills.Acrobatics.Roll_DamageThreshold", 7); }
+    public double getRollDamageThreshold() { return config.getDouble("Skills.Acrobatics.Roll_DamageThreshold", 7.0D); }
 
     public double getGracefulRollChanceMax() { return config.getDouble("Skills.Acrobatics.GracefulRoll_ChanceMax", 100.0D); }
     public int getGracefulRollMaxBonusLevel() { return config.getInt("Skills.Acrobatics.GracefulRoll_MaxBonusLevel", 500); }
-    public int getGracefulRollDamageThreshold() { return config.getInt("Skills.Acrobatics.GracefulRoll_DamageThreshold", 14); }
-    public int getGracefulRollSuccessModifer() { return config.getInt("Skills.Acrobatics.GracefulRoll_SuccessModifier", 2); }
+    public double getGracefulRollDamageThreshold() { return config.getDouble("Skills.Acrobatics.GracefulRoll_DamageThreshold", 14.0D); }
 
     public int getDodgeXPModifier() { return config.getInt("Skills.Acrobatics.Dodge_XP_Modifier", 120); }
     public int getRollXPModifier() { return config.getInt("Skills.Acrobatics.Roll_XP_Modifier", 80); }
@@ -44,16 +807,19 @@ public class AdvancedConfig extends AutoUpdateConfigLoader {
     public int getSkillShotIncreaseLevel() { return config.getInt("Skills.Archery.SkillShot_IncreaseLevel", 50); }
     public double getSkillShotIncreasePercentage() { return config.getDouble("Skills.Archery.SkillShot_IncreasePercentage", 0.1D); }
     public double getSkillShotBonusMax() { return config.getDouble("Skills.Archery.SkillShot_MaxBonus", 2.0D); }
+    public double getSkillShotDamageMax() { return config.getDouble("Skills.Archery.SkillShot_MaxDamage", 9.0D); }
 
     public double getDazeBonusMax() { return config.getDouble("Skills.Archery.Daze_MaxChance", 50.0D); }
     public int getDazeMaxBonusLevel() { return config.getInt("Skills.Archery.Daze_MaxBonusLevel", 1000); }
-    public int getDazeModifier() { return config.getInt("Skills.Archery.Daze_BonusDamage", 4); }
+    public double getDazeModifier() { return config.getDouble("Skills.Archery.Daze_BonusDamage", 4.0D); }
 
     public double getRetrieveChanceMax() { return config.getDouble("Skills.Archery.Retrieve_MaxBonus", 100.0D); }
     public int getRetrieveMaxBonusLevel() { return config.getInt("Skills.Archery.Retrieve_MaxBonusLevel", 1000); }
 
+    public double getForceMultiplier() { return config.getDouble("Skills.Archery.Force_Multiplier", 2.0D); }
+
     /* AXES */
-    public int getBonusDamageAxesBonusMax() { return config.getInt("Skills.Axes.DamageIncrease_MaxBonus", 4); }
+    public double getBonusDamageAxesBonusMax() { return config.getDouble("Skills.Axes.DamageIncrease_MaxBonus", 4.0D); }
     public int getBonusDamageAxesMaxBonusLevel() { return config.getInt("Skills.Axes.DamageIncrease_MaxBonusLevel", 200); }
 
     public double getAxesCriticalChance() { return config.getDouble("Skills.Axes.AxesCritical_MaxChance", 37.50D); }
@@ -62,14 +828,14 @@ public class AdvancedConfig extends AutoUpdateConfigLoader {
     public double getAxesCriticalPVEModifier() { return config.getDouble("Skills.Axes.AxesCritical_PVE_Modifier", 2.0D); }
 
     public double getGreaterImpactChance() { return config.getDouble("Skills.Axes.GreaterImpact_Chance", 25.0D); }
-    public double getGreaterImpactModifier() { return config.getDouble("Skills.Axes.GreaterImpact_KnockbackModifier", 1.5); }
-    public int getGreaterImpactBonusDamage() { return config.getInt("Skills.Axes.GreaterImpact_BonusDamage", 2); }
+    public double getGreaterImpactModifier() { return config.getDouble("Skills.Axes.GreaterImpact_KnockbackModifier", 1.5D); }
+    public double getGreaterImpactBonusDamage() { return config.getDouble("Skills.Axes.GreaterImpact_BonusDamage", 2.0D); }
 
     public int getArmorImpactIncreaseLevel() { return config.getInt("Skills.Axes.ArmorImpact_IncreaseLevel", 50); }
     public double getImpactChance() { return config.getDouble("Skills.Axes.ArmorImpact_Chance", 25.0D); }
     public double getArmorImpactMaxDurabilityDamage() { return config.getDouble("Skills.Axes.ArmorImpact_MaxPercentageDurabilityDamage", 20.0D); }
 
-    public int getSkullSplitterModifier() { return config.getInt("Skills.Axes.SkullSplitter_DamagerModifier", 2); }
+    public double getSkullSplitterModifier() { return config.getDouble("Skills.Axes.SkullSplitter_DamagerModifier", 2.0D); }
 
     /* EXCAVATION */
     //Nothing to configure, everything is already configurable in config.yml
@@ -81,17 +847,19 @@ public class AdvancedConfig extends AutoUpdateConfigLoader {
     public int getFishingTierLevelsTier4() { return config.getInt("Skills.Fishing.Tier_Levels.Tier4", 600); }
     public int getFishingTierLevelsTier5() { return config.getInt("Skills.Fishing.Tier_Levels.Tier5", 800); }
 
-    public int getFishingMagicMultiplier() { return config.getInt("Skills.Fishing.MagicHunter_Multiplier", 5); }
+    public double getFishingMagicMultiplier() { return config.getDouble("Skills.Fishing.MagicHunter_Multiplier", 5.0D); }
 
     public int getFishermanDietRankChange() { return config.getInt("Skills.Fishing.Fisherman_Diet_RankChange", 200); }
 
+    public int getIceFishingUnlockLevel() { return config.getInt("Skills.Fishing.Ice_Fishing_UnlockLevel", 50); }
+
     /* Shake */
     public int getShakeUnlockLevel() { return config.getInt("Skills.Fishing.Shake_UnlockLevel", 150); }
-    public int getShakeChanceRank1() { return config.getInt("Skills.Fishing.Shake_Chance.Rank_1", 25); }
-    public int getShakeChanceRank2() { return config.getInt("Skills.Fishing.Shake_Chance.Rank_2", 40); }
-    public int getShakeChanceRank3() { return config.getInt("Skills.Fishing.Shake_Chance.Rank_3", 55); }
-    public int getShakeChanceRank4() { return config.getInt("Skills.Fishing.Shake_Chance.Rank_4", 60); }
-    public int getShakeChanceRank5() { return config.getInt("Skills.Fishing.Shake_Chance.Rank_5", 75); }
+    public double getShakeChanceRank1() { return config.getDouble("Skills.Fishing.Shake_Chance.Rank_1", 25.0D); }
+    public double getShakeChanceRank2() { return config.getDouble("Skills.Fishing.Shake_Chance.Rank_2", 40.0D); }
+    public double getShakeChanceRank3() { return config.getDouble("Skills.Fishing.Shake_Chance.Rank_3", 55.0D); }
+    public double getShakeChanceRank4() { return config.getDouble("Skills.Fishing.Shake_Chance.Rank_4", 60.0D); }
+    public double getShakeChanceRank5() { return config.getDouble("Skills.Fishing.Shake_Chance.Rank_5", 75.0D); }
 
     /* Vanilla XP Boost */
     public int getFishingVanillaXPModifierRank1() { return config.getInt("Skills.Fishing.VanillaXPBoost.Rank_1", 1); }
@@ -183,15 +951,17 @@ public class AdvancedConfig extends AutoUpdateConfigLoader {
 
     /* Arcane Forging */
     public boolean getArcaneForgingDowngradeEnabled() { return config.getBoolean("Skills.Repair.Arcane_Forging.Downgrades.Enabled", true); }
-    public int getArcaneForgingDowngradeChanceRank1() { return config.getInt("Skills.Repair.Arcane_Forging.Downgrades.Chance.Rank_1", 75); }
-    public int getArcaneForgingDowngradeChanceRank2() { return config.getInt("Skills.Repair.Arcane_Forging.Downgrades.Chance.Rank_2", 50); }
-    public int getArcaneForgingDowngradeChanceRank3() { return config.getInt("Skills.Repair.Arcane_Forging.Downgrades.Chance.Rank_3", 25); }
-    public int getArcaneForgingDowngradeChanceRank4() { return config.getInt("Skills.Repair.Arcane_Forging.Downgrades.Chance.Rank_4", 15); }
+    public double getArcaneForgingDowngradeChanceRank1() { return config.getDouble("Skills.Repair.Arcane_Forging.Downgrades.Chance.Rank_1", 75.0D); }
+    public double getArcaneForgingDowngradeChanceRank2() { return config.getDouble("Skills.Repair.Arcane_Forging.Downgrades.Chance.Rank_2", 50.0D); }
+    public double getArcaneForgingDowngradeChanceRank3() { return config.getDouble("Skills.Repair.Arcane_Forging.Downgrades.Chance.Rank_3", 25.0D); }
+    public double getArcaneForgingDowngradeChanceRank4() { return config.getDouble("Skills.Repair.Arcane_Forging.Downgrades.Chance.Rank_4", 15.0D); }
+
     public boolean getArcaneForgingEnchantLossEnabled() { return config.getBoolean("Skills.Repair.Arcane_Forging.May_Lose_Enchants", true); }
-    public int getArcaneForgingKeepEnchantsChanceRank1() { return config.getInt("Skills.Repair.Arcane_Forging.Keep_Enchants.Chance.Rank_1", 10); }
-    public int getArcaneForgingKeepEnchantsChanceRank2() { return config.getInt("Skills.Repair.Arcane_Forging.Keep_Enchants.Chance.Rank_2", 20); }
-    public int getArcaneForgingKeepEnchantsChanceRank3() { return config.getInt("Skills.Repair.Arcane_Forging.Keep_Enchants.Chance.Rank_3", 30); }
-    public int getArcaneForgingKeepEnchantsChanceRank4() { return config.getInt("Skills.Repair.Arcane_Forging.Keep_Enchants.Chance.Rank_4", 40); }
+    public double getArcaneForgingKeepEnchantsChanceRank1() { return config.getDouble("Skills.Repair.Arcane_Forging.Keep_Enchants.Chance.Rank_1", 10.0D); }
+    public double getArcaneForgingKeepEnchantsChanceRank2() { return config.getDouble("Skills.Repair.Arcane_Forging.Keep_Enchants.Chance.Rank_2", 20.0D); }
+    public double getArcaneForgingKeepEnchantsChanceRank3() { return config.getDouble("Skills.Repair.Arcane_Forging.Keep_Enchants.Chance.Rank_3", 30.0D); }
+    public double getArcaneForgingKeepEnchantsChanceRank4() { return config.getDouble("Skills.Repair.Arcane_Forging.Keep_Enchants.Chance.Rank_4", 40.0D); }
+
     public int getArcaneForgingRankLevels1() { return config.getInt("Skills.Repair.Arcane_Forging.Rank_Levels.Rank_1", 100); }
     public int getArcaneForgingRankLevels2() { return config.getInt("Skills.Repair.Arcane_Forging.Rank_Levels.Rank_2", 250); }
     public int getArcaneForgingRankLevels3() { return config.getInt("Skills.Repair.Arcane_Forging.Rank_Levels.Rank_3", 500); }
@@ -225,34 +995,35 @@ public class AdvancedConfig extends AutoUpdateConfigLoader {
     public int getBleedMaxTicks() { return config.getInt("Skills.Swords.Bleed_MaxTicks", 3); }
     public int getBleedBaseTicks() { return config.getInt("Skills.Swords.Bleed_BaseTicks", 2); }
 
+    public boolean getCounterRequiresBlock() { return config.getBoolean("Skills.Swords.Counter_RequiresBlock"); }
     public double getCounterChanceMax() { return config.getDouble("Skills.Swords.Counter_ChanceMax", 30.0D); }
     public int getCounterMaxBonusLevel() { return config.getInt("Skills.Swords.Counter_MaxBonusLevel", 600); }
-    public int getCounterModifier() { return config.getInt("Skills.Swords.Counter_DamageModifier", 2); }
+    public double getCounterModifier() { return config.getDouble("Skills.Swords.Counter_DamageModifier", 2.0D); }
 
-    public int getSerratedStrikesModifier() { return config.getInt("Skills.Swords.SerratedStrikes_DamageModifier", 4); }
+    public double getSerratedStrikesModifier() { return config.getDouble("Skills.Swords.SerratedStrikes_DamageModifier", 4.0D); }
     public int getSerratedStrikesTicks() { return config.getInt("Skills.Swords.SerratedStrikes_BleedTicks", 5); }
 
     /* TAMING */
-    public double getGoreChanceMax() { return config.getInt("Skills.Taming.Gore_ChanceMax", 100); }
+    public double getGoreChanceMax() { return config.getDouble("Skills.Taming.Gore_ChanceMax", 100.0D); }
     public int getGoreMaxBonusLevel() { return config.getInt("Skills.Taming.Gore_MaxBonusLevel", 1000); }
     public int getGoreBleedTicks() { return config.getInt("Skills.Taming.Gore_BleedTicks", 2); }
-    public int getGoreModifier() { return config.getInt("Skills.Taming.Gore_Modifier", 2); }
+    public double getGoreModifier() { return config.getDouble("Skills.Taming.Gore_Modifier", 2.0D); }
 
     public int getFastFoodUnlock() { return config.getInt("Skills.Taming.FastFood_UnlockLevel", 50); }
-    public double getFastFoodChance() { return config.getInt("Skills.Taming.FastFood_Chance", 50); }
+    public double getFastFoodChance() { return config.getDouble("Skills.Taming.FastFood_Chance", 50.0D); }
 
     public int getEnviromentallyAwareUnlock() { return config.getInt("Skills.Taming.EnvironmentallyAware_UnlockLevel", 100); }
 
     public int getThickFurUnlock() { return config.getInt("Skills.Taming.ThickFur_UnlockLevel", 250); }
-    public int getThickFurModifier() { return config.getInt("Skills.Taming.ThickFur_Modifier", 2); }
+    public double getThickFurModifier() { return config.getDouble("Skills.Taming.ThickFur_Modifier", 2.0D); }
 
     public int getHolyHoundUnlock() {return config.getInt("Skills.Taming.HolyHound_UnlockLevel", 375); }
 
     public int getShockProofUnlock() { return config.getInt("Skills.Taming.ShockProof_UnlockLevel", 500); }
-    public int getShockProofModifier() { return config.getInt("Skills.Taming.ShockProof_Modifier", 6); }
+    public double getShockProofModifier() { return config.getDouble("Skills.Taming.ShockProof_Modifier", 6.0D); }
 
     public int getSharpenedClawsUnlock() { return config.getInt("Skills.Taming.SharpenedClaws_UnlockLevel", 750); }
-    public int getSharpenedClawsBonus() { return config.getInt("Skills.Taming.SharpenedClaws_Bonus", 2); }
+    public double getSharpenedClawsBonus() { return config.getDouble("Skills.Taming.SharpenedClaws_Bonus", 2.0D); }
 
     /* UNARMED */
     public double getDisarmChanceMax() { return config.getDouble("Skills.Unarmed.Disarm_ChanceMax", 33.0D); }
@@ -264,7 +1035,8 @@ public class AdvancedConfig extends AutoUpdateConfigLoader {
     public double getIronGripChanceMax() { return config.getDouble("Skills.Unarmed.IronGrip_ChanceMax", 100.0D); }
     public int getIronGripMaxBonusLevel() { return config.getInt("Skills.Unarmed.IronGrip_MaxBonusLevel", 1000); }
 
-    public int getIronArmMaxBonus() { return config.getInt("Skills.Unarmed.IronArm_BonusMax", 8); }
+    public double getIronArmMinBonus() { return config.getDouble("Skills.Unarmed.IronArm_BonusMin", 3.0D); }
+    public double getIronArmMaxBonus() { return config.getDouble("Skills.Unarmed.IronArm_BonusMax", 8.0D); }
     public int getIronArmIncreaseLevel() { return config.getInt("Skills.Unarmed.IronArm_IncreaseLevel", 50); }
 
     /* WOODCUTTING */
@@ -273,9 +1045,17 @@ public class AdvancedConfig extends AutoUpdateConfigLoader {
     public double getWoodcuttingDoubleDropChance() { return config.getDouble("Skills.Woodcutting.DoubleDrops_ChanceMax", 100.0D); }
     public int getWoodcuttingDoubleDropMaxLevel() { return config.getInt("Skills.Woodcutting.DoubleDrops_MaxBonusLevel", 1000); }
 
-    /* SPOUT STUFF*/
-    public int getSpoutNotificationTier1() { return config.getInt("Spout.Notifications.Tier1", 200); }
-    public int getSpoutNotificationTier2() { return config.getInt("Spout.Notifications.Tier2", 400); }
-    public int getSpoutNotificationTier3() { return config.getInt("Spout.Notifications.Tier3", 600); }
-    public int getSpoutNotificationTier4() { return config.getInt("Spout.Notifications.Tier4", 800); }
+    /* KRAKEN STUFF */
+    public boolean getKrakenEnabled() { return config.getBoolean("Kraken.Enabled", true); }
+    public boolean getKrakenGlobalSoundsEnabled() { return config.getBoolean("Kraken.Global_Sounds", true); }
+    public boolean getKrakenEscapeAllowed() { return config.getBoolean("Kraken.Allow_Escaping", false); }
+    public int getKrakenTriesBeforeRelease() { return config.getInt("Kraken.Tries_Before_Release", 50); }
+    public double getKrakenHealth() { return config.getDouble("Kraken.Health", 50.0D); }
+    public String getKrakenName() { return config.getString("Kraken.Name", "The Kraken"); }
+    public String getServerUnleashMessage() { return config.getString("Kraken.Unleashed_Message.Server", "(PLAYER) has unleashed the kraken!"); }
+    public String getPlayerUnleashMessage() { return config.getString("Kraken.Unleashed_Message.Player", "THE KRAKEN HAS BEEN UNLEASHED!"); }
+    public String getPlayerDefeatMessage() { return config.getString("Kraken.Defeated_Message.Killed", "You have slain the kraken!"); }
+    public String getPlayerEscapeMessage() { return config.getString("Kraken.Defeated_Message.Escape", "You have escaped from the kraken!"); }
+    public int getKrakenAttackInterval() { return config.getInt("Kraken.Attack_Interval_Seconds", 1); }
+    public double getKrakenAttackDamage() { return config.getDouble("Kraken.Attack_Damage", 1.0D); }
 }

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

@@ -1,5 +1,7 @@
 package com.gmail.nossr50.config;
 
+import java.util.ArrayList;
+import java.util.List;
 import java.util.Set;
 
 import org.bukkit.Material;
@@ -16,6 +18,7 @@ public class Config extends AutoUpdateConfigLoader {
 
     private Config() {
         super("config.yml");
+        validate();
     }
 
     public static Config getInstance() {
@@ -26,6 +29,148 @@ public class Config extends AutoUpdateConfigLoader {
         return instance;
     }
 
+    @Override
+    protected boolean validateKeys() {
+        // Validate all the settings!
+        List<String> reason = new ArrayList<String>();
+
+        /* General Settings */
+        if (getSaveInterval() <= 0) {
+            reason.add("General.Save_Interval should be greater than 0!");
+        }
+
+        /* Mob Healthbar */
+        if (getMobHealthbarTime() == 0) {
+            reason.add("Mob_Healthbar.Display_Time cannot be 0! Set to -1 to disable or set a valid value.");
+        }
+
+        /* Scoreboards */
+        if (getMcrankScoreboardTime() != -1 && getMcrankScoreboardTime() <= 0) {
+            reason.add("Scoreboards.Mcrank.Display_Time should be greater than 0 or -1!");
+        }
+
+        if (getMcstatsScoreboardTime() != -1 && getMcstatsScoreboardTime() <= 0) {
+            reason.add("Scoreboards.Mcstats.Display_Time should be greater than 0 or -1!");
+        }
+
+        if (getMctopScoreboardTime() != -1 && getMctopScoreboardTime() <= 0) {
+            reason.add("Scoreboards.Mctop.Display_Time should be greater than 0 or -1!");
+        }
+
+        if (getInspectScoreboardTime() != -1 && getInspectScoreboardTime() <= 0) {
+            reason.add("Scoreboards.Inspect.Display_Time should be greater than 0 or -1!");
+        }
+
+        if (getSkillScoreboardTime() != -1 && getSkillScoreboardTime() <= 0) {
+            reason.add("Scoreboards.Skillname.Display_Time should be greater than 0 or -1!");
+        }
+
+        /* Database Purging */
+        if (getPurgeInterval() < -1) {
+            reason.add("Database_Purging.Purge_Interval should be greater than, or equal to -1!");
+        }
+
+        if (getOldUsersCutoff() != -1 && getOldUsersCutoff() <= 0) {
+            reason.add("Database_Purging.Old_User_Cutoff should be greater than 0 or -1!");
+        }
+
+        /* Hardcore Mode */
+        if (getHardcoreDeathStatPenaltyPercentage() < 1 || getHardcoreDeathStatPenaltyPercentage() > 100) {
+            reason.add("Hardcore.Death_Stat_Loss.Penalty_Percentage only accepts values from 1 to 100!");
+        }
+
+        if (getHardcoreVampirismStatLeechPercentage() < 1 || getHardcoreVampirismStatLeechPercentage() > 100) {
+            reason.add("Hardcore.Vampirism.Leech_Percentage only accepts values from 1 to 100!");
+        }
+
+        /* Items */
+        if (getChimaeraUseCost() < 1 || getChimaeraUseCost() > 64) {
+            reason.add("Items.Chimaera_Wing.Use_Cost only accepts values from 1 to 64!");
+        }
+
+        if (getChimaeraRecipeCost() < 1 || getChimaeraRecipeCost() > 9) {
+            reason.add("Items.Chimaera_Wing.Recipe_Cost only accepts values from 1 to 64!");
+        }
+
+        if (getChimaeraItemId() < 1) {
+            reason.add("Items.Chimaera_Wing.Item_ID should be at least 1!");
+        }
+
+        /* Particles */
+        if (getLevelUpEffectsTier() < 1) {
+            reason.add("Particles.LevelUp_Tier should be at least 1!");
+        }
+
+        /* PARTY SETTINGS */
+        if (getAutoPartyKickInterval() < -1) {
+            reason.add("Party.AutoKick_Interval should be at least -1!");
+        }
+
+        if (getAutoPartyKickTime() < 0) {
+            reason.add("Party.Old_Party_Member_Cutoff should be at least 0!");
+        }
+
+        if (getPartyShareBonusBase() <= 0) {
+            reason.add("Party.Sharing.ExpShare_bonus_base should be greater than 0!");
+        }
+
+        if (getPartyShareBonusIncrease() < 0) {
+            reason.add("Party.Sharing.ExpShare_bonus_increase should be at least 0!");
+        }
+
+        if (getPartyShareBonusCap() <= 0) {
+            reason.add("Party.Sharing.ExpShare_bonus_cap should be greater than 0!");
+        }
+
+        if (getPartyShareRange() <= 0) {
+            reason.add("Party.Sharing.Range should be greater than 0!");
+        }
+
+        /* Inspect command distance */
+        if (getInspectDistance() <= 0) {
+            reason.add("Commands.inspect.Max_Distance should be greater than 0!");
+        }
+
+        if (getTreeFellerThreshold() <= 0) {
+            reason.add("Abilities.Limits.Tree_Feller_Threshold should be greater than 0!");
+        }
+
+
+        if (getDetonatorItemID() < 1) {
+            reason.add("Skills.Mining.Detonator_ID should be at least 1!");
+        }
+
+        if (getRepairAnvilId() < 1) {
+            reason.add("Skills.Repair.Anvil_ID should be at least 1!");
+        }
+
+        if (getSalvageAnvilId() < 1) {
+            reason.add("Skills.Repair.Salvage_Anvil_ID should be at least 1!");
+        }
+
+        if (getRepairAnvilId() == getSalvageAnvilId()) {
+            reason.add("Cannot use the same item ID for Repair and Salvage anvils!");
+        }
+
+        if (getTamingCOTWWolfCost() < 1) {
+            reason.add("Skills.Taming.Call_Of_The_Wild.Bones_Required should be at least 1!");
+        }
+
+        if (getTamingCOTWOcelotCost() < 1) {
+            reason.add("Skills.Taming.Call_Of_The_Wild.Fish_Required should be at least 1!");
+        }
+
+        if (getTamingCOTWAmount(EntityType.OCELOT) <= 0) {
+            reason.add("Skills.Taming.Call_Of_The_Wild.Ocelot_Amount should be greater than 0!");
+        }
+
+        if (getTamingCOTWAmount(EntityType.WOLF) <= 0) {
+            reason.add("Skills.Taming.Call_Of_The_Wild.Wolf_Amount should be greater than 0!");
+        }
+
+        return noErrorsInConfig(reason);
+    }
+
     @Override
     protected void loadKeys() {}
 
@@ -46,7 +191,11 @@ public class Config extends AutoUpdateConfigLoader {
     public boolean getVerboseLoggingEnabled() { return config.getBoolean("General.Verbose_Logging", false); }
     public boolean getConfigOverwriteEnabled() { return config.getBoolean("General.Config_Update_Overwrite", true); }
 
+    public String getPartyChatPrefix() { return config.getString("Commands.p.Chat_Prefix_Format", "[[GREEN]]([[WHITE]]{0}[[GREEN]])"); }
+    public boolean getPartyChatColorLeaderName() { return config.getBoolean("Commands.p.Gold_Leader_Name", true); }
     public boolean getPartyDisplayNames() { return config.getBoolean("Commands.p.Use_Display_Names", true); }
+
+    public String getAdminChatPrefix() { return config.getString("Commands.a.Chat_Prefix_Format", "[[AQUA]][[[WHITE]]{0}[[AQUA]]]"); }
     public boolean getAdminDisplayNames() { return config.getBoolean("Commands.a.Use_Display_Names", true); }
 
     /* Mob Healthbar */
@@ -66,7 +215,7 @@ public class Config extends AutoUpdateConfigLoader {
     public int getMcrankScoreboardTime() { return config.getInt("Scoreboards.Mcrank.Display_Time", 10); }
 
     public boolean getMcstatsScoreboardsEnabled() { return config.getBoolean("Scoreboards.Mcstats.Use", true); }
-    public int getMcstatsScoreboardTime() { return config.getInt("Scoreboards.Mctop.Display_Time", 10); }
+    public int getMcstatsScoreboardTime() { return config.getInt("Scoreboards.Mcstats.Display_Time", 10); }
 
     public boolean getMctopScoreboardEnabled() { return config.getBoolean("Scoreboards.Mctop.Use", true); }
     public int getMctopScoreboardTime() { return config.getInt("Scoreboards.Mctop.Display_Time", 10); }
@@ -77,6 +226,8 @@ public class Config extends AutoUpdateConfigLoader {
     public boolean getSkillScoreboardEnabled() { return config.getBoolean("Scoreboards.Skillname.Use", true); }
     public int getSkillScoreboardTime() { return config.getInt("Scoreboards.Skillname.Display_Time", 10); }
 
+    public boolean getPowerLevelsEnabled() { return config.getBoolean("Scoreboards.Power_Level.Use", false); }
+
     /* Database Purging */
     public int getPurgeInterval() { return config.getInt("Database_Purging.Purge_Interval", -1); }
     public int getOldUsersCutoff() { return config.getInt("Database_Purging.Old_User_Cutoff", 6); }
@@ -104,24 +255,24 @@ public class Config extends AutoUpdateConfigLoader {
             str = String.valueOf(cfg.getInt(key));
         }
 
-        if (str == "0") {
+        if (str.equals("0")) {
             str = "No value set for '" + key + "'";
         }
         return str;
     }
 
     /* Hardcore Mode */
-    public boolean getHardcoreEnabled() { return config.getBoolean("Hardcore.Enabled", false); }
-    public void setHardcoreEnabled(boolean enabled) { config.set("Hardcore.Enabled", enabled); }
+    public boolean getHardcoreStatLossEnabled(SkillType skillType) { return config.getBoolean("Hardcore.Death_Stat_Loss.Enabled." + StringUtils.getCapitalized(skillType.toString()), false); }
+    public void setHardcoreStatLossEnabled(SkillType skillType, boolean enabled) { config.set("Hardcore.Death_Stat_Loss.Enabled." + StringUtils.getCapitalized(skillType.toString()), enabled); }
 
-    public double getHardcoreDeathStatPenaltyPercentage() { return config.getDouble("Hardcore.Death_Stat_Loss_Penalty_Percentage", 75.0); }
-    public void setHardcoreDeathStatPenaltyPercentage(double value) { config.set("Hardcore.Death_Stat_Loss_Penalty_Percentage", value); }
+    public double getHardcoreDeathStatPenaltyPercentage() { return config.getDouble("Hardcore.Death_Stat_Loss.Penalty_Percentage", 75.0); }
+    public void setHardcoreDeathStatPenaltyPercentage(double value) { config.set("Hardcore.Death_Stat_Loss.Penalty_Percentage", value); }
 
-    public double getHardcoreVampirismStatLeechPercentage() { return config.getDouble("Hardcore.Vampirism_Stat_Leech_Percentage", 5.0); }
-    public void setHardcoreVampirismStatLeechPercentage(double value) { config.set("Hardcore.Vampirism_Stat_Leech_Percentage", value); }
+    public boolean getHardcoreVampirismEnabled(SkillType skillType) { return config.getBoolean("Hardcore.Vampirism.Enabled." + StringUtils.getCapitalized(skillType.toString()), false); }
+    public void setHardcoreVampirismEnabled(SkillType skillType, boolean enabled) { config.set("Hardcore.Vampirism.Enabled." + StringUtils.getCapitalized(skillType.toString()), enabled); }
 
-    public boolean getHardcoreVampirismEnabled() { return config.getBoolean("Hardcore.Vampirism", false); }
-    public void setHardcoreVampirismEnabled(boolean enabled) { config.set("Hardcore.Vampirism", enabled); }
+    public double getHardcoreVampirismStatLeechPercentage() { return config.getDouble("Hardcore.Vampirism.Leech_Percentage", 5.0); }
+    public void setHardcoreVampirismStatLeechPercentage(double value) { config.set("Hardcore.Vampirism.Leech_Percentage", value); }
 
     /* SMP Mods */
     public boolean getToolModsEnabled() { return config.getBoolean("Mods.Tool_Mods_Enabled", false); }
@@ -147,6 +298,7 @@ public class Config extends AutoUpdateConfigLoader {
     public boolean getGreaterImpactEffectEnabled() { return config.getBoolean("Particles.Greater_Impact", true); }
     public boolean getLevelUpEffectsEnabled() { return config.getBoolean("Particles.LevelUp_Enabled", true); }
     public int getLevelUpEffectsTier() { return config.getInt("Particles.LevelUp_Tier", 100); }
+    public boolean getLargeFireworks() { return config.getBoolean("Particles.LargeFireworks", true); }
 
     /* PARTY SETTINGS */
     public int getAutoPartyKickInterval() { return config.getInt("Party.AutoKick_Interval", 12); }
@@ -166,6 +318,9 @@ public class Config extends AutoUpdateConfigLoader {
     public boolean getPTPCommandConfirmRequired() { return config.getBoolean("Commands.ptp.Confirm_Required", true); }
     public boolean getPTPCommandWorldPermissions() { return config.getBoolean("Commands.ptp.World_Based_Permissions", false); }
 
+    /* Inspect command distance */
+    public double getInspectDistance() { return config.getDouble("Commands.inspect.Max_Distance", 30); }
+
     /*
      * ABILITY SETTINGS
      */
@@ -179,7 +334,6 @@ public class Config extends AutoUpdateConfigLoader {
     public int getMaxTicks(AbilityType ability) { return config.getInt("Abilities.Max_Seconds." + ability.toString()); }
 
     /* Durability Settings */
-    public boolean getAbilitiesDamageTools() { return config.getBoolean("Abilities.Tools.Durability_Loss_Enabled", true); }
     public int getAbilityToolDamage() { return config.getInt("Abilities.Tools.Durability_Loss", 2); }
 
     /* Thresholds */
@@ -188,8 +342,6 @@ public class Config extends AutoUpdateConfigLoader {
     /*
      * SKILL SETTINGS
      */
-
-    public int getXp(SkillType skill, Material material) { return config.getInt("Experience." + StringUtils.getCapitalized(skill.toString()) + "." + StringUtils.getPrettyItemString(material).replace(" ", "_")); }
     public boolean getDoubleDropsEnabled(SkillType skill, Material material) { return config.getBoolean("Double_Drops." + StringUtils.getCapitalized(skill.toString()) + "." + StringUtils.getPrettyItemString(material).replace(" ", "_")); }
 
     public boolean getDoubleDropsDisabled(SkillType skill) {
@@ -210,9 +362,9 @@ public class Config extends AutoUpdateConfigLoader {
 
     /* Acrobatics */
     public boolean getDodgeLightningDisabled() { return config.getBoolean("Skills.Acrobatics.Prevent_Dodge_Lightning", false); }
+    public boolean getPreventXPAfterTeleport() { return config.getBoolean("Skills.Acrobatics.Prevent_XP_After_Teleport", true); }
 
     /* Fishing */
-    public int getFishingBaseXP() { return config.getInt("Experience.Fishing.Base", 800); }
     public boolean getFishingDropsEnabled() { return config.getBoolean("Skills.Fishing.Drops_Enabled", true); }
 
     /* Mining */
@@ -230,19 +382,13 @@ public class Config extends AutoUpdateConfigLoader {
     public boolean getUnarmedBlockCrackerSmoothbrickToCracked() { return config.getBoolean("Skills.Unarmed.Block_Cracker.SmoothBrick_To_CrackedBrick", true); }
 
     /* Taming */
-    public int getTamingXPWolf() { return config.getInt("Experience.Taming.Animal_Taming.Wolf", 250); }
-    public int getTamingXPOcelot() { return config.getInt("Experience.Taming.Animal_Taming.Ocelot", 500); }
+    public int getTamingCOTWHorseCost() { return config.getInt("Skills.Taming.Call_Of_The_Wild.Apples_Required", 10); }
     public int getTamingCOTWWolfCost() { return config.getInt("Skills.Taming.Call_Of_The_Wild.Bones_Required", 10); }
     public int getTamingCOTWOcelotCost() { return config.getInt("Skills.Taming.Call_Of_The_Wild.Fish_Required", 10); }
+    public double getTamingCOTWRange() { return config.getDouble("Skills.Taming.Call_Of_The_Wild.Range", 40); }
+    public int getTamingCOTWAmount(EntityType type) { return config.getInt("Skills.Taming.Call_Of_The_Wild." + StringUtils.getPrettyEntityTypeString(type)+ "_Amount"); }
 
     /* Woodcutting */
-    public int getWoodcuttingXPOak() { return config.getInt("Experience.Woodcutting.Oak", 70); }
-    public int getWoodcuttingXPBirch() { return config.getInt("Experience.Woodcutting.Birch", 90); }
-    public int getWoodcuttingXPSpruce() { return config.getInt("Experience.Woodcutting.Spruce", 80); }
-    public int getWoodcuttingXPJungle() { return config.getInt("Experience.Woodcutting.Jungle", 100); }
-    public int getWoodcuttingXPHugeBrownMushroom() { return config.getInt("Experience.Woodcutting.Huge_Mushroom_Brown", 70); }
-    public int getWoodcuttingXPHugeRedMushroom() { return config.getInt("Experience.Woodcutting.Huge_Mushroom_Red", 70); }
-
     public boolean getOakDoubleDropsEnabled() { return config.getBoolean("Double_Drops.Woodcutting.Oak", true); }
     public boolean getBirchDoubleDropsEnabled() { return config.getBoolean("Double_Drops.Woodcutting.Birch", true); }
     public boolean getSpruceDoubleDropsEnabled() { return config.getBoolean("Double_Drops.Woodcutting.Spruce", true); }
@@ -266,27 +412,4 @@ public class Config extends AutoUpdateConfigLoader {
     /* PVP & PVE Settings */
     public boolean getPVPEnabled(SkillType skill) { return config.getBoolean("Skills." + StringUtils.getCapitalized(skill.toString()) + ".Enabled_For_PVP", true); }
     public boolean getPVEEnabled(SkillType skill) { return config.getBoolean("Skills." + StringUtils.getCapitalized(skill.toString()) + ".Enabled_For_PVE", true); }
-
-    /*
-     * XP SETTINGS
-     */
-
-    /* General Settings */
-    public boolean getExperienceGainsMobspawnersEnabled() { return config.getBoolean("Experience.Gains.Mobspawners.Enabled", false); }
-    public boolean getExperienceGainsPlayerVersusPlayerEnabled() { return config.getBoolean("Experience.PVP.Rewards", true); }
-
-    public double getExperienceGainsGlobalMultiplier() { return config.getDouble("Experience.Gains.Multiplier.Global", 1.0); }
-    public void setExperienceGainsGlobalMultiplier(double value) { config.set("Experience.Gains.Multiplier.Global", value); }
-
-    /* Combat XP Multipliers */
-    public double getPlayerVersusPlayerXP() { return config.getDouble("Experience.Gains.Multiplier.PVP", 1.0); }
-    public double getCombatXP(EntityType entity) { return config.getDouble("Experience.Combat.Multiplier." + StringUtils.getPrettyEntityTypeString(entity).replace(" ", "_")); }
-
-    public double getAnimalsXP() { return config.getDouble("Experience.Combat.Multiplier.Animals", 1.0); }
-    public double getWitherSkeletonXP() { return config.getDouble("Experience.Combat.Multiplier.Wither_Skeleton", 4.0); }
-
-
-    /* XP Formula Multiplier */
-    public int getFormulaMultiplierCurve() { return config.getInt("Experience.Formula.Curve_Modifier", 20); }
-    public double getForumulaMultiplier(SkillType skill) { return config.getDouble("Experience.Formula.Modifier." + StringUtils.getCapitalized(skill.toString())); }
 }

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

@@ -6,6 +6,7 @@ import java.io.FileOutputStream;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
+import java.util.List;
 
 import org.bukkit.configuration.file.FileConfiguration;
 import org.bukkit.configuration.file.YamlConfiguration;
@@ -57,7 +58,7 @@ public abstract class ConfigLoader {
         OutputStream outputStream = null;
 
         try {
-             outputStream = new FileOutputStream(configFile);
+            outputStream = new FileOutputStream(configFile);
 
             int read;
             byte[] bytes = new byte[1024];
@@ -90,4 +91,27 @@ public abstract class ConfigLoader {
             }
         }
     }
+
+    protected boolean validateKeys() {
+        return true;
+    }
+
+    protected boolean noErrorsInConfig(List<String> issues) {
+        for (String issue : issues) {
+            plugin.getLogger().warning(issue);
+        }
+
+        return issues.isEmpty();
+    }
+
+    protected void validate() {
+        if (validateKeys()) {
+            plugin.debug("No errors found in " + fileName + "!");
+        }
+        else {
+            plugin.getLogger().warning("Errors were found in " + fileName + "! mcMMO was disabled!");
+            plugin.getServer().getPluginManager().disablePlugin(plugin);
+            plugin.noErrorsInConfigFiles = false;
+        }
+    }
 }

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

@@ -0,0 +1,198 @@
+package com.gmail.nossr50.config.experience;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.bukkit.Material;
+import org.bukkit.entity.EntityType;
+
+import com.gmail.nossr50.config.AutoUpdateConfigLoader;
+import com.gmail.nossr50.datatypes.experience.FormulaType;
+import com.gmail.nossr50.datatypes.skills.SkillType;
+import com.gmail.nossr50.skills.repair.RepairMaterialType;
+import com.gmail.nossr50.util.StringUtils;
+
+public class ExperienceConfig extends AutoUpdateConfigLoader {
+    private static ExperienceConfig instance;
+
+    private ExperienceConfig() {
+        super("experience.yml");
+        validate();
+    }
+
+    public static ExperienceConfig getInstance() {
+        if (instance == null) {
+            instance = new ExperienceConfig();
+        }
+
+        return instance;
+    }
+
+    @Override
+    protected void loadKeys() {}
+
+    @Override
+    protected boolean validateKeys() {
+        List<String> reason = new ArrayList<String>();
+
+        /*
+         * FORMULA SETTINGS
+         */
+
+        /* Curve values */
+        if (getMultiplier(FormulaType.EXPONENTIAL) <= 0) {
+            reason.add("Experience_Formula.Exponential_Values.multiplier should be greater than 0!");
+        }
+
+        if (getMultiplier(FormulaType.LINEAR) <= 0) {
+            reason.add("Experience_Formula.Linear_Values.multiplier should be greater than 0!");
+        }
+
+        if (getExponent(FormulaType.EXPONENTIAL) <= 0) {
+            reason.add("Experience_Formula.Exponential_Values.exponent should be greater than 0!");
+        }
+
+        /* Global modifier */
+        if (getExperienceGainsGlobalMultiplier() <= 0) {
+            reason.add("Experience_Formula.Multiplier.Global should be greater than 0!");
+        }
+
+        /* PVP modifier */
+        if (getPlayerVersusPlayerXP() < 0) {
+            reason.add("Experience_Formula.Multiplier.PVP should be at least 0!");
+        }
+
+        /* Spawned Mob modifier */
+        if (getSpawnedMobXpMultiplier() < 0) {
+            reason.add("Experience_Formula.Mobspawners.Multiplier should be at least 0!");
+        }
+
+        /* Conversion */
+        if (getExpModifier() <= 0) {
+            reason.add("Conversion.Exp_Modifier should be greater than 0!");
+        }
+
+        /*
+         * XP SETTINGS
+         */
+
+        /* Combat XP Multipliers */
+        if (getAnimalsXP() < 0) {
+            reason.add("Experience.Combat.Multiplier.Animals should be at least 0!");
+        }
+
+        if (getWitherSkeletonXP() < 0) {
+            reason.add("Experience.Combat.Multiplier.Wither_Skeleton should be at least 0!");
+        }
+
+        /* Fishing */
+        if (getFishingBaseXP() <= 0) {
+            reason.add("Experience.Fishing.Base should be greater than 0!");
+        }
+
+        /* Repair */
+        if (getRepairXPBase() <= 0) {
+            reason.add("Experience.Repair.Base should be greater than 0!");
+        }
+
+        /* Taming */
+        if (getTamingXPWolf() <= 0) {
+            reason.add("Experience.Taming.Animal_Taming.Wolf should be greater than 0!");
+        }
+
+        if (getTamingXPOcelot() <= 0) {
+            reason.add("Experience.Taming.Animal_Taming.Ocelot should be greater than 0!");
+        }
+
+        /* Woodcutting */
+        if (getWoodcuttingXPOak() <= 0) {
+            reason.add("Experience.Woodcutting.Oak should be greater than 0!");
+        }
+
+        if (getWoodcuttingXPBirch() <= 0) {
+            reason.add("Experience.Woodcutting.Birch should be greater than 0!");
+        }
+
+        if (getWoodcuttingXPSpruce() <= 0) {
+            reason.add("Experience.Woodcutting.Spruce should be greater than 0!");
+        }
+
+        if (getWoodcuttingXPJungle() <= 0) {
+            reason.add("Experience.Woodcutting.Jungle should be greater than 0!");
+        }
+
+        if (getWoodcuttingXPHugeBrownMushroom() <= 0) {
+            reason.add("Experience.Woodcutting.Huge_Mushroom_Brown should be greater than 0!");
+        }
+
+        if (getWoodcuttingXPHugeRedMushroom() <= 0) {
+            reason.add("Experience.Woodcutting.Huge_Mushroom_Red should be greater than 0!");
+        }
+
+        return noErrorsInConfig(reason);
+    }
+
+    /*
+     * FORMULA SETTINGS
+     */
+
+    /* Curve settings */
+    public FormulaType getFormulaType() { return FormulaType.getFormulaType(config.getString("Experience_Formula.Curve")); }
+    public boolean getCumulativeCurveEnabled() { return config.getBoolean("Experience_Formula.Cumulative_Curve", false); }
+
+    /* Curve values */
+    public double getMultiplier(FormulaType type) { return config.getDouble("Experience_Formula." + StringUtils.getCapitalized(type.toString()) + "_Values.multiplier"); }
+    public int getBase(FormulaType type) { return config.getInt("Experience_Formula." + StringUtils.getCapitalized(type.toString()) + "_Values.base"); }
+    public double getExponent(FormulaType type) { return config.getDouble("Experience_Formula." + StringUtils.getCapitalized(type.toString()) +"_Values.exponent"); }
+
+    /* Global modifier */
+    public double getExperienceGainsGlobalMultiplier() { return config.getDouble("Experience_Formula.Multiplier.Global", 1.0); }
+    public void setExperienceGainsGlobalMultiplier(double value) { config.set("Experience_Formula.Multiplier.Global", value); }
+
+    /* PVP modifier */
+    public double getPlayerVersusPlayerXP() { return config.getDouble("Experience_Formula.Multiplier.PVP", 1.0); }
+
+    /* Spawned Mob modifier */
+    public double getSpawnedMobXpMultiplier() { return config.getDouble("Experience_Formula.Mobspawners.Multiplier", 0.0); }
+
+    /* Skill modifiers */
+    public double getFormulaSkillModifier(SkillType skill) { return config.getDouble("Experience_Formula.Modifier." + StringUtils.getCapitalized(skill.toString())); }
+
+    /* Conversion */
+    public double getExpModifier() { return config.getDouble("Conversion.Exp_Modifier", 1); }
+
+    /*
+     * XP SETTINGS
+     */
+
+    /* General Settings */
+    public boolean getExperienceGainsPlayerVersusPlayerEnabled() { return config.getBoolean("Experience.PVP.Rewards", true); }
+
+    /* Combat XP Multipliers */
+    public double getCombatXP(EntityType entity) { return config.getDouble("Experience.Combat.Multiplier." + StringUtils.getPrettyEntityTypeString(entity).replace(" ", "_")); }
+    public double getAnimalsXP() { return config.getDouble("Experience.Combat.Multiplier.Animals", 1.0); }
+    public double getWitherSkeletonXP() { return config.getDouble("Experience.Combat.Multiplier.Wither_Skeleton", 4.0); }
+
+    /* Materials  */
+    public int getXp(SkillType skill, Material material) { return config.getInt("Experience." + StringUtils.getCapitalized(skill.toString()) + "." + StringUtils.getPrettyItemString(material).replace(" ", "_")); }
+
+    /* Fishing */
+    public int getFishingBaseXP() { return config.getInt("Experience.Fishing.Base", 800); }
+
+    /* Repair */
+    public double getRepairXPBase() { return config.getDouble("Experience.Repair.Base", 1000.0); }
+    public double getRepairXP(RepairMaterialType repairMaterialType) { return config.getDouble("Experience.Repair." + StringUtils.getCapitalized(repairMaterialType.toString())); }
+
+    /* Taming */
+    public int getTamingXPHorse() { return config.getInt("Experience.Taming.Animal_Taming.Horse", 1000); }
+    public int getTamingXPWolf() { return config.getInt("Experience.Taming.Animal_Taming.Wolf", 250); }
+    public int getTamingXPOcelot() { return config.getInt("Experience.Taming.Animal_Taming.Ocelot", 500); }
+
+    /* Woodcutting */
+    public int getWoodcuttingXPOak() { return config.getInt("Experience.Woodcutting.Oak", 70); }
+    public int getWoodcuttingXPBirch() { return config.getInt("Experience.Woodcutting.Birch", 90); }
+    public int getWoodcuttingXPSpruce() { return config.getInt("Experience.Woodcutting.Spruce", 80); }
+    public int getWoodcuttingXPJungle() { return config.getInt("Experience.Woodcutting.Jungle", 100); }
+    public int getWoodcuttingXPHugeBrownMushroom() { return config.getInt("Experience.Woodcutting.Huge_Mushroom_Brown", 70); }
+    public int getWoodcuttingXPHugeRedMushroom() { return config.getInt("Experience.Woodcutting.Huge_Mushroom_Red", 70); }
+}

src/main/java/com/gmail/nossr50/config/mods/CustomToolConfig.java

@@ -15,13 +15,15 @@ import com.gmail.nossr50.skills.repair.RepairableFactory;
 public class CustomToolConfig extends ConfigLoader {
     private static CustomToolConfig instance;
     private List<Repairable> repairables;
-    public List<Integer> customAxeIDs = new ArrayList<Integer>();
-    public List<Integer> customBowIDs = new ArrayList<Integer>();
-    public List<Integer> customHoeIDs = new ArrayList<Integer>();
+
+    public List<Integer> customAxeIDs     = new ArrayList<Integer>();
+    public List<Integer> customBowIDs     = new ArrayList<Integer>();
+    public List<Integer> customHoeIDs     = new ArrayList<Integer>();
     public List<Integer> customPickaxeIDs = new ArrayList<Integer>();
-    public List<Integer> customShovelIDs = new ArrayList<Integer>();
-    public List<Integer> customSwordIDs = new ArrayList<Integer>();
-    public List<Integer> customIDs = new ArrayList<Integer>();
+    public List<Integer> customShovelIDs  = new ArrayList<Integer>();
+    public List<Integer> customSwordIDs   = new ArrayList<Integer>();
+    public List<Integer> customIDs        = new ArrayList<Integer>();
+
     public List<CustomTool> customToolList = new ArrayList<CustomTool>();
     public HashMap<Integer, CustomTool> customTools = new HashMap<Integer, CustomTool>();
 

src/main/java/com/gmail/nossr50/config/spout/SpoutConfig.java

@@ -4,6 +4,8 @@ import com.gmail.nossr50.config.ConfigLoader;
 import com.gmail.nossr50.datatypes.skills.SkillType;
 import com.gmail.nossr50.datatypes.spout.huds.HudType;
 
+import org.getspout.spoutapi.keyboard.Keyboard;
+
 public class SpoutConfig extends ConfigLoader {
     private static SpoutConfig instance;
 
@@ -34,7 +36,14 @@ public class SpoutConfig extends ConfigLoader {
     }
 
     public boolean getShowPowerLevel() { return config.getBoolean("HUD.Show_Power_Level", true); }
-    public String getMenuKey() { return config.getString("Menu.Key", "KEY_M"); }
+    public Keyboard getMenuKey() { 
+        try {
+            return Keyboard.valueOf(config.getString("Menu.Key", "KEY_M").toUpperCase().trim());
+        }
+        catch (IllegalArgumentException ex) {
+            return Keyboard.KEY_M;
+        }
+    }
 
     /* XP Bar */
     public boolean getXPBarEnabled() { return config.getBoolean("XP.Bar.Enabled", true); }
@@ -57,4 +66,10 @@ public class SpoutConfig extends ConfigLoader {
     public double getRetroHUDRed(SkillType skill) { return config.getDouble("HUD.Retro.Colors." + skill.toString().toLowerCase() +".RED", 0.3); }
     public double getRetroHUDGreen(SkillType skill) { return config.getDouble("HUD.Retro.Colors." + skill.toString().toLowerCase() +".RED", 0.3); }
     public double getRetroHUDBlue(SkillType skill) { return config.getDouble("HUD.Retro.Colors." + skill.toString().toLowerCase() +".RED", 0.3); }
+
+    /* Notification Tiers */
+    public int getNotificationTier1() { return config.getInt("Notifications.Tier1", 200); }
+    public int getNotificationTier2() { return config.getInt("Notifications.Tier2", 400); }
+    public int getNotificationTier3() { return config.getInt("Notifications.Tier3", 600); }
+    public int getNotificationTier4() { return config.getInt("Notifications.Tier4", 800); }
 }

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

@@ -5,7 +5,6 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.Map.Entry;
-import java.util.Set;
 
 import org.bukkit.Material;
 import org.bukkit.configuration.ConfigurationSection;
@@ -25,13 +24,14 @@ import com.gmail.nossr50.datatypes.treasure.Treasure;
 public class TreasureConfig extends ConfigLoader {
     private static TreasureConfig instance;
 
-    public List<ExcavationTreasure> excavationFromDirt     = new ArrayList<ExcavationTreasure>();
-    public List<ExcavationTreasure> excavationFromGrass    = new ArrayList<ExcavationTreasure>();
-    public List<ExcavationTreasure> excavationFromSand     = new ArrayList<ExcavationTreasure>();
-    public List<ExcavationTreasure> excavationFromGravel   = new ArrayList<ExcavationTreasure>();
-    public List<ExcavationTreasure> excavationFromClay     = new ArrayList<ExcavationTreasure>();
-    public List<ExcavationTreasure> excavationFromMycel    = new ArrayList<ExcavationTreasure>();
-    public List<ExcavationTreasure> excavationFromSoulSand = new ArrayList<ExcavationTreasure>();
+    public List<ExcavationTreasure> excavationFromDirt      = new ArrayList<ExcavationTreasure>();
+    public List<ExcavationTreasure> excavationFromGrass     = new ArrayList<ExcavationTreasure>();
+    public List<ExcavationTreasure> excavationFromSand      = new ArrayList<ExcavationTreasure>();
+    public List<ExcavationTreasure> excavationFromGravel    = new ArrayList<ExcavationTreasure>();
+    public List<ExcavationTreasure> excavationFromClay      = new ArrayList<ExcavationTreasure>();
+    public List<ExcavationTreasure> excavationFromMycel     = new ArrayList<ExcavationTreasure>();
+    public List<ExcavationTreasure> excavationFromSoulSand  = new ArrayList<ExcavationTreasure>();
+    public List<ExcavationTreasure> excavationFromSnow      = new ArrayList<ExcavationTreasure>();
 
     public List<HylianTreasure> hylianFromBushes  = new ArrayList<HylianTreasure>();
     public List<HylianTreasure> hylianFromFlowers = new ArrayList<HylianTreasure>();
@@ -82,9 +82,7 @@ public class TreasureConfig extends ConfigLoader {
             return;
         }
 
-        Set<String> treasureConfigSet = treasureSection.getKeys(false);
-
-        for (String treasureName : treasureConfigSet) {
+        for (String treasureName : treasureSection.getKeys(false)) {
 
             // Validate all the things!
             List<String> reason = new ArrayList<String>();
@@ -117,7 +115,7 @@ public class TreasureConfig extends ConfigLoader {
                 reason.add("Invalid amount: " + amount);
             }
 
-            if (data > 127 || data < -128) {
+            if (id < 256 && (data > 127 || data < -128)) {
                 reason.add("Invalid data: " + data);
             }
 
@@ -187,7 +185,7 @@ public class TreasureConfig extends ConfigLoader {
 
                 int maxLevel = config.getInt("Treasures." + treasureName + ".Max_Level");
 
-                if (noErrorsInTreasure(reason)) {
+                if (noErrorsInConfig(reason)) {
                     FishingTreasure fTreasure = new FishingTreasure(item, xp, dropChance, dropLevel, maxLevel);
                     treasures.put(treasureName, fTreasure);
                 }
@@ -211,7 +209,7 @@ public class TreasureConfig extends ConfigLoader {
                     reason.add("Invalid Mob: " + mobType);
                 }
 
-                if (noErrorsInTreasure(reason)) {
+                if (noErrorsInConfig(reason)) {
                     ShakeTreasure sTreasure = new ShakeTreasure(item, xp, dropChance, dropLevel, mob);
                     treasures.put(treasureName, sTreasure);
                 }
@@ -248,6 +246,10 @@ public class TreasureConfig extends ConfigLoader {
                     eTreasure.setDropsFromSoulSand();
                 }
 
+                if (config.getBoolean("Treasures." + treasureName + ".Drops_From.Snow", false)) {
+                    eTreasure.setDropsFromSnow();
+                }
+
                 if (config.getBoolean("Treasures." + treasureName + ".Drops_From.Bushes", false)) {
                     hTreasure.setDropsFromBushes();
                 }
@@ -268,10 +270,10 @@ public class TreasureConfig extends ConfigLoader {
                     reason.add("This cannot also be a shake drop.");
                 }
 
-                if (noErrorsInTreasure(reason) && hTreasure.getDropsFrom() == (byte) 0x0) {
+                if (noErrorsInConfig(reason) && hTreasure.getDropsFrom() == (byte) 0x0) {
                     treasures.put(treasureName, eTreasure);
                 }
-                else if (noErrorsInTreasure(reason) && eTreasure.getDropsFrom() == (byte) 0x0) {
+                else if (noErrorsInConfig(reason) && eTreasure.getDropsFrom() == (byte) 0x0) {
                     treasures.put(treasureName, hTreasure);
                 }
             }
@@ -437,18 +439,11 @@ public class TreasureConfig extends ConfigLoader {
                 if (eTreasure.getDropsFromSoulSand()) {
                     excavationFromSoulSand.add(eTreasure);
                 }
+
+                if (eTreasure.getDropsFromSnow()) {
+                    excavationFromSnow.add(eTreasure);
+                }
             }
         }
     }
-
-    private boolean noErrorsInTreasure(List<String> issues) {
-        if (issues.isEmpty()) {
-            return true;
-        }
-
-        for (String issue : issues) {
-            plugin.getLogger().warning(issue);
-        }
-        return false;
-    }
 }

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

@@ -1,63 +1,97 @@
 package com.gmail.nossr50.database;
 
-import java.io.File;
-import java.io.IOException;
+import java.util.List;
+import java.util.Map;
 
-import com.gmail.nossr50.mcMMO;
-import com.gmail.nossr50.util.Misc;
+import com.gmail.nossr50.config.Config;
+import com.gmail.nossr50.datatypes.database.DatabaseType;
+import com.gmail.nossr50.datatypes.database.PlayerStat;
+import com.gmail.nossr50.datatypes.player.PlayerProfile;
 
-public class DatabaseManager {
-    private final mcMMO plugin;
-    private final boolean isUsingSQL;
-    private File usersFile;
+public interface DatabaseManager {
+    // One month in milliseconds
+    public final long PURGE_TIME = 2630000000L * Config.getInstance().getOldUsersCutoff();
 
-    public DatabaseManager(final mcMMO plugin, final boolean isUsingSQL) {
-        this.plugin = plugin;
-        this.isUsingSQL = isUsingSQL;
+    /**
+     * Purge users with 0 power level from the database.
+     */
+    public void purgePowerlessUsers();
 
-        if (isUsingSQL) {
-            SQLDatabaseManager.checkConnected();
-            SQLDatabaseManager.createStructure();
-        }
-        else {
-            usersFile = new File(mcMMO.getUsersFilePath());
-            createFlatfileDatabase();
-            FlatfileDatabaseManager.updateLeaderboards();
-        }
-    }
+    /**
+     * Purge users who haven't logged on in over a certain time frame from the database.
+     */
+    public void purgeOldUsers();
 
-    public void purgePowerlessUsers() {
-        plugin.getLogger().info("Purging powerless users...");
-        plugin.getLogger().info("Purged " + (isUsingSQL ? SQLDatabaseManager.purgePowerlessSQL() : FlatfileDatabaseManager.purgePowerlessFlatfile()) + " users from the database.");
-    }
+    /**
+     * Remove a user from the database.
+     *
+     * @param playerName The name of the user to remove
+     * @return true if the user was successfully removed, false otherwise
+     */
+    public boolean removeUser(String playerName);
 
-    public void purgeOldUsers() {
-        plugin.getLogger().info("Purging old users...");
-        plugin.getLogger().info("Purged " + (isUsingSQL ? SQLDatabaseManager.purgeOldSQL() : FlatfileDatabaseManager.removeOldFlatfileUsers()) + " users from the database.");
-    }
+    /**
+     * Save a user to the database.
+     *
+     * @param profile The profile of the player to save
+     */
+    public void saveUser(PlayerProfile profile);
 
-    public boolean removeUser(String playerName) {
-        if (isUsingSQL ? SQLDatabaseManager.removeUserSQL(playerName) : FlatfileDatabaseManager.removeFlatFileUser(playerName)) {
-            Misc.profileCleanup(playerName);
-            return true;
-        }
+    /**
+    * Retrieve leaderboard info.
+    *
+    * @param skillName The skill to retrieve info on
+    * @param pageNumber Which page in the leaderboards to retrieve
+    * @param statsPerPage The number of stats per page
+    * @return the requested leaderboard information
+    */
+    public List<PlayerStat> readLeaderboard(String skillName, int pageNumber, int statsPerPage);
 
-        return false;
-    }
+    /**
+     * Retrieve rank info.
+     *
+     * @param playerName The name of the user to retrieve the rankings for
+     * @return the requested rank information
+     */
+    public Map<String, Integer> readRank(String playerName);
 
-    private void createFlatfileDatabase() {
-        if (usersFile.exists()) {
-            return;
-        }
+    /**
+     * Add a new user to the database.
+     *
+     * @param playerName The name of the player to be added to the database
+     */
+    public void newUser(String playerName);
 
-        usersFile.getParentFile().mkdir();
+    /**
+     * Load a player from the database.
+     *
+     * @param playerName The name of the player to load from the database
+     * @param createNew Whether to create a new record if the player is not
+     *          found
+     * @return The player's data, or an unloaded PlayerProfile if not found
+     *          and createNew is false
+     */
+    public PlayerProfile loadPlayerProfile(String playerName, boolean createNew);
 
-        try {
-            plugin.debug("Creating mcmmo.users file...");
-            new File(mcMMO.getUsersFilePath()).createNewFile();
-        }
-        catch (IOException e) {
-            e.printStackTrace();
-        }
-    }
+    /**
+     * Get all users currently stored in the database.
+     *
+     * @return list of playernames
+     */
+    public List<String> getStoredUsers();
+
+    /**
+     * Convert all users from this database to the provided database using
+     * {@link #saveUser(PlayerProfile)}.
+     *
+     * @param destination The DatabaseManager to save to
+     */
+    public void convertUsers(DatabaseManager destination);
+
+    /**
+     * Retrieve the type of database in use. Custom databases should return CUSTOM.
+     *
+     * @return The type of database
+     */
+    public DatabaseType getDatabaseType();
 }

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

@@ -0,0 +1,75 @@
+package com.gmail.nossr50.database;
+
+import com.gmail.nossr50.mcMMO;
+import com.gmail.nossr50.config.Config;
+import com.gmail.nossr50.datatypes.database.DatabaseType;
+
+public class DatabaseManagerFactory {
+    private static Class<? extends DatabaseManager> customManager = null;
+
+    public static DatabaseManager getDatabaseManager() {
+        if (customManager != null) {
+            try {
+                return createCustomDatabaseManager(customManager);
+            }
+            catch (Exception e) {
+                mcMMO.p.debug("Could not create custom database manager");
+                e.printStackTrace();
+            }
+            catch (Throwable e) {
+                mcMMO.p.debug("Failed to create custom database manager");
+                e.printStackTrace();
+            }
+            mcMMO.p.debug("Falling back on " + (Config.getInstance().getUseMySQL() ? "SQL" : "Flatfile") + " database");
+        }
+
+        return Config.getInstance().getUseMySQL() ? new SQLDatabaseManager() : new FlatfileDatabaseManager();
+    }
+
+    /**
+     * Sets the custom DatabaseManager class for mcMMO to use. This should be
+     * called prior to mcMMO enabling.
+     * <p>
+     * The provided class must have an empty constructor, which is the one
+     * that will be used.
+     * <p>
+     * This method is intended for API use, but it should not be considered
+     * stable. This method is subject to change and/or removal in future
+     * versions.
+     *
+     * @param clazz the DatabaseManager class to use
+     * @throws IllegalArgumentException if the provided class does not have
+     *             an empty constructor
+     */
+    public static void setCustomDatabaseManagerClass(Class<? extends DatabaseManager> clazz) {
+        try {
+            clazz.getConstructor((Class<?>) null);
+            customManager = clazz;
+        }
+        catch (Throwable e) {
+            throw new IllegalArgumentException("Provided database manager class must have an empty constructor", e);
+        }
+    }
+
+    public static Class<? extends DatabaseManager> getCustomDatabaseManagerClass() {
+        return customManager;
+    }
+
+    public static DatabaseManager createDatabaseManager(DatabaseType type) {
+        switch (type) {
+            case FLATFILE:
+                return new FlatfileDatabaseManager();
+
+            case SQL:
+                return new SQLDatabaseManager();
+
+            default:
+                return null;
+        }
+    }
+
+    //TODO: Why is clazz never used here?
+    public static DatabaseManager createCustomDatabaseManager(Class<? extends DatabaseManager> clazz) throws Throwable {
+        return customManager.getConstructor((Class<?>) clazz).newInstance((Object[]) null);
+    }
+}

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

@@ -1,6 +1,9 @@
 package com.gmail.nossr50.database;
 
 import java.io.BufferedReader;
+import java.io.BufferedWriter;
+import java.io.Closeable;
+import java.io.File;
 import java.io.FileReader;
 import java.io.FileWriter;
 import java.io.IOException;
@@ -8,29 +11,466 @@ import java.util.ArrayList;
 import java.util.Collections;
 import java.util.Comparator;
 import java.util.HashMap;
+import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
 
+import org.bukkit.Bukkit;
+import org.bukkit.OfflinePlayer;
+
 import com.gmail.nossr50.mcMMO;
 import com.gmail.nossr50.config.Config;
+import com.gmail.nossr50.datatypes.MobHealthbarType;
+import com.gmail.nossr50.datatypes.database.DatabaseType;
 import com.gmail.nossr50.datatypes.database.PlayerStat;
+import com.gmail.nossr50.datatypes.player.PlayerProfile;
+import com.gmail.nossr50.datatypes.skills.AbilityType;
 import com.gmail.nossr50.datatypes.skills.SkillType;
-import com.gmail.nossr50.util.StringUtils;
+import com.gmail.nossr50.datatypes.spout.huds.HudType;
+import com.gmail.nossr50.util.Misc;
 
-public final class FlatfileDatabaseManager {
-    private static HashMap<SkillType, List<PlayerStat>> playerStatHash = new HashMap<SkillType, List<PlayerStat>>();
-    private static List<PlayerStat> powerLevels = new ArrayList<PlayerStat>();
-    private static long lastUpdate = 0;
+public final class FlatfileDatabaseManager implements DatabaseManager {
+    private final HashMap<SkillType, List<PlayerStat>> playerStatHash = new HashMap<SkillType, List<PlayerStat>>();
+    private final List<PlayerStat> powerLevels = new ArrayList<PlayerStat>();
+    private long lastUpdate = 0;
 
-    private static final long UPDATE_WAIT_TIME = 600000L; // 10 minutes
-    private static final long ONE_MONTH = 2630000000L;
+    private final long UPDATE_WAIT_TIME = 600000L; // 10 minutes
+    private final File usersFile;
+    private static final Object fileWritingLock = new Object();
 
-    private FlatfileDatabaseManager() {}
+    protected FlatfileDatabaseManager() {
+        usersFile = new File(mcMMO.getUsersFilePath());
+        checkStructure();
+        updateLeaderboards();
+    }
+
+    public void purgePowerlessUsers() {
+        int purgedUsers = 0;
+
+        mcMMO.p.getLogger().info("Purging powerless users...");
+
+        BufferedReader in = null;
+        FileWriter out = null;
+        String usersFilePath = mcMMO.getUsersFilePath();
+
+        // This code is O(n) instead of O(n²)
+        synchronized (fileWritingLock) {
+            try {
+                in = new BufferedReader(new FileReader(usersFilePath));
+                StringBuilder writer = new StringBuilder();
+                String line = "";
+
+                while ((line = in.readLine()) != null) {
+                    String[] character = line.split(":");
+                    Map<SkillType, Integer> skills = getSkillMapFromLine(character);
+
+                    boolean powerless = true;
+                    for (int skill : skills.values()) {
+                        if (skill != 0) {
+                            powerless = false;
+                            break;
+                        }
+                    }
+
+                    // If they're still around, rewrite them to the file.
+                    if (!powerless) {
+                        writer.append(line).append("\r\n");
+                    }
+                    else {
+                        purgedUsers++;
+                        Misc.profileCleanup(character[0]);
+                    }
+                }
+
+                // Write the new file
+                out = new FileWriter(usersFilePath);
+                out.write(writer.toString());
+            }
+            catch (IOException e) {
+                mcMMO.p.getLogger().severe("Exception while reading " + usersFilePath + " (Are you sure you formatted it correctly?)" + e.toString());
+            }
+            finally {
+                tryClose(in);
+                tryClose(out);
+            }
+        }
+
+        mcMMO.p.getLogger().info("Purged " + purgedUsers + " users from the database.");
+    }
+
+    public void purgeOldUsers() {
+        int removedPlayers = 0;
+        long currentTime = System.currentTimeMillis();
+
+        mcMMO.p.getLogger().info("Purging old users...");
+
+        BufferedReader in = null;
+        FileWriter out = null;
+        String usersFilePath = mcMMO.getUsersFilePath();
+
+        // This code is O(n) instead of O(n²)
+        synchronized (fileWritingLock) {
+            try {
+                in = new BufferedReader(new FileReader(usersFilePath));
+                StringBuilder writer = new StringBuilder();
+                String line = "";
+
+                while ((line = in.readLine()) != null) {
+                    String[] character = line.split(":");
+                    String name = character[0];
+                    long lastPlayed = 0;
+                    boolean rewrite = false;
+                    try {
+                        lastPlayed = Long.parseLong(character[37]) * Misc.TIME_CONVERSION_FACTOR;
+                    }
+                    catch (NumberFormatException e) {}
+                    if (lastPlayed == 0) {
+                        OfflinePlayer player = Bukkit.getOfflinePlayer(name);
+                        lastPlayed = player.getLastPlayed();
+                        rewrite = true;
+                    }
+
+                    if (currentTime - lastPlayed > PURGE_TIME) {
+                        removedPlayers++;
+                        Misc.profileCleanup(name);
+                    }
+                    else {
+                        if (rewrite) {
+                            // Rewrite their data with a valid time
+                            character[37] = Long.toString(lastPlayed);
+                            String newLine = org.apache.commons.lang.StringUtils.join(character, ":");
+                            writer.append(newLine).append("\r\n");
+                        }
+                        else {
+                            writer.append(line).append("\r\n");
+                        }
+                    }
+                }
+
+                // Write the new file
+                out = new FileWriter(usersFilePath);
+                out.write(writer.toString());
+            }
+            catch (IOException e) {
+                mcMMO.p.getLogger().severe("Exception while reading " + usersFilePath + " (Are you sure you formatted it correctly?)" + e.toString());
+            }
+            finally {
+                tryClose(in);
+                tryClose(out);
+            }
+        }
+
+        mcMMO.p.getLogger().info("Purged " + removedPlayers + " users from the database.");
+    }
+
+    public boolean removeUser(String playerName) {
+        boolean worked = false;
+
+        BufferedReader in = null;
+        FileWriter out = null;
+        String usersFilePath = mcMMO.getUsersFilePath();
+
+        synchronized (fileWritingLock) {
+            try {
+                in = new BufferedReader(new FileReader(usersFilePath));
+                StringBuilder writer = new StringBuilder();
+                String line = "";
+
+                while ((line = in.readLine()) != null) {
+                    // Write out the same file but when we get to the player we want to remove, we skip his line.
+                    if (!worked && line.split(":")[0].equalsIgnoreCase(playerName)) {
+                        mcMMO.p.getLogger().info("User found, removing...");
+                        worked = true;
+                        continue; // Skip the player
+                    }
+
+                    writer.append(line).append("\r\n");
+                }
+
+                out = new FileWriter(usersFilePath); // Write out the new file
+                out.write(writer.toString());
+            }
+            catch (Exception e) {
+                mcMMO.p.getLogger().severe("Exception while reading " + usersFilePath + " (Are you sure you formatted it correctly?)" + e.toString());
+            }
+            finally {
+                tryClose(in);
+                tryClose(out);
+            }
+        }
+
+        Misc.profileCleanup(playerName);
+
+        return worked;
+    }
+
+    public void saveUser(PlayerProfile profile) {
+        String playerName = profile.getPlayerName();
+
+        BufferedReader in = null;
+        FileWriter out = null;
+        String usersFilePath = mcMMO.getUsersFilePath();
+
+        synchronized (fileWritingLock) {
+            try {
+                // Open the file
+                in = new BufferedReader(new FileReader(usersFilePath));
+                StringBuilder writer = new StringBuilder();
+                String line;
+
+                // While not at the end of the file
+                while ((line = in.readLine()) != null) {
+                    // Read the line in and copy it to the output it's not the player we want to edit
+                    if (!line.split(":")[0].equalsIgnoreCase(playerName)) {
+                        writer.append(line).append("\r\n");
+                    }
+                    else {
+                        // Otherwise write the new player information
+                        writer.append(playerName).append(":");
+                        writer.append(profile.getSkillLevel(SkillType.MINING)).append(":");
+                        writer.append(":");
+                        writer.append(":");
+                        writer.append(profile.getSkillXpLevel(SkillType.MINING)).append(":");
+                        writer.append(profile.getSkillLevel(SkillType.WOODCUTTING)).append(":");
+                        writer.append(profile.getSkillXpLevel(SkillType.WOODCUTTING)).append(":");
+                        writer.append(profile.getSkillLevel(SkillType.REPAIR)).append(":");
+                        writer.append(profile.getSkillLevel(SkillType.UNARMED)).append(":");
+                        writer.append(profile.getSkillLevel(SkillType.HERBALISM)).append(":");
+                        writer.append(profile.getSkillLevel(SkillType.EXCAVATION)).append(":");
+                        writer.append(profile.getSkillLevel(SkillType.ARCHERY)).append(":");
+                        writer.append(profile.getSkillLevel(SkillType.SWORDS)).append(":");
+                        writer.append(profile.getSkillLevel(SkillType.AXES)).append(":");
+                        writer.append(profile.getSkillLevel(SkillType.ACROBATICS)).append(":");
+                        writer.append(profile.getSkillXpLevel(SkillType.REPAIR)).append(":");
+                        writer.append(profile.getSkillXpLevel(SkillType.UNARMED)).append(":");
+                        writer.append(profile.getSkillXpLevel(SkillType.HERBALISM)).append(":");
+                        writer.append(profile.getSkillXpLevel(SkillType.EXCAVATION)).append(":");
+                        writer.append(profile.getSkillXpLevel(SkillType.ARCHERY)).append(":");
+                        writer.append(profile.getSkillXpLevel(SkillType.SWORDS)).append(":");
+                        writer.append(profile.getSkillXpLevel(SkillType.AXES)).append(":");
+                        writer.append(profile.getSkillXpLevel(SkillType.ACROBATICS)).append(":");
+                        writer.append(":");
+                        writer.append(profile.getSkillLevel(SkillType.TAMING)).append(":");
+                        writer.append(profile.getSkillXpLevel(SkillType.TAMING)).append(":");
+                        writer.append((int) profile.getSkillDATS(AbilityType.BERSERK)).append(":");
+                        writer.append((int) profile.getSkillDATS(AbilityType.GIGA_DRILL_BREAKER)).append(":");
+                        writer.append((int) profile.getSkillDATS(AbilityType.TREE_FELLER)).append(":");
+                        writer.append((int) profile.getSkillDATS(AbilityType.GREEN_TERRA)).append(":");
+                        writer.append((int) profile.getSkillDATS(AbilityType.SERRATED_STRIKES)).append(":");
+                        writer.append((int) profile.getSkillDATS(AbilityType.SKULL_SPLITTER)).append(":");
+                        writer.append((int) profile.getSkillDATS(AbilityType.SUPER_BREAKER)).append(":");
+                        HudType hudType = profile.getHudType();
+                        writer.append(hudType == null ? "STANDARD" : hudType.toString()).append(":");
+                        writer.append(profile.getSkillLevel(SkillType.FISHING)).append(":");
+                        writer.append(profile.getSkillXpLevel(SkillType.FISHING)).append(":");
+                        writer.append((int) profile.getSkillDATS(AbilityType.BLAST_MINING)).append(":");
+                        writer.append(System.currentTimeMillis() / Misc.TIME_CONVERSION_FACTOR).append(":");
+                        MobHealthbarType mobHealthbarType = profile.getMobHealthbarType();
+                        writer.append(mobHealthbarType == null ? Config.getInstance().getMobHealthbarDefault().toString() : mobHealthbarType.toString()).append(":");
+                        writer.append("\r\n");
+                    }
+                }
+
+                // Write the new file
+                out = new FileWriter(usersFilePath);
+                out.write(writer.toString());
+            }
+            catch (Exception e) {
+                e.printStackTrace();
+            }
+            finally {
+                tryClose(in);
+                tryClose(out);
+            }
+        }
+    }
+
+    public List<PlayerStat> readLeaderboard(String skillName, int pageNumber, int statsPerPage) {
+        updateLeaderboards();
+        List<PlayerStat> statsList = skillName.equalsIgnoreCase("all") ? powerLevels : playerStatHash.get(SkillType.getSkill(skillName));
+        int fromIndex = (Math.max(pageNumber, 1) - 1) * statsPerPage;
+
+        return statsList.subList(Math.min(fromIndex, statsList.size()), Math.min(fromIndex + statsPerPage, statsList.size()));
+    }
+
+    public Map<String, Integer> readRank(String playerName) {
+        updateLeaderboards();
+
+        Map<String, Integer> skills = new HashMap<String, Integer>();
+
+        for (SkillType skill : SkillType.nonChildSkills()) {
+            skills.put(skill.name(), getPlayerRank(playerName, playerStatHash.get(skill)));
+        }
+
+        skills.put("ALL", getPlayerRank(playerName, powerLevels));
+
+        return skills;
+    }
+
+    public void newUser(String playerName) {
+        BufferedWriter out = null;
+        synchronized (fileWritingLock) {
+            try {
+                // Open the file to write the player
+                out = new BufferedWriter(new FileWriter(mcMMO.getUsersFilePath(), true));
+
+                // Add the player to the end
+                out.append(playerName).append(":");
+                out.append("0:"); // Mining
+                out.append(":");
+                out.append(":");
+                out.append("0:"); // Xp
+                out.append("0:"); // Woodcutting
+                out.append("0:"); // WoodCuttingXp
+                out.append("0:"); // Repair
+                out.append("0:"); // Unarmed
+                out.append("0:"); // Herbalism
+                out.append("0:"); // Excavation
+                out.append("0:"); // Archery
+                out.append("0:"); // Swords
+                out.append("0:"); // Axes
+                out.append("0:"); // Acrobatics
+                out.append("0:"); // RepairXp
+                out.append("0:"); // UnarmedXp
+                out.append("0:"); // HerbalismXp
+                out.append("0:"); // ExcavationXp
+                out.append("0:"); // ArcheryXp
+                out.append("0:"); // SwordsXp
+                out.append("0:"); // AxesXp
+                out.append("0:"); // AcrobaticsXp
+                out.append(":");
+                out.append("0:"); // Taming
+                out.append("0:"); // TamingXp
+                out.append("0:"); // DATS
+                out.append("0:"); // DATS
+                out.append("0:"); // DATS
+                out.append("0:"); // DATS
+                out.append("0:"); // DATS
+                out.append("0:"); // DATS
+                out.append("0:"); // DATS
+                out.append("STANDARD").append(":"); // HUD
+                out.append("0:"); // Fishing
+                out.append("0:"); // FishingXp
+                out.append("0:"); // Blast Mining
+                out.append(String.valueOf(System.currentTimeMillis() / Misc.TIME_CONVERSION_FACTOR)).append(":"); // LastLogin
+                out.append(Config.getInstance().getMobHealthbarDefault().toString()).append(":"); // Mob Healthbar HUD
+
+                // Add more in the same format as the line above
+
+                out.newLine();
+            }
+            catch (Exception e) {
+                e.printStackTrace();
+            }
+            finally {
+                tryClose(out);
+            }
+        }
+    }
+
+    public PlayerProfile loadPlayerProfile(String playerName, boolean create) {
+        BufferedReader in = null;
+        String usersFilePath = mcMMO.getUsersFilePath();
+
+        synchronized (fileWritingLock) {
+            try {
+                // Open the user file
+                in = new BufferedReader(new FileReader(usersFilePath));
+                String line;
+
+                while ((line = in.readLine()) != null) {
+                    // Find if the line contains the player we want.
+                    String[] character = line.split(":");
+
+                    if (!character[0].equalsIgnoreCase(playerName)) {
+                        continue;
+                    }
+
+                    PlayerProfile p = loadFromLine(character);
+                    in.close();
+                    return p;
+                }
+            }
+            catch (Exception e) {
+                e.printStackTrace();
+            }
+            finally {
+                tryClose(in);
+            }
+        }
+
+        if (create) {
+            newUser(playerName);
+            return new PlayerProfile(playerName, true);
+        }
+        return new PlayerProfile(playerName);
+    }
+
+    public void convertUsers(DatabaseManager destination) {
+        BufferedReader in = null;
+        String usersFilePath = mcMMO.getUsersFilePath();
+
+        synchronized (fileWritingLock) {
+            try {
+                // Open the user file
+                in = new BufferedReader(new FileReader(usersFilePath));
+                String line;
+
+                while ((line = in.readLine()) != null) {
+                    String[] character = line.split(":");
+
+                    try {
+                        destination.saveUser(loadFromLine(character));
+                    }
+                    catch (Exception e) {
+                        e.printStackTrace();
+                    }
+                }
+            }
+            catch (Exception e) {
+                e.printStackTrace();
+            }
+            finally {
+                tryClose(in);
+            }
+        }
+    }
+
+    public boolean checkConnected() {
+        // Not implemented
+        return true;
+    }
+
+    public List<String> getStoredUsers() {
+        ArrayList<String> users = new ArrayList<String>();
+        BufferedReader in = null;
+        String usersFilePath = mcMMO.getUsersFilePath();
+
+        synchronized (fileWritingLock) {
+            try {
+                // Open the user file
+                in = new BufferedReader(new FileReader(usersFilePath));
+                String line;
+
+                while ((line = in.readLine()) != null) {
+                    String[] character = line.split(":");
+                    users.add(character[0]);
+                }
+            }
+            catch (Exception e) {
+                e.printStackTrace();
+            }
+            finally {
+                tryClose(in);
+            }
+        }
+        return users;
+    }
 
     /**
      * Update the leader boards.
      */
-    public static void updateLeaderboards() {
+    private void updateLeaderboards() {
         // Only update FFS leaderboards every 10 minutes.. this puts a lot of strain on the server (depending on the size of the database) and should not be done frequently
         if (System.currentTimeMillis() < lastUpdate + UPDATE_WAIT_TIME) {
             return;
@@ -41,57 +481,55 @@ public final class FlatfileDatabaseManager {
         powerLevels.clear(); // Clear old values from the power levels
 
         // Initialize lists
-        List<PlayerStat> mining      = new ArrayList<PlayerStat>();
+        List<PlayerStat> mining = new ArrayList<PlayerStat>();
         List<PlayerStat> woodcutting = new ArrayList<PlayerStat>();
-        List<PlayerStat> herbalism   = new ArrayList<PlayerStat>();
-        List<PlayerStat> excavation  = new ArrayList<PlayerStat>();
-        List<PlayerStat> acrobatics  = new ArrayList<PlayerStat>();
-        List<PlayerStat> repair      = new ArrayList<PlayerStat>();
-        List<PlayerStat> swords      = new ArrayList<PlayerStat>();
-        List<PlayerStat> axes        = new ArrayList<PlayerStat>();
-        List<PlayerStat> archery     = new ArrayList<PlayerStat>();
-        List<PlayerStat> unarmed     = new ArrayList<PlayerStat>();
-        List<PlayerStat> taming      = new ArrayList<PlayerStat>();
-        List<PlayerStat> fishing     = new ArrayList<PlayerStat>();
+        List<PlayerStat> herbalism = new ArrayList<PlayerStat>();
+        List<PlayerStat> excavation = new ArrayList<PlayerStat>();
+        List<PlayerStat> acrobatics = new ArrayList<PlayerStat>();
+        List<PlayerStat> repair = new ArrayList<PlayerStat>();
+        List<PlayerStat> swords = new ArrayList<PlayerStat>();
+        List<PlayerStat> axes = new ArrayList<PlayerStat>();
+        List<PlayerStat> archery = new ArrayList<PlayerStat>();
+        List<PlayerStat> unarmed = new ArrayList<PlayerStat>();
+        List<PlayerStat> taming = new ArrayList<PlayerStat>();
+        List<PlayerStat> fishing = new ArrayList<PlayerStat>();
 
+        BufferedReader in = null;
         // Read from the FlatFile database and fill our arrays with information
-        try {
-            BufferedReader in = new BufferedReader(new FileReader(usersFilePath));
-            String line = "";
-            ArrayList<String> players = new ArrayList<String>();
+        synchronized (fileWritingLock) {
+            try {
+                in = new BufferedReader(new FileReader(usersFilePath));
+                String line = "";
 
-            while ((line = in.readLine()) != null) {
-                String[] data = line.split(":");
+                while ((line = in.readLine()) != null) {
+                    String[] data = line.split(":");
+                    String playerName = data[0];
+                    int powerLevel = 0;
 
-                String playerName = data[0];
-                int powerLevel = 0;
+                    Map<SkillType, Integer> skills = getSkillMapFromLine(data);
 
-                // Prevent the same player from being added multiple times (I'd like to note that this shouldn't happen...)
-                if (players.contains(playerName)) {
-                    continue;
+                    powerLevel += putStat(acrobatics, playerName, skills.get(SkillType.ACROBATICS));
+                    powerLevel += putStat(archery, playerName, skills.get(SkillType.ARCHERY));
+                    powerLevel += putStat(axes, playerName, skills.get(SkillType.AXES));
+                    powerLevel += putStat(excavation, playerName, skills.get(SkillType.EXCAVATION));
+                    powerLevel += putStat(fishing, playerName, skills.get(SkillType.FISHING));
+                    powerLevel += putStat(herbalism, playerName, skills.get(SkillType.HERBALISM));
+                    powerLevel += putStat(mining, playerName, skills.get(SkillType.MINING));
+                    powerLevel += putStat(repair, playerName, skills.get(SkillType.REPAIR));
+                    powerLevel += putStat(swords, playerName, skills.get(SkillType.SWORDS));
+                    powerLevel += putStat(taming, playerName, skills.get(SkillType.TAMING));
+                    powerLevel += putStat(unarmed, playerName, skills.get(SkillType.UNARMED));
+                    powerLevel += putStat(woodcutting, playerName, skills.get(SkillType.WOODCUTTING));
+
+                    putStat(powerLevels, playerName, powerLevel);
                 }
-
-                players.add(playerName);
-
-                powerLevel += loadStat(mining, playerName, data, 1);
-                powerLevel += loadStat(woodcutting, playerName, data, 5);
-                powerLevel += loadStat(repair, playerName, data, 7);
-                powerLevel += loadStat(unarmed, playerName, data, 8);
-                powerLevel += loadStat(herbalism, playerName, data, 9);
-                powerLevel += loadStat(excavation, playerName, data, 10);
-                powerLevel += loadStat(archery, playerName, data, 11);
-                powerLevel += loadStat(swords, playerName, data, 12);
-                powerLevel += loadStat(axes, playerName, data, 13);
-                powerLevel += loadStat(acrobatics, playerName, data, 14);
-                powerLevel += loadStat(taming, playerName, data, 24);
-                powerLevel += loadStat(fishing, playerName, data, 34);
-
-                powerLevels.add(new PlayerStat(playerName, powerLevel));
             }
-            in.close();
-        }
-        catch (Exception e) {
-            mcMMO.p.getLogger().severe("Exception while reading " + usersFilePath + " (Are you sure you formatted it correctly?)" + e.toString());
+            catch (Exception e) {
+                mcMMO.p.getLogger().severe("Exception while reading " + usersFilePath + " (Are you sure you formatted it correctly?)" + e.toString());
+            }
+            finally {
+                tryClose(in);
+            }
         }
 
         SkillComparator c = new SkillComparator();
@@ -125,159 +563,144 @@ public final class FlatfileDatabaseManager {
     }
 
     /**
-     * Retrieve leaderboard info.
-     *
-     * @param skillType Skill to retrieve info on.
-     * @param pageNumber Which page in the leaderboards to retrieve
-     * @return the requested leaderboard information
+     * Checks that the file is present and valid
      */
-    public static List<PlayerStat> retrieveInfo(String skillType, int pageNumber, int statsPerPage) {
-        List<PlayerStat> statsList = skillType.equalsIgnoreCase("all") ? powerLevels : playerStatHash.get(SkillType.getSkill(skillType));
-        int fromIndex = (Math.max(pageNumber, 1) - 1) * statsPerPage;
+    private void checkStructure() {
+        if (usersFile.exists()) {
+            BufferedReader in = null;
+            FileWriter out = null;
+            String usersFilePath = mcMMO.getUsersFilePath();
 
-        return statsList.subList(Math.min(fromIndex, statsList.size()), Math.min(fromIndex + statsPerPage, statsList.size()));
-    }
+            synchronized (fileWritingLock) {
+                try {
+                    in = new BufferedReader(new FileReader(usersFilePath));
+                    StringBuilder writer = new StringBuilder();
+                    String line = "";
+                    HashSet<String> players = new HashSet<String>();
 
-    public static boolean removeFlatFileUser(String playerName) {
-        boolean worked = false;
+                    while ((line = in.readLine()) != null) {
+                        // Length checks depend on last character being ':'
+                        if (line.charAt(line.length() - 1) != ':') {
+                            line = line + ":";
+                        }
+                        String[] character = line.split(":");
 
-        BufferedReader in = null;
-        FileWriter out = null;
-        String usersFilePath = mcMMO.getUsersFilePath();
+                        // Prevent the same player from being present multiple times
+                        if (!players.add(character[0])) {
+                            continue;
+                        }
+
+                        // If they're valid, rewrite them to the file.
+                        if (character.length > 38) {
+                            writer.append(line).append("\r\n");
+                        }
+                        else if (character.length < 33) {
+                            // Before Version 1.0 - Drop
+                            mcMMO.p.getLogger().warning("Dropping malformed or before version 1.0 line from database - " + line);
+                        }
+                        else {
+                            String oldVersion = null;
+                            StringBuilder newLine = new StringBuilder(line);
+                            boolean announce = false;
+                            if (character.length <= 33) {
+                                // Introduction of HUDType
+                                // Version 1.1.06
+                                // commit 78f79213cdd7190cd11ae54526f3b4ea42078e8a
+                                newLine.append("STANDARD").append(":");
+                                oldVersion = "1.1.06";
+                            }
+                            if (character.length <= 35) {
+                                // Introduction of Fishing
+                                // Version 1.2.00
+                                // commit a814b57311bc7734661109f0e77fc8bab3a0bd29
+                                newLine.append(0).append(":");
+                                newLine.append(0).append(":");
+                                if (oldVersion == null) {
+                                    oldVersion = "1.2.00";
+                                }
+                            }
+                            if (character.length <= 36) {
+                                // Introduction of Blast Mining cooldowns
+                                // Version 1.3.00-dev
+                                // commit fadbaf429d6b4764b8f1ad0efaa524a090e82ef5
+                                newLine.append(0).append(":");
+                                if (oldVersion == null) {
+                                    oldVersion = "1.3.00";
+                                }
+                            }
+                            if (character.length <= 37) {
+                                // Making old-purge work with flatfile
+                                // Version 1.4.00-dev
+                                // commmit 3f6c07ba6aaf44e388cc3b882cac3d8f51d0ac28
+                                // XXX Cannot create an OfflinePlayer at startup, use 0 and fix in purge
+                                newLine.append("0").append(":");
+                                announce = true; // TODO move this down
+                                if (oldVersion == null) {
+                                    oldVersion = "1.4.00";
+                                }
+                            }
+                            if (character.length <= 38) {
+                                // Addition of mob healthbars
+                                // Version 1.4.06
+                                // commit da29185b7dc7e0d992754bba555576d48fa08aa6
+                                newLine.append(Config.getInstance().getMobHealthbarDefault().toString()).append(":");
+                                if (oldVersion == null) {
+                                    oldVersion = "1.4.06";
+                                }
+                            }
+
+                            if (announce) {
+                                mcMMO.p.debug("Updating database line for player " + character[0] + " from before version " + oldVersion);
+                            }
+                            writer.append(newLine).append("\r\n");
+                        }
+                    }
+
+                    // Write the new file
+                    out = new FileWriter(usersFilePath);
+                    out.write(writer.toString());
+                }
+                catch (IOException e) {
+                    mcMMO.p.getLogger().severe("Exception while reading " + usersFilePath + " (Are you sure you formatted it correctly?)" + e.toString());
+                }
+                finally {
+                    tryClose(in);
+                    tryClose(out);
+                }
+            }
+            return;
+        }
+
+        usersFile.getParentFile().mkdir();
 
         try {
-            FileReader file = new FileReader(usersFilePath);
-            in = new BufferedReader(file);
-            StringBuilder writer = new StringBuilder();
-            String line = "";
-
-            while ((line = in.readLine()) != null) {
-
-                // Write out the same file but when we get to the player we want to remove, we skip his line.
-                if (!line.split(":")[0].equalsIgnoreCase(playerName)) {
-                    writer.append(line).append("\r\n");
-                }
-                else {
-                    mcMMO.p.getLogger().info("User found, removing...");
-                    worked = true;
-                    continue; // Skip the player
-                }
-            }
-
-            out = new FileWriter(usersFilePath); // Write out the new file
-            out.write(writer.toString());
+            mcMMO.p.debug("Creating mcmmo.users file...");
+            new File(mcMMO.getUsersFilePath()).createNewFile();
         }
-        catch (Exception e) {
-            mcMMO.p.getLogger().severe("Exception while reading " + usersFilePath + " (Are you sure you formatted it correctly?)" + e.toString());
+        catch (IOException e) {
+            e.printStackTrace();
         }
-        finally {
-            if (in != null) {
-                try {
-                    in.close();
-                }
-                catch (IOException ex) {
-                    ex.printStackTrace();
-                }
-            }
-
-            if (out != null) {
-                try {
-                    out.close();
-                }
-                catch (IOException ex) {
-                    ex.printStackTrace();
-                }
-            }
-        }
-
-        return worked;
     }
 
-    public static int purgePowerlessFlatfile() {
-        mcMMO.p.getLogger().info("Purging powerless users...");
-
-        int purgedUsers = 0;
-
-        for (PlayerStat stat : powerLevels) {
-            if (stat.statVal == 0 && !mcMMO.p.getServer().getOfflinePlayer(stat.name).isOnline() && removeFlatFileUser(stat.name)) {
-                purgedUsers++;
-            }
+    private void tryClose(Closeable c) {
+        if (c == null) {
+            return;
         }
-
-        return purgedUsers;
-    }
-
-    public static int removeOldFlatfileUsers() {
-        int removedPlayers = 0;
-        long currentTime = System.currentTimeMillis();
-        long purgeTime = ONE_MONTH * Config.getInstance().getOldUsersCutoff();
-
-        BufferedReader in = null;
-        FileWriter out = null;
-        String usersFilePath = mcMMO.getUsersFilePath();
-
         try {
-            FileReader file = new FileReader(usersFilePath);
-            in = new BufferedReader(file);
-            StringBuilder writer = new StringBuilder();
-            String line = "";
-
-            while ((line = in.readLine()) != null) {
-
-                // Write out the same file but when we get to the player we want to remove, we skip his line.
-                String[] splitLine = line.split(":");
-
-                if (splitLine.length > 37) {
-                    if (currentTime - (StringUtils.getLong(line.split(":")[37]) * 1000) <= purgeTime) {
-                        writer.append(line).append("\r\n");
-                    }
-                    else {
-                        mcMMO.p.getLogger().info("User found, removing...");
-                        removedPlayers++;
-                        continue; // Skip the player
-                    }
-                }
-                else {
-                    writer.append(line).append("\r\n");
-                }
-            }
-
-            out = new FileWriter(usersFilePath); // Write out the new file
-            out.write(writer.toString());
+            c.close();
         }
-        catch (Exception e) {
-            mcMMO.p.getLogger().severe("Exception while reading " + usersFilePath + " (Are you sure you formatted it correctly?)" + e.toString());
+        catch (IOException e) {
+            e.printStackTrace();
         }
-        finally {
-            if (in != null) {
-                try {
-                    in.close();
-                }
-                catch (IOException ex) {
-                    ex.printStackTrace();
-                }
-            }
-
-            if (out != null) {
-                try {
-                    out.close();
-                }
-                catch (IOException ex) {
-                    ex.printStackTrace();
-                }
-            }
-        }
-
-        return removedPlayers;
     }
 
-    private static Integer getPlayerRank(String playerName, List<PlayerStat> statsList) {
-        int currentPos = 1;
-
+    private Integer getPlayerRank(String playerName, List<PlayerStat> statsList) {
         if (statsList == null) {
             return null;
         }
 
+        int currentPos = 1;
+
         for (PlayerStat stat : statsList) {
             if (stat.name.equalsIgnoreCase(playerName)) {
                 return currentPos;
@@ -289,43 +712,90 @@ public final class FlatfileDatabaseManager {
         return null;
     }
 
-    public static Map<String, Integer> getPlayerRanks(String playerName) {
-        updateLeaderboards();
-
-        Map<String, Integer> skills = new HashMap<String, Integer>();
-
-        for (SkillType skill : SkillType.values()) {
-            if (skill.isChildSkill()) {
-                continue;
-            }
-
-            skills.put(skill.name(), getPlayerRank(playerName, playerStatHash.get(skill)));
-        }
-
-        skills.put("ALL", getPlayerRank(playerName, powerLevels));
-
-        return skills;
+    private int putStat(List<PlayerStat> statList, String playerName, int statValue) {
+        statList.add(new PlayerStat(playerName, statValue));
+        return statValue;
     }
 
-    public static List<PlayerStat> getPlayerStats(String skillName) {
-        return (skillName.equalsIgnoreCase("all")) ? powerLevels : playerStatHash.get(SkillType.getSkill(skillName));
-    }
-
-    private static int loadStat(List<PlayerStat> statList, String playerName, String[] data, int dataIndex) {
-        if (data.length > dataIndex) {
-            int statValue = Integer.parseInt(data[dataIndex]);
-
-            statList.add(new PlayerStat(playerName, statValue));
-            return statValue;
-        }
-
-        return 0;
-    }
-
-    private static class SkillComparator implements Comparator<PlayerStat> {
+    private class SkillComparator implements Comparator<PlayerStat> {
         @Override
         public int compare(PlayerStat o1, PlayerStat o2) {
             return (o2.statVal - o1.statVal);
         }
     }
+
+    private PlayerProfile loadFromLine(String[] character) throws Exception {
+        Map<SkillType, Integer>   skills     = getSkillMapFromLine(character);      // Skill levels
+        Map<SkillType, Float>     skillsXp   = new HashMap<SkillType, Float>();     // Skill & XP
+        Map<AbilityType, Integer> skillsDATS = new HashMap<AbilityType, Integer>(); // Ability & Cooldown
+        HudType hudType;
+        MobHealthbarType mobHealthbarType;
+
+        // TODO on updates, put new values in a try{} ?
+
+        skillsXp.put(SkillType.TAMING, (float) Integer.valueOf(character[25]));
+        skillsXp.put(SkillType.MINING, (float) Integer.valueOf(character[4]));
+        skillsXp.put(SkillType.REPAIR, (float) Integer.valueOf(character[15]));
+        skillsXp.put(SkillType.WOODCUTTING, (float) Integer.valueOf(character[6]));
+        skillsXp.put(SkillType.UNARMED, (float) Integer.valueOf(character[16]));
+        skillsXp.put(SkillType.HERBALISM, (float) Integer.valueOf(character[17]));
+        skillsXp.put(SkillType.EXCAVATION, (float) Integer.valueOf(character[18]));
+        skillsXp.put(SkillType.ARCHERY, (float) Integer.valueOf(character[19]));
+        skillsXp.put(SkillType.SWORDS, (float) Integer.valueOf(character[20]));
+        skillsXp.put(SkillType.AXES, (float) Integer.valueOf(character[21]));
+        skillsXp.put(SkillType.ACROBATICS, (float) Integer.valueOf(character[22]));
+        skillsXp.put(SkillType.FISHING, (float) Integer.valueOf(character[35]));
+
+        // Taming - Unused
+        skillsDATS.put(AbilityType.SUPER_BREAKER, Integer.valueOf(character[32]));
+        // Repair - Unused
+        skillsDATS.put(AbilityType.TREE_FELLER, Integer.valueOf(character[28]));
+        skillsDATS.put(AbilityType.BERSERK, Integer.valueOf(character[26]));
+        skillsDATS.put(AbilityType.GREEN_TERRA, Integer.valueOf(character[29]));
+        skillsDATS.put(AbilityType.GIGA_DRILL_BREAKER, Integer.valueOf(character[27]));
+        // Archery - Unused
+        skillsDATS.put(AbilityType.SERRATED_STRIKES, Integer.valueOf(character[30]));
+        skillsDATS.put(AbilityType.SKULL_SPLITTER, Integer.valueOf(character[31]));
+        // Acrobatics - Unused
+        skillsDATS.put(AbilityType.BLAST_MINING, Integer.valueOf(character[36]));
+
+        try {
+            hudType = HudType.valueOf(character[33]);
+        }
+        catch (Exception e) {
+            hudType = HudType.STANDARD; // Shouldn't happen unless database is being tampered with
+        }
+
+        try {
+            mobHealthbarType = MobHealthbarType.valueOf(character[38]);
+        }
+        catch (Exception e) {
+            mobHealthbarType = Config.getInstance().getMobHealthbarDefault();
+        }
+
+        return new PlayerProfile(character[0], skills, skillsXp, skillsDATS, hudType, mobHealthbarType);
+    }
+
+    private Map<SkillType, Integer> getSkillMapFromLine(String[] character) {
+        Map<SkillType, Integer> skills = new HashMap<SkillType, Integer>();   // Skill & Level
+
+        skills.put(SkillType.TAMING, Integer.valueOf(character[24]));
+        skills.put(SkillType.MINING, Integer.valueOf(character[1]));
+        skills.put(SkillType.REPAIR, Integer.valueOf(character[7]));
+        skills.put(SkillType.WOODCUTTING, Integer.valueOf(character[5]));
+        skills.put(SkillType.UNARMED, Integer.valueOf(character[8]));
+        skills.put(SkillType.HERBALISM, Integer.valueOf(character[9]));
+        skills.put(SkillType.EXCAVATION, Integer.valueOf(character[10]));
+        skills.put(SkillType.ARCHERY, Integer.valueOf(character[11]));
+        skills.put(SkillType.SWORDS, Integer.valueOf(character[12]));
+        skills.put(SkillType.AXES, Integer.valueOf(character[13]));
+        skills.put(SkillType.ACROBATICS, Integer.valueOf(character[14]));
+        skills.put(SkillType.FISHING, Integer.valueOf(character[34]));
+
+        return skills;
+    }
+
+    public DatabaseType getDatabaseType() {
+        return DatabaseType.FLATFILE;
+    }
 }

src/main/java/com/gmail/nossr50/datatypes/chat/ChatMode.java

@@ -1,4 +1,4 @@
-package com.gmail.nossr50.chat;
+package com.gmail.nossr50.datatypes.chat;
 
 import com.gmail.nossr50.datatypes.player.McMMOPlayer;
 import com.gmail.nossr50.locale.LocaleLoader;

src/main/java/com/gmail/nossr50/datatypes/database/DatabaseType.java

@@ -0,0 +1,24 @@
+package com.gmail.nossr50.datatypes.database;
+
+public enum DatabaseType {
+    FLATFILE,
+    SQL,
+    CUSTOM;
+
+    public static DatabaseType getDatabaseType(String typeName) {
+        for (DatabaseType type : values()) {
+            if (type.name().equalsIgnoreCase(typeName)) {
+                return type;
+            }
+        }
+
+        if (typeName.equalsIgnoreCase("file")) {
+            return FLATFILE;
+        }
+        else if (typeName.equalsIgnoreCase("mysql")) {
+            return SQL;
+        }
+
+        return CUSTOM;
+    }
+}

src/main/java/com/gmail/nossr50/datatypes/database/DatabaseUpdateType.java

@@ -3,7 +3,9 @@ package com.gmail.nossr50.datatypes.database;
 public enum DatabaseUpdateType {
     FISHING,
     BLAST_MINING,
-    CASCADE_DELETE,
     INDEX,
-    MOB_HEALTHBARS;
+    MOB_HEALTHBARS,
+    PARTY_NAMES, 
+    KILL_ORPHANS,
+    ;
 }

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

@@ -0,0 +1,16 @@
+package com.gmail.nossr50.datatypes.experience;
+
+public enum FormulaType {
+    LINEAR,
+    EXPONENTIAL,
+    UNKNOWN;
+
+    public static FormulaType getFormulaType(String string) {
+        try {
+            return valueOf(string);
+        }
+        catch (IllegalArgumentException ex) {
+            return UNKNOWN;
+        }
+    }
+};

src/main/java/com/gmail/nossr50/datatypes/party/ItemShareType.java

@@ -2,7 +2,9 @@ package com.gmail.nossr50.datatypes.party;
 
 import org.bukkit.inventory.ItemStack;
 
+import com.gmail.nossr50.locale.LocaleLoader;
 import com.gmail.nossr50.util.ItemUtils;
+import com.gmail.nossr50.util.StringUtils;
 
 public enum ItemShareType {
     LOOT,
@@ -30,4 +32,8 @@ public enum ItemShareType {
 
         return null;
     }
+
+    public String getLocaleString() {
+        return LocaleLoader.getString("Party.ItemShare.Category." + StringUtils.getCapitalized(this.toString()));
+    }
 }

src/main/java/com/gmail/nossr50/datatypes/party/Party.java

@@ -4,14 +4,13 @@ import java.util.ArrayList;
 import java.util.LinkedHashSet;
 import java.util.List;
 
-import org.bukkit.OfflinePlayer;
 import org.bukkit.entity.Player;
 
 import com.gmail.nossr50.mcMMO;
-import com.gmail.nossr50.party.ShareHandler.ShareMode;
 
 public class Party {
-    private LinkedHashSet<String> members = new LinkedHashSet<String>();
+    private final LinkedHashSet<String> members = new LinkedHashSet<String>();
+
     private String leader;
     private String name;
     private String password;
@@ -26,6 +25,30 @@ public class Party {
     private boolean shareWoodcuttingDrops = true;
     private boolean shareMiscDrops        = true;
 
+    public Party(String name) {
+        this.name = name;
+    }
+
+    public Party(String leader, String name) {
+        this.leader = leader;
+        this.name = name;
+        this.locked = true;
+    }
+
+    public Party(String leader, String name, String password) {
+        this.leader = leader;
+        this.name = name;
+        this.password = password;
+        this.locked = true;
+    }
+
+    public Party(String leader, String name, String password, boolean locked) {
+        this.leader = leader;
+        this.name = name;
+        this.password = password;
+        this.locked = locked;
+    }
+
     public LinkedHashSet<String> getMembers() {
         return members;
     }
@@ -34,9 +57,10 @@ public class Party {
         List<Player> onlineMembers = new ArrayList<Player>();
 
         for (String memberName : members) {
-            OfflinePlayer member = mcMMO.p.getServer().getOfflinePlayer(memberName);
-            if (member.isOnline()) {
-                onlineMembers.add(member.getPlayer());
+            Player member = mcMMO.p.getServer().getPlayerExact(memberName);
+
+            if (member != null) {
+                onlineMembers.add(member);
             }
         }
 
@@ -62,25 +86,10 @@ public class Party {
     public List<String> getItemShareCategories() {
         List<String> shareCategories = new ArrayList<String>();
 
-        // TODO Locale the category names!
-        if (shareLootDrops) {
-            shareCategories.add("Loot");
-        }
-
-        if (shareMiningDrops) {
-            shareCategories.add("Mining");
-        }
-
-        if (shareHerbalismDrops) {
-            shareCategories.add("Herbalism");
-        }
-
-        if (shareWoodcuttingDrops) {
-            shareCategories.add("Woodcutting");
-        }
-
-        if (shareMiscDrops) {
-            shareCategories.add("Misc");
+        for (ItemShareType shareType : ItemShareType.values()) {
+            if (sharingDrops(shareType)) {
+                shareCategories.add(shareType.getLocaleString());
+            }
         }
 
         return shareCategories;
@@ -166,4 +175,28 @@ public class Party {
                 return;
         }
     }
+
+    @Override
+    public boolean equals(Object obj) {
+        if (obj == null) {
+            return false;
+        }
+
+        if (!(obj instanceof Party)) {
+            return false;
+        }
+
+        Party other = (Party) obj;
+
+        if ((this.getName() == null) || (other.getName() == null)) {
+            return false;
+        }
+
+        return this.getName().equals(other.getName());
+    }
+
+    @Override
+    public int hashCode() {
+        return super.hashCode();
+    }
 }

src/main/java/com/gmail/nossr50/datatypes/party/ShareMode.java

@@ -0,0 +1,25 @@
+package com.gmail.nossr50.datatypes.party;
+
+import com.gmail.nossr50.util.commands.CommandUtils;
+
+public enum ShareMode {
+    NONE,
+    EQUAL,
+    RANDOM;
+
+    public static ShareMode getShareMode(String string) {
+        try {
+            return valueOf(string);
+        }
+        catch (IllegalArgumentException ex) {
+            if (string.equalsIgnoreCase("even")) {
+                return EQUAL;
+            }
+            else if (CommandUtils.shouldDisableToggle(string)) {
+                return NONE;
+            }
+
+            return null;
+        }
+    }
+};

src/main/java/com/gmail/nossr50/datatypes/player/McMMOPlayer.java

@@ -7,10 +7,10 @@ import java.util.Set;
 import org.bukkit.GameMode;
 import org.bukkit.Location;
 import org.bukkit.entity.Player;
-import org.bukkit.inventory.ItemStack;
 
 import com.gmail.nossr50.mcMMO;
 import com.gmail.nossr50.config.Config;
+import com.gmail.nossr50.config.experience.ExperienceConfig;
 import com.gmail.nossr50.datatypes.mods.CustomTool;
 import com.gmail.nossr50.datatypes.party.Party;
 import com.gmail.nossr50.datatypes.skills.AbilityType;
@@ -18,8 +18,10 @@ import com.gmail.nossr50.datatypes.skills.SkillType;
 import com.gmail.nossr50.datatypes.skills.ToolType;
 import com.gmail.nossr50.datatypes.spout.huds.McMMOHud;
 import com.gmail.nossr50.events.experience.McMMOPlayerXpGainEvent;
+import com.gmail.nossr50.locale.LocaleLoader;
 import com.gmail.nossr50.party.PartyManager;
 import com.gmail.nossr50.party.ShareHandler;
+import com.gmail.nossr50.runnables.skills.AbilityDisableTask;
 import com.gmail.nossr50.skills.SkillManager;
 import com.gmail.nossr50.skills.acrobatics.AcrobaticsManager;
 import com.gmail.nossr50.skills.archery.ArcheryManager;
@@ -53,7 +55,7 @@ public class McMMOPlayer {
      * we make sure that all class inheriting from SkillManager are instanced.
      * Which solution is better, I let you decide. - bm01
      */
-    private Map<SkillType, SkillManager> skillManagers = new HashMap<SkillType, SkillManager>();
+    private final Map<SkillType, SkillManager> skillManagers = new HashMap<SkillType, SkillManager>();
 
     private Party   party;
     private Party   invite;
@@ -63,6 +65,7 @@ public class McMMOPlayer {
     private boolean ptpEnabled = true;
     private boolean ptpConfirmRequired = Config.getInstance().getPTPCommandConfirmRequired();
     private long    ptpTimeout;
+    private int     ptpLastUse;
 
     private boolean partyChatMode;
     private boolean adminChatMode;
@@ -75,15 +78,16 @@ public class McMMOPlayer {
     private int     lastSalvageClick;
     private boolean godMode;
 
-    private Map<AbilityType, Boolean> abilityMode     = new HashMap<AbilityType, Boolean>();
-    private Map<AbilityType, Boolean> abilityInformed = new HashMap<AbilityType, Boolean>();
+    private final Map<AbilityType, Boolean> abilityMode     = new HashMap<AbilityType, Boolean>();
+    private final Map<AbilityType, Boolean> abilityInformed = new HashMap<AbilityType, Boolean>();
 
-    private Map<ToolType, Boolean> toolMode = new HashMap<ToolType, Boolean>();
-    private Map<ToolType, Integer> toolATS  = new HashMap<ToolType, Integer>();
+    private final Map<ToolType, Boolean> toolMode = new HashMap<ToolType, Boolean>();
+    private final Map<ToolType, Integer> toolATS  = new HashMap<ToolType, Integer>();
 
     private int recentlyHurt;
     private int respawnATS;
-    private int teleportLastUse;
+    private int teleportATS;
+    private int chimeraWingLastUse;
     private Location teleportCommence;
 
     private boolean isUsingUnarmed;
@@ -92,10 +96,10 @@ public class McMMOPlayer {
         String playerName = player.getName();
 
         this.player = player;
-        profile = new PlayerProfile(playerName, true);
+        profile = mcMMO.getDatabaseManager().loadPlayerProfile(playerName, true);
         party = PartyManager.getPlayerParty(playerName);
 
-        /* 
+        /*
          * I'm using this method because it makes code shorter and safer (we don't have to add all SkillTypes manually),
          * but I actually have no idea about the performance impact, if there is any.
          * If in the future someone wants to remove this, don't forget to also remove what is in the SkillType enum. - bm01
@@ -182,7 +186,8 @@ public class McMMOPlayer {
      */
     public void resetAbilityMode() {
         for (AbilityType ability : AbilityType.values()) {
-            setAbilityMode(ability, false);
+            // Correctly disable and handle any special deactivate code
+            new AbilityDisableTask(this, ability).run();
         }
     }
 
@@ -200,10 +205,10 @@ public class McMMOPlayer {
      * Set the mode of an ability.
      *
      * @param ability The ability to check
-     * @param bool True if the ability is active, false otherwise
+     * @param isActive True if the ability is active, false otherwise
      */
-    public void setAbilityMode(AbilityType ability, boolean bool) {
-        abilityMode.put(ability, bool);
+    public void setAbilityMode(AbilityType ability, boolean isActive) {
+        abilityMode.put(ability, isActive);
     }
 
     /**
@@ -220,10 +225,10 @@ public class McMMOPlayer {
      * Set the informed state of an ability.
      *
      * @param ability The ability to check
-     * @param bool True if the ability is informed, false otherwise
+     * @param isInformed True if the ability is informed, false otherwise
      */
-    public void setAbilityInformed(AbilityType ability, boolean bool) {
-        abilityInformed.put(ability, bool);
+    public void setAbilityInformed(AbilityType ability, boolean isInformed) {
+        abilityInformed.put(ability, isInformed);
     }
 
     /**
@@ -261,10 +266,10 @@ public class McMMOPlayer {
      * Set the current prep mode of a tool.
      *
      * @param tool Tool to set the mode for
-     * @param bool true if the tool should be prepped, false otherwise
+     * @param isPrepared true if the tool should be prepped, false otherwise
      */
-    public void setToolPreparationMode(ToolType tool, boolean bool) {
-        toolMode.put(tool, bool);
+    public void setToolPreparationMode(ToolType tool, boolean isPrepared) {
+        toolMode.put(tool, isPrepared);
     }
 
     /**
@@ -309,16 +314,12 @@ public class McMMOPlayer {
      * Teleportation cooldown & warmup
      */
 
-    public int getLastTeleport() {
-        return teleportLastUse;
+    public int getChimeraWingLastUse() {
+        return chimeraWingLastUse;
     }
 
-    public void setLastTeleport(int value) {
-        teleportLastUse = value;
-    }
-
-    public void actualizeLastTeleport() {
-        teleportLastUse = (int) (System.currentTimeMillis() / Misc.TIME_CONVERSION_FACTOR);
+    public void actualizeChimeraWingLastUse() {
+        chimeraWingLastUse = (int) (System.currentTimeMillis() / Misc.TIME_CONVERSION_FACTOR);
     }
 
     public Location getTeleportCommenceLocation() {
@@ -330,7 +331,7 @@ public class McMMOPlayer {
     }
 
     public void actualizeTeleportCommenceLocation(Player player) {
-        setTeleportCommenceLocation(player.getLocation());
+        teleportCommence = player.getLocation();
     }
 
     /*
@@ -345,6 +346,14 @@ public class McMMOPlayer {
         respawnATS = (int) (System.currentTimeMillis() / Misc.TIME_CONVERSION_FACTOR);
     }
 
+    public int getTeleportATS() {
+        return teleportATS;
+    }
+
+    public void actualizeTeleportATS() {
+        teleportATS = (int) (System.currentTimeMillis() / Misc.TIME_CONVERSION_FACTOR);
+    }
+
     /*
      * Repair Anvil Placement
      */
@@ -439,11 +448,7 @@ public class McMMOPlayer {
     public int getPowerLevel() {
         int powerLevel = 0;
 
-        for (SkillType type : SkillType.values()) {
-            if (type.isChildSkill()) {
-                continue;
-            }
-
+        for (SkillType type : SkillType.nonChildSkills()) {
             if (Permissions.skillEnabled(player, type)) {
                 powerLevel += profile.getSkillLevel(type);
             }
@@ -502,19 +507,20 @@ public class McMMOPlayer {
      * @param xp Experience amount to add
      */
     public void applyXpGain(SkillType skillType, float xp) {
+        if (!Permissions.skillEnabled(player, skillType)) {
+            return;
+        }
+
         if (skillType.isChildSkill()) {
             Set<SkillType> parentSkills = FamilyTree.getParents(skillType);
 
             for (SkillType parentSkill : parentSkills) {
-                if (Permissions.skillEnabled(player, parentSkill)) {
-                    applyXpGain(parentSkill, xp / parentSkills.size());
-                }
+                applyXpGain(parentSkill, xp / parentSkills.size());
             }
 
             return;
         }
 
-
         McMMOPlayerXpGainEvent event = new McMMOPlayerXpGainEvent(player, skillType, xp);
         mcMMO.p.getServer().getPluginManager().callEvent(event);
 
@@ -530,7 +536,7 @@ public class McMMOPlayer {
             spoutHud.setLastGained(skillType);
         }
 
-        isUsingUnarmed = skillType == SkillType.UNARMED;
+        isUsingUnarmed = (skillType == SkillType.UNARMED);
         SkillUtils.xpCheckSkill(skillType, player, profile);
     }
 
@@ -563,11 +569,7 @@ public class McMMOPlayer {
     }
 
     public boolean hasPartyInvite() {
-        if (invite != null) {
-            return true;
-        }
-
-        return false;
+        return (invite != null);
     }
 
     public void setParty(Party party) {
@@ -579,11 +581,7 @@ public class McMMOPlayer {
     }
 
     public boolean inParty() {
-        if (party != null) {
-            return true;
-        }
-
-        return false;
+        return (party != null);
     }
 
     public void removeParty() {
@@ -611,11 +609,7 @@ public class McMMOPlayer {
     }
 
     public boolean hasPtpRequest() {
-        if (ptpRequest != null) {
-            return true;
-        }
-
-        return false;
+        return (ptpRequest != null);
     }
 
     public void removePtpRequest() {
@@ -630,6 +624,14 @@ public class McMMOPlayer {
         ptpConfirmRequired = !ptpConfirmRequired;
     }
 
+    public int getPtpLastUse() {
+        return ptpLastUse;
+    }
+
+    public void actualizePtpLastUse() {
+        ptpLastUse = (int) (System.currentTimeMillis() / Misc.TIME_CONVERSION_FACTOR);
+    }
+
     public long getPtpTimeout() {
         return ptpTimeout;
     }
@@ -647,11 +649,7 @@ public class McMMOPlayer {
     }
 
     public void setItemShareModifier(int modifier) {
-        if (modifier < 10) {
-            modifier = 10;
-        }
-
-        itemShareModifier = modifier;
+        itemShareModifier = Math.max(10, modifier);
     }
 
     /*
@@ -694,21 +692,34 @@ public class McMMOPlayer {
      * @return Modified experience
      */
     private float modifyXpGain(SkillType skillType, float xp) {
-        if (player.getGameMode() == GameMode.CREATIVE || (skillType.getMaxLevel() < profile.getSkillLevel(skillType) + 1) || (Config.getInstance().getPowerLevelCap() < getPowerLevel() + 1)) {
+        if (player.getGameMode() == GameMode.CREATIVE || (skillType.getMaxLevel() <= profile.getSkillLevel(skillType)) || (Config.getInstance().getPowerLevelCap() <= getPowerLevel())) {
             return 0;
         }
 
-        xp = (float) (xp / skillType.getXpModifier() * Config.getInstance().getExperienceGainsGlobalMultiplier());
+        xp = (float) (xp / skillType.getXpModifier() * ExperienceConfig.getInstance().getExperienceGainsGlobalMultiplier());
 
         if (Config.getInstance().getToolModsEnabled()) {
-            ItemStack item = player.getItemInHand();
-            CustomTool tool = ModUtils.getToolFromItemStack(item);
+            CustomTool tool = ModUtils.getToolFromItemStack(player.getItemInHand());
 
             if (tool != null) {
                 xp *= tool.getXpMultiplier();
             }
         }
 
-        return PerksUtils.handleXpPerks(player, xp);
+        return PerksUtils.handleXpPerks(player, xp, skillType);
+    }
+
+    public void checkGodMode() {
+        if (godMode && !Permissions.mcgod(player)) {
+            toggleGodMode();
+            player.sendMessage(LocaleLoader.getString("Commands.GodMode.Forbidden"));
+        }
+    }
+
+    public void checkParty() {
+        if (inParty() && !Permissions.party(player)) {
+            removeParty();
+            player.sendMessage(LocaleLoader.getString("Party.Forbidden"));
+        }
     }
 }

src/main/java/com/gmail/nossr50/datatypes/player/PlayerProfile.java

@@ -1,10 +1,5 @@
 package com.gmail.nossr50.datatypes.player;
 
-import java.io.BufferedReader;
-import java.io.BufferedWriter;
-import java.io.FileReader;
-import java.io.FileWriter;
-import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.Set;
@@ -13,20 +8,21 @@ import org.bukkit.scoreboard.Scoreboard;
 
 import com.gmail.nossr50.mcMMO;
 import com.gmail.nossr50.config.Config;
+import com.gmail.nossr50.config.experience.ExperienceConfig;
 import com.gmail.nossr50.config.spout.SpoutConfig;
-import com.gmail.nossr50.database.SQLDatabaseManager;
 import com.gmail.nossr50.datatypes.MobHealthbarType;
+import com.gmail.nossr50.datatypes.experience.FormulaType;
 import com.gmail.nossr50.datatypes.skills.AbilityType;
 import com.gmail.nossr50.datatypes.skills.SkillType;
 import com.gmail.nossr50.datatypes.spout.huds.HudType;
 import com.gmail.nossr50.datatypes.spout.huds.McMMOHud;
 import com.gmail.nossr50.skills.child.FamilyTree;
-import com.gmail.nossr50.util.Misc;
+import com.gmail.nossr50.util.player.UserManager;
 
 public class PlayerProfile {
     private final String playerName;
-    private int userId;
     private boolean loaded;
+    private boolean changed;
 
     /* HUDs */
     private HudType hudType;
@@ -36,41 +32,53 @@ public class PlayerProfile {
 
     /* Skill Data */
     private final Map<SkillType, Integer>   skills     = new HashMap<SkillType, Integer>();   // Skill & Level
-    private final Map<SkillType, Float>     skillsXp   = new HashMap<SkillType, Float>();   // Skill & XP
+    private final Map<SkillType, Float>     skillsXp   = new HashMap<SkillType, Float>();     // Skill & XP
     private final Map<AbilityType, Integer> skillsDATS = new HashMap<AbilityType, Integer>(); // Ability & Cooldown
 
-    public PlayerProfile(String playerName, boolean addNew) {
+    public PlayerProfile(String playerName) {
         this.playerName = playerName;
 
-        hudType = mcMMO.spoutEnabled ? SpoutConfig.getInstance().getDefaultHudType() : HudType.DISABLED;
+        hudType = mcMMO.isSpoutEnabled() ? SpoutConfig.getInstance().getDefaultHudType() : HudType.DISABLED;
         mobHealthbarType = Config.getInstance().getMobHealthbarDefault();
 
         for (AbilityType abilityType : AbilityType.values()) {
             skillsDATS.put(abilityType, 0);
         }
 
-        for (SkillType skillType : SkillType.values()) {
-            if (skillType.isChildSkill()) {
-                continue;
-            }
-
+        for (SkillType skillType : SkillType.nonChildSkills()) {
             skills.put(skillType, 0);
             skillsXp.put(skillType, 0F);
         }
+    }
 
-        if (!loadPlayer() && addNew) {
-            addPlayer();
-            loaded = true;
-        }
+    public PlayerProfile(String playerName, boolean isLoaded) {
+        this(playerName);
+        this.loaded = isLoaded;
+    }
+
+    /**
+     * Calling this constructor is considered loading the profile.
+     */
+    public PlayerProfile(String playerName, Map<SkillType, Integer> argSkills, Map<SkillType, Float> argSkillsXp, Map<AbilityType, Integer> argSkillsDats, HudType hudType, MobHealthbarType mobHealthbarType) {
+        this(playerName, true);
+
+        this.hudType = hudType;
+        this.mobHealthbarType = mobHealthbarType;
+
+        this.skills.putAll(argSkills);
+        this.skillsXp.putAll(argSkillsXp);
+        this.skillsDATS.putAll(argSkillsDats);
+
+        loaded = true;
     }
 
     public void save() {
-        if (Config.getInstance().getUseMySQL()) {
-            saveMySQL();
-        }
-        else {
-            saveFlatfile();
+        if (!changed) {
+            return;
         }
+
+        mcMMO.getDatabaseManager().saveUser(this);
+        changed = false;
     }
 
     public String getPlayerName() {
@@ -142,12 +150,14 @@ public class PlayerProfile {
     /**
      * Set the current DATS of a skill.
      *
-     * @param abilityType Ability to set the DATS for
+     *  @param abilityType Ability to set the DATS for
      * @param DATS the DATS of the ability
      */
     public void setSkillDATS(AbilityType abilityType, long DATS) {
         int wearsOff = (int) (DATS * .001D);
 
+        changed = true;
+
         skillsDATS.put(abilityType, wearsOff);
     }
 
@@ -155,6 +165,8 @@ public class PlayerProfile {
      * Reset all skill cooldowns.
      */
     public void resetCooldowns() {
+        changed = true;
+
         for (AbilityType ability : skillsDATS.keySet()) {
             skillsDATS.put(ability, 0);
         }
@@ -185,6 +197,8 @@ public class PlayerProfile {
             return;
         }
 
+        changed = true;
+
         skillsXp.put(skillType, newValue);
     }
 
@@ -203,6 +217,8 @@ public class PlayerProfile {
             return;
         }
 
+        changed = true;
+
         skillsXp.put(skillType, skillsXp.get(skillType) - xp);
     }
 
@@ -217,6 +233,8 @@ public class PlayerProfile {
             return;
         }
 
+        changed = true;
+
         skills.put(skillType, newValue);
         skillsXp.put(skillType, 0F);
     }
@@ -232,6 +250,8 @@ public class PlayerProfile {
             return;
         }
 
+        changed = true;
+
         skills.put(skillType, skills.get(skillType) + levels);
         skillsXp.put(skillType, 0F);
     }
@@ -247,17 +267,22 @@ public class PlayerProfile {
             return;
         }
 
+        changed = true;
+
         skillsXp.put(skillType, skillsXp.get(skillType) + experience);
     }
 
     /**
-     * Get the amount of Xp remaining before the next level.
+     * Get the total amount of Xp before the next level.
      *
      * @param skillType Type of skill to check
-     * @return the Xp remaining until next level
+     * @return the total amount of Xp until next level
      */
     public int getXpToLevel(SkillType skillType) {
-        return 1020 + (skills.get(skillType) *  Config.getInstance().getFormulaMultiplierCurve());
+        int level = (ExperienceConfig.getInstance().getCumulativeCurveEnabled()) ? UserManager.getPlayer(playerName).getPowerLevel() : skills.get(skillType);
+        FormulaType formulaType = ExperienceConfig.getInstance().getFormulaType();
+
+        return mcMMO.getFormulaManager().getCachedXpToLevel(level, formulaType);
     }
 
     private int getChildSkillLevel(SkillType skillType) {
@@ -270,373 +295,4 @@ public class PlayerProfile {
 
         return sum / parents.size();
     }
-
-    private boolean loadPlayer() {
-        return Config.getInstance().getUseMySQL() ? loadMySQL() : loadFlatfile();
-    }
-
-    private void addPlayer() {
-        if (Config.getInstance().getUseMySQL()) {
-            addMySQLPlayer();
-        }
-        else {
-            addFlatfilePlayer();
-        }
-    }
-
-    private boolean loadMySQL() {
-        String tablePrefix = Config.getInstance().getMySQLTablePrefix();
-
-        userId = SQLDatabaseManager.getInt("SELECT id FROM " + tablePrefix + "users WHERE user = '" + playerName + "'");
-
-        if (userId == 0) {
-            return false;
-        }
-
-        ArrayList<String> hudValues = SQLDatabaseManager.read("SELECT hudtype, mobhealthbar FROM " + tablePrefix + "huds WHERE user_id = " + userId).get(1);
-
-        if (hudValues == null) {
-            SQLDatabaseManager.write("INSERT INTO " + tablePrefix + "huds (user_id, mobhealthbar) VALUES (" + userId + ",'" + mobHealthbarType.name() + "')");
-            mcMMO.p.getLogger().warning(playerName + "does not exist in the HUD table. Their HUDs will be reset.");
-        }
-        else {
-            hudType = HudType.valueOf(hudValues.get(0));
-            mobHealthbarType = MobHealthbarType.valueOf(hudValues.get(1));
-        }
-
-        ArrayList<String> cooldownValues = SQLDatabaseManager.read("SELECT mining, woodcutting, unarmed, herbalism, excavation, swords, axes, blast_mining FROM " + tablePrefix + "cooldowns WHERE user_id = " + userId).get(1);
-
-        if (cooldownValues == null) {
-            SQLDatabaseManager.write("INSERT INTO " + tablePrefix + "cooldowns (user_id) VALUES (" + userId + ")");
-            mcMMO.p.getLogger().warning(playerName + "does not exist in the cooldown table. Their cooldowns will be reset.");
-        }
-        else {
-            skillsDATS.put(AbilityType.SUPER_BREAKER, Integer.valueOf(cooldownValues.get(0)));
-            skillsDATS.put(AbilityType.TREE_FELLER, Integer.valueOf(cooldownValues.get(1)));
-            skillsDATS.put(AbilityType.BERSERK, Integer.valueOf(cooldownValues.get(2)));
-            skillsDATS.put(AbilityType.GREEN_TERRA, Integer.valueOf(cooldownValues.get(3)));
-            skillsDATS.put(AbilityType.GIGA_DRILL_BREAKER, Integer.valueOf(cooldownValues.get(4)));
-            skillsDATS.put(AbilityType.SERRATED_STRIKES, Integer.valueOf(cooldownValues.get(5)));
-            skillsDATS.put(AbilityType.SKULL_SPLITTER, Integer.valueOf(cooldownValues.get(6)));
-            skillsDATS.put(AbilityType.BLAST_MINING, Integer.valueOf(cooldownValues.get(7)));
-        }
-
-        ArrayList<String> statValues = SQLDatabaseManager.read("SELECT taming, mining, repair, woodcutting, unarmed, herbalism, excavation, archery, swords, axes, acrobatics, fishing FROM " + tablePrefix + "skills WHERE user_id = " + userId).get(1);
-
-        if (statValues == null) {
-            SQLDatabaseManager.write("INSERT INTO " + tablePrefix + "skills (user_id) VALUES (" + userId + ")");
-            mcMMO.p.getLogger().warning(playerName + "does not exist in the skills table. Their stats will be reset.");
-        }
-        else {
-            skills.put(SkillType.TAMING, Integer.valueOf(statValues.get(0)));
-            skills.put(SkillType.MINING, Integer.valueOf(statValues.get(1)));
-            skills.put(SkillType.REPAIR, Integer.valueOf(statValues.get(2)));
-            skills.put(SkillType.WOODCUTTING, Integer.valueOf(statValues.get(3)));
-            skills.put(SkillType.UNARMED, Integer.valueOf(statValues.get(4)));
-            skills.put(SkillType.HERBALISM, Integer.valueOf(statValues.get(5)));
-            skills.put(SkillType.EXCAVATION, Integer.valueOf(statValues.get(6)));
-            skills.put(SkillType.ARCHERY, Integer.valueOf(statValues.get(7)));
-            skills.put(SkillType.SWORDS, Integer.valueOf(statValues.get(8)));
-            skills.put(SkillType.AXES, Integer.valueOf(statValues.get(9)));
-            skills.put(SkillType.ACROBATICS, Integer.valueOf(statValues.get(10)));
-            skills.put(SkillType.FISHING, Integer.valueOf(statValues.get(11)));
-        }
-
-        ArrayList<String> experienceValues = SQLDatabaseManager.read("SELECT taming, mining, repair, woodcutting, unarmed, herbalism, excavation, archery, swords, axes, acrobatics, fishing FROM " + tablePrefix + "experience WHERE user_id = " + userId).get(1);
-
-        if (experienceValues == null) {
-            SQLDatabaseManager.write("INSERT INTO " + tablePrefix + "experience (user_id) VALUES (" + userId + ")");
-            mcMMO.p.getLogger().warning(playerName + "does not exist in the experience table. Their experience will be reset.");
-        }
-        else {
-            skillsXp.put(SkillType.TAMING, (float) Integer.valueOf(experienceValues.get(0)));
-            skillsXp.put(SkillType.MINING, (float) Integer.valueOf(experienceValues.get(1)));
-            skillsXp.put(SkillType.REPAIR, (float) Integer.valueOf(experienceValues.get(2)));
-            skillsXp.put(SkillType.WOODCUTTING, (float) Integer.valueOf(experienceValues.get(3)));
-            skillsXp.put(SkillType.UNARMED, (float) Integer.valueOf(experienceValues.get(4)));
-            skillsXp.put(SkillType.HERBALISM, (float) Integer.valueOf(experienceValues.get(5)));
-            skillsXp.put(SkillType.EXCAVATION, (float) Integer.valueOf(experienceValues.get(6)));
-            skillsXp.put(SkillType.ARCHERY, (float) Integer.valueOf(experienceValues.get(7)));
-            skillsXp.put(SkillType.SWORDS, (float) Integer.valueOf(experienceValues.get(8)));
-            skillsXp.put(SkillType.AXES, (float) Integer.valueOf(experienceValues.get(9)));
-            skillsXp.put(SkillType.ACROBATICS, (float) Integer.valueOf(experienceValues.get(10)));
-            skillsXp.put(SkillType.FISHING, (float) Integer.valueOf(experienceValues.get(11)));
-        }
-
-        loaded = true;
-        return true;
-    }
-
-    private void addMySQLPlayer() {
-        String tablePrefix = Config.getInstance().getMySQLTablePrefix();
-
-        SQLDatabaseManager.write("INSERT INTO " + tablePrefix + "users (user, lastlogin) VALUES ('" + playerName + "'," + System.currentTimeMillis() / Misc.TIME_CONVERSION_FACTOR + ")");
-        userId = SQLDatabaseManager.getInt("SELECT id FROM " + tablePrefix + "users WHERE user = '" + playerName + "'");
-
-        SQLDatabaseManager.write("INSERT INTO " + tablePrefix + "huds (user_id, mobhealthbar) VALUES (" + userId + ", '" + mobHealthbarType.name() + "')");
-        SQLDatabaseManager.write("INSERT INTO " + tablePrefix + "cooldowns (user_id) VALUES (" + userId + ")");
-        SQLDatabaseManager.write("INSERT INTO " + tablePrefix + "skills (user_id) VALUES (" + userId + ")");
-        SQLDatabaseManager.write("INSERT INTO " + tablePrefix + "experience (user_id) VALUES (" + userId + ")");
-    }
-
-
-    private void addFlatfilePlayer() {
-        try {
-            // Open the file to write the player
-            BufferedWriter out = new BufferedWriter(new FileWriter(mcMMO.getUsersFilePath(), true));
-
-            // Add the player to the end
-            out.append(playerName).append(":");
-            out.append("0:"); // Mining
-            out.append(":");
-            out.append(":");
-            out.append("0:"); // Xp
-            out.append("0:"); // Woodcutting
-            out.append("0:"); // WoodCuttingXp
-            out.append("0:"); // Repair
-            out.append("0:"); // Unarmed
-            out.append("0:"); // Herbalism
-            out.append("0:"); // Excavation
-            out.append("0:"); // Archery
-            out.append("0:"); // Swords
-            out.append("0:"); // Axes
-            out.append("0:"); // Acrobatics
-            out.append("0:"); // RepairXp
-            out.append("0:"); // UnarmedXp
-            out.append("0:"); // HerbalismXp
-            out.append("0:"); // ExcavationXp
-            out.append("0:"); // ArcheryXp
-            out.append("0:"); // SwordsXp
-            out.append("0:"); // AxesXp
-            out.append("0:"); // AcrobaticsXp
-            out.append(":");
-            out.append("0:"); // Taming
-            out.append("0:"); // TamingXp
-            out.append("0:"); // DATS
-            out.append("0:"); // DATS
-            out.append("0:"); // DATS
-            out.append("0:"); // DATS
-            out.append("0:"); // DATS
-            out.append("0:"); // DATS
-            out.append("0:"); // DATS
-            out.append(hudType == null ? "STANDARD" : hudType.toString()).append(":"); // HUD
-            out.append("0:"); // Fishing
-            out.append("0:"); // FishingXp
-            out.append("0:"); // Blast Mining
-            out.append(String.valueOf(System.currentTimeMillis() / Misc.TIME_CONVERSION_FACTOR)).append(":"); // LastLogin
-            out.append(mobHealthbarType == null ? Config.getInstance().getMobHealthbarDefault().toString() : mobHealthbarType.toString()).append(":"); // Mob Healthbar HUD
-
-            // Add more in the same format as the line above
-
-            out.newLine();
-            out.close();
-        }
-        catch (Exception e) {
-            e.printStackTrace();
-        }
-    }
-
-    private boolean loadFlatfile() {
-        try {
-            // Open the user file
-            FileReader file = new FileReader(mcMMO.getUsersFilePath());
-            BufferedReader in = new BufferedReader(file);
-            String line;
-
-            while ((line = in.readLine()) != null) {
-                // Find if the line contains the player we want.
-                String[] character = line.split(":");
-
-                if (!character[0].equalsIgnoreCase(playerName)) {
-                    continue;
-                }
-
-                loadSkillData(SkillType.MINING, character, 1);
-                loadSkillData(SkillType.WOODCUTTING, character, 5);
-                loadSkillData(SkillType.REPAIR, character, 7);
-                loadSkillData(SkillType.UNARMED, character, 8);
-                loadSkillData(SkillType.HERBALISM, character, 9);
-                loadSkillData(SkillType.EXCAVATION, character, 10);
-                loadSkillData(SkillType.ARCHERY, character, 11);
-                loadSkillData(SkillType.SWORDS, character, 12);
-                loadSkillData(SkillType.AXES, character, 13);
-                loadSkillData(SkillType.ACROBATICS, character, 14);
-                loadSkillData(SkillType.TAMING, character, 24);
-                loadSkillData(SkillType.FISHING, character, 34);
-
-                loadSkillXpData(SkillType.MINING, character, 4);
-                loadSkillXpData(SkillType.WOODCUTTING, character, 6);
-                loadSkillXpData(SkillType.REPAIR, character, 15);
-                loadSkillXpData(SkillType.UNARMED, character, 16);
-                loadSkillXpData(SkillType.HERBALISM, character, 17);
-                loadSkillXpData(SkillType.EXCAVATION, character, 18);
-                loadSkillXpData(SkillType.ARCHERY, character, 19);
-                loadSkillXpData(SkillType.SWORDS, character, 20);
-                loadSkillXpData(SkillType.AXES, character, 21);
-                loadSkillXpData(SkillType.ACROBATICS, character, 22);
-                loadSkillXpData(SkillType.TAMING, character, 25);
-                loadSkillXpData(SkillType.FISHING, character, 35);
-
-                loadDATSData(AbilityType.BERSERK, character, 26);
-                loadDATSData(AbilityType.GIGA_DRILL_BREAKER, character, 27);
-                loadDATSData(AbilityType.TREE_FELLER, character, 28);
-                loadDATSData(AbilityType.GREEN_TERRA, character, 29);
-                loadDATSData(AbilityType.SERRATED_STRIKES, character, 30);
-                loadDATSData(AbilityType.SKULL_SPLITTER, character, 31);
-                loadDATSData(AbilityType.SUPER_BREAKER, character, 32);
-                loadDATSData(AbilityType.BLAST_MINING, character, 36);
-
-                hudType = character.length > 33 ? HudType.valueOf(character[33]) : null;
-                mobHealthbarType = character.length > 38 ? MobHealthbarType.valueOf(character[38]) : null;
-
-                loaded = true;
-            }
-
-            in.close();
-        }
-        catch (Exception e) {
-            e.printStackTrace();
-        }
-
-        return loaded;
-    }
-
-    private void saveMySQL() {
-        if (Config.getInstance().getUseMySQL()) {
-            String tablePrefix = Config.getInstance().getMySQLTablePrefix();
-
-            SQLDatabaseManager.write("UPDATE " + tablePrefix + "users SET lastlogin = " + ((int) (System.currentTimeMillis() / Misc.TIME_CONVERSION_FACTOR)) + " WHERE id = " + userId);
-            SQLDatabaseManager.write("UPDATE " + tablePrefix + "huds SET "
-                    + "  hudtype = '" + (hudType == null ? "STANDARD" : hudType.toString() + "'")
-                    + ", mobhealthbar = '" + (mobHealthbarType == null ? Config.getInstance().getMobHealthbarDefault().toString() : mobHealthbarType.toString() + "'")
-                    + "  WHERE user_id = " + userId);
-            SQLDatabaseManager.write("UPDATE " + tablePrefix + "cooldowns SET "
-                    + "  mining = " + skillsDATS.get(AbilityType.SUPER_BREAKER)
-                    + ", woodcutting = " + skillsDATS.get(AbilityType.TREE_FELLER)
-                    + ", unarmed = " + skillsDATS.get(AbilityType.BERSERK)
-                    + ", herbalism = " + skillsDATS.get(AbilityType.GREEN_TERRA)
-                    + ", excavation = " + skillsDATS.get(AbilityType.GIGA_DRILL_BREAKER)
-                    + ", swords = " + skillsDATS.get(AbilityType.SERRATED_STRIKES)
-                    + ", axes = " + skillsDATS.get(AbilityType.SKULL_SPLITTER)
-                    + ", blast_mining = " + skillsDATS.get(AbilityType.BLAST_MINING)
-                    + "  WHERE user_id = " + userId);
-            SQLDatabaseManager.write("UPDATE " + tablePrefix + "skills SET "
-                    + "  taming = " + skills.get(SkillType.TAMING)
-                    + ", mining = " + skills.get(SkillType.MINING)
-                    + ", repair = " + skills.get(SkillType.REPAIR)
-                    + ", woodcutting = " + skills.get(SkillType.WOODCUTTING)
-                    + ", unarmed = " + skills.get(SkillType.UNARMED)
-                    + ", herbalism = " + skills.get(SkillType.HERBALISM)
-                    + ", excavation = " + skills.get(SkillType.EXCAVATION)
-                    + ", archery = " + skills.get(SkillType.ARCHERY)
-                    + ", swords = " + skills.get(SkillType.SWORDS)
-                    + ", axes = " + skills.get(SkillType.AXES)
-                    + ", acrobatics = " + skills.get(SkillType.ACROBATICS)
-                    + ", fishing = " + skills.get(SkillType.FISHING)
-                    + "  WHERE user_id = " + userId);
-            SQLDatabaseManager.write("UPDATE " + tablePrefix + "experience SET "
-                    + "  taming = " + getSkillXpLevel(SkillType.TAMING)
-                    + ", mining = " + getSkillXpLevel(SkillType.MINING)
-                    + ", repair = " + getSkillXpLevel(SkillType.REPAIR)
-                    + ", woodcutting = " + getSkillXpLevel(SkillType.WOODCUTTING)
-                    + ", unarmed = " + getSkillXpLevel(SkillType.UNARMED)
-                    + ", herbalism = " + getSkillXpLevel(SkillType.HERBALISM)
-                    + ", excavation = " + getSkillXpLevel(SkillType.EXCAVATION)
-                    + ", archery = " + getSkillXpLevel(SkillType.ARCHERY)
-                    + ", swords = " + getSkillXpLevel(SkillType.SWORDS)
-                    + ", axes = " + getSkillXpLevel(SkillType.AXES)
-                    + ", acrobatics = " + getSkillXpLevel(SkillType.ACROBATICS)
-                    + ", fishing = " + getSkillXpLevel(SkillType.FISHING)
-                    + "  WHERE user_id = " + userId);
-        }
-    }
-
-    private void saveFlatfile() {
-        try {
-            // Open the file
-            BufferedReader in = new BufferedReader(new FileReader(mcMMO.getUsersFilePath()));
-            StringBuilder writer = new StringBuilder();
-            String line;
-
-            // While not at the end of the file
-            while ((line = in.readLine()) != null) {
-                // Read the line in and copy it to the output it's not the player we want to edit
-                if (!line.split(":")[0].equalsIgnoreCase(playerName)) {
-                    writer.append(line).append("\r\n");
-                }
-                else {
-                    // Otherwise write the new player information
-                    writer.append(playerName).append(":");
-                    writer.append(skills.get(SkillType.MINING)).append(":");
-                    writer.append(":");
-                    writer.append(":");
-                    writer.append(getSkillXpLevel(SkillType.MINING)).append(":");
-                    writer.append(skills.get(SkillType.WOODCUTTING)).append(":");
-                    writer.append(getSkillXpLevel(SkillType.WOODCUTTING)).append(":");
-                    writer.append(skills.get(SkillType.REPAIR)).append(":");
-                    writer.append(skills.get(SkillType.UNARMED)).append(":");
-                    writer.append(skills.get(SkillType.HERBALISM)).append(":");
-                    writer.append(skills.get(SkillType.EXCAVATION)).append(":");
-                    writer.append(skills.get(SkillType.ARCHERY)).append(":");
-                    writer.append(skills.get(SkillType.SWORDS)).append(":");
-                    writer.append(skills.get(SkillType.AXES)).append(":");
-                    writer.append(skills.get(SkillType.ACROBATICS)).append(":");
-                    writer.append(getSkillXpLevel(SkillType.REPAIR)).append(":");
-                    writer.append(getSkillXpLevel(SkillType.UNARMED)).append(":");
-                    writer.append(getSkillXpLevel(SkillType.HERBALISM)).append(":");
-                    writer.append(getSkillXpLevel(SkillType.EXCAVATION)).append(":");
-                    writer.append(getSkillXpLevel(SkillType.ARCHERY)).append(":");
-                    writer.append(getSkillXpLevel(SkillType.SWORDS)).append(":");
-                    writer.append(getSkillXpLevel(SkillType.AXES)).append(":");
-                    writer.append(getSkillXpLevel(SkillType.ACROBATICS)).append(":");
-                    writer.append(":");
-                    writer.append(skills.get(SkillType.TAMING)).append(":");
-                    writer.append(getSkillXpLevel(SkillType.TAMING)).append(":");
-                    writer.append(skillsDATS.get(AbilityType.BERSERK)).append(":");
-                    writer.append(skillsDATS.get(AbilityType.GIGA_DRILL_BREAKER)).append(":");
-                    writer.append(skillsDATS.get(AbilityType.TREE_FELLER)).append(":");
-                    writer.append(skillsDATS.get(AbilityType.GREEN_TERRA)).append(":");
-                    writer.append(skillsDATS.get(AbilityType.SERRATED_STRIKES)).append(":");
-                    writer.append(skillsDATS.get(AbilityType.SKULL_SPLITTER)).append(":");
-                    writer.append(skillsDATS.get(AbilityType.SUPER_BREAKER)).append(":");
-                    writer.append(hudType == null ? "STANDARD" : hudType.toString()).append(":");
-                    writer.append(skills.get(SkillType.FISHING)).append(":");
-                    writer.append(getSkillXpLevel(SkillType.FISHING)).append(":");
-                    writer.append(skillsDATS.get(AbilityType.BLAST_MINING)).append(":");
-                    writer.append(System.currentTimeMillis() / Misc.TIME_CONVERSION_FACTOR).append(":");
-                    writer.append(mobHealthbarType == null ? Config.getInstance().getMobHealthbarDefault().toString() : mobHealthbarType.toString()).append(":");
-                    writer.append("\r\n");
-                }
-            }
-
-            in.close();
-
-            // Write the new file
-            FileWriter out = new FileWriter(mcMMO.getUsersFilePath());
-            out.write(writer.toString());
-            out.flush();
-            out.close();
-        }
-        catch (Exception e) {
-            e.printStackTrace();
-        }
-    }
-
-    private void loadSkillXpData(SkillType skill, String[] data, int dataIndex) {
-        if (data.length > dataIndex) {
-            skillsXp.put(skill, (float) Integer.valueOf(data[dataIndex]));
-        }
-    }
-
-    private void loadSkillData(SkillType skill, String[] data, int dataIndex) {
-        if (data.length > dataIndex) {
-            skills.put(skill, Integer.valueOf(data[dataIndex]));
-        }
-    }
-
-    private void loadDATSData(AbilityType ability, String[] data, int dataIndex) {
-        if (data.length > dataIndex) {
-            skillsDATS.put(ability, Integer.valueOf(data[dataIndex]));
-        }
-    }
 }

src/main/java/com/gmail/nossr50/datatypes/skills/AbilityType.java

@@ -68,6 +68,13 @@ public enum AbilityType {
             null),
 
     LEAF_BLOWER(
+            null,
+            null,
+            null,
+            null,
+            null),
+
+    BLOCK_CRACKER(
             null,
             null,
             null,
@@ -144,7 +151,6 @@ public enum AbilityType {
      * @return true if the player has permissions, false otherwise
      */
     public boolean getPermissions(Player player) {
-
         switch (this) {
             case BERSERK:
                 return Permissions.berserk(player);
@@ -152,6 +158,9 @@ public enum AbilityType {
             case BLAST_MINING:
                 return Permissions.remoteDetonation(player);
 
+            case BLOCK_CRACKER:
+                return Permissions.blockCracker(player);
+
             case GIGA_DRILL_BREAKER:
                 return Permissions.gigaDrillBreaker(player);
 
@@ -189,6 +198,9 @@ public enum AbilityType {
             case BERSERK:
                 return (BlockUtils.affectedByGigaDrillBreaker(blockState) || blockState.getType() == Material.SNOW);
 
+            case BLOCK_CRACKER:
+                return BlockUtils.affectedByBlockCracker(blockState);
+
             case GIGA_DRILL_BREAKER:
                 return BlockUtils.affectedByGigaDrillBreaker(blockState);
 

src/main/java/com/gmail/nossr50/datatypes/skills/SkillType.java

@@ -8,6 +8,7 @@ import org.bukkit.Color;
 
 import com.gmail.nossr50.mcMMO;
 import com.gmail.nossr50.config.Config;
+import com.gmail.nossr50.config.experience.ExperienceConfig;
 import com.gmail.nossr50.locale.LocaleLoader;
 import com.gmail.nossr50.skills.SkillManager;
 import com.gmail.nossr50.skills.acrobatics.AcrobaticsManager;
@@ -25,6 +26,7 @@ import com.gmail.nossr50.skills.unarmed.UnarmedManager;
 import com.gmail.nossr50.skills.woodcutting.WoodcuttingManager;
 import com.gmail.nossr50.util.StringUtils;
 import com.gmail.nossr50.util.skills.SkillUtils;
+
 import com.google.common.collect.ImmutableList;
 
 public enum SkillType {
@@ -103,12 +105,20 @@ public enum SkillType {
         return Config.getInstance().getDoubleDropsDisabled(this);
     }
 
+    public boolean getHardcoreStatLossEnabled() {
+        return Config.getInstance().getHardcoreStatLossEnabled(this);
+    }
+
+    public boolean getHardcoreVampirismEnabled() {
+        return Config.getInstance().getHardcoreVampirismEnabled(this);
+    }
+
     public ToolType getTool() {
         return tool;
     }
 
     public double getXpModifier() {
-        return Config.getInstance().getForumulaMultiplier(this);
+        return ExperienceConfig.getInstance().getFormulaSkillModifier(this);
     }
 
     public static SkillType getSkill(String skillName) {
@@ -141,7 +151,36 @@ public enum SkillType {
         }
     }
 
+    public static SkillType[] nonChildSkills() {
+        return new SkillType[] {SkillType.ACROBATICS,
+                SkillType.ARCHERY,
+                SkillType.AXES,
+                SkillType.EXCAVATION,
+                SkillType.FISHING,
+                SkillType.HERBALISM,
+                SkillType.MINING,
+                SkillType.REPAIR,
+                SkillType.SWORDS,
+                SkillType.TAMING,
+                SkillType.UNARMED,
+                SkillType.WOODCUTTING };
+    }
+
+    public static SkillType[] childSkills() {
+        return new SkillType[] { SkillType.SMELTING };
+    }
+
     public Color getRunescapeModeColor() {
         return runescapeColor;
     }
+
+    public static SkillType byAbility(AbilityType ability) {
+        for (SkillType type : values()) {
+            if (type.getAbility() == ability) {
+                return type;
+            }
+        }
+
+        return null;
+    }
 }

src/main/java/com/gmail/nossr50/datatypes/spout/huds/McMMOHud.java

@@ -1,7 +1,6 @@
 package com.gmail.nossr50.datatypes.spout.huds;
 
 import org.bukkit.entity.Player;
-import org.getspout.spoutapi.SpoutManager;
 
 import com.gmail.nossr50.mcMMO;
 import com.gmail.nossr50.config.spout.SpoutConfig;
@@ -11,6 +10,8 @@ import com.gmail.nossr50.datatypes.skills.SkillType;
 import com.gmail.nossr50.datatypes.spout.popups.McMMOMenu;
 import com.gmail.nossr50.datatypes.spout.popups.McMMOXpBar;
 
+import org.getspout.spoutapi.SpoutManager;
+
 public class McMMOHud {
     private Player        player;
     private PlayerProfile profile;
@@ -56,11 +57,7 @@ public class McMMOHud {
     }
 
     public boolean isMenuOpened() {
-        if (menu != null) {
-            return true;
-        }
-
-        return false;
+        return (menu != null);
     }
 
     public void openMenu() {

src/main/java/com/gmail/nossr50/datatypes/spout/popups/McMMOMenu.java

@@ -1,10 +1,5 @@
 package com.gmail.nossr50.datatypes.spout.popups;
 
-import org.getspout.spoutapi.gui.GenericLabel;
-import org.getspout.spoutapi.gui.GenericPopup;
-import org.getspout.spoutapi.gui.InGameHUD;
-import org.getspout.spoutapi.player.SpoutPlayer;
-
 import com.gmail.nossr50.mcMMO;
 import com.gmail.nossr50.datatypes.player.PlayerProfile;
 import com.gmail.nossr50.datatypes.spout.buttons.McMMOButton;
@@ -13,6 +8,11 @@ import com.gmail.nossr50.datatypes.spout.huds.HudType;
 import com.gmail.nossr50.datatypes.spout.huds.McMMOHud;
 import com.gmail.nossr50.locale.LocaleLoader;
 
+import org.getspout.spoutapi.gui.GenericLabel;
+import org.getspout.spoutapi.gui.GenericPopup;
+import org.getspout.spoutapi.gui.InGameHUD;
+import org.getspout.spoutapi.player.SpoutPlayer;
+
 public class McMMOMenu extends GenericPopup {
     private McMMOButton hudButton;
     private McMMOButton escapeButton;

src/main/java/com/gmail/nossr50/datatypes/spout/popups/McMMOXpBar.java

@@ -1,5 +1,12 @@
 package com.gmail.nossr50.datatypes.spout.popups;
 
+import com.gmail.nossr50.mcMMO;
+import com.gmail.nossr50.config.spout.SpoutConfig;
+import com.gmail.nossr50.datatypes.player.PlayerProfile;
+import com.gmail.nossr50.datatypes.skills.SkillType;
+import com.gmail.nossr50.datatypes.spout.huds.HudType;
+import com.gmail.nossr50.util.StringUtils;
+
 import org.getspout.spoutapi.gui.Color;
 import org.getspout.spoutapi.gui.GenericGradient;
 import org.getspout.spoutapi.gui.GenericTexture;
@@ -8,13 +15,6 @@ import org.getspout.spoutapi.gui.RenderPriority;
 import org.getspout.spoutapi.gui.Widget;
 import org.getspout.spoutapi.player.SpoutPlayer;
 
-import com.gmail.nossr50.mcMMO;
-import com.gmail.nossr50.config.spout.SpoutConfig;
-import com.gmail.nossr50.datatypes.player.PlayerProfile;
-import com.gmail.nossr50.datatypes.skills.SkillType;
-import com.gmail.nossr50.datatypes.spout.huds.HudType;
-import com.gmail.nossr50.util.StringUtils;
-
 public class McMMOXpBar {
     private SpoutPlayer spoutPlayer;
     private Widget xpBar;

src/main/java/com/gmail/nossr50/datatypes/treasure/ExcavationTreasure.java

@@ -3,7 +3,7 @@ package com.gmail.nossr50.datatypes.treasure;
 import org.bukkit.inventory.ItemStack;
 
 public class ExcavationTreasure extends Treasure {
-    // dirt | grass | sand | gravel | clay | mycel | soulsand
+    // dirt | grass | sand | gravel | clay | mycel | soulsand | snow
     // 00000001 - dirt      1
     // 00000010 - grass     2
     // 00000100 - sand      4
@@ -11,6 +11,7 @@ public class ExcavationTreasure extends Treasure {
     // 00010000 - clay      16
     // 00100000 - mycel     32
     // 01000000 - soulsand  64
+    // 10000000 - snow      128
     private byte dropsFrom = 0x0;
 
     public ExcavationTreasure(ItemStack drop, int xp, double dropChance, int dropLevel) {
@@ -55,6 +56,10 @@ public class ExcavationTreasure extends Treasure {
         return getDropFromMask(64);
     }
 
+    public boolean getDropsFromSnow() {
+        return getDropFromMask(128);
+    }
+
     private boolean getDropFromMask(int mask) {
         return ((dropsFrom & mask) > 0) ? true : false;
     }
@@ -88,6 +93,10 @@ public class ExcavationTreasure extends Treasure {
         setDropFromMask(64);
     }
 
+    public void setDropsFromSnow() {
+        setDropFromMask(128);
+    }
+
     private void setDropFromMask(int mask) {
         dropsFrom |= mask;
     }
@@ -121,6 +130,10 @@ public class ExcavationTreasure extends Treasure {
         unsetDropFromMask(64);
     }
 
+    public void unsetDropsFromSnow() {
+        unsetDropFromMask(128);
+    }
+
     private void unsetDropFromMask(int mask) {
         dropsFrom &= ~mask;
     }

src/main/java/com/gmail/nossr50/events/experience/McMMOPlayerLevelChangeEvent.java

@@ -0,0 +1,14 @@
+package com.gmail.nossr50.events.experience;
+
+import org.bukkit.entity.Player;
+
+import com.gmail.nossr50.datatypes.skills.SkillType;
+
+/**
+ * Called when a user levels change
+ */
+public abstract class McMMOPlayerLevelChangeEvent extends McMMOPlayerExperienceEvent {
+    public McMMOPlayerLevelChangeEvent(Player player, SkillType skill) {
+        super(player, skill);
+    }
+}

src/main/java/com/gmail/nossr50/events/experience/McMMOPlayerLevelDownEvent.java

@@ -0,0 +1,36 @@
+package com.gmail.nossr50.events.experience;
+
+import org.bukkit.entity.Player;
+
+import com.gmail.nossr50.datatypes.skills.SkillType;
+
+/**
+ * Called when a user loses levels in a skill
+ */
+public class McMMOPlayerLevelDownEvent extends McMMOPlayerLevelChangeEvent {
+    private int levelsLost;
+
+    public McMMOPlayerLevelDownEvent(Player player, SkillType skill) {
+        super(player, skill);
+        this.levelsLost = 1;
+    }
+
+    public McMMOPlayerLevelDownEvent(Player player, SkillType skill, int levelsLost) {
+        super(player, skill);
+        this.levelsLost = levelsLost;
+    }
+
+    /**
+     * @param levelsLost Set the number of levels lost in this event
+     */
+    public void setLevelsLost(int levelsLost) {
+        this.levelsLost = levelsLost;
+    }
+
+    /**
+     * @return The number of levels lost in this event
+     */
+    public int getLevelsLost() {
+        return levelsLost;
+    }
+}

src/main/java/com/gmail/nossr50/events/experience/McMMOPlayerLevelUpEvent.java

@@ -7,7 +7,7 @@ import com.gmail.nossr50.datatypes.skills.SkillType;
 /**
  * Called when a user levels up in a skill
  */
-public class McMMOPlayerLevelUpEvent extends McMMOPlayerExperienceEvent {
+public class McMMOPlayerLevelUpEvent extends McMMOPlayerLevelChangeEvent {
     private int levelsGained;
 
     public McMMOPlayerLevelUpEvent(Player player, SkillType skill) {
@@ -17,12 +17,11 @@ public class McMMOPlayerLevelUpEvent extends McMMOPlayerExperienceEvent {
 
     public McMMOPlayerLevelUpEvent(Player player, SkillType skill, int levelsGained) {
         super(player, skill);
-        this.setLevelsGained(levelsGained);
+        this.levelsGained = levelsGained;
     }
 
     /**
-     * @param levelsGained 
-     * @return Set the number of levels gained in this event
+     * @param levelsGained Set the number of levels gained in this event
      */
     public void setLevelsGained(int levelsGained) {
         this.levelsGained = levelsGained;

src/main/java/com/gmail/nossr50/events/experience/McMMOPlayerXpGainEvent.java

@@ -23,7 +23,7 @@ public class McMMOPlayerXpGainEvent extends McMMOPlayerExperienceEvent {
     }
 
     /**
-     * @param xpGained int amount of experience gained in this event
+     * @return int amount of experience gained in this event
      */
     @Deprecated
     public int getXpGained() {

src/main/java/com/gmail/nossr50/events/fake/FakeEntityDamageByEntityEvent.java

@@ -7,7 +7,7 @@ import org.bukkit.event.entity.EntityDamageByEntityEvent;
  * Called when mcMMO applies damage from an entity due to special abilities.
  */
 public class FakeEntityDamageByEntityEvent extends EntityDamageByEntityEvent {
-    public FakeEntityDamageByEntityEvent(Entity damager, Entity damagee, DamageCause cause, int damage) {
+    public FakeEntityDamageByEntityEvent(Entity damager, Entity damagee, DamageCause cause, double damage) {
         super(damager, damagee, cause, damage);
     }
 }

src/main/java/com/gmail/nossr50/events/fake/FakeEntityDamageEvent.java

@@ -7,7 +7,7 @@ import org.bukkit.event.entity.EntityDamageEvent;
  * Called when mcMMO applies damage due to special abilities.
  */
 public class FakeEntityDamageEvent extends EntityDamageEvent {
-    public FakeEntityDamageEvent(Entity damagee, DamageCause cause, int damage) {
+    public FakeEntityDamageEvent(Entity damagee, DamageCause cause, double damage) {
         super(damagee, cause, damage);
     }
 }

src/main/java/com/gmail/nossr50/events/fake/FakePlayerFishEvent.java

@@ -0,0 +1,12 @@
+package com.gmail.nossr50.events.fake;
+
+import org.bukkit.entity.Entity;
+import org.bukkit.entity.Fish;
+import org.bukkit.entity.Player;
+import org.bukkit.event.player.PlayerFishEvent;
+
+public class FakePlayerFishEvent extends PlayerFishEvent {
+    public FakePlayerFishEvent(Player player, Entity entity, Fish hookEntity, State state) {
+        super(player, entity, hookEntity, state);
+    }
+}

src/main/java/com/gmail/nossr50/events/hardcore/McMMOPlayerDeathPenaltyEvent.java

@@ -0,0 +1,38 @@
+package com.gmail.nossr50.events.hardcore;
+
+import org.bukkit.entity.Player;
+import org.bukkit.event.Cancellable;
+import org.bukkit.event.HandlerList;
+import org.bukkit.event.player.PlayerEvent;
+
+public class McMMOPlayerDeathPenaltyEvent extends PlayerEvent implements Cancellable {
+    private boolean cancelled;
+
+    public McMMOPlayerDeathPenaltyEvent(Player player) {
+        super(player);
+        this.cancelled = false;
+    }
+
+    /** Following are required for Cancellable **/
+    @Override
+    public boolean isCancelled() {
+        return cancelled;
+    }
+
+    @Override
+    public void setCancelled(boolean cancelled) {
+        this.cancelled = cancelled;
+    }
+
+    /** Rest of file is required boilerplate for custom events **/
+    private static final HandlerList handlers = new HandlerList();
+
+    @Override
+    public HandlerList getHandlers() {
+        return handlers;
+    }
+
+    public static HandlerList getHandlerList() {
+        return handlers;
+    }
+}