NuclearW loves his spacing, also pinging him.

worlds.

Fixes #815

.gitattributes

@@ -0,0 +1,4 @@
+* text=auto
+
+*.png binary
+*.wav binary

Changelog.txt

@@ -7,8 +7,58 @@ Key:
   ! Change
   - Removal
 
-Version 1.4.00-dev
+Version 1.4.03-dev
+ + Added option to advanced.yml to determine the # of enchant levels used when buffing Super Breaker & Giga Drill Breaker
+ + Improved stats display for child skills
+ + Added cooldown between using Chimaera Wings
+ = Fixed bug with Repair not decreasing enchanting levels properly
+ = Fixed bug with Smelting not properly tracking furnaces
+ = Fixed bug with Blast Mining not dropping blocks correctly
+ = Fixed bug with custom blocks not working
+ = Fixed bug with Blast Mining increasing TNT damage.
+ = Fixed bug where Blast Mining was awarding too much XP
+ = Fixed bug where triple drops would award twice the amount of experience in Herbalism and Mining
+ = Fixed bug where Green Thumb would consume wheat instead of seeds
+ = Fixed bug where Green Terra would consume twice the amount of seed when used on crops
+ = Fixed bug where experience would be awarded in Herbalism for some player-placed blocks
+ = Fixed bug where players were unable to salvage leather armor
+ = Fixed bug with repairing using materials with byte metadata
+ = Fixed bug where Fishing was becoming less successful at higher levels
+ = Fixed bug with using Salvage on stacked items.
+ = Fixed bug where the 'mcmmo.commands.ptp.world.all' was registered twice
+ = Fixed bug where Beast Lore wouldn't work on friendly pets
+ = Fixed bug where Deflect was calculated based on the attacker, not the defender. (We really did this time!)
+ ! Moved the Salvage unlock level from config.yml to advanced.yml
+ ! Changed how Chimaera Wings are acquired, you need to craft them now. (By default, use 5 feathers in a shapeless recipe)
+ ! Queue mctop and mcrank commands when using mySQL
+ - Removed option to disable Salvage via the config file. This should be handled via permissions instead.
+ - Removed the option to use Woodcutting without an axe from the config file.
+
+Version 1.4.02
+ + Added API to get the skill and power level caps.
+ = Fixed bug where Deflect was calculated based on the attacker, not the defender
+ = Fixed bug where some skills weren't registering as unlocked until one level later
+ = Fixed bug where the PTP cooldown was being read improperly
+ = Fixed bug where /ptp <accept|toggle|acceptall> where broken
+ = Fixed ClassCastException relating to counter-attack with Swords
+ = Fixed issue with some skill activations not activating enough or activating too much
+
+Version 1.4.01
+ = Fixed bug where trying to use /mctop or /xplock with the Smelting child skill caused NPEs
+ = Fixed bug where /mctop and /mcrank wouldn't show overall power levels for servers using Flatfile
+ = Fixed bug where Smelting would throw consistent errors due to offline players
+ = Fixed bug where repairing an mcMMO ability-buffed item with mcMMO repair could take the enchant but leave the lore tag
+ = Fixed bug where using '/party chat message...' would result in the first word of the message being printed repeatedly
+ = Fixed bug where the wrong flag was being set when taking damage
+ = Fixed bug where the PTP cooldown was set improperly
+ = Fixed bug where ptp permissions weren't being handled properly
+ = Fixed bug where Beast Lore wouldn't work
+ = Fixed bug where Chimaera Wing would always teleport to spawn, even when the player had a valid bed spawn location
+ = Updated locale files
+
+Version 1.4.00
  + Added new Child Skill - Smelting!
+ + Added a version check, admins will get notified when a new version is available!
  + Added new cancellable McMMOPlayerDisarmEvent for Citizens compatibility - fires whenever a player is disarmed.
  + Added config options for Hylian Luck skill
  + Added display values to Unarmed command for Iron Grip
@@ -30,6 +80,27 @@ Version 1.4.00-dev
  + Added Shears, Buckets, Fishing Rods, Flint & Steel, Carrot Sticks, and Bows to the list of items that can be Salvaged
  + Added the "wait" music disc to the default fishing treasures
  + Added "Chinese (Taiwan)" localization files (zh_TW)
+ + Added '/hardcore' and '/vampirism' commands for toggling these modes on or off.
+ + Added Block Cracker to Unarmed's Berserk, turn smooth brick into cracked smooth brick
+ + Added config option to disable automatic zip backups.
+ + Added particle effects for many abilities.
+ + Added '/mcnotify' command to toggle ability notifications on/off
+ + Added ability for config files to automatically update with new keys, and prune out old ones
+ + Added config option to make .new config files instead over writing over old ones when updating
+ + Added "Holy Hound" ability to Taming
+ + Added "Shroom Thumb" ability to Herbalism
+ + Added child.yml config file to choose parents for child skills
+ + Added '/party itemshare <NONE | EQUAL | RANDOM>' command to choose party item share mode
+ + Added '/party itemshare <loot | mining | herbalism | woodcutting> <true | false>' command to control items that are shared
+ + Added itemweights.yml file to determine which items are more valuable for party itemshare
+ = Fixed Green Thumb on wheat not working properly at rank 4
+ = Fixed Green Thumb and Green Terra consuming twice the amount of seed needed
+ = Fixed Green Terra not also checking Green Thumb permissions
+ = Fixed bug where splash potions could raise a player's unarmed level
+ = Fixed bug where fired arrows could raise skill levels other than Archery
+ = Fixed /ptp telporting the target to the player, rather than the other way around.
+ = Fixed Impact reducing the durability of non-armor equipped blocks
+ = Fixed Impact reducing improperly the durability of armors (as a consequence it is now more effective)
  = Fixed multiple commands not working properly on offline players
  = Fixed /mmoedit not giving feedback when modifying another players stats
  = Fixed the guide usage string showing up every time /skillname was called
@@ -51,9 +122,15 @@ Version 1.4.00-dev
  = Fixed Experience.Gains.Mobspawners.Enabled not being used correctly (the check was inverted)
  = Fixed bug where Iron Grip was using the attacker's skill values rather than the defender's.
  = Fixed a bug where /party kick would trigger the PartyChangeEvent for the wrong player
+ = Fixed /party kick not working on offline players
  = Fixed a bug where party join messages weren't displayed
+ = Fixed a bug where a new party leader wasn't appointed, after the previous party leader left
  = Fixed a bug where Disarm and Deflect had wrong values
  = Fixed Magic Hunter (Fishing ability) favoring certain enchants
+ ! Changed our custom chat events to be async
+ ! Changed some config value key names regarding double drops and XP - make sure you copy any custom values to your new config after updating.
+ ! Changed Green Terra blocks to be determined via permissions instead of the config file
+ ! Config files are now backed up even when running in SQL mode
  ! Changed /p and /a to use /partychat and /adminchat as the default command name. The use of /p, /pc, /a, and /ac is still supported.
  ! We're now using Bukkit sounds instead of Spout sounds.
  ! It is now possible to use a negative number for Max_Level in treasures.yml to not use a maximum level, changed default file accordingly
@@ -61,6 +138,7 @@ Version 1.4.00-dev
  ! Changed how Berserk handles not picking up items to avoid listening to PlayerPickupItemEvent
  ! Moved Hylian Luck into a separate listener since it actually cancels the event and shouldn't just be on MONITOR.
  ! Changed how Tree Feller is handled, it should now put less stress on the CPU
+ ! Changed Tree Feller to work on huge mushrooms
  ! Changed Fisherman's Diet and Farmer's Diet to use two seperate config values
  ! Major refactoring - please take note, this WILL break any mcMMO-related plugin not properly hooking into the API.
  ! Changed the way party commands work, use /party ? to check how to use the new commands
@@ -70,10 +148,13 @@ Version 1.4.00-dev
  ! Changed BeastLore: Now also displays offline player names
  ! Changed backup task to include ALL config files
  ! Deprecated most functions in ExperienceAPI, replaced them with identical versions that use a String for the SkillName rather than the SkillType enum values
+ ! Changed Super Breaker & Giga Drill Breaker to be an enchantment-based boost, rather than an instabreak. Option exists in hidden.yml to change this to an potion-based buff.
+ ! Changed locales to fall back on English when translated strings cannot be found.
  - Removed Party "master/apprentice" system. Replaced with the new party XP share feature.
  - Removed unused "healthbar" files from the resources
  - Removed config options for disabling commands from the config.yml. This should instead be done through permissions.
- - Removed Chimaera Wing
+ - Removed /mcc command. Replaced with /mcmmo [?|help|commands]
+ - Removed options to allow Mining & Excavation without a tool due to the changes to their abilities
 
 Version 1.3.14
  + Added new Hylian Luck skill to Herbalism.

README.creole

@@ -1,28 +0,0 @@
-== mcMMO
-**The RPG lovers mod**
-
-=== Dev builds
-http://ci.mcmmo.info Download the latest dev build of mcMMO here.
-
-=== 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.
-
-=== About the Developer
-I've always wanted to make games and in the last year I decided to take a swing at developing Minecraft mods as a platform to teach myself programming, the biggest project I have made to date is mcMMO. I went from knowing nothing about Java to what I know now purely from modding Minecraft, and I plan to move onto game development in the not so distant future.
-
-I take design very seriously, I am not the kind of person who can be satisfied giving a project anything less than my all. As you will see reflected in the quality of the mods I make, I take great care in my work.
-
-Hearing that people enjoy mcMMO and seeing the daily youtube videos about my mod has become a joy, I really can't believe how popular my mod has gotten!
-
-=== Compiling
-
-Required Libraries:
-* Spout API
-* JUnit
-
-Required to Run:
-* Bukkit
-
-http://dev.bukkit.org/server-mods/mcmmo for more up to date information.

README.md

@@ -0,0 +1,47 @@
+# mcMMO
+## The RPG lovers mod
+
+### Dev builds
+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.
+
+## About the Team
+
+mcMMO is currently developed by a team of individuals from all over the world.
+### Glorious Leader
+[![gmcferrin](http://www.gravatar.com/avatar/b64c52daf25d206b27650788b5813b7b.png)]
+(https://github.com/gmcferrin)
+
+### Developers
+[![bm01](http://www.gravatar.com/avatar/ec8146f5358177f12e9a252271bbc391.png)]
+(https://github.com/bm01)
+[![Glitchfinder](http://www.gravatar.com/avatar/5aa4cce22f72ae9c002ecec30f061d00.png)]
+(https://github.com/Glitchfinder)
+[![nossr50](http://www.gravatar.com/avatar/f2ee41eedfd645fb4a3a2c8f6cb1b18c.png)]
+(https://github.com/nossr50)
+[![NuclearW](http://www.gravatar.com/avatar/90926bdcf1c8a75918df5ea5fa801ce6.png)]
+(https://github.com/NuclearW)
+[![shatteredbeam](http://www.gravatar.com/avatar/cad3b5d7d39cf5387afb87f494389610.png)]
+(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)]
+(https://github.com/t00thpick1)
+
+## Compiling
+
+mcMMO uses Maven 3 to manage dependancies, packaging, and shading of necessary classes; Maven 3 is required to compile mcMMO.
+
+The typical command used to build mcMMO is: mvn clean package install
+
+Required Libraries:
+* Spout API
+* JUnit
+* Metrics
+* 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.00-beta2</version>
+    <version>1.4.03-dev1</version>
     <name>mcMMO</name>
     <url>https://github.com/mcMMO-Dev/mcMMO</url>
     <issueManagement>
@@ -99,13 +99,13 @@
                 <configuration>
                     <artifactSet>
                         <includes>
-                            <include>org.mcstats.bukkit:metrics</include>
+                            <include>com.turt2live.metrics:MetricsExtension</include>
                         </includes>
                     </artifactSet>
                     <relocations>
                         <relocation>
-                            <pattern>org.mcstats</pattern>
+                            <pattern>com.turt2live.metrics</pattern>
-                            <shadedPattern>com.gmail.nossr50.util.mcstats</shadedPattern>
+                            <shadedPattern>com.gmail.nossr50.metrics.mcstats</shadedPattern>
                         </relocation>
                     </relocations>
                 </configuration>
@@ -129,31 +129,16 @@
     </build>
     <repositories>
         <repository>
-            <snapshots>
-                <enabled>true</enabled>
-                <updatePolicy>always</updatePolicy>
-                <checksumPolicy>fail</checksumPolicy>
-            </snapshots>
             <id>bukkit-repo</id>
             <url>http://repo.bukkit.org/content/groups/public/</url>
         </repository>
         <repository>
-            <snapshots>
-                <enabled>true</enabled>
-                <updatePolicy>always</updatePolicy>
-                <checksumPolicy>fail</checksumPolicy>
-            </snapshots>
             <id>spout-repo</id>
             <url>http://nexus.spout.org/content/groups/public/</url>
         </repository>
         <repository>
-            <snapshots>
+            <id>Plugin MetricsExtension</id>
-                <enabled>true</enabled>
+            <url>http://repo.turt2live.com</url>
-                <updatePolicy>always</updatePolicy>
-                <checksumPolicy>fail</checksumPolicy>
-            </snapshots>
-            <id>Plugin Metrics</id>
-            <url>http://repo.mcstats.org/content/repositories/public</url>
         </repository>
     </repositories>
     <dependencies>
@@ -178,9 +163,10 @@
             <scope>test</scope>
         </dependency>
         <dependency>
-            <groupId>org.mcstats.bukkit</groupId>
+            <groupId>com.turt2live.metrics</groupId>
-            <artifactId>metrics</artifactId>
+            <artifactId>MetricsExtension</artifactId>
-            <version>R6</version>
+            <version>0.0.2-SNAPSHOT</version>
+            <type>jar</type>
             <scope>compile</scope>
         </dependency>
     </dependencies>

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

@@ -2,46 +2,46 @@ package com.gmail.nossr50.api;
 
 import org.bukkit.entity.Player;
 
-import com.gmail.nossr50.datatypes.PlayerProfile;
+import com.gmail.nossr50.datatypes.player.McMMOPlayer;
-import com.gmail.nossr50.skills.utilities.AbilityType;
+import com.gmail.nossr50.datatypes.skills.AbilityType;
-import com.gmail.nossr50.util.Users;
+import com.gmail.nossr50.util.player.UserManager;
 
 public final class AbilityAPI {
     private AbilityAPI() {}
 
     public static boolean berserkEnabled(Player player) {
-        return Users.getPlayer(player).getProfile().getAbilityMode(AbilityType.BERSERK);
+        return UserManager.getPlayer(player).getAbilityMode(AbilityType.BERSERK);
     }
 
     public static boolean gigaDrillBreakerEnabled(Player player) {
-        return Users.getPlayer(player).getProfile().getAbilityMode(AbilityType.GIGA_DRILL_BREAKER);
+        return UserManager.getPlayer(player).getAbilityMode(AbilityType.GIGA_DRILL_BREAKER);
     }
 
     public static boolean greenTerraEnabled(Player player) {
-        return Users.getPlayer(player).getProfile().getAbilityMode(AbilityType.GREEN_TERRA);
+        return UserManager.getPlayer(player).getAbilityMode(AbilityType.GREEN_TERRA);
     }
 
     public static boolean serratedStrikesEnabled(Player player) {
-        return Users.getPlayer(player).getProfile().getAbilityMode(AbilityType.SERRATED_STRIKES);
+        return UserManager.getPlayer(player).getAbilityMode(AbilityType.SERRATED_STRIKES);
     }
 
     public static boolean skullSplitterEnabled(Player player) {
-        return Users.getPlayer(player).getProfile().getAbilityMode(AbilityType.SKULL_SPLIITER);
+        return UserManager.getPlayer(player).getAbilityMode(AbilityType.SKULL_SPLITTER);
     }
 
     public static boolean superBreakerEnabled(Player player) {
-        return Users.getPlayer(player).getProfile().getAbilityMode(AbilityType.SUPER_BREAKER);
+        return UserManager.getPlayer(player).getAbilityMode(AbilityType.SUPER_BREAKER);
     }
 
     public static boolean treeFellerEnabled(Player player) {
-        return Users.getPlayer(player).getProfile().getAbilityMode(AbilityType.TREE_FELLER);
+        return UserManager.getPlayer(player).getAbilityMode(AbilityType.TREE_FELLER);
     }
 
     public static boolean isAnyAbilityEnabled(Player player) {
-        PlayerProfile profile = Users.getPlayer(player).getProfile();
+        McMMOPlayer mcMMOPlayer = UserManager.getPlayer(player);
 
         for (AbilityType ability : AbilityType.values()) {
-            if (profile.getAbilityMode(ability)) {
+            if (mcMMOPlayer.getAbilityMode(ability)) {
                 return true;
             }
         }

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

@@ -5,7 +5,7 @@ import org.bukkit.plugin.Plugin;
 
 import com.gmail.nossr50.chat.ChatManager;
 import com.gmail.nossr50.party.PartyManager;
-import com.gmail.nossr50.util.Users;
+import com.gmail.nossr50.util.player.UserManager;
 
 public final class ChatAPI {
     private ChatAPI() {}
@@ -104,7 +104,7 @@ public final class ChatAPI {
      * @return true if the player is using party chat, false otherwise
      */
     public static boolean isUsingPartyChat(Player player) {
-        return Users.getPlayer(player).getPartyChatMode();
+        return UserManager.getPlayer(player).getPartyChatMode();
     }
 
     /**
@@ -114,7 +114,7 @@ public final class ChatAPI {
      * @return true if the player is using party chat, false otherwise
      */
     public static boolean isUsingPartyChat(String playerName) {
-        return Users.getPlayer(playerName).getPartyChatMode();
+        return UserManager.getPlayer(playerName).getPartyChatMode();
     }
 
     /**
@@ -124,7 +124,7 @@ public final class ChatAPI {
      * @return true if the player is using admin chat, false otherwise
      */
     public static boolean isUsingAdminChat(Player player) {
-        return Users.getPlayer(player).getAdminChatMode();
+        return UserManager.getPlayer(player).getAdminChatMode();
     }
 
     /**
@@ -134,6 +134,6 @@ public final class ChatAPI {
      * @return true if the player is using admin chat, false otherwise
      */
     public static boolean isUsingAdminChat(String playerName) {
-        return Users.getPlayer(playerName).getAdminChatMode();
+        return UserManager.getPlayer(playerName).getAdminChatMode();
     }
 }

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

@@ -3,25 +3,13 @@ package com.gmail.nossr50.api;
 import org.bukkit.entity.Player;
 
 import com.gmail.nossr50.config.Config;
-import com.gmail.nossr50.skills.utilities.SkillTools;
+import com.gmail.nossr50.datatypes.skills.SkillType;
-import com.gmail.nossr50.skills.utilities.SkillType;
+import com.gmail.nossr50.util.player.UserManager;
-import com.gmail.nossr50.util.Users;
+import com.gmail.nossr50.util.skills.SkillUtils;
 
 public final class ExperienceAPI {
     private ExperienceAPI() {}
 
-    /**
-     * Check the XP of a player. This should be called after giving XP to process level-ups.
-     *
-     * @param player The player to check
-     * @param skillType The skill to check
-     * @deprecated Calling this function is no longer needed and should be avoided
-     */
-    @Deprecated
-    private static void checkXP(Player player, SkillType skillType) {
-        SkillTools.xpCheckSkill(skillType, player, Users.getProfile(player));
-    }
-
     /**
      * Adds raw XP to the player.
      * </br>
@@ -32,9 +20,9 @@ public final class ExperienceAPI {
      * @param XP The amount of XP to add
      * @deprecated Use {@link #addRawXP(Player, String, int)} instead
      */
-   @Deprecated
+    @Deprecated
     public static void addRawXP(Player player, SkillType skillType, int XP) {
-        Users.getPlayer(player).applyXpGain(skillType, XP);
+        UserManager.getPlayer(player).applyXpGain(skillType, XP);
     }
 
     /**
@@ -47,7 +35,7 @@ public final class ExperienceAPI {
      * @param XP The amount of XP to add
      */
     public static void addRawXP(Player player, String skillType, int XP) {
-        Users.getPlayer(player).applyXpGain(SkillType.getSkill(skillType), XP);
+        UserManager.getPlayer(player).applyXpGain(SkillType.getSkill(skillType), XP);
     }
 
     /**
@@ -62,7 +50,7 @@ public final class ExperienceAPI {
      */
     @Deprecated
     public static void addMultipliedXP(Player player, SkillType skillType, int XP) {
-        Users.getPlayer(player).applyXpGain(skillType, (int) (XP * Config.getInstance().getExperienceGainsGlobalMultiplier()));
+        UserManager.getPlayer(player).applyXpGain(skillType, (int) (XP * Config.getInstance().getExperienceGainsGlobalMultiplier()));
     }
 
     /**
@@ -75,7 +63,7 @@ public final class ExperienceAPI {
      * @param XP The amount of XP to add
      */
     public static void addMultipliedXP(Player player, String skillType, int XP) {
-        Users.getPlayer(player).applyXpGain(SkillType.getSkill(skillType), (int) (XP * Config.getInstance().getExperienceGainsGlobalMultiplier()));
+        UserManager.getPlayer(player).applyXpGain(SkillType.getSkill(skillType), (int) (XP * Config.getInstance().getExperienceGainsGlobalMultiplier()));
     }
 
     /**
@@ -90,7 +78,7 @@ public final class ExperienceAPI {
      */
     @Deprecated
     public static void addXP(Player player, SkillType skillType, int XP) {
-        Users.getPlayer(player).beginXpGain(skillType, XP);
+        UserManager.getPlayer(player).beginXpGain(skillType, XP);
     }
 
     /**
@@ -103,7 +91,7 @@ public final class ExperienceAPI {
      * @param XP The amount of XP to add
      */
     public static void addXP(Player player, String skillType, int XP) {
-        Users.getPlayer(player).beginXpGain(SkillType.getSkill(skillType), XP);
+        UserManager.getPlayer(player).beginXpGain(SkillType.getSkill(skillType), XP);
     }
 
     /**
@@ -118,7 +106,7 @@ public final class ExperienceAPI {
      */
     @Deprecated
     public static int getXP(Player player, SkillType skillType) {
-        return Users.getPlayer(player).getProfile().getSkillXpLevel(skillType);
+        return UserManager.getPlayer(player).getProfile().getSkillXpLevel(skillType);
     }
 
     /**
@@ -131,7 +119,7 @@ public final class ExperienceAPI {
      * @return the amount of XP in a given skill
      */
     public static int getXP(Player player, String skillType) {
-        return Users.getPlayer(player).getProfile().getSkillXpLevel(SkillType.getSkill(skillType));
+        return UserManager.getPlayer(player).getProfile().getSkillXpLevel(SkillType.getSkill(skillType));
     }
 
     /**
@@ -146,7 +134,7 @@ public final class ExperienceAPI {
      */
     @Deprecated
     public static int getXPToNextLevel(Player player, SkillType skillType) {
-        return Users.getPlayer(player).getProfile().getXpToLevel(skillType);
+        return UserManager.getPlayer(player).getProfile().getXpToLevel(skillType);
     }
 
     /**
@@ -159,7 +147,7 @@ public final class ExperienceAPI {
      * @return the amount of XP left before leveling up a specifc skill
      */
     public static int getXPToNextLevel(Player player, String skillType) {
-        return Users.getPlayer(player).getProfile().getXpToLevel(SkillType.getSkill(skillType));
+        return UserManager.getPlayer(player).getProfile().getXpToLevel(SkillType.getSkill(skillType));
     }
 
     /**
@@ -174,7 +162,7 @@ public final class ExperienceAPI {
      * @deprecated Use addLevel(Player, SKillType, int) instead
      */
     public static void addLevel(Player player, SkillType skillType, int levels, boolean notify) {
-        Users.getProfile(player).addLevels(skillType, levels);
+        UserManager.getProfile(player).addLevels(skillType, levels);
 
         if (notify) {
             checkXP(player, skillType);
@@ -193,7 +181,7 @@ public final class ExperienceAPI {
      */
     @Deprecated
     public static void addLevel(Player player, SkillType skillType, int levels) {
-        Users.getPlayer(player).getProfile().addLevels(skillType, levels);
+        UserManager.getPlayer(player).getProfile().addLevels(skillType, levels);
     }
 
     /**
@@ -206,7 +194,7 @@ public final class ExperienceAPI {
      * @param levels Number of levels to add
      */
     public static void addLevel(Player player, String skillType, int levels) {
-        Users.getPlayer(player).getProfile().addLevels(SkillType.getSkill(skillType), levels);
+        UserManager.getPlayer(player).getProfile().addLevels(SkillType.getSkill(skillType), levels);
     }
 
     /**
@@ -221,7 +209,7 @@ public final class ExperienceAPI {
      */
     @Deprecated
     public static int getLevel(Player player, SkillType skillType) {
-        return Users.getPlayer(player).getProfile().getSkillLevel(skillType);
+        return UserManager.getPlayer(player).getProfile().getSkillLevel(skillType);
     }
 
     /**
@@ -234,7 +222,7 @@ public final class ExperienceAPI {
      * @return the level of a given skill
      */
     public static int getLevel(Player player, String skillType) {
-        return Users.getPlayer(player).getProfile().getSkillLevel(SkillType.getSkill(skillType));
+        return UserManager.getPlayer(player).getProfile().getSkillLevel(SkillType.getSkill(skillType));
     }
 
     /**
@@ -246,7 +234,30 @@ public final class ExperienceAPI {
      * @return the power level of the player
      */
     public static int getPowerLevel(Player player) {
-        return Users.getPlayer(player).getPowerLevel();
+        return UserManager.getPlayer(player).getPowerLevel();
+    }
+
+    /**
+     * Get the level cap of a specific skill.
+     * </br>
+     * This function is designed for API usage.
+     *
+     * @param skillType The skill to get the level cap for
+     * @return the level cap of a given skill
+     */
+    public static int getLevelCap(String skillType) {
+        return Config.getInstance().getLevelCap(SkillType.getSkill(skillType));
+    }
+
+    /**
+     * Get the power level cap.
+     * </br>
+     * This function is designed for API usage.
+     *
+     * @return the power level cap of a given skill
+     */
+    public static int getPowerLevelCap() {
+        return Config.getInstance().getPowerLevelCap();
     }
 
     /**
@@ -261,7 +272,7 @@ public final class ExperienceAPI {
      */
     @Deprecated
     public static void setLevel(Player player, SkillType skillType, int skillLevel) {
-        Users.getPlayer(player).getProfile().modifySkill(skillType, skillLevel);
+        UserManager.getPlayer(player).getProfile().modifySkill(skillType, skillLevel);
     }
 
     /**
@@ -274,7 +285,7 @@ public final class ExperienceAPI {
      * @param skillLevel The value to set the level to
      */
     public static void setLevel(Player player, String skillType, int skillLevel) {
-        Users.getPlayer(player).getProfile().modifySkill(SkillType.getSkill(skillType), skillLevel);
+        UserManager.getPlayer(player).getProfile().modifySkill(SkillType.getSkill(skillType), skillLevel);
     }
 
     /**
@@ -289,7 +300,7 @@ public final class ExperienceAPI {
      */
     @Deprecated
     public static void setXP(Player player, SkillType skillType, int newValue) {
-        Users.getPlayer(player).getProfile().setSkillXpLevel(skillType, newValue);
+        UserManager.getPlayer(player).getProfile().setSkillXpLevel(skillType, newValue);
     }
 
     /**
@@ -302,7 +313,7 @@ public final class ExperienceAPI {
      * @param newValue The value to set the XP to
      */
     public static void setXP(Player player, String skillType, int newValue) {
-        Users.getPlayer(player).getProfile().setSkillXpLevel(SkillType.getSkill(skillType), newValue);
+        UserManager.getPlayer(player).getProfile().setSkillXpLevel(SkillType.getSkill(skillType), newValue);
     }
 
     /**
@@ -317,7 +328,7 @@ public final class ExperienceAPI {
      */
     @Deprecated
     public static void removeXP(Player player, SkillType skillType, int xp) {
-        Users.getPlayer(player).getProfile().removeXp(skillType, xp);
+        UserManager.getPlayer(player).getProfile().removeXp(skillType, xp);
     }
 
     /**
@@ -330,6 +341,18 @@ public final class ExperienceAPI {
      * @param xp The amount of XP to remove
      */
     public static void removeXP(Player player, String skillType, int xp) {
-        Users.getPlayer(player).getProfile().removeXp(SkillType.getSkill(skillType), xp);
+        UserManager.getPlayer(player).getProfile().removeXp(SkillType.getSkill(skillType), xp);
+    }
+
+    /**
+     * Check the XP of a player. This should be called after giving XP to process level-ups.
+     *
+     * @param player The player to check
+     * @param skillType The skill to check
+     * @deprecated Calling this function is no longer needed and should be avoided
+     */
+    @Deprecated
+    private static void checkXP(Player player, SkillType skillType) {
+        SkillUtils.xpCheckSkill(skillType, player, UserManager.getProfile(player));
     }
 }

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

@@ -1,12 +1,14 @@
 package com.gmail.nossr50.api;
 
+import java.util.ArrayList;
 import java.util.List;
 
+import org.bukkit.OfflinePlayer;
 import org.bukkit.entity.Player;
 
-import com.gmail.nossr50.party.Party;
+import com.gmail.nossr50.datatypes.party.Party;
 import com.gmail.nossr50.party.PartyManager;
-import com.gmail.nossr50.util.Users;
+import com.gmail.nossr50.util.player.UserManager;
 
 public final class PartyAPI {
     private PartyAPI() {}
@@ -20,7 +22,7 @@ public final class PartyAPI {
      * @return the name of the player's party
      */
     public static String getPartyName(Player player) {
-        return Users.getPlayer(player).getParty().getName();
+        return UserManager.getPlayer(player).getParty().getName();
     }
 
     /**
@@ -32,7 +34,7 @@ public final class PartyAPI {
      * @return true if the player is in a party, false otherwise
      */
     public static boolean inParty(Player player) {
-        return Users.getPlayer(player).inParty();
+        return UserManager.getPlayer(player).inParty();
     }
 
     /**
@@ -69,15 +71,14 @@ public final class PartyAPI {
      */
     public static void addToParty(Player player, String partyName) {
         Party party = PartyManager.getParty(partyName);
-        String playerName = player.getName();
 
         if (party == null) {
             party = new Party();
             party.setName(partyName);
-            party.setLeader(playerName);
+            party.setLeader(player.getName());
         }
 
-        PartyManager.addToParty(playerName, Users.getPlayer(player), party);
+        PartyManager.addToParty(player, UserManager.getPlayer(player), party);
     }
 
     /**
@@ -88,7 +89,7 @@ public final class PartyAPI {
      * @param player The player to remove
      */
     public static void removeFromParty(Player player) {
-        PartyManager.removeFromParty(player.getName(), Users.getPlayer(player).getParty());
+        PartyManager.removeFromParty(player, UserManager.getPlayer(player).getParty());
     }
 
     /**
@@ -122,8 +123,28 @@ public final class PartyAPI {
      *
      * @param player The player to check
      * @return all the players in the player's party
+     * @deprecated
      */
+    @Deprecated
     public static List<String> getAllMembers(Player player) {
+        List<String> memberNames = new ArrayList<String>();
+
+        for (OfflinePlayer member : PartyManager.getAllMembers(player)) {
+            memberNames.add(member.getName());
+        }
+
+        return memberNames;
+    }
+
+    /**
+     * Get a list of all players in this player's party.
+     * </br>
+     * This function is designed for API usage.
+     *
+     * @param player The player to check
+     * @return all the players in the player's party
+     */
+    public static List<OfflinePlayer> getOnlineAndOfflineMembers(Player player) {
         return PartyManager.getAllMembers(player);
     }
 

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

@@ -0,0 +1,29 @@
+package com.gmail.nossr50.api;
+
+import org.bukkit.entity.Player;
+
+import com.gmail.nossr50.config.spout.SpoutConfig;
+import com.gmail.nossr50.datatypes.spout.huds.HudType;
+import com.gmail.nossr50.util.player.UserManager;
+
+public class SpoutHudAPI {
+    private SpoutHudAPI() {}
+
+    /**
+     * Disable the mcMMO XP bar for a player.
+     * </br>
+     * This function is designed for API usage.
+     */
+    public static void disableXpBar(Player player) {
+        UserManager.getPlayer(player).getProfile().setHudType(HudType.DISABLED);
+    }
+
+    /**
+     * Disable the mcMMO XP bar for the server.
+     * </br>
+     * This function is designed for API usage.
+     */
+    public static void disableXpBar() {
+        SpoutConfig.getInstance().setXPBarEnabled(false);
+    }
+}

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

@@ -5,14 +5,14 @@ import java.util.List;
 
 import org.bukkit.inventory.ItemStack;
 
-import com.gmail.nossr50.skills.utilities.ToolType;
+import com.gmail.nossr50.datatypes.skills.ToolType;
 
 public final class SpoutToolsAPI {
-    public static final List<ItemStack> spoutSwords = new ArrayList<ItemStack>();
+    public static final List<ItemStack> spoutSwords   = new ArrayList<ItemStack>();
-    public static final List<ItemStack> spoutAxes = new ArrayList<ItemStack>();
+    public static final List<ItemStack> spoutAxes     = new ArrayList<ItemStack>();
     public static final List<ItemStack> spoutPickaxes = new ArrayList<ItemStack>();
-    public static final List<ItemStack> spoutHoes = new ArrayList<ItemStack>();
+    public static final List<ItemStack> spoutHoes     = new ArrayList<ItemStack>();
-    public static final List<ItemStack> spoutShovels = new ArrayList<ItemStack>();
+    public static final List<ItemStack> spoutShovels  = new ArrayList<ItemStack>();
 
     private SpoutToolsAPI() {}
 
@@ -26,28 +26,28 @@ public final class SpoutToolsAPI {
      */
     public static void addCustomTool(ItemStack spoutTool, ToolType type) {
         switch (type) {
-        case AXE:
+            case AXE:
-            spoutAxes.add(spoutTool);
+                spoutAxes.add(spoutTool);
-            break;
+                break;
 
-        case HOE:
+            case HOE:
-            spoutHoes.add(spoutTool);
+                spoutHoes.add(spoutTool);
-            break;
+                break;
 
-        case PICKAXE:
+            case PICKAXE:
-            spoutPickaxes.add(spoutTool);
+                spoutPickaxes.add(spoutTool);
-            break;
+                break;
 
-        case SHOVEL:
+            case SHOVEL:
-            spoutShovels.add(spoutTool);
+                spoutShovels.add(spoutTool);
-            break;
+                break;
 
-        case SWORD:
+            case SWORD:
-            spoutSwords.add(spoutTool);
+                spoutSwords.add(spoutTool);
-            break;
+                break;
 
-        default:
+            default:
-            break;
+                break;
         }
     }
 }

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

@@ -6,58 +6,58 @@ 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.locale.LocaleLoader;
-import com.gmail.nossr50.party.Party;
-import com.gmail.nossr50.util.Permissions;
 
 public final class ChatManager {
     public ChatManager () {}
 
-    public static void handleAdminChat(Plugin plugin, String playerName, String displayName, String message) {
+    public static void handleAdminChat(Plugin plugin, String playerName, String displayName, String message, boolean isAsync) {
-        McMMOAdminChatEvent chatEvent = new McMMOAdminChatEvent(plugin, playerName, displayName, message);
+        McMMOAdminChatEvent chatEvent = new McMMOAdminChatEvent(plugin, playerName, displayName, message, isAsync);
         mcMMO.p.getServer().getPluginManager().callEvent(chatEvent);
 
         if (chatEvent.isCancelled()) {
             return;
         }
 
-        if(Config.getInstance().getAdminDisplayNames())
+        if (Config.getInstance().getAdminDisplayNames()) {
             displayName = chatEvent.getDisplayName();
-        else
+        }
+        else {
             displayName = chatEvent.getSender();
+        }
 
         String adminMessage = chatEvent.getMessage();
 
-        for (Player otherPlayer : mcMMO.p.getServer().getOnlinePlayers()) {
+        mcMMO.p.getServer().broadcast(LocaleLoader.getString("Commands.AdminChat.Prefix", displayName) + adminMessage, "mcmmo.chat.adminchat");
-            if (Permissions.adminChat(otherPlayer) || otherPlayer.isOp()) {
-                otherPlayer.sendMessage(LocaleLoader.getString("Commands.AdminChat.Prefix", displayName) + adminMessage);
-            }
-        }
-
-        displayName = ChatColor.stripColor(displayName);
-        mcMMO.p.getLogger().info("[A]<" + displayName + "> " + adminMessage);
     }
 
     public static void handleAdminChat(Plugin plugin, String senderName, String message) {
         handleAdminChat(plugin, senderName, senderName, message);
     }
 
-    public static void handlePartyChat(Plugin plugin, Party party, String playerName, String displayName, String message) {
+    public static void handleAdminChat(Plugin plugin, String playerName, String displayName, String message) {
+        handleAdminChat(plugin, playerName, displayName, message, false);
+    }
+
+    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);
+        McMMOPartyChatEvent chatEvent = new McMMOPartyChatEvent(plugin, playerName, displayName, partyName, message, isAsync);
         mcMMO.p.getServer().getPluginManager().callEvent(chatEvent);
 
         if (chatEvent.isCancelled()) {
             return;
         }
 
-        if(Config.getInstance().getPartyDisplayNames())
+        if (Config.getInstance().getPartyDisplayNames()) {
             displayName = chatEvent.getDisplayName();
-        else
+        }
+        else {
             displayName = chatEvent.getSender();
+        }
 
         String partyMessage = chatEvent.getMessage();
 
@@ -65,11 +65,14 @@ public final class ChatManager {
             member.sendMessage(LocaleLoader.getString("Commands.Party.Chat.Prefix", displayName) + partyMessage);
         }
 
-        displayName = ChatColor.stripColor(displayName);
+        mcMMO.p.getLogger().info("[P](" + partyName + ")" + "<" + ChatColor.stripColor(displayName) + "> " + partyMessage);
-        mcMMO.p.getLogger().info("[P](" + partyName + ")" + "<" + displayName + "> " + partyMessage);
     }
 
     public static void handlePartyChat(Plugin plugin, Party party, String senderName, String message) {
         handlePartyChat(plugin, party, senderName, senderName, message);
     }
+
+    public static void handlePartyChat(Plugin plugin, Party party, String playerName, String displayName, String message) {
+        handlePartyChat(plugin, party, playerName, displayName, message, false);
+    }
 }

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

@@ -1,6 +1,6 @@
 package com.gmail.nossr50.chat;
 
-import com.gmail.nossr50.datatypes.McMMOPlayer;
+import com.gmail.nossr50.datatypes.player.McMMOPlayer;
 import com.gmail.nossr50.locale.LocaleLoader;
 
 public enum ChatMode {
@@ -10,53 +10,53 @@ public enum ChatMode {
     private String enabledMessage;
     private String disabledMessage;
 
-    private ChatMode (String enabledMessage, String disabledMessage) {
+    private ChatMode(String enabledMessage, String disabledMessage) {
-        this.enabledMessage = enabledMessage;
+        this.enabledMessage  = enabledMessage;
         this.disabledMessage = disabledMessage;
     }
 
     public boolean isEnabled(McMMOPlayer mcMMOPlayer) {
         switch (this) {
-        case ADMIN:
+            case ADMIN:
-            return mcMMOPlayer.getAdminChatMode();
+                return mcMMOPlayer.getAdminChatMode();
 
-        case PARTY:
+            case PARTY:
-            return mcMMOPlayer.getPartyChatMode();
+                return mcMMOPlayer.getPartyChatMode();
 
-        default:
+            default:
-            return false;
+                return false;
         }
     }
 
     public void disable(McMMOPlayer mcMMOPlayer) {
         switch (this) {
-        case ADMIN:
+            case ADMIN:
-            mcMMOPlayer.setAdminChat(false);
+                mcMMOPlayer.setAdminChat(false);
-            return;
+                return;
 
-        case PARTY:
+            case PARTY:
-            mcMMOPlayer.setPartyChat(false);
+                mcMMOPlayer.setPartyChat(false);
-            return;
+                return;
 
-        default:
+            default:
-            return;
+                return;
         }
     }
 
     public void enable(McMMOPlayer mcMMOPlayer) {
         switch (this) {
-        case ADMIN:
+            case ADMIN:
-            mcMMOPlayer.setAdminChat(true);
+                mcMMOPlayer.setAdminChat(true);
-            mcMMOPlayer.setPartyChat(false);
+                mcMMOPlayer.setPartyChat(false);
-            return;
+                return;
 
-        case PARTY:
+            case PARTY:
-            mcMMOPlayer.setPartyChat(true);
+                mcMMOPlayer.setPartyChat(true);
-            mcMMOPlayer.setAdminChat(false);
+                mcMMOPlayer.setAdminChat(false);
-            return;
+                return;
 
-        default:
+            default:
-            return;
+                return;
         }
     }
 

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

@@ -0,0 +1,79 @@
+package com.gmail.nossr50.commands;
+
+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.player.McMMOPlayer;
+import com.gmail.nossr50.datatypes.player.PlayerProfile;
+import com.gmail.nossr50.locale.LocaleLoader;
+import com.gmail.nossr50.util.Permissions;
+import com.gmail.nossr50.util.player.UserManager;
+
+public class McabilityCommand implements CommandExecutor {
+    @Override
+    public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
+        McMMOPlayer mcMMOPlayer;
+
+        switch (args.length) {
+            case 0:
+                if (!Permissions.mcability(sender)) {
+                    sender.sendMessage(command.getPermissionMessage());
+                    return true;
+                }
+
+                mcMMOPlayer = UserManager.getPlayer((Player) sender);
+
+                if (mcMMOPlayer.getAbilityUse()) {
+                    sender.sendMessage(LocaleLoader.getString("Commands.Ability.Off"));
+                }
+                else {
+                    sender.sendMessage(LocaleLoader.getString("Commands.Ability.On"));
+                }
+
+                mcMMOPlayer.toggleAbilityUse();
+                return true;
+
+            case 1:
+                if (!Permissions.mcabilityOthers(sender)) {
+                    sender.sendMessage(command.getPermissionMessage());
+                    return true;
+                }
+
+                mcMMOPlayer = UserManager.getPlayer(args[0]);
+
+                if (mcMMOPlayer == null) {
+                    PlayerProfile playerProfile = new PlayerProfile(args[0], false);
+
+                    if (!playerProfile.isLoaded()) {
+                        sender.sendMessage(LocaleLoader.getString("Commands.DoesNotExist"));
+                        return true;
+                    }
+
+                    sender.sendMessage(LocaleLoader.getString("Commands.Offline"));
+                    return true;
+                }
+
+                Player player = mcMMOPlayer.getPlayer();
+
+                if (!player.isOnline()) {
+                    sender.sendMessage(LocaleLoader.getString("Commands.Offline"));
+                    return true;
+                }
+
+                if (mcMMOPlayer.getAbilityUse()) {
+                    player.sendMessage(LocaleLoader.getString("Commands.Ability.Off"));
+                }
+                else {
+                    player.sendMessage(LocaleLoader.getString("Commands.Ability.On"));
+                }
+
+                mcMMOPlayer.toggleAbilityUse();
+                return true;
+
+            default:
+                return false;
+        }
+    }
+}

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

@@ -0,0 +1,88 @@
+package com.gmail.nossr50.commands;
+
+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.player.McMMOPlayer;
+import com.gmail.nossr50.datatypes.player.PlayerProfile;
+import com.gmail.nossr50.locale.LocaleLoader;
+import com.gmail.nossr50.util.Permissions;
+import com.gmail.nossr50.util.player.UserManager;
+
+public class McgodCommand implements CommandExecutor {
+    @Override
+    public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
+        McMMOPlayer mcMMOPlayer;
+
+        switch (args.length) {
+            case 0:
+                if (!Permissions.mcgod(sender)) {
+                    sender.sendMessage(command.getPermissionMessage());
+                    return true;
+                }
+
+                if (!(sender instanceof Player)) {
+                    return false;
+                }
+
+                mcMMOPlayer = UserManager.getPlayer((Player) sender);
+
+                if (mcMMOPlayer == null) {
+                    sender.sendMessage(LocaleLoader.getString("Commands.DoesNotExist"));
+                    return true;
+                }
+
+                if (mcMMOPlayer.getGodMode()) {
+                    sender.sendMessage(LocaleLoader.getString("Commands.GodMode.Disabled"));
+                }
+                else {
+                    sender.sendMessage(LocaleLoader.getString("Commands.GodMode.Enabled"));
+                }
+
+                mcMMOPlayer.toggleGodMode();
+                return true;
+
+            case 1:
+                if (!Permissions.mcgodOthers(sender)) {
+                    sender.sendMessage(command.getPermissionMessage());
+                    return true;
+                }
+
+                mcMMOPlayer = UserManager.getPlayer(args[0]);
+
+                if (mcMMOPlayer == null) {
+                    PlayerProfile playerProfile = new PlayerProfile(args[0], false);
+
+                    if (!playerProfile.isLoaded()) {
+                        sender.sendMessage(LocaleLoader.getString("Commands.DoesNotExist"));
+                        return true;
+                    }
+
+                    sender.sendMessage(LocaleLoader.getString("Commands.Offline"));
+                    return true;
+                }
+
+                Player player = mcMMOPlayer.getPlayer();
+
+                if (!player.isOnline()) {
+                    sender.sendMessage(LocaleLoader.getString("Commands.Offline"));
+                    return true;
+                }
+
+                if (mcMMOPlayer.getGodMode()) {
+                    player.sendMessage(LocaleLoader.getString("Commands.GodMode.Disabled"));
+                }
+                else {
+                    player.sendMessage(LocaleLoader.getString("Commands.GodMode.Enabled"));
+                }
+
+                mcMMOPlayer.toggleGodMode();
+                return true;
+
+            default:
+                return false;
+        }
+    }
+}

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

@@ -0,0 +1,113 @@
+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 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;
+
+public class McmmoCommand implements CommandExecutor {
+    @Override
+    public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
+        switch (args.length) {
+            case 0:
+                if (!Permissions.mcmmoDescription(sender)) {
+                    sender.sendMessage(command.getPermissionMessage());
+                    return true;
+                }
+
+                String description = LocaleLoader.getString("mcMMO.Description");
+                String[] mcSplit = description.split(",");
+                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);
+                    }
+
+                    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()));
+                return true;
+
+            case 1:
+                if (args[0].equalsIgnoreCase("?") || args[0].equalsIgnoreCase("help") || args[0].equalsIgnoreCase("commands")) {
+                    if (!Permissions.mcmmoHelp(sender)) {
+                        sender.sendMessage(command.getPermissionMessage());
+                        return true;
+                    }
+
+                    sender.sendMessage(LocaleLoader.getString("Commands.mcc.Header"));
+                    displayPartyCommands(sender);
+                    displayOtherCommands(sender);
+
+                }
+                return true;
+
+            default:
+                return false;
+        }
+    }
+
+    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"));
+
+            if (Permissions.partyChat(sender)) {
+                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"));
+
+            if (Permissions.partySubcommand(sender, PartySubcommandType.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"));
+
+        if (Permissions.skillreset(sender)) {
+            sender.sendMessage("/skillreset <skill|all> " + LocaleLoader.getString("Commands.Reset"));
+        }
+
+        if (Permissions.mcability(sender)) {
+            sender.sendMessage("/mcability " + LocaleLoader.getString("Commands.ToggleAbility"));
+        }
+
+        if (Permissions.adminChat(sender)) {
+            sender.sendMessage("/adminchat " + LocaleLoader.getString("Commands.AdminToggle"));
+        }
+
+        if (Permissions.inspect(sender)) {
+            sender.sendMessage("/inspect " + LocaleLoader.getString("Commands.Inspect"));
+        }
+
+        if (Permissions.mmoedit(sender)) {
+            sender.sendMessage("/mmoedit " + LocaleLoader.getString("Commands.mmoedit"));
+        }
+
+        if (Permissions.mcgod(sender)) {
+            sender.sendMessage("/mcgod " + LocaleLoader.getString("Commands.mcgod"));
+        }
+
+        sender.sendMessage(LocaleLoader.getString("Commands.SkillInfo"));
+    }
+}

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

@@ -0,0 +1,33 @@
+package com.gmail.nossr50.commands;
+
+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.player.McMMOPlayer;
+import com.gmail.nossr50.locale.LocaleLoader;
+import com.gmail.nossr50.util.player.UserManager;
+
+public class McnotifyCommand implements CommandExecutor {
+    @Override
+    public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
+        switch (args.length) {
+            case 0:
+                McMMOPlayer mcMMOPlayer = UserManager.getPlayer((Player) sender);
+
+                if (mcMMOPlayer.useChatNotifications()) {
+                    sender.sendMessage(LocaleLoader.getString("Commands.Notifications.Off"));
+                }
+                else {
+                    sender.sendMessage(LocaleLoader.getString("Commands.Notifications.On"));
+                }
+
+                mcMMOPlayer.toggleChatNotifications();
+                return true;
+
+            default:
+                return false;
+        }
+    }
+}

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

@@ -0,0 +1,80 @@
+package com.gmail.nossr50.commands;
+
+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.player.McMMOPlayer;
+import com.gmail.nossr50.datatypes.player.PlayerProfile;
+import com.gmail.nossr50.locale.LocaleLoader;
+import com.gmail.nossr50.util.Permissions;
+import com.gmail.nossr50.util.player.UserManager;
+
+public class McrefreshCommand implements CommandExecutor {
+    @Override
+    public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
+        McMMOPlayer mcMMOPlayer;
+
+        switch (args.length) {
+            case 0:
+                if (!Permissions.mcrefresh(sender)) {
+                    sender.sendMessage(command.getPermissionMessage());
+                    return true;
+                }
+
+                if (!(sender instanceof Player)) {
+                    return false;
+                }
+
+                mcMMOPlayer = UserManager.getPlayer(sender.getName());
+
+                mcMMOPlayer.setRecentlyHurt(0);
+                mcMMOPlayer.getProfile().resetCooldowns();
+                mcMMOPlayer.resetToolPrepMode();
+                mcMMOPlayer.resetAbilityMode();
+
+                sender.sendMessage(LocaleLoader.getString("Ability.Generic.Refresh"));
+                return true;
+
+            case 1:
+                if (!Permissions.mcrefreshOthers(sender)) {
+                    sender.sendMessage(command.getPermissionMessage());
+                    return true;
+                }
+
+                mcMMOPlayer = UserManager.getPlayer(args[0]);
+
+                if (mcMMOPlayer == null) {
+                    PlayerProfile playerProfile = new PlayerProfile(args[0], false);
+
+                    if (!playerProfile.isLoaded()) {
+                        sender.sendMessage(LocaleLoader.getString("Commands.DoesNotExist"));
+                        return true;
+                    }
+
+                    sender.sendMessage(LocaleLoader.getString("Commands.Offline"));
+                    return true;
+                }
+
+                Player player = mcMMOPlayer.getPlayer();
+
+                if (!player.isOnline()) {
+                    sender.sendMessage(LocaleLoader.getString("Commands.Offline"));
+                    return true;
+                }
+
+                mcMMOPlayer.setRecentlyHurt(0);
+                mcMMOPlayer.getProfile().resetCooldowns();
+                mcMMOPlayer.resetToolPrepMode();
+                mcMMOPlayer.resetAbilityMode();
+
+                player.sendMessage(LocaleLoader.getString("Ability.Generic.Refresh"));
+                sender.sendMessage(LocaleLoader.getString("Commands.mcrefresh.Success", args[0]));
+                return true;
+
+            default:
+                return false;
+        }
+    }
+}

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

@@ -0,0 +1,69 @@
+package com.gmail.nossr50.commands;
+
+import org.bukkit.command.Command;
+import org.bukkit.command.CommandExecutor;
+import org.bukkit.command.CommandSender;
+
+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.gmail.nossr50.util.StringUtils;
+
+public class XprateCommand implements CommandExecutor {
+    private static double originalRate = Config.getInstance().getExperienceGainsGlobalMultiplier();
+
+    @Override
+    public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
+        switch (args.length) {
+            case 1:
+                if (!args[0].equalsIgnoreCase("reset")) {
+                    return false;
+                }
+
+                if (!Permissions.xprateReset(sender)) {
+                    sender.sendMessage(command.getPermissionMessage());
+                    return true;
+                }
+
+                if (mcMMO.p.isXPEventEnabled()) {
+                    mcMMO.p.getServer().broadcastMessage(LocaleLoader.getString("Commands.xprate.over"));
+                    mcMMO.p.toggleXpEventEnabled();
+                }
+
+                Config.getInstance().setExperienceGainsGlobalMultiplier(originalRate);
+                return true;
+
+            case 2:
+                if (!StringUtils.isInt(args[0])) {
+                    return false;
+                }
+
+                if (!Permissions.xprateSet(sender)) {
+                    sender.sendMessage(command.getPermissionMessage());
+                    return true;
+                }
+
+                if (!args[1].equalsIgnoreCase("true") && !args[1].equalsIgnoreCase("false")) {
+                    return false;
+                }
+
+                mcMMO.p.setXPEventEnabled(Boolean.valueOf(args[1]));
+                int newXpRate = Integer.parseInt(args[0]);
+                Config.getInstance().setExperienceGainsGlobalMultiplier(newXpRate);
+
+                if (mcMMO.p.isXPEventEnabled()) {
+                    mcMMO.p.getServer().broadcastMessage(LocaleLoader.getString("Commands.xprate.started.0"));
+                    mcMMO.p.getServer().broadcastMessage(LocaleLoader.getString("Commands.xprate.started.1", newXpRate));
+                }
+                else {
+                    sender.sendMessage(LocaleLoader.getString("Commands.xprate.modified", newXpRate));
+                }
+
+                return true;
+
+            default:
+                return false;
+        }
+    }
+}

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

@@ -1,150 +0,0 @@
-package com.gmail.nossr50.commands.admin;
-
-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.McMMOPlayer;
-import com.gmail.nossr50.datatypes.PlayerProfile;
-import com.gmail.nossr50.locale.LocaleLoader;
-import com.gmail.nossr50.skills.utilities.SkillTools;
-import com.gmail.nossr50.skills.utilities.SkillType;
-import com.gmail.nossr50.util.Misc;
-import com.gmail.nossr50.util.Permissions;
-import com.gmail.nossr50.util.Users;
-
-public class AddlevelsCommand implements CommandExecutor{
-    @Override
-    public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
-        PlayerProfile profile;
-        int levels;
-        boolean allSkills = false;
-
-        switch (args.length) {
-        case 2:
-            if (!Permissions.hasPermission(sender, "mcmmo.commands.addlevels")) {
-                sender.sendMessage(command.getPermissionMessage());
-                return true;
-            }
-
-            if (!(sender instanceof Player)) {
-                return false;
-            }
-
-            if (args[0].equalsIgnoreCase("all")) {
-                allSkills = true;
-            }
-            else if (!SkillTools.isSkill(args[0])) {
-                sender.sendMessage(LocaleLoader.getString("Commands.Skill.Invalid"));
-                return true;
-            }
-
-            if (!Misc.isInt(args[1])) {
-                return false;
-            }
-
-            levels = Integer.valueOf(args[1]);
-            profile = Users.getPlayer((Player) sender).getProfile();
-
-            if (allSkills) {
-                for (SkillType skillType : SkillType.values()) {
-                    if (skillType.isChildSkill()) {
-                        continue;
-                    }
-
-                    profile.addLevels(skillType, levels);
-                }
-            }
-            else {
-                profile.addLevels(SkillType.getSkill(args[0]), levels);
-            }
-
-            if (allSkills) {
-                sender.sendMessage(LocaleLoader.getString("Commands.addlevels.AwardAll.1", levels));
-            }
-            else {
-                sender.sendMessage(LocaleLoader.getString("Commands.addlevels.AwardSkill.1", levels, Misc.getCapitalized(args[0])));
-            }
-
-            return true;
-
-        case 3:
-            if (!Permissions.hasPermission(sender, "mcmmo.commands.addlevels.others")) {
-                sender.sendMessage(command.getPermissionMessage());
-                return true;
-            }
-
-            if (args[1].equalsIgnoreCase("all")) {
-                allSkills = true;
-            }
-            else if (!SkillTools.isSkill(args[1])) {
-                sender.sendMessage(LocaleLoader.getString("Commands.Skill.Invalid"));
-                return true;
-            }
-
-            if (!Misc.isInt(args[2])) {
-                return false;
-            }
-
-            McMMOPlayer mcMMOPlayer = Users.getPlayer(args[0]);
-            levels = Integer.valueOf(args[2]);
-
-            // 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);
-
-                if (!profile.isLoaded()) {
-                    sender.sendMessage(LocaleLoader.getString("Commands.DoesNotExist"));
-                    return true;
-                }
-
-                if (allSkills) {
-                    for (SkillType skillType : SkillType.values()) {
-                        if (skillType.isChildSkill()) {
-                            continue;
-                        }
-
-                        profile.addLevels(skillType, levels);
-                    }
-                }
-                else {
-                    profile.addLevels(SkillType.getSkill(args[1]), levels);
-                }
-
-                profile.save(); // Since this is a temporary profile, we save it here.
-            }
-            else {
-                profile = mcMMOPlayer.getProfile();
-
-                if (allSkills) {
-                    for (SkillType skillType : SkillType.values()) {
-                        if (skillType.isChildSkill()) {
-                            continue;
-                        }
-
-                        profile.addLevels(skillType, levels);
-                    }
-
-                    mcMMOPlayer.getPlayer().sendMessage(LocaleLoader.getString("Commands.addlevels.AwardAll.1", levels));
-                }
-                else {
-                    profile.addLevels(SkillType.getSkill(args[1]), levels);
-                    mcMMOPlayer.getPlayer().sendMessage(LocaleLoader.getString("Commands.addlevels.AwardSkill.1", levels, Misc.getCapitalized(args[1])));
-                }
-            }
-
-            if (allSkills) {
-                sender.sendMessage(LocaleLoader.getString("Commands.addlevels.AwardAll.2", args[0]));
-            }
-            else {
-                sender.sendMessage(LocaleLoader.getString("Commands.addlevels.AwardSkill.2", Misc.getCapitalized(args[1]), args[0]));
-            }
-
-            return true;
-
-        default:
-            return false;
-        }
-    }
-}

src/main/java/com/gmail/nossr50/commands/admin/AddxpCommand.java

@@ -1,147 +0,0 @@
-package com.gmail.nossr50.commands.admin;
-
-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.McMMOPlayer;
-import com.gmail.nossr50.datatypes.PlayerProfile;
-import com.gmail.nossr50.locale.LocaleLoader;
-import com.gmail.nossr50.skills.utilities.SkillTools;
-import com.gmail.nossr50.skills.utilities.SkillType;
-import com.gmail.nossr50.util.Misc;
-import com.gmail.nossr50.util.Permissions;
-import com.gmail.nossr50.util.Users;
-
-public class AddxpCommand implements CommandExecutor {
-    @Override
-    public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
-        int xp;
-        McMMOPlayer mcMMOPlayer;
-        PlayerProfile profile;
-        boolean allSkills = false;
-
-        switch (args.length) {
-        case 2:
-            if (!Permissions.hasPermission(sender, "mcmmo.commands.addxp")) {
-                sender.sendMessage(command.getPermissionMessage());
-                return true;
-            }
-
-            if (!(sender instanceof Player)) {
-                return false;
-            }
-
-            if (args[0].equalsIgnoreCase("all")) {
-                allSkills = true;
-            }
-            else if (!SkillTools.isSkill(args[0])) {
-                sender.sendMessage(LocaleLoader.getString("Commands.Skill.Invalid"));
-                return true;
-            }
-
-            if (!Misc.isInt(args[1])) {
-                return false;
-            }
-
-            xp = Integer.valueOf(args[1]);
-            mcMMOPlayer = Users.getPlayer((Player) sender);
-            profile = mcMMOPlayer.getProfile();
-
-            if (allSkills) {
-                for (SkillType skillType : SkillType.values()) {
-                    if (skillType.isChildSkill()) {
-                        continue;
-                    }
-
-                    mcMMOPlayer.applyXpGain(skillType, xp);
-                }
-
-                sender.sendMessage(LocaleLoader.getString("Commands.addxp.AwardAll", xp));
-            }
-            else {
-                mcMMOPlayer.applyXpGain(SkillType.getSkill(args[0]), xp);
-                sender.sendMessage(LocaleLoader.getString("Commands.addxp.AwardSkill", xp, Misc.getCapitalized(args[0])));
-            }
-
-            return true;
-
-        case 3:
-            if (!Permissions.hasPermission(sender, "mcmmo.commands.addxp.others")) {
-                sender.sendMessage(command.getPermissionMessage());
-                return true;
-            }
-
-            if (args[1].equalsIgnoreCase("all")) {
-                allSkills = true;
-            }
-            else if (!SkillTools.isSkill(args[1])) {
-                sender.sendMessage(LocaleLoader.getString("Commands.Skill.Invalid"));
-                return true;
-            }
-
-            if (!Misc.isInt(args[2])) {
-                return false;
-            }
-
-            mcMMOPlayer = Users.getPlayer(args[0]);
-            xp = Integer.valueOf(args[2]);
-
-            // 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);
-
-                if (!profile.isLoaded()) {
-                    sender.sendMessage(LocaleLoader.getString("Commands.DoesNotExist"));
-                    return true;
-                }
-
-                // TODO: Currently the offline player doesn't level up automatically
-                if (allSkills) {
-                    for (SkillType skillType : SkillType.values()) {
-                        if (skillType.isChildSkill()) {
-                            continue;
-                        }
-
-                        profile.setSkillXpLevel(skillType, xp);
-                    }
-                }
-                else {
-                    profile.setSkillXpLevel(SkillType.getSkill(args[1]), xp);
-                }
-
-                profile.save(); // Since this is a temporary profile, we save it here.
-            }
-            else {
-                if (allSkills) {
-                    for (SkillType skillType : SkillType.values()) {
-                        if (skillType.isChildSkill()) {
-                            continue;
-                        }
-
-                        mcMMOPlayer.applyXpGain(skillType, xp);
-                    }
-
-                    mcMMOPlayer.getPlayer().sendMessage(LocaleLoader.getString("Commands.addxp.AwardAll", xp));
-                }
-                else {
-                    mcMMOPlayer.applyXpGain(SkillType.getSkill(args[1]), xp);
-                    mcMMOPlayer.getPlayer().sendMessage(LocaleLoader.getString("Commands.addxp.AwardSkill", xp, Misc.getCapitalized(args[1])));
-                }
-            }
-
-            if (allSkills) {
-                sender.sendMessage(LocaleLoader.getString("Commands.addlevels.AwardAll.2", args[0]));
-            }
-            else {
-                sender.sendMessage(LocaleLoader.getString("Commands.addlevels.AwardSkill.2", Misc.getCapitalized(args[1]), args[0]));
-            }
-
-            return true;
-
-        default:
-            return false;
-        }
-    }
-}

src/main/java/com/gmail/nossr50/commands/admin/McgodCommand.java

@@ -1,89 +0,0 @@
-package com.gmail.nossr50.commands.admin;
-
-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.McMMOPlayer;
-import com.gmail.nossr50.datatypes.PlayerProfile;
-import com.gmail.nossr50.locale.LocaleLoader;
-import com.gmail.nossr50.util.Permissions;
-import com.gmail.nossr50.util.Users;
-
-public class McgodCommand implements CommandExecutor {
-    @Override
-    public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
-        PlayerProfile profile;
-
-        switch (args.length) {
-        case 0:
-            if (!Permissions.hasPermission(sender, "mcmmo.commands.mcgod")) {
-                sender.sendMessage(command.getPermissionMessage());
-                return true;
-            }
-
-            if (!(sender instanceof Player)) {
-                return false;
-            }
-
-            profile = Users.getPlayer((Player) sender).getProfile();
-
-            if (profile == null) {
-                sender.sendMessage(LocaleLoader.getString("Commands.DoesNotExist"));
-                return true;
-            }
-
-            if (profile.getGodMode()) {
-                sender.sendMessage(LocaleLoader.getString("Commands.GodMode.Disabled"));
-            }
-            else {
-                sender.sendMessage(LocaleLoader.getString("Commands.GodMode.Enabled"));
-            }
-
-            profile.toggleGodMode();
-            return true;
-
-        case 1:
-            if (!Permissions.hasPermission(sender, "mcmmo.commands.mcgod.others")) {
-                sender.sendMessage(command.getPermissionMessage());
-                return true;
-            }
-
-            McMMOPlayer mcMMOPlayer = Users.getPlayer(args[0]);
-
-            if (mcMMOPlayer == null) {
-                profile = new PlayerProfile(args[0], false);
-
-                if (!profile.isLoaded()) {
-                    sender.sendMessage(LocaleLoader.getString("Commands.DoesNotExist"));
-                    return true;
-                }
-
-                sender.sendMessage(LocaleLoader.getString("Commands.Offline"));
-                return true;
-            }
-
-            profile = mcMMOPlayer.getProfile();
-            Player player = mcMMOPlayer.getPlayer();
-
-            if (!player.isOnline()) {
-                sender.sendMessage(LocaleLoader.getString("Commands.Offline"));
-                return true;
-            }
-
-            if (profile.getGodMode()) {
-                player.sendMessage(LocaleLoader.getString("Commands.GodMode.Disabled"));
-            }
-            else {
-                player.sendMessage(LocaleLoader.getString("Commands.GodMode.Enabled"));
-            }
-
-            profile.toggleGodMode();
-            return true;
-
-        default:
-            return false;
-        }
-    }
-}

src/main/java/com/gmail/nossr50/commands/admin/McrefreshCommand.java

@@ -1,80 +0,0 @@
-package com.gmail.nossr50.commands.admin;
-
-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.McMMOPlayer;
-import com.gmail.nossr50.datatypes.PlayerProfile;
-import com.gmail.nossr50.locale.LocaleLoader;
-import com.gmail.nossr50.util.Permissions;
-import com.gmail.nossr50.util.Users;
-
-public class McrefreshCommand implements CommandExecutor {
-    @Override
-    public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
-        PlayerProfile profile;
-
-        switch (args.length) {
-        case 0:
-            if (!Permissions.hasPermission(sender, "mcmmo.commands.mcrefresh")) {
-                sender.sendMessage(command.getPermissionMessage());
-                return true;
-            }
-
-            if (!(sender instanceof Player)) {
-                return false;
-            }
-
-            profile = Users.getPlayer(sender.getName()).getProfile();
-
-            profile.setRecentlyHurt(0);
-            profile.resetCooldowns();
-            profile.resetToolPrepMode();
-            profile.resetAbilityMode();
-
-            sender.sendMessage(LocaleLoader.getString("Ability.Generic.Refresh"));
-            return true;
-
-        case 1:
-            if (!Permissions.hasPermission(sender, "mcmmo.commands.mcrefresh.others")) {
-                sender.sendMessage(command.getPermissionMessage());
-                return true;
-            }
-
-            McMMOPlayer mcMMOPlayer = Users.getPlayer(args[0]);
-
-            if (mcMMOPlayer == null) {
-                profile = new PlayerProfile(args[0], false);
-
-                if (!profile.isLoaded()) {
-                    sender.sendMessage(LocaleLoader.getString("Commands.DoesNotExist"));
-                    return true;
-                }
-
-                sender.sendMessage(LocaleLoader.getString("Commands.Offline"));
-                return true;
-            }
-            profile = mcMMOPlayer.getProfile();
-            Player player = mcMMOPlayer.getPlayer();
-
-            if (!player.isOnline()) {
-                sender.sendMessage(LocaleLoader.getString("Commands.Offline"));
-                return true;
-            }
-
-            profile.setRecentlyHurt(0);
-            profile.resetCooldowns();
-            profile.resetToolPrepMode();
-            profile.resetAbilityMode();
-
-            player.sendMessage(LocaleLoader.getString("Ability.Generic.Refresh"));
-            sender.sendMessage(LocaleLoader.getString("Commands.mcrefresh.Success", args[0]));
-            return true;
-
-        default:
-            return false;
-        }
-    }
-}

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

@@ -1,146 +0,0 @@
-package com.gmail.nossr50.commands.admin;
-
-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.McMMOPlayer;
-import com.gmail.nossr50.datatypes.PlayerProfile;
-import com.gmail.nossr50.locale.LocaleLoader;
-import com.gmail.nossr50.skills.utilities.SkillTools;
-import com.gmail.nossr50.skills.utilities.SkillType;
-import com.gmail.nossr50.util.Misc;
-import com.gmail.nossr50.util.Permissions;
-import com.gmail.nossr50.util.Users;
-
-public class MmoeditCommand implements CommandExecutor {
-    @Override
-    public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
-        PlayerProfile profile;
-        int newValue;
-        boolean allSkills = false;
-
-        switch (args.length) {
-        case 2:
-            if (!Permissions.hasPermission(sender, "mcmmo.commands.mmoedit")) {
-                sender.sendMessage(command.getPermissionMessage());
-                return true;
-            }
-
-            if (!(sender instanceof Player)) {
-                return false;
-            }
-
-            if (args[0].equalsIgnoreCase("all")) {
-                allSkills = true;
-            }
-            else if (!SkillTools.isSkill(args[0])) {
-                sender.sendMessage(LocaleLoader.getString("Commands.Skill.Invalid"));
-                return true;
-            }
-
-            if (!Misc.isInt(args[1])) {
-                return false;
-            }
-
-            newValue = Integer.valueOf(args[1]);
-            profile = Users.getPlayer((Player) sender).getProfile();
-
-            if (allSkills) {
-                for (SkillType skillType : SkillType.values()) {
-                    if (skillType.isChildSkill()) {
-                        continue;
-                    }
-
-                    profile.modifySkill(skillType, newValue);
-                }
-
-                sender.sendMessage(LocaleLoader.getString("Commands.mmoedit.AllSkills.1", newValue));
-            }
-            else {
-                profile.modifySkill(SkillType.getSkill(args[0]), newValue);
-                sender.sendMessage(LocaleLoader.getString("Commands.mmoedit.Modified.1", Misc.getCapitalized(args[0]), newValue));
-            }
-
-            return true;
-
-        case 3:
-            if (!Permissions.hasPermission(sender, "mcmmo.commands.mmoedit.others")) {
-                sender.sendMessage(command.getPermissionMessage());
-                return true;
-            }
-
-            if (args[1].equalsIgnoreCase("all")) {
-                allSkills = true;
-            }
-            else if (!SkillTools.isSkill(args[1])) {
-                sender.sendMessage(LocaleLoader.getString("Commands.Skill.Invalid"));
-                return true;
-            }
-
-            if (!Misc.isInt(args[2])) {
-                return false;
-            }
-
-            newValue = Integer.valueOf(args[2]);
-            McMMOPlayer mcMMOPlayer = Users.getPlayer(args[0]);
-
-            // 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);
-
-                if (!profile.isLoaded()) {
-                    sender.sendMessage(LocaleLoader.getString("Commands.DoesNotExist"));
-                    return true;
-                }
-
-                if (allSkills) {
-                    for (SkillType skillType : SkillType.values()) {
-                        if (skillType.isChildSkill()) {
-                            continue;
-                        }
-
-                        profile.modifySkill(skillType, newValue);
-                    }
-                }
-                else {
-                    profile.modifySkill(SkillType.getSkill(args[1]), newValue);
-                }
-
-                profile.save(); // Since this is a temporary profile, we save it here.
-            }
-            else {
-                profile = mcMMOPlayer.getProfile();
-
-                if (allSkills) {
-                    for (SkillType skillType : SkillType.values()) {
-                        if (skillType.isChildSkill()) {
-                            continue;
-                        }
-
-                        profile.modifySkill(skillType, newValue);
-                    }
-
-                    mcMMOPlayer.getPlayer().sendMessage(LocaleLoader.getString("Commands.mmoedit.AllSkills.1", newValue));
-                }
-                else {
-                    profile.modifySkill(SkillType.getSkill(args[1]), newValue);
-                    mcMMOPlayer.getPlayer().sendMessage(LocaleLoader.getString("Commands.mmoedit.Modified.1",  Misc.getCapitalized(args[1]), newValue));
-                }
-            }
-
-            if (allSkills) {
-                sender.sendMessage(LocaleLoader.getString("Commands.addlevels.AwardAll.2", args[0]));
-            }
-            else {
-                sender.sendMessage(LocaleLoader.getString("Commands.mmoedit.Modified.2", Misc.getCapitalized(args[1]), args[0]));
-            }
-
-            return true;
-
-        default:
-            return false;
-        }
-    }
-}

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

@@ -1,173 +0,0 @@
-package com.gmail.nossr50.commands.admin;
-
-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.McMMOPlayer;
-import com.gmail.nossr50.datatypes.PlayerProfile;
-import com.gmail.nossr50.locale.LocaleLoader;
-import com.gmail.nossr50.skills.utilities.SkillTools;
-import com.gmail.nossr50.skills.utilities.SkillType;
-import com.gmail.nossr50.util.Misc;
-import com.gmail.nossr50.util.Permissions;
-import com.gmail.nossr50.util.Users;
-
-public class SkillresetCommand implements CommandExecutor {
-    @Override
-    public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
-        PlayerProfile profile;
-        boolean allSkills = false;
-
-        switch (args.length) {
-        case 1:
-            if (!Permissions.hasPermission(sender, "mcmmo.commands.skillreset")) {
-                sender.sendMessage(command.getPermissionMessage());
-                return true;
-            }
-
-            if (!(sender instanceof Player)) {
-                return false;
-            }
-
-            if (args[0].equalsIgnoreCase("all")) {
-                allSkills = true;
-            }
-            else if (!SkillTools.isSkill(args[0])) {
-                sender.sendMessage(LocaleLoader.getString("Commands.Skill.Invalid"));
-                return true;
-            }
-
-            if (allSkills) {
-                for (SkillType skillType : SkillType.values()) {
-                    if (skillType.isChildSkill()) {
-                        continue;
-                    }
-
-                    if (!Permissions.hasPermission(sender, "mcmmo.commands.skillreset." + args[0].toLowerCase())) {
-                        sender.sendMessage(command.getPermissionMessage());
-                        return true;
-                    }
-                }
-            }
-            else {
-                if (!Permissions.hasPermission(sender, "mcmmo.commands.skillreset." + args[0].toLowerCase())) {
-                    sender.sendMessage(command.getPermissionMessage());
-                    return true;
-                }
-            }
-
-            profile = Users.getPlayer((Player) sender).getProfile();
-
-            if (allSkills) {
-                for (SkillType skillType : SkillType.values()) {
-                    if (skillType.isChildSkill()) {
-                        continue;
-                    }
-
-                    profile.modifySkill(skillType, 0);
-                }
-
-                sender.sendMessage(LocaleLoader.getString("Commands.Reset.All"));
-            }
-            else {
-                profile.modifySkill(SkillType.getSkill(args[0]), 0);
-                sender.sendMessage(LocaleLoader.getString("Commands.Reset.Single", Misc.getCapitalized(args[0])));
-            }
-
-            return true;
-
-        case 2:
-            if (!Permissions.hasPermission(sender, "mcmmo.commands.skillreset.others")) {
-                sender.sendMessage(command.getPermissionMessage());
-                return true;
-            }
-
-            if (args[1].equalsIgnoreCase("all")) {
-                allSkills = true;
-            }
-            else if (!SkillTools.isSkill(args[1])) {
-                sender.sendMessage(LocaleLoader.getString("Commands.Skill.Invalid"));
-                return true;
-            }
-
-            if (allSkills) {
-                for (SkillType skillType : SkillType.values()) {
-                    if (skillType.isChildSkill()) {
-                        continue;
-                    }
-
-                    if (!Permissions.hasPermission(sender, "mcmmo.commands.skillreset.others." + args[1].toLowerCase())) {
-                        sender.sendMessage(command.getPermissionMessage());
-                        return true;
-                    }
-                }
-            }
-            else {
-                if (!Permissions.hasPermission(sender, "mcmmo.commands.skillreset.others." + args[1].toLowerCase())) {
-                    sender.sendMessage(command.getPermissionMessage());
-                    return true;
-                }
-            }
-
-            McMMOPlayer mcMMOPlayer = Users.getPlayer(args[0]);
-
-            // 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);
-
-                if (!profile.isLoaded()) {
-                    sender.sendMessage(LocaleLoader.getString("Commands.DoesNotExist"));
-                    return true;
-                }
-
-                if (allSkills) {
-                    for (SkillType skillType : SkillType.values()) {
-                        if (skillType.isChildSkill()) {
-                            continue;
-                        }
-
-                        profile.modifySkill(skillType, 0);
-                    }
-                }
-                else {
-                    profile.modifySkill(SkillType.getSkill(args[1]), 0);
-                }
-
-                profile.save(); // Since this is a temporary profile, we save it here.
-            }
-            else {
-                profile = mcMMOPlayer.getProfile();
-
-                if (allSkills) {
-                    for (SkillType skillType : SkillType.values()) {
-                        if (skillType.isChildSkill()) {
-                            continue;
-                        }
-
-                        profile.modifySkill(skillType, 0);
-                    }
-
-                    mcMMOPlayer.getPlayer().sendMessage(LocaleLoader.getString("Commands.Reset.All"));
-                }
-                else {
-                    profile.modifySkill(SkillType.getSkill(args[1]), 0);
-                    mcMMOPlayer.getPlayer().sendMessage(LocaleLoader.getString("Commands.Reset.Single", Misc.getCapitalized(args[1])));
-                }
-            }
-
-            if (allSkills) {
-                sender.sendMessage(LocaleLoader.getString("Commands.addlevels.AwardAll.2", args[0]));
-            }
-            else {
-                sender.sendMessage(LocaleLoader.getString("Commands.mmoedit.Modified.2", Misc.getCapitalized(args[1]), args[0]));
-            }
-
-            return true;
-
-        default:
-            return false;
-        }
-    }
-}

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

@@ -1,75 +0,0 @@
-package com.gmail.nossr50.commands.admin;
-
-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.config.Config;
-import com.gmail.nossr50.locale.LocaleLoader;
-import com.gmail.nossr50.util.Misc;
-import com.gmail.nossr50.util.Permissions;
-
-public class XprateCommand implements CommandExecutor {
-    private static double originalRate = Config.getInstance().getExperienceGainsGlobalMultiplier();
-
-    @Override
-    public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
-        switch (args.length) {
-        case 1:
-            if (!args[0].equalsIgnoreCase("reset")) {
-                return false;
-            }
-
-            if (!Permissions.hasPermission(sender, "mcmmo.commands.xprate.reset")) {
-                sender.sendMessage(command.getPermissionMessage());
-                return true;
-            }
-
-            if (mcMMO.p.isXPEventEnabled()) {
-                for (Player player : mcMMO.p.getServer().getOnlinePlayers()) {
-                    player.sendMessage(LocaleLoader.getString("Commands.xprate.over"));
-                }
-
-                mcMMO.p.toggleXpEventEnabled();
-            }
-
-            Config.getInstance().setExperienceGainsGlobalMultiplier(originalRate);
-            return true;
-
-        case 2:
-            if (!Misc.isInt(args[0])) {
-                return false;
-            }
-
-            if (!Permissions.hasPermission(sender, "mcmmo.commands.xprate.set")) {
-                sender.sendMessage(command.getPermissionMessage());
-                return true;
-            }
-
-            if (!args[1].equalsIgnoreCase("true") && !args[1].equalsIgnoreCase("false")) {
-                return false;
-            }
-
-            mcMMO.p.setXPEventEnabled(Boolean.valueOf(args[1]));
-            int newXpRate = Misc.getInt(args[0]);
-            Config.getInstance().setExperienceGainsGlobalMultiplier(newXpRate);
-
-            if (mcMMO.p.isXPEventEnabled()) {
-                for (Player player : mcMMO.p.getServer().getOnlinePlayers()) {
-                    player.sendMessage(LocaleLoader.getString("Commands.xprate.started.0"));
-                    player.sendMessage(LocaleLoader.getString("Commands.xprate.started.1", newXpRate));
-                }
-            }
-            else {
-                sender.sendMessage(LocaleLoader.getString("Commands.xprate.modified", newXpRate));
-            }
-
-            return true;
-
-        default:
-            return false;
-        }
-    }
-}

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

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

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

@@ -1,4 +1,4 @@
-package com.gmail.nossr50.chat.commands;
+package com.gmail.nossr50.commands.chat;
 
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandExecutor;
@@ -6,69 +6,63 @@ import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 
 import com.gmail.nossr50.chat.ChatMode;
-import com.gmail.nossr50.datatypes.McMMOPlayer;
+import com.gmail.nossr50.datatypes.player.McMMOPlayer;
-import com.gmail.nossr50.util.Users;
+import com.gmail.nossr50.util.player.UserManager;
 
 public abstract class ChatCommand implements CommandExecutor {
     protected McMMOPlayer mcMMOPlayer;
     protected ChatMode chatMode;
 
-    public ChatCommand (ChatMode chatMode) {
+    public ChatCommand(ChatMode chatMode) {
         this.chatMode = chatMode;
     }
 
     @Override
     public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
         switch (args.length) {
-        case 0:
+            case 0:
-            if (!(sender instanceof Player)) {
-                return false;
-            }
-
-            mcMMOPlayer = Users.getPlayer((Player) sender);
-
-            if (chatMode.isEnabled(mcMMOPlayer)) {
-                disableChatMode(sender);
-                return true;
-            }
-
-            enableChatMode(sender);
-            return true;
-
-        default:
-            if (args.length == 1) {
                 if (!(sender instanceof Player)) {
                     return false;
                 }
 
-                mcMMOPlayer = Users.getPlayer((Player) sender);
+                mcMMOPlayer = UserManager.getPlayer((Player) sender);
 
+                if (chatMode.isEnabled(mcMMOPlayer)) {
+                    disableChatMode(sender);
+                }
+                else {
+                    enableChatMode(sender);
+                }
+
+                return true;
+
+            case 1:
                 if (args[0].equalsIgnoreCase("on")) {
+                    if (!(sender instanceof Player)) {
+                        return false;
+                    }
+
                     enableChatMode(sender);
                     return true;
                 }
 
                 if (args[0].equalsIgnoreCase("off")) {
+                    if (!(sender instanceof Player)) {
+                        return false;
+                    }
+
                     disableChatMode(sender);
                     return true;
                 }
-            }
 
-            handleChatSending(sender, args);
+                // Fallthrough
-            return true;
+
+            default:
+                handleChatSending(sender, args);
+                return true;
         }
     }
 
-    private void enableChatMode(CommandSender sender) {
-        chatMode.enable(mcMMOPlayer);
-        sender.sendMessage(chatMode.getEnabledMessage());
-    }
-
-    private void disableChatMode(CommandSender sender) {
-        chatMode.disable(mcMMOPlayer);
-        sender.sendMessage(chatMode.getDisabledMessage());
-    }
-
     protected String buildChatMessage(String[] args, int index) {
         StringBuilder builder = new StringBuilder();
         builder.append(args[index]);
@@ -82,4 +76,14 @@ public abstract class ChatCommand implements CommandExecutor {
     }
 
     protected abstract void handleChatSending(CommandSender sender, String[] args);
+
+    private void enableChatMode(CommandSender sender) {
+        chatMode.enable(mcMMOPlayer);
+        sender.sendMessage(chatMode.getEnabledMessage());
+    }
+
+    private void disableChatMode(CommandSender sender) {
+        chatMode.disable(mcMMOPlayer);
+        sender.sendMessage(chatMode.getDisabledMessage());
+    }
 }

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

@@ -1,4 +1,4 @@
-package com.gmail.nossr50.chat.commands;
+package com.gmail.nossr50.commands.chat;
 
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
@@ -6,10 +6,10 @@ 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.datatypes.party.Party;
 import com.gmail.nossr50.locale.LocaleLoader;
-import com.gmail.nossr50.party.Party;
 import com.gmail.nossr50.party.PartyManager;
-import com.gmail.nossr50.util.Users;
+import com.gmail.nossr50.util.player.UserManager;
 
 public class PartyChatCommand extends ChatCommand {
     public PartyChatCommand() {
@@ -20,7 +20,7 @@ public class PartyChatCommand extends ChatCommand {
     protected void handleChatSending(CommandSender sender, String[] args) {
         if (sender instanceof Player) {
             Player player = (Player) sender;
-            Party party = Users.getPlayer(player).getParty();
+            Party party = UserManager.getPlayer(player).getParty();
 
             if (party == null) {
                 sender.sendMessage(LocaleLoader.getString("Commands.Party.None"));

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

@@ -0,0 +1,45 @@
+package com.gmail.nossr50.commands.database;
+
+import org.bukkit.command.Command;
+import org.bukkit.command.CommandExecutor;
+import org.bukkit.command.CommandSender;
+
+import com.gmail.nossr50.config.Config;
+import com.gmail.nossr50.database.DatabaseManager;
+import com.gmail.nossr50.database.LeaderboardManager;
+import com.gmail.nossr50.locale.LocaleLoader;
+import com.gmail.nossr50.util.Permissions;
+
+public class McpurgeCommand implements CommandExecutor {
+    @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:
+                if (Config.getInstance().getUseMySQL()) {
+                    DatabaseManager.purgePowerlessSQL();
+
+                    if (Config.getInstance().getOldUsersCutoff() != -1) {
+                        DatabaseManager.purgeOldSQL();
+                    }
+                }
+                else {
+                    LeaderboardManager.purgePowerlessFlatfile();
+
+                    if (Config.getInstance().getOldUsersCutoff() != -1) {
+                        LeaderboardManager.purgeOldFlatfile();
+                    }
+                }
+
+                sender.sendMessage(LocaleLoader.getString("Commands.mcpurge.Success"));
+                return true;
+
+            default:
+                return false;
+        }
+    }
+}

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

@@ -0,0 +1,51 @@
+package com.gmail.nossr50.commands.database;
+
+import org.bukkit.command.Command;
+import org.bukkit.command.CommandExecutor;
+import org.bukkit.command.CommandSender;
+
+import com.gmail.nossr50.config.Config;
+import com.gmail.nossr50.database.DatabaseManager;
+import com.gmail.nossr50.database.LeaderboardManager;
+import com.gmail.nossr50.locale.LocaleLoader;
+import com.gmail.nossr50.util.Permissions;
+
+public class McremoveCommand implements CommandExecutor {
+    @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:
+                /* MySQL */
+                if (Config.getInstance().getUseMySQL()) {
+                    String tablePrefix = Config.getInstance().getMySQLTablePrefix();
+
+                    if (DatabaseManager.update("DELETE FROM " + tablePrefix + "users WHERE " + tablePrefix + "users.user = '" + args[0] + "'") != 0) {
+                        DatabaseManager.profileCleanup(args[0]);
+                        sender.sendMessage(LocaleLoader.getString("Commands.mcremove.Success", args[0]));
+                    }
+                    else {
+                        sender.sendMessage(LocaleLoader.getString("Commands.DoesNotExist"));
+                    }
+                }
+                else {
+                    if (LeaderboardManager.removeFlatFileUser(args[0])) {
+                        DatabaseManager.profileCleanup(args[0]);
+                        sender.sendMessage(LocaleLoader.getString("Commands.mcremove.Success", args[0]));
+                    }
+                    else {
+                        sender.sendMessage(LocaleLoader.getString("Commands.DoesNotExist"));
+                    }
+                }
+
+                return true;
+
+            default:
+                return false;
+        }
+    }
+}

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

@@ -0,0 +1,51 @@
+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.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;
+
+public class MmoupdateCommand implements CommandExecutor {
+    @Override
+    public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
+        if (!Permissions.mmoupdate(sender)) {
+            sender.sendMessage(command.getPermissionMessage());
+            return true;
+        }
+
+        switch (args.length) {
+            case 0:
+                sender.sendMessage(LocaleLoader.getString("Commands.mmoupdate.Start"));
+                UserManager.clearAll();
+                convertToMySQL();
+
+                for (Player player : mcMMO.p.getServer().getOnlinePlayers()) {
+                    UserManager.addUser(player);
+                }
+
+                sender.sendMessage(LocaleLoader.getString("Commands.mmoupdate.Finish"));
+                return true;
+
+            default:
+                return false;
+        }
+    }
+
+    /**
+     * Convert FlatFile data to MySQL data.
+     */
+    private void convertToMySQL() {
+        if (!Config.getInstance().getUseMySQL()) {
+            return;
+        }
+
+        mcMMO.p.getServer().getScheduler().runTaskLaterAsynchronously(mcMMO.p, new SQLConversionTask(), 1);
+    }
+}

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

@@ -0,0 +1,154 @@
+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.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.Permissions;
+import com.gmail.nossr50.util.StringUtils;
+import com.gmail.nossr50.util.player.UserManager;
+import com.gmail.nossr50.util.skills.SkillUtils;
+
+public class AddlevelsCommand implements CommandExecutor {
+    @Override
+    public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
+        PlayerProfile profile;
+        int levels;
+        boolean allSkills = false;
+        SkillType skill = null;
+
+        switch (args.length) {
+            case 2:
+                if (!Permissions.addlevels(sender)) {
+                    sender.sendMessage(command.getPermissionMessage());
+                    return true;
+                }
+
+                if (!(sender instanceof Player)) {
+                    return false;
+                }
+
+                if (args[0].equalsIgnoreCase("all")) {
+                    allSkills = true;
+                }
+                else if (!SkillUtils.isSkill(args[0])) {
+                    sender.sendMessage(LocaleLoader.getString("Commands.Skill.Invalid"));
+                    return true;
+                }
+
+                if (!StringUtils.isInt(args[1])) {
+                    return false;
+                }
+
+                levels = Integer.parseInt(args[1]);
+                profile = UserManager.getPlayer((Player) sender).getProfile();
+
+                if (allSkills) {
+                    for (SkillType skillType : SkillType.values()) {
+                        if (skillType.isChildSkill()) {
+                            continue;
+                        }
+
+                        profile.addLevels(skillType, levels);
+                    }
+                }
+                else {
+                    skill = SkillType.getSkill(args[0]);
+                    profile.addLevels(skill, levels);
+                }
+
+                if (allSkills) {
+                    sender.sendMessage(LocaleLoader.getString("Commands.addlevels.AwardAll.1", levels));
+                }
+                else {
+                    sender.sendMessage(LocaleLoader.getString("Commands.addlevels.AwardSkill.1", levels, SkillUtils.getSkillName(skill)));
+                }
+
+                return true;
+
+            case 3:
+                if (!Permissions.addlevelsOthers(sender)) {
+                    sender.sendMessage(command.getPermissionMessage());
+                    return true;
+                }
+
+                if (args[1].equalsIgnoreCase("all")) {
+                    allSkills = true;
+                }
+                else if (!SkillUtils.isSkill(args[1])) {
+                    sender.sendMessage(LocaleLoader.getString("Commands.Skill.Invalid"));
+                    return true;
+                }
+
+                if (!StringUtils.isInt(args[2])) {
+                    return false;
+                }
+
+                McMMOPlayer mcMMOPlayer = UserManager.getPlayer(args[0]);
+                levels = Integer.parseInt(args[2]);
+
+                // 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);
+
+                    if (!profile.isLoaded()) {
+                        sender.sendMessage(LocaleLoader.getString("Commands.DoesNotExist"));
+                        return true;
+                    }
+
+                    if (allSkills) {
+                        for (SkillType skillType : SkillType.values()) {
+                            if (skillType.isChildSkill()) {
+                                continue;
+                            }
+
+                            profile.addLevels(skillType, levels);
+                        }
+                    }
+                    else {
+                        skill = SkillType.getSkill(args[1]);
+                        profile.addLevels(skill, levels);
+                    }
+
+                    profile.save(); // Since this is a temporary profile, we save it here.
+                }
+                else {
+                    profile = mcMMOPlayer.getProfile();
+
+                    if (allSkills) {
+                        for (SkillType skillType : SkillType.values()) {
+                            if (skillType.isChildSkill()) {
+                                continue;
+                            }
+
+                            profile.addLevels(skillType, levels);
+                        }
+
+                        mcMMOPlayer.getPlayer().sendMessage(LocaleLoader.getString("Commands.addlevels.AwardAll.1", levels));
+                    }
+                    else {
+                        skill = SkillType.getSkill(args[1]);
+                        profile.addLevels(skill, levels);
+                        mcMMOPlayer.getPlayer().sendMessage(LocaleLoader.getString("Commands.addlevels.AwardSkill.1", levels, SkillUtils.getSkillName(skill)));
+                    }
+                }
+
+                if (allSkills) {
+                    sender.sendMessage(LocaleLoader.getString("Commands.addlevels.AwardAll.2", args[0]));
+                }
+                else {
+                    sender.sendMessage(LocaleLoader.getString("Commands.addlevels.AwardSkill.2", SkillUtils.getSkillName(skill), args[0]));
+                }
+
+                return true;
+
+            default:
+                return false;
+        }
+    }
+}

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

@@ -0,0 +1,152 @@
+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.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.Permissions;
+import com.gmail.nossr50.util.StringUtils;
+import com.gmail.nossr50.util.player.UserManager;
+import com.gmail.nossr50.util.skills.SkillUtils;
+
+public class AddxpCommand implements CommandExecutor {
+    @Override
+    public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
+        int xp;
+        McMMOPlayer mcMMOPlayer;
+        PlayerProfile profile;
+        boolean allSkills = false;
+        SkillType skill = null;
+
+        switch (args.length) {
+            case 2:
+                if (!Permissions.addxp(sender)) {
+                    sender.sendMessage(command.getPermissionMessage());
+                    return true;
+                }
+
+                if (!(sender instanceof Player)) {
+                    return false;
+                }
+
+                if (args[0].equalsIgnoreCase("all")) {
+                    allSkills = true;
+                }
+                else if (!SkillUtils.isSkill(args[0])) {
+                    sender.sendMessage(LocaleLoader.getString("Commands.Skill.Invalid"));
+                    return true;
+                }
+
+                if (!StringUtils.isInt(args[1])) {
+                    return false;
+                }
+
+                xp = Integer.parseInt(args[1]);
+                mcMMOPlayer = UserManager.getPlayer((Player) sender);
+                profile = mcMMOPlayer.getProfile();
+
+                if (allSkills) {
+                    for (SkillType skillType : SkillType.values()) {
+                        if (skillType.isChildSkill()) {
+                            continue;
+                        }
+
+                        mcMMOPlayer.applyXpGain(skillType, xp);
+                    }
+
+                    sender.sendMessage(LocaleLoader.getString("Commands.addxp.AwardAll", xp));
+                }
+                else {
+                    skill = SkillType.getSkill(args[0]);
+
+                    mcMMOPlayer.applyXpGain(skill, xp);
+                    sender.sendMessage(LocaleLoader.getString("Commands.addxp.AwardSkill", xp, SkillUtils.getSkillName(skill)));
+                }
+
+                return true;
+
+            case 3:
+                if (!Permissions.addxpOthers(sender)) {
+                    sender.sendMessage(command.getPermissionMessage());
+                    return true;
+                }
+
+                if (args[1].equalsIgnoreCase("all")) {
+                    allSkills = true;
+                }
+                else if (!SkillUtils.isSkill(args[1])) {
+                    sender.sendMessage(LocaleLoader.getString("Commands.Skill.Invalid"));
+                    return true;
+                }
+
+                if (!StringUtils.isInt(args[2])) {
+                    return false;
+                }
+
+                mcMMOPlayer = UserManager.getPlayer(args[0]);
+                xp = Integer.parseInt(args[2]);
+
+                // 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);
+
+                    if (!profile.isLoaded()) {
+                        sender.sendMessage(LocaleLoader.getString("Commands.DoesNotExist"));
+                        return true;
+                    }
+
+                    // TODO: Currently the offline player doesn't level up automatically
+                    if (allSkills) {
+                        for (SkillType skillType : SkillType.values()) {
+                            if (skillType.isChildSkill()) {
+                                continue;
+                            }
+
+                            profile.setSkillXpLevel(skillType, xp);
+                        }
+                    }
+                    else {
+                        skill = SkillType.getSkill(args[1]);
+                        profile.setSkillXpLevel(skill, xp);
+                    }
+
+                    profile.save(); // Since this is a temporary profile, we save it here.
+                }
+                else {
+                    if (allSkills) {
+                        for (SkillType skillType : SkillType.values()) {
+                            if (skillType.isChildSkill()) {
+                                continue;
+                            }
+
+                            mcMMOPlayer.applyXpGain(skillType, xp);
+                        }
+
+                        mcMMOPlayer.getPlayer().sendMessage(LocaleLoader.getString("Commands.addxp.AwardAll", xp));
+                    }
+                    else {
+                        skill = SkillType.getSkill(args[1]);
+                        mcMMOPlayer.applyXpGain(skill, xp);
+                        mcMMOPlayer.getPlayer().sendMessage(LocaleLoader.getString("Commands.addxp.AwardSkill", xp, SkillUtils.getSkillName(skill)));
+                    }
+                }
+
+                if (allSkills) {
+                    sender.sendMessage(LocaleLoader.getString("Commands.addlevels.AwardAll.2", args[0]));
+                }
+                else {
+                    sender.sendMessage(LocaleLoader.getString("Commands.addlevels.AwardSkill.2", SkillUtils.getSkillName(skill), args[0]));
+                }
+
+                return true;
+
+            default:
+                return false;
+        }
+    }
+}

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

@@ -0,0 +1,150 @@
+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.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.Permissions;
+import com.gmail.nossr50.util.StringUtils;
+import com.gmail.nossr50.util.player.UserManager;
+import com.gmail.nossr50.util.skills.SkillUtils;
+
+public class MmoeditCommand implements CommandExecutor {
+    @Override
+    public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
+        PlayerProfile profile;
+        int newValue;
+        boolean allSkills = false;
+        SkillType skill = null;
+
+        switch (args.length) {
+            case 2:
+                if (!Permissions.mmoedit(sender)) {
+                    sender.sendMessage(command.getPermissionMessage());
+                    return true;
+                }
+
+                if (!(sender instanceof Player)) {
+                    return false;
+                }
+
+                if (args[0].equalsIgnoreCase("all")) {
+                    allSkills = true;
+                }
+                else if (!SkillUtils.isSkill(args[0])) {
+                    sender.sendMessage(LocaleLoader.getString("Commands.Skill.Invalid"));
+                    return true;
+                }
+
+                if (!StringUtils.isInt(args[1])) {
+                    return false;
+                }
+
+                newValue = Integer.parseInt(args[1]);
+                profile = UserManager.getPlayer((Player) sender).getProfile();
+
+                if (allSkills) {
+                    for (SkillType skillType : SkillType.values()) {
+                        if (skillType.isChildSkill()) {
+                            continue;
+                        }
+
+                        profile.modifySkill(skillType, newValue);
+                    }
+
+                    sender.sendMessage(LocaleLoader.getString("Commands.mmoedit.AllSkills.1", newValue));
+                }
+                else {
+                    skill = SkillType.getSkill(args[0]);
+                    profile.modifySkill(skill, newValue);
+                    sender.sendMessage(LocaleLoader.getString("Commands.mmoedit.Modified.1", SkillUtils.getSkillName(skill), newValue));
+                }
+
+                return true;
+
+            case 3:
+                if (!Permissions.mmoeditOthers(sender)) {
+                    sender.sendMessage(command.getPermissionMessage());
+                    return true;
+                }
+
+                if (args[1].equalsIgnoreCase("all")) {
+                    allSkills = true;
+                }
+                else if (!SkillUtils.isSkill(args[1])) {
+                    sender.sendMessage(LocaleLoader.getString("Commands.Skill.Invalid"));
+                    return true;
+                }
+
+                if (!StringUtils.isInt(args[2])) {
+                    return false;
+                }
+
+                newValue = Integer.parseInt(args[2]);
+                McMMOPlayer mcMMOPlayer = UserManager.getPlayer(args[0]);
+
+                // 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);
+
+                    if (!profile.isLoaded()) {
+                        sender.sendMessage(LocaleLoader.getString("Commands.DoesNotExist"));
+                        return true;
+                    }
+
+                    if (allSkills) {
+                        for (SkillType skillType : SkillType.values()) {
+                            if (skillType.isChildSkill()) {
+                                continue;
+                            }
+
+                            profile.modifySkill(skillType, newValue);
+                        }
+                    }
+                    else {
+                        skill = SkillType.getSkill(args[1]);
+                        profile.modifySkill(skill, newValue);
+                    }
+
+                    profile.save(); // Since this is a temporary profile, we save it here.
+                }
+                else {
+                    profile = mcMMOPlayer.getProfile();
+
+                    if (allSkills) {
+                        for (SkillType skillType : SkillType.values()) {
+                            if (skillType.isChildSkill()) {
+                                continue;
+                            }
+
+                            profile.modifySkill(skillType, newValue);
+                        }
+
+                        mcMMOPlayer.getPlayer().sendMessage(LocaleLoader.getString("Commands.mmoedit.AllSkills.1", newValue));
+                    }
+                    else {
+                        skill = SkillType.getSkill(args[1]);
+                        profile.modifySkill(skill, newValue);
+                        mcMMOPlayer.getPlayer().sendMessage(LocaleLoader.getString("Commands.mmoedit.Modified.1", SkillUtils.getSkillName(skill), newValue));
+                    }
+                }
+
+                if (allSkills) {
+                    sender.sendMessage(LocaleLoader.getString("Commands.addlevels.AwardAll.2", args[0]));
+                }
+                else {
+                    sender.sendMessage(LocaleLoader.getString("Commands.mmoedit.Modified.2", SkillUtils.getSkillName(skill), args[0]));
+                }
+
+                return true;
+
+            default:
+                return false;
+        }
+    }
+}

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

@@ -0,0 +1,169 @@
+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.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.Permissions;
+import com.gmail.nossr50.util.player.UserManager;
+import com.gmail.nossr50.util.skills.SkillUtils;
+
+public class SkillresetCommand implements CommandExecutor {
+    @Override
+    public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
+        PlayerProfile profile;
+        boolean allSkills = false;
+        SkillType skill = null;
+        String skillName = "";
+
+        switch (args.length) {
+            case 1:
+                if (!Permissions.skillreset(sender)) {
+                    sender.sendMessage(command.getPermissionMessage());
+                    return true;
+                }
+
+                if (!(sender instanceof Player)) {
+                    return false;
+                }
+
+                if (args[0].equalsIgnoreCase("all")) {
+                    allSkills = true;
+                }
+                else if (!SkillUtils.isSkill(args[0])) {
+                    sender.sendMessage(LocaleLoader.getString("Commands.Skill.Invalid"));
+                    return true;
+                }
+
+                profile = UserManager.getPlayer((Player) sender).getProfile();
+
+                if (allSkills) {
+                    for (SkillType skillType : SkillType.values()) {
+                        if (skillType.isChildSkill()) {
+                            continue;
+                        }
+
+                        if (!Permissions.skillreset(sender, skillType)) {
+                            sender.sendMessage(command.getPermissionMessage());
+                            continue;
+                        }
+
+                        profile.modifySkill(skillType, 0);
+                    }
+
+                    sender.sendMessage(LocaleLoader.getString("Commands.Reset.All"));
+                }
+                else {
+                    skill = SkillType.getSkill(args[0]);
+                    skillName = SkillUtils.getSkillName(skill);
+
+                    if (!Permissions.skillreset(sender, skill)) {
+                        sender.sendMessage(command.getPermissionMessage());
+                        return true;
+                    }
+
+                    profile.modifySkill(skill, 0);
+                    sender.sendMessage(LocaleLoader.getString("Commands.Reset.Single", skillName));
+                }
+
+                return true;
+
+            case 2:
+                if (!Permissions.skillresetOthers(sender)) {
+                    sender.sendMessage(command.getPermissionMessage());
+                    return true;
+                }
+
+                if (args[1].equalsIgnoreCase("all")) {
+                    allSkills = true;
+                }
+                else if (!SkillUtils.isSkill(args[1])) {
+                    sender.sendMessage(LocaleLoader.getString("Commands.Skill.Invalid"));
+                    return true;
+                }
+
+                if (!allSkills) {
+                    skill = SkillType.getSkill(args[1]);
+                    skillName = SkillUtils.getSkillName(skill);
+
+                    if (!Permissions.skillresetOthers(sender, skill)) {
+                        sender.sendMessage(command.getPermissionMessage());
+                        return true;
+                    }
+                }
+
+                McMMOPlayer mcMMOPlayer = UserManager.getPlayer(args[0]);
+
+                // 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);
+
+                    if (!profile.isLoaded()) {
+                        sender.sendMessage(LocaleLoader.getString("Commands.DoesNotExist"));
+                        return true;
+                    }
+
+                    if (allSkills) {
+                        for (SkillType skillType : SkillType.values()) {
+                            if (skillType.isChildSkill()) {
+                                continue;
+                            }
+
+                            if (!Permissions.skillresetOthers(sender, skill)) {
+                                sender.sendMessage(command.getPermissionMessage());
+                                continue;
+                            }
+
+                            profile.modifySkill(skillType, 0);
+                        }
+                    }
+                    else {
+                        profile.modifySkill(skill, 0);
+                    }
+
+                    profile.save(); // Since this is a temporary profile, we save it here.
+                }
+                else {
+                    profile = mcMMOPlayer.getProfile();
+
+                    if (allSkills) {
+                        for (SkillType skillType : SkillType.values()) {
+                            if (skillType.isChildSkill()) {
+                                continue;
+                            }
+
+                            if (!Permissions.skillresetOthers(sender, skillType)) {
+                                sender.sendMessage(command.getPermissionMessage());
+                                continue;
+                            }
+
+                            profile.modifySkill(skillType, 0);
+                        }
+
+                        mcMMOPlayer.getPlayer().sendMessage(LocaleLoader.getString("Commands.Reset.All"));
+                    }
+                    else {
+                        profile.modifySkill(skill, 0);
+                        mcMMOPlayer.getPlayer().sendMessage(LocaleLoader.getString("Commands.Reset.Single", skillName));
+                    }
+                }
+
+                if (allSkills) {
+                    sender.sendMessage(LocaleLoader.getString("Commands.addlevels.AwardAll.2", args[0]));
+                }
+                else {
+                    sender.sendMessage(LocaleLoader.getString("Commands.mmoedit.Modified.2", skillName, args[0]));
+                }
+
+                return true;
+
+            default:
+                return false;
+        }
+    }
+}

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

@@ -0,0 +1,85 @@
+package com.gmail.nossr50.commands.hardcore;
+
+import java.text.DecimalFormat;
+
+import org.bukkit.command.Command;
+import org.bukkit.command.CommandExecutor;
+import org.bukkit.command.CommandSender;
+
+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.gmail.nossr50.util.StringUtils;
+
+public class HardcoreCommand implements CommandExecutor {
+    @Override
+    public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
+        switch (args.length) {
+            case 0:
+                if (!Permissions.hardcoreToggle(sender)) {
+                    sender.sendMessage(command.getPermissionMessage());
+                    return true;
+                }
+
+                if (Config.getInstance().getHardcoreEnabled()) {
+                    disableHardcore();
+                }
+                else {
+                    enableHardcore();
+                }
+
+                return true;
+
+            case 1:
+                if (args[0].equalsIgnoreCase("on") || args[0].equalsIgnoreCase("true") || args[0].equalsIgnoreCase("enabled")) {
+                    if (!Permissions.hardcoreToggle(sender)) {
+                        sender.sendMessage(command.getPermissionMessage());
+                        return true;
+                    }
+
+                    enableHardcore();
+                    return true;
+                }
+
+                if (args[0].equalsIgnoreCase("off") || args[0].equalsIgnoreCase("false") || args[0].equalsIgnoreCase("disabled")) {
+                    if (!Permissions.hardcoreToggle(sender)) {
+                        sender.sendMessage(command.getPermissionMessage());
+                        return true;
+                    }
+
+                    disableHardcore();
+                    return true;
+                }
+
+                if (!StringUtils.isDouble(args[0])) {
+                    return false;
+                }
+
+                if (!Permissions.hardcoreModify(sender)) {
+                    sender.sendMessage(command.getPermissionMessage());
+                    return true;
+                }
+
+                DecimalFormat percent = new DecimalFormat("##0.00%");
+                double newPercent = Double.parseDouble(args[0]);
+
+                Config.getInstance().setHardcoreDeathStatPenaltyPercentage(newPercent);
+                sender.sendMessage(LocaleLoader.getString("Hardcore.PercentageChanged", percent.format(newPercent / 100D)));
+                return true;
+
+            default:
+                return false;
+        }
+    }
+
+    private void disableHardcore() {
+        Config.getInstance().setHardcoreEnabled(false);
+        mcMMO.p.getServer().broadcastMessage(LocaleLoader.getString("Hardcore.Disabled"));
+    }
+
+    private void enableHardcore() {
+        Config.getInstance().setHardcoreEnabled(true);
+        mcMMO.p.getServer().broadcastMessage(LocaleLoader.getString("Hardcore.Enabled"));
+    }
+}

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

@@ -0,0 +1,90 @@
+package com.gmail.nossr50.commands.hardcore;
+
+import java.text.DecimalFormat;
+
+import org.bukkit.command.Command;
+import org.bukkit.command.CommandExecutor;
+import org.bukkit.command.CommandSender;
+
+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.gmail.nossr50.util.StringUtils;
+
+public class VampirismCommand implements CommandExecutor {
+    @Override
+    public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
+        if (!Config.getInstance().getHardcoreEnabled()) {
+            sender.sendMessage(LocaleLoader.getString("Hardcore.Disabled"));
+            return true;
+        }
+
+        switch (args.length) {
+            case 0:
+                if (!Permissions.vampirismToggle(sender)) {
+                    sender.sendMessage(command.getPermissionMessage());
+                    return true;
+                }
+
+                if (Config.getInstance().getHardcoreVampirismEnabled()) {
+                    disableVampirism();
+                }
+                else {
+                    enableVampirism();
+                }
+
+                return true;
+
+            case 1:
+                if (args[0].equalsIgnoreCase("on") || args[0].equalsIgnoreCase("true") || args[0].equalsIgnoreCase("enabled")) {
+                    if (!Permissions.vampirismToggle(sender)) {
+                        sender.sendMessage(command.getPermissionMessage());
+                        return true;
+                    }
+
+                    enableVampirism();
+                    return true;
+                }
+
+                if (args[0].equalsIgnoreCase("off") || args[0].equalsIgnoreCase("false") || args[0].equalsIgnoreCase("disabled")) {
+                    if (!Permissions.vampirismToggle(sender)) {
+                        sender.sendMessage(command.getPermissionMessage());
+                        return true;
+                    }
+
+                    disableVampirism();
+                    return true;
+                }
+
+                if (!StringUtils.isDouble(args[0])) {
+                    return false;
+                }
+
+                if (!Permissions.vampirismModify(sender)) {
+                    sender.sendMessage(command.getPermissionMessage());
+                    return true;
+                }
+
+                DecimalFormat percent = new DecimalFormat("##0.00%");
+                double newPercent = Double.parseDouble(args[0]);
+
+                Config.getInstance().setHardcoreVampirismStatLeechPercentage(newPercent);
+                sender.sendMessage(LocaleLoader.getString("Vampirism.PercentageChanged", percent.format(newPercent / 100D)));
+                return true;
+
+            default:
+                return false;
+        }
+    }
+
+    private void disableVampirism() {
+        Config.getInstance().setHardcoreVampirismEnabled(false);
+        mcMMO.p.getServer().broadcastMessage(LocaleLoader.getString("Vampirism.Disabled"));
+    }
+
+    private void enableVampirism() {
+        Config.getInstance().setHardcoreVampirismEnabled(true);
+        mcMMO.p.getServer().broadcastMessage(LocaleLoader.getString("Vampirism.Enabled"));
+    }
+}

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

@@ -0,0 +1,42 @@
+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.player.McMMOPlayer;
+import com.gmail.nossr50.locale.LocaleLoader;
+import com.gmail.nossr50.party.PartyManager;
+import com.gmail.nossr50.util.player.UserManager;
+
+public class PartyAcceptCommand implements CommandExecutor {
+    private McMMOPlayer mcMMOPlayer;
+    private Player player;
+
+    @Override
+    public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
+        switch (args.length) {
+            case 1:
+                player = (Player) sender;
+                mcMMOPlayer = UserManager.getPlayer(player);
+
+                if (!mcMMOPlayer.hasPartyInvite()) {
+                    sender.sendMessage(LocaleLoader.getString("mcMMO.NoInvites"));
+                    return true;
+                }
+
+                // Changing parties
+                if (!PartyManager.changeOrJoinParty(mcMMOPlayer, player, mcMMOPlayer.getParty(), mcMMOPlayer.getPartyInvite().getName())) {
+                    return true;
+                }
+
+                PartyManager.joinInvitedParty(player, mcMMOPlayer);
+                return true;
+
+            default:
+                sender.sendMessage(LocaleLoader.getString("Commands.Usage.1", "party", "accept"));
+                return true;
+        }
+    }
+}

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

@@ -0,0 +1,34 @@
+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.mcMMO;
+import com.gmail.nossr50.datatypes.party.Party;
+import com.gmail.nossr50.locale.LocaleLoader;
+import com.gmail.nossr50.party.PartyManager;
+import com.gmail.nossr50.util.player.UserManager;
+
+public class PartyChangeOwnerCommand implements CommandExecutor {
+    @Override
+    public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
+        switch (args.length) {
+            case 2:
+                Party playerParty = UserManager.getPlayer((Player) sender).getParty();
+
+                if (!playerParty.getMembers().contains(mcMMO.p.getServer().getOfflinePlayer(args[1]))) {
+                    sender.sendMessage(LocaleLoader.getString("Party.NotInYourParty", args[1]));
+                    return true;
+                }
+
+                PartyManager.setPartyLeader(args[1], playerParty);
+                return true;
+
+            default:
+                sender.sendMessage(LocaleLoader.getString("Commands.Usage.2", "party", "owner", "<" + LocaleLoader.getString("Commands.Usage.Player") + ">"));
+                return true;
+        }
+    }
+}

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

@@ -0,0 +1,49 @@
+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.util.player.UserManager;
+
+public class PartyChangePasswordCommand implements CommandExecutor {
+    @Override
+    public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
+        Party playerParty = UserManager.getPlayer((Player) sender).getParty();
+
+        switch (args.length) {
+            case 1:
+                unprotectParty(sender, playerParty);
+                return true;
+
+            case 2:
+                if (args[1].equalsIgnoreCase("clear") || args[1].equalsIgnoreCase("reset")) {
+                    unprotectParty(sender, playerParty);
+                    return true;
+                }
+
+                protectParty(sender, playerParty, args[1]);
+                return true;
+
+            default:
+                sender.sendMessage(LocaleLoader.getString("Commands.Usage.2", "party", "password", "[clear|reset]"));
+                sender.sendMessage(LocaleLoader.getString("Commands.Usage.2", "party", "password", "<" + LocaleLoader.getString("Commands.Usage.Password") + ">"));
+                return true;
+        }
+    }
+
+    private void unprotectParty(CommandSender sender, Party playerParty) {
+        playerParty.setLocked(true);
+        playerParty.setPassword(null);
+        sender.sendMessage(LocaleLoader.getString("Party.Password.Removed"));
+    }
+
+    private void protectParty(CommandSender sender, Party playerParty, String password) {
+        playerParty.setLocked(true);
+        playerParty.setPassword(password);
+        sender.sendMessage(LocaleLoader.getString("Party.Password.Set", password));
+    }
+}

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

@@ -0,0 +1,154 @@
+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.commands.chat.PartyChatCommand;
+import com.gmail.nossr50.datatypes.player.McMMOPlayer;
+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;
+
+public class PartyCommand implements CommandExecutor {
+    private McMMOPlayer mcMMOPlayer;
+    private Player player;
+
+    private CommandExecutor partyJoinCommand           = new PartyJoinCommand();
+    private CommandExecutor partyAcceptCommand         = new PartyAcceptCommand();
+    private CommandExecutor partyCreateCommand         = new PartyCreateCommand();
+    private CommandExecutor partyQuitCommand           = new PartyQuitCommand();
+    private CommandExecutor partyExpShareCommand       = new PartyExpShareCommand();
+    private CommandExecutor partyItemShareCommand      = new PartyItemShareCommand();
+    private CommandExecutor partyInviteCommand         = new PartyInviteCommand();
+    private CommandExecutor partyKickCommand           = new PartyKickCommand();
+    private CommandExecutor partyDisbandCommand        = new PartyDisbandCommand();
+    private CommandExecutor partyChangeOwnerCommand    = new PartyChangeOwnerCommand();
+    private CommandExecutor partyLockCommand           = new PartyLockCommand();
+    private CommandExecutor partyChangePasswordCommand = new PartyChangePasswordCommand();
+    private CommandExecutor partyRenameCommand         = new PartyRenameCommand();
+    private CommandExecutor partyInfoCommand           = new PartyInfoCommand();
+    private CommandExecutor partyHelpCommand           = new PartyHelpCommand();
+    private CommandExecutor partyTeleportCommand       = new PtpCommand();
+    private CommandExecutor partyChatCommand           = new PartyChatCommand();
+
+    @Override
+    public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
+        if (CommandUtils.noConsoleUsage(sender)) {
+            return true;
+        }
+
+        if (!Permissions.party(sender)) {
+            sender.sendMessage(command.getPermissionMessage());
+            return true;
+        }
+
+        player = (Player) sender;
+        mcMMOPlayer = UserManager.getPlayer(player);
+
+        if (args.length < 1) {
+            if (!mcMMOPlayer.inParty()) {
+                sender.sendMessage(LocaleLoader.getString("Commands.Party.None"));
+                return printUsage();
+            }
+
+            return partyInfoCommand.onCommand(sender, command, label, args);
+        }
+
+        PartySubcommandType subcommand = PartySubcommandType.getSubcommand(args[0]);
+
+        if (subcommand == null) {
+            return printUsage();
+        }
+
+        // Can't use this for lock/unlock since they're handled by the same command
+        if (subcommand != PartySubcommandType.LOCK && subcommand != PartySubcommandType.UNLOCK && !Permissions.partySubcommand(sender, subcommand)) {
+            sender.sendMessage(command.getPermissionMessage());
+            return true;
+        }
+
+        switch (subcommand) {
+            case JOIN:
+                return partyJoinCommand.onCommand(sender, command, label, args);
+            case ACCEPT:
+                return partyAcceptCommand.onCommand(sender, command, label, args);
+            case CREATE:
+                return partyCreateCommand.onCommand(sender, command, label, args);
+            case HELP:
+                return partyHelpCommand.onCommand(sender, command, label, args);
+            default:
+                break;
+        }
+
+        // Party member commands
+        if (!mcMMOPlayer.inParty()) {
+            sender.sendMessage(LocaleLoader.getString("Commands.Party.None"));
+            return printUsage();
+        }
+
+        switch (subcommand) {
+            case INFO:
+                return partyInfoCommand.onCommand(sender, command, label, args);
+            case QUIT:
+                return partyQuitCommand.onCommand(sender, command, label, args);
+            case INVITE:
+                return partyInviteCommand.onCommand(sender, command, label, args);
+            case TELEPORT:
+                return partyTeleportCommand.onCommand(sender, command, label, extractArgs(args));
+            case CHAT:
+                return partyChatCommand.onCommand(sender, command, label, extractArgs(args));
+            default:
+                break;
+        }
+
+        // Party leader commands
+        if (!mcMMOPlayer.getParty().getLeader().equalsIgnoreCase(player.getName())) {
+            sender.sendMessage(LocaleLoader.getString("Party.NotOwner"));
+            return true;
+        }
+
+        switch (subcommand) {
+            case EXPSHARE:
+                return partyExpShareCommand.onCommand(sender, command, label, args);
+            case ITEMSHARE:
+                return partyItemShareCommand.onCommand(sender, command, label, args);
+            case KICK:
+                return partyKickCommand.onCommand(sender, command, label, args);
+            case DISBAND:
+                return partyDisbandCommand.onCommand(sender, command, label, args);
+            case OWNER:
+                return partyChangeOwnerCommand.onCommand(sender, command, label, args);
+            case LOCK:
+                // Fallthrough
+            case UNLOCK:
+                return partyLockCommand.onCommand(sender, command, label, args);
+            case PASSWORD:
+                return partyChangePasswordCommand.onCommand(sender, command, label, args);
+            case RENAME:
+                return partyRenameCommand.onCommand(sender, command, label, args);
+            default:
+                break;
+        }
+
+        return true;
+    }
+
+    private boolean printUsage() {
+        player.sendMessage(LocaleLoader.getString("Party.Help.0", "/party join"));
+        player.sendMessage(LocaleLoader.getString("Party.Help.1", "/party create"));
+        player.sendMessage(LocaleLoader.getString("Party.Help.2", "/party ?"));
+        return true;
+    }
+
+    private String[] extractArgs(String[] args) {
+        String[] newArgs = new String[args.length - 1];
+
+        for (int i = 1; i < args.length; i++) {
+            newArgs[i - 1] = args[i];
+        }
+
+        return newArgs;
+    }
+}

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

@@ -0,0 +1,56 @@
+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.datatypes.player.McMMOPlayer;
+import com.gmail.nossr50.locale.LocaleLoader;
+import com.gmail.nossr50.party.PartyManager;
+import com.gmail.nossr50.util.player.UserManager;
+
+public class PartyCreateCommand implements CommandExecutor {
+    private McMMOPlayer mcMMOPlayer;
+    private Player player;
+
+    @Override
+    public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
+        switch (args.length) {
+            case 2:
+                // Fallthrough
+            case 3:
+                Party newParty = PartyManager.getParty(args[1]);
+
+                // Check to see if the party exists, and if it does cancel creating a new party
+                if (newParty != null) {
+                    sender.sendMessage(LocaleLoader.getString("Commands.Party.AlreadyExists", args[1]));
+                    return true;
+                }
+
+                player = (Player) sender;
+                mcMMOPlayer = UserManager.getPlayer(player);
+
+                // Changing parties
+                if (!PartyManager.changeOrJoinParty(mcMMOPlayer, player, mcMMOPlayer.getParty(), args[1])) {
+                    return true;
+                }
+
+                PartyManager.createParty(player, mcMMOPlayer, args[1], getPassword(args));
+                return true;
+
+            default:
+                sender.sendMessage(LocaleLoader.getString("Commands.Usage.3", "party", "create", "<" + LocaleLoader.getString("Commands.Usage.PartyName") + ">", "[" + LocaleLoader.getString("Commands.Usage.Password") + "]"));
+                return true;
+        }
+    }
+
+    private String getPassword(String[] args) {
+        if (args.length == 3) {
+            return args[2];
+        }
+
+        return null;
+    }
+}

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

@@ -0,0 +1,37 @@
+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.events.party.McMMOPartyChangeEvent.EventReason;
+import com.gmail.nossr50.locale.LocaleLoader;
+import com.gmail.nossr50.party.PartyManager;
+import com.gmail.nossr50.util.player.UserManager;
+
+public class PartyDisbandCommand implements CommandExecutor {
+    @Override
+    public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
+        switch (args.length) {
+            case 1:
+                Party playerParty = UserManager.getPlayer((Player) sender).getParty();
+
+                for (Player member : playerParty.getOnlineMembers()) {
+                    if (!PartyManager.handlePartyChangeEvent(member, playerParty.getName(), null, EventReason.KICKED_FROM_PARTY)) {
+                        return true;
+                    }
+
+                    member.sendMessage(LocaleLoader.getString("Party.Disband"));
+                }
+
+                PartyManager.disbandParty(playerParty);
+                return true;
+
+            default:
+                sender.sendMessage(LocaleLoader.getString("Commands.Usage.1", "party", "disband"));
+                return true;
+        }
+    }
+}

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

@@ -0,0 +1,55 @@
+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.config.Config;
+import com.gmail.nossr50.datatypes.party.Party;
+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.player.UserManager;
+
+public class PartyExpShareCommand implements CommandExecutor {
+    private Party playerParty;
+
+    @Override
+    public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
+        if (!Config.getInstance().getExpShareEnabled()) {
+            sender.sendMessage(LocaleLoader.getString("Party.ExpShare.Disabled"));
+            return true;
+        }
+
+        switch (args.length) {
+            case 2:
+                playerParty = UserManager.getPlayer((Player) sender).getParty();
+
+                if (args[1].equalsIgnoreCase("none") || args[1].equalsIgnoreCase("off") || args[1].equalsIgnoreCase("false")) {
+                    handleChangingShareMode(ShareMode.NONE);
+                }
+                else if (args[1].equalsIgnoreCase("equal") || args[1].equalsIgnoreCase("even") || args[1].equalsIgnoreCase("on") || args[1].equalsIgnoreCase("true")) {
+                    handleChangingShareMode(ShareMode.EQUAL);
+                }
+                else {
+                    sender.sendMessage(LocaleLoader.getString("Commands.Usage.2", "party", "expshare", "[NONE | EQUAL]"));
+                }
+
+                return true;
+
+            default:
+                sender.sendMessage(LocaleLoader.getString("Commands.Usage.2", "party", "expshare", "<NONE | EQUAL>"));
+                return true;
+        }
+    }
+
+    private void handleChangingShareMode(ShareHandler.ShareMode mode) {
+        playerParty.setXpShareMode(mode);
+
+        for (Player member : playerParty.getOnlineMembers()) {
+            member.sendMessage(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

@@ -0,0 +1,30 @@
+package com.gmail.nossr50.commands.party;
+
+import org.bukkit.command.Command;
+import org.bukkit.command.CommandExecutor;
+import org.bukkit.command.CommandSender;
+
+import com.gmail.nossr50.locale.LocaleLoader;
+
+public class PartyHelpCommand implements CommandExecutor {
+
+    @Override
+    public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
+        switch (args.length) {
+            case 1:
+                sender.sendMessage(LocaleLoader.getString("Party.Help.3", "/party join", "/party quit"));
+                sender.sendMessage(LocaleLoader.getString("Party.Help.1", "/party create"));
+                sender.sendMessage(LocaleLoader.getString("Party.Help.4", "/party <lock|unlock>"));
+                sender.sendMessage(LocaleLoader.getString("Party.Help.5", "/party password"));
+                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"));
+                return true;
+
+            default:
+                sender.sendMessage(LocaleLoader.getString("Commands.Usage.1", "party", "help"));
+                return true;
+        }
+    }
+
+}

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

@@ -0,0 +1,102 @@
+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;
+import org.bukkit.entity.Player;
+
+import com.gmail.nossr50.config.Config;
+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.party.ShareHandler;
+import com.gmail.nossr50.util.player.UserManager;
+
+public class PartyInfoCommand implements CommandExecutor {
+    private Player player;
+    private Party playerParty;
+
+    @Override
+    public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
+        player = (Player) sender;
+        McMMOPlayer mcMMOPlayer = UserManager.getPlayer(player);
+        playerParty = mcMMOPlayer.getParty();
+
+        displayPartyHeader();
+        displayShareModeInfo();
+        displayMemberInfo();
+        return true;
+    }
+
+    private String createMembersList() {
+        StringBuilder memberList = new StringBuilder();
+
+        for (OfflinePlayer member : playerParty.getMembers()) {
+            if (playerParty.getLeader().equalsIgnoreCase(member.getName())) {
+                memberList.append(ChatColor.GOLD).append(member.getName()).append(" ");
+            }
+            else if (member.isOnline()) {
+                memberList.append(ChatColor.WHITE).append(member.getName()).append(" ");
+            }
+            else {
+                memberList.append(ChatColor.GRAY).append(member.getName()).append(" ");
+            }
+        }
+
+        return memberList.toString();
+    }
+
+    private void displayShareModeInfo() {
+        boolean xpShareEnabled = Config.getInstance().getExpShareEnabled();
+        boolean itemShareEnabled = Config.getInstance().getItemShareEnabled();
+        boolean itemSharingActive = playerParty.getItemShareMode() != ShareHandler.ShareMode.NONE;
+
+        if (!xpShareEnabled && !itemShareEnabled) {
+            return;
+        }
+
+        String expShareInfo = "";
+        String itemShareInfo = "";
+        String separator = "";
+
+        if (xpShareEnabled) {
+            expShareInfo = LocaleLoader.getString("Commands.Party.ExpShare", playerParty.getXpShareMode().toString());
+        }
+
+        if (itemShareEnabled) {
+            itemShareInfo = LocaleLoader.getString("Commands.Party.ItemShare", playerParty.getItemShareMode().toString());
+        }
+
+        if (xpShareEnabled && itemShareEnabled) {
+            separator = ChatColor.DARK_GRAY + " || ";
+        }
+
+        player.sendMessage(LocaleLoader.getString("Commands.Party.ShareMode") + expShareInfo + separator + itemShareInfo);
+        if (itemSharingActive) {
+            player.sendMessage(LocaleLoader.getString("Commands.Party.ItemShareCategories", playerParty.getItemShareCategories()));
+        }
+    }
+
+    private void displayPartyHeader() {
+        player.sendMessage(LocaleLoader.getString("Commands.Party.Header"));
+
+        if (playerParty.isLocked()) {
+            player.sendMessage(LocaleLoader.getString("Commands.Party.Status", playerParty.getName(), LocaleLoader.getString("Party.Status.Locked")));
+        }
+        else {
+            player.sendMessage(LocaleLoader.getString("Commands.Party.Status", playerParty.getName(), LocaleLoader.getString("Party.Status.Unlocked")));
+        }
+    }
+
+    private void displayMemberInfo() {
+        int membersNear = PartyManager.getNearMembers(player, playerParty, Config.getInstance().getPartyShareRange()).size();
+        int membersOnline = playerParty.getOnlineMembers().size() - 1;
+
+        player.sendMessage(LocaleLoader.getString("Commands.Party.Members.Header"));
+        player.sendMessage(LocaleLoader.getString("Commands.Party.MembersNear", membersNear, membersOnline));
+        player.sendMessage(LocaleLoader.getString("Commands.Party.Members", createMembersList()));
+    }
+}

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

@@ -0,0 +1,72 @@
+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.mcMMO;
+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.player.UserManager;
+
+public class PartyInviteCommand implements CommandExecutor {
+    private McMMOPlayer mcMMOTarget;
+    private Player target;
+
+    private McMMOPlayer mcMMOPlayer;
+    private Player player;
+    private Party playerParty;
+
+    @Override
+    public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
+        switch (args.length) {
+            case 2:
+                if (!mcMMO.p.getServer().getOfflinePlayer(args[1]).isOnline()) {
+                    sender.sendMessage(LocaleLoader.getString("Party.NotOnline", args[1]));
+                    return true;
+                }
+
+                mcMMOTarget = UserManager.getPlayer(args[1]);
+
+                if (mcMMOTarget == null) {
+                    sender.sendMessage(LocaleLoader.getString("Party.Player.Invalid"));
+                    return true;
+                }
+
+                target = mcMMOTarget.getPlayer();
+                mcMMOPlayer = UserManager.getPlayer((Player) sender);
+                player = mcMMOPlayer.getPlayer();
+
+                if (player.equals(target)) {
+                    sender.sendMessage(LocaleLoader.getString("Party.Invite.Self"));
+                    return true;
+                }
+
+                if (PartyManager.inSameParty(player, target)) {
+                    sender.sendMessage(LocaleLoader.getString("Party.Player.InSameParty", target.getName()));
+                    return true;
+                }
+
+                playerParty = mcMMOPlayer.getParty();
+
+                if (!PartyManager.canInvite(player, playerParty)) {
+                    player.sendMessage(LocaleLoader.getString("Party.Locked"));
+                    return true;
+                }
+
+                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.1"));
+                return true;
+
+            default:
+                sender.sendMessage(LocaleLoader.getString("Commands.Usage.2", "party", "invite", "<" + LocaleLoader.getString("Commands.Usage.Player") + ">"));
+                return true;
+        }
+    }
+}

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

@@ -0,0 +1,101 @@
+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.config.Config;
+import com.gmail.nossr50.datatypes.party.Party;
+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.player.UserManager;
+
+public class PartyItemShareCommand implements CommandExecutor {
+    private Party playerParty;
+
+    @Override
+    public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
+        if (!Config.getInstance().getItemShareEnabled()) {
+            sender.sendMessage(LocaleLoader.getString("Party.ItemShare.Disabled"));
+            return true;
+        }
+
+        switch (args.length) {
+            case 2:
+                playerParty = UserManager.getPlayer((Player) sender).getParty();
+
+                if (args[1].equalsIgnoreCase("none") || args[1].equalsIgnoreCase("off") || args[1].equalsIgnoreCase("false")) {
+                    handleChangingShareMode(ShareMode.NONE);
+                }
+                else if (args[1].equalsIgnoreCase("equal") || args[1].equalsIgnoreCase("even")) {
+                    handleChangingShareMode(ShareMode.EQUAL);
+                }
+                else if (args[1].equalsIgnoreCase("random")) {
+                    handleChangingShareMode(ShareMode.RANDOM);
+                }
+                else {
+                    sender.sendMessage(LocaleLoader.getString("Commands.Usage.2", "party", "itemshare", "<NONE | EQUAL | RANDOM>"));
+                }
+
+                return true;
+
+            case 3:
+                playerParty = UserManager.getPlayer((Player) sender).getParty();
+                boolean toggle = false;
+
+                if (args[2].equalsIgnoreCase("true") || args[2].equalsIgnoreCase("on") || args[2].equalsIgnoreCase("enabled")) {
+                    toggle = true;
+                }
+                else if (args[2].equalsIgnoreCase("false") || args[2].equalsIgnoreCase("off") || args[2].equalsIgnoreCase("disabled")) {
+                    toggle = false;
+                }
+
+                if (args[1].equalsIgnoreCase("loot")) {
+                    playerParty.setSharingLootDrops(toggle);
+                }
+                else if (args[1].equalsIgnoreCase("mining")) {
+                    playerParty.setSharingMiningDrops(toggle);
+                }
+                else if (args[1].equalsIgnoreCase("herbalism")) {
+                    playerParty.setSharingHerbalismDrops(toggle);
+                }
+                else if (args[1].equalsIgnoreCase("woodcutting")) {
+                    playerParty.setSharingWoodcuttingDrops(toggle);
+                }
+                else {
+                    sender.sendMessage(LocaleLoader.getString("Commands.Usage.2", "party", "itemshare", "<loot | mining | herbalism | woodcutting> <true | false>"));
+                }
+
+                notifyToggleItemShareCategory(args, toggle);
+                return true;
+
+            default:
+                sender.sendMessage(LocaleLoader.getString("Commands.Usage.2", "party", "itemshare", "<NONE | EQUAL | RANDOM>"));
+                sender.sendMessage(LocaleLoader.getString("Commands.Usage.2", "party", "itemshare", "<loot | mining | herbalism | woodcutting> <true | false>"));
+                return true;
+        }
+    }
+
+    private void handleChangingShareMode(ShareHandler.ShareMode mode) {
+        playerParty.setItemShareMode(mode);
+
+        for (Player member : playerParty.getOnlineMembers()) {
+            member.sendMessage(LocaleLoader.getString("Commands.Party.SetSharing", LocaleLoader.getString("Party.ShareType.Item"), LocaleLoader.getString("Party.ShareMode." + StringUtils.getCapitalized(mode.toString()))));
+        }
+    }
+
+    private void notifyToggleItemShareCategory(String[] args, boolean toggle) {
+        String state = "disabled";
+
+        if (toggle) {
+            state = "enabled";
+        }
+
+        for (Player member : playerParty.getOnlineMembers()) {
+            member.sendMessage(LocaleLoader.getString("Commands.Party.ToggleShareCategory", StringUtils.getCapitalized(args[1]), state));
+        }
+    }
+}

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

@@ -0,0 +1,96 @@
+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.mcMMO;
+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.player.UserManager;
+
+public class PartyJoinCommand implements CommandExecutor {
+    private McMMOPlayer mcMMOTarget;
+    private Player target;
+    private Party targetParty;
+
+    private McMMOPlayer mcMMOPlayer;
+    private Player player;
+    private Party playerParty;
+
+    @Override
+    public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
+        switch (args.length) {
+            case 2:
+                // Fallthrough
+            case 3:
+                // Verify target exists and is in a different party than the player
+                if (!canJoinParty(sender, args[1])) {
+                    return true;
+                }
+
+                String password = getPassword(args);
+
+                // Make sure party passwords match
+                if (!PartyManager.checkPartyPassword(player, targetParty, password)) {
+                    return true;
+                }
+
+                // Changing parties
+                if (!PartyManager.changeOrJoinParty(mcMMOPlayer, player, playerParty, targetParty.getName())) {
+                    return true;
+                }
+
+                PartyManager.joinParty(player, mcMMOPlayer, targetParty, password);
+                return true;
+
+            default:
+                sender.sendMessage(LocaleLoader.getString("Commands.Usage.3", "party", "join", "<" + LocaleLoader.getString("Commands.Usage.Player") + ">", "[" + LocaleLoader.getString("Commands.Usage.Password") + "]"));
+                return true;
+        }
+    }
+
+    private String getPassword(String[] args) {
+        if (args.length == 3) {
+            return args[2];
+        }
+
+        return null;
+    }
+
+    private boolean canJoinParty(CommandSender sender, String targetName) {
+        if (!mcMMO.p.getServer().getOfflinePlayer(targetName).isOnline()) {
+            sender.sendMessage(LocaleLoader.getString("Party.NotOnline", targetName));
+            return false;
+        }
+
+        mcMMOTarget = UserManager.getPlayer(targetName);
+
+        if (mcMMOTarget == null) {
+            sender.sendMessage(LocaleLoader.getString("Party.Player.Invalid"));
+            return false;
+        }
+
+        target = mcMMOTarget.getPlayer();
+
+        if (!mcMMOTarget.inParty()) {
+            sender.sendMessage(LocaleLoader.getString("Party.PlayerNotInParty", targetName));
+            return false;
+        }
+
+        player = (Player) sender;
+        mcMMOPlayer = UserManager.getPlayer(player);
+        playerParty = mcMMOPlayer.getParty();
+        targetParty = mcMMOTarget.getParty();
+
+        if (player.equals(target) || (mcMMOPlayer.inParty() && playerParty.equals(targetParty))) {
+            sender.sendMessage(LocaleLoader.getString("Party.Join.Self"));
+            return false;
+        }
+
+        return true;
+    }
+}

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

@@ -0,0 +1,49 @@
+package com.gmail.nossr50.commands.party;
+
+import org.bukkit.OfflinePlayer;
+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.party.Party;
+import com.gmail.nossr50.events.party.McMMOPartyChangeEvent.EventReason;
+import com.gmail.nossr50.locale.LocaleLoader;
+import com.gmail.nossr50.party.PartyManager;
+import com.gmail.nossr50.util.player.UserManager;
+
+public class PartyKickCommand implements CommandExecutor {
+    @Override
+    public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
+        switch (args.length) {
+            case 2:
+                Party playerParty = UserManager.getPlayer((Player) sender).getParty();
+
+                OfflinePlayer target = mcMMO.p.getServer().getOfflinePlayer(args[1]);
+
+                if (!playerParty.getMembers().contains(target)) {
+                    sender.sendMessage(LocaleLoader.getString("Party.NotInYourParty", args[1]));
+                    return true;
+                }
+
+                if (target.isOnline()) {
+                    Player onlineTarget = target.getPlayer();
+                    String partyName = playerParty.getName();
+
+                    if (!PartyManager.handlePartyChangeEvent(onlineTarget, partyName, null, EventReason.KICKED_FROM_PARTY)) {
+                        return true;
+                    }
+
+                    onlineTarget.sendMessage(LocaleLoader.getString("Commands.Party.Kick", partyName));
+                }
+
+                PartyManager.removeFromParty(target, playerParty);
+                return true;
+
+            default:
+                sender.sendMessage(LocaleLoader.getString("Commands.Usage.2", "party", "kick", "<" + LocaleLoader.getString("Commands.Usage.Player") + ">"));
+                return true;
+        }
+    }
+}

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

@@ -0,0 +1,97 @@
+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.util.Permissions;
+import com.gmail.nossr50.util.player.UserManager;
+
+public class PartyLockCommand implements CommandExecutor {
+    private Party playerParty;
+
+    @Override
+    public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
+        playerParty = UserManager.getPlayer((Player) sender).getParty();
+
+        switch (args.length) {
+            case 1:
+                if (args[0].equalsIgnoreCase("lock")) {
+                    lockParty(sender, command);
+                }
+                else if (args[0].equalsIgnoreCase("unlock")) {
+                    unlockParty(sender, command);
+                }
+
+                return true;
+
+            case 2:
+                if (!args[0].equalsIgnoreCase("lock")) {
+                    sendUsageStrings(sender);
+                    return true;
+                }
+
+                if (args[1].equalsIgnoreCase("on") || args[1].equalsIgnoreCase("true")) {
+                    lockParty(sender, command);
+                }
+                else if (args[1].equalsIgnoreCase("off") || args[1].equalsIgnoreCase("false")) {
+                    unlockParty(sender, command);
+                }
+                else {
+                    sendUsageStrings(sender);
+                }
+
+                return true;
+
+            default:
+                sendUsageStrings(sender);
+                return true;
+        }
+    }
+
+    /**
+     * Handle locking a party.
+     */
+    private void lockParty(CommandSender sender, Command command) {
+        if (!Permissions.partySubcommand(sender, PartySubcommandType.LOCK)) {
+            sender.sendMessage(command.getPermissionMessage());
+            return;
+        }
+
+        if (playerParty.isLocked()) {
+            sender.sendMessage(LocaleLoader.getString("Party.IsLocked"));
+            return;
+        }
+
+        playerParty.setLocked(true);
+        sender.sendMessage(LocaleLoader.getString("Party.Locked"));
+    }
+
+    /**
+     * Handle unlocking a party.
+     *
+     * @return true if party is successfully unlocked, false otherwise.
+     */
+    private void unlockParty(CommandSender sender, Command command) {
+        if (!Permissions.partySubcommand(sender, PartySubcommandType.UNLOCK)) {
+            sender.sendMessage(command.getPermissionMessage());
+            return;
+        }
+
+        if (!playerParty.isLocked()) {
+            sender.sendMessage(LocaleLoader.getString("Party.IsntLocked"));
+            return;
+        }
+
+        playerParty.setLocked(false);
+        sender.sendMessage(LocaleLoader.getString("Party.Unlocked"));
+    }
+
+    private void sendUsageStrings(CommandSender sender) {
+        sender.sendMessage(LocaleLoader.getString("Commands.Usage.2", "party", "lock", "[on|off]"));
+        sender.sendMessage(LocaleLoader.getString("Commands.Usage.1", "party", "unlock"));
+    }
+}

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

@@ -0,0 +1,38 @@
+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.events.party.McMMOPartyChangeEvent.EventReason;
+import com.gmail.nossr50.locale.LocaleLoader;
+import com.gmail.nossr50.party.PartyManager;
+import com.gmail.nossr50.util.player.UserManager;
+
+public class PartyQuitCommand implements CommandExecutor {
+    private Player player;
+    private Party playerParty;
+
+    @Override
+    public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
+        switch (args.length) {
+            case 1:
+                player = (Player) sender;
+                playerParty = UserManager.getPlayer(player).getParty();
+
+                if (!PartyManager.handlePartyChangeEvent(player, playerParty.getName(), null, EventReason.LEFT_PARTY)) {
+                    return true;
+                }
+
+                PartyManager.removeFromParty(player, playerParty);
+                sender.sendMessage(LocaleLoader.getString("Commands.Party.Leave"));
+                return true;
+
+            default:
+                sender.sendMessage(LocaleLoader.getString("Commands.Usage.1", "party", "[quit|q|leave]"));
+                return true;
+        }
+    }
+}

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

@@ -0,0 +1,58 @@
+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.events.party.McMMOPartyChangeEvent.EventReason;
+import com.gmail.nossr50.locale.LocaleLoader;
+import com.gmail.nossr50.party.PartyManager;
+import com.gmail.nossr50.util.player.UserManager;
+
+public class PartyRenameCommand implements CommandExecutor {
+    @Override
+    public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
+        Party playerParty = UserManager.getPlayer((Player) sender).getParty();
+        String leaderName = playerParty.getLeader();
+
+        switch (args.length) {
+            case 2:
+                String newPartyName = args[1];
+
+                // This is to prevent party leaders from spamming other players with the rename message
+                if (playerParty.getName().equalsIgnoreCase(newPartyName)) {
+                    sender.sendMessage(LocaleLoader.getString("Party.Rename.Same"));
+                    return true;
+                }
+
+                Party newParty = PartyManager.getParty(newPartyName);
+
+                // Check to see if the party exists, and if it does cancel renaming the party
+                if (newParty != null) {
+                    sender.sendMessage(LocaleLoader.getString("Commands.Party.AlreadyExists", newPartyName));
+                    return true;
+                }
+
+                for (Player member : playerParty.getOnlineMembers()) {
+                    if (!PartyManager.handlePartyChangeEvent(member, playerParty.getName(), newPartyName, EventReason.CHANGED_PARTIES)) {
+                        return true;
+                    }
+
+                    if (!member.getName().equalsIgnoreCase(leaderName)) {
+                        member.sendMessage(LocaleLoader.getString("Party.InformedOnNameChange", leaderName, newPartyName));
+                    }
+                }
+
+                playerParty.setName(newPartyName);
+
+                sender.sendMessage(LocaleLoader.getString("Commands.Party.Rename", newPartyName));
+                return true;
+
+            default:
+                sender.sendMessage(LocaleLoader.getString("Commands.Usage.2", "party", "rename", "<" + LocaleLoader.getString("Commands.Usage.PartyName") + ">"));
+                return true;
+        }
+    }
+}

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

@@ -0,0 +1,48 @@
+package com.gmail.nossr50.commands.party;
+
+public enum PartySubcommandType {
+    JOIN,
+    ACCEPT,
+    CREATE,
+    HELP,
+    INFO,
+    QUIT,
+    EXPSHARE,
+    ITEMSHARE,
+    INVITE,
+    KICK,
+    DISBAND,
+    OWNER,
+    LOCK,
+    UNLOCK,
+    PASSWORD,
+    RENAME,
+    TELEPORT,
+    CHAT;
+
+    public static PartySubcommandType getSubcommand(String commandName) {
+        for (PartySubcommandType command : values()) {
+            if (command.name().equalsIgnoreCase(commandName)) {
+                return command;
+            }
+        }
+
+        if (commandName.equalsIgnoreCase("?")) {
+            return HELP;
+        }
+        else if (commandName.equalsIgnoreCase("q") || commandName.equalsIgnoreCase("leave")) {
+            return QUIT;
+        }
+        else if (commandName.equalsIgnoreCase("leader")) {
+            return OWNER;
+        }
+        else if (commandName.equalsIgnoreCase("xpshare") || commandName.equalsIgnoreCase("shareexp") || commandName.equalsIgnoreCase("sharexp")) {
+            return EXPSHARE;
+        }
+        else if (commandName.equalsIgnoreCase("shareitem") || commandName.equalsIgnoreCase("shareitems")) {
+            return ITEMSHARE;
+        }
+
+        return null;
+    }
+}

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

@@ -0,0 +1,218 @@
+package com.gmail.nossr50.commands.party;
+
+import org.bukkit.World;
+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.config.Config;
+import com.gmail.nossr50.datatypes.player.McMMOPlayer;
+import com.gmail.nossr50.events.party.McMMOPartyTeleportEvent;
+import com.gmail.nossr50.locale.LocaleLoader;
+import com.gmail.nossr50.party.PartyManager;
+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;
+
+public class PtpCommand implements CommandExecutor {
+    private Player player;
+    private McMMOPlayer mcMMOPlayer;
+
+    private Player target;
+    private McMMOPlayer mcMMOTarget;
+
+    @Override
+    public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
+        if (CommandUtils.noConsoleUsage(sender)) {
+            return true;
+        }
+
+        switch (args.length) {
+            case 1:
+                player = (Player) sender;
+                mcMMOPlayer = UserManager.getPlayer(player);
+
+                if (args[0].equalsIgnoreCase("toggle")) {
+                    if (!Permissions.partyTeleportToggle(sender)) {
+                        sender.sendMessage(command.getPermissionMessage());
+                        return true;
+                    }
+
+                    return togglePartyTeleportation();
+                }
+
+                if (args[0].equalsIgnoreCase("acceptany") || args[0].equalsIgnoreCase("acceptall")) {
+                    if (!Permissions.partyTeleportAcceptAll(sender)) {
+                        sender.sendMessage(command.getPermissionMessage());
+                        return true;
+                    }
+
+                    return acceptAnyTeleportRequest();
+                }
+
+                int ptpCooldown = Config.getInstance().getPTPCommandCooldown();
+                long recentlyHurt = UserManager.getPlayer(player).getRecentlyHurt();
+
+                if ((recentlyHurt * Misc.TIME_CONVERSION_FACTOR + ptpCooldown * Misc.TIME_CONVERSION_FACTOR) > System.currentTimeMillis()) {
+                    player.sendMessage(LocaleLoader.getString("Party.Teleport.Hurt", ptpCooldown));
+                    return true;
+                }
+
+                if (args[0].equalsIgnoreCase("accept")) {
+                    if (!Permissions.partyTeleportAccept(sender)) {
+                        sender.sendMessage(command.getPermissionMessage());
+                        return true;
+                    }
+
+                    return acceptTeleportRequest();
+                }
+
+                return sendTeleportRequest(args[0]);
+
+            default:
+                return false;
+        }
+    }
+
+    private boolean sendTeleportRequest(String targetName) {
+        if (!canTeleport(targetName)) {
+            return true;
+        }
+
+        if (!mcMMOTarget.getPtpConfirmRequired()) {
+            return handlePartyTeleportEvent(player, target);
+        }
+
+        mcMMOTarget.setPtpRequest(player);
+        mcMMOTarget.actualizePtpTimeout();
+        player.sendMessage(LocaleLoader.getString("Commands.Invite.Success"));
+
+        int ptpRequestExpire = Config.getInstance().getPTPCommandTimeout();
+
+        target.sendMessage(LocaleLoader.getString("Commands.ptp.Request1", player.getName()));
+        target.sendMessage(LocaleLoader.getString("Commands.ptp.Request2", ptpRequestExpire));
+        return true;
+    }
+
+    private boolean acceptTeleportRequest() {
+        if (!mcMMOPlayer.hasPtpRequest()) {
+            player.sendMessage(LocaleLoader.getString("Commands.ptp.NoRequests"));
+            return true;
+        }
+
+        int ptpRequestExpire = Config.getInstance().getPTPCommandTimeout();
+
+        if ((mcMMOPlayer.getPtpTimeout() + ptpRequestExpire) * Misc.TIME_CONVERSION_FACTOR < System.currentTimeMillis()) {
+            mcMMOPlayer.removePtpRequest();
+            player.sendMessage(LocaleLoader.getString("Commands.ptp.RequestExpired"));
+            return true;
+        }
+
+        target = mcMMOPlayer.getPtpRequest();
+        mcMMOPlayer.removePtpRequest();
+
+        if (!canTeleport(target.getName())) {
+            return true;
+        }
+
+        if (Config.getInstance().getPTPCommandWorldPermissions()) {
+            World targetWorld = target.getWorld();
+            World playerWorld = player.getWorld();
+
+            if (!Permissions.partyTeleportAllWorlds(target)) {
+                if (!Permissions.partyTeleportWorld(target, targetWorld)) {
+                    target.sendMessage(LocaleLoader.getString("Commands.ptp.NoWorldPermissions", targetWorld.getName()));
+                    return true;
+                }
+                else if (targetWorld != playerWorld && !Permissions.partyTeleportWorld(target, playerWorld)) {
+                    target.sendMessage(LocaleLoader.getString("Commands.ptp.NoWorldPermissions", playerWorld.getName()));
+                    return true;
+                }
+            }
+        }
+
+        return handlePartyTeleportEvent(target, player);
+    }
+
+    private boolean acceptAnyTeleportRequest() {
+        if (mcMMOPlayer.getPtpConfirmRequired()) {
+            player.sendMessage(LocaleLoader.getString("Commands.ptp.AcceptAny.Disabled"));
+        }
+        else {
+            player.sendMessage(LocaleLoader.getString("Commands.ptp.AcceptAny.Enabled"));
+        }
+
+        mcMMOPlayer.togglePtpConfirmRequired();
+        return true;
+    }
+
+    private boolean togglePartyTeleportation() {
+        if (mcMMOPlayer.getPtpEnabled()) {
+            player.sendMessage(LocaleLoader.getString("Commands.ptp.Disabled"));
+        }
+        else {
+            player.sendMessage(LocaleLoader.getString("Commands.ptp.Enabled"));
+        }
+
+        mcMMOPlayer.togglePtpUse();
+        return true;
+    }
+
+    private boolean canTeleport(String targetName) {
+        if (!mcMMO.p.getServer().getOfflinePlayer(targetName).isOnline()) {
+            player.sendMessage(LocaleLoader.getString("Party.NotOnline", targetName));
+            return false;
+        }
+
+        mcMMOTarget = UserManager.getPlayer(targetName);
+
+        if (mcMMOTarget == null) {
+            player.sendMessage(LocaleLoader.getString("Party.Player.Invalid"));
+            return false;
+        }
+
+        target = mcMMOTarget.getPlayer();
+
+        if (player.equals(target)) {
+            player.sendMessage(LocaleLoader.getString("Party.Teleport.Self"));
+            return false;
+        }
+
+        if (!PartyManager.inSameParty(player, target)) {
+            player.sendMessage(LocaleLoader.getString("Party.NotInYourParty", targetName));
+            return false;
+        }
+
+        if (!mcMMOTarget.getPtpEnabled()) {
+            player.sendMessage(LocaleLoader.getString("Party.Teleport.Disabled", target.getName()));
+            return false;
+        }
+
+        if (target.isDead()) {
+            player.sendMessage(LocaleLoader.getString("Party.Teleport.Dead"));
+            return false;
+        }
+
+        return true;
+    }
+
+    private boolean handlePartyTeleportEvent(Player player, Player target) {
+        McMMOPlayer mcMMOPlayer = UserManager.getPlayer(player);
+        McMMOPartyTeleportEvent event = new McMMOPartyTeleportEvent(player, target, mcMMOPlayer.getParty().getName());
+
+        mcMMO.p.getServer().getPluginManager().callEvent(event);
+
+        if (event.isCancelled()) {
+            return true;
+        }
+
+        player.teleport(target);
+        player.sendMessage(LocaleLoader.getString("Party.Teleport.Player", target.getName()));
+        target.sendMessage(LocaleLoader.getString("Party.Teleport.Target", player.getName()));
+        mcMMOPlayer.actualizeRecentlyHurt();
+        return true;
+    }
+}

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

@@ -5,14 +5,14 @@ import org.bukkit.command.CommandExecutor;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 
-import com.gmail.nossr50.commands.CommandHelper;
+import com.gmail.nossr50.datatypes.player.McMMOPlayer;
-import com.gmail.nossr50.datatypes.McMMOPlayer;
+import com.gmail.nossr50.datatypes.player.PlayerProfile;
-import com.gmail.nossr50.datatypes.PlayerProfile;
+import com.gmail.nossr50.datatypes.skills.SkillType;
 import com.gmail.nossr50.locale.LocaleLoader;
-import com.gmail.nossr50.skills.utilities.SkillType;
 import com.gmail.nossr50.util.Misc;
 import com.gmail.nossr50.util.Permissions;
-import com.gmail.nossr50.util.Users;
+import com.gmail.nossr50.util.commands.CommandUtils;
+import com.gmail.nossr50.util.player.UserManager;
 
 public class InspectCommand implements CommandExecutor {
     @Override
@@ -20,72 +20,68 @@ public class InspectCommand implements CommandExecutor {
         PlayerProfile profile;
 
         switch (args.length) {
-        case 1:
+            case 1:
-            if (!Permissions.hasPermission(sender, "mcmmo.commands.inspect")) {
+                McMMOPlayer mcMMOPlayer = UserManager.getPlayer(args[0]);
-                sender.sendMessage(command.getPermissionMessage());
-                return true;
-            }
 
-            McMMOPlayer mcMMOPlayer = Users.getPlayer(args[0]);
+                // 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); // Temporary Profile
 
-            // 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 (!profile.isLoaded()) {
-            if (mcMMOPlayer == null) {
+                        sender.sendMessage(LocaleLoader.getString("Commands.DoesNotExist"));
-                profile = new PlayerProfile(args[0], false); //Temporary Profile
-
-                if (!profile.isLoaded()) {
-                    sender.sendMessage(LocaleLoader.getString("Commands.DoesNotExist"));
-                    return true;
-                }
-
-                if (sender instanceof Player && !Permissions.inspectOffline((Player) sender)) {
-                    sender.sendMessage(LocaleLoader.getString("Inspect.Offline"));
-                    return true;
-                }
-
-                sender.sendMessage(LocaleLoader.getString("Inspect.OfflineStats", args[0]));
-
-                sender.sendMessage(LocaleLoader.getString("Stats.Header.Gathering"));
-                sender.sendMessage(LocaleLoader.getString("Skills.Stats", LocaleLoader.getString("Excavation.Listener"), profile.getSkillLevel(SkillType.EXCAVATION), profile.getSkillXpLevel(SkillType.EXCAVATION), profile.getXpToLevel(SkillType.EXCAVATION)));
-                sender.sendMessage(LocaleLoader.getString("Skills.Stats", LocaleLoader.getString("Fishing.Listener"), profile.getSkillLevel(SkillType.FISHING), profile.getSkillXpLevel(SkillType.FISHING), profile.getXpToLevel(SkillType.FISHING)));
-                sender.sendMessage(LocaleLoader.getString("Skills.Stats", LocaleLoader.getString("Herbalism.Listener"), profile.getSkillLevel(SkillType.HERBALISM), profile.getSkillXpLevel(SkillType.HERBALISM), profile.getXpToLevel(SkillType.HERBALISM)));
-                sender.sendMessage(LocaleLoader.getString("Skills.Stats", LocaleLoader.getString("Mining.Listener"), profile.getSkillLevel(SkillType.MINING), profile.getSkillXpLevel(SkillType.MINING), profile.getXpToLevel(SkillType.MINING)));
-                sender.sendMessage(LocaleLoader.getString("Skills.Stats", LocaleLoader.getString("Woodcutting.Listener"), profile.getSkillLevel(SkillType.WOODCUTTING), profile.getSkillXpLevel(SkillType.WOODCUTTING), profile.getXpToLevel(SkillType.WOODCUTTING)));
-
-                sender.sendMessage(LocaleLoader.getString("Stats.Header.Combat"));
-                sender.sendMessage(LocaleLoader.getString("Skills.Stats", LocaleLoader.getString("Axes.Listener"), profile.getSkillLevel(SkillType.AXES), profile.getSkillXpLevel(SkillType.AXES), profile.getXpToLevel(SkillType.AXES)));
-                sender.sendMessage(LocaleLoader.getString("Skills.Stats", LocaleLoader.getString("Archery.Listener"), profile.getSkillLevel(SkillType.ARCHERY), profile.getSkillXpLevel(SkillType.ARCHERY), profile.getXpToLevel(SkillType.ARCHERY)));
-                sender.sendMessage(LocaleLoader.getString("Skills.Stats", LocaleLoader.getString("Swords.Listener"), profile.getSkillLevel(SkillType.SWORDS), profile.getSkillXpLevel(SkillType.SWORDS), profile.getXpToLevel(SkillType.SWORDS)));
-                sender.sendMessage(LocaleLoader.getString("Skills.Stats", LocaleLoader.getString("Taming.Listener"), profile.getSkillLevel(SkillType.TAMING), profile.getSkillXpLevel(SkillType.TAMING), profile.getXpToLevel(SkillType.TAMING)));
-                sender.sendMessage(LocaleLoader.getString("Skills.Stats", LocaleLoader.getString("Unarmed.Listener"), profile.getSkillLevel(SkillType.UNARMED), profile.getSkillXpLevel(SkillType.UNARMED), profile.getXpToLevel(SkillType.UNARMED)));
-
-                sender.sendMessage(LocaleLoader.getString("Stats.Header.Misc"));
-                sender.sendMessage(LocaleLoader.getString("Skills.Stats", LocaleLoader.getString("Acrobatics.Listener"), profile.getSkillLevel(SkillType.ACROBATICS), profile.getSkillXpLevel(SkillType.ACROBATICS), profile.getXpToLevel(SkillType.ACROBATICS)));
-                sender.sendMessage(LocaleLoader.getString("Skills.Stats", LocaleLoader.getString("Repair.Listener"), profile.getSkillLevel(SkillType.REPAIR), profile.getSkillXpLevel(SkillType.REPAIR), profile.getXpToLevel(SkillType.REPAIR)));
-            }
-            else {
-                Player target = mcMMOPlayer.getPlayer();
-
-                if (sender instanceof Player) {
-                    Player inspector = (Player) sender;
-
-                    if (!Misc.isNear(inspector.getLocation(), target.getLocation(), 5.0) && !Permissions.inspectFar(inspector)) {
-                        sender.sendMessage(LocaleLoader.getString("Inspect.TooFar"));
                         return true;
                     }
+
+                    // TODO: Why do we care if this is a player?
+                    if (sender instanceof Player && !Permissions.inspectOffline(sender)) {
+                        sender.sendMessage(LocaleLoader.getString("Inspect.Offline"));
+                        return true;
+                    }
+
+                    sender.sendMessage(LocaleLoader.getString("Inspect.OfflineStats", args[0]));
+
+                    sender.sendMessage(LocaleLoader.getString("Stats.Header.Gathering"));
+                    sender.sendMessage(LocaleLoader.getString("Skills.Stats", LocaleLoader.getString("Excavation.Listener"), profile.getSkillLevel(SkillType.EXCAVATION), profile.getSkillXpLevel(SkillType.EXCAVATION), profile.getXpToLevel(SkillType.EXCAVATION)));
+                    sender.sendMessage(LocaleLoader.getString("Skills.Stats", LocaleLoader.getString("Fishing.Listener"), profile.getSkillLevel(SkillType.FISHING), profile.getSkillXpLevel(SkillType.FISHING), profile.getXpToLevel(SkillType.FISHING)));
+                    sender.sendMessage(LocaleLoader.getString("Skills.Stats", LocaleLoader.getString("Herbalism.Listener"), profile.getSkillLevel(SkillType.HERBALISM), profile.getSkillXpLevel(SkillType.HERBALISM), profile.getXpToLevel(SkillType.HERBALISM)));
+                    sender.sendMessage(LocaleLoader.getString("Skills.Stats", LocaleLoader.getString("Mining.Listener"), profile.getSkillLevel(SkillType.MINING), profile.getSkillXpLevel(SkillType.MINING), profile.getXpToLevel(SkillType.MINING)));
+                    sender.sendMessage(LocaleLoader.getString("Skills.Stats", LocaleLoader.getString("Woodcutting.Listener"), profile.getSkillLevel(SkillType.WOODCUTTING), profile.getSkillXpLevel(SkillType.WOODCUTTING), profile.getXpToLevel(SkillType.WOODCUTTING)));
+
+                    sender.sendMessage(LocaleLoader.getString("Stats.Header.Combat"));
+                    sender.sendMessage(LocaleLoader.getString("Skills.Stats", LocaleLoader.getString("Axes.Listener"), profile.getSkillLevel(SkillType.AXES), profile.getSkillXpLevel(SkillType.AXES), profile.getXpToLevel(SkillType.AXES)));
+                    sender.sendMessage(LocaleLoader.getString("Skills.Stats", LocaleLoader.getString("Archery.Listener"), profile.getSkillLevel(SkillType.ARCHERY), profile.getSkillXpLevel(SkillType.ARCHERY), profile.getXpToLevel(SkillType.ARCHERY)));
+                    sender.sendMessage(LocaleLoader.getString("Skills.Stats", LocaleLoader.getString("Swords.Listener"), profile.getSkillLevel(SkillType.SWORDS), profile.getSkillXpLevel(SkillType.SWORDS), profile.getXpToLevel(SkillType.SWORDS)));
+                    sender.sendMessage(LocaleLoader.getString("Skills.Stats", LocaleLoader.getString("Taming.Listener"), profile.getSkillLevel(SkillType.TAMING), profile.getSkillXpLevel(SkillType.TAMING), profile.getXpToLevel(SkillType.TAMING)));
+                    sender.sendMessage(LocaleLoader.getString("Skills.Stats", LocaleLoader.getString("Unarmed.Listener"), profile.getSkillLevel(SkillType.UNARMED), profile.getSkillXpLevel(SkillType.UNARMED), profile.getXpToLevel(SkillType.UNARMED)));
+
+                    sender.sendMessage(LocaleLoader.getString("Stats.Header.Misc"));
+                    sender.sendMessage(LocaleLoader.getString("Skills.Stats", LocaleLoader.getString("Acrobatics.Listener"), profile.getSkillLevel(SkillType.ACROBATICS), profile.getSkillXpLevel(SkillType.ACROBATICS), profile.getXpToLevel(SkillType.ACROBATICS)));
+                    sender.sendMessage(LocaleLoader.getString("Skills.Stats", LocaleLoader.getString("Repair.Listener"), profile.getSkillLevel(SkillType.REPAIR), profile.getSkillXpLevel(SkillType.REPAIR), profile.getXpToLevel(SkillType.REPAIR)));
                 }
-                profile = mcMMOPlayer.getProfile();
+                else {
+                    Player target = mcMMOPlayer.getPlayer();
 
-                sender.sendMessage(LocaleLoader.getString("Inspect.Stats", target.getName()));
+                    if (sender instanceof Player) {
-                CommandHelper.printGatheringSkills(target, profile, sender);
+                        Player inspector = (Player) sender;
-                CommandHelper.printCombatSkills(target, profile, sender);
-                CommandHelper.printMiscSkills(target, profile, sender);
-                sender.sendMessage(LocaleLoader.getString("Commands.PowerLevel", mcMMOPlayer.getPowerLevel()));
-            }
 
-            return true;
+                        if (!Misc.isNear(inspector.getLocation(), target.getLocation(), 5.0) && !Permissions.inspectFar(inspector)) {
+                            sender.sendMessage(LocaleLoader.getString("Inspect.TooFar"));
+                            return true;
+                        }
+                    }
+                    profile = mcMMOPlayer.getProfile();
 
-        default:
+                    sender.sendMessage(LocaleLoader.getString("Inspect.Stats", target.getName()));
-            return false;
+                    CommandUtils.printGatheringSkills(target, profile, sender);
+                    CommandUtils.printCombatSkills(target, profile, sender);
+                    CommandUtils.printMiscSkills(target, profile, sender);
+                    sender.sendMessage(LocaleLoader.getString("Commands.PowerLevel", mcMMOPlayer.getPowerLevel()));
+                }
+
+                return true;
+
+            default:
+                return false;
         }
     }
 }

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

@@ -1,80 +0,0 @@
-package com.gmail.nossr50.commands.player;
-
-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.McMMOPlayer;
-import com.gmail.nossr50.datatypes.PlayerProfile;
-import com.gmail.nossr50.locale.LocaleLoader;
-import com.gmail.nossr50.util.Permissions;
-import com.gmail.nossr50.util.Users;
-
-public class McabilityCommand implements CommandExecutor {
-    @Override
-    public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
-        PlayerProfile profile;
-
-        switch (args.length) {
-        case 0:
-            if (!Permissions.hasPermission(sender, "mcmmo.commands.mcability")) {
-                sender.sendMessage(command.getPermissionMessage());
-                return true;
-            }
-
-            profile = Users.getPlayer((Player) sender).getProfile();
-
-            if (profile.getAbilityUse()) {
-                sender.sendMessage(LocaleLoader.getString("Commands.Ability.Off"));
-            }
-            else {
-                sender.sendMessage(LocaleLoader.getString("Commands.Ability.On"));
-            }
-
-            profile.toggleAbilityUse();
-            return true;
-
-        case 1:
-            if (!Permissions.hasPermission(sender, "mcmmo.commands.mcability.others")) {
-                sender.sendMessage(command.getPermissionMessage());
-                return true;
-            }
-
-            McMMOPlayer mcMMOPlayer = Users.getPlayer(args[0]);
-
-            if (mcMMOPlayer == null) {
-                profile = new PlayerProfile(args[0], false);
-
-                if (!profile.isLoaded()) {
-                    sender.sendMessage(LocaleLoader.getString("Commands.DoesNotExist"));
-                    return true;
-                }
-
-                sender.sendMessage(LocaleLoader.getString("Commands.Offline"));
-                return true;
-            }
-
-            Player player = mcMMOPlayer.getPlayer();
-            profile = mcMMOPlayer.getProfile();
-
-            if (!player.isOnline()) {
-                sender.sendMessage(LocaleLoader.getString("Commands.Offline"));
-                return true;
-            }
-
-            if (profile.getAbilityUse()) {
-                player.sendMessage(LocaleLoader.getString("Commands.Ability.Off"));
-            }
-            else {
-                player.sendMessage(LocaleLoader.getString("Commands.Ability.On"));
-            }
-
-            profile.toggleAbilityUse();
-            return true;
-
-        default:
-            return false;
-        }
-    }
-}

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

@@ -1,79 +0,0 @@
-package com.gmail.nossr50.commands.player;
-
-import org.bukkit.command.Command;
-import org.bukkit.command.CommandExecutor;
-import org.bukkit.command.CommandSender;
-import org.bukkit.entity.Player;
-
-import com.gmail.nossr50.commands.CommandHelper;
-import com.gmail.nossr50.locale.LocaleLoader;
-import com.gmail.nossr50.util.Permissions;
-
-//TODO: Rework this whole thing. It's ugly. Also is missing all the admin & spout commands.
-public class MccCommand implements CommandExecutor {
-    @Override
-    public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
-        if (CommandHelper.noConsoleUsage(sender)) {
-            return true;
-        }
-
-        if (!Permissions.hasPermission(sender, "mcmmo.commands.mcc")) {
-            return true;
-        }
-
-        Player player = (Player) sender;
-
-        player.sendMessage(LocaleLoader.getString("Commands.mcc.Header"));
-
-        if (Permissions.party(player)) {
-            player.sendMessage(LocaleLoader.getString("Commands.Party.Commands"));
-            player.sendMessage("/party create <" + LocaleLoader.getString("Commands.Usage.PartyName") + "> " + LocaleLoader.getString("Commands.Party1"));
-            player.sendMessage("/party join <" + LocaleLoader.getString("Commands.Usage.Player") + "> " + LocaleLoader.getString("Commands.Party2"));
-            player.sendMessage("/party quit " + LocaleLoader.getString("Commands.Party.Quit"));
-
-            if (Permissions.partyChat(player)) {
-                player.sendMessage("/p " + LocaleLoader.getString("Commands.Party.Toggle"));
-            }
-
-            player.sendMessage("/party invite <" + LocaleLoader.getString("Commands.Usage.Player") + "> " + LocaleLoader.getString("Commands.Party.Invite"));
-            player.sendMessage("/party accept " + LocaleLoader.getString("Commands.Party.Accept"));
-
-            if (Permissions.partyTeleport(player)) {
-                player.sendMessage("/ptp " + LocaleLoader.getString("Commands.Party.Teleport"));
-            }
-        }
-
-        player.sendMessage(LocaleLoader.getString("Commands.Other"));
-        player.sendMessage("/mcstats " + LocaleLoader.getString("Commands.Stats"));
-        player.sendMessage("/mctop " + LocaleLoader.getString("Commands.Leaderboards"));
-
-        if (Permissions.skillReset(player)) {
-            player.sendMessage("/skillreset <skill|all> " + LocaleLoader.getString("Commands.Reset"));
-        }
-
-        if (Permissions.mcAbility(player)) {
-            player.sendMessage("/mcability " + LocaleLoader.getString("Commands.ToggleAbility"));
-        }
-
-        if (Permissions.adminChat(player)) {
-            player.sendMessage("/a " + LocaleLoader.getString("Commands.AdminToggle"));
-        }
-
-        if (Permissions.inspect(player)) {
-            player.sendMessage("/inspect " + LocaleLoader.getString("Commands.Inspect"));
-        }
-
-        if (Permissions.mmoedit(player)) {
-            player.sendMessage("/mmoedit " + LocaleLoader.getString("Commands.mmoedit"));
-        }
-
-        if (Permissions.mcgod(player)) {
-            player.sendMessage("/mcgod " + LocaleLoader.getString("Commands.mcgod"));
-        }
-
-        player.sendMessage(LocaleLoader.getString("Commands.SkillInfo"));
-        player.sendMessage("/mcmmo " + LocaleLoader.getString("Commands.ModDescription"));
-
-        return true;
-    }
-}

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

@@ -1,42 +0,0 @@
-package com.gmail.nossr50.commands.player;
-
-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 com.gmail.nossr50.mcMMO;
-import com.gmail.nossr50.config.Config;
-import com.gmail.nossr50.locale.LocaleLoader;
-import com.gmail.nossr50.util.Anniversary;
-
-public class McmmoCommand implements CommandExecutor {
-    @Override
-    public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
-
-        if (args.length == 0 || (args.length == 1 && args[0].equals("?"))) {
-            String description = LocaleLoader.getString("mcMMO.Description");
-            String[] mcSplit = description.split(",");
-            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);
-                }
-
-                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()));
-
-            Anniversary.anniversaryCheck(sender);
-            return true;
-        }
-
-        return false;
-    }
-}

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

@@ -1,6 +1,6 @@
 package com.gmail.nossr50.commands.player;
 
-import org.bukkit.Bukkit;
+import org.bukkit.ChatColor;
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandExecutor;
 import org.bukkit.command.CommandSender;
@@ -8,83 +8,83 @@ import org.bukkit.entity.Player;
 
 import com.gmail.nossr50.mcMMO;
 import com.gmail.nossr50.config.Config;
-import com.gmail.nossr50.database.Leaderboard;
+import com.gmail.nossr50.database.LeaderboardManager;
-import com.gmail.nossr50.datatypes.McMMOPlayer;
+import com.gmail.nossr50.database.queuemanager.McRankAsync;
-import com.gmail.nossr50.datatypes.PlayerProfile;
+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.runnables.McRankAsync;
-import com.gmail.nossr50.skills.utilities.SkillTools;
-import com.gmail.nossr50.skills.utilities.SkillType;
 import com.gmail.nossr50.util.Misc;
 import com.gmail.nossr50.util.Permissions;
-import com.gmail.nossr50.util.Users;
+import com.gmail.nossr50.util.player.UserManager;
+import com.gmail.nossr50.util.skills.SkillUtils;
 
 public class McrankCommand implements CommandExecutor {
     @Override
     public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
         switch (args.length) {
-        case 0:
+            case 0:
-            if (!Permissions.hasPermission(sender, "mcmmo.commands.mcrank")) {
+                if (!Permissions.mcrank(sender)) {
-                sender.sendMessage(command.getPermissionMessage());
+                    sender.sendMessage(command.getPermissionMessage());
-                return true;
+                    return true;
-            }
+                }
 
-            if (!(sender instanceof Player)) {
+                if (!(sender instanceof Player)) {
+                    return false;
+                }
+
+                if (Config.getInstance().getUseMySQL()) {
+                    sqlDisplay(sender, sender.getName());
+                }
+                else {
+                    LeaderboardManager.updateLeaderboards(); // Make sure the information is up to date
+                    flatfileDisplay(sender, sender.getName());
+                }
+
+                return true;
+
+            case 1:
+                if (!Permissions.mcrankOthers(sender)) {
+                    sender.sendMessage(command.getPermissionMessage());
+                    return true;
+                }
+
+                McMMOPlayer mcMMOPlayer = UserManager.getPlayer(args[0]);
+
+                if (mcMMOPlayer == null) {
+                    PlayerProfile profile = new PlayerProfile(args[0], false); // Temporary Profile
+
+                    if (!profile.isLoaded()) {
+                        sender.sendMessage(LocaleLoader.getString("Commands.DoesNotExist"));
+                        return true;
+                    }
+
+                    if (sender instanceof Player && !Permissions.mcrankOffline(sender)) {
+                        sender.sendMessage(LocaleLoader.getString("Inspect.Offline"));
+                        return true;
+                    }
+                }
+                else {
+                    Player target = mcMMOPlayer.getPlayer();
+
+                    if (sender instanceof Player && !Misc.isNear(((Player) sender).getLocation(), target.getLocation(), 5.0) && !Permissions.mcrankFar(sender)) {
+                        sender.sendMessage(LocaleLoader.getString("Inspect.TooFar"));
+                        return true;
+                    }
+                }
+
+                if (Config.getInstance().getUseMySQL()) {
+                    sqlDisplay(sender, args[0]);
+                }
+                else {
+                    LeaderboardManager.updateLeaderboards(); // Make sure the information is up to date
+                    flatfileDisplay(sender, args[0]);
+                }
+
+                return true;
+
+            default:
                 return false;
-            }
-
-            if (Config.getInstance().getUseMySQL()) {
-                sqlDisplay(sender, sender.getName());
-            }
-            else {
-                Leaderboard.updateLeaderboards(); // Make sure the information is up to date
-                flatfileDisplay(sender, sender.getName());
-            }
-
-            return true;
-
-        case 1:
-            if (!Permissions.hasPermission(sender, "mcmmo.commands.mcrank.others")) {
-                sender.sendMessage(command.getPermissionMessage());
-                return true;
-            }
-
-            McMMOPlayer mcMMOPlayer = Users.getPlayer(args[0]);
-
-            if (mcMMOPlayer == null) {
-                PlayerProfile profile = new PlayerProfile(args[0], false); //Temporary Profile
-
-                if (!profile.isLoaded()) {
-                    sender.sendMessage(LocaleLoader.getString("Commands.DoesNotExist"));
-                    return true;
-                }
-
-                if (sender instanceof Player && !!Permissions.hasPermission(sender, "mcmmo.commands.mcrank.others.offline")) {
-                    sender.sendMessage(LocaleLoader.getString("Inspect.Offline"));
-                    return true;
-                }
-            }
-            else {
-                Player target = mcMMOPlayer.getPlayer();
-
-                if (sender instanceof Player && !Misc.isNear(((Player) sender).getLocation(), target.getLocation(), 5.0) && !Permissions.hasPermission(sender, "mcmmo.commands.mcrank.others.far")) {
-                    sender.sendMessage(LocaleLoader.getString("Inspect.TooFar"));
-                    return true;
-                }
-            }
-
-            if (Config.getInstance().getUseMySQL()) {
-                sqlDisplay(sender, args[0]);
-            }
-            else {
-                Leaderboard.updateLeaderboards(); // Make sure the information is up to date
-                flatfileDisplay(sender, args[0]);
-            }
-
-            return true;
-
-        default:
-            return false;
         }
     }
 
@@ -93,32 +93,46 @@ public class McrankCommand implements CommandExecutor {
         sender.sendMessage(LocaleLoader.getString("Commands.mcrank.Player", playerName));
 
         for (SkillType skillType : SkillType.values()) {
-            int[] rankInts = Leaderboard.getPlayerRank(playerName, skillType);
+            int[] rankInts = LeaderboardManager.getPlayerRank(playerName, skillType);
 
             if (skillType.isChildSkill()) {
                 continue;
             }
 
+            if ((sender instanceof Player) && !Permissions.skillEnabled((Player) sender, skillType)) {
+                continue;
+            }
+
             if (rankInts[1] == 0) {
-                sender.sendMessage(LocaleLoader.getString("Commands.mcrank.Skill", SkillTools.localizeSkillName(skillType), LocaleLoader.getString("Commands.mcrank.Unranked"))); // Don't bother showing ranking for players without skills
+                sender.sendMessage(LocaleLoader.getString("Commands.mcrank.Skill", SkillUtils.getSkillName(skillType), LocaleLoader.getString("Commands.mcrank.Unranked"))); // Don't bother showing ranking for players without skills
             }
             else {
-                sender.sendMessage(LocaleLoader.getString("Commands.mcrank.Skill", SkillTools.localizeSkillName(skillType), String.valueOf(rankInts[0])));
+                sender.sendMessage(LocaleLoader.getString("Commands.mcrank.Skill", SkillUtils.getSkillName(skillType), rankInts[0]));
             }
         }
 
         // Show the powerlevel ranking
-        int[] rankInts = Leaderboard.getPlayerRank(playerName);
+        int[] rankInts = LeaderboardManager.getPlayerRank(playerName);
 
         if (rankInts[1] == 0) {
-            sender.sendMessage(LocaleLoader.getString("Commands.mcrank.Overalll", LocaleLoader.getString("Commands.mcrank.Unranked"))); // Don't bother showing ranking for players without skills
+            sender.sendMessage(LocaleLoader.getString("Commands.mcrank.Overall", LocaleLoader.getString("Commands.mcrank.Unranked"))); // Don't bother showing ranking for players without skills
         }
         else {
-            sender.sendMessage(LocaleLoader.getString("Commands.mcrank.Overall", String.valueOf(rankInts[0])));
+            sender.sendMessage(LocaleLoader.getString("Commands.mcrank.Overall", rankInts[0]));
         }
     }
 
     private void sqlDisplay(CommandSender sender, String playerName) {
-        Bukkit.getScheduler().runTaskAsynchronously(mcMMO.p, new McRankAsync(playerName, sender));
+        //TODO: Localize messages
+        if (mcMMO.queueManager.contains(sender.getName())) {
+            sender.sendMessage(ChatColor.RED + "Please wait for your previous command to process");
+        }
+
+        if (!mcMMO.queueManager.queue(new McRankAsync(playerName, sender))) {
+            // This will only run if for some reason it is unable to add to the queue
+            sender.sendMessage(ChatColor.RED + "Unable to add to queue.");
+        }
+
+        sender.sendMessage(ChatColor.YELLOW + "Calculating mcMMO rankings...");
     }
 }

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

@@ -5,46 +5,46 @@ import org.bukkit.command.CommandExecutor;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 
-import com.gmail.nossr50.commands.CommandHelper;
 import com.gmail.nossr50.config.Config;
-import com.gmail.nossr50.datatypes.McMMOPlayer;
+import com.gmail.nossr50.datatypes.player.McMMOPlayer;
-import com.gmail.nossr50.datatypes.PlayerProfile;
+import com.gmail.nossr50.datatypes.player.PlayerProfile;
 import com.gmail.nossr50.locale.LocaleLoader;
-import com.gmail.nossr50.util.Users;
+import com.gmail.nossr50.util.commands.CommandUtils;
+import com.gmail.nossr50.util.player.UserManager;
 
 public class McstatsCommand implements CommandExecutor {
     @Override
     public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
-        if (CommandHelper.noConsoleUsage(sender)) {
+        if (CommandUtils.noConsoleUsage(sender)) {
             return true;
         }
 
         switch (args.length) {
-        case 0:
+            case 0:
-            Player player = (Player) sender;
+                Player player = (Player) sender;
-            McMMOPlayer mcMMOPlayer = Users.getPlayer(player);
+                McMMOPlayer mcMMOPlayer = UserManager.getPlayer(player);
-            PlayerProfile profile = mcMMOPlayer.getProfile();
+                PlayerProfile profile = mcMMOPlayer.getProfile();
 
-            player.sendMessage(LocaleLoader.getString("Stats.Own.Stats"));
+                player.sendMessage(LocaleLoader.getString("Stats.Own.Stats"));
-            player.sendMessage(LocaleLoader.getString("mcMMO.NoSkillNote"));
+                player.sendMessage(LocaleLoader.getString("mcMMO.NoSkillNote"));
 
-            CommandHelper.printGatheringSkills(player, profile);
+                CommandUtils.printGatheringSkills(player, profile);
-            CommandHelper.printCombatSkills(player, profile);
+                CommandUtils.printCombatSkills(player, profile);
-            CommandHelper.printMiscSkills(player, profile);
+                CommandUtils.printMiscSkills(player, profile);
 
-            int powerLevelCap = Config.getInstance().getPowerLevelCap();
+                int powerLevelCap = Config.getInstance().getPowerLevelCap();
 
-            if (powerLevelCap != Integer.MAX_VALUE) {
+                if (powerLevelCap != Integer.MAX_VALUE) {
-                player.sendMessage(LocaleLoader.getString("Commands.PowerLevel.Capped", String.valueOf(mcMMOPlayer.getPowerLevel()), String.valueOf(powerLevelCap)));
+                    player.sendMessage(LocaleLoader.getString("Commands.PowerLevel.Capped", mcMMOPlayer.getPowerLevel(), powerLevelCap));
-            }
+                }
-            else {
+                else {
-                player.sendMessage(LocaleLoader.getString("Commands.PowerLevel", String.valueOf(mcMMOPlayer.getPowerLevel())));
+                    player.sendMessage(LocaleLoader.getString("Commands.PowerLevel", mcMMOPlayer.getPowerLevel()));
-            }
+                }
 
-            return true;
+                return true;
 
-        default:
+            default:
-            return false;
+                return false;
         }
     }
 }

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

@@ -1,20 +1,19 @@
 package com.gmail.nossr50.commands.player;
 
-import java.util.ArrayList;
-import java.util.HashMap;
-
 import org.bukkit.ChatColor;
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandExecutor;
 import org.bukkit.command.CommandSender;
 
-import com.gmail.nossr50.commands.CommandHelper;
+import com.gmail.nossr50.mcMMO;
 import com.gmail.nossr50.config.Config;
-import com.gmail.nossr50.database.Database;
+import com.gmail.nossr50.database.LeaderboardManager;
-import com.gmail.nossr50.database.Leaderboard;
+import com.gmail.nossr50.database.queuemanager.McTopAsync;
+import com.gmail.nossr50.datatypes.skills.SkillType;
 import com.gmail.nossr50.locale.LocaleLoader;
-import com.gmail.nossr50.skills.utilities.SkillTools;
+import com.gmail.nossr50.util.Permissions;
-import com.gmail.nossr50.util.Misc;
+import com.gmail.nossr50.util.StringUtils;
+import com.gmail.nossr50.util.skills.SkillUtils;
 
 public class MctopCommand implements CommandExecutor {
     @Override
@@ -22,49 +21,62 @@ public class MctopCommand implements CommandExecutor {
         boolean useMySQL = Config.getInstance().getUseMySQL();
 
         switch (args.length) {
-        case 0:
+            case 0:
-            display(1, "ALL", sender, useMySQL);
+                display(1, "ALL", sender, useMySQL, command);
-            return true;
+                return true;
 
-        case 1:
+            case 1:
-            if (Misc.isInt(args[0])) {
+                if (StringUtils.isInt(args[0])) {
-                display(Integer.valueOf(args[0]), "ALL", sender, useMySQL);
+                    display(Integer.parseInt(args[0]), "ALL", sender, useMySQL, command);
-            }
+                }
-            else if (SkillTools.isSkill(args[0])) {
+                else if (SkillUtils.isSkill(args[0])) {
-                display(1, args[0], sender, useMySQL);
+                    SkillType skill = SkillType.getSkill(args[0]);
-            }
-            else if (SkillTools.isLocalizedSkill(args[0])) {
-                display(1, SkillTools.translateLocalizedSkill(args[0]), sender, useMySQL);
-            }
-            else {
-                sender.sendMessage(LocaleLoader.getString("Commands.Skill.Invalid"));
-            }
 
-            return true;
+                    if (skill.isChildSkill()) {
+                        sender.sendMessage("Child skills are not yet supported by this command."); // TODO: Localize this
+                        return true;
+                    }
 
-        case 2:
+                    display(1, skill.toString(), sender, useMySQL, command);
-            if (!Misc.isInt(args[1])) {
+                }
+                else {
+                    sender.sendMessage(LocaleLoader.getString("Commands.Skill.Invalid"));
+                }
+
+                return true;
+
+            case 2:
+                if (!StringUtils.isInt(args[1])) {
+                    return false;
+                }
+
+                if (SkillUtils.isSkill(args[0])) {
+                    SkillType skill = SkillType.getSkill(args[0]);
+
+                    if (skill.isChildSkill()) {
+                        sender.sendMessage("Child skills are not yet supported by this command."); // TODO: Localize this
+                        return true;
+                    }
+
+                    display(Integer.parseInt(args[1]), skill.toString(), sender, useMySQL, command);
+                }
+                else {
+                    sender.sendMessage(LocaleLoader.getString("Commands.Skill.Invalid"));
+                }
+
+                return true;
+
+            default:
                 return false;
-            }
-
-            if (SkillTools.isSkill(args[0])) {
-                display(Integer.valueOf(args[1]), args[0], sender, useMySQL);
-            }
-            else if (SkillTools.isLocalizedSkill(args[0])) {
-                display(Integer.valueOf(args[1]), SkillTools.translateLocalizedSkill(args[0]), sender, useMySQL);
-            }
-            else {
-                sender.sendMessage(LocaleLoader.getString("Commands.Skill.Invalid"));
-            }
-
-            return true;
-
-        default:
-            return false;
         }
     }
 
-    private void display(int page, String skill, CommandSender sender, boolean sql) {
+    private void display(int page, String skill, CommandSender sender, boolean sql, Command command) {
+        if (!skill.equalsIgnoreCase("all") && !Permissions.mctop(sender, SkillType.getSkill(skill))) {
+            sender.sendMessage(command.getPermissionMessage());
+            return;
+        }
+
         if (sql) {
             if (skill.equalsIgnoreCase("all")) {
                 sqlDisplay(page, "taming+mining+woodcutting+repair+unarmed+herbalism+excavation+archery+swords+axes+acrobatics+fishing", sender);
@@ -74,24 +86,20 @@ public class MctopCommand implements CommandExecutor {
             }
         }
         else {
-            flatfileDisplay(page, skill, sender);
+            flatfileDisplay(page, skill, sender, command);
         }
     }
 
-    private void flatfileDisplay(int page, String skill, CommandSender sender) {
+    private void flatfileDisplay(int page, String skill, CommandSender sender, Command command) {
-        if (!skill.equalsIgnoreCase("all") && CommandHelper.noCommandPermissions(sender, "mcmmo.commands.mctop." + skill.toLowerCase())) {
+        LeaderboardManager.updateLeaderboards(); // Make sure we have the latest information
-            return;
-        }
 
-        Leaderboard.updateLeaderboards(); //Make sure we have the latest information
+        String[] info = LeaderboardManager.retrieveInfo(skill, page);
-
-        String[] info = Leaderboard.retrieveInfo(skill, page);
 
         if (skill.equalsIgnoreCase("all")) {
             sender.sendMessage(LocaleLoader.getString("Commands.PowerLevel.Leaderboard"));
         }
         else {
-            sender.sendMessage(LocaleLoader.getString("Commands.Skill.Leaderboard", Misc.getCapitalized(skill)));
+            sender.sendMessage(LocaleLoader.getString("Commands.Skill.Leaderboard", StringUtils.getCapitalized(skill)));
         }
 
         int n = (page * 10) - 9; // Position
@@ -115,32 +123,17 @@ public class MctopCommand implements CommandExecutor {
     }
 
     private void sqlDisplay(int page, String query, CommandSender sender) {
-        if (!query.equalsIgnoreCase("taming+mining+woodcutting+repair+unarmed+herbalism+excavation+archery+swords+axes+acrobatics+fishing")) {
+        //TODO: Localize messages
-            if (CommandHelper.noCommandPermissions(sender, "mcmmo.commands.mctop." + query.toLowerCase())) {
+        if (mcMMO.queueManager.contains(sender.getName())) {
-                return;
+            sender.sendMessage(ChatColor.RED + "Please wait for your previous command to process");
-            }
+            return;
-        }
-        String tablePrefix = Config.getInstance().getMySQLTablePrefix();
-        HashMap<Integer, ArrayList<String>> userslist = Database.read("SELECT " + query + ", user, NOW() FROM " + tablePrefix + "users JOIN " + tablePrefix + "skills ON (user_id = id) WHERE " + query + " > 0 ORDER BY " + query + " DESC, user LIMIT "+((page * 10) - 10)+",10");
-
-        if (query.equals("taming+mining+woodcutting+repair+unarmed+herbalism+excavation+archery+swords+axes+acrobatics+fishing")) {
-            sender.sendMessage(LocaleLoader.getString("Commands.PowerLevel.Leaderboard"));
-        }
-        else {
-            sender.sendMessage(LocaleLoader.getString("Commands.Skill.Leaderboard", Misc.getCapitalized(query)));
         }
 
-        int place = (page * 10) - 9;
+        if (!mcMMO.queueManager.queue(new McTopAsync(page, query, sender))) {
-        for (int i = 1; i <= 10; i++) {
+            // This will only run if for some reason it is unable to add to the queue
-            if (userslist.get(i) == null) {
+            sender.sendMessage(ChatColor.RED + "Unable to add to queue.");
-                break;
-            }
-
-         // Format: 1. Playername - skill value
-            sender.sendMessage(String.valueOf(place) + ". " + ChatColor.GREEN + userslist.get(i).get(1) + " - " + ChatColor.WHITE + userslist.get(i).get(0));
-            place++;
         }
 
-        sender.sendMessage(LocaleLoader.getString("Commands.mctop.Tip"));
+        sender.sendMessage(ChatColor.YELLOW + "Calculating mcMMO rankings...");
     }
 }

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

@@ -1,8 +1,8 @@
-package com.gmail.nossr50.skills.acrobatics;
+package com.gmail.nossr50.commands.skills;
 
+import com.gmail.nossr50.datatypes.skills.SkillType;
 import com.gmail.nossr50.locale.LocaleLoader;
-import com.gmail.nossr50.skills.SkillCommand;
+import com.gmail.nossr50.skills.acrobatics.Acrobatics;
-import com.gmail.nossr50.skills.utilities.SkillType;
 import com.gmail.nossr50.util.Permissions;
 
 public class AcrobaticsCommand extends SkillCommand {
@@ -23,17 +23,17 @@ public class AcrobaticsCommand extends SkillCommand {
 
     @Override
     protected void dataCalculations() {
-        //DODGE
+        // DODGE
         String[] dodgeStrings = calculateAbilityDisplayValues(Acrobatics.dodgeMaxBonusLevel, Acrobatics.dodgeMaxChance);
         dodgeChance = dodgeStrings[0];
         dodgeChanceLucky = dodgeStrings[1];
 
-        //ROLL
+        // ROLL
         String[] rollStrings = calculateAbilityDisplayValues(Acrobatics.rollMaxBonusLevel, Acrobatics.rollMaxChance);
         rollChance = rollStrings[0];
         rollChanceLucky = rollStrings[1];
 
-        //GRACEFUL ROLL
+        // GRACEFUL ROLL
         String[] gracefulRollStrings = calculateAbilityDisplayValues(Acrobatics.gracefulRollMaxBonusLevel, Acrobatics.gracefulRollMaxChance);
         gracefulRollChance = gracefulRollStrings[0];
         gracefulRollChanceLucky = gracefulRollStrings[1];

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

@@ -1,8 +1,8 @@
-package com.gmail.nossr50.skills.archery;
+package com.gmail.nossr50.commands.skills;
 
+import com.gmail.nossr50.datatypes.skills.SkillType;
 import com.gmail.nossr50.locale.LocaleLoader;
-import com.gmail.nossr50.skills.SkillCommand;
+import com.gmail.nossr50.skills.archery.Archery;
-import com.gmail.nossr50.skills.utilities.SkillType;
 import com.gmail.nossr50.util.Permissions;
 
 public class ArcheryCommand extends SkillCommand {
@@ -22,7 +22,7 @@ public class ArcheryCommand extends SkillCommand {
 
     @Override
     protected void dataCalculations() {
-        //SKILL SHOT
+        // SKILL SHOT
         double bonus = (skillValue / Archery.skillShotIncreaseLevel) * Archery.skillShotIncreasePercentage;
 
         if (bonus > Archery.skillShotMaxBonusPercentage) {
@@ -32,12 +32,12 @@ public class ArcheryCommand extends SkillCommand {
             skillShotBonus = percent.format(bonus);
         }
 
-        //DAZE
+        // DAZE
         String[] dazeStrings = calculateAbilityDisplayValues(Archery.dazeMaxBonusLevel, Archery.dazeMaxBonus);
         dazeChance = dazeStrings[0];
         dazeChanceLucky = dazeStrings[1];
 
-        //RETRIEVE
+        // RETRIEVE
         String[] retrieveStrings = calculateAbilityDisplayValues(Archery.retrieveMaxBonusLevel, Archery.retrieveMaxChance);
         retrieveChance = retrieveStrings[0];
         retrieveChanceLucky = retrieveStrings[1];
@@ -45,9 +45,9 @@ public class ArcheryCommand extends SkillCommand {
 
     @Override
     protected void permissionsCheck() {
-        canSkillShot = Permissions.archeryBonus(player);
+        canSkillShot = Permissions.bonusDamage(player, skill);
         canDaze = Permissions.daze(player);
-        canRetrieve = Permissions.trackArrows(player);
+        canRetrieve = Permissions.arrowRetrieval(player);
     }
 
     @Override

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

@@ -1,8 +1,8 @@
-package com.gmail.nossr50.skills.axes;
+package com.gmail.nossr50.commands.skills;
 
+import com.gmail.nossr50.datatypes.skills.SkillType;
 import com.gmail.nossr50.locale.LocaleLoader;
-import com.gmail.nossr50.skills.SkillCommand;
+import com.gmail.nossr50.skills.axes.Axes;
-import com.gmail.nossr50.skills.utilities.SkillType;
 import com.gmail.nossr50.util.Permissions;
 
 public class AxesCommand extends SkillCommand {
@@ -26,21 +26,21 @@ public class AxesCommand extends SkillCommand {
 
     @Override
     protected void dataCalculations() {
-        //IMPACT
+        // IMPACT
         impactDamage = String.valueOf(1 + (skillValue / Axes.impactIncreaseLevel));
         greaterImpactDamage = String.valueOf(Axes.greaterImpactBonusDamage);
 
-        //SKULL SPLITTER
+        // SKULL SPLITTER
         String[] skullSplitterStrings = calculateLengthDisplayValues();
         skullSplitterLength = skullSplitterStrings[0];
         skullSplitterLengthEndurance = skullSplitterStrings[1];
 
-        //CRITICAL STRIKES
+        // CRITICAL STRIKES
         String[] criticalStrikeStrings = calculateAbilityDisplayValues(Axes.criticalHitMaxBonusLevel, Axes.criticalHitMaxChance);
         critChance = criticalStrikeStrings[0];
         critChanceLucky = criticalStrikeStrings[1];
 
-        //AXE MASTERY
+        // AXE MASTERY
         if (skillValue >= Axes.bonusDamageMaxBonusLevel) {
             bonusDamage = String.valueOf(Axes.bonusDamageMaxBonus);
         }
@@ -52,9 +52,9 @@ public class AxesCommand extends SkillCommand {
     @Override
     protected void permissionsCheck() {
         canSkullSplitter = Permissions.skullSplitter(player);
-        canCritical = Permissions.criticalHit(player);
+        canCritical = Permissions.criticalStrikes(player);
-        canBonusDamage = Permissions.axeBonus(player);
+        canBonusDamage = Permissions.bonusDamage(player, skill);
-        canImpact = Permissions.impact(player);
+        canImpact = Permissions.armorImpact(player);
         canGreaterImpact = Permissions.greaterImpact(player);
     }
 

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

@@ -1,8 +1,7 @@
-package com.gmail.nossr50.skills.excavation;
+package com.gmail.nossr50.commands.skills;
 
+import com.gmail.nossr50.datatypes.skills.SkillType;
 import com.gmail.nossr50.locale.LocaleLoader;
-import com.gmail.nossr50.skills.SkillCommand;
-import com.gmail.nossr50.skills.utilities.SkillType;
 import com.gmail.nossr50.util.Permissions;
 
 public class ExcavationCommand extends SkillCommand {
@@ -18,7 +17,7 @@ public class ExcavationCommand extends SkillCommand {
 
     @Override
     protected void dataCalculations() {
-        //GIGA DRILL BREAKER
+        // GIGA DRILL BREAKER
         String gigaDrillStrings[] = calculateLengthDisplayValues();
         gigaDrillBreakerLength = gigaDrillStrings[0];
         gigaDrillBreakerLengthEndurance = gigaDrillStrings[1];
@@ -27,7 +26,7 @@ public class ExcavationCommand extends SkillCommand {
     @Override
     protected void permissionsCheck() {
         canGigaDrill = Permissions.gigaDrillBreaker(player);
-        canTreasureHunt = Permissions.excavationTreasures(player);
+        canTreasureHunt = Permissions.excavationTreasureHunter(player);
     }
 
     @Override

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

@@ -1,10 +1,11 @@
-package com.gmail.nossr50.skills.fishing;
+package com.gmail.nossr50.commands.skills;
 
 import com.gmail.nossr50.config.AdvancedConfig;
+import com.gmail.nossr50.datatypes.skills.SkillType;
 import com.gmail.nossr50.locale.LocaleLoader;
-import com.gmail.nossr50.skills.SkillCommand;
+import com.gmail.nossr50.skills.fishing.Fishing;
-import com.gmail.nossr50.skills.utilities.SkillType;
 import com.gmail.nossr50.util.Permissions;
+import com.gmail.nossr50.util.player.UserManager;
 
 public class FishingCommand extends SkillCommand {
     private int lootTier;
@@ -26,9 +27,9 @@ public class FishingCommand extends SkillCommand {
 
     @Override
     protected void dataCalculations() {
-        lootTier = Fishing.getLootTier((int) skillValue);
+        lootTier = UserManager.getPlayer(player).getFishingManager().getLootTier();
 
-        //TREASURE HUNTER
+        // TREASURE HUNTER
         double enchantChance = lootTier * AdvancedConfig.getInstance().getFishingMagicMultiplier();
 
         if (player.getWorld().hasStorm()) {
@@ -40,20 +41,20 @@ public class FishingCommand extends SkillCommand {
         magicChance = treasureHunterStrings[0];
         magicChanceLucky = treasureHunterStrings[1];
 
-        //SHAKE
+        // SHAKE
-        String[] shakeStrings = calculateAbilityDisplayValues(ShakeMob.getShakeProbability((int) skillValue));
+        String[] shakeStrings = calculateAbilityDisplayValues(UserManager.getPlayer(player).getFishingManager().getShakeProbability());
         shakeChance = shakeStrings[0];
         shakeChanceLucky = shakeStrings[1];
 
-        //FISHERMAN'S DIET
+        // FISHERMAN'S DIET
         fishermansDietRank = calculateRank(Fishing.fishermansDietMaxLevel, Fishing.fishermansDietRankLevel1);
     }
 
     @Override
     protected void permissionsCheck() {
-        canTreasureHunt = Permissions.fishingTreasures(player);
+        canTreasureHunt = Permissions.fishingTreasureHunter(player);
-        canMagicHunt = Permissions.fishingMagic(player);
+        canMagicHunt = Permissions.magicHunter(player);
-        canShake = Permissions.shakeMob(player);
+        canShake = Permissions.shake(player);
         canFishermansDiet = Permissions.fishermansDiet(player);
     }
 
@@ -96,7 +97,7 @@ public class FishingCommand extends SkillCommand {
 
         if (canMagicHunt) {
             if (isLucky) {
-                player.sendMessage(LocaleLoader.getString("Fishing.Enchant.Chance", magicChance) + chanceRaining +  LocaleLoader.getString("Perks.lucky.bonus", magicChanceLucky));
+                player.sendMessage(LocaleLoader.getString("Fishing.Enchant.Chance", magicChance) + chanceRaining + LocaleLoader.getString("Perks.lucky.bonus", magicChanceLucky));
             }
             else {
                 player.sendMessage(LocaleLoader.getString("Fishing.Enchant.Chance", magicChance) + chanceRaining);

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

@@ -1,8 +1,10 @@
-package com.gmail.nossr50.skills.herbalism;
+package com.gmail.nossr50.commands.skills;
 
+import org.bukkit.Material;
+
+import com.gmail.nossr50.datatypes.skills.SkillType;
 import com.gmail.nossr50.locale.LocaleLoader;
-import com.gmail.nossr50.skills.SkillCommand;
+import com.gmail.nossr50.skills.herbalism.Herbalism;
-import com.gmail.nossr50.skills.utilities.SkillType;
 import com.gmail.nossr50.util.Permissions;
 
 public class HerbalismCommand extends SkillCommand {
@@ -16,6 +18,8 @@ public class HerbalismCommand extends SkillCommand {
     private String doubleDropChanceLucky;
     private String hylianLuckChance;
     private String hylianLuckChanceLucky;
+    private String shroomThumbChance;
+    private String shroomThumbChanceLucky;
 
     private boolean hasHylianLuck;
     private boolean canGreenTerra;
@@ -23,6 +27,7 @@ public class HerbalismCommand extends SkillCommand {
     private boolean canGreenThumbBlocks;
     private boolean canFarmersDiet;
     private boolean canDoubleDrop;
+    private boolean canShroomThumb;
     private boolean doubleDropsDisabled;
 
     public HerbalismCommand() {
@@ -31,46 +36,52 @@ public class HerbalismCommand extends SkillCommand {
 
     @Override
     protected void dataCalculations() {
-        //GREEN TERRA
+        // GREEN TERRA
         String[] greenTerraStrings = calculateLengthDisplayValues();
         greenTerraLength = greenTerraStrings[0];
         greenTerraLengthEndurance = greenTerraStrings[1];
 
-        //FARMERS DIET
+        // FARMERS DIET
         farmersDietRank = calculateRank(Herbalism.farmersDietMaxLevel, Herbalism.farmersDietRankLevel1);
 
-        //GREEN THUMB
+        // GREEN THUMB
-        greenThumbStage = calculateRank(Herbalism.greenThumbStageMaxLevel, Herbalism.greenThumbStageMaxLevel);
+        greenThumbStage = calculateRank(Herbalism.greenThumbStageMaxLevel, Herbalism.greenThumbStageChangeLevel);
 
         String[] greenThumbStrings = calculateAbilityDisplayValues(Herbalism.greenThumbMaxLevel, Herbalism.greenThumbMaxChance);
         greenThumbChance = greenThumbStrings[0];
         greenThumbChanceLucky = greenThumbStrings[1];
 
-        //DOUBLE DROPS
+        // DOUBLE DROPS
         String[] doubleDropStrings = calculateAbilityDisplayValues(Herbalism.doubleDropsMaxLevel, Herbalism.doubleDropsMaxChance);
         doubleDropChance = doubleDropStrings[0];
         doubleDropChanceLucky = doubleDropStrings[1];
 
-        //HYLIAN LUCK
+        // HYLIAN LUCK
         String[] hylianLuckStrings = calculateAbilityDisplayValues(Herbalism.hylianLuckMaxLevel, Herbalism.hylianLuckMaxChance);
         hylianLuckChance = hylianLuckStrings[0];
         hylianLuckChanceLucky = hylianLuckStrings[1];
+
+        // SHROOM THUMB
+        String[] shroomThumbStrings = calculateAbilityDisplayValues(Herbalism.shroomThumbMaxLevel, Herbalism.shroomThumbMaxChance);
+        shroomThumbChance = shroomThumbStrings[0];
+        shroomThumbChanceLucky = shroomThumbStrings[1];
     }
 
     @Override
     protected void permissionsCheck() {
         hasHylianLuck = Permissions.hylianLuck(player);
         canGreenTerra = Permissions.greenTerra(player);
-        canGreenThumbWheat = Permissions.greenThumbWheat(player);
+        canGreenThumbWheat = Permissions.greenThumbPlant(player, Material.CROPS); // TODO: This isn't really accurate - they could have perms for other crops but not wheat.
-        canGreenThumbBlocks = Permissions.greenThumbBlocks(player);
+        canGreenThumbBlocks = (Permissions.greenThumbBlock(player, Material.DIRT) || Permissions.greenThumbBlock(player, Material.COBBLESTONE) || Permissions.greenThumbBlock(player, Material.COBBLE_WALL) || Permissions.greenThumbBlock(player, Material.SMOOTH_BRICK));
         canFarmersDiet = Permissions.farmersDiet(player);
-        canDoubleDrop = Permissions.herbalismDoubleDrops(player);
+        canDoubleDrop = Permissions.doubleDrops(player, skill);
-        doubleDropsDisabled = Herbalism.doubleDropsDisabled;
+        doubleDropsDisabled = skill.getDoubleDropsDisabled();
+        canShroomThumb = Permissions.shroomThumb(player);
     }
 
     @Override
     protected boolean effectsHeaderPermissions() {
-        return canGreenTerra || (canDoubleDrop && !doubleDropsDisabled) || canFarmersDiet || canGreenThumbBlocks || canGreenThumbWheat;
+        return canGreenTerra || (canDoubleDrop && !doubleDropsDisabled) || canFarmersDiet || canGreenThumbBlocks || canGreenThumbWheat || canShroomThumb;
     }
 
     @Override
@@ -97,6 +108,10 @@ public class HerbalismCommand extends SkillCommand {
             player.sendMessage(LocaleLoader.getString("Effects.Template", LocaleLoader.getString("Herbalism.Effect.10"), LocaleLoader.getString("Herbalism.Effect.11")));
         }
 
+        if (canShroomThumb) {
+            player.sendMessage(LocaleLoader.getString("Effects.Template", LocaleLoader.getString("Herbalism.Effect.12"), LocaleLoader.getString("Herbalism.Effect.13")));
+        }
+
         if (canDoubleDrop && !doubleDropsDisabled) {
             player.sendMessage(LocaleLoader.getString("Effects.Template", LocaleLoader.getString("Herbalism.Effect.8"), LocaleLoader.getString("Herbalism.Effect.9")));
         }
@@ -104,7 +119,7 @@ public class HerbalismCommand extends SkillCommand {
 
     @Override
     protected boolean statsHeaderPermissions() {
-        return canGreenTerra || (canDoubleDrop && !doubleDropsDisabled) || canFarmersDiet || canGreenThumbBlocks || canGreenThumbWheat;
+        return canGreenTerra || (canDoubleDrop && !doubleDropsDisabled) || canFarmersDiet || canGreenThumbBlocks || canGreenThumbWheat || canShroomThumb;
     }
 
     @Override
@@ -143,6 +158,16 @@ public class HerbalismCommand extends SkillCommand {
                 player.sendMessage(LocaleLoader.getString("Herbalism.Ability.HylianLuck", hylianLuckChance));
             }
         }
+
+        if (canShroomThumb) {
+            if (isLucky) {
+                player.sendMessage(LocaleLoader.getString("Herbalism.Ability.ShroomThumb.Chance", shroomThumbChance) + LocaleLoader.getString("Perks.lucky.bonus", shroomThumbChanceLucky));
+            }
+            else {
+                player.sendMessage(LocaleLoader.getString("Herbalism.Ability.ShroomThumb.Chance", shroomThumbChance));
+            }
+        }
+
         if (canDoubleDrop && !doubleDropsDisabled) {
             if (isLucky) {
                 player.sendMessage(LocaleLoader.getString("Herbalism.Ability.DoubleDropChance", doubleDropChance) + LocaleLoader.getString("Perks.lucky.bonus", doubleDropChanceLucky));

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

@@ -1,18 +1,24 @@
-package com.gmail.nossr50.skills.mining;
+package com.gmail.nossr50.commands.skills;
 
+import com.gmail.nossr50.config.AdvancedConfig;
+import com.gmail.nossr50.datatypes.skills.SkillType;
 import com.gmail.nossr50.locale.LocaleLoader;
-import com.gmail.nossr50.skills.SkillCommand;
+import com.gmail.nossr50.skills.mining.Mining;
-import com.gmail.nossr50.skills.utilities.SkillType;
+import com.gmail.nossr50.skills.mining.MiningManager;
-import com.gmail.nossr50.util.Misc;
 import com.gmail.nossr50.util.Permissions;
+import com.gmail.nossr50.util.player.UserManager;
 
 public class MiningCommand extends SkillCommand {
     private String doubleDropChance;
     private String doubleDropChanceLucky;
     private String superBreakerLength;
     private String superBreakerLengthEndurance;
-    private String blastMiningRank;
+
-    private String blastRadiusIncrease;
+    private int blastMiningRank;
+    private int bonusTNTDrops;
+    private double blastRadiusIncrease;
+    private String oreBonus;
+    private String debrisReduction;
     private String blastDamageDecrease;
 
     private boolean canSuperBreaker;
@@ -28,72 +34,34 @@ public class MiningCommand extends SkillCommand {
 
     @Override
     protected void dataCalculations() {
-        //SUPER BREAKER
+        // SUPER BREAKER
         String[] superBreakerStrings = calculateLengthDisplayValues();
         superBreakerLength = superBreakerStrings[0];
         superBreakerLengthEndurance = superBreakerStrings[1];
 
-        //DOUBLE DROPS
+        // DOUBLE DROPS
         String[] doubleDropStrings = calculateAbilityDisplayValues(Mining.doubleDropsMaxLevel, Mining.doubleDropsMaxChance);
         doubleDropChance = doubleDropStrings[0];
         doubleDropChanceLucky = doubleDropStrings[1];
 
-        //BLAST MINING
+        // BLAST MINING
-        if (skillValue >= BlastMining.rank8) {
+        MiningManager miningManager = UserManager.getPlayer(player).getMiningManager();
-            blastMiningRank = "8";
+        blastMiningRank = miningManager.getBlastMiningTier();
-            blastDamageDecrease = "100.00%";
+        bonusTNTDrops = miningManager.getDropMultiplier();
-            blastRadiusIncrease = "4";
+        oreBonus = percent.format(miningManager.getOreBonus() / 30.0D); // Base received in TNT is 30%
-        }
+        debrisReduction = percent.format(miningManager.getDebrisReduction() / 30.0D); // Base received in TNT is 30%
-        else if (skillValue >= BlastMining.rank7) {
+        blastDamageDecrease = percent.format(miningManager.getBlastDamageModifier() / 100.0D);
-            blastMiningRank = "7";
+        blastRadiusIncrease = miningManager.getBlastRadiusModifier();
-            blastDamageDecrease = "50.00%";
-            blastRadiusIncrease = "3";
-        }
-        else if (skillValue >= BlastMining.rank6) {
-            blastMiningRank = "6";
-            blastDamageDecrease = "50.00%";
-            blastRadiusIncrease = "3";
-        }
-        else if (skillValue >= BlastMining.rank5) {
-            blastMiningRank = "5";
-            blastDamageDecrease = "25.00%";
-            blastRadiusIncrease = "2";
-        }
-        else if (skillValue >= BlastMining.rank4) {
-            blastMiningRank = "4";
-            blastDamageDecrease = "25.00%";
-            blastRadiusIncrease = "2";
-        }
-        else if (skillValue >= BlastMining.rank3) {
-            blastMiningRank = "3";
-            blastDamageDecrease = "0.00%";
-            blastRadiusIncrease = "1";
-        }
-        else if (skillValue >= BlastMining.rank2) {
-            blastMiningRank = "2";
-            blastDamageDecrease = "0.00%";
-            blastRadiusIncrease = "1";
-        }
-        else if (skillValue >= BlastMining.rank1) {
-            blastMiningRank = "1";
-            blastDamageDecrease = "0.00%";
-            blastRadiusIncrease = "0";
-        }
-        else {
-            blastMiningRank = "0";
-            blastDamageDecrease = "0.00%";
-            blastRadiusIncrease = "0";
-        }
     }
 
     @Override
     protected void permissionsCheck() {
         canBiggerBombs = Permissions.biggerBombs(player);
-        canBlast = Permissions.blastMining(player);
+        canBlast = Permissions.remoteDetonation(player);
         canDemoExpert = Permissions.demolitionsExpertise(player);
-        canDoubleDrop = Permissions.miningDoubleDrops(player);
+        canDoubleDrop = Permissions.doubleDrops(player, skill);
         canSuperBreaker = Permissions.superBreaker(player);
-        doubleDropsDisabled = Mining.doubleDropsDisabled;
+        doubleDropsDisabled = skill.getDoubleDropsDisabled();
     }
 
     @Override
@@ -152,17 +120,17 @@ public class MiningCommand extends SkillCommand {
         }
 
         if (canBlast) {
-            if (skillValue < BlastMining.rank1) {
+            if (skillValue < AdvancedConfig.getInstance().getBlastMiningRank1()) {
-                player.sendMessage(LocaleLoader.getString("Ability.Generic.Template.Lock", LocaleLoader.getString("Mining.Ability.Locked.0", BlastMining.rank1)));
+                player.sendMessage(LocaleLoader.getString("Ability.Generic.Template.Lock", LocaleLoader.getString("Mining.Ability.Locked.0", AdvancedConfig.getInstance().getBlastMiningRank1())));
             }
             else {
-                player.sendMessage(LocaleLoader.getString("Mining.Blast.Rank", blastMiningRank, LocaleLoader.getString("Mining.Blast.Effect." + (Misc.getInt(blastMiningRank) - 1))));
+                player.sendMessage(LocaleLoader.getString("Mining.Blast.Rank", blastMiningRank, LocaleLoader.getString("Mining.Blast.Effect", oreBonus, debrisReduction, bonusTNTDrops)));
             }
         }
 
         if (canBiggerBombs) {
-            if (skillValue < BlastMining.rank2) {
+            if (skillValue < AdvancedConfig.getInstance().getBlastMiningRank2()) {
-                player.sendMessage(LocaleLoader.getString("Ability.Generic.Template.Lock", LocaleLoader.getString("Mining.Ability.Locked.1", BlastMining.rank2)));
+                player.sendMessage(LocaleLoader.getString("Ability.Generic.Template.Lock", LocaleLoader.getString("Mining.Ability.Locked.1", AdvancedConfig.getInstance().getBlastMiningRank2())));
             }
             else {
                 player.sendMessage(LocaleLoader.getString("Mining.Blast.Radius.Increase", blastRadiusIncrease));
@@ -170,8 +138,8 @@ public class MiningCommand extends SkillCommand {
         }
 
         if (canDemoExpert) {
-            if (skillValue < BlastMining.rank4) {
+            if (skillValue < AdvancedConfig.getInstance().getBlastMiningRank4()) {
-                player.sendMessage(LocaleLoader.getString("Ability.Generic.Template.Lock", LocaleLoader.getString("Mining.Ability.Locked.2", BlastMining.rank4)));
+                player.sendMessage(LocaleLoader.getString("Ability.Generic.Template.Lock", LocaleLoader.getString("Mining.Ability.Locked.2", AdvancedConfig.getInstance().getBlastMiningRank4())));
             }
             else {
                 player.sendMessage(LocaleLoader.getString("Mining.Effect.Decrease", blastDamageDecrease));

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

@@ -1,12 +1,14 @@
-package com.gmail.nossr50.skills.repair;
+package com.gmail.nossr50.commands.skills;
 
 import org.bukkit.Material;
 
 import com.gmail.nossr50.mcMMO;
+import com.gmail.nossr50.datatypes.skills.SkillType;
 import com.gmail.nossr50.locale.LocaleLoader;
-import com.gmail.nossr50.skills.SkillCommand;
+import com.gmail.nossr50.skills.repair.Repair;
-import com.gmail.nossr50.skills.utilities.SkillType;
+import com.gmail.nossr50.skills.repair.Repairable;
 import com.gmail.nossr50.util.Permissions;
+import com.gmail.nossr50.util.player.UserManager;
 
 public class RepairCommand extends SkillCommand {
     private int arcaneForgingRank;
@@ -39,47 +41,47 @@ public class RepairCommand extends SkillCommand {
     @Override
     protected void dataCalculations() {
         // We're using pickaxes here, not the best but it works
-        Repairable diamondRepairable = mcMMO.repairManager.getRepairable(Material.DIAMOND_PICKAXE.getId());
+        Repairable diamondRepairable = mcMMO.repairableManager.getRepairable(Material.DIAMOND_PICKAXE.getId());
-        Repairable goldRepairable = mcMMO.repairManager.getRepairable(Material.GOLD_PICKAXE.getId());
+        Repairable goldRepairable = mcMMO.repairableManager.getRepairable(Material.GOLD_PICKAXE.getId());
-        Repairable ironRepairable = mcMMO.repairManager.getRepairable(Material.IRON_PICKAXE.getId());
+        Repairable ironRepairable = mcMMO.repairableManager.getRepairable(Material.IRON_PICKAXE.getId());
-        Repairable stoneRepairable = mcMMO.repairManager.getRepairable(Material.STONE_PICKAXE.getId());
+        Repairable stoneRepairable = mcMMO.repairableManager.getRepairable(Material.STONE_PICKAXE.getId());
 
-        //TODO: This isn't really accurate - if they don't have pickaxes loaded it doesn't always mean the repair level is 0
+        // TODO: This isn't really accurate - if they don't have pickaxes loaded it doesn't always mean the repair level is 0
         diamondLevel = (diamondRepairable == null) ? 0 : diamondRepairable.getMinimumLevel();
         goldLevel = (goldRepairable == null) ? 0 : goldRepairable.getMinimumLevel();
         ironLevel = (ironRepairable == null) ? 0 : ironRepairable.getMinimumLevel();
         stoneLevel = (stoneRepairable == null) ? 0 : stoneRepairable.getMinimumLevel();
 
-        //REPAIR MASTERY
+        // REPAIR MASTERY
-        if (skillValue >= Repair.REPAIR_MASTERY_MAX_BONUS_LEVEL) {
+        if (skillValue >= Repair.repairMasteryMaxBonusLevel) {
-            repairMasteryBonus = percent.format(Repair.REPAIR_MASTERY_CHANCE_MAX / 100D);
+            repairMasteryBonus = percent.format(Repair.repairMasteryMaxBonus / 100D);
         }
         else {
-            repairMasteryBonus = percent.format((( Repair.REPAIR_MASTERY_CHANCE_MAX / Repair.REPAIR_MASTERY_MAX_BONUS_LEVEL) * skillValue) / 100D);
+            repairMasteryBonus = percent.format(((Repair.repairMasteryMaxBonus / Repair.repairMasteryMaxBonusLevel) * skillValue) / 100D);
         }
 
-        //SUPER REPAIR
+        // SUPER REPAIR
-        String[] superRepairStrings = calculateAbilityDisplayValues(Repair.SUPER_REPAIR_MAX_BONUS_LEVEL, Repair.SUPER_REPAIR_CHANCE_MAX);
+        String[] superRepairStrings = calculateAbilityDisplayValues(Repair.superRepairMaxBonusLevel, Repair.superRepairMaxChance);
         superRepairChance = superRepairStrings[0];
         superRepairChanceLucky = superRepairStrings[1];
 
-        //ARCANE FORGING
+        // ARCANE FORGING
-        arcaneForgingRank = Repair.getArcaneForgingRank(profile);
+        arcaneForgingRank = UserManager.getPlayer(player).getRepairManager().getArcaneForgingRank();
     }
 
     @Override
     protected void permissionsCheck() {
-        canSuperRepair = Permissions.repairBonus(player);
+        canSuperRepair = Permissions.superRepair(player);
         canMasterRepair = Permissions.repairMastery(player);
         canArcaneForge = Permissions.arcaneForging(player);
         canSalvage = Permissions.salvage(player);
-        canRepairDiamond = Permissions.diamondRepair(player);
+        canRepairDiamond = Permissions.repairDiamond(player);
-        canRepairGold = Permissions.goldRepair(player);
+        canRepairGold = Permissions.repairGold(player);
-        canRepairIron = Permissions.ironRepair(player);
+        canRepairIron = Permissions.repairIron(player);
-        canRepairStone = Permissions.stoneRepair(player);
+        canRepairStone = Permissions.repairStone(player);
-        canRepairString = Permissions.stringRepair(player);
+        canRepairString = Permissions.repairString(player);
-        canRepairLeather = Permissions.leatherRepair(player);
+        canRepairLeather = Permissions.repairLeather(player);
-        canRepairWood = Permissions.woodRepair(player);
+        canRepairWood = Permissions.repairWood(player);
         arcaneBypass = Permissions.arcaneBypass(player);
     }
 
@@ -120,8 +122,8 @@ public class RepairCommand extends SkillCommand {
             player.sendMessage(LocaleLoader.getString("Effects.Template", LocaleLoader.getString("Repair.Effect.6", diamondLevel), LocaleLoader.getString("Repair.Effect.7")));
         }
 
-        if (canSalvage && Salvage.salvageUnlockLevel > 0) {
+        if (canSalvage && Repair.salvageUnlockLevel > 0) {
-            player.sendMessage(LocaleLoader.getString("Effects.Template", LocaleLoader.getString("Repair.Effect.16", Salvage.salvageUnlockLevel), LocaleLoader.getString("Repair.Effect.17")));
+            player.sendMessage(LocaleLoader.getString("Effects.Template", LocaleLoader.getString("Repair.Effect.16", Repair.salvageUnlockLevel), LocaleLoader.getString("Repair.Effect.17")));
         }
 
         if (canArcaneForge) {
@@ -153,11 +155,11 @@ public class RepairCommand extends SkillCommand {
             player.sendMessage(LocaleLoader.getString("Repair.Arcane.Rank", arcaneForgingRank));
 
             if (Repair.arcaneForgingEnchantLoss) {
-                player.sendMessage(LocaleLoader.getString("Repair.Arcane.Chance.Success", (arcaneBypass ? 100 : Repair.getEnchantChance(arcaneForgingRank))));
+                player.sendMessage(LocaleLoader.getString("Repair.Arcane.Chance.Success", (arcaneBypass ? 100 : UserManager.getPlayer(player).getRepairManager().getKeepEnchantChance())));
             }
 
             if (Repair.arcaneForgingDowngrades) {
-                player.sendMessage(LocaleLoader.getString("Repair.Arcane.Chance.Downgrade", (arcaneBypass ? 0 : Repair.getDowngradeChance(arcaneForgingRank))));
+                player.sendMessage(LocaleLoader.getString("Repair.Arcane.Chance.Downgrade", (arcaneBypass ? 0 : UserManager.getPlayer(player).getRepairManager().getDowngradeEnchantChance())));
             }
         }
     }

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

@@ -1,23 +1,27 @@
-package com.gmail.nossr50.skills;
+package com.gmail.nossr50.commands.skills;
 
 import java.text.DecimalFormat;
+import java.util.Set;
 
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandExecutor;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 
-import com.gmail.nossr50.commands.CommandHelper;
+import com.gmail.nossr50.config.AdvancedConfig;
-import com.gmail.nossr50.datatypes.PlayerProfile;
+import com.gmail.nossr50.datatypes.player.PlayerProfile;
+import com.gmail.nossr50.datatypes.skills.SkillType;
 import com.gmail.nossr50.locale.LocaleLoader;
-import com.gmail.nossr50.skills.utilities.SkillTools;
+import com.gmail.nossr50.skills.child.FamilyTree;
-import com.gmail.nossr50.skills.utilities.SkillType;
-import com.gmail.nossr50.util.Misc;
 import com.gmail.nossr50.util.Permissions;
-import com.gmail.nossr50.util.Users;
+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.skills.PerksUtils;
+import com.gmail.nossr50.util.skills.SkillUtils;
 
 public abstract class SkillCommand implements CommandExecutor {
-    private SkillType skill;
+    protected SkillType skill;
     private String skillString;
 
     protected Player player;
@@ -31,17 +35,17 @@ public abstract class SkillCommand implements CommandExecutor {
 
     public SkillCommand(SkillType skill) {
         this.skill = skill;
-        this.skillString = Misc.getCapitalized(skill.toString());
+        this.skillString = StringUtils.getCapitalized(skill.toString());
     }
 
     @Override
     public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
-        if (CommandHelper.noConsoleUsage(sender)) {
+        if (CommandUtils.noConsoleUsage(sender)) {
             return true;
         }
 
         player = (Player) sender;
-        profile = Users.getPlayer(player).getProfile();
+        profile = UserManager.getPlayer(player).getProfile();
 
         if (profile == null) {
             sender.sendMessage(LocaleLoader.getString("Commands.DoesNotExist"));
@@ -49,18 +53,29 @@ public abstract class SkillCommand implements CommandExecutor {
         }
 
         skillValue = profile.getSkillLevel(skill);
-        isLucky = Permissions.lucky(player, skill);
+        isLucky = Permissions.lucky(sender, skill);
-        hasEndurance = (Permissions.activationTwelve(player) || Permissions.activationEight(player) || Permissions.activationFour(player));
+        hasEndurance = (Permissions.twelveSecondActivationBoost(sender) || Permissions.eightSecondActivationBoost(sender) || Permissions.fourSecondActivationBoost(sender));
 
         dataCalculations();
         permissionsCheck();
 
-        player.sendMessage(LocaleLoader.getString("Skills.Header", LocaleLoader.getString(skillString + ".SkillName")));
-
         if (!skill.isChildSkill()) {
+            player.sendMessage(LocaleLoader.getString("Skills.Header", SkillUtils.getSkillName(skill)));
             player.sendMessage(LocaleLoader.getString("Commands.XPGain", LocaleLoader.getString("Commands.XPGain." + skillString)));
             player.sendMessage(LocaleLoader.getString("Effects.Level", profile.getSkillLevel(skill), profile.getSkillXpLevel(skill), profile.getXpToLevel(skill)));
         }
+        else {
+            player.sendMessage(LocaleLoader.getString("Skills.Header", SkillUtils.getSkillName(skill) + " " + LocaleLoader.getString("Skills.Child")));
+            player.sendMessage(LocaleLoader.getString("Commands.XPGain", LocaleLoader.getString("Commands.XPGain.Child")));
+            player.sendMessage(LocaleLoader.getString("Effects.Child", profile.getSkillLevel(skill)));
+
+            player.sendMessage(LocaleLoader.getString("Skills.Header", LocaleLoader.getString("Skills.Parents")));
+            Set<SkillType> parents = FamilyTree.getParents(skill);
+
+            for (SkillType parent : parents) {
+                player.sendMessage(SkillUtils.getSkillName(parent) + " - " + LocaleLoader.getString("Effects.Level", profile.getSkillLevel(parent), profile.getSkillXpLevel(parent), profile.getXpToLevel(parent)));
+            }
+        }
 
         if (effectsHeaderPermissions()) {
             player.sendMessage(LocaleLoader.getString("Skills.Header", LocaleLoader.getString("Effects.Effects")));
@@ -74,7 +89,7 @@ public abstract class SkillCommand implements CommandExecutor {
 
         statsDisplay();
 
-        return SkillGuide.grabGuidePageForSkill(skill, player, args);
+        return SkillGuideCommand.grabGuidePageForSkill(skill, player, args);
     }
 
     protected String calculateRank(int maxLevel, int rankChangeLevel) {
@@ -124,27 +139,13 @@ public abstract class SkillCommand implements CommandExecutor {
 
     protected String[] calculateLengthDisplayValues() {
         int maxLength = skill.getAbility().getMaxTicks();
-        int length = 2 + (int) (skillValue / Misc.abilityLengthIncreaseLevel);
+        int length = 2 + (int) (skillValue / AdvancedConfig.getInstance().getAbilityLength());
-        int enduranceLength = 0;
+        int enduranceLength = PerksUtils.handleActivationPerks(player, length, maxLength);
-
-        if (Permissions.activationTwelve(player)) {
-            enduranceLength = length + 12;
-        }
-        else if (Permissions.activationEight(player)) {
-            enduranceLength = length + 8;
-        }
-        else if (Permissions.activationFour(player)) {
-            enduranceLength = length + 4;
-        }
 
         if (maxLength != 0) {
             if (length > maxLength) {
                 length = maxLength;
             }
-
-            if (enduranceLength > maxLength) {
-                enduranceLength = maxLength;
-            }
         }
 
         return new String[] { String.valueOf(length), String.valueOf(enduranceLength) };
@@ -153,7 +154,7 @@ public abstract class SkillCommand implements CommandExecutor {
     protected void luckyEffectsDisplay() {
         if (isLucky) {
             String perkPrefix = LocaleLoader.getString("MOTD.PerksPrefix");
-            player.sendMessage(perkPrefix + LocaleLoader.getString("Effects.Template", LocaleLoader.getString("Perks.lucky.name"), LocaleLoader.getString("Perks.lucky.desc", SkillTools.localizeSkillName(skill))));
+            player.sendMessage(perkPrefix + LocaleLoader.getString("Effects.Template", LocaleLoader.getString("Perks.lucky.name"), LocaleLoader.getString("Perks.lucky.desc", SkillUtils.getSkillName(skill))));
         }
     }
 

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

@@ -0,0 +1,107 @@
+package com.gmail.nossr50.commands.skills;
+
+import java.util.ArrayList;
+
+import org.bukkit.entity.Player;
+
+import com.gmail.nossr50.datatypes.skills.SkillType;
+import com.gmail.nossr50.locale.LocaleLoader;
+import com.gmail.nossr50.util.StringUtils;
+import com.gmail.nossr50.util.skills.SkillUtils;
+
+public final class SkillGuideCommand {
+    private SkillGuideCommand() {}
+
+    public static int getTotalPageNumber(String address) {
+        String[] addressSplit = LocaleLoader.getString(address).split("\n");
+
+        if (addressSplit.length <= 8) {
+            return 1;
+        }
+
+        return (addressSplit.length / 8) + 1;
+    }
+
+    public static ArrayList<String> grabPageContents(String header, String address, int pagenum) {
+        int pageIndexStart = 0;
+
+        // Determine what string to start at
+        if (pagenum > 1) {
+            pageIndexStart = 8 * (pagenum - 1);
+        }
+
+        ArrayList<String> allStrings = new ArrayList<String>();
+        String split[] = LocaleLoader.getString(address).split("\n");
+
+        allStrings.add(LocaleLoader.getString("Guides.Header", header));
+
+        // Add targeted strings
+        while (allStrings.size() < 9) {
+            if (pageIndexStart + allStrings.size() > split.length) {
+                allStrings.add("");
+            }
+            else {
+                allStrings.add(split[pageIndexStart + allStrings.size() - 1]);
+            }
+        }
+
+        allStrings.add("Page " + pagenum + " of " + getTotalPageNumber(address));
+        return allStrings;
+    }
+
+    public static void clearChat(Player player) {
+        player.sendMessage("\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n"); // Dear god why?
+    }
+
+    public static boolean grabGuidePageForSkill(SkillType skilltype, Player player, String[] args) {
+        String skillName = skilltype.toString();
+        String capitalized = StringUtils.getCapitalized(skillName);
+        String localized = SkillUtils.getSkillName(skilltype);
+        player.sendMessage(LocaleLoader.getString("Guides.Available", localized, localized.toLowerCase()));
+
+        String address = "Guides." + capitalized;
+
+        switch (args.length) {
+            case 0:
+                // We have to specify this, otherwise we get the usage string every time we call /skillname...
+                return true;
+
+            case 1:
+                if (!args[0].equals("?")) {
+                    return false;
+                }
+
+                SkillGuideCommand.clearChat(player);
+
+                for (String target : SkillGuideCommand.grabPageContents(localized, address, 1)) {
+                    player.sendMessage(target);
+                }
+
+                return true;
+
+            case 2:
+                int totalPages = SkillGuideCommand.getTotalPageNumber(address);
+
+                if (!StringUtils.isInt(args[1])) {
+                    player.sendMessage(LocaleLoader.getString("Guides.Page.Invalid"));
+                    return true;
+                }
+
+                if (Integer.parseInt(args[1]) > totalPages) {
+                    player.sendMessage(LocaleLoader.getString("Guides.Page.OutOfRange", totalPages));
+                    return true;
+                }
+
+                SkillGuideCommand.clearChat(player);
+
+                for (String target : SkillGuideCommand.grabPageContents(localized, address, Integer.parseInt(args[1]))) {
+                    player.sendMessage(target);
+                }
+
+                return true;
+
+            default:
+                return false;
+        }
+    }
+}

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

@@ -1,9 +1,11 @@
-package com.gmail.nossr50.skills.smelting;
+package com.gmail.nossr50.commands.skills;
 
+import com.gmail.nossr50.config.AdvancedConfig;
+import com.gmail.nossr50.datatypes.skills.SkillType;
 import com.gmail.nossr50.locale.LocaleLoader;
-import com.gmail.nossr50.skills.SkillCommand;
+import com.gmail.nossr50.skills.smelting.Smelting;
-import com.gmail.nossr50.skills.utilities.SkillType;
 import com.gmail.nossr50.util.Permissions;
+import com.gmail.nossr50.util.player.UserManager;
 
 public class SmeltingCommand extends SkillCommand {
     private String burnTimeModifier;
@@ -11,7 +13,8 @@ public class SmeltingCommand extends SkillCommand {
     private String secondSmeltChanceLucky;
     private String fluxMiningChance;
     private String fluxMiningChanceLucky;
-    private String vanillaXPModifier;
+
+    private int vanillaXPModifier;
 
     private boolean canFuelEfficiency;
     private boolean canSecondSmelt;
@@ -24,43 +27,29 @@ public class SmeltingCommand extends SkillCommand {
 
     @Override
     protected void dataCalculations() {
-        //FUEL EFFICIENCY
+        // FUEL EFFICIENCY
         burnTimeModifier = decimal.format(1 + ((skillValue / Smelting.burnModifierMaxLevel) * Smelting.burnTimeMultiplier));
 
-        //SECOND SMELT
+        // SECOND SMELT
         String[] secondSmeltStrings = calculateAbilityDisplayValues(Smelting.secondSmeltMaxLevel, Smelting.secondSmeltMaxChance);
         secondSmeltChance = secondSmeltStrings[0];
         secondSmeltChanceLucky = secondSmeltStrings[1];
 
-        //FLUX MINING
+        // FLUX MINING
         String[] fluxMiningStrings = calculateAbilityDisplayValues(Smelting.fluxMiningChance);
         fluxMiningChance = fluxMiningStrings[0];
         fluxMiningChanceLucky = fluxMiningStrings[1];
 
-        //VANILLA XP BOOST
+        // VANILLA XP BOOST
-        if (skillValue >= Smelting.vanillaXPBoostRank5Level) {
+        vanillaXPModifier = UserManager.getPlayer(player).getSmeltingManager().getVanillaXpMultiplier();
-            vanillaXPModifier = String.valueOf(Smelting.vanillaXPBoostRank5Multiplier);
-        }
-        else if (skillValue >= Smelting.vanillaXPBoostRank4Level) {
-            vanillaXPModifier = String.valueOf(Smelting.vanillaXPBoostRank4Multiplier);
-        }
-        else if (skillValue >= Smelting.vanillaXPBoostRank3Level) {
-            vanillaXPModifier = String.valueOf(Smelting.vanillaXPBoostRank3Multiplier);
-        }
-        else if (skillValue >= Smelting.vanillaXPBoostRank2Level) {
-            vanillaXPModifier = String.valueOf(Smelting.vanillaXPBoostRank2Multiplier);
-        }
-        else {
-            vanillaXPModifier = String.valueOf(Smelting.vanillaXPBoostRank1Multiplier);
-        }
     }
 
     @Override
     protected void permissionsCheck() {
         canFuelEfficiency = Permissions.fuelEfficiency(player);
-        canSecondSmelt = Permissions.secondSmelt(player);
+        canSecondSmelt = Permissions.doubleDrops(player, skill);
         canFluxMine = Permissions.fluxMining(player);
-        canVanillaXPBoost = Permissions.smeltingVanillaXPBoost(player);
+        canVanillaXPBoost = Permissions.vanillaXpBoost(player, skill);
     }
 
     @Override
@@ -110,8 +99,8 @@ public class SmeltingCommand extends SkillCommand {
         }
 
         if (canVanillaXPBoost) {
-            if (skillValue < Smelting.vanillaXPBoostRank1Level) {
+            if (skillValue < AdvancedConfig.getInstance().getSmeltingVanillaXPBoostRank1Level()) {
-                player.sendMessage(LocaleLoader.getString("Ability.Generic.Template.Lock", LocaleLoader.getString("Smelting.Ability.Locked.0", Smelting.vanillaXPBoostRank1Level)));
+                player.sendMessage(LocaleLoader.getString("Ability.Generic.Template.Lock", LocaleLoader.getString("Smelting.Ability.Locked.0", AdvancedConfig.getInstance().getSmeltingVanillaXPBoostRank1Level())));
             }
             else {
                 player.sendMessage(LocaleLoader.getString("Smelting.Ability.VanillaXPBoost", vanillaXPModifier));

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

@@ -1,8 +1,8 @@
-package com.gmail.nossr50.skills.swords;
+package com.gmail.nossr50.commands.skills;
 
+import com.gmail.nossr50.datatypes.skills.SkillType;
 import com.gmail.nossr50.locale.LocaleLoader;
-import com.gmail.nossr50.skills.SkillCommand;
+import com.gmail.nossr50.skills.swords.Swords;
-import com.gmail.nossr50.skills.utilities.SkillType;
 import com.gmail.nossr50.util.Permissions;
 
 public class SwordsCommand extends SkillCommand {
@@ -24,12 +24,12 @@ public class SwordsCommand extends SkillCommand {
 
     @Override
     protected void dataCalculations() {
-        //SERRATED STRIKES
+        // SERRATED STRIKES
         String[] serratedStrikesStrings = calculateLengthDisplayValues();
         serratedStrikesLength = serratedStrikesStrings[0];
         serratedStrikesLengthEndurance = serratedStrikesStrings[1];
 
-        //BLEED
+        // BLEED
         if (skillValue >= Swords.bleedMaxBonusLevel) {
             bleedLength = String.valueOf(Swords.bleedMaxTicks);
         }
@@ -41,7 +41,7 @@ public class SwordsCommand extends SkillCommand {
         bleedChance = bleedStrings[0];
         bleedChanceLucky = bleedStrings[1];
 
-        //COUNTER ATTACK
+        // COUNTER ATTACK
         String[] counterAttackStrings = calculateAbilityDisplayValues(Swords.counterAttackMaxBonusLevel, Swords.counterAttackMaxChance);
         counterAttackChance = counterAttackStrings[0];
         counterAttackChanceLucky = counterAttackStrings[1];
@@ -49,7 +49,7 @@ public class SwordsCommand extends SkillCommand {
 
     @Override
     protected void permissionsCheck() {
-        canBleed = Permissions.swordsBleed(player);
+        canBleed = Permissions.bleed(player);
         canCounter = Permissions.counterAttack(player);
         canSerratedStrike = Permissions.serratedStrikes(player);
     }

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

@@ -1,9 +1,9 @@
-package com.gmail.nossr50.skills.taming;
+package com.gmail.nossr50.commands.skills;
 
 import com.gmail.nossr50.config.Config;
+import com.gmail.nossr50.datatypes.skills.SkillType;
 import com.gmail.nossr50.locale.LocaleLoader;
-import com.gmail.nossr50.skills.SkillCommand;
+import com.gmail.nossr50.skills.taming.Taming;
-import com.gmail.nossr50.skills.utilities.SkillType;
 import com.gmail.nossr50.util.Permissions;
 
 public class TamingCommand extends SkillCommand {
@@ -18,6 +18,7 @@ public class TamingCommand extends SkillCommand {
     private boolean canShockProof;
     private boolean canCallWild;
     private boolean canFastFood;
+    private boolean canHolyHound;
 
     public TamingCommand() {
         super(SkillType.TAMING);
@@ -40,11 +41,12 @@ public class TamingCommand extends SkillCommand {
         canSharpenedClaws = Permissions.sharpenedClaws(player);
         canShockProof = Permissions.shockProof(player);
         canThickFur = Permissions.thickFur(player);
+        canHolyHound = Permissions.holyHound(player);
     }
 
     @Override
     protected boolean effectsHeaderPermissions() {
-        return canBeastLore || canCallWild || canEnvironmentallyAware || canFastFood || canGore || canSharpenedClaws || canShockProof || canThickFur;
+        return canBeastLore || canCallWild || canEnvironmentallyAware || canFastFood || canGore || canSharpenedClaws || canShockProof || canThickFur || canHolyHound;
     }
 
     @Override
@@ -79,6 +81,10 @@ public class TamingCommand extends SkillCommand {
             player.sendMessage(LocaleLoader.getString("Effects.Template", LocaleLoader.getString("Taming.Effect.16"), LocaleLoader.getString("Taming.Effect.17")));
         }
 
+        if (canHolyHound) {
+            player.sendMessage(LocaleLoader.getString("Effects.Template", LocaleLoader.getString("Taming.Effect.18"), LocaleLoader.getString("Taming.Effect.19")));
+        }
+
         if (canCallWild) {
             player.sendMessage(LocaleLoader.getString("Effects.Template", LocaleLoader.getString("Taming.Effect.12"), LocaleLoader.getString("Taming.Effect.13")));
             player.sendMessage(LocaleLoader.getString("Taming.Effect.14", Config.getInstance().getTamingCOTWOcelotCost()));
@@ -88,7 +94,7 @@ public class TamingCommand extends SkillCommand {
 
     @Override
     protected boolean statsHeaderPermissions() {
-        return canEnvironmentallyAware || canFastFood || canGore || canSharpenedClaws || canShockProof || canThickFur;
+        return canEnvironmentallyAware || canFastFood || canGore || canSharpenedClaws || canShockProof || canThickFur || canHolyHound;
     }
 
     @Override
@@ -98,7 +104,7 @@ public class TamingCommand extends SkillCommand {
                 player.sendMessage(LocaleLoader.getString("Ability.Generic.Template.Lock", LocaleLoader.getString("Taming.Ability.Locked.4", Taming.fastFoodServiceUnlockLevel)));
             }
             else {
-                player.sendMessage(LocaleLoader.getString("Ability.Generic.Template", LocaleLoader.getString("Taming.Ability.Bonus.8"), LocaleLoader.getString("Taming.Ability.Bonus.9", percent.format(Taming.fastFoodServiceActivationChance))));
+                player.sendMessage(LocaleLoader.getString("Ability.Generic.Template", LocaleLoader.getString("Taming.Ability.Bonus.8"), LocaleLoader.getString("Taming.Ability.Bonus.9", percent.format(Taming.fastFoodServiceActivationChance / 100D))));
             }
         }
 
@@ -120,6 +126,15 @@ public class TamingCommand extends SkillCommand {
             }
         }
 
+        if (canHolyHound) {
+            if (skillValue < Taming.holyHoundUnlockLevel) {
+                player.sendMessage(LocaleLoader.getString("Ability.Generic.Template.Lock", LocaleLoader.getString("Taming.Ability.Locked.5", Taming.holyHoundUnlockLevel)));
+            }
+            else {
+                player.sendMessage(LocaleLoader.getString("Ability.Generic.Template", LocaleLoader.getString("Taming.Ability.Bonus.10"), LocaleLoader.getString("Taming.Ability.Bonus.11")));
+            }
+        }
+
         if (canShockProof) {
             if (skillValue < Taming.shockProofUnlockLevel) {
                 player.sendMessage(LocaleLoader.getString("Ability.Generic.Template.Lock", LocaleLoader.getString("Taming.Ability.Locked.2", Taming.shockProofUnlockLevel)));

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

@@ -1,8 +1,8 @@
-package com.gmail.nossr50.skills.unarmed;
+package com.gmail.nossr50.commands.skills;
 
+import com.gmail.nossr50.datatypes.skills.SkillType;
 import com.gmail.nossr50.locale.LocaleLoader;
-import com.gmail.nossr50.skills.SkillCommand;
+import com.gmail.nossr50.skills.unarmed.Unarmed;
-import com.gmail.nossr50.skills.utilities.SkillType;
 import com.gmail.nossr50.util.Permissions;
 
 public class UnarmedCommand extends SkillCommand {
@@ -28,22 +28,22 @@ public class UnarmedCommand extends SkillCommand {
 
     @Override
     protected void dataCalculations() {
-        //BERSERK
+        // BERSERK
         String[] berserkStrings = calculateLengthDisplayValues();
         berserkLength = berserkStrings[0];
         berserkLengthEndurance = berserkStrings[1];
 
-        //DISARM
+        // DISARM
         String[] disarmStrings = calculateAbilityDisplayValues(Unarmed.disarmMaxBonusLevel, Unarmed.disarmMaxChance);
         disarmChance = disarmStrings[0];
         disarmChanceLucky = disarmStrings[1];
 
-        //DEFLECT
+        // DEFLECT
         String[] deflectStrings = calculateAbilityDisplayValues(Unarmed.deflectMaxBonusLevel, Unarmed.deflectMaxChance);
         deflectChance = deflectStrings[0];
         deflectChanceLucky = deflectStrings[1];
 
-        //IRON ARM
+        // IRON ARM
         if (skillValue >= ((Unarmed.ironArmMaxBonusDamage - 3) * Unarmed.ironArmIncreaseLevel)) {
             ironArmBonus = String.valueOf(Unarmed.ironArmMaxBonusDamage);
         }
@@ -51,7 +51,7 @@ public class UnarmedCommand extends SkillCommand {
             ironArmBonus = String.valueOf(3 + (skillValue / Unarmed.ironArmIncreaseLevel));
         }
 
-        //IRON GRIP
+        // IRON GRIP
         String[] ironGripStrings = calculateAbilityDisplayValues(Unarmed.ironGripMaxBonusLevel, Unarmed.ironGripMaxChance);
         ironGripChance = ironGripStrings[0];
         ironGripChanceLucky = ironGripStrings[1];
@@ -60,8 +60,8 @@ public class UnarmedCommand extends SkillCommand {
     @Override
     protected void permissionsCheck() {
         canBerserk = Permissions.berserk(player);
-        canBonusDamage = Permissions.unarmedBonus(player);
+        canBonusDamage = Permissions.bonusDamage(player, skill);
-        canDeflect = Permissions.deflect(player);
+        canDeflect = Permissions.arrowDeflect(player);
         canDisarm = Permissions.disarm(player);
         canIronGrip = Permissions.ironGrip(player);
     }

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

@@ -1,10 +1,9 @@
-package com.gmail.nossr50.skills.woodcutting;
+package com.gmail.nossr50.commands.skills;
 
 import com.gmail.nossr50.config.AdvancedConfig;
-import com.gmail.nossr50.config.Config;
+import com.gmail.nossr50.datatypes.skills.SkillType;
 import com.gmail.nossr50.locale.LocaleLoader;
-import com.gmail.nossr50.skills.SkillCommand;
+import com.gmail.nossr50.skills.woodcutting.Woodcutting;
-import com.gmail.nossr50.skills.utilities.SkillType;
 import com.gmail.nossr50.util.Permissions;
 
 public class WoodcuttingCommand extends SkillCommand {
@@ -16,6 +15,7 @@ public class WoodcuttingCommand extends SkillCommand {
     private boolean canTreeFell;
     private boolean canLeafBlow;
     private boolean canDoubleDrop;
+    private boolean doubleDropsDisabled;
 
     public WoodcuttingCommand() {
         super(SkillType.WOODCUTTING);
@@ -23,14 +23,13 @@ public class WoodcuttingCommand extends SkillCommand {
 
     @Override
     protected void dataCalculations() {
-        //TREE FELLER
+        // TREE FELLER
         String[] treeFellerStrings = calculateLengthDisplayValues();
         treeFellerLength = treeFellerStrings[0];
         treeFellerLengthEndurance = treeFellerStrings[1];
 
-        //DOUBLE DROPS
+        // DOUBLE DROPS
-        AdvancedConfig advancedConfig = AdvancedConfig.getInstance();
+        String[] doubleDropStrings = calculateAbilityDisplayValues(Woodcutting.doubleDropsMaxLevel, Woodcutting.doubleDropsMaxChance);
-        String[] doubleDropStrings = calculateAbilityDisplayValues(advancedConfig.getWoodcuttingDoubleDropMaxLevel(), advancedConfig.getWoodcuttingDoubleDropChance());
         doubleDropChance = doubleDropStrings[0];
         doubleDropChanceLucky = doubleDropStrings[1];
     }
@@ -38,13 +37,14 @@ public class WoodcuttingCommand extends SkillCommand {
     @Override
     protected void permissionsCheck() {
         canTreeFell = Permissions.treeFeller(player);
-        canDoubleDrop = Permissions.woodcuttingDoubleDrops(player);
+        canDoubleDrop = Permissions.doubleDrops(player, skill);
         canLeafBlow = Permissions.leafBlower(player);
+        doubleDropsDisabled = skill.getDoubleDropsDisabled();
     }
 
     @Override
     protected boolean effectsHeaderPermissions() {
-        return (canDoubleDrop && !Config.getInstance().woodcuttingDoubleDropsDisabled()) || canLeafBlow || canTreeFell;
+        return (canDoubleDrop && !doubleDropsDisabled) || canLeafBlow || canTreeFell;
     }
 
     @Override
@@ -59,14 +59,14 @@ public class WoodcuttingCommand extends SkillCommand {
             player.sendMessage(LocaleLoader.getString("Effects.Template", LocaleLoader.getString("Woodcutting.Effect.2"), LocaleLoader.getString("Woodcutting.Effect.3")));
         }
 
-        if (canDoubleDrop && !Config.getInstance().woodcuttingDoubleDropsDisabled()) {
+        if (canDoubleDrop && !doubleDropsDisabled) {
             player.sendMessage(LocaleLoader.getString("Effects.Template", LocaleLoader.getString("Woodcutting.Effect.4"), LocaleLoader.getString("Woodcutting.Effect.5")));
         }
     }
 
     @Override
     protected boolean statsHeaderPermissions() {
-        return (canDoubleDrop && !Config.getInstance().woodcuttingDoubleDropsDisabled()) || canLeafBlow || canTreeFell;
+        return (canDoubleDrop && !doubleDropsDisabled) || canLeafBlow || canTreeFell;
     }
 
     @Override
@@ -75,14 +75,14 @@ public class WoodcuttingCommand extends SkillCommand {
             int leafBlowerUnlockLevel = AdvancedConfig.getInstance().getLeafBlowUnlockLevel();
 
             if (skillValue < leafBlowerUnlockLevel) {
-                player.sendMessage(LocaleLoader.getString("Ability.Generic.Template.Lock",  LocaleLoader.getString("Woodcutting.Ability.Locked.0", leafBlowerUnlockLevel)));
+                player.sendMessage(LocaleLoader.getString("Ability.Generic.Template.Lock", LocaleLoader.getString("Woodcutting.Ability.Locked.0", leafBlowerUnlockLevel)));
             }
             else {
                 player.sendMessage(LocaleLoader.getString("Ability.Generic.Template", LocaleLoader.getString("Woodcutting.Ability.0"), LocaleLoader.getString("Woodcutting.Ability.1")));
             }
         }
 
-        if (canDoubleDrop && !Config.getInstance().woodcuttingDoubleDropsDisabled()) {
+        if (canDoubleDrop && !doubleDropsDisabled) {
             if (isLucky) {
                 player.sendMessage(LocaleLoader.getString("Woodcutting.Ability.Chance.DDrop", doubleDropChance) + LocaleLoader.getString("Perks.lucky.bonus", doubleDropChanceLucky));
             }

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

@@ -1,10 +1,10 @@
-package com.gmail.nossr50.spout.commands;
+package com.gmail.nossr50.commands.spout;
 
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandSender;
 
+import com.gmail.nossr50.datatypes.spout.huds.HudType;
 import com.gmail.nossr50.locale.LocaleLoader;
-import com.gmail.nossr50.spout.huds.HudType;
 
 public class MchudCommand extends SpoutCommand {
     @Override

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

@@ -1,4 +1,4 @@
-package com.gmail.nossr50.spout.commands;
+package com.gmail.nossr50.commands.spout;
 
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandExecutor;
@@ -6,20 +6,20 @@ import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 
 import com.gmail.nossr50.mcMMO;
-import com.gmail.nossr50.commands.CommandHelper;
+import com.gmail.nossr50.config.spout.SpoutConfig;
-import com.gmail.nossr50.datatypes.PlayerProfile;
+import com.gmail.nossr50.datatypes.player.PlayerProfile;
+import com.gmail.nossr50.datatypes.spout.huds.McMMOHud;
 import com.gmail.nossr50.locale.LocaleLoader;
-import com.gmail.nossr50.spout.SpoutConfig;
+import com.gmail.nossr50.util.commands.CommandUtils;
-import com.gmail.nossr50.spout.huds.SpoutHud;
+import com.gmail.nossr50.util.player.UserManager;
-import com.gmail.nossr50.util.Users;
 
 public abstract class SpoutCommand implements CommandExecutor {
     protected PlayerProfile playerProfile;
-    protected SpoutHud spoutHud;
+    protected McMMOHud spoutHud;
 
     @Override
     public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
-        if (CommandHelper.noConsoleUsage(sender)) {
+        if (CommandUtils.noConsoleUsage(sender)) {
             return true;
         }
 
@@ -28,7 +28,7 @@ public abstract class SpoutCommand implements CommandExecutor {
             return true;
         }
 
-        playerProfile = Users.getPlayer((Player) sender).getProfile();
+        playerProfile = UserManager.getPlayer((Player) sender).getProfile();
         spoutHud = playerProfile.getSpoutHud();
 
         if (spoutHud == null) {
@@ -37,17 +37,18 @@ public abstract class SpoutCommand implements CommandExecutor {
         }
 
         switch (args.length) {
-        case 0:
+            case 0:
-            return noArguments(command, sender, args);
+                return noArguments(command, sender, args);
 
-        case 1:
+            case 1:
-            return oneArgument(command, sender, args);
+                return oneArgument(command, sender, args);
 
-        default:
+            default:
-            return false;
+                return false;
         }
     }
 
     protected abstract boolean noArguments(Command command, CommandSender sender, String[] args);
+
     protected abstract boolean oneArgument(Command command, CommandSender sender, String[] args);
 }

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

@@ -1,13 +1,12 @@
-package com.gmail.nossr50.spout.commands;
+package com.gmail.nossr50.commands.spout;
 
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandSender;
 
+import com.gmail.nossr50.datatypes.skills.SkillType;
 import com.gmail.nossr50.locale.LocaleLoader;
-import com.gmail.nossr50.skills.utilities.SkillTools;
-import com.gmail.nossr50.skills.utilities.SkillType;
-import com.gmail.nossr50.util.Misc;
 import com.gmail.nossr50.util.Permissions;
+import com.gmail.nossr50.util.skills.SkillUtils;
 
 public class XplockCommand extends SpoutCommand {
     @Override
@@ -33,17 +32,24 @@ public class XplockCommand extends SpoutCommand {
             return true;
         }
 
-        if (!SkillTools.isSkill(args[0])) {
+        if (!SkillUtils.isSkill(args[0])) {
             sender.sendMessage(LocaleLoader.getString("Commands.Skill.Invalid"));
             return true;
         }
 
-        if (!Permissions.hasPermission(sender, "mcmmo.commands.xplock." + args[0].toLowerCase())) {
+        SkillType skill = SkillType.getSkill(args[0]);
+
+        if (skill.isChildSkill()) {
+            sender.sendMessage("Child skills are not yet supported by this command."); // TODO: Localize this
+            return true;
+        }
+
+        if (!Permissions.xplock(sender, skill)) {
             sender.sendMessage(command.getPermissionMessage());
             return true;
         }
 
-        lockXpBar(sender, SkillType.getSkill(args[0]));
+        lockXpBar(sender, skill);
         return true;
     }
 
@@ -52,7 +58,7 @@ public class XplockCommand extends SpoutCommand {
             spoutHud.setXpBarLocked(true);
             spoutHud.setSkillLock(skill);
             spoutHud.updateXpBar();
-            sender.sendMessage(LocaleLoader.getString("Commands.xplock.locked", Misc.getCapitalized(skill.toString())));
+            sender.sendMessage(LocaleLoader.getString("Commands.xplock.locked", SkillUtils.getSkillName(skill)));
         }
     }
 

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

@@ -1,11 +1,10 @@
 package com.gmail.nossr50.config;
 
-public class AdvancedConfig extends ConfigLoader {
+public class AdvancedConfig extends AutoUpdateConfigLoader {
     private static AdvancedConfig instance;
 
     private AdvancedConfig() {
         super("advanced.yml");
-        loadKeys();
     }
 
     public static AdvancedConfig getInstance() {
@@ -17,21 +16,25 @@ public class AdvancedConfig extends ConfigLoader {
     }
 
     @Override
-    protected void loadKeys() {
+    protected void loadKeys() {}
-        // TODO Do we need to use this?
+
-    }
     /* GENERAL */
     public int getAbilityLength() { return config.getInt("Skills.General.Ability_IncreaseLevel", 50); }
+    public int getEnchantBuff() { return config.getInt("Skills.General.Ability_EnchantBuff", 5); }
 
     /* 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 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 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 int getDodgeXPModifier() { return config.getInt("Skills.Acrobatics.Dodge_XP_Modifier", 120); }
     public int getRollXPModifier() { return config.getInt("Skills.Acrobatics.Roll_XP_Modifier", 80); }
@@ -63,6 +66,7 @@ public class AdvancedConfig extends ConfigLoader {
     public int getGreaterImpactBonusDamage() { return config.getInt("Skills.Axes.GreaterImpact_BonusDamage", 2); }
 
     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); }
@@ -107,7 +111,10 @@ public class AdvancedConfig extends ConfigLoader {
     public int getHerbalismDoubleDropsMaxLevel() { return config.getInt("Skills.Herbalism.DoubleDrops_MaxBonusLevel", 1000); }
 
     public double getHylianLuckChanceMax() { return config.getDouble("Skills.Herbalism.HylianLuck_ChanceMax", 10.0D); }
-    public int getHylianLucksMaxLevel() { return config.getInt("Skills.Herbalism.HylianLuck_MaxBonusLevel", 1000); }
+    public int getHylianLuckMaxLevel() { return config.getInt("Skills.Herbalism.HylianLuck_MaxBonusLevel", 1000); }
+
+    public double getShroomThumbChanceMax() { return config.getDouble("Skills.Herbalism.ShroomThumb_ChanceMax", 50.0D); }
+    public int getShroomThumbMaxLevel() { return config.getInt("Skills.Herbalism.ShroomThumb_MaxBonusLevel", 1500); }
 
     /* MINING */
     public double getMiningDoubleDropChance() { return config.getDouble("Skills.Mining.DoubleDrops_ChanceMax", 100.0D); }
@@ -122,11 +129,57 @@ public class AdvancedConfig extends ConfigLoader {
     public int getBlastMiningRank7() { return config.getInt("Skills.Mining.BlastMining_Rank7", 875); }
     public int getBlastMiningRank8() { return config.getInt("Skills.Mining.BlastMining_Rank8", 1000); }
 
+    public double getBlastDamageDecreaseRank1() { return config.getDouble("Skills.Mining.BlastDamageDecrease_Rank1", 0.0D); }
+    public double getBlastDamageDecreaseRank2() { return config.getDouble("Skills.Mining.BlastDamageDecrease_Rank2", 0.0D); }
+    public double getBlastDamageDecreaseRank3() { return config.getDouble("Skills.Mining.BlastDamageDecrease_Rank3", 0.0D); }
+    public double getBlastDamageDecreaseRank4() { return config.getDouble("Skills.Mining.BlastDamageDecrease_Rank4", 25.0D); }
+    public double getBlastDamageDecreaseRank5() { return config.getDouble("Skills.Mining.BlastDamageDecrease_Rank5", 25.0D); }
+    public double getBlastDamageDecreaseRank6() { return config.getDouble("Skills.Mining.BlastDamageDecrease_Rank6", 50.0D); }
+    public double getBlastDamageDecreaseRank7() { return config.getDouble("Skills.Mining.BlastDamageDecrease_Rank7", 50.0D); }
+    public double getBlastDamageDecreaseRank8() { return config.getDouble("Skills.Mining.BlastDamageDecrease_Rank8", 100.0D); }
+
+    public double getOreBonusRank1() { return config.getDouble("Skills.Mining.OreBonus_Rank1", 35.0D); }
+    public double getOreBonusRank2() { return config.getDouble("Skills.Mining.OreBonus_Rank2", 40.0D); }
+    public double getOreBonusRank3() { return config.getDouble("Skills.Mining.OreBonus_Rank3", 45.0D); }
+    public double getOreBonusRank4() { return config.getDouble("Skills.Mining.OreBonus_Rank4", 50.0D); }
+    public double getOreBonusRank5() { return config.getDouble("Skills.Mining.OreBonus_Rank5", 55.0D); }
+    public double getOreBonusRank6() { return config.getDouble("Skills.Mining.OreBonus_Rank6", 60.0D); }
+    public double getOreBonusRank7() { return config.getDouble("Skills.Mining.OreBonus_Rank7", 65.0D); }
+    public double getOreBonusRank8() { return config.getDouble("Skills.Mining.OreBonus_Rank8", 70.0D); }
+
+    public double getDebrisReductionRank1() { return config.getDouble("Skills.Mining.DebrisReduction_Rank1", 10.0D); }
+    public double getDebrisReductionRank2() { return config.getDouble("Skills.Mining.DebrisReduction_Rank2", 20.0D); }
+    public double getDebrisReductionRank3() { return config.getDouble("Skills.Mining.DebrisReduction_Rank3", 30.0D); }
+    public double getDebrisReductionRank4() { return config.getDouble("Skills.Mining.DebrisReduction_Rank4", 30.0D); }
+    public double getDebrisReductionRank5() { return config.getDouble("Skills.Mining.DebrisReduction_Rank5", 30.0D); }
+    public double getDebrisReductionRank6() { return config.getDouble("Skills.Mining.DebrisReduction_Rank6", 30.0D); }
+    public double getDebrisReductionRank7() { return config.getDouble("Skills.Mining.DebrisReduction_Rank7", 30.0D); }
+    public double getDebrisReductionRank8() { return config.getDouble("Skills.Mining.DebrisReduction_Rank8", 30.0D); }
+
+    public int getDropMultiplierRank1() { return config.getInt("Skills.Mining.DropMultiplier_Rank1", 1); }
+    public int getDropMultiplierRank2() { return config.getInt("Skills.Mining.DropMultiplier_Rank2", 1); }
+    public int getDropMultiplierRank3() { return config.getInt("Skills.Mining.DropMultiplier_Rank3", 1); }
+    public int getDropMultiplierRank4() { return config.getInt("Skills.Mining.DropMultiplier_Rank4", 1); }
+    public int getDropMultiplierRank5() { return config.getInt("Skills.Mining.DropMultiplier_Rank5", 2); }
+    public int getDropMultiplierRank6() { return config.getInt("Skills.Mining.DropMultiplier_Rank6", 2); }
+    public int getDropMultiplierRank7() { return config.getInt("Skills.Mining.DropMultiplier_Rank7", 3); }
+    public int getDropMultiplierRank8() { return config.getInt("Skills.Mining.DropMultiplier_Rank8", 3); }
+
+    public double getBlastRadiusModifierRank1() { return config.getDouble("Skills.Mining.BlastRadiusModifier_Rank1", 1.0); }
+    public double getBlastRadiusModifierRank2() { return config.getDouble("Skills.Mining.BlastRadiusModifier_Rank2", 1.0); }
+    public double getBlastRadiusModifierRank3() { return config.getDouble("Skills.Mining.BlastRadiusModifier_Rank3", 2.0); }
+    public double getBlastRadiusModifierRank4() { return config.getDouble("Skills.Mining.BlastRadiusModifier_Rank4", 2.0); }
+    public double getBlastRadiusModifierRank5() { return config.getDouble("Skills.Mining.BlastRadiusModifier_Rank5", 3.0); }
+    public double getBlastRadiusModifierRank6() { return config.getDouble("Skills.Mining.BlastRadiusModifier_Rank6", 3.0); }
+    public double getBlastRadiusModifierRank7() { return config.getDouble("Skills.Mining.BlastRadiusModifier_Rank7", 4.0); }
+    public double getBlastRadiusModifierRank8() { return config.getDouble("Skills.Mining.BlastRadiusModifier_Rank8", 4.0); }
+
     /* REPAIR */
     public double getRepairMasteryMaxBonus() { return config.getDouble("Skills.Repair.RepairMastery_MaxBonusPercentage", 200.0D); }
     public int getRepairMasteryMaxLevel() { return config.getInt("Skills.Repair.RepairMastery_MaxBonusLevel", 1000); }
     public double getSuperRepairChanceMax() { return config.getDouble("Skills.Repair.SuperRepair_ChanceMax", 100.0D); }
     public int getSuperRepairMaxLevel() { return config.getInt("Skills.Repair.SuperRepair_MaxBonusLevel", 1000); }
+    public int getSalvageUnlockLevel() { return config.getInt("Skills.Repair.Salvage_UnlockLevel", 600); }
 
     /* Arcane Forging */
     public boolean getArcaneForgingDowngradeEnabled() { return config.getBoolean("Skills.Repair.Arcane_Forging.Downgrades.Enabled", true); }
@@ -193,6 +246,8 @@ public class AdvancedConfig extends ConfigLoader {
     public int getThickFurUnlock() { return config.getInt("Skills.Taming.ThickFur_UnlockLevel", 250); }
     public int getThickFurModifier() { return config.getInt("Skills.Taming.ThickFur_Modifier", 2); }
 
+    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); }
 

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

@@ -0,0 +1,128 @@
+package com.gmail.nossr50.config;
+
+import java.io.BufferedReader;
+import java.io.BufferedWriter;
+import java.io.File;
+import java.io.FileWriter;
+import java.io.InputStreamReader;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Set;
+
+import org.bukkit.configuration.file.FileConfiguration;
+import org.bukkit.configuration.file.YamlConfiguration;
+
+import com.gmail.nossr50.metrics.MetricsManager;
+
+public abstract class AutoUpdateConfigLoader extends ConfigLoader {
+    public AutoUpdateConfigLoader(String relativePath, String fileName) {
+        super(relativePath, fileName);
+    }
+
+    public AutoUpdateConfigLoader(String fileName) {
+        super(fileName);
+    }
+
+    @Override
+    protected void loadFile() {
+        super.loadFile();
+        FileConfiguration internalConfig = YamlConfiguration.loadConfiguration(plugin.getResource(fileName));
+
+        Set<String> configKeys = config.getKeys(true);
+        Set<String> internalConfigKeys = internalConfig.getKeys(true);
+
+        boolean needSave = false;
+
+        Set<String> oldKeys = new HashSet<String>(configKeys);
+        oldKeys.removeAll(internalConfigKeys);
+
+        Set<String> newKeys = new HashSet<String>(internalConfigKeys);
+        newKeys.removeAll(configKeys);
+
+        // Don't need a re-save if we have old keys sticking around?
+        // Would be less saving, but less... correct?
+        if (!newKeys.isEmpty() || !oldKeys.isEmpty()) {
+            needSave = true;
+        }
+
+        for (String key : oldKeys) {
+            plugin.debug("Removing unused key: " + key);
+            config.set(key, null);
+        }
+
+        for (String key : newKeys) {
+            plugin.debug("Adding new key: " + key + " = " + internalConfig.get(key));
+            config.set(key, internalConfig.get(key));
+        }
+
+        if (needSave) {
+            // Get Bukkit's version of an acceptable config with new keys, and no old keys
+            String output = config.saveToString();
+
+            // Convert to the superior 4 space indentation
+            output = output.replace("  ", "    ");
+
+            // Rip out Bukkit's attempt to save comments at the top of the file
+            while (output.indexOf('#') != -1) {
+                output = output.substring(output.indexOf('\n', output.indexOf('#')) + 1);
+            }
+
+            // Read the internal config to get comments, then put them in the new one
+            try {
+                // Read internal
+                BufferedReader reader = new BufferedReader(new InputStreamReader(plugin.getResource(fileName)));
+                HashMap<String, String> comments = new HashMap<String, String>();
+                String temp = "";
+
+                String line;
+                while ((line = reader.readLine()) != null) {
+                    if (line.contains("#")) {
+                        temp += line + "\n";
+                    }
+                    else if (line.contains(":")) {
+                        line = line.substring(0, line.indexOf(":") + 1);
+                        if (!temp.isEmpty()) {
+                            comments.put(line, temp);
+                            temp = "";
+                        }
+                    }
+                }
+
+                // Dump to the new one
+                for (String key : comments.keySet()) {
+                    if (output.indexOf(key) != -1) {
+                        output = output.substring(0, output.indexOf(key)) + comments.get(key) + output.substring(output.indexOf(key));
+                    }
+                }
+            }
+            catch (Exception e) {
+                e.printStackTrace();
+            }
+
+            // Save it
+            try {
+                String saveName = fileName;
+                // At this stage we cannot guarantee that Config has been loaded, so we do the check directly here
+                if (!plugin.getConfig().getBoolean("General.Config_Update_Overwrite", true)) {
+                    saveName += ".new";
+                }
+
+                BufferedWriter writer = new BufferedWriter(new FileWriter(new File(plugin.getDataFolder(), saveName)));
+                writer.write(output);
+                writer.flush();
+                writer.close();
+            }
+            catch (Exception e) {
+                e.printStackTrace();
+            }
+        }
+        else {
+            for (String key : configKeys) {
+                if (!config.isConfigurationSection(key) && !config.get(key).equals(internalConfig.get(key))) {
+                    MetricsManager.customConfig();
+                    break;
+                }
+            }
+        }
+    }
+}

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

@@ -2,16 +2,19 @@ package com.gmail.nossr50.config;
 
 import java.util.Set;
 
+import org.bukkit.Material;
 import org.bukkit.configuration.ConfigurationSection;
+import org.bukkit.entity.EntityType;
 
-import com.gmail.nossr50.mcMMO;
+import com.gmail.nossr50.datatypes.skills.AbilityType;
+import com.gmail.nossr50.datatypes.skills.SkillType;
+import com.gmail.nossr50.util.StringUtils;
 
-public class Config extends ConfigLoader {
+public class Config extends AutoUpdateConfigLoader {
     private static Config instance;
 
     private Config() {
         super("config.yml");
-        loadKeys();
     }
 
     public static Config getInstance() {
@@ -35,7 +38,13 @@ public class Config extends ConfigLoader {
     public boolean getDonateMessageEnabled() { return config.getBoolean("Commands.mcmmo.Donate_Message", true); }
     public int getSaveInterval() { return config.getInt("General.Save_Interval", 10); }
     public boolean getStatsTrackingEnabled() { return config.getBoolean("General.Stats_Tracking", true); }
+    public boolean getUpdateCheckEnabled() { return config.getBoolean("General.Update_Check", true); }
+    public boolean getPreferBeta() { return config.getBoolean("General.Prefer_Beta", false); }
     public boolean getEventCallbackEnabled() { return config.getBoolean("General.Event_Callback", true); }
+    public boolean getBackupsEnabled() { return config.getBoolean("General.Generate_Backups", true); }
+    public boolean getVerboseLoggingEnabled() { return config.getBoolean("General.Verbose_Logging", false); }
+    public boolean getConfigOverwriteEnabled() { return config.getBoolean("General.Config_Update_Overwrite", true); }
+
     public boolean getPartyDisplayNames() { return config.getBoolean("Commands.p.Use_Display_Names", true); }
     public boolean getAdminDisplayNames() { return config.getBoolean("Commands.a.Use_Display_Names", true); }
 
@@ -61,18 +70,29 @@ public class Config extends ConfigLoader {
 
     private static String getStringIncludingInts(ConfigurationSection cfg, String key) {
         String str = cfg.getString(key);
-        if (str == null)
+
+        if (str == null) {
             str = String.valueOf(cfg.getInt(key));
-        if (str == null)
+        }
+
+        if (str == "0") {
             str = "No value set for '" + key + "'";
+        }
         return str;
     }
 
     /* Hardcore Mode */
     public boolean getHardcoreEnabled() { return config.getBoolean("Hardcore.Enabled", false); }
-    public double getHardcoreDeathStatPenaltyPercentage() { return config.getDouble("Hardcore.Death_Stat_Loss_Penalty_Percentage", 75); }
+    public void setHardcoreEnabled(boolean enabled) { config.set("Hardcore.Enabled", enabled); }
-    public double getHardcoreVampirismStatLeechPercentage() { return config.getDouble("Hardcore.Vampirism_Stat_Leech_Percentage", 5); }
+
+    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() { return config.getBoolean("Hardcore.Vampirism", false); }
+    public void setHardcoreVampirismEnabled(boolean enabled) { config.set("Hardcore.Vampirism", enabled); }
 
     /* SMP Mods */
     public boolean getToolModsEnabled() { return config.getBoolean("Mods.Tool_Mods_Enabled", false); }
@@ -80,6 +100,21 @@ public class Config extends ConfigLoader {
     public boolean getBlockModsEnabled() { return config.getBoolean("Mods.Block_Mods_Enabled", false); }
     public boolean getEntityModsEnabled() { return config.getBoolean("Mods.Entity_Mods_Enabled", false); }
 
+    /* Items */
+    public int getChimaeraUseCost() { return config.getInt("Items.Chimaera_Wing.Use_Cost", 1); }
+    public int getChimaeraRecipeCost() { return config.getInt("Items.Chimaera_Wing.Recipe_Cost", 5); }
+    public int getChimaeraItemId() { return config.getInt("Items.Chimaera_Wing.Item_ID", 288); }
+    public boolean getChimaeraEnabled() { return config.getBoolean("Items.Chimaera_Wing.Enabled", true); }
+    public boolean getChimaeraPreventUseUnderground() { return config.getBoolean("Items.Chimaera_Wing.Prevent_Use_Underground", true); }
+    public int getChimaeraCooldown() { return config.getInt("Items.Chimaera_Wing.Cooldown", 240); }
+
+    /* Particles */
+    public boolean getAbilityActivationEffectEnabled() { return config.getBoolean("Particles.Ability_Activation", true); }
+    public boolean getAbilityDeactivationEffectEnabled() { return config.getBoolean("Particles.Ability_Deactivation", true); }
+    public boolean getDodgeEffectEnabled() { return config.getBoolean("Particles.Dodge", true); }
+    public boolean getBleedEffectEnabled() { return config.getBoolean("Particles.Bleed", true); }
+    public boolean getGreaterImpactEffectEnabled() { return config.getBoolean("Particles.Greater_Impact", true); }
+
     /* PARTY SETTINGS */
     public int getAutoPartyKickInterval() { return config.getInt("Party.AutoKick_Interval", 12); }
     public int getAutoPartyKickTime() { return config.getInt("Party.Old_Party_Member_Cutoff", 7); }
@@ -105,30 +140,13 @@ public class Config extends ConfigLoader {
     public boolean getAbilitiesEnabled() { return config.getBoolean("Abilities.Enabled", true); }
     public boolean getAbilitiesOnlyActivateWhenSneaking() { return config.getBoolean("Abilities.Activation.Only_Activate_When_Sneaking", false); }
 
+    public int getCooldown(AbilityType ability) { return config.getInt("Abilities.Cooldowns." + ability.toString()); }
+    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); }
 
-    /* Cooldowns */
-    public int getAbilityCooldownGreenTerra() { return config.getInt("Abilities.Cooldowns.Green_Terra", 240); }
-    public int getAbilityCooldownSuperBreaker() { return config.getInt("Abilities.Cooldowns.Super_Breaker", 240); }
-    public int getAbilityCooldownGigaDrillBreaker() { return config.getInt("Abilities.Cooldowns.Giga_Drill_Breaker", 240); }
-    public int getAbilityCooldownTreeFeller() { return config.getInt("Abilities.Cooldowns.Tree_Feller", 240); }
-    public int getAbilityCooldownBerserk() { return config.getInt("Abilities.Cooldowns.Berserk", 240); }
-    public int getAbilityCooldownSerratedStrikes() { return config.getInt("Abilities.Cooldowns.Serrated_Strikes", 240); }
-    public int getAbilityCooldownSkullSplitter() { return config.getInt("Abilities.Cooldowns.Skull_Splitter", 240); }
-    public int getAbilityCooldownBlastMining() { return config.getInt("Abilities.Cooldowns.Blast_Mining", 60); }
-
-    /* Max ticks */
-    public int getAbilityMaxTicksGreenTerra() { return config.getInt("Abilities.Max_Seconds.Green_Terra", 0); }
-    public int getAbilityMaxTicksSuperBreaker() { return config.getInt("Abilities.Max_Seconds.Super_Breaker", 0); }
-    public int getAbilityMaxTicksGigaDrillBreaker() { return config.getInt("Abilities.Max_Seconds.Giga_Drill_Breaker", 0); }
-    public int getAbilityMaxTicksTreeFeller() { return config.getInt("Abilities.Max_Seconds.Tree_Feller", 0); }
-    public int getAbilityMaxTicksBerserk() { return config.getInt("Abilities.Max_Seconds.Berserk", 0); }
-    public int getAbilityMaxTicksSerratedStrikes() { return config.getInt("Abilities.Max_Seconds.Serrated_Strikes", 0); }
-    public int getAbilityMaxTicksSkullSplitter() { return config.getInt("Abilities.Max_Seconds.Skull_Splitter", 0); }
-    public int getAbilityMaxTicksBlastMining() { return config.getInt("Abilities.Max_Seconds.Blast_Mining", 0); }
-
     /* Thresholds */
     public int getTreeFellerThreshold() { return config.getInt("Abilities.Limits.Tree_Feller_Threshold", 500); }
 
@@ -136,275 +154,13 @@ public class Config extends ConfigLoader {
      * SKILL SETTINGS
      */
 
-    /* Tool Requirements */
+    public int getXp(SkillType skill, Material material) { return config.getInt("Experience." + StringUtils.getCapitalized(skill.toString()) + "." + StringUtils.getPrettyItemString(material).replace(" ", "_")); }
-    public boolean getMiningRequiresTool() { return config.getBoolean("Skills.Mining.Requires_Pickaxe", true); }
+    public boolean getDoubleDropsEnabled(SkillType skill, Material material) { return config.getBoolean("Double_Drops." + StringUtils.getCapitalized(skill.toString()) + "." + StringUtils.getPrettyItemString(material).replace(" ", "_")); }
-    public boolean getExcavationRequiresTool() { return config.getBoolean("Skills.Excavation.Requires_Shovel", true); }
-    public boolean getWoodcuttingRequiresTool() { return config.getBoolean("Skills.Woodcutting.Requires_Axe", true); }
 
-    /* Excavation */
+    public boolean getDoubleDropsDisabled(SkillType skill) {
-    public int getExcavationClayXP() { return config.getInt("Experience.Excavation.Clay", 40); }
+        String skillName = StringUtils.getCapitalized(skill.toString());
-    public int getExcavationDirtXP() { return config.getInt("Experience.Excavation.Dirt", 40); }
-    public int getExcavationGrassXP() { return config.getInt("Experience.Excavation.Grass", 40); }
-    public int getExcavationGravelXP() { return config.getInt("Experience.Excavation.Gravel", 40); }
-    public int getExcavationMycelXP() { return config.getInt("Experience.Excavation.Mycel", 40); }
-    public int getExcavationSandXP() { return config.getInt("Experience.Excavation.Sand", 40); }
-    public int getExcavationSoulSandXP() { return config.getInt("Experience.Excavation.SoulSand", 40); }
-
-    /* Fishing */
-    public int getFishingBaseXP() { return config.getInt("Experience.Fishing.Base", 800); }
-    public boolean getFishingDropsEnabled() { return config.getBoolean("Skills.Fishing.Drops_Enabled", true); }
-
-    /* Herbalism */
-    public int getHerbalismXPSugarCane() { return config.getInt("Experience.Herbalism.Sugar_Cane", 30); }
-    public int getHerbalismXPWheat() { return config.getInt("Experience.Herbalism.Wheat", 50); }
-    public int getHerbalismXPCactus() { return config.getInt("Experience.Herbalism.Cactus", 30); }
-    public int getHerbalismXPPumpkin() { return config.getInt("Experience.Herbalism.Pumpkin", 20); }
-    public int getHerbalismXPFlowers() { return config.getInt("Experience.Herbalism.Flowers", 100); }
-    public int getHerbalismXPMushrooms() { return config.getInt("Experience.Herbalism.Mushrooms", 150); }
-    public int getHerbalismXPMelon() { return config.getInt("Experience.Herbalism.Melon", 20); }
-    public int getHerbalismXPNetherWart() { return config.getInt("Experience.Herbalism.Nether_Wart", 50); }
-    public int getHerbalismXPLilyPads() { return config.getInt("Experience.Herbalism.Lily_Pads", 100); }
-    public int getHerbalismXPVines() { return config.getInt("Experience.Herbalism.Vines", 10); }
-    public int getHerbalismXPCocoa() { return config.getInt("Experience.Herbalism.Cocoa", 30); }
-    public int getHerbalismXPCarrot() { return config.getInt("Experience.Herbalism.Carrot", 50); }
-    public int getHerbalismXPPotato() { return config.getInt("Experience.Herbalism.Potato", 50); }
-
-    public boolean getHerbalismGreenThumbCobbleToMossy() { return config.getBoolean("Skills.Herbalism.Green_Thumb.Cobble_To_Mossy", true); }
-    public boolean getHerbalismGreenThumbCobbleWallToMossyWall() { return config.getBoolean("Skills.Herbalism.Green_Thumb.CobbleWall_To_MossyWall", true); }
-    public boolean getHerbalismGreenThumbSmoothbrickToMossy() { return config.getBoolean("Skills.Herbalism.Green_Thumb.SmoothBrick_To_MossyBrick", true); }
-    public boolean getHerbalismGreenThumbDirtToGrass() { return config.getBoolean("Skills.Herbalism.Green_Thumb.Dirt_To_Grass", true); }
-
-    public boolean getBrownMushroomsDoubleDropsEnabled() { return config.getBoolean("Double_Drops.Herbalism.Brown_Mushrooms", true); }
-    public boolean getCactiDoubleDropsEnabled() { return config.getBoolean("Double_Drops.Herbalism.Cacti", true); }
-    public boolean getWheatDoubleDropsEnabled() { return config.getBoolean("Double_Drops.Herbalism.Wheat", true); }
-    public boolean getMelonsDoubleDropsEnabled() { return config.getBoolean("Double_Drops.Herbalism.Melons", true); }
-    public boolean getNetherWartsDoubleDropsEnabled() { return config.getBoolean("Double_Drops.Herbalism.Nether_Warts", true); }
-    public boolean getPumpkinsDoubleDropsEnabled() { return config.getBoolean("Double_Drops.Herbalism.Pumpkins", true); }
-    public boolean getRedMushroomsDoubleDropsEnabled() { return config.getBoolean("Double_Drops.Herbalism.Red_Mushrooms", true); }
-    public boolean getRedRosesDoubleDropsEnabled() { return config.getBoolean("Double_Drops.Herbalism.Red_Roses", true); }
-    public boolean getSugarCaneDoubleDropsEnabled() { return config.getBoolean("Double_Drops.Herbalism.Sugar_Cane", true); }
-    public boolean getVinesDoubleDropsEnabled() { return config.getBoolean("Double_Drops.Herbalism.Vines", true); }
-    public boolean getWaterLiliesDoubleDropsEnabled() { return config.getBoolean("Double_Drops.Herbalism.Water_Lilies", true); }
-    public boolean getYellowFlowersDoubleDropsEnabled() { return config.getBoolean("Double_Drops.Herbalism.Yellow_Flowers", true); }
-    public boolean getCocoaDoubleDropsEnabled() { return config.getBoolean("Double_Drops.Herbalism.Cocoa", true); }
-    public boolean getCarrotDoubleDropsEnabled() { return config.getBoolean("Double_Drops.Herbalism.Carrot", true); }
-    public boolean getPotatoDoubleDropsEnabled() { return config.getBoolean("Double_Drops.Herbalism.Potato", true); }
-
-    public boolean herbalismDoubleDropsDisabled() {
-        return doubleDropsDisabled("Herbalism");
-    }
-
-    /* Mining */
-    public int getMiningXPGoldOre() { return config.getInt("Experience.Mining.Gold", 250); }
-    public int getMiningXPDiamondOre() { return config.getInt("Experience.Mining.Diamond", 750); }
-    public int getMiningXPIronOre() { return config.getInt("Experience.Mining.Iron", 250); }
-    public int getMiningXPRedstoneOre() { return config.getInt("Experience.Mining.Redstone", 150); }
-    public int getMiningXPLapisOre() { return config.getInt("Experience.Mining.Lapis", 400); }
-    public int getMiningXPObsidian() { return config.getInt("Experience.Mining.Obsidian", 150); }
-    public int getMiningXPNetherrack() { return config.getInt("Experience.Mining.Netherrack", 30); }
-    public int getMiningXPGlowstone() { return config.getInt("Experience.Mining.Glowstone", 30); }
-    public int getMiningXPCoalOre() { return config.getInt("Experience.Mining.Coal", 100); }
-    public int getMiningXPStone() { return config.getInt("Experience.Mining.Stone", 30); }
-    public int getMiningXPSandstone() { return config.getInt("Experience.Mining.Sandstone", 30); }
-    public int getMiningXPEndStone() { return config.getInt("Experience.Mining.End_Stone", 150); }
-    public int getMiningXPMossyStone() { return config.getInt("Experience.Mining.Moss_Stone", 30); }
-    public int getMiningXPEmeraldOre() { return config.getInt("Experience.Mining.Emerald", 1000); }
-
-    public boolean getCoalDoubleDropsEnabled() { return config.getBoolean("Double_Drops.Mining.Coal", true); }
-    public boolean getDiamondDoubleDropsEnabled() { return config.getBoolean("Double_Drops.Mining.Diamond", true); }
-    public boolean getEndStoneDoubleDropsEnabled() { return config.getBoolean("Double_Drops.Mining.End_Stone", true); }
-    public boolean getGlowstoneDoubleDropsEnabled() { return config.getBoolean("Double_Drops.Mining.Glowstone", true); }
-    public boolean getGoldDoubleDropsEnabled() { return config.getBoolean("Double_Drops.Mining.Gold", true); }
-    public boolean getIronDoubleDropsEnabled() { return config.getBoolean("Double_Drops.Mining.Iron", true); }
-    public boolean getLapisDoubleDropsEnabled() { return config.getBoolean("Double_Drops.Mining.Lapis", true); }
-    public boolean getMossyCobblestoneDoubleDropsEnabled() { return config.getBoolean("Double_Drops.Mining.Moss_Stone", true); }
-    public boolean getNetherrackDoubleDropsEnabled() { return config.getBoolean("Double_Drops.Mining.Netherrack", true); }
-    public boolean getObsidianDoubleDropsEnabled() { return config.getBoolean("Double_Drops.Mining.Obsidian", true); }
-    public boolean getRedstoneDoubleDropsEnabled() { return config.getBoolean("Double_Drops.Mining.Redstone", true); }
-    public boolean getSandstoneDoubleDropsEnabled() { return config.getBoolean("Double_Drops.Mining.Sandstone", true); }
-    public boolean getStoneDoubleDropsEnabled() { return config.getBoolean("Double_Drops.Mining.Stone", true); }
-    public boolean getEmeraldDoubleDropsEnabled() { return config.getBoolean("Double_Drops.Mining.Emerald", true); }
-
-    public boolean miningDoubleDropsDisabled() {
-        return doubleDropsDisabled("Mining");
-    }
-
-    public int getDetonatorItemID() { return config.getInt("Skills.Mining.Detonator_ID", 259); }
-
-    /* Repair */
-    public boolean getRepairAnvilMessagesEnabled() { return config.getBoolean("Skills.Repair.Anvil_Messages", true); }
-    public int getRepairAnvilId() { return config.getInt("Skills.Repair.Anvil_ID", 42); }
-    public boolean getSalvageEnabled() { return config.getBoolean("Skills.Repair.Salvage_enabled", true); }
-    public int getSalvageAnvilId() { return config.getInt("Skills.Repair.Salvage_Anvil_ID", 41); }
-    public int getSalvageUnlockLevel() { return config.getInt("Skills.Repair.Salvage_UnlockLevel", 600); }
-    public boolean getSalvageTools() { return config.getBoolean("Skills.Repair.Salvage_tools", true); }
-    public boolean getSalvageArmor() { return config.getBoolean("Skills.Repair.Salvage_armor", true); }
-
-    /* Smelting */
-    public int getSmeltingXPCoal() { return config.getInt("Experience.Smelting.Coal", 10); }
-    public int getSmeltingXPRedstone() { return config.getInt("Experience.Smelting.Redstone", 15); }
-    public int getSmeltingXPIron() { return config.getInt("Experience.Smelting.Iron", 25); }
-    public int getSmeltingXPGold() { return config.getInt("Experience.Smelting.Gold", 35); }
-    public int getSmeltingXPDiamond() { return config.getInt("Experience.Smelting.Diamond", 75); }
-    public int getSmeltingXPLapis() { return config.getInt("Experience.Smelting.Lapis", 40); }
-    public int getSmeltingXPEmerald() { return config.getInt("Experience.Smelting.Emerald", 100); }
-
-    /* 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 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); }
-
-    /* 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 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); }
-    public boolean getJungleDoubleDropsEnabled() { return config.getBoolean("Double_Drops.Woodcutting.Jungle", true); }
-
-    public boolean woodcuttingDoubleDropsDisabled() {
-        return doubleDropsDisabled("Woodcutting");
-    }
-
-    /* AFK Leveling */
-    public boolean getAcrobaticsAFKDisabled() { return config.getBoolean("Skills.Acrobatics.Prevent_AFK_Leveling", true); }
-    public boolean getHerbalismAFKDisabled() { return config.getBoolean("Skills.Herbalism.Prevent_AFK_Leveling", true); }
-
-    /* Dogde Lightning */
-    public boolean getDodgeLightningDisabled() { return config.getBoolean("Skills.Acrobatics.Prevent_Dodge_Lightning", false); }
-
-    /* Level Caps */
-    public int getLevelCapAcrobatics() {
-        return getLevelCap("Skills.Acrobatics.Level_Cap");
-    }
-
-    public int getLevelCapArchery() {
-        return getLevelCap("Skills.Archery.Level_Cap");
-    }
-
-    public int getLevelCapAxes() {
-        return getLevelCap("Skills.Axes.Level_Cap");
-    }
-
-    public int getLevelCapExcavation() {
-        return getLevelCap("Skills.Excavation.Level_Cap");
-    }
-
-    public int getLevelCapFishing() {
-        return getLevelCap("Skills.Fishing.Level_Cap");
-    }
-
-    public int getLevelCapHerbalism() {
-        return getLevelCap("Skills.Herbalism.Level_Cap");
-    }
-
-    public int getLevelCapMining() {
-        return getLevelCap("Skills.Mining.Level_Cap");
-    }
-
-    public int getLevelCapRepair() {
-        return getLevelCap("Skills.Repair.Level_Cap");
-    }
-
-    public int getLevelCapSmelting() {
-        return getLevelCap("Skills.Smelting.Level_Cap");
-    }
-
-    public int getLevelCapSwords() {
-        return getLevelCap("Skills.Swords.Level_Cap");
-    }
-
-    public int getLevelCapTaming() {
-        return getLevelCap("Skills.Taming.Level_Cap");
-    }
-
-    public int getLevelCapUnarmed() {
-        return getLevelCap("Skills.Unarmed.Level_Cap");
-    }
-
-    public int getLevelCapWoodcutting() {
-        return getLevelCap("Skills.Woodcutting.Level_Cap");
-    }
-
-    public int getPowerLevelCap() {
-        return getLevelCap("General.Power_Level_Cap");
-    }
-
-    /* PVP & PVE Settings */
-    public boolean getAcrobaticsPVP() { return config.getBoolean("Skills.Acrobatics.Enabled_For_PVP", true); }
-    public boolean getAcrobaticsPVE() { return config.getBoolean("Skills.Acrobatics.Enabled_For_PVE", true); }
-    public boolean getArcheryPVP() { return config.getBoolean("Skills.Archery.Enabled_For_PVP", true); }
-    public boolean getArcheryPVE() { return config.getBoolean("Skills.Archery.Enabled_For_PVE", true); }
-    public boolean getAxesPVP() { return config.getBoolean("Skills.Axes.Enabled_For_PVP", true); }
-    public boolean getAxesPVE() { return config.getBoolean("Skills.Axes.Enabled_For_PVE", true); }
-    public boolean getSwordsPVP() { return config.getBoolean("Skills.Swords.Enabled_For_PVP", true); }
-    public boolean getSwordsPVE() { return config.getBoolean("Skills.Swords.Enabled_For_PVE", true); }
-    public boolean getTamingPVP() { return config.getBoolean("Skills.Taming.Enabled_For_PVP", true); }
-    public boolean getTamingPVE() { return config.getBoolean("Skills.Taming.Enabled_For_PVE", true); }
-    public boolean getUnarmedPVP() { return config.getBoolean("Skills.Unarmed.Enabled_For_PVP", true); }
-    public boolean getUnarmedPVE() { return config.getBoolean("Skills.Unarmed.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 getAnimalsXP() { return config.getDouble("Experience.Combat.Multiplier.Animals", 1.0); }
-    public double getCreeperXP() { return config.getDouble("Experience.Combat.Multiplier.Creeper", 4.0); }
-    public double getSkeletonXP() { return config.getDouble("Experience.Combat.Multiplier.Skeleton", 2.0); }
-    public double getSpiderXP() { return config.getDouble("Experience.Combat.Multiplier.Spider", 3.0); }
-    public double getGhastXP() { return config.getDouble("Experience.Combat.Multiplier.Ghast", 3.0); }
-    public double getSlimeXP() { return config.getDouble("Experience.Combat.Multiplier.Slime", 2.0); }
-    public double getZombieXP() { return config.getDouble("Experience.Combat.Multiplier.Zombie", 2.0); }
-    public double getPigZombieXP() { return config.getDouble("Experience.Combat.Multiplier.Pig_Zombie", 3.0); }
-    public double getEndermanXP() { return config.getDouble("Experience.Combat.Multiplier.Enderman", 1.0); }
-    public double getCaveSpiderXP() { return config.getDouble("Experience.Combat.Multiplier.Cave_Spider", 3.0); }
-    public double getSilverfishXP() { return config.getDouble("Experience.Combat.Multiplier.Silverfish", 3.0); }
-    public double getBlazeXP() { return config.getDouble("Experience.Combat.Multiplier.Blaze", 3.0); }
-    public double getMagmaCubeXP() { return config.getDouble("Experience.Combat.Multiplier.Magma_Cube", 2.0); }
-    public double getEnderDragonXP() { return config.getDouble("Experience.Combat.Multiplier.Ender_Dragon", 8.0); }
-    public double getIronGolemXP() { return config.getDouble("Experience.Combat.Multiplier.Iron_Golem", 2.0); }
-    public double getGiantXP() { return config.getDouble("Experience.Combat.Multiplier.Giant", 4.0); }
-    public double getWitherXP() { return config.getDouble("Experience.Combat.Multiplier.Wither", 7.0); }
-    public double getWitherSkeletonXP() { return config.getDouble("Experience.Combat.Multiplier.Wither_Skeleton", 4.0); }
-    public double getWitchXP() { return config.getDouble("Experience.Combat.Multiplier.Witch", 4.0); }
-
-    /* XP Formula Multiplier */
-    public int getFormulaMultiplierCurve() { return config.getInt("Experience.Formula.Curve_Modifier", 20); }
-    public double getFormulaMultiplierTaming() { return config.getDouble("Experience.Formula.Multiplier.Taming", 1.0); }
-    public double getFormulaMultiplierMining() { return config.getDouble("Experience.Formula.Multiplier.Mining", 1.0); }
-    public double getFormulaMultiplierRepair() { return config.getDouble("Experience.Formula.Multiplier.Repair", 1.0); }
-    public double getFormulaMultiplierWoodcutting() { return config.getDouble("Experience.Formula.Multiplier.Woodcutting", 1.0); }
-    public double getFormulaMultiplierUnarmed() { return config.getDouble("Experience.Formula.Multiplier.Unarmed", 1.0); }
-    public double getFormulaMultiplierHerbalism() { return config.getDouble("Experience.Formula.Multiplier.Herbalism", 1.0); }
-    public double getFormulaMultiplierExcavation() { return config.getDouble("Experience.Formula.Multiplier.Excavation", 1.0); }
-    public double getFormulaMultiplierArchery() { return config.getDouble("Experience.Formula.Multiplier.Archery", 1.0); }
-    public double getFormulaMultiplierSwords() { return config.getDouble("Experience.Formula.Multiplier.Swords", 1.0); }
-    public double getFormulaMultiplierAxes() { return config.getDouble("Experience.Formula.Multiplier.Axes", 1.0); }
-    public double getFormulaMultiplierAcrobatics() { return config.getDouble("Experience.Formula.Multiplier.Acrobatics", 1.0); }
-    public double getFormulaMultiplierFishing() { return config.getDouble("Experience.Formula.Multiplier.Fishing", 1.0); }
-
-    private boolean doubleDropsDisabled(String skillName) {
         ConfigurationSection section = config.getConfigurationSection("Double_Drops." + skillName);
-
-        if (section == null) {
-            mcMMO.p.getLogger().warning("The configuration files are outdated!"); //TODO Locale and more descriptive message!
-            return false;
-        }
-
         Set<String> keys = section.getKeys(false);
-
         boolean disabled = true;
 
         for (String key : keys) {
@@ -417,8 +173,84 @@ public class Config extends ConfigLoader {
         return disabled;
     }
 
-    private int getLevelCap(String configString) {
+    /* Acrobatics */
-        int cap = config.getInt(configString, 0);
+    public boolean getDodgeLightningDisabled() { return config.getBoolean("Skills.Acrobatics.Prevent_Dodge_Lightning", false); }
-        return ((cap <= 0) ? Integer.MAX_VALUE : cap);
+
+    /* Fishing */
+    public int getFishingBaseXP() { return config.getInt("Experience.Fishing.Base", 800); }
+    public boolean getFishingDropsEnabled() { return config.getBoolean("Skills.Fishing.Drops_Enabled", true); }
+
+    /* Mining */
+    public int getDetonatorItemID() { return config.getInt("Skills.Mining.Detonator_ID", 259); }
+
+    /* Repair */
+    public boolean getRepairAnvilMessagesEnabled() { return config.getBoolean("Skills.Repair.Anvil_Messages", true); }
+    public int getRepairAnvilId() { return config.getInt("Skills.Repair.Anvil_ID", 42); }
+    public int getSalvageAnvilId() { return config.getInt("Skills.Repair.Salvage_Anvil_ID", 41); }
+    public boolean getSalvageTools() { return config.getBoolean("Skills.Repair.Salvage_tools", true); }
+    public boolean getSalvageArmor() { return config.getBoolean("Skills.Repair.Salvage_armor", true); }
+
+    /* Unarmed */
+    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 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); }
+
+    /* 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); }
+    public boolean getJungleDoubleDropsEnabled() { return config.getBoolean("Double_Drops.Woodcutting.Jungle", true); }
+
+    /* AFK Leveling */
+    public boolean getAcrobaticsAFKDisabled() { return config.getBoolean("Skills.Acrobatics.Prevent_AFK_Leveling", true); }
+    public boolean getHerbalismAFKDisabled() { return config.getBoolean("Skills.Herbalism.Prevent_AFK_Leveling", true); }
+
+    /* Level Caps */
+    public int getPowerLevelCap() {
+        int cap = config.getInt("General.Power_Level_Cap", 0);
+        return (cap <= 0) ? Integer.MAX_VALUE : cap;
     }
+
+    public int getLevelCap(SkillType skill) {
+        int cap = config.getInt("Skills." + StringUtils.getCapitalized(skill.toString()) + ".Level_Cap");
+        return (cap <= 0) ? Integer.MAX_VALUE : cap;
+    }
+
+    /* 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.Multiplier." + StringUtils.getCapitalized(skill.toString())); }
 }

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

@@ -54,7 +54,8 @@ public abstract class ConfigLoader {
         if (inputStream != null) {
             try {
                 copyStreamToFile(inputStream, configFile);
-            } catch (Exception e) {
+            }
+            catch (Exception e) {
                 e.printStackTrace();
             }
         }

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

@@ -10,6 +10,7 @@ public class HiddenConfig {
     private static YamlConfiguration config;
     private static boolean chunkletsEnabled;
     private static int conversionRate;
+    private static boolean useEnchantmentBuffs;
 
     public HiddenConfig(String fileName) {
         HiddenConfig.fileName = fileName;
@@ -29,6 +30,7 @@ public class HiddenConfig {
             config = YamlConfiguration.loadConfiguration(mcMMO.p.getResource(fileName));
             chunkletsEnabled = config.getBoolean("Options.Chunklets", true);
             conversionRate = config.getInt("Options.ConversionRate", 1);
+            useEnchantmentBuffs = config.getBoolean("Options.EnchantmentBuffs", true);
         }
     }
 
@@ -39,4 +41,8 @@ public class HiddenConfig {
     public int getConversionRate() {
         return conversionRate;
     }
+
+    public boolean useEnchantmentBuffs() {
+        return useEnchantmentBuffs;
+    }
 }

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

@@ -1,4 +1,4 @@
-package com.gmail.nossr50.mods.config;
+package com.gmail.nossr50.config.mods;
 
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -8,18 +8,21 @@ import java.util.Set;
 import org.bukkit.configuration.ConfigurationSection;
 
 import com.gmail.nossr50.config.ConfigLoader;
-import com.gmail.nossr50.mods.datatypes.CustomItem;
+import com.gmail.nossr50.datatypes.mods.CustomItem;
 import com.gmail.nossr50.skills.repair.Repairable;
 import com.gmail.nossr50.skills.repair.RepairableFactory;
 
-public class CustomArmorConfig extends ConfigLoader{
+public class CustomArmorConfig extends ConfigLoader {
     private static CustomArmorConfig instance;
+
     private List<Repairable> repairables;
-    public List<Integer> customBootIDs = new ArrayList<Integer>();
+
+    public List<Integer> customBootIDs       = new ArrayList<Integer>();
     public List<Integer> customChestplateIDs = new ArrayList<Integer>();
-    public List<Integer> customHelmetIDs = new ArrayList<Integer>();
+    public List<Integer> customHelmetIDs     = new ArrayList<Integer>();
-    public List<Integer> customLeggingIDs = new ArrayList<Integer>();
+    public List<Integer> customLeggingIDs    = new ArrayList<Integer>();
-    public List<Integer> customIDs = new ArrayList<Integer>();
+    public List<Integer> customIDs           = new ArrayList<Integer>();
+
     public List<CustomItem> customArmorList = new ArrayList<CustomItem>();
     public HashMap<Integer, CustomItem> customArmor = new HashMap<Integer, CustomItem>();
 
@@ -36,6 +39,14 @@ public class CustomArmorConfig extends ConfigLoader{
         return instance;
     }
 
+    public List<Repairable> getLoadedRepairables() {
+        if (repairables == null) {
+            return new ArrayList<Repairable>();
+        }
+
+        return repairables;
+    }
+
     @Override
     protected void loadKeys() {
         repairables = new ArrayList<Repairable>();
@@ -49,8 +60,9 @@ public class CustomArmorConfig extends ConfigLoader{
     private void loadArmor(String armorType, List<Integer> idList) {
         ConfigurationSection armorSection = config.getConfigurationSection(armorType);
 
-        if (armorSection == null)
+        if (armorSection == null) {
             return;
+        }
 
         Set<String> armorConfigSet = armorSection.getKeys(false);
 
@@ -86,9 +98,4 @@ public class CustomArmorConfig extends ConfigLoader{
             customArmor.put(id, armor);
         }
     }
-
-    public List<Repairable> getLoadedRepairables() {
-        if (repairables == null) return new ArrayList<Repairable>();
-        return repairables;
-    }
 }

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

@@ -1,4 +1,4 @@
-package com.gmail.nossr50.mods.config;
+package com.gmail.nossr50.config.mods;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -9,29 +9,31 @@ import org.bukkit.inventory.ItemStack;
 import org.bukkit.material.MaterialData;
 
 import com.gmail.nossr50.config.ConfigLoader;
-import com.gmail.nossr50.mods.datatypes.CustomBlock;
+import com.gmail.nossr50.datatypes.mods.CustomBlock;
 
-public class CustomBlocksConfig extends ConfigLoader {
+public class CustomBlockConfig extends ConfigLoader {
-    private static CustomBlocksConfig instance;
+    private static CustomBlockConfig instance;
-    public List<ItemStack> customExcavationBlocks = new ArrayList<ItemStack>();
+
-    public List<ItemStack> customHerbalismBlocks = new ArrayList<ItemStack>();
+    public List<ItemStack> customExcavationBlocks  = new ArrayList<ItemStack>();
-    public List<ItemStack> customMiningBlocks = new ArrayList<ItemStack>();
+    public List<ItemStack> customHerbalismBlocks   = new ArrayList<ItemStack>();
+    public List<ItemStack> customMiningBlocks      = new ArrayList<ItemStack>();
     public List<ItemStack> customWoodcuttingBlocks = new ArrayList<ItemStack>();
-    public List<ItemStack> customOres = new ArrayList<ItemStack>();
+    public List<ItemStack> customOres              = new ArrayList<ItemStack>();
-    public List<ItemStack> customLogs = new ArrayList<ItemStack>();
+    public List<ItemStack> customLogs              = new ArrayList<ItemStack>();
-    public List<ItemStack> customLeaves = new ArrayList<ItemStack>();
+    public List<ItemStack> customLeaves            = new ArrayList<ItemStack>();
-    public List<ItemStack> customAbilityBlocks = new ArrayList<ItemStack>();
+    public List<ItemStack> customAbilityBlocks     = new ArrayList<ItemStack>();
-    public List<ItemStack> customItems = new ArrayList<ItemStack>();
+    public List<ItemStack> customItems             = new ArrayList<ItemStack>();
+
     public List<CustomBlock> customBlocks = new ArrayList<CustomBlock>();
 
-    public CustomBlocksConfig() {
+    public CustomBlockConfig() {
         super("ModConfigs", "blocks.yml");
         loadKeys();
     }
 
-    public static CustomBlocksConfig getInstance() {
+    public static CustomBlockConfig getInstance() {
         if (instance == null) {
-            instance = new CustomBlocksConfig();
+            instance = new CustomBlockConfig();
         }
 
         return instance;
@@ -49,8 +51,9 @@ public class CustomBlocksConfig extends ConfigLoader {
     private void loadBlocks(String skillType, List<ItemStack> blockList) {
         ConfigurationSection skillSection = config.getConfigurationSection(skillType);
 
-        if (skillSection == null)
+        if (skillSection == null) {
             return;
+        }
 
         Set<String> skillConfigSet = skillSection.getKeys(false);
 
@@ -105,7 +108,7 @@ public class CustomBlocksConfig extends ConfigLoader {
                 }
                 else {
                     customLeaves.add(blockItem);
-                    block.setXpGain(0); //Leaves don't grant XP
+                    block.setXpGain(0); // Leaves don't grant XP
                 }
             }
 

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

@@ -1,4 +1,4 @@
-package com.gmail.nossr50.mods.config;
+package com.gmail.nossr50.config.mods;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -9,14 +9,16 @@ import org.bukkit.entity.EntityType;
 import org.bukkit.inventory.ItemStack;
 
 import com.gmail.nossr50.config.ConfigLoader;
-import com.gmail.nossr50.mods.datatypes.CustomEntity;
+import com.gmail.nossr50.datatypes.mods.CustomEntity;
 
 public class CustomEntityConfig extends ConfigLoader {
     private static CustomEntityConfig instance;
-    public List<Integer> customEntityIds = new ArrayList<Integer>();
+
+    public List<Integer> customEntityIds        = new ArrayList<Integer>();
     public List<Integer> customHostileEntityIds = new ArrayList<Integer>();
     public List<Integer> customNeutralEntityIds = new ArrayList<Integer>();
     public List<Integer> customPassiveEntityIds = new ArrayList<Integer>();
+
     public List<EntityType> customEntityTypes = new ArrayList<EntityType>();
     public List<CustomEntity> customEntities = new ArrayList<CustomEntity>();
 
@@ -54,11 +56,11 @@ public class CustomEntityConfig extends ConfigLoader {
             EntityType type = EntityType.fromId(id);
             double xpMultiplier = config.getDouble(entityType + "." + entityName + ".XP_Multiplier", 1.0D);
             boolean canBeTamed = config.getBoolean(entityType + "." + entityName + ".Tameable", false);
-            int tamingXp = config.getInt(entityType + "." + entityName + ".Tameable.Taming_XP", 0);
+            int tamingXp = config.getInt(entityType + "." + entityName + "Taming_XP", 0);
-            boolean canBeSummoned = config.getBoolean(entityType + "." + entityName + ".Tameable.CanBeSummoned", false);
+            boolean canBeSummoned = config.getBoolean(entityType + "." + entityName + "CanBeSummoned", false);
-            int callOfTheWildId = config.getInt(entityType + "." + entityName + ".Tameable.COTW_Material_ID", 0);
+            int callOfTheWildId = config.getInt(entityType + "." + entityName + "COTW_Material_ID", 0);
-            int callOfTheWildData = config.getInt(entityType + "." + entityName + ".Tameable.COTW_Material_Data", 0);
+            int callOfTheWildData = config.getInt(entityType + "." + entityName + "COTW_Material_Data", 0);
-            int callOfTheWildAmount = config.getInt(entityType + "." + entityName + ".Tameable.COTW_Material_Amount", 0);
+            int callOfTheWildAmount = config.getInt(entityType + "." + entityName + "COTW_Material_Amount", 0);
 
             CustomEntity entity;
 

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

@@ -1,4 +1,4 @@
-package com.gmail.nossr50.mods.config;
+package com.gmail.nossr50.config.mods;
 
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -8,12 +8,12 @@ import java.util.Set;
 import org.bukkit.configuration.ConfigurationSection;
 
 import com.gmail.nossr50.config.ConfigLoader;
-import com.gmail.nossr50.mods.datatypes.CustomTool;
+import com.gmail.nossr50.datatypes.mods.CustomTool;
 import com.gmail.nossr50.skills.repair.Repairable;
 import com.gmail.nossr50.skills.repair.RepairableFactory;
 
-public class CustomToolsConfig extends ConfigLoader {
+public class CustomToolConfig extends ConfigLoader {
-    private static CustomToolsConfig instance;
+    private static CustomToolConfig instance;
     private List<Repairable> repairables;
     public List<Integer> customAxeIDs = new ArrayList<Integer>();
     public List<Integer> customBowIDs = new ArrayList<Integer>();
@@ -25,19 +25,27 @@ public class CustomToolsConfig extends ConfigLoader {
     public List<CustomTool> customToolList = new ArrayList<CustomTool>();
     public HashMap<Integer, CustomTool> customTools = new HashMap<Integer, CustomTool>();
 
-    private CustomToolsConfig() {
+    private CustomToolConfig() {
         super("ModConfigs", "tools.yml");
         loadKeys();
     }
 
-    public static CustomToolsConfig getInstance() {
+    public static CustomToolConfig getInstance() {
         if (instance == null) {
-            instance = new CustomToolsConfig();
+            instance = new CustomToolConfig();
         }
 
         return instance;
     }
 
+    public List<Repairable> getLoadedRepairables() {
+        if (repairables == null) {
+            return new ArrayList<Repairable>();
+        }
+
+        return repairables;
+    }
+
     @Override
     protected void loadKeys() {
         repairables = new ArrayList<Repairable>();
@@ -53,8 +61,9 @@ public class CustomToolsConfig extends ConfigLoader {
     private void loadTool(String toolType, List<Integer> idList) {
         ConfigurationSection toolSection = config.getConfigurationSection(toolType);
 
-        if (toolSection == null)
+        if (toolSection == null) {
             return;
+        }
 
         Set<String> toolConfigSet = toolSection.getKeys(false);
 
@@ -93,9 +102,4 @@ public class CustomToolsConfig extends ConfigLoader {
             customTools.put(id, tool);
         }
     }
-
-    public List<Repairable> getLoadedRepairables() {
-        if (repairables == null) return new ArrayList<Repairable>();
-        return repairables;
-    }
 }

src/main/java/com/gmail/nossr50/config/party/ItemWeightConfig.java

@@ -0,0 +1,35 @@
+package com.gmail.nossr50.config.party;
+
+import org.bukkit.Material;
+
+import com.gmail.nossr50.config.ConfigLoader;
+import com.gmail.nossr50.util.StringUtils;
+
+public class ItemWeightConfig extends ConfigLoader {
+    private static ItemWeightConfig instance;
+
+    private ItemWeightConfig() {
+        super("itemweights.yml");
+    }
+
+    public static ItemWeightConfig getInstance() {
+        if (instance == null) {
+            instance = new ItemWeightConfig();
+        }
+
+        return instance;
+    }
+
+    public int getItemWeight(Material material) {
+        String materialName = StringUtils.getPrettyItemString(material).replace(" ", "_");
+        int itemWeight = config.getInt("Item_Weights.Default");
+
+        if (config.getInt("Item_Weights." + materialName) > 0) {
+            itemWeight = config.getInt("Item_Weights." + materialName);
+        }
+        return itemWeight;
+    }
+
+    @Override
+    protected void loadKeys() {}
+}

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

@@ -0,0 +1,65 @@
+package com.gmail.nossr50.config.spout;
+
+import com.gmail.nossr50.config.ConfigLoader;
+import com.gmail.nossr50.datatypes.skills.SkillType;
+import com.gmail.nossr50.datatypes.spout.huds.HudType;
+
+public class SpoutConfig extends ConfigLoader {
+    private static SpoutConfig instance;
+    public HudType defaultHudType;
+
+    private SpoutConfig() {
+        super("spout.yml");
+        loadKeys();
+    }
+
+    public static SpoutConfig getInstance() {
+        if (instance == null) {
+            instance = new SpoutConfig();
+        }
+
+        return instance;
+    }
+
+    @Override
+    protected void loadKeys() {
+        // Setup default HUD
+        String temp = config.getString("Spout.HUD.Default", "STANDARD");
+
+        for (HudType hudType : HudType.values()) {
+            if (hudType.toString().equalsIgnoreCase(temp)) {
+                defaultHudType = hudType;
+                break;
+            }
+        }
+
+        if (defaultHudType == null) {
+            defaultHudType = HudType.STANDARD;
+        }
+    }
+
+    public boolean getShowPowerLevel() { return config.getBoolean("HUD.Show_Power_Level", true); }
+    public String getMenuKey() { return config.getString("Menu.Key", "KEY_M"); }
+
+    /* XP Bar */
+    public boolean getXPBarEnabled() { return config.getBoolean("XP.Bar.Enabled", true); }
+    public void setXPBarEnabled(boolean enabled) { config.set("XP.Bar.Enabled", enabled); }
+
+    public boolean getXPBarIconEnabled() { return config.getBoolean("XP.Icon.Enabled", true); }
+    public int getXPBarXPosition() { return config.getInt("XP.Bar.X_POS", 95); }
+    public int getXPBarYPosition() { return config.getInt("XP.Bar.Y_POS", 6); }
+    public int getXPIconXPosition() { return config.getInt("XP.Icon.X_POS", 78); }
+    public int getXPIconYPosition() { return config.getInt("XP.Icon.Y_POS", 2); }
+
+    /* HUD Colors */
+    public double getRetroHUDXPBorderRed() { return config.getDouble("HUD.Retro.Colors.Border.RED", 0.0); }
+    public double getRetroHUDXPBorderGreen() { return config.getDouble("HUD.Retro.Colors.Border.GREEN", 0.0); }
+    public double getRetroHUDXPBorderBlue() { return config.getDouble("HUD.Retro.Colors.Border.BLUE", 0.0); }
+    public double getRetroHUDXPBackgroundRed() { return config.getDouble("HUD.Retro.Colors.Background.RED", 0.75); }
+    public double getRetroHUDXPBackgroundGreen() { return config.getDouble("HUD.Retro.Colors.Background.GREEN", 0.75); }
+    public double getRetroHUDXPBackgroundBlue() { return config.getDouble("HUD.Retro.Colors.Background.BLUE", 0.75); }
+
+    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); }
+}

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

@@ -1,4 +1,4 @@
-package com.gmail.nossr50.config;
+package com.gmail.nossr50.config.treasure;
 
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -12,35 +12,37 @@ import org.bukkit.configuration.ConfigurationSection;
 import org.bukkit.inventory.ItemStack;
 import org.bukkit.material.MaterialData;
 
+import com.gmail.nossr50.config.ConfigLoader;
 import com.gmail.nossr50.datatypes.treasure.ExcavationTreasure;
 import com.gmail.nossr50.datatypes.treasure.FishingTreasure;
 import com.gmail.nossr50.datatypes.treasure.HylianTreasure;
 import com.gmail.nossr50.datatypes.treasure.Treasure;
 
-public class TreasuresConfig extends ConfigLoader {
+public class TreasureConfig extends ConfigLoader {
-    private static TreasuresConfig instance;
+    private static TreasureConfig instance;
-    public List<ExcavationTreasure> excavationFromDirt = new ArrayList<ExcavationTreasure>();
+
-    public List<ExcavationTreasure> excavationFromGrass = new ArrayList<ExcavationTreasure>();
+    public List<ExcavationTreasure> excavationFromDirt     = new ArrayList<ExcavationTreasure>();
-    public List<ExcavationTreasure> excavationFromSand = new ArrayList<ExcavationTreasure>();
+    public List<ExcavationTreasure> excavationFromGrass    = new ArrayList<ExcavationTreasure>();
-    public List<ExcavationTreasure> excavationFromGravel = new ArrayList<ExcavationTreasure>();
+    public List<ExcavationTreasure> excavationFromSand     = new ArrayList<ExcavationTreasure>();
-    public List<ExcavationTreasure> excavationFromClay = new ArrayList<ExcavationTreasure>();
+    public List<ExcavationTreasure> excavationFromGravel   = new ArrayList<ExcavationTreasure>();
-    public List<ExcavationTreasure> excavationFromMycel = 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<HylianTreasure> hylianFromBushes = new ArrayList<HylianTreasure>();
+    public List<HylianTreasure> hylianFromBushes  = new ArrayList<HylianTreasure>();
     public List<HylianTreasure> hylianFromFlowers = new ArrayList<HylianTreasure>();
-    public List<HylianTreasure> hylianFromPots = new ArrayList<HylianTreasure>();
+    public List<HylianTreasure> hylianFromPots    = new ArrayList<HylianTreasure>();
 
     public List<FishingTreasure> fishingRewards = new ArrayList<FishingTreasure>();
 
-    private TreasuresConfig() {
+    private TreasureConfig() {
         super("treasures.yml");
         loadKeys();
     }
 
-    public static TreasuresConfig getInstance() {
+    public static TreasureConfig getInstance() {
         if (instance == null) {
-            instance = new TreasuresConfig();
+            instance = new TreasureConfig();
         }
 
         return instance;
@@ -50,6 +52,11 @@ public class TreasuresConfig extends ConfigLoader {
     protected void loadKeys() {
         Map<String, Treasure> treasures = new HashMap<String, Treasure>();
         ConfigurationSection treasureSection = config.getConfigurationSection("Treasures");
+
+        if (treasureSection == null) {
+            return;
+        }
+
         Set<String> treasureConfigSet = treasureSection.getKeys(false);
 
         for (String treasureName : treasureConfigSet) {
@@ -194,7 +201,7 @@ public class TreasuresConfig extends ConfigLoader {
                 if (noErrorsInTreasure(reason) && hTreasure.getDropsFrom() == (byte) 0x0) {
                     treasures.put(treasureName, eTreasure);
                 }
-                else if (noErrorsInTreasure(reason) && eTreasure.getDropsFrom() == (byte) 0x0){
+                else if (noErrorsInTreasure(reason) && eTreasure.getDropsFrom() == (byte) 0x0) {
                     treasures.put(treasureName, hTreasure);
                 }
             }
@@ -204,19 +211,19 @@ public class TreasuresConfig extends ConfigLoader {
         List<String> fishingTreasures = config.getStringList("Fishing.Treasure");
         List<String> hylianTreasures = config.getStringList("Hylian_Luck.Treasure");
 
-        for (Entry<String,Treasure> nextEntry : treasures.entrySet()) {
+        for (Entry<String, Treasure> nextEntry : treasures.entrySet()) {
             String treasureKey = nextEntry.getKey();
             Treasure treasure = nextEntry.getValue();
 
             if (treasure instanceof FishingTreasure) {
-                if (!fishingTreasures.contains(treasureKey)) {
+                if (fishingTreasures == null || !fishingTreasures.contains(treasureKey)) {
                     continue;
                 }
 
                 fishingRewards.add((FishingTreasure) treasure);
             }
             else if (treasure instanceof HylianTreasure) {
-                if (!hylianTreasures.contains(treasureKey)) {
+                if (hylianTreasures == null || !hylianTreasures.contains(treasureKey)) {
                     continue;
                 }
 
@@ -235,7 +242,7 @@ public class TreasuresConfig extends ConfigLoader {
                 }
             }
             else if (treasure instanceof ExcavationTreasure) {
-                if (!excavationTreasures.contains(treasureKey)) {
+                if (excavationTreasures == null || !excavationTreasures.contains(treasureKey)) {
                     continue;
                 }
 

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

@@ -10,19 +10,19 @@ import java.util.HashMap;
 import java.util.Map;
 import java.util.Properties;
 
-import org.bukkit.Bukkit;
 import org.bukkit.entity.Player;
 
 import com.gmail.nossr50.mcMMO;
 import com.gmail.nossr50.config.Config;
-import com.gmail.nossr50.database.runnables.SQLReconnect;
+import com.gmail.nossr50.datatypes.database.DatabaseUpdateType;
-import com.gmail.nossr50.datatypes.McMMOPlayer;
+import com.gmail.nossr50.datatypes.player.McMMOPlayer;
-import com.gmail.nossr50.skills.utilities.SkillType;
+import com.gmail.nossr50.datatypes.skills.SkillType;
-import com.gmail.nossr50.spout.SpoutTools;
+import com.gmail.nossr50.datatypes.spout.huds.McMMOHud;
-import com.gmail.nossr50.spout.huds.SpoutHud;
+import com.gmail.nossr50.runnables.database.SQLReconnectTask;
-import com.gmail.nossr50.util.Users;
+import com.gmail.nossr50.util.player.UserManager;
+import com.gmail.nossr50.util.spout.SpoutUtils;
 
-public final class Database {
+public final class DatabaseManager {
     private static String connectionString;
 
     private static String tablePrefix = Config.getInstance().getMySQLTablePrefix();
@@ -32,7 +32,7 @@ public final class Database {
     private static final double SCALING_FACTOR = 40;
 
     // Minimum wait in nanoseconds (default 500ms)
-    private static final long MIN_WAIT = 500L*1000000L;
+    private static final long MIN_WAIT = 500L * 1000000L;
 
     // Maximum time to wait between reconnects (default 5 minutes)
     private static final long MAX_WAIT = 5L * 60L * 1000L * 1000000L;
@@ -43,10 +43,12 @@ public final class Database {
     // When next to try connecting to Database in nanoseconds
     private static long nextReconnectTimestamp = 0L;
 
-    // How many connection attemtps have failed
+    // How many connection attempts have failed
     private static int reconnectAttempt = 0;
 
-    private Database() {}
+    private static final long ONE_MONTH = 2630000000L;
+
+    private DatabaseManager() {}
 
     /**
      * Attempt to connect to the mySQL database.
@@ -68,13 +70,17 @@ public final class Database {
             connection = DriverManager.getConnection(connectionString, connectionProperties);
 
             mcMMO.p.getLogger().info("Connection to MySQL was a success!");
-        } catch (SQLException ex) {
+        }
+        catch (SQLException ex) {
             connection = null;
+
             if (reconnectAttempt == 0 || reconnectAttempt >= 11) {
                 mcMMO.p.getLogger().info("Connection to MySQL failed!");
             }
-        } catch (ClassNotFoundException ex) {
+        }
+        catch (ClassNotFoundException ex) {
             connection = null;
+
             if (reconnectAttempt == 0 || reconnectAttempt >= 11) {
                 mcMMO.p.getLogger().info("MySQL database driver not found!");
             }
@@ -147,107 +153,10 @@ public final class Database {
                 + "FOREIGN KEY (`user_id`) REFERENCES `" + tablePrefix + "users` (`id`) "
                 + "ON DELETE CASCADE) ENGINE=MyISAM DEFAULT CHARSET=latin1;");
 
-        checkDatabaseStructure(DatabaseUpdate.FISHING);
+        checkDatabaseStructure(DatabaseUpdateType.FISHING);
-        checkDatabaseStructure(DatabaseUpdate.BLAST_MINING);
+        checkDatabaseStructure(DatabaseUpdateType.BLAST_MINING);
-        checkDatabaseStructure(DatabaseUpdate.CASCADE_DELETE);
+        checkDatabaseStructure(DatabaseUpdateType.CASCADE_DELETE);
-        checkDatabaseStructure(DatabaseUpdate.INDEX);
+        checkDatabaseStructure(DatabaseUpdateType.INDEX);
-    }
-
-    /**
-     * Check database structure for missing values.
-     *
-     * @param update Type of data to check updates for
-     */
-    private static void checkDatabaseStructure(DatabaseUpdate update) {
-        String sql = null;
-        ResultSet resultSet = null;
-        HashMap<Integer, ArrayList<String>> rows = new HashMap<Integer, ArrayList<String>>();
-
-        switch (update) {
-        case BLAST_MINING:
-            sql = "SELECT * FROM  `" + tablePrefix + "cooldowns` ORDER BY  `" + tablePrefix + "cooldowns`.`blast_mining` ASC LIMIT 0 , 30";
-            break;
-
-        case CASCADE_DELETE:
-            write("ALTER TABLE `" + tablePrefix + "huds` ADD FOREIGN KEY (`user_id`) REFERENCES `users`(`id`) ON DELETE CASCADE;");
-            write("ALTER TABLE `" + tablePrefix + "experience` ADD FOREIGN KEY (`user_id`) REFERENCES `users`(`id`) ON DELETE CASCADE;");
-            write("ALTER TABLE `" + tablePrefix + "cooldowns` ADD FOREIGN KEY (`user_id`) REFERENCES `users`(`id`) ON DELETE CASCADE;");
-            write("ALTER TABLE `" + tablePrefix + "skills` ADD FOREIGN KEY (`user_id`) REFERENCES `users`(`id`) ON DELETE CASCADE;");
-
-        case FISHING:
-            sql = "SELECT * FROM  `" + tablePrefix + "experience` ORDER BY  `" + tablePrefix + "experience`.`fishing` ASC LIMIT 0 , 30";
-            break;
-
-        case INDEX:
-            if (read("SHOW INDEX FROM " + tablePrefix + "skills").size() != 13) {
-                mcMMO.p.getLogger().info("Indexing tables, this may take a while on larger databases");
-                write("ALTER TABLE `" + tablePrefix + "skills` ADD INDEX `idx_taming` (`taming`) USING BTREE, "
-                        + "ADD INDEX `idx_mining` (`mining`) USING BTREE, "
-                        + "ADD INDEX `idx_woodcutting` (`woodcutting`) USING BTREE, "
-                        + "ADD INDEX `idx_repair` (`repair`) USING BTREE, "
-                        + "ADD INDEX `idx_unarmed` (`unarmed`) USING BTREE, "
-                        + "ADD INDEX `idx_herbalism` (`herbalism`) USING BTREE, "
-                        + "ADD INDEX `idx_excavation` (`excavation`) USING BTREE, "
-                        + "ADD INDEX `idx_archery` (`archery`) USING BTREE, "
-                        + "ADD INDEX `idx_swords` (`swords`) USING BTREE, "
-                        + "ADD INDEX `idx_axes` (`axes`) USING BTREE, "
-                        + "ADD INDEX `idx_acrobatics` (`acrobatics`) USING BTREE, "
-                        + "ADD INDEX `idx_fishing` (`fishing`) USING BTREE;");
-            }
-            break;
-
-        default:
-            break;
-        }
-
-        PreparedStatement statement = null;
-        try {
-            if (!checkConnected()) return;
-            statement = connection.prepareStatement(sql);
-            resultSet = statement.executeQuery();
-
-            while (resultSet.next()) {
-                ArrayList<String> column = new ArrayList<String>();
-
-                for (int i = 1; i <= resultSet.getMetaData().getColumnCount(); i++) {
-                    column.add(resultSet.getString(i));
-                }
-
-                rows.put(resultSet.getRow(), column);
-            }
-        }
-        catch (SQLException ex) {
-            switch (update) {
-            case BLAST_MINING:
-                mcMMO.p.getLogger().info("Updating mcMMO MySQL tables for Blast Mining...");
-                write("ALTER TABLE `"+tablePrefix + "cooldowns` ADD `blast_mining` int(32) NOT NULL DEFAULT '0' ;");
-                break;
-
-            case FISHING:
-                mcMMO.p.getLogger().info("Updating mcMMO MySQL tables for Fishing...");
-                write("ALTER TABLE `"+tablePrefix + "skills` ADD `fishing` int(10) NOT NULL DEFAULT '0' ;");
-                write("ALTER TABLE `"+tablePrefix + "experience` ADD `fishing` int(10) NOT NULL DEFAULT '0' ;");
-                break;
-
-            default:
-                break;
-            }
-        } finally {
-            if (resultSet != null) {
-                try     {
-                    resultSet.close();
-                } catch (SQLException e) {
-                    // Ignore the error, we're leaving
-                }
-            }
-            if (statement != null) {
-                try {
-                    statement.close();
-                } catch (SQLException e) {
-                    // Ignore the error, we're leaving
-                }
-            }
-        }
     }
 
     /**
@@ -257,29 +166,31 @@ public final class Database {
      * @return true if the query was successfully written, false otherwise.
      */
     public static boolean write(String sql) {
-        if (checkConnected()) {
+        if (!checkConnected()) {
-            PreparedStatement statement = null;
+            return false;
-            try {
+        }
-                statement = connection.prepareStatement(sql);
+
-                statement.executeUpdate();
+        PreparedStatement statement = null;
-                return true;
+        try {
-            }
+            statement = connection.prepareStatement(sql);
-            catch (SQLException ex) {
+            statement.executeUpdate();
-                printErrors(ex);
+            return true;
-                return false;
+        }
-            } finally {
+        catch (SQLException ex) {
-                if (statement != null) {
+            printErrors(ex);
-                    try {
+            return false;
-                        statement.close();
+        }
-                    } catch (SQLException e) {
+        finally {
-                        printErrors(e);
+            if (statement != null) {
-                        return false;
+                try {
-                    }
+                    statement.close();
+                }
+                catch (SQLException e) {
+                    printErrors(e);
+                    return false;
                 }
             }
         }
-
-        return false;
     }
 
     /**
@@ -290,22 +201,23 @@ public final class Database {
      */
     public static int update(String sql) {
         int ret = 0;
+
         if (checkConnected()) {
             PreparedStatement statement = null;
             try {
                 statement = connection.prepareStatement(sql);
                 ret = statement.executeUpdate();
-                return ret;
+            }
-            } catch (SQLException ex) {
+            catch (SQLException ex) {
                 printErrors(ex);
-                return 0;
+            }
-            } finally {
+            finally {
                 if (statement != null) {
                     try {
                         statement.close();
-                    } catch (SQLException e) {
+                    }
+                    catch (SQLException e) {
                         printErrors(e);
-                        return 0;
                     }
                 }
             }
@@ -321,12 +233,14 @@ public final class Database {
      * @return the value in the first row / first field
      */
     public static int getInt(String sql) {
-        ResultSet resultSet;
+        ResultSet resultSet = null;
         int result = 0;
 
         if (checkConnected()) {
+            PreparedStatement statement = null;
+
             try {
-                PreparedStatement statement = connection.prepareStatement(sql);
+                statement = connection.prepareStatement(sql);
                 resultSet = statement.executeQuery();
 
                 if (resultSet.next()) {
@@ -335,12 +249,20 @@ public final class Database {
                 else {
                     result = 0;
                 }
-
-                statement.close();
             }
             catch (SQLException ex) {
                 printErrors(ex);
             }
+            finally {
+                if (statement != null) {
+                    try {
+                        statement.close();
+                    }
+                    catch (SQLException e) {
+                        printErrors(e);
+                    }
+                }
+            }
         }
 
         return result;
@@ -374,7 +296,8 @@ public final class Database {
         if (exists) {
             try {
                 isClosed = connection.isClosed();
-            } catch (SQLException e) {
+            }
+            catch (SQLException e) {
                 isClosed = true;
                 e.printStackTrace();
                 printErrors(e);
@@ -383,9 +306,9 @@ public final class Database {
             if (!isClosed) {
                 try {
                     isValid = connection.isValid(VALID_TIMEOUT);
-                } catch (SQLException e) {
+                }
-                    // Don't print stack trace because it's valid to lose idle connections
+                catch (SQLException e) {
-                    // to the server and have to restart them.
+                    // Don't print stack trace because it's valid to lose idle connections to the server and have to restart them.
                     isValid = false;
                 }
             }
@@ -403,7 +326,8 @@ public final class Database {
         if (exists && !isClosed) {
             try {
                 connection.close();
-            } catch (SQLException ex) {
+            }
+            catch (SQLException ex) {
                 // This is a housekeeping exercise, ignore errors
             }
         }
@@ -416,22 +340,21 @@ public final class Database {
             if (connection != null && !connection.isClosed()) {
                 // Schedule a database save if we really had an outage
                 if (reconnectAttempt > 1) {
-                    mcMMO.p.getServer().getScheduler().scheduleSyncDelayedTask(mcMMO.p, new SQLReconnect(), 5);
+                    mcMMO.p.getServer().getScheduler().scheduleSyncDelayedTask(mcMMO.p, new SQLReconnectTask(), 5);
                 }
                 nextReconnectTimestamp = 0;
                 reconnectAttempt = 0;
                 return true;
             }
-        } catch (SQLException e) {
+        }
+        catch (SQLException e) {
             // Failed to check isClosed, so presume connection is bad and attempt later
             e.printStackTrace();
             printErrors(e);
         }
 
         reconnectAttempt++;
-
+        nextReconnectTimestamp = (long)(System.nanoTime() + Math.min(MAX_WAIT, (reconnectAttempt * SCALING_FACTOR * MIN_WAIT)));
-        nextReconnectTimestamp = (long)(System.nanoTime() + Math.min(MAX_WAIT, (reconnectAttempt*SCALING_FACTOR*MIN_WAIT)));
-
         return false;
     }
 
@@ -446,8 +369,10 @@ public final class Database {
         HashMap<Integer, ArrayList<String>> rows = new HashMap<Integer, ArrayList<String>>();
 
         if (checkConnected()) {
+            PreparedStatement statement = null;
+
             try {
-                PreparedStatement statement = connection.prepareStatement(sql);
+                statement = connection.prepareStatement(sql);
                 resultSet = statement.executeQuery();
 
                 while (resultSet.next()) {
@@ -459,12 +384,20 @@ public final class Database {
 
                     rows.put(resultSet.getRow(), column);
                 }
-
-                statement.close();
             }
             catch (SQLException ex) {
                 printErrors(ex);
             }
+            finally {
+                if (statement != null) {
+                    try {
+                        statement.close();
+                    }
+                    catch (SQLException e) {
+                        printErrors(e);
+                    }
+                }
+            }
         }
 
         return rows;
@@ -476,12 +409,15 @@ public final class Database {
 
         if (checkConnected()) {
             try {
-                for (SkillType skillType: SkillType.values()) {
+                for (SkillType skillType : SkillType.values()) {
                     if (skillType.isChildSkill()) {
                         continue;
                     }
 
-                    String sql = "SELECT COUNT(*) AS rank FROM " + tablePrefix + "users JOIN " + tablePrefix + "skills ON user_id = id WHERE " + skillType.name().toLowerCase() + " > 0 AND " + skillType.name().toLowerCase() + " > (SELECT " + skillType.name().toLowerCase() + " FROM " + tablePrefix + "users JOIN " + tablePrefix + "skills ON user_id = id WHERE user = '" + playerName + "')";
+                    String skillName = skillType.name().toLowerCase();
+                    String sql = "SELECT COUNT(*) AS rank FROM " + tablePrefix + "users JOIN " + tablePrefix + "skills ON user_id = id WHERE " + skillName + " > 0 " +
+                                 "AND " + skillName + " > (SELECT " + skillName + " FROM " + tablePrefix + "users JOIN " + tablePrefix + "skills ON user_id = id " +
+                                 "WHERE user = '" + playerName + "')";
 
                     PreparedStatement statement = connection.prepareStatement(sql);
                     resultSet = statement.executeQuery();
@@ -490,7 +426,9 @@ public final class Database {
 
                     int rank = resultSet.getInt("rank");
 
-                    sql = "SELECT user, " + skillType.name().toLowerCase() + " FROM " + tablePrefix + "users JOIN " + tablePrefix + "skills ON user_id = id WHERE " + skillType.name().toLowerCase() + " > 0 AND " + skillType.name().toLowerCase() + " = (SELECT " + skillType.name().toLowerCase() + " FROM " + tablePrefix + "users JOIN " + tablePrefix + "skills ON user_id = id WHERE user = '" + playerName + "') ORDER BY user";
+                    sql = "SELECT user, " + skillName + " FROM " + tablePrefix + "users JOIN " + tablePrefix + "skills ON user_id = id WHERE " + skillName + " > 0 " +
+                          "AND " + skillName + " = (SELECT " + skillName + " FROM " + tablePrefix + "users JOIN " + tablePrefix + "skills ON user_id = id " +
+                          "WHERE user = '" + playerName + "') ORDER BY user";
 
                     statement = connection.prepareStatement(sql);
                     resultSet = statement.executeQuery();
@@ -505,7 +443,11 @@ public final class Database {
                     statement.close();
                 }
 
-                String sql = "SELECT COUNT(*) AS rank FROM " + tablePrefix + "users JOIN " + tablePrefix + "skills ON user_id = id WHERE taming+mining+woodcutting+repair+unarmed+herbalism+excavation+archery+swords+axes+acrobatics+fishing > 0 AND taming+mining+woodcutting+repair+unarmed+herbalism+excavation+archery+swords+axes+acrobatics+fishing > (SELECT taming+mining+woodcutting+repair+unarmed+herbalism+excavation+archery+swords+axes+acrobatics+fishing FROM " + tablePrefix + "users JOIN " + tablePrefix + "skills ON user_id = id WHERE user = '" + playerName + "')";
+                String sql = "SELECT COUNT(*) AS rank FROM " + tablePrefix + "users JOIN " + tablePrefix + "skills ON user_id = id " +
+                             "WHERE taming+mining+woodcutting+repair+unarmed+herbalism+excavation+archery+swords+axes+acrobatics+fishing > 0 " +
+                             "AND taming+mining+woodcutting+repair+unarmed+herbalism+excavation+archery+swords+axes+acrobatics+fishing > " +
+                             "(SELECT taming+mining+woodcutting+repair+unarmed+herbalism+excavation+archery+swords+axes+acrobatics+fishing " +
+                             "FROM " + tablePrefix + "users JOIN " + tablePrefix + "skills ON user_id = id WHERE user = '" + playerName + "')";
 
                 PreparedStatement statement = connection.prepareStatement(sql);
                 resultSet = statement.executeQuery();
@@ -514,7 +456,12 @@ public final class Database {
 
                 int rank = resultSet.getInt("rank");
 
-                sql = "SELECT user, taming+mining+woodcutting+repair+unarmed+herbalism+excavation+archery+swords+axes+acrobatics+fishing FROM " + tablePrefix + "users JOIN " + tablePrefix + "skills ON user_id = id WHERE taming+mining+woodcutting+repair+unarmed+herbalism+excavation+archery+swords+axes+acrobatics+fishing > 0 AND taming+mining+woodcutting+repair+unarmed+herbalism+excavation+archery+swords+axes+acrobatics+fishing = (SELECT taming+mining+woodcutting+repair+unarmed+herbalism+excavation+archery+swords+axes+acrobatics+fishing FROM " + tablePrefix + "users JOIN " + tablePrefix + "skills ON user_id = id WHERE user = '" + playerName + "') ORDER BY user";
+                sql = "SELECT user, taming+mining+woodcutting+repair+unarmed+herbalism+excavation+archery+swords+axes+acrobatics+fishing " +
+                      "FROM " + tablePrefix + "users JOIN " + tablePrefix + "skills ON user_id = id " +
+                      "WHERE taming+mining+woodcutting+repair+unarmed+herbalism+excavation+archery+swords+axes+acrobatics+fishing > 0 " +
+                      "AND taming+mining+woodcutting+repair+unarmed+herbalism+excavation+archery+swords+axes+acrobatics+fishing = " +
+                      "(SELECT taming+mining+woodcutting+repair+unarmed+herbalism+excavation+archery+swords+axes+acrobatics+fishing " +
+                      "FROM " + tablePrefix + "users JOIN " + tablePrefix + "skills ON user_id = id WHERE user = '" + playerName + "') ORDER BY user";
 
                 statement = connection.prepareStatement(sql);
                 resultSet = statement.executeQuery();
@@ -538,14 +485,20 @@ public final class Database {
 
     public static void purgePowerlessSQL() {
         mcMMO.p.getLogger().info("Purging powerless users...");
-        HashMap<Integer, ArrayList<String>> usernames = read("SELECT u.user FROM " + tablePrefix + "skills AS s, " + tablePrefix + "users AS u WHERE s.user_id = u.id AND (s.taming+s.mining+s.woodcutting+s.repair+s.unarmed+s.herbalism+s.excavation+s.archery+s.swords+s.axes+s.acrobatics+s.fishing) = 0");
+        HashMap<Integer, ArrayList<String>> usernames;
-        write("DELETE FROM " + tablePrefix + "users WHERE " + tablePrefix + "users.id IN (SELECT * FROM (SELECT u.id FROM " + tablePrefix + "skills AS s, " + tablePrefix + "users AS u WHERE s.user_id = u.id AND (s.taming+s.mining+s.woodcutting+s.repair+s.unarmed+s.herbalism+s.excavation+s.archery+s.swords+s.axes+s.acrobatics+s.fishing) = 0) AS p)");
+
+        usernames = read("SELECT u.user FROM " + tablePrefix + "skills AS s, " + tablePrefix + "users AS u " + "WHERE s.user_id = u.id AND " +
+                "(s.taming+s.mining+s.woodcutting+s.repair+s.unarmed+s.herbalism+s.excavation+s.archery+s.swords+s.axes+s.acrobatics+s.fishing) = 0");
+
+        write("DELETE FROM " + tablePrefix + "users WHERE " + tablePrefix + "users.id IN (SELECT * FROM " +
+                "(SELECT u.id FROM " + tablePrefix + "skills AS s, " + tablePrefix + "users AS u " + "WHERE s.user_id = u.id " +
+                "AND (s.taming+s.mining+s.woodcutting+s.repair+s.unarmed+s.herbalism+s.excavation+s.archery+s.swords+s.axes+s.acrobatics+s.fishing) = 0) AS p)");
 
         int purgedUsers = 0;
         for (int i = 1; i <= usernames.size(); i++) {
             String playerName = usernames.get(i).get(0);
 
-            if (playerName == null || Bukkit.getOfflinePlayer(playerName).isOnline()) {
+            if (playerName == null || mcMMO.p.getServer().getOfflinePlayer(playerName).isOnline()) {
                 continue;
             }
 
@@ -559,7 +512,7 @@ public final class Database {
     public static void purgeOldSQL() {
         mcMMO.p.getLogger().info("Purging old users...");
         long currentTime = System.currentTimeMillis();
-        long purgeTime = 2630000000L * Config.getInstance().getOldUsersCutoff();
+        long purgeTime = ONE_MONTH * Config.getInstance().getOldUsersCutoff();
         HashMap<Integer, ArrayList<String>> usernames = read("SELECT user FROM " + tablePrefix + "users WHERE ((" + currentTime + " - lastlogin*1000) > " + purgeTime + ")");
         write("DELETE FROM " + tablePrefix + "users WHERE " + tablePrefix + "users.id IN (SELECT * FROM (SELECT id FROM " + tablePrefix + "users WHERE ((" + currentTime + " - lastlogin*1000) > " + purgeTime + ")) AS p)");
 
@@ -578,32 +531,137 @@ public final class Database {
         mcMMO.p.getLogger().info("Purged " + purgedUsers + " users from the database.");
     }
 
-    private static void printErrors(SQLException ex) {
-        System.out.println("SQLException: " + ex.getMessage());
-        System.out.println("SQLState: " + ex.getSQLState());
-        System.out.println("VendorError: " + ex.getErrorCode());
-    }
-
     public static void profileCleanup(String playerName) {
-        McMMOPlayer mcmmoPlayer = Users.getPlayer(playerName);
+        McMMOPlayer mcMMOPlayer = UserManager.getPlayer(playerName);
 
-        if (mcmmoPlayer != null) {
+        if (mcMMOPlayer != null) {
-            Player player = mcmmoPlayer.getPlayer();
+            Player player = mcMMOPlayer.getPlayer();
-            SpoutHud spoutHud = mcmmoPlayer.getProfile().getSpoutHud();
+            McMMOHud spoutHud = mcMMOPlayer.getProfile().getSpoutHud();
 
             if (spoutHud != null) {
                 spoutHud.removeWidgets();
             }
 
-            Users.remove(playerName);
+            UserManager.remove(playerName);
 
             if (player.isOnline()) {
-                Users.addUser(player);
+                UserManager.addUser(player);
 
                 if (mcMMO.spoutEnabled) {
-                    SpoutTools.reloadSpoutPlayer(player);
+                    SpoutUtils.reloadSpoutPlayer(player);
                 }
             }
         }
     }
+
+    /**
+     * Check database structure for missing values.
+     *
+     * @param update Type of data to check updates for
+     */
+    private static void checkDatabaseStructure(DatabaseUpdateType update) {
+        String sql = null;
+        ResultSet resultSet = null;
+        HashMap<Integer, ArrayList<String>> rows = new HashMap<Integer, ArrayList<String>>();
+
+        switch (update) {
+            case BLAST_MINING:
+                sql = "SELECT * FROM  `" + tablePrefix + "cooldowns` ORDER BY  `" + tablePrefix + "cooldowns`.`blast_mining` ASC LIMIT 0 , 30";
+                break;
+
+            case CASCADE_DELETE:
+                write("ALTER TABLE `" + tablePrefix + "huds` ADD FOREIGN KEY (`user_id`) REFERENCES `users`(`id`) ON DELETE CASCADE;");
+                write("ALTER TABLE `" + tablePrefix + "experience` ADD FOREIGN KEY (`user_id`) REFERENCES `users`(`id`) ON DELETE CASCADE;");
+                write("ALTER TABLE `" + tablePrefix + "cooldowns` ADD FOREIGN KEY (`user_id`) REFERENCES `users`(`id`) ON DELETE CASCADE;");
+                write("ALTER TABLE `" + tablePrefix + "skills` ADD FOREIGN KEY (`user_id`) REFERENCES `users`(`id`) ON DELETE CASCADE;");
+                break;
+
+            case FISHING:
+                sql = "SELECT * FROM  `" + tablePrefix + "experience` ORDER BY  `" + tablePrefix + "experience`.`fishing` ASC LIMIT 0 , 30";
+                break;
+
+            case INDEX:
+                if (read("SHOW INDEX FROM " + tablePrefix + "skills").size() != 13 && checkConnected()) {
+                    mcMMO.p.getLogger().info("Indexing tables, this may take a while on larger databases");
+                    write("ALTER TABLE `" + tablePrefix + "skills` ADD INDEX `idx_taming` (`taming`) USING BTREE, "
+                            + "ADD INDEX `idx_mining` (`mining`) USING BTREE, "
+                            + "ADD INDEX `idx_woodcutting` (`woodcutting`) USING BTREE, "
+                            + "ADD INDEX `idx_repair` (`repair`) USING BTREE, "
+                            + "ADD INDEX `idx_unarmed` (`unarmed`) USING BTREE, "
+                            + "ADD INDEX `idx_herbalism` (`herbalism`) USING BTREE, "
+                            + "ADD INDEX `idx_excavation` (`excavation`) USING BTREE, "
+                            + "ADD INDEX `idx_archery` (`archery`) USING BTREE, "
+                            + "ADD INDEX `idx_swords` (`swords`) USING BTREE, "
+                            + "ADD INDEX `idx_axes` (`axes`) USING BTREE, "
+                            + "ADD INDEX `idx_acrobatics` (`acrobatics`) USING BTREE, "
+                            + "ADD INDEX `idx_fishing` (`fishing`) USING BTREE;");
+                }
+                break;
+
+            default:
+                break;
+        }
+
+        PreparedStatement statement = null;
+        try {
+            if (!checkConnected()) {
+                return;
+            }
+
+            statement = connection.prepareStatement(sql);
+            resultSet = statement.executeQuery();
+
+            while (resultSet.next()) {
+                ArrayList<String> column = new ArrayList<String>();
+
+                for (int i = 1; i <= resultSet.getMetaData().getColumnCount(); i++) {
+                    column.add(resultSet.getString(i));
+                }
+
+                rows.put(resultSet.getRow(), column);
+            }
+        }
+        catch (SQLException ex) {
+            switch (update) {
+                case BLAST_MINING:
+                    mcMMO.p.getLogger().info("Updating mcMMO MySQL tables for Blast Mining...");
+                    write("ALTER TABLE `"+tablePrefix + "cooldowns` ADD `blast_mining` int(32) NOT NULL DEFAULT '0' ;");
+                    break;
+
+                case FISHING:
+                    mcMMO.p.getLogger().info("Updating mcMMO MySQL tables for Fishing...");
+                    write("ALTER TABLE `"+tablePrefix + "skills` ADD `fishing` int(10) NOT NULL DEFAULT '0' ;");
+                    write("ALTER TABLE `"+tablePrefix + "experience` ADD `fishing` int(10) NOT NULL DEFAULT '0' ;");
+                    break;
+
+                default:
+                    break;
+            }
+        }
+        finally {
+            if (resultSet != null) {
+                try {
+                    resultSet.close();
+                }
+                catch (SQLException e) {
+                    // Ignore the error, we're leaving
+                }
+            }
+
+            if (statement != null) {
+                try {
+                    statement.close();
+                }
+                catch (SQLException e) {
+                    // Ignore the error, we're leaving
+                }
+            }
+        }
+    }
+
+    private static void printErrors(SQLException ex) {
+        mcMMO.p.getLogger().severe("SQLException: " + ex.getMessage());
+        mcMMO.p.getLogger().severe("SQLState: " + ex.getSQLState());
+        mcMMO.p.getLogger().severe("VendorError: " + ex.getErrorCode());
+    }
 }

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

@@ -1,8 +0,0 @@
-package com.gmail.nossr50.database;
-
-public enum DatabaseUpdate {
-    FISHING,
-    BLAST_MINING,
-    CASCADE_DELETE,
-    INDEX;
-}

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

@@ -10,48 +10,49 @@ import java.util.Comparator;
 import java.util.HashMap;
 import java.util.List;
 
-import org.bukkit.Bukkit;
-
 import com.gmail.nossr50.mcMMO;
 import com.gmail.nossr50.config.Config;
-import com.gmail.nossr50.skills.utilities.SkillType;
+import com.gmail.nossr50.datatypes.database.PlayerStat;
-import com.gmail.nossr50.util.Misc;
+import com.gmail.nossr50.datatypes.skills.SkillType;
+import com.gmail.nossr50.util.StringUtils;
 
-public final class Leaderboard {
+public final class LeaderboardManager {
     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;
 
-    private Leaderboard() {}
+    private static final long UPDATE_WAIT_TIME = 600000L; // 10 minutes
+    private static final long ONE_MONTH = 2630000000L;
+
+    private LeaderboardManager() {}
 
     /**
      * Update the leader boards.
      */
     public static void updateLeaderboards() {
-        if(System.currentTimeMillis() < lastUpdate + 600000) {
+        // 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
-            return; //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;
         }
 
-        lastUpdate = System.currentTimeMillis(); //Log when the last update was run
+        lastUpdate = System.currentTimeMillis(); // Log when the last update was run
+        powerLevels.clear(); // Clear old values from the power levels
 
-        //Initialize lists
+        // Initialize lists
-        List<PlayerStat> mining, woodcutting, herbalism, excavation, acrobatics, repair, swords, axes, archery, unarmed, taming, fishing;
+        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>();
 
-        mining = new ArrayList<PlayerStat>();
+        // Read from the FlatFile database and fill our arrays with information
-        woodcutting = new ArrayList<PlayerStat>();
-        herbalism = new ArrayList<PlayerStat>();
-        excavation = new ArrayList<PlayerStat>();
-        acrobatics = new ArrayList<PlayerStat>();
-        repair = new ArrayList<PlayerStat>();
-        swords = new ArrayList<PlayerStat>();
-        axes = new ArrayList<PlayerStat>();
-        archery = new ArrayList<PlayerStat>();
-        unarmed = new ArrayList<PlayerStat>();
-        taming = new ArrayList<PlayerStat>();
-        fishing = new ArrayList<PlayerStat>();
-        powerLevels = new ArrayList<PlayerStat>();
-
-        //Read from the FlatFile database and fill our arrays with information
         try {
             FileReader file = new FileReader(mcMMO.getUsersFilePath());
             BufferedReader in = new BufferedReader(file);
@@ -64,71 +65,71 @@ public final class Leaderboard {
                 String p = character[0];
                 int powerLevel = 0;
 
-                //Prevent the same player from being added multiple times (I'd like to note that this shouldn't happen...)
+                // Prevent the same player from being added multiple times (I'd like to note that this shouldn't happen...)
                 if (players.contains(p)) {
                     continue;
                 }
 
                 players.add(p);
 
-                if (character.length > 1 && Misc.isInt(character[1])) {
+                if (character.length > 1 && StringUtils.isInt(character[1])) {
-                    mining.add(new PlayerStat(p, Integer.valueOf(character[1])));
+                    mining.add(new PlayerStat(p, Integer.parseInt(character[1])));
-                    powerLevel += Integer.valueOf(character[1]);
+                    powerLevel += Integer.parseInt(character[1]);
                 }
 
-                if (character.length > 5 && Misc.isInt(character[5])) {
+                if (character.length > 5 && StringUtils.isInt(character[5])) {
-                    woodcutting.add(new PlayerStat(p, Integer.valueOf(character[5])));
+                    woodcutting.add(new PlayerStat(p, Integer.parseInt(character[5])));
-                    powerLevel += Integer.valueOf(character[5]);
+                    powerLevel += Integer.parseInt(character[5]);
                 }
 
-                if (character.length > 7 && Misc.isInt(character[7])) {
+                if (character.length > 7 && StringUtils.isInt(character[7])) {
-                    repair.add(new PlayerStat(p, Integer.valueOf(character[7])));
+                    repair.add(new PlayerStat(p, Integer.parseInt(character[7])));
-                    powerLevel += Integer.valueOf(character[7]);
+                    powerLevel += Integer.parseInt(character[7]);
                 }
 
-                if (character.length > 8 && Misc.isInt(character[8])) {
+                if (character.length > 8 && StringUtils.isInt(character[8])) {
-                    unarmed.add(new PlayerStat(p, Integer.valueOf(character[8])));
+                    unarmed.add(new PlayerStat(p, Integer.parseInt(character[8])));
-                    powerLevel += Integer.valueOf(character[8]);
+                    powerLevel += Integer.parseInt(character[8]);
                 }
 
-                if (character.length > 9 && Misc.isInt(character[9])) {
+                if (character.length > 9 && StringUtils.isInt(character[9])) {
-                    herbalism.add(new PlayerStat(p, Integer.valueOf(character[9])));
+                    herbalism.add(new PlayerStat(p, Integer.parseInt(character[9])));
-                    powerLevel += Integer.valueOf(character[9]);
+                    powerLevel += Integer.parseInt(character[9]);
                 }
 
-                if (character.length > 10 && Misc.isInt(character[10])) {
+                if (character.length > 10 && StringUtils.isInt(character[10])) {
-                    excavation.add(new PlayerStat(p, Integer.valueOf(character[10])));
+                    excavation.add(new PlayerStat(p, Integer.parseInt(character[10])));
-                    powerLevel += Integer.valueOf(character[10]);
+                    powerLevel += Integer.parseInt(character[10]);
                 }
 
-                if (character.length > 11 && Misc.isInt(character[11])) {
+                if (character.length > 11 && StringUtils.isInt(character[11])) {
-                    archery.add(new PlayerStat(p, Integer.valueOf(character[11])));
+                    archery.add(new PlayerStat(p, Integer.parseInt(character[11])));
-                    powerLevel += Integer.valueOf(character[11]);
+                    powerLevel += Integer.parseInt(character[11]);
                 }
 
-                if (character.length > 12 && Misc.isInt(character[12])) {
+                if (character.length > 12 && StringUtils.isInt(character[12])) {
-                    swords.add(new PlayerStat(p, Integer.valueOf(character[12])));
+                    swords.add(new PlayerStat(p, Integer.parseInt(character[12])));
-                    powerLevel += Integer.valueOf(character[12]);
+                    powerLevel += Integer.parseInt(character[12]);
                 }
 
-                if (character.length > 13 && Misc.isInt(character[13])) {
+                if (character.length > 13 && StringUtils.isInt(character[13])) {
-                    axes.add(new PlayerStat(p, Integer.valueOf(character[13])));
+                    axes.add(new PlayerStat(p, Integer.parseInt(character[13])));
-                    powerLevel += Integer.valueOf(character[13]);
+                    powerLevel += Integer.parseInt(character[13]);
                 }
 
-                if (character.length > 14 && Misc.isInt(character[14])) {
+                if (character.length > 14 && StringUtils.isInt(character[14])) {
-                    acrobatics.add(new PlayerStat(p, Integer.valueOf(character[14])));
+                    acrobatics.add(new PlayerStat(p, Integer.parseInt(character[14])));
-                    powerLevel += Integer.valueOf(character[14]);
+                    powerLevel += Integer.parseInt(character[14]);
                 }
 
-                if (character.length > 24 && Misc.isInt(character[24])) {
+                if (character.length > 24 && StringUtils.isInt(character[24])) {
-                    taming.add(new PlayerStat(p, Integer.valueOf(character[24])));
+                    taming.add(new PlayerStat(p, Integer.parseInt(character[24])));
-                    powerLevel += Integer.valueOf(character[24]);
+                    powerLevel += Integer.parseInt(character[24]);
                 }
 
-                if (character.length > 34 && Misc.isInt(character[34])) {
+                if (character.length > 34 && StringUtils.isInt(character[34])) {
-                    fishing.add(new PlayerStat(p, Integer.valueOf(character[34])));
+                    fishing.add(new PlayerStat(p, Integer.parseInt(character[34])));
-                    powerLevel += Integer.valueOf(character[34]);
+                    powerLevel += Integer.parseInt(character[34]);
                 }
 
                 powerLevels.add(new PlayerStat(p, powerLevel));
@@ -136,10 +137,11 @@ public final class Leaderboard {
             in.close();
         }
         catch (Exception e) {
-            mcMMO.p.getLogger().severe(("Exception while reading " + mcMMO.getUsersFilePath() + " (Are you sure you formatted it correctly?)" + e.toString()));
+            mcMMO.p.getLogger().severe("Exception while reading " + mcMMO.getUsersFilePath() + " (Are you sure you formatted it correctly?)" + e.toString());
         }
 
         SkillComparator c = new SkillComparator();
+
         Collections.sort(mining, c);
         Collections.sort(woodcutting, c);
         Collections.sort(repair, c);
@@ -227,6 +229,7 @@ public final class Leaderboard {
                 currentPos++;
                 continue;
             }
+
             return new int[] {0, 0};
         }
 
@@ -246,19 +249,13 @@ public final class Leaderboard {
                 currentPos++;
                 continue;
             }
+
             return new int[] {0, 0};
         }
 
         return new int[] {0, 0};
     }
 
-    private static class SkillComparator implements Comparator<PlayerStat> {
-        @Override
-        public int compare(PlayerStat o1, PlayerStat o2) {
-            return (o2.statVal - o1.statVal);
-        }
-    }
-
     public static boolean removeFlatFileUser(String playerName) {
         boolean worked = false;
 
@@ -274,18 +271,18 @@ public final class Leaderboard {
 
             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. */
+                // 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 {
-                    System.out.println("User found, removing...");
+                    mcMMO.p.getLogger().info("User found, removing...");
                     worked = true;
-                    continue; //Skip the player
+                    continue; // Skip the player
                 }
             }
 
-            out = new FileWriter(usersFilePath); //Write out the new file
+            out = new FileWriter(usersFilePath); // Write out the new file
             out.write(writer.toString());
         }
         catch (Exception e) {
@@ -314,13 +311,12 @@ public final class Leaderboard {
         return worked;
     }
 
-    
     public static void purgePowerlessFlatfile() {
         mcMMO.p.getLogger().info("Purging powerless users...");
 
         int purgedUsers = 0;
         for (PlayerStat stat : powerLevels) {
-            if (stat.statVal == 0 && removeFlatFileUser(stat.name) && !Bukkit.getOfflinePlayer(stat.name).isOnline()) {
+            if (stat.statVal == 0 && removeFlatFileUser(stat.name) && !mcMMO.p.getServer().getOfflinePlayer(stat.name).isOnline()) {
                 purgedUsers++;
             }
         }
@@ -337,7 +333,7 @@ public final class Leaderboard {
     private static int removeOldFlatfileUsers() {
         int removedPlayers = 0;
         long currentTime = System.currentTimeMillis();
-        long purgeTime = 2630000000L * Config.getInstance().getOldUsersCutoff();
+        long purgeTime = ONE_MONTH * Config.getInstance().getOldUsersCutoff();
 
         BufferedReader in = null;
         FileWriter out = null;
@@ -351,17 +347,17 @@ public final class Leaderboard {
 
             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. */
+                // 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 - (Misc.getLong(line.split(":")[37]) * 1000) <= purgeTime) {
+                    if (currentTime - (StringUtils.getLong(line.split(":")[37]) * 1000) <= purgeTime) {
                         writer.append(line).append("\r\n");
                     }
                     else {
-                        System.out.println("User found, removing...");
+                        mcMMO.p.getLogger().info("User found, removing...");
                         removedPlayers++;
-                        continue; //Skip the player
+                        continue; // Skip the player
                     }
                 }
                 else {
@@ -369,7 +365,7 @@ public final class Leaderboard {
                 }
             }
 
-            out = new FileWriter(usersFilePath); //Write out the new file
+            out = new FileWriter(usersFilePath); // Write out the new file
             out.write(writer.toString());
         }
         catch (Exception e) {
@@ -398,4 +394,10 @@ public final class Leaderboard {
         return removedPlayers;
     }
 
+    private static class SkillComparator implements Comparator<PlayerStat> {
+        @Override
+        public int compare(PlayerStat o1, PlayerStat o2) {
+            return (o2.statVal - o1.statVal);
+        }
+    }
 }

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

@@ -1,39 +0,0 @@
-package com.gmail.nossr50.database.commands;
-
-import org.bukkit.command.Command;
-import org.bukkit.command.CommandExecutor;
-import org.bukkit.command.CommandSender;
-
-import com.gmail.nossr50.config.Config;
-import com.gmail.nossr50.database.Database;
-import com.gmail.nossr50.database.Leaderboard;
-import com.gmail.nossr50.locale.LocaleLoader;
-
-public class McpurgeCommand implements CommandExecutor{
-    @Override
-    public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
-        switch (args.length) {
-        case 0:
-            if (Config.getInstance().getUseMySQL()) {
-                Database.purgePowerlessSQL();
-
-                if (Config.getInstance().getOldUsersCutoff() != -1) {
-                    Database.purgeOldSQL();
-                }
-            }
-            else {
-                Leaderboard.purgePowerlessFlatfile();
-
-                if (Config.getInstance().getOldUsersCutoff() != -1) {
-                    Leaderboard.purgeOldFlatfile();
-                }
-            }
-
-            sender.sendMessage(LocaleLoader.getString("Commands.mcpurge.Success"));
-            return true;
-
-        default:
-            return false;
-        }
-    }
-}

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

@@ -1,45 +0,0 @@
-package com.gmail.nossr50.database.commands;
-
-import org.bukkit.command.Command;
-import org.bukkit.command.CommandExecutor;
-import org.bukkit.command.CommandSender;
-
-import com.gmail.nossr50.config.Config;
-import com.gmail.nossr50.database.Database;
-import com.gmail.nossr50.database.Leaderboard;
-import com.gmail.nossr50.locale.LocaleLoader;
-
-public class McremoveCommand implements CommandExecutor {
-    @Override
-    public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
-        switch (args.length) {
-        case 1:
-            /* MySQL */
-            if (Config.getInstance().getUseMySQL()) {
-                String tablePrefix = Config.getInstance().getMySQLTablePrefix();
-
-                if (Database.update("DELETE FROM " + tablePrefix + "users WHERE " + tablePrefix + "users.user = '" + args[0] + "'") != 0) {
-                    Database.profileCleanup(args[0]);
-                    sender.sendMessage(LocaleLoader.getString("Commands.mcremove.Success", args[0]));
-                }
-                else {
-                    sender.sendMessage(LocaleLoader.getString("Commands.DoesNotExist"));
-                }
-            }
-            else {
-                if (Leaderboard.removeFlatFileUser(args[0])) {
-                    Database.profileCleanup(args[0]);
-                    sender.sendMessage(LocaleLoader.getString("Commands.mcremove.Success", args[0]));
-                }
-                else {
-                    sender.sendMessage(LocaleLoader.getString("Commands.DoesNotExist"));
-                }
-            }
-
-            return true;
-
-        default:
-            return false;
-        }
-    }
-}

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

@@ -1,45 +0,0 @@
-package com.gmail.nossr50.database.commands;
-
-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.config.Config;
-import com.gmail.nossr50.database.runnables.SQLConversionTask;
-import com.gmail.nossr50.locale.LocaleLoader;
-import com.gmail.nossr50.util.Users;
-
-public class MmoupdateCommand implements CommandExecutor {
-    @Override
-    public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
-        switch (args.length) {
-        case 0:
-            sender.sendMessage(LocaleLoader.getString("Commands.mmoupdate.Start"));
-            Users.clearAll();
-            convertToMySQL();
-
-            for (Player player : mcMMO.p.getServer().getOnlinePlayers()) {
-                Users.addUser(player);
-            }
-
-            sender.sendMessage(LocaleLoader.getString("Commands.mmoupdate.Finish"));
-            return true;
-
-        default:
-            return false;
-        }
-    }
-
-    /**
-     * Convert FlatFile data to MySQL data.
-     */
-    private void convertToMySQL() {
-        if (!Config.getInstance().getUseMySQL()) {
-            return;
-        }
-
-        mcMMO.p.getServer().getScheduler().runTaskLaterAsynchronously(mcMMO.p, new SQLConversionTask(), 1);
-    }
-}

src/main/java/com/gmail/nossr50/database/queuemanager/AsyncQueueManager.java

@@ -0,0 +1,63 @@
+package com.gmail.nossr50.database.queuemanager;
+
+import java.util.concurrent.LinkedBlockingQueue;
+
+public class AsyncQueueManager implements Runnable {
+    private LinkedBlockingQueue<Queueable> queue;
+    private boolean running;
+    
+    public AsyncQueueManager() {
+        this.queue = new LinkedBlockingQueue<Queueable>();
+        this.running = true;
+    }
+
+    @Override
+    public void run() {
+        while(running) {
+            try {
+                queue.take().run();
+            } catch (InterruptedException e) {
+                e.printStackTrace();
+            }
+        }
+    }
+
+    public boolean queue(Queueable task) {
+        return queue.offer(task);
+    }
+
+    public boolean contains(String player) {
+        return queue.contains(new EqualString(player));
+    }
+
+    public void disable() {
+        running = false;
+        // Throw one more Queueable into queue to unblock take()
+        queue.add(new EndThread());
+    }
+
+    private class EqualString {
+        private String player;
+
+        public EqualString(String player) {
+            this.player = player;
+        }
+
+        @Override
+        public boolean equals(Object obj) {
+            if (obj instanceof Queueable) {
+                return ((Queueable)obj).getPlayer().equalsIgnoreCase(player);
+            }
+
+            return false;
+        }
+    }
+
+    private class EndThread implements Queueable {
+        @Override
+        public void run() { }
+
+        @Override
+        public String getPlayer() { return null; }     
+    }
+}