Reimplement Impact event

- Added custom events for Skill Shot and Daze.
- Archery metadata is now stored directly as a location, rather than a
string.
- Fixed bug where arrows weren't properly tracked.
- Use HashMap instead of ArrayList for entity tracking.

Changelog.txt

@@ -7,7 +7,100 @@ Key:
   ! Change
   - Removal
 
-Version 1.4.06-dev
+Version 1.4.08-dev
+ + Added the possibility to gain experience when using Fishing "Shake"
+ + Added config options to disable various sound effects
+ + Smelting now works with custom ores - add smelting XP value to blocks.yml, or it will default to 1/10th of normal XP.
+ + Added automatic cleanup of backups folder.
+ + Added bypass permission for finding Fishing traps
+ = Fixed bug with toggle commands not properly displaying the success message.
+ = Fixed IllegalArgumentException caused by an empty Fishing treasure category
+ = Fixed bug with Salvage not reading the config value for the anvil material.
+ = Fixed exploit where you could receive smelting XP for improper items
+ = Fixed bug where the Unbreaking enchantment was ignored when using "Super Breaker" or "Giga Drill Breaker"
+ = Fixed bug which prevented players from gaining Acrobatics XP when the setting 'Prevent_XP_After_Teleport' was set to false
+ = Fixed McMMOPlayerDisarmEvent reporting the skill level of the defending player, not the attacking player.
+ = Fixed bug where arrow retrieval was not properly detecting entities that already existed in the tracker
+ ! Updated localization files
+
+Version 1.4.07
+ + Added XP boost to Acrobatics when wearing Boots of Feather Falling
+ + Added SQL Database can now recover from a dropped connection without losing data. (Thanks Riking!)
+ + Added more tiers to Fishing, Repair and Smelting!
+ + Added Carrot on a Stick and Flint & Steel to repair.vanilla.yml
+ + Added horses to the "Shake" ability
+ + Added ability to summon horses via "Call of the Wild" using apples
+ + Added XP gain to Taming for horses
+ + Added new permission nodes to allow more control over Taming and "Call of the Wild"
+ + Added new experience.yml config file! Moved all experience related settings from config.yml to experience.yml
+ + Added support for EXPONENTIAL formula curves to experience.yml
+ + Added new /mcconvert command to convert players levels and experience from one formula curve to another.
+ + Added snow to Excavation blocks
+ + Added new experience curve option. Cumulative curve, calculates experience needed for next level using power level.
+ + Added extra settings to config.yml for "Call of the Wild" (Taming)
+ + Added a 5 second cooldown after teleporting before Acrobatics XP can be earned. Plus a config option to disable
+ + Added new API methods to ExperienceAPI to get a players rank on the leaderboards
+ + Added new McMMOPlayerDeathPenaltyEvent, fired when a player dies and would lose levels
+ + Added new McMMOPlayerLevelChangeEvent, fired when a players level changes
+ + Added new McMMOPlayerLevelDownEvent, fired when a player loses levels
+ + Added ability to give custom names to items in treasures.yml - use the key "Custom_Name" to set, expects a string.
+ + Added ability to give lore to items in treasures.yml - use the key "Lore" to set, expects a list of strings.
+ + Added Quartz and Name Tags to the default Excavation treasures
+ + Added a warning message if the server is running NoCheatPlus without CompatNoCheatPlus
+ + Added cooldown to commands with heavy database access to prevent denial of service
+ + Added /mcscoreboard keep, to keep the scoreboard up forever
+ + Added Rainbow Mode to scoreboards
+ + Added new /mccooldowns command to show all ability cooldowns
+ + Commands may now both print text and display a scoreboard
+ + Killing a custom entity will automatically add it to the custom entity config file with default values.
+ = Fixed bug which allowed players to bypass fishing's exploit prevention
+ = Fixed bug where FakeEntityDamageByEntityEvent wasn't being fired
+ = Fixed bug with "Skull Splitter" not finding the locale string
+ = Fixed issue where locale strings could cause the scoreboard header to be longer than 16 characters.
+ = Fixed a bug with "Beast Lore" when the entity had no owner but was tamed.
+ = Fixed a bug where AbilityDeactivateEvent would throw an error if the player logged out before his ability ran out.
+ = Fixed a bug where LevelUpEvent would be called for an offline player.
+ = Fixed a bug where teleport location was never reset if warmup was set to 0 for "Chimaera Wing".
+ = Fixed a bug where the "Dodge" DamageModifier wasn't being read from advanced.yml
+ = Fixed a bug where squid were not awarding XP.
+ = Fixed a bug where Combat XP was granted within 5 seconds for respawned players
+ = Fixed a bug where wrong feedback messages were being send when using a command on an offline player
+ = Fixed a bug where players were able to gain Herbalism XP in mine carts, even though Prevent_AFK_Leveling was enabled
+ = Fixed a bug where players would get hit by fireworks if they leveled up while in a boat
+ ! Changed Fishing "Treasure Hunter" and "Magic Hunter" drop percentages
+ ! Changed format of mod config files. (blocks.yml, tools.yml, armor.yml and entities.yml) **YOU WILL NEED TO UPDATE YOUR FILE TO THE NEW FORMAT**
+ ! Changed format of treasures.yml. **YOU WILL NEED TO UPDATE YOUR FILE TO THE NEW FORMAT**
+ ! Changed format of repair.vanilla.yml. **YOU WILL NEED TO UPDATE YOUR FILE TO THE NEW FORMAT**
+ ! Changed default XP multiplier for repairing shears
+ ! Changed "Shake" drops for Witches. They no longer drop water bottles, since they no longer drop them in Vanilla.
+ ! Changed fishing exploit prevention, by default it will no longer send global sounds, effects and messages.
+ ! Changed Hardcore modes, they will also subtract experience
+ ! Changed various values to double in advanced.yml for the sake of consistency.
+ ! Nerfed Fishing "Master Angler" (removed skill level based bonus) and also made the modifiers configurable
+ ! Nerfed Archery damage to eliminate constant one-hit kills.
+ ! Changed the way Repair hands out XP, also added config options to control Repair XP
+ ! Changed Swords "Counter Attack" ability from passive to active. Blocking is required to activate.
+ ! Hardcore modes can now be toggled for each skill individually
+ ! Vampirism can now be enabled without having Skill Death Penalty enabled
+ ! Admin and Party chat prefixes are now customizable
+ ! Changed the color of party leader names in Party chat
+ ! Improved "Tree Feller" algorithm (Thanks Riking!)
+ ! Improved AFK Acrobatics prevention mechanism
+ ! Improved profile saving
+ ! Improved partial name matcher
+ ! Improved update checker
+ ! Updated localization files
+ ! Party item share category states are now saved when the server shuts down.
+ ! When using "Super Breaker" or "Giga Driller" abilities extra tool durability is used (again)
+ ! Mob healthbars are automatically disabled when the plugin "HealthBar" is found
+ ! Massively improved scoreboard handling
+ ! Reworked scoreboard configuration (config.yml) - **you will need to update**
+ - The /mmoupdate command has been removed. It is replaced by /mcconvert database
+ - Removed Abilities.Tools.Durability_Loss_Enabled, set Abilities.Tools.Durability_Loss to 0 to disable instead.
+ - Removed Skills.Fishing.Shake_UnlockLevel from advanced.yml, now using Skills.Fishing.Rank_Levels.Rank_1 instead.
+ - Removed SpoutPlugin support
+
+Version 1.4.06
  + Added "Ice Fishing" ability to Fishing
  + Added global scoreboards to track skill rankings (display using /mctop)
  + Added per-player scoreboard displays for the /inspect, /mcrank, /mcstats, and /<skillname> commands
@@ -29,6 +122,9 @@ Version 1.4.06-dev
  + Added information about /party itemshare and /party expshare to the party help page
  + Added option to use scoreboards for power level display instead of Spout.
  + Added permission node to prevent inspecting hidden players
+ + Added SQL to Flatfile database conversion
+ + Added ability to use custom database managers and convert to/from them
+ = Fixed bug which could cause the server to hang for a minute when checking for updates. (Thanks to Riking)
  = Fixed bug where spawned arrows could throw ArrayIndexOutOfBoundsException
  = Fixed bug where custom Spout titles were overwritten by mcMMO.
  = Fixed bug where Nether Quartz wasn't included in Smelting or item sharing
@@ -52,6 +148,8 @@ Version 1.4.06-dev
  = Fixed bug where the chance of a successful Gracefull Roll was twice as high as displayed
  = Fixed bug where lucky perks where not working
  = Fixed bug with Ice Fishing on a single block of ice
+ = Fixed bug with Ice Fishing which allowed players to break ice in protected areas
+ = Fixed a small bug with mob healthbars and bosses, such as EnderDragons and Withers
  ! Changed Spout notification tiers to be stored in SpoutConfig instead of AdvancedConfig
  ! Changed Berserk to add items to inventory rather than denying pickup
  ! Changed Call of the Wild, newly summoned pet's will have a custom name. (added permission node to disable this)

README.md

@@ -2,12 +2,10 @@
 ## The RPG lovers mod
 
 ### Dev builds
-Our latest development builds are available [here](http://ci.mcmmo.info).
+Our latest development builds are available ~~[here](http://ci.mcmmo.info)~~. Unfortunately, the mcMMO site is down; a temporary dev build location is hosted [here](http://ci.ecocitycraft.com/job/mcMMO/).
 
 ### 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.
+The goal of mcMMO is to take core Minecraft game mechanics and expand them into add an extensive and quality RPG experience. Everything in mcMMO has been carefully thought out and is constantly being improved upon. Currently, mcMMO adds thirteen unique skills to train and level in. Each of these skills is highly customizable through our configuration files, allowing server admins to tweak mcMMO to best suit the needs of his or her server. Know that the mcMMO team is dedicated to providing an ever-evolving experience, and that we carefully read all feedback and bug reports in order to evaluate and balance the mechanics of mcMMO in every update.
-
-If you want an original RPG experience like no other mod out there, mcMMO is for you.
 
 ## About the Team
 
@@ -31,17 +29,18 @@ mcMMO is currently developed by a team of individuals from all over the world.
 (https://github.com/TfT-02)
 [![t00thpick1](http://www.gravatar.com/avatar/ee23c7794a0c40120c3474287c7bce06.png)]
 (https://github.com/t00thpick1)
+[![riking](https://1.gravatar.com/avatar/aca9f37e569ac3a63929920035a91ba4.png)]
+(https://github.com/riking)
 
 ## 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
+The typical command used to build mcMMO is: `mvn clean package install`
 
 Required Libraries:
-* Spout API
 * JUnit
-* Metrics
+* EMetrics
 * Bukkit
 
 http://dev.bukkit.org/server-mods/mcmmo for more up to date information.

extras/repair.chain.yml

@@ -1,11 +1,11 @@
 #
+#  Repair configuration
+#  Last updated on ${project.version}-b${BUILD_NUMBER}
+#
 # Any file named repair.*.yml in the mcmmmo folder will be loaded as a repair config
 # All repair configs have a main section titled "Repairables"
-# Afterwards, all sub-items are considered a Repairable to be loaded
+# Afterwards, all sub-items are considered a Repairable to be loaded. The names of each subitem should be the exact material name.
-# The bare minimum of a Repairable is that it have an ItemId, a RepairMaterialId, and a MaximumDurability
+# The bare minimum of a Repairable is that it have a RepairMaterial and a MaximumDurability
-#
-# ItemId: This is the id of the item to be repairable.
-## This is required to be set.
 #
 # ItemType: This is the type of item to be repaired, this is only important to permissions.
 ## Valid values are ARMOR, TOOL, and OTHER.
@@ -15,7 +15,7 @@
 ## Valid values are STRING, LEATHER, WOOD, STONE, IRON, GOLD, DIAMOND, and OTHER
 ## This defaults to OTHER.
 #
-# RepairMaterialId: This is the id of the item used to repair this repairable.
+# RepairMaterial: This is the material name of the item used to repair this repairable.
 ## This is required to be set.
 #
 # RepairMaterialMetadata: This is the metadata of the item used to repair this repairable.
@@ -26,7 +26,7 @@
 ## This is required to be set.
 #
 # MinimumLevel: This is the minimum repair level needed to repair this item.
-## Valid values are > 0
+## Valid values are => 0
 ## This defaults to 0
 #
 # MinimumQuantity: This is the minimum number of items needed to repair this item ignoring all other repair bonuses.
@@ -42,32 +42,19 @@
 #
 ###
 Repairables:
-    ChainHelmet:
+    #
-        ItemId: 302
+    # Chainmail repairables
-        ItemType: ARMOR
+    ###
-        RepairMaterialId: 51
+    # Armor
-        MaximumDurability: 165
+    CHAINMAIL_HELMET:
-        MinimumQuantity: 5
+        RepairMaterial: FIRE
         XpMultiplier: 2
-    ChainChest:
+    CHAINMAIL_CHESTPLATE:
-        ItemId: 303
+        RepairMaterial: FIRE
-        ItemType: ARMOR
-        RepairMaterialId: 51
-        MaximumDurability: 240
-        MinimumQuantity: 8
         XpMultiplier: 2
-    ChainLegs:
+    CHAINMAIL_LEGGINGS:
-        ItemId: 304
+        RepairMaterial: FIRE
-        ItemType: ARMOR
-        RepairMaterialId: 51
-        MaximumDurability: 225
-        MinimumQuantity: 7
         XpMultiplier: 2
-    ChainBoots:
+    CHAINMAIL_BOOTS:
-        ItemId: 305
+        RepairMaterial: FIRE
-        ItemType: ARMOR
-        RepairMaterialId: 51
-        RepairMaterialMetadata: -1
-        MaximumDurability: 195
-        MinimumQuantity: 4
         XpMultiplier: 2

pom.xml

@@ -2,7 +2,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>com.gmail.nossr50.mcMMO</groupId>
     <artifactId>mcMMO</artifactId>
-    <version>1.4.06-dev6</version>
+    <version>1.4.08-dev1</version>
     <name>mcMMO</name>
     <url>https://github.com/mcMMO-Dev/mcMMO</url>
     <issueManagement>
@@ -22,38 +22,6 @@
                     <include>.jenkins</include>
                 </includes>
             </resource>
-            <resource>
-                <targetPath>resources</targetPath>
-                <filtering>false</filtering>
-                <directory>${basedir}/src/main/resources/xpbar/</directory>
-                <includes>
-                    <include>xpbar*.png</include>
-                </includes>
-            </resource>
-            <resource>
-                <targetPath>resources</targetPath>
-                <filtering>false</filtering>
-                <directory>${basedir}/src/main/resources/healthbar/</directory>
-                <includes>
-                    <include>health*.png</include>
-                </includes>
-            </resource>
-            <resource>
-                <targetPath>resources</targetPath>
-                <filtering>false</filtering>
-                <directory>${basedir}/src/main/resources/skillicon/</directory>
-                <includes>
-                    <include>*.png</include>
-                </includes>
-            </resource>
-            <resource>
-                <targetPath>resources</targetPath>
-                <filtering>false</filtering>
-                <directory>${basedir}/src/main/resources/sound/</directory>
-                <includes>
-                    <include>*.wav</include>
-                </includes>
-            </resource>
             <resource>
                 <targetPath>com/gmail/nossr50/locale</targetPath>
                 <filtering>true</filtering>
@@ -62,6 +30,14 @@
                     <include>locale*.properties</include>
                 </includes>
             </resource>
+            <resource>
+                <targetPath>mods</targetPath>
+                <filtering>true</filtering>
+                <directory>${basedir}/src/main/resources/mods</directory>
+                <includes>
+                    <include>*.yml</include>
+                </includes>
+            </resource>
         </resources>
         <plugins>
             <plugin>
@@ -132,10 +108,6 @@
             <id>bukkit-repo</id>
             <url>http://repo.bukkit.org/content/groups/public/</url>
         </repository>
-        <repository>
-            <id>spout-repo</id>
-            <url>http://nexus.spout.org/content/groups/public/</url>
-        </repository>
         <repository>
             <id>Plugin MetricsExtension</id>
             <url>http://repo.turt2live.com</url>
@@ -149,13 +121,6 @@
             <type>jar</type>
             <scope>compile</scope>
         </dependency>
-        <dependency>
-            <groupId>org.getspout</groupId>
-            <artifactId>spoutplugin</artifactId>
-            <version>LATEST</version>
-            <type>jar</type>
-            <scope>compile</scope>
-        </dependency>
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit-dep</artifactId>
@@ -165,7 +130,7 @@
         <dependency>
             <groupId>com.turt2live.metrics</groupId>
             <artifactId>MetricsExtension</artifactId>
-            <version>0.0.4-SNAPSHOT</version>
+            <version>0.0.5-SNAPSHOT</version>
         </dependency>
     </dependencies>
     <distributionManagement>
@@ -178,7 +143,7 @@
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     </properties>
     <ciManagement>
-    	<system>Jenkins</system>
+        <system>Jenkins</system>
-    	<url>ci.mcmmo.org</url>
+        <url>http://ci.ecocitycraft.com/job/mcMMO</url>
     </ciManagement>
 </project>

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

@@ -50,34 +50,34 @@ public final class AbilityAPI {
     }
 
     public static void resetCooldowns(Player player) {
-        UserManager.getPlayer(player).getProfile().resetCooldowns();
+        UserManager.getPlayer(player).resetCooldowns();
     }
 
     public static void setBerserkCooldown(Player player, long cooldown) {
-        UserManager.getPlayer(player).getProfile().setSkillDATS(AbilityType.BERSERK, cooldown);
+        UserManager.getPlayer(player).setAbilityDATS(AbilityType.BERSERK, cooldown);
     }
 
     public static void setGigaDrillBreakerCooldown(Player player, long cooldown) {
-        UserManager.getPlayer(player).getProfile().setSkillDATS(AbilityType.GIGA_DRILL_BREAKER, cooldown);
+        UserManager.getPlayer(player).setAbilityDATS(AbilityType.GIGA_DRILL_BREAKER, cooldown);
     }
 
     public static void setGreenTerraCooldown(Player player, long cooldown) {
-        UserManager.getPlayer(player).getProfile().setSkillDATS(AbilityType.GREEN_TERRA, cooldown);
+        UserManager.getPlayer(player).setAbilityDATS(AbilityType.GREEN_TERRA, cooldown);
     }
 
     public static void setSerratedStrikesCooldown(Player player, long cooldown) {
-        UserManager.getPlayer(player).getProfile().setSkillDATS(AbilityType.SERRATED_STRIKES, cooldown);
+        UserManager.getPlayer(player).setAbilityDATS(AbilityType.SERRATED_STRIKES, cooldown);
     }
 
     public static void setSkullSplitterCooldown(Player player, long cooldown) {
-        UserManager.getPlayer(player).getProfile().setSkillDATS(AbilityType.SKULL_SPLITTER, cooldown);
+        UserManager.getPlayer(player).setAbilityDATS(AbilityType.SKULL_SPLITTER, cooldown);
     }
 
     public static void setSuperBreakerCooldown(Player player, long cooldown) {
-        UserManager.getPlayer(player).getProfile().setSkillDATS(AbilityType.SUPER_BREAKER, cooldown);
+        UserManager.getPlayer(player).setAbilityDATS(AbilityType.SUPER_BREAKER, cooldown);
     }
 
     public static void setTreeFellerCooldown(Player player, long cooldown) {
-        UserManager.getPlayer(player).getProfile().setSkillDATS(AbilityType.TREE_FELLER, cooldown);
+        UserManager.getPlayer(player).setAbilityDATS(AbilityType.TREE_FELLER, cooldown);
     }
 }

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

@@ -5,8 +5,8 @@ import org.bukkit.plugin.Plugin;
 
 import com.gmail.nossr50.chat.ChatManager;
 import com.gmail.nossr50.chat.ChatManagerFactory;
-import com.gmail.nossr50.chat.ChatMode;
 import com.gmail.nossr50.chat.PartyChatManager;
+import com.gmail.nossr50.datatypes.chat.ChatMode;
 import com.gmail.nossr50.party.PartyManager;
 import com.gmail.nossr50.util.player.UserManager;
 
@@ -76,7 +76,7 @@ public final class ChatAPI {
      * @return true if the player is using party chat, false otherwise
      */
     public static boolean isUsingPartyChat(Player player) {
-        return UserManager.getPlayer(player).getPartyChatMode();
+        return UserManager.getPlayer(player).isChatEnabled(ChatMode.PARTY);
     }
 
     /**
@@ -86,7 +86,7 @@ public final class ChatAPI {
      * @return true if the player is using party chat, false otherwise
      */
     public static boolean isUsingPartyChat(String playerName) {
-        return UserManager.getPlayer(playerName).getPartyChatMode();
+        return UserManager.getPlayer(playerName).isChatEnabled(ChatMode.PARTY);
     }
 
     /**
@@ -96,7 +96,7 @@ public final class ChatAPI {
      * @return true if the player is using admin chat, false otherwise
      */
     public static boolean isUsingAdminChat(Player player) {
-        return UserManager.getPlayer(player).getAdminChatMode();
+        return UserManager.getPlayer(player).isChatEnabled(ChatMode.ADMIN);
     }
 
     /**
@@ -106,7 +106,7 @@ public final class ChatAPI {
      * @return true if the player is using admin chat, false otherwise
      */
     public static boolean isUsingAdminChat(String playerName) {
-        return UserManager.getPlayer(playerName).getAdminChatMode();
+        return UserManager.getPlayer(playerName).isChatEnabled(ChatMode.ADMIN);
     }
 
     /**
@@ -115,7 +115,7 @@ public final class ChatAPI {
      * @param player The player to toggle party chat on.
      */
     public static void togglePartyChat(Player player) {
-        UserManager.getPlayer(player).togglePartyChat();
+        UserManager.getPlayer(player).toggleChat(ChatMode.PARTY);
     }
 
     /**
@@ -124,7 +124,7 @@ public final class ChatAPI {
      * @param playerName The name of the player to toggle party chat on.
      */
     public static void togglePartyChat(String playerName) {
-        UserManager.getPlayer(playerName).togglePartyChat();
+        UserManager.getPlayer(playerName).toggleChat(ChatMode.PARTY);
     }
 
     /**
@@ -133,7 +133,7 @@ public final class ChatAPI {
      * @param player The player to toggle admin chat on.
      */
     public static void toggleAdminChat(Player player) {
-        UserManager.getPlayer(player).toggleAdminChat();
+        UserManager.getPlayer(player).toggleChat(ChatMode.ADMIN);
     }
 
     /**
@@ -142,7 +142,7 @@ public final class ChatAPI {
      * @param playerName The name of the player to toggle party chat on.
      */
     public static void toggleAdminChat(String playerName) {
-        UserManager.getPlayer(playerName).toggleAdminChat();
+        UserManager.getPlayer(playerName).toggleChat(ChatMode.ADMIN);
     }
 
     private static ChatManager getPartyChatManager(Plugin plugin, String party) {

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

@@ -4,9 +4,11 @@ import java.util.Set;
 
 import org.bukkit.entity.Player;
 
+import com.gmail.nossr50.mcMMO;
 import com.gmail.nossr50.api.exceptions.InvalidPlayerException;
 import com.gmail.nossr50.api.exceptions.InvalidSkillException;
 import com.gmail.nossr50.config.Config;
+import com.gmail.nossr50.config.experience.ExperienceConfig;
 import com.gmail.nossr50.datatypes.player.PlayerProfile;
 import com.gmail.nossr50.datatypes.skills.SkillType;
 import com.gmail.nossr50.skills.child.FamilyTree;
@@ -46,6 +48,11 @@ public final class ExperienceAPI {
         return !skill.isChildSkill();
     }
 
+    @Deprecated
+    public static void addRawXP(Player player, String skillType, int XP) {
+        addRawXP(player, skillType, (float) XP);
+    }
+
     /**
      * Adds raw XP to the player.
      * </br>
@@ -57,10 +64,15 @@ public final class ExperienceAPI {
      *
      * @throws InvalidSkillException if the given skill is not valid
      */
-    public static void addRawXP(Player player, String skillType, int XP) {
+    public static void addRawXP(Player player, String skillType, float XP) {
         UserManager.getPlayer(player).applyXpGain(getSkillType(skillType), XP);
     }
 
+    @Deprecated
+    public static void addRawXPOffline(String playerName, String skillType, int XP) {
+        addRawXPOffline(playerName, skillType, (float) XP);
+    }
+
     /**
      * Adds raw XP to an offline player.
      * </br>
@@ -73,8 +85,8 @@ public final class ExperienceAPI {
      * @throws InvalidSkillException if the given skill is not valid
      * @throws InvalidPlayerException if the given player does not exist in the database
      */
-    public static void addRawXPOffline(String playerName, String skillType, int XP) {
+    public static void addRawXPOffline(String playerName, String skillType, float XP) {
-        addOfflineXP(playerName, getSkillType(skillType), XP);
+        addOfflineXP(playerName, getSkillType(skillType), (int) Math.floor(XP));
     }
 
     /**
@@ -89,7 +101,7 @@ public final class ExperienceAPI {
      * @throws InvalidSkillException if the given skill is not valid
      */
     public static void addMultipliedXP(Player player, String skillType, int XP) {
-        UserManager.getPlayer(player).applyXpGain(getSkillType(skillType), (int) (XP * Config.getInstance().getExperienceGainsGlobalMultiplier()));
+        UserManager.getPlayer(player).applyXpGain(getSkillType(skillType), (int) (XP * ExperienceConfig.getInstance().getExperienceGainsGlobalMultiplier()));
     }
 
     /**
@@ -105,7 +117,7 @@ public final class ExperienceAPI {
      * @throws InvalidPlayerException if the given player does not exist in the database
      */
     public static void addMultipliedXPOffline(String playerName, String skillType, int XP) {
-        addOfflineXP(playerName, getSkillType(skillType), (int) (XP * Config.getInstance().getExperienceGainsGlobalMultiplier()));
+        addOfflineXP(playerName, getSkillType(skillType), (int) (XP * ExperienceConfig.getInstance().getExperienceGainsGlobalMultiplier()));
     }
 
     /**
@@ -122,7 +134,7 @@ public final class ExperienceAPI {
     public static void addModifiedXP(Player player, String skillType, int XP) {
         SkillType skill = getSkillType(skillType);
 
-        UserManager.getPlayer(player).applyXpGain(skill, (int) (XP / skill.getXpModifier() * Config.getInstance().getExperienceGainsGlobalMultiplier()));
+        UserManager.getPlayer(player).applyXpGain(skill, (int) (XP / skill.getXpModifier() * ExperienceConfig.getInstance().getExperienceGainsGlobalMultiplier()));
     }
 
     /**
@@ -140,7 +152,7 @@ public final class ExperienceAPI {
     public static void addModifiedXPOffline(String playerName, String skillType, int XP) {
         SkillType skill = getSkillType(skillType);
 
-        addOfflineXP(playerName, skill, (int) (XP / skill.getXpModifier() * Config.getInstance().getExperienceGainsGlobalMultiplier()));
+        addOfflineXP(playerName, skill, (int) (XP / skill.getXpModifier() * ExperienceConfig.getInstance().getExperienceGainsGlobalMultiplier()));
     }
 
     /**
@@ -172,7 +184,7 @@ public final class ExperienceAPI {
      * @throws UnsupportedOperationException if the given skill is a child skill
      */
     public static int getXP(Player player, String skillType) {
-        return UserManager.getPlayer(player).getProfile().getSkillXpLevel(getNonChildSkillType(skillType));
+        return UserManager.getPlayer(player).getSkillXpLevel(getNonChildSkillType(skillType));
     }
 
     /**
@@ -205,7 +217,7 @@ public final class ExperienceAPI {
      * @throws UnsupportedOperationException if the given skill is a child skill
      */
     public static float getXPRaw(Player player, String skillType) {
-        return UserManager.getPlayer(player).getProfile().getSkillXpLevelRaw(getNonChildSkillType(skillType));
+        return UserManager.getPlayer(player).getSkillXpLevelRaw(getNonChildSkillType(skillType));
     }
 
     /**
@@ -238,7 +250,7 @@ public final class ExperienceAPI {
      * @throws UnsupportedOperationException if the given skill is a child skill
      */
     public static int getXPToNextLevel(Player player, String skillType) {
-        return UserManager.getPlayer(player).getProfile().getXpToLevel(getNonChildSkillType(skillType));
+        return UserManager.getPlayer(player).getXpToLevel(getNonChildSkillType(skillType));
     }
 
     /**
@@ -311,7 +323,7 @@ public final class ExperienceAPI {
      * @throws InvalidSkillException if the given skill is not valid
      */
     public static void addLevel(Player player, String skillType, int levels) {
-        UserManager.getPlayer(player).getProfile().addLevels(getSkillType(skillType), levels);
+        UserManager.getPlayer(player).addLevels(getSkillType(skillType), levels);
     }
 
     /**
@@ -357,7 +369,7 @@ public final class ExperienceAPI {
      * @throws InvalidSkillException if the given skill is not valid
      */
     public static int getLevel(Player player, String skillType) {
-        return UserManager.getPlayer(player).getProfile().getSkillLevel(getSkillType(skillType));
+        return UserManager.getPlayer(player).getSkillLevel(getSkillType(skillType));
     }
 
     /**
@@ -402,7 +414,7 @@ public final class ExperienceAPI {
         int powerLevel = 0;
         PlayerProfile profile = getOfflineProfile(playerName);
 
-        for (SkillType type : SkillType.nonChildSkills()) {
+        for (SkillType type : SkillType.NON_CHILD_SKILLS) {
             powerLevel += profile.getSkillLevel(type);
         }
 
@@ -434,6 +446,40 @@ public final class ExperienceAPI {
         return Config.getInstance().getPowerLevelCap();
     }
 
+    /**
+     * Get the position on the leaderboard of a player.
+     * </br>
+     * This function is designed for API usage.
+     *
+     * @param playerName The name of the player to check
+     * @param skillType The skill to check
+     *
+     * @throws InvalidSkillException if the given skill is not valid
+     * @throws InvalidPlayerException if the given player does not exist in the database
+     * @throws UnsupportedOperationException if the given skill is a child skill
+     *
+     * @return the position on the leaderboard
+     */
+    public static int getPlayerRankSkill(String playerName, String skillType) {
+        return mcMMO.getDatabaseManager().readRank(getOfflineProfile(playerName).getPlayerName()).get(getNonChildSkillType(skillType));
+    }
+
+
+    /**
+     * Get the position on the power level leaderboard of a player.
+     * </br>
+     * This function is designed for API usage.
+     *
+     * @param playerName The name of the player to check
+     *
+     * @throws InvalidPlayerException if the given player does not exist in the database
+     *
+     * @return the position on the power level leaderboard
+     */
+    public static int getPlayerRankOverall(String playerName) {
+        return mcMMO.getDatabaseManager().readRank(getOfflineProfile(playerName).getPlayerName()).get(null);
+    }
+
     /**
      * Sets the level of a player in a specific skill type.
      * </br>
@@ -446,7 +492,7 @@ public final class ExperienceAPI {
      * @throws InvalidSkillException if the given skill is not valid
      */
     public static void setLevel(Player player, String skillType, int skillLevel) {
-        UserManager.getPlayer(player).getProfile().modifySkill(getSkillType(skillType), skillLevel);
+        UserManager.getPlayer(player).modifySkill(getSkillType(skillType), skillLevel);
     }
 
     /**
@@ -478,7 +524,7 @@ public final class ExperienceAPI {
      * @throws UnsupportedOperationException if the given skill is a child skill
      */
     public static void setXP(Player player, String skillType, int newValue) {
-        UserManager.getPlayer(player).getProfile().setSkillXpLevel(getNonChildSkillType(skillType), newValue);
+        UserManager.getPlayer(player).setSkillXpLevel(getNonChildSkillType(skillType), newValue);
     }
 
     /**
@@ -511,7 +557,7 @@ public final class ExperienceAPI {
      * @throws UnsupportedOperationException if the given skill is a child skill
      */
     public static void removeXP(Player player, String skillType, int xp) {
-        UserManager.getPlayer(player).getProfile().removeXp(getNonChildSkillType(skillType), xp);
+        UserManager.getPlayer(player).removeXp(getNonChildSkillType(skillType), xp);
     }
 
     /**
@@ -536,23 +582,12 @@ public final class ExperienceAPI {
     private static void addOfflineXP(String playerName, SkillType skill, int XP) {
         PlayerProfile profile = getOfflineProfile(playerName);
 
-        if (skill.isChildSkill()) {
+        profile.addXp(skill, XP);
-            Set<SkillType> parentSkills = FamilyTree.getParents(skill);
-
-            for (SkillType parentSkill : parentSkills) {
-                profile.setSkillXpLevel(parentSkill, profile.getSkillLevel(parentSkill) + (XP / parentSkills.size()));
-            }
-
-            profile.save();
-            return;
-        }
-
-        profile.setSkillXpLevel(skill, profile.getSkillXpLevel(skill) + XP);
         profile.save();
     }
 
     private static PlayerProfile getOfflineProfile(String playerName) {
-        PlayerProfile profile = new PlayerProfile(playerName, false);
+        PlayerProfile profile = mcMMO.getDatabaseManager().loadPlayerProfile(playerName, false);
 
         if (!profile.isLoaded()) {
             throw new InvalidPlayerException();

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

@@ -77,13 +77,12 @@ 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(playerName, partyName);
+            party = new Party(player.getName(), partyName);
         }
 
-        PartyManager.addToParty(playerName, UserManager.getPlayer(player), party);
+        PartyManager.addToParty(UserManager.getPlayer(player), party);
     }
 
     /**
@@ -94,7 +93,7 @@ public final class PartyAPI {
      * @param player The player to remove
      */
     public static void removeFromParty(Player player) {
-        PartyManager.removeFromParty(player, UserManager.getPlayer(player).getParty());
+        PartyManager.removeFromParty(UserManager.getPlayer(player));
     }
 
     /**

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

@@ -1,29 +0,0 @@
-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

@@ -1,53 +0,0 @@
-package com.gmail.nossr50.api;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.bukkit.inventory.ItemStack;
-
-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> 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> spoutShovels  = new ArrayList<ItemStack>();
-
-    private SpoutToolsAPI() {}
-
-    /**
-     * Add a custom Spout tool to mcMMO for XP gain & ability use.
-     * </br>
-     * This function is designed for API usage.
-     *
-     * @param spoutTool The tool to add
-     * @param type The type of tool to add
-     */
-    public static void addCustomTool(ItemStack spoutTool, ToolType type) {
-        switch (type) {
-            case AXE:
-                spoutAxes.add(spoutTool);
-                break;
-
-            case HOE:
-                spoutHoes.add(spoutTool);
-                break;
-
-            case PICKAXE:
-                spoutPickaxes.add(spoutTool);
-                break;
-
-            case SHOVEL:
-                spoutShovels.add(spoutTool);
-                break;
-
-            case SWORD:
-                spoutSwords.add(spoutTool);
-                break;
-
-            default:
-                break;
-        }
-    }
-}

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

@@ -7,7 +7,7 @@ import com.gmail.nossr50.events.chat.McMMOAdminChatEvent;
 
 public class AdminChatManager extends ChatManager {
     protected AdminChatManager(Plugin plugin) {
-        super(plugin, Config.getInstance().getAdminDisplayNames(), "Commands.AdminChat.Prefix");
+        super(plugin, Config.getInstance().getAdminDisplayNames(), Config.getInstance().getAdminChatPrefix());
     }
 
     @Override

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

@@ -11,6 +11,7 @@ public abstract class ChatManager {
     protected boolean useDisplayNames;
     protected String chatPrefix;
 
+    protected String senderName;
     protected String displayName;
     protected String message;
 
@@ -27,8 +28,9 @@ public abstract class ChatManager {
             return;
         }
 
-        displayName = useDisplayNames ? event.getDisplayName() : event.getSender();
+        senderName = event.getSender();
-        message = LocaleLoader.getString(chatPrefix, displayName) + event.getMessage();
+        displayName = useDisplayNames ? event.getDisplayName() : senderName;
+        message = LocaleLoader.formatString(chatPrefix, displayName) + " " + event.getMessage();
 
         sendMessage();
     }

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

@@ -4,6 +4,8 @@ import java.util.HashMap;
 
 import org.bukkit.plugin.Plugin;
 
+import com.gmail.nossr50.datatypes.chat.ChatMode;
+
 public class ChatManagerFactory {
     private static final HashMap<Plugin, AdminChatManager> adminChatManagers = new HashMap<Plugin, AdminChatManager>();
     private static final HashMap<Plugin, PartyChatManager> partyChatManagers = new HashMap<Plugin, PartyChatManager>();

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

@@ -1,70 +0,0 @@
-package com.gmail.nossr50.chat;
-
-import com.gmail.nossr50.datatypes.player.McMMOPlayer;
-import com.gmail.nossr50.locale.LocaleLoader;
-
-public enum ChatMode {
-    ADMIN(LocaleLoader.getString("Commands.AdminChat.On"), LocaleLoader.getString("Commands.AdminChat.Off")),
-    PARTY(LocaleLoader.getString("Commands.Party.Chat.On"), LocaleLoader.getString("Commands.Party.Chat.Off"));
-
-    private String enabledMessage;
-    private String disabledMessage;
-
-    private ChatMode(String enabledMessage, String disabledMessage) {
-        this.enabledMessage  = enabledMessage;
-        this.disabledMessage = disabledMessage;
-    }
-
-    public boolean isEnabled(McMMOPlayer mcMMOPlayer) {
-        switch (this) {
-            case ADMIN:
-                return mcMMOPlayer.getAdminChatMode();
-
-            case PARTY:
-                return mcMMOPlayer.getPartyChatMode();
-
-            default:
-                return false;
-        }
-    }
-
-    public void disable(McMMOPlayer mcMMOPlayer) {
-        switch (this) {
-            case ADMIN:
-                mcMMOPlayer.setAdminChat(false);
-                return;
-
-            case PARTY:
-                mcMMOPlayer.setPartyChat(false);
-                return;
-
-            default:
-                return;
-        }
-    }
-
-    public void enable(McMMOPlayer mcMMOPlayer) {
-        switch (this) {
-            case ADMIN:
-                mcMMOPlayer.setAdminChat(true);
-                mcMMOPlayer.setPartyChat(false);
-                return;
-
-            case PARTY:
-                mcMMOPlayer.setPartyChat(true);
-                mcMMOPlayer.setAdminChat(false);
-                return;
-
-            default:
-                return;
-        }
-    }
-
-    public String getEnabledMessage() {
-        return enabledMessage;
-    }
-
-    public String getDisabledMessage() {
-        return disabledMessage;
-    }
-}

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

@@ -1,5 +1,6 @@
 package com.gmail.nossr50.chat;
 
+import org.bukkit.ChatColor;
 import org.bukkit.entity.Player;
 import org.bukkit.plugin.Plugin;
 
@@ -11,7 +12,7 @@ public class PartyChatManager extends ChatManager {
     private Party party;
 
     protected PartyChatManager(Plugin plugin) {
-        super(plugin, Config.getInstance().getPartyDisplayNames(), "Commands.Party.Chat.Prefix");
+        super(plugin, Config.getInstance().getPartyDisplayNames(), Config.getInstance().getPartyChatPrefix());
     }
 
     public void setParty(Party party) {
@@ -25,6 +26,10 @@ public class PartyChatManager extends ChatManager {
 
     @Override
     protected void sendMessage() {
+        if (Config.getInstance().getPartyChatColorLeaderName() && senderName.equalsIgnoreCase(party.getLeader())) {
+            message = message.replaceFirst(displayName, ChatColor.GOLD + displayName + ChatColor.RESET);
+        }
+
         for (Player member : party.getOnlineMembers()) {
             member.sendMessage(message);
         }

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

@@ -7,13 +7,14 @@ import java.util.Set;
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandSender;
 import org.bukkit.command.TabExecutor;
-import org.bukkit.entity.Player;
 import org.bukkit.util.StringUtil;
 
 import com.gmail.nossr50.datatypes.player.McMMOPlayer;
+import com.gmail.nossr50.util.Misc;
 import com.gmail.nossr50.util.Permissions;
 import com.gmail.nossr50.util.commands.CommandUtils;
 import com.gmail.nossr50.util.player.UserManager;
+
 import com.google.common.collect.ImmutableList;
 
 public class KrakenCommand implements TabExecutor {
@@ -30,7 +31,7 @@ public class KrakenCommand implements TabExecutor {
                     return true;
                 }
 
-                UserManager.getPlayer((Player) sender).getFishingManager().unleashTheKraken();
+                UserManager.getPlayer(sender.getName()).getFishingManager().unleashTheKraken();
                 return true;
 
             case 1:
@@ -39,9 +40,10 @@ public class KrakenCommand implements TabExecutor {
                     return true;
                 }
 
-                McMMOPlayer mcMMOPlayer = UserManager.getPlayer(args[0]);
+                String playerName = Misc.getMatchedPlayerName(args[0]);
+                McMMOPlayer mcMMOPlayer = UserManager.getPlayer(playerName);
 
-                if (!CommandUtils.checkPlayerExistence(sender, args[0], mcMMOPlayer)) {
+                if (!CommandUtils.checkPlayerExistence(sender, playerName, mcMMOPlayer)) {
                     return true;
                 }
 
@@ -57,7 +59,7 @@ public class KrakenCommand implements TabExecutor {
     public List<String> onTabComplete(CommandSender sender, Command command, String alias, String[] args) {
         switch (args.length) {
             case 1:
-                Set<String> playerNames = UserManager.getPlayers().keySet();
+                Set<String> playerNames = UserManager.getPlayerNames();
                 return StringUtil.copyPartialMatches(args[0], playerNames, new ArrayList<String>(playerNames.size()));
             default:
                 return ImmutableList.of();

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

@@ -2,6 +2,7 @@ package com.gmail.nossr50.commands;
 
 import org.bukkit.command.CommandSender;
 
+import com.gmail.nossr50.datatypes.player.McMMOPlayer;
 import com.gmail.nossr50.locale.LocaleLoader;
 import com.gmail.nossr50.util.Permissions;
 
@@ -17,13 +18,13 @@ public class McabilityCommand extends ToggleCommand {
     }
 
     @Override
-    protected void applyCommandAction() {
+    protected void applyCommandAction(McMMOPlayer mcMMOPlayer) {
-        player.sendMessage(LocaleLoader.getString("Commands.Ability." + (mcMMOPlayer.getAbilityUse() ? "Off" : "On")));
+        mcMMOPlayer.getPlayer().sendMessage(LocaleLoader.getString("Commands.Ability." + (mcMMOPlayer.getAbilityUse() ? "Off" : "On")));
         mcMMOPlayer.toggleAbilityUse();
     }
 
     @Override
-    protected void sendSuccessMessage(CommandSender sender) {
+    protected void sendSuccessMessage(CommandSender sender, String playerName) {
-        sender.sendMessage("Ability use has been toggled for " + player.getName()); // TODO: Localize
+        sender.sendMessage(LocaleLoader.getString("Commands.Ability.Toggle", playerName));
     }
 }

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

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

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

@@ -2,6 +2,7 @@ package com.gmail.nossr50.commands;
 
 import org.bukkit.command.CommandSender;
 
+import com.gmail.nossr50.datatypes.player.McMMOPlayer;
 import com.gmail.nossr50.locale.LocaleLoader;
 import com.gmail.nossr50.util.Permissions;
 
@@ -17,13 +18,13 @@ public class McgodCommand extends ToggleCommand {
     }
 
     @Override
-    protected void applyCommandAction() {
+    protected void applyCommandAction(McMMOPlayer mcMMOPlayer) {
-        player.sendMessage(LocaleLoader.getString("Commands.GodMode." + (mcMMOPlayer.getGodMode() ? "Disabled" : "Enabled")));
+        mcMMOPlayer.getPlayer().sendMessage(LocaleLoader.getString("Commands.GodMode." + (mcMMOPlayer.getGodMode() ? "Disabled" : "Enabled")));
         mcMMOPlayer.toggleGodMode();
     }
 
     @Override
-    protected void sendSuccessMessage(CommandSender sender) {
+    protected void sendSuccessMessage(CommandSender sender, String playerName) {
-        sender.sendMessage("God mode has been toggled for " + player.getName()); // TODO: Localize
+        sender.sendMessage(LocaleLoader.getString("Commands.GodMode.Toggle", playerName));
     }
 }

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

@@ -4,14 +4,13 @@ import org.bukkit.ChatColor;
 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.commands.party.PartySubcommandType;
 import com.gmail.nossr50.config.Config;
 import com.gmail.nossr50.locale.LocaleLoader;
+import com.gmail.nossr50.util.HolidayManager;
 import com.gmail.nossr50.util.Permissions;
-import com.gmail.nossr50.util.spout.SpoutUtils;
 
 public class McmmoCommand implements CommandExecutor {
     @Override
@@ -28,16 +27,12 @@ public class McmmoCommand implements CommandExecutor {
                 sender.sendMessage(mcSplit);
 
                 if (Config.getInstance().getDonateMessageEnabled()) {
-                    if (mcMMO.isSpoutEnabled() && sender instanceof Player) {
+                    sender.sendMessage(LocaleLoader.getString("MOTD.Donate"));
-                        SpoutUtils.sendDonationNotification((Player) sender);
+                    sender.sendMessage(ChatColor.GOLD + " - " + ChatColor.GREEN + "gjmcferrin@gmail.com" + ChatColor.GOLD + " Paypal");
-                    }
-                    else {
-                        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()));
+                HolidayManager.anniversaryCheck(sender);
                 return true;
 
             case 1:

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

@@ -2,6 +2,7 @@ package com.gmail.nossr50.commands;
 
 import org.bukkit.command.CommandSender;
 
+import com.gmail.nossr50.datatypes.player.McMMOPlayer;
 import com.gmail.nossr50.locale.LocaleLoader;
 import com.gmail.nossr50.util.Permissions;
 
@@ -17,17 +18,17 @@ public class McrefreshCommand extends ToggleCommand {
     }
 
     @Override
-    protected void applyCommandAction() {
+    protected void applyCommandAction(McMMOPlayer mcMMOPlayer) {
         mcMMOPlayer.setRecentlyHurt(0);
-        mcMMOPlayer.getProfile().resetCooldowns();
+        mcMMOPlayer.resetCooldowns();
         mcMMOPlayer.resetToolPrepMode();
         mcMMOPlayer.resetAbilityMode();
 
-        player.sendMessage(LocaleLoader.getString("Ability.Generic.Refresh"));
+        mcMMOPlayer.getPlayer().sendMessage(LocaleLoader.getString("Ability.Generic.Refresh"));
     }
 
     @Override
-    protected void sendSuccessMessage(CommandSender sender) {
+    protected void sendSuccessMessage(CommandSender sender, String playerName) {
-        sender.sendMessage(LocaleLoader.getString("Commands.mcrefresh.Success", player.getName()));
+        sender.sendMessage(LocaleLoader.getString("Commands.mcrefresh.Success", playerName));
     }
 }

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

@@ -6,20 +6,17 @@ import java.util.List;
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandSender;
 import org.bukkit.command.TabExecutor;
-import org.bukkit.entity.Player;
 import org.bukkit.util.StringUtil;
 
-import com.gmail.nossr50.mcMMO;
 import com.gmail.nossr50.config.Config;
-import com.gmail.nossr50.datatypes.skills.SkillType;
+import com.gmail.nossr50.locale.LocaleLoader;
-import com.gmail.nossr50.util.StringUtils;
 import com.gmail.nossr50.util.commands.CommandUtils;
-import com.gmail.nossr50.util.player.UserManager;
 import com.gmail.nossr50.util.scoreboards.ScoreboardManager;
+
 import com.google.common.collect.ImmutableList;
 
 public class McscoreboardCommand implements TabExecutor {
-    private static final List<String> SCOREBOARD_TYPES = ImmutableList.of("clear", "rank", "stats", "top");
+    private static final List<String> FIRST_ARGS = ImmutableList.of("keep", "time", "clear");
 
     @Override
     public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
@@ -27,94 +24,49 @@ public class McscoreboardCommand implements TabExecutor {
             return true;
         }
 
-        Player player = (Player) sender;
-
         switch (args.length) {
-            case 0:
-                clearScoreboard(player);
-                return true;
-
             case 1:
-                if (args[0].equalsIgnoreCase("clear")) {
+                if (args[0].equalsIgnoreCase("clear") || args[0].equalsIgnoreCase("reset")) {
-                    clearScoreboard(player);
+                    ScoreboardManager.clearBoard(sender.getName());
+                    sender.sendMessage(LocaleLoader.getString("Commands.Scoreboard.Clear"));
+                    return true;
                 }
-                else if (args[0].equalsIgnoreCase("rank")) {
+
-                    if (!Config.getInstance().getMcrankScoreboardEnabled()) {
+                if (args[0].equalsIgnoreCase("keep")) {
-                        sender.sendMessage("This scoreboard is not enabled."); //TODO: Localize
+                    if (!Config.getInstance().getAllowKeepBoard()) {
+                        sender.sendMessage(LocaleLoader.getString("Commands.Disabled"));
                         return true;
                     }
 
-                    ScoreboardManager.setupPlayerScoreboard(player.getName());
+                    if (!ScoreboardManager.isBoardShown(sender.getName())) {
-                    ScoreboardManager.enablePlayerRankScoreboard(player);
+                        sender.sendMessage(LocaleLoader.getString("Commands.Scoreboard.NoBoard"));
-                }
-                else if (args[0].equalsIgnoreCase("stats")) {
-                    if (!Config.getInstance().getMcstatsScoreboardsEnabled()) {
-                        sender.sendMessage("This scoreboard is not enabled."); //TODO: Localize
                         return true;
                     }
 
-                    ScoreboardManager.setupPlayerScoreboard(player.getName());
+                    ScoreboardManager.keepBoard(sender.getName());
-                    ScoreboardManager.enablePlayerStatsScoreboard(UserManager.getPlayer(player));
+                    sender.sendMessage(LocaleLoader.getString("Commands.Scoreboard.Keep"));
-                }
+                    return true;
-                else if (args[0].equalsIgnoreCase("top")) {
-                    if (!Config.getInstance().getMctopScoreboardEnabled()) {
-                        sender.sendMessage("This scoreboard is not enabled."); //TODO: Localize
-                        return true;
-                    }
-
-                    ScoreboardManager.enableGlobalStatsScoreboard(player, "all", 1);
-                }
-                else {
-                    return false;
                 }
 
-                return true;
+                return help(sender);
 
             case 2:
-                if (!args[0].equalsIgnoreCase("top")) {
+                if (args[0].equalsIgnoreCase("time") || args[0].equalsIgnoreCase("timer")) {
-                    return false;
+                    if (CommandUtils.isInvalidInteger(sender, args[1])) {
-                }
+                        return true;
+                    }
 
-                if (!Config.getInstance().getMctopScoreboardEnabled()) {
+                    int time = Math.abs(Integer.parseInt(args[1]));
-                    sender.sendMessage("This scoreboard is not enabled."); //TODO: Localize
+
+                    ScoreboardManager.setRevertTimer(sender.getName(), time);
+                    sender.sendMessage(LocaleLoader.getString("Commands.Scoreboard.Timer", time));
                     return true;
                 }
 
-                if (StringUtils.isInt(args[1])) {
+                return help(sender);
-                    ScoreboardManager.enableGlobalStatsScoreboard(player, "all", Math.abs(Integer.parseInt(args[1])));
-                    return true;
-                }
-
-                if (CommandUtils.isInvalidSkill(sender, args[1])) {
-                    return true;
-                }
-
-                ScoreboardManager.enableGlobalStatsScoreboard(player, args[1], 1);
-                return true;
-
-            case 3:
-                if (!args[0].equalsIgnoreCase("top")) {
-                    return false;
-                }
-
-                if (!Config.getInstance().getMctopScoreboardEnabled()) {
-                    sender.sendMessage("This scoreboard is not enabled."); //TODO: Localize
-                    return true;
-                }
-
-                if (CommandUtils.isInvalidSkill(sender, args[1])) {
-                    return true;
-                }
-
-                if (CommandUtils.isInvalidInteger(sender, args[2])) {
-                    return true;
-                }
-
-                ScoreboardManager.enableGlobalStatsScoreboard(player, args[1], Math.abs(Integer.parseInt(args[2])));
-                return true;
 
             default:
-                return false;
+                return help(sender);
         }
     }
 
@@ -122,20 +74,17 @@ public class McscoreboardCommand implements TabExecutor {
     public List<String> onTabComplete(CommandSender sender, Command command, String alias, String[] args) {
         switch (args.length) {
             case 1:
-                return StringUtil.copyPartialMatches(args[0], SCOREBOARD_TYPES, new ArrayList<String>(SCOREBOARD_TYPES.size()));
+                return StringUtil.copyPartialMatches(args[0], FIRST_ARGS, new ArrayList<String>(FIRST_ARGS.size()));
-            case 2:
-                if (args[0].equalsIgnoreCase("top")) {
-                    return StringUtil.copyPartialMatches(args[1], SkillType.SKILL_NAMES, new ArrayList<String>(SkillType.SKILL_NAMES.size()));
-                }
-                // Fallthrough
-
             default:
                 return ImmutableList.of();
         }
     }
 
-    private void clearScoreboard(Player player) {
+    private boolean help(CommandSender sender) {
-        player.setScoreboard(mcMMO.p.getServer().getScoreboardManager().getMainScoreboard());
+        sender.sendMessage(LocaleLoader.getString("Commands.Scoreboard.Help.0"));
-        player.sendMessage("Your scoreboard has been cleared!"); //TODO: Locale
+        sender.sendMessage(LocaleLoader.getString("Commands.Scoreboard.Help.1"));
+        sender.sendMessage(LocaleLoader.getString("Commands.Scoreboard.Help.2"));
+        sender.sendMessage(LocaleLoader.getString("Commands.Scoreboard.Help.3"));
+        return true;
     }
 }

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

@@ -11,7 +11,7 @@ import org.bukkit.entity.Player;
 import org.bukkit.util.StringUtil;
 
 import com.gmail.nossr50.datatypes.MobHealthbarType;
-import com.gmail.nossr50.datatypes.player.PlayerProfile;
+import com.gmail.nossr50.locale.LocaleLoader;
 import com.gmail.nossr50.util.commands.CommandUtils;
 import com.gmail.nossr50.util.player.UserManager;
 
@@ -39,16 +39,14 @@ public class MobhealthCommand implements TabExecutor {
 
         switch (args.length) {
             case 1:
-                PlayerProfile playerProfile = UserManager.getPlayer((Player) sender).getProfile();
-
                 try {
                     MobHealthbarType type = MobHealthbarType.valueOf(args[0].toUpperCase().trim());
-                    playerProfile.setMobHealthbarType(type);
+                    UserManager.getPlayer((Player) sender).getProfile().setMobHealthbarType(type);
-                    sender.sendMessage("Display type changed to: " + type); //TODO: Localize
+                    sender.sendMessage(LocaleLoader.getString("Commands.Healthbars.Changed." + type.name()));
                     return true;
                 }
                 catch (IllegalArgumentException ex) {
-                    sender.sendMessage("Invalid type!"); //TODO: Localize
+                    sender.sendMessage(LocaleLoader.getString("Commands.Healthbars.Invalid"));
                     return true;
                 }
 

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

@@ -7,19 +7,16 @@ import java.util.Set;
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandSender;
 import org.bukkit.command.TabExecutor;
-import org.bukkit.entity.Player;
 import org.bukkit.util.StringUtil;
 
 import com.gmail.nossr50.datatypes.player.McMMOPlayer;
+import com.gmail.nossr50.util.Misc;
 import com.gmail.nossr50.util.commands.CommandUtils;
 import com.gmail.nossr50.util.player.UserManager;
 
 import com.google.common.collect.ImmutableList;
 
 public abstract class ToggleCommand implements TabExecutor {
-    protected McMMOPlayer mcMMOPlayer;
-    protected Player player;
-
     @Override
     public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
         switch (args.length) {
@@ -33,10 +30,7 @@ public abstract class ToggleCommand implements TabExecutor {
                     return true;
                 }
 
-                player = (Player) sender;
+                applyCommandAction(UserManager.getPlayer(sender.getName()));
-                mcMMOPlayer = UserManager.getPlayer(player);
-
-                applyCommandAction();
                 return true;
 
             case 1:
@@ -45,20 +39,19 @@ public abstract class ToggleCommand implements TabExecutor {
                     return true;
                 }
 
-                mcMMOPlayer = UserManager.getPlayer(args[0]);
+                String playerName = Misc.getMatchedPlayerName(args[0]);
+                McMMOPlayer mcMMOPlayer = UserManager.getPlayer(playerName);
 
-                if (!CommandUtils.checkPlayerExistence(sender, args[0], mcMMOPlayer)) {
+                if (!CommandUtils.checkPlayerExistence(sender, playerName, mcMMOPlayer)) {
                     return true;
                 }
 
-                player = mcMMOPlayer.getPlayer();
+                if (CommandUtils.isOffline(sender, mcMMOPlayer.getPlayer())) {
-
-                if (CommandUtils.isOffline(sender, player)) {
                     return true;
                 }
 
-                applyCommandAction();
+                applyCommandAction(mcMMOPlayer);
-                sendSuccessMessage(sender);
+                sendSuccessMessage(sender, playerName);
                 return true;
 
             default:
@@ -70,7 +63,7 @@ public abstract class ToggleCommand implements TabExecutor {
     public List<String> onTabComplete(CommandSender sender, Command command, String alias, String[] args) {
         switch (args.length) {
             case 1:
-                Set<String> playerNames = UserManager.getPlayers().keySet();
+                Set<String> playerNames = UserManager.getPlayerNames();
                 return StringUtil.copyPartialMatches(args[0], playerNames, new ArrayList<String>(playerNames.size()));
             default:
                 return ImmutableList.of();
@@ -79,6 +72,6 @@ public abstract class ToggleCommand implements TabExecutor {
 
     protected abstract boolean hasOtherPermission(CommandSender sender);
     protected abstract boolean hasSelfPermission(CommandSender sender);
-    protected abstract void applyCommandAction();
+    protected abstract void applyCommandAction(McMMOPlayer mcMMOPlayer);
-    protected abstract void sendSuccessMessage(CommandSender sender);
+    protected abstract void sendSuccessMessage(CommandSender sender, String playerName);
 }

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

@@ -9,7 +9,7 @@ import org.bukkit.command.TabExecutor;
 import org.bukkit.util.StringUtil;
 
 import com.gmail.nossr50.mcMMO;
-import com.gmail.nossr50.config.Config;
+import com.gmail.nossr50.config.experience.ExperienceConfig;
 import com.gmail.nossr50.locale.LocaleLoader;
 import com.gmail.nossr50.util.Permissions;
 import com.gmail.nossr50.util.StringUtils;
@@ -18,11 +18,7 @@ import com.gmail.nossr50.util.commands.CommandUtils;
 import com.google.common.collect.ImmutableList;
 
 public class XprateCommand implements TabExecutor {
-    private double originalRate;
+    private final double ORIGINAL_XP_RATE = ExperienceConfig.getInstance().getExperienceGainsGlobalMultiplier();
-
-    public XprateCommand() {
-        originalRate = Config.getInstance().getExperienceGainsGlobalMultiplier();
-    }
 
     @Override
     public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
@@ -42,7 +38,7 @@ public class XprateCommand implements TabExecutor {
                     mcMMO.p.toggleXpEventEnabled();
                 }
 
-                Config.getInstance().setExperienceGainsGlobalMultiplier(originalRate);
+                ExperienceConfig.getInstance().setExperienceGainsGlobalMultiplier(ORIGINAL_XP_RATE);
                 return true;
 
             case 2:
@@ -66,7 +62,7 @@ public class XprateCommand implements TabExecutor {
                 }
 
                 int newXpRate = Integer.parseInt(args[0]);
-                Config.getInstance().setExperienceGainsGlobalMultiplier(newXpRate);
+                ExperienceConfig.getInstance().setExperienceGainsGlobalMultiplier(newXpRate);
 
                 if (mcMMO.p.isXPEventEnabled()) {
                     mcMMO.p.getServer().broadcastMessage(LocaleLoader.getString("Commands.xprate.started.0"));

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

@@ -2,7 +2,7 @@ package com.gmail.nossr50.commands.chat;
 
 import org.bukkit.command.CommandSender;
 
-import com.gmail.nossr50.chat.ChatMode;
+import com.gmail.nossr50.datatypes.chat.ChatMode;
 
 public class AdminChatCommand extends ChatCommand {
     public AdminChatCommand() {

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

@@ -12,7 +12,7 @@ import org.bukkit.util.StringUtil;
 import com.gmail.nossr50.mcMMO;
 import com.gmail.nossr50.chat.ChatManager;
 import com.gmail.nossr50.chat.ChatManagerFactory;
-import com.gmail.nossr50.chat.ChatMode;
+import com.gmail.nossr50.datatypes.chat.ChatMode;
 import com.gmail.nossr50.datatypes.player.McMMOPlayer;
 import com.gmail.nossr50.locale.LocaleLoader;
 import com.gmail.nossr50.util.commands.CommandUtils;
@@ -21,9 +21,8 @@ import com.gmail.nossr50.util.player.UserManager;
 import com.google.common.collect.ImmutableList;
 
 public abstract class ChatCommand implements TabExecutor {
-    protected ChatMode chatMode;
+    private ChatMode chatMode;
     protected ChatManager chatManager;
-    private McMMOPlayer mcMMOPlayer;
 
     public ChatCommand(ChatMode chatMode) {
         this.chatMode = chatMode;
@@ -32,19 +31,21 @@ public abstract class ChatCommand implements TabExecutor {
 
     @Override
     public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
+        McMMOPlayer mcMMOPlayer;
+
         switch (args.length) {
             case 0:
                 if (CommandUtils.noConsoleUsage(sender)) {
                     return true;
                 }
 
-                mcMMOPlayer = UserManager.getPlayer((Player) sender);
+                mcMMOPlayer = UserManager.getPlayer(sender.getName());
 
-                if (chatMode.isEnabled(mcMMOPlayer)) {
+                if (mcMMOPlayer.isChatEnabled(chatMode)) {
-                    disableChatMode(sender);
+                    disableChatMode(mcMMOPlayer, sender);
                 }
                 else {
-                    enableChatMode(sender);
+                    enableChatMode(mcMMOPlayer, sender);
                 }
 
                 return true;
@@ -55,9 +56,7 @@ public abstract class ChatCommand implements TabExecutor {
                         return true;
                     }
 
-                    mcMMOPlayer = UserManager.getPlayer((Player) sender);
+                    enableChatMode(UserManager.getPlayer(sender.getName()), sender);
-
-                    enableChatMode(sender);
                     return true;
                 }
 
@@ -66,9 +65,7 @@ public abstract class ChatCommand implements TabExecutor {
                         return true;
                     }
 
-                    mcMMOPlayer = UserManager.getPlayer((Player) sender);
+                    disableChatMode(UserManager.getPlayer(sender.getName()), sender);
-
-                    disableChatMode(sender);
                     return true;
                 }
 
@@ -108,23 +105,23 @@ public abstract class ChatCommand implements TabExecutor {
 
     protected abstract void handleChatSending(CommandSender sender, String[] args);
 
-    private void enableChatMode(CommandSender sender) {
+    private void enableChatMode(McMMOPlayer mcMMOPlayer, CommandSender sender) {
         if (chatMode == ChatMode.PARTY && mcMMOPlayer.getParty() == null) {
             sender.sendMessage(LocaleLoader.getString("Commands.Party.None"));
             return;
         }
 
-        chatMode.enable(mcMMOPlayer);
+        mcMMOPlayer.enableChat(chatMode);
         sender.sendMessage(chatMode.getEnabledMessage());
     }
 
-    private void disableChatMode(CommandSender sender) {
+    private void disableChatMode(McMMOPlayer mcMMOPlayer, CommandSender sender) {
         if (chatMode == ChatMode.PARTY && mcMMOPlayer.getParty() == null) {
             sender.sendMessage(LocaleLoader.getString("Commands.Party.None"));
             return;
         }
 
-        chatMode.disable(mcMMOPlayer);
+        mcMMOPlayer.disableChat(chatMode);
         sender.sendMessage(chatMode.getDisabledMessage());
     }
 }

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

@@ -3,8 +3,8 @@ package com.gmail.nossr50.commands.chat;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 
-import com.gmail.nossr50.chat.ChatMode;
 import com.gmail.nossr50.chat.PartyChatManager;
+import com.gmail.nossr50.datatypes.chat.ChatMode;
 import com.gmail.nossr50.datatypes.party.Party;
 import com.gmail.nossr50.locale.LocaleLoader;
 import com.gmail.nossr50.party.PartyManager;

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

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

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

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

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

@@ -5,36 +5,26 @@ import java.util.List;
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandSender;
 import org.bukkit.command.TabExecutor;
-import org.bukkit.entity.Player;
 
-import com.gmail.nossr50.mcMMO;
 import com.gmail.nossr50.config.Config;
+import com.gmail.nossr50.database.DatabaseManagerFactory;
 import com.gmail.nossr50.locale.LocaleLoader;
-import com.gmail.nossr50.runnables.database.SQLConversionTask;
-import com.gmail.nossr50.util.player.UserManager;
 
 import com.google.common.collect.ImmutableList;
 
-public class MmoupdateCommand implements TabExecutor {
+public class MmoshowdbCommand implements TabExecutor {
     @Override
     public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
-        if (!Config.getInstance().getUseMySQL()) {
-            sender.sendMessage("SQL Mode is not enabled."); // TODO: Localize
-            return true;
-        }
-
         switch (args.length) {
             case 0:
-                sender.sendMessage(LocaleLoader.getString("Commands.mmoupdate.Start"));
+                Class<?> clazz = DatabaseManagerFactory.getCustomDatabaseManagerClass();
-                UserManager.saveAll();
-                UserManager.clearAll();
-                new SQLConversionTask().runTaskLaterAsynchronously(mcMMO.p, 1);
 
-                for (Player player : mcMMO.p.getServer().getOnlinePlayers()) {
+                if (clazz != null) {
-                    UserManager.addUser(player);
+                    sender.sendMessage(LocaleLoader.getString("Commands.mmoshowdb", clazz.getName()));
+                    return true;
                 }
 
-                sender.sendMessage(LocaleLoader.getString("Commands.mmoupdate.Finish"));
+                sender.sendMessage(LocaleLoader.getString("Commands.mmoshowdb", (Config.getInstance().getUseMySQL() ? "sql" : "flatfile")));
                 return true;
 
             default:

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

@@ -1,13 +1,13 @@
 package com.gmail.nossr50.commands.experience;
 
 import org.bukkit.command.CommandSender;
+import org.bukkit.entity.Player;
 
-import com.gmail.nossr50.mcMMO;
+import com.gmail.nossr50.datatypes.player.PlayerProfile;
 import com.gmail.nossr50.datatypes.skills.SkillType;
-import com.gmail.nossr50.events.experience.McMMOPlayerLevelUpEvent;
 import com.gmail.nossr50.locale.LocaleLoader;
+import com.gmail.nossr50.util.EventUtils;
 import com.gmail.nossr50.util.Permissions;
-import com.gmail.nossr50.util.skills.SkillUtils;
 
 public class AddlevelsCommand extends ExperienceCommand {
     @Override
@@ -21,21 +21,25 @@ public class AddlevelsCommand extends ExperienceCommand {
     }
 
     @Override
-    protected void handleCommand(SkillType skill) {
+    protected void handleCommand(Player player, PlayerProfile profile, SkillType skill, int value) {
+        float xpRemoved = profile.getSkillXpLevelRaw(skill);
         profile.addLevels(skill, value);
 
-        if (player != null) {
+        if (player == null) {
-            mcMMO.p.getServer().getPluginManager().callEvent(new McMMOPlayerLevelUpEvent(player, skill, value));
+            profile.save();
+            return;
         }
+
+        EventUtils.handleLevelChangeEvent(player, skill, value, xpRemoved, true);
     }
 
     @Override
-    protected void handlePlayerMessageAll() {
+    protected void handlePlayerMessageAll(Player player, int value) {
         player.sendMessage(LocaleLoader.getString("Commands.addlevels.AwardAll.1", value));
     }
 
     @Override
-    protected void handlePlayerMessageSkill() {
+    protected void handlePlayerMessageSkill(Player player, int value, SkillType skill) {
-        player.sendMessage(LocaleLoader.getString("Commands.addlevels.AwardSkill.1", value, SkillUtils.getSkillName(skill)));
+        player.sendMessage(LocaleLoader.getString("Commands.addlevels.AwardSkill.1", value, skill.getName()));
     }
 }

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

@@ -1,11 +1,13 @@
 package com.gmail.nossr50.commands.experience;
 
 import org.bukkit.command.CommandSender;
+import org.bukkit.entity.Player;
 
+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.skills.SkillUtils;
+import com.gmail.nossr50.util.player.UserManager;
 
 public class AddxpCommand extends ExperienceCommand {
     @Override
@@ -19,22 +21,23 @@ public class AddxpCommand extends ExperienceCommand {
     }
 
     @Override
-    protected void handleCommand(SkillType skill) {
+    protected void handleCommand(Player player, PlayerProfile profile, SkillType skill, int value) {
         if (player != null) {
-            mcMMOPlayer.applyXpGain(skill, value);
+            UserManager.getPlayer(player).applyXpGain(skill, value);
         }
         else {
-            profile.addExperience(skill, value);
+            profile.addXp(skill, value);
+            profile.save();
         }
     }
 
     @Override
-    protected void handlePlayerMessageAll() {
+    protected void handlePlayerMessageAll(Player player, int value) {
         player.sendMessage(LocaleLoader.getString("Commands.addxp.AwardAll", value));
     }
 
     @Override
-    protected void handlePlayerMessageSkill() {
+    protected void handlePlayerMessageSkill(Player player, int value, SkillType skill) {
-        player.sendMessage(LocaleLoader.getString("Commands.addxp.AwardSkill", value, SkillUtils.getSkillName(skill)));
+        player.sendMessage(LocaleLoader.getString("Commands.addxp.AwardSkill", value, skill.getName()));
     }
 }

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

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

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

@@ -10,25 +10,18 @@ import org.bukkit.command.TabExecutor;
 import org.bukkit.entity.Player;
 import org.bukkit.util.StringUtil;
 
+import com.gmail.nossr50.mcMMO;
 import com.gmail.nossr50.datatypes.player.McMMOPlayer;
 import com.gmail.nossr50.datatypes.player.PlayerProfile;
 import com.gmail.nossr50.datatypes.skills.SkillType;
 import com.gmail.nossr50.locale.LocaleLoader;
+import com.gmail.nossr50.util.Misc;
 import com.gmail.nossr50.util.commands.CommandUtils;
 import com.gmail.nossr50.util.player.UserManager;
-import com.gmail.nossr50.util.skills.SkillUtils;
 
 import com.google.common.collect.ImmutableList;
 
 public abstract class ExperienceCommand implements TabExecutor {
-    protected McMMOPlayer mcMMOPlayer;
-    protected Player player;
-    protected PlayerProfile profile;
-
-    protected boolean allSkills;
-    protected SkillType skill;
-    protected int value;
-
     @Override
     public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
         switch (args.length) {
@@ -46,12 +39,7 @@ public abstract class ExperienceCommand implements TabExecutor {
                     return true;
                 }
 
-                player = (Player) sender;
+                editValues((Player) sender, UserManager.getPlayer(sender.getName()).getProfile(), SkillType.getSkill(args[0]), Integer.parseInt(args[1]));
-                mcMMOPlayer = UserManager.getPlayer(player);
-                profile = mcMMOPlayer.getProfile();
-
-                editValues();
-                allSkills = false;
                 return true;
 
             case 3:
@@ -64,27 +52,27 @@ public abstract class ExperienceCommand implements TabExecutor {
                     return true;
                 }
 
-                mcMMOPlayer = UserManager.getPlayer(args[0]);
+                SkillType skill = SkillType.getSkill(args[1]);
+                int value = Integer.parseInt(args[2]);
+
+                String playerName = Misc.getMatchedPlayerName(args[0]);
+                McMMOPlayer mcMMOPlayer = UserManager.getPlayer(playerName, true);
 
                 // If the mcMMOPlayer doesn't exist, create a temporary profile and check if it's present in the database. If it's not, abort the process.
                 if (mcMMOPlayer == null) {
-                    profile = new PlayerProfile(args[0], false);
+                    PlayerProfile profile = mcMMO.getDatabaseManager().loadPlayerProfile(playerName, false);
 
                     if (CommandUtils.unloadedProfile(sender, profile)) {
                         return true;
                     }
 
-                    editValues();
+                    editValues(null, profile, skill, value);
-                    profile.save(); // Since this is a temporary profile, we save it here.
                 }
                 else {
-                    profile = mcMMOPlayer.getProfile();
+                    editValues(mcMMOPlayer.getPlayer(), mcMMOPlayer.getProfile(), skill, value);
-                    player = mcMMOPlayer.getPlayer();
-                    editValues();
                 }
 
-                handleSenderMessage(sender, args[0]);
+                handleSenderMessage(sender, playerName, skill);
-                allSkills = false;
                 return true;
 
             default:
@@ -96,7 +84,7 @@ public abstract class ExperienceCommand implements TabExecutor {
     public List<String> onTabComplete(CommandSender sender, Command command, String alias, String[] args) {
         switch (args.length) {
             case 1:
-                Set<String> playerNames = UserManager.getPlayers().keySet();
+                Set<String> playerNames = UserManager.getPlayerNames();
                 return StringUtil.copyPartialMatches(args[0], playerNames, new ArrayList<String>(playerNames.size()));
             case 2:
                 return StringUtil.copyPartialMatches(args[1], SkillType.SKILL_NAMES, new ArrayList<String>(SkillType.SKILL_NAMES.size()));
@@ -107,64 +95,42 @@ public abstract class ExperienceCommand implements TabExecutor {
 
     protected abstract boolean permissionsCheckSelf(CommandSender sender);
     protected abstract boolean permissionsCheckOthers(CommandSender sender);
-    protected abstract void handleCommand(SkillType skill);
+    protected abstract void handleCommand(Player player, PlayerProfile profile, SkillType skill, int value);
-    protected abstract void handlePlayerMessageAll();
+    protected abstract void handlePlayerMessageAll(Player player, int value);
-    protected abstract void handlePlayerMessageSkill();
+    protected abstract void handlePlayerMessageSkill(Player player, int value, SkillType skill);
 
     private boolean validateArguments(CommandSender sender, String skillName, String value) {
-        if (isInvalidInteger(sender, value) || isInvalidSkill(sender, skillName)) {
+        if (CommandUtils.isInvalidInteger(sender, value) || CommandUtils.isInvalidSkill(sender, skillName)) {
             return false;
         }
 
         return true;
     }
 
-    private boolean isInvalidInteger(CommandSender sender, String value) {
+    protected static void handleSenderMessage(CommandSender sender, String playerName, SkillType skill) {
-        if (CommandUtils.isInvalidInteger(sender, value)) {
+        if (skill == null) {
-            return true;
-        }
-
-        this.value = Integer.parseInt(value);
-        return false;
-    }
-
-    protected boolean isInvalidSkill(CommandSender sender, String skillName) {
-        if (skillName.equalsIgnoreCase("all")) {
-            allSkills = true;
-            return false;
-        }
-        else if (CommandUtils.isInvalidSkill(sender, skillName)) {
-            return true;
-        }
-
-        skill = SkillType.getSkill(skillName);
-        return false;
-    }
-
-    protected void handleSenderMessage(CommandSender sender, String playerName) {
-        if (allSkills) {
             sender.sendMessage(LocaleLoader.getString("Commands.addlevels.AwardAll.2", playerName));
         }
         else {
-            sender.sendMessage(LocaleLoader.getString("Commands.addlevels.AwardSkill.2", SkillUtils.getSkillName(skill), playerName));
+            sender.sendMessage(LocaleLoader.getString("Commands.addlevels.AwardSkill.2", skill.getName(), playerName));
         }
     }
 
-    protected void editValues() {
+    protected void editValues(Player player, PlayerProfile profile, SkillType skill, int value) {
-        if (allSkills) {
+        if (skill == null) {
             for (SkillType skillType : SkillType.values()) {
-                handleCommand(skillType);
+                handleCommand(player, profile, skillType, value);
             }
 
             if (player != null) {
-                handlePlayerMessageAll();
+                handlePlayerMessageAll(player, value);
             }
         }
         else {
-            handleCommand(skill);
+            handleCommand(player, profile, skill, value);
 
             if (player != null) {
-                handlePlayerMessageSkill();
+                handlePlayerMessageSkill(player, value, skill);
             }
         }
     }

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

@@ -1,13 +1,13 @@
 package com.gmail.nossr50.commands.experience;
 
 import org.bukkit.command.CommandSender;
+import org.bukkit.entity.Player;
 
-import com.gmail.nossr50.mcMMO;
+import com.gmail.nossr50.datatypes.player.PlayerProfile;
 import com.gmail.nossr50.datatypes.skills.SkillType;
-import com.gmail.nossr50.events.experience.McMMOPlayerLevelUpEvent;
 import com.gmail.nossr50.locale.LocaleLoader;
+import com.gmail.nossr50.util.EventUtils;
 import com.gmail.nossr50.util.Permissions;
-import com.gmail.nossr50.util.skills.SkillUtils;
 
 public class MmoeditCommand extends ExperienceCommand {
     @Override
@@ -21,21 +21,31 @@ public class MmoeditCommand extends ExperienceCommand {
     }
 
     @Override
-    protected void handleCommand(SkillType skill) {
+    protected void handleCommand(Player player, PlayerProfile profile, SkillType skill, int value) {
+        int skillLevel = profile.getSkillLevel(skill);
+        float xpRemoved = profile.getSkillXpLevelRaw(skill);
+
         profile.modifySkill(skill, value);
 
-        if (player != null) {
+        if (player == null) {
-            mcMMO.p.getServer().getPluginManager().callEvent(new McMMOPlayerLevelUpEvent(player, skill, value - profile.getSkillLevel(skill)));
+            profile.save();
+            return;
         }
+
+        if (value == skillLevel) {
+            return;
+        }
+
+        EventUtils.handleLevelChangeEvent(player, skill, value, xpRemoved, value > skillLevel);
     }
 
     @Override
-    protected void handlePlayerMessageAll() {
+    protected void handlePlayerMessageAll(Player player, int value) {
         player.sendMessage(LocaleLoader.getString("Commands.mmoedit.AllSkills.1", value));
     }
 
     @Override
-    protected void handlePlayerMessageSkill() {
+    protected void handlePlayerMessageSkill(Player player, int value, SkillType skill) {
-        player.sendMessage(LocaleLoader.getString("Commands.mmoedit.Modified.1", SkillUtils.getSkillName(skill), value));
+        player.sendMessage(LocaleLoader.getString("Commands.mmoedit.Modified.1", skill.getName(), value));
     }
 }

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

@@ -1,30 +1,30 @@
 package com.gmail.nossr50.commands.experience;
 
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Set;
+
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandSender;
+import org.bukkit.command.TabExecutor;
 import org.bukkit.entity.Player;
+import org.bukkit.util.StringUtil;
 
 import com.gmail.nossr50.mcMMO;
+import com.gmail.nossr50.datatypes.player.McMMOPlayer;
 import com.gmail.nossr50.datatypes.player.PlayerProfile;
 import com.gmail.nossr50.datatypes.skills.SkillType;
-import com.gmail.nossr50.events.experience.McMMOPlayerLevelUpEvent;
 import com.gmail.nossr50.locale.LocaleLoader;
+import com.gmail.nossr50.util.EventUtils;
+import com.gmail.nossr50.util.Misc;
 import com.gmail.nossr50.util.Permissions;
 import com.gmail.nossr50.util.commands.CommandUtils;
 import com.gmail.nossr50.util.player.UserManager;
-import com.gmail.nossr50.util.skills.SkillUtils;
+import com.google.common.collect.ImmutableList;
-
-public class SkillresetCommand extends ExperienceCommand {
-    private CommandSender sender;
-    private Command command;
-    private int argsLength;
 
+public class SkillresetCommand implements TabExecutor {
     @Override
     public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
-        this.command = command;
-        this.sender = sender;
-        argsLength = args.length;
-
         switch (args.length) {
             case 1:
                 if (CommandUtils.noConsoleUsage(sender)) {
@@ -36,15 +36,11 @@ public class SkillresetCommand extends ExperienceCommand {
                     return true;
                 }
 
-                if (isInvalidSkill(sender, args[0])) {
+                if (CommandUtils.isInvalidSkill(sender, args[0])) {
                     return true;
                 }
 
-                player = (Player) sender;
+                editValues((Player) sender, UserManager.getPlayer(sender.getName()).getProfile(), SkillType.getSkill(args[0]), args.length, sender, command);
-                mcMMOPlayer = UserManager.getPlayer(player);
-                profile = mcMMOPlayer.getProfile();
-
-                editValues();
                 return true;
 
             case 2:
@@ -53,31 +49,30 @@ public class SkillresetCommand extends ExperienceCommand {
                     return true;
                 }
 
-                if (isInvalidSkill(sender, args[1])) {
+                if (CommandUtils.isInvalidSkill(sender, args[1])) {
                     return true;
                 }
 
-                mcMMOPlayer = UserManager.getPlayer(args[0]);
+                SkillType skill = SkillType.getSkill(args[1]);
+
+                String playerName = Misc.getMatchedPlayerName(args[0]);
+                McMMOPlayer mcMMOPlayer = UserManager.getPlayer(playerName, true);
 
                 // If the mcMMOPlayer doesn't exist, create a temporary profile and check if it's present in the database. If it's not, abort the process.
                 if (mcMMOPlayer == null) {
-                    profile = new PlayerProfile(args[0], false);
+                    PlayerProfile profile = mcMMO.getDatabaseManager().loadPlayerProfile(playerName, false);
 
                     if (CommandUtils.unloadedProfile(sender, profile)) {
                         return true;
                     }
 
-                    editValues();
+                    editValues(null, profile, skill, args.length, sender, command);
-                    profile.save(); // Since this is a temporary profile, we save it here.
                 }
                 else {
-                    profile = mcMMOPlayer.getProfile();
+                    editValues(mcMMOPlayer.getPlayer(), mcMMOPlayer.getProfile(), skill, args.length, sender, command);
-                    player = mcMMOPlayer.getPlayer();
-
-                    editValues();
                 }
 
-                handleSenderMessage(sender, args[0]);
+                ExperienceCommand.handleSenderMessage(sender, playerName, skill);
                 return true;
 
             default:
@@ -86,36 +81,53 @@ public class SkillresetCommand extends ExperienceCommand {
     }
 
     @Override
-    protected boolean permissionsCheckSelf(CommandSender sender) {
+    public List<String> onTabComplete(CommandSender sender, Command command, String alias, String[] args) {
-        return false;
+        switch (args.length) {
+            case 1:
+                Set<String> playerNames = UserManager.getPlayerNames();
+                return StringUtil.copyPartialMatches(args[0], playerNames, new ArrayList<String>(playerNames.size()));
+            case 2:
+                return StringUtil.copyPartialMatches(args[1], SkillType.SKILL_NAMES, new ArrayList<String>(SkillType.SKILL_NAMES.size()));
+            default:
+                return ImmutableList.of();
+        }
     }
 
-    @Override
+    private void editValues(Player player, PlayerProfile profile, SkillType skill, int argsLength, CommandSender sender, Command command) {
-    protected boolean permissionsCheckOthers(CommandSender sender) {
+        if (skill == null) {
-        return false;
+            for (SkillType skillType : SkillType.values()) {
+                handleCommand(player, profile, skillType, argsLength, sender, command);
+            }
+
+            if (player != null) {
+                player.sendMessage(LocaleLoader.getString("Commands.Reset.All"));
+            }
+        }
+        else {
+            handleCommand(player, profile, skill, argsLength, sender, command);
+
+            if (player != null) {
+                player.sendMessage(LocaleLoader.getString("Commands.Reset.Single", skill.getName()));
+            }
+        }
     }
 
-    @Override
+    private void handleCommand(Player player, PlayerProfile profile, SkillType skill, int argsLength, CommandSender sender, Command command) {
-    protected void handleCommand(SkillType skill) {
         if (argsLength == 1 && !Permissions.skillreset(sender, skill) || (argsLength == 2 && !Permissions.skillresetOthers(sender, skill))) {
             sender.sendMessage(command.getPermissionMessage());
             return;
         }
 
+        int levelsRemoved = profile.getSkillLevel(skill);
+        float xpRemoved = profile.getSkillXpLevelRaw(skill);
+
         profile.modifySkill(skill, 0);
 
-        if (player != null) {
+        if (player == null) {
-            mcMMO.p.getServer().getPluginManager().callEvent(new McMMOPlayerLevelUpEvent(player, skill, 0 - profile.getSkillLevel(skill)));
+            profile.save();
+            return;
         }
-    }
 
-    @Override
+        EventUtils.handleLevelChangeEvent(player, skill, levelsRemoved, xpRemoved, false);
-    protected void handlePlayerMessageAll() {
-        player.sendMessage(LocaleLoader.getString("Commands.Reset.All"));
-    }
-
-    @Override
-    protected void handlePlayerMessageSkill() {
-        player.sendMessage(LocaleLoader.getString("Commands.Reset.Single", SkillUtils.getSkillName(skill)));
     }
 }

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

@@ -1,41 +1,65 @@
 package com.gmail.nossr50.commands.hardcore;
 
+import org.bukkit.command.CommandSender;
+
 import com.gmail.nossr50.mcMMO;
 import com.gmail.nossr50.config.Config;
+import com.gmail.nossr50.datatypes.skills.SkillType;
 import com.gmail.nossr50.locale.LocaleLoader;
 import com.gmail.nossr50.util.Permissions;
 
 public class HardcoreCommand extends HardcoreModeCommand {
     @Override
-    protected void disable() {
+    protected boolean checkTogglePermissions(CommandSender sender) {
-        Config.getInstance().setHardcoreEnabled(false);
-        mcMMO.p.getServer().broadcastMessage(LocaleLoader.getString("Hardcore.Disabled"));
-    }
-
-    @Override
-    protected void enable() {
-        Config.getInstance().setHardcoreEnabled(true);
-        mcMMO.p.getServer().broadcastMessage(LocaleLoader.getString("Hardcore.Enabled"));
-    }
-
-    @Override
-    protected boolean checkTogglePermissions() {
         return Permissions.hardcoreToggle(sender);
     }
 
     @Override
-    protected boolean checkModifyPermissions() {
+    protected boolean checkModifyPermissions(CommandSender sender) {
         return Permissions.hardcoreModify(sender);
     }
 
     @Override
-    protected boolean checkEnabled() {
+    protected boolean checkEnabled(SkillType skill) {
-        return Config.getInstance().getHardcoreEnabled();
+        if (skill == null) {
+            for (SkillType skillType : SkillType.values()) {
+                if (!skillType.getHardcoreStatLossEnabled()) {
+                    return false;
+                }
+            }
+
+            return true;
+        }
+
+        return skill.getHardcoreStatLossEnabled();
     }
 
     @Override
-    protected void modify() {
+    protected void enable(SkillType skill) {
-        Config.getInstance().setHardcoreDeathStatPenaltyPercentage(newPercent);
+        toggle(true, skill);
-        sender.sendMessage(LocaleLoader.getString("Hardcore.PercentageChanged", percent.format(newPercent / 100D)));
+    }
+
+    @Override
+    protected void disable(SkillType skill) {
+        toggle(false, skill);
+    }
+
+    @Override
+    protected void modify(CommandSender sender, double newPercentage) {
+        Config.getInstance().setHardcoreDeathStatPenaltyPercentage(newPercentage);
+        sender.sendMessage(LocaleLoader.getString("Hardcore.DeathStatLoss.PercentageChanged", percent.format(newPercentage / 100.0D)));
+    }
+
+    private void toggle(boolean enable, SkillType skill) {
+        if (skill == null) {
+            for (SkillType skillType : SkillType.NON_CHILD_SKILLS) {
+                skillType.setHardcoreStatLossEnabled(enable);
+            }
+        }
+        else {
+            skill.setHardcoreStatLossEnabled(enable);
+        }
+
+        mcMMO.p.getServer().broadcastMessage(LocaleLoader.getString("Hardcore.Mode." + (enable ? "Enabled" : "Disabled"), LocaleLoader.getString("Hardcore.DeathStatLoss.Name"), (skill == null ? "all skills" : skill.getName())));
     }
 }

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

@@ -9,6 +9,7 @@ import org.bukkit.command.CommandSender;
 import org.bukkit.command.TabExecutor;
 import org.bukkit.util.StringUtil;
 
+import com.gmail.nossr50.datatypes.skills.SkillType;
 import com.gmail.nossr50.util.Permissions;
 import com.gmail.nossr50.util.StringUtils;
 import com.gmail.nossr50.util.commands.CommandUtils;
@@ -16,30 +17,22 @@ import com.gmail.nossr50.util.commands.CommandUtils;
 import com.google.common.collect.ImmutableList;
 
 public abstract class HardcoreModeCommand implements TabExecutor {
-    protected CommandSender sender;
+    protected final DecimalFormat percent = new DecimalFormat("##0.00%");
-    protected double newPercent;
-    protected DecimalFormat percent;
-
-    public HardcoreModeCommand() {
-        percent = new DecimalFormat("##0.00%");
-    }
 
     @Override
     public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
         switch (args.length) {
             case 0:
-                this.sender = sender;
+                if (!checkTogglePermissions(sender)) {
-
-                if (!checkTogglePermissions()) {
                     sender.sendMessage(command.getPermissionMessage());
                     return true;
                 }
 
-                if (checkEnabled()) {
+                if (checkEnabled(null)) {
-                    disable();
+                    disable(null);
                 }
                 else {
-                    enable();
+                    enable(null);
                 }
 
                 return true;
@@ -51,7 +44,7 @@ public abstract class HardcoreModeCommand implements TabExecutor {
                         return true;
                     }
 
-                    enable();
+                    enable(null);
                     return true;
                 }
 
@@ -61,11 +54,11 @@ public abstract class HardcoreModeCommand implements TabExecutor {
                         return true;
                     }
 
-                    disable();
+                    disable(null);
                     return true;
                 }
 
-                if (isInvalidPercentage(sender, args[0])) {
+                if (CommandUtils.isInvalidDouble(sender, args[0])) {
                     return true;
                 }
 
@@ -74,7 +67,41 @@ public abstract class HardcoreModeCommand implements TabExecutor {
                     return true;
                 }
 
-                modify();
+                modify(sender, Double.parseDouble(args[0]));
+                return true;
+
+
+            case 2:
+                if (CommandUtils.isInvalidSkill(sender, args[0])) {
+                    return true;
+                }
+
+                SkillType skill = SkillType.getSkill(args[0]);
+
+                if (!CommandUtils.isChildSkill(sender, skill)) {
+                    return true;
+                }
+
+                if (CommandUtils.shouldEnableToggle(args[1])) {
+                    if (!Permissions.hardcoreToggle(sender)) {
+                        sender.sendMessage(command.getPermissionMessage());
+                        return true;
+                    }
+
+                    enable(skill);
+                    return true;
+                }
+
+                if (CommandUtils.shouldDisableToggle(args[1])) {
+                    if (!Permissions.hardcoreToggle(sender)) {
+                        sender.sendMessage(command.getPermissionMessage());
+                        return true;
+                    }
+
+                    enable(skill);
+                    return true;
+                }
+
                 return true;
 
             default:
@@ -96,19 +123,10 @@ public abstract class HardcoreModeCommand implements TabExecutor {
         }
     }
 
-    protected abstract boolean checkTogglePermissions();
+    protected abstract boolean checkTogglePermissions(CommandSender sender);
-    protected abstract boolean checkModifyPermissions();
+    protected abstract boolean checkModifyPermissions(CommandSender sender);
-    protected abstract boolean checkEnabled();
+    protected abstract boolean checkEnabled(SkillType skill);
-    protected abstract void enable();
+    protected abstract void enable(SkillType skill);
-    protected abstract void disable();
+    protected abstract void disable(SkillType skill);
-    protected abstract void modify();
+    protected abstract void modify(CommandSender sender, double newPercentage);
-
-    private boolean isInvalidPercentage(CommandSender sender, String value) {
-        if (CommandUtils.isInvalidDouble(sender, value)) {
-            return true;
-        }
-
-        newPercent = Double.parseDouble(value);
-        return false;
-    }
 }

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

@@ -1,41 +1,65 @@
 package com.gmail.nossr50.commands.hardcore;
 
+import org.bukkit.command.CommandSender;
+
 import com.gmail.nossr50.mcMMO;
 import com.gmail.nossr50.config.Config;
+import com.gmail.nossr50.datatypes.skills.SkillType;
 import com.gmail.nossr50.locale.LocaleLoader;
 import com.gmail.nossr50.util.Permissions;
 
 public class VampirismCommand extends HardcoreModeCommand {
     @Override
-    protected boolean checkTogglePermissions() {
+    protected boolean checkTogglePermissions(CommandSender sender) {
         return Permissions.vampirismToggle(sender);
     }
 
     @Override
-    protected boolean checkModifyPermissions() {
+    protected boolean checkModifyPermissions(CommandSender sender) {
         return Permissions.vampirismModify(sender);
     }
 
     @Override
-    protected boolean checkEnabled() {
+    protected boolean checkEnabled(SkillType skill) {
-        return Config.getInstance().getHardcoreVampirismEnabled();
+        if (skill == null) {
+            for (SkillType skillType : SkillType.values()) {
+                if (!skillType.getHardcoreVampirismEnabled()) {
+                    return false;
+                }
+            }
+
+            return true;
+        }
+
+        return skill.getHardcoreVampirismEnabled();
     }
 
     @Override
-    protected void enable() {
+    protected void enable(SkillType skill) {
-        Config.getInstance().setHardcoreVampirismEnabled(true);
+        toggle(true, skill);
-        mcMMO.p.getServer().broadcastMessage(LocaleLoader.getString("Vampirism.Enabled"));
     }
 
     @Override
-    protected void disable() {
+    protected void disable(SkillType skill) {
-        Config.getInstance().setHardcoreVampirismEnabled(false);
+        toggle(false, skill);
-        mcMMO.p.getServer().broadcastMessage(LocaleLoader.getString("Vampirism.Disabled"));
     }
 
     @Override
-    protected void modify() {
+    protected void modify(CommandSender sender, double newPercentage) {
-        Config.getInstance().setHardcoreVampirismStatLeechPercentage(newPercent);
+        Config.getInstance().setHardcoreVampirismStatLeechPercentage(newPercentage);
-        sender.sendMessage(LocaleLoader.getString("Vampirism.PercentageChanged", percent.format(newPercent / 100D)));
+        sender.sendMessage(LocaleLoader.getString("Hardcore.Vampirism.PercentageChanged", percent.format(newPercentage / 100.0D)));
+    }
+
+    private void toggle(boolean enable, SkillType skill) {
+        if (skill == null) {
+            for (SkillType skillType : SkillType.NON_CHILD_SKILLS) {
+                skillType.setHardcoreVampirismEnabled(enable);
+            }
+        }
+        else {
+            skill.setHardcoreVampirismEnabled(enable);
+        }
+
+        mcMMO.p.getServer().broadcastMessage(LocaleLoader.getString("Hardcore.Mode." + (enable ? "Enabled" : "Disabled"), LocaleLoader.getString("Hardcore.Vampirism.Name"), (skill == null ? "all skills" : skill)));
     }
 }

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

@@ -24,11 +24,11 @@ public class PartyAcceptCommand implements CommandExecutor {
                 }
 
                 // Changing parties
-                if (!PartyManager.changeOrJoinParty(mcMMOPlayer, player, mcMMOPlayer.getParty(), mcMMOPlayer.getPartyInvite().getName())) {
+                if (!PartyManager.changeOrJoinParty(mcMMOPlayer, mcMMOPlayer.getPartyInvite().getName())) {
                     return true;
                 }
 
-                PartyManager.joinInvitedParty(player, mcMMOPlayer);
+                PartyManager.joinInvitedParty(mcMMOPlayer);
                 return true;
 
             default:

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

@@ -8,6 +8,7 @@ import org.bukkit.entity.Player;
 import com.gmail.nossr50.datatypes.party.Party;
 import com.gmail.nossr50.locale.LocaleLoader;
 import com.gmail.nossr50.party.PartyManager;
+import com.gmail.nossr50.util.Misc;
 import com.gmail.nossr50.util.player.UserManager;
 
 public class PartyChangeOwnerCommand implements CommandExecutor {
@@ -16,13 +17,14 @@ public class PartyChangeOwnerCommand implements CommandExecutor {
         switch (args.length) {
             case 2:
                 Party playerParty = UserManager.getPlayer((Player) sender).getParty();
+                String targetName = Misc.getMatchedPlayerName(args[1]);
 
-                if (!playerParty.getMembers().contains(args[1])) {
+                if (!playerParty.getMembers().contains(targetName)) {
-                    sender.sendMessage(LocaleLoader.getString("Party.NotInYourParty", args[1]));
+                    sender.sendMessage(LocaleLoader.getString("Party.NotInYourParty", targetName));
                     return true;
                 }
 
-                PartyManager.setPartyLeader(args[1], playerParty);
+                PartyManager.setPartyLeader(targetName, playerParty);
                 return true;
 
             default:

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

@@ -10,24 +10,22 @@ import com.gmail.nossr50.locale.LocaleLoader;
 import com.gmail.nossr50.util.player.UserManager;
 
 public class PartyChangePasswordCommand implements CommandExecutor {
-    private Party playerParty;
-
     @Override
     public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
-        playerParty = UserManager.getPlayer((Player) sender).getParty();
+        Party party = UserManager.getPlayer((Player) sender).getParty();
 
         switch (args.length) {
             case 1:
-                unprotectParty(sender);
+                unprotectParty(party, sender);
                 return true;
 
             case 2:
                 if (args[1].equalsIgnoreCase("clear") || args[1].equalsIgnoreCase("reset")) {
-                    unprotectParty(sender);
+                    unprotectParty(party, sender);
                     return true;
                 }
 
-                protectParty(sender, args[1]);
+                protectParty(party, sender, args[1]);
                 return true;
 
             default:
@@ -37,15 +35,15 @@ public class PartyChangePasswordCommand implements CommandExecutor {
         }
     }
 
-    private void unprotectParty(CommandSender sender) {
+    private void unprotectParty(Party party, CommandSender sender) {
-        playerParty.setLocked(true);
+        party.setLocked(true);
-        playerParty.setPassword(null);
+        party.setPassword(null);
         sender.sendMessage(LocaleLoader.getString("Party.Password.Removed"));
     }
 
-    private void protectParty(CommandSender sender, String password) {
+    private void protectParty(Party party, CommandSender sender, String password) {
-        playerParty.setLocked(true);
+        party.setLocked(true);
-        playerParty.setPassword(password);
+        party.setPassword(password);
         sender.sendMessage(LocaleLoader.getString("Party.Password.Set", password));
     }
 }

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

@@ -20,12 +20,10 @@ import com.gmail.nossr50.locale.LocaleLoader;
 import com.gmail.nossr50.util.Permissions;
 import com.gmail.nossr50.util.commands.CommandUtils;
 import com.gmail.nossr50.util.player.UserManager;
+
 import com.google.common.collect.ImmutableList;
 
 public class PartyCommand implements TabExecutor {
-    private McMMOPlayer mcMMOPlayer;
-    private Player player;
-
     private static final List<String> PARTY_SUBCOMMANDS;
     private static final List<String> EXPSHARE_COMPLETIONS = ImmutableList.of("none", "equal");
     private static final List<String> ITEMSHARE_COMPLETIONS = ImmutableList.of("none", "equal", "random", "loot", "mining", "herbalism", "woodcutting", "misc");
@@ -70,13 +68,13 @@ public class PartyCommand implements TabExecutor {
             return true;
         }
 
-        player = (Player) sender;
+        Player player = (Player) sender;
-        mcMMOPlayer = UserManager.getPlayer(player);
+        McMMOPlayer mcMMOPlayer = UserManager.getPlayer(player);
 
         if (args.length < 1) {
             if (!mcMMOPlayer.inParty()) {
                 sender.sendMessage(LocaleLoader.getString("Commands.Party.None"));
-                return printUsage();
+                return printUsage(player);
             }
 
             return partyInfoCommand.onCommand(sender, command, label, args);
@@ -85,7 +83,7 @@ public class PartyCommand implements TabExecutor {
         PartySubcommandType subcommand = PartySubcommandType.getSubcommand(args[0]);
 
         if (subcommand == null) {
-            return printUsage();
+            return printUsage(player);
         }
 
         // Can't use this for lock/unlock since they're handled by the same command
@@ -110,7 +108,7 @@ public class PartyCommand implements TabExecutor {
         // Party member commands
         if (!mcMMOPlayer.inParty()) {
             sender.sendMessage(LocaleLoader.getString("Commands.Party.None"));
-            return printUsage();
+            return printUsage(player);
         }
 
         switch (subcommand) {
@@ -176,7 +174,7 @@ public class PartyCommand implements TabExecutor {
                     case INVITE:
                     case KICK:
                     case OWNER:
-                        Set<String> playerNames = UserManager.getPlayers().keySet();
+                        Set<String> playerNames = UserManager.getPlayerNames();
                         return StringUtil.copyPartialMatches(args[1], playerNames, new ArrayList<String>(playerNames.size()));
                     case EXPSHARE:
                         return StringUtil.copyPartialMatches(args[1], EXPSHARE_COMPLETIONS, new ArrayList<String>(EXPSHARE_COMPLETIONS.size()));
@@ -191,7 +189,7 @@ public class PartyCommand implements TabExecutor {
                         List<String> matches = StringUtil.copyPartialMatches(args[1], PtpCommand.TELEPORT_SUBCOMMANDS, new ArrayList<String>(PtpCommand.TELEPORT_SUBCOMMANDS.size()));
 
                         if (matches.size() == 0) {
-                            playerNames = UserManager.getPlayers().keySet();
+                            playerNames = UserManager.getPlayerNames();
                             return StringUtil.copyPartialMatches(args[1], playerNames, new ArrayList<String>(playerNames.size()));
                         }
 
@@ -210,7 +208,7 @@ public class PartyCommand implements TabExecutor {
         }
     }
 
-    private boolean printUsage() {
+    private boolean printUsage(Player player) {
         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 ?"));

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

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

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

@@ -7,16 +7,13 @@ import org.bukkit.entity.Player;
 
 import com.gmail.nossr50.config.Config;
 import com.gmail.nossr50.datatypes.party.Party;
+import com.gmail.nossr50.datatypes.party.ShareMode;
 import com.gmail.nossr50.locale.LocaleLoader;
-import com.gmail.nossr50.party.ShareHandler;
-import com.gmail.nossr50.party.ShareHandler.ShareMode;
 import com.gmail.nossr50.util.StringUtils;
 import com.gmail.nossr50.util.commands.CommandUtils;
 import com.gmail.nossr50.util.player.UserManager;
 
 public class PartyExpShareCommand implements CommandExecutor {
-    private Party playerParty;
-
     @Override
     public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
         if (!Config.getInstance().getExpShareEnabled()) {
@@ -26,13 +23,13 @@ public class PartyExpShareCommand implements CommandExecutor {
 
         switch (args.length) {
             case 2:
-                playerParty = UserManager.getPlayer((Player) sender).getParty();
+                Party party = UserManager.getPlayer((Player) sender).getParty();
 
                 if (args[1].equalsIgnoreCase("none") || CommandUtils.shouldDisableToggle(args[1])) {
-                    handleChangingShareMode(ShareMode.NONE);
+                    handleChangingShareMode(party, ShareMode.NONE);
                 }
                 else if (args[1].equalsIgnoreCase("equal") || args[1].equalsIgnoreCase("even") || CommandUtils.shouldEnableToggle(args[1])) {
-                    handleChangingShareMode(ShareMode.EQUAL);
+                    handleChangingShareMode(party, ShareMode.EQUAL);
                 }
                 else {
                     sender.sendMessage(LocaleLoader.getString("Commands.Usage.2", "party", "expshare", "<NONE | EQUAL>"));
@@ -46,12 +43,12 @@ public class PartyExpShareCommand implements CommandExecutor {
         }
     }
 
-    private void handleChangingShareMode(ShareHandler.ShareMode mode) {
+    private void handleChangingShareMode(Party party, ShareMode mode) {
-        playerParty.setXpShareMode(mode);
+        party.setXpShareMode(mode);
 
         String changeModeMessage = LocaleLoader.getString("Commands.Party.SetSharing", LocaleLoader.getString("Party.ShareType.Exp"), LocaleLoader.getString("Party.ShareMode." + StringUtils.getCapitalized(mode.toString())));
 
-        for (Player member : playerParty.getOnlineMembers()) {
+        for (Player member : party.getOnlineMembers()) {
             member.sendMessage(changeModeMessage);
         }
     }

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

@@ -1,7 +1,6 @@
 package com.gmail.nossr50.commands.party;
 
 import org.bukkit.ChatColor;
-import org.bukkit.OfflinePlayer;
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandExecutor;
 import org.bukkit.command.CommandSender;
@@ -10,45 +9,43 @@ import org.bukkit.entity.Player;
 import com.gmail.nossr50.mcMMO;
 import com.gmail.nossr50.config.Config;
 import com.gmail.nossr50.datatypes.party.Party;
+import com.gmail.nossr50.datatypes.party.ShareMode;
 import com.gmail.nossr50.datatypes.player.McMMOPlayer;
 import com.gmail.nossr50.locale.LocaleLoader;
 import com.gmail.nossr50.party.PartyManager;
-import com.gmail.nossr50.party.ShareHandler;
 import com.gmail.nossr50.util.player.UserManager;
 
 public class PartyInfoCommand implements CommandExecutor {
-    private Player player;
-    private Party playerParty;
-
     @Override
     public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
         switch (args.length) {
             case 0:
             case 1:
-                player = (Player) sender;
+                Player player = (Player) sender;
                 McMMOPlayer mcMMOPlayer = UserManager.getPlayer(player);
-                playerParty = mcMMOPlayer.getParty();
+                Party party = mcMMOPlayer.getParty();
 
-                displayPartyHeader();
+                displayPartyHeader(player, party);
-                displayShareModeInfo();
+                displayShareModeInfo(party, player);
-                displayMemberInfo();
+                displayMemberInfo(player, mcMMOPlayer, party);
                 return true;
+
             default:
                 sender.sendMessage(LocaleLoader.getString("Commands.Usage.1", "party", "info"));
                 return true;
         }
     }
 
-    private String createMembersList() {
+    private String createMembersList(Party party) {
         StringBuilder memberList = new StringBuilder();
 
-        for (String memberName : playerParty.getMembers()) {
+        for (String memberName : party.getMembers()) {
-            OfflinePlayer member = mcMMO.p.getServer().getOfflinePlayer(memberName);
+            Player member = mcMMO.p.getServer().getPlayerExact(memberName);
 
-            if (playerParty.getLeader().equalsIgnoreCase(memberName)) {
+            if (party.getLeader().equalsIgnoreCase(memberName)) {
                 memberList.append(ChatColor.GOLD);
             }
-            else if (member.isOnline()) {
+            else if (member != null) {
                 memberList.append(ChatColor.WHITE);
             }
             else {
@@ -61,10 +58,10 @@ public class PartyInfoCommand implements CommandExecutor {
         return memberList.toString();
     }
 
-    private void displayShareModeInfo() {
+    private void displayShareModeInfo(Party party, Player player) {
         boolean xpShareEnabled = Config.getInstance().getExpShareEnabled();
         boolean itemShareEnabled = Config.getInstance().getItemShareEnabled();
-        boolean itemSharingActive = (playerParty.getItemShareMode() != ShareHandler.ShareMode.NONE);
+        boolean itemSharingActive = (party.getItemShareMode() != ShareMode.NONE);
 
         if (!xpShareEnabled && !itemShareEnabled) {
             return;
@@ -75,11 +72,11 @@ public class PartyInfoCommand implements CommandExecutor {
         String separator = "";
 
         if (xpShareEnabled) {
-            expShareInfo = LocaleLoader.getString("Commands.Party.ExpShare", playerParty.getXpShareMode().toString());
+            expShareInfo = LocaleLoader.getString("Commands.Party.ExpShare", party.getXpShareMode().toString());
         }
 
         if (itemShareEnabled) {
-            itemShareInfo = LocaleLoader.getString("Commands.Party.ItemShare", playerParty.getItemShareMode().toString());
+            itemShareInfo = LocaleLoader.getString("Commands.Party.ItemShare", party.getItemShareMode().toString());
         }
 
         if (xpShareEnabled && itemShareEnabled) {
@@ -87,28 +84,23 @@ public class PartyInfoCommand implements CommandExecutor {
         }
 
         player.sendMessage(LocaleLoader.getString("Commands.Party.ShareMode") + expShareInfo + separator + itemShareInfo);
+
         if (itemSharingActive) {
-            player.sendMessage(LocaleLoader.getString("Commands.Party.ItemShareCategories", playerParty.getItemShareCategories()));
+            player.sendMessage(LocaleLoader.getString("Commands.Party.ItemShareCategories", party.getItemShareCategories()));
         }
     }
 
-    private void displayPartyHeader() {
+    private void displayPartyHeader(Player player, Party party) {
         player.sendMessage(LocaleLoader.getString("Commands.Party.Header"));
-
+        player.sendMessage(LocaleLoader.getString("Commands.Party.Status", party.getName(), LocaleLoader.getString("Party.Status." + (party.isLocked() ? "Locked" : "Unlocked"))));
-        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() {
+    private void displayMemberInfo(Player player, McMMOPlayer mcMMOPlayer, Party party) {
-        int membersNear = PartyManager.getNearMembers(player, playerParty, Config.getInstance().getPartyShareRange()).size();
+        int membersNear = PartyManager.getNearMembers(mcMMOPlayer).size();
-        int membersOnline = playerParty.getOnlineMembers().size() - 1;
+        int membersOnline = party.getOnlineMembers().size() - 1;
 
         player.sendMessage(LocaleLoader.getString("Commands.Party.Members.Header"));
         player.sendMessage(LocaleLoader.getString("Commands.Party.MembersNear", membersNear, membersOnline));
-        player.sendMessage(createMembersList());
+        player.sendMessage(createMembersList(party));
     }
 }

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

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

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

@@ -8,15 +8,13 @@ import org.bukkit.entity.Player;
 import com.gmail.nossr50.config.Config;
 import com.gmail.nossr50.datatypes.party.ItemShareType;
 import com.gmail.nossr50.datatypes.party.Party;
+import com.gmail.nossr50.datatypes.party.ShareMode;
 import com.gmail.nossr50.locale.LocaleLoader;
-import com.gmail.nossr50.party.ShareHandler.ShareMode;
 import com.gmail.nossr50.util.StringUtils;
 import com.gmail.nossr50.util.commands.CommandUtils;
 import com.gmail.nossr50.util.player.UserManager;
 
 public class PartyItemShareCommand implements CommandExecutor {
-    private Party playerParty;
-
     @Override
     public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
         if (!Config.getInstance().getItemShareEnabled()) {
@@ -24,9 +22,10 @@ public class PartyItemShareCommand implements CommandExecutor {
             return true;
         }
 
+        Party party = UserManager.getPlayer((Player) sender).getParty();
+
         switch (args.length) {
             case 2:
-                playerParty = UserManager.getPlayer((Player) sender).getParty();
                 ShareMode mode = ShareMode.getShareMode(args[1].toUpperCase());
 
                 if (mode == null) {
@@ -34,11 +33,10 @@ public class PartyItemShareCommand implements CommandExecutor {
                     return true;
                 }
 
-                handleChangingShareMode(mode);
+                handleChangingShareMode(party, mode);
                 return true;
 
             case 3:
-                playerParty = UserManager.getPlayer((Player) sender).getParty();
                 boolean toggle = false;
 
                 if (CommandUtils.shouldEnableToggle(args[2])) {
@@ -53,7 +51,7 @@ public class PartyItemShareCommand implements CommandExecutor {
                 }
 
                 try {
-                    handleToggleItemShareCategory(ItemShareType.valueOf(args[1].toUpperCase()), toggle);
+                    handleToggleItemShareCategory(party, ItemShareType.valueOf(args[1].toUpperCase()), toggle);
                 }
                 catch (IllegalArgumentException ex) {
                     sender.sendMessage(LocaleLoader.getString("Commands.Usage.2", "party", "itemshare", "<loot | mining | herbalism | woodcutting | misc> <true | false>"));
@@ -68,22 +66,22 @@ public class PartyItemShareCommand implements CommandExecutor {
         }
     }
 
-    private void handleChangingShareMode(ShareMode mode) {
+    private void handleChangingShareMode(Party party, ShareMode mode) {
-        playerParty.setItemShareMode(mode);
+        party.setItemShareMode(mode);
 
         String changeModeMessage = LocaleLoader.getString("Commands.Party.SetSharing", LocaleLoader.getString("Party.ShareType.Item"), LocaleLoader.getString("Party.ShareMode." + StringUtils.getCapitalized(mode.toString())));
 
-        for (Player member : playerParty.getOnlineMembers()) {
+        for (Player member : party.getOnlineMembers()) {
             member.sendMessage(changeModeMessage);
         }
     }
 
-    private void handleToggleItemShareCategory(ItemShareType type, boolean toggle) {
+    private void handleToggleItemShareCategory(Party party, ItemShareType type, boolean toggle) {
-        playerParty.setSharingDrops(type, toggle);
+        party.setSharingDrops(type, toggle);
 
         String toggleMessage = LocaleLoader.getString("Commands.Party.ToggleShareCategory", StringUtils.getCapitalized(type.toString()), toggle ? "enabled" : "disabled");
 
-        for (Player member : playerParty.getOnlineMembers()) {
+        for (Player member : party.getOnlineMembers()) {
             member.sendMessage(toggleMessage);
         }
     }

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

@@ -9,30 +9,38 @@ import com.gmail.nossr50.datatypes.party.Party;
 import com.gmail.nossr50.datatypes.player.McMMOPlayer;
 import com.gmail.nossr50.locale.LocaleLoader;
 import com.gmail.nossr50.party.PartyManager;
+import com.gmail.nossr50.util.Misc;
 import com.gmail.nossr50.util.commands.CommandUtils;
 import com.gmail.nossr50.util.player.UserManager;
 
 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:
             case 3:
-                // Verify target exists and is in a different party than the player
+                String targetName = Misc.getMatchedPlayerName(args[1]);
-                if (!canJoinParty(sender, args[1])) {
+                McMMOPlayer mcMMOTarget = UserManager.getPlayer(targetName);
+
+                if (!CommandUtils.checkPlayerExistence(sender, targetName, mcMMOTarget)) {
                     return true;
                 }
 
-                mcMMOPlayer = UserManager.getPlayer((Player) sender);
+                Player target = mcMMOTarget.getPlayer();
-                player = mcMMOPlayer.getPlayer();
+
+                if (!mcMMOTarget.inParty()) {
+                    sender.sendMessage(LocaleLoader.getString("Party.PlayerNotInParty", targetName));
+                    return true;
+                }
+
+                Player player = (Player) sender;
+                McMMOPlayer mcMMOPlayer = UserManager.getPlayer(player);
+                Party targetParty = mcMMOTarget.getParty();
+
+                if (player.equals(target) || (mcMMOPlayer.inParty() && mcMMOPlayer.getParty().equals(targetParty))) {
+                    sender.sendMessage(LocaleLoader.getString("Party.Join.Self"));
+                    return true;
+                }
 
                 String password = getPassword(args);
 
@@ -41,12 +49,15 @@ public class PartyJoinCommand implements CommandExecutor {
                     return true;
                 }
 
+                String partyName = targetParty.getName();
+
                 // Changing parties
-                if (!PartyManager.changeOrJoinParty(mcMMOPlayer, player, playerParty, targetParty.getName())) {
+                if (!PartyManager.changeOrJoinParty(mcMMOPlayer, partyName)) {
                     return true;
                 }
 
-                PartyManager.joinParty(player, mcMMOPlayer, targetParty, password);
+                player.sendMessage(LocaleLoader.getString("Commands.Party.Join", partyName));
+                PartyManager.addToParty(mcMMOPlayer, targetParty);
                 return true;
 
             default:
@@ -62,32 +73,4 @@ public class PartyJoinCommand implements CommandExecutor {
 
         return null;
     }
-
-    private boolean canJoinParty(CommandSender sender, String targetName) {
-        mcMMOTarget = UserManager.getPlayer(targetName);
-
-        if (!CommandUtils.checkPlayerExistence(sender, targetName, mcMMOTarget)) {
-            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

@@ -22,7 +22,7 @@ public class PartyKickCommand implements CommandExecutor {
                 OfflinePlayer target = mcMMO.p.getServer().getOfflinePlayer(args[1]);
 
                 if (!playerParty.getMembers().contains(target.getName())) {
-                    sender.sendMessage(LocaleLoader.getString("Party.NotInYourParty", args[1]));
+                    sender.sendMessage(LocaleLoader.getString("Party.NotInYourParty", target.getName()));
                     return true;
                 }
 
@@ -34,6 +34,7 @@ public class PartyKickCommand implements CommandExecutor {
                         return true;
                     }
 
+                    PartyManager.processPartyLeaving(UserManager.getPlayer(onlineTarget));
                     onlineTarget.sendMessage(LocaleLoader.getString("Commands.Party.Kick", partyName));
                 }
 

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

@@ -12,19 +12,15 @@ import com.gmail.nossr50.util.commands.CommandUtils;
 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.getPermissionMessage());
+                    togglePartyLock(sender, true);
                 }
                 else if (args[0].equalsIgnoreCase("unlock")) {
-                    unlockParty(sender, command.getPermissionMessage());
+                    togglePartyLock(sender, false);
                 }
 
                 return true;
@@ -36,10 +32,10 @@ public class PartyLockCommand implements CommandExecutor {
                 }
 
                 if (CommandUtils.shouldEnableToggle(args[1])) {
-                    lockParty(sender, command.getPermissionMessage());
+                    togglePartyLock(sender, true);
                 }
                 else if (CommandUtils.shouldDisableToggle(args[1])) {
-                    unlockParty(sender, command.getPermissionMessage());
+                    togglePartyLock(sender, false);
                 }
                 else {
                     sendUsageStrings(sender);
@@ -53,46 +49,25 @@ public class PartyLockCommand implements CommandExecutor {
         }
     }
 
-    /**
-     * Handle locking a party.
-     */
-    private void lockParty(CommandSender sender, String permissionMessage) {
-        if (!Permissions.partySubcommand(sender, PartySubcommandType.LOCK)) {
-            sender.sendMessage(permissionMessage);
-            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, String permissionMessage) {
-        if (!Permissions.partySubcommand(sender, PartySubcommandType.UNLOCK)) {
-            sender.sendMessage(permissionMessage);
-            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"));
     }
+
+    private void togglePartyLock(CommandSender sender, boolean lock) {
+        Party party = UserManager.getPlayer((Player) sender).getParty();
+
+        if (!Permissions.partySubcommand(sender, lock ? PartySubcommandType.LOCK : PartySubcommandType.UNLOCK)) {
+            sender.sendMessage(LocaleLoader.getString("mcMMO.NoPermission"));
+            return;
+        }
+
+        if (lock ? party.isLocked() : !party.isLocked()) {
+            sender.sendMessage(LocaleLoader.getString("Party." + (lock ? "IsLocked" : "IsntLocked")));
+            return;
+        }
+
+        party.setLocked(lock);
+        sender.sendMessage(LocaleLoader.getString("Party." + (lock ? "Locked" : "Unlocked")));
+    }
 }

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

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

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

@@ -30,10 +30,9 @@ public class PartyRenameCommand implements CommandExecutor {
                 }
 
                 Player player = mcMMOPlayer.getPlayer();
-                Party newParty = PartyManager.getParty(newPartyName);
 
                 // Check to see if the party exists, and if it does cancel renaming the party
-                if (PartyManager.checkPartyExistence(player, newParty, newPartyName)) {
+                if (PartyManager.checkPartyExistence(player, newPartyName)) {
                     return true;
                 }
 

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

@@ -3,9 +3,8 @@ package com.gmail.nossr50.commands.party.teleport;
 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.party.PartyTeleportRecord;
 import com.gmail.nossr50.locale.LocaleLoader;
 import com.gmail.nossr50.util.Permissions;
 import com.gmail.nossr50.util.player.UserManager;
@@ -18,17 +17,16 @@ public class PtpAcceptAnyCommand implements CommandExecutor {
             return true;
         }
 
-        Player player = (Player) sender;
+        PartyTeleportRecord ptpRecord = UserManager.getPlayer(sender.getName()).getPartyTeleportRecord();
-        McMMOPlayer mcMMOPlayer = UserManager.getPlayer(player);
 
-        if (mcMMOPlayer.getPtpConfirmRequired()) {
+        if (ptpRecord.isConfirmRequired()) {
-            player.sendMessage(LocaleLoader.getString("Commands.ptp.AcceptAny.Disabled"));
+            sender.sendMessage(LocaleLoader.getString("Commands.ptp.AcceptAny.Disabled"));
         }
         else {
-            player.sendMessage(LocaleLoader.getString("Commands.ptp.AcceptAny.Enabled"));
+            sender.sendMessage(LocaleLoader.getString("Commands.ptp.AcceptAny.Enabled"));
         }
 
-        mcMMOPlayer.togglePtpConfirmRequired();
+        ptpRecord.toggleConfirmRequired();
         return true;
     }
 }

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

@@ -7,7 +7,7 @@ import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 
 import com.gmail.nossr50.config.Config;
-import com.gmail.nossr50.datatypes.player.McMMOPlayer;
+import com.gmail.nossr50.datatypes.party.PartyTeleportRecord;
 import com.gmail.nossr50.locale.LocaleLoader;
 import com.gmail.nossr50.util.Misc;
 import com.gmail.nossr50.util.Permissions;
@@ -22,21 +22,21 @@ public class PtpAcceptCommand implements CommandExecutor {
         }
 
         Player player = (Player) sender;
-        McMMOPlayer mcMMOPlayer = UserManager.getPlayer(player);
+        PartyTeleportRecord ptpRecord = UserManager.getPlayer(player).getPartyTeleportRecord();
 
-        if (!mcMMOPlayer.hasPtpRequest()) {
+        if (!ptpRecord.hasRequest()) {
             player.sendMessage(LocaleLoader.getString("Commands.ptp.NoRequests"));
             return true;
         }
 
-        if ((mcMMOPlayer.getPtpTimeout() + Config.getInstance().getPTPCommandTimeout()) * Misc.TIME_CONVERSION_FACTOR < System.currentTimeMillis()) {
+        if ((ptpRecord.getTimeout() + Config.getInstance().getPTPCommandTimeout()) * Misc.TIME_CONVERSION_FACTOR < System.currentTimeMillis()) {
-            mcMMOPlayer.removePtpRequest();
+            ptpRecord.removeRequest();
             player.sendMessage(LocaleLoader.getString("Commands.ptp.RequestExpired"));
             return true;
         }
 
-        Player target = mcMMOPlayer.getPtpRequest();
+        Player target = ptpRecord.getRequestor();
-        mcMMOPlayer.removePtpRequest();
+        ptpRecord.removeRequest();
 
         if (!PtpCommand.canTeleport(sender, player, target.getName())) {
             return true;

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

@@ -13,22 +13,21 @@ import org.bukkit.util.StringUtil;
 
 import com.gmail.nossr50.mcMMO;
 import com.gmail.nossr50.config.Config;
+import com.gmail.nossr50.datatypes.party.PartyTeleportRecord;
 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.runnables.items.TeleportationWarmup;
+import com.gmail.nossr50.util.EventUtils;
 import com.gmail.nossr50.util.Misc;
 import com.gmail.nossr50.util.Permissions;
 import com.gmail.nossr50.util.commands.CommandUtils;
 import com.gmail.nossr50.util.player.UserManager;
 import com.gmail.nossr50.util.skills.SkillUtils;
+
 import com.google.common.collect.ImmutableList;
 
 public class PtpCommand implements TabExecutor {
-    private static Player target;
-    private static McMMOPlayer mcMMOTarget;
-
     public static final List<String> TELEPORT_SUBCOMMANDS = ImmutableList.of("toggle", "accept", "acceptany", "acceptall");
 
     private CommandExecutor ptpToggleCommand = new PtpToggleCommand();
@@ -76,10 +75,10 @@ public class PtpCommand implements TabExecutor {
                 }
 
                 int ptpCooldown = Config.getInstance().getPTPCommandCooldown();
-                long lastTeleport = mcMMOPlayer.getLastTeleport();
+                long ptpLastUse = mcMMOPlayer.getPartyTeleportRecord().getLastUse();
 
                 if (ptpCooldown > 0) {
-                    int timeRemaining = SkillUtils.calculateTimeLeft(lastTeleport * Misc.TIME_CONVERSION_FACTOR, ptpCooldown, player);
+                    int timeRemaining = SkillUtils.calculateTimeLeft(ptpLastUse * Misc.TIME_CONVERSION_FACTOR, ptpCooldown, player);
 
                     if (timeRemaining > 0) {
                         player.sendMessage(LocaleLoader.getString("Item.Generic.Wait", timeRemaining));
@@ -87,7 +86,7 @@ public class PtpCommand implements TabExecutor {
                     }
                 }
 
-                sendTeleportRequest(sender, player, args[0]);
+                sendTeleportRequest(sender, player, Misc.getMatchedPlayerName(args[0]));
                 return true;
 
             default:
@@ -102,7 +101,7 @@ public class PtpCommand implements TabExecutor {
                 List<String> matches = StringUtil.copyPartialMatches(args[0], TELEPORT_SUBCOMMANDS, new ArrayList<String>(TELEPORT_SUBCOMMANDS.size()));
 
                 if (matches.size() == 0) {
-                    Set<String> playerNames = UserManager.getPlayers().keySet();
+                    Set<String> playerNames = UserManager.getPlayerNames();
                     return StringUtil.copyPartialMatches(args[0], playerNames, new ArrayList<String>(playerNames.size()));
                 }
 
@@ -117,13 +116,18 @@ public class PtpCommand implements TabExecutor {
             return;
         }
 
-        if (!mcMMOTarget.getPtpConfirmRequired()) {
+        McMMOPlayer mcMMOTarget = UserManager.getPlayer(targetName);
+        Player target = mcMMOTarget.getPlayer();
+
+        PartyTeleportRecord ptpRecord = mcMMOTarget.getPartyTeleportRecord();
+
+        if (!ptpRecord.isConfirmRequired()) {
             handleTeleportWarmup(player, target);
             return;
         }
 
-        mcMMOTarget.setPtpRequest(player);
+        ptpRecord.setRequestor(player);
-        mcMMOTarget.actualizePtpTimeout();
+        ptpRecord.actualizeTimeout();
 
         player.sendMessage(LocaleLoader.getString("Commands.Invite.Success"));
 
@@ -132,14 +136,13 @@ public class PtpCommand implements TabExecutor {
     }
 
     protected static boolean canTeleport(CommandSender sender, Player player, String targetName) {
-        mcMMOTarget = UserManager.getPlayer(targetName);
+        McMMOPlayer mcMMOTarget = UserManager.getPlayer(targetName);
 
         if (!CommandUtils.checkPlayerExistence(sender, targetName, mcMMOTarget)) {
             return false;
         }
 
-        target = mcMMOTarget.getPlayer();
+        Player target = mcMMOTarget.getPlayer();
-        targetName = target.getName();
 
         if (player.equals(target)) {
             player.sendMessage(LocaleLoader.getString("Party.Teleport.Self"));
@@ -151,7 +154,7 @@ public class PtpCommand implements TabExecutor {
             return false;
         }
 
-        if (!mcMMOTarget.getPtpEnabled()) {
+        if (!mcMMOTarget.getPartyTeleportRecord().isEnabled()) {
             player.sendMessage(LocaleLoader.getString("Party.Teleport.Disabled", targetName));
             return false;
         }
@@ -166,7 +169,7 @@ public class PtpCommand implements TabExecutor {
 
     protected static void handleTeleportWarmup(Player teleportingPlayer, Player targetPlayer) {
         McMMOPlayer mcMMOPlayer = UserManager.getPlayer(teleportingPlayer);
-        mcMMOTarget = UserManager.getPlayer(targetPlayer);
+        McMMOPlayer mcMMOTarget = UserManager.getPlayer(targetPlayer);
 
         long warmup = Config.getInstance().getPTPCommandWarmup();
 
@@ -177,25 +180,7 @@ public class PtpCommand implements TabExecutor {
             new TeleportationWarmup(mcMMOPlayer, mcMMOTarget).runTaskLater(mcMMO.p, 20 * warmup);
         }
         else {
-            handlePartyTeleportEvent(teleportingPlayer, targetPlayer);
+            EventUtils.handlePartyTeleportEvent(teleportingPlayer, targetPlayer);
         }
     }
-
-    public static void handlePartyTeleportEvent(Player teleportingPlayer, Player targetPlayer) {
-        McMMOPlayer mcMMOPlayer = UserManager.getPlayer(teleportingPlayer);
-        McMMOPartyTeleportEvent event = new McMMOPartyTeleportEvent(teleportingPlayer, targetPlayer, mcMMOPlayer.getParty().getName());
-
-        mcMMO.p.getServer().getPluginManager().callEvent(event);
-
-        if (event.isCancelled()) {
-            return;
-        }
-
-        teleportingPlayer.teleport(targetPlayer);
-
-        teleportingPlayer.sendMessage(LocaleLoader.getString("Party.Teleport.Player", targetPlayer.getName()));
-        targetPlayer.sendMessage(LocaleLoader.getString("Party.Teleport.Target", teleportingPlayer.getName()));
-
-        mcMMOPlayer.actualizeRecentlyHurt();
-    }
 }

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

@@ -3,9 +3,8 @@ package com.gmail.nossr50.commands.party.teleport;
 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.party.PartyTeleportRecord;
 import com.gmail.nossr50.locale.LocaleLoader;
 import com.gmail.nossr50.util.Permissions;
 import com.gmail.nossr50.util.player.UserManager;
@@ -18,17 +17,16 @@ public class PtpToggleCommand implements CommandExecutor {
             return true;
         }
 
-        Player player = (Player) sender;
+        PartyTeleportRecord ptpRecord = UserManager.getPlayer(sender.getName()).getPartyTeleportRecord();
-        McMMOPlayer mcMMOPlayer = UserManager.getPlayer(player);
 
-        if (mcMMOPlayer.getPtpEnabled()) {
+        if (ptpRecord.isEnabled()) {
-            player.sendMessage(LocaleLoader.getString("Commands.ptp.Disabled"));
+            sender.sendMessage(LocaleLoader.getString("Commands.ptp.Disabled"));
         }
         else {
-            player.sendMessage(LocaleLoader.getString("Commands.ptp.Enabled"));
+            sender.sendMessage(LocaleLoader.getString("Commands.ptp.Enabled"));
         }
 
-        mcMMOPlayer.togglePtpUse();
+        ptpRecord.toggleEnabled();
         return true;
     }
 }

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

@@ -10,11 +10,13 @@ import org.bukkit.command.TabExecutor;
 import org.bukkit.entity.Player;
 import org.bukkit.util.StringUtil;
 
+import com.gmail.nossr50.mcMMO;
 import com.gmail.nossr50.config.Config;
 import com.gmail.nossr50.datatypes.player.McMMOPlayer;
 import com.gmail.nossr50.datatypes.player.PlayerProfile;
 import com.gmail.nossr50.datatypes.skills.SkillType;
 import com.gmail.nossr50.locale.LocaleLoader;
+import com.gmail.nossr50.util.Misc;
 import com.gmail.nossr50.util.Permissions;
 import com.gmail.nossr50.util.commands.CommandUtils;
 import com.gmail.nossr50.util.player.UserManager;
@@ -27,44 +29,42 @@ public class InspectCommand implements TabExecutor {
     public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
         switch (args.length) {
             case 1:
-                if (sender instanceof Player && Config.getInstance().getInspectScoreboardEnabled()) {
+                String playerName = Misc.getMatchedPlayerName(args[0]);
-                    ScoreboardManager.setupPlayerScoreboard(sender.getName());
+                McMMOPlayer mcMMOPlayer = UserManager.getPlayer(playerName, 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) {
-                    PlayerProfile profile = new PlayerProfile(args[0], false); // Temporary Profile
+                    PlayerProfile profile = mcMMO.getDatabaseManager().loadPlayerProfile(playerName, false); // Temporary Profile
 
                     if (CommandUtils.inspectOffline(sender, profile, Permissions.inspectOffline(sender))) {
                         return true;
                     }
 
-                    if (sender instanceof Player && Config.getInstance().getInspectScoreboardEnabled()) {
+                    if (sender instanceof Player && Config.getInstance().getInspectUseBoard()) {
-                        ScoreboardManager.enablePlayerInspectScoreboardOffline((Player) sender, profile);
+                        ScoreboardManager.enablePlayerInspectScoreboard((Player) sender, profile);
-                        return true;
+
+                        if (!Config.getInstance().getInspectUseChat()) {
+                            return true;
+                        }
                     }
 
-                    sender.sendMessage(LocaleLoader.getString("Inspect.OfflineStats", args[0]));
+                    sender.sendMessage(LocaleLoader.getString("Inspect.OfflineStats", playerName));
 
                     sender.sendMessage(LocaleLoader.getString("Stats.Header.Gathering"));
-                    CommandUtils.displaySkill(sender, profile, SkillType.EXCAVATION);
+                    for (SkillType skill : SkillType.GATHERING_SKILLS) {
-                    CommandUtils.displaySkill(sender, profile, SkillType.FISHING);
+                        sender.sendMessage(CommandUtils.displaySkill(profile, skill));
-                    CommandUtils.displaySkill(sender, profile, SkillType.HERBALISM);
+                    }
-                    CommandUtils.displaySkill(sender, profile, SkillType.MINING);
-                    CommandUtils.displaySkill(sender, profile, SkillType.WOODCUTTING);
 
                     sender.sendMessage(LocaleLoader.getString("Stats.Header.Combat"));
-                    CommandUtils.displaySkill(sender, profile, SkillType.AXES);
+                    for (SkillType skill : SkillType.COMBAT_SKILLS) {
-                    CommandUtils.displaySkill(sender, profile, SkillType.ARCHERY);
+                        sender.sendMessage(CommandUtils.displaySkill(profile, skill));
-                    CommandUtils.displaySkill(sender, profile, SkillType.SWORDS);
+                    }
-                    CommandUtils.displaySkill(sender, profile, SkillType.TAMING);
-                    CommandUtils.displaySkill(sender, profile, SkillType.UNARMED);
 
                     sender.sendMessage(LocaleLoader.getString("Stats.Header.Misc"));
-                    CommandUtils.displaySkill(sender, profile, SkillType.ACROBATICS);
+                    for (SkillType skill : SkillType.MISC_SKILLS) {
-                    CommandUtils.displaySkill(sender, profile, SkillType.REPAIR);
+                        sender.sendMessage(CommandUtils.displaySkill(profile, skill));
+                    }
+
                 }
                 else {
                     Player target = mcMMOPlayer.getPlayer();
@@ -79,9 +79,12 @@ public class InspectCommand implements TabExecutor {
                         return true;
                     }
 
-                    if (sender instanceof Player && Config.getInstance().getInspectScoreboardEnabled()) {
+                    if (sender instanceof Player && Config.getInstance().getInspectUseBoard()) {
-                        ScoreboardManager.enablePlayerInspectScoreboardOnline((Player) sender, mcMMOPlayer);
+                        ScoreboardManager.enablePlayerInspectScoreboard((Player) sender, mcMMOPlayer.getProfile());
-                        return true;
+
+                        if (!Config.getInstance().getInspectUseChat()) {
+                            return true;
+                        }
                     }
 
                     sender.sendMessage(LocaleLoader.getString("Inspect.Stats", target.getName()));
@@ -102,7 +105,7 @@ public class InspectCommand implements TabExecutor {
     public List<String> onTabComplete(CommandSender sender, Command command, String alias, String[] args) {
         switch (args.length) {
             case 1:
-                Set<String> playerNames = UserManager.getPlayers().keySet();
+                Set<String> playerNames = UserManager.getPlayerNames();
                 return StringUtil.copyPartialMatches(args[0], playerNames, new ArrayList<String>(playerNames.size()));
             default:
                 return ImmutableList.of();

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

@@ -0,0 +1,70 @@
+package com.gmail.nossr50.commands.player;
+
+import java.util.List;
+
+import org.bukkit.command.Command;
+import org.bukkit.command.CommandSender;
+import org.bukkit.command.TabExecutor;
+import org.bukkit.entity.Player;
+
+import com.gmail.nossr50.config.Config;
+import com.gmail.nossr50.datatypes.player.McMMOPlayer;
+import com.gmail.nossr50.datatypes.skills.AbilityType;
+import com.gmail.nossr50.locale.LocaleLoader;
+import com.gmail.nossr50.util.commands.CommandUtils;
+import com.gmail.nossr50.util.player.UserManager;
+import com.gmail.nossr50.util.scoreboards.ScoreboardManager;
+
+import com.google.common.collect.ImmutableList;
+
+public class MccooldownCommand implements TabExecutor {
+    @Override
+    public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
+        if (CommandUtils.noConsoleUsage(sender)) {
+            return true;
+        }
+
+        switch (args.length) {
+            case 0:
+                Player player = (Player) sender;
+
+                if (Config.getInstance().getCooldownUseBoard()) {
+                    ScoreboardManager.enablePlayerCooldownScoreboard(player);
+
+                    if (!Config.getInstance().getCooldownUseChat()) {
+                        return true;
+                    }
+                }
+
+                McMMOPlayer mcMMOPlayer = UserManager.getPlayer(player);
+
+                player.sendMessage(LocaleLoader.getString("Commands.Cooldowns.Header"));
+                player.sendMessage(LocaleLoader.getString("mcMMO.NoSkillNote"));
+
+                for (AbilityType ability : AbilityType.NORMAL_ABILITIES) {
+                    if (!ability.getPermissions(player)) {
+                        continue;
+                    }
+
+                    int seconds = mcMMOPlayer.calculateTimeRemaining(ability);
+
+                    if (seconds <= 0) {
+                        player.sendMessage(LocaleLoader.getString("Commands.Cooldowns.Row.Y", ability.getName()));
+                    }
+                    else {
+                        player.sendMessage(LocaleLoader.getString("Commands.Cooldowns.Row.N", ability.getName(), seconds));
+                    }
+                }
+
+                return true;
+
+            default:
+                return false;
+        }
+    }
+
+    @Override
+    public List<String> onTabComplete(CommandSender sender, Command command, String alias, String[] args) {
+        return ImmutableList.of();
+    }
+}

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

@@ -13,12 +13,13 @@ import org.bukkit.util.StringUtil;
 import com.gmail.nossr50.mcMMO;
 import com.gmail.nossr50.config.Config;
 import com.gmail.nossr50.datatypes.player.McMMOPlayer;
-import com.gmail.nossr50.datatypes.player.PlayerProfile;
+import com.gmail.nossr50.locale.LocaleLoader;
 import com.gmail.nossr50.runnables.commands.McrankCommandAsyncTask;
+import com.gmail.nossr50.util.Misc;
 import com.gmail.nossr50.util.Permissions;
 import com.gmail.nossr50.util.commands.CommandUtils;
 import com.gmail.nossr50.util.player.UserManager;
-import com.gmail.nossr50.util.scoreboards.ScoreboardManager;
+
 import com.google.common.collect.ImmutableList;
 
 public class McrankCommand implements TabExecutor {
@@ -35,13 +36,7 @@ public class McrankCommand implements TabExecutor {
                     return true;
                 }
 
-                if (Config.getInstance().getMcrankScoreboardEnabled()) {
+                display(sender, sender.getName());
-                    ScoreboardManager.setupPlayerScoreboard(sender.getName());
-                    ScoreboardManager.enablePlayerRankScoreboard((Player) sender);
-                }
-                else {
-                    display(sender, sender.getName());
-                }
 
                 return true;
 
@@ -51,27 +46,22 @@ public class McrankCommand implements TabExecutor {
                     return true;
                 }
 
-                String playerName = args[0];
+                String playerName = Misc.getMatchedPlayerName(args[0]);
-                McMMOPlayer mcMMOPlayer = UserManager.getPlayer(playerName);
+                McMMOPlayer mcMMOPlayer = UserManager.getPlayer(playerName, true);
 
                 if (mcMMOPlayer != null) {
-                    playerName = mcMMOPlayer.getPlayer().getName();
+                    Player player = mcMMOPlayer.getPlayer();
+                    playerName = player.getName();
 
-                    if (CommandUtils.tooFar(sender, mcMMOPlayer.getPlayer(), Permissions.mcrankFar(sender))) {
+                    if (CommandUtils.tooFar(sender, player, Permissions.mcrankFar(sender))) {
                         return true;
                     }
                 }
-                else if (CommandUtils.inspectOffline(sender, new PlayerProfile(playerName, false), Permissions.mcrankOffline(sender))) {
+                else if (CommandUtils.inspectOffline(sender, mcMMO.getDatabaseManager().loadPlayerProfile(playerName, false), Permissions.mcrankOffline(sender))) {
                     return true;
                 }
 
-                if (sender instanceof Player && Config.getInstance().getMcrankScoreboardEnabled()) {
+                display(sender, playerName);
-                    ScoreboardManager.setupPlayerScoreboard(sender.getName());
-                    ScoreboardManager.enablePlayerRankScoreboardOthers((Player) sender, playerName);
-                }
-                else {
-                    display(sender, playerName);
-                }
                 return true;
 
             default:
@@ -83,7 +73,7 @@ public class McrankCommand implements TabExecutor {
     public List<String> onTabComplete(CommandSender sender, Command command, String alias, String[] args) {
         switch (args.length) {
             case 1:
-                Set<String> playerNames = UserManager.getPlayers().keySet();
+                Set<String> playerNames = UserManager.getPlayerNames();
                 return StringUtil.copyPartialMatches(args[0], playerNames, new ArrayList<String>(playerNames.size()));
             default:
                 return ImmutableList.of();
@@ -91,6 +81,20 @@ public class McrankCommand implements TabExecutor {
     }
 
     private void display(CommandSender sender, String playerName) {
-        new McrankCommandAsyncTask(playerName, sender).runTaskAsynchronously(mcMMO.p);
+        if (sender instanceof Player) {
+            McMMOPlayer mcMMOPlayer = UserManager.getPlayer(sender.getName());
+
+            if (mcMMOPlayer.getDatabaseATS() + Misc.PLAYER_DATABASE_COOLDOWN_MILLIS > System.currentTimeMillis()) {
+                sender.sendMessage(LocaleLoader.getString("Commands.Database.Cooldown"));
+                return;
+            }
+
+            mcMMOPlayer.actualizeDatabaseATS();
+        }
+
+        boolean useBoard = (sender instanceof Player) && (Config.getInstance().getRankUseBoard());
+        boolean useChat = useBoard ? Config.getInstance().getRankUseChat() : true;
+
+        new McrankCommandAsyncTask(playerName, sender, useBoard, useChat).runTaskAsynchronously(mcMMO.p);
     }
 }

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

@@ -8,11 +8,11 @@ import org.bukkit.command.TabExecutor;
 import org.bukkit.entity.Player;
 
 import com.gmail.nossr50.config.Config;
-import com.gmail.nossr50.datatypes.player.McMMOPlayer;
 import com.gmail.nossr50.locale.LocaleLoader;
 import com.gmail.nossr50.util.commands.CommandUtils;
 import com.gmail.nossr50.util.player.UserManager;
 import com.gmail.nossr50.util.scoreboards.ScoreboardManager;
+
 import com.google.common.collect.ImmutableList;
 
 public class McstatsCommand implements TabExecutor {
@@ -25,28 +25,29 @@ public class McstatsCommand implements TabExecutor {
         switch (args.length) {
             case 0:
                 Player player = (Player) sender;
-                McMMOPlayer mcMMOPlayer = UserManager.getPlayer(player);
 
-                if (Config.getInstance().getMcstatsScoreboardsEnabled()) {
+                if (Config.getInstance().getStatsUseBoard()) {
-                    ScoreboardManager.setupPlayerScoreboard(player.getName());
+                    ScoreboardManager.enablePlayerStatsScoreboard(player);
-                    ScoreboardManager.enablePlayerStatsScoreboard(mcMMOPlayer);
+
+                    if (!Config.getInstance().getStatsUseChat()) {
+                        return true;
+                    }
+                }
+
+                player.sendMessage(LocaleLoader.getString("Stats.Own.Stats"));
+                player.sendMessage(LocaleLoader.getString("mcMMO.NoSkillNote"));
+
+                CommandUtils.printGatheringSkills(player);
+                CommandUtils.printCombatSkills(player);
+                CommandUtils.printMiscSkills(player);
+
+                int powerLevelCap = Config.getInstance().getPowerLevelCap();
+
+                if (powerLevelCap != Integer.MAX_VALUE) {
+                    player.sendMessage(LocaleLoader.getString("Commands.PowerLevel.Capped", UserManager.getPlayer(player).getPowerLevel(), powerLevelCap));
                 }
                 else {
-                    player.sendMessage(LocaleLoader.getString("Stats.Own.Stats"));
+                    player.sendMessage(LocaleLoader.getString("Commands.PowerLevel", UserManager.getPlayer(player).getPowerLevel()));
-                    player.sendMessage(LocaleLoader.getString("mcMMO.NoSkillNote"));
-
-                    CommandUtils.printGatheringSkills(player);
-                    CommandUtils.printCombatSkills(player);
-                    CommandUtils.printMiscSkills(player);
-
-                    int powerLevelCap = Config.getInstance().getPowerLevelCap();
-
-                    if (powerLevelCap != Integer.MAX_VALUE) {
-                        player.sendMessage(LocaleLoader.getString("Commands.PowerLevel.Capped", UserManager.getPlayer(player).getPowerLevel(), powerLevelCap));
-                    }
-                    else {
-                        player.sendMessage(LocaleLoader.getString("Commands.PowerLevel", UserManager.getPlayer(player).getPowerLevel()));
-                    }
                 }
 
                 return true;

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

@@ -11,36 +11,41 @@ import org.bukkit.util.StringUtil;
 
 import com.gmail.nossr50.mcMMO;
 import com.gmail.nossr50.config.Config;
+import com.gmail.nossr50.datatypes.player.McMMOPlayer;
 import com.gmail.nossr50.datatypes.skills.SkillType;
+import com.gmail.nossr50.locale.LocaleLoader;
 import com.gmail.nossr50.runnables.commands.MctopCommandAsyncTask;
+import com.gmail.nossr50.util.Misc;
 import com.gmail.nossr50.util.Permissions;
 import com.gmail.nossr50.util.StringUtils;
 import com.gmail.nossr50.util.commands.CommandUtils;
-import com.gmail.nossr50.util.scoreboards.ScoreboardManager;
+import com.gmail.nossr50.util.player.UserManager;
 
 import com.google.common.collect.ImmutableList;
 
 public class MctopCommand implements TabExecutor {
-    private SkillType skill;
-
     @Override
     public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
+        SkillType skill = null;
+
         switch (args.length) {
             case 0:
-                display(1, "ALL", sender, command);
+                display(1, skill, sender, command);
                 return true;
 
             case 1:
                 if (StringUtils.isInt(args[0])) {
-                    display(Math.abs(Integer.parseInt(args[0])), "ALL", sender, command);
+                    display(Math.abs(Integer.parseInt(args[0])), skill, sender, command);
                     return true;
                 }
 
-                if (!extractSkill(sender, args[0])) {
+                skill = extractSkill(sender, args[0]);
+
+                if (skill == null) {
                     return true;
                 }
 
-                display(1, skill.toString(), sender, command);
+                display(1, skill, sender, command);
                 return true;
 
             case 2:
@@ -48,11 +53,13 @@ public class MctopCommand implements TabExecutor {
                     return true;
                 }
 
-                if (!extractSkill(sender, args[0])) {
+                skill = extractSkill(sender, args[0]);
+
+                if (skill == null) {
                     return true;
                 }
 
-                display(Math.abs(Integer.parseInt(args[1])), skill.toString(), sender, command);
+                display(Math.abs(Integer.parseInt(args[1])), skill, sender, command);
                 return true;
 
             default:
@@ -70,35 +77,44 @@ public class MctopCommand implements TabExecutor {
         }
     }
 
-    private void display(int page, String skill, CommandSender sender, Command command) {
+    private void display(int page, SkillType skill, CommandSender sender, Command command) {
-        if (!skill.equalsIgnoreCase("all") && !Permissions.mctop(sender, this.skill)) {
+        if (skill != null && !Permissions.mctop(sender, skill)) {
             sender.sendMessage(command.getPermissionMessage());
             return;
         }
 
-        if (sender instanceof Player && Config.getInstance().getMctopScoreboardEnabled()) {
+        if (sender instanceof Player) {
-            ScoreboardManager.enableGlobalStatsScoreboard((Player) sender, skill, page);
+            McMMOPlayer mcMMOPlayer = UserManager.getPlayer(sender.getName());
-        }
+
-        else {
+            if (mcMMOPlayer.getDatabaseATS() + Misc.PLAYER_DATABASE_COOLDOWN_MILLIS > System.currentTimeMillis()) {
-            display(page, skill, sender);
+                sender.sendMessage(LocaleLoader.getString("Commands.Database.Cooldown"));
+                return;
+            }
+
+            mcMMOPlayer.actualizeDatabaseATS();
         }
+
+        display(page, skill, sender);
     }
 
-    private void display(int page, String query, CommandSender sender) {
+    private void display(int page, SkillType skill, CommandSender sender) {
-        new MctopCommandAsyncTask(page, query, sender).runTaskAsynchronously(mcMMO.p);
+        boolean useBoard = (sender instanceof Player) && (Config.getInstance().getTopUseBoard());
+        boolean useChat = useBoard ? Config.getInstance().getTopUseChat() : true;
+
+        new MctopCommandAsyncTask(page, skill, sender, useBoard, useChat).runTaskAsynchronously(mcMMO.p);
     }
 
-    private boolean extractSkill(CommandSender sender, String skillName) {
+    private SkillType extractSkill(CommandSender sender, String skillName) {
         if (CommandUtils.isInvalidSkill(sender, skillName)) {
-            return false;
+            return null;
         }
 
-        skill = SkillType.getSkill(skillName);
+        SkillType skill = SkillType.getSkill(skillName);
 
         if (CommandUtils.isChildSkill(sender, skill)) {
-            return false;
+            return null;
         }
 
-        return true;
+        return skill;
     }
 }

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

@@ -1,5 +1,10 @@
 package com.gmail.nossr50.commands.skills;
 
+import java.util.ArrayList;
+import java.util.List;
+
+import org.bukkit.entity.Player;
+
 import com.gmail.nossr50.datatypes.skills.SkillType;
 import com.gmail.nossr50.locale.LocaleLoader;
 import com.gmail.nossr50.skills.acrobatics.Acrobatics;
@@ -22,75 +27,71 @@ public class AcrobaticsCommand extends SkillCommand {
     }
 
     @Override
-    protected void dataCalculations() {
+    protected void dataCalculations(Player player, float skillValue, boolean isLucky) {
         // DODGE
         if (canDodge) {
-            String[] dodgeStrings = calculateAbilityDisplayValues(Acrobatics.dodgeMaxBonusLevel, Acrobatics.dodgeMaxChance);
+            String[] dodgeStrings = calculateAbilityDisplayValues(skillValue, Acrobatics.dodgeMaxBonusLevel, Acrobatics.dodgeMaxChance, isLucky);
             dodgeChance = dodgeStrings[0];
             dodgeChanceLucky = dodgeStrings[1];
         }
 
         // ROLL
         if (canRoll) {
-            String[] rollStrings = calculateAbilityDisplayValues(Acrobatics.rollMaxBonusLevel, Acrobatics.rollMaxChance);
+            String[] rollStrings = calculateAbilityDisplayValues(skillValue, Acrobatics.rollMaxBonusLevel, Acrobatics.rollMaxChance, isLucky);
             rollChance = rollStrings[0];
             rollChanceLucky = rollStrings[1];
         }
 
         // GRACEFUL ROLL
         if (canGracefulRoll) {
-            String[] gracefulRollStrings = calculateAbilityDisplayValues(Acrobatics.gracefulRollMaxBonusLevel, Acrobatics.gracefulRollMaxChance);
+            String[] gracefulRollStrings = calculateAbilityDisplayValues(skillValue, Acrobatics.gracefulRollMaxBonusLevel, Acrobatics.gracefulRollMaxChance, isLucky);
             gracefulRollChance = gracefulRollStrings[0];
             gracefulRollChanceLucky = gracefulRollStrings[1];
         }
     }
 
     @Override
-    protected void permissionsCheck() {
+    protected void permissionsCheck(Player player) {
         canDodge = Permissions.dodge(player);
         canRoll = Permissions.roll(player);
         canGracefulRoll = Permissions.gracefulRoll(player);
     }
 
     @Override
-    protected boolean effectsHeaderPermissions() {
+    protected List<String> effectsDisplay() {
-        return canDodge || canGracefulRoll || canRoll;
+        List<String> messages = new ArrayList<String>();
-    }
-
-    @Override
-    protected void effectsDisplay() {
-        luckyEffectsDisplay();
 
         if (canRoll) {
-            player.sendMessage(LocaleLoader.getString("Effects.Template", LocaleLoader.getString("Acrobatics.Effect.0"), LocaleLoader.getString("Acrobatics.Effect.1")));
+            messages.add(LocaleLoader.getString("Effects.Template", LocaleLoader.getString("Acrobatics.Effect.0"), LocaleLoader.getString("Acrobatics.Effect.1")));
         }
 
         if (canGracefulRoll) {
-            player.sendMessage(LocaleLoader.getString("Effects.Template", LocaleLoader.getString("Acrobatics.Effect.2"), LocaleLoader.getString("Acrobatics.Effect.3")));
+            messages.add(LocaleLoader.getString("Effects.Template", LocaleLoader.getString("Acrobatics.Effect.2"), LocaleLoader.getString("Acrobatics.Effect.3")));
         }
 
         if (canDodge) {
-            player.sendMessage(LocaleLoader.getString("Effects.Template", LocaleLoader.getString("Acrobatics.Effect.4"), LocaleLoader.getString("Acrobatics.Effect.5")));
+            messages.add(LocaleLoader.getString("Effects.Template", LocaleLoader.getString("Acrobatics.Effect.4"), LocaleLoader.getString("Acrobatics.Effect.5")));
         }
+
+        return messages;
     }
 
     @Override
-    protected boolean statsHeaderPermissions() {
+    protected List<String> statsDisplay(Player player, float skillValue, boolean hasEndurance, boolean isLucky) {
-        return canDodge || canGracefulRoll || canRoll;
+        List<String> messages = new ArrayList<String>();
-    }
 
-    @Override
-    protected void statsDisplay() {
         if (canRoll) {
-            player.sendMessage(LocaleLoader.getString("Acrobatics.Roll.Chance", rollChance) + (isLucky ? LocaleLoader.getString("Perks.lucky.bonus", rollChanceLucky) : ""));
+            messages.add(LocaleLoader.getString("Acrobatics.Roll.Chance", rollChance) + (isLucky ? LocaleLoader.getString("Perks.Lucky.Bonus", rollChanceLucky) : ""));
         }
 
         if (canGracefulRoll) {
-            player.sendMessage(LocaleLoader.getString("Acrobatics.Roll.GraceChance", gracefulRollChance) + (isLucky ? LocaleLoader.getString("Perks.lucky.bonus", gracefulRollChanceLucky) : ""));
+            messages.add(LocaleLoader.getString("Acrobatics.Roll.GraceChance", gracefulRollChance) + (isLucky ? LocaleLoader.getString("Perks.Lucky.Bonus", gracefulRollChanceLucky) : ""));
         }
 
         if (canDodge) {
-            player.sendMessage(LocaleLoader.getString("Acrobatics.DodgeChance", dodgeChance) + (isLucky ? LocaleLoader.getString("Perks.lucky.bonus", dodgeChanceLucky) : ""));
+            messages.add(LocaleLoader.getString("Acrobatics.DodgeChance", dodgeChance) + (isLucky ? LocaleLoader.getString("Perks.Lucky.Bonus", dodgeChanceLucky) : ""));
         }
+
+        return messages;
     }
 }

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

@@ -1,5 +1,10 @@
 package com.gmail.nossr50.commands.skills;
 
+import java.util.ArrayList;
+import java.util.List;
+
+import org.bukkit.entity.Player;
+
 import com.gmail.nossr50.datatypes.skills.SkillType;
 import com.gmail.nossr50.locale.LocaleLoader;
 import com.gmail.nossr50.skills.archery.Archery;
@@ -21,7 +26,7 @@ public class ArcheryCommand extends SkillCommand {
     }
 
     @Override
-    protected void dataCalculations() {
+    protected void dataCalculations(Player player, float skillValue, boolean isLucky) {
         // SKILL SHOT
         if (canSkillShot) {
             double bonus = (skillValue / Archery.skillShotIncreaseLevel) * Archery.skillShotIncreasePercentage;
@@ -30,65 +35,61 @@ public class ArcheryCommand extends SkillCommand {
 
         // DAZE
         if (canDaze) {
-            String[] dazeStrings = calculateAbilityDisplayValues(Archery.dazeMaxBonusLevel, Archery.dazeMaxBonus);
+            String[] dazeStrings = calculateAbilityDisplayValues(skillValue, Archery.dazeMaxBonusLevel, Archery.dazeMaxBonus, isLucky);
             dazeChance = dazeStrings[0];
             dazeChanceLucky = dazeStrings[1];
         }
 
         // RETRIEVE
         if (canRetrieve) {
-            String[] retrieveStrings = calculateAbilityDisplayValues(Archery.retrieveMaxBonusLevel, Archery.retrieveMaxChance);
+            String[] retrieveStrings = calculateAbilityDisplayValues(skillValue, Archery.retrieveMaxBonusLevel, Archery.retrieveMaxChance, isLucky);
             retrieveChance = retrieveStrings[0];
             retrieveChanceLucky = retrieveStrings[1];
         }
     }
 
     @Override
-    protected void permissionsCheck() {
+    protected void permissionsCheck(Player player) {
         canSkillShot = Permissions.bonusDamage(player, skill);
         canDaze = Permissions.daze(player);
         canRetrieve = Permissions.arrowRetrieval(player);
     }
 
     @Override
-    protected boolean effectsHeaderPermissions() {
+    protected List<String> effectsDisplay() {
-        return canSkillShot || canDaze || canRetrieve;
+        List<String> messages = new ArrayList<String>();
-    }
-
-    @Override
-    protected void effectsDisplay() {
-        luckyEffectsDisplay();
 
         if (canSkillShot) {
-            player.sendMessage(LocaleLoader.getString("Effects.Template", LocaleLoader.getString("Archery.Effect.0"), LocaleLoader.getString("Archery.Effect.1")));
+            messages.add(LocaleLoader.getString("Effects.Template", LocaleLoader.getString("Archery.Effect.0"), LocaleLoader.getString("Archery.Effect.1")));
         }
 
         if (canDaze) {
-            player.sendMessage(LocaleLoader.getString("Effects.Template", LocaleLoader.getString("Archery.Effect.2"), LocaleLoader.getString("Archery.Effect.3", Archery.dazeModifier)));
+            messages.add(LocaleLoader.getString("Effects.Template", LocaleLoader.getString("Archery.Effect.2"), LocaleLoader.getString("Archery.Effect.3", Archery.dazeModifier)));
         }
 
         if (canRetrieve) {
-            player.sendMessage(LocaleLoader.getString("Effects.Template", LocaleLoader.getString("Archery.Effect.4"), LocaleLoader.getString("Archery.Effect.5")));
+            messages.add(LocaleLoader.getString("Effects.Template", LocaleLoader.getString("Archery.Effect.4"), LocaleLoader.getString("Archery.Effect.5")));
         }
+
+        return messages;
     }
 
     @Override
-    protected boolean statsHeaderPermissions() {
+    protected List<String> statsDisplay(Player player, float skillValue, boolean hasEndurance, boolean isLucky) {
-        return canSkillShot || canDaze || canRetrieve;
+        List<String> messages = new ArrayList<String>();
-    }
 
-    @Override
-    protected void statsDisplay() {
         if (canSkillShot) {
-            player.sendMessage(LocaleLoader.getString("Archery.Combat.SkillshotBonus", skillShotBonus));
+            messages.add(LocaleLoader.getString("Archery.Combat.SkillshotBonus", skillShotBonus));
         }
 
         if (canDaze) {
-            player.sendMessage(LocaleLoader.getString("Archery.Combat.DazeChance", dazeChance) + (isLucky ? LocaleLoader.getString("Perks.lucky.bonus", dazeChanceLucky) : ""));
+            messages.add(LocaleLoader.getString("Archery.Combat.DazeChance", dazeChance) + (isLucky ? LocaleLoader.getString("Perks.Lucky.Bonus", dazeChanceLucky) : ""));
         }
 
         if (canRetrieve) {
-            player.sendMessage(LocaleLoader.getString("Archery.Combat.RetrieveChance", retrieveChance) + (isLucky ? LocaleLoader.getString("Perks.lucky.bonus", retrieveChanceLucky) : ""));
+            messages.add(LocaleLoader.getString("Archery.Combat.RetrieveChance", retrieveChance) + (isLucky ? LocaleLoader.getString("Perks.Lucky.Bonus", retrieveChanceLucky) : ""));
         }
+
+        return messages;
     }
 }

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

@@ -1,5 +1,10 @@
 package com.gmail.nossr50.commands.skills;
 
+import java.util.ArrayList;
+import java.util.List;
+
+import org.bukkit.entity.Player;
+
 import com.gmail.nossr50.datatypes.skills.SkillType;
 import com.gmail.nossr50.locale.LocaleLoader;
 import com.gmail.nossr50.skills.axes.Axes;
@@ -8,8 +13,8 @@ import com.gmail.nossr50.util.Permissions;
 public class AxesCommand extends SkillCommand {
     private String critChance;
     private String critChanceLucky;
-    private float bonusDamage;
+    private double bonusDamage;
-    private float impactDamage;
+    private double impactDamage;
     private String skullSplitterLength;
     private String skullSplitterLengthEndurance;
 
@@ -24,7 +29,7 @@ public class AxesCommand extends SkillCommand {
     }
 
     @Override
-    protected void dataCalculations() {
+    protected void dataCalculations(Player player, float skillValue, boolean isLucky) {
         // IMPACT
         if (canImpact) {
             impactDamage = 1 + (skillValue / Axes.impactIncreaseLevel);
@@ -32,14 +37,14 @@ public class AxesCommand extends SkillCommand {
 
         // SKULL SPLITTER
         if (canSkullSplitter) {
-            String[] skullSplitterStrings = calculateLengthDisplayValues();
+            String[] skullSplitterStrings = calculateLengthDisplayValues(player, skillValue);
             skullSplitterLength = skullSplitterStrings[0];
             skullSplitterLengthEndurance = skullSplitterStrings[1];
         }
 
         // CRITICAL STRIKES
         if (canCritical) {
-            String[] criticalStrikeStrings = calculateAbilityDisplayValues(Axes.criticalHitMaxBonusLevel, Axes.criticalHitMaxChance);
+            String[] criticalStrikeStrings = calculateAbilityDisplayValues(skillValue, Axes.criticalHitMaxBonusLevel, Axes.criticalHitMaxChance, isLucky);
             critChance = criticalStrikeStrings[0];
             critChanceLucky = criticalStrikeStrings[1];
         }
@@ -51,7 +56,7 @@ public class AxesCommand extends SkillCommand {
     }
 
     @Override
-    protected void permissionsCheck() {
+    protected void permissionsCheck(Player player) {
         canSkullSplitter = Permissions.skullSplitter(player);
         canCritical = Permissions.criticalStrikes(player);
         canBonusDamage = Permissions.bonusDamage(player, skill);
@@ -60,60 +65,56 @@ public class AxesCommand extends SkillCommand {
     }
 
     @Override
-    protected boolean effectsHeaderPermissions() {
+    protected List<String> effectsDisplay() {
-        return canSkullSplitter || canCritical || canBonusDamage || canImpact || canGreaterImpact;
+        List<String> messages = new ArrayList<String>();
-    }
-
-    @Override
-    protected void effectsDisplay() {
-        luckyEffectsDisplay();
 
         if (canSkullSplitter) {
-            player.sendMessage(LocaleLoader.getString("Effects.Template", LocaleLoader.getString("Axes.Effect.0"), LocaleLoader.getString("Axes.Effect.1")));
+            messages.add(LocaleLoader.getString("Effects.Template", LocaleLoader.getString("Axes.Effect.0"), LocaleLoader.getString("Axes.Effect.1")));
         }
 
         if (canCritical) {
-            player.sendMessage(LocaleLoader.getString("Effects.Template", LocaleLoader.getString("Axes.Effect.2"), LocaleLoader.getString("Axes.Effect.3")));
+            messages.add(LocaleLoader.getString("Effects.Template", LocaleLoader.getString("Axes.Effect.2"), LocaleLoader.getString("Axes.Effect.3")));
         }
 
         if (canBonusDamage) {
-            player.sendMessage(LocaleLoader.getString("Effects.Template", LocaleLoader.getString("Axes.Effect.4"), LocaleLoader.getString("Axes.Effect.5")));
+            messages.add(LocaleLoader.getString("Effects.Template", LocaleLoader.getString("Axes.Effect.4"), LocaleLoader.getString("Axes.Effect.5")));
         }
 
         if (canImpact) {
-            player.sendMessage(LocaleLoader.getString("Effects.Template", LocaleLoader.getString("Axes.Effect.6"), LocaleLoader.getString("Axes.Effect.7")));
+            messages.add(LocaleLoader.getString("Effects.Template", LocaleLoader.getString("Axes.Effect.6"), LocaleLoader.getString("Axes.Effect.7")));
         }
 
         if (canGreaterImpact) {
-            player.sendMessage(LocaleLoader.getString("Effects.Template", LocaleLoader.getString("Axes.Effect.8"), LocaleLoader.getString("Axes.Effect.9")));
+            messages.add(LocaleLoader.getString("Effects.Template", LocaleLoader.getString("Axes.Effect.8"), LocaleLoader.getString("Axes.Effect.9")));
         }
+
+        return messages;
     }
 
     @Override
-    protected boolean statsHeaderPermissions() {
+    protected List<String> statsDisplay(Player player, float skillValue, boolean hasEndurance, boolean isLucky) {
-        return canSkullSplitter || canCritical || canBonusDamage || canImpact || canGreaterImpact;
+        List<String> messages = new ArrayList<String>();
-    }
 
-    @Override
-    protected void statsDisplay() {
         if (canBonusDamage) {
-            player.sendMessage(LocaleLoader.getString("Ability.Generic.Template", LocaleLoader.getString("Axes.Ability.Bonus.0"), LocaleLoader.getString("Axes.Ability.Bonus.1", bonusDamage)));
+            messages.add(LocaleLoader.getString("Ability.Generic.Template", LocaleLoader.getString("Axes.Ability.Bonus.0"), LocaleLoader.getString("Axes.Ability.Bonus.1", bonusDamage)));
         }
 
         if (canImpact) {
-            player.sendMessage(LocaleLoader.getString("Ability.Generic.Template", LocaleLoader.getString("Axes.Ability.Bonus.2"), LocaleLoader.getString("Axes.Ability.Bonus.3", impactDamage)));
+            messages.add(LocaleLoader.getString("Ability.Generic.Template", LocaleLoader.getString("Axes.Ability.Bonus.2"), LocaleLoader.getString("Axes.Ability.Bonus.3", impactDamage)));
         }
 
         if (canGreaterImpact) {
-            player.sendMessage(LocaleLoader.getString("Ability.Generic.Template", LocaleLoader.getString("Axes.Ability.Bonus.4"), LocaleLoader.getString("Axes.Ability.Bonus.5", Axes.greaterImpactBonusDamage)));
+            messages.add(LocaleLoader.getString("Ability.Generic.Template", LocaleLoader.getString("Axes.Ability.Bonus.4"), LocaleLoader.getString("Axes.Ability.Bonus.5", Axes.greaterImpactBonusDamage)));
         }
 
         if (canCritical) {
-            player.sendMessage(LocaleLoader.getString("Axes.Combat.CritChance", critChance) + (isLucky ? LocaleLoader.getString("Perks.lucky.bonus", critChanceLucky) : ""));
+            messages.add(LocaleLoader.getString("Axes.Combat.CritChance", critChance) + (isLucky ? LocaleLoader.getString("Perks.Lucky.Bonus", critChanceLucky) : ""));
         }
 
         if (canSkullSplitter) {
-            player.sendMessage(LocaleLoader.getString("Axes.Combat.SS.Length", skullSplitterLength) + (hasEndurance ? LocaleLoader.getString("Perks.activationtime.bonus", skullSplitterLengthEndurance) : ""));
+            messages.add(LocaleLoader.getString("Axes.Combat.SS.Length", skullSplitterLength) + (hasEndurance ? LocaleLoader.getString("Perks.ActivationTime.Bonus", skullSplitterLengthEndurance) : ""));
         }
+
+        return messages;
     }
 }

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

@@ -1,5 +1,10 @@
 package com.gmail.nossr50.commands.skills;
 
+import java.util.ArrayList;
+import java.util.List;
+
+import org.bukkit.entity.Player;
+
 import com.gmail.nossr50.datatypes.skills.SkillType;
 import com.gmail.nossr50.locale.LocaleLoader;
 import com.gmail.nossr50.util.Permissions;
@@ -16,48 +21,44 @@ public class ExcavationCommand extends SkillCommand {
     }
 
     @Override
-    protected void dataCalculations() {
+    protected void dataCalculations(Player player, float skillValue, boolean isLucky) {
         // GIGA DRILL BREAKER
         if (canGigaDrill) {
-            String gigaDrillStrings[] = calculateLengthDisplayValues();
+            String gigaDrillStrings[] = calculateLengthDisplayValues(player, skillValue);
             gigaDrillBreakerLength = gigaDrillStrings[0];
             gigaDrillBreakerLengthEndurance = gigaDrillStrings[1];
         }
     }
 
     @Override
-    protected void permissionsCheck() {
+    protected void permissionsCheck(Player player) {
         canGigaDrill = Permissions.gigaDrillBreaker(player);
         canTreasureHunt = Permissions.excavationTreasureHunter(player);
     }
 
     @Override
-    protected boolean effectsHeaderPermissions() {
+    protected List<String> effectsDisplay() {
-        return canGigaDrill || canTreasureHunt;
+        List<String> messages = new ArrayList<String>();
-    }
-
-    @Override
-    protected void effectsDisplay() {
-        luckyEffectsDisplay();
 
         if (canGigaDrill) {
-            player.sendMessage(LocaleLoader.getString("Effects.Template", LocaleLoader.getString("Excavation.Effect.0"), LocaleLoader.getString("Excavation.Effect.1")));
+            messages.add(LocaleLoader.getString("Effects.Template", LocaleLoader.getString("Excavation.Effect.0"), LocaleLoader.getString("Excavation.Effect.1")));
         }
 
         if (canTreasureHunt) {
-            player.sendMessage(LocaleLoader.getString("Effects.Template", LocaleLoader.getString("Excavation.Effect.2"), LocaleLoader.getString("Excavation.Effect.3")));
+            messages.add(LocaleLoader.getString("Effects.Template", LocaleLoader.getString("Excavation.Effect.2"), LocaleLoader.getString("Excavation.Effect.3")));
         }
+
+        return messages;
     }
 
     @Override
-    protected boolean statsHeaderPermissions() {
+    protected List<String> statsDisplay(Player player, float skillValue, boolean hasEndurance, boolean isLucky) {
-        return canGigaDrill;
+        List<String> messages = new ArrayList<String>();
-    }
 
-    @Override
-    protected void statsDisplay() {
         if (canGigaDrill) {
-            player.sendMessage(LocaleLoader.getString("Excavation.Effect.Length", gigaDrillBreakerLength) + (hasEndurance ? LocaleLoader.getString("Perks.activationtime.bonus", gigaDrillBreakerLengthEndurance) : ""));
+            messages.add(LocaleLoader.getString("Excavation.Effect.Length", gigaDrillBreakerLength) + (hasEndurance ? LocaleLoader.getString("Perks.ActivationTime.Bonus", gigaDrillBreakerLengthEndurance) : ""));
         }
+
+        return messages;
     }
 }

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

@@ -1,25 +1,41 @@
 package com.gmail.nossr50.commands.skills;
 
+import java.util.ArrayList;
+import java.util.List;
+
+import org.bukkit.Location;
 import org.bukkit.block.Biome;
 import org.bukkit.entity.EntityType;
+import org.bukkit.entity.Player;
 
 import com.gmail.nossr50.config.AdvancedConfig;
+import com.gmail.nossr50.config.treasure.TreasureConfig;
 import com.gmail.nossr50.datatypes.skills.SkillType;
+import com.gmail.nossr50.datatypes.treasure.Rarity;
 import com.gmail.nossr50.locale.LocaleLoader;
 import com.gmail.nossr50.skills.fishing.Fishing;
+import com.gmail.nossr50.skills.fishing.Fishing.Tier;
+import com.gmail.nossr50.skills.fishing.FishingManager;
 import com.gmail.nossr50.util.Permissions;
 import com.gmail.nossr50.util.player.UserManager;
 
 public class FishingCommand extends SkillCommand {
     private int lootTier;
-    private String magicChance;
-    private String magicChanceLucky;
-    private String chanceRaining = "";
     private String shakeChance;
     private String shakeChanceLucky;
     private int fishermansDietRank;
     private String biteChance;
 
+    private String trapTreasure;
+    private String commonTreasure;
+    private String uncommonTreasure;
+    private String rareTreasure;
+    private String epicTreasure;
+    private String legendaryTreasure;
+    private String recordTreasure;
+
+    private String magicChance;
+
     private boolean canTreasureHunt;
     private boolean canMagicHunt;
     private boolean canShake;
@@ -32,55 +48,72 @@ public class FishingCommand extends SkillCommand {
     }
 
     @Override
-    protected void dataCalculations() {
+    protected void dataCalculations(Player player, float skillValue, boolean isLucky) {
+        FishingManager fishingManager = UserManager.getPlayer(player).getFishingManager();
         boolean isStorming = player.getWorld().hasStorm();
 
         // TREASURE HUNTER
         if (canTreasureHunt) {
-            lootTier = mcMMOPlayer.getFishingManager().getLootTier();
+            lootTier = fishingManager.getLootTier();
-            double enchantChance = lootTier * AdvancedConfig.getInstance().getFishingMagicMultiplier();
 
-            if (isStorming) {
+            // Item drop rates
-                chanceRaining = LocaleLoader.getString("Fishing.Chance.Raining");
+            trapTreasure = percent.format(TreasureConfig.getInstance().getItemDropRate(lootTier, Rarity.TRAP) / 100.0);
-                enchantChance *= 1.1D;
+            commonTreasure = percent.format(TreasureConfig.getInstance().getItemDropRate(lootTier, Rarity.COMMON) / 100.0);
+            uncommonTreasure = percent.format(TreasureConfig.getInstance().getItemDropRate(lootTier, Rarity.UNCOMMON) / 100.0);
+            rareTreasure = percent.format(TreasureConfig.getInstance().getItemDropRate(lootTier, Rarity.RARE) / 100.0);
+            epicTreasure = percent.format(TreasureConfig.getInstance().getItemDropRate(lootTier, Rarity.EPIC) / 100.0);
+            legendaryTreasure = percent.format(TreasureConfig.getInstance().getItemDropRate(lootTier, Rarity.LEGENDARY) / 100.0);
+            recordTreasure = percent.format(TreasureConfig.getInstance().getItemDropRate(lootTier, Rarity.RECORD) / 100.0);
+
+            // Magic hunter drop rates
+            double totalEnchantChance = 0;
+
+            for (Rarity rarity : Rarity.values()) {
+                if (rarity != Rarity.TRAP || rarity != Rarity.RECORD) {
+                    totalEnchantChance += TreasureConfig.getInstance().getEnchantmentDropRate(lootTier, rarity);
+                }
             }
 
-            String[] treasureHunterStrings = calculateAbilityDisplayValues(enchantChance);
+            magicChance = percent.format(totalEnchantChance / 100.0);
-            magicChance = treasureHunterStrings[0];
-            magicChanceLucky = treasureHunterStrings[1];
         }
 
         // SHAKE
         if (canShake) {
-            String[] shakeStrings = calculateAbilityDisplayValues(UserManager.getPlayer(player).getFishingManager().getShakeProbability());
+            String[] shakeStrings = calculateAbilityDisplayValues(UserManager.getPlayer(player).getFishingManager().getShakeProbability(), isLucky);
             shakeChance = shakeStrings[0];
             shakeChanceLucky = shakeStrings[1];
         }
 
         // FISHERMAN'S DIET
         if (canFishermansDiet) {
-            fishermansDietRank = calculateRank(Fishing.fishermansDietMaxLevel, Fishing.fishermansDietRankLevel1);
+            fishermansDietRank = calculateRank(skillValue, Fishing.fishermansDietMaxLevel, Fishing.fishermansDietRankLevel1);
         }
 
         // MASTER ANGLER
         if (canMasterAngler) {
-            double rawBiteChance = ((Math.max((skillValue / 200.0), 1.0)) / (isStorming ? 300 : 500));
+            double rawBiteChance = 1.0 / (isStorming ? 300 : 500);
-            Biome biome = player.getLocation().getBlock().getBiome();
+            Location location = fishingManager.getHookLocation();
+
+            if (location == null) {
+                location = player.getLocation();
+            }
+
+            Biome biome = location.getBlock().getBiome();
 
             if (biome == Biome.RIVER || biome == Biome.OCEAN) {
-                rawBiteChance = rawBiteChance * 2.0;
+                rawBiteChance = rawBiteChance * AdvancedConfig.getInstance().getMasterAnglerBiomeModifier();
             }
 
             if (player.isInsideVehicle() && player.getVehicle().getType() == EntityType.BOAT) {
-                rawBiteChance = rawBiteChance * 2.0;
+                rawBiteChance = rawBiteChance * AdvancedConfig.getInstance().getMasterAnglerBoatModifier();
             }
 
-            biteChance = calculateAbilityDisplayValues(rawBiteChance * 100.0)[0];
+            biteChance = calculateAbilityDisplayValues(rawBiteChance * 100.0, isLucky)[0];
         }
     }
 
     @Override
-    protected void permissionsCheck() {
+    protected void permissionsCheck(Player player) {
         canTreasureHunt = Permissions.fishingTreasureHunter(player);
         canMagicHunt = Permissions.magicHunter(player);
         canShake = Permissions.shake(player);
@@ -90,82 +123,86 @@ public class FishingCommand extends SkillCommand {
     }
 
     @Override
-    protected boolean effectsHeaderPermissions() {
+    protected List<String> effectsDisplay() {
-        return canTreasureHunt || canMagicHunt || canShake || canMasterAngler || canFishermansDiet || canIceFish;
+        List<String> messages = new ArrayList<String>();
-    }
-
-    @Override
-    protected void effectsDisplay() {
-        luckyEffectsDisplay();
 
         if (canTreasureHunt) {
-            player.sendMessage(LocaleLoader.getString("Effects.Template", LocaleLoader.getString("Fishing.Effect.0"), LocaleLoader.getString("Fishing.Effect.1")));
+            messages.add(LocaleLoader.getString("Effects.Template", LocaleLoader.getString("Fishing.Effect.0"), LocaleLoader.getString("Fishing.Effect.1")));
         }
 
         if (canMagicHunt) {
-            player.sendMessage(LocaleLoader.getString("Effects.Template", LocaleLoader.getString("Fishing.Effect.2"), LocaleLoader.getString("Fishing.Effect.3")));
+            messages.add(LocaleLoader.getString("Effects.Template", LocaleLoader.getString("Fishing.Effect.2"), LocaleLoader.getString("Fishing.Effect.3")));
-        }
-
-        if (canShake) {
-            player.sendMessage(LocaleLoader.getString("Effects.Template", LocaleLoader.getString("Fishing.Effect.4"), LocaleLoader.getString("Fishing.Effect.5")));
-        }
-
-        if (canFishermansDiet) {
-            player.sendMessage(LocaleLoader.getString("Effects.Template", LocaleLoader.getString("Fishing.Effect.6"), LocaleLoader.getString("Fishing.Effect.7")));
-        }
-
-        if (canMasterAngler) {
-            player.sendMessage(LocaleLoader.getString("Effects.Template", LocaleLoader.getString("Fishing.Effect.8"), LocaleLoader.getString("Fishing.Effect.9")));
         }
 
         if (canIceFish) {
-            player.sendMessage(LocaleLoader.getString("Effects.Template", LocaleLoader.getString("Fishing.Effect.10"), LocaleLoader.getString("Fishing.Effect.11")));
+            messages.add(LocaleLoader.getString("Effects.Template", LocaleLoader.getString("Fishing.Effect.10"), LocaleLoader.getString("Fishing.Effect.11")));
         }
-    }
 
-    @Override
-    protected boolean statsHeaderPermissions() {
-        return canTreasureHunt || canMagicHunt || canShake || canMasterAngler || canFishermansDiet || canIceFish;
-    }
-
-    @Override
-    protected void statsDisplay() {
         if (canMasterAngler) {
-            player.sendMessage(LocaleLoader.getString("Fishing.Ability.Chance", biteChance));
+            messages.add(LocaleLoader.getString("Effects.Template", LocaleLoader.getString("Fishing.Effect.8"), LocaleLoader.getString("Fishing.Effect.9")));
-        }
-
-        if (canTreasureHunt) {
-            player.sendMessage(LocaleLoader.getString("Fishing.Ability.Rank", lootTier));
-        }
-
-        if (canMagicHunt) {
-            player.sendMessage(LocaleLoader.getString("Fishing.Enchant.Chance", magicChance) + chanceRaining + (isLucky ? LocaleLoader.getString("Perks.lucky.bonus", magicChanceLucky) : ""));
         }
 
         if (canShake) {
-            int unlockLevel = AdvancedConfig.getInstance().getShakeUnlockLevel();
+            messages.add(LocaleLoader.getString("Effects.Template", LocaleLoader.getString("Fishing.Effect.4"), LocaleLoader.getString("Fishing.Effect.5")));
-
-            if (skillValue < unlockLevel) {
-                player.sendMessage(LocaleLoader.getString("Ability.Generic.Template.Lock", LocaleLoader.getString("Fishing.Ability.Locked.0", unlockLevel)));
-            }
-            else {
-                player.sendMessage(LocaleLoader.getString("Fishing.Ability.Shake", shakeChance) + (isLucky ? LocaleLoader.getString("Perks.lucky.bonus", shakeChanceLucky) : ""));
-            }
         }
 
         if (canFishermansDiet) {
-            player.sendMessage(LocaleLoader.getString("Fishing.Ability.FD", fishermansDietRank));
+            messages.add(LocaleLoader.getString("Effects.Template", LocaleLoader.getString("Fishing.Effect.6"), LocaleLoader.getString("Fishing.Effect.7")));
+        }
+
+        return messages;
+    }
+
+    @Override
+    protected List<String> statsDisplay(Player player, float skillValue, boolean hasEndurance, boolean isLucky) {
+        List<String> messages = new ArrayList<String>();
+
+        if (canTreasureHunt) {
+            messages.add(LocaleLoader.getString("Fishing.Ability.Rank", lootTier, Tier.EIGHT.toNumerical()));
+            messages.add(LocaleLoader.getString("Fishing.Ability.TH.DropRate", trapTreasure, commonTreasure, uncommonTreasure, rareTreasure, epicTreasure, legendaryTreasure, recordTreasure));
+        }
+
+        if (canMagicHunt) {
+            messages.add(LocaleLoader.getString("Fishing.Ability.TH.MagicRate", magicChance));
         }
 
         if (canIceFish) {
             int unlockLevel = AdvancedConfig.getInstance().getIceFishingUnlockLevel();
 
             if (skillValue < unlockLevel) {
-                player.sendMessage(LocaleLoader.getString("Ability.Generic.Template.Lock", LocaleLoader.getString("Fishing.Ability.Locked.1", unlockLevel)));
+                messages.add(LocaleLoader.getString("Ability.Generic.Template.Lock", LocaleLoader.getString("Fishing.Ability.Locked.1", unlockLevel)));
             }
             else {
-                player.sendMessage(LocaleLoader.getString("Fishing.Ability.IceFishing"));
+                messages.add(LocaleLoader.getString("Fishing.Ability.IceFishing"));
             }
         }
+
+        if (canMasterAngler) {
+            int unlockLevel = AdvancedConfig.getInstance().getMasterAnglerUnlockLevel();
+
+            if (skillValue < unlockLevel) {
+                messages.add(LocaleLoader.getString("Ability.Generic.Template.Lock", LocaleLoader.getString("Fishing.Ability.Locked.2", unlockLevel)));
+            }
+            else {
+                messages.add(LocaleLoader.getString("Fishing.Ability.Chance", biteChance));
+            }
+        }
+
+        if (canShake) {
+            int unlockLevel = AdvancedConfig.getInstance().getFishingTierLevel(Tier.ONE);
+
+            if (skillValue < unlockLevel) {
+                messages.add(LocaleLoader.getString("Ability.Generic.Template.Lock", LocaleLoader.getString("Fishing.Ability.Locked.0", unlockLevel)));
+            }
+            else {
+                messages.add(LocaleLoader.getString("Fishing.Ability.Shake", shakeChance) + (isLucky ? LocaleLoader.getString("Perks.Lucky.Bonus", shakeChanceLucky) : ""));
+            }
+        }
+
+        if (canFishermansDiet) {
+            messages.add(LocaleLoader.getString("Fishing.Ability.FD", fishermansDietRank));
+        }
+
+        return messages;
     }
 }

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

@@ -1,6 +1,10 @@
 package com.gmail.nossr50.commands.skills;
 
+import java.util.ArrayList;
+import java.util.List;
+
 import org.bukkit.Material;
+import org.bukkit.entity.Player;
 
 import com.gmail.nossr50.datatypes.skills.SkillType;
 import com.gmail.nossr50.locale.LocaleLoader;
@@ -34,52 +38,52 @@ public class HerbalismCommand extends SkillCommand {
     }
 
     @Override
-    protected void dataCalculations() {
+    protected void dataCalculations(Player player, float skillValue, boolean isLucky) {
         // GREEN TERRA
         if (canGreenTerra) {
-            String[] greenTerraStrings = calculateLengthDisplayValues();
+            String[] greenTerraStrings = calculateLengthDisplayValues(player, skillValue);
             greenTerraLength = greenTerraStrings[0];
             greenTerraLengthEndurance = greenTerraStrings[1];
         }
 
         // FARMERS DIET
         if (canFarmersDiet) {
-            farmersDietRank = calculateRank(Herbalism.farmersDietMaxLevel, Herbalism.farmersDietRankLevel1);
+            farmersDietRank = calculateRank(skillValue, Herbalism.farmersDietMaxLevel, Herbalism.farmersDietRankLevel1);
         }
 
         // GREEN THUMB
         if (canGreenThumbBlocks || canGreenThumbPlants) {
-            greenThumbStage = calculateRank(Herbalism.greenThumbStageMaxLevel, Herbalism.greenThumbStageChangeLevel);
+            greenThumbStage = calculateRank(skillValue, Herbalism.greenThumbStageMaxLevel, Herbalism.greenThumbStageChangeLevel);
 
-            String[] greenThumbStrings = calculateAbilityDisplayValues(Herbalism.greenThumbMaxLevel, Herbalism.greenThumbMaxChance);
+            String[] greenThumbStrings = calculateAbilityDisplayValues(skillValue, Herbalism.greenThumbMaxLevel, Herbalism.greenThumbMaxChance, isLucky);
             greenThumbChance = greenThumbStrings[0];
             greenThumbChanceLucky = greenThumbStrings[1];
         }
 
         // DOUBLE DROPS
         if (canDoubleDrop) {
-            String[] doubleDropStrings = calculateAbilityDisplayValues(Herbalism.doubleDropsMaxLevel, Herbalism.doubleDropsMaxChance);
+            String[] doubleDropStrings = calculateAbilityDisplayValues(skillValue, Herbalism.doubleDropsMaxLevel, Herbalism.doubleDropsMaxChance, isLucky);
             doubleDropChance = doubleDropStrings[0];
             doubleDropChanceLucky = doubleDropStrings[1];
         }
 
         // HYLIAN LUCK
         if (hasHylianLuck) {
-            String[] hylianLuckStrings = calculateAbilityDisplayValues(Herbalism.hylianLuckMaxLevel, Herbalism.hylianLuckMaxChance);
+            String[] hylianLuckStrings = calculateAbilityDisplayValues(skillValue, Herbalism.hylianLuckMaxLevel, Herbalism.hylianLuckMaxChance, isLucky);
             hylianLuckChance = hylianLuckStrings[0];
             hylianLuckChanceLucky = hylianLuckStrings[1];
         }
 
         // SHROOM THUMB
         if (canShroomThumb) {
-            String[] shroomThumbStrings = calculateAbilityDisplayValues(Herbalism.shroomThumbMaxLevel, Herbalism.shroomThumbMaxChance);
+            String[] shroomThumbStrings = calculateAbilityDisplayValues(skillValue, Herbalism.shroomThumbMaxLevel, Herbalism.shroomThumbMaxChance, isLucky);
             shroomThumbChance = shroomThumbStrings[0];
             shroomThumbChanceLucky = shroomThumbStrings[1];
         }
     }
 
     @Override
-    protected void permissionsCheck() {
+    protected void permissionsCheck(Player player) {
         hasHylianLuck = Permissions.hylianLuck(player);
         canGreenTerra = Permissions.greenTerra(player);
         canGreenThumbPlants = Permissions.greenThumbPlant(player, Material.CROPS) || Permissions.greenThumbPlant(player, Material.CARROT) || Permissions.greenThumbPlant(player, Material.POTATO) || Permissions.greenThumbPlant(player, Material.NETHER_WARTS) || Permissions.greenThumbPlant(player, Material.COCOA);
@@ -90,76 +94,72 @@ public class HerbalismCommand extends SkillCommand {
     }
 
     @Override
-    protected boolean effectsHeaderPermissions() {
+    protected List<String> effectsDisplay() {
-        return canGreenTerra || canDoubleDrop || canFarmersDiet || canGreenThumbBlocks || canGreenThumbPlants || canShroomThumb;
+        List<String> messages = new ArrayList<String>();
-    }
-
-    @Override
-    protected void effectsDisplay() {
-        luckyEffectsDisplay();
 
         if (canGreenTerra) {
-            player.sendMessage(LocaleLoader.getString("Effects.Template", LocaleLoader.getString("Herbalism.Effect.0"), LocaleLoader.getString("Herbalism.Effect.1")));
+            messages.add(LocaleLoader.getString("Effects.Template", LocaleLoader.getString("Herbalism.Effect.0"), LocaleLoader.getString("Herbalism.Effect.1")));
         }
 
         if (canGreenThumbPlants) {
-            player.sendMessage(LocaleLoader.getString("Effects.Template", LocaleLoader.getString("Herbalism.Effect.2"), LocaleLoader.getString("Herbalism.Effect.3")));
+            messages.add(LocaleLoader.getString("Effects.Template", LocaleLoader.getString("Herbalism.Effect.2"), LocaleLoader.getString("Herbalism.Effect.3")));
         }
 
         if (canGreenThumbBlocks) {
-            player.sendMessage(LocaleLoader.getString("Effects.Template", LocaleLoader.getString("Herbalism.Effect.4"), LocaleLoader.getString("Herbalism.Effect.5")));
+            messages.add(LocaleLoader.getString("Effects.Template", LocaleLoader.getString("Herbalism.Effect.4"), LocaleLoader.getString("Herbalism.Effect.5")));
         }
 
         if (canFarmersDiet) {
-            player.sendMessage(LocaleLoader.getString("Effects.Template", LocaleLoader.getString("Herbalism.Effect.6"), LocaleLoader.getString("Herbalism.Effect.7")));
+            messages.add(LocaleLoader.getString("Effects.Template", LocaleLoader.getString("Herbalism.Effect.6"), LocaleLoader.getString("Herbalism.Effect.7")));
         }
 
         if (hasHylianLuck) {
-            player.sendMessage(LocaleLoader.getString("Effects.Template", LocaleLoader.getString("Herbalism.Effect.10"), LocaleLoader.getString("Herbalism.Effect.11")));
+            messages.add(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")));
+            messages.add(LocaleLoader.getString("Effects.Template", LocaleLoader.getString("Herbalism.Effect.12"), LocaleLoader.getString("Herbalism.Effect.13")));
         }
 
         if (canDoubleDrop) {
-            player.sendMessage(LocaleLoader.getString("Effects.Template", LocaleLoader.getString("Herbalism.Effect.8"), LocaleLoader.getString("Herbalism.Effect.9")));
+            messages.add(LocaleLoader.getString("Effects.Template", LocaleLoader.getString("Herbalism.Effect.8"), LocaleLoader.getString("Herbalism.Effect.9")));
         }
+
+        return messages;
     }
 
     @Override
-    protected boolean statsHeaderPermissions() {
+    protected List<String> statsDisplay(Player player, float skillValue, boolean hasEndurance, boolean isLucky) {
-        return canGreenTerra || canDoubleDrop || canFarmersDiet || canGreenThumbBlocks || canGreenThumbPlants || canShroomThumb;
+        List<String> messages = new ArrayList<String>();
-    }
 
-    @Override
-    protected void statsDisplay() {
         if (canGreenTerra) {
-            player.sendMessage(LocaleLoader.getString("Herbalism.Ability.GTe.Length", greenTerraLength) + (hasEndurance ? LocaleLoader.getString("Perks.activationtime.bonus", greenTerraLengthEndurance) : ""));
+            messages.add(LocaleLoader.getString("Herbalism.Ability.GTe.Length", greenTerraLength) + (hasEndurance ? LocaleLoader.getString("Perks.ActivationTime.Bonus", greenTerraLengthEndurance) : ""));
         }
 
         if (canGreenThumbBlocks || canGreenThumbPlants) {
-            player.sendMessage(LocaleLoader.getString("Herbalism.Ability.GTh.Chance", greenThumbChance) + (isLucky ? LocaleLoader.getString("Perks.lucky.bonus", greenThumbChanceLucky) : ""));
+            messages.add(LocaleLoader.getString("Herbalism.Ability.GTh.Chance", greenThumbChance) + (isLucky ? LocaleLoader.getString("Perks.Lucky.Bonus", greenThumbChanceLucky) : ""));
         }
 
         if (canGreenThumbPlants) {
-            player.sendMessage(LocaleLoader.getString("Herbalism.Ability.GTh.Stage", greenThumbStage));
+            messages.add(LocaleLoader.getString("Herbalism.Ability.GTh.Stage", greenThumbStage));
         }
 
         if (canFarmersDiet) {
-            player.sendMessage(LocaleLoader.getString("Herbalism.Ability.FD", farmersDietRank));
+            messages.add(LocaleLoader.getString("Herbalism.Ability.FD", farmersDietRank));
         }
 
         if (hasHylianLuck) {
-            player.sendMessage(LocaleLoader.getString("Herbalism.Ability.HylianLuck", hylianLuckChance) + (isLucky ? LocaleLoader.getString("Perks.lucky.bonus", hylianLuckChanceLucky) : ""));
+            messages.add(LocaleLoader.getString("Herbalism.Ability.HylianLuck", hylianLuckChance) + (isLucky ? LocaleLoader.getString("Perks.Lucky.Bonus", hylianLuckChanceLucky) : ""));
         }
 
         if (canShroomThumb) {
-            player.sendMessage(LocaleLoader.getString("Herbalism.Ability.ShroomThumb.Chance", shroomThumbChance) + (isLucky ? LocaleLoader.getString("Perks.lucky.bonus", shroomThumbChanceLucky) : ""));
+            messages.add(LocaleLoader.getString("Herbalism.Ability.ShroomThumb.Chance", shroomThumbChance) + (isLucky ? LocaleLoader.getString("Perks.Lucky.Bonus", shroomThumbChanceLucky) : ""));
         }
 
         if (canDoubleDrop) {
-            player.sendMessage(LocaleLoader.getString("Herbalism.Ability.DoubleDropChance", doubleDropChance) + (isLucky ? LocaleLoader.getString("Perks.lucky.bonus", doubleDropChanceLucky) : ""));
+            messages.add(LocaleLoader.getString("Herbalism.Ability.DoubleDropChance", doubleDropChance) + (isLucky ? LocaleLoader.getString("Perks.Lucky.Bonus", doubleDropChanceLucky) : ""));
         }
+
+        return messages;
     }
 }

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

@@ -1,11 +1,18 @@
 package com.gmail.nossr50.commands.skills;
 
+import java.util.ArrayList;
+import java.util.List;
+
+import org.bukkit.entity.Player;
+
 import com.gmail.nossr50.config.AdvancedConfig;
 import com.gmail.nossr50.datatypes.skills.SkillType;
 import com.gmail.nossr50.locale.LocaleLoader;
+import com.gmail.nossr50.skills.mining.BlastMining.Tier;
 import com.gmail.nossr50.skills.mining.Mining;
 import com.gmail.nossr50.skills.mining.MiningManager;
 import com.gmail.nossr50.util.Permissions;
+import com.gmail.nossr50.util.player.UserManager;
 
 public class MiningCommand extends SkillCommand {
     private String doubleDropChance;
@@ -31,24 +38,24 @@ public class MiningCommand extends SkillCommand {
     }
 
     @Override
-    protected void dataCalculations() {
+    protected void dataCalculations(Player player, float skillValue, boolean isLucky) {
         // SUPER BREAKER
         if (canSuperBreaker) {
-            String[] superBreakerStrings = calculateLengthDisplayValues();
+            String[] superBreakerStrings = calculateLengthDisplayValues(player, skillValue);
             superBreakerLength = superBreakerStrings[0];
             superBreakerLengthEndurance = superBreakerStrings[1];
         }
 
         // DOUBLE DROPS
         if (canDoubleDrop) {
-            String[] doubleDropStrings = calculateAbilityDisplayValues(Mining.doubleDropsMaxLevel, Mining.doubleDropsMaxChance);
+            String[] doubleDropStrings = calculateAbilityDisplayValues(skillValue, Mining.doubleDropsMaxLevel, Mining.doubleDropsMaxChance, isLucky);
             doubleDropChance = doubleDropStrings[0];
             doubleDropChanceLucky = doubleDropStrings[1];
         }
 
         // BLAST MINING
         if (canBlast || canDemoExpert || canBiggerBombs) {
-            MiningManager miningManager = mcMMOPlayer.getMiningManager();
+            MiningManager miningManager = UserManager.getPlayer(player).getMiningManager();
 
             blastMiningRank = miningManager.getBlastMiningTier();
             bonusTNTDrops = miningManager.getDropMultiplier();
@@ -60,7 +67,7 @@ public class MiningCommand extends SkillCommand {
     }
 
     @Override
-    protected void permissionsCheck() {
+    protected void permissionsCheck(Player player) {
         canBiggerBombs = Permissions.biggerBombs(player);
         canBlast = Permissions.remoteDetonation(player);
         canDemoExpert = Permissions.demolitionsExpertise(player);
@@ -69,81 +76,77 @@ public class MiningCommand extends SkillCommand {
     }
 
     @Override
-    protected boolean effectsHeaderPermissions() {
+    protected List<String> effectsDisplay() {
-        return canBiggerBombs || canBlast || canDemoExpert || canDoubleDrop || canSuperBreaker;
+        List<String> messages = new ArrayList<String>();
-    }
-
-    @Override
-    protected void effectsDisplay() {
-        luckyEffectsDisplay();
 
         if (canSuperBreaker) {
-            player.sendMessage(LocaleLoader.getString("Effects.Template", LocaleLoader.getString("Mining.Effect.0"), LocaleLoader.getString("Mining.Effect.1")));
+            messages.add(LocaleLoader.getString("Effects.Template", LocaleLoader.getString("Mining.Effect.0"), LocaleLoader.getString("Mining.Effect.1")));
         }
 
         if (canDoubleDrop) {
-            player.sendMessage(LocaleLoader.getString("Effects.Template", LocaleLoader.getString("Mining.Effect.2"), LocaleLoader.getString("Mining.Effect.3")));
+            messages.add(LocaleLoader.getString("Effects.Template", LocaleLoader.getString("Mining.Effect.2"), LocaleLoader.getString("Mining.Effect.3")));
         }
 
         if (canBlast) {
-            player.sendMessage(LocaleLoader.getString("Effects.Template", LocaleLoader.getString("Mining.Effect.4"), LocaleLoader.getString("Mining.Effect.5")));
+            messages.add(LocaleLoader.getString("Effects.Template", LocaleLoader.getString("Mining.Effect.4"), LocaleLoader.getString("Mining.Effect.5")));
         }
 
         if (canBiggerBombs) {
-            player.sendMessage(LocaleLoader.getString("Effects.Template", LocaleLoader.getString("Mining.Effect.6"), LocaleLoader.getString("Mining.Effect.7")));
+            messages.add(LocaleLoader.getString("Effects.Template", LocaleLoader.getString("Mining.Effect.6"), LocaleLoader.getString("Mining.Effect.7")));
         }
 
         if (canDemoExpert) {
-            player.sendMessage(LocaleLoader.getString("Effects.Template", LocaleLoader.getString("Mining.Effect.8"), LocaleLoader.getString("Mining.Effect.9")));
+            messages.add(LocaleLoader.getString("Effects.Template", LocaleLoader.getString("Mining.Effect.8"), LocaleLoader.getString("Mining.Effect.9")));
         }
+
+        return messages;
     }
 
     @Override
-    protected boolean statsHeaderPermissions() {
+    protected List<String> statsDisplay(Player player, float skillValue, boolean hasEndurance, boolean isLucky) {
-        return canBiggerBombs || canBlast || canDemoExpert || canDoubleDrop || canSuperBreaker;
+        List<String> messages = new ArrayList<String>();
-    }
 
-    @Override
-    protected void statsDisplay() {
         if (canDoubleDrop) {
-            player.sendMessage(LocaleLoader.getString("Mining.Effect.DropChance", doubleDropChance) + (isLucky ? LocaleLoader.getString("Perks.lucky.bonus", doubleDropChanceLucky) : ""));
+            messages.add(LocaleLoader.getString("Mining.Effect.DropChance", doubleDropChance) + (isLucky ? LocaleLoader.getString("Perks.Lucky.Bonus", doubleDropChanceLucky) : ""));
         }
 
         if (canSuperBreaker) {
-            player.sendMessage(LocaleLoader.getString("Mining.Ability.Length", superBreakerLength) + (hasEndurance ? LocaleLoader.getString("Perks.activationtime.bonus", superBreakerLengthEndurance) : ""));
+            messages.add(LocaleLoader.getString("Mining.Ability.Length", superBreakerLength) + (hasEndurance ? LocaleLoader.getString("Perks.ActivationTime.Bonus", superBreakerLengthEndurance) : ""));
         }
 
         if (canBlast) {
-            int unlockLevel = AdvancedConfig.getInstance().getBlastMiningRank1();
+            int unlockLevel = AdvancedConfig.getInstance().getBlastMiningRankLevel(Tier.ONE);
 
             if (skillValue < unlockLevel) {
-                player.sendMessage(LocaleLoader.getString("Ability.Generic.Template.Lock", LocaleLoader.getString("Mining.Ability.Locked.0", unlockLevel)));
+                messages.add(LocaleLoader.getString("Ability.Generic.Template.Lock", LocaleLoader.getString("Mining.Ability.Locked.0", unlockLevel)));
             }
             else {
-                player.sendMessage(LocaleLoader.getString("Mining.Blast.Rank", blastMiningRank, LocaleLoader.getString("Mining.Blast.Effect", oreBonus, debrisReduction, bonusTNTDrops)));
+                messages.add(LocaleLoader.getString("Mining.Blast.Rank", blastMiningRank, Tier.EIGHT.toNumerical(), LocaleLoader.getString("Mining.Blast.Effect", oreBonus, debrisReduction, bonusTNTDrops)));
             }
         }
 
         if (canBiggerBombs) {
-            int unlockLevel = AdvancedConfig.getInstance().getBlastMiningRank2();
+            int unlockLevel = AdvancedConfig.getInstance().getBlastMiningRankLevel(Tier.TWO);
 
             if (skillValue < unlockLevel) {
-                player.sendMessage(LocaleLoader.getString("Ability.Generic.Template.Lock", LocaleLoader.getString("Mining.Ability.Locked.1", unlockLevel)));
+                messages.add(LocaleLoader.getString("Ability.Generic.Template.Lock", LocaleLoader.getString("Mining.Ability.Locked.1", unlockLevel)));
             }
             else {
-                player.sendMessage(LocaleLoader.getString("Mining.Blast.Radius.Increase", blastRadiusIncrease));
+                messages.add(LocaleLoader.getString("Mining.Blast.Radius.Increase", blastRadiusIncrease));
             }
         }
 
         if (canDemoExpert) {
-            int unlockLevel = AdvancedConfig.getInstance().getBlastMiningRank4();
+            int unlockLevel = AdvancedConfig.getInstance().getBlastMiningRankLevel(Tier.FOUR);
 
             if (skillValue < unlockLevel) {
-                player.sendMessage(LocaleLoader.getString("Ability.Generic.Template.Lock", LocaleLoader.getString("Mining.Ability.Locked.2", unlockLevel)));
+                messages.add(LocaleLoader.getString("Ability.Generic.Template.Lock", LocaleLoader.getString("Mining.Ability.Locked.2", unlockLevel)));
             }
             else {
-                player.sendMessage(LocaleLoader.getString("Mining.Effect.Decrease", blastDamageDecrease));
+                messages.add(LocaleLoader.getString("Mining.Effect.Decrease", blastDamageDecrease));
             }
         }
+
+        return messages;
     }
 }

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

@@ -1,15 +1,21 @@
 package com.gmail.nossr50.commands.skills;
 
+import java.util.ArrayList;
+import java.util.List;
+
 import org.bukkit.Material;
+import org.bukkit.entity.Player;
 
 import com.gmail.nossr50.mcMMO;
 import com.gmail.nossr50.datatypes.skills.SkillType;
 import com.gmail.nossr50.locale.LocaleLoader;
 import com.gmail.nossr50.skills.repair.ArcaneForging;
+import com.gmail.nossr50.skills.repair.ArcaneForging.Tier;
 import com.gmail.nossr50.skills.repair.Repair;
 import com.gmail.nossr50.skills.repair.RepairManager;
-import com.gmail.nossr50.skills.repair.Repairable;
+import com.gmail.nossr50.skills.repair.repairables.Repairable;
 import com.gmail.nossr50.util.Permissions;
+import com.gmail.nossr50.util.player.UserManager;
 
 public class RepairCommand extends SkillCommand {
     private String repairMasteryBonus;
@@ -39,12 +45,12 @@ public class RepairCommand extends SkillCommand {
     }
 
     @Override
-    protected void dataCalculations() {
+    protected void dataCalculations(Player player, float skillValue, boolean isLucky) {
         // We're using pickaxes here, not the best but it works
-        Repairable diamondRepairable = mcMMO.getRepairableManager().getRepairable(Material.DIAMOND_PICKAXE.getId());
+        Repairable diamondRepairable = mcMMO.getRepairableManager().getRepairable(Material.DIAMOND_PICKAXE);
-        Repairable goldRepairable = mcMMO.getRepairableManager().getRepairable(Material.GOLD_PICKAXE.getId());
+        Repairable goldRepairable = mcMMO.getRepairableManager().getRepairable(Material.GOLD_PICKAXE);
-        Repairable ironRepairable = mcMMO.getRepairableManager().getRepairable(Material.IRON_PICKAXE.getId());
+        Repairable ironRepairable = mcMMO.getRepairableManager().getRepairable(Material.IRON_PICKAXE);
-        Repairable stoneRepairable = mcMMO.getRepairableManager().getRepairable(Material.STONE_PICKAXE.getId());
+        Repairable stoneRepairable = mcMMO.getRepairableManager().getRepairable(Material.STONE_PICKAXE);
 
         // 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();
@@ -59,14 +65,14 @@ public class RepairCommand extends SkillCommand {
 
         // SUPER REPAIR
         if (canSuperRepair) {
-            String[] superRepairStrings = calculateAbilityDisplayValues(Repair.superRepairMaxBonusLevel, Repair.superRepairMaxChance);
+            String[] superRepairStrings = calculateAbilityDisplayValues(skillValue, Repair.superRepairMaxBonusLevel, Repair.superRepairMaxChance, isLucky);
             superRepairChance = superRepairStrings[0];
             superRepairChanceLucky = superRepairStrings[1];
         }
     }
 
     @Override
-    protected void permissionsCheck() {
+    protected void permissionsCheck(Player player) {
         canSuperRepair = Permissions.superRepair(player);
         canMasterRepair = Permissions.repairMastery(player);
         canArcaneForge = Permissions.arcaneForging(player);
@@ -82,78 +88,76 @@ public class RepairCommand extends SkillCommand {
     }
 
     @Override
-    protected boolean effectsHeaderPermissions() {
+    protected List<String> effectsDisplay() {
-        return canArcaneForge || canSalvage || canRepairDiamond || canRepairGold || canRepairIron || canMasterRepair || canRepairStone || canSuperRepair || canRepairString || canRepairWood || canRepairLeather;
+        List<String> messages = new ArrayList<String>();
-    }
 
-    @Override
+        if (canRepairLeather || canRepairString || canRepairWood || canRepairStone || canRepairIron || canRepairGold || canRepairDiamond) {
-    protected void effectsDisplay() {
+            messages.add(LocaleLoader.getString("Effects.Template", LocaleLoader.getString("Repair.Effect.0"), LocaleLoader.getString("Repair.Effect.1")));
-        luckyEffectsDisplay();
+        }
-
-        player.sendMessage(LocaleLoader.getString("Effects.Template", LocaleLoader.getString("Repair.Effect.0"), LocaleLoader.getString("Repair.Effect.1")));
 
         if (canMasterRepair) {
-            player.sendMessage(LocaleLoader.getString("Effects.Template", LocaleLoader.getString("Repair.Effect.2"), LocaleLoader.getString("Repair.Effect.3")));
+            messages.add(LocaleLoader.getString("Effects.Template", LocaleLoader.getString("Repair.Effect.2"), LocaleLoader.getString("Repair.Effect.3")));
         }
 
         if (canSuperRepair) {
-            player.sendMessage(LocaleLoader.getString("Effects.Template", LocaleLoader.getString("Repair.Effect.4"), LocaleLoader.getString("Repair.Effect.5")));
+            messages.add(LocaleLoader.getString("Effects.Template", LocaleLoader.getString("Repair.Effect.4"), LocaleLoader.getString("Repair.Effect.5")));
         }
 
         /* Repair Level Requirements */
 
         if (canRepairStone && stoneLevel > 0) {
-            player.sendMessage(LocaleLoader.getString("Effects.Template", LocaleLoader.getString("Repair.Effect.14", stoneLevel), LocaleLoader.getString("Repair.Effect.15")));
+            messages.add(LocaleLoader.getString("Effects.Template", LocaleLoader.getString("Repair.Effect.14", stoneLevel), LocaleLoader.getString("Repair.Effect.15")));
         }
 
         if (canRepairIron && ironLevel > 0) {
-            player.sendMessage(LocaleLoader.getString("Effects.Template", LocaleLoader.getString("Repair.Effect.12", ironLevel), LocaleLoader.getString("Repair.Effect.13")));
+            messages.add(LocaleLoader.getString("Effects.Template", LocaleLoader.getString("Repair.Effect.12", ironLevel), LocaleLoader.getString("Repair.Effect.13")));
         }
 
         if (canRepairGold && goldLevel > 0) {
-            player.sendMessage(LocaleLoader.getString("Effects.Template", LocaleLoader.getString("Repair.Effect.10", goldLevel), LocaleLoader.getString("Repair.Effect.11")));
+            messages.add(LocaleLoader.getString("Effects.Template", LocaleLoader.getString("Repair.Effect.10", goldLevel), LocaleLoader.getString("Repair.Effect.11")));
         }
 
         if (canRepairDiamond && diamondLevel > 0) {
-            player.sendMessage(LocaleLoader.getString("Effects.Template", LocaleLoader.getString("Repair.Effect.6", diamondLevel), LocaleLoader.getString("Repair.Effect.7")));
+            messages.add(LocaleLoader.getString("Effects.Template", LocaleLoader.getString("Repair.Effect.6", diamondLevel), LocaleLoader.getString("Repair.Effect.7")));
         }
 
         if (canSalvage && Repair.salvageUnlockLevel > 0) {
-            player.sendMessage(LocaleLoader.getString("Effects.Template", LocaleLoader.getString("Repair.Effect.16", Repair.salvageUnlockLevel), LocaleLoader.getString("Repair.Effect.17")));
+            messages.add(LocaleLoader.getString("Effects.Template", LocaleLoader.getString("Repair.Effect.16", Repair.salvageUnlockLevel), LocaleLoader.getString("Repair.Effect.17")));
         }
 
         if (canArcaneForge) {
-            player.sendMessage(LocaleLoader.getString("Effects.Template", LocaleLoader.getString("Repair.Effect.8"), LocaleLoader.getString("Repair.Effect.9")));
+            messages.add(LocaleLoader.getString("Effects.Template", LocaleLoader.getString("Repair.Effect.8"), LocaleLoader.getString("Repair.Effect.9")));
         }
+
+        return messages;
     }
 
     @Override
-    protected boolean statsHeaderPermissions() {
+    protected List<String> statsDisplay(Player player, float skillValue, boolean hasEndurance, boolean isLucky) {
-        return canArcaneForge || canMasterRepair || canSuperRepair;
+        List<String> messages = new ArrayList<String>();
-    }
 
-    @Override
-    protected void statsDisplay() {
         if (canMasterRepair) {
-            player.sendMessage(LocaleLoader.getString("Repair.Skills.Mastery", repairMasteryBonus));
+            messages.add(LocaleLoader.getString("Repair.Skills.Mastery", repairMasteryBonus));
         }
 
         if (canSuperRepair) {
-            player.sendMessage(LocaleLoader.getString("Repair.Skills.Super.Chance", superRepairChance) + (isLucky ? LocaleLoader.getString("Perks.lucky.bonus", superRepairChanceLucky) : ""));
+            messages.add(LocaleLoader.getString("Repair.Skills.Super.Chance", superRepairChance) + (isLucky ? LocaleLoader.getString("Perks.Lucky.Bonus", superRepairChanceLucky) : ""));
         }
 
         if (canArcaneForge) {
-            RepairManager repairManager = mcMMOPlayer.getRepairManager();
+            RepairManager repairManager = UserManager.getPlayer(player).getRepairManager();
 
-            player.sendMessage(LocaleLoader.getString("Repair.Arcane.Rank", repairManager.getArcaneForgingRank()));
+            messages.add(LocaleLoader.getString("Repair.Arcane.Rank", repairManager.getArcaneForgingRank(), Tier.EIGHT.toNumerical()));
 
             if (ArcaneForging.arcaneForgingEnchantLoss) {
-                player.sendMessage(LocaleLoader.getString("Repair.Arcane.Chance.Success", (arcaneBypass ? 100 : repairManager.getKeepEnchantChance())));
+                messages.add(LocaleLoader.getString("Repair.Arcane.Chance.Success", (arcaneBypass ? 100 : repairManager.getKeepEnchantChance())));
             }
 
             if (ArcaneForging.arcaneForgingDowngrades) {
-                player.sendMessage(LocaleLoader.getString("Repair.Arcane.Chance.Downgrade", (arcaneBypass ? 0 : repairManager.getDowngradeEnchantChance())));
+                messages.add(LocaleLoader.getString("Repair.Arcane.Chance.Downgrade", (arcaneBypass ? 0 : repairManager.getDowngradeEnchantChance())));
             }
         }
+
+        return messages;
     }
 }

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

@@ -13,7 +13,6 @@ import org.bukkit.entity.Player;
 import com.gmail.nossr50.config.AdvancedConfig;
 import com.gmail.nossr50.config.Config;
 import com.gmail.nossr50.datatypes.player.McMMOPlayer;
-import com.gmail.nossr50.datatypes.player.PlayerProfile;
 import com.gmail.nossr50.datatypes.skills.SkillType;
 import com.gmail.nossr50.locale.LocaleLoader;
 import com.gmail.nossr50.skills.child.FamilyTree;
@@ -23,21 +22,12 @@ import com.gmail.nossr50.util.commands.CommandUtils;
 import com.gmail.nossr50.util.player.UserManager;
 import com.gmail.nossr50.util.scoreboards.ScoreboardManager;
 import com.gmail.nossr50.util.skills.PerksUtils;
-import com.gmail.nossr50.util.skills.SkillUtils;
 
 import com.google.common.collect.ImmutableList;
 
 public abstract class SkillCommand implements TabExecutor {
     protected SkillType skill;
-    protected String skillName;
+    private String skillName;
-
-    protected Player player;
-    protected PlayerProfile profile;
-    protected McMMOPlayer mcMMOPlayer;
-
-    protected float skillValue;
-    protected boolean isLucky;
-    protected boolean hasEndurance;
 
     protected DecimalFormat percent = new DecimalFormat("##0.00%");
     protected DecimalFormat decimal = new DecimalFormat("##0.00");
@@ -46,7 +36,7 @@ public abstract class SkillCommand implements TabExecutor {
 
     public SkillCommand(SkillType skill) {
         this.skill = skill;
-        skillName = SkillUtils.getSkillName(skill);
+        skillName = skill.getName();
         skillGuideCommand = new SkillGuideCommand(skill);
     }
 
@@ -56,31 +46,26 @@ public abstract class SkillCommand implements TabExecutor {
             return true;
         }
 
-        player = (Player) sender;
-        mcMMOPlayer = UserManager.getPlayer(player);
-
         switch (args.length) {
             case 0:
-                profile = mcMMOPlayer.getProfile();
+                Player player = (Player) sender;
+                McMMOPlayer mcMMOPlayer = UserManager.getPlayer(player);
 
-                skillValue = profile.getSkillLevel(skill);
+                boolean isLucky = Permissions.lucky(player, skill);
-                isLucky = Permissions.lucky(sender, skill);
+                boolean hasEndurance = (PerksUtils.handleActivationPerks(player, 0, 0) != 0);
-                hasEndurance = (PerksUtils.handleActivationPerks(player, 0, 0) != 0);
+                float skillValue = mcMMOPlayer.getSkillLevel(skill);
 
-                permissionsCheck();
+                permissionsCheck(player);
-                dataCalculations();
+                dataCalculations(player, skillValue, isLucky);
+
+                if (Config.getInstance().getSkillUseBoard()) {
+                    ScoreboardManager.enablePlayerSkillScoreboard(player, skill);
+                }
 
                 if (!skill.isChildSkill()) {
                     player.sendMessage(LocaleLoader.getString("Skills.Header", skillName));
                     player.sendMessage(LocaleLoader.getString("Commands.XPGain", LocaleLoader.getString("Commands.XPGain." + StringUtils.getCapitalized(skill.toString()))));
-
+                    player.sendMessage(LocaleLoader.getString("Effects.Level", (int) skillValue, mcMMOPlayer.getSkillXpLevel(skill), mcMMOPlayer.getXpToLevel(skill)));
-                    if (Config.getInstance().getSkillScoreboardEnabled()) {
-                        ScoreboardManager.setupPlayerScoreboard(player.getName());
-                        ScoreboardManager.enablePlayerSkillScoreboard(mcMMOPlayer, skill);
-                    }
-                    else {
-                        player.sendMessage(LocaleLoader.getString("Effects.Level", (int) skillValue, profile.getSkillXpLevel(skill), profile.getXpToLevel(skill)));
-                    }
                 }
                 else {
                     player.sendMessage(LocaleLoader.getString("Skills.Header", skillName + " " + LocaleLoader.getString("Skills.Child")));
@@ -91,21 +76,34 @@ public abstract class SkillCommand implements TabExecutor {
                     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)));
+                        player.sendMessage(parent.getName() + " - " + LocaleLoader.getString("Effects.Level", mcMMOPlayer.getSkillLevel(parent), mcMMOPlayer.getSkillXpLevel(parent), mcMMOPlayer.getXpToLevel(parent)));
                     }
                 }
 
-                if (effectsHeaderPermissions()) {
+                List<String> effectMessages = effectsDisplay();
+
+                if (!effectMessages.isEmpty()) {
                     player.sendMessage(LocaleLoader.getString("Skills.Header", LocaleLoader.getString("Effects.Effects")));
+
+                    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", skillName)));
+                    }
+
+                    for (String message : effectMessages) {
+                        player.sendMessage(message);
+                    }
                 }
 
-                effectsDisplay();
+                List<String> statsMessages = statsDisplay(player, skillValue, hasEndurance, isLucky);
 
-                if (statsHeaderPermissions()) {
+                if (!statsMessages.isEmpty()) {
                     player.sendMessage(LocaleLoader.getString("Skills.Header", LocaleLoader.getString("Commands.Stats.Self")));
-                }
 
-                statsDisplay();
+                    for (String message : statsMessages) {
+                        player.sendMessage(message);
+                    }
+                }
 
                 player.sendMessage(LocaleLoader.getString("Guides.Available", skillName, skillName.toLowerCase()));
                 return true;
@@ -125,11 +123,11 @@ public abstract class SkillCommand implements TabExecutor {
         }
     }
 
-    protected int calculateRank(int maxLevel, int rankChangeLevel) {
+    protected int calculateRank(float skillValue, int maxLevel, int rankChangeLevel) {
         return Math.min((int) skillValue, maxLevel) / rankChangeLevel;
     }
 
-    protected String[] calculateAbilityDisplayValues(double chance) {
+    protected String[] calculateAbilityDisplayValues(double chance, boolean isLucky) {
         String[] displayValues = new String[2];
 
         displayValues[0] = percent.format(Math.min(chance, 100.0D) / 100.0D);
@@ -138,12 +136,12 @@ public abstract class SkillCommand implements TabExecutor {
         return displayValues;
     }
 
-    protected String[] calculateAbilityDisplayValues(int maxBonusLevel, double maxChance) {
+    protected String[] calculateAbilityDisplayValues(float skillValue, int maxBonusLevel, double maxChance, boolean isLucky) {
-        return calculateAbilityDisplayValues((maxChance / maxBonusLevel) * Math.min(skillValue, maxBonusLevel));
+        return calculateAbilityDisplayValues((maxChance / maxBonusLevel) * Math.min(skillValue, maxBonusLevel), isLucky);
     }
 
-    protected String[] calculateLengthDisplayValues() {
+    protected String[] calculateLengthDisplayValues(Player player, float skillValue) {
-        int maxLength = skill.getAbility().getMaxTicks();
+        int maxLength = skill.getAbility().getMaxLength();
         int length = 2 + (int) (skillValue / AdvancedConfig.getInstance().getAbilityLength());
         int enduranceLength = PerksUtils.handleActivationPerks(player, length, maxLength);
 
@@ -154,22 +152,11 @@ public abstract class SkillCommand implements TabExecutor {
         return new String[] { String.valueOf(length), String.valueOf(enduranceLength) };
     }
 
-    protected void luckyEffectsDisplay() {
+    protected abstract void dataCalculations(Player player, float skillValue, boolean isLucky);
-        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", skillName)));
-        }
-    }
 
-    protected abstract void dataCalculations();
+    protected abstract void permissionsCheck(Player player);
 
-    protected abstract void permissionsCheck();
+    protected abstract List<String> effectsDisplay();
 
-    protected abstract boolean effectsHeaderPermissions();
+    protected abstract List<String> statsDisplay(Player player, float skillValue, boolean hasEndurance, boolean isLucky);
-
-    protected abstract void effectsDisplay();
-
-    protected abstract boolean statsHeaderPermissions();
-
-    protected abstract void statsDisplay();
 }

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

@@ -1,6 +1,7 @@
 package com.gmail.nossr50.commands.skills;
 
 import java.util.ArrayList;
+import java.util.Arrays;
 
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandExecutor;
@@ -9,19 +10,16 @@ import org.bukkit.command.CommandSender;
 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 class SkillGuideCommand implements CommandExecutor {
     private String header;
-    private String[] guide;
+    private ArrayList<String> guide;
 
-    private String invalidPage;
+    private String invalidPage = LocaleLoader.getString("Guides.Page.Invalid");
 
-    public SkillGuideCommand(SkillType skillType) {
+    public SkillGuideCommand(SkillType skill) {
-        header = LocaleLoader.getString("Guides.Header", SkillUtils.getSkillName(skillType));
+        header = LocaleLoader.getString("Guides.Header", skill.getName());
-        guide = LocaleLoader.getString("Guides." + StringUtils.getCapitalized(skillType.toString())).split("\n");
+        guide = getGuide(skill);
-
-        invalidPage = LocaleLoader.getString("Guides.Page.Invalid");
     }
 
     @Override
@@ -59,7 +57,7 @@ public class SkillGuideCommand implements CommandExecutor {
     }
 
     private int getTotalPageNumber() {
-        return (int) Math.ceil(guide.length / 8.0);
+        return (int) Math.ceil(guide.size() / 8.0);
     }
 
     private void sendGuide(CommandSender sender, int pageNumber) {
@@ -68,23 +66,46 @@ public class SkillGuideCommand implements CommandExecutor {
         }
     }
 
-    private ArrayList<String> grabPageContents(int pagenum) {
+    private ArrayList<String> grabPageContents(int page) {
-        int pageIndexStart = 8 * (pagenum - 1); // Determine what string to start at
+        int pageIndexStart = 8 * (page - 1); // Determine what string to start at
         ArrayList<String> allStrings = new ArrayList<String>();
 
         allStrings.add(header);
 
         // Add targeted strings
         while (allStrings.size() < 9) {
-            if (pageIndexStart + allStrings.size() > guide.length) {
+            if (pageIndexStart + allStrings.size() > guide.size()) {
                 allStrings.add("");
             }
             else {
-                allStrings.add(guide[pageIndexStart + (allStrings.size() - 1)]);
+                allStrings.add(guide.get(pageIndexStart + (allStrings.size() - 1)));
             }
         }
 
-        allStrings.add("Page " + pagenum + " of " + getTotalPageNumber());
+        allStrings.add("Page " + page + " of " + getTotalPageNumber());
         return allStrings;
     }
+
+    private ArrayList<String> getGuide(SkillType skill) {
+        ArrayList<String> guide = new ArrayList<String>();
+
+        for (int i = 0; i < 10; i++) {
+            String[] section = LocaleLoader.getString("Guides." + StringUtils.getCapitalized(skill.toString()) + ".Section." + i).split("\n");
+
+            if (section[0].startsWith("!")) {
+                break;
+            }
+
+            guide.addAll(Arrays.asList(section));
+
+            if (section.length < 8) {
+                for (int blankLine = 8 - section.length; blankLine > 0; blankLine--) {
+                    guide.add("");
+                }
+
+            }
+        }
+
+        return guide;
+    }
 }

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

@@ -1,10 +1,17 @@
 package com.gmail.nossr50.commands.skills;
 
+import java.util.ArrayList;
+import java.util.List;
+
+import org.bukkit.entity.Player;
+
 import com.gmail.nossr50.config.AdvancedConfig;
 import com.gmail.nossr50.datatypes.skills.SkillType;
 import com.gmail.nossr50.locale.LocaleLoader;
 import com.gmail.nossr50.skills.smelting.Smelting;
+import com.gmail.nossr50.skills.smelting.Smelting.Tier;
 import com.gmail.nossr50.util.Permissions;
+import com.gmail.nossr50.util.player.UserManager;
 
 public class SmeltingCommand extends SkillCommand {
     private String burnTimeModifier;
@@ -23,7 +30,7 @@ public class SmeltingCommand extends SkillCommand {
     }
 
     @Override
-    protected void dataCalculations() {
+    protected void dataCalculations(Player player, float skillValue, boolean isLucky) {
         // FUEL EFFICIENCY
         if (canFuelEfficiency) {
             burnTimeModifier = decimal.format(1 + ((skillValue / Smelting.burnModifierMaxLevel) * Smelting.burnTimeMultiplier));
@@ -31,21 +38,21 @@ public class SmeltingCommand extends SkillCommand {
 
         // SECOND SMELT
         if (canSecondSmelt) {
-            String[] secondSmeltStrings = calculateAbilityDisplayValues(Smelting.secondSmeltMaxLevel, Smelting.secondSmeltMaxChance);
+            String[] secondSmeltStrings = calculateAbilityDisplayValues(skillValue, Smelting.secondSmeltMaxLevel, Smelting.secondSmeltMaxChance, isLucky);
             secondSmeltChance = secondSmeltStrings[0];
             secondSmeltChanceLucky = secondSmeltStrings[1];
         }
 
         // FLUX MINING
         if (canFluxMine) {
-            String[] fluxMiningStrings = calculateAbilityDisplayValues(Smelting.fluxMiningChance);
+            String[] fluxMiningStrings = calculateAbilityDisplayValues(Smelting.fluxMiningChance, isLucky);
             fluxMiningChance = fluxMiningStrings[0];
             fluxMiningChanceLucky = fluxMiningStrings[1];
         }
     }
 
     @Override
-    protected void permissionsCheck() {
+    protected void permissionsCheck(Player player) {
         canFuelEfficiency = Permissions.fuelEfficiency(player);
         canSecondSmelt = Permissions.doubleDrops(player, skill);
         canFluxMine = Permissions.fluxMining(player);
@@ -53,64 +60,60 @@ public class SmeltingCommand extends SkillCommand {
     }
 
     @Override
-    protected boolean effectsHeaderPermissions() {
+    protected List<String> effectsDisplay() {
-        return canFluxMine || canFuelEfficiency || canSecondSmelt || canVanillaXPBoost;
+        List<String> messages = new ArrayList<String>();
-    }
-
-    @Override
-    protected void effectsDisplay() {
-        luckyEffectsDisplay();
 
         if (canFuelEfficiency) {
-            player.sendMessage(LocaleLoader.getString("Effects.Template", LocaleLoader.getString("Smelting.Effect.0"), LocaleLoader.getString("Smelting.Effect.1")));
+            messages.add(LocaleLoader.getString("Effects.Template", LocaleLoader.getString("Smelting.Effect.0"), LocaleLoader.getString("Smelting.Effect.1")));
         }
 
         if (canSecondSmelt) {
-            player.sendMessage(LocaleLoader.getString("Effects.Template", LocaleLoader.getString("Smelting.Effect.2"), LocaleLoader.getString("Smelting.Effect.3")));
+            messages.add(LocaleLoader.getString("Effects.Template", LocaleLoader.getString("Smelting.Effect.2"), LocaleLoader.getString("Smelting.Effect.3")));
         }
 
         if (canVanillaXPBoost) {
-            player.sendMessage(LocaleLoader.getString("Effects.Template", LocaleLoader.getString("Smelting.Effect.4"), LocaleLoader.getString("Smelting.Effect.5")));
+            messages.add(LocaleLoader.getString("Effects.Template", LocaleLoader.getString("Smelting.Effect.4"), LocaleLoader.getString("Smelting.Effect.5")));
         }
 
         if (canFluxMine) {
-            player.sendMessage(LocaleLoader.getString("Effects.Template", LocaleLoader.getString("Smelting.Effect.6"), LocaleLoader.getString("Smelting.Effect.7")));
+            messages.add(LocaleLoader.getString("Effects.Template", LocaleLoader.getString("Smelting.Effect.6"), LocaleLoader.getString("Smelting.Effect.7")));
         }
+
+        return messages;
     }
 
     @Override
-    protected boolean statsHeaderPermissions() {
+    protected List<String> statsDisplay(Player player, float skillValue, boolean hasEndurance, boolean isLucky) {
-        return canFluxMine || canFuelEfficiency || canSecondSmelt || canVanillaXPBoost;
+        List<String> messages = new ArrayList<String>();
-    }
 
-    @Override
-    protected void statsDisplay() {
         if (canFuelEfficiency) {
-            player.sendMessage(LocaleLoader.getString("Smelting.Ability.FuelEfficiency", burnTimeModifier));
+            messages.add(LocaleLoader.getString("Smelting.Ability.FuelEfficiency", burnTimeModifier));
         }
 
         if (canSecondSmelt) {
-            player.sendMessage(LocaleLoader.getString("Smelting.Ability.SecondSmelt", secondSmeltChance) + (isLucky ? LocaleLoader.getString("Perks.lucky.bonus", secondSmeltChanceLucky) : ""));
+            messages.add(LocaleLoader.getString("Smelting.Ability.SecondSmelt", secondSmeltChance) + (isLucky ? LocaleLoader.getString("Perks.Lucky.Bonus", secondSmeltChanceLucky) : ""));
         }
 
         if (canVanillaXPBoost) {
-            int unlockLevel = AdvancedConfig.getInstance().getSmeltingVanillaXPBoostRank1Level();
+            int unlockLevel = AdvancedConfig.getInstance().getSmeltingRankLevel(Tier.ONE);
 
             if (skillValue < unlockLevel) {
-                player.sendMessage(LocaleLoader.getString("Ability.Generic.Template.Lock", LocaleLoader.getString("Smelting.Ability.Locked.0", unlockLevel)));
+                messages.add(LocaleLoader.getString("Ability.Generic.Template.Lock", LocaleLoader.getString("Smelting.Ability.Locked.0", unlockLevel)));
             }
             else {
-                player.sendMessage(LocaleLoader.getString("Smelting.Ability.VanillaXPBoost", mcMMOPlayer.getSmeltingManager().getVanillaXpMultiplier()));
+                messages.add(LocaleLoader.getString("Smelting.Ability.VanillaXPBoost", UserManager.getPlayer(player).getSmeltingManager().getVanillaXpMultiplier()));
             }
         }
 
         if (canFluxMine) {
             if (skillValue < Smelting.fluxMiningUnlockLevel) {
-                player.sendMessage(LocaleLoader.getString("Ability.Generic.Template.Lock", LocaleLoader.getString("Smelting.Ability.Locked.1", Smelting.fluxMiningUnlockLevel)));
+                messages.add(LocaleLoader.getString("Ability.Generic.Template.Lock", LocaleLoader.getString("Smelting.Ability.Locked.1", Smelting.fluxMiningUnlockLevel)));
             }
             else {
-                player.sendMessage(LocaleLoader.getString("Smelting.Ability.FluxMining", fluxMiningChance) + (isLucky ? LocaleLoader.getString("Perks.lucky.bonus", fluxMiningChanceLucky) : ""));
+                messages.add(LocaleLoader.getString("Smelting.Ability.FluxMining", fluxMiningChance) + (isLucky ? LocaleLoader.getString("Perks.Lucky.Bonus", fluxMiningChanceLucky) : ""));
             }
         }
+
+        return messages;
     }
 }

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

@@ -1,5 +1,10 @@
 package com.gmail.nossr50.commands.skills;
 
+import java.util.ArrayList;
+import java.util.List;
+
+import org.bukkit.entity.Player;
+
 import com.gmail.nossr50.datatypes.skills.SkillType;
 import com.gmail.nossr50.locale.LocaleLoader;
 import com.gmail.nossr50.skills.swords.Swords;
@@ -23,10 +28,10 @@ public class SwordsCommand extends SkillCommand {
     }
 
     @Override
-    protected void dataCalculations() {
+    protected void dataCalculations(Player player, float skillValue, boolean isLucky) {
         // SERRATED STRIKES
         if (canSerratedStrike) {
-            String[] serratedStrikesStrings = calculateLengthDisplayValues();
+            String[] serratedStrikesStrings = calculateLengthDisplayValues(player, skillValue);
             serratedStrikesLength = serratedStrikesStrings[0];
             serratedStrikesLengthEndurance = serratedStrikesStrings[1];
         }
@@ -35,68 +40,64 @@ public class SwordsCommand extends SkillCommand {
         if (canBleed) {
             bleedLength = (skillValue >= Swords.bleedMaxBonusLevel) ? Swords.bleedMaxTicks : Swords.bleedBaseTicks;
 
-            String[] bleedStrings = calculateAbilityDisplayValues(Swords.bleedMaxBonusLevel, Swords.bleedMaxChance);
+            String[] bleedStrings = calculateAbilityDisplayValues(skillValue, Swords.bleedMaxBonusLevel, Swords.bleedMaxChance, isLucky);
             bleedChance = bleedStrings[0];
             bleedChanceLucky = bleedStrings[1];
         }
 
         // COUNTER ATTACK
         if (canCounter) {
-            String[] counterAttackStrings = calculateAbilityDisplayValues(Swords.counterAttackMaxBonusLevel, Swords.counterAttackMaxChance);
+            String[] counterAttackStrings = calculateAbilityDisplayValues(skillValue, Swords.counterAttackMaxBonusLevel, Swords.counterAttackMaxChance, isLucky);
             counterAttackChance = counterAttackStrings[0];
             counterAttackChanceLucky = counterAttackStrings[1];
         }
     }
 
     @Override
-    protected void permissionsCheck() {
+    protected void permissionsCheck(Player player) {
         canBleed = Permissions.bleed(player);
         canCounter = Permissions.counterAttack(player);
         canSerratedStrike = Permissions.serratedStrikes(player);
     }
 
     @Override
-    protected boolean effectsHeaderPermissions() {
+    protected List<String> effectsDisplay() {
-        return canBleed || canCounter || canSerratedStrike;
+        List<String> messages = new ArrayList<String>();
-    }
-
-    @Override
-    protected void effectsDisplay() {
-        luckyEffectsDisplay();
 
         if (canCounter) {
-            player.sendMessage(LocaleLoader.getString("Effects.Template", LocaleLoader.getString("Swords.Effect.0"), LocaleLoader.getString("Swords.Effect.1", percent.format(1.0D / Swords.counterAttackModifier))));
+            messages.add(LocaleLoader.getString("Effects.Template", LocaleLoader.getString("Swords.Effect.0"), LocaleLoader.getString("Swords.Effect.1", percent.format(1.0D / Swords.counterAttackModifier))));
         }
 
         if (canSerratedStrike) {
-            player.sendMessage(LocaleLoader.getString("Effects.Template", LocaleLoader.getString("Swords.Effect.2"), LocaleLoader.getString("Swords.Effect.3", percent.format(1.0D / Swords.serratedStrikesModifier))));
+            messages.add(LocaleLoader.getString("Effects.Template", LocaleLoader.getString("Swords.Effect.2"), LocaleLoader.getString("Swords.Effect.3", percent.format(1.0D / Swords.serratedStrikesModifier))));
-            player.sendMessage(LocaleLoader.getString("Effects.Template", LocaleLoader.getString("Swords.Effect.4"), LocaleLoader.getString("Swords.Effect.5", Swords.serratedStrikesBleedTicks)));
+            messages.add(LocaleLoader.getString("Effects.Template", LocaleLoader.getString("Swords.Effect.4"), LocaleLoader.getString("Swords.Effect.5", Swords.serratedStrikesBleedTicks)));
         }
 
         if (canBleed) {
-            player.sendMessage(LocaleLoader.getString("Effects.Template", LocaleLoader.getString("Swords.Effect.6"), LocaleLoader.getString("Swords.Effect.7")));
+            messages.add(LocaleLoader.getString("Effects.Template", LocaleLoader.getString("Swords.Effect.6"), LocaleLoader.getString("Swords.Effect.7")));
         }
+
+        return messages;
     }
 
     @Override
-    protected boolean statsHeaderPermissions() {
+    protected List<String> statsDisplay(Player player, float skillValue, boolean hasEndurance, boolean isLucky) {
-        return canBleed || canCounter || canSerratedStrike;
+        List<String> messages = new ArrayList<String>();
-    }
 
-    @Override
-    protected void statsDisplay() {
         if (canCounter) {
-            player.sendMessage(LocaleLoader.getString("Swords.Combat.Counter.Chance", counterAttackChance) + (isLucky ? LocaleLoader.getString("Perks.lucky.bonus", counterAttackChanceLucky) : ""));
+            messages.add(LocaleLoader.getString("Swords.Combat.Counter.Chance", counterAttackChance) + (isLucky ? LocaleLoader.getString("Perks.Lucky.Bonus", counterAttackChanceLucky) : ""));
         }
 
         if (canBleed) {
-            player.sendMessage(LocaleLoader.getString("Swords.Combat.Bleed.Length", bleedLength));
+            messages.add(LocaleLoader.getString("Swords.Combat.Bleed.Length", bleedLength));
-            player.sendMessage(LocaleLoader.getString("Swords.Combat.Bleed.Note"));
+            messages.add(LocaleLoader.getString("Swords.Combat.Bleed.Note"));
-            player.sendMessage(LocaleLoader.getString("Swords.Combat.Bleed.Chance", bleedChance) + (isLucky ? LocaleLoader.getString("Perks.lucky.bonus", bleedChanceLucky) : ""));
+            messages.add(LocaleLoader.getString("Swords.Combat.Bleed.Chance", bleedChance) + (isLucky ? LocaleLoader.getString("Perks.Lucky.Bonus", bleedChanceLucky) : ""));
         }
 
         if (canSerratedStrike) {
-            player.sendMessage(LocaleLoader.getString("Swords.SS.Length", serratedStrikesLength) + (hasEndurance ? LocaleLoader.getString("Perks.activationtime.bonus", serratedStrikesLengthEndurance) : ""));
+            messages.add(LocaleLoader.getString("Swords.SS.Length", serratedStrikesLength) + (hasEndurance ? LocaleLoader.getString("Perks.ActivationTime.Bonus", serratedStrikesLengthEndurance) : ""));
         }
+
+        return messages;
     }
 }

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

@@ -1,5 +1,11 @@
 package com.gmail.nossr50.commands.skills;
 
+import java.util.ArrayList;
+import java.util.List;
+
+import org.bukkit.entity.EntityType;
+import org.bukkit.entity.Player;
+
 import com.gmail.nossr50.config.Config;
 import com.gmail.nossr50.datatypes.skills.SkillType;
 import com.gmail.nossr50.locale.LocaleLoader;
@@ -25,18 +31,18 @@ public class TamingCommand extends SkillCommand {
     }
 
     @Override
-    protected void dataCalculations() {
+    protected void dataCalculations(Player player, float skillValue, boolean isLucky) {
         if (canGore) {
-            String[] goreStrings = calculateAbilityDisplayValues(Taming.goreMaxBonusLevel, Taming.goreMaxChance);
+            String[] goreStrings = calculateAbilityDisplayValues(skillValue, Taming.goreMaxBonusLevel, Taming.goreMaxChance, isLucky);
             goreChance = goreStrings[0];
             goreChanceLucky = goreStrings[1];
         }
     }
 
     @Override
-    protected void permissionsCheck() {
+    protected void permissionsCheck(Player player) {
         canBeastLore = Permissions.beastLore(player);
-        canCallWild = Permissions.callOfTheWild(player);
+        canCallWild = Permissions.callOfTheWild(player, EntityType.HORSE) || Permissions.callOfTheWild(player, EntityType.WOLF) || Permissions.callOfTheWild(player, EntityType.OCELOT);
         canEnvironmentallyAware = Permissions.environmentallyAware(player);
         canFastFood = Permissions.fastFoodService(player);
         canGore = Permissions.gore(player);
@@ -47,116 +53,113 @@ public class TamingCommand extends SkillCommand {
     }
 
     @Override
-    protected boolean effectsHeaderPermissions() {
+    protected List<String> effectsDisplay() {
-        return canBeastLore || canCallWild || canEnvironmentallyAware || canFastFood || canGore || canSharpenedClaws || canShockProof || canThickFur || canHolyHound;
+        List<String> messages = new ArrayList<String>();
-    }
-
-    @Override
-    protected void effectsDisplay() {
-        luckyEffectsDisplay();
 
         if (canBeastLore) {
-            player.sendMessage(LocaleLoader.getString("Effects.Template", LocaleLoader.getString("Taming.Effect.0"), LocaleLoader.getString("Taming.Effect.1")));
+            messages.add(LocaleLoader.getString("Effects.Template", LocaleLoader.getString("Taming.Effect.0"), LocaleLoader.getString("Taming.Effect.1")));
         }
 
         if (canGore) {
-            player.sendMessage(LocaleLoader.getString("Effects.Template", LocaleLoader.getString("Taming.Effect.2"), LocaleLoader.getString("Taming.Effect.3")));
+            messages.add(LocaleLoader.getString("Effects.Template", LocaleLoader.getString("Taming.Effect.2"), LocaleLoader.getString("Taming.Effect.3")));
         }
 
         if (canSharpenedClaws) {
-            player.sendMessage(LocaleLoader.getString("Effects.Template", LocaleLoader.getString("Taming.Effect.4"), LocaleLoader.getString("Taming.Effect.5")));
+            messages.add(LocaleLoader.getString("Effects.Template", LocaleLoader.getString("Taming.Effect.4"), LocaleLoader.getString("Taming.Effect.5")));
         }
 
         if (canEnvironmentallyAware) {
-            player.sendMessage(LocaleLoader.getString("Effects.Template", LocaleLoader.getString("Taming.Effect.6"), LocaleLoader.getString("Taming.Effect.7")));
+            messages.add(LocaleLoader.getString("Effects.Template", LocaleLoader.getString("Taming.Effect.6"), LocaleLoader.getString("Taming.Effect.7")));
         }
 
         if (canThickFur) {
-            player.sendMessage(LocaleLoader.getString("Effects.Template", LocaleLoader.getString("Taming.Effect.8"), LocaleLoader.getString("Taming.Effect.9")));
+            messages.add(LocaleLoader.getString("Effects.Template", LocaleLoader.getString("Taming.Effect.8"), LocaleLoader.getString("Taming.Effect.9")));
         }
 
         if (canShockProof) {
-            player.sendMessage(LocaleLoader.getString("Effects.Template", LocaleLoader.getString("Taming.Effect.10"), LocaleLoader.getString("Taming.Effect.11")));
+            messages.add(LocaleLoader.getString("Effects.Template", LocaleLoader.getString("Taming.Effect.10"), LocaleLoader.getString("Taming.Effect.11")));
         }
 
         if (canFastFood) {
-            player.sendMessage(LocaleLoader.getString("Effects.Template", LocaleLoader.getString("Taming.Effect.16"), LocaleLoader.getString("Taming.Effect.17")));
+            messages.add(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")));
+            messages.add(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")));
+            messages.add(LocaleLoader.getString("Effects.Template", LocaleLoader.getString("Taming.Effect.12"), LocaleLoader.getString("Taming.Effect.13")));
-            player.sendMessage(LocaleLoader.getString("Taming.Effect.14", Config.getInstance().getTamingCOTWOcelotCost()));
+            messages.add(LocaleLoader.getString("Taming.Effect.14", Config.getInstance().getTamingCOTWOcelotCost()));
-            player.sendMessage(LocaleLoader.getString("Taming.Effect.15", Config.getInstance().getTamingCOTWWolfCost()));
+            messages.add(LocaleLoader.getString("Taming.Effect.15", Config.getInstance().getTamingCOTWWolfCost()));
+            messages.add(LocaleLoader.getString("Taming.Effect.20", Config.getInstance().getTamingCOTWHorseCost()));
         }
+
+        return messages;
     }
 
     @Override
-    protected boolean statsHeaderPermissions() {
+    protected List<String> statsDisplay(Player player, float skillValue, boolean hasEndurance, boolean isLucky) {
-        return canEnvironmentallyAware || canFastFood || canGore || canSharpenedClaws || canShockProof || canThickFur || canHolyHound;
+        List<String> messages = new ArrayList<String>();
-    }
 
-    @Override
-    protected void statsDisplay() {
         if (canFastFood) {
             if (skillValue < Taming.fastFoodServiceUnlockLevel) {
-                player.sendMessage(LocaleLoader.getString("Ability.Generic.Template.Lock", LocaleLoader.getString("Taming.Ability.Locked.4", Taming.fastFoodServiceUnlockLevel)));
+                messages.add(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 / 100D))));
+                messages.add(LocaleLoader.getString("Ability.Generic.Template", LocaleLoader.getString("Taming.Ability.Bonus.8"), LocaleLoader.getString("Taming.Ability.Bonus.9", percent.format(Taming.fastFoodServiceActivationChance / 100D))));
             }
         }
 
         if (canEnvironmentallyAware) {
             if (skillValue < Taming.environmentallyAwareUnlockLevel) {
-                player.sendMessage(LocaleLoader.getString("Ability.Generic.Template.Lock", LocaleLoader.getString("Taming.Ability.Locked.0", Taming.environmentallyAwareUnlockLevel)));
+                messages.add(LocaleLoader.getString("Ability.Generic.Template.Lock", LocaleLoader.getString("Taming.Ability.Locked.0", Taming.environmentallyAwareUnlockLevel)));
             }
             else {
-                player.sendMessage(LocaleLoader.getString("Ability.Generic.Template", LocaleLoader.getString("Taming.Ability.Bonus.0"), LocaleLoader.getString("Taming.Ability.Bonus.1")));
+                messages.add(LocaleLoader.getString("Ability.Generic.Template", LocaleLoader.getString("Taming.Ability.Bonus.0"), LocaleLoader.getString("Taming.Ability.Bonus.1")));
             }
         }
 
         if (canThickFur) {
             if (skillValue < Taming.thickFurUnlockLevel) {
-                player.sendMessage(LocaleLoader.getString("Ability.Generic.Template.Lock", LocaleLoader.getString("Taming.Ability.Locked.1", Taming.thickFurUnlockLevel)));
+                messages.add(LocaleLoader.getString("Ability.Generic.Template.Lock", LocaleLoader.getString("Taming.Ability.Locked.1", Taming.thickFurUnlockLevel)));
             }
             else {
-                player.sendMessage(LocaleLoader.getString("Ability.Generic.Template", LocaleLoader.getString("Taming.Ability.Bonus.2"), LocaleLoader.getString("Taming.Ability.Bonus.3", Taming.thickFurModifier)));
+                messages.add(LocaleLoader.getString("Ability.Generic.Template", LocaleLoader.getString("Taming.Ability.Bonus.2"), LocaleLoader.getString("Taming.Ability.Bonus.3", Taming.thickFurModifier)));
             }
         }
 
         if (canHolyHound) {
             if (skillValue < Taming.holyHoundUnlockLevel) {
-                player.sendMessage(LocaleLoader.getString("Ability.Generic.Template.Lock", LocaleLoader.getString("Taming.Ability.Locked.5", Taming.holyHoundUnlockLevel)));
+                messages.add(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")));
+                messages.add(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)));
+                messages.add(LocaleLoader.getString("Ability.Generic.Template.Lock", LocaleLoader.getString("Taming.Ability.Locked.2", Taming.shockProofUnlockLevel)));
             }
             else {
-                player.sendMessage(LocaleLoader.getString("Ability.Generic.Template", LocaleLoader.getString("Taming.Ability.Bonus.4"), LocaleLoader.getString("Taming.Ability.Bonus.5", Taming.shockProofModifier)));
+                messages.add(LocaleLoader.getString("Ability.Generic.Template", LocaleLoader.getString("Taming.Ability.Bonus.4"), LocaleLoader.getString("Taming.Ability.Bonus.5", Taming.shockProofModifier)));
             }
         }
 
         if (canSharpenedClaws) {
             if (skillValue < Taming.sharpenedClawsUnlockLevel) {
-                player.sendMessage(LocaleLoader.getString("Ability.Generic.Template.Lock", LocaleLoader.getString("Taming.Ability.Locked.3", Taming.sharpenedClawsUnlockLevel)));
+                messages.add(LocaleLoader.getString("Ability.Generic.Template.Lock", LocaleLoader.getString("Taming.Ability.Locked.3", Taming.sharpenedClawsUnlockLevel)));
             }
             else {
-                player.sendMessage(LocaleLoader.getString("Ability.Generic.Template", LocaleLoader.getString("Taming.Ability.Bonus.6"), LocaleLoader.getString("Taming.Ability.Bonus.7", Taming.sharpenedClawsBonusDamage)));
+                messages.add(LocaleLoader.getString("Ability.Generic.Template", LocaleLoader.getString("Taming.Ability.Bonus.6"), LocaleLoader.getString("Taming.Ability.Bonus.7", Taming.sharpenedClawsBonusDamage)));
             }
         }
 
         if (canGore) {
-            player.sendMessage(LocaleLoader.getString("Taming.Combat.Chance.Gore", goreChance) + (isLucky ? LocaleLoader.getString("Perks.lucky.bonus", goreChanceLucky) : ""));
+            messages.add(LocaleLoader.getString("Taming.Combat.Chance.Gore", goreChance) + (isLucky ? LocaleLoader.getString("Perks.Lucky.Bonus", goreChanceLucky) : ""));
         }
+
+        return messages;
     }
 }

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

@@ -1,5 +1,10 @@
 package com.gmail.nossr50.commands.skills;
 
+import java.util.ArrayList;
+import java.util.List;
+
+import org.bukkit.entity.Player;
+
 import com.gmail.nossr50.datatypes.skills.SkillType;
 import com.gmail.nossr50.locale.LocaleLoader;
 import com.gmail.nossr50.skills.unarmed.Unarmed;
@@ -14,7 +19,7 @@ public class UnarmedCommand extends SkillCommand {
     private String disarmChanceLucky;
     private String ironGripChance;
     private String ironGripChanceLucky;
-    private int ironArmBonus;
+    private double ironArmBonus;
 
     private boolean canBerserk;
     private boolean canDisarm;
@@ -27,24 +32,24 @@ public class UnarmedCommand extends SkillCommand {
     }
 
     @Override
-    protected void dataCalculations() {
+    protected void dataCalculations(Player player, float skillValue, boolean isLucky) {
         // BERSERK
         if (canBerserk) {
-            String[] berserkStrings = calculateLengthDisplayValues();
+            String[] berserkStrings = calculateLengthDisplayValues(player, skillValue);
             berserkLength = berserkStrings[0];
             berserkLengthEndurance = berserkStrings[1];
         }
 
         // DISARM
         if (canDisarm) {
-            String[] disarmStrings = calculateAbilityDisplayValues(Unarmed.disarmMaxBonusLevel, Unarmed.disarmMaxChance);
+            String[] disarmStrings = calculateAbilityDisplayValues(skillValue, Unarmed.disarmMaxBonusLevel, Unarmed.disarmMaxChance, isLucky);
             disarmChance = disarmStrings[0];
             disarmChanceLucky = disarmStrings[1];
         }
 
         // DEFLECT
         if (canDeflect) {
-            String[] deflectStrings = calculateAbilityDisplayValues(Unarmed.deflectMaxBonusLevel, Unarmed.deflectMaxChance);
+            String[] deflectStrings = calculateAbilityDisplayValues(skillValue, Unarmed.deflectMaxBonusLevel, Unarmed.deflectMaxChance, isLucky);
             deflectChance = deflectStrings[0];
             deflectChanceLucky = deflectStrings[1];
         }
@@ -56,14 +61,14 @@ public class UnarmedCommand extends SkillCommand {
 
         // IRON GRIP
         if (canIronGrip) {
-            String[] ironGripStrings = calculateAbilityDisplayValues(Unarmed.ironGripMaxBonusLevel, Unarmed.ironGripMaxChance);
+            String[] ironGripStrings = calculateAbilityDisplayValues(skillValue, Unarmed.ironGripMaxBonusLevel, Unarmed.ironGripMaxChance, isLucky);
             ironGripChance = ironGripStrings[0];
             ironGripChanceLucky = ironGripStrings[1];
         }
     }
 
     @Override
-    protected void permissionsCheck() {
+    protected void permissionsCheck(Player player) {
         canBerserk = Permissions.berserk(player);
         canBonusDamage = Permissions.bonusDamage(player, skill);
         canDeflect = Permissions.arrowDeflect(player);
@@ -72,60 +77,56 @@ public class UnarmedCommand extends SkillCommand {
     }
 
     @Override
-    protected boolean effectsHeaderPermissions() {
+    protected List<String> effectsDisplay() {
-        return canBerserk || canBonusDamage || canDeflect || canDisarm || canIronGrip;
+        List<String> messages = new ArrayList<String>();
-    }
-
-    @Override
-    protected void effectsDisplay() {
-        luckyEffectsDisplay();
 
         if (canBerserk) {
-            player.sendMessage(LocaleLoader.getString("Effects.Template", LocaleLoader.getString("Unarmed.Effect.0"), LocaleLoader.getString("Unarmed.Effect.1")));
+            messages.add(LocaleLoader.getString("Effects.Template", LocaleLoader.getString("Unarmed.Effect.0"), LocaleLoader.getString("Unarmed.Effect.1")));
         }
 
         if (canDisarm) {
-            player.sendMessage(LocaleLoader.getString("Effects.Template", LocaleLoader.getString("Unarmed.Effect.2"), LocaleLoader.getString("Unarmed.Effect.3")));
+            messages.add(LocaleLoader.getString("Effects.Template", LocaleLoader.getString("Unarmed.Effect.2"), LocaleLoader.getString("Unarmed.Effect.3")));
         }
 
         if (canBonusDamage) {
-            player.sendMessage(LocaleLoader.getString("Effects.Template", LocaleLoader.getString("Unarmed.Effect.4"), LocaleLoader.getString("Unarmed.Effect.5")));
+            messages.add(LocaleLoader.getString("Effects.Template", LocaleLoader.getString("Unarmed.Effect.4"), LocaleLoader.getString("Unarmed.Effect.5")));
         }
 
         if (canDeflect) {
-            player.sendMessage(LocaleLoader.getString("Effects.Template", LocaleLoader.getString("Unarmed.Effect.6"), LocaleLoader.getString("Unarmed.Effect.7")));
+            messages.add(LocaleLoader.getString("Effects.Template", LocaleLoader.getString("Unarmed.Effect.6"), LocaleLoader.getString("Unarmed.Effect.7")));
         }
 
         if (canIronGrip) {
-            player.sendMessage(LocaleLoader.getString("Effects.Template", LocaleLoader.getString("Unarmed.Effect.8"), LocaleLoader.getString("Unarmed.Effect.9")));
+            messages.add(LocaleLoader.getString("Effects.Template", LocaleLoader.getString("Unarmed.Effect.8"), LocaleLoader.getString("Unarmed.Effect.9")));
         }
+
+        return messages;
     }
 
     @Override
-    protected boolean statsHeaderPermissions() {
+    protected List<String> statsDisplay(Player player, float skillValue, boolean hasEndurance, boolean isLucky) {
-        return canBerserk || canBonusDamage || canDeflect || canDisarm || canIronGrip;
+        List<String> messages = new ArrayList<String>();
-    }
 
-    @Override
-    protected void statsDisplay() {
         if (canBonusDamage) {
-            player.sendMessage(LocaleLoader.getString("Ability.Generic.Template", LocaleLoader.getString("Unarmed.Ability.Bonus.0"), LocaleLoader.getString("Unarmed.Ability.Bonus.1", ironArmBonus)));
+            messages.add(LocaleLoader.getString("Ability.Generic.Template", LocaleLoader.getString("Unarmed.Ability.Bonus.0"), LocaleLoader.getString("Unarmed.Ability.Bonus.1", ironArmBonus)));
         }
 
         if (canDeflect) {
-            player.sendMessage(LocaleLoader.getString("Unarmed.Ability.Chance.ArrowDeflect", deflectChance) + (isLucky ? LocaleLoader.getString("Perks.lucky.bonus", deflectChanceLucky) : ""));
+            messages.add(LocaleLoader.getString("Unarmed.Ability.Chance.ArrowDeflect", deflectChance) + (isLucky ? LocaleLoader.getString("Perks.Lucky.Bonus", deflectChanceLucky) : ""));
         }
 
         if (canDisarm) {
-            player.sendMessage(LocaleLoader.getString("Unarmed.Ability.Chance.Disarm", disarmChance) + (isLucky ? LocaleLoader.getString("Perks.lucky.bonus", disarmChanceLucky) : ""));
+            messages.add(LocaleLoader.getString("Unarmed.Ability.Chance.Disarm", disarmChance) + (isLucky ? LocaleLoader.getString("Perks.Lucky.Bonus", disarmChanceLucky) : ""));
         }
 
         if (canIronGrip) {
-            player.sendMessage(LocaleLoader.getString("Unarmed.Ability.Chance.IronGrip", ironGripChance) + (isLucky ? LocaleLoader.getString("Perks.lucky.bonus", ironGripChanceLucky) : ""));
+            messages.add(LocaleLoader.getString("Unarmed.Ability.Chance.IronGrip", ironGripChance) + (isLucky ? LocaleLoader.getString("Perks.Lucky.Bonus", ironGripChanceLucky) : ""));
         }
 
         if (canBerserk) {
-            player.sendMessage(LocaleLoader.getString("Unarmed.Ability.Berserk.Length", berserkLength) + (hasEndurance ? LocaleLoader.getString("Perks.activationtime.bonus", berserkLengthEndurance) : ""));
+            messages.add(LocaleLoader.getString("Unarmed.Ability.Berserk.Length", berserkLength) + (hasEndurance ? LocaleLoader.getString("Perks.ActivationTime.Bonus", berserkLengthEndurance) : ""));
         }
+
+        return messages;
     }
 }

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

@@ -1,5 +1,10 @@
 package com.gmail.nossr50.commands.skills;
 
+import java.util.ArrayList;
+import java.util.List;
+
+import org.bukkit.entity.Player;
+
 import com.gmail.nossr50.config.AdvancedConfig;
 import com.gmail.nossr50.datatypes.skills.SkillType;
 import com.gmail.nossr50.locale.LocaleLoader;
@@ -21,75 +26,71 @@ public class WoodcuttingCommand extends SkillCommand {
     }
 
     @Override
-    protected void dataCalculations() {
+    protected void dataCalculations(Player player, float skillValue, boolean isLucky) {
         // TREE FELLER
         if (canTreeFell) {
-            String[] treeFellerStrings = calculateLengthDisplayValues();
+            String[] treeFellerStrings = calculateLengthDisplayValues(player, skillValue);
             treeFellerLength = treeFellerStrings[0];
             treeFellerLengthEndurance = treeFellerStrings[1];
         }
 
         // DOUBLE DROPS
         if (canDoubleDrop) {
-            String[] doubleDropStrings = calculateAbilityDisplayValues(Woodcutting.doubleDropsMaxLevel, Woodcutting.doubleDropsMaxChance);
+            String[] doubleDropStrings = calculateAbilityDisplayValues(skillValue, Woodcutting.doubleDropsMaxLevel, Woodcutting.doubleDropsMaxChance, isLucky);
             doubleDropChance = doubleDropStrings[0];
             doubleDropChanceLucky = doubleDropStrings[1];
         }
     }
 
     @Override
-    protected void permissionsCheck() {
+    protected void permissionsCheck(Player player) {
         canTreeFell = Permissions.treeFeller(player);
         canDoubleDrop = Permissions.doubleDrops(player, skill) && !skill.getDoubleDropsDisabled();
         canLeafBlow = Permissions.leafBlower(player);
     }
 
     @Override
-    protected boolean effectsHeaderPermissions() {
+    protected List<String> effectsDisplay() {
-        return canDoubleDrop || canLeafBlow || canTreeFell;
+        List<String> messages = new ArrayList<String>();
-    }
-
-    @Override
-    protected void effectsDisplay() {
-        luckyEffectsDisplay();
 
         if (canTreeFell) {
-            player.sendMessage(LocaleLoader.getString("Effects.Template", LocaleLoader.getString("Woodcutting.Effect.0"), LocaleLoader.getString("Woodcutting.Effect.1")));
+            messages.add(LocaleLoader.getString("Effects.Template", LocaleLoader.getString("Woodcutting.Effect.0"), LocaleLoader.getString("Woodcutting.Effect.1")));
         }
 
         if (canLeafBlow) {
-            player.sendMessage(LocaleLoader.getString("Effects.Template", LocaleLoader.getString("Woodcutting.Effect.2"), LocaleLoader.getString("Woodcutting.Effect.3")));
+            messages.add(LocaleLoader.getString("Effects.Template", LocaleLoader.getString("Woodcutting.Effect.2"), LocaleLoader.getString("Woodcutting.Effect.3")));
         }
 
         if (canDoubleDrop) {
-            player.sendMessage(LocaleLoader.getString("Effects.Template", LocaleLoader.getString("Woodcutting.Effect.4"), LocaleLoader.getString("Woodcutting.Effect.5")));
+            messages.add(LocaleLoader.getString("Effects.Template", LocaleLoader.getString("Woodcutting.Effect.4"), LocaleLoader.getString("Woodcutting.Effect.5")));
         }
+
+        return messages;
     }
 
     @Override
-    protected boolean statsHeaderPermissions() {
+    protected List<String> statsDisplay(Player player, float skillValue, boolean hasEndurance, boolean isLucky) {
-        return canDoubleDrop || canLeafBlow || canTreeFell;
+        List<String> messages = new ArrayList<String>();
-    }
 
-    @Override
-    protected void statsDisplay() {
         if (canLeafBlow) {
             int leafBlowerUnlockLevel = AdvancedConfig.getInstance().getLeafBlowUnlockLevel();
 
             if (skillValue < leafBlowerUnlockLevel) {
-                player.sendMessage(LocaleLoader.getString("Ability.Generic.Template.Lock", LocaleLoader.getString("Woodcutting.Ability.Locked.0", leafBlowerUnlockLevel)));
+                messages.add(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")));
+                messages.add(LocaleLoader.getString("Ability.Generic.Template", LocaleLoader.getString("Woodcutting.Ability.0"), LocaleLoader.getString("Woodcutting.Ability.1")));
             }
         }
 
         if (canDoubleDrop) {
-            player.sendMessage(LocaleLoader.getString("Woodcutting.Ability.Chance.DDrop", doubleDropChance) + (isLucky ? LocaleLoader.getString("Perks.lucky.bonus", doubleDropChanceLucky) : ""));
+            messages.add(LocaleLoader.getString("Woodcutting.Ability.Chance.DDrop", doubleDropChance) + (isLucky ? LocaleLoader.getString("Perks.Lucky.Bonus", doubleDropChanceLucky) : ""));
         }
 
         if (canTreeFell) {
-            player.sendMessage(LocaleLoader.getString("Woodcutting.Ability.Length", treeFellerLength) + (hasEndurance ? LocaleLoader.getString("Perks.activationtime.bonus", treeFellerLengthEndurance) : ""));
+            messages.add(LocaleLoader.getString("Woodcutting.Ability.Length", treeFellerLength) + (hasEndurance ? LocaleLoader.getString("Perks.ActivationTime.Bonus", treeFellerLengthEndurance) : ""));
         }
+
+        return messages;
     }
 }

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

@@ -1,57 +0,0 @@
-package com.gmail.nossr50.commands.spout;
-
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-
-import org.bukkit.command.Command;
-import org.bukkit.command.CommandSender;
-import org.bukkit.util.StringUtil;
-
-import com.gmail.nossr50.datatypes.spout.huds.HudType;
-import com.gmail.nossr50.locale.LocaleLoader;
-import com.google.common.collect.ImmutableList;
-
-public class MchudCommand extends SpoutCommand {
-    private static final List<String> HUD_TYPES;
-
-    static {
-        ArrayList<String> types = new ArrayList<String>();
-
-        for (HudType type : HudType.values()) {
-            types.add(type.toString());
-        }
-
-        Collections.sort(types);
-        HUD_TYPES = ImmutableList.copyOf(types);
-    }
-
-    @Override
-    public List<String> onTabComplete(CommandSender sender, Command command, String alias, String[] args) {
-        switch (args.length) {
-            case 1:
-                return StringUtil.copyPartialMatches(args[0], HUD_TYPES, new ArrayList<String>(HUD_TYPES.size()));
-            default:
-                return ImmutableList.of();
-        }
-    }
-
-    @Override
-    protected boolean noArguments(Command command, CommandSender sender, String[] args) {
-        return false;
-    }
-
-    @Override
-    protected boolean oneArgument(Command command, CommandSender sender, String[] args) {
-        try {
-            playerProfile.setHudType(HudType.valueOf(args[0].toUpperCase().trim()));
-            spoutHud.initializeXpBar();
-            spoutHud.updateXpBar();
-            return true;
-        }
-        catch (IllegalArgumentException ex) {
-            sender.sendMessage(LocaleLoader.getString("Commands.mchud.Invalid"));
-            return true;
-        }
-    }
-}

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

@@ -1,54 +0,0 @@
-package com.gmail.nossr50.commands.spout;
-
-import org.bukkit.command.Command;
-import org.bukkit.command.CommandSender;
-import org.bukkit.command.TabExecutor;
-import org.bukkit.entity.Player;
-
-import com.gmail.nossr50.mcMMO;
-import com.gmail.nossr50.config.spout.SpoutConfig;
-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.util.commands.CommandUtils;
-import com.gmail.nossr50.util.player.UserManager;
-
-public abstract class SpoutCommand implements TabExecutor {
-    protected PlayerProfile playerProfile;
-    protected McMMOHud spoutHud;
-
-    @Override
-    public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
-        if (CommandUtils.noConsoleUsage(sender)) {
-            return true;
-        }
-
-        if (!mcMMO.isSpoutEnabled() || !SpoutConfig.getInstance().getXPBarEnabled()) {
-            sender.sendMessage(LocaleLoader.getString("Commands.Disabled"));
-            return true;
-        }
-
-        playerProfile = UserManager.getPlayer((Player) sender).getProfile();
-        spoutHud = playerProfile.getSpoutHud();
-
-        if (spoutHud == null) {
-            sender.sendMessage(LocaleLoader.getString("Commands.Disabled"));
-            return true;
-        }
-
-        switch (args.length) {
-            case 0:
-                return noArguments(command, sender, args);
-
-            case 1:
-                return oneArgument(command, sender, args);
-
-            default:
-                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,89 +0,0 @@
-package com.gmail.nossr50.commands.spout;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.bukkit.command.Command;
-import org.bukkit.command.CommandSender;
-import org.bukkit.util.StringUtil;
-
-import com.gmail.nossr50.datatypes.skills.SkillType;
-import com.gmail.nossr50.locale.LocaleLoader;
-import com.gmail.nossr50.util.Permissions;
-import com.gmail.nossr50.util.commands.CommandUtils;
-import com.gmail.nossr50.util.skills.SkillUtils;
-import com.google.common.collect.ImmutableList;
-
-public class XplockCommand extends SpoutCommand {
-    @Override
-    public List<String> onTabComplete(CommandSender sender, Command command, String alias, String[] args) {
-        switch (args.length) {
-            case 1:
-                List<String> matches = StringUtil.copyPartialMatches(args[0], CommandUtils.TRUE_FALSE_OPTIONS, new ArrayList<String>(CommandUtils.TRUE_FALSE_OPTIONS.size()));
-
-                if (matches.size() == 0) {
-                    return StringUtil.copyPartialMatches(args[0], SkillType.SKILL_NAMES, new ArrayList<String>(SkillType.SKILL_NAMES.size()));
-                }
-
-                return matches;
-            default:
-                return ImmutableList.of();
-        }
-    }
-
-    @Override
-    protected boolean noArguments(Command command, CommandSender sender, String[] args) {
-        if (spoutHud.getXpBarLocked()) {
-            unlockXpBar(sender);
-            return true;
-        }
-
-        lockXpBar(sender, spoutHud.getLastGained());
-        return true;
-    }
-
-    @Override
-    protected boolean oneArgument(Command command, CommandSender sender, String[] args) {
-        if (CommandUtils.shouldEnableToggle(args[0])) {
-            lockXpBar(sender, spoutHud.getLastGained());
-            return true;
-        }
-
-        if (CommandUtils.shouldDisableToggle(args[0])) {
-            unlockXpBar(sender);
-            return true;
-        }
-
-        if (CommandUtils.isInvalidSkill(sender, args[0])) {
-            return true;
-        }
-
-        SkillType skill = SkillType.getSkill(args[0]);
-
-        if (CommandUtils.isChildSkill(sender, skill)) {
-            return true;
-        }
-
-        if (!Permissions.xplock(sender, skill)) {
-            sender.sendMessage(command.getPermissionMessage());
-            return true;
-        }
-
-        lockXpBar(sender, skill);
-        return true;
-    }
-
-    private void lockXpBar(CommandSender sender, SkillType skill) {
-        if (skill != null) {
-            spoutHud.setXpBarLocked(true);
-            spoutHud.setSkillLock(skill);
-            spoutHud.updateXpBar();
-            sender.sendMessage(LocaleLoader.getString("Commands.xplock.locked", SkillUtils.getSkillName(skill)));
-        }
-    }
-
-    private void unlockXpBar(CommandSender sender) {
-        spoutHud.setXpBarLocked(false);
-        sender.sendMessage(LocaleLoader.getString("Commands.xplock.unlocked"));
-    }
-}

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

@@ -63,7 +63,7 @@ public abstract class AutoUpdateConfigLoader extends ConfigLoader {
             output = output.replace("  ", "    ");
 
             // Rip out Bukkit's attempt to save comments at the top of the file
-            while (output.indexOf('#') != -1) {
+            while (output.replaceAll("[//s]", "").startsWith("#")) {
                 output = output.substring(output.indexOf('\n', output.indexOf('#')) + 1);
             }
 
@@ -90,7 +90,7 @@ public abstract class AutoUpdateConfigLoader extends ConfigLoader {
 
                 // Dump to the new one
                 for (String key : comments.keySet()) {
-                    if (output.indexOf(key) != -1) {
+                    if (output.contains(key)) {
                         output = output.substring(0, output.indexOf(key)) + comments.get(key) + output.substring(output.indexOf(key));
                     }
                 }

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

@@ -1,5 +1,7 @@
 package com.gmail.nossr50.config;
 
+import java.util.ArrayList;
+import java.util.List;
 import java.util.Set;
 
 import org.bukkit.Material;
@@ -16,6 +18,7 @@ public class Config extends AutoUpdateConfigLoader {
 
     private Config() {
         super("config.yml");
+        validate();
     }
 
     public static Config getInstance() {
@@ -26,6 +29,167 @@ public class Config extends AutoUpdateConfigLoader {
         return instance;
     }
 
+    @Override
+    protected boolean validateKeys() {
+        // Validate all the settings!
+        List<String> reason = new ArrayList<String>();
+
+        /* General Settings */
+        if (getSaveInterval() <= 0) {
+            reason.add("General.Save_Interval should be greater than 0!");
+        }
+
+        /* Mob Healthbar */
+        if (getMobHealthbarTime() == 0) {
+            reason.add("Mob_Healthbar.Display_Time cannot be 0! Set to -1 to disable or set a valid value.");
+        }
+
+        /* Scoreboards */
+        if (getRankScoreboardTime() != -1 && getRankScoreboardTime() <= 0) {
+            reason.add("Scoreboard.Types.Rank.Display_Time should be greater than 0, or -1!");
+        }
+
+        if (getStatsScoreboardTime() != -1 && getStatsScoreboardTime() <= 0) {
+            reason.add("Scoreboard.Types.Stats.Display_Time should be greater than 0, or -1!");
+        }
+
+        if (getTopScoreboardTime() != -1 && getTopScoreboardTime() <= 0) {
+            reason.add("Scoreboard.Types.Top.Display_Time should be greater than 0, or -1!");
+        }
+
+        if (getInspectScoreboardTime() != -1 && getInspectScoreboardTime() <= 0) {
+            reason.add("Scoreboard.Types.Inspect.Display_Time should be greater than 0, or -1!");
+        }
+
+        if (getSkillScoreboardTime() != -1 && getSkillScoreboardTime() <= 0) {
+            reason.add("Scoreboard.Types.Skill.Display_Time should be greater than 0, or -1!");
+        }
+
+        if (getSkillLevelUpTime() != -1 && getSkillScoreboardTime() <= 0) {
+            reason.add("Scoreboard.Types.Skill.Display_Time should be greater than 0, or -1!");
+        }
+
+        if (!(getRankUseChat() || getRankUseBoard())) {
+            reason.add("Either Board or Print in Scoreboard.Types.Rank must be true!");
+        }
+
+        if (!(getTopUseChat() || getTopUseBoard())) {
+            reason.add("Either Board or Print in Scoreboard.Types.Top must be true!");
+        }
+
+        if (!(getStatsUseChat() || getStatsUseBoard())) {
+            reason.add("Either Board or Print in Scoreboard.Types.Stats must be true!");
+        }
+
+        if (!(getInspectUseChat() || getInspectUseBoard())) {
+            reason.add("Either Board or Print in Scoreboard.Types.Inspect must be true!");
+        }
+
+        /* Database Purging */
+        if (getPurgeInterval() < -1) {
+            reason.add("Database_Purging.Purge_Interval should be greater than, or equal to -1!");
+        }
+
+        if (getOldUsersCutoff() != -1 && getOldUsersCutoff() <= 0) {
+            reason.add("Database_Purging.Old_User_Cutoff should be greater than 0 or -1!");
+        }
+
+        /* Hardcore Mode */
+        if (getHardcoreDeathStatPenaltyPercentage() < 0.01 || getHardcoreDeathStatPenaltyPercentage() > 100) {
+            reason.add("Hardcore.Death_Stat_Loss.Penalty_Percentage only accepts values from 0.01 to 100!");
+        }
+
+        if (getHardcoreVampirismStatLeechPercentage() < 0.01 || getHardcoreVampirismStatLeechPercentage() > 100) {
+            reason.add("Hardcore.Vampirism.Leech_Percentage only accepts values from 0.01 to 100!");
+        }
+
+        /* Items */
+        if (getChimaeraUseCost() < 1 || getChimaeraUseCost() > 64) {
+            reason.add("Items.Chimaera_Wing.Use_Cost only accepts values from 1 to 64!");
+        }
+
+        if (getChimaeraRecipeCost() < 1 || getChimaeraRecipeCost() > 9) {
+            reason.add("Items.Chimaera_Wing.Recipe_Cost only accepts values from 1 to 64!");
+        }
+
+        if (getChimaeraItem() == null) {
+            reason.add("Items.Chimaera_Wing.Item_Name is invalid!");
+        }
+
+        /* Particles */
+        if (getLevelUpEffectsTier() < 1) {
+            reason.add("Particles.LevelUp_Tier should be at least 1!");
+        }
+
+        /* PARTY SETTINGS */
+        if (getAutoPartyKickInterval() < -1) {
+            reason.add("Party.AutoKick_Interval should be at least -1!");
+        }
+
+        if (getAutoPartyKickTime() < 0) {
+            reason.add("Party.Old_Party_Member_Cutoff should be at least 0!");
+        }
+
+        if (getPartyShareBonusBase() <= 0) {
+            reason.add("Party.Sharing.ExpShare_bonus_base should be greater than 0!");
+        }
+
+        if (getPartyShareBonusIncrease() < 0) {
+            reason.add("Party.Sharing.ExpShare_bonus_increase should be at least 0!");
+        }
+
+        if (getPartyShareBonusCap() <= 0) {
+            reason.add("Party.Sharing.ExpShare_bonus_cap should be greater than 0!");
+        }
+
+        if (getPartyShareRange() <= 0) {
+            reason.add("Party.Sharing.Range should be greater than 0!");
+        }
+
+        /* Inspect command distance */
+        if (getInspectDistance() <= 0) {
+            reason.add("Commands.inspect.Max_Distance should be greater than 0!");
+        }
+
+        if (getTreeFellerThreshold() <= 0) {
+            reason.add("Abilities.Limits.Tree_Feller_Threshold should be greater than 0!");
+        }
+
+        if (getDetonatorItem() == null) {
+            reason.add("Skills.Mining.Detonator_Item is invalid!");
+        }
+
+        if (getRepairAnvilMaterial() == null) {
+            reason.add("Skills.Repair.Anvil_Type is invalid!!");
+        }
+
+        if (getSalvageAnvilMaterial() == null) {
+            reason.add("Skills.Repair.Salvage_Anvil_Type is invalid!");
+        }
+
+        if (getRepairAnvilMaterial() == getSalvageAnvilMaterial()) {
+            reason.add("Cannot use the same item for Repair and Salvage anvils!");
+        }
+
+        if (getTamingCOTWWolfCost() < 1) {
+            reason.add("Skills.Taming.Call_Of_The_Wild.Bones_Required should be at least 1!");
+        }
+
+        if (getTamingCOTWOcelotCost() < 1) {
+            reason.add("Skills.Taming.Call_Of_The_Wild.Fish_Required should be at least 1!");
+        }
+
+        if (getTamingCOTWAmount(EntityType.OCELOT) <= 0) {
+            reason.add("Skills.Taming.Call_Of_The_Wild.Ocelot_Amount should be greater than 0!");
+        }
+
+        if (getTamingCOTWAmount(EntityType.WOLF) <= 0) {
+            reason.add("Skills.Taming.Call_Of_The_Wild.Wolf_Amount should be greater than 0!");
+        }
+
+        return noErrorsInConfig(reason);
+    }
+
     @Override
     protected void loadKeys() {}
 
@@ -41,13 +205,19 @@ public class Config extends AutoUpdateConfigLoader {
     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 String getPartyChatPrefix() { return config.getString("Commands.partychat.Chat_Prefix_Format", "[[GREEN]]([[WHITE]]{0}[[GREEN]])"); }
-    public boolean getAdminDisplayNames() { return config.getBoolean("Commands.a.Use_Display_Names", true); }
+    public boolean getPartyChatColorLeaderName() { return config.getBoolean("Commands.partychat.Gold_Leader_Name", true); }
+    public boolean getPartyDisplayNames() { return config.getBoolean("Commands.partychat.Use_Display_Names", true); }
+
+    public String getAdminChatPrefix() { return config.getString("Commands.adminchat.Chat_Prefix_Format", "[[AQUA]][[[WHITE]]{0}[[AQUA]]]"); }
+    public boolean getAdminDisplayNames() { return config.getBoolean("Commands.adminchat.Use_Display_Names", true); }
+
+    public boolean getMatchOfflinePlayers() { return config.getBoolean("Commands.Generic.Match_OfflinePlayers", false); }
+
+    public boolean getLevelUpSoundsEnabled() { return config.getBoolean("General.LevelUp_Sounds", true); }
 
     /* Mob Healthbar */
     public MobHealthbarType getMobHealthbarDefault() {
@@ -62,84 +232,97 @@ public class Config extends AutoUpdateConfigLoader {
     public int getMobHealthbarTime() { return config.getInt("Mob_Healthbar.Display_Time", 3); }
 
     /* Scoreboards */
-    public boolean getMcrankScoreboardEnabled() { return config.getBoolean("Scoreboards.Mcrank.Use", true); }
+    public boolean getRankUseChat() { return config.getBoolean("Scoreboard.Types.Rank.Print", false); }
-    public int getMcrankScoreboardTime() { return config.getInt("Scoreboards.Mcrank.Display_Time", 10); }
+    public boolean getRankUseBoard() { return config.getBoolean("Scoreboard.Types.Rank.Board", true); }
+    public int getRankScoreboardTime() { return config.getInt("Scoreboard.Types.Rank.Display_Time", 10); }
 
-    public boolean getMcstatsScoreboardsEnabled() { return config.getBoolean("Scoreboards.Mcstats.Use", true); }
+    public boolean getTopUseChat() { return config.getBoolean("Scoreboard.Types.Top.Print", true); }
-    public int getMcstatsScoreboardTime() { return config.getInt("Scoreboards.Mcstats.Display_Time", 10); }
+    public boolean getTopUseBoard() { return config.getBoolean("Scoreboard.Types.Top.Board", true); }
+    public int getTopScoreboardTime() { return config.getInt("Scoreboard.Types.Top.Display_Time", 15); }
 
-    public boolean getMctopScoreboardEnabled() { return config.getBoolean("Scoreboards.Mctop.Use", true); }
+    public boolean getStatsUseChat() { return config.getBoolean("Scoreboard.Types.Stats.Print", true); }
-    public int getMctopScoreboardTime() { return config.getInt("Scoreboards.Mctop.Display_Time", 10); }
+    public boolean getStatsUseBoard() { return config.getBoolean("Scoreboard.Types.Stats.Board", true); }
+    public int getStatsScoreboardTime() { return config.getInt("Scoreboard.Types.Stats.Display_Time", 10); }
 
-    public boolean getInspectScoreboardEnabled() { return config.getBoolean("Scoreboards.Inspect.Use", true); }
+    public boolean getInspectUseChat() { return config.getBoolean("Scoreboard.Types.Inspect.Print", true); }
-    public int getInspectScoreboardTime() { return config.getInt("Scoreboards.Inspect.Display_Time", 10); }
+    public boolean getInspectUseBoard() { return config.getBoolean("Scoreboard.Types.Inspect.Board", true); }
+    public int getInspectScoreboardTime() { return config.getInt("Scoreboard.Types.Inspect.Display_Time", 25); }
 
-    public boolean getSkillScoreboardEnabled() { return config.getBoolean("Scoreboards.Skillname.Use", true); }
+    public boolean getCooldownUseChat() { return config.getBoolean("Scoreboard.Types.Cooldown.Print", false); }
-    public int getSkillScoreboardTime() { return config.getInt("Scoreboards.Skillname.Display_Time", 10); }
+    public boolean getCooldownUseBoard() { return config.getBoolean("Scoreboard.Types.Cooldown.Board", true); }
+    public int getCooldownScoreboardTime() { return config.getInt("Scoreboard.Types.Cooldown.Display_Time", 41); }
 
-    public boolean getPowerLevelsEnabled() { return config.getBoolean("Scoreboards.Power_Level.Use", false); }
+    public boolean getSkillUseBoard() { return config.getBoolean("Scoreboard.Types.Skill.Board", true); }
+    public int getSkillScoreboardTime() { return config.getInt("Scoreboard.Types.Skill.Display_Time", 30); }
+    public boolean getSkillLevelUpBoard() { return config.getBoolean("Scoreboard.Types.Skill.LevelUp_Board", true); }
+    public int getSkillLevelUpTime() { return config.getInt("Scoreboard.Types.Skill.LevelUp_Time", 5); }
+
+    public boolean getPowerLevelTagsEnabled() { return config.getBoolean("Scoreboard.Power_Level_Tags", false); }
+
+    public boolean getAllowKeepBoard() { return config.getBoolean("Scoreboard.Allow_Keep", true); }
+    public boolean getScoreboardRainbows() { return config.getBoolean("Scoreboard.Rainbows", false); }
 
     /* Database Purging */
     public int getPurgeInterval() { return config.getInt("Database_Purging.Purge_Interval", -1); }
     public int getOldUsersCutoff() { return config.getInt("Database_Purging.Old_User_Cutoff", 6); }
 
+    /* Backups */
+    public boolean getBackupsEnabled() { return config.getBoolean("Backups.Enabled", true); }
+    public boolean getKeepLast24Hours() { return config.getBoolean("Backups.Keep.Last_24_Hours", true); }
+    public boolean getKeepDailyLastWeek() { return config.getBoolean("Backups.Keep.Daily_Last_Week", true); }
+    public boolean getKeepWeeklyPastMonth() { return config.getBoolean("Backups.Keep.Weekly_Past_Months", true); }
+
     /* mySQL */
     public boolean getUseMySQL() { return config.getBoolean("MySQL.Enabled", false); }
     public String getMySQLTablePrefix() { return config.getString("MySQL.Database.TablePrefix", "mcmmo_"); }
-    public String getMySQLDatabaseName() { return getStringIncludingInts(config, "MySQL.Database.Name"); }
+    public String getMySQLDatabaseName() { return getStringIncludingInts("MySQL.Database.Name"); }
-    public String getMySQLUserName() { return getStringIncludingInts(config, "MySQL.Database.User_Name"); }
+    public String getMySQLUserName() { return getStringIncludingInts("MySQL.Database.User_Name"); }
     public int getMySQLServerPort() { return config.getInt("MySQL.Server.Port", 3306); }
     public String getMySQLServerName() { return config.getString("MySQL.Server.Address", "localhost"); }
+    public String getMySQLUserPassword() { return getStringIncludingInts("MySQL.Database.User_Password"); }
 
-    public String getMySQLUserPassword() {
+    private String getStringIncludingInts(String key) {
-        if (getStringIncludingInts(config, "MySQL.Database.User_Password") != null) {
+        String str = config.getString(key);
-            return getStringIncludingInts(config, "MySQL.Database.User_Password");
-        }
-
-        return "";
-    }
-
-    private static String getStringIncludingInts(ConfigurationSection cfg, String key) {
-        String str = cfg.getString(key);
 
         if (str == null) {
-            str = String.valueOf(cfg.getInt(key));
+            str = String.valueOf(config.getInt(key));
         }
 
-        if (str == "0") {
+        if (str.equals("0")) {
             str = "No value set for '" + key + "'";
         }
         return str;
     }
 
     /* Hardcore Mode */
-    public boolean getHardcoreEnabled() { return config.getBoolean("Hardcore.Enabled", false); }
+    public boolean getHardcoreStatLossEnabled(SkillType skillType) { return config.getBoolean("Hardcore.Death_Stat_Loss.Enabled." + StringUtils.getCapitalized(skillType.toString()), false); }
-    public void setHardcoreEnabled(boolean enabled) { config.set("Hardcore.Enabled", enabled); }
+    public void setHardcoreStatLossEnabled(SkillType skillType, boolean enabled) { config.set("Hardcore.Death_Stat_Loss.Enabled." + StringUtils.getCapitalized(skillType.toString()), enabled); }
 
-    public double getHardcoreDeathStatPenaltyPercentage() { return config.getDouble("Hardcore.Death_Stat_Loss_Penalty_Percentage", 75.0); }
+    public double getHardcoreDeathStatPenaltyPercentage() { return config.getDouble("Hardcore.Death_Stat_Loss.Penalty_Percentage", 75.0D); }
-    public void setHardcoreDeathStatPenaltyPercentage(double value) { config.set("Hardcore.Death_Stat_Loss_Penalty_Percentage", value); }
+    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 boolean getHardcoreVampirismEnabled(SkillType skillType) { return config.getBoolean("Hardcore.Vampirism.Enabled." + StringUtils.getCapitalized(skillType.toString()), false); }
-    public void setHardcoreVampirismStatLeechPercentage(double value) { config.set("Hardcore.Vampirism_Stat_Leech_Percentage", value); }
+    public void setHardcoreVampirismEnabled(SkillType skillType, boolean enabled) { config.set("Hardcore.Vampirism.Enabled." + StringUtils.getCapitalized(skillType.toString()), enabled); }
 
-    public boolean getHardcoreVampirismEnabled() { return config.getBoolean("Hardcore.Vampirism", false); }
+    public double getHardcoreVampirismStatLeechPercentage() { return config.getDouble("Hardcore.Vampirism.Leech_Percentage", 5.0D); }
-    public void setHardcoreVampirismEnabled(boolean enabled) { config.set("Hardcore.Vampirism", enabled); }
+    public void setHardcoreVampirismStatLeechPercentage(double value) { config.set("Hardcore.Vampirism.Leech_Percentage", value); }
 
     /* SMP Mods */
     public boolean getToolModsEnabled() { return config.getBoolean("Mods.Tool_Mods_Enabled", false); }
-    public boolean getArmorModsEnabled() { return config.getBoolean("Mods.Tool_Mods_Enabled", false); }
+    public boolean getArmorModsEnabled() { return config.getBoolean("Mods.Armor_Mods_Enabled", false); }
     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 Material getChimaeraItem() { return Material.matchMaterial(config.getString("Items.Chimaera_Wing.Item_Name", "Feather")); }
     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); }
     public int getChimaeraWarmup() { return config.getInt("Items.Chimaera_Wing.Warmup", 5); }
     public int getChimaeraRecentlyHurtCooldown() { return config.getInt("Items.Chimaera_Wing.RecentlyHurt_Cooldown", 60); }
+    public boolean getChimaeraSoundEnabled() { return config.getBoolean("Items.Chimaera_Wing.Sound_Enabled", true); }
 
     /* Particles */
     public boolean getAbilityActivationEffectEnabled() { return config.getBoolean("Particles.Ability_Activation", true); }
@@ -155,11 +338,11 @@ public class Config extends AutoUpdateConfigLoader {
     public int getAutoPartyKickInterval() { return config.getInt("Party.AutoKick_Interval", 12); }
     public int getAutoPartyKickTime() { return config.getInt("Party.Old_Party_Member_Cutoff", 7); }
     public boolean getExpShareEnabled() { return config.getBoolean("Party.Sharing.ExpShare_enabled", true); }
-    public double getPartyShareBonusBase() { return config.getDouble("Party.Sharing.ExpShare_bonus_base", 1.1); }
+    public double getPartyShareBonusBase() { return config.getDouble("Party.Sharing.ExpShare_bonus_base", 1.1D); }
-    public double getPartyShareBonusIncrease() { return config.getDouble("Party.Sharing.ExpShare_bonus_increase", 0.05); }
+    public double getPartyShareBonusIncrease() { return config.getDouble("Party.Sharing.ExpShare_bonus_increase", 0.05D); }
-    public double getPartyShareBonusCap() { return config.getDouble("Party.Sharing.ExpShare_bonus_cap", 1.5); }
+    public double getPartyShareBonusCap() { return config.getDouble("Party.Sharing.ExpShare_bonus_cap", 1.5D); }
     public boolean getItemShareEnabled() { return config.getBoolean("Party.Sharing.ItemShare_enabled", true); }
-    public double getPartyShareRange() { return config.getDouble("Party.Sharing.Range", 75.0); }
+    public double getPartyShareRange() { return config.getDouble("Party.Sharing.Range", 75.0D); }
 
     /* Party Teleport Settings */
     public int getPTPCommandCooldown() { return config.getInt("Commands.ptp.Cooldown", 120); }
@@ -170,7 +353,7 @@ public class Config extends AutoUpdateConfigLoader {
     public boolean getPTPCommandWorldPermissions() { return config.getBoolean("Commands.ptp.World_Based_Permissions", false); }
 
     /* Inspect command distance */
-    public double getInspectDistance() { return config.getDouble("Commands.inspect.Max_Distance", 30); }
+    public double getInspectDistance() { return config.getDouble("Commands.inspect.Max_Distance", 30.0D); }
 
     /*
      * ABILITY SETTINGS
@@ -182,11 +365,10 @@ public class Config extends AutoUpdateConfigLoader {
     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()); }
+    public int getMaxLength(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", 1); }
-    public int getAbilityToolDamage() { return config.getInt("Abilities.Tools.Durability_Loss", 2); }
 
     /* Thresholds */
     public int getTreeFellerThreshold() { return config.getInt("Abilities.Limits.Tree_Feller_Threshold", 500); }
@@ -194,8 +376,6 @@ public class Config extends AutoUpdateConfigLoader {
     /*
      * SKILL SETTINGS
      */
-
-    public int getXp(SkillType skill, Material material) { return config.getInt("Experience." + StringUtils.getCapitalized(skill.toString()) + "." + StringUtils.getPrettyItemString(material).replace(" ", "_")); }
     public boolean getDoubleDropsEnabled(SkillType skill, Material material) { return config.getBoolean("Double_Drops." + StringUtils.getCapitalized(skill.toString()) + "." + StringUtils.getPrettyItemString(material).replace(" ", "_")); }
 
     public boolean getDoubleDropsDisabled(SkillType skill) {
@@ -216,18 +396,20 @@ public class Config extends AutoUpdateConfigLoader {
 
     /* Acrobatics */
     public boolean getDodgeLightningDisabled() { return config.getBoolean("Skills.Acrobatics.Prevent_Dodge_Lightning", false); }
+    public boolean getPreventXPAfterTeleport() { return config.getBoolean("Skills.Acrobatics.Prevent_XP_After_Teleport", true); }
 
     /* Fishing */
-    public int getFishingBaseXP() { return config.getInt("Experience.Fishing.Base", 800); }
     public boolean getFishingDropsEnabled() { return config.getBoolean("Skills.Fishing.Drops_Enabled", true); }
 
     /* Mining */
-    public int getDetonatorItemID() { return config.getInt("Skills.Mining.Detonator_ID", 259); }
+    public Material getDetonatorItem() { return Material.matchMaterial(config.getString("Skills.Mining.Detonator_Name", "FLINT_AND_STEEL")); }
 
     /* 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 getRepairAnvilPlaceSoundsEnabled() { return config.getBoolean("Skills.Repair.Anvil_Placed_Sounds", true); }
-    public int getSalvageAnvilId() { return config.getInt("Skills.Repair.Salvage_Anvil_ID", 41); }
+    public boolean getRepairAnvilUseSoundsEnabled() { return config.getBoolean("Skills.Repair.Anvil_Use_Sounds", true); }
+    public Material getRepairAnvilMaterial() { return Material.matchMaterial(config.getString("Skills.Repair.Anvil_Material", "IRON_BLOCK")); }
+    public Material getSalvageAnvilMaterial() { return Material.matchMaterial(config.getString("Skills.Repair.Salvage_Anvil_Material", "GOLD_BLOCK")); }
     public boolean getSalvageTools() { return config.getBoolean("Skills.Repair.Salvage_tools", true); }
     public boolean getSalvageArmor() { return config.getBoolean("Skills.Repair.Salvage_armor", true); }
     public boolean getRepairConfirmRequired() { return config.getBoolean("Skills.Repair.Confirm_Required", true); }
@@ -236,27 +418,23 @@ public class Config extends AutoUpdateConfigLoader {
     public boolean getUnarmedBlockCrackerSmoothbrickToCracked() { return config.getBoolean("Skills.Unarmed.Block_Cracker.SmoothBrick_To_CrackedBrick", true); }
 
     /* Taming */
-    public int getTamingXPWolf() { return config.getInt("Experience.Taming.Animal_Taming.Wolf", 250); }
+    public int getTamingCOTWHorseCost() { return config.getInt("Skills.Taming.Call_Of_The_Wild.Apples_Required", 10); }
-    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); }
+    public double getTamingCOTWRange() { return config.getDouble("Skills.Taming.Call_Of_The_Wild.Range", 40.0D); }
+    public int getTamingCOTWAmount(EntityType type) { return config.getInt("Skills.Taming.Call_Of_The_Wild." + StringUtils.getPrettyEntityTypeString(type)+ "_Amount"); }
 
     /* Woodcutting */
-    public int getWoodcuttingXPOak() { return config.getInt("Experience.Woodcutting.Oak", 70); }
-    public int getWoodcuttingXPBirch() { return config.getInt("Experience.Woodcutting.Birch", 90); }
-    public int getWoodcuttingXPSpruce() { return config.getInt("Experience.Woodcutting.Spruce", 80); }
-    public int getWoodcuttingXPJungle() { return config.getInt("Experience.Woodcutting.Jungle", 100); }
-    public int getWoodcuttingXPHugeBrownMushroom() { return config.getInt("Experience.Woodcutting.Huge_Mushroom_Brown", 70); }
-    public int getWoodcuttingXPHugeRedMushroom() { return config.getInt("Experience.Woodcutting.Huge_Mushroom_Red", 70); }
-
     public boolean getOakDoubleDropsEnabled() { return config.getBoolean("Double_Drops.Woodcutting.Oak", true); }
     public boolean getBirchDoubleDropsEnabled() { return config.getBoolean("Double_Drops.Woodcutting.Birch", true); }
     public boolean getSpruceDoubleDropsEnabled() { return config.getBoolean("Double_Drops.Woodcutting.Spruce", true); }
     public boolean getJungleDoubleDropsEnabled() { return config.getBoolean("Double_Drops.Woodcutting.Jungle", true); }
+    public boolean getTreeFellerSoundsEnabled() { return config.getBoolean("Skills.Woodcutting.Tree_Feller_Sounds", true); }
 
     /* AFK Leveling */
-    public boolean getAcrobaticsAFKDisabled() { return config.getBoolean("Skills.Acrobatics.Prevent_AFK_Leveling", true); }
+    public boolean getAcrobaticsPreventAFK() { return config.getBoolean("Skills.Acrobatics.Prevent_AFK_Leveling", true); }
-    public boolean getHerbalismAFKDisabled() { return config.getBoolean("Skills.Herbalism.Prevent_AFK_Leveling", true); }
+    public int getAcrobaticsAFKMaxTries() { return config.getInt("Skills.Acrobatics.Max_Tries_At_Same_Location", 3); }
+    public boolean getHerbalismPreventAFK() { return config.getBoolean("Skills.Herbalism.Prevent_AFK_Leveling", true); }
 
     /* Level Caps */
     public int getPowerLevelCap() {
@@ -272,27 +450,4 @@ public class Config extends AutoUpdateConfigLoader {
     /* PVP & PVE Settings */
     public boolean getPVPEnabled(SkillType skill) { return config.getBoolean("Skills." + StringUtils.getCapitalized(skill.toString()) + ".Enabled_For_PVP", true); }
     public boolean getPVEEnabled(SkillType skill) { return config.getBoolean("Skills." + StringUtils.getCapitalized(skill.toString()) + ".Enabled_For_PVE", true); }
-
-    /*
-     * XP SETTINGS
-     */
-
-    /* General Settings */
-    public boolean 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); }
-
-    public double getSpawnedMobXpMultiplier() { return config.getDouble("Experience.Gains.Mobspawners.Multiplier", 0.0); }
-
-    /* XP Formula Multiplier */
-    public int getFormulaMultiplierCurve() { return config.getInt("Experience.Formula.Curve_Modifier", 20); }
-    public double getFormulaSkillModifier(SkillType skill) { return config.getDouble("Experience.Formula.Modifier." + StringUtils.getCapitalized(skill.toString())); }
 }

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

@@ -1,11 +1,7 @@
 package com.gmail.nossr50.config;
 
 import java.io.File;
-import java.io.FileNotFoundException;
+import java.util.List;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
 
 import org.bukkit.configuration.file.FileConfiguration;
 import org.bukkit.configuration.file.YamlConfiguration;
@@ -15,7 +11,7 @@ import com.gmail.nossr50.mcMMO;
 public abstract class ConfigLoader {
     protected static final mcMMO plugin = mcMMO.p;
     protected String fileName;
-    protected File configFile;
+    private File configFile;
     protected FileConfiguration config;
 
     public ConfigLoader(String relativePath, String fileName) {
@@ -33,7 +29,13 @@ public abstract class ConfigLoader {
     protected void loadFile() {
         if (!configFile.exists()) {
             plugin.debug("Creating mcMMO " + fileName + " File...");
-            createFile();
+
+            try {
+                plugin.saveResource(fileName, false); // Normal files
+            }
+            catch (IllegalArgumentException ex) {
+                plugin.saveResource(configFile.getParentFile().getName() + File.separator + fileName, false); // Mod files
+            }
         }
         else {
             plugin.debug("Loading mcMMO " + fileName + " File...");
@@ -44,50 +46,45 @@ public abstract class ConfigLoader {
 
     protected abstract void loadKeys();
 
-    protected void createFile() {
+    protected boolean validateKeys() {
-        configFile.getParentFile().mkdirs();
+        return true;
+    }
 
-        InputStream inputStream = plugin.getResource(fileName);
+    protected boolean noErrorsInConfig(List<String> issues) {
-
+        for (String issue : issues) {
-        if (inputStream == null) {
+            plugin.getLogger().warning(issue);
-            plugin.getLogger().severe("Missing resource file: '" + fileName + "' please notify the plugin authors");
-            return;
         }
 
-        OutputStream outputStream = null;
+        return issues.isEmpty();
+    }
 
-        try {
+    protected void validate() {
-            outputStream = new FileOutputStream(configFile);
+        if (validateKeys()) {
-
+            plugin.debug("No errors found in " + fileName + "!");
-            int read;
-            byte[] bytes = new byte[1024];
-
-            while ((read = inputStream.read(bytes)) != -1) {
-                outputStream.write(bytes, 0, read);
-            }
         }
-        catch (FileNotFoundException e) {
+        else {
-            e.printStackTrace();
+            plugin.getLogger().warning("Errors were found in " + fileName + "! mcMMO was disabled!");
-        }
+            plugin.getServer().getPluginManager().disablePlugin(plugin);
-        catch (IOException e) {
+            plugin.noErrorsInConfigFiles = false;
-            e.printStackTrace();
-        }
-        finally {
-            if (outputStream != null) {
-                try {
-                    outputStream.close();
-                }
-                catch (IOException e) {
-                    e.printStackTrace();
-                }
-            }
-
-            try {
-                inputStream.close();
-            }
-            catch (IOException e) {
-                e.printStackTrace();
-            }
         }
     }
+
+    public File getFile() {
+        return configFile;
+    }
+
+    public void backup() {
+        plugin.getLogger().warning("You are using an old version of the " + fileName + " file.");
+        plugin.getLogger().warning("Your old file has been renamed to " + fileName + ".old and has been replaced by an updated version.");
+
+        configFile.renameTo(new File(configFile.getPath() + ".old"));
+
+        if (plugin.getResource(fileName) != null) {
+            plugin.saveResource(fileName, true);
+        }
+
+        plugin.getLogger().warning("Reloading " + fileName + " with new values...");
+        loadFile();
+        loadKeys();
+    }
 }

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

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

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

@@ -1,33 +1,34 @@
 package com.gmail.nossr50.config.mods;
 
 import java.util.ArrayList;
-import java.util.HashMap;
 import java.util.List;
 import java.util.Set;
 
+import org.bukkit.Material;
 import org.bukkit.configuration.ConfigurationSection;
+import org.bukkit.inventory.ItemStack;
 
 import com.gmail.nossr50.config.ConfigLoader;
-import com.gmail.nossr50.datatypes.mods.CustomItem;
+import com.gmail.nossr50.skills.repair.Repair;
-import com.gmail.nossr50.skills.repair.Repairable;
+import com.gmail.nossr50.skills.repair.repairables.RepairItemType;
-import com.gmail.nossr50.skills.repair.RepairableFactory;
+import com.gmail.nossr50.skills.repair.repairables.RepairMaterialType;
+import com.gmail.nossr50.skills.repair.repairables.Repairable;
+import com.gmail.nossr50.skills.repair.repairables.RepairableFactory;
 
 public class CustomArmorConfig extends ConfigLoader {
     private static CustomArmorConfig instance;
 
+    private boolean needsUpdate = false;
+
     private List<Repairable> repairables;
 
-    public List<Integer> customBootIDs       = new ArrayList<Integer>();
+    private List<Material> customBoots       = new ArrayList<Material>();
-    public List<Integer> customChestplateIDs = new ArrayList<Integer>();
+    private List<Material> customChestplates = new ArrayList<Material>();
-    public List<Integer> customHelmetIDs     = new ArrayList<Integer>();
+    private List<Material> customHelmets     = new ArrayList<Material>();
-    public List<Integer> customLeggingIDs    = new ArrayList<Integer>();
+    private List<Material> customLeggings    = new ArrayList<Material>();
-    public List<Integer> customIDs           = new ArrayList<Integer>();
-
-    public List<CustomItem> customArmorList = new ArrayList<CustomItem>();
-    public HashMap<Integer, CustomItem> customArmor = new HashMap<Integer, CustomItem>();
 
     public CustomArmorConfig() {
-        super("ModConfigs", "armor.yml");
+        super("mods", "armor.yml");
         loadKeys();
     }
 
@@ -51,13 +52,22 @@ public class CustomArmorConfig extends ConfigLoader {
     protected void loadKeys() {
         repairables = new ArrayList<Repairable>();
 
-        loadArmor("Boots", customBootIDs);
+        loadArmor("Boots", customBoots);
-        loadArmor("Chestplates", customChestplateIDs);
+        loadArmor("Chestplates", customChestplates);
-        loadArmor("Helmets", customHelmetIDs);
+        loadArmor("Helmets", customHelmets);
-        loadArmor("Leggings", customLeggingIDs);
+        loadArmor("Leggings", customLeggings);
+
+        if (needsUpdate) {
+            needsUpdate = false;
+            backup();
+        }
     }
 
-    private void loadArmor(String armorType, List<Integer> idList) {
+    private void loadArmor(String armorType, List<Material> materialList) {
+        if (needsUpdate) {
+            return;
+        }
+
         ConfigurationSection armorSection = config.getConfigurationSection(armorType);
 
         if (armorSection == null) {
@@ -67,35 +77,60 @@ public class CustomArmorConfig extends ConfigLoader {
         Set<String> armorConfigSet = armorSection.getKeys(false);
 
         for (String armorName : armorConfigSet) {
-            int id = config.getInt(armorType + "." + armorName + ".ID", 0);
+            if (config.contains(armorType + "." + armorName + "." + ".ID")) {
-            boolean repairable = config.getBoolean(armorType + "." + armorName + ".Repairable");
+                needsUpdate = true;
-            int repairID = config.getInt(armorType + "." + armorName + ".Repair_Material_ID", 0);
+                return;
-            byte repairData = (byte) config.getInt(armorType + "." + armorName + ".Repair_Material_Data_Value", 0);
+            }
-            int repairQuantity = config.getInt(armorType + "." + armorName + ".Repair_Material_Quantity", 0);
-            short durability = (short) config.getInt(armorType + "." + armorName + ".Durability", 0);
 
-            if (id == 0) {
+            Material armorMaterial = Material.matchMaterial(armorName);
-                plugin.getLogger().warning("Missing ID. This item will be skipped.");
+
+            if (armorMaterial == null) {
+                plugin.getLogger().warning("Invalid material name. This item will be skipped. - " + armorName);
                 continue;
             }
 
-            if (repairable && (repairID == 0 || repairQuantity == 0 || durability == 0)) {
+            boolean repairable = config.getBoolean(armorType + "." + armorName + ".Repairable");
-                plugin.getLogger().warning("Incomplete repair information. This item will be unrepairable.");
+            Material repairMaterial = Material.matchMaterial(config.getString(armorType + "." + armorName + ".Repair_Material", ""));
+
+            if (repairMaterial == null) {
+                plugin.getLogger().warning("Incomplete repair information. This item will be unrepairable. - " + armorName);
                 repairable = false;
             }
 
-            CustomItem armor;
-
             if (repairable) {
-                repairables.add(RepairableFactory.getRepairable(id, repairID, repairData, repairQuantity, durability));
+                byte repairData = (byte) config.getInt(armorType + "." + armorName + ".Repair_Material_Data_Value", -1);
+                int repairQuantity = Repair.getRepairAndSalvageQuantities(new ItemStack(armorMaterial), repairMaterial, repairData);
+
+                if (repairQuantity == 0) {
+                    repairQuantity = config.getInt(armorType + "." + armorName + ".Repair_Material_Data_Quantity", 2);
+                }
+
+                short durability = armorMaterial.getMaxDurability();
+
+                if (durability == 0) {
+                    durability = (short) config.getInt(armorType + "." + armorName + ".Durability", 70);
+                }
+
+                repairables.add(RepairableFactory.getRepairable(armorMaterial, repairMaterial, repairData, 0, repairQuantity, durability, RepairItemType.ARMOR, RepairMaterialType.OTHER, 1.0));
             }
 
-            armor = new CustomItem(id, durability);
+            materialList.add(armorMaterial);
-
-            idList.add(id);
-            customIDs.add(id);
-            customArmorList.add(armor);
-            customArmor.put(id, armor);
         }
     }
+
+    public boolean isCustomBoots(Material material) {
+        return customBoots.contains(material);
+    }
+
+    public boolean isCustomChestplate(Material material) {
+        return customChestplates.contains(material);
+    }
+
+    public boolean isCustomHelmet(Material material) {
+        return customHelmets.contains(material);
+    }
+
+    public boolean isCustomLeggings(Material material) {
+        return customLeggings.contains(material);
+    }
 }

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

@@ -1,11 +1,12 @@
 package com.gmail.nossr50.config.mods;
 
 import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.List;
 import java.util.Set;
 
+import org.bukkit.Material;
 import org.bukkit.configuration.ConfigurationSection;
-import org.bukkit.inventory.ItemStack;
 import org.bukkit.material.MaterialData;
 
 import com.gmail.nossr50.config.ConfigLoader;
@@ -14,20 +15,21 @@ import com.gmail.nossr50.datatypes.mods.CustomBlock;
 public class CustomBlockConfig extends ConfigLoader {
     private static CustomBlockConfig instance;
 
-    public List<ItemStack> customExcavationBlocks  = new ArrayList<ItemStack>();
+    private boolean needsUpdate = false;
-    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> customLogs              = new ArrayList<ItemStack>();
-    public List<ItemStack> customLeaves            = new ArrayList<ItemStack>();
-    public List<ItemStack> customAbilityBlocks     = new ArrayList<ItemStack>();
-    public List<ItemStack> customItems             = new ArrayList<ItemStack>();
 
-    public List<CustomBlock> customBlocks = new ArrayList<CustomBlock>();
+    private List<MaterialData> customExcavationBlocks  = new ArrayList<MaterialData>();
+    private List<MaterialData> customHerbalismBlocks   = new ArrayList<MaterialData>();
+    private List<MaterialData> customMiningBlocks      = new ArrayList<MaterialData>();
+    private List<MaterialData> customWoodcuttingBlocks = new ArrayList<MaterialData>();
+    private List<MaterialData> customOres              = new ArrayList<MaterialData>();
+    private List<MaterialData> customLogs              = new ArrayList<MaterialData>();
+    private List<MaterialData> customLeaves            = new ArrayList<MaterialData>();
+    private List<MaterialData> customAbilityBlocks     = new ArrayList<MaterialData>();
+
+    private HashMap<MaterialData, CustomBlock> customBlockMap = new HashMap<MaterialData, CustomBlock>();
 
     public CustomBlockConfig() {
-        super("ModConfigs", "blocks.yml");
+        super("mods", "blocks.yml");
         loadKeys();
     }
 
@@ -46,9 +48,18 @@ public class CustomBlockConfig extends ConfigLoader {
         loadBlocks("Mining", customMiningBlocks);
         loadBlocks("Woodcutting", customWoodcuttingBlocks);
         loadBlocks("Ability_Blocks", customAbilityBlocks);
+
+        if (needsUpdate) {
+            needsUpdate = false;
+            backup();
+        }
     }
 
-    private void loadBlocks(String skillType, List<ItemStack> blockList) {
+    private void loadBlocks(String skillType, List<MaterialData> blockList) {
+        if (needsUpdate) {
+            return;
+        }
+
         ConfigurationSection skillSection = config.getConfigurationSection(skillType);
 
         if (skillSection == null) {
@@ -58,63 +69,82 @@ public class CustomBlockConfig extends ConfigLoader {
         Set<String> skillConfigSet = skillSection.getKeys(false);
 
         for (String blockName : skillConfigSet) {
-            int id = config.getInt(skillType + "." + blockName + ".ID", 0);
+            if (config.contains(skillType + "." + blockName + "." + ".Drop_Item")) {
-            byte data = (byte) config.getInt(skillType + "." + blockName + ".Data_Value", 0);
+                needsUpdate = true;
-            int xp = config.getInt(skillType + "." + blockName + ".XP_Gain", 0);
+                return;
-            int tier = config.getInt(skillType + "." + blockName + ".Tier", 1);
+            }
-            boolean dropItem = config.getBoolean(skillType + "." + blockName + ".Drop_Item", false);
-            int dropID = config.getInt(skillType + "." + blockName + ".Drop_Item_ID", 0);
-            byte dropData = (byte) config.getInt(skillType + "." + blockName + ".Drop_Item_Data_Value", 0);
-            int minimumDropAmount = config.getInt(skillType + "." + blockName + ".Min_Drop_Item_Amount", 1);
-            int maxiumDropAmount = config.getInt(skillType + "." + blockName + ".Max_Drop_Item_Amount", 1);
 
-            CustomBlock block;
+            String[] blockInfo = blockName.split("[|]");
-            ItemStack itemDrop;
-            ItemStack blockItem;
 
-            if (id == 0) {
+            Material blockMaterial = Material.matchMaterial(blockInfo[0]);
-                plugin.getLogger().warning("Missing ID. This block will be skipped.");
+
+            if (blockMaterial == null) {
+                plugin.getLogger().warning("Invalid material name. This item will be skipped. - " + blockInfo[0]);
                 continue;
             }
 
+            byte blockData = Byte.valueOf(blockInfo[1]);
+            MaterialData blockMaterialData = new MaterialData(blockMaterial, blockData);
+            blockList.add(blockMaterialData);
+
             if (skillType.equals("Ability_Blocks")) {
-                blockItem = (new MaterialData(id, data)).toItemStack(1);
-
-                blockList.add(blockItem);
                 continue;
             }
 
-            if (dropItem && dropID == 0) {
+            int xp = config.getInt(skillType + "." + blockName + ".XP_Gain");
-                plugin.getLogger().warning("Incomplete item drop information. This block will drop itself.");
+            int smeltingXp = 0;
-                dropItem = false;
-            }
-
-            if (dropItem) {
-                itemDrop = (new MaterialData(dropID, dropData)).toItemStack(1);
-            }
-            else {
-                itemDrop = (new MaterialData(id, data)).toItemStack(1);
-            }
-
-            block = new CustomBlock(minimumDropAmount, maxiumDropAmount, itemDrop, tier, xp, data, id);
-            blockItem = (new MaterialData(id, data)).toItemStack(1);
 
             if (skillType.equals("Mining") && config.getBoolean(skillType + "." + blockName + ".Is_Ore")) {
-                customOres.add(blockItem);
+                customOres.add(blockMaterialData);
+                smeltingXp = config.getInt(skillType + "." + blockName + ".Smelting_XP_Gain", xp / 10);
             }
             else if (skillType.equals("Woodcutting")) {
                 if (config.getBoolean(skillType + "." + blockName + ".Is_Log")) {
-                    customLogs.add(blockItem);
+                    customLogs.add(blockMaterialData);
                 }
                 else {
-                    customLeaves.add(blockItem);
+                    customLeaves.add(blockMaterialData);
-                    block.setXpGain(0); // Leaves don't grant XP
+                    xp = 0; // Leaves don't grant XP
                 }
             }
 
-            blockList.add(blockItem);
+            customBlockMap.put(blockMaterialData, new CustomBlock(xp, config.getBoolean(skillType + "." + blockName + ".Double_Drops_Enabled"), smeltingXp));
-            customItems.add(blockItem);
-            customBlocks.add(block);
         }
     }
+
+    public CustomBlock getCustomBlock(MaterialData data) {
+        return customBlockMap.get(data);
+    }
+
+    public boolean isCustomOre(MaterialData data) {
+        return customOres.contains(data);
+    }
+
+    public boolean isCustomLog(MaterialData data) {
+        return customLogs.contains(data);
+    }
+
+    public boolean isCustomLeaf(MaterialData data) {
+        return customLeaves.contains(data);
+    }
+
+    public boolean isCustomAbilityBlock(MaterialData data) {
+        return customAbilityBlocks.contains(data);
+    }
+
+    public boolean isCustomExcavationBlock(MaterialData data) {
+        return customExcavationBlocks.contains(data);
+    }
+
+    public boolean isCustomHerbalismBlock(MaterialData data) {
+        return customHerbalismBlocks.contains(data);
+    }
+
+    public boolean isCustomMiningBlock(MaterialData data) {
+        return customMiningBlocks.contains(data);
+    }
+
+    public boolean isCustomWoodcuttingBlock(MaterialData data) {
+        return customWoodcuttingBlocks.contains(data);
+    }
 }

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

@@ -1,29 +1,24 @@
 package com.gmail.nossr50.config.mods;
 
-import java.util.ArrayList;
+import java.util.HashMap;
-import java.util.List;
-import java.util.Set;
 
-import org.bukkit.configuration.ConfigurationSection;
+import org.bukkit.Material;
-import org.bukkit.entity.EntityType;
+import org.bukkit.entity.Entity;
-import org.bukkit.inventory.ItemStack;
+import org.bukkit.material.MaterialData;
 
 import com.gmail.nossr50.config.ConfigLoader;
 import com.gmail.nossr50.datatypes.mods.CustomEntity;
 
+import org.apache.commons.lang.ClassUtils;
+
 public class CustomEntityConfig extends ConfigLoader {
     private static CustomEntityConfig instance;
 
-    public List<Integer> customEntityIds        = new ArrayList<Integer>();
+    private HashMap<String, CustomEntity> customEntityClassMap = new HashMap<String, CustomEntity>();
-    public List<Integer> customHostileEntityIds = new ArrayList<Integer>();
+    private HashMap<String, CustomEntity> customEntityTypeMap  = new HashMap<String, CustomEntity>();
-    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>();
 
     public CustomEntityConfig() {
-        super("ModConfigs", "entities.yml");
+        super("mods", "entities.yml");
         loadKeys();
     }
 
@@ -37,48 +32,86 @@ public class CustomEntityConfig extends ConfigLoader {
 
     @Override
     protected void loadKeys() {
-        loadMobs("Hostile", customHostileEntityIds);
+        if (config.getConfigurationSection("Hostile") != null) {
-        loadMobs("Neutral", customNeutralEntityIds);
+            backup();
-        loadMobs("Passive", customPassiveEntityIds);
-    }
-
-    private void loadMobs(String entityType, List<Integer> entityIdList) {
-        ConfigurationSection entitySection = config.getConfigurationSection(entityType);
-
-        if (entitySection == null) {
             return;
         }
 
-        Set<String> entityConfigSet = entitySection.getKeys(false);
+        for (String entityName : config.getKeys(false)) {
+            Class<?> clazz = null;
+            String className = config.getString(entityName + ".Class", "");
 
-        for (String entityName : entityConfigSet) {
+            try {
-            int id = config.getInt(entityType + "." + entityName + ".ID", 0);
+                clazz = ClassUtils.getClass(className);
-            EntityType type = EntityType.fromId(id);
+            }
-            double xpMultiplier = config.getDouble(entityType + "." + entityName + ".XP_Multiplier", 1.0D);
+            catch (ClassNotFoundException e) {
-            boolean canBeTamed = config.getBoolean(entityType + "." + entityName + ".Tameable", false);
+                plugin.getLogger().warning("Invalid class (" + className + ") detected for " + entityName + ".");
-            int tamingXp = config.getInt(entityType + "." + entityName + "Taming_XP", 0);
+                plugin.getLogger().warning("This custom entity may not function properly.");
-            boolean canBeSummoned = config.getBoolean(entityType + "." + entityName + "CanBeSummoned", false);
-            int callOfTheWildId = config.getInt(entityType + "." + entityName + "COTW_Material_ID", 0);
-            int callOfTheWildData = config.getInt(entityType + "." + entityName + "COTW_Material_Data", 0);
-            int callOfTheWildAmount = config.getInt(entityType + "." + entityName + "COTW_Material_Amount", 0);
-
-            CustomEntity entity;
-
-            if (id == 0) {
-                plugin.getLogger().warning("Missing ID. This block will be skipped.");
-                continue;
             }
 
-            if (canBeSummoned && (callOfTheWildId == 0 || callOfTheWildAmount == 0)) {
+            String entityTypeName = entityName.replace("_", ".");
-                plugin.getLogger().warning("Incomplete Call of the Wild information. This enitity will not be able to be summoned by Call of the Wild.");
+            double xpMultiplier = config.getDouble(entityName + ".XP_Multiplier", 1.0D);
+
+            boolean canBeTamed = config.getBoolean(entityName + ".Tameable");
+            int tamingXp = config.getInt(entityName + ".Taming_XP");
+
+            boolean canBeSummoned = config.getBoolean(entityName + ".CanBeSummoned");
+            Material callOfTheWildMaterial = Material.matchMaterial(config.getString(entityName + ".COTW_Material", ""));
+            byte callOfTheWildData = (byte) config.getInt(entityName + ".COTW_Material_Data");
+            int callOfTheWildAmount = config.getInt(entityName + ".COTW_Material_Amount");
+
+            if (canBeSummoned && (callOfTheWildMaterial == null || callOfTheWildAmount == 0)) {
+                plugin.getLogger().warning("Incomplete Call of the Wild information. This entity will not be able to be summoned by Call of the Wild.");
                 canBeSummoned = false;
             }
 
-            entity = new CustomEntity(id, type, xpMultiplier, canBeTamed, tamingXp, canBeSummoned, new ItemStack(callOfTheWildId, callOfTheWildData), callOfTheWildAmount);
+            CustomEntity entity = new CustomEntity(xpMultiplier, canBeTamed, tamingXp, canBeSummoned, (canBeSummoned ? new MaterialData(callOfTheWildMaterial, callOfTheWildData).toItemStack(1) : null), callOfTheWildAmount);
 
-            entityIdList.add(id);
+            customEntityTypeMap.put(entityTypeName, entity);
-            customEntityTypes.add(type);
+            customEntityClassMap.put(clazz == null ? null : clazz.getName(), entity);
-            customEntities.add(entity);
         }
     }
+
+    public boolean isCustomEntity(Entity entity) {
+        if (customEntityTypeMap.containsKey(entity.getType().toString())) {
+            return true;
+        }
+
+        try {
+            return customEntityClassMap.containsKey(((Class<?>) entity.getClass().getDeclaredField("entityClass").get(entity)).getName());
+        }
+        catch (Exception e) {
+            if (e instanceof NoSuchFieldException || e instanceof IllegalArgumentException || e instanceof IllegalAccessException) {
+                return customEntityClassMap.containsKey(entity.getClass().getName());
+            }
+
+            e.printStackTrace();
+            return false;
+        }
+    }
+
+    public CustomEntity getCustomEntity(Entity entity) {
+        CustomEntity customEntity = customEntityTypeMap.get(entity.getType().toString());
+
+        if (customEntity == null) {
+            try {
+                customEntity = customEntityClassMap.get(((Class<?>) entity.getClass().getDeclaredField("entityClass").get(entity)).getName());
+            }
+            catch (Exception e) {
+                if (e instanceof NoSuchFieldException || e instanceof IllegalArgumentException || e instanceof IllegalAccessException) {
+                    customEntity = customEntityClassMap.get(entity.getClass().getName());
+                }
+                else {
+                    e.printStackTrace();
+                }
+            }
+        }
+
+        return customEntity;
+    }
+
+    public void addEntity(CustomEntity customEntity, String className, String entityName) {
+        customEntityTypeMap.put(entityName, customEntity);
+        customEntityClassMap.put(className, customEntity);
+    }
 }

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

@@ -5,28 +5,36 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Set;
 
+import org.bukkit.Material;
 import org.bukkit.configuration.ConfigurationSection;
+import org.bukkit.inventory.ItemStack;
 
 import com.gmail.nossr50.config.ConfigLoader;
 import com.gmail.nossr50.datatypes.mods.CustomTool;
-import com.gmail.nossr50.skills.repair.Repairable;
+import com.gmail.nossr50.skills.repair.Repair;
-import com.gmail.nossr50.skills.repair.RepairableFactory;
+import com.gmail.nossr50.skills.repair.repairables.RepairItemType;
+import com.gmail.nossr50.skills.repair.repairables.RepairMaterialType;
+import com.gmail.nossr50.skills.repair.repairables.Repairable;
+import com.gmail.nossr50.skills.repair.repairables.RepairableFactory;
 
 public class CustomToolConfig extends ConfigLoader {
     private static CustomToolConfig instance;
+
+    private boolean needsUpdate = false;
+
     private List<Repairable> repairables;
-    public List<Integer> customAxeIDs = new ArrayList<Integer>();
+
-    public List<Integer> customBowIDs = new ArrayList<Integer>();
+    private List<Material> customAxes     = new ArrayList<Material>();
-    public List<Integer> customHoeIDs = new ArrayList<Integer>();
+    private List<Material> customBows     = new ArrayList<Material>();
-    public List<Integer> customPickaxeIDs = new ArrayList<Integer>();
+    private List<Material> customHoes     = new ArrayList<Material>();
-    public List<Integer> customShovelIDs = new ArrayList<Integer>();
+    private List<Material> customPickaxes = new ArrayList<Material>();
-    public List<Integer> customSwordIDs = new ArrayList<Integer>();
+    private List<Material> customShovels  = new ArrayList<Material>();
-    public List<Integer> customIDs = new ArrayList<Integer>();
+    private List<Material> customSwords   = new ArrayList<Material>();
-    public List<CustomTool> customToolList = new ArrayList<CustomTool>();
+
-    public HashMap<Integer, CustomTool> customTools = new HashMap<Integer, CustomTool>();
+    private HashMap<Material, CustomTool> customToolMap = new HashMap<Material, CustomTool>();
 
     private CustomToolConfig() {
-        super("ModConfigs", "tools.yml");
+        super("mods", "tools.yml");
         loadKeys();
     }
 
@@ -50,15 +58,24 @@ public class CustomToolConfig extends ConfigLoader {
     protected void loadKeys() {
         repairables = new ArrayList<Repairable>();
 
-        loadTool("Axes", customAxeIDs);
+        loadTool("Axes", customAxes);
-        loadTool("Bows", customBowIDs);
+        loadTool("Bows", customBows);
-        loadTool("Hoes", customHoeIDs);
+        loadTool("Hoes", customHoes);
-        loadTool("Pickaxes", customPickaxeIDs);
+        loadTool("Pickaxes", customPickaxes);
-        loadTool("Shovels", customShovelIDs);
+        loadTool("Shovels", customShovels);
-        loadTool("Swords", customSwordIDs);
+        loadTool("Swords", customSwords);
+
+        if (needsUpdate) {
+            needsUpdate = false;
+            backup();
+        }
     }
 
-    private void loadTool(String toolType, List<Integer> idList) {
+    private void loadTool(String toolType, List<Material> materialList) {
+        if (needsUpdate) {
+            return;
+        }
+
         ConfigurationSection toolSection = config.getConfigurationSection(toolType);
 
         if (toolSection == null) {
@@ -68,38 +85,83 @@ public class CustomToolConfig extends ConfigLoader {
         Set<String> toolConfigSet = toolSection.getKeys(false);
 
         for (String toolName : toolConfigSet) {
-            int id = config.getInt(toolType + "." + toolName + ".ID", 0);
+            if (config.contains(toolType + "." + toolName + "." + ".ID")) {
-            double multiplier = config.getDouble(toolType + "." + toolName + ".XP_Modifier", 1.0);
+                needsUpdate = true;
-            boolean abilityEnabled = config.getBoolean(toolType + "." + toolName + ".Ability_Enabled", true);
+                return;
-            int tier = config.getInt(toolType + "." + toolName + ".Tier", 1);
+            }
-            boolean repairable = config.getBoolean(toolType + "." + toolName + ".Repairable");
-            int repairID = config.getInt(toolType + "." + toolName + ".Repair_Material_ID", 0);
-            byte repairData = (byte) config.getInt(toolType + "." + toolName + ".Repair_Material_Data_Value", 0);
-            int repairQuantity = config.getInt(toolType + "." + toolName + ".Repair_Material_Quantity", 0);
-            short durability = (short) config.getInt(toolType + "." + toolName + ".Durability", 0);
 
-            if (id == 0) {
+            Material toolMaterial = Material.matchMaterial(toolName);
-                plugin.getLogger().warning("Missing ID. This item will be skipped.");
+
+            if (toolMaterial == null) {
+                plugin.getLogger().warning("Invalid material name. This item will be skipped. - " + toolName);
                 continue;
             }
 
-            if (repairable && (repairID == 0 || repairQuantity == 0 || durability == 0)) {
+            boolean repairable = config.getBoolean(toolType + "." + toolName + ".Repairable");
-                plugin.getLogger().warning("Incomplete repair information. This item will be unrepairable.");
+            Material repairMaterial = Material.matchMaterial(config.getString(toolType + "." + toolName + ".Repair_Material", ""));
+
+            if (repairMaterial == null) {
+                plugin.getLogger().warning("Incomplete repair information. This item will be unrepairable. - " + toolName);
                 repairable = false;
             }
 
-            CustomTool tool;
-
             if (repairable) {
-                repairables.add(RepairableFactory.getRepairable(id, repairID, repairData, repairQuantity, durability));
+                byte repairData = (byte) config.getInt(toolType + "." + toolName + ".Repair_Material_Data_Value", -1);
+                int repairQuantity = Repair.getRepairAndSalvageQuantities(new ItemStack(toolMaterial), repairMaterial, repairData);
+
+                if (repairQuantity == 0) {
+                    repairQuantity = config.getInt(toolType + "." + toolName + ".Repair_Material_Data_Quantity", 2);
+                }
+
+                short durability = toolMaterial.getMaxDurability();
+
+                if (durability == 0) {
+                    durability = (short) config.getInt(toolType + "." + toolName + ".Durability", 60);
+                }
+
+                repairables.add(RepairableFactory.getRepairable(toolMaterial, repairMaterial, repairData, 0, repairQuantity, durability, RepairItemType.TOOL, RepairMaterialType.OTHER, 1.0));
             }
 
-            tool = new CustomTool(tier, abilityEnabled, multiplier, durability, id);
+            double multiplier = config.getDouble(toolType + "." + toolName + ".XP_Modifier", 1.0);
+            boolean abilityEnabled = config.getBoolean(toolType + "." + toolName + ".Ability_Enabled", true);
+            int tier = config.getInt(toolType + "." + toolName + ".Tier", 1);
 
-            idList.add(id);
+            CustomTool tool = new CustomTool(tier, abilityEnabled, multiplier);
-            customIDs.add(id);
+
-            customToolList.add(tool);
+            materialList.add(toolMaterial);
-            customTools.put(id, tool);
+            customToolMap.put(toolMaterial, tool);
         }
     }
+
+    public boolean isCustomAxe(Material material) {
+        return customAxes.contains(material);
+    }
+
+    public boolean isCustomBow(Material material) {
+        return customBows.contains(material);
+    }
+
+    public boolean isCustomHoe(Material material) {
+        return customHoes.contains(material);
+    }
+
+    public boolean isCustomPickaxe(Material material) {
+        return customPickaxes.contains(material);
+    }
+
+    public boolean isCustomShovel(Material material) {
+        return customShovels.contains(material);
+    }
+
+    public boolean isCustomSword(Material material) {
+        return customSwords.contains(material);
+    }
+
+    public boolean isCustomTool(Material material) {
+        return customToolMap.containsKey(material);
+    }
+
+    public CustomTool getCustomTool(Material material) {
+        return customToolMap.get(material);
+    }
 }

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

@@ -1,75 +0,0 @@
-package com.gmail.nossr50.config.spout;
-
-import org.getspout.spoutapi.keyboard.Keyboard;
-
-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;
-
-    private SpoutConfig() {
-        super("spout.yml");
-    }
-
-    public static SpoutConfig getInstance() {
-        if (instance == null) {
-            instance = new SpoutConfig();
-        }
-
-        return instance;
-    }
-
-    @Override
-    protected void loadKeys() {
-        // Setup default HUD
-    }
-
-    public HudType getDefaultHudType() {
-        try {
-            return HudType.valueOf(config.getString("Spout.HUD.Default", "STANDARD").toUpperCase().trim());
-        }
-        catch (IllegalArgumentException ex) {
-            return HudType.STANDARD;
-        }
-    }
-
-    public boolean getShowPowerLevel() { return config.getBoolean("HUD.Show_Power_Level", true); }
-    public Keyboard getMenuKey() { 
-        try {
-            return Keyboard.valueOf(config.getString("Menu.Key", "KEY_M").toUpperCase().trim());
-        }
-        catch (IllegalArgumentException ex) {
-            return Keyboard.KEY_M;
-        }
-    }
-
-    /* XP Bar */
-    public boolean getXPBarEnabled() { return config.getBoolean("XP.Bar.Enabled", true); }
-    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); }
-
-    /* Notification Tiers */
-    public int getNotificationTier1() { return config.getInt("Notifications.Tier1", 200); }
-    public int getNotificationTier2() { return config.getInt("Notifications.Tier2", 400); }
-    public int getNotificationTier3() { return config.getInt("Notifications.Tier3", 600); }
-    public int getNotificationTier4() { return config.getInt("Notifications.Tier4", 800); }
-}

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

@@ -3,35 +3,38 @@ package com.gmail.nossr50.config.treasure;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
-import java.util.Map;
-import java.util.Map.Entry;
-import java.util.Set;
 
+import org.bukkit.DyeColor;
 import org.bukkit.Material;
 import org.bukkit.configuration.ConfigurationSection;
+import org.bukkit.enchantments.Enchantment;
 import org.bukkit.entity.EntityType;
 import org.bukkit.inventory.ItemStack;
-import org.bukkit.material.MaterialData;
+import org.bukkit.inventory.meta.ItemMeta;
+import org.bukkit.material.Dye;
 import org.bukkit.potion.Potion;
 import org.bukkit.potion.PotionType;
 
 import com.gmail.nossr50.config.ConfigLoader;
+import com.gmail.nossr50.datatypes.treasure.EnchantmentTreasure;
 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.Rarity;
 import com.gmail.nossr50.datatypes.treasure.ShakeTreasure;
-import com.gmail.nossr50.datatypes.treasure.Treasure;
+import com.gmail.nossr50.util.EnchantmentUtils;
 
 public class TreasureConfig extends ConfigLoader {
     private static TreasureConfig instance;
 
-    public List<ExcavationTreasure> excavationFromDirt     = new ArrayList<ExcavationTreasure>();
+    public List<ExcavationTreasure> excavationFromDirt      = new ArrayList<ExcavationTreasure>();
-    public List<ExcavationTreasure> excavationFromGrass    = new ArrayList<ExcavationTreasure>();
+    public List<ExcavationTreasure> excavationFromGrass     = new ArrayList<ExcavationTreasure>();
-    public List<ExcavationTreasure> excavationFromSand     = new ArrayList<ExcavationTreasure>();
+    public List<ExcavationTreasure> excavationFromSand      = new ArrayList<ExcavationTreasure>();
-    public List<ExcavationTreasure> excavationFromGravel   = new ArrayList<ExcavationTreasure>();
+    public List<ExcavationTreasure> excavationFromGravel    = new ArrayList<ExcavationTreasure>();
-    public List<ExcavationTreasure> excavationFromClay     = new ArrayList<ExcavationTreasure>();
+    public List<ExcavationTreasure> excavationFromClay      = new ArrayList<ExcavationTreasure>();
-    public List<ExcavationTreasure> excavationFromMycel    = new ArrayList<ExcavationTreasure>();
+    public List<ExcavationTreasure> excavationFromMycel     = new ArrayList<ExcavationTreasure>();
-    public List<ExcavationTreasure> excavationFromSoulSand = new ArrayList<ExcavationTreasure>();
+    public List<ExcavationTreasure> excavationFromSoulSand  = new ArrayList<ExcavationTreasure>();
+    public List<ExcavationTreasure> excavationFromSnow      = new ArrayList<ExcavationTreasure>();
 
     public List<HylianTreasure> hylianFromBushes  = new ArrayList<HylianTreasure>();
     public List<HylianTreasure> hylianFromFlowers = new ArrayList<HylianTreasure>();
@@ -45,6 +48,7 @@ public class TreasureConfig extends ConfigLoader {
     public List<ShakeTreasure> shakeFromCreeper     = new ArrayList<ShakeTreasure>();
     public List<ShakeTreasure> shakeFromEnderman    = new ArrayList<ShakeTreasure>();
     public List<ShakeTreasure> shakeFromGhast       = new ArrayList<ShakeTreasure>();
+    public List<ShakeTreasure> shakeFromHorse       = new ArrayList<ShakeTreasure>();
     public List<ShakeTreasure> shakeFromIronGolem   = new ArrayList<ShakeTreasure>();
     public List<ShakeTreasure> shakeFromMagmaCube   = new ArrayList<ShakeTreasure>();
     public List<ShakeTreasure> shakeFromMushroomCow = new ArrayList<ShakeTreasure>();
@@ -58,11 +62,13 @@ public class TreasureConfig extends ConfigLoader {
     public List<ShakeTreasure> shakeFromWitch       = new ArrayList<ShakeTreasure>();
     public List<ShakeTreasure> shakeFromZombie      = new ArrayList<ShakeTreasure>();
 
-    public List<FishingTreasure> fishingRewards = new ArrayList<FishingTreasure>();
+    public HashMap<Rarity, List<FishingTreasure>> fishingRewards = new HashMap<Rarity, List<FishingTreasure>>();
+    public HashMap<Rarity, List<EnchantmentTreasure>> fishingEnchantments = new HashMap<Rarity, List<EnchantmentTreasure>>();
 
     private TreasureConfig() {
         super("treasures.yml");
         loadKeys();
+        validate();
     }
 
     public static TreasureConfig getInstance() {
@@ -73,379 +79,349 @@ public class TreasureConfig extends ConfigLoader {
         return instance;
     }
 
+    @Override
+    protected boolean validateKeys() {
+        // Validate all the settings!
+        List<String> reason = new ArrayList<String>();
+
+        for (String tier : config.getConfigurationSection("Enchantment_Drop_Rates").getKeys(false)) {
+            double totalEnchantDropRate = 0;
+            double totalItemDropRate = 0;
+
+            for (Rarity rarity : Rarity.values()) {
+                double enchantDropRate = config.getDouble("Enchantment_Drop_Rates." + tier + "." + rarity.toString());
+                double itemDropRate = config.getDouble("Item_Drop_Rates." + tier + "." + rarity.toString());
+
+                if ((enchantDropRate < 0.0 || enchantDropRate > 100.0) && rarity != Rarity.TRAP && rarity != Rarity.RECORD) {
+                    reason.add("The enchant drop rate for " + tier + " items that are " + rarity.toString() + "should be between 0.0 and 100.0!");
+                }
+
+                if (itemDropRate < 0.0 || itemDropRate > 100.0) {
+                    reason.add("The item drop rate for " + tier + " items that are " + rarity.toString() + "should be between 0.0 and 100.0!");
+                }
+
+                totalEnchantDropRate += enchantDropRate;
+                totalItemDropRate += itemDropRate;
+            }
+
+            if (totalEnchantDropRate < 0 || totalEnchantDropRate > 100.0) {
+                reason.add("The total enchant drop rate for " + tier + " should be between 0.0 and 100.0!");
+            }
+
+            if (totalItemDropRate < 0 || totalItemDropRate > 100.0) {
+                reason.add("The total item drop rate for " + tier + " should be between 0.0 and 100.0!");
+            }
+        }
+
+        return noErrorsInConfig(reason);
+    }
+
     @Override
     protected void loadKeys() {
-        Map<String, Treasure> treasures = new HashMap<String, Treasure>();
+        if (config.getConfigurationSection("Treasures") != null) {
-        ConfigurationSection treasureSection = config.getConfigurationSection("Treasures");
+            backup();
+            return;
+        }
+
+        loadTreaures("Fishing");
+        loadTreaures("Excavation");
+        loadTreaures("Hylian_Luck");
+        loadEnchantments();
+
+        for (EntityType entity : EntityType.values()) {
+            if (entity.isAlive()) {
+                loadTreaures("Shake." + entity.toString());
+            }
+        }
+    }
+
+    private void loadTreaures(String type) {
+        boolean isFishing = type.equals("Fishing");
+        boolean isShake = type.contains("Shake");
+        boolean isExcavation = type.equals("Excavation");
+        boolean isHylian = type.equals("Hylian_Luck");
+
+        ConfigurationSection treasureSection = config.getConfigurationSection(type);
 
         if (treasureSection == null) {
             return;
         }
 
-        Set<String> treasureConfigSet = treasureSection.getKeys(false);
+        // Initialize fishing HashMap
-
+        for (Rarity rarity : Rarity.values()) {
-        for (String treasureName : treasureConfigSet) {
+            if (!fishingRewards.containsKey(rarity)) {
+                fishingRewards.put(rarity, (new ArrayList<FishingTreasure>()));
+            }
+        }
 
+        for (String treasureName : treasureSection.getKeys(false)) {
             // Validate all the things!
             List<String> reason = new ArrayList<String>();
 
             /*
-             * ID, Amount, and Data
+             * Material, Amount, and Data
              */
+            Material material;
 
-            if (!config.contains("Treasures." + treasureName + ".ID")) {
+            if (treasureName.contains("POTION")) {
-                reason.add("Missing ID");
+                material = Material.POTION;
+            }
+            else if (treasureName.contains("INK_SACK")) {
+                material = Material.INK_SACK;
+            }
+            else {
+                material = Material.matchMaterial(treasureName);
             }
 
-            if (!config.contains("Treasures." + treasureName + ".Amount")) {
+            int amount = config.getInt(type + "." + treasureName + ".Amount");
-                reason.add("Missing Amount");
+            int data = config.getInt(type + "." + treasureName + ".Data");
+
+            if (material == null) {
+                reason.add("Invalid material: " + treasureName);
             }
 
-            if (!config.contains("Treasures." + treasureName + ".Data")) {
+            if (amount <= 0) {
-                reason.add("Missing Data");
+                reason.add("Amount of " + treasureName + " must be greater than 0! " + amount);
             }
 
-            int id = config.getInt("Treasures." + treasureName + ".ID");
+            if (material != null && material.isBlock() && (data > 127 || data < -128)) {
-            int amount = config.getInt("Treasures." + treasureName + ".Amount");
+                reason.add("Data of " + treasureName + " is invalid! " + data);
-            int data = config.getInt("Treasures." + treasureName + ".Data");
-
-            if (Material.getMaterial(id) == null) {
-                reason.add("Invalid id: " + id);
-            }
-
-            if (amount < 1) {
-                reason.add("Invalid amount: " + amount);
-            }
-
-            if (id < 256 && (data > 127 || data < -128)) {
-                reason.add("Invalid data: " + data);
             }
 
             /*
              * XP, Drop Chance, and Drop Level
              */
 
-            if (!config.contains("Treasures." + treasureName + ".XP")) {
+            int xp = config.getInt(type + "." + treasureName + ".XP");
-                reason.add("Missing XP");
+            double dropChance = config.getDouble(type + "." + treasureName + ".Drop_Chance");
-            }
+            int dropLevel = config.getInt(type + "." + treasureName + ".Drop_Level");
-
-            if (!config.contains("Treasures." + treasureName + ".Drop_Chance")) {
-                reason.add("Missing Drop_Chance");
-            }
-
-            if (!config.contains("Treasures." + treasureName + ".Drop_Level")) {
-                reason.add("Missing Drop_Level");
-            }
-
-            int xp = config.getInt("Treasures." + treasureName + ".XP");
-            Double dropChance = config.getDouble("Treasures." + treasureName + ".Drop_Chance");
-            int dropLevel = config.getInt("Treasures." + treasureName + ".Drop_Level");
 
             if (xp < 0) {
-                reason.add("Invalid xp: " + xp);
+                reason.add(treasureName + " has an invalid XP value: " + xp);
             }
 
-            if (dropChance < 0) {
+            if (dropChance < 0.0D) {
-                reason.add("Invalid Drop_Chance: " + dropChance);
+                reason.add(treasureName + " has an invalid Drop_Chance: " + dropChance);
             }
 
             if (dropLevel < 0) {
-                reason.add("Invalid Drop_Level: " + dropLevel);
+                reason.add(treasureName + " has an invalid Drop_Level: " + dropLevel);
             }
 
             /*
-             * Potions
+             * Specific Types
              */
+            Rarity rarity = null;
 
+            if (isFishing) {
+                rarity = Rarity.getRarity(config.getString(type + "." + treasureName + ".Rarity"));
+
+                if (rarity == null) {
+                    reason.add("Invalid Rarity for item: " + treasureName);
+                }
+            }
+
+            /*
+             * Itemstack
+             */
             ItemStack item = null;
 
-            if (config.contains("Treasures." + treasureName + ".Potion_Type")) {
+            if (treasureName.contains("POTION")) {
-                String potionType = config.getString("Treasures." + treasureName + ".Potion_Type");
+                String potionType = treasureName.substring(7);
+
                 try {
-                    item = new Potion(PotionType.valueOf(potionType.toUpperCase())).toItemStack(amount);
+                    item = new Potion(PotionType.valueOf(potionType.toUpperCase().trim())).toItemStack(amount);
                 }
                 catch (IllegalArgumentException ex) {
                     reason.add("Invalid Potion_Type: " + potionType);
                 }
             }
-            else {
+            else if (treasureName.contains("INK_SACK")) {
-                item = (new MaterialData(id, (byte) data)).toItemStack(amount);
+                String color = treasureName.substring(9);
-            }
-
-            /*
-             * Drops From & Max Level
-             */
-
-            if (config.getBoolean("Treasures." + treasureName + ".Drops_From.Fishing", false)) {
-                if (config.getConfigurationSection("Treasures." + treasureName + ".Drops_From").getKeys(false).size() != 1) {
-                    reason.add("This can only be a fishing drop.");
-                }
-
-                if (!config.contains("Treasures." + treasureName + ".Max_Level")) {
-                    reason.add("Missing Max_Level");
-                }
-
-                int maxLevel = config.getInt("Treasures." + treasureName + ".Max_Level");
-
-                if (noErrorsInTreasure(reason)) {
-                    FishingTreasure fTreasure = new FishingTreasure(item, xp, dropChance, dropLevel, maxLevel);
-                    treasures.put(treasureName, fTreasure);
-                }
-            }
-            else if (config.getBoolean("Treasures." + treasureName + ".Drops_From.Shake", false)) {
-                if (config.getConfigurationSection("Treasures." + treasureName + ".Drops_From").getKeys(false).size() != 1) {
-                    reason.add("This can only be a shake drop.");
-                }
-
-                if (!config.contains("Treasures." + treasureName + ".Mob")) {
-                    reason.add("Missing Mob");
-                }
-
-                String mobType = config.getString("Treasures." + treasureName + ".Mob");
-                EntityType mob = null;
 
                 try {
-                     mob = EntityType.valueOf(mobType.toUpperCase().trim());
+                    Dye dye = new Dye();
-                }
+                    dye.setColor(DyeColor.valueOf(color.toUpperCase().trim()));
-                catch (IllegalArgumentException ex){
-                    reason.add("Invalid Mob: " + mobType);
-                }
 
-                if (noErrorsInTreasure(reason)) {
+                    item = dye.toItemStack(amount);
-                    ShakeTreasure sTreasure = new ShakeTreasure(item, xp, dropChance, dropLevel, mob);
+                }
-                    treasures.put(treasureName, sTreasure);
+                catch (IllegalArgumentException ex) {
+                    reason.add("Invalid Dye_Color: " + color);
                 }
             }
-            else {
+            else if (material != null) {
-                ExcavationTreasure eTreasure = new ExcavationTreasure(item, xp, dropChance, dropLevel);
+                item = new ItemStack(material, amount, (short) data);
-                HylianTreasure hTreasure = new HylianTreasure(item, xp, dropChance, dropLevel);
 
-                if (config.getBoolean("Treasures." + treasureName + ".Drops_From.Dirt", false)) {
+                if (config.contains(type + "." + treasureName + ".Custom_Name")) {
-                    eTreasure.setDropsFromDirt();
+                    ItemMeta itemMeta = item.getItemMeta();
+                    itemMeta.setDisplayName(config.getString(type + "." + treasureName + "Custom_Name"));
+                    item.setItemMeta(itemMeta);
                 }
 
-                if (config.getBoolean("Treasures." + treasureName + ".Drops_From.Grass", false)) {
+                if (config.contains(type + "." + treasureName + ".Lore")) {
-                    eTreasure.setDropsFromGrass();
+                    ItemMeta itemMeta = item.getItemMeta();
-                }
+                    itemMeta.setLore(config.getStringList(type + "." + treasureName + "Custom_Name"));
-
+                    item.setItemMeta(itemMeta);
-                if (config.getBoolean("Treasures." + treasureName + ".Drops_From.Sand", false)) {
-                    eTreasure.setDropsFromSand();
-                }
-
-                if (config.getBoolean("Treasures." + treasureName + ".Drops_From.Gravel", false)) {
-                    eTreasure.setDropsFromGravel();
-                }
-
-                if (config.getBoolean("Treasures." + treasureName + ".Drops_From.Clay", false)) {
-                    eTreasure.setDropsFromClay();
-                }
-
-                if (config.getBoolean("Treasures." + treasureName + ".Drops_From.Mycelium", false)) {
-                    eTreasure.setDropsFromMycel();
-                }
-
-                if (config.getBoolean("Treasures." + treasureName + ".Drops_From.Soul_Sand", false)) {
-                    eTreasure.setDropsFromSoulSand();
-                }
-
-                if (config.getBoolean("Treasures." + treasureName + ".Drops_From.Bushes", false)) {
-                    hTreasure.setDropsFromBushes();
-                }
-
-                if (config.getBoolean("Treasures." + treasureName + ".Drops_From.Flowers", false)) {
-                    hTreasure.setDropsFromFlowers();
-                }
-
-                if (config.getBoolean("Treasures." + treasureName + ".Drops_From.Pots", false)) {
-                    hTreasure.setDropsFromPots();
-                }
-
-                if (config.getBoolean("Treasures." + treasureName + ".Drops_From.Fishing", false)) {
-                    reason.add("This cannot also be a fishing drop.");
-                }
-
-                if (config.getBoolean("Treasures." + treasureName + ".Drops_From.Shake", false)) {
-                    reason.add("This cannot also be a shake drop.");
-                }
-
-                if (noErrorsInTreasure(reason) && hTreasure.getDropsFrom() == (byte) 0x0) {
-                    treasures.put(treasureName, eTreasure);
-                }
-                else if (noErrorsInTreasure(reason) && eTreasure.getDropsFrom() == (byte) 0x0) {
-                    treasures.put(treasureName, hTreasure);
                 }
             }
-        }
 
-        List<String> excavationTreasures = config.getStringList("Excavation.Treasure");
+            if (noErrorsInConfig(reason)) {
-        List<String> fishingTreasures = config.getStringList("Fishing.Treasure");
+                if (isFishing) {
-        List<String> hylianTreasures = config.getStringList("Hylian_Luck.Treasure");
+                    fishingRewards.get(rarity).add(new FishingTreasure(item, xp));
-        List<String> shakeTreasures = config.getStringList("Shake.Treasure");
-
-        for (Entry<String, Treasure> nextEntry : treasures.entrySet()) {
-            String treasureKey = nextEntry.getKey();
-            Treasure treasure = nextEntry.getValue();
-
-            if (treasure instanceof FishingTreasure) {
-                if (fishingTreasures == null || !fishingTreasures.contains(treasureKey)) {
-                    continue;
                 }
+                else if (isShake) {
+                    ShakeTreasure shakeTreasure = new ShakeTreasure(item, xp, dropChance, dropLevel);
 
-                fishingRewards.add((FishingTreasure) treasure);
+                    if (type.equals("Shake.BLAZE")) {
-            }
+                        shakeFromBlaze.add(shakeTreasure);
-            else if (treasure instanceof ShakeTreasure) {
+                    }
-                if (shakeTreasures == null || !shakeTreasures.contains(treasureKey)) {
+                    else if (type.equals("Shake.CAVE_SPIDER")) {
-                    continue;
+                        shakeFromCaveSpider.add(shakeTreasure);
+                    }
+                    else if (type.equals("Shake.CHICKEN")) {
+                        shakeFromChicken.add(shakeTreasure);
+                    }
+                    else if (type.equals("Shake.COW")) {
+                        shakeFromCow.add(shakeTreasure);
+                    }
+                    else if (type.equals("Shake.CREEPER")) {
+                        shakeFromCreeper.add(shakeTreasure);
+                    }
+                    else if (type.equals("Shake.ENDERMAN")) {
+                        shakeFromEnderman.add(shakeTreasure);
+                    }
+                    else if (type.equals("Shake.GHAST")) {
+                        shakeFromGhast.add(shakeTreasure);
+                    }
+                    else if (type.equals("Shake.HORSE")) {
+                        shakeFromHorse.add(shakeTreasure);
+                    }
+                    else if (type.equals("Shake.IRON_GOLEM")) {
+                        shakeFromIronGolem.add(shakeTreasure);
+                    }
+                    else if (type.equals("Shake.MAGMA_CUBE")) {
+                        shakeFromMagmaCube.add(shakeTreasure);
+                    }
+                    else if (type.equals("Shake.MUSHROOM_COW")) {
+                        shakeFromMushroomCow.add(shakeTreasure);
+                    }
+                    else if (type.equals("Shake.PIG")) {
+                        shakeFromPig.add(shakeTreasure);
+                    }
+                    else if (type.equals("Shake.PIG_ZOMBIE")) {
+                        shakeFromPigZombie.add(shakeTreasure);
+                    }
+                    else if (type.equals("Shake.SHEEP")) {
+                        shakeFromSheep.add(shakeTreasure);
+                    }
+                    else if (type.equals("Shake.SKELETON")) {
+                        shakeFromSkeleton.add(shakeTreasure);
+                    }
+                    else if (type.equals("Shake.SLIME")) {
+                        shakeFromSlime.add(shakeTreasure);
+                    }
+                    else if (type.equals("Shake.SPIDER")) {
+                        shakeFromSpider.add(shakeTreasure);
+                    }
+                    else if (type.equals("Shake.SNOWMAN")) {
+                        shakeFromSnowman.add(shakeTreasure);
+                    }
+                    else if (type.equals("Shake.SQUID")) {
+                        shakeFromSquid.add(shakeTreasure);
+                    }
+                    else if (type.equals("Shake.WITCH")) {
+                        shakeFromWitch.add(shakeTreasure);
+                    }
+                    else if (type.equals("Shake.ZOMBIE")) {
+                        shakeFromZombie.add(shakeTreasure);
+                    }
                 }
+                else if (isExcavation) {
+                    ExcavationTreasure excavationTreasure = new ExcavationTreasure(item, xp, dropChance, dropLevel);
+                    List<String> dropList = config.getStringList(type + "." + treasureName + ".Drops_From");
 
-                ShakeTreasure e = (ShakeTreasure) treasure;
+                    if (dropList.contains("Dirt")) {
-                switch (e.getMob()) {
+                        excavationFromDirt.add(excavationTreasure);
-                    case BLAZE:
+                    }
-                        shakeFromBlaze.add(e);
-                        break;
 
-                    case CAVE_SPIDER:
+                    if (dropList.contains("Grass")) {
-                        shakeFromCaveSpider.add(e);
+                        excavationFromGrass.add(excavationTreasure);
-                        break;
+                    }
 
-                    case CHICKEN:
+                    if (dropList.contains("Sand")) {
-                        shakeFromChicken.add(e);
+                        excavationFromSand.add(excavationTreasure);
-                        break;
+                    }
 
-                    case COW:
+                    if (dropList.contains("Gravel")) {
-                        shakeFromCow.add(e);
+                        excavationFromGravel.add(excavationTreasure);
-                        break;
+                    }
 
-                    case CREEPER:
+                    if (dropList.contains("Clay")) {
-                        shakeFromCreeper.add(e);
+                        excavationFromClay.add(excavationTreasure);
-                        break;
+                    }
 
-                    case ENDERMAN:
+                    if (dropList.contains("Mycelium")) {
-                        shakeFromEnderman.add(e);
+                        excavationFromMycel.add(excavationTreasure);
-                        break;
+                    }
 
-                    case GHAST:
+                    if (dropList.contains("Soul_Sand")) {
-                        shakeFromGhast.add(e);
+                        excavationFromSoulSand.add(excavationTreasure);
-                        break;
+                    }
 
-                    case IRON_GOLEM:
+                    if (dropList.contains("Snow")) {
-                        shakeFromIronGolem.add(e);
+                        excavationFromSnow.add(excavationTreasure);
-                        break;
+                    }
-
-                    case MAGMA_CUBE:
-                        shakeFromMagmaCube.add(e);
-                        break;
-
-                    case MUSHROOM_COW:
-                        shakeFromMushroomCow.add(e);
-                        break;
-
-                    case PIG:
-                        shakeFromPig.add(e);
-                        break;
-
-                    case PIG_ZOMBIE:
-                        shakeFromPigZombie.add(e);
-                        break;
-
-                    case SHEEP:
-                        shakeFromSheep.add(e);
-                        break;
-
-                    case SKELETON:
-                        shakeFromSkeleton.add(e);
-                        break;
-
-                    case SLIME:
-                        shakeFromSlime.add(e);
-                        break;
-
-                    case SPIDER:
-                        shakeFromSpider.add(e);
-                        break;
-
-                    case SNOWMAN:
-                        shakeFromSnowman.add(e);
-                        break;
-
-                    case SQUID:
-                        shakeFromSquid.add(e);
-                        break;
-
-                    case WITCH:
-                        shakeFromWitch.add(e);
-                        break;
-
-                    case ZOMBIE:
-                        shakeFromZombie.add(e);
-                        break;
-
-                    default:
-                        break;
-                }
-            }
-            else if (treasure instanceof HylianTreasure) {
-                if (hylianTreasures == null || !hylianTreasures.contains(treasureKey)) {
-                    continue;
                 }
+                else if (isHylian) {
+                    HylianTreasure hylianTreasure = new HylianTreasure(item, xp, dropChance, dropLevel);
+                    List<String> dropList = config.getStringList(type + "." + treasureName + ".Drops_From");
 
-                HylianTreasure hTreasure = (HylianTreasure) treasure;
+                    if (dropList.contains("Bushes")) {
+                        hylianFromBushes.add(hylianTreasure);
+                    }
 
-                if (hTreasure.getDropsFromBushes()) {
+                    if (dropList.contains("Flowers")) {
-                    hylianFromBushes.add(hTreasure);
+                        hylianFromFlowers.add(hylianTreasure);
-                }
+                    }
 
-                if (hTreasure.getDropsFromFlowers()) {
+                    if (dropList.contains("Pots")) {
-                    hylianFromFlowers.add(hTreasure);
+                        hylianFromPots.add(hylianTreasure);
-                }
+                    }
-
-                if (hTreasure.getDropsFromPots()) {
-                    hylianFromPots.add(hTreasure);
-                }
-            }
-            else if (treasure instanceof ExcavationTreasure) {
-                if (excavationTreasures == null || !excavationTreasures.contains(treasureKey)) {
-                    continue;
-                }
-
-                ExcavationTreasure eTreasure = (ExcavationTreasure) treasure;
-
-                if (eTreasure.getDropsFromDirt()) {
-                    excavationFromDirt.add(eTreasure);
-                }
-
-                if (eTreasure.getDropsFromGrass()) {
-                    excavationFromGrass.add(eTreasure);
-                }
-
-                if (eTreasure.getDropsFromSand()) {
-                    excavationFromSand.add(eTreasure);
-                }
-
-                if (eTreasure.getDropsFromGravel()) {
-                    excavationFromGravel.add(eTreasure);
-                }
-
-                if (eTreasure.getDropsFromClay()) {
-                    excavationFromClay.add(eTreasure);
-                }
-
-                if (eTreasure.getDropsFromMycel()) {
-                    excavationFromMycel.add(eTreasure);
-                }
-
-                if (eTreasure.getDropsFromSoulSand()) {
-                    excavationFromSoulSand.add(eTreasure);
                 }
             }
         }
     }
 
-    private boolean noErrorsInTreasure(List<String> issues) {
+    private void loadEnchantments() {
-        for (String issue : issues) {
+        for (Rarity rarity : Rarity.values()) {
-            plugin.getLogger().warning(issue);
+            if (rarity == Rarity.TRAP || rarity == Rarity.RECORD) {
-        }
+                continue;
+            }
 
-        return issues.isEmpty();
+            if (!fishingEnchantments.containsKey(rarity)) {
+                fishingEnchantments.put(rarity, (new ArrayList<EnchantmentTreasure>()));
+            }
+
+            ConfigurationSection enchantmentSection = config.getConfigurationSection("Enchantments_Rarity." + rarity.toString());
+
+            if (enchantmentSection == null) {
+                return;
+            }
+
+            for (String enchantmentName : enchantmentSection.getKeys(false)) {
+                int level = config.getInt("Enchantments_Rarity." + rarity.toString() + "." + enchantmentName);
+                Enchantment enchantment = EnchantmentUtils.getByName(enchantmentName);
+
+                if (enchantment == null) {
+                    plugin.getLogger().warning("Skipping invalid enchantment in treasures.yml: " + enchantmentName);
+                    continue;
+                }
+
+                fishingEnchantments.get(rarity).add(new EnchantmentTreasure(enchantment, level));
+            }
+        }
     }
+
+    public double getItemDropRate(int tier, Rarity rarity) { return config.getDouble("Item_Drop_Rates.Tier_" + tier + "." + rarity.toString()); }
+    public double getEnchantmentDropRate(int tier, Rarity rarity) { return config.getDouble("Enchantment_Drop_Rates.Tier_" + tier + "." + rarity.toString()); }
 }

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

@@ -4,11 +4,16 @@ import java.util.List;
 import java.util.Map;
 
 import com.gmail.nossr50.config.Config;
+import com.gmail.nossr50.datatypes.database.DatabaseType;
 import com.gmail.nossr50.datatypes.database.PlayerStat;
 import com.gmail.nossr50.datatypes.player.PlayerProfile;
+import com.gmail.nossr50.datatypes.skills.SkillType;
 
 public interface DatabaseManager {
+    // One month in milliseconds
     public final long PURGE_TIME = 2630000000L * Config.getInstance().getOldUsersCutoff();
+    // During convertUsers, how often to output a status
+    public final int progressInterval = 200;
 
     /**
      * Purge users with 0 power level from the database.
@@ -32,8 +37,9 @@ public interface DatabaseManager {
      * Save a user to the database.
      *
      * @param profile The profile of the player to save
+     * @return true if successful, false on failure
      */
-    public void saveUser(PlayerProfile profile);
+    public boolean saveUser(PlayerProfile profile);
 
     /**
     * Retrieve leaderboard info.
@@ -43,15 +49,18 @@ public interface DatabaseManager {
     * @param statsPerPage The number of stats per page
     * @return the requested leaderboard information
     */
-    public List<PlayerStat> readLeaderboard(String skillName, int pageNumber, int statsPerPage);
+    public List<PlayerStat> readLeaderboard(SkillType skill, int pageNumber, int statsPerPage);
 
     /**
-     * Retrieve rank info.
+     * Retrieve rank info into a HashMap from SkillType to the rank.
+     * <p>
+     * The special value <code>null</code> is used to represent the Power
+     * Level rank (the combination of all skill levels).
      *
      * @param playerName The name of the user to retrieve the rankings for
      * @return the requested rank information
      */
-    public Map<String, Integer> readRank(String playerName);
+    public Map<SkillType, Integer> readRank(String playerName);
 
     /**
      * Add a new user to the database.
@@ -64,16 +73,32 @@ public interface DatabaseManager {
      * Load a player from the database.
      *
      * @param playerName The name of the player to load from the database
-     * @return The player's data
+     * @param createNew Whether to create a new record if the player is not
+     *          found
+     * @return The player's data, or an unloaded PlayerProfile if not found
+     *          and createNew is false
      */
-    public List<String> loadPlayerData(String playerName);
+    public PlayerProfile loadPlayerProfile(String playerName, boolean createNew);
 
     /**
-     * Convert player data to a different storage format.
+     * Get all users currently stored in the database.
      *
-     * @param data The player's data
+     * @return list of playernames
-     * @return true if the conversion was successful, false otherwise
-     * @throws Exception
      */
-    public boolean convert(String[] data) throws Exception;
+    public List<String> getStoredUsers();
+
+    /**
+     * Convert all users from this database to the provided database using
+     * {@link #saveUser(PlayerProfile)}.
+     *
+     * @param destination The DatabaseManager to save to
+     */
+    public void convertUsers(DatabaseManager destination);
+
+    /**
+     * Retrieve the type of database in use. Custom databases should return CUSTOM.
+     *
+     * @return The type of database
+     */
+    public DatabaseType getDatabaseType();
 }

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

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

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

@@ -5,6 +5,7 @@ import java.sql.DriverManager;
 import java.sql.PreparedStatement;
 import java.sql.ResultSet;
 import java.sql.SQLException;
+import java.sql.Statement;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.HashMap;
@@ -15,15 +16,15 @@ import java.util.Properties;
 import com.gmail.nossr50.mcMMO;
 import com.gmail.nossr50.config.Config;
 import com.gmail.nossr50.datatypes.MobHealthbarType;
+import com.gmail.nossr50.datatypes.database.DatabaseType;
 import com.gmail.nossr50.datatypes.database.DatabaseUpdateType;
 import com.gmail.nossr50.datatypes.database.PlayerStat;
 import com.gmail.nossr50.datatypes.player.PlayerProfile;
 import com.gmail.nossr50.datatypes.skills.AbilityType;
 import com.gmail.nossr50.datatypes.skills.SkillType;
-import com.gmail.nossr50.datatypes.spout.huds.HudType;
+import com.gmail.nossr50.runnables.database.SQLDatabaseKeepaliveTask;
 import com.gmail.nossr50.runnables.database.SQLReconnectTask;
 import com.gmail.nossr50.util.Misc;
-import com.gmail.nossr50.util.StringUtils;
 
 public final class SQLDatabaseManager implements DatabaseManager {
     private String connectionString;
@@ -49,11 +50,16 @@ public final class SQLDatabaseManager implements DatabaseManager {
     private int reconnectAttempt = 0;
 
     protected SQLDatabaseManager() {
-        checkConnected();
+        checkStructure();
-        createStructure();
+
+        new SQLDatabaseKeepaliveTask(this).runTaskTimerAsynchronously(mcMMO.p, 10, 60L * 60 * Misc.TICK_CONVERSION_FACTOR);
     }
 
     public void purgePowerlessUsers() {
+        if (!checkConnected()) {
+            return;
+        }
+
         mcMMO.p.getLogger().info("Purging powerless users...");
 
         Collection<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").values();
@@ -70,6 +76,10 @@ public final class SQLDatabaseManager implements DatabaseManager {
     }
 
     public void purgeOldUsers() {
+        if (!checkConnected()) {
+            return;
+        }
+
         long currentTime = System.currentTimeMillis();
 
         mcMMO.p.getLogger().info("Purging old users...");
@@ -84,10 +94,14 @@ public final class SQLDatabaseManager implements DatabaseManager {
                 "WHERE ((" + currentTime + " - lastlogin * " + Misc.TIME_CONVERSION_FACTOR + ") > " + PURGE_TIME + ")");
 
         processPurge(usernames);
-        mcMMO.p.getLogger().info("Purged " + usernames.size() + " users from the database.");;
+        mcMMO.p.getLogger().info("Purged " + usernames.size() + " users from the database.");
     }
 
     public boolean removeUser(String playerName) {
+        if (!checkConnected()) {
+            return false;
+        }
+
         boolean success = update("DELETE FROM u, e, h, s, c " +
                 "USING " + tablePrefix + "users u " +
                 "JOIN " + tablePrefix + "experience e ON (u.id = e.user_id) " +
@@ -101,28 +115,39 @@ public final class SQLDatabaseManager implements DatabaseManager {
         return success;
     }
 
-    public void saveUser(PlayerProfile profile) {
+    public boolean saveUser(PlayerProfile profile) {
-        int userId = readId(profile.getPlayerName());
+        if (!checkConnected()) {
-        MobHealthbarType mobHealthbarType = profile.getMobHealthbarType();
+            return false;
-        HudType hudType = profile.getHudType();
+        }
 
-        saveLogin(userId, ((int) (System.currentTimeMillis() / Misc.TIME_CONVERSION_FACTOR)));
+        int userId = readId(profile.getPlayerName());
-        saveHuds(userId, (hudType == null ? "STANDARD" : hudType.toString()), (mobHealthbarType == null ? Config.getInstance().getMobHealthbarDefault().toString() : mobHealthbarType.toString()));
+        if (userId == -1) {
-        saveLongs(
+            newUser(profile.getPlayerName());
+            userId = readId(profile.getPlayerName());
+            if (userId == -1) {
+                return false;
+            }
+        }
+        boolean success = true;
+        MobHealthbarType mobHealthbarType = profile.getMobHealthbarType();
+
+        success &= saveLogin(userId, ((int) (System.currentTimeMillis() / Misc.TIME_CONVERSION_FACTOR)));
+        success &= saveHuds(userId, (mobHealthbarType == null ? Config.getInstance().getMobHealthbarDefault().toString() : mobHealthbarType.toString()));
+        success &= saveLongs(
                 "UPDATE " + tablePrefix + "cooldowns SET "
                     + "  mining = ?, woodcutting = ?, unarmed = ?"
                     + ", herbalism = ?, excavation = ?, swords = ?"
                     + ", axes = ?, blast_mining = ? WHERE user_id = ?",
                 userId,
-                profile.getSkillDATS(AbilityType.SUPER_BREAKER),
+                profile.getAbilityDATS(AbilityType.SUPER_BREAKER),
-                profile.getSkillDATS(AbilityType.TREE_FELLER),
+                profile.getAbilityDATS(AbilityType.TREE_FELLER),
-                profile.getSkillDATS(AbilityType.BERSERK),
+                profile.getAbilityDATS(AbilityType.BERSERK),
-                profile.getSkillDATS(AbilityType.GREEN_TERRA),
+                profile.getAbilityDATS(AbilityType.GREEN_TERRA),
-                profile.getSkillDATS(AbilityType.GIGA_DRILL_BREAKER),
+                profile.getAbilityDATS(AbilityType.GIGA_DRILL_BREAKER),
-                profile.getSkillDATS(AbilityType.SERRATED_STRIKES),
+                profile.getAbilityDATS(AbilityType.SERRATED_STRIKES),
-                profile.getSkillDATS(AbilityType.SKULL_SPLITTER),
+                profile.getAbilityDATS(AbilityType.SKULL_SPLITTER),
-                profile.getSkillDATS(AbilityType.BLAST_MINING));
+                profile.getAbilityDATS(AbilityType.BLAST_MINING));
-        saveIntegers(
+        success &= saveIntegers(
                 "UPDATE " + tablePrefix + "skills SET "
                     + " taming = ?, mining = ?, repair = ?, woodcutting = ?"
                     + ", unarmed = ?, herbalism = ?, excavation = ?"
@@ -141,7 +166,7 @@ public final class SQLDatabaseManager implements DatabaseManager {
                 profile.getSkillLevel(SkillType.ACROBATICS),
                 profile.getSkillLevel(SkillType.FISHING),
                 userId);
-        saveIntegers(
+        success &= saveIntegers(
                 "UPDATE " + tablePrefix + "experience SET "
                     + " taming = ?, mining = ?, repair = ?, woodcutting = ?"
                     + ", unarmed = ?, herbalism = ?, excavation = ?"
@@ -160,13 +185,14 @@ public final class SQLDatabaseManager implements DatabaseManager {
                 profile.getSkillXpLevel(SkillType.ACROBATICS),
                 profile.getSkillXpLevel(SkillType.FISHING),
                 userId);
+        return success;
     }
 
-    public List<PlayerStat> readLeaderboard(String skillName, int pageNumber, int statsPerPage) {
+    public List<PlayerStat> readLeaderboard(SkillType skill, int pageNumber, int statsPerPage) {
         List<PlayerStat> stats = new ArrayList<PlayerStat>();
 
         if (checkConnected()) {
-            String query = skillName.equalsIgnoreCase("ALL") ? "taming+mining+woodcutting+repair+unarmed+herbalism+excavation+archery+swords+axes+acrobatics+fishing" : skillName;
+            String query = skill == null ? "taming+mining+woodcutting+repair+unarmed+herbalism+excavation+archery+swords+axes+acrobatics+fishing" : skill.name().toLowerCase();
             ResultSet resultSet = null;
             PreparedStatement statement = null;
 
@@ -204,14 +230,14 @@ public final class SQLDatabaseManager implements DatabaseManager {
         return stats;
     }
 
-    public Map<String, Integer> readRank(String playerName) {
+    public Map<SkillType, Integer> readRank(String playerName) {
-        Map<String, Integer> skills = new HashMap<String, Integer>();
+        Map<SkillType, Integer> skills = new HashMap<SkillType, Integer>();
 
         if (checkConnected()) {
             ResultSet resultSet;
 
             try {
-                for (SkillType skillType : SkillType.nonChildSkills()) {
+                for (SkillType skillType : SkillType.NON_CHILD_SKILLS) {
                     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 " +
@@ -236,7 +262,7 @@ public final class SQLDatabaseManager implements DatabaseManager {
 
                     while (resultSet.next()) {
                         if (resultSet.getString("user").equalsIgnoreCase(playerName)) {
-                            skills.put(skillType.name(), rank + resultSet.getRow());
+                            skills.put(skillType, rank + resultSet.getRow());
                             break;
                         }
                     }
@@ -273,7 +299,7 @@ public final class SQLDatabaseManager implements DatabaseManager {
 
                 while (resultSet.next()) {
                     if (resultSet.getString("user").equalsIgnoreCase(playerName)) {
-                        skills.put("ALL", rank + resultSet.getRow());
+                        skills.put(null, rank + resultSet.getRow());
                         break;
                     }
                 }
@@ -289,15 +315,20 @@ public final class SQLDatabaseManager implements DatabaseManager {
     }
 
     public void newUser(String playerName) {
+        if (!checkConnected()) {
+            return;
+        }
+
         PreparedStatement statement = null;
 
         try {
-            statement = connection.prepareStatement("INSERT INTO " + tablePrefix + "users (user, lastlogin) VALUES (?, ?)");
+            statement = connection.prepareStatement("INSERT INTO " + tablePrefix + "users (user, lastlogin) VALUES (?, ?)", Statement.RETURN_GENERATED_KEYS);
             statement.setString(1, playerName);
             statement.setLong(2, System.currentTimeMillis() / Misc.TIME_CONVERSION_FACTOR);
             statement.execute();
 
-            writeMissingRows(readId(playerName));
+            int id = readId(playerName);
+            writeMissingRows(id);
         }
         catch (SQLException ex) {
             printErrors(ex);
@@ -314,8 +345,15 @@ public final class SQLDatabaseManager implements DatabaseManager {
         }
     }
 
-    public List<String> loadPlayerData(String playerName) {
+    public PlayerProfile loadPlayerProfile(String playerName, boolean create) {
-        List<String> playerData = null;
+        return loadPlayerProfile(playerName, create, true);
+    }
+
+    private PlayerProfile loadPlayerProfile(String playerName, boolean create, boolean retry) {
+        if (!checkConnected()) {
+            return new PlayerProfile(playerName, false); // return fake profile if not connected
+        }
+
         PreparedStatement statement = null;
 
         try {
@@ -324,7 +362,7 @@ public final class SQLDatabaseManager implements DatabaseManager {
                     + "s.taming, s.mining, s.repair, s.woodcutting, s.unarmed, s.herbalism, s.excavation, s.archery, s.swords, s.axes, s.acrobatics, s.fishing, "
                     + "e.taming, e.mining, e.repair, e.woodcutting, e.unarmed, e.herbalism, e.excavation, e.archery, e.swords, e.axes, e.acrobatics, e.fishing, "
                     + "c.taming, c.mining, c.repair, c.woodcutting, c.unarmed, c.herbalism, c.excavation, c.archery, c.swords, c.axes, c.acrobatics, c.blast_mining, "
-                    + "h.hudtype, h.mobhealthbar, NOW() "
+                    + "h.mobhealthbar "
                     + "FROM " + tablePrefix + "users u "
                     + "JOIN " + tablePrefix + "skills s ON (u.id = s.user_id) "
                     + "JOIN " + tablePrefix + "experience e ON (u.id = e.user_id) "
@@ -333,22 +371,18 @@ public final class SQLDatabaseManager implements DatabaseManager {
                     + "WHERE u.user = ?");
             statement.setString(1, playerName);
 
-            playerData = readRow(statement);
+            ResultSet result = statement.executeQuery();
 
-            if (playerData == null || playerData.size() == 0) {
+            if (result.next()) {
-                int userId = readId(playerName);
+                try {
-
+                    PlayerProfile ret = loadFromResult(playerName, result);
-                // Check if user doesn't exist
+                    result.close();
-                if (userId == 0) {
+                    return ret;
-                    return playerData;
+                }
+                catch (SQLException e) {
                 }
-
-                // Write missing table rows
-                writeMissingRows(userId);
-
-                // Re-read data
-                playerData = loadPlayerData(playerName);
             }
+            result.close();
         }
         catch (SQLException ex) {
             printErrors(ex);
@@ -363,106 +397,87 @@ public final class SQLDatabaseManager implements DatabaseManager {
                 }
             }
         }
-        return playerData;
+
+        // Problem, nothing was returned
+
+        // Quit if this is second time around
+        if (!retry) {
+            return new PlayerProfile(playerName, false);
+        }
+
+        // First, read User Id - this is to check for orphans
+
+        int id = readId(playerName);
+
+        if (id == -1) {
+            // There is no such user
+            if (create) {
+                newUser(playerName);
+                return loadPlayerProfile(playerName, false, false);
+            }
+
+            // Return unloaded profile if can't create
+            return new PlayerProfile(playerName, false);
+        }
+        // There is such a user
+        writeMissingRows(id);
+        // Retry, and abort on re-failure
+        return loadPlayerProfile(playerName, create, false);
     }
 
-    public boolean convert(String[] data) throws Exception {
+    public void convertUsers(DatabaseManager destination) {
-        String playerName = data[0];
+        if (!checkConnected()) {
-
+            return;
-        // Check for things we don't want put in the DB
-        if (playerName == null || playerName.equalsIgnoreCase("null") || playerName.length() > 16) {
-            return false;
         }
 
-        String mining = (data.length > 1) ? data[1] : null;
+        PreparedStatement statement = null;
-        String woodcutting = (data.length > 5) ? data[5] : null;
-        String repair = (data.length > 7) ? data[7] : null;
-        String unarmed = (data.length > 8) ? data[8] : null;
-        String herbalism = (data.length > 9) ? data[9] : null;
-        String excavation = (data.length > 10) ? data[10] : null;
-        String archery = (data.length > 11) ? data[11] : null;
-        String swords = (data.length > 12) ? data[12] : null;
-        String axes = (data.length > 13) ? data[13] : null;
-        String acrobatics = (data.length > 14) ? data[14] : null;
-        String taming = (data.length > 24) ? data[24] : null;
-        String fishing = (data.length > 34) ? data[34] : null;
 
-        String miningXP = (data.length > 4) ? data[4] : null;
+        try {
-        String woodCuttingXP = (data.length > 6) ? data[6] : null;;
+            statement = connection.prepareStatement(
-        String repairXP = (data.length > 15) ? data[15] : null;
+                    "SELECT "
-        String unarmedXP = (data.length > 16) ? data[16] : null;
+                    + "s.taming, s.mining, s.repair, s.woodcutting, s.unarmed, s.herbalism, s.excavation, s.archery, s.swords, s.axes, s.acrobatics, s.fishing, "
-        String herbalismXP = (data.length > 17) ? data[17] : null;
+                    + "e.taming, e.mining, e.repair, e.woodcutting, e.unarmed, e.herbalism, e.excavation, e.archery, e.swords, e.axes, e.acrobatics, e.fishing, "
-        String excavationXP = (data.length > 18) ? data[18] : null;
+                    + "c.taming, c.mining, c.repair, c.woodcutting, c.unarmed, c.herbalism, c.excavation, c.archery, c.swords, c.axes, c.acrobatics, c.blast_mining, "
-        String archeryXP = (data.length > 19) ? data[19] : null;
+                    + "h.mobhealthbar "
-        String swordsXP = (data.length > 20) ? data[20] : null;
+                    + "FROM " + tablePrefix + "users u "
-        String axesXP = (data.length > 21) ? data[21] : null;
+                    + "JOIN " + tablePrefix + "skills s ON (u.id = s.user_id) "
-        String acrobaticsXP = (data.length > 22) ? data[22] : null;
+                    + "JOIN " + tablePrefix + "experience e ON (u.id = e.user_id) "
-        String tamingXP = (data.length > 25) ? data[25] : null;
+                    + "JOIN " + tablePrefix + "cooldowns c ON (u.id = c.user_id) "
-        String fishingXP = (data.length > 35) ? data[35] : null;
+                    + "JOIN " + tablePrefix + "huds h ON (u.id = h.user_id) "
-
+                    + "WHERE u.user = ?");
-        String superBreakerCooldown = (data.length > 32) ? data[32] : null;
+            List<String> usernames = getStoredUsers();
-        String treeFellerCooldown = (data.length > 28) ? data[28] : null;
+            ResultSet result = null;
-        String berserkCooldown = (data.length > 26) ? data[26] : null;
+            int convertedUsers = 0;
-        String greenTerraCooldown = (data.length > 29) ? data[29] : null;
+            long startMillis = System.currentTimeMillis();
-        String gigaDrillBreakerCooldown = (data.length > 27) ? data[27] : null;
+            for (String playerName : usernames) {
-        String serratedStrikesCooldown = (data.length > 30) ? data[30] : null;
+                statement.setString(1, playerName);
-        String skullSplitterCooldown = (data.length > 31) ? data[31] : null;
+                try {
-        String blastMiningCooldown = (data.length > 36) ? data[36] : null;
+                    result = statement.executeQuery();
-
+                    result.next();
-        String hudType = (data.length > 33) ? data[33] : null;
+                    destination.saveUser(loadFromResult(playerName, result));
-        String mobHealthbarType = (data.length > 38 ? data[38] : null);
+                    result.close();
-        long lastLogin = mcMMO.p.getServer().getOfflinePlayer(playerName).getLastPlayed();
+                }
-
+                catch (SQLException e) {
-        int id = readId(playerName); // Check to see if the user is in the DB
+                    // Ignore
-
+                }
-        // Create the user if they don't exist
+                convertedUsers++;
-        if (id == 0) {
+                Misc.printProgress(convertedUsers, progressInterval, startMillis);
-            newUser(playerName);
+            }
-            id = readId(playerName);
+        }
+        catch (SQLException e) {
+            printErrors(e);
+        }
+        finally {
+            if (statement != null) {
+                try {
+                    statement.close();
+                }
+                catch (SQLException e) {
+                    // Ignore
+                }
+            }
         }
 
-        saveLogin(id, lastLogin);
-        saveIntegers(
-                "UPDATE " + tablePrefix + "skills SET "
-                        + " taming = ?, mining = ?, repair = ?, woodcutting = ?"
-                        + ", unarmed = ?, herbalism = ?, excavation = ?"
-                        + ", archery = ?, swords = ?, axes = ?, acrobatics = ?"
-                        + ", fishing = ? WHERE user_id = ?",
-                StringUtils.getInt(taming), StringUtils.getInt(mining),
-                StringUtils.getInt(repair), StringUtils.getInt(woodcutting),
-                StringUtils.getInt(unarmed), StringUtils.getInt(herbalism),
-                StringUtils.getInt(excavation), StringUtils.getInt(archery),
-                StringUtils.getInt(swords), StringUtils.getInt(axes),
-                StringUtils.getInt(acrobatics), StringUtils.getInt(fishing),
-                id);
-        saveIntegers(
-                "UPDATE " + tablePrefix + "experience SET "
-                        + " taming = ?, mining = ?, repair = ?, woodcutting = ?"
-                        + ", unarmed = ?, herbalism = ?, excavation = ?"
-                        + ", archery = ?, swords = ?, axes = ?, acrobatics = ?"
-                        + ", fishing = ? WHERE user_id = ?",
-                StringUtils.getInt(tamingXP), StringUtils.getInt(miningXP),
-                StringUtils.getInt(repairXP), StringUtils.getInt(woodCuttingXP),
-                StringUtils.getInt(unarmedXP), StringUtils.getInt(herbalismXP),
-                StringUtils.getInt(excavationXP), StringUtils.getInt(archeryXP),
-                StringUtils.getInt(swordsXP), StringUtils.getInt(axesXP),
-                StringUtils.getInt(acrobaticsXP), StringUtils.getInt(fishingXP),
-                id);
-        saveLongs(
-                "UPDATE " + tablePrefix + "cooldowns SET "
-                        + " taming = ?, mining = ?, repair = ?, woodcutting = ?"
-                        + ", unarmed = ?, herbalism = ?, excavation = ?"
-                        + ", archery = ?, swords = ?, axes = ?, acrobatics = ?"
-                        + ", blast_mining = ? WHERE user_id = ?",
-                id,
-                StringUtils.getLong(null), StringUtils.getLong(superBreakerCooldown),
-                StringUtils.getLong(null), StringUtils.getInt(treeFellerCooldown),
-                StringUtils.getLong(berserkCooldown), StringUtils.getLong(greenTerraCooldown),
-                StringUtils.getLong(gigaDrillBreakerCooldown), StringUtils.getLong(null),
-                StringUtils.getLong(serratedStrikesCooldown), StringUtils.getLong(skullSplitterCooldown),
-                StringUtils.getLong(null), StringUtils.getLong(blastMiningCooldown));
-        saveHuds(id, hudType, mobHealthbarType);
-        return true;
     }
 
     /**
@@ -555,9 +570,40 @@ public final class SQLDatabaseManager implements DatabaseManager {
         return false;
     }
 
+    public List<String> getStoredUsers() {
+        ArrayList<String> users = new ArrayList<String>();
+
+        if (checkConnected()) {
+            Statement stmt = null;
+            try {
+                stmt = connection.createStatement();
+                ResultSet result = stmt.executeQuery("SELECT user FROM " + tablePrefix + "users");
+                while (result.next()) {
+                    users.add(result.getString("user"));
+                }
+                result.close();
+            }
+            catch (SQLException e) {
+                printErrors(e);
+            }
+            finally {
+                if (stmt != null) {
+                    try {
+                        stmt.close();
+                    }
+                    catch (SQLException e) {
+                        // Ignore
+                    }
+                }
+            }
+        }
+
+        return users;
+    }
+
     /**
-    * Attempt to connect to the mySQL database.
+     * Attempt to connect to the mySQL database.
-    */
+     */
     private void connect() {
         connectionString = "jdbc:mysql://" + Config.getInstance().getMySQLServerName() + ":" + Config.getInstance().getMySQLServerPort() + "/" + Config.getInstance().getMySQLDatabaseName();
 
@@ -579,22 +625,27 @@ public final class SQLDatabaseManager implements DatabaseManager {
             connection = null;
 
             if (reconnectAttempt == 0 || reconnectAttempt >= 11) {
-                mcMMO.p.getLogger().info("Connection to MySQL failed!");
+                mcMMO.p.getLogger().severe("Connection to MySQL failed!");
+                printErrors(ex);
             }
         }
         catch (ClassNotFoundException ex) {
             connection = null;
 
             if (reconnectAttempt == 0 || reconnectAttempt >= 11) {
-                mcMMO.p.getLogger().info("MySQL database driver not found!");
+                mcMMO.p.getLogger().severe("MySQL database driver not found!");
             }
         }
     }
 
     /**
-    * Attempt to create the database structure.
+     * Checks that the database structure is present and correct
-    */
+     */
-    private void createStructure() {
+    private void checkStructure() {
+        if (!checkConnected()) {
+            return;
+        }
+
         write("CREATE TABLE IF NOT EXISTS `" + tablePrefix + "users` ("
                 + "`id` int(10) unsigned NOT NULL AUTO_INCREMENT,"
                 + "`user` varchar(40) NOT NULL,"
@@ -603,7 +654,6 @@ public final class SQLDatabaseManager implements DatabaseManager {
                 + "UNIQUE KEY `user` (`user`)) DEFAULT CHARSET=latin1 AUTO_INCREMENT=1;");
         write("CREATE TABLE IF NOT EXISTS `" + tablePrefix + "huds` ("
                 + "`user_id` int(10) unsigned NOT NULL,"
-                + "`hudtype` varchar(50) NOT NULL DEFAULT 'STANDARD',"
                 + "`mobhealthbar` varchar(50) NOT NULL DEFAULT '" + Config.getInstance().getMobHealthbarDefault() + "',"
                 + "PRIMARY KEY (`user_id`)) "
                 + "DEFAULT CHARSET=latin1;");
@@ -662,10 +712,10 @@ public final class SQLDatabaseManager implements DatabaseManager {
     }
 
     /**
-    * Check database structure for missing values.
+     * Check database structure for missing values.
-    *
+     *
-    * @param update Type of data to check updates for
+     * @param update Type of data to check updates for
-    */
+     */
     private void checkDatabaseStructure(DatabaseUpdateType update) {
         String sql = "";
 
@@ -704,6 +754,10 @@ public final class SQLDatabaseManager implements DatabaseManager {
                 write("ALTER TABLE `" + tablePrefix + "users` DROP COLUMN `party` ;");
                 return;
 
+            case DROPPED_SPOUT:
+                write("ALTER TABLE `" + tablePrefix + "huds` DROP COLUMN `hudtype` ;");
+                return;
+
             case KILL_ORPHANS:
                 mcMMO.p.getLogger().info("Killing orphans");
                 write(
@@ -793,11 +847,11 @@ public final class SQLDatabaseManager implements DatabaseManager {
     }
 
     /**
-    * Attempt to write the SQL query.
+     * Attempt to write the SQL query.
-    *
+     *
-    * @param sql Query to write.
+     * @param sql Query to write.
-    * @return true if the query was successfully written, false otherwise.
+     * @return true if the query was successfully written, false otherwise.
-    */
+     */
     private boolean write(String sql) {
         if (!checkConnected()) {
             return false;
@@ -810,7 +864,7 @@ public final class SQLDatabaseManager implements DatabaseManager {
             return true;
         }
         catch (SQLException ex) {
-            if (!sql.equalsIgnoreCase("ALTER TABLE `" + tablePrefix + "users` DROP COLUMN `party` ;")) {
+            if (!sql.contains("DROP COLUMN")) {
                 printErrors(ex);
             }
             return false;
@@ -828,11 +882,11 @@ public final class SQLDatabaseManager implements DatabaseManager {
     }
 
     /**
-    * Returns the number of rows affected by either a DELETE or UPDATE query
+     * Returns the number of rows affected by either a DELETE or UPDATE query
-    *
+     *
-    * @param sql SQL query to execute
+     * @param sql SQL query to execute
-    * @return the number of rows affected
+     * @return the number of rows affected
-    */
+     */
     private int update(String sql) {
         int rows = 0;
 
@@ -862,11 +916,11 @@ public final class SQLDatabaseManager implements DatabaseManager {
     }
 
     /**
-    * Read SQL query.
+     * Read SQL query.
-    *
+     *
-    * @param sql SQL query to read
+     * @param sql SQL query to read
-    * @return the rows in this SQL query
+     * @return the rows in this SQL query
-    */
+     */
     private HashMap<Integer, ArrayList<String>> read(String sql) {
         HashMap<Integer, ArrayList<String>> rows = new HashMap<Integer, ArrayList<String>>();
 
@@ -906,47 +960,14 @@ public final class SQLDatabaseManager implements DatabaseManager {
         return rows;
     }
 
-    private ArrayList<String> readRow(PreparedStatement statement) {
-        ArrayList<String> playerData = new ArrayList<String>();
-
-        if (checkConnected()) {
-            ResultSet resultSet = null;
-
-            try {
-                resultSet = statement.executeQuery();
-
-                if (resultSet.next()) {
-                    for (int i = 1; i <= resultSet.getMetaData().getColumnCount(); i++) {
-                        playerData.add(resultSet.getString(i));
-                    }
-                }
-            }
-            catch (SQLException ex) {
-                printErrors(ex);
-            }
-            finally {
-                if (statement != null) {
-                    try {
-                        statement.close();
-                    }
-                    catch (SQLException e) {
-                        // Ignore
-                    }
-                }
-            }
-        }
-
-        return playerData;
-    }
-
     /**
-    * Get the Integer. Only return first row / first field.
+     * Get the Integer. Only return first row / first field.
-    *
+     *
-    * @param sql SQL query to execute
+     * @param statement SQL query to execute
-    * @return the value in the first row / first field
+     * @return the value in the first row / first field
-    */
+     */
     private int readInt(PreparedStatement statement) {
-        int result = 0;
+        int result = -1;
 
         if (checkConnected()) {
             ResultSet resultSet = null;
@@ -1021,7 +1042,7 @@ public final class SQLDatabaseManager implements DatabaseManager {
         }
     }
 
-    private void saveIntegers(String sql, int... args) {
+    private boolean saveIntegers(String sql, int... args) {
         PreparedStatement statement = null;
 
         try {
@@ -1033,9 +1054,11 @@ public final class SQLDatabaseManager implements DatabaseManager {
             }
 
             statement.execute();
+            return true;
         }
         catch (SQLException ex) {
             printErrors(ex);
+            return false;
         }
         finally {
             if (statement != null) {
@@ -1049,7 +1072,7 @@ public final class SQLDatabaseManager implements DatabaseManager {
         }
     }
 
-    private void saveLongs(String sql, int id, long... args) {
+    private boolean saveLongs(String sql, int id, long... args) {
         PreparedStatement statement = null;
 
         try {
@@ -1062,9 +1085,11 @@ public final class SQLDatabaseManager implements DatabaseManager {
 
             statement.setInt(i++, id);
             statement.execute();
+            return true;
         }
         catch (SQLException ex) {
             printErrors(ex);
+            return false;
         }
         finally {
             if (statement != null) {
@@ -1078,8 +1103,14 @@ public final class SQLDatabaseManager implements DatabaseManager {
         }
     }
 
+    /**
+     * Retrieve the database id for a player
+     *
+     * @param playerName The name of the user to retrieve the id for
+     * @return the requested id or -1 if not found
+     */
     private int readId(String playerName) {
-        int id = 0;
+        int id = -1;
 
         try {
             PreparedStatement statement = connection.prepareStatement("SELECT id FROM " + tablePrefix + "users WHERE user = ?");
@@ -1093,7 +1124,7 @@ public final class SQLDatabaseManager implements DatabaseManager {
         return id;
     }
 
-    private void saveLogin(int id, long login) {
+    private boolean saveLogin(int id, long login) {
         PreparedStatement statement = null;
 
         try {
@@ -1101,9 +1132,11 @@ public final class SQLDatabaseManager implements DatabaseManager {
             statement.setLong(1, login);
             statement.setInt(2, id);
             statement.execute();
+            return true;
         }
         catch (SQLException ex) {
             printErrors(ex);
+            return false;
         }
         finally {
             if (statement != null) {
@@ -1117,18 +1150,19 @@ public final class SQLDatabaseManager implements DatabaseManager {
         }
     }
 
-    private void saveHuds(int userId, String hudType, String mobHealthBar) {
+    private boolean saveHuds(int userId, String mobHealthBar) {
         PreparedStatement statement = null;
 
         try {
-            statement = connection.prepareStatement("UPDATE " + tablePrefix + "huds SET hudtype = ?, mobhealthbar = ? WHERE user_id = ?");
+            statement = connection.prepareStatement("UPDATE " + tablePrefix + "huds SET mobhealthbar = ? WHERE user_id = ?");
-            statement.setString(1, hudType);
+            statement.setString(1, mobHealthBar);
-            statement.setString(2, mobHealthBar);
+            statement.setInt(2, userId);
-            statement.setInt(3, userId);
             statement.execute();
+            return true;
         }
         catch (SQLException ex) {
             printErrors(ex);
+            return false;
         }
         finally {
             if (statement != null) {
@@ -1142,9 +1176,73 @@ public final class SQLDatabaseManager implements DatabaseManager {
         }
     }
 
+    private PlayerProfile loadFromResult(String playerName, ResultSet result) throws SQLException {
+        Map<SkillType, Integer>   skills     = new HashMap<SkillType, Integer>();   // Skill & Level
+        Map<SkillType, Float>     skillsXp   = new HashMap<SkillType, Float>();     // Skill & XP
+        Map<AbilityType, Integer> skillsDATS = new HashMap<AbilityType, Integer>(); // Ability & Cooldown
+        MobHealthbarType mobHealthbarType;
+
+        final int OFFSET_SKILLS = 0; // TODO update these numbers when the query changes (a new skill is added)
+        final int OFFSET_XP = 12;
+        final int OFFSET_DATS = 24;
+        final int OFFSET_OTHER = 36;
+
+        skills.put(SkillType.TAMING, result.getInt(OFFSET_SKILLS + 1));
+        skills.put(SkillType.MINING, result.getInt(OFFSET_SKILLS + 2));
+        skills.put(SkillType.REPAIR, result.getInt(OFFSET_SKILLS + 3));
+        skills.put(SkillType.WOODCUTTING, result.getInt(OFFSET_SKILLS + 4));
+        skills.put(SkillType.UNARMED, result.getInt(OFFSET_SKILLS + 5));
+        skills.put(SkillType.HERBALISM, result.getInt(OFFSET_SKILLS + 6));
+        skills.put(SkillType.EXCAVATION, result.getInt(OFFSET_SKILLS + 7));
+        skills.put(SkillType.ARCHERY, result.getInt(OFFSET_SKILLS + 8));
+        skills.put(SkillType.SWORDS, result.getInt(OFFSET_SKILLS + 9));
+        skills.put(SkillType.AXES, result.getInt(OFFSET_SKILLS + 10));
+        skills.put(SkillType.ACROBATICS, result.getInt(OFFSET_SKILLS + 11));
+        skills.put(SkillType.FISHING, result.getInt(OFFSET_SKILLS + 12));
+
+        skillsXp.put(SkillType.TAMING, result.getFloat(OFFSET_XP + 1));
+        skillsXp.put(SkillType.MINING, result.getFloat(OFFSET_XP + 2));
+        skillsXp.put(SkillType.REPAIR, result.getFloat(OFFSET_XP + 3));
+        skillsXp.put(SkillType.WOODCUTTING, result.getFloat(OFFSET_XP + 4));
+        skillsXp.put(SkillType.UNARMED, result.getFloat(OFFSET_XP + 5));
+        skillsXp.put(SkillType.HERBALISM, result.getFloat(OFFSET_XP + 6));
+        skillsXp.put(SkillType.EXCAVATION, result.getFloat(OFFSET_XP + 7));
+        skillsXp.put(SkillType.ARCHERY, result.getFloat(OFFSET_XP + 8));
+        skillsXp.put(SkillType.SWORDS, result.getFloat(OFFSET_XP + 9));
+        skillsXp.put(SkillType.AXES, result.getFloat(OFFSET_XP + 10));
+        skillsXp.put(SkillType.ACROBATICS, result.getFloat(OFFSET_XP + 11));
+        skillsXp.put(SkillType.FISHING, result.getFloat(OFFSET_XP + 12));
+
+        // Taming - Unused - result.getInt(OFFSET_DATS + 1)
+        skillsDATS.put(AbilityType.SUPER_BREAKER, result.getInt(OFFSET_DATS + 2));
+        // Repair - Unused - result.getInt(OFFSET_DATS + 3)
+        skillsDATS.put(AbilityType.TREE_FELLER, result.getInt(OFFSET_DATS + 4));
+        skillsDATS.put(AbilityType.BERSERK, result.getInt(OFFSET_DATS + 5));
+        skillsDATS.put(AbilityType.GREEN_TERRA, result.getInt(OFFSET_DATS + 6));
+        skillsDATS.put(AbilityType.GIGA_DRILL_BREAKER, result.getInt(OFFSET_DATS + 7));
+        // Archery - Unused - result.getInt(OFFSET_DATS + 8)
+        skillsDATS.put(AbilityType.SERRATED_STRIKES, result.getInt(OFFSET_DATS + 9));
+        skillsDATS.put(AbilityType.SKULL_SPLITTER, result.getInt(OFFSET_DATS + 10));
+        // Acrobatics - Unused - result.getInt(OFFSET_DATS + 11)
+        skillsDATS.put(AbilityType.BLAST_MINING, result.getInt(OFFSET_DATS + 12));
+
+        try {
+            mobHealthbarType = MobHealthbarType.valueOf(result.getString(OFFSET_OTHER + 2));
+        }
+        catch (Exception e) {
+            mobHealthbarType = Config.getInstance().getMobHealthbarDefault();
+        }
+
+        return new PlayerProfile(playerName, skills, skillsXp, skillsDATS, mobHealthbarType);
+    }
+
     private 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());
     }
-}
+
+    public DatabaseType getDatabaseType() {
+        return DatabaseType.SQL;
+    }
+}

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

@@ -0,0 +1,24 @@
+package com.gmail.nossr50.datatypes.chat;
+
+import com.gmail.nossr50.locale.LocaleLoader;
+
+public enum ChatMode {
+    ADMIN(LocaleLoader.getString("Commands.AdminChat.On"), LocaleLoader.getString("Commands.AdminChat.Off")),
+    PARTY(LocaleLoader.getString("Commands.Party.Chat.On"), LocaleLoader.getString("Commands.Party.Chat.Off"));
+
+    private String enabledMessage;
+    private String disabledMessage;
+
+    private ChatMode(String enabledMessage, String disabledMessage) {
+        this.enabledMessage  = enabledMessage;
+        this.disabledMessage = disabledMessage;
+    }
+
+    public String getEnabledMessage() {
+        return enabledMessage;
+    }
+
+    public String getDisabledMessage() {
+        return disabledMessage;
+    }
+}

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

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

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

@@ -5,7 +5,8 @@ public enum DatabaseUpdateType {
     BLAST_MINING,
     INDEX,
     MOB_HEALTHBARS,
-    PARTY_NAMES, 
+    PARTY_NAMES,
     KILL_ORPHANS,
+    DROPPED_SPOUT
     ;
 }

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

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