Created an Ability class to be consistent with Tool

Fixed Tool objects being shared by all players
Moved ability and tool stuff from McMMOPlayer to SkillManager classes
2026-02-18 09:43:00 +01:00 · 2013-03-04 00:18:23 +01:00 · 2013-03-04 00:01:53 +01:00 · 2013-03-03 23:27:51 +01:00
596 changed files with 13592 additions and 21889 deletions
--- a/.gitattributes
+++ b/.gitattributes
@@ -1,4 +1,4 @@
-* text=auto
+* text

 *.png binary
 *.wav binary
--- a/.gitignore
+++ b/.gitignore
@@ -1,42 +1,42 @@
-# Eclipse stuff
-/.classpath
-/.project
-/.settings
-
-# netbeans
-/nbproject
-
-# we use maven!
-/build.xml
-
-# maven
-/target
-
-# vim
-.*.sw[a-p]
-
-# various other potential build files
-/build
-/bin
-/dist
-/manifest.mf
-
-/world
-
-# Mac filesystem dust
-*.DS_Store
-
-# intellij
-*.iml
-*.ipr
-*.iws
-.idea/
-
-# Project Stuff
-/src/main/resources/mcMMO
-
-# Other Libraries
-*.jar
-
-# Atlassian Stuff
+# Eclipse stuff
+/.classpath
+/.project
+/.settings
+
+# netbeans
+/nbproject
+
+# we use maven!
+/build.xml
+
+# maven
+/target
+
+# vim
+.*.sw[a-p]
+
+# various other potential build files
+/build
+/bin
+/dist
+/manifest.mf
+
+/world
+
+# Mac filesystem dust
+*.DS_Store
+
+# intellij
+*.iml
+*.ipr
+*.iws
+.idea/
+
+# Project Stuff
+/src/main/resources/mcMMO
+
+# Other Libraries
+*.jar
+
+# Atlassian Stuff
 /atlassian-ide-plugin.xml
--- a/Changelog.txt
+++ b/Changelog.txt
@@ -7,209 +7,7 @@ Key:
  ! Change
  - Removal

-Version 1.4.07-dev
- + 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
- + 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
- ! 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 various values to double in advanced.yml for the sake of consistency.
- ! Nerfed Archery damage to eliminate constant one-hit kills.
- ! Changed the way Repair hands out XP, also added config options to control Repair XP
- ! Changed Swords "Counter Attack" ability from passive to active. Blocking is required to activate.
- ! Hardcore 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 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
- - 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 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
- + Added tab-complete support for all commands
- + Added ability to configure drops from Shake in treasures.yml
- + Added "Master Angler" ability to Fishing.
- + Added health display for mobs during combat.
- + Added new API method to McMMOPlayerLevelUpEvent to set levels gained
- + Added new permission node for /ptp; mcmmo.commands.ptp.send (enabled by default)
- + Added configurable cooldown and warmup times when using /ptp
- + Added a new Party item share category "Misc" which contains a list of configurable items. (By default all tools and armor)
- + Added fishing exploit prevention
- + Added permission node to bypass the fishing exploit prevention
- + Added boosts to Fishing chance depending on conditions
- + Added McMMOAbilityActivateEvent and McMMOAbilityDeactivateEvent
- + Added config option to toggle the size of fireworks
- + Added config option to multiply xp gains from mob spawner mobs
- + Added multiplier to Archery XP based on bow force
- + Added information about /party itemshare and /party expshare to the party help page
- + Added option to use scoreboards for power level display instead of Spout.
- + Added permission node to prevent inspecting hidden players
- + Added SQL to Flatfile database conversion
- + Added ability to use custom database managers and convert to/from them
- = Fixed bug which could cause the server to hang for a minute when checking for updates. (Thanks to Riking)
- = Fixed bug where spawned arrows could throw ArrayIndexOutOfBoundsException
- = Fixed bug where custom Spout titles were overwritten by mcMMO.
- = Fixed bug where Nether Quartz wasn't included in Smelting or item sharing
- = Fixed bug where players were able to join the same party multiple times
- = Fixed displaying partial names when trying to use /ptp
- = Fixed wolves from Call of the Wild only having 8 health
- = Fixed bug where /party chat was not working
- = Fixed bug where experience commands were adding levels to all skills when they shouldn't
- = Fixed mcmmo.commands.ptp.send not being set by default
- = Fixed NPE when trying to tab-complete /mctop
- = Fixed Fishing treasures always having the same enchants
- = Fixed Smelting returning ink sacs instead of Lapis when double-dropping
- = Fixed bug where players could remain in party chat after leaving or being kicked from a party.
- = Fixed bug where non-player arrows couldn't be deflected.
- = Fixed experience being applied even when the permission for a skill was denied
- = Fixed possible item duplication bug with infinity bows
- = Fixed bug with removing players from mySQL database
- = Fixed bug with empty metadata lists and Smelting
- = Fixed bug where Blast Mining would drop wrong items
- = Fixed bug with Blast Mining where the Ability refreshed message was being send too early
- = Fixed bug where the chance of a successful Gracefull Roll was twice as high as displayed
- = Fixed bug where lucky perks where not working
- = Fixed bug with Ice Fishing on a single block of ice
- = Fixed bug with Ice Fishing which allowed players to break ice in protected areas
- = Fixed a small bug with mob healthbars and bosses, such as EnderDragons and Withers
- ! Changed Spout notification tiers to be stored in SpoutConfig instead of AdvancedConfig
- ! Changed Berserk to add items to inventory rather than denying pickup
- ! Changed Call of the Wild, newly summoned pet's will have a custom name. (added permission node to disable this)
- ! Changed Chimaera Wing's recipe result to use the ingredient Material
- ! Changed Repair to ask a confirmation of the player when he tries to repair an enchanted item
- ! Players will no longer pickup items to their hotbar while using Unarmed
- ! ExperienceAPI methods will now throw InvalidSkillException if the skill name passed in is invalid.
- ! Changed default value for recently-hurt cooldown between teleports, this is also fully configurable now
- ! Changed the amount of info messages in the console when enabling/disabling, enable Verbose_Logging to enable them again
- ! Items dropped by players are now being tracked and are not being shared with party members
- ! Optimized tracking of tool & ability cooldowns.
- ! Updated the localization files
-
-Version 1.4.05
- + Added option to allow refreshing of chunks after block-breaking abilities. (Disabled by default)
- + Added fireworks effects when a player levels-up, for every 100 levels (configurable)
- = Fixed bug where /addxp was setting instead of adding experience
- = Fixed bug where /addxp was not processessing level-ups for online players
- = Fixed bug which allowed players to share experience with nearby dead players
- = Fixed bug with ChimaeraWings not taking Wings from a players inventory properly
- = Fixed bug which caused a NPE when trying to use /mctop smelting
- = Fixed Berserk misbehaving when /reload was used
- = Fixed parties misbehaving when /reload was used
- = Fixed Berserk getting "stuck" when /mcrefresh was used
- = Fixed ClassCastException with Taming
- = Fixed huge mushroom blocks not being properly tracked
- = Fixed potion buff option not using the appropriate # of ticks
- = Fixed Chimera Wing spamming console if Metrics was disabled
- = Fixed Chimera Wing displaying warmup message if warmup was set to 0
- = Fixed party & admin chat errors when not aysnc
- ! Updated localization files
-
-Version 1.4.04
- + Added functions to ExperienceAPI for use with offline players
- + Added Nether Quartz Ore to Mining
- + Added Dropper, Hopper, and Trapped Chest to blocks that shouldn't activate abilities
- + Added partial name matching
- = Fixed bug where trying to activate a Chimaera Wing would require one item too much
- = Fixed bug where Treefeller would try to cut too many leaves and reach the threshold when it shouldn't
- = Fixed bug where Mining wasn't awarding double drops
- = Fixed bug where Shake wouldn't damage mobs whose max health was less than 4
- = Fixed bug where the API would fail if the name of a player's current party is requested when the player isn't in one (Thanks @dualspiral!)
- = Fixed bug with retrieving a player's party members
- = Fixed bug which caused a NPE when trying to join the party of a non-existing player or when ptp to a non-existing player
- = Fixed bug which causes a NPE when trying to use /mcrefresh from the console
- = Fixed bug where Carrots and Potatoes weren't awarding Herbalism XP.
- = Fixed bug where some herbalism drops weren't properly shared within parties.
- = Fixed bug where players wouldn't be able to pick up items if they logged our while Berserk was still active.
- ! Changed config node name for the skill experience modifiers from "Experience.Formula.Multiplier.[Skill]" to "Experience.Formula.Modifier.[Skill]"
- ! Updated localization files
- ! mcMMO abilities can no longer be activated while in Creative mode
- ! Expanded ChatAPI to allow toggling of chat states for users
- ! Updated to EMetrics 0.0.4-SNAPSHOT
- - Removed deprecated functions from API classes.
- - Removed functions for getting the PlayerProfile - using API classes is preferred, but if not the McMMOPlayer should be used instead
- - Removed Ender Dragon, Wither, and Witch from granting combat experience and related configuration options
-
-Version 1.4.03
- + Added option to advanced.yml to determine the # of enchant levels used when buffing Super Breaker & Giga Drill Breaker
- + Improved stats display for child skills
- + Added cooldown between using Chimaera Wings
- = Fixed bug with '/party chat (on|off)' and '/partychat (on|off)' not working
- = Fixed bug with Repair not decreasing enchanting levels properly
- = Fixed bug with Smelting not properly tracking furnaces
- = Fixed bug with Blast Mining not dropping blocks correctly
- = Fixed bug with custom blocks not working
- = Fixed bug with Blast Mining increasing TNT damage.
- = Fixed bug where Blast Mining was awarding too much XP
- = Fixed bug where triple drops would award twice the amount of experience in Herbalism and Mining
- = Fixed bug where Green Thumb would consume wheat instead of seeds
- = Fixed bug where Green Terra would consume twice the amount of seed when used on crops
- = Fixed bug where experience would be awarded in Herbalism for some player-placed blocks
- = Fixed bug where players were unable to salvage leather armor
- = Fixed bug with repairing using materials with byte metadata
- = Fixed bug where Fishing was becoming less successful at higher levels
- = Fixed bug with using Salvage on stacked items.
- = Fixed bug where the 'mcmmo.commands.ptp.world.all' was registered twice
- = Fixed bug where Beast Lore wouldn't work on friendly pets
- = Fixed bug where Deflect was calculated based on the attacker, not the defender. (We really did this time!)
- = Fixed bug where Treefeller would not deal durability damage when the axe "splinters into dozens of pieces"
- ! Moved the Salvage unlock level from config.yml to advanced.yml
- ! Changed how Chimaera Wings are acquired, you need to craft them now. (By default, use 5 feathers in a shapeless recipe)
- ! Changed how Chimaera Wings teleport players to the spawnpoint, will now check if the location is safe
- - Removed option to disable Salvage via the config file. This should be handled via permissions instead.
- - Removed the option to use Woodcutting without an axe from the config file.
-
-Version 1.4.02
- + Added API to get the skill and power level caps.
- = Fixed bug where Deflect was calculated based on the attacker, not the defender
- = Fixed bug where some skills weren't registering as unlocked until one level later
- = Fixed bug where the PTP cooldown was being read improperly
- = Fixed bug where /ptp <accept|toggle|acceptall> where broken
- = Fixed ClassCastException relating to counter-attack with Swords
- = Fixed issue with some skill activations not activating enough or activating too much
-
-Version 1.4.01
+Version 1.4.01-dev
 = Fixed bug where trying to use /mctop or /xplock with the Smelting child skill caused NPEs
 = Fixed bug where /mctop and /mcrank wouldn't show overall power levels for servers using Flatfile
 = Fixed bug where Smelting would throw consistent errors due to offline players
@@ -220,7 +18,6 @@ Version 1.4.01
 = Fixed bug where ptp permissions weren't being handled properly
 = Fixed bug where Beast Lore wouldn't work
 = Fixed bug where Chimaera Wing would always teleport to spawn, even when the player had a valid bed spawn location
- = Updated locale files

 Version 1.4.00
 + Added new Child Skill - Smelting!
--- a/README.md
+++ b/README.md
@@ -5,7 +5,9 @@
 Our latest development builds are available [here](http://ci.mcmmo.info).

 ### Brief Description
-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.
+mcMMO takes core Minecraft game mechanics and expands them to add an extensive RPG experience, the goal of the project has always been a quality RPG experience. Everything in mcMMO is carefully thought out and is constantly improving. mcMMO adds eleven skills to train in and level in, while also offering a high level of customization for server admins. There are countless features, including custom sounds, graphical elements, and more added when running mcMMO in conjunction with Spout. I carefully read feedback and evaluate the mechanics of mcMMO in every update to provide an ever-evolving experience.
+
+If you want an original RPG experience like no other mod out there, mcMMO is for you.

 ## About the Team

@@ -27,18 +29,19 @@ mcMMO is currently developed by a team of individuals from all over the world.
 (https://github.com/shatteredbeam)
 [![TfT_02](http://www.gravatar.com/avatar/b8914f9970e1f6ffd5281ce4770e20a7.png)]
 (https://github.com/TfT-02)
-[![t00thpick1](http://www.gravatar.com/avatar/ee23c7794a0c40120c3474287c7bce06.png)]
+[![t00thpick1](http://www.gravatar.com/avatar/??.png)]
 (https://github.com/t00thpick1)

 ## Compiling

 mcMMO uses Maven 3 to manage dependancies, packaging, and shading of necessary classes; Maven 3 is required to compile mcMMO.

-The typical command used to build mcMMO is: `mvn clean package install`
+The typical command used to build mcMMO is: mvn clean package install

 Required Libraries:
+* Spout API
 * JUnit
-* EMetrics
+* Metrics
 * Bukkit

 http://dev.bukkit.org/server-mods/mcmmo for more up to date information.
--- a/extras/repair.chain.yml
+++ b/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. The names of each subitem should be the exact material name.
-# The bare minimum of a Repairable is that it have a RepairMaterial and a MaximumDurability
+# Afterwards, all sub-items are considered a Repairable to be loaded
+# The bare minimum of a Repairable is that it have an ItemId, a RepairMaterialId, 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.
 #
-# RepairMaterial: This is the material name of the item used to repair this repairable.
+# RepairMaterialId: This is the id 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,19 +42,32 @@
 #
 ###
 Repairables:
-    #
-    # Chainmail repairables
-    ###
-    # Armor
-    CHAINMAIL_HELMET:
-        RepairMaterial: FIRE
+    ChainHelmet:
+        ItemId: 302
+        ItemType: ARMOR
+        RepairMaterialId: 51
+        MaximumDurability: 165
+        MinimumQuantity: 5
        XpMultiplier: 2
-    CHAINMAIL_CHESTPLATE:
-        RepairMaterial: FIRE
+    ChainChest:
+        ItemId: 303
+        ItemType: ARMOR
+        RepairMaterialId: 51
+        MaximumDurability: 240
+        MinimumQuantity: 8
        XpMultiplier: 2
-    CHAINMAIL_LEGGINGS:
-        RepairMaterial: FIRE
+    ChainLegs:
+        ItemId: 304
+        ItemType: ARMOR
+        RepairMaterialId: 51
+        MaximumDurability: 225
+        MinimumQuantity: 7
        XpMultiplier: 2
-    CHAINMAIL_BOOTS:
-        RepairMaterial: FIRE
+    ChainBoots:
+        ItemId: 305
+        ItemType: ARMOR
+        RepairMaterialId: 51
+        RepairMaterialMetadata: -1
+        MaximumDurability: 195
+        MinimumQuantity: 4
        XpMultiplier: 2
--- a/pom.xml
+++ b/pom.xml
@@ -2,7 +2,7 @@
    <modelVersion>4.0.0</modelVersion>
    <groupId>com.gmail.nossr50.mcMMO</groupId>
    <artifactId>mcMMO</artifactId>
-    <version>1.4.07-dev2</version>
+    <version>1.4.01-dev1</version>
    <name>mcMMO</name>
    <url>https://github.com/mcMMO-Dev/mcMMO</url>
    <issueManagement>
@@ -22,6 +22,38 @@
                    <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>
@@ -100,6 +132,10 @@
            <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>
@@ -113,6 +149,13 @@
            <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>
@@ -122,7 +165,9 @@
        <dependency>
            <groupId>com.turt2live.metrics</groupId>
            <artifactId>MetricsExtension</artifactId>
-            <version>0.0.5-SNAPSHOT</version>
+            <version>0.0.2-SNAPSHOT</version>
+            <type>jar</type>
+            <scope>compile</scope>
        </dependency>
    </dependencies>
    <distributionManagement>
@@ -134,8 +179,4 @@
    <properties>
        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
    </properties>
-    <ciManagement>
-    	<system>Jenkins</system>
-    	<url>ci.mcmmo.org</url>
-    </ciManagement>
 </project>
--- a/src/main/assembly/package.xml
+++ b/src/main/assembly/package.xml
@@ -1,14 +1,14 @@
-<assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0 http://maven.apache.org/xsd/assembly-1.1.0.xsd">
-	<id>bin</id>
-	<includeBaseDirectory>false</includeBaseDirectory>
-	<formats>
-		<format>zip</format>
-	</formats>
-	<files>
-		<file>
-			<source>${project.build.directory}/${artifactId}.jar</source>
-			<outputDirectory>/</outputDirectory>
-			<destName>mcMMO.jar</destName>
-		</file>
-	</files>
+<assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0 http://maven.apache.org/xsd/assembly-1.1.0.xsd">
+	<id>bin</id>
+	<includeBaseDirectory>false</includeBaseDirectory>
+	<formats>
+		<format>zip</format>
+	</formats>
+	<files>
+		<file>
+			<source>${project.build.directory}/${artifactId}.jar</source>
+			<outputDirectory>/</outputDirectory>
+			<destName>mcMMO.jar</destName>
+		</file>
+	</files>
 </assembly>
--- a/src/main/java/com/gmail/nossr50/api/AbilityAPI.java
+++ b/src/main/java/com/gmail/nossr50/api/AbilityAPI.java
@@ -3,81 +3,50 @@ package com.gmail.nossr50.api;
 import org.bukkit.entity.Player;

 import com.gmail.nossr50.datatypes.player.McMMOPlayer;
-import com.gmail.nossr50.datatypes.skills.AbilityType;
+import com.gmail.nossr50.datatypes.skills.SkillType;
+import com.gmail.nossr50.skills.SkillManager;
 import com.gmail.nossr50.util.player.UserManager;

 public final class AbilityAPI {
    private AbilityAPI() {}

    public static boolean berserkEnabled(Player player) {
-        return UserManager.getPlayer(player).getAbilityMode(AbilityType.BERSERK);
+        return UserManager.getPlayer(player).getSkillManager(SkillType.UNARMED).getAbility().getMode();
    }

    public static boolean gigaDrillBreakerEnabled(Player player) {
-        return UserManager.getPlayer(player).getAbilityMode(AbilityType.GIGA_DRILL_BREAKER);
+        return UserManager.getPlayer(player).getSkillManager(SkillType.EXCAVATION).getAbility().getMode();
    }

    public static boolean greenTerraEnabled(Player player) {
-        return UserManager.getPlayer(player).getAbilityMode(AbilityType.GREEN_TERRA);
+        return UserManager.getPlayer(player).getSkillManager(SkillType.HERBALISM).getAbility().getMode();
    }

    public static boolean serratedStrikesEnabled(Player player) {
-        return UserManager.getPlayer(player).getAbilityMode(AbilityType.SERRATED_STRIKES);
+        return UserManager.getPlayer(player).getSkillManager(SkillType.SWORDS).getAbility().getMode();
    }

    public static boolean skullSplitterEnabled(Player player) {
-        return UserManager.getPlayer(player).getAbilityMode(AbilityType.SKULL_SPLITTER);
+        return UserManager.getPlayer(player).getSkillManager(SkillType.AXES).getAbility().getMode();
    }

    public static boolean superBreakerEnabled(Player player) {
-        return UserManager.getPlayer(player).getAbilityMode(AbilityType.SUPER_BREAKER);
+        return UserManager.getPlayer(player).getSkillManager(SkillType.MINING).getAbility().getMode();
    }

    public static boolean treeFellerEnabled(Player player) {
-        return UserManager.getPlayer(player).getAbilityMode(AbilityType.TREE_FELLER);
+        return UserManager.getPlayer(player).getSkillManager(SkillType.WOODCUTTING).getAbility().getMode();
    }

    public static boolean isAnyAbilityEnabled(Player player) {
        McMMOPlayer mcMMOPlayer = UserManager.getPlayer(player);

-        for (AbilityType ability : AbilityType.values()) {
-            if (mcMMOPlayer.getAbilityMode(ability)) {
+        for (SkillManager skillManager : mcMMOPlayer.getSkillManagers().values()) {
+            if (skillManager.getAbility().getMode()) {
                return true;
            }
        }

        return false;
    }
-
-    public static void resetCooldowns(Player player) {
-        UserManager.getPlayer(player).getProfile().resetCooldowns();
-    }
-
-    public static void setBerserkCooldown(Player player, long cooldown) {
-        UserManager.getPlayer(player).getProfile().setSkillDATS(AbilityType.BERSERK, cooldown);
-    }
-
-    public static void setGigaDrillBreakerCooldown(Player player, long cooldown) {
-        UserManager.getPlayer(player).getProfile().setSkillDATS(AbilityType.GIGA_DRILL_BREAKER, cooldown);
-    }
-
-    public static void setGreenTerraCooldown(Player player, long cooldown) {
-        UserManager.getPlayer(player).getProfile().setSkillDATS(AbilityType.GREEN_TERRA, cooldown);
-    }
-
-    public static void setSerratedStrikesCooldown(Player player, long cooldown) {
-        UserManager.getPlayer(player).getProfile().setSkillDATS(AbilityType.SERRATED_STRIKES, cooldown);
-    }
-
-    public static void setSkullSplitterCooldown(Player player, long cooldown) {
-        UserManager.getPlayer(player).getProfile().setSkillDATS(AbilityType.SKULL_SPLITTER, cooldown);
-    }
-
-    public static void setSuperBreakerCooldown(Player player, long cooldown) {
-        UserManager.getPlayer(player).getProfile().setSkillDATS(AbilityType.SUPER_BREAKER, cooldown);
-    }
-
-    public static void setTreeFellerCooldown(Player player, long cooldown) {
-        UserManager.getPlayer(player).getProfile().setSkillDATS(AbilityType.TREE_FELLER, cooldown);
-    }
 }
--- a/src/main/java/com/gmail/nossr50/api/ChatAPI.java
+++ b/src/main/java/com/gmail/nossr50/api/ChatAPI.java
@@ -4,9 +4,6 @@ import org.bukkit.entity.Player;
 import org.bukkit.plugin.Plugin;

 import com.gmail.nossr50.chat.ChatManager;
-import com.gmail.nossr50.chat.ChatManagerFactory;
-import com.gmail.nossr50.chat.PartyChatManager;
-import com.gmail.nossr50.datatypes.chat.ChatMode;
 import com.gmail.nossr50.party.PartyManager;
 import com.gmail.nossr50.util.player.UserManager;

@@ -25,7 +22,7 @@ public final class ChatAPI {
     * @param message The message to send
     */
    public static void sendPartyChat(Plugin plugin, String sender, String displayName, String party, String message) {
-        getPartyChatManager(plugin, party).handleChat(sender, displayName, message);
+        ChatManager.handlePartyChat(plugin, PartyManager.getParty(party), sender, displayName, message);
    }

    /**
@@ -39,7 +36,23 @@ public final class ChatAPI {
     * @param message The message to send
     */
    public static void sendPartyChat(Plugin plugin, String sender, String party, String message) {
-        getPartyChatManager(plugin, party).handleChat(sender, message);
+        ChatManager.handlePartyChat(plugin, PartyManager.getParty(party), sender, sender, message);
+    }
+
+    /**
+     * Send a message to all members of a party
+     * </br>
+     * This function is designed for API usage.
+     *
+     * @deprecated Replaced by sendPartyChat(Plugin, String, String, String)
+     *
+     * @param sender The name of the sender to display in the chat
+     * @param party The name of the party to send to
+     * @param message The message to send
+     */
+    @Deprecated
+    public static void sendPartyChat(String sender, String party, String message) {
+        sendPartyChat(null, party, sender, sender, message);
    }

    /**
@@ -53,7 +66,7 @@ public final class ChatAPI {
     * @param message The message to send
     */
    public static void sendAdminChat(Plugin plugin, String sender, String displayName, String message) {
-        ChatManagerFactory.getChatManager(plugin, ChatMode.ADMIN).handleChat(sender, displayName, message);
+        ChatManager.handleAdminChat(plugin, sender, displayName, message);
    }

    /**
@@ -66,7 +79,22 @@ public final class ChatAPI {
     * @param message The message to send
     */
    public static void sendAdminChat(Plugin plugin, String sender, String message) {
-        ChatManagerFactory.getChatManager(plugin, ChatMode.ADMIN).handleChat(sender, message);
+        ChatManager.handleAdminChat(plugin, sender, sender, message);
+    }
+
+    /**
+     * Send a message to administrators
+     * </br>
+     * This function is designed for API usage.
+     *
+     * @deprecated Replaced by sendAdminChat(Plugin, String, String)
+     *
+     * @param sender The name of the sender to display in the chat
+     * @param message The message to send
+     */
+    @Deprecated
+    public static void sendAdminChat(String sender, String message) {
+        sendAdminChat(null, sender, sender, message);
    }

    /**
@@ -108,47 +136,4 @@ public final class ChatAPI {
    public static boolean isUsingAdminChat(String playerName) {
        return UserManager.getPlayer(playerName).getAdminChatMode();
    }
-
-    /**
-     * Toggle the party chat mode of a player.
-     *
-     * @param player The player to toggle party chat on.
-     */
-    public static void togglePartyChat(Player player) {
-        UserManager.getPlayer(player).togglePartyChat();
-    }
-
-    /**
-     * Toggle the party chat mode of a player.
-     *
-     * @param playerName The name of the player to toggle party chat on.
-     */
-    public static void togglePartyChat(String playerName) {
-        UserManager.getPlayer(playerName).togglePartyChat();
-    }
-
-    /**
-     * Toggle the admin chat mode of a player.
-     *
-     * @param player The player to toggle admin chat on.
-     */
-    public static void toggleAdminChat(Player player) {
-        UserManager.getPlayer(player).toggleAdminChat();
-    }
-
-    /**
-     * Toggle the admin chat mode of a player.
-     *
-     * @param playerName The name of the player to toggle party chat on.
-     */
-    public static void toggleAdminChat(String playerName) {
-        UserManager.getPlayer(playerName).toggleAdminChat();
-    }
-
-    private static ChatManager getPartyChatManager(Plugin plugin, String party) {
-        ChatManager chatManager = ChatManagerFactory.getChatManager(plugin, ChatMode.PARTY);
-        ((PartyChatManager) chatManager).setParty(PartyManager.getParty(party));
-
-        return chatManager;
-    }
 }
--- a/src/main/java/com/gmail/nossr50/api/ExperienceAPI.java
+++ b/src/main/java/com/gmail/nossr50/api/ExperienceAPI.java
@@ -1,56 +1,28 @@
 package com.gmail.nossr50.api;

-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;
 import com.gmail.nossr50.util.player.UserManager;
+import com.gmail.nossr50.util.skills.SkillUtils;

 public final class ExperienceAPI {
    private ExperienceAPI() {}

    /**
-     * Returns whether given string is a valid type of skill suitable for the
-     * other API calls in this class.
+     * Adds raw XP to the player.
     * </br>
     * This function is designed for API usage.
     *
-     * @param skillType A string that may or may not be a skill
-     * @return true if this is a valid mcMMO skill
+     * @param player The player to add XP to
+     * @param skillType The skill to add XP to
+     * @param XP The amount of XP to add
+     * @deprecated Use {@link #addRawXP(Player, String, int)} instead
     */
-    public static boolean isValidSkillType(String skillType) {
-        return SkillType.getSkill(skillType) != null;
-    }
-
-    /**
-     * Returns whether the given skill type string is both valid and not a
-     * child skill. (Child skills have no XP of their own, and their level is
-     * derived from the parent(s).)
-     * </br>
-     * This function is designed for API usage.
-     *
-     * @param skillType the skill to check
-     * @return true if this is a valid, non-child mcMMO skill
-     */
-    public static boolean isNonChildSkill(String skillType) {
-        SkillType skill = SkillType.getSkill(skillType);
-
-        if (skill == null) return false;
-
-        return !skill.isChildSkill();
-    }
-
    @Deprecated
-    public static void addRawXP(Player player, String skillType, int XP) {
-        addRawXP(player, skillType, (float) XP);
+    public static void addRawXP(Player player, SkillType skillType, int XP) {
+        UserManager.getPlayer(player).applyXpGain(skillType, XP);
    }

    /**
@@ -61,32 +33,9 @@ public final class ExperienceAPI {
     * @param player The player to add XP to
     * @param skillType The skill to add XP to
     * @param XP The amount of XP to add
-     *
-     * @throws InvalidSkillException if the given skill is not valid
     */
-    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>
-     * This function is designed for API usage.
-     *
-     * @param playerName The player to add XP to
-     * @param skillType The skill to add XP to
-     * @param XP The amount of XP to add
-     *
-     * @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, float XP) {
-        addOfflineXP(playerName, getSkillType(skillType), (int) Math.floor(XP));
+    public static void addRawXP(Player player, String skillType, int XP) {
+        UserManager.getPlayer(player).applyXpGain(SkillType.getSkill(skillType), XP);
    }

    /**
@@ -97,78 +46,52 @@ public final class ExperienceAPI {
     * @param player The player to add XP to
     * @param skillType The skill to add XP to
     * @param XP The amount of XP to add
+     * @deprecated Use {@link #addMultipliedXP(Player, String, int)} instead
+     */
+    @Deprecated
+    public static void addMultipliedXP(Player player, SkillType skillType, int XP) {
+        UserManager.getPlayer(player).applyXpGain(skillType, (int) (XP * Config.getInstance().getExperienceGainsGlobalMultiplier()));
+    }
+
+    /**
+     * Adds XP to the player, calculates for XP Rate only.
+     * </br>
+     * This function is designed for API usage.
     *
-     * @throws InvalidSkillException if the given skill is not valid
+     * @param player The player to add XP to
+     * @param skillType The skill to add XP to
+     * @param XP The amount of XP to add
     */
    public static void addMultipliedXP(Player player, String skillType, int XP) {
-        UserManager.getPlayer(player).applyXpGain(getSkillType(skillType), (int) (XP * ExperienceConfig.getInstance().getExperienceGainsGlobalMultiplier()));
+        UserManager.getPlayer(player).applyXpGain(SkillType.getSkill(skillType), (int) (XP * Config.getInstance().getExperienceGainsGlobalMultiplier()));
    }

    /**
-     * Adds XP to an offline player, calculates for XP Rate only.
-     * </br>
-     * This function is designed for API usage.
-     *
-     * @param playerName The player to add XP to
-     * @param skillType The skill to add XP to
-     * @param XP The amount of XP to add
-     *
-     * @throws InvalidSkillException if the given skill is not valid
-     * @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 * ExperienceConfig.getInstance().getExperienceGainsGlobalMultiplier()));
-    }
-
-    /**
-     * Adds XP to the player, calculates for XP Rate and skill modifier.
+     * Adds XP to the player, calculates for XP Rate, skill modifiers and perks. May be shared with the party.
     * </br>
     * This function is designed for API usage.
     *
     * @param player The player to add XP to
     * @param skillType The skill to add XP to
     * @param XP The amount of XP to add
-     *
-     * @throws InvalidSkillException if the given skill is not valid
+     * @deprecated Use {@link #addXP(Player, String, int)} instead
     */
-    public static void addModifiedXP(Player player, String skillType, int XP) {
-        SkillType skill = getSkillType(skillType);
-
-        UserManager.getPlayer(player).applyXpGain(skill, (int) (XP / skill.getXpModifier() * ExperienceConfig.getInstance().getExperienceGainsGlobalMultiplier()));
+    @Deprecated
+    public static void addXP(Player player, SkillType skillType, int XP) {
+        UserManager.getPlayer(player).beginXpGain(skillType, XP);
    }

    /**
-     * Adds XP to an offline player, calculates for XP Rate and skill modifier.
-     * </br>
-     * This function is designed for API usage.
-     *
-     * @param playerName The player to add XP to
-     * @param skillType The skill to add XP to
-     * @param XP The amount of XP to add
-     *
-     * @throws InvalidSkillException if the given skill is not valid
-     * @throws InvalidPlayerException if the given player does not exist in the database
-     */
-    public static void addModifiedXPOffline(String playerName, String skillType, int XP) {
-        SkillType skill = getSkillType(skillType);
-
-        addOfflineXP(playerName, skill, (int) (XP / skill.getXpModifier() * ExperienceConfig.getInstance().getExperienceGainsGlobalMultiplier()));
-    }
-
-    /**
-     * Adds XP to the player, calculates for XP Rate, skill modifiers, perks, child skills,
-     * and party sharing.
+     * Adds XP to the player, calculates for XP Rate, skill modifiers and perks. May be shared with the party.
     * </br>
     * This function is designed for API usage.
     *
     * @param player The player to add XP to
     * @param skillType The skill to add XP to
     * @param XP The amount of XP to add
-     *
-     * @throws InvalidSkillException if the given skill is not valid
     */
    public static void addXP(Player player, String skillType, int XP) {
-        UserManager.getPlayer(player).beginXpGain(getSkillType(skillType), XP);
+        UserManager.getPlayer(player).beginXpGain(SkillType.getSkill(skillType), XP);
    }

    /**
@@ -179,136 +102,52 @@ public final class ExperienceAPI {
     * @param player The player to get XP for
     * @param skillType The skill to get XP for
     * @return the amount of XP in a given skill
-     *
-     * @throws InvalidSkillException if the given skill is not valid
-     * @throws UnsupportedOperationException if the given skill is a child skill
+     * @deprecated Use {@link #getXP(Player, String)} instead
     */
-    public static int getXP(Player player, String skillType) {
-        return UserManager.getPlayer(player).getProfile().getSkillXpLevel(getNonChildSkillType(skillType));
+    @Deprecated
+    public static int getXP(Player player, SkillType skillType) {
+        return UserManager.getPlayer(player).getProfile().getSkillXpLevel(skillType);
    }

    /**
-     * Get the amount of XP an offline player has in a specific skill.
-     * </br>
-     * This function is designed for API usage.
-     *
-     * @param playerName The player to get XP for
-     * @param skillType The skill to get XP for
-     * @return the amount of XP in a given skill
-     *
-     * @throws InvalidSkillException if the given skill is not valid
-     * @throws InvalidPlayerException if the given player does not exist in the database
-     * @throws UnsupportedOperationException if the given skill is a child skill
-     */
-    public static int getOfflineXP(String playerName, String skillType) {
-        return getOfflineProfile(playerName).getSkillXpLevel(getNonChildSkillType(skillType));
-    }
-
-    /**
-     * Get the raw amount of XP a player has in a specific skill.
+     * Get the amount of XP a player has in a specific skill.
     * </br>
     * This function is designed for API usage.
     *
     * @param player The player to get XP for
     * @param skillType The skill to get XP for
     * @return the amount of XP in a given skill
-     *
-     * @throws InvalidSkillException if the given skill is not valid
-     * @throws UnsupportedOperationException if the given skill is a child skill
     */
-    public static float getXPRaw(Player player, String skillType) {
-        return UserManager.getPlayer(player).getProfile().getSkillXpLevelRaw(getNonChildSkillType(skillType));
+    public static int getXP(Player player, String skillType) {
+        return UserManager.getPlayer(player).getProfile().getSkillXpLevel(SkillType.getSkill(skillType));
    }

    /**
-     * Get the raw amount of XP an offline player has in a specific skill.
-     * </br>
-     * This function is designed for API usage.
-     *
-     * @param playerName The player to get XP for
-     * @param skillType The skill to get XP for
-     * @return the amount of XP in a given skill
-     *
-     * @throws InvalidSkillException if the given skill is not valid
-     * @throws InvalidPlayerException if the given player does not exist in the database
-     * @throws UnsupportedOperationException if the given skill is a child skill
-     */
-    public static float getOfflineXPRaw(String playerName, String skillType) {
-        return getOfflineProfile(playerName).getSkillXpLevelRaw(getNonChildSkillType(skillType));
-    }
-
-    /**
-     * Get the total amount of XP needed to reach the next level.
+     * Get the amount of XP left before leveling up.
     * </br>
     * This function is designed for API usage.
     *
     * @param player The player to get the XP amount for
     * @param skillType The skill to get the XP amount for
-     * @return the total amount of XP needed to reach the next level
+     * @return the amount of XP left before leveling up a specifc skill
+     * @deprecated Use {@link #getXPToNextLevel(Player, String)} instead
+     */
+    @Deprecated
+    public static int getXPToNextLevel(Player player, SkillType skillType) {
+        return UserManager.getPlayer(player).getProfile().getXpToLevel(skillType);
+    }
+
+    /**
+     * Get the amount of XP left before leveling up.
+     * </br>
+     * This function is designed for API usage.
     *
-     * @throws InvalidSkillException if the given skill is not valid
-     * @throws UnsupportedOperationException if the given skill is a child skill
+     * @param player The player to get the XP amount for
+     * @param skillType The skill to get the XP amount for
+     * @return the amount of XP left before leveling up a specifc skill
     */
    public static int getXPToNextLevel(Player player, String skillType) {
-        return UserManager.getPlayer(player).getProfile().getXpToLevel(getNonChildSkillType(skillType));
-    }
-
-    /**
-     * Get the total amount of XP an offline player needs to reach the next level.
-     * </br>
-     * This function is designed for API usage.
-     *
-     * @param playerName The player to get XP for
-     * @param skillType The skill to get XP for
-     * @return the total amount of XP needed to reach the next level
-     *
-     * @throws InvalidSkillException if the given skill is not valid
-     * @throws InvalidPlayerException if the given player does not exist in the database
-     * @throws UnsupportedOperationException if the given skill is a child skill
-     */
-    public static int getOfflineXPToNextLevel(String playerName, String skillType) {
-        return getOfflineProfile(playerName).getXpToLevel(getNonChildSkillType(skillType));
-    }
-
-    /**
-     * Get the amount of XP remaining until the next level.
-     * </br>
-     * This function is designed for API usage.
-     *
-     * @param player The player to get the XP amount for
-     * @param skillType The skill to get the XP amount for
-     * @return the amount of XP remaining until the next level
-     *
-     * @throws InvalidSkillException if the given skill is not valid
-     * @throws UnsupportedOperationException if the given skill is a child skill
-     */
-    public static int getXPRemaining(Player player, String skillType) {
-        SkillType skill = getNonChildSkillType(skillType);
-
-        PlayerProfile profile = UserManager.getPlayer(player).getProfile();
-
-        return profile.getXpToLevel(skill) - profile.getSkillXpLevel(skill);
-    }
-
-    /**
-     * Get the amount of XP an offline player has left before leveling up.
-     * </br>
-     * This function is designed for API usage.
-     *
-     * @param playerName The player to get XP for
-     * @param skillType The skill to get XP for
-     * @return the amount of XP needed to reach the next level
-     *
-     * @throws InvalidSkillException if the given skill is not valid
-     * @throws InvalidPlayerException if the given player does not exist in the database
-     * @throws UnsupportedOperationException if the given skill is a child skill
-     */
-    public static int getOfflineXPRemaining(String playerName, String skillType) {
-        SkillType skill = getNonChildSkillType(skillType);
-
-        PlayerProfile profile = getOfflineProfile(playerName);
-
-        return profile.getXpToLevel(skill) - profile.getSkillXpLevel(skill);
+        return UserManager.getPlayer(player).getProfile().getXpToLevel(SkillType.getSkill(skillType));
    }

    /**
@@ -319,42 +158,43 @@ public final class ExperienceAPI {
     * @param player The player to add levels to
     * @param skillType Type of skill to add levels to
     * @param levels Number of levels to add
-     *
-     * @throws InvalidSkillException if the given skill is not valid
+     * @param notify Unused argument
+     * @deprecated Use addLevel(Player, SKillType, int) instead
     */
-    public static void addLevel(Player player, String skillType, int levels) {
-        UserManager.getPlayer(player).getProfile().addLevels(getSkillType(skillType), levels);
+    public static void addLevel(Player player, SkillType skillType, int levels, boolean notify) {
+        UserManager.getProfile(player).addLevels(skillType, levels);
+
+        if (notify) {
+            checkXP(player, skillType);
+        }
    }

    /**
-     * Add levels to a skill for an offline player.
+     * Add levels to a skill.
     * </br>
     * This function is designed for API usage.
     *
-     * @param playerName The player to add levels to
+     * @param player The player to add levels to
     * @param skillType Type of skill to add levels to
     * @param levels Number of levels to add
-     *
-     * @throws InvalidSkillException if the given skill is not valid
-     * @throws InvalidPlayerException if the given player does not exist in the database
+     * @deprecated Use {@link #addLevel(Player, String, int)} instead
     */
-    public static void addLevelOffline(String playerName, String skillType, int levels) {
-        PlayerProfile profile = getOfflineProfile(playerName);
-        SkillType skill = getSkillType(skillType);
+    @Deprecated
+    public static void addLevel(Player player, SkillType skillType, int levels) {
+        UserManager.getPlayer(player).getProfile().addLevels(skillType, levels);
+    }

-        if (skill.isChildSkill()) {
-            Set<SkillType> parentSkills = FamilyTree.getParents(skill);
-
-            for (SkillType parentSkill : parentSkills) {
-                profile.addLevels(parentSkill, (levels / parentSkills.size()));
-            }
-
-            profile.save();
-            return;
-        }
-
-        profile.addLevels(skill, levels);
-        profile.save();
+    /**
+     * Add levels to a skill.
+     * </br>
+     * This function is designed for API usage.
+     *
+     * @param player The player to add levels to
+     * @param skillType Type of skill to add levels to
+     * @param levels Number of levels to add
+     */
+    public static void addLevel(Player player, String skillType, int levels) {
+        UserManager.getPlayer(player).getProfile().addLevels(SkillType.getSkill(skillType), levels);
    }

    /**
@@ -365,27 +205,24 @@ public final class ExperienceAPI {
     * @param player The player to get the level for
     * @param skillType The skill to get the level for
     * @return the level of a given skill
-     *
-     * @throws InvalidSkillException if the given skill is not valid
+     * @deprecated Use {@link #getLevel(Player, String)} instead
     */
-    public static int getLevel(Player player, String skillType) {
-        return UserManager.getPlayer(player).getProfile().getSkillLevel(getSkillType(skillType));
+    @Deprecated
+    public static int getLevel(Player player, SkillType skillType) {
+        return UserManager.getPlayer(player).getProfile().getSkillLevel(skillType);
    }

    /**
-     * Get the level an offline player has in a specific skill.
+     * Get the level a player has in a specific skill.
     * </br>
     * This function is designed for API usage.
     *
-     * @param playerName The player to get the level for
+     * @param player The player to get the level for
     * @param skillType The skill to get the level for
     * @return the level of a given skill
-     *
-     * @throws InvalidSkillException if the given skill is not valid
-     * @throws InvalidPlayerException if the given player does not exist in the database
     */
-    public static int getLevelOffline(String playerName, String skillType) {
-        return getOfflineProfile(playerName).getSkillLevel(getSkillType(skillType));
+    public static int getLevel(Player player, String skillType) {
+        return UserManager.getPlayer(player).getProfile().getSkillLevel(SkillType.getSkill(skillType));
    }

    /**
@@ -401,83 +238,18 @@ public final class ExperienceAPI {
    }

    /**
-     * Gets the power level of an offline player.
+     * Sets the level of a player in a specific skill type.
     * </br>
     * This function is designed for API usage.
     *
-     * @param playerName The player to get the power level for
-     * @return the power level of the player
-     *
-     * @throws InvalidPlayerException if the given player does not exist in the database
+     * @param player The player to set the level of
+     * @param skillType The skill to set the level for
+     * @param skillLevel The value to set the level to
+     * @deprecated Use {@link #setLevel(Player, String, int)} instead
     */
-    public static int getPowerLevelOffline(String playerName) {
-        int powerLevel = 0;
-        PlayerProfile profile = getOfflineProfile(playerName);
-
-        for (SkillType type : SkillType.nonChildSkills()) {
-            powerLevel += profile.getSkillLevel(type);
-        }
-
-        return powerLevel;
-    }
-
-    /**
-     * Get the level cap of a specific skill.
-     * </br>
-     * This function is designed for API usage.
-     *
-     * @param skillType The skill to get the level cap for
-     * @return the level cap of a given skill
-     *
-     * @throws InvalidSkillException if the given skill is not valid
-     */
-    public static int getLevelCap(String skillType) {
-        return Config.getInstance().getLevelCap(getSkillType(skillType));
-    }
-
-    /**
-     * Get the power level cap.
-     * </br>
-     * This function is designed for API usage.
-     *
-     * @return the overall power level cap
-     */
-    public static int getPowerLevelCap() {
-        return Config.getInstance().getPowerLevelCap();
-    }
-
-    /**
-     * Get the position on the leaderboard of a player.
-     * </br>
-     * This function is designed for API usage.
-     *
-     * @param playerName The name of the player to check
-     * @param skillType The skill to check
-     *
-     * @throws InvalidSkillException if the given skill is not valid
-     * @throws InvalidPlayerException if the given player does not exist in the database
-     * @throws UnsupportedOperationException if the given skill is a child skill
-     *
-     * @return the position on the leaderboard
-     */
-    public static int getPlayerRankSkill(String playerName, String skillType) {
-        return mcMMO.getDatabaseManager().readRank(getOfflineProfile(playerName).getPlayerName()).get(getNonChildSkillType(skillType).toString());
-    }
-
-
-    /**
-     * Get the position on the power level leaderboard of a player.
-     * </br>
-     * This function is designed for API usage.
-     *
-     * @param playerName The name of the player to check
-     *
-     * @throws InvalidPlayerException if the given player does not exist in the database
-     *
-     * @return the position on the power level leaderboard
-     */
-    public static int getPlayerRankOverall(String playerName) {
-        return mcMMO.getDatabaseManager().readRank(getOfflineProfile(playerName).getPlayerName()).get("ALL");
+    @Deprecated
+    public static void setLevel(Player player, SkillType skillType, int skillLevel) {
+        UserManager.getPlayer(player).getProfile().modifySkill(skillType, skillLevel);
    }

    /**
@@ -488,27 +260,9 @@ public final class ExperienceAPI {
     * @param player The player to set the level of
     * @param skillType The skill to set the level for
     * @param skillLevel The value to set the level to
-     *
-     * @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);
-    }
-
-    /**
-     * Sets the level of an offline player in a specific skill type.
-     * </br>
-     * This function is designed for API usage.
-     *
-     * @param playerName The player to set the level of
-     * @param skillType The skill to set the level for
-     * @param skillLevel The value to set the level to
-     *
-     * @throws InvalidSkillException if the given skill is not valid
-     * @throws InvalidPlayerException if the given player does not exist in the database
-     */
-    public static void setLevelOffline(String playerName, String skillType, int skillLevel) {
-        getOfflineProfile(playerName).modifySkill(getSkillType(skillType), skillLevel);
+        UserManager.getPlayer(player).getProfile().modifySkill(SkillType.getSkill(skillType), skillLevel);
    }

    /**
@@ -519,29 +273,24 @@ public final class ExperienceAPI {
     * @param player The player to set the XP of
     * @param skillType The skill to set the XP for
     * @param newValue The value to set the XP to
-     *
-     * @throws InvalidSkillException if the given skill is not valid
-     * @throws UnsupportedOperationException if the given skill is a child skill
+     * @deprecated Use {@link #setXP(Player, String, int)} instead
     */
-    public static void setXP(Player player, String skillType, int newValue) {
-        UserManager.getPlayer(player).getProfile().setSkillXpLevel(getNonChildSkillType(skillType), newValue);
+    @Deprecated
+    public static void setXP(Player player, SkillType skillType, int newValue) {
+        UserManager.getPlayer(player).getProfile().setSkillXpLevel(skillType, newValue);
    }

    /**
-     * Sets the XP of an offline player in a specific skill type.
+     * Sets the XP of a player in a specific skill type.
     * </br>
     * This function is designed for API usage.
     *
-     * @param playerName The player to set the XP of
+     * @param player The player to set the XP of
     * @param skillType The skill to set the XP for
     * @param newValue The value to set the XP to
-     *
-     * @throws InvalidSkillException if the given skill is not valid
-     * @throws InvalidPlayerException if the given player does not exist in the database
-     * @throws UnsupportedOperationException if the given skill is a child skill
     */
-    public static void setXPOffline(String playerName, String skillType, int newValue) {
-        getOfflineProfile(playerName).setSkillXpLevel(getNonChildSkillType(skillType), newValue);
+    public static void setXP(Player player, String skillType, int newValue) {
+        UserManager.getPlayer(player).getProfile().setSkillXpLevel(SkillType.getSkill(skillType), newValue);
    }

    /**
@@ -552,78 +301,35 @@ public final class ExperienceAPI {
     * @param player The player to change the XP of
     * @param skillType The skill to change the XP for
     * @param xp The amount of XP to remove
-     *
-     * @throws InvalidSkillException if the given skill is not valid
-     * @throws UnsupportedOperationException if the given skill is a child skill
+     * @deprecated Use {@link #removeXP(Player, String, int)} instead
     */
-    public static void removeXP(Player player, String skillType, int xp) {
-        UserManager.getPlayer(player).getProfile().removeXp(getNonChildSkillType(skillType), xp);
+    @Deprecated
+    public static void removeXP(Player player, SkillType skillType, int xp) {
+        UserManager.getPlayer(player).getProfile().removeXp(skillType, xp);
    }

    /**
-     * Removes XP from an offline player in a specific skill type.
+     * Removes XP from a player in a specific skill type.
     * </br>
     * This function is designed for API usage.
     *
-     * @param playerName The player to change the XP of
+     * @param player The player to change the XP of
     * @param skillType The skill to change the XP for
     * @param xp The amount of XP to remove
-     *
-     * @throws InvalidSkillException if the given skill is not valid
-     * @throws InvalidPlayerException if the given player does not exist in the database
-     * @throws UnsupportedOperationException if the given skill is a child skill
     */
-    public static void removeXPOffline(String playerName, String skillType, int xp) {
-        getOfflineProfile(playerName).removeXp(getNonChildSkillType(skillType), xp);
+    public static void removeXP(Player player, String skillType, int xp) {
+        UserManager.getPlayer(player).getProfile().removeXp(SkillType.getSkill(skillType), xp);
    }

-    // Utility methods follow.
-
-    private static void addOfflineXP(String playerName, SkillType skill, int XP) {
-        PlayerProfile profile = getOfflineProfile(playerName);
-
-        if (skill.isChildSkill()) {
-            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 = mcMMO.getDatabaseManager().loadPlayerProfile(playerName, false);
-
-        if (!profile.isLoaded()) {
-            throw new InvalidPlayerException();
-        }
-
-        return profile;
-    }
-
-    private static SkillType getSkillType(String skillType) throws InvalidSkillException {
-        SkillType skill = SkillType.getSkill(skillType);
-
-        if (skill == null) {
-            throw new InvalidSkillException();
-        }
-
-        return skill;
-    }
-
-    private static SkillType getNonChildSkillType(String skillType) throws InvalidSkillException, UnsupportedOperationException {
-        SkillType skill = getSkillType(skillType);
-
-        if (skill.isChildSkill()) {
-            throw new UnsupportedOperationException("Child skills do not have XP");
-        }
-
-        return skill;
+    /**
+     * Check the XP of a player. This should be called after giving XP to process level-ups.
+     *
+     * @param player The player to check
+     * @param skillType The skill to check
+     * @deprecated Calling this function is no longer needed and should be avoided
+     */
+    @Deprecated
+    private static void checkXP(Player player, SkillType skillType) {
+        SkillUtils.xpCheckSkill(skillType, player, UserManager.getProfile(player));
    }
 }
--- a/src/main/java/com/gmail/nossr50/api/PartyAPI.java
+++ b/src/main/java/com/gmail/nossr50/api/PartyAPI.java
@@ -1,13 +1,11 @@
 package com.gmail.nossr50.api;

 import java.util.ArrayList;
-import java.util.LinkedHashSet;
 import java.util.List;

 import org.bukkit.OfflinePlayer;
 import org.bukkit.entity.Player;

-import com.gmail.nossr50.mcMMO;
 import com.gmail.nossr50.datatypes.party.Party;
 import com.gmail.nossr50.party.PartyManager;
 import com.gmail.nossr50.util.player.UserManager;
@@ -21,13 +19,9 @@ public final class PartyAPI {
     * This function is designed for API usage.
     *
     * @param player The player to check the party name of
-     * @return the name of the player's party, or null if not in a party
+     * @return the name of the player's party
     */
    public static String getPartyName(Player player) {
-        if (!inParty(player)) {
-            return null;
-        }
-
        return UserManager.getPlayer(player).getParty().getName();
    }

@@ -79,10 +73,12 @@ public final class PartyAPI {
        Party party = PartyManager.getParty(partyName);

        if (party == null) {
-            party = new Party(player.getName(), partyName);
+            party = new Party();
+            party.setName(partyName);
+            party.setLeader(player.getName());
        }

-        PartyManager.addToParty(UserManager.getPlayer(player), party);
+        PartyManager.addToParty(player, UserManager.getPlayer(player), party);
    }

    /**
@@ -93,7 +89,7 @@ public final class PartyAPI {
     * @param player The player to remove
     */
    public static void removeFromParty(Player player) {
-        PartyManager.removeFromParty(UserManager.getPlayer(player));
+        PartyManager.removeFromParty(player, UserManager.getPlayer(player).getParty());
    }

    /**
@@ -127,27 +123,28 @@ public final class PartyAPI {
     *
     * @param player The player to check
     * @return all the players in the player's party
+     * @deprecated
     */
    @Deprecated
-    public static List<OfflinePlayer> getOnlineAndOfflineMembers(Player player) {
-        List<OfflinePlayer> members = new ArrayList<OfflinePlayer>();
+    public static List<String> getAllMembers(Player player) {
+        List<String> memberNames = new ArrayList<String>();

-        for (String memberName : PartyManager.getAllMembers(player)) {
-            OfflinePlayer member = mcMMO.p.getServer().getOfflinePlayer(memberName);
-            members.add(member);
+        for (OfflinePlayer member : PartyManager.getAllMembers(player)) {
+            memberNames.add(member.getName());
        }
-        return members;
+
+        return memberNames;
    }

    /**
-     * Get a list of all player names in this player's party.
+     * Get a list of all players in this player's party.
     * </br>
     * This function is designed for API usage.
     *
     * @param player The player to check
-     * @return all the player names in the player's party
+     * @return all the players in the player's party
     */
-    public static LinkedHashSet<String> getMembers(Player player) {
+    public static List<OfflinePlayer> getOnlineAndOfflineMembers(Player player) {
        return PartyManager.getAllMembers(player);
    }

--- a/src/main/java/com/gmail/nossr50/api/SpoutHudAPI.java
+++ b/src/main/java/com/gmail/nossr50/api/SpoutHudAPI.java
@@ -0,0 +1,29 @@
+package com.gmail.nossr50.api;
+
+import org.bukkit.entity.Player;
+
+import com.gmail.nossr50.config.spout.SpoutConfig;
+import com.gmail.nossr50.datatypes.spout.huds.HudType;
+import com.gmail.nossr50.util.player.UserManager;
+
+public class SpoutHudAPI {
+    private SpoutHudAPI() {}
+
+    /**
+     * Disable the mcMMO XP bar for a player.
+     * </br>
+     * This function is designed for API usage.
+     */
+    public static void disableXpBar(Player player) {
+        UserManager.getPlayer(player).getProfile().setHudType(HudType.DISABLED);
+    }
+
+    /**
+     * Disable the mcMMO XP bar for the server.
+     * </br>
+     * This function is designed for API usage.
+     */
+    public static void disableXpBar() {
+        SpoutConfig.getInstance().setXPBarEnabled(false);
+    }
+}
--- a/src/main/java/com/gmail/nossr50/api/SpoutToolsAPI.java
+++ b/src/main/java/com/gmail/nossr50/api/SpoutToolsAPI.java
@@ -0,0 +1,53 @@
+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;
+        }
+    }
+}
--- a/src/main/java/com/gmail/nossr50/api/exceptions/InvalidPlayerException.java
+++ b/src/main/java/com/gmail/nossr50/api/exceptions/InvalidPlayerException.java
@@ -1,9 +0,0 @@
-package com.gmail.nossr50.api.exceptions;
-
-public class InvalidPlayerException extends RuntimeException {
-    private static final long serialVersionUID = 907213002618581385L;
-
-    public InvalidPlayerException() {
-        super("That player does not exist in the database.");
-    }
-}
--- a/src/main/java/com/gmail/nossr50/api/exceptions/InvalidSkillException.java
+++ b/src/main/java/com/gmail/nossr50/api/exceptions/InvalidSkillException.java
@@ -1,9 +0,0 @@
-package com.gmail.nossr50.api.exceptions;
-
-public class InvalidSkillException extends RuntimeException {
-    private static final long serialVersionUID = 942705284195791157L;
-
-    public InvalidSkillException() {
-        super("That is not a valid skill.");
-    }
-}
--- a/src/main/java/com/gmail/nossr50/chat/AdminChatManager.java
+++ b/src/main/java/com/gmail/nossr50/chat/AdminChatManager.java
@@ -1,22 +0,0 @@
-package com.gmail.nossr50.chat;
-
-import org.bukkit.plugin.Plugin;
-
-import com.gmail.nossr50.config.Config;
-import com.gmail.nossr50.events.chat.McMMOAdminChatEvent;
-
-public class AdminChatManager extends ChatManager {
-    protected AdminChatManager(Plugin plugin) {
-        super(plugin, Config.getInstance().getAdminDisplayNames(), Config.getInstance().getAdminChatPrefix());
-    }
-
-    @Override
-    public void handleChat(String senderName, String displayName, String message, boolean isAsync) {
-        handleChat(new McMMOAdminChatEvent(plugin, senderName, displayName, message, isAsync));
-    }
-
-    @Override
-    protected void sendMessage() {
-        plugin.getServer().broadcast(message, "mcmmo.chat.adminchat");
-    }
-}
--- a/src/main/java/com/gmail/nossr50/chat/ChatManager.java
+++ b/src/main/java/com/gmail/nossr50/chat/ChatManager.java
@@ -1,53 +1,78 @@
 package com.gmail.nossr50.chat;

+import org.bukkit.ChatColor;
 import org.bukkit.entity.Player;
 import org.bukkit.plugin.Plugin;

-import com.gmail.nossr50.events.chat.McMMOChatEvent;
+import com.gmail.nossr50.mcMMO;
+import com.gmail.nossr50.config.Config;
+import com.gmail.nossr50.datatypes.party.Party;
+import com.gmail.nossr50.events.chat.McMMOAdminChatEvent;
+import com.gmail.nossr50.events.chat.McMMOPartyChatEvent;
 import com.gmail.nossr50.locale.LocaleLoader;

-public abstract class ChatManager {
-    protected Plugin plugin;
-    protected boolean useDisplayNames;
-    protected String chatPrefix;
+public final class ChatManager {
+    public ChatManager () {}

-    protected String senderName;
-    protected String displayName;
-    protected String message;
+    public static void handleAdminChat(Plugin plugin, String playerName, String displayName, String message, boolean isAsync) {
+        McMMOAdminChatEvent chatEvent = new McMMOAdminChatEvent(plugin, playerName, displayName, message, isAsync);
+        mcMMO.p.getServer().getPluginManager().callEvent(chatEvent);

-    protected ChatManager(Plugin plugin, boolean useDisplayNames, String chatPrefix) {
-        this.plugin = plugin;
-        this.useDisplayNames = useDisplayNames;
-        this.chatPrefix = chatPrefix;
-    }
-
-    protected void handleChat(McMMOChatEvent event) {
-        plugin.getServer().getPluginManager().callEvent(event);
-
-        if (event.isCancelled()) {
+        if (chatEvent.isCancelled()) {
            return;
        }

-        senderName = event.getSender();
-        displayName = useDisplayNames ? event.getDisplayName() : senderName;
-        message = LocaleLoader.formatString(chatPrefix, displayName) + " " + event.getMessage();
+        if (Config.getInstance().getAdminDisplayNames()) {
+            displayName = chatEvent.getDisplayName();
+        }
+        else {
+            displayName = chatEvent.getSender();
+        }

-        sendMessage();
+        String adminMessage = chatEvent.getMessage();
+
+        mcMMO.p.getServer().broadcast(LocaleLoader.getString("Commands.AdminChat.Prefix", displayName) + adminMessage, "mcmmo.chat.adminchat");
    }

-    public void handleChat(String senderName, String message) {
-        handleChat(senderName, senderName, message, false);
+    public static void handleAdminChat(Plugin plugin, String senderName, String message) {
+        handleAdminChat(plugin, senderName, senderName, message);
    }

-    public void handleChat(Player player, String message, boolean isAsync) {
-        handleChat(player.getName(), player.getDisplayName(), message, isAsync);
+    public static void handleAdminChat(Plugin plugin, String playerName, String displayName, String message) {
+        handleAdminChat(plugin, playerName, displayName, message, false);
    }

-    public void handleChat(String senderName, String displayName, String message) {
-        handleChat(senderName, displayName, message, false);
+    public static void handlePartyChat(Plugin plugin, Party party, String playerName, String displayName, String message, boolean isAsync) {
+        String partyName = party.getName();
+
+        McMMOPartyChatEvent chatEvent = new McMMOPartyChatEvent(plugin, playerName, displayName, partyName, message, isAsync);
+        mcMMO.p.getServer().getPluginManager().callEvent(chatEvent);
+
+        if (chatEvent.isCancelled()) {
+            return;
+        }
+
+        if (Config.getInstance().getPartyDisplayNames()) {
+            displayName = chatEvent.getDisplayName();
+        }
+        else {
+            displayName = chatEvent.getSender();
+        }
+
+        String partyMessage = chatEvent.getMessage();
+
+        for (Player member : party.getOnlineMembers()) {
+            member.sendMessage(LocaleLoader.getString("Commands.Party.Chat.Prefix", displayName) + partyMessage);
+        }
+
+        mcMMO.p.getLogger().info("[P](" + partyName + ")" + "<" + ChatColor.stripColor(displayName) + "> " + partyMessage);
    }

-    public abstract void handleChat(String senderName, String displayName, String message, boolean isAsync);
+    public static void handlePartyChat(Plugin plugin, Party party, String senderName, String message) {
+        handlePartyChat(plugin, party, senderName, senderName, message);
+    }

-    protected abstract void sendMessage();
+    public static void handlePartyChat(Plugin plugin, Party party, String playerName, String displayName, String message) {
+        handlePartyChat(plugin, party, playerName, displayName, message, false);
+    }
 }
--- a/src/main/java/com/gmail/nossr50/chat/ChatManagerFactory.java
+++ b/src/main/java/com/gmail/nossr50/chat/ChatManagerFactory.java
@@ -1,31 +0,0 @@
-package com.gmail.nossr50.chat;
-
-import java.util.HashMap;
-
-import org.bukkit.plugin.Plugin;
-
-import com.gmail.nossr50.datatypes.chat.ChatMode;
-
-public class ChatManagerFactory {
-    private static final HashMap<Plugin, AdminChatManager> adminChatManagers = new HashMap<Plugin, AdminChatManager>();
-    private static final HashMap<Plugin, PartyChatManager> partyChatManagers = new HashMap<Plugin, PartyChatManager>();
-
-    public static ChatManager getChatManager(Plugin plugin, ChatMode mode) {
-        switch (mode) {
-            case ADMIN:
-                if (!adminChatManagers.containsKey(plugin)) {
-                    adminChatManagers.put(plugin, new AdminChatManager(plugin));
-                }
-
-                return adminChatManagers.get(plugin);
-            case PARTY:
-                if (!partyChatManagers.containsKey(plugin)) {
-                    partyChatManagers.put(plugin, new PartyChatManager(plugin));
-                }
-
-                return partyChatManagers.get(plugin);
-            default:
-                return null;
-        }
-    }
-}
--- a/src/main/java/com/gmail/nossr50/datatypes/chat/ChatMode.java
+++ b/src/main/java/com/gmail/nossr50/datatypes/chat/ChatMode.java
@@ -1,4 +1,4 @@
-package com.gmail.nossr50.datatypes.chat;
+package com.gmail.nossr50.chat;

 import com.gmail.nossr50.datatypes.player.McMMOPlayer;
 import com.gmail.nossr50.locale.LocaleLoader;
--- a/src/main/java/com/gmail/nossr50/chat/PartyChatManager.java
+++ b/src/main/java/com/gmail/nossr50/chat/PartyChatManager.java
@@ -1,39 +0,0 @@
-package com.gmail.nossr50.chat;
-
-import org.bukkit.ChatColor;
-import org.bukkit.entity.Player;
-import org.bukkit.plugin.Plugin;
-
-import com.gmail.nossr50.config.Config;
-import com.gmail.nossr50.datatypes.party.Party;
-import com.gmail.nossr50.events.chat.McMMOPartyChatEvent;
-
-public class PartyChatManager extends ChatManager {
-    private Party party;
-
-    protected PartyChatManager(Plugin plugin) {
-        super(plugin, Config.getInstance().getPartyDisplayNames(), Config.getInstance().getPartyChatPrefix());
-    }
-
-    public void setParty(Party party) {
-        this.party = party;
-    }
-
-    @Override
-    public void handleChat(String senderName, String displayName, String message, boolean isAsync) {
-        handleChat(new McMMOPartyChatEvent(plugin, senderName, displayName, party.getName(), message, isAsync));
-    }
-
-    @Override
-    protected void sendMessage() {
-        if (Config.getInstance().getPartyChatColorLeaderName() && senderName.equalsIgnoreCase(party.getLeader())) {
-            message = message.replaceAll(displayName, ChatColor.GOLD + displayName + ChatColor.RESET);
-        }
-
-        for (Player member : party.getOnlineMembers()) {
-            member.sendMessage(message);
-        }
-
-        plugin.getLogger().info("[P]<" + party.getName() + ">" + message);
-    }
-}
--- a/src/main/java/com/gmail/nossr50/commands/KrakenCommand.java
+++ b/src/main/java/com/gmail/nossr50/commands/KrakenCommand.java
@@ -1,69 +0,0 @@
-package com.gmail.nossr50.commands;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Set;
-
-import org.bukkit.command.Command;
-import org.bukkit.command.CommandSender;
-import org.bukkit.command.TabExecutor;
-import org.bukkit.entity.Player;
-import org.bukkit.util.StringUtil;
-
-import com.gmail.nossr50.datatypes.player.McMMOPlayer;
-import com.gmail.nossr50.util.Misc;
-import com.gmail.nossr50.util.Permissions;
-import com.gmail.nossr50.util.commands.CommandUtils;
-import com.gmail.nossr50.util.player.UserManager;
-
-import com.google.common.collect.ImmutableList;
-
-public class KrakenCommand implements TabExecutor {
-    @Override
-    public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
-        switch (args.length) {
-            case 0:
-                if (CommandUtils.noConsoleUsage(sender)) {
-                    return true;
-                }
-
-                if (!Permissions.kraken(sender)) {
-                    sender.sendMessage(command.getPermissionMessage());
-                    return true;
-                }
-
-                UserManager.getPlayer((Player) sender).getFishingManager().unleashTheKraken();
-                return true;
-
-            case 1:
-                if (!Permissions.krakenOthers(sender)) {
-                    sender.sendMessage(command.getPermissionMessage());
-                    return true;
-                }
-
-                String playerName = Misc.getMatchedPlayerName(args[0]);
-                McMMOPlayer mcMMOPlayer = UserManager.getPlayer(playerName);
-
-                if (!CommandUtils.checkPlayerExistence(sender, playerName, mcMMOPlayer)) {
-                    return true;
-                }
-
-                mcMMOPlayer.getFishingManager().unleashTheKraken();
-                return true;
-
-            default:
-                return false;
-        }
-    }
-
-    @Override
-    public List<String> onTabComplete(CommandSender sender, Command command, String alias, String[] args) {
-        switch (args.length) {
-            case 1:
-                Set<String> playerNames = UserManager.getPlayerNames();
-                return StringUtil.copyPartialMatches(args[0], playerNames, new ArrayList<String>(playerNames.size()));
-            default:
-                return ImmutableList.of();
-        }
-    }
-}
--- a/src/main/java/com/gmail/nossr50/commands/McabilityCommand.java
+++ b/src/main/java/com/gmail/nossr50/commands/McabilityCommand.java
@@ -1,29 +1,79 @@
 package com.gmail.nossr50.commands;

+import org.bukkit.command.Command;
+import org.bukkit.command.CommandExecutor;
 import org.bukkit.command.CommandSender;
+import org.bukkit.entity.Player;

+import com.gmail.nossr50.datatypes.player.McMMOPlayer;
+import com.gmail.nossr50.datatypes.player.PlayerProfile;
 import com.gmail.nossr50.locale.LocaleLoader;
 import com.gmail.nossr50.util.Permissions;
+import com.gmail.nossr50.util.player.UserManager;

-public class McabilityCommand extends ToggleCommand {
+public class McabilityCommand implements CommandExecutor {
    @Override
-    protected boolean hasOtherPermission(CommandSender sender) {
-        return Permissions.mcabilityOthers(sender);
-    }
+    public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
+        McMMOPlayer mcMMOPlayer;

-    @Override
-    protected boolean hasSelfPermission(CommandSender sender) {
-        return Permissions.mcability(sender);
-    }
+        switch (args.length) {
+            case 0:
+                if (!Permissions.mcability(sender)) {
+                    sender.sendMessage(command.getPermissionMessage());
+                    return true;
+                }

-    @Override
-    protected void applyCommandAction() {
-        player.sendMessage(LocaleLoader.getString("Commands.Ability." + (mcMMOPlayer.getAbilityUse() ? "Off" : "On")));
-        mcMMOPlayer.toggleAbilityUse();
-    }
+                mcMMOPlayer = UserManager.getPlayer((Player) sender);

-    @Override
-    protected void sendSuccessMessage(CommandSender sender) {
-        sender.sendMessage("Ability use has been toggled for " + player.getName()); // TODO: Localize
+                if (mcMMOPlayer.getAbilityUse()) {
+                    sender.sendMessage(LocaleLoader.getString("Commands.Ability.Off"));
+                }
+                else {
+                    sender.sendMessage(LocaleLoader.getString("Commands.Ability.On"));
+                }
+
+                mcMMOPlayer.toggleAbilityUse();
+                return true;
+
+            case 1:
+                if (!Permissions.mcabilityOthers(sender)) {
+                    sender.sendMessage(command.getPermissionMessage());
+                    return true;
+                }
+
+                mcMMOPlayer = UserManager.getPlayer(args[0]);
+
+                if (mcMMOPlayer == null) {
+                    PlayerProfile playerProfile = new PlayerProfile(args[0], false);
+
+                    if (!playerProfile.isLoaded()) {
+                        sender.sendMessage(LocaleLoader.getString("Commands.DoesNotExist"));
+                        return true;
+                    }
+
+                    sender.sendMessage(LocaleLoader.getString("Commands.Offline"));
+                    return true;
+                }
+
+                Player player = mcMMOPlayer.getPlayer();
+
+                if (!player.isOnline()) {
+                    sender.sendMessage(LocaleLoader.getString("Commands.Offline"));
+                    return true;
+                }
+
+                if (mcMMOPlayer.getAbilityUse()) {
+                    player.sendMessage(LocaleLoader.getString("Commands.Ability.Off"));
+                }
+                else {
+                    player.sendMessage(LocaleLoader.getString("Commands.Ability.On"));
+                }
+
+                mcMMOPlayer.toggleAbilityUse();
+                return true;
+
+            default:
+                return false;
+        }
    }
 }
--- a/src/main/java/com/gmail/nossr50/commands/McgodCommand.java
+++ b/src/main/java/com/gmail/nossr50/commands/McgodCommand.java
@@ -1,29 +1,88 @@
 package com.gmail.nossr50.commands;

+import org.bukkit.command.Command;
+import org.bukkit.command.CommandExecutor;
 import org.bukkit.command.CommandSender;
+import org.bukkit.entity.Player;

+import com.gmail.nossr50.datatypes.player.McMMOPlayer;
+import com.gmail.nossr50.datatypes.player.PlayerProfile;
 import com.gmail.nossr50.locale.LocaleLoader;
 import com.gmail.nossr50.util.Permissions;
+import com.gmail.nossr50.util.player.UserManager;

-public class McgodCommand extends ToggleCommand {
+public class McgodCommand implements CommandExecutor {
    @Override
-    protected boolean hasOtherPermission(CommandSender sender) {
-        return Permissions.mcgodOthers(sender);
-    }
+    public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
+        McMMOPlayer mcMMOPlayer;

-    @Override
-    protected boolean hasSelfPermission(CommandSender sender) {
-        return Permissions.mcgod(sender);
-    }
+        switch (args.length) {
+            case 0:
+                if (!Permissions.mcgod(sender)) {
+                    sender.sendMessage(command.getPermissionMessage());
+                    return true;
+                }

-    @Override
-    protected void applyCommandAction() {
-        player.sendMessage(LocaleLoader.getString("Commands.GodMode." + (mcMMOPlayer.getGodMode() ? "Disabled" : "Enabled")));
-        mcMMOPlayer.toggleGodMode();
-    }
+                if (!(sender instanceof Player)) {
+                    return false;
+                }

-    @Override
-    protected void sendSuccessMessage(CommandSender sender) {
-        sender.sendMessage("God mode has been toggled for " + player.getName()); // TODO: Localize
+                mcMMOPlayer = UserManager.getPlayer((Player) sender);
+
+                if (mcMMOPlayer == null) {
+                    sender.sendMessage(LocaleLoader.getString("Commands.DoesNotExist"));
+                    return true;
+                }
+
+                if (mcMMOPlayer.getGodMode()) {
+                    sender.sendMessage(LocaleLoader.getString("Commands.GodMode.Disabled"));
+                }
+                else {
+                    sender.sendMessage(LocaleLoader.getString("Commands.GodMode.Enabled"));
+                }
+
+                mcMMOPlayer.toggleGodMode();
+                return true;
+
+            case 1:
+                if (!Permissions.mcgodOthers(sender)) {
+                    sender.sendMessage(command.getPermissionMessage());
+                    return true;
+                }
+
+                mcMMOPlayer = UserManager.getPlayer(args[0]);
+
+                if (mcMMOPlayer == null) {
+                    PlayerProfile playerProfile = new PlayerProfile(args[0], false);
+
+                    if (!playerProfile.isLoaded()) {
+                        sender.sendMessage(LocaleLoader.getString("Commands.DoesNotExist"));
+                        return true;
+                    }
+
+                    sender.sendMessage(LocaleLoader.getString("Commands.Offline"));
+                    return true;
+                }
+
+                Player player = mcMMOPlayer.getPlayer();
+
+                if (!player.isOnline()) {
+                    sender.sendMessage(LocaleLoader.getString("Commands.Offline"));
+                    return true;
+                }
+
+                if (mcMMOPlayer.getGodMode()) {
+                    player.sendMessage(LocaleLoader.getString("Commands.GodMode.Disabled"));
+                }
+                else {
+                    player.sendMessage(LocaleLoader.getString("Commands.GodMode.Enabled"));
+                }
+
+                mcMMOPlayer.toggleGodMode();
+                return true;
+
+            default:
+                return false;
+        }
    }
 }
--- a/src/main/java/com/gmail/nossr50/commands/McmmoCommand.java
+++ b/src/main/java/com/gmail/nossr50/commands/McmmoCommand.java
@@ -1,15 +1,16 @@
 package com.gmail.nossr50.commands;

 import org.bukkit.ChatColor;
+import org.bukkit.Material;
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandExecutor;
 import org.bukkit.command.CommandSender;
+import org.getspout.spoutapi.player.SpoutPlayer;

 import com.gmail.nossr50.mcMMO;
 import com.gmail.nossr50.commands.party.PartySubcommandType;
 import com.gmail.nossr50.config.Config;
 import com.gmail.nossr50.locale.LocaleLoader;
-import com.gmail.nossr50.util.HolidayManager;
 import com.gmail.nossr50.util.Permissions;

 public class McmmoCommand implements CommandExecutor {
@@ -27,12 +28,16 @@ public class McmmoCommand implements CommandExecutor {
                sender.sendMessage(mcSplit);

                if (Config.getInstance().getDonateMessageEnabled()) {
+                    if (mcMMO.spoutEnabled && sender instanceof SpoutPlayer) {
+                        SpoutPlayer spoutPlayer = (SpoutPlayer) sender;
+                        spoutPlayer.sendNotification(LocaleLoader.getString("Spout.Donate"), ChatColor.GREEN + "gjmcferrin@gmail.com", Material.DIAMOND);
+                    }
+
                    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:
@@ -57,52 +62,52 @@ public class McmmoCommand implements CommandExecutor {
    private void displayPartyCommands(CommandSender sender) {
        if (Permissions.party(sender)) {
            sender.sendMessage(LocaleLoader.getString("Commands.Party.Commands"));
-            sender.sendMessage(" /party create <" + LocaleLoader.getString("Commands.Usage.PartyName") + "> " + LocaleLoader.getString("Commands.Party1"));
-            sender.sendMessage(" /party join <" + LocaleLoader.getString("Commands.Usage.Player") + "> " + LocaleLoader.getString("Commands.Party2"));
-            sender.sendMessage(" /party quit " + LocaleLoader.getString("Commands.Party.Quit"));
+            sender.sendMessage("/party create <" + LocaleLoader.getString("Commands.Usage.PartyName") + "> " + LocaleLoader.getString("Commands.Party1"));
+            sender.sendMessage("/party join <" + LocaleLoader.getString("Commands.Usage.Player") + "> " + LocaleLoader.getString("Commands.Party2"));
+            sender.sendMessage("/party quit " + LocaleLoader.getString("Commands.Party.Quit"));

            if (Permissions.partyChat(sender)) {
-                sender.sendMessage(" /party chat " + LocaleLoader.getString("Commands.Party.Toggle"));
+                sender.sendMessage("/party chat " + LocaleLoader.getString("Commands.Party.Toggle"));
            }

-            sender.sendMessage(" /party invite <" + LocaleLoader.getString("Commands.Usage.Player") + "> " + LocaleLoader.getString("Commands.Party.Invite"));
-            sender.sendMessage(" /party accept " + LocaleLoader.getString("Commands.Party.Accept"));
+            sender.sendMessage("/party invite <" + LocaleLoader.getString("Commands.Usage.Player") + "> " + LocaleLoader.getString("Commands.Party.Invite"));
+            sender.sendMessage("/party accept " + LocaleLoader.getString("Commands.Party.Accept"));

            if (Permissions.partySubcommand(sender, PartySubcommandType.TELEPORT)) {
-                sender.sendMessage(" /party teleport " + LocaleLoader.getString("Commands.Party.Teleport"));
+                sender.sendMessage("/party teleport " + LocaleLoader.getString("Commands.Party.Teleport"));
            }
        }
    }

    private void displayOtherCommands(CommandSender sender) {
        sender.sendMessage(LocaleLoader.getString("Commands.Other"));
-        sender.sendMessage(" /mcstats " + LocaleLoader.getString("Commands.Stats"));
-        sender.sendMessage(" /mctop " + LocaleLoader.getString("Commands.Leaderboards"));
+        sender.sendMessage("/mcstats " + LocaleLoader.getString("Commands.Stats"));
+        sender.sendMessage("/mctop " + LocaleLoader.getString("Commands.Leaderboards"));

        if (Permissions.skillreset(sender)) {
-            sender.sendMessage(" /skillreset <skill|all> " + LocaleLoader.getString("Commands.Reset"));
+            sender.sendMessage("/skillreset <skill|all> " + LocaleLoader.getString("Commands.Reset"));
        }

        if (Permissions.mcability(sender)) {
-            sender.sendMessage(" /mcability " + LocaleLoader.getString("Commands.ToggleAbility"));
+            sender.sendMessage("/mcability " + LocaleLoader.getString("Commands.ToggleAbility"));
        }

        if (Permissions.adminChat(sender)) {
-            sender.sendMessage(" /adminchat " + LocaleLoader.getString("Commands.AdminToggle"));
+            sender.sendMessage("/adminchat " + LocaleLoader.getString("Commands.AdminToggle"));
        }

        if (Permissions.inspect(sender)) {
-            sender.sendMessage(" /inspect " + LocaleLoader.getString("Commands.Inspect"));
+            sender.sendMessage("/inspect " + LocaleLoader.getString("Commands.Inspect"));
        }

        if (Permissions.mmoedit(sender)) {
-            sender.sendMessage(" /mmoedit " + LocaleLoader.getString("Commands.mmoedit"));
+            sender.sendMessage("/mmoedit " + LocaleLoader.getString("Commands.mmoedit"));
        }

        if (Permissions.mcgod(sender)) {
-            sender.sendMessage(" /mcgod " + LocaleLoader.getString("Commands.mcgod"));
+            sender.sendMessage("/mcgod " + LocaleLoader.getString("Commands.mcgod"));
        }

-        sender.sendMessage(" /<skill>" + LocaleLoader.getString("Commands.SkillInfo"));
+        sender.sendMessage(LocaleLoader.getString("Commands.SkillInfo"));
    }
 }
--- a/src/main/java/com/gmail/nossr50/commands/McnotifyCommand.java
+++ b/src/main/java/com/gmail/nossr50/commands/McnotifyCommand.java
@@ -1,26 +1,28 @@
 package com.gmail.nossr50.commands;

-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.entity.Player;

 import com.gmail.nossr50.datatypes.player.McMMOPlayer;
 import com.gmail.nossr50.locale.LocaleLoader;
 import com.gmail.nossr50.util.player.UserManager;

-import com.google.common.collect.ImmutableList;
-
-public class McnotifyCommand implements TabExecutor {
+public class McnotifyCommand implements CommandExecutor {
    @Override
    public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
        switch (args.length) {
            case 0:
                McMMOPlayer mcMMOPlayer = UserManager.getPlayer((Player) sender);

-                sender.sendMessage(LocaleLoader.getString("Commands.Notifications." + (mcMMOPlayer.useChatNotifications() ? "Off" : "On")));
+                if (mcMMOPlayer.useChatNotifications()) {
+                    sender.sendMessage(LocaleLoader.getString("Commands.Notifications.Off"));
+                }
+                else {
+                    sender.sendMessage(LocaleLoader.getString("Commands.Notifications.On"));
+                }
+
                mcMMOPlayer.toggleChatNotifications();
                return true;

@@ -28,9 +30,4 @@ public class McnotifyCommand implements TabExecutor {
                return false;
        }
    }
-
-    @Override
-    public List<String> onTabComplete(CommandSender sender, Command command, String alias, String[] args) {
-        return ImmutableList.of();
-    }
 }
--- a/src/main/java/com/gmail/nossr50/commands/McrefreshCommand.java
+++ b/src/main/java/com/gmail/nossr50/commands/McrefreshCommand.java
@@ -1,33 +1,80 @@
 package com.gmail.nossr50.commands;

+import org.bukkit.command.Command;
+import org.bukkit.command.CommandExecutor;
 import org.bukkit.command.CommandSender;
+import org.bukkit.entity.Player;

+import com.gmail.nossr50.datatypes.player.McMMOPlayer;
+import com.gmail.nossr50.datatypes.player.PlayerProfile;
 import com.gmail.nossr50.locale.LocaleLoader;
 import com.gmail.nossr50.util.Permissions;
+import com.gmail.nossr50.util.player.UserManager;

-public class McrefreshCommand extends ToggleCommand {
+public class McrefreshCommand implements CommandExecutor {
    @Override
-    protected boolean hasOtherPermission(CommandSender sender) {
-        return Permissions.mcrefreshOthers(sender);
-    }
+    public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
+        McMMOPlayer mcMMOPlayer;

-    @Override
-    protected boolean hasSelfPermission(CommandSender sender) {
-        return Permissions.mcrefresh(sender);
-    }
+        switch (args.length) {
+            case 0:
+                if (!Permissions.mcrefresh(sender)) {
+                    sender.sendMessage(command.getPermissionMessage());
+                    return true;
+                }

-    @Override
-    protected void applyCommandAction() {
-        mcMMOPlayer.setRecentlyHurt(0);
-        mcMMOPlayer.getProfile().resetCooldowns();
-        mcMMOPlayer.resetToolPrepMode();
-        mcMMOPlayer.resetAbilityMode();
+                if (!(sender instanceof Player)) {
+                    return false;
+                }

-        player.sendMessage(LocaleLoader.getString("Ability.Generic.Refresh"));
-    }
+                mcMMOPlayer = UserManager.getPlayer(sender.getName());

-    @Override
-    protected void sendSuccessMessage(CommandSender sender) {
-        sender.sendMessage(LocaleLoader.getString("Commands.mcrefresh.Success", player.getName()));
+                mcMMOPlayer.setRecentlyHurt(0);
+                mcMMOPlayer.getProfile().resetCooldowns();
+                mcMMOPlayer.resetToolPrepMode();
+                mcMMOPlayer.resetAbilityMode();
+
+                sender.sendMessage(LocaleLoader.getString("Ability.Generic.Refresh"));
+                return true;
+
+            case 1:
+                if (!Permissions.mcrefreshOthers(sender)) {
+                    sender.sendMessage(command.getPermissionMessage());
+                    return true;
+                }
+
+                mcMMOPlayer = UserManager.getPlayer(args[0]);
+
+                if (mcMMOPlayer == null) {
+                    PlayerProfile playerProfile = new PlayerProfile(args[0], false);
+
+                    if (!playerProfile.isLoaded()) {
+                        sender.sendMessage(LocaleLoader.getString("Commands.DoesNotExist"));
+                        return true;
+                    }
+
+                    sender.sendMessage(LocaleLoader.getString("Commands.Offline"));
+                    return true;
+                }
+
+                Player player = mcMMOPlayer.getPlayer();
+
+                if (!player.isOnline()) {
+                    sender.sendMessage(LocaleLoader.getString("Commands.Offline"));
+                    return true;
+                }
+
+                mcMMOPlayer.setRecentlyHurt(0);
+                mcMMOPlayer.getProfile().resetCooldowns();
+                mcMMOPlayer.resetToolPrepMode();
+                mcMMOPlayer.resetAbilityMode();
+
+                player.sendMessage(LocaleLoader.getString("Ability.Generic.Refresh"));
+                sender.sendMessage(LocaleLoader.getString("Commands.mcrefresh.Success", args[0]));
+                return true;
+
+            default:
+                return false;
+        }
    }
 }
--- a/src/main/java/com/gmail/nossr50/commands/McscoreboardCommand.java
+++ b/src/main/java/com/gmail/nossr50/commands/McscoreboardCommand.java
@@ -1,142 +0,0 @@
-package com.gmail.nossr50.commands;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.bukkit.command.Command;
-import org.bukkit.command.CommandSender;
-import org.bukkit.command.TabExecutor;
-import org.bukkit.entity.Player;
-import org.bukkit.util.StringUtil;
-
-import com.gmail.nossr50.mcMMO;
-import com.gmail.nossr50.config.Config;
-import com.gmail.nossr50.datatypes.skills.SkillType;
-import com.gmail.nossr50.util.StringUtils;
-import com.gmail.nossr50.util.commands.CommandUtils;
-import com.gmail.nossr50.util.player.UserManager;
-import com.gmail.nossr50.util.scoreboards.ScoreboardManager;
-
-import com.google.common.collect.ImmutableList;
-
-public class McscoreboardCommand implements TabExecutor {
-    private static final List<String> SCOREBOARD_TYPES = ImmutableList.of("clear", "rank", "stats", "top");
-
-    @Override
-    public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
-        if (CommandUtils.noConsoleUsage(sender)) {
-            return true;
-        }
-
-        Player player = (Player) sender;
-
-        switch (args.length) {
-            case 0:
-                clearScoreboard(player);
-                return true;
-
-            case 1:
-                if (args[0].equalsIgnoreCase("clear")) {
-                    clearScoreboard(player);
-                }
-                else if (args[0].equalsIgnoreCase("rank")) {
-                    if (!Config.getInstance().getMcrankScoreboardEnabled()) {
-                        sender.sendMessage("This scoreboard is not enabled."); //TODO: Localize
-                        return true;
-                    }
-
-                    ScoreboardManager.setupPlayerScoreboard(player.getName());
-                    ScoreboardManager.enablePlayerRankScoreboard(player);
-                }
-                else if (args[0].equalsIgnoreCase("stats")) {
-                    if (!Config.getInstance().getMcstatsScoreboardsEnabled()) {
-                        sender.sendMessage("This scoreboard is not enabled."); //TODO: Localize
-                        return true;
-                    }
-
-                    ScoreboardManager.setupPlayerScoreboard(player.getName());
-                    ScoreboardManager.enablePlayerStatsScoreboard(UserManager.getPlayer(player));
-                }
-                else if (args[0].equalsIgnoreCase("top")) {
-                    if (!Config.getInstance().getMctopScoreboardEnabled()) {
-                        sender.sendMessage("This scoreboard is not enabled."); //TODO: Localize
-                        return true;
-                    }
-
-                    ScoreboardManager.enableGlobalStatsScoreboard(player, "all", 1);
-                }
-                else {
-                    return false;
-                }
-
-                return true;
-
-            case 2:
-                if (!args[0].equalsIgnoreCase("top")) {
-                    return false;
-                }
-
-                if (!Config.getInstance().getMctopScoreboardEnabled()) {
-                    sender.sendMessage("This scoreboard is not enabled."); //TODO: Localize
-                    return true;
-                }
-
-                if (StringUtils.isInt(args[1])) {
-                    ScoreboardManager.enableGlobalStatsScoreboard(player, "all", Math.abs(Integer.parseInt(args[1])));
-                    return true;
-                }
-
-                if (CommandUtils.isInvalidSkill(sender, args[1])) {
-                    return true;
-                }
-
-                ScoreboardManager.enableGlobalStatsScoreboard(player, args[1], 1);
-                return true;
-
-            case 3:
-                if (!args[0].equalsIgnoreCase("top")) {
-                    return false;
-                }
-
-                if (!Config.getInstance().getMctopScoreboardEnabled()) {
-                    sender.sendMessage("This scoreboard is not enabled."); //TODO: Localize
-                    return true;
-                }
-
-                if (CommandUtils.isInvalidSkill(sender, args[1])) {
-                    return true;
-                }
-
-                if (CommandUtils.isInvalidInteger(sender, args[2])) {
-                    return true;
-                }
-
-                ScoreboardManager.enableGlobalStatsScoreboard(player, args[1], Math.abs(Integer.parseInt(args[2])));
-                return true;
-
-            default:
-                return false;
-        }
-    }
-
-    @Override
-    public List<String> onTabComplete(CommandSender sender, Command command, String alias, String[] args) {
-        switch (args.length) {
-            case 1:
-                return StringUtil.copyPartialMatches(args[0], SCOREBOARD_TYPES, new ArrayList<String>(SCOREBOARD_TYPES.size()));
-            case 2:
-                if (args[0].equalsIgnoreCase("top")) {
-                    return StringUtil.copyPartialMatches(args[1], SkillType.SKILL_NAMES, new ArrayList<String>(SkillType.SKILL_NAMES.size()));
-                }
-                // Fallthrough
-
-            default:
-                return ImmutableList.of();
-        }
-    }
-
-    private void clearScoreboard(Player player) {
-        player.setScoreboard(mcMMO.p.getServer().getScoreboardManager().getMainScoreboard());
-        player.sendMessage("Your scoreboard has been cleared!"); //TODO: Locale
-    }
-}
--- a/src/main/java/com/gmail/nossr50/commands/MobhealthCommand.java
+++ b/src/main/java/com/gmail/nossr50/commands/MobhealthCommand.java
@@ -1,69 +0,0 @@
-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.CommandSender;
-import org.bukkit.command.TabExecutor;
-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.util.commands.CommandUtils;
-import com.gmail.nossr50.util.player.UserManager;
-
-import com.google.common.collect.ImmutableList;
-
-public class MobhealthCommand implements TabExecutor {
-    private static final List<String> MOB_HEALTHBAR_TYPES;
-
-    static {
-        ArrayList<String> types = new ArrayList<String>();
-
-        for (MobHealthbarType type : MobHealthbarType.values()) {
-            types.add(type.toString());
-        }
-
-        Collections.sort(types);
-        MOB_HEALTHBAR_TYPES = ImmutableList.copyOf(types);
-    }
-
-    @Override
-    public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
-        if (CommandUtils.noConsoleUsage(sender)) {
-            return true;
-        }
-
-        switch (args.length) {
-            case 1:
-                PlayerProfile playerProfile = UserManager.getPlayer((Player) sender).getProfile();
-
-                try {
-                    MobHealthbarType type = MobHealthbarType.valueOf(args[0].toUpperCase().trim());
-                    playerProfile.setMobHealthbarType(type);
-                    sender.sendMessage("Display type changed to: " + type); //TODO: Localize
-                    return true;
-                }
-                catch (IllegalArgumentException ex) {
-                    sender.sendMessage("Invalid type!"); //TODO: Localize
-                    return true;
-                }
-
-            default:
-                return false;
-        }
-    }
-
-    @Override
-    public List<String> onTabComplete(CommandSender sender, Command command, String alias, String[] args) {
-        switch (args.length) {
-            case 1:
-                return StringUtil.copyPartialMatches(args[0], MOB_HEALTHBAR_TYPES, new ArrayList<String>(MOB_HEALTHBAR_TYPES.size()));
-            default:
-                return ImmutableList.of();
-        }
-    }
-}
--- a/src/main/java/com/gmail/nossr50/commands/ToggleCommand.java
+++ b/src/main/java/com/gmail/nossr50/commands/ToggleCommand.java
@@ -1,86 +0,0 @@
-package com.gmail.nossr50.commands;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Set;
-
-import org.bukkit.command.Command;
-import org.bukkit.command.CommandSender;
-import org.bukkit.command.TabExecutor;
-import org.bukkit.entity.Player;
-import org.bukkit.util.StringUtil;
-
-import com.gmail.nossr50.datatypes.player.McMMOPlayer;
-import com.gmail.nossr50.util.Misc;
-import com.gmail.nossr50.util.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) {
-            case 0:
-                if (CommandUtils.noConsoleUsage(sender)) {
-                    return true;
-                }
-
-                if (!hasSelfPermission(sender)) {
-                    sender.sendMessage(command.getPermissionMessage());
-                    return true;
-                }
-
-                player = (Player) sender;
-                mcMMOPlayer = UserManager.getPlayer(player);
-
-                applyCommandAction();
-                return true;
-
-            case 1:
-                if (!hasOtherPermission(sender)) {
-                    sender.sendMessage(command.getPermissionMessage());
-                    return true;
-                }
-
-                String playerName = Misc.getMatchedPlayerName(args[0]);
-                mcMMOPlayer = UserManager.getPlayer(playerName);
-
-                if (!CommandUtils.checkPlayerExistence(sender, playerName, mcMMOPlayer)) {
-                    return true;
-                }
-
-                player = mcMMOPlayer.getPlayer();
-
-                if (CommandUtils.isOffline(sender, player)) {
-                    return true;
-                }
-
-                applyCommandAction();
-                sendSuccessMessage(sender);
-                return true;
-
-            default:
-                return false;
-        }
-    }
-
-    @Override
-    public List<String> onTabComplete(CommandSender sender, Command command, String alias, String[] args) {
-        switch (args.length) {
-            case 1:
-                Set<String> playerNames = UserManager.getPlayerNames();
-                return StringUtil.copyPartialMatches(args[0], playerNames, new ArrayList<String>(playerNames.size()));
-            default:
-                return ImmutableList.of();
-        }
-    }
-
-    protected abstract boolean hasOtherPermission(CommandSender sender);
-    protected abstract boolean hasSelfPermission(CommandSender sender);
-    protected abstract void applyCommandAction();
-    protected abstract void sendSuccessMessage(CommandSender sender);
-}
--- a/src/main/java/com/gmail/nossr50/commands/XprateCommand.java
+++ b/src/main/java/com/gmail/nossr50/commands/XprateCommand.java
@@ -1,28 +1,17 @@
 package com.gmail.nossr50.commands;

-import java.util.ArrayList;
-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.config.experience.ExperienceConfig;
+import com.gmail.nossr50.config.Config;
 import com.gmail.nossr50.locale.LocaleLoader;
 import com.gmail.nossr50.util.Permissions;
 import com.gmail.nossr50.util.StringUtils;
-import com.gmail.nossr50.util.commands.CommandUtils;

-import com.google.common.collect.ImmutableList;
-
-public class XprateCommand implements TabExecutor {
-    private double originalRate;
-
-    public XprateCommand() {
-        originalRate = ExperienceConfig.getInstance().getExperienceGainsGlobalMultiplier();
-    }
+public class XprateCommand implements CommandExecutor {
+    private static double originalRate = Config.getInstance().getExperienceGainsGlobalMultiplier();

    @Override
    public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
@@ -42,12 +31,12 @@ public class XprateCommand implements TabExecutor {
                    mcMMO.p.toggleXpEventEnabled();
                }

-                ExperienceConfig.getInstance().setExperienceGainsGlobalMultiplier(originalRate);
+                Config.getInstance().setExperienceGainsGlobalMultiplier(originalRate);
                return true;

            case 2:
-                if (CommandUtils.isInvalidInteger(sender, args[0])) {
-                    return true;
+                if (!StringUtils.isInt(args[0])) {
+                    return false;
                }

                if (!Permissions.xprateSet(sender)) {
@@ -55,18 +44,13 @@ public class XprateCommand implements TabExecutor {
                    return true;
                }

-                if (CommandUtils.shouldDisableToggle(args[1])) {
-                    mcMMO.p.setXPEventEnabled(false);
-                }
-                else if (CommandUtils.shouldEnableToggle(args[1])) {
-                    mcMMO.p.setXPEventEnabled(true);
-                }
-                else {
+                if (!args[1].equalsIgnoreCase("true") && !args[1].equalsIgnoreCase("false")) {
                    return false;
                }

+                mcMMO.p.setXPEventEnabled(Boolean.valueOf(args[1]));
                int newXpRate = Integer.parseInt(args[0]);
-                ExperienceConfig.getInstance().setExperienceGainsGlobalMultiplier(newXpRate);
+                Config.getInstance().setExperienceGainsGlobalMultiplier(newXpRate);

                if (mcMMO.p.isXPEventEnabled()) {
                    mcMMO.p.getServer().broadcastMessage(LocaleLoader.getString("Commands.xprate.started.0"));
@@ -82,20 +66,4 @@ public class XprateCommand implements TabExecutor {
                return false;
        }
    }
-
-    @Override
-    public List<String> onTabComplete(CommandSender sender, Command command, String alias, String[] args) {
-        switch (args.length) {
-            case 1:
-                if (StringUtils.isInt(args[0])) {
-                    return ImmutableList.of();
-                }
-
-                return StringUtil.copyPartialMatches(args[0], CommandUtils.RESET_OPTIONS, new ArrayList<String>(CommandUtils.RESET_OPTIONS.size()));
-            case 2:
-                return StringUtil.copyPartialMatches(args[1], CommandUtils.TRUE_FALSE_OPTIONS, new ArrayList<String>(CommandUtils.TRUE_FALSE_OPTIONS.size()));
-            default:
-                return ImmutableList.of();
-        }
-    }
 }
--- a/src/main/java/com/gmail/nossr50/commands/chat/AdminChatCommand.java
+++ b/src/main/java/com/gmail/nossr50/commands/chat/AdminChatCommand.java
@@ -1,8 +1,12 @@
 package com.gmail.nossr50.commands.chat;

 import org.bukkit.command.CommandSender;
+import org.bukkit.entity.Player;

-import com.gmail.nossr50.datatypes.chat.ChatMode;
+import com.gmail.nossr50.mcMMO;
+import com.gmail.nossr50.chat.ChatManager;
+import com.gmail.nossr50.chat.ChatMode;
+import com.gmail.nossr50.locale.LocaleLoader;

 public class AdminChatCommand extends ChatCommand {
    public AdminChatCommand() {
@@ -11,6 +15,12 @@ public class AdminChatCommand extends ChatCommand {

    @Override
    protected void handleChatSending(CommandSender sender, String[] args) {
-        chatManager.handleChat(sender.getName(), getDisplayName(sender), buildChatMessage(args, 0));
+        if (sender instanceof Player) {
+            Player player = (Player) sender;
+            ChatManager.handleAdminChat(mcMMO.p, player.getName(), player.getDisplayName(), buildChatMessage(args, 0));
+        }
+        else {
+            ChatManager.handleAdminChat(mcMMO.p, LocaleLoader.getString("Commands.Chat.Console"), buildChatMessage(args, 0));
+        }
    }
 }
--- a/src/main/java/com/gmail/nossr50/commands/chat/ChatCommand.java
+++ b/src/main/java/com/gmail/nossr50/commands/chat/ChatCommand.java
@@ -1,41 +1,28 @@
 package com.gmail.nossr50.commands.chat;

-import java.util.ArrayList;
-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.entity.Player;
-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.datatypes.chat.ChatMode;
+import com.gmail.nossr50.chat.ChatMode;
 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.google.common.collect.ImmutableList;
-
-public abstract class ChatCommand implements TabExecutor {
+public abstract class ChatCommand implements CommandExecutor {
+    protected McMMOPlayer mcMMOPlayer;
    protected ChatMode chatMode;
-    protected ChatManager chatManager;
-    private McMMOPlayer mcMMOPlayer;

    public ChatCommand(ChatMode chatMode) {
        this.chatMode = chatMode;
-        this.chatManager = ChatManagerFactory.getChatManager(mcMMO.p, chatMode);
    }

    @Override
    public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
        switch (args.length) {
            case 0:
-                if (CommandUtils.noConsoleUsage(sender)) {
-                    return true;
+                if (!(sender instanceof Player)) {
+                    return false;
                }

                mcMMOPlayer = UserManager.getPlayer((Player) sender);
@@ -50,24 +37,20 @@ public abstract class ChatCommand implements TabExecutor {
                return true;

            case 1:
-                if (CommandUtils.shouldEnableToggle(args[0])) {
-                    if (CommandUtils.noConsoleUsage(sender)) {
-                        return true;
+                if (args[0].equalsIgnoreCase("on")) {
+                    if (!(sender instanceof Player)) {
+                        return false;
                    }

-                    mcMMOPlayer = UserManager.getPlayer((Player) sender);
-
                    enableChatMode(sender);
                    return true;
                }

-                if (CommandUtils.shouldDisableToggle(args[0])) {
-                    if (CommandUtils.noConsoleUsage(sender)) {
-                        return true;
+                if (args[0].equalsIgnoreCase("off")) {
+                    if (!(sender instanceof Player)) {
+                        return false;
                    }

-                    mcMMOPlayer = UserManager.getPlayer((Player) sender);
-
                    disableChatMode(sender);
                    return true;
                }
@@ -80,16 +63,6 @@ public abstract class ChatCommand implements TabExecutor {
        }
    }

-    @Override
-    public List<String> onTabComplete(CommandSender sender, Command command, String alias, String[] args) {
-        switch (args.length) {
-            case 1:
-                return StringUtil.copyPartialMatches(args[0], CommandUtils.TRUE_FALSE_OPTIONS, new ArrayList<String>(CommandUtils.TRUE_FALSE_OPTIONS.size()));
-            default:
-                return ImmutableList.of();
-        }
-    }
-
    protected String buildChatMessage(String[] args, int index) {
        StringBuilder builder = new StringBuilder();
        builder.append(args[index]);
@@ -102,28 +75,14 @@ public abstract class ChatCommand implements TabExecutor {
        return builder.toString();
    }

-    protected String getDisplayName(CommandSender sender) {
-        return (sender instanceof Player) ? ((Player) sender).getDisplayName() : LocaleLoader.getString("Commands.Chat.Console");
-    }
-
    protected abstract void handleChatSending(CommandSender sender, String[] args);

    private void enableChatMode(CommandSender sender) {
-        if (chatMode == ChatMode.PARTY && mcMMOPlayer.getParty() == null) {
-            sender.sendMessage(LocaleLoader.getString("Commands.Party.None"));
-            return;
-        }
-
        chatMode.enable(mcMMOPlayer);
        sender.sendMessage(chatMode.getEnabledMessage());
    }

    private void disableChatMode(CommandSender sender) {
-        if (chatMode == ChatMode.PARTY && mcMMOPlayer.getParty() == null) {
-            sender.sendMessage(LocaleLoader.getString("Commands.Party.None"));
-            return;
-        }
-
        chatMode.disable(mcMMOPlayer);
        sender.sendMessage(chatMode.getDisabledMessage());
    }
--- a/src/main/java/com/gmail/nossr50/commands/chat/PartyChatCommand.java
+++ b/src/main/java/com/gmail/nossr50/commands/chat/PartyChatCommand.java
@@ -3,8 +3,9 @@ package com.gmail.nossr50.commands.chat;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;

-import com.gmail.nossr50.chat.PartyChatManager;
-import com.gmail.nossr50.datatypes.chat.ChatMode;
+import com.gmail.nossr50.mcMMO;
+import com.gmail.nossr50.chat.ChatManager;
+import com.gmail.nossr50.chat.ChatMode;
 import com.gmail.nossr50.datatypes.party.Party;
 import com.gmail.nossr50.locale.LocaleLoader;
 import com.gmail.nossr50.party.PartyManager;
@@ -17,18 +18,16 @@ public class PartyChatCommand extends ChatCommand {

    @Override
    protected void handleChatSending(CommandSender sender, String[] args) {
-        Party party;
-        String message;
-
        if (sender instanceof Player) {
-            party = UserManager.getPlayer((Player) sender).getParty();
+            Player player = (Player) sender;
+            Party party = UserManager.getPlayer(player).getParty();

            if (party == null) {
                sender.sendMessage(LocaleLoader.getString("Commands.Party.None"));
                return;
            }

-            message = buildChatMessage(args, 0);
+            ChatManager.handlePartyChat(mcMMO.p, party, player.getName(), player.getDisplayName(), buildChatMessage(args, 0));
        }
        else {
            if (args.length < 2) {
@@ -36,17 +35,14 @@ public class PartyChatCommand extends ChatCommand {
                return;
            }

-            party = PartyManager.getParty(args[0]);
+            Party party = PartyManager.getParty(args[0]);

            if (party == null) {
                sender.sendMessage(LocaleLoader.getString("Party.InvalidName"));
                return;
            }

-            message = buildChatMessage(args, 1);
+            ChatManager.handlePartyChat(mcMMO.p, party, LocaleLoader.getString("Commands.Chat.Console"), buildChatMessage(args, 1));
        }
-
-        ((PartyChatManager) chatManager).setParty(party);
-        chatManager.handleChat(sender.getName(), getDisplayName(sender), message);
    }
 }
--- a/src/main/java/com/gmail/nossr50/commands/database/ConvertDatabaseCommand.java
+++ b/src/main/java/com/gmail/nossr50/commands/database/ConvertDatabaseCommand.java
@@ -1,79 +0,0 @@
-package com.gmail.nossr50.commands.database;
-
-import org.bukkit.command.Command;
-import org.bukkit.command.CommandExecutor;
-import org.bukkit.command.CommandSender;
-import org.bukkit.entity.Player;
-
-import com.gmail.nossr50.mcMMO;
-import com.gmail.nossr50.database.DatabaseManager;
-import com.gmail.nossr50.database.DatabaseManagerFactory;
-import com.gmail.nossr50.datatypes.database.DatabaseType;
-import com.gmail.nossr50.datatypes.player.PlayerProfile;
-import com.gmail.nossr50.locale.LocaleLoader;
-import com.gmail.nossr50.runnables.database.DatabaseConversionTask;
-import com.gmail.nossr50.util.player.UserManager;
-
-public class ConvertDatabaseCommand implements CommandExecutor {
-    @Override
-    public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
-        switch (args.length) {
-            case 2:
-                DatabaseType previousType = DatabaseType.getDatabaseType(args[1]);
-                DatabaseType newType = mcMMO.getDatabaseManager().getDatabaseType();
-
-                if ((newType == DatabaseType.CUSTOM && DatabaseManagerFactory.getCustomDatabaseManagerClass().getSimpleName().equalsIgnoreCase(args[1])) || previousType == newType) {
-                    sender.sendMessage(LocaleLoader.getString("Commands.mcconvert.Database.Same", newType.toString()));
-                    return true;
-                }
-
-                DatabaseManager oldDatabase = DatabaseManagerFactory.createDatabaseManager(previousType);
-
-                if (previousType == DatabaseType.CUSTOM) {
-                    Class<?> clazz;
-
-                    try {
-                        clazz = Class.forName(args[1]);
-
-                        if (!DatabaseManager.class.isAssignableFrom(clazz)) {
-                            sender.sendMessage(LocaleLoader.getString("Commands.mcconvert.Database.InvalidType", args[1]));
-                            return true;
-                        }
-                    }
-                    catch (Exception e) {
-                        sender.sendMessage(LocaleLoader.getString("Commands.mcconvert.Database.InvalidType", args[1]));
-                        return true;
-                    }
-
-                    try {
-                        oldDatabase = DatabaseManagerFactory.createCustomDatabaseManager((Class<? extends DatabaseManager>) clazz);
-                    }
-                    catch (Throwable t) {
-                        sender.sendMessage("An error occurred during the conversion process."); // TODO: Localize
-                        return true;
-                    }
-                }
-
-                sender.sendMessage(LocaleLoader.getString("Commands.mcconvert.Database.Start", previousType.toString(), newType.toString()));
-
-                UserManager.saveAll();
-                UserManager.clearAll();
-
-                for (Player player : mcMMO.p.getServer().getOnlinePlayers()) {
-                    PlayerProfile profile = oldDatabase.loadPlayerProfile(player.getName(), false);
-
-                    if (profile.isLoaded()) {
-                        mcMMO.getDatabaseManager().saveUser(profile);
-                    }
-
-                    UserManager.addUser(player);
-                }
-
-                new DatabaseConversionTask(oldDatabase, sender, previousType.toString(), newType.toString()).runTaskAsynchronously(mcMMO.p);
-                return true;
-
-            default:
-                return false;
-        }
-    }
-}
--- a/src/main/java/com/gmail/nossr50/commands/database/McconvertCommand.java
+++ b/src/main/java/com/gmail/nossr50/commands/database/McconvertCommand.java
@@ -1,94 +0,0 @@
-package com.gmail.nossr50.commands.database;
-
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-
-import org.bukkit.command.Command;
-import org.bukkit.command.CommandExecutor;
-import org.bukkit.command.CommandSender;
-import org.bukkit.command.TabExecutor;
-import org.bukkit.util.StringUtil;
-
-import com.gmail.nossr50.mcMMO;
-import com.gmail.nossr50.commands.experience.ConvertExperienceCommand;
-import com.gmail.nossr50.database.DatabaseManagerFactory;
-import com.gmail.nossr50.datatypes.database.DatabaseType;
-import com.gmail.nossr50.datatypes.experience.FormulaType;
-
-import com.google.common.collect.ImmutableList;
-
-public class McconvertCommand implements TabExecutor {
-    private static final List<String> FORMULA_TYPES;
-    private static final List<String> DATABASE_TYPES;
-    private static final List<String> SUBCOMMANDS = ImmutableList.of("database", "experience");
-
-    private CommandExecutor databaseConvertCommand   = new ConvertDatabaseCommand();
-    private CommandExecutor experienceConvertCommand = new ConvertExperienceCommand();
-
-    static {
-        ArrayList<String> formulaTypes = new ArrayList<String>();
-
-        for (FormulaType type : FormulaType.values()) {
-            formulaTypes.add(type.toString());
-        }
-
-        Collections.sort(formulaTypes);
-        FORMULA_TYPES = ImmutableList.copyOf(formulaTypes);
-    }
-
-    static {
-        ArrayList<String> databaseTypes = new ArrayList<String>();
-
-        for (DatabaseType type : DatabaseType.values()) {
-            databaseTypes.add(type.toString());
-        }
-
-        // Custom stuff
-        databaseTypes.remove(DatabaseType.CUSTOM);
-
-        if (mcMMO.getDatabaseManager().getDatabaseType() == DatabaseType.CUSTOM) {
-            databaseTypes.add(DatabaseManagerFactory.getCustomDatabaseManagerClass().getName());
-        }
-
-        Collections.sort(databaseTypes);
-        DATABASE_TYPES = ImmutableList.copyOf(databaseTypes);
-    }
-
-    @Override
-    public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
-        switch (args.length) {
-            case 2:
-                if (args[0].equalsIgnoreCase("database") || args[0].equalsIgnoreCase("db")) {
-                    return databaseConvertCommand.onCommand(sender, command, label, args);
-                }
-                else if (args[0].equalsIgnoreCase("experience") || args[0].equalsIgnoreCase("xp") || args[1].equalsIgnoreCase("exp")) {
-                    return experienceConvertCommand.onCommand(sender, command, label, args);
-                }
-
-                return false;
-            default:
-                return false;
-        }
-    }
-
-    @Override
-    public List<String> onTabComplete(CommandSender sender, Command command, String alias, String[] args) {
-        switch (args.length) {
-            case 1:
-                return StringUtil.copyPartialMatches(args[0], SUBCOMMANDS, new ArrayList<String>(SUBCOMMANDS.size()));
-            case 2:
-                if (args[0].equalsIgnoreCase("database") || args[0].equalsIgnoreCase("db")) {
-                    return StringUtil.copyPartialMatches(args[0], DATABASE_TYPES, new ArrayList<String>(DATABASE_TYPES.size()));
-                }
-
-                if (args[0].equalsIgnoreCase("experience") || args[0].equalsIgnoreCase("xp") || args[0].equalsIgnoreCase("exp")) {
-                    return StringUtil.copyPartialMatches(args[0], FORMULA_TYPES, new ArrayList<String>(FORMULA_TYPES.size()));
-                }
-
-                return ImmutableList.of();
-            default:
-                return ImmutableList.of();
-        }
-    }
-}
--- a/src/main/java/com/gmail/nossr50/commands/database/McpurgeCommand.java
+++ b/src/main/java/com/gmail/nossr50/commands/database/McpurgeCommand.java
@@ -1,26 +1,38 @@
 package com.gmail.nossr50.commands.database;

-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 com.gmail.nossr50.mcMMO;
 import com.gmail.nossr50.config.Config;
+import com.gmail.nossr50.database.DatabaseManager;
+import com.gmail.nossr50.database.LeaderboardManager;
 import com.gmail.nossr50.locale.LocaleLoader;
+import com.gmail.nossr50.util.Permissions;

-import com.google.common.collect.ImmutableList;
-
-public class McpurgeCommand implements TabExecutor {
+public class McpurgeCommand implements CommandExecutor {
    @Override
    public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
+        if (!Permissions.mcpurge(sender)) {
+            sender.sendMessage(command.getPermissionMessage());
+            return true;
+        }
+
        switch (args.length) {
            case 0:
-                mcMMO.getDatabaseManager().purgePowerlessUsers();
+                if (Config.getInstance().getUseMySQL()) {
+                    DatabaseManager.purgePowerlessSQL();

-                if (Config.getInstance().getOldUsersCutoff() != -1) {
-                    mcMMO.getDatabaseManager().purgeOldUsers();
+                    if (Config.getInstance().getOldUsersCutoff() != -1) {
+                        DatabaseManager.purgeOldSQL();
+                    }
+                }
+                else {
+                    LeaderboardManager.purgePowerlessFlatfile();
+
+                    if (Config.getInstance().getOldUsersCutoff() != -1) {
+                        LeaderboardManager.purgeOldFlatfile();
+                    }
                }

                sender.sendMessage(LocaleLoader.getString("Commands.mcpurge.Success"));
@@ -30,9 +42,4 @@ public class McpurgeCommand implements TabExecutor {
                return false;
        }
    }
-
-    @Override
-    public List<String> onTabComplete(CommandSender sender, Command command, String alias, String[] args) {
-        return ImmutableList.of();
-    }
 }
--- a/src/main/java/com/gmail/nossr50/commands/database/McremoveCommand.java
+++ b/src/main/java/com/gmail/nossr50/commands/database/McremoveCommand.java
@@ -1,38 +1,45 @@
 package com.gmail.nossr50.commands.database;

-import java.util.ArrayList;
-import java.util.List;
-import java.util.Set;
-
 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.config.Config;
+import com.gmail.nossr50.database.DatabaseManager;
+import com.gmail.nossr50.database.LeaderboardManager;
 import com.gmail.nossr50.locale.LocaleLoader;
-import com.gmail.nossr50.util.Misc;
-import com.gmail.nossr50.util.commands.CommandUtils;
-import com.gmail.nossr50.util.player.UserManager;
+import com.gmail.nossr50.util.Permissions;

-import com.google.common.collect.ImmutableList;
-
-public class McremoveCommand implements TabExecutor {
+public class McremoveCommand implements CommandExecutor {
    @Override
    public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
+        if (!Permissions.mcremove(sender)) {
+            sender.sendMessage(command.getPermissionMessage());
+            return true;
+        }
+
        switch (args.length) {
            case 1:
-                String playerName = Misc.getMatchedPlayerName(args[0]);
+                /* MySQL */
+                if (Config.getInstance().getUseMySQL()) {
+                    String tablePrefix = Config.getInstance().getMySQLTablePrefix();

-                if (UserManager.getPlayer(playerName, true) == null && CommandUtils.unloadedProfile(sender, mcMMO.getDatabaseManager().loadPlayerProfile(playerName, false))) {
-                    return true;
-                }
-
-                if (mcMMO.getDatabaseManager().removeUser(playerName)) {
-                    sender.sendMessage(LocaleLoader.getString("Commands.mcremove.Success", playerName));
+                    if (DatabaseManager.update("DELETE FROM " + tablePrefix + "users WHERE " + tablePrefix + "users.user = '" + args[0] + "'") != 0) {
+                        DatabaseManager.profileCleanup(args[0]);
+                        sender.sendMessage(LocaleLoader.getString("Commands.mcremove.Success", args[0]));
+                    }
+                    else {
+                        sender.sendMessage(LocaleLoader.getString("Commands.DoesNotExist"));
+                    }
                }
                else {
-                    sender.sendMessage(playerName + " could not be removed from the database."); // Pretty sure this should NEVER happen.
+                    if (LeaderboardManager.removeFlatFileUser(args[0])) {
+                        DatabaseManager.profileCleanup(args[0]);
+                        sender.sendMessage(LocaleLoader.getString("Commands.mcremove.Success", args[0]));
+                    }
+                    else {
+                        sender.sendMessage(LocaleLoader.getString("Commands.DoesNotExist"));
+                    }
                }

                return true;
@@ -41,15 +48,4 @@ public class McremoveCommand implements TabExecutor {
                return false;
        }
    }
-
-    @Override
-    public List<String> onTabComplete(CommandSender sender, Command command, String alias, String[] args) {
-        switch (args.length) {
-            case 1:
-                Set<String> playerNames = UserManager.getPlayerNames();
-                return StringUtil.copyPartialMatches(args[0], playerNames, new ArrayList<String>(playerNames.size()));
-            default:
-                return ImmutableList.of();
-        }
-    }
 }
--- a/src/main/java/com/gmail/nossr50/commands/database/MmoshowdbCommand.java
+++ b/src/main/java/com/gmail/nossr50/commands/database/MmoshowdbCommand.java
@@ -1,37 +0,0 @@
-package com.gmail.nossr50.commands.database;
-
-import java.util.List;
-
-import org.bukkit.command.Command;
-import org.bukkit.command.CommandSender;
-import org.bukkit.command.TabExecutor;
-
-import com.gmail.nossr50.config.Config;
-import com.gmail.nossr50.database.DatabaseManagerFactory;
-import com.gmail.nossr50.locale.LocaleLoader;
-
-import com.google.common.collect.ImmutableList;
-
-public class MmoshowdbCommand implements TabExecutor {
-    @Override
-    public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
-        if (args.length != 0) {
-            return false;
-        }
-
-        Class<?> clazz = DatabaseManagerFactory.getCustomDatabaseManagerClass();
-
-        if (clazz != null) {
-            sender.sendMessage(LocaleLoader.getString("Commands.mmoshowdb", clazz.getName()));
-            return true;
-        }
-
-        sender.sendMessage(LocaleLoader.getString("Commands.mmoshowdb", (Config.getInstance().getUseMySQL() ? "sql" : "flatfile")));
-        return true;
-    }
-
-    @Override
-    public List<String> onTabComplete(CommandSender sender, Command command, String alias, String[] args) {
-        return ImmutableList.of();
-    }
-}
--- a/src/main/java/com/gmail/nossr50/commands/database/MmoupdateCommand.java
+++ b/src/main/java/com/gmail/nossr50/commands/database/MmoupdateCommand.java
@@ -0,0 +1,51 @@
+package com.gmail.nossr50.commands.database;
+
+import org.bukkit.command.Command;
+import org.bukkit.command.CommandExecutor;
+import org.bukkit.command.CommandSender;
+import org.bukkit.entity.Player;
+
+import com.gmail.nossr50.mcMMO;
+import com.gmail.nossr50.config.Config;
+import com.gmail.nossr50.locale.LocaleLoader;
+import com.gmail.nossr50.runnables.database.SQLConversionTask;
+import com.gmail.nossr50.util.Permissions;
+import com.gmail.nossr50.util.player.UserManager;
+
+public class MmoupdateCommand implements CommandExecutor {
+    @Override
+    public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
+        if (!Permissions.mmoupdate(sender)) {
+            sender.sendMessage(command.getPermissionMessage());
+            return true;
+        }
+
+        switch (args.length) {
+            case 0:
+                sender.sendMessage(LocaleLoader.getString("Commands.mmoupdate.Start"));
+                UserManager.clearAll();
+                convertToMySQL();
+
+                for (Player player : mcMMO.p.getServer().getOnlinePlayers()) {
+                    UserManager.addUser(player);
+                }
+
+                sender.sendMessage(LocaleLoader.getString("Commands.mmoupdate.Finish"));
+                return true;
+
+            default:
+                return false;
+        }
+    }
+
+    /**
+     * Convert FlatFile data to MySQL data.
+     */
+    private void convertToMySQL() {
+        if (!Config.getInstance().getUseMySQL()) {
+            return;
+        }
+
+        mcMMO.p.getServer().getScheduler().runTaskLaterAsynchronously(mcMMO.p, new SQLConversionTask(), 1);
+    }
+}
--- a/src/main/java/com/gmail/nossr50/commands/experience/AddlevelsCommand.java
+++ b/src/main/java/com/gmail/nossr50/commands/experience/AddlevelsCommand.java
@@ -1,41 +1,154 @@
 package com.gmail.nossr50.commands.experience;

+import org.bukkit.command.Command;
+import org.bukkit.command.CommandExecutor;
 import org.bukkit.command.CommandSender;
+import org.bukkit.entity.Player;

-import com.gmail.nossr50.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.Permissions;
+import com.gmail.nossr50.util.StringUtils;
+import com.gmail.nossr50.util.player.UserManager;
 import com.gmail.nossr50.util.skills.SkillUtils;

-public class AddlevelsCommand extends ExperienceCommand {
+public class AddlevelsCommand implements CommandExecutor {
    @Override
-    protected boolean permissionsCheckSelf(CommandSender sender) {
-        return Permissions.addlevels(sender);
-    }
+    public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
+        PlayerProfile profile;
+        int levels;
+        boolean allSkills = false;
+        SkillType skill = null;

-    @Override
-    protected boolean permissionsCheckOthers(CommandSender sender) {
-        return Permissions.addlevelsOthers(sender);
-    }
+        switch (args.length) {
+            case 2:
+                if (!Permissions.addlevels(sender)) {
+                    sender.sendMessage(command.getPermissionMessage());
+                    return true;
+                }

-    @Override
-    protected void handleCommand(SkillType skill) {
-        profile.addLevels(skill, value);
+                if (!(sender instanceof Player)) {
+                    return false;
+                }

-        if (player != null) {
-            mcMMO.p.getServer().getPluginManager().callEvent(new McMMOPlayerLevelUpEvent(player, skill, value));
+                if (args[0].equalsIgnoreCase("all")) {
+                    allSkills = true;
+                }
+                else if (!SkillUtils.isSkill(args[0])) {
+                    sender.sendMessage(LocaleLoader.getString("Commands.Skill.Invalid"));
+                    return true;
+                }
+
+                if (!StringUtils.isInt(args[1])) {
+                    return false;
+                }
+
+                levels = Integer.parseInt(args[1]);
+                profile = UserManager.getPlayer((Player) sender).getProfile();
+
+                if (allSkills) {
+                    for (SkillType skillType : SkillType.values()) {
+                        if (skillType.isChildSkill()) {
+                            continue;
+                        }
+
+                        profile.addLevels(skillType, levels);
+                    }
+                }
+                else {
+                    skill = SkillType.getSkill(args[0]);
+                    profile.addLevels(skill, levels);
+                }
+
+                if (allSkills) {
+                    sender.sendMessage(LocaleLoader.getString("Commands.addlevels.AwardAll.1", levels));
+                }
+                else {
+                    sender.sendMessage(LocaleLoader.getString("Commands.addlevels.AwardSkill.1", levels, SkillUtils.getSkillName(skill)));
+                }
+
+                return true;
+
+            case 3:
+                if (!Permissions.addlevelsOthers(sender)) {
+                    sender.sendMessage(command.getPermissionMessage());
+                    return true;
+                }
+
+                if (args[1].equalsIgnoreCase("all")) {
+                    allSkills = true;
+                }
+                else if (!SkillUtils.isSkill(args[1])) {
+                    sender.sendMessage(LocaleLoader.getString("Commands.Skill.Invalid"));
+                    return true;
+                }
+
+                if (!StringUtils.isInt(args[2])) {
+                    return false;
+                }
+
+                McMMOPlayer mcMMOPlayer = UserManager.getPlayer(args[0]);
+                levels = Integer.parseInt(args[2]);
+
+                // If the mcMMOPlayer doesn't exist, create a temporary profile and check if it's present in the database. If it's not, abort the process.
+                if (mcMMOPlayer == null) {
+                    profile = new PlayerProfile(args[0], false);
+
+                    if (!profile.isLoaded()) {
+                        sender.sendMessage(LocaleLoader.getString("Commands.DoesNotExist"));
+                        return true;
+                    }
+
+                    if (allSkills) {
+                        for (SkillType skillType : SkillType.values()) {
+                            if (skillType.isChildSkill()) {
+                                continue;
+                            }
+
+                            profile.addLevels(skillType, levels);
+                        }
+                    }
+                    else {
+                        skill = SkillType.getSkill(args[1]);
+                        profile.addLevels(skill, levels);
+                    }
+
+                    profile.save(); // Since this is a temporary profile, we save it here.
+                }
+                else {
+                    profile = mcMMOPlayer.getProfile();
+
+                    if (allSkills) {
+                        for (SkillType skillType : SkillType.values()) {
+                            if (skillType.isChildSkill()) {
+                                continue;
+                            }
+
+                            profile.addLevels(skillType, levels);
+                        }
+
+                        mcMMOPlayer.getPlayer().sendMessage(LocaleLoader.getString("Commands.addlevels.AwardAll.1", levels));
+                    }
+                    else {
+                        skill = SkillType.getSkill(args[1]);
+                        profile.addLevels(skill, levels);
+                        mcMMOPlayer.getPlayer().sendMessage(LocaleLoader.getString("Commands.addlevels.AwardSkill.1", levels, SkillUtils.getSkillName(skill)));
+                    }
+                }
+
+                if (allSkills) {
+                    sender.sendMessage(LocaleLoader.getString("Commands.addlevels.AwardAll.2", args[0]));
+                }
+                else {
+                    sender.sendMessage(LocaleLoader.getString("Commands.addlevels.AwardSkill.2", SkillUtils.getSkillName(skill), args[0]));
+                }
+
+                return true;
+
+            default:
+                return false;
        }
    }
-
-    @Override
-    protected void handlePlayerMessageAll() {
-        player.sendMessage(LocaleLoader.getString("Commands.addlevels.AwardAll.1", value));
-    }
-
-    @Override
-    protected void handlePlayerMessageSkill() {
-        player.sendMessage(LocaleLoader.getString("Commands.addlevels.AwardSkill.1", value, SkillUtils.getSkillName(skill)));
-    }
 }
--- a/src/main/java/com/gmail/nossr50/commands/experience/AddxpCommand.java
+++ b/src/main/java/com/gmail/nossr50/commands/experience/AddxpCommand.java
@@ -1,40 +1,152 @@
 package com.gmail.nossr50.commands.experience;

+import org.bukkit.command.Command;
+import org.bukkit.command.CommandExecutor;
 import org.bukkit.command.CommandSender;
+import org.bukkit.entity.Player;

+import com.gmail.nossr50.datatypes.player.McMMOPlayer;
+import com.gmail.nossr50.datatypes.player.PlayerProfile;
 import com.gmail.nossr50.datatypes.skills.SkillType;
 import com.gmail.nossr50.locale.LocaleLoader;
 import com.gmail.nossr50.util.Permissions;
+import com.gmail.nossr50.util.StringUtils;
+import com.gmail.nossr50.util.player.UserManager;
 import com.gmail.nossr50.util.skills.SkillUtils;

-public class AddxpCommand extends ExperienceCommand {
+public class AddxpCommand implements CommandExecutor {
    @Override
-    protected boolean permissionsCheckSelf(CommandSender sender) {
-        return Permissions.addxp(sender);
-    }
+    public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
+        int xp;
+        McMMOPlayer mcMMOPlayer;
+        PlayerProfile profile;
+        boolean allSkills = false;
+        SkillType skill = null;

-    @Override
-    protected boolean permissionsCheckOthers(CommandSender sender) {
-        return Permissions.addxpOthers(sender);
-    }
+        switch (args.length) {
+            case 2:
+                if (!Permissions.addxp(sender)) {
+                    sender.sendMessage(command.getPermissionMessage());
+                    return true;
+                }

-    @Override
-    protected void handleCommand(SkillType skill) {
-        if (player != null) {
-            mcMMOPlayer.applyXpGain(skill, value);
+                if (!(sender instanceof Player)) {
+                    return false;
+                }
+
+                if (args[0].equalsIgnoreCase("all")) {
+                    allSkills = true;
+                }
+                else if (!SkillUtils.isSkill(args[0])) {
+                    sender.sendMessage(LocaleLoader.getString("Commands.Skill.Invalid"));
+                    return true;
+                }
+
+                if (!StringUtils.isInt(args[1])) {
+                    return false;
+                }
+
+                xp = Integer.parseInt(args[1]);
+                mcMMOPlayer = UserManager.getPlayer((Player) sender);
+                profile = mcMMOPlayer.getProfile();
+
+                if (allSkills) {
+                    for (SkillType skillType : SkillType.values()) {
+                        if (skillType.isChildSkill()) {
+                            continue;
+                        }
+
+                        mcMMOPlayer.applyXpGain(skillType, xp);
+                    }
+
+                    sender.sendMessage(LocaleLoader.getString("Commands.addxp.AwardAll", xp));
+                }
+                else {
+                    skill = SkillType.getSkill(args[0]);
+
+                    mcMMOPlayer.applyXpGain(skill, xp);
+                    sender.sendMessage(LocaleLoader.getString("Commands.addxp.AwardSkill", xp, SkillUtils.getSkillName(skill)));
+                }
+
+                return true;
+
+            case 3:
+                if (!Permissions.addxpOthers(sender)) {
+                    sender.sendMessage(command.getPermissionMessage());
+                    return true;
+                }
+
+                if (args[1].equalsIgnoreCase("all")) {
+                    allSkills = true;
+                }
+                else if (!SkillUtils.isSkill(args[1])) {
+                    sender.sendMessage(LocaleLoader.getString("Commands.Skill.Invalid"));
+                    return true;
+                }
+
+                if (!StringUtils.isInt(args[2])) {
+                    return false;
+                }
+
+                mcMMOPlayer = UserManager.getPlayer(args[0]);
+                xp = Integer.parseInt(args[2]);
+
+                // If the mcMMOPlayer doesn't exist, create a temporary profile and check if it's present in the database. If it's not, abort the process.
+                if (mcMMOPlayer == null) {
+                    profile = new PlayerProfile(args[0], false);
+
+                    if (!profile.isLoaded()) {
+                        sender.sendMessage(LocaleLoader.getString("Commands.DoesNotExist"));
+                        return true;
+                    }
+
+                    // TODO: Currently the offline player doesn't level up automatically
+                    if (allSkills) {
+                        for (SkillType skillType : SkillType.values()) {
+                            if (skillType.isChildSkill()) {
+                                continue;
+                            }
+
+                            profile.setSkillXpLevel(skillType, xp);
+                        }
+                    }
+                    else {
+                        skill = SkillType.getSkill(args[1]);
+                        profile.setSkillXpLevel(skill, xp);
+                    }
+
+                    profile.save(); // Since this is a temporary profile, we save it here.
+                }
+                else {
+                    if (allSkills) {
+                        for (SkillType skillType : SkillType.values()) {
+                            if (skillType.isChildSkill()) {
+                                continue;
+                            }
+
+                            mcMMOPlayer.applyXpGain(skillType, xp);
+                        }
+
+                        mcMMOPlayer.getPlayer().sendMessage(LocaleLoader.getString("Commands.addxp.AwardAll", xp));
+                    }
+                    else {
+                        skill = SkillType.getSkill(args[1]);
+                        mcMMOPlayer.applyXpGain(skill, xp);
+                        mcMMOPlayer.getPlayer().sendMessage(LocaleLoader.getString("Commands.addxp.AwardSkill", xp, SkillUtils.getSkillName(skill)));
+                    }
+                }
+
+                if (allSkills) {
+                    sender.sendMessage(LocaleLoader.getString("Commands.addlevels.AwardAll.2", args[0]));
+                }
+                else {
+                    sender.sendMessage(LocaleLoader.getString("Commands.addlevels.AwardSkill.2", SkillUtils.getSkillName(skill), args[0]));
+                }
+
+                return true;
+
+            default:
+                return false;
        }
-        else {
-            profile.addExperience(skill, value);
-        }
-    }
-
-    @Override
-    protected void handlePlayerMessageAll() {
-        player.sendMessage(LocaleLoader.getString("Commands.addxp.AwardAll", value));
-    }
-
-    @Override
-    protected void handlePlayerMessageSkill() {
-        player.sendMessage(LocaleLoader.getString("Commands.addxp.AwardSkill", value, SkillUtils.getSkillName(skill)));
    }
 }
--- a/src/main/java/com/gmail/nossr50/commands/experience/ConvertExperienceCommand.java
+++ b/src/main/java/com/gmail/nossr50/commands/experience/ConvertExperienceCommand.java
@@ -1,49 +0,0 @@
-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;
-        }
-    }
-}
--- a/src/main/java/com/gmail/nossr50/commands/experience/ExperienceCommand.java
+++ b/src/main/java/com/gmail/nossr50/commands/experience/ExperienceCommand.java
@@ -1,179 +0,0 @@
-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.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) {
-            case 2:
-                if (CommandUtils.noConsoleUsage(sender)) {
-                    return true;
-                }
-
-                if (!permissionsCheckSelf(sender)) {
-                    sender.sendMessage(command.getPermissionMessage());
-                    return true;
-                }
-
-                if (!validateArguments(sender, args[0], args[1])) {
-                    return true;
-                }
-
-                player = (Player) sender;
-                mcMMOPlayer = UserManager.getPlayer(player);
-                profile = mcMMOPlayer.getProfile();
-
-                editValues();
-                cleanUp();
-                return true;
-
-            case 3:
-                if (!permissionsCheckOthers(sender)) {
-                    sender.sendMessage(command.getPermissionMessage());
-                    return true;
-                }
-
-                if (!validateArguments(sender, args[1], args[2])) {
-                    return true;
-                }
-
-                String playerName = Misc.getMatchedPlayerName(args[0]);
-                mcMMOPlayer = UserManager.getPlayer(playerName, true);
-
-                // If the mcMMOPlayer doesn't exist, create a temporary profile and check if it's present in the database. If it's not, abort the process.
-                if (mcMMOPlayer == null) {
-                    profile = mcMMO.getDatabaseManager().loadPlayerProfile(playerName, false);
-
-                    if (CommandUtils.unloadedProfile(sender, profile)) {
-                        return true;
-                    }
-
-                    editValues();
-                    profile.save(); // Since this is a temporary profile, we save it here.
-                }
-                else {
-                    profile = mcMMOPlayer.getProfile();
-                    player = mcMMOPlayer.getPlayer();
-                    editValues();
-                }
-
-                handleSenderMessage(sender, playerName);
-                cleanUp();
-                return true;
-
-            default:
-                return false;
-        }
-    }
-
-    @Override
-    public List<String> onTabComplete(CommandSender sender, Command command, String alias, String[] args) {
-        switch (args.length) {
-            case 1:
-                Set<String> playerNames = UserManager.getPlayerNames();
-                return StringUtil.copyPartialMatches(args[0], playerNames, new ArrayList<String>(playerNames.size()));
-            case 2:
-                return StringUtil.copyPartialMatches(args[1], SkillType.SKILL_NAMES, new ArrayList<String>(SkillType.SKILL_NAMES.size()));
-            default:
-                return ImmutableList.of();
-        }
-    }
-
-    protected abstract boolean permissionsCheckSelf(CommandSender sender);
-    protected abstract boolean permissionsCheckOthers(CommandSender sender);
-    protected abstract void handleCommand(SkillType skill);
-    protected abstract void handlePlayerMessageAll();
-    protected abstract void handlePlayerMessageSkill();
-
-    private boolean validateArguments(CommandSender sender, String skillName, String value) {
-        if (isInvalidInteger(sender, value) || isInvalidSkill(sender, skillName)) {
-            return false;
-        }
-
-        return true;
-    }
-
-    private boolean isInvalidInteger(CommandSender sender, String value) {
-        if (CommandUtils.isInvalidInteger(sender, value)) {
-            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));
-        }
-    }
-
-    protected void editValues() {
-        if (allSkills) {
-            for (SkillType skillType : SkillType.values()) {
-                handleCommand(skillType);
-            }
-
-            if (player != null) {
-                handlePlayerMessageAll();
-            }
-        }
-        else {
-            handleCommand(skill);
-
-            if (player != null) {
-                handlePlayerMessageSkill();
-            }
-        }
-    }
-
-    private void cleanUp() {
-        allSkills = false;
-        player = null;
-    }
-}
--- a/src/main/java/com/gmail/nossr50/commands/experience/MmoeditCommand.java
+++ b/src/main/java/com/gmail/nossr50/commands/experience/MmoeditCommand.java
@@ -1,51 +1,150 @@
 package com.gmail.nossr50.commands.experience;

+import org.bukkit.command.Command;
+import org.bukkit.command.CommandExecutor;
 import org.bukkit.command.CommandSender;
+import org.bukkit.entity.Player;

-import com.gmail.nossr50.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.McMMOPlayerLevelDownEvent;
-import com.gmail.nossr50.events.experience.McMMOPlayerLevelUpEvent;
 import com.gmail.nossr50.locale.LocaleLoader;
 import com.gmail.nossr50.util.Permissions;
+import com.gmail.nossr50.util.StringUtils;
+import com.gmail.nossr50.util.player.UserManager;
 import com.gmail.nossr50.util.skills.SkillUtils;

-public class MmoeditCommand extends ExperienceCommand {
+public class MmoeditCommand implements CommandExecutor {
    @Override
-    protected boolean permissionsCheckSelf(CommandSender sender) {
-        return Permissions.mmoedit(sender);
-    }
+    public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
+        PlayerProfile profile;
+        int newValue;
+        boolean allSkills = false;
+        SkillType skill = null;

-    @Override
-    protected boolean permissionsCheckOthers(CommandSender sender) {
-        return Permissions.mmoeditOthers(sender);
-    }
+        switch (args.length) {
+            case 2:
+                if (!Permissions.mmoedit(sender)) {
+                    sender.sendMessage(command.getPermissionMessage());
+                    return true;
+                }

-    @Override
-    protected void handleCommand(SkillType skill) {
-        profile.modifySkill(skill, value);
+                if (!(sender instanceof Player)) {
+                    return false;
+                }

-        if (player == null) {
-            return;
+                if (args[0].equalsIgnoreCase("all")) {
+                    allSkills = true;
+                }
+                else if (!SkillUtils.isSkill(args[0])) {
+                    sender.sendMessage(LocaleLoader.getString("Commands.Skill.Invalid"));
+                    return true;
+                }
+
+                if (!StringUtils.isInt(args[1])) {
+                    return false;
+                }
+
+                newValue = Integer.parseInt(args[1]);
+                profile = UserManager.getPlayer((Player) sender).getProfile();
+
+                if (allSkills) {
+                    for (SkillType skillType : SkillType.values()) {
+                        if (skillType.isChildSkill()) {
+                            continue;
+                        }
+
+                        profile.modifySkill(skillType, newValue);
+                    }
+
+                    sender.sendMessage(LocaleLoader.getString("Commands.mmoedit.AllSkills.1", newValue));
+                }
+                else {
+                    skill = SkillType.getSkill(args[0]);
+                    profile.modifySkill(skill, newValue);
+                    sender.sendMessage(LocaleLoader.getString("Commands.mmoedit.Modified.1", SkillUtils.getSkillName(skill), newValue));
+                }
+
+                return true;
+
+            case 3:
+                if (!Permissions.mmoeditOthers(sender)) {
+                    sender.sendMessage(command.getPermissionMessage());
+                    return true;
+                }
+
+                if (args[1].equalsIgnoreCase("all")) {
+                    allSkills = true;
+                }
+                else if (!SkillUtils.isSkill(args[1])) {
+                    sender.sendMessage(LocaleLoader.getString("Commands.Skill.Invalid"));
+                    return true;
+                }
+
+                if (!StringUtils.isInt(args[2])) {
+                    return false;
+                }
+
+                newValue = Integer.parseInt(args[2]);
+                McMMOPlayer mcMMOPlayer = UserManager.getPlayer(args[0]);
+
+                // If the mcMMOPlayer doesn't exist, create a temporary profile and check if it's present in the database. If it's not, abort the process.
+                if (mcMMOPlayer == null) {
+                    profile = new PlayerProfile(args[0], false);
+
+                    if (!profile.isLoaded()) {
+                        sender.sendMessage(LocaleLoader.getString("Commands.DoesNotExist"));
+                        return true;
+                    }
+
+                    if (allSkills) {
+                        for (SkillType skillType : SkillType.values()) {
+                            if (skillType.isChildSkill()) {
+                                continue;
+                            }
+
+                            profile.modifySkill(skillType, newValue);
+                        }
+                    }
+                    else {
+                        skill = SkillType.getSkill(args[1]);
+                        profile.modifySkill(skill, newValue);
+                    }
+
+                    profile.save(); // Since this is a temporary profile, we save it here.
+                }
+                else {
+                    profile = mcMMOPlayer.getProfile();
+
+                    if (allSkills) {
+                        for (SkillType skillType : SkillType.values()) {
+                            if (skillType.isChildSkill()) {
+                                continue;
+                            }
+
+                            profile.modifySkill(skillType, newValue);
+                        }
+
+                        mcMMOPlayer.getPlayer().sendMessage(LocaleLoader.getString("Commands.mmoedit.AllSkills.1", newValue));
+                    }
+                    else {
+                        skill = SkillType.getSkill(args[1]);
+                        profile.modifySkill(skill, newValue);
+                        mcMMOPlayer.getPlayer().sendMessage(LocaleLoader.getString("Commands.mmoedit.Modified.1", SkillUtils.getSkillName(skill), newValue));
+                    }
+                }
+
+                if (allSkills) {
+                    sender.sendMessage(LocaleLoader.getString("Commands.addlevels.AwardAll.2", args[0]));
+                }
+                else {
+                    sender.sendMessage(LocaleLoader.getString("Commands.mmoedit.Modified.2", SkillUtils.getSkillName(skill), args[0]));
+                }
+
+                return true;
+
+            default:
+                return false;
        }
-
-        int skillLevel = profile.getSkillLevel(skill);
-
-        if (value > skillLevel) {
-            mcMMO.p.getServer().getPluginManager().callEvent(new McMMOPlayerLevelUpEvent(player, skill, value - skillLevel));
-        }
-        else if (value < skillLevel) {
-            mcMMO.p.getServer().getPluginManager().callEvent(new McMMOPlayerLevelDownEvent(player, skill, skillLevel - value));
-        }
-    }
-
-    @Override
-    protected void handlePlayerMessageAll() {
-        player.sendMessage(LocaleLoader.getString("Commands.mmoedit.AllSkills.1", value));
-    }
-
-    @Override
-    protected void handlePlayerMessageSkill() {
-        player.sendMessage(LocaleLoader.getString("Commands.mmoedit.Modified.1", SkillUtils.getSkillName(skill), value));
    }
 }
--- a/src/main/java/com/gmail/nossr50/commands/experience/SkillresetCommand.java
+++ b/src/main/java/com/gmail/nossr50/commands/experience/SkillresetCommand.java
@@ -1,50 +1,76 @@
 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.player.McMMOPlayer;
+import com.gmail.nossr50.datatypes.player.PlayerProfile;
 import com.gmail.nossr50.datatypes.skills.SkillType;
-import com.gmail.nossr50.events.experience.McMMOPlayerLevelDownEvent;
 import com.gmail.nossr50.locale.LocaleLoader;
-import com.gmail.nossr50.util.Misc;
 import com.gmail.nossr50.util.Permissions;
-import com.gmail.nossr50.util.commands.CommandUtils;
 import com.gmail.nossr50.util.player.UserManager;
 import com.gmail.nossr50.util.skills.SkillUtils;

-public class SkillresetCommand extends ExperienceCommand {
-    private CommandSender sender;
-    private Command command;
-    private int argsLength;
-
+public class SkillresetCommand implements CommandExecutor {
    @Override
    public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
-        this.command = command;
-        this.sender = sender;
-        argsLength = args.length;
+        PlayerProfile profile;
+        boolean allSkills = false;
+        SkillType skill = null;
+        String skillName = "";

        switch (args.length) {
            case 1:
-                if (CommandUtils.noConsoleUsage(sender)) {
-                    return true;
-                }
-
                if (!Permissions.skillreset(sender)) {
                    sender.sendMessage(command.getPermissionMessage());
                    return true;
                }

-                if (isInvalidSkill(sender, args[0])) {
+                if (!(sender instanceof Player)) {
+                    return false;
+                }
+
+                if (args[0].equalsIgnoreCase("all")) {
+                    allSkills = true;
+                }
+                else if (!SkillUtils.isSkill(args[0])) {
+                    sender.sendMessage(LocaleLoader.getString("Commands.Skill.Invalid"));
                    return true;
                }

-                player = (Player) sender;
-                mcMMOPlayer = UserManager.getPlayer(player);
-                profile = mcMMOPlayer.getProfile();
+                profile = UserManager.getPlayer((Player) sender).getProfile();
+
+                if (allSkills) {
+                    for (SkillType skillType : SkillType.values()) {
+                        if (skillType.isChildSkill()) {
+                            continue;
+                        }
+
+                        if (!Permissions.skillreset(sender, skillType)) {
+                            sender.sendMessage(command.getPermissionMessage());
+                            continue;
+                        }
+
+                        profile.modifySkill(skillType, 0);
+                    }
+
+                    sender.sendMessage(LocaleLoader.getString("Commands.Reset.All"));
+                }
+                else {
+                    skill = SkillType.getSkill(args[0]);
+                    skillName = SkillUtils.getSkillName(skill);
+
+                    if (!Permissions.skillreset(sender, skill)) {
+                        sender.sendMessage(command.getPermissionMessage());
+                        return true;
+                    }
+
+                    profile.modifySkill(skill, 0);
+                    sender.sendMessage(LocaleLoader.getString("Commands.Reset.Single", skillName));
+                }

-                editValues();
                return true;

            case 2:
@@ -53,70 +79,91 @@ public class SkillresetCommand extends ExperienceCommand {
                    return true;
                }

-                if (isInvalidSkill(sender, args[1])) {
+                if (args[1].equalsIgnoreCase("all")) {
+                    allSkills = true;
+                }
+                else if (!SkillUtils.isSkill(args[1])) {
+                    sender.sendMessage(LocaleLoader.getString("Commands.Skill.Invalid"));
                    return true;
                }

-                String playerName = Misc.getMatchedPlayerName(args[0]);
-                mcMMOPlayer = UserManager.getPlayer(playerName, true);
+                if (!allSkills) {
+                    skill = SkillType.getSkill(args[1]);
+                    skillName = SkillUtils.getSkillName(skill);
+
+                    if (!Permissions.skillresetOthers(sender, skill)) {
+                        sender.sendMessage(command.getPermissionMessage());
+                        return true;
+                    }
+                }
+
+                McMMOPlayer mcMMOPlayer = UserManager.getPlayer(args[0]);

                // If the mcMMOPlayer doesn't exist, create a temporary profile and check if it's present in the database. If it's not, abort the process.
                if (mcMMOPlayer == null) {
-                    profile = mcMMO.getDatabaseManager().loadPlayerProfile(playerName, false);
+                    profile = new PlayerProfile(args[0], false);

-                    if (CommandUtils.unloadedProfile(sender, profile)) {
+                    if (!profile.isLoaded()) {
+                        sender.sendMessage(LocaleLoader.getString("Commands.DoesNotExist"));
                        return true;
                    }

-                    editValues();
+                    if (allSkills) {
+                        for (SkillType skillType : SkillType.values()) {
+                            if (skillType.isChildSkill()) {
+                                continue;
+                            }
+
+                            if (!Permissions.skillresetOthers(sender, skill)) {
+                                sender.sendMessage(command.getPermissionMessage());
+                                continue;
+                            }
+
+                            profile.modifySkill(skillType, 0);
+                        }
+                    }
+                    else {
+                        profile.modifySkill(skill, 0);
+                    }
+
                    profile.save(); // Since this is a temporary profile, we save it here.
                }
                else {
                    profile = mcMMOPlayer.getProfile();
-                    player = mcMMOPlayer.getPlayer();

-                    editValues();
+                    if (allSkills) {
+                        for (SkillType skillType : SkillType.values()) {
+                            if (skillType.isChildSkill()) {
+                                continue;
+                            }
+
+                            if (!Permissions.skillresetOthers(sender, skillType)) {
+                                sender.sendMessage(command.getPermissionMessage());
+                                continue;
+                            }
+
+                            profile.modifySkill(skillType, 0);
+                        }
+
+                        mcMMOPlayer.getPlayer().sendMessage(LocaleLoader.getString("Commands.Reset.All"));
+                    }
+                    else {
+                        profile.modifySkill(skill, 0);
+                        mcMMOPlayer.getPlayer().sendMessage(LocaleLoader.getString("Commands.Reset.Single", skillName));
+                    }
+                }
+
+                if (allSkills) {
+                    sender.sendMessage(LocaleLoader.getString("Commands.addlevels.AwardAll.2", args[0]));
+                }
+                else {
+                    sender.sendMessage(LocaleLoader.getString("Commands.mmoedit.Modified.2", skillName, args[0]));
                }

-                handleSenderMessage(sender, playerName);
                return true;

            default:
                return false;
        }
    }
-
-    @Override
-    protected boolean permissionsCheckSelf(CommandSender sender) {
-        return false;
-    }
-
-    @Override
-    protected boolean permissionsCheckOthers(CommandSender sender) {
-        return false;
-    }
-
-    @Override
-    protected void handleCommand(SkillType skill) {
-        if (argsLength == 1 && !Permissions.skillreset(sender, skill) || (argsLength == 2 && !Permissions.skillresetOthers(sender, skill))) {
-            sender.sendMessage(command.getPermissionMessage());
-            return;
-        }
-
-        profile.modifySkill(skill, 0);
-
-        if (player != null) {
-            mcMMO.p.getServer().getPluginManager().callEvent(new McMMOPlayerLevelDownEvent(player, skill, profile.getSkillLevel(skill)));
-        }
-    }
-
-    @Override
-    protected void handlePlayerMessageAll() {
-        player.sendMessage(LocaleLoader.getString("Commands.Reset.All"));
-    }
-
-    @Override
-    protected void handlePlayerMessageSkill() {
-        player.sendMessage(LocaleLoader.getString("Commands.Reset.Single", SkillUtils.getSkillName(skill)));
-    }
 }
--- a/src/main/java/com/gmail/nossr50/commands/hardcore/HardcoreCommand.java
+++ b/src/main/java/com/gmail/nossr50/commands/hardcore/HardcoreCommand.java
@@ -1,63 +1,85 @@
 package com.gmail.nossr50.commands.hardcore;

+import java.text.DecimalFormat;
+
+import org.bukkit.command.Command;
+import org.bukkit.command.CommandExecutor;
+import org.bukkit.command.CommandSender;
+
 import com.gmail.nossr50.mcMMO;
 import com.gmail.nossr50.config.Config;
-import com.gmail.nossr50.datatypes.skills.SkillType;
 import com.gmail.nossr50.locale.LocaleLoader;
 import com.gmail.nossr50.util.Permissions;
+import com.gmail.nossr50.util.StringUtils;

-public class HardcoreCommand extends HardcoreModeCommand {
+public class HardcoreCommand implements CommandExecutor {
    @Override
-    protected boolean checkTogglePermissions() {
-        return Permissions.hardcoreToggle(sender);
-    }
+    public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
+        switch (args.length) {
+            case 0:
+                if (!Permissions.hardcoreToggle(sender)) {
+                    sender.sendMessage(command.getPermissionMessage());
+                    return true;
+                }

-    @Override
-    protected boolean checkModifyPermissions() {
-        return Permissions.hardcoreModify(sender);
-    }
+                if (Config.getInstance().getHardcoreEnabled()) {
+                    disableHardcore();
+                }
+                else {
+                    enableHardcore();
+                }

-    @Override
-    protected boolean checkEnabled(String skill) {
-        if (skill.equalsIgnoreCase("ALL")) {
-            for (SkillType skillType : SkillType.values()) {
-                if (!skillType.getHardcoreStatLossEnabled()) {
+                return true;
+
+            case 1:
+                if (args[0].equalsIgnoreCase("on") || args[0].equalsIgnoreCase("true") || args[0].equalsIgnoreCase("enabled")) {
+                    if (!Permissions.hardcoreToggle(sender)) {
+                        sender.sendMessage(command.getPermissionMessage());
+                        return true;
+                    }
+
+                    enableHardcore();
+                    return true;
+                }
+
+                if (args[0].equalsIgnoreCase("off") || args[0].equalsIgnoreCase("false") || args[0].equalsIgnoreCase("disabled")) {
+                    if (!Permissions.hardcoreToggle(sender)) {
+                        sender.sendMessage(command.getPermissionMessage());
+                        return true;
+                    }
+
+                    disableHardcore();
+                    return true;
+                }
+
+                if (!StringUtils.isDouble(args[0])) {
                    return false;
                }
-            }

-            return true;
+                if (!Permissions.hardcoreModify(sender)) {
+                    sender.sendMessage(command.getPermissionMessage());
+                    return true;
+                }
+
+                DecimalFormat percent = new DecimalFormat("##0.00%");
+                double newPercent = Double.parseDouble(args[0]);
+
+                Config.getInstance().setHardcoreDeathStatPenaltyPercentage(newPercent);
+                sender.sendMessage(LocaleLoader.getString("Hardcore.PercentageChanged", percent.format(newPercent / 100D)));
+                return true;
+
+            default:
+                return false;
        }
-
-        return SkillType.getSkill(skill).getHardcoreStatLossEnabled();
    }

-    @Override
-    protected void enable(String skill) {
-        toggle(true);
+    private void disableHardcore() {
+        Config.getInstance().setHardcoreEnabled(false);
+        mcMMO.p.getServer().broadcastMessage(LocaleLoader.getString("Hardcore.Disabled"));
    }

-    @Override
-    protected void disable(String skill) {
-        toggle(false);
+    private void enableHardcore() {
+        Config.getInstance().setHardcoreEnabled(true);
+        mcMMO.p.getServer().broadcastMessage(LocaleLoader.getString("Hardcore.Enabled"));
    }
-
-    @Override
-    protected void modify() {
-        Config.getInstance().setHardcoreDeathStatPenaltyPercentage(newPercent);
-        sender.sendMessage(LocaleLoader.getString("Hardcore.DeathStatLoss.PercentageChanged", percent.format(newPercent / 100D)));
-    }
-
-    private void toggle(boolean enable) {
-        if (skill.equalsIgnoreCase("ALL")) {
-            for (SkillType skillType : SkillType.nonChildSkills()) {
-                Config.getInstance().setHardcoreStatLossEnabled(skillType, enable);
-            }
-        }
-        else {
-            Config.getInstance().setHardcoreStatLossEnabled(SkillType.getSkill(skill), enable);
-        }
-
-        mcMMO.p.getServer().broadcastMessage(LocaleLoader.getString("Hardcore.Mode." + (enable ? "Enabled" : "Disabled"), LocaleLoader.getString("Hardcore.DeathStatLoss.Name"), skill));
-    }
-}
+}
--- a/src/main/java/com/gmail/nossr50/commands/hardcore/HardcoreModeCommand.java
+++ b/src/main/java/com/gmail/nossr50/commands/hardcore/HardcoreModeCommand.java
@@ -1,146 +0,0 @@
-package com.gmail.nossr50.commands.hardcore;
-
-import java.text.DecimalFormat;
-import java.util.ArrayList;
-import java.util.List;
-
-import org.bukkit.command.Command;
-import org.bukkit.command.CommandSender;
-import org.bukkit.command.TabExecutor;
-import org.bukkit.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;
-
-import com.google.common.collect.ImmutableList;
-
-public abstract class HardcoreModeCommand implements TabExecutor {
-    protected CommandSender sender;
-    protected double newPercent;
-    protected DecimalFormat percent;
-    protected String skill;
-
-    public HardcoreModeCommand() {
-        percent = new DecimalFormat("##0.00%");
-    }
-
-    @Override
-    public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
-        switch (args.length) {
-            case 0:
-                this.sender = sender;
-
-                if (!checkTogglePermissions()) {
-                    sender.sendMessage(command.getPermissionMessage());
-                    return true;
-                }
-
-                if (checkEnabled("ALL")) {
-                    disable("ALL");
-                }
-                else {
-                    enable("ALL");
-                }
-
-                return true;
-
-            case 1:
-                if (CommandUtils.shouldEnableToggle(args[0])) {
-                    if (!Permissions.hardcoreToggle(sender)) {
-                        sender.sendMessage(command.getPermissionMessage());
-                        return true;
-                    }
-
-                    enable("ALL");
-                    return true;
-                }
-
-                if (CommandUtils.shouldDisableToggle(args[0])) {
-                    if (!Permissions.hardcoreToggle(sender)) {
-                        sender.sendMessage(command.getPermissionMessage());
-                        return true;
-                    }
-
-                    disable("ALL");
-                    return true;
-                }
-
-                if (isInvalidPercentage(sender, args[0])) {
-                    return true;
-                }
-
-                if (!Permissions.hardcoreModify(sender)) {
-                    sender.sendMessage(command.getPermissionMessage());
-                    return true;
-                }
-
-                modify();
-                return true;
-
-
-            case 2:
-                if (!args[0].equalsIgnoreCase("ALL") && CommandUtils.isChildSkill(sender, SkillType.getSkill(args[0]))) {
-                    return true;
-                }
-
-                skill = args[0];
-
-                if (CommandUtils.shouldEnableToggle(args[1])) {
-                    if (!Permissions.hardcoreToggle(sender)) {
-                        sender.sendMessage(command.getPermissionMessage());
-                        return true;
-                    }
-
-                    enable(skill);
-                    return true;
-                }
-
-                if (CommandUtils.shouldDisableToggle(args[1])) {
-                    if (!Permissions.hardcoreToggle(sender)) {
-                        sender.sendMessage(command.getPermissionMessage());
-                        return true;
-                    }
-
-                    disable(skill);
-                    return true;
-                }
-
-                return true;
-
-            default:
-                return false;
-        }
-    }
-
-    @Override
-    public List<String> onTabComplete(CommandSender sender, Command command, String alias, String[] args) {
-        switch (args.length) {
-            case 1:
-                if (StringUtils.isDouble(args[0])) {
-                    return ImmutableList.of();
-                }
-
-                return StringUtil.copyPartialMatches(args[0], CommandUtils.TRUE_FALSE_OPTIONS, new ArrayList<String>(CommandUtils.TRUE_FALSE_OPTIONS.size()));
-            default:
-                return ImmutableList.of();
-        }
-    }
-
-    protected abstract boolean checkTogglePermissions();
-    protected abstract boolean checkModifyPermissions();
-    protected abstract boolean checkEnabled(String skill);
-    protected abstract void enable(String skill);
-    protected abstract void disable(String skill);
-    protected abstract void modify();
-
-    private boolean isInvalidPercentage(CommandSender sender, String value) {
-        if (CommandUtils.isInvalidDouble(sender, value)) {
-            return true;
-        }
-
-        newPercent = Double.parseDouble(value);
-        return false;
-    }
-}
--- a/src/main/java/com/gmail/nossr50/commands/hardcore/VampirismCommand.java
+++ b/src/main/java/com/gmail/nossr50/commands/hardcore/VampirismCommand.java
@@ -1,63 +1,90 @@
 package com.gmail.nossr50.commands.hardcore;

+import java.text.DecimalFormat;
+
+import org.bukkit.command.Command;
+import org.bukkit.command.CommandExecutor;
+import org.bukkit.command.CommandSender;
+
 import com.gmail.nossr50.mcMMO;
 import com.gmail.nossr50.config.Config;
-import com.gmail.nossr50.datatypes.skills.SkillType;
 import com.gmail.nossr50.locale.LocaleLoader;
 import com.gmail.nossr50.util.Permissions;
+import com.gmail.nossr50.util.StringUtils;

-public class VampirismCommand extends HardcoreModeCommand {
+public class VampirismCommand implements CommandExecutor {
    @Override
-    protected boolean checkTogglePermissions() {
-        return Permissions.vampirismToggle(sender);
-    }
-
-    @Override
-    protected boolean checkModifyPermissions() {
-        return Permissions.vampirismModify(sender);
-    }
-
-    @Override
-    protected boolean checkEnabled(String skill) {
-        if (skill.equalsIgnoreCase("ALL")) {
-            for (SkillType skillType : SkillType.values()) {
-                if (!skillType.getHardcoreVampirismEnabled()) {
-                    return false;
-                }
-            }
-
+    public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
+        if (!Config.getInstance().getHardcoreEnabled()) {
+            sender.sendMessage(LocaleLoader.getString("Hardcore.Disabled"));
            return true;
        }

-        return SkillType.getSkill(skill).getHardcoreVampirismEnabled();
-    }
+        switch (args.length) {
+            case 0:
+                if (!Permissions.vampirismToggle(sender)) {
+                    sender.sendMessage(command.getPermissionMessage());
+                    return true;
+                }

-    @Override
-    protected void enable(String skill) {
-        toggle(true);
-    }
+                if (Config.getInstance().getHardcoreVampirismEnabled()) {
+                    disableVampirism();
+                }
+                else {
+                    enableVampirism();
+                }

-    @Override
-    protected void disable(String skill) {
-        toggle(false);
-    }
+                return true;

-    @Override
-    protected void modify() {
-        Config.getInstance().setHardcoreVampirismStatLeechPercentage(newPercent);
-        sender.sendMessage(LocaleLoader.getString("Hardcore.Vampirism.PercentageChanged", percent.format(newPercent / 100D)));
-    }
+            case 1:
+                if (args[0].equalsIgnoreCase("on") || args[0].equalsIgnoreCase("true") || args[0].equalsIgnoreCase("enabled")) {
+                    if (!Permissions.vampirismToggle(sender)) {
+                        sender.sendMessage(command.getPermissionMessage());
+                        return true;
+                    }

-    private void toggle(boolean enabled) {
-        if (skill.equalsIgnoreCase("ALL")) {
-            for (SkillType skillType : SkillType.nonChildSkills()) {
-                Config.getInstance().setHardcoreVampirismEnabled(skillType, enabled);
-            }
+                    enableVampirism();
+                    return true;
+                }
+
+                if (args[0].equalsIgnoreCase("off") || args[0].equalsIgnoreCase("false") || args[0].equalsIgnoreCase("disabled")) {
+                    if (!Permissions.vampirismToggle(sender)) {
+                        sender.sendMessage(command.getPermissionMessage());
+                        return true;
+                    }
+
+                    disableVampirism();
+                    return true;
+                }
+
+                if (!StringUtils.isDouble(args[0])) {
+                    return false;
+                }
+
+                if (!Permissions.vampirismModify(sender)) {
+                    sender.sendMessage(command.getPermissionMessage());
+                    return true;
+                }
+
+                DecimalFormat percent = new DecimalFormat("##0.00%");
+                double newPercent = Double.parseDouble(args[0]);
+
+                Config.getInstance().setHardcoreVampirismStatLeechPercentage(newPercent);
+                sender.sendMessage(LocaleLoader.getString("Vampirism.PercentageChanged", percent.format(newPercent / 100D)));
+                return true;
+
+            default:
+                return false;
        }
-        else {
-            Config.getInstance().setHardcoreVampirismEnabled(SkillType.getSkill(skill), enabled);
-        }
-
-        mcMMO.p.getServer().broadcastMessage(LocaleLoader.getString("Hardcore.Mode." + (enabled ? "Enabled" : "Disabled"), LocaleLoader.getString("Hardcore.Vampirism.Name"), skill));
    }
-}
+
+    private void disableVampirism() {
+        Config.getInstance().setHardcoreVampirismEnabled(false);
+        mcMMO.p.getServer().broadcastMessage(LocaleLoader.getString("Vampirism.Disabled"));
+    }
+
+    private void enableVampirism() {
+        Config.getInstance().setHardcoreVampirismEnabled(true);
+        mcMMO.p.getServer().broadcastMessage(LocaleLoader.getString("Vampirism.Enabled"));
+    }
+}
--- a/src/main/java/com/gmail/nossr50/commands/party/PartyAcceptCommand.java
+++ b/src/main/java/com/gmail/nossr50/commands/party/PartyAcceptCommand.java
@@ -11,12 +11,15 @@ import com.gmail.nossr50.party.PartyManager;
 import com.gmail.nossr50.util.player.UserManager;

 public class PartyAcceptCommand implements CommandExecutor {
+    private McMMOPlayer mcMMOPlayer;
+    private Player player;
+
    @Override
    public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
        switch (args.length) {
            case 1:
-                Player player = (Player) sender;
-                McMMOPlayer mcMMOPlayer = UserManager.getPlayer(player);
+                player = (Player) sender;
+                mcMMOPlayer = UserManager.getPlayer(player);

                if (!mcMMOPlayer.hasPartyInvite()) {
                    sender.sendMessage(LocaleLoader.getString("mcMMO.NoInvites"));
@@ -24,11 +27,11 @@ public class PartyAcceptCommand implements CommandExecutor {
                }

                // Changing parties
-                if (!PartyManager.changeOrJoinParty(mcMMOPlayer, mcMMOPlayer.getPartyInvite().getName())) {
+                if (!PartyManager.changeOrJoinParty(mcMMOPlayer, player, mcMMOPlayer.getParty(), mcMMOPlayer.getPartyInvite().getName())) {
                    return true;
                }

-                PartyManager.joinInvitedParty(mcMMOPlayer);
+                PartyManager.joinInvitedParty(player, mcMMOPlayer);
                return true;

            default:
--- a/src/main/java/com/gmail/nossr50/commands/party/PartyChangeOwnerCommand.java
+++ b/src/main/java/com/gmail/nossr50/commands/party/PartyChangeOwnerCommand.java
@@ -5,10 +5,10 @@ import org.bukkit.command.CommandExecutor;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;

+import com.gmail.nossr50.mcMMO;
 import com.gmail.nossr50.datatypes.party.Party;
 import com.gmail.nossr50.locale.LocaleLoader;
 import com.gmail.nossr50.party.PartyManager;
-import com.gmail.nossr50.util.Misc;
 import com.gmail.nossr50.util.player.UserManager;

 public class PartyChangeOwnerCommand implements CommandExecutor {
@@ -17,14 +17,13 @@ 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(targetName)) {
-                    sender.sendMessage(LocaleLoader.getString("Party.NotInYourParty", targetName));
+                if (!playerParty.getMembers().contains(mcMMO.p.getServer().getOfflinePlayer(args[1]))) {
+                    sender.sendMessage(LocaleLoader.getString("Party.NotInYourParty", args[1]));
                    return true;
                }

-                PartyManager.setPartyLeader(targetName, playerParty);
+                PartyManager.setPartyLeader(args[1], playerParty);
                return true;

            default:
--- a/src/main/java/com/gmail/nossr50/commands/party/PartyChangePasswordCommand.java
+++ b/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 playerParty = UserManager.getPlayer((Player) sender).getParty();

        switch (args.length) {
            case 1:
-                unprotectParty(sender);
+                unprotectParty(sender, playerParty);
                return true;

            case 2:
                if (args[1].equalsIgnoreCase("clear") || args[1].equalsIgnoreCase("reset")) {
-                    unprotectParty(sender);
+                    unprotectParty(sender, playerParty);
                    return true;
                }

-                protectParty(sender, args[1]);
+                protectParty(sender, playerParty, args[1]);
                return true;

            default:
@@ -37,13 +35,13 @@ public class PartyChangePasswordCommand implements CommandExecutor {
        }
    }

-    private void unprotectParty(CommandSender sender) {
+    private void unprotectParty(CommandSender sender, Party playerParty) {
        playerParty.setLocked(true);
        playerParty.setPassword(null);
        sender.sendMessage(LocaleLoader.getString("Party.Password.Removed"));
    }

-    private void protectParty(CommandSender sender, String password) {
+    private void protectParty(CommandSender sender, Party playerParty, String password) {
        playerParty.setLocked(true);
        playerParty.setPassword(password);
        sender.sendMessage(LocaleLoader.getString("Party.Password.Set", password));
--- a/src/main/java/com/gmail/nossr50/commands/party/PartyCommand.java
+++ b/src/main/java/com/gmail/nossr50/commands/party/PartyCommand.java
@@ -1,47 +1,21 @@
 package com.gmail.nossr50.commands.party;

-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-import java.util.Set;
-
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandExecutor;
 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.commands.chat.PartyChatCommand;
-import com.gmail.nossr50.commands.party.teleport.PtpCommand;
 import com.gmail.nossr50.datatypes.player.McMMOPlayer;
 import com.gmail.nossr50.locale.LocaleLoader;
 import com.gmail.nossr50.util.Permissions;
 import com.gmail.nossr50.util.commands.CommandUtils;
 import com.gmail.nossr50.util.player.UserManager;

-import com.google.common.collect.ImmutableList;
-
-public class PartyCommand implements TabExecutor {
+public class PartyCommand implements CommandExecutor {
    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");
-
-    static {
-        ArrayList<String> subcommands = new ArrayList<String>();
-
-        for (PartySubcommandType subcommand : PartySubcommandType.values()) {
-            subcommands.add(subcommand.toString());
-        }
-
-        Collections.sort(subcommands);
-        PARTY_SUBCOMMANDS = ImmutableList.copyOf(subcommands);
-    }
-
    private CommandExecutor partyJoinCommand           = new PartyJoinCommand();
    private CommandExecutor partyAcceptCommand         = new PartyAcceptCommand();
    private CommandExecutor partyCreateCommand         = new PartyCreateCommand();
@@ -57,7 +31,7 @@ public class PartyCommand implements TabExecutor {
    private CommandExecutor partyRenameCommand         = new PartyRenameCommand();
    private CommandExecutor partyInfoCommand           = new PartyInfoCommand();
    private CommandExecutor partyHelpCommand           = new PartyHelpCommand();
-    private CommandExecutor partyTeleportCommand       = mcMMO.p.getCommand("ptp").getExecutor();
+    private CommandExecutor partyTeleportCommand       = new PtpCommand();
    private CommandExecutor partyChatCommand           = new PartyChatCommand();

    @Override
@@ -130,7 +104,7 @@ public class PartyCommand implements TabExecutor {
        }

        // Party leader commands
-        if (!mcMMOPlayer.getParty().getLeader().equalsIgnoreCase(player.getName())) {
+        if (!mcMMOPlayer.getParty().getLeader().equals(player.getName())) {
            sender.sendMessage(LocaleLoader.getString("Party.NotOwner"));
            return true;
        }
@@ -147,6 +121,7 @@ public class PartyCommand implements TabExecutor {
            case OWNER:
                return partyChangeOwnerCommand.onCommand(sender, command, label, args);
            case LOCK:
+                // Fallthrough
            case UNLOCK:
                return partyLockCommand.onCommand(sender, command, label, args);
            case PASSWORD:
@@ -160,57 +135,6 @@ public class PartyCommand implements TabExecutor {
        return true;
    }

-    @Override
-    public List<String> onTabComplete(CommandSender sender, Command command, String alias, String[] args) {
-        switch (args.length) {
-            case 1:
-                return StringUtil.copyPartialMatches(args[0], PARTY_SUBCOMMANDS, new ArrayList<String>(PARTY_SUBCOMMANDS.size()));
-            case 2:
-                PartySubcommandType subcommand = PartySubcommandType.getSubcommand(args[0]);
-
-                if (subcommand == null) {
-                    return ImmutableList.of();
-                }
-
-                switch (subcommand) {
-                    case JOIN:
-                    case INVITE:
-                    case KICK:
-                    case OWNER:
-                        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()));
-                    case ITEMSHARE:
-                        return StringUtil.copyPartialMatches(args[1], ITEMSHARE_COMPLETIONS, new ArrayList<String>(ITEMSHARE_COMPLETIONS.size()));
-                    case LOCK:
-                    case CHAT:
-                        return StringUtil.copyPartialMatches(args[1], CommandUtils.TRUE_FALSE_OPTIONS, new ArrayList<String>(CommandUtils.TRUE_FALSE_OPTIONS.size()));
-                    case PASSWORD:
-                        return StringUtil.copyPartialMatches(args[1], CommandUtils.RESET_OPTIONS, new ArrayList<String>(CommandUtils.RESET_OPTIONS.size()));
-                    case TELEPORT:
-                        List<String> matches = StringUtil.copyPartialMatches(args[1], PtpCommand.TELEPORT_SUBCOMMANDS, new ArrayList<String>(PtpCommand.TELEPORT_SUBCOMMANDS.size()));
-
-                        if (matches.size() == 0) {
-                            playerNames = UserManager.getPlayerNames();
-                            return StringUtil.copyPartialMatches(args[1], playerNames, new ArrayList<String>(playerNames.size()));
-                        }
-
-                        return matches;
-                    default:
-                        return ImmutableList.of();
-                }
-            case 3:
-                if (PartySubcommandType.getSubcommand(args[0]) == PartySubcommandType.ITEMSHARE && isItemShareCategory(args[1])) {
-                    return StringUtil.copyPartialMatches(args[2], CommandUtils.TRUE_FALSE_OPTIONS, new ArrayList<String>(CommandUtils.TRUE_FALSE_OPTIONS.size()));
-                }
-
-                return ImmutableList.of();
-            default:
-                return ImmutableList.of();
-        }
-    }
-
    private boolean printUsage() {
        player.sendMessage(LocaleLoader.getString("Party.Help.0", "/party join"));
        player.sendMessage(LocaleLoader.getString("Party.Help.1", "/party create"));
@@ -227,9 +151,4 @@ public class PartyCommand implements TabExecutor {

        return newArgs;
    }
-
-    private boolean isItemShareCategory(String category) {
-        return category.equalsIgnoreCase("loot") || category.equalsIgnoreCase("mining") || category.equalsIgnoreCase("herbalism") || category.equalsIgnoreCase("woodcutting") || category.equalsIgnoreCase("misc");
-    }
 }
-
--- a/src/main/java/com/gmail/nossr50/commands/party/PartyCreateCommand.java
+++ b/src/main/java/com/gmail/nossr50/commands/party/PartyCreateCommand.java
@@ -5,31 +5,39 @@ import org.bukkit.command.CommandExecutor;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;

+import com.gmail.nossr50.datatypes.party.Party;
 import com.gmail.nossr50.datatypes.player.McMMOPlayer;
 import com.gmail.nossr50.locale.LocaleLoader;
 import com.gmail.nossr50.party.PartyManager;
 import com.gmail.nossr50.util.player.UserManager;

 public class PartyCreateCommand implements CommandExecutor {
+    private McMMOPlayer mcMMOPlayer;
+    private Player player;
+
    @Override
    public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
        switch (args.length) {
            case 2:
+                // Fallthrough
            case 3:
-                Player player = (Player) sender;
-                McMMOPlayer mcMMOPlayer = UserManager.getPlayer(player);
+                Party newParty = PartyManager.getParty(args[1]);

                // Check to see if the party exists, and if it does cancel creating a new party
-                if (PartyManager.checkPartyExistence(player, args[1])) {
+                if (newParty != null) {
+                    sender.sendMessage(LocaleLoader.getString("Commands.Party.AlreadyExists", args[1]));
                    return true;
                }

+                player = (Player) sender;
+                mcMMOPlayer = UserManager.getPlayer(player);
+
                // Changing parties
-                if (!PartyManager.changeOrJoinParty(mcMMOPlayer, args[1])) {
+                if (!PartyManager.changeOrJoinParty(mcMMOPlayer, player, mcMMOPlayer.getParty(), args[1])) {
                    return true;
                }

-                PartyManager.createParty(mcMMOPlayer, args[1], getPassword(args));
+                PartyManager.createParty(player, mcMMOPlayer, args[1], getPassword(args));
                return true;

            default:
--- a/src/main/java/com/gmail/nossr50/commands/party/PartyDisbandCommand.java
+++ b/src/main/java/com/gmail/nossr50/commands/party/PartyDisbandCommand.java
@@ -17,10 +17,9 @@ public class PartyDisbandCommand implements CommandExecutor {
        switch (args.length) {
            case 1:
                Party playerParty = UserManager.getPlayer((Player) sender).getParty();
-                String partyName = playerParty.getName();

                for (Player member : playerParty.getOnlineMembers()) {
-                    if (!PartyManager.handlePartyChangeEvent(member, partyName, null, EventReason.KICKED_FROM_PARTY)) {
+                    if (!PartyManager.handlePartyChangeEvent(member, playerParty.getName(), null, EventReason.KICKED_FROM_PARTY)) {
                        return true;
                    }

--- a/src/main/java/com/gmail/nossr50/commands/party/PartyExpShareCommand.java
+++ b/src/main/java/com/gmail/nossr50/commands/party/PartyExpShareCommand.java
@@ -7,10 +7,10 @@ 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 {
@@ -27,14 +27,14 @@ public class PartyExpShareCommand implements CommandExecutor {
            case 2:
                playerParty = UserManager.getPlayer((Player) sender).getParty();

-                if (args[1].equalsIgnoreCase("none") || CommandUtils.shouldDisableToggle(args[1])) {
+                if (args[1].equalsIgnoreCase("none") || args[1].equalsIgnoreCase("off") || args[1].equalsIgnoreCase("false")) {
                    handleChangingShareMode(ShareMode.NONE);
                }
-                else if (args[1].equalsIgnoreCase("equal") || args[1].equalsIgnoreCase("even") || CommandUtils.shouldEnableToggle(args[1])) {
+                else if (args[1].equalsIgnoreCase("equal") || args[1].equalsIgnoreCase("even") || args[1].equalsIgnoreCase("on") || args[1].equalsIgnoreCase("true")) {
                    handleChangingShareMode(ShareMode.EQUAL);
                }
                else {
-                    sender.sendMessage(LocaleLoader.getString("Commands.Usage.2", "party", "expshare", "<NONE | EQUAL>"));
+                    sender.sendMessage(LocaleLoader.getString("Commands.Usage.2", "party", "expshare", "[NONE | EQUAL]"));
                }

                return true;
@@ -45,13 +45,11 @@ public class PartyExpShareCommand implements CommandExecutor {
        }
    }

-    private void handleChangingShareMode(ShareMode mode) {
+    private void handleChangingShareMode(ShareHandler.ShareMode mode) {
        playerParty.setXpShareMode(mode);

-        String changeModeMessage = LocaleLoader.getString("Commands.Party.SetSharing", LocaleLoader.getString("Party.ShareType.Exp"), LocaleLoader.getString("Party.ShareMode." + StringUtils.getCapitalized(mode.toString())));
-
        for (Player member : playerParty.getOnlineMembers()) {
-            member.sendMessage(changeModeMessage);
+            member.sendMessage(LocaleLoader.getString("Commands.Party.SetSharing", LocaleLoader.getString("Party.ShareType.Exp"), LocaleLoader.getString("Party.ShareMode." + StringUtils.getCapitalized(mode.toString()))));
        }
    }
 }
--- a/src/main/java/com/gmail/nossr50/commands/party/PartyHelpCommand.java
+++ b/src/main/java/com/gmail/nossr50/commands/party/PartyHelpCommand.java
@@ -19,8 +19,6 @@ public class PartyHelpCommand implements CommandExecutor {
                sender.sendMessage(LocaleLoader.getString("Party.Help.6", "/party kick"));
                sender.sendMessage(LocaleLoader.getString("Party.Help.7", "/party leader"));
                sender.sendMessage(LocaleLoader.getString("Party.Help.8", "/party disband"));
-                sender.sendMessage(LocaleLoader.getString("Party.Help.9", "/party itemshare"));
-                sender.sendMessage(LocaleLoader.getString("Party.Help.10", "/party expshare"));
                return true;

            default:
@@ -28,4 +26,5 @@ public class PartyHelpCommand implements CommandExecutor {
                return true;
        }
    }
+
 }
--- a/src/main/java/com/gmail/nossr50/commands/party/PartyInfoCommand.java
+++ b/src/main/java/com/gmail/nossr50/commands/party/PartyInfoCommand.java
@@ -1,61 +1,49 @@
 package com.gmail.nossr50.commands.party;

 import org.bukkit.ChatColor;
+import org.bukkit.OfflinePlayer;
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandExecutor;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;

-import com.gmail.nossr50.mcMMO;
 import com.gmail.nossr50.config.Config;
 import com.gmail.nossr50.datatypes.party.Party;
-import com.gmail.nossr50.datatypes.party.ShareMode;
 import com.gmail.nossr50.datatypes.player.McMMOPlayer;
 import com.gmail.nossr50.locale.LocaleLoader;
 import com.gmail.nossr50.party.PartyManager;
+import com.gmail.nossr50.party.ShareHandler;
 import com.gmail.nossr50.util.player.UserManager;

 public class PartyInfoCommand implements CommandExecutor {
-    private McMMOPlayer mcMMOPlayer;
    private Player player;
    private Party playerParty;

    @Override
    public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
-        switch (args.length) {
-            case 0:
-            case 1:
-                player = (Player) sender;
-                mcMMOPlayer = UserManager.getPlayer(player);
-                playerParty = mcMMOPlayer.getParty();
+        player = (Player) sender;
+        McMMOPlayer mcMMOPlayer = UserManager.getPlayer(player);
+        playerParty = mcMMOPlayer.getParty();

-                displayPartyHeader();
-                displayShareModeInfo();
-                displayMemberInfo();
-                return true;
-            default:
-                sender.sendMessage(LocaleLoader.getString("Commands.Usage.1", "party", "info"));
-                return true;
-        }
+        displayPartyHeader();
+        displayShareModeInfo();
+        displayMemberInfo();
+        return true;
    }

    private String createMembersList() {
        StringBuilder memberList = new StringBuilder();

-        for (String memberName : playerParty.getMembers()) {
-            Player member = mcMMO.p.getServer().getPlayerExact(memberName);
-
-            if (playerParty.getLeader().equalsIgnoreCase(memberName)) {
-                memberList.append(ChatColor.GOLD);
+        for (OfflinePlayer member : playerParty.getMembers()) {
+            if (playerParty.getLeader().equals(member.getName())) {
+                memberList.append(ChatColor.GOLD).append(member.getName()).append(" ");
            }
-            else if (member != null) {
-                memberList.append(ChatColor.WHITE);
+            else if (member.isOnline()) {
+                memberList.append(ChatColor.WHITE).append(member.getName()).append(" ");
            }
            else {
-                memberList.append(ChatColor.GRAY);
+                memberList.append(ChatColor.GRAY).append(member.getName()).append(" ");
            }
-
-            memberList.append(memberName).append(" ");
        }

        return memberList.toString();
@@ -64,7 +52,7 @@ public class PartyInfoCommand implements CommandExecutor {
    private void displayShareModeInfo() {
        boolean xpShareEnabled = Config.getInstance().getExpShareEnabled();
        boolean itemShareEnabled = Config.getInstance().getItemShareEnabled();
-        boolean itemSharingActive = (playerParty.getItemShareMode() != ShareMode.NONE);
+        boolean itemSharingActive = playerParty.getItemShareMode() != ShareHandler.ShareMode.NONE;

        if (!xpShareEnabled && !itemShareEnabled) {
            return;
@@ -104,11 +92,11 @@ public class PartyInfoCommand implements CommandExecutor {
    }

    private void displayMemberInfo() {
-        int membersNear = PartyManager.getNearMembers(mcMMOPlayer).size();
+        int membersNear = PartyManager.getNearMembers(player, playerParty, Config.getInstance().getPartyShareRange()).size();
        int membersOnline = playerParty.getOnlineMembers().size() - 1;

        player.sendMessage(LocaleLoader.getString("Commands.Party.Members.Header"));
        player.sendMessage(LocaleLoader.getString("Commands.Party.MembersNear", membersNear, membersOnline));
-        player.sendMessage(createMembersList());
+        player.sendMessage(LocaleLoader.getString("Commands.Party.Members", createMembersList()));
    }
 }
--- a/src/main/java/com/gmail/nossr50/commands/party/PartyInviteCommand.java
+++ b/src/main/java/com/gmail/nossr50/commands/party/PartyInviteCommand.java
@@ -5,30 +5,40 @@ import org.bukkit.command.CommandExecutor;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;

+import com.gmail.nossr50.mcMMO;
 import com.gmail.nossr50.datatypes.party.Party;
 import com.gmail.nossr50.datatypes.player.McMMOPlayer;
 import com.gmail.nossr50.locale.LocaleLoader;
 import com.gmail.nossr50.party.PartyManager;
-import com.gmail.nossr50.util.Misc;
-import com.gmail.nossr50.util.commands.CommandUtils;
 import com.gmail.nossr50.util.player.UserManager;

 public class PartyInviteCommand implements CommandExecutor {
+    private McMMOPlayer mcMMOTarget;
+    private Player target;
+
+    private McMMOPlayer mcMMOPlayer;
+    private Player player;
+    private Party playerParty;
+
    @Override
    public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
        switch (args.length) {
            case 2:
-                String targetName = Misc.getMatchedPlayerName(args[1]);
-                McMMOPlayer mcMMOTarget = UserManager.getPlayer(targetName, true);
-
-                if (!CommandUtils.checkPlayerExistence(sender, targetName, mcMMOTarget)) {
-                    return false;
+                if (!mcMMO.p.getServer().getOfflinePlayer(args[1]).isOnline()) {
+                    sender.sendMessage(LocaleLoader.getString("Party.NotOnline", args[1]));
+                    return true;
                }

-                Player target = mcMMOTarget.getPlayer();
-                Player player = (Player) sender;
-                McMMOPlayer mcMMOPlayer = UserManager.getPlayer(player);
-                String playerName = player.getName();
+                mcMMOTarget = UserManager.getPlayer(args[1]);
+
+                if (mcMMOTarget == null) {
+                    sender.sendMessage(LocaleLoader.getString("Party.Player.Invalid"));
+                    return true;
+                }
+
+                target = mcMMOTarget.getPlayer();
+                mcMMOPlayer = UserManager.getPlayer((Player) sender);
+                player = mcMMOPlayer.getPlayer();

                if (player.equals(target)) {
                    sender.sendMessage(LocaleLoader.getString("Party.Invite.Self"));
@@ -36,20 +46,21 @@ public class PartyInviteCommand implements CommandExecutor {
                }

                if (PartyManager.inSameParty(player, target)) {
-                    sender.sendMessage(LocaleLoader.getString("Party.Player.InSameParty", targetName));
+                    sender.sendMessage(LocaleLoader.getString("Party.Player.InSameParty", target.getName()));
                    return true;
                }

-                if (!PartyManager.canInvite(mcMMOPlayer)) {
+                playerParty = mcMMOPlayer.getParty();
+
+                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(), playerName));
+                target.sendMessage(LocaleLoader.getString("Commands.Party.Invite.0", playerParty.getName(), player.getName()));
                target.sendMessage(LocaleLoader.getString("Commands.Party.Invite.1"));
                return true;

--- a/src/main/java/com/gmail/nossr50/commands/party/PartyItemShareCommand.java
+++ b/src/main/java/com/gmail/nossr50/commands/party/PartyItemShareCommand.java
@@ -6,12 +6,11 @@ import org.bukkit.command.CommandSender;
 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;
+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 {
@@ -27,64 +26,76 @@ public class PartyItemShareCommand implements CommandExecutor {
        switch (args.length) {
            case 2:
                playerParty = UserManager.getPlayer((Player) sender).getParty();
-                ShareMode mode = ShareMode.getShareMode(args[1].toUpperCase());

-                if (mode == null) {
+                if (args[1].equalsIgnoreCase("none") || args[1].equalsIgnoreCase("off") || args[1].equalsIgnoreCase("false")) {
+                    handleChangingShareMode(ShareMode.NONE);
+                }
+                else if (args[1].equalsIgnoreCase("equal") || args[1].equalsIgnoreCase("even")) {
+                    handleChangingShareMode(ShareMode.EQUAL);
+                }
+                else if (args[1].equalsIgnoreCase("random")) {
+                    handleChangingShareMode(ShareMode.RANDOM);
+                }
+                else {
                    sender.sendMessage(LocaleLoader.getString("Commands.Usage.2", "party", "itemshare", "<NONE | EQUAL | RANDOM>"));
-                    return true;
                }

-                handleChangingShareMode(mode);
                return true;

            case 3:
                playerParty = UserManager.getPlayer((Player) sender).getParty();
                boolean toggle = false;

-                if (CommandUtils.shouldEnableToggle(args[2])) {
+                if (args[2].equalsIgnoreCase("true") || args[2].equalsIgnoreCase("on") || args[2].equalsIgnoreCase("enabled")) {
                    toggle = true;
                }
-                else if (CommandUtils.shouldDisableToggle(args[2])) {
+                else if (args[2].equalsIgnoreCase("false") || args[2].equalsIgnoreCase("off") || args[2].equalsIgnoreCase("disabled")) {
                    toggle = false;
                }
+
+                if (args[1].equalsIgnoreCase("loot")) {
+                    playerParty.setSharingLootDrops(toggle);
+                }
+                else if (args[1].equalsIgnoreCase("mining")) {
+                    playerParty.setSharingMiningDrops(toggle);
+                }
+                else if (args[1].equalsIgnoreCase("herbalism")) {
+                    playerParty.setSharingHerbalismDrops(toggle);
+                }
+                else if (args[1].equalsIgnoreCase("woodcutting")) {
+                    playerParty.setSharingWoodcuttingDrops(toggle);
+                }
                else {
-                    sender.sendMessage(LocaleLoader.getString("Commands.Usage.2", "party", "itemshare", "<loot | mining | herbalism | woodcutting | misc> <true | false>"));
-                    return true;
-                }
-
-                try {
-                    handleToggleItemShareCategory(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>"));
+                    sender.sendMessage(LocaleLoader.getString("Commands.Usage.2", "party", "itemshare", "<loot | mining | herbalism | woodcutting> <true | false>"));
                }

+                notifyToggleItemShareCategory(args, toggle);
                return true;

            default:
                sender.sendMessage(LocaleLoader.getString("Commands.Usage.2", "party", "itemshare", "<NONE | EQUAL | RANDOM>"));
-                sender.sendMessage(LocaleLoader.getString("Commands.Usage.2", "party", "itemshare", "<loot | mining | herbalism | woodcutting | misc> <true | false>"));
+                sender.sendMessage(LocaleLoader.getString("Commands.Usage.2", "party", "itemshare", "<loot | mining | herbalism | woodcutting> <true | false>"));
                return true;
        }
    }

-    private void handleChangingShareMode(ShareMode mode) {
+    private void handleChangingShareMode(ShareHandler.ShareMode mode) {
        playerParty.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()) {
-            member.sendMessage(changeModeMessage);
+            member.sendMessage(LocaleLoader.getString("Commands.Party.SetSharing", LocaleLoader.getString("Party.ShareType.Item"), LocaleLoader.getString("Party.ShareMode." + StringUtils.getCapitalized(mode.toString()))));
        }
    }

-    private void handleToggleItemShareCategory(ItemShareType type, boolean toggle) {
-        playerParty.setSharingDrops(type, toggle);
+    private void notifyToggleItemShareCategory(String[] args, boolean toggle) {
+        String state = "disabled";

-        String toggleMessage = LocaleLoader.getString("Commands.Party.ToggleShareCategory", StringUtils.getCapitalized(type.toString()), toggle ? "enabled" : "disabled");
+        if (toggle) {
+            state = "enabled";
+        }

        for (Player member : playerParty.getOnlineMembers()) {
-            member.sendMessage(toggleMessage);
+            member.sendMessage(LocaleLoader.getString("Commands.Party.ToggleShareCategory", StringUtils.getCapitalized(args[1]), state));
        }
    }
 }
--- a/src/main/java/com/gmail/nossr50/commands/party/PartyJoinCommand.java
+++ b/src/main/java/com/gmail/nossr50/commands/party/PartyJoinCommand.java
@@ -5,12 +5,11 @@ import org.bukkit.command.CommandExecutor;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;

+import com.gmail.nossr50.mcMMO;
 import com.gmail.nossr50.datatypes.party.Party;
 import com.gmail.nossr50.datatypes.player.McMMOPlayer;
 import com.gmail.nossr50.locale.LocaleLoader;
 import com.gmail.nossr50.party.PartyManager;
-import com.gmail.nossr50.util.Misc;
-import com.gmail.nossr50.util.commands.CommandUtils;
 import com.gmail.nossr50.util.player.UserManager;

 public class PartyJoinCommand implements CommandExecutor {
@@ -20,20 +19,19 @@ public class PartyJoinCommand implements CommandExecutor {

    private McMMOPlayer mcMMOPlayer;
    private Player player;
+    private Party playerParty;

    @Override
    public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
        switch (args.length) {
            case 2:
+                // Fallthrough
            case 3:
                // Verify target exists and is in a different party than the player
                if (!canJoinParty(sender, args[1])) {
                    return true;
                }

-                mcMMOPlayer = UserManager.getPlayer((Player) sender);
-                player = mcMMOPlayer.getPlayer();
-
                String password = getPassword(args);

                // Make sure party passwords match
@@ -41,15 +39,12 @@ public class PartyJoinCommand implements CommandExecutor {
                    return true;
                }

-                String partyName = targetParty.getName();
-
                // Changing parties
-                if (!PartyManager.changeOrJoinParty(mcMMOPlayer, partyName)) {
+                if (!PartyManager.changeOrJoinParty(mcMMOPlayer, player, playerParty, targetParty.getName())) {
                    return true;
                }

-                player.sendMessage(LocaleLoader.getString("Commands.Party.Join", partyName));
-                PartyManager.addToParty(mcMMOPlayer, targetParty);
+                PartyManager.joinParty(player, mcMMOPlayer, targetParty, password);
                return true;

            default:
@@ -67,10 +62,15 @@ public class PartyJoinCommand implements CommandExecutor {
    }

    private boolean canJoinParty(CommandSender sender, String targetName) {
-        targetName = Misc.getMatchedPlayerName(targetName);
+        if (!mcMMO.p.getServer().getOfflinePlayer(targetName).isOnline()) {
+            sender.sendMessage(LocaleLoader.getString("Party.NotOnline", targetName));
+            return false;
+        }
+
        mcMMOTarget = UserManager.getPlayer(targetName);

-        if (!CommandUtils.checkPlayerExistence(sender, targetName, mcMMOTarget)) {
+        if (mcMMOTarget == null) {
+            sender.sendMessage(LocaleLoader.getString("Party.Player.Invalid"));
            return false;
        }

@@ -83,9 +83,10 @@ public class PartyJoinCommand implements CommandExecutor {

        player = (Player) sender;
        mcMMOPlayer = UserManager.getPlayer(player);
+        playerParty = mcMMOPlayer.getParty();
        targetParty = mcMMOTarget.getParty();

-        if (player.equals(target) || (mcMMOPlayer.inParty() && mcMMOPlayer.getParty().equals(targetParty))) {
+        if (player.equals(target) || (mcMMOPlayer.inParty() && playerParty.equals(targetParty))) {
            sender.sendMessage(LocaleLoader.getString("Party.Join.Self"));
            return false;
        }
--- a/src/main/java/com/gmail/nossr50/commands/party/PartyKickCommand.java
+++ b/src/main/java/com/gmail/nossr50/commands/party/PartyKickCommand.java
@@ -19,10 +19,11 @@ public class PartyKickCommand implements CommandExecutor {
        switch (args.length) {
            case 2:
                Party playerParty = UserManager.getPlayer((Player) sender).getParty();
+
                OfflinePlayer target = mcMMO.p.getServer().getOfflinePlayer(args[1]);

-                if (!playerParty.getMembers().contains(target.getName())) {
-                    sender.sendMessage(LocaleLoader.getString("Party.NotInYourParty", target.getName()));
+                if (!playerParty.getMembers().contains(target)) {
+                    sender.sendMessage(LocaleLoader.getString("Party.NotInYourParty", args[1]));
                    return true;
                }

@@ -34,7 +35,6 @@ public class PartyKickCommand implements CommandExecutor {
                        return true;
                    }

-                    PartyManager.processPartyLeaving(UserManager.getPlayer(onlineTarget));
                    onlineTarget.sendMessage(LocaleLoader.getString("Commands.Party.Kick", partyName));
                }

--- a/src/main/java/com/gmail/nossr50/commands/party/PartyLockCommand.java
+++ b/src/main/java/com/gmail/nossr50/commands/party/PartyLockCommand.java
@@ -8,7 +8,6 @@ import org.bukkit.entity.Player;
 import com.gmail.nossr50.datatypes.party.Party;
 import com.gmail.nossr50.locale.LocaleLoader;
 import com.gmail.nossr50.util.Permissions;
-import com.gmail.nossr50.util.commands.CommandUtils;
 import com.gmail.nossr50.util.player.UserManager;

 public class PartyLockCommand implements CommandExecutor {
@@ -21,10 +20,10 @@ public class PartyLockCommand implements CommandExecutor {
        switch (args.length) {
            case 1:
                if (args[0].equalsIgnoreCase("lock")) {
-                    lockParty(sender, command.getPermissionMessage());
+                    lockParty(sender, command);
                }
                else if (args[0].equalsIgnoreCase("unlock")) {
-                    unlockParty(sender, command.getPermissionMessage());
+                    unlockParty(sender, command);
                }

                return true;
@@ -35,11 +34,11 @@ public class PartyLockCommand implements CommandExecutor {
                    return true;
                }

-                if (CommandUtils.shouldEnableToggle(args[1])) {
-                    lockParty(sender, command.getPermissionMessage());
+                if (args[1].equalsIgnoreCase("on") || args[1].equalsIgnoreCase("true")) {
+                    lockParty(sender, command);
                }
-                else if (CommandUtils.shouldDisableToggle(args[1])) {
-                    unlockParty(sender, command.getPermissionMessage());
+                else if (args[1].equalsIgnoreCase("off") || args[1].equalsIgnoreCase("false")) {
+                    unlockParty(sender, command);
                }
                else {
                    sendUsageStrings(sender);
@@ -56,9 +55,9 @@ public class PartyLockCommand implements CommandExecutor {
    /**
     * Handle locking a party.
     */
-    private void lockParty(CommandSender sender, String permissionMessage) {
+    private void lockParty(CommandSender sender, Command command) {
        if (!Permissions.partySubcommand(sender, PartySubcommandType.LOCK)) {
-            sender.sendMessage(permissionMessage);
+            sender.sendMessage(command.getPermissionMessage());
            return;
        }

@@ -73,10 +72,12 @@ public class PartyLockCommand implements CommandExecutor {

    /**
     * Handle unlocking a party.
+     *
+     * @return true if party is successfully unlocked, false otherwise.
     */
-    private void unlockParty(CommandSender sender, String permissionMessage) {
+    private void unlockParty(CommandSender sender, Command command) {
        if (!Permissions.partySubcommand(sender, PartySubcommandType.UNLOCK)) {
-            sender.sendMessage(permissionMessage);
+            sender.sendMessage(command.getPermissionMessage());
            return;
        }

--- a/src/main/java/com/gmail/nossr50/commands/party/PartyQuitCommand.java
+++ b/src/main/java/com/gmail/nossr50/commands/party/PartyQuitCommand.java
@@ -6,31 +6,32 @@ 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;
 import com.gmail.nossr50.util.player.UserManager;

 public class PartyQuitCommand implements CommandExecutor {
+    private Player player;
+    private Party playerParty;
+
    @Override
    public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
        switch (args.length) {
            case 1:
-                Player player = (Player) sender;
-                McMMOPlayer mcMMOPlayer = UserManager.getPlayer(player);
-                Party playerParty = mcMMOPlayer.getParty();
+                player = (Player) sender;
+                playerParty = UserManager.getPlayer(player).getParty();

                if (!PartyManager.handlePartyChangeEvent(player, playerParty.getName(), null, EventReason.LEFT_PARTY)) {
                    return true;
                }

-                PartyManager.removeFromParty(mcMMOPlayer);
+                PartyManager.removeFromParty(player, playerParty);
                sender.sendMessage(LocaleLoader.getString("Commands.Party.Leave"));
                return true;

            default:
-                sender.sendMessage(LocaleLoader.getString("Commands.Usage.1", "party", "quit"));
+                sender.sendMessage(LocaleLoader.getString("Commands.Usage.1", "party", "[quit|q|leave]"));
                return true;
        }
    }
--- a/src/main/java/com/gmail/nossr50/commands/party/PartyRenameCommand.java
+++ b/src/main/java/com/gmail/nossr50/commands/party/PartyRenameCommand.java
@@ -6,7 +6,6 @@ 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;
@@ -15,35 +14,33 @@ import com.gmail.nossr50.util.player.UserManager;
 public class PartyRenameCommand implements CommandExecutor {
    @Override
    public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
+        Party playerParty = UserManager.getPlayer((Player) sender).getParty();
+        String leaderName = playerParty.getLeader();
+
        switch (args.length) {
            case 2:
-                McMMOPlayer mcMMOPlayer = UserManager.getPlayer((Player) sender);
-                Party playerParty = mcMMOPlayer.getParty();
-
-                String oldPartyName = playerParty.getName();
                String newPartyName = args[1];

                // This is to prevent party leaders from spamming other players with the rename message
-                if (oldPartyName.equalsIgnoreCase(newPartyName)) {
+                if (playerParty.getName().equalsIgnoreCase(newPartyName)) {
                    sender.sendMessage(LocaleLoader.getString("Party.Rename.Same"));
                    return true;
                }

-                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, newPartyName)) {
+                if (newParty != null) {
+                    sender.sendMessage(LocaleLoader.getString("Commands.Party.AlreadyExists", newPartyName));
                    return true;
                }

-                String leaderName = playerParty.getLeader();
-
                for (Player member : playerParty.getOnlineMembers()) {
-                    if (!PartyManager.handlePartyChangeEvent(member, oldPartyName, newPartyName, EventReason.CHANGED_PARTIES)) {
+                    if (!PartyManager.handlePartyChangeEvent(member, playerParty.getName(), newPartyName, EventReason.CHANGED_PARTIES)) {
                        return true;
                    }

-                    if (!member.getName().equalsIgnoreCase(leaderName)) {
+                    if (!member.getName().equals(leaderName)) {
                        member.sendMessage(LocaleLoader.getString("Party.InformedOnNameChange", leaderName, newPartyName));
                    }
                }
--- a/src/main/java/com/gmail/nossr50/commands/party/PtpCommand.java
+++ b/src/main/java/com/gmail/nossr50/commands/party/PtpCommand.java
@@ -0,0 +1,216 @@
+package com.gmail.nossr50.commands.party;
+
+import org.bukkit.World;
+import org.bukkit.command.Command;
+import org.bukkit.command.CommandExecutor;
+import org.bukkit.command.CommandSender;
+import org.bukkit.entity.Player;
+
+import com.gmail.nossr50.mcMMO;
+import com.gmail.nossr50.config.Config;
+import com.gmail.nossr50.datatypes.player.McMMOPlayer;
+import com.gmail.nossr50.events.party.McMMOPartyTeleportEvent;
+import com.gmail.nossr50.locale.LocaleLoader;
+import com.gmail.nossr50.party.PartyManager;
+import com.gmail.nossr50.util.Misc;
+import com.gmail.nossr50.util.Permissions;
+import com.gmail.nossr50.util.commands.CommandUtils;
+import com.gmail.nossr50.util.player.UserManager;
+
+public class PtpCommand implements CommandExecutor {
+    private Player player;
+    private McMMOPlayer mcMMOPlayer;
+
+    private Player target;
+    private McMMOPlayer mcMMOTarget;
+
+    @Override
+    public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
+        if (CommandUtils.noConsoleUsage(sender)) {
+            return true;
+        }
+
+        switch (args.length) {
+            case 1:
+                if (args[0].equalsIgnoreCase("toggle")) {
+                    if (!Permissions.partyTeleportToggle(sender)) {
+                        sender.sendMessage(command.getPermissionMessage());
+                        return true;
+                    }
+
+                    return togglePartyTeleportation();
+                }
+
+                if (args[0].equalsIgnoreCase("acceptany") || args[0].equalsIgnoreCase("acceptall")) {
+                    if (!Permissions.partyTeleportAcceptAll(sender)) {
+                        sender.sendMessage(command.getPermissionMessage());
+                        return true;
+                    }
+
+                    return acceptAnyTeleportRequest();
+                }
+
+                player = (Player) sender;
+                int ptpCooldown = Config.getInstance().getPTPCommandCooldown();
+                long recentlyHurt = UserManager.getPlayer(player).getRecentlyHurt() * Misc.TIME_CONVERSION_FACTOR;
+
+                if (System.currentTimeMillis() - recentlyHurt >= (ptpCooldown * Misc.TIME_CONVERSION_FACTOR)) {
+                    player.sendMessage(LocaleLoader.getString("Party.Teleport.Hurt", ptpCooldown));
+                    return true;
+                }
+
+                if (args[0].equalsIgnoreCase("accept")) {
+                    if (!Permissions.partyTeleportAccept(sender)) {
+                        sender.sendMessage(command.getPermissionMessage());
+                        return true;
+                    }
+
+                    return acceptTeleportRequest();
+                }
+
+                return sendTeleportRequest(args[0]);
+
+            default:
+                return false;
+        }
+    }
+
+    private boolean sendTeleportRequest(String targetName) {
+        if (!canTeleport(targetName)) {
+            return true;
+        }
+
+        if (!mcMMOTarget.getPtpConfirmRequired()) {
+            return handlePartyTeleportEvent(player, target);
+        }
+
+        mcMMOTarget.setPtpRequest(player);
+        mcMMOTarget.actualizePtpTimeout();
+        player.sendMessage(LocaleLoader.getString("Commands.Invite.Success"));
+
+        int ptpRequestExpire = Config.getInstance().getPTPCommandTimeout();
+
+        target.sendMessage(LocaleLoader.getString("Commands.ptp.Request1", player.getName()));
+        target.sendMessage(LocaleLoader.getString("Commands.ptp.Request2", ptpRequestExpire));
+        return true;
+    }
+
+    private boolean acceptTeleportRequest() {
+        if (!mcMMOPlayer.hasPtpRequest()) {
+            player.sendMessage(LocaleLoader.getString("Commands.ptp.NoRequests"));
+            return true;
+        }
+
+        int ptpRequestExpire = Config.getInstance().getPTPCommandTimeout();
+
+        if ((mcMMOPlayer.getPtpTimeout() + ptpRequestExpire) * Misc.TIME_CONVERSION_FACTOR < System.currentTimeMillis()) {
+            mcMMOPlayer.removePtpRequest();
+            player.sendMessage(LocaleLoader.getString("Commands.ptp.RequestExpired"));
+            return true;
+        }
+
+        target = mcMMOPlayer.getPtpRequest();
+
+        if (!canTeleport(target.getName())) {
+            mcMMOPlayer.removePtpRequest();
+            return true;
+        }
+
+        if (Config.getInstance().getPTPCommandWorldPermissions()) {
+            World targetWorld = target.getWorld();
+            World playerWorld = player.getWorld();
+
+            if (!Permissions.partyTeleportAllWorlds(target)) {
+                if (!Permissions.partyTeleportWorld(target, targetWorld)) {
+                    target.sendMessage(LocaleLoader.getString("Commands.ptp.NoWorldPermissions", targetWorld.getName()));
+                    return true;
+                }
+                else if (targetWorld != playerWorld && !Permissions.partyTeleportWorld(target, playerWorld)) {
+                    target.sendMessage(LocaleLoader.getString("Commands.ptp.NoWorldPermissions", playerWorld.getName()));
+                    return true;
+                }
+            }
+        }
+
+        return handlePartyTeleportEvent(target, player);
+    }
+
+    private boolean acceptAnyTeleportRequest() {
+        if (mcMMOPlayer.getPtpConfirmRequired()) {
+            player.sendMessage(LocaleLoader.getString("Commands.ptp.AcceptAny.Disabled"));
+        }
+        else {
+            player.sendMessage(LocaleLoader.getString("Commands.ptp.AcceptAny.Enabled"));
+        }
+
+        mcMMOPlayer.togglePtpConfirmRequired();
+        return true;
+    }
+
+    private boolean togglePartyTeleportation() {
+        if (mcMMOPlayer.getPtpEnabled()) {
+            player.sendMessage(LocaleLoader.getString("Commands.ptp.Disabled"));
+        }
+        else {
+            player.sendMessage(LocaleLoader.getString("Commands.ptp.Enabled"));
+        }
+
+        mcMMOPlayer.togglePtpUse();
+        return true;
+    }
+
+    private boolean canTeleport(String targetName) {
+        if (!mcMMO.p.getServer().getOfflinePlayer(targetName).isOnline()) {
+            player.sendMessage(LocaleLoader.getString("Party.NotOnline", targetName));
+            return false;
+        }
+
+        mcMMOTarget = UserManager.getPlayer(targetName);
+
+        if (mcMMOTarget == null) {
+            player.sendMessage(LocaleLoader.getString("Party.Player.Invalid"));
+            return false;
+        }
+
+        target = mcMMOTarget.getPlayer();
+
+        if (player.equals(target)) {
+            player.sendMessage(LocaleLoader.getString("Party.Teleport.Self"));
+            return false;
+        }
+
+        if (!PartyManager.inSameParty(player, target)) {
+            player.sendMessage(LocaleLoader.getString("Party.NotInYourParty", targetName));
+            return false;
+        }
+
+        if (!mcMMOTarget.getPtpEnabled()) {
+            player.sendMessage(LocaleLoader.getString("Party.Teleport.Disabled", target.getName()));
+            return false;
+        }
+
+        if (target.isDead()) {
+            player.sendMessage(LocaleLoader.getString("Party.Teleport.Dead"));
+            return false;
+        }
+
+        return true;
+    }
+
+    private boolean handlePartyTeleportEvent(Player player, Player target) {
+        McMMOPlayer mcMMOPlayer = UserManager.getPlayer(player);
+        McMMOPartyTeleportEvent event = new McMMOPartyTeleportEvent(player, target, mcMMOPlayer.getParty().getName());
+
+        mcMMO.p.getServer().getPluginManager().callEvent(event);
+
+        if (event.isCancelled()) {
+            return true;
+        }
+
+        player.teleport(target);
+        player.sendMessage(LocaleLoader.getString("Party.Teleport.Player", target.getName()));
+        target.sendMessage(LocaleLoader.getString("Party.Teleport.Target", player.getName()));
+        mcMMOPlayer.actualizeRecentlyHurt();
+        return true;
+    }
+}
--- a/src/main/java/com/gmail/nossr50/commands/party/teleport/PtpAcceptAnyCommand.java
+++ b/src/main/java/com/gmail/nossr50/commands/party/teleport/PtpAcceptAnyCommand.java
@@ -1,34 +0,0 @@
-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.locale.LocaleLoader;
-import com.gmail.nossr50.util.Permissions;
-import com.gmail.nossr50.util.player.UserManager;
-
-public class PtpAcceptAnyCommand implements CommandExecutor {
-    @Override
-    public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
-        if (!Permissions.partyTeleportAcceptAll(sender)) {
-            sender.sendMessage(command.getPermissionMessage());
-            return true;
-        }
-
-        Player player = (Player) sender;
-        McMMOPlayer mcMMOPlayer = UserManager.getPlayer(player);
-
-        if (mcMMOPlayer.getPtpConfirmRequired()) {
-            player.sendMessage(LocaleLoader.getString("Commands.ptp.AcceptAny.Disabled"));
-        }
-        else {
-            player.sendMessage(LocaleLoader.getString("Commands.ptp.AcceptAny.Enabled"));
-        }
-
-        mcMMOPlayer.togglePtpConfirmRequired();
-        return true;
-    }
-}
--- a/src/main/java/com/gmail/nossr50/commands/party/teleport/PtpAcceptCommand.java
+++ b/src/main/java/com/gmail/nossr50/commands/party/teleport/PtpAcceptCommand.java
@@ -1,64 +0,0 @@
-package com.gmail.nossr50.commands.party.teleport;
-
-import org.bukkit.World;
-import org.bukkit.command.Command;
-import org.bukkit.command.CommandExecutor;
-import org.bukkit.command.CommandSender;
-import org.bukkit.entity.Player;
-
-import com.gmail.nossr50.config.Config;
-import com.gmail.nossr50.datatypes.player.McMMOPlayer;
-import com.gmail.nossr50.locale.LocaleLoader;
-import com.gmail.nossr50.util.Misc;
-import com.gmail.nossr50.util.Permissions;
-import com.gmail.nossr50.util.player.UserManager;
-
-public class PtpAcceptCommand implements CommandExecutor {
-    @Override
-    public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
-        if (!Permissions.partyTeleportAccept(sender)) {
-            sender.sendMessage(command.getPermissionMessage());
-            return true;
-        }
-
-        Player player = (Player) sender;
-        McMMOPlayer mcMMOPlayer = UserManager.getPlayer(player);
-
-        if (!mcMMOPlayer.hasPtpRequest()) {
-            player.sendMessage(LocaleLoader.getString("Commands.ptp.NoRequests"));
-            return true;
-        }
-
-        if ((mcMMOPlayer.getPtpTimeout() + Config.getInstance().getPTPCommandTimeout()) * Misc.TIME_CONVERSION_FACTOR < System.currentTimeMillis()) {
-            mcMMOPlayer.removePtpRequest();
-            player.sendMessage(LocaleLoader.getString("Commands.ptp.RequestExpired"));
-            return true;
-        }
-
-        Player target = mcMMOPlayer.getPtpRequest();
-        mcMMOPlayer.removePtpRequest();
-
-        if (!PtpCommand.canTeleport(sender, player, target.getName())) {
-            return true;
-        }
-
-        if (Config.getInstance().getPTPCommandWorldPermissions()) {
-            World targetWorld = target.getWorld();
-            World playerWorld = player.getWorld();
-
-            if (!Permissions.partyTeleportAllWorlds(target)) {
-                if (!Permissions.partyTeleportWorld(target, targetWorld)) {
-                    target.sendMessage(LocaleLoader.getString("Commands.ptp.NoWorldPermissions", targetWorld.getName()));
-                    return true;
-                }
-                else if (targetWorld != playerWorld && !Permissions.partyTeleportWorld(target, playerWorld)) {
-                    target.sendMessage(LocaleLoader.getString("Commands.ptp.NoWorldPermissions", playerWorld.getName()));
-                    return true;
-                }
-            }
-        }
-
-        PtpCommand.handleTeleportWarmup(target, player);
-        return true;
-    }
-}
--- a/src/main/java/com/gmail/nossr50/commands/party/teleport/PtpCommand.java
+++ b/src/main/java/com/gmail/nossr50/commands/party/teleport/PtpCommand.java
@@ -1,201 +0,0 @@
-package com.gmail.nossr50.commands.party.teleport;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Set;
-
-import org.bukkit.command.Command;
-import org.bukkit.command.CommandExecutor;
-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.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.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();
-    private CommandExecutor ptpAcceptAnyCommand = new PtpAcceptAnyCommand();
-    private CommandExecutor ptpAcceptCommand = new PtpAcceptCommand();
-
-    @Override
-    public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
-        if (CommandUtils.noConsoleUsage(sender)) {
-            return true;
-        }
-
-        switch (args.length) {
-            case 1:
-                if (args[0].equalsIgnoreCase("toggle")) {
-                    return ptpToggleCommand.onCommand(sender, command, label, args);
-                }
-
-                if (args[0].equalsIgnoreCase("acceptany") || args[0].equalsIgnoreCase("acceptall")) {
-                    return ptpAcceptAnyCommand.onCommand(sender, command, label, args);
-                }
-
-                Player player = (Player) sender;
-                McMMOPlayer mcMMOPlayer = UserManager.getPlayer(player);
-
-                long recentlyHurt = mcMMOPlayer.getRecentlyHurt();
-                int hurtCooldown = Config.getInstance().getPTPCommandRecentlyHurtCooldown();
-
-                if (hurtCooldown > 0) {
-                    int timeRemaining = SkillUtils.calculateTimeLeft(recentlyHurt * Misc.TIME_CONVERSION_FACTOR, hurtCooldown, player);
-
-                    if (timeRemaining > 0) {
-                        player.sendMessage(LocaleLoader.getString("Item.Injured.Wait", timeRemaining));
-                        return true;
-                    }
-                }
-
-                if (args[0].equalsIgnoreCase("accept")) {
-                    return ptpAcceptCommand.onCommand(sender, command, label, args);
-                }
-
-                if (!Permissions.partyTeleportSend(sender)) {
-                    sender.sendMessage(command.getPermissionMessage());
-                    return true;
-                }
-
-                int ptpCooldown = Config.getInstance().getPTPCommandCooldown();
-                long ptpLastUse = mcMMOPlayer.getPtpLastUse();
-
-                if (ptpCooldown > 0) {
-                    int timeRemaining = SkillUtils.calculateTimeLeft(ptpLastUse * Misc.TIME_CONVERSION_FACTOR, ptpCooldown, player);
-
-                    if (timeRemaining > 0) {
-                        player.sendMessage(LocaleLoader.getString("Item.Generic.Wait", timeRemaining));
-                        return true;
-                    }
-                }
-
-                sendTeleportRequest(sender, player, Misc.getMatchedPlayerName(args[0]));
-                return true;
-
-            default:
-                return false;
-        }
-    }
-
-    @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], TELEPORT_SUBCOMMANDS, new ArrayList<String>(TELEPORT_SUBCOMMANDS.size()));
-
-                if (matches.size() == 0) {
-                    Set<String> playerNames = UserManager.getPlayerNames();
-                    return StringUtil.copyPartialMatches(args[0], playerNames, new ArrayList<String>(playerNames.size()));
-                }
-
-                return matches;
-            default:
-                return ImmutableList.of();
-        }
-    }
-
-    private void sendTeleportRequest(CommandSender sender, Player player, String targetName) {
-        if (!canTeleport(sender, player, targetName)) {
-            return;
-        }
-
-        if (!mcMMOTarget.getPtpConfirmRequired()) {
-            handleTeleportWarmup(player, target);
-            return;
-        }
-
-        mcMMOTarget.setPtpRequest(player);
-        mcMMOTarget.actualizePtpTimeout();
-
-        player.sendMessage(LocaleLoader.getString("Commands.Invite.Success"));
-
-        target.sendMessage(LocaleLoader.getString("Commands.ptp.Request1", player.getName()));
-        target.sendMessage(LocaleLoader.getString("Commands.ptp.Request2", Config.getInstance().getPTPCommandTimeout()));
-    }
-
-    protected static boolean canTeleport(CommandSender sender, Player player, String targetName) {
-        mcMMOTarget = UserManager.getPlayer(targetName);
-
-        if (!CommandUtils.checkPlayerExistence(sender, targetName, mcMMOTarget)) {
-            return false;
-        }
-
-        target = mcMMOTarget.getPlayer();
-
-        if (player.equals(target)) {
-            player.sendMessage(LocaleLoader.getString("Party.Teleport.Self"));
-            return false;
-        }
-
-        if (!PartyManager.inSameParty(player, target)) {
-            player.sendMessage(LocaleLoader.getString("Party.NotInYourParty", targetName));
-            return false;
-        }
-
-        if (!mcMMOTarget.getPtpEnabled()) {
-            player.sendMessage(LocaleLoader.getString("Party.Teleport.Disabled", targetName));
-            return false;
-        }
-
-        if (!target.isValid()) {
-            player.sendMessage(LocaleLoader.getString("Party.Teleport.Dead"));
-            return false;
-        }
-
-        return true;
-    }
-
-    protected static void handleTeleportWarmup(Player teleportingPlayer, Player targetPlayer) {
-        McMMOPlayer mcMMOPlayer = UserManager.getPlayer(teleportingPlayer);
-        mcMMOTarget = UserManager.getPlayer(targetPlayer);
-
-        long warmup = Config.getInstance().getPTPCommandWarmup();
-
-        mcMMOPlayer.actualizeTeleportCommenceLocation(teleportingPlayer);
-
-        if (warmup > 0) {
-            teleportingPlayer.sendMessage(LocaleLoader.getString("Teleport.Commencing", warmup));
-            new TeleportationWarmup(mcMMOPlayer, mcMMOTarget).runTaskLater(mcMMO.p, 20 * warmup);
-        }
-        else {
-            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.actualizePtpLastUse();
-    }
-}
--- a/src/main/java/com/gmail/nossr50/commands/party/teleport/PtpToggleCommand.java
+++ b/src/main/java/com/gmail/nossr50/commands/party/teleport/PtpToggleCommand.java
@@ -1,34 +0,0 @@
-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.locale.LocaleLoader;
-import com.gmail.nossr50.util.Permissions;
-import com.gmail.nossr50.util.player.UserManager;
-
-public class PtpToggleCommand implements CommandExecutor {
-    @Override
-    public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
-        if (!Permissions.partyTeleportToggle(sender)) {
-            sender.sendMessage(command.getPermissionMessage());
-            return true;
-        }
-
-        Player player = (Player) sender;
-        McMMOPlayer mcMMOPlayer = UserManager.getPlayer(player);
-
-        if (mcMMOPlayer.getPtpEnabled()) {
-            player.sendMessage(LocaleLoader.getString("Commands.ptp.Disabled"));
-        }
-        else {
-            player.sendMessage(LocaleLoader.getString("Commands.ptp.Enabled"));
-        }
-
-        mcMMOPlayer.togglePtpUse();
-        return true;
-    }
-}
--- a/src/main/java/com/gmail/nossr50/commands/player/InspectCommand.java
+++ b/src/main/java/com/gmail/nossr50/commands/player/InspectCommand.java
@@ -1,17 +1,10 @@
 package com.gmail.nossr50.commands.player;

-import java.util.ArrayList;
-import java.util.List;
-import java.util.Set;
-
 import org.bukkit.command.Command;
+import org.bukkit.command.CommandExecutor;
 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.player.McMMOPlayer;
 import com.gmail.nossr50.datatypes.player.PlayerProfile;
 import com.gmail.nossr50.datatypes.skills.SkillType;
@@ -20,77 +13,68 @@ 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 InspectCommand implements TabExecutor {
+public class InspectCommand implements CommandExecutor {
    @Override
    public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
+        PlayerProfile profile;
+
        switch (args.length) {
            case 1:
-                if (sender instanceof Player && Config.getInstance().getInspectScoreboardEnabled()) {
-                    ScoreboardManager.setupPlayerScoreboard(sender.getName());
-                }
-
-                String playerName = Misc.getMatchedPlayerName(args[0]);
-                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 = mcMMO.getDatabaseManager().loadPlayerProfile(playerName, false); // Temporary Profile
+                    profile = new PlayerProfile(args[0], false); // Temporary Profile

-                    if (CommandUtils.inspectOffline(sender, profile, Permissions.inspectOffline(sender))) {
+                    if (!profile.isLoaded()) {
+                        sender.sendMessage(LocaleLoader.getString("Commands.DoesNotExist"));
                        return true;
                    }

-                    if (sender instanceof Player && Config.getInstance().getInspectScoreboardEnabled()) {
-                        ScoreboardManager.enablePlayerInspectScoreboardOffline((Player) sender, profile);
+                    // TODO: Why do we care if this is a player?
+                    if (sender instanceof Player && !Permissions.inspectOffline(sender)) {
+                        sender.sendMessage(LocaleLoader.getString("Inspect.Offline"));
                        return true;
                    }

-                    sender.sendMessage(LocaleLoader.getString("Inspect.OfflineStats", playerName));
+                    sender.sendMessage(LocaleLoader.getString("Inspect.OfflineStats", args[0]));

                    sender.sendMessage(LocaleLoader.getString("Stats.Header.Gathering"));
-                    CommandUtils.displaySkill(sender, profile, SkillType.EXCAVATION);
-                    CommandUtils.displaySkill(sender, profile, SkillType.FISHING);
-                    CommandUtils.displaySkill(sender, profile, SkillType.HERBALISM);
-                    CommandUtils.displaySkill(sender, profile, SkillType.MINING);
-                    CommandUtils.displaySkill(sender, profile, SkillType.WOODCUTTING);
+                    sender.sendMessage(LocaleLoader.getString("Skills.Stats", LocaleLoader.getString("Excavation.Listener"), profile.getSkillLevel(SkillType.EXCAVATION), profile.getSkillXpLevel(SkillType.EXCAVATION), profile.getXpToLevel(SkillType.EXCAVATION)));
+                    sender.sendMessage(LocaleLoader.getString("Skills.Stats", LocaleLoader.getString("Fishing.Listener"), profile.getSkillLevel(SkillType.FISHING), profile.getSkillXpLevel(SkillType.FISHING), profile.getXpToLevel(SkillType.FISHING)));
+                    sender.sendMessage(LocaleLoader.getString("Skills.Stats", LocaleLoader.getString("Herbalism.Listener"), profile.getSkillLevel(SkillType.HERBALISM), profile.getSkillXpLevel(SkillType.HERBALISM), profile.getXpToLevel(SkillType.HERBALISM)));
+                    sender.sendMessage(LocaleLoader.getString("Skills.Stats", LocaleLoader.getString("Mining.Listener"), profile.getSkillLevel(SkillType.MINING), profile.getSkillXpLevel(SkillType.MINING), profile.getXpToLevel(SkillType.MINING)));
+                    sender.sendMessage(LocaleLoader.getString("Skills.Stats", LocaleLoader.getString("Woodcutting.Listener"), profile.getSkillLevel(SkillType.WOODCUTTING), profile.getSkillXpLevel(SkillType.WOODCUTTING), profile.getXpToLevel(SkillType.WOODCUTTING)));

                    sender.sendMessage(LocaleLoader.getString("Stats.Header.Combat"));
-                    CommandUtils.displaySkill(sender, profile, SkillType.AXES);
-                    CommandUtils.displaySkill(sender, profile, SkillType.ARCHERY);
-                    CommandUtils.displaySkill(sender, profile, SkillType.SWORDS);
-                    CommandUtils.displaySkill(sender, profile, SkillType.TAMING);
-                    CommandUtils.displaySkill(sender, profile, SkillType.UNARMED);
+                    sender.sendMessage(LocaleLoader.getString("Skills.Stats", LocaleLoader.getString("Axes.Listener"), profile.getSkillLevel(SkillType.AXES), profile.getSkillXpLevel(SkillType.AXES), profile.getXpToLevel(SkillType.AXES)));
+                    sender.sendMessage(LocaleLoader.getString("Skills.Stats", LocaleLoader.getString("Archery.Listener"), profile.getSkillLevel(SkillType.ARCHERY), profile.getSkillXpLevel(SkillType.ARCHERY), profile.getXpToLevel(SkillType.ARCHERY)));
+                    sender.sendMessage(LocaleLoader.getString("Skills.Stats", LocaleLoader.getString("Swords.Listener"), profile.getSkillLevel(SkillType.SWORDS), profile.getSkillXpLevel(SkillType.SWORDS), profile.getXpToLevel(SkillType.SWORDS)));
+                    sender.sendMessage(LocaleLoader.getString("Skills.Stats", LocaleLoader.getString("Taming.Listener"), profile.getSkillLevel(SkillType.TAMING), profile.getSkillXpLevel(SkillType.TAMING), profile.getXpToLevel(SkillType.TAMING)));
+                    sender.sendMessage(LocaleLoader.getString("Skills.Stats", LocaleLoader.getString("Unarmed.Listener"), profile.getSkillLevel(SkillType.UNARMED), profile.getSkillXpLevel(SkillType.UNARMED), profile.getXpToLevel(SkillType.UNARMED)));

                    sender.sendMessage(LocaleLoader.getString("Stats.Header.Misc"));
-                    CommandUtils.displaySkill(sender, profile, SkillType.ACROBATICS);
-                    CommandUtils.displaySkill(sender, profile, SkillType.REPAIR);
+                    sender.sendMessage(LocaleLoader.getString("Skills.Stats", LocaleLoader.getString("Acrobatics.Listener"), profile.getSkillLevel(SkillType.ACROBATICS), profile.getSkillXpLevel(SkillType.ACROBATICS), profile.getXpToLevel(SkillType.ACROBATICS)));
+                    sender.sendMessage(LocaleLoader.getString("Skills.Stats", LocaleLoader.getString("Repair.Listener"), profile.getSkillLevel(SkillType.REPAIR), profile.getSkillXpLevel(SkillType.REPAIR), profile.getXpToLevel(SkillType.REPAIR)));
                }
                else {
                    Player target = mcMMOPlayer.getPlayer();

-                    if (CommandUtils.hidden(sender, target, Permissions.inspectHidden(sender))) {
-                        if (!Permissions.inspectOffline(sender)) {
-                            sender.sendMessage(LocaleLoader.getString("Inspect.Offline"));
+                    if (sender instanceof Player) {
+                        Player inspector = (Player) sender;
+
+                        if (!Misc.isNear(inspector.getLocation(), target.getLocation(), 5.0) && !Permissions.inspectFar(inspector)) {
+                            sender.sendMessage(LocaleLoader.getString("Inspect.TooFar"));
                            return true;
                        }
                    }
-                    else if (CommandUtils.tooFar(sender, target, Permissions.inspectFar(sender))) {
-                        return true;
-                    }
-
-                    if (sender instanceof Player && Config.getInstance().getInspectScoreboardEnabled()) {
-                        ScoreboardManager.enablePlayerInspectScoreboardOnline((Player) sender, mcMMOPlayer);
-                        return true;
-                    }
+                    profile = mcMMOPlayer.getProfile();

                    sender.sendMessage(LocaleLoader.getString("Inspect.Stats", target.getName()));
-                    CommandUtils.printGatheringSkills(target, sender);
-                    CommandUtils.printCombatSkills(target, sender);
-                    CommandUtils.printMiscSkills(target, sender);
+                    CommandUtils.printGatheringSkills(target, profile, sender);
+                    CommandUtils.printCombatSkills(target, profile, sender);
+                    CommandUtils.printMiscSkills(target, profile, sender);
                    sender.sendMessage(LocaleLoader.getString("Commands.PowerLevel", mcMMOPlayer.getPowerLevel()));
                }

@@ -100,15 +84,4 @@ public class InspectCommand implements TabExecutor {
                return false;
        }
    }
-
-    @Override
-    public List<String> onTabComplete(CommandSender sender, Command command, String alias, String[] args) {
-        switch (args.length) {
-            case 1:
-                Set<String> playerNames = UserManager.getPlayerNames();
-                return StringUtil.copyPartialMatches(args[0], playerNames, new ArrayList<String>(playerNames.size()));
-            default:
-                return ImmutableList.of();
-        }
-    }
 }
--- a/src/main/java/com/gmail/nossr50/commands/player/McrankCommand.java
+++ b/src/main/java/com/gmail/nossr50/commands/player/McrankCommand.java
@@ -1,47 +1,44 @@
 package com.gmail.nossr50.commands.player;

-import java.util.ArrayList;
-import java.util.List;
-import java.util.Set;
-
+import org.bukkit.Bukkit;
 import org.bukkit.command.Command;
+import org.bukkit.command.CommandExecutor;
 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.database.LeaderboardManager;
 import com.gmail.nossr50.datatypes.player.McMMOPlayer;
+import com.gmail.nossr50.datatypes.player.PlayerProfile;
+import com.gmail.nossr50.datatypes.skills.SkillType;
+import com.gmail.nossr50.locale.LocaleLoader;
 import com.gmail.nossr50.runnables.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.gmail.nossr50.util.skills.SkillUtils;

-import com.google.common.collect.ImmutableList;
-
-public class McrankCommand implements TabExecutor {
+public class McrankCommand implements CommandExecutor {
    @Override
    public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
        switch (args.length) {
            case 0:
-                if (CommandUtils.noConsoleUsage(sender)) {
-                    return true;
-                }
-
                if (!Permissions.mcrank(sender)) {
                    sender.sendMessage(command.getPermissionMessage());
                    return true;
                }

-                if (Config.getInstance().getMcrankScoreboardEnabled()) {
-                    ScoreboardManager.setupPlayerScoreboard(sender.getName());
-                    ScoreboardManager.enablePlayerRankScoreboard((Player) sender);
+                if (!(sender instanceof Player)) {
+                    return false;
+                }
+
+                if (Config.getInstance().getUseMySQL()) {
+                    sqlDisplay(sender, sender.getName());
                }
                else {
-                    display(sender, sender.getName());
+                    LeaderboardManager.updateLeaderboards(); // Make sure the information is up to date
+                    flatfileDisplay(sender, sender.getName());
                }

                return true;
@@ -52,27 +49,38 @@ public class McrankCommand implements TabExecutor {
                    return true;
                }

-                String playerName = Misc.getMatchedPlayerName(args[0]);
-                McMMOPlayer mcMMOPlayer = UserManager.getPlayer(playerName, true);
+                McMMOPlayer mcMMOPlayer = UserManager.getPlayer(args[0]);

-                if (mcMMOPlayer != null) {
-                    playerName = mcMMOPlayer.getPlayer().getName();
+                if (mcMMOPlayer == null) {
+                    PlayerProfile profile = new PlayerProfile(args[0], false); // Temporary Profile

-                    if (CommandUtils.tooFar(sender, mcMMOPlayer.getPlayer(), Permissions.mcrankFar(sender))) {
+                    if (!profile.isLoaded()) {
+                        sender.sendMessage(LocaleLoader.getString("Commands.DoesNotExist"));
+                        return true;
+                    }
+
+                    if (sender instanceof Player && !Permissions.mcrankOffline(sender)) {
+                        sender.sendMessage(LocaleLoader.getString("Inspect.Offline"));
                        return true;
                    }
                }
-                else if (CommandUtils.inspectOffline(sender, mcMMO.getDatabaseManager().loadPlayerProfile(playerName, false), Permissions.mcrankOffline(sender))) {
-                    return true;
+                else {
+                    Player target = mcMMOPlayer.getPlayer();
+
+                    if (sender instanceof Player && !Misc.isNear(((Player) sender).getLocation(), target.getLocation(), 5.0) && !Permissions.mcrankFar(sender)) {
+                        sender.sendMessage(LocaleLoader.getString("Inspect.TooFar"));
+                        return true;
+                    }
                }

-                if (sender instanceof Player && Config.getInstance().getMcrankScoreboardEnabled()) {
-                    ScoreboardManager.setupPlayerScoreboard(sender.getName());
-                    ScoreboardManager.enablePlayerRankScoreboardOthers((Player) sender, playerName);
+                if (Config.getInstance().getUseMySQL()) {
+                    sqlDisplay(sender, args[0]);
                }
                else {
-                    display(sender, playerName);
+                    LeaderboardManager.updateLeaderboards(); // Make sure the information is up to date
+                    flatfileDisplay(sender, args[0]);
                }
+
                return true;

            default:
@@ -80,18 +88,37 @@ public class McrankCommand implements TabExecutor {
        }
    }

-    @Override
-    public List<String> onTabComplete(CommandSender sender, Command command, String alias, String[] args) {
-        switch (args.length) {
-            case 1:
-                Set<String> playerNames = UserManager.getPlayerNames();
-                return StringUtil.copyPartialMatches(args[0], playerNames, new ArrayList<String>(playerNames.size()));
-            default:
-                return ImmutableList.of();
+    private void flatfileDisplay(CommandSender sender, String playerName) {
+        sender.sendMessage(LocaleLoader.getString("Commands.mcrank.Heading"));
+        sender.sendMessage(LocaleLoader.getString("Commands.mcrank.Player", playerName));
+
+        for (SkillType skillType : SkillType.values()) {
+            int[] rankInts = LeaderboardManager.getPlayerRank(playerName, skillType);
+
+            if (skillType.isChildSkill()) {
+                continue;
+            }
+
+            if (rankInts[1] == 0) {
+                sender.sendMessage(LocaleLoader.getString("Commands.mcrank.Skill", SkillUtils.getSkillName(skillType), LocaleLoader.getString("Commands.mcrank.Unranked"))); // Don't bother showing ranking for players without skills
+            }
+            else {
+                sender.sendMessage(LocaleLoader.getString("Commands.mcrank.Skill", SkillUtils.getSkillName(skillType), rankInts[0]));
+            }
+        }
+
+        // Show the powerlevel ranking
+        int[] rankInts = LeaderboardManager.getPlayerRank(playerName);
+
+        if (rankInts[1] == 0) {
+            sender.sendMessage(LocaleLoader.getString("Commands.mcrank.Overall", LocaleLoader.getString("Commands.mcrank.Unranked"))); // Don't bother showing ranking for players without skills
+        }
+        else {
+            sender.sendMessage(LocaleLoader.getString("Commands.mcrank.Overall", rankInts[0]));
        }
    }

-    private void display(CommandSender sender, String playerName) {
-        new McrankCommandAsyncTask(playerName, sender).runTaskAsynchronously(mcMMO.p);
+    private void sqlDisplay(CommandSender sender, String playerName) {
+        Bukkit.getScheduler().runTaskAsynchronously(mcMMO.p, new McrankCommandAsyncTask(playerName, sender));
    }
 }
--- a/src/main/java/com/gmail/nossr50/commands/player/McstatsCommand.java
+++ b/src/main/java/com/gmail/nossr50/commands/player/McstatsCommand.java
@@ -1,22 +1,18 @@
 package com.gmail.nossr50.commands.player;

-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.entity.Player;

 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.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 {
+public class McstatsCommand implements CommandExecutor {
    @Override
    public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
        if (CommandUtils.noConsoleUsage(sender)) {
@@ -27,27 +23,22 @@ public class McstatsCommand implements TabExecutor {
            case 0:
                Player player = (Player) sender;
                McMMOPlayer mcMMOPlayer = UserManager.getPlayer(player);
+                PlayerProfile profile = mcMMOPlayer.getProfile();

-                if (Config.getInstance().getMcstatsScoreboardsEnabled()) {
-                    ScoreboardManager.setupPlayerScoreboard(player.getName());
-                    ScoreboardManager.enablePlayerStatsScoreboard(mcMMOPlayer);
+                player.sendMessage(LocaleLoader.getString("Stats.Own.Stats"));
+                player.sendMessage(LocaleLoader.getString("mcMMO.NoSkillNote"));
+
+                CommandUtils.printGatheringSkills(player, profile);
+                CommandUtils.printCombatSkills(player, profile);
+                CommandUtils.printMiscSkills(player, profile);
+
+                int powerLevelCap = Config.getInstance().getPowerLevelCap();
+
+                if (powerLevelCap != Integer.MAX_VALUE) {
+                    player.sendMessage(LocaleLoader.getString("Commands.PowerLevel.Capped", mcMMOPlayer.getPowerLevel(), powerLevelCap));
                }
                else {
-                    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("Commands.PowerLevel", UserManager.getPlayer(player).getPowerLevel()));
-                    }
+                    player.sendMessage(LocaleLoader.getString("Commands.PowerLevel", mcMMOPlayer.getPowerLevel()));
                }

                return true;
@@ -56,9 +47,4 @@ public class McstatsCommand implements TabExecutor {
                return false;
        }
    }
-
-    @Override
-    public List<String> onTabComplete(CommandSender sender, Command command, String alias, String[] args) {
-        return ImmutableList.of();
-    }
 }
--- a/src/main/java/com/gmail/nossr50/commands/player/MctopCommand.java
+++ b/src/main/java/com/gmail/nossr50/commands/player/MctopCommand.java
@@ -1,58 +1,70 @@
 package com.gmail.nossr50.commands.player;

-import java.util.ArrayList;
-import java.util.List;
-
+import org.bukkit.Bukkit;
+import org.bukkit.ChatColor;
 import org.bukkit.command.Command;
+import org.bukkit.command.CommandExecutor;
 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.database.LeaderboardManager;
 import com.gmail.nossr50.datatypes.skills.SkillType;
+import com.gmail.nossr50.locale.LocaleLoader;
 import com.gmail.nossr50.runnables.commands.MctopCommandAsyncTask;
 import com.gmail.nossr50.util.Permissions;
 import com.gmail.nossr50.util.StringUtils;
-import com.gmail.nossr50.util.commands.CommandUtils;
-import com.gmail.nossr50.util.scoreboards.ScoreboardManager;
-
-import com.google.common.collect.ImmutableList;
-
-public class MctopCommand implements TabExecutor {
-    private SkillType skill;
+import com.gmail.nossr50.util.skills.SkillUtils;

+public class MctopCommand implements CommandExecutor {
    @Override
    public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
+        boolean useMySQL = Config.getInstance().getUseMySQL();
+
        switch (args.length) {
            case 0:
-                display(1, "ALL", sender, command);
+                display(1, "ALL", sender, useMySQL, command);
                return true;

            case 1:
                if (StringUtils.isInt(args[0])) {
-                    display(Math.abs(Integer.parseInt(args[0])), "ALL", sender, command);
-                    return true;
+                    display(Integer.parseInt(args[0]), "ALL", sender, useMySQL, command);
+                }
+                else if (SkillUtils.isSkill(args[0])) {
+                    SkillType skill = SkillType.getSkill(args[0]);
+
+                    if (skill.isChildSkill()) {
+                        sender.sendMessage("Child skills are not yet supported by this command."); // TODO: Localize this
+                        return true;
+                    }
+
+                    display(1, skill.toString(), sender, useMySQL, command);
+                }
+                else {
+                    sender.sendMessage(LocaleLoader.getString("Commands.Skill.Invalid"));
                }

-                if (!extractSkill(sender, args[0])) {
-                    return true;
-                }
-
-                display(1, skill.toString(), sender, command);
                return true;

            case 2:
-                if (CommandUtils.isInvalidInteger(sender, args[1])) {
-                    return true;
+                if (!StringUtils.isInt(args[1])) {
+                    return false;
                }

-                if (!extractSkill(sender, args[0])) {
-                    return true;
+                if (SkillUtils.isSkill(args[0])) {
+                    SkillType skill = SkillType.getSkill(args[0]);
+
+                    if (skill.isChildSkill()) {
+                        sender.sendMessage("Child skills are not yet supported by this command."); // TODO: Localize this
+                        return true;
+                    }
+
+                    display(Integer.parseInt(args[1]), skill.toString(), sender, useMySQL, command);
+                }
+                else {
+                    sender.sendMessage(LocaleLoader.getString("Commands.Skill.Invalid"));
                }

-                display(Math.abs(Integer.parseInt(args[1])), skill.toString(), sender, command);
                return true;

            default:
@@ -60,45 +72,58 @@ public class MctopCommand implements TabExecutor {
        }
    }

-    @Override
-    public List<String> onTabComplete(CommandSender sender, Command command, String alias, String[] args) {
-        switch (args.length) {
-            case 1:
-                return StringUtil.copyPartialMatches(args[0], SkillType.SKILL_NAMES, new ArrayList<String>(SkillType.SKILL_NAMES.size()));
-            default:
-                return ImmutableList.of();
+    private void display(int page, String skill, CommandSender sender, boolean sql, Command command) {
+        if (sql) {
+            if (skill.equalsIgnoreCase("all")) {
+                sqlDisplay(page, "taming+mining+woodcutting+repair+unarmed+herbalism+excavation+archery+swords+axes+acrobatics+fishing", sender, command);
+            }
+            else {
+                sqlDisplay(page, skill, sender, command);
+            }
+        }
+        else {
+            flatfileDisplay(page, skill, sender, command);
        }
    }

-    private void display(int page, String skill, CommandSender sender, Command command) {
-        if (!skill.equalsIgnoreCase("all") && !Permissions.mctop(sender, this.skill)) {
+    private void flatfileDisplay(int page, String skill, CommandSender sender, Command command) {
+        if (!skill.equalsIgnoreCase("all") && !Permissions.mctop(sender, SkillType.getSkill(skill))) {
            sender.sendMessage(command.getPermissionMessage());
            return;
        }

-        if (sender instanceof Player && Config.getInstance().getMctopScoreboardEnabled()) {
-            ScoreboardManager.enableGlobalStatsScoreboard((Player) sender, skill, page);
+        LeaderboardManager.updateLeaderboards(); // Make sure we have the latest information
+
+        String[] info = LeaderboardManager.retrieveInfo(skill, page);
+
+        if (skill.equalsIgnoreCase("all")) {
+            sender.sendMessage(LocaleLoader.getString("Commands.PowerLevel.Leaderboard"));
        }
        else {
-            display(page, skill, sender);
+            sender.sendMessage(LocaleLoader.getString("Commands.Skill.Leaderboard", StringUtils.getCapitalized(skill)));
        }
+
+        int n = (page * 10) - 9; // Position
+        for (String x : info) {
+            if (x != null) {
+                String digit = String.valueOf(n);
+
+                if (n < 10) {
+                    digit = "0" + digit;
+                }
+
+                String[] splitx = x.split(":");
+
+                // Format: 1. Playername - skill value
+                sender.sendMessage(digit + ". " + ChatColor.GREEN + splitx[1] + " - " + ChatColor.WHITE + splitx[0]);
+                n++;
+            }
+        }
+
+        sender.sendMessage(LocaleLoader.getString("Commands.mctop.Tip"));
    }

-    private void display(int page, String query, CommandSender sender) {
-        new MctopCommandAsyncTask(page, query, sender).runTaskAsynchronously(mcMMO.p);
-    }
-
-    private boolean extractSkill(CommandSender sender, String skillName) {
-        if (CommandUtils.isInvalidSkill(sender, skillName)) {
-            return false;
-        }
-
-        skill = SkillType.getSkill(skillName);
-
-        if (CommandUtils.isChildSkill(sender, skill)) {
-            return false;
-        }
-
-        return true;
+    private void sqlDisplay(int page, String query, CommandSender sender, Command command) {
+        Bukkit.getScheduler().runTaskAsynchronously(mcMMO.p, new MctopCommandAsyncTask(page, query, sender, command));
    }
 }
--- a/src/main/java/com/gmail/nossr50/commands/skills/AcrobaticsCommand.java
+++ b/src/main/java/com/gmail/nossr50/commands/skills/AcrobaticsCommand.java
@@ -24,25 +24,19 @@ public class AcrobaticsCommand extends SkillCommand {
    @Override
    protected void dataCalculations() {
        // DODGE
-        if (canDodge) {
-            String[] dodgeStrings = calculateAbilityDisplayValues(Acrobatics.dodgeMaxBonusLevel, Acrobatics.dodgeMaxChance);
-            dodgeChance = dodgeStrings[0];
-            dodgeChanceLucky = dodgeStrings[1];
-        }
+        String[] dodgeStrings = calculateAbilityDisplayValues(Acrobatics.dodgeMaxBonusLevel, Acrobatics.dodgeMaxChance);
+        dodgeChance = dodgeStrings[0];
+        dodgeChanceLucky = dodgeStrings[1];

        // ROLL
-        if (canRoll) {
-            String[] rollStrings = calculateAbilityDisplayValues(Acrobatics.rollMaxBonusLevel, Acrobatics.rollMaxChance);
-            rollChance = rollStrings[0];
-            rollChanceLucky = rollStrings[1];
-        }
+        String[] rollStrings = calculateAbilityDisplayValues(Acrobatics.rollMaxBonusLevel, Acrobatics.rollMaxChance);
+        rollChance = rollStrings[0];
+        rollChanceLucky = rollStrings[1];

        // GRACEFUL ROLL
-        if (canGracefulRoll) {
-            String[] gracefulRollStrings = calculateAbilityDisplayValues(Acrobatics.gracefulRollMaxBonusLevel, Acrobatics.gracefulRollMaxChance);
-            gracefulRollChance = gracefulRollStrings[0];
-            gracefulRollChanceLucky = gracefulRollStrings[1];
-        }
+        String[] gracefulRollStrings = calculateAbilityDisplayValues(Acrobatics.gracefulRollMaxBonusLevel, Acrobatics.gracefulRollMaxChance);
+        gracefulRollChance = gracefulRollStrings[0];
+        gracefulRollChanceLucky = gracefulRollStrings[1];
    }

    @Override
@@ -82,15 +76,30 @@ public class AcrobaticsCommand extends SkillCommand {
    @Override
    protected void statsDisplay() {
        if (canRoll) {
-            player.sendMessage(LocaleLoader.getString("Acrobatics.Roll.Chance", rollChance) + (isLucky ? LocaleLoader.getString("Perks.Lucky.Bonus", rollChanceLucky) : ""));
+            if (isLucky) {
+                player.sendMessage(LocaleLoader.getString("Acrobatics.Roll.Chance", new Object[] { rollChance }) + LocaleLoader.getString("Perks.lucky.bonus", new Object[] { rollChanceLucky }));
+            }
+            else {
+                player.sendMessage(LocaleLoader.getString("Acrobatics.Roll.Chance", new Object[] { rollChance }));
+            }
        }

        if (canGracefulRoll) {
-            player.sendMessage(LocaleLoader.getString("Acrobatics.Roll.GraceChance", gracefulRollChance) + (isLucky ? LocaleLoader.getString("Perks.Lucky.Bonus", gracefulRollChanceLucky) : ""));
+            if (isLucky) {
+                player.sendMessage(LocaleLoader.getString("Acrobatics.Roll.GraceChance", new Object[] { gracefulRollChance }) + LocaleLoader.getString("Perks.lucky.bonus", new Object[] { gracefulRollChanceLucky }));
+            }
+            else {
+                player.sendMessage(LocaleLoader.getString("Acrobatics.Roll.GraceChance", new Object[] { gracefulRollChance }));
+            }
        }

        if (canDodge) {
-            player.sendMessage(LocaleLoader.getString("Acrobatics.DodgeChance", dodgeChance) + (isLucky ? LocaleLoader.getString("Perks.Lucky.Bonus", dodgeChanceLucky) : ""));
+            if (isLucky) {
+                player.sendMessage(LocaleLoader.getString("Acrobatics.DodgeChance", new Object[] { dodgeChance }) + LocaleLoader.getString("Perks.lucky.bonus", new Object[] { dodgeChanceLucky }));
+            }
+            else {
+                player.sendMessage(LocaleLoader.getString("Acrobatics.DodgeChance", new Object[] { dodgeChance }));
+            }
        }
    }
 }
--- a/src/main/java/com/gmail/nossr50/commands/skills/ArcheryCommand.java
+++ b/src/main/java/com/gmail/nossr50/commands/skills/ArcheryCommand.java
@@ -23,24 +23,24 @@ public class ArcheryCommand extends SkillCommand {
    @Override
    protected void dataCalculations() {
        // SKILL SHOT
-        if (canSkillShot) {
-            double bonus = (skillValue / Archery.skillShotIncreaseLevel) * Archery.skillShotIncreasePercentage;
-            skillShotBonus = percent.format(Math.min(bonus, Archery.skillShotMaxBonusPercentage));
+        double bonus = (skillValue / Archery.skillShotIncreaseLevel) * Archery.skillShotIncreasePercentage;
+
+        if (bonus > Archery.skillShotMaxBonusPercentage) {
+            skillShotBonus = percent.format(Archery.skillShotMaxBonusPercentage);
+        }
+        else {
+            skillShotBonus = percent.format(bonus);
        }

        // DAZE
-        if (canDaze) {
-            String[] dazeStrings = calculateAbilityDisplayValues(Archery.dazeMaxBonusLevel, Archery.dazeMaxBonus);
-            dazeChance = dazeStrings[0];
-            dazeChanceLucky = dazeStrings[1];
-        }
+        String[] dazeStrings = calculateAbilityDisplayValues(Archery.dazeMaxBonusLevel, Archery.dazeMaxBonus);
+        dazeChance = dazeStrings[0];
+        dazeChanceLucky = dazeStrings[1];

        // RETRIEVE
-        if (canRetrieve) {
-            String[] retrieveStrings = calculateAbilityDisplayValues(Archery.retrieveMaxBonusLevel, Archery.retrieveMaxChance);
-            retrieveChance = retrieveStrings[0];
-            retrieveChanceLucky = retrieveStrings[1];
-        }
+        String[] retrieveStrings = calculateAbilityDisplayValues(Archery.retrieveMaxBonusLevel, Archery.retrieveMaxChance);
+        retrieveChance = retrieveStrings[0];
+        retrieveChanceLucky = retrieveStrings[1];
    }

    @Override
@@ -84,11 +84,21 @@ public class ArcheryCommand extends SkillCommand {
        }

        if (canDaze) {
-            player.sendMessage(LocaleLoader.getString("Archery.Combat.DazeChance", dazeChance) + (isLucky ? LocaleLoader.getString("Perks.Lucky.Bonus", dazeChanceLucky) : ""));
+            if (isLucky) {
+                player.sendMessage(LocaleLoader.getString("Archery.Combat.DazeChance", dazeChance) + LocaleLoader.getString("Perks.lucky.bonus", dazeChanceLucky));
+            }
+            else {
+                player.sendMessage(LocaleLoader.getString("Archery.Combat.DazeChance", dazeChance));
+            }
        }

        if (canRetrieve) {
-            player.sendMessage(LocaleLoader.getString("Archery.Combat.RetrieveChance", retrieveChance) + (isLucky ? LocaleLoader.getString("Perks.Lucky.Bonus", retrieveChanceLucky) : ""));
+            if (isLucky) {
+                player.sendMessage(LocaleLoader.getString("Archery.Combat.RetrieveChance", retrieveChance) + LocaleLoader.getString("Perks.lucky.bonus", retrieveChanceLucky));
+            }
+            else {
+                player.sendMessage(LocaleLoader.getString("Archery.Combat.RetrieveChance", retrieveChance));
+            }
        }
    }
 }
--- a/src/main/java/com/gmail/nossr50/commands/skills/AxesCommand.java
+++ b/src/main/java/com/gmail/nossr50/commands/skills/AxesCommand.java
@@ -8,8 +8,9 @@ import com.gmail.nossr50.util.Permissions;
 public class AxesCommand extends SkillCommand {
    private String critChance;
    private String critChanceLucky;
-    private double bonusDamage;
-    private double impactDamage;
+    private String bonusDamage;
+    private String impactDamage;
+    private String greaterImpactDamage;
    private String skullSplitterLength;
    private String skullSplitterLengthEndurance;

@@ -26,27 +27,25 @@ public class AxesCommand extends SkillCommand {
    @Override
    protected void dataCalculations() {
        // IMPACT
-        if (canImpact) {
-            impactDamage = 1 + (skillValue / Axes.impactIncreaseLevel);
-        }
+        impactDamage = String.valueOf(1 + (skillValue / Axes.impactIncreaseLevel));
+        greaterImpactDamage = String.valueOf(Axes.greaterImpactBonusDamage);

        // SKULL SPLITTER
-        if (canSkullSplitter) {
-            String[] skullSplitterStrings = calculateLengthDisplayValues();
-            skullSplitterLength = skullSplitterStrings[0];
-            skullSplitterLengthEndurance = skullSplitterStrings[1];
-        }
+        String[] skullSplitterStrings = calculateLengthDisplayValues();
+        skullSplitterLength = skullSplitterStrings[0];
+        skullSplitterLengthEndurance = skullSplitterStrings[1];

        // CRITICAL STRIKES
-        if (canCritical) {
-            String[] criticalStrikeStrings = calculateAbilityDisplayValues(Axes.criticalHitMaxBonusLevel, Axes.criticalHitMaxChance);
-            critChance = criticalStrikeStrings[0];
-            critChanceLucky = criticalStrikeStrings[1];
-        }
+        String[] criticalStrikeStrings = calculateAbilityDisplayValues(Axes.criticalHitMaxBonusLevel, Axes.criticalHitMaxChance);
+        critChance = criticalStrikeStrings[0];
+        critChanceLucky = criticalStrikeStrings[1];

        // AXE MASTERY
-        if (canBonusDamage) {
-            bonusDamage = Math.min(skillValue / (Axes.bonusDamageMaxBonusLevel / Axes.bonusDamageMaxBonus), Axes.bonusDamageMaxBonus);
+        if (skillValue >= Axes.bonusDamageMaxBonusLevel) {
+            bonusDamage = String.valueOf(Axes.bonusDamageMaxBonus);
+        }
+        else {
+            bonusDamage = String.valueOf(skillValue / (Axes.bonusDamageMaxBonusLevel / Axes.bonusDamageMaxBonus));
        }
    }

@@ -105,15 +104,25 @@ public class AxesCommand extends SkillCommand {
        }

        if (canGreaterImpact) {
-            player.sendMessage(LocaleLoader.getString("Ability.Generic.Template", LocaleLoader.getString("Axes.Ability.Bonus.4"), LocaleLoader.getString("Axes.Ability.Bonus.5", Axes.greaterImpactBonusDamage)));
+            player.sendMessage(LocaleLoader.getString("Ability.Generic.Template", LocaleLoader.getString("Axes.Ability.Bonus.4"), LocaleLoader.getString("Axes.Ability.Bonus.5", greaterImpactDamage)));
        }

        if (canCritical) {
-            player.sendMessage(LocaleLoader.getString("Axes.Combat.CritChance", critChance) + (isLucky ? LocaleLoader.getString("Perks.Lucky.Bonus", critChanceLucky) : ""));
+            if (isLucky) {
+                player.sendMessage(LocaleLoader.getString("Axes.Combat.CritChance", critChance) + LocaleLoader.getString("Perks.lucky.bonus", critChanceLucky));
+            }
+            else {
+                player.sendMessage(LocaleLoader.getString("Axes.Combat.CritChance", critChance));
+            }
        }

        if (canSkullSplitter) {
-            player.sendMessage(LocaleLoader.getString("Axes.Combat.SS.Length", skullSplitterLength) + (hasEndurance ? LocaleLoader.getString("Perks.ActivationTime.Bonus", skullSplitterLengthEndurance) : ""));
+            if (hasEndurance) {
+                player.sendMessage(LocaleLoader.getString("Axes.Combat.SS.Length", skullSplitterLength) + LocaleLoader.getString("Perks.activationtime.bonus", skullSplitterLengthEndurance));
+            }
+            else {
+                player.sendMessage(LocaleLoader.getString("Axes.Combat.SS.Length", skullSplitterLength));
+            }
        }
    }
 }
--- a/src/main/java/com/gmail/nossr50/commands/skills/ExcavationCommand.java
+++ b/src/main/java/com/gmail/nossr50/commands/skills/ExcavationCommand.java
@@ -18,11 +18,9 @@ public class ExcavationCommand extends SkillCommand {
    @Override
    protected void dataCalculations() {
        // GIGA DRILL BREAKER
-        if (canGigaDrill) {
-            String gigaDrillStrings[] = calculateLengthDisplayValues();
-            gigaDrillBreakerLength = gigaDrillStrings[0];
-            gigaDrillBreakerLengthEndurance = gigaDrillStrings[1];
-        }
+        String gigaDrillStrings[] = calculateLengthDisplayValues();
+        gigaDrillBreakerLength = gigaDrillStrings[0];
+        gigaDrillBreakerLengthEndurance = gigaDrillStrings[1];
    }

    @Override
@@ -57,7 +55,12 @@ public class ExcavationCommand extends SkillCommand {
    @Override
    protected void statsDisplay() {
        if (canGigaDrill) {
-            player.sendMessage(LocaleLoader.getString("Excavation.Effect.Length", gigaDrillBreakerLength) + (hasEndurance ? LocaleLoader.getString("Perks.ActivationTime.Bonus", gigaDrillBreakerLengthEndurance) : ""));
+            if (hasEndurance) {
+                player.sendMessage(LocaleLoader.getString("Excavation.Effect.Length", gigaDrillBreakerLength) + LocaleLoader.getString("Perks.activationtime.bonus", gigaDrillBreakerLengthEndurance));
+            }
+            else {
+                player.sendMessage(LocaleLoader.getString("Excavation.Effect.Length", gigaDrillBreakerLength));
+            }
        }
    }
 }
--- a/src/main/java/com/gmail/nossr50/commands/skills/FishingCommand.java
+++ b/src/main/java/com/gmail/nossr50/commands/skills/FishingCommand.java
@@ -1,8 +1,5 @@
 package com.gmail.nossr50.commands.skills;

-import org.bukkit.block.Biome;
-import org.bukkit.entity.EntityType;
-
 import com.gmail.nossr50.config.AdvancedConfig;
 import com.gmail.nossr50.datatypes.skills.SkillType;
 import com.gmail.nossr50.locale.LocaleLoader;
@@ -17,15 +14,12 @@ public class FishingCommand extends SkillCommand {
    private String chanceRaining = "";
    private String shakeChance;
    private String shakeChanceLucky;
-    private int fishermansDietRank;
-    private String biteChance;
+    private String fishermansDietRank;

    private boolean canTreasureHunt;
    private boolean canMagicHunt;
    private boolean canShake;
    private boolean canFishermansDiet;
-    private boolean canMasterAngler;
-    private boolean canIceFish;

    public FishingCommand() {
        super(SkillType.FISHING);
@@ -33,50 +27,27 @@ public class FishingCommand extends SkillCommand {

    @Override
    protected void dataCalculations() {
-        boolean isStorming = player.getWorld().hasStorm();
+        lootTier = UserManager.getPlayer(player).getFishingManager().getLootTier();

        // TREASURE HUNTER
-        if (canTreasureHunt) {
-            lootTier = mcMMOPlayer.getFishingManager().getLootTier();
-            double enchantChance = lootTier * AdvancedConfig.getInstance().getFishingMagicMultiplier();
+        double enchantChance = lootTier * AdvancedConfig.getInstance().getFishingMagicMultiplier();

-            if (isStorming) {
-                chanceRaining = LocaleLoader.getString("Fishing.Chance.Raining");
-                enchantChance *= 1.1D;
-            }
-
-            String[] treasureHunterStrings = calculateAbilityDisplayValues(enchantChance);
-            magicChance = treasureHunterStrings[0];
-            magicChanceLucky = treasureHunterStrings[1];
+        if (player.getWorld().hasStorm()) {
+            chanceRaining = LocaleLoader.getString("Fishing.Chance.Raining");
+            enchantChance = enchantChance * 1.1D;
        }

+        String[] treasureHunterStrings = calculateAbilityDisplayValues(enchantChance);
+        magicChance = treasureHunterStrings[0];
+        magicChanceLucky = treasureHunterStrings[1];
+
        // SHAKE
-        if (canShake) {
-            String[] shakeStrings = calculateAbilityDisplayValues(UserManager.getPlayer(player).getFishingManager().getShakeProbability());
-            shakeChance = shakeStrings[0];
-            shakeChanceLucky = shakeStrings[1];
-        }
+        String[] shakeStrings = calculateAbilityDisplayValues(UserManager.getPlayer(player).getFishingManager().getShakeProbability());
+        shakeChance = shakeStrings[0];
+        shakeChanceLucky = shakeStrings[1];

        // FISHERMAN'S DIET
-        if (canFishermansDiet) {
-            fishermansDietRank = calculateRank(Fishing.fishermansDietMaxLevel, Fishing.fishermansDietRankLevel1);
-        }
-
-        // MASTER ANGLER
-        if (canMasterAngler) {
-            double rawBiteChance = ((Math.max((skillValue / 200.0), 1.0)) / (isStorming ? 300 : 500));
-            Biome biome = player.getLocation().getBlock().getBiome();
-
-            if (biome == Biome.RIVER || biome == Biome.OCEAN) {
-                rawBiteChance = rawBiteChance * 2.0;
-            }
-
-            if (player.isInsideVehicle() && player.getVehicle().getType() == EntityType.BOAT) {
-                rawBiteChance = rawBiteChance * 2.0;
-            }
-
-            biteChance = calculateAbilityDisplayValues(rawBiteChance * 100.0)[0];
-        }
+        fishermansDietRank = calculateRank(Fishing.fishermansDietMaxLevel, Fishing.fishermansDietRankLevel1);
    }

    @Override
@@ -85,13 +56,11 @@ public class FishingCommand extends SkillCommand {
        canMagicHunt = Permissions.magicHunter(player);
        canShake = Permissions.shake(player);
        canFishermansDiet = Permissions.fishermansDiet(player);
-        canMasterAngler = Permissions.masterAngler(player);
-        canIceFish = Permissions.iceFishing(player);
    }

    @Override
    protected boolean effectsHeaderPermissions() {
-        return canTreasureHunt || canMagicHunt || canShake || canMasterAngler || canFishermansDiet || canIceFish;
+        return canTreasureHunt || canMagicHunt || canShake;
    }

    @Override
@@ -113,59 +82,44 @@ public class FishingCommand extends SkillCommand {
        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")));
-        }
    }

    @Override
    protected boolean statsHeaderPermissions() {
-        return canTreasureHunt || canMagicHunt || canShake || canMasterAngler || canFishermansDiet || canIceFish;
+        return canTreasureHunt || canMagicHunt || canShake;
    }

    @Override
    protected void statsDisplay() {
-        if (canMasterAngler) {
-            player.sendMessage(LocaleLoader.getString("Fishing.Ability.Chance", biteChance));
-        }
-
        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 (isLucky) {
+                player.sendMessage(LocaleLoader.getString("Fishing.Enchant.Chance", magicChance) + chanceRaining + LocaleLoader.getString("Perks.lucky.bonus", magicChanceLucky));
+            }
+            else {
+                player.sendMessage(LocaleLoader.getString("Fishing.Enchant.Chance", magicChance) + chanceRaining);
+            }
        }

        if (canShake) {
-            int unlockLevel = AdvancedConfig.getInstance().getShakeUnlockLevel();
-
-            if (skillValue < unlockLevel) {
-                player.sendMessage(LocaleLoader.getString("Ability.Generic.Template.Lock", LocaleLoader.getString("Fishing.Ability.Locked.0", unlockLevel)));
+            if (skillValue < AdvancedConfig.getInstance().getShakeUnlockLevel()) {
+                player.sendMessage(LocaleLoader.getString("Ability.Generic.Template.Lock", LocaleLoader.getString("Fishing.Ability.Locked.0", AdvancedConfig.getInstance().getShakeUnlockLevel())));
            }
            else {
-                player.sendMessage(LocaleLoader.getString("Fishing.Ability.Shake", shakeChance) + (isLucky ? LocaleLoader.getString("Perks.Lucky.Bonus", shakeChanceLucky) : ""));
+                if (isLucky) {
+                    player.sendMessage(LocaleLoader.getString("Fishing.Ability.Shake", shakeChance) + LocaleLoader.getString("Perks.lucky.bonus", shakeChanceLucky));
+                }
+                else {
+                    player.sendMessage(LocaleLoader.getString("Fishing.Ability.Shake", shakeChance));
+                }
            }
        }

        if (canFishermansDiet) {
            player.sendMessage(LocaleLoader.getString("Fishing.Ability.FD", fishermansDietRank));
        }
-
-        if (canIceFish) {
-            int unlockLevel = AdvancedConfig.getInstance().getIceFishingUnlockLevel();
-
-            if (skillValue < unlockLevel) {
-                player.sendMessage(LocaleLoader.getString("Ability.Generic.Template.Lock", LocaleLoader.getString("Fishing.Ability.Locked.1", unlockLevel)));
-            }
-            else {
-                player.sendMessage(LocaleLoader.getString("Fishing.Ability.IceFishing"));
-            }
-        }
    }
 }
--- a/src/main/java/com/gmail/nossr50/commands/skills/HerbalismCommand.java
+++ b/src/main/java/com/gmail/nossr50/commands/skills/HerbalismCommand.java
@@ -12,8 +12,8 @@ public class HerbalismCommand extends SkillCommand {
    private String greenTerraLengthEndurance;
    private String greenThumbChance;
    private String greenThumbChanceLucky;
-    private int greenThumbStage;
-    private int farmersDietRank;
+    private String greenThumbStage;
+    private String farmersDietRank;
    private String doubleDropChance;
    private String doubleDropChanceLucky;
    private String hylianLuckChance;
@@ -23,11 +23,12 @@ public class HerbalismCommand extends SkillCommand {

    private boolean hasHylianLuck;
    private boolean canGreenTerra;
-    private boolean canGreenThumbPlants;
+    private boolean canGreenThumbWheat;
    private boolean canGreenThumbBlocks;
    private boolean canFarmersDiet;
    private boolean canDoubleDrop;
    private boolean canShroomThumb;
+    private boolean doubleDropsDisabled;

    public HerbalismCommand() {
        super(SkillType.HERBALISM);
@@ -36,62 +37,51 @@ public class HerbalismCommand extends SkillCommand {
    @Override
    protected void dataCalculations() {
        // GREEN TERRA
-        if (canGreenTerra) {
-            String[] greenTerraStrings = calculateLengthDisplayValues();
-            greenTerraLength = greenTerraStrings[0];
-            greenTerraLengthEndurance = greenTerraStrings[1];
-        }
+        String[] greenTerraStrings = calculateLengthDisplayValues();
+        greenTerraLength = greenTerraStrings[0];
+        greenTerraLengthEndurance = greenTerraStrings[1];

        // FARMERS DIET
-        if (canFarmersDiet) {
-            farmersDietRank = calculateRank(Herbalism.farmersDietMaxLevel, Herbalism.farmersDietRankLevel1);
-        }
+        farmersDietRank = calculateRank(Herbalism.farmersDietMaxLevel, Herbalism.farmersDietRankLevel1);

        // GREEN THUMB
-        if (canGreenThumbBlocks || canGreenThumbPlants) {
-            greenThumbStage = calculateRank(Herbalism.greenThumbStageMaxLevel, Herbalism.greenThumbStageChangeLevel);
+        greenThumbStage = calculateRank(Herbalism.greenThumbStageMaxLevel, Herbalism.greenThumbStageChangeLevel);

-            String[] greenThumbStrings = calculateAbilityDisplayValues(Herbalism.greenThumbMaxLevel, Herbalism.greenThumbMaxChance);
-            greenThumbChance = greenThumbStrings[0];
-            greenThumbChanceLucky = greenThumbStrings[1];
-        }
+        String[] greenThumbStrings = calculateAbilityDisplayValues(Herbalism.greenThumbMaxLevel, Herbalism.greenThumbMaxChance);
+        greenThumbChance = greenThumbStrings[0];
+        greenThumbChanceLucky = greenThumbStrings[1];

        // DOUBLE DROPS
-        if (canDoubleDrop) {
-            String[] doubleDropStrings = calculateAbilityDisplayValues(Herbalism.doubleDropsMaxLevel, Herbalism.doubleDropsMaxChance);
-            doubleDropChance = doubleDropStrings[0];
-            doubleDropChanceLucky = doubleDropStrings[1];
-        }
+        String[] doubleDropStrings = calculateAbilityDisplayValues(Herbalism.doubleDropsMaxLevel, Herbalism.doubleDropsMaxChance);
+        doubleDropChance = doubleDropStrings[0];
+        doubleDropChanceLucky = doubleDropStrings[1];

        // HYLIAN LUCK
-        if (hasHylianLuck) {
-            String[] hylianLuckStrings = calculateAbilityDisplayValues(Herbalism.hylianLuckMaxLevel, Herbalism.hylianLuckMaxChance);
-            hylianLuckChance = hylianLuckStrings[0];
-            hylianLuckChanceLucky = hylianLuckStrings[1];
-        }
+        String[] hylianLuckStrings = calculateAbilityDisplayValues(Herbalism.hylianLuckMaxLevel, Herbalism.hylianLuckMaxChance);
+        hylianLuckChance = hylianLuckStrings[0];
+        hylianLuckChanceLucky = hylianLuckStrings[1];

        // SHROOM THUMB
-        if (canShroomThumb) {
-            String[] shroomThumbStrings = calculateAbilityDisplayValues(Herbalism.shroomThumbMaxLevel, Herbalism.shroomThumbMaxChance);
-            shroomThumbChance = shroomThumbStrings[0];
-            shroomThumbChanceLucky = shroomThumbStrings[1];
-        }
+        String[] shroomThumbStrings = calculateAbilityDisplayValues(Herbalism.shroomThumbMaxLevel, Herbalism.shroomThumbMaxChance);
+        shroomThumbChance = shroomThumbStrings[0];
+        shroomThumbChanceLucky = shroomThumbStrings[1];
    }

    @Override
    protected void permissionsCheck() {
        hasHylianLuck = Permissions.hylianLuck(player);
        canGreenTerra = Permissions.greenTerra(player);
-        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);
-        canGreenThumbBlocks = Permissions.greenThumbBlock(player, Material.DIRT) || Permissions.greenThumbBlock(player, Material.COBBLESTONE) || Permissions.greenThumbBlock(player, Material.COBBLE_WALL) || Permissions.greenThumbBlock(player, Material.SMOOTH_BRICK);
+        canGreenThumbWheat = Permissions.greenThumbPlant(player, Material.CROPS); // TODO: This isn't really accurate - they could have perms for other crops but not wheat.
+        canGreenThumbBlocks = (Permissions.greenThumbBlock(player, Material.DIRT) || Permissions.greenThumbBlock(player, Material.COBBLESTONE) || Permissions.greenThumbBlock(player, Material.COBBLE_WALL) || Permissions.greenThumbBlock(player, Material.SMOOTH_BRICK));
        canFarmersDiet = Permissions.farmersDiet(player);
-        canDoubleDrop = Permissions.doubleDrops(player, skill) && !skill.getDoubleDropsDisabled();
+        canDoubleDrop = Permissions.doubleDrops(player, skill);
+        doubleDropsDisabled = skill.getDoubleDropsDisabled();
        canShroomThumb = Permissions.shroomThumb(player);
    }

    @Override
    protected boolean effectsHeaderPermissions() {
-        return canGreenTerra || canDoubleDrop || canFarmersDiet || canGreenThumbBlocks || canGreenThumbPlants || canShroomThumb;
+        return canGreenTerra || (canDoubleDrop && !doubleDropsDisabled) || canFarmersDiet || canGreenThumbBlocks || canGreenThumbWheat || canShroomThumb;
    }

    @Override
@@ -102,7 +92,7 @@ public class HerbalismCommand extends SkillCommand {
            player.sendMessage(LocaleLoader.getString("Effects.Template", LocaleLoader.getString("Herbalism.Effect.0"), LocaleLoader.getString("Herbalism.Effect.1")));
        }

-        if (canGreenThumbPlants) {
+        if (canGreenThumbWheat) {
            player.sendMessage(LocaleLoader.getString("Effects.Template", LocaleLoader.getString("Herbalism.Effect.2"), LocaleLoader.getString("Herbalism.Effect.3")));
        }

@@ -122,27 +112,37 @@ public class HerbalismCommand extends SkillCommand {
            player.sendMessage(LocaleLoader.getString("Effects.Template", LocaleLoader.getString("Herbalism.Effect.12"), LocaleLoader.getString("Herbalism.Effect.13")));
        }

-        if (canDoubleDrop) {
+        if (canDoubleDrop && !doubleDropsDisabled) {
            player.sendMessage(LocaleLoader.getString("Effects.Template", LocaleLoader.getString("Herbalism.Effect.8"), LocaleLoader.getString("Herbalism.Effect.9")));
        }
    }

    @Override
    protected boolean statsHeaderPermissions() {
-        return canGreenTerra || canDoubleDrop || canFarmersDiet || canGreenThumbBlocks || canGreenThumbPlants || canShroomThumb;
+        return canGreenTerra || (canDoubleDrop && !doubleDropsDisabled) || canFarmersDiet || canGreenThumbBlocks || canGreenThumbWheat || canShroomThumb;
    }

    @Override
    protected void statsDisplay() {
        if (canGreenTerra) {
-            player.sendMessage(LocaleLoader.getString("Herbalism.Ability.GTe.Length", greenTerraLength) + (hasEndurance ? LocaleLoader.getString("Perks.ActivationTime.Bonus", greenTerraLengthEndurance) : ""));
+            if (hasEndurance) {
+                player.sendMessage(LocaleLoader.getString("Herbalism.Ability.GTe.Length", greenTerraLength) + LocaleLoader.getString("Perks.activationtime.bonus", greenTerraLengthEndurance));
+            }
+            else {
+                player.sendMessage(LocaleLoader.getString("Herbalism.Ability.GTe.Length", greenTerraLength));
+            }
        }

-        if (canGreenThumbBlocks || canGreenThumbPlants) {
-            player.sendMessage(LocaleLoader.getString("Herbalism.Ability.GTh.Chance", greenThumbChance) + (isLucky ? LocaleLoader.getString("Perks.Lucky.Bonus", greenThumbChanceLucky) : ""));
+        if (canGreenThumbBlocks || canGreenThumbWheat) {
+            if (isLucky) {
+                player.sendMessage(LocaleLoader.getString("Herbalism.Ability.GTh.Chance", greenThumbChance) + LocaleLoader.getString("Perks.lucky.bonus", greenThumbChanceLucky));
+            }
+            else {
+                player.sendMessage(LocaleLoader.getString("Herbalism.Ability.GTh.Chance", greenThumbChance));
+            }
        }

-        if (canGreenThumbPlants) {
+        if (canGreenThumbWheat) {
            player.sendMessage(LocaleLoader.getString("Herbalism.Ability.GTh.Stage", greenThumbStage));
        }

@@ -151,15 +151,30 @@ public class HerbalismCommand extends SkillCommand {
        }

        if (hasHylianLuck) {
-            player.sendMessage(LocaleLoader.getString("Herbalism.Ability.HylianLuck", hylianLuckChance) + (isLucky ? LocaleLoader.getString("Perks.Lucky.Bonus", hylianLuckChanceLucky) : ""));
+            if (isLucky) {
+                player.sendMessage(LocaleLoader.getString("Herbalism.Ability.HylianLuck", hylianLuckChance) + LocaleLoader.getString("Perks.lucky.bonus", hylianLuckChanceLucky));
+            }
+            else {
+                player.sendMessage(LocaleLoader.getString("Herbalism.Ability.HylianLuck", hylianLuckChance));
+            }
        }

        if (canShroomThumb) {
-            player.sendMessage(LocaleLoader.getString("Herbalism.Ability.ShroomThumb.Chance", shroomThumbChance) + (isLucky ? LocaleLoader.getString("Perks.Lucky.Bonus", shroomThumbChanceLucky) : ""));
+            if (isLucky) {
+                player.sendMessage(LocaleLoader.getString("Herbalism.Ability.ShroomThumb.Chance", shroomThumbChance) + LocaleLoader.getString("Perks.lucky.bonus", shroomThumbChanceLucky));
+            }
+            else {
+                player.sendMessage(LocaleLoader.getString("Herbalism.Ability.ShroomThumb.Chance", shroomThumbChance));
+            }
        }

-        if (canDoubleDrop) {
-            player.sendMessage(LocaleLoader.getString("Herbalism.Ability.DoubleDropChance", doubleDropChance) + (isLucky ? LocaleLoader.getString("Perks.Lucky.Bonus", doubleDropChanceLucky) : ""));
+        if (canDoubleDrop && !doubleDropsDisabled) {
+            if (isLucky) {
+                player.sendMessage(LocaleLoader.getString("Herbalism.Ability.DoubleDropChance", doubleDropChance) + LocaleLoader.getString("Perks.lucky.bonus", doubleDropChanceLucky));
+            }
+            else {
+                player.sendMessage(LocaleLoader.getString("Herbalism.Ability.DoubleDropChance", doubleDropChance));
+            }
        }
    }
 }
--- a/src/main/java/com/gmail/nossr50/commands/skills/MiningCommand.java
+++ b/src/main/java/com/gmail/nossr50/commands/skills/MiningCommand.java
@@ -6,6 +6,7 @@ import com.gmail.nossr50.locale.LocaleLoader;
 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;
@@ -25,6 +26,7 @@ public class MiningCommand extends SkillCommand {
    private boolean canBlast;
    private boolean canBiggerBombs;
    private boolean canDemoExpert;
+    private boolean doubleDropsDisabled;

    public MiningCommand() {
        super(SkillType.MINING);
@@ -33,30 +35,23 @@ public class MiningCommand extends SkillCommand {
    @Override
    protected void dataCalculations() {
        // SUPER BREAKER
-        if (canSuperBreaker) {
-            String[] superBreakerStrings = calculateLengthDisplayValues();
-            superBreakerLength = superBreakerStrings[0];
-            superBreakerLengthEndurance = superBreakerStrings[1];
-        }
+        String[] superBreakerStrings = calculateLengthDisplayValues();
+        superBreakerLength = superBreakerStrings[0];
+        superBreakerLengthEndurance = superBreakerStrings[1];

        // DOUBLE DROPS
-        if (canDoubleDrop) {
-            String[] doubleDropStrings = calculateAbilityDisplayValues(Mining.doubleDropsMaxLevel, Mining.doubleDropsMaxChance);
-            doubleDropChance = doubleDropStrings[0];
-            doubleDropChanceLucky = doubleDropStrings[1];
-        }
+        String[] doubleDropStrings = calculateAbilityDisplayValues(Mining.doubleDropsMaxLevel, Mining.doubleDropsMaxChance);
+        doubleDropChance = doubleDropStrings[0];
+        doubleDropChanceLucky = doubleDropStrings[1];

        // BLAST MINING
-        if (canBlast || canDemoExpert || canBiggerBombs) {
-            MiningManager miningManager = mcMMOPlayer.getMiningManager();
-
-            blastMiningRank = miningManager.getBlastMiningTier();
-            bonusTNTDrops = miningManager.getDropMultiplier();
-            oreBonus = percent.format(miningManager.getOreBonus() / 30.0D); // Base received in TNT is 30%
-            debrisReduction = percent.format(miningManager.getDebrisReduction() / 30.0D); // Base received in TNT is 30%
-            blastDamageDecrease = percent.format(miningManager.getBlastDamageModifier() / 100.0D);
-            blastRadiusIncrease = miningManager.getBlastRadiusModifier();
-        }
+        MiningManager miningManager = UserManager.getPlayer(player).getMiningManager();
+        blastMiningRank = miningManager.getBlastMiningTier();
+        bonusTNTDrops = miningManager.getDropMultiplier();
+        oreBonus = percent.format(miningManager.getOreBonus() / 30.0D); // Base received in TNT is 30%
+        debrisReduction = percent.format(miningManager.getDebrisReduction() / 30.0D); // Base received in TNT is 30%
+        blastDamageDecrease = percent.format(miningManager.getBlastDamageModifier() / 100.0D);
+        blastRadiusIncrease = miningManager.getBlastRadiusModifier();
    }

    @Override
@@ -64,13 +59,14 @@ public class MiningCommand extends SkillCommand {
        canBiggerBombs = Permissions.biggerBombs(player);
        canBlast = Permissions.remoteDetonation(player);
        canDemoExpert = Permissions.demolitionsExpertise(player);
-        canDoubleDrop = Permissions.doubleDrops(player, skill) && !skill.getDoubleDropsDisabled();
+        canDoubleDrop = Permissions.doubleDrops(player, skill);
        canSuperBreaker = Permissions.superBreaker(player);
+        doubleDropsDisabled = skill.getDoubleDropsDisabled();
    }

    @Override
    protected boolean effectsHeaderPermissions() {
-        return canBiggerBombs || canBlast || canDemoExpert || canDoubleDrop || canSuperBreaker;
+        return canBiggerBombs || canBlast || canDemoExpert || (canDoubleDrop && !doubleDropsDisabled) || canSuperBreaker;
    }

    @Override
@@ -81,7 +77,7 @@ public class MiningCommand extends SkillCommand {
            player.sendMessage(LocaleLoader.getString("Effects.Template", LocaleLoader.getString("Mining.Effect.0"), LocaleLoader.getString("Mining.Effect.1")));
        }

-        if (canDoubleDrop) {
+        if (canDoubleDrop && !doubleDropsDisabled) {
            player.sendMessage(LocaleLoader.getString("Effects.Template", LocaleLoader.getString("Mining.Effect.2"), LocaleLoader.getString("Mining.Effect.3")));
        }

@@ -100,24 +96,32 @@ public class MiningCommand extends SkillCommand {

    @Override
    protected boolean statsHeaderPermissions() {
-        return canBiggerBombs || canBlast || canDemoExpert || canDoubleDrop || canSuperBreaker;
+        return canBiggerBombs || canBlast || canDemoExpert || (canDoubleDrop && !doubleDropsDisabled) || canSuperBreaker;
    }

    @Override
    protected void statsDisplay() {
-        if (canDoubleDrop) {
-            player.sendMessage(LocaleLoader.getString("Mining.Effect.DropChance", doubleDropChance) + (isLucky ? LocaleLoader.getString("Perks.Lucky.Bonus", doubleDropChanceLucky) : ""));
+        if (canDoubleDrop && !doubleDropsDisabled) {
+            if (isLucky) {
+                player.sendMessage(LocaleLoader.getString("Mining.Effect.DropChance", doubleDropChance) + LocaleLoader.getString("Perks.lucky.bonus", doubleDropChanceLucky));
+            }
+            else {
+                player.sendMessage(LocaleLoader.getString("Mining.Effect.DropChance", doubleDropChance));
+            }
        }

        if (canSuperBreaker) {
-            player.sendMessage(LocaleLoader.getString("Mining.Ability.Length", superBreakerLength) + (hasEndurance ? LocaleLoader.getString("Perks.ActivationTime.Bonus", superBreakerLengthEndurance) : ""));
+            if (hasEndurance) {
+                player.sendMessage(LocaleLoader.getString("Mining.Ability.Length", superBreakerLength) + LocaleLoader.getString("Perks.activationtime.bonus", superBreakerLengthEndurance));
+            }
+            else {
+                player.sendMessage(LocaleLoader.getString("Mining.Ability.Length", superBreakerLength));
+            }
        }

        if (canBlast) {
-            int unlockLevel = AdvancedConfig.getInstance().getBlastMiningRank1();
-
-            if (skillValue < unlockLevel) {
-                player.sendMessage(LocaleLoader.getString("Ability.Generic.Template.Lock", LocaleLoader.getString("Mining.Ability.Locked.0", unlockLevel)));
+            if (skillValue < AdvancedConfig.getInstance().getBlastMiningRank1()) {
+                player.sendMessage(LocaleLoader.getString("Ability.Generic.Template.Lock", LocaleLoader.getString("Mining.Ability.Locked.0", AdvancedConfig.getInstance().getBlastMiningRank1())));
            }
            else {
                player.sendMessage(LocaleLoader.getString("Mining.Blast.Rank", blastMiningRank, LocaleLoader.getString("Mining.Blast.Effect", oreBonus, debrisReduction, bonusTNTDrops)));
@@ -125,10 +129,8 @@ public class MiningCommand extends SkillCommand {
        }

        if (canBiggerBombs) {
-            int unlockLevel = AdvancedConfig.getInstance().getBlastMiningRank2();
-
-            if (skillValue < unlockLevel) {
-                player.sendMessage(LocaleLoader.getString("Ability.Generic.Template.Lock", LocaleLoader.getString("Mining.Ability.Locked.1", unlockLevel)));
+            if (skillValue < AdvancedConfig.getInstance().getBlastMiningRank2()) {
+                player.sendMessage(LocaleLoader.getString("Ability.Generic.Template.Lock", LocaleLoader.getString("Mining.Ability.Locked.1", AdvancedConfig.getInstance().getBlastMiningRank2())));
            }
            else {
                player.sendMessage(LocaleLoader.getString("Mining.Blast.Radius.Increase", blastRadiusIncrease));
@@ -136,10 +138,8 @@ public class MiningCommand extends SkillCommand {
        }

        if (canDemoExpert) {
-            int unlockLevel = AdvancedConfig.getInstance().getBlastMiningRank4();
-
-            if (skillValue < unlockLevel) {
-                player.sendMessage(LocaleLoader.getString("Ability.Generic.Template.Lock", LocaleLoader.getString("Mining.Ability.Locked.2", unlockLevel)));
+            if (skillValue < AdvancedConfig.getInstance().getBlastMiningRank4()) {
+                player.sendMessage(LocaleLoader.getString("Ability.Generic.Template.Lock", LocaleLoader.getString("Mining.Ability.Locked.2", AdvancedConfig.getInstance().getBlastMiningRank4())));
            }
            else {
                player.sendMessage(LocaleLoader.getString("Mining.Effect.Decrease", blastDamageDecrease));
--- a/src/main/java/com/gmail/nossr50/commands/skills/RepairCommand.java
+++ b/src/main/java/com/gmail/nossr50/commands/skills/RepairCommand.java
@@ -5,13 +5,13 @@ import org.bukkit.Material;
 import com.gmail.nossr50.mcMMO;
 import com.gmail.nossr50.datatypes.skills.SkillType;
 import com.gmail.nossr50.locale.LocaleLoader;
-import com.gmail.nossr50.skills.repair.ArcaneForging;
 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.Salvage;
 import com.gmail.nossr50.util.Permissions;

 public class RepairCommand extends SkillCommand {
+    private int arcaneForgingRank;
    private String repairMasteryBonus;
    private String superRepairChance;
    private String superRepairChanceLucky;
@@ -41,10 +41,10 @@ public class RepairCommand extends SkillCommand {
    @Override
    protected void dataCalculations() {
        // We're using pickaxes here, not the best but it works
-        Repairable diamondRepairable = mcMMO.getRepairableManager().getRepairable(Material.DIAMOND_PICKAXE);
-        Repairable goldRepairable = mcMMO.getRepairableManager().getRepairable(Material.GOLD_PICKAXE);
-        Repairable ironRepairable = mcMMO.getRepairableManager().getRepairable(Material.IRON_PICKAXE);
-        Repairable stoneRepairable = mcMMO.getRepairableManager().getRepairable(Material.STONE_PICKAXE);
+        Repairable diamondRepairable = mcMMO.repairManager.getRepairable(Material.DIAMOND_PICKAXE.getId());
+        Repairable goldRepairable = mcMMO.repairManager.getRepairable(Material.GOLD_PICKAXE.getId());
+        Repairable ironRepairable = mcMMO.repairManager.getRepairable(Material.IRON_PICKAXE.getId());
+        Repairable stoneRepairable = mcMMO.repairManager.getRepairable(Material.STONE_PICKAXE.getId());

        // TODO: This isn't really accurate - if they don't have pickaxes loaded it doesn't always mean the repair level is 0
        diamondLevel = (diamondRepairable == null) ? 0 : diamondRepairable.getMinimumLevel();
@@ -53,16 +53,20 @@ public class RepairCommand extends SkillCommand {
        stoneLevel = (stoneRepairable == null) ? 0 : stoneRepairable.getMinimumLevel();

        // REPAIR MASTERY
-        if (canMasterRepair) {
-            repairMasteryBonus = percent.format(Math.min(((Repair.repairMasteryMaxBonus / Repair.repairMasteryMaxBonusLevel) * skillValue), Repair.repairMasteryMaxBonus) / 100D);
+        if (skillValue >= Repair.repairMasteryMaxBonusLevel) {
+            repairMasteryBonus = percent.format(Repair.repairMasteryMaxBonus / 100D);
+        }
+        else {
+            repairMasteryBonus = percent.format(((Repair.repairMasteryMaxBonus / Repair.repairMasteryMaxBonusLevel) * skillValue) / 100D);
        }

        // SUPER REPAIR
-        if (canSuperRepair) {
-            String[] superRepairStrings = calculateAbilityDisplayValues(Repair.superRepairMaxBonusLevel, Repair.superRepairMaxChance);
-            superRepairChance = superRepairStrings[0];
-            superRepairChanceLucky = superRepairStrings[1];
-        }
+        String[] superRepairStrings = calculateAbilityDisplayValues(Repair.superRepairMaxBonusLevel, Repair.superRepairMaxChance);
+        superRepairChance = superRepairStrings[0];
+        superRepairChanceLucky = superRepairStrings[1];
+
+        // ARCANE FORGING
+        arcaneForgingRank = Repair.getArcaneForgingRank(profile);
    }

    @Override
@@ -118,8 +122,8 @@ public class RepairCommand extends SkillCommand {
            player.sendMessage(LocaleLoader.getString("Effects.Template", LocaleLoader.getString("Repair.Effect.6", diamondLevel), LocaleLoader.getString("Repair.Effect.7")));
        }

-        if (canSalvage && Repair.salvageUnlockLevel > 0) {
-            player.sendMessage(LocaleLoader.getString("Effects.Template", LocaleLoader.getString("Repair.Effect.16", Repair.salvageUnlockLevel), LocaleLoader.getString("Repair.Effect.17")));
+        if (canSalvage && Salvage.salvageUnlockLevel > 0) {
+            player.sendMessage(LocaleLoader.getString("Effects.Template", LocaleLoader.getString("Repair.Effect.16", Salvage.salvageUnlockLevel), LocaleLoader.getString("Repair.Effect.17")));
        }

        if (canArcaneForge) {
@@ -139,20 +143,23 @@ public class RepairCommand extends SkillCommand {
        }

        if (canSuperRepair) {
-            player.sendMessage(LocaleLoader.getString("Repair.Skills.Super.Chance", superRepairChance) + (isLucky ? LocaleLoader.getString("Perks.Lucky.Bonus", superRepairChanceLucky) : ""));
+            if (isLucky) {
+                player.sendMessage(LocaleLoader.getString("Repair.Skills.Super.Chance", superRepairChance) + LocaleLoader.getString("Perks.lucky.bonus", superRepairChanceLucky));
+            }
+            else {
+                player.sendMessage(LocaleLoader.getString("Repair.Skills.Super.Chance", superRepairChance));
+            }
        }

        if (canArcaneForge) {
-            RepairManager repairManager = mcMMOPlayer.getRepairManager();
+            player.sendMessage(LocaleLoader.getString("Repair.Arcane.Rank", arcaneForgingRank));

-            player.sendMessage(LocaleLoader.getString("Repair.Arcane.Rank", repairManager.getArcaneForgingRank()));
-
-            if (ArcaneForging.arcaneForgingEnchantLoss) {
-                player.sendMessage(LocaleLoader.getString("Repair.Arcane.Chance.Success", (arcaneBypass ? 100 : repairManager.getKeepEnchantChance())));
+            if (Repair.arcaneForgingEnchantLoss) {
+                player.sendMessage(LocaleLoader.getString("Repair.Arcane.Chance.Success", (arcaneBypass ? 100 : Repair.getEnchantChance(arcaneForgingRank))));
            }

-            if (ArcaneForging.arcaneForgingDowngrades) {
-                player.sendMessage(LocaleLoader.getString("Repair.Arcane.Chance.Downgrade", (arcaneBypass ? 0 : repairManager.getDowngradeEnchantChance())));
+            if (Repair.arcaneForgingDowngrades) {
+                player.sendMessage(LocaleLoader.getString("Repair.Arcane.Chance.Downgrade", (arcaneBypass ? 0 : Repair.getDowngradeChance(arcaneForgingRank))));
            }
        }
    }
--- a/src/main/java/com/gmail/nossr50/commands/skills/SkillCommand.java
+++ b/src/main/java/com/gmail/nossr50/commands/skills/SkillCommand.java
@@ -1,40 +1,29 @@
 package com.gmail.nossr50.commands.skills;

 import java.text.DecimalFormat;
-import java.util.List;
-import java.util.Set;

 import org.bukkit.command.Command;
 import org.bukkit.command.CommandExecutor;
 import org.bukkit.command.CommandSender;
-import org.bukkit.command.TabExecutor;
 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;
 import com.gmail.nossr50.util.Permissions;
 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.gmail.nossr50.util.skills.PerksUtils;
 import com.gmail.nossr50.util.skills.SkillUtils;

-import com.google.common.collect.ImmutableList;
-
-public abstract class SkillCommand implements TabExecutor {
+public abstract class SkillCommand implements CommandExecutor {
    protected SkillType skill;
-    protected String skillName;
+    private String skillString;

    protected Player player;
    protected PlayerProfile profile;
-    protected McMMOPlayer mcMMOPlayer;
-
    protected float skillValue;
    protected boolean isLucky;
    protected boolean hasEndurance;
@@ -42,12 +31,9 @@ public abstract class SkillCommand implements TabExecutor {
    protected DecimalFormat percent = new DecimalFormat("##0.00%");
    protected DecimalFormat decimal = new DecimalFormat("##0.00");

-    private CommandExecutor skillGuideCommand;
-
    public SkillCommand(SkillType skill) {
        this.skill = skill;
-        skillName = SkillUtils.getSkillName(skill);
-        skillGuideCommand = new SkillGuideCommand(skill);
+        this.skillString = StringUtils.getCapitalized(skill.toString());
    }

    @Override
@@ -57,98 +43,96 @@ public abstract class SkillCommand implements TabExecutor {
        }

        player = (Player) sender;
-        mcMMOPlayer = UserManager.getPlayer(player);
+        profile = UserManager.getPlayer(player).getProfile();

-        switch (args.length) {
-            case 0:
-                profile = mcMMOPlayer.getProfile();
-
-                skillValue = profile.getSkillLevel(skill);
-                isLucky = Permissions.lucky(sender, skill);
-                hasEndurance = (PerksUtils.handleActivationPerks(player, 0, 0) != 0);
-
-                permissionsCheck();
-                dataCalculations();
-
-                if (!skill.isChildSkill()) {
-                    player.sendMessage(LocaleLoader.getString("Skills.Header", skillName));
-                    player.sendMessage(LocaleLoader.getString("Commands.XPGain", LocaleLoader.getString("Commands.XPGain." + StringUtils.getCapitalized(skill.toString()))));
-
-                    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")));
-                    player.sendMessage(LocaleLoader.getString("Commands.XPGain", LocaleLoader.getString("Commands.XPGain.Child")));
-                    player.sendMessage(LocaleLoader.getString("Effects.Child", (int) skillValue));
-
-                    player.sendMessage(LocaleLoader.getString("Skills.Header", LocaleLoader.getString("Skills.Parents")));
-                    Set<SkillType> parents = FamilyTree.getParents(skill);
-
-                    for (SkillType parent : parents) {
-                        player.sendMessage(SkillUtils.getSkillName(parent) + " - " + LocaleLoader.getString("Effects.Level", profile.getSkillLevel(parent), profile.getSkillXpLevel(parent), profile.getXpToLevel(parent)));
-                    }
-                }
-
-                if (effectsHeaderPermissions()) {
-                    player.sendMessage(LocaleLoader.getString("Skills.Header", LocaleLoader.getString("Effects.Effects")));
-                }
-
-                effectsDisplay();
-
-                if (statsHeaderPermissions()) {
-                    player.sendMessage(LocaleLoader.getString("Skills.Header", LocaleLoader.getString("Commands.Stats.Self")));
-                }
-
-                statsDisplay();
-
-                player.sendMessage(LocaleLoader.getString("Guides.Available", skillName, skillName.toLowerCase()));
-                return true;
-
-            default:
-                return skillGuideCommand.onCommand(sender, command, label, args);
+        if (profile == null) {
+            sender.sendMessage(LocaleLoader.getString("Commands.DoesNotExist"));
+            return true;
        }
+
+        skillValue = profile.getSkillLevel(skill);
+        isLucky = Permissions.lucky(sender, skill);
+        hasEndurance = (Permissions.twelveSecondActivationBoost(sender) || Permissions.eightSecondActivationBoost(sender) || Permissions.fourSecondActivationBoost(sender));
+
+        dataCalculations();
+        permissionsCheck();
+
+        player.sendMessage(LocaleLoader.getString("Skills.Header", LocaleLoader.getString(skillString + ".SkillName")));
+
+        if (!skill.isChildSkill()) {
+            player.sendMessage(LocaleLoader.getString("Commands.XPGain", LocaleLoader.getString("Commands.XPGain." + skillString)));
+            player.sendMessage(LocaleLoader.getString("Effects.Level", profile.getSkillLevel(skill), profile.getSkillXpLevel(skill), profile.getXpToLevel(skill)));
+        }
+
+        if (effectsHeaderPermissions()) {
+            player.sendMessage(LocaleLoader.getString("Skills.Header", LocaleLoader.getString("Effects.Effects")));
+        }
+
+        effectsDisplay();
+
+        if (statsHeaderPermissions()) {
+            player.sendMessage(LocaleLoader.getString("Skills.Header", LocaleLoader.getString("Commands.Stats.Self")));
+        }
+
+        statsDisplay();
+
+        return SkillGuideCommand.grabGuidePageForSkill(skill, player, args);
    }

-    @Override
-    public List<String> onTabComplete(CommandSender sender, Command command, String alias, String[] args) {
-        switch (args.length) {
-            case 1:
-                return ImmutableList.of("?");
-            default:
-                return ImmutableList.of();
+    protected String calculateRank(int maxLevel, int rankChangeLevel) {
+        if (skillValue >= maxLevel) {
+            return String.valueOf(maxLevel / rankChangeLevel);
        }
-    }

-    protected int calculateRank(int maxLevel, int rankChangeLevel) {
-        return Math.min((int) skillValue, maxLevel) / rankChangeLevel;
+        return String.valueOf((int) (skillValue / rankChangeLevel));
    }

    protected String[] calculateAbilityDisplayValues(double chance) {
-        String[] displayValues = new String[2];
+        if (isLucky) {
+            double luckyChance = chance * 1.3333D;

-        displayValues[0] = percent.format(Math.min(chance, 100.0D) / 100.0D);
-        displayValues[1] = isLucky ? percent.format(Math.min(chance * 1.3333D, 100.0D) / 100.0D) : null;
+            if (luckyChance >= 100D) {
+                return new String[] { percent.format(chance / 100.0D), percent.format(1.0D) };
+            }

-        return displayValues;
+            return new String[] { percent.format(chance / 100.0D), percent.format(luckyChance / 100.0D) };
+        }
+
+        return new String[] { percent.format(chance / 100.0D), null };
    }

    protected String[] calculateAbilityDisplayValues(int maxBonusLevel, double maxChance) {
-        return calculateAbilityDisplayValues((maxChance / maxBonusLevel) * Math.min(skillValue, maxBonusLevel));
+        double abilityChance;
+
+        if (skillValue >= maxBonusLevel) {
+            abilityChance = maxChance;
+        }
+        else {
+            abilityChance = (maxChance / maxBonusLevel) * skillValue;
+        }
+
+        if (isLucky) {
+            double luckyChance = abilityChance * 1.3333D;
+
+            if (luckyChance >= 100D) {
+                return new String[] { percent.format(abilityChance / 100.0D), percent.format(1.0D) };
+            }
+
+            return new String[] { percent.format(abilityChance / 100.0D), percent.format(luckyChance / 100.0D) };
+        }
+
+        return new String[] { percent.format(abilityChance / 100.0D), null };
    }

    protected String[] calculateLengthDisplayValues() {
-        int maxLength = skill.getAbility().getMaxLength();
+        int maxLength = skill.getAbilityType().getMaxTicks();
        int length = 2 + (int) (skillValue / AdvancedConfig.getInstance().getAbilityLength());
        int enduranceLength = PerksUtils.handleActivationPerks(player, length, maxLength);

        if (maxLength != 0) {
-            length = Math.min(length, maxLength);
+            if (length > maxLength) {
+                length = maxLength;
+            }
        }

        return new String[] { String.valueOf(length), String.valueOf(enduranceLength) };
@@ -157,7 +141,7 @@ public abstract class SkillCommand implements TabExecutor {
    protected void luckyEffectsDisplay() {
        if (isLucky) {
            String perkPrefix = LocaleLoader.getString("MOTD.PerksPrefix");
-            player.sendMessage(perkPrefix + LocaleLoader.getString("Effects.Template", LocaleLoader.getString("Perks.Lucky.Name"), LocaleLoader.getString("Perks.Lucky.Desc", skillName)));
+            player.sendMessage(perkPrefix + LocaleLoader.getString("Effects.Template", LocaleLoader.getString("Perks.lucky.name"), LocaleLoader.getString("Perks.lucky.desc", SkillUtils.getSkillName(skill))));
        }
    }

--- a/src/main/java/com/gmail/nossr50/commands/skills/SkillGuideCommand.java
+++ b/src/main/java/com/gmail/nossr50/commands/skills/SkillGuideCommand.java
@@ -2,89 +2,106 @@ package com.gmail.nossr50.commands.skills;

 import java.util.ArrayList;

-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.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;
+public final class SkillGuideCommand {
+    private SkillGuideCommand() {}

-    private String invalidPage;
+    public static int getTotalPageNumber(String address) {
+        String[] addressSplit = LocaleLoader.getString(address).split("\n");

-    public SkillGuideCommand(SkillType skillType) {
-        header = LocaleLoader.getString("Guides.Header", SkillUtils.getSkillName(skillType));
-        guide = LocaleLoader.getString("Guides." + StringUtils.getCapitalized(skillType.toString())).split("\n");
+        if (addressSplit.length <= 8) {
+            return 1;
+        }

-        invalidPage = LocaleLoader.getString("Guides.Page.Invalid");
+        return (addressSplit.length / 8) + 1;
    }

-    @Override
-    public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
+    public static ArrayList<String> grabPageContents(String header, String address, int pagenum) {
+        int pageIndexStart = 0;
+
+        // Determine what string to start at
+        if (pagenum > 1) {
+            pageIndexStart = 8 * (pagenum - 1);
+        }
+
+        ArrayList<String> allStrings = new ArrayList<String>();
+        String split[] = LocaleLoader.getString(address).split("\n");
+
+        allStrings.add(LocaleLoader.getString("Guides.Header", header));
+
+        // Add targeted strings
+        while (allStrings.size() < 9) {
+            if (pageIndexStart + allStrings.size() > split.length) {
+                allStrings.add("");
+            }
+            else {
+                allStrings.add(split[pageIndexStart + allStrings.size() - 1]);
+            }
+        }
+
+        allStrings.add("Page " + pagenum + " of " + getTotalPageNumber(address));
+        return allStrings;
+    }
+
+    public static void clearChat(Player player) {
+        player.sendMessage("\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n"); // Dear god why?
+    }
+
+    public static boolean grabGuidePageForSkill(SkillType skilltype, Player player, String[] args) {
+        String skillName = skilltype.toString();
+        String capitalized = StringUtils.getCapitalized(skillName);
+        String localized = SkillUtils.getSkillName(skilltype);
+        player.sendMessage(LocaleLoader.getString("Guides.Available", localized, localized.toLowerCase()));
+
+        String address = "Guides." + capitalized;
+
        switch (args.length) {
+            case 0:
+                // We have to specify this, otherwise we get the usage string every time we call /skillname...
+                return true;
+
            case 1:
                if (!args[0].equals("?")) {
                    return false;
                }

-                sendGuide(sender, 1);
+                SkillGuideCommand.clearChat(player);
+
+                for (String target : SkillGuideCommand.grabPageContents(localized, address, 1)) {
+                    player.sendMessage(target);
+                }
+
                return true;

            case 2:
-                int totalPages = getTotalPageNumber();
+                int totalPages = SkillGuideCommand.getTotalPageNumber(address);

                if (!StringUtils.isInt(args[1])) {
-                    sender.sendMessage(invalidPage);
+                    player.sendMessage(LocaleLoader.getString("Guides.Page.Invalid"));
                    return true;
                }

-                int pageNumber = Integer.parseInt(args[1]);
-
-                if (pageNumber > totalPages || pageNumber <= 0) {
-                    sender.sendMessage(LocaleLoader.getString("Guides.Page.OutOfRange", totalPages));
+                if (Integer.parseInt(args[1]) > totalPages) {
+                    player.sendMessage(LocaleLoader.getString("Guides.Page.OutOfRange", totalPages));
                    return true;
                }

-                sendGuide(sender, pageNumber);
+                SkillGuideCommand.clearChat(player);
+
+                for (String target : SkillGuideCommand.grabPageContents(localized, address, Integer.parseInt(args[1]))) {
+                    player.sendMessage(target);
+                }
+
                return true;

            default:
                return false;
        }
    }
-
-    private int getTotalPageNumber() {
-        return (int) Math.ceil(guide.length / 8.0);
-    }
-
-    private void sendGuide(CommandSender sender, int pageNumber) {
-        for (String target : grabPageContents(pageNumber)) {
-            sender.sendMessage(target);
-        }
-    }
-
-    private ArrayList<String> grabPageContents(int pagenum) {
-        int pageIndexStart = 8 * (pagenum - 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) {
-                allStrings.add("");
-            }
-            else {
-                allStrings.add(guide[pageIndexStart + (allStrings.size() - 1)]);
-            }
-        }
-
-        allStrings.add("Page " + pagenum + " of " + getTotalPageNumber());
-        return allStrings;
-    }
 }
--- a/src/main/java/com/gmail/nossr50/commands/skills/SmeltingCommand.java
+++ b/src/main/java/com/gmail/nossr50/commands/skills/SmeltingCommand.java
@@ -5,6 +5,7 @@ import com.gmail.nossr50.datatypes.skills.SkillType;
 import com.gmail.nossr50.locale.LocaleLoader;
 import com.gmail.nossr50.skills.smelting.Smelting;
 import com.gmail.nossr50.util.Permissions;
+import com.gmail.nossr50.util.player.UserManager;

 public class SmeltingCommand extends SkillCommand {
    private String burnTimeModifier;
@@ -13,6 +14,8 @@ public class SmeltingCommand extends SkillCommand {
    private String fluxMiningChance;
    private String fluxMiningChanceLucky;

+    private int vanillaXPModifier;
+
    private boolean canFuelEfficiency;
    private boolean canSecondSmelt;
    private boolean canFluxMine;
@@ -25,23 +28,20 @@ public class SmeltingCommand extends SkillCommand {
    @Override
    protected void dataCalculations() {
        // FUEL EFFICIENCY
-        if (canFuelEfficiency) {
-            burnTimeModifier = decimal.format(1 + ((skillValue / Smelting.burnModifierMaxLevel) * Smelting.burnTimeMultiplier));
-        }
+        burnTimeModifier = decimal.format(1 + ((skillValue / Smelting.burnModifierMaxLevel) * Smelting.burnTimeMultiplier));

        // SECOND SMELT
-        if (canSecondSmelt) {
-            String[] secondSmeltStrings = calculateAbilityDisplayValues(Smelting.secondSmeltMaxLevel, Smelting.secondSmeltMaxChance);
-            secondSmeltChance = secondSmeltStrings[0];
-            secondSmeltChanceLucky = secondSmeltStrings[1];
-        }
+        String[] secondSmeltStrings = calculateAbilityDisplayValues(Smelting.secondSmeltMaxLevel, Smelting.secondSmeltMaxChance);
+        secondSmeltChance = secondSmeltStrings[0];
+        secondSmeltChanceLucky = secondSmeltStrings[1];

        // FLUX MINING
-        if (canFluxMine) {
-            String[] fluxMiningStrings = calculateAbilityDisplayValues(Smelting.fluxMiningChance);
-            fluxMiningChance = fluxMiningStrings[0];
-            fluxMiningChanceLucky = fluxMiningStrings[1];
-        }
+        String[] fluxMiningStrings = calculateAbilityDisplayValues(Smelting.fluxMiningChance);
+        fluxMiningChance = fluxMiningStrings[0];
+        fluxMiningChanceLucky = fluxMiningStrings[1];
+
+        // VANILLA XP BOOST
+        vanillaXPModifier = UserManager.getPlayer(player).getSmeltingManager().getVanillaXpMultiplier();
    }

    @Override
@@ -90,17 +90,20 @@ public class SmeltingCommand extends SkillCommand {
        }

        if (canSecondSmelt) {
-            player.sendMessage(LocaleLoader.getString("Smelting.Ability.SecondSmelt", secondSmeltChance) + (isLucky ? LocaleLoader.getString("Perks.Lucky.Bonus", secondSmeltChanceLucky) : ""));
+            if (isLucky) {
+                player.sendMessage(LocaleLoader.getString("Smelting.Ability.SecondSmelt", secondSmeltChance) + LocaleLoader.getString("Perks.lucky.bonus", secondSmeltChanceLucky));
+            }
+            else {
+                player.sendMessage(LocaleLoader.getString("Smelting.Ability.SecondSmelt", secondSmeltChance));
+            }
        }

        if (canVanillaXPBoost) {
-            int unlockLevel = AdvancedConfig.getInstance().getSmeltingVanillaXPBoostRank1Level();
-
-            if (skillValue < unlockLevel) {
-                player.sendMessage(LocaleLoader.getString("Ability.Generic.Template.Lock", LocaleLoader.getString("Smelting.Ability.Locked.0", unlockLevel)));
+            if (skillValue < AdvancedConfig.getInstance().getSmeltingVanillaXPBoostRank1Level()) {
+                player.sendMessage(LocaleLoader.getString("Ability.Generic.Template.Lock", LocaleLoader.getString("Smelting.Ability.Locked.0", AdvancedConfig.getInstance().getSmeltingVanillaXPBoostRank1Level())));
            }
            else {
-                player.sendMessage(LocaleLoader.getString("Smelting.Ability.VanillaXPBoost", mcMMOPlayer.getSmeltingManager().getVanillaXpMultiplier()));
+                player.sendMessage(LocaleLoader.getString("Smelting.Ability.VanillaXPBoost", vanillaXPModifier));
            }
        }

@@ -108,8 +111,11 @@ public class SmeltingCommand extends SkillCommand {
            if (skillValue < Smelting.fluxMiningUnlockLevel) {
                player.sendMessage(LocaleLoader.getString("Ability.Generic.Template.Lock", LocaleLoader.getString("Smelting.Ability.Locked.1", Smelting.fluxMiningUnlockLevel)));
            }
+            else if (isLucky) {
+                player.sendMessage(LocaleLoader.getString("Smelting.Ability.FluxMining", fluxMiningChance) + LocaleLoader.getString("Perks.lucky.bonus", fluxMiningChanceLucky));
+            }
            else {
-                player.sendMessage(LocaleLoader.getString("Smelting.Ability.FluxMining", fluxMiningChance) + (isLucky ? LocaleLoader.getString("Perks.Lucky.Bonus", fluxMiningChanceLucky) : ""));
+                player.sendMessage(LocaleLoader.getString("Smelting.Ability.FluxMining", fluxMiningChance));
            }
        }
    }
--- a/src/main/java/com/gmail/nossr50/commands/skills/SwordsCommand.java
+++ b/src/main/java/com/gmail/nossr50/commands/skills/SwordsCommand.java
@@ -8,7 +8,7 @@ import com.gmail.nossr50.util.Permissions;
 public class SwordsCommand extends SkillCommand {
    private String counterAttackChance;
    private String counterAttackChanceLucky;
-    private int bleedLength;
+    private String bleedLength;
    private String bleedChance;
    private String bleedChanceLucky;
    private String serratedStrikesLength;
@@ -25,27 +25,26 @@ public class SwordsCommand extends SkillCommand {
    @Override
    protected void dataCalculations() {
        // SERRATED STRIKES
-        if (canSerratedStrike) {
-            String[] serratedStrikesStrings = calculateLengthDisplayValues();
-            serratedStrikesLength = serratedStrikesStrings[0];
-            serratedStrikesLengthEndurance = serratedStrikesStrings[1];
-        }
+        String[] serratedStrikesStrings = calculateLengthDisplayValues();
+        serratedStrikesLength = serratedStrikesStrings[0];
+        serratedStrikesLengthEndurance = serratedStrikesStrings[1];

        // BLEED
-        if (canBleed) {
-            bleedLength = (skillValue >= Swords.bleedMaxBonusLevel) ? Swords.bleedMaxTicks : Swords.bleedBaseTicks;
-
-            String[] bleedStrings = calculateAbilityDisplayValues(Swords.bleedMaxBonusLevel, Swords.bleedMaxChance);
-            bleedChance = bleedStrings[0];
-            bleedChanceLucky = bleedStrings[1];
+        if (skillValue >= Swords.bleedMaxBonusLevel) {
+            bleedLength = String.valueOf(Swords.bleedMaxTicks);
        }
+        else {
+            bleedLength = String.valueOf(Swords.bleedBaseTicks);
+        }
+
+        String[] bleedStrings = calculateAbilityDisplayValues(Swords.bleedMaxBonusLevel, Swords.bleedMaxChance);
+        bleedChance = bleedStrings[0];
+        bleedChanceLucky = bleedStrings[1];

        // COUNTER ATTACK
-        if (canCounter) {
-            String[] counterAttackStrings = calculateAbilityDisplayValues(Swords.counterAttackMaxBonusLevel, Swords.counterAttackMaxChance);
-            counterAttackChance = counterAttackStrings[0];
-            counterAttackChanceLucky = counterAttackStrings[1];
-        }
+        String[] counterAttackStrings = calculateAbilityDisplayValues(Swords.counterAttackMaxBonusLevel, Swords.counterAttackMaxChance);
+        counterAttackChance = counterAttackStrings[0];
+        counterAttackChanceLucky = counterAttackStrings[1];
    }

    @Override
@@ -86,17 +85,33 @@ public class SwordsCommand extends SkillCommand {
    @Override
    protected void statsDisplay() {
        if (canCounter) {
-            player.sendMessage(LocaleLoader.getString("Swords.Combat.Counter.Chance", counterAttackChance) + (isLucky ? LocaleLoader.getString("Perks.Lucky.Bonus", counterAttackChanceLucky) : ""));
+            if (isLucky) {
+                player.sendMessage(LocaleLoader.getString("Swords.Combat.Counter.Chance", counterAttackChance) + LocaleLoader.getString("Perks.lucky.bonus", counterAttackChanceLucky));
+            }
+            else {
+                player.sendMessage(LocaleLoader.getString("Swords.Combat.Counter.Chance", counterAttackChance));
+            }
        }

        if (canBleed) {
            player.sendMessage(LocaleLoader.getString("Swords.Combat.Bleed.Length", bleedLength));
            player.sendMessage(LocaleLoader.getString("Swords.Combat.Bleed.Note"));
-            player.sendMessage(LocaleLoader.getString("Swords.Combat.Bleed.Chance", bleedChance) + (isLucky ? LocaleLoader.getString("Perks.Lucky.Bonus", bleedChanceLucky) : ""));
+
+            if (isLucky) {
+                player.sendMessage(LocaleLoader.getString("Swords.Combat.Bleed.Chance", bleedChance) + LocaleLoader.getString("Perks.lucky.bonus", bleedChanceLucky));
+            }
+            else {
+                player.sendMessage(LocaleLoader.getString("Swords.Combat.Bleed.Chance", bleedChance));
+            }
        }

        if (canSerratedStrike) {
-            player.sendMessage(LocaleLoader.getString("Swords.SS.Length", serratedStrikesLength) + (hasEndurance ? LocaleLoader.getString("Perks.ActivationTime.Bonus", serratedStrikesLengthEndurance) : ""));
+            if (hasEndurance) {
+                player.sendMessage(LocaleLoader.getString("Swords.SS.Length", serratedStrikesLength) + LocaleLoader.getString("Perks.activationtime.bonus", serratedStrikesLengthEndurance));
+            }
+            else {
+                player.sendMessage(LocaleLoader.getString("Swords.SS.Length", serratedStrikesLength));
+            }
        }
    }
 }
--- a/src/main/java/com/gmail/nossr50/commands/skills/TamingCommand.java
+++ b/src/main/java/com/gmail/nossr50/commands/skills/TamingCommand.java
@@ -1,7 +1,5 @@
 package com.gmail.nossr50.commands.skills;

-import org.bukkit.entity.EntityType;
-
 import com.gmail.nossr50.config.Config;
 import com.gmail.nossr50.datatypes.skills.SkillType;
 import com.gmail.nossr50.locale.LocaleLoader;
@@ -28,17 +26,15 @@ public class TamingCommand extends SkillCommand {

    @Override
    protected void dataCalculations() {
-        if (canGore) {
-            String[] goreStrings = calculateAbilityDisplayValues(Taming.goreMaxBonusLevel, Taming.goreMaxChance);
-            goreChance = goreStrings[0];
-            goreChanceLucky = goreStrings[1];
-        }
+        String[] goreStrings = calculateAbilityDisplayValues(Taming.goreMaxBonusLevel, Taming.goreMaxChance);
+        goreChance = goreStrings[0];
+        goreChanceLucky = goreStrings[1];
    }

    @Override
    protected void permissionsCheck() {
        canBeastLore = Permissions.beastLore(player);
-        canCallWild = Permissions.callOfTheWild(player, EntityType.HORSE) || Permissions.callOfTheWild(player, EntityType.WOLF) || Permissions.callOfTheWild(player, EntityType.OCELOT);
+        canCallWild = Permissions.callOfTheWild(player);
        canEnvironmentallyAware = Permissions.environmentallyAware(player);
        canFastFood = Permissions.fastFoodService(player);
        canGore = Permissions.gore(player);
@@ -93,7 +89,6 @@ public class TamingCommand extends SkillCommand {
            player.sendMessage(LocaleLoader.getString("Effects.Template", LocaleLoader.getString("Taming.Effect.12"), LocaleLoader.getString("Taming.Effect.13")));
            player.sendMessage(LocaleLoader.getString("Taming.Effect.14", Config.getInstance().getTamingCOTWOcelotCost()));
            player.sendMessage(LocaleLoader.getString("Taming.Effect.15", Config.getInstance().getTamingCOTWWolfCost()));
-            player.sendMessage(LocaleLoader.getString("Taming.Effect.20", Config.getInstance().getTamingCOTWHorseCost()));
        }
    }

@@ -159,7 +154,12 @@ public class TamingCommand extends SkillCommand {
        }

        if (canGore) {
-            player.sendMessage(LocaleLoader.getString("Taming.Combat.Chance.Gore", goreChance) + (isLucky ? LocaleLoader.getString("Perks.Lucky.Bonus", goreChanceLucky) : ""));
+            if (isLucky) {
+                player.sendMessage(LocaleLoader.getString("Taming.Combat.Chance.Gore", goreChance) + LocaleLoader.getString("Perks.lucky.bonus", goreChanceLucky));
+            }
+            else {
+                player.sendMessage(LocaleLoader.getString("Taming.Combat.Chance.Gore", goreChance));
+            }
        }
    }
 }
--- a/src/main/java/com/gmail/nossr50/commands/skills/UnarmedCommand.java
+++ b/src/main/java/com/gmail/nossr50/commands/skills/UnarmedCommand.java
@@ -14,7 +14,7 @@ public class UnarmedCommand extends SkillCommand {
    private String disarmChanceLucky;
    private String ironGripChance;
    private String ironGripChanceLucky;
-    private double ironArmBonus;
+    private String ironArmBonus;

    private boolean canBerserk;
    private boolean canDisarm;
@@ -29,37 +29,32 @@ public class UnarmedCommand extends SkillCommand {
    @Override
    protected void dataCalculations() {
        // BERSERK
-        if (canBerserk) {
-            String[] berserkStrings = calculateLengthDisplayValues();
-            berserkLength = berserkStrings[0];
-            berserkLengthEndurance = berserkStrings[1];
-        }
+        String[] berserkStrings = calculateLengthDisplayValues();
+        berserkLength = berserkStrings[0];
+        berserkLengthEndurance = berserkStrings[1];

        // DISARM
-        if (canDisarm) {
-            String[] disarmStrings = calculateAbilityDisplayValues(Unarmed.disarmMaxBonusLevel, Unarmed.disarmMaxChance);
-            disarmChance = disarmStrings[0];
-            disarmChanceLucky = disarmStrings[1];
-        }
+        String[] disarmStrings = calculateAbilityDisplayValues(Unarmed.disarmMaxBonusLevel, Unarmed.disarmMaxChance);
+        disarmChance = disarmStrings[0];
+        disarmChanceLucky = disarmStrings[1];

        // DEFLECT
-        if (canDeflect) {
-            String[] deflectStrings = calculateAbilityDisplayValues(Unarmed.deflectMaxBonusLevel, Unarmed.deflectMaxChance);
-            deflectChance = deflectStrings[0];
-            deflectChanceLucky = deflectStrings[1];
-        }
+        String[] deflectStrings = calculateAbilityDisplayValues(Unarmed.deflectMaxBonusLevel, Unarmed.deflectMaxChance);
+        deflectChance = deflectStrings[0];
+        deflectChanceLucky = deflectStrings[1];

        // IRON ARM
-        if (canBonusDamage) {
-            ironArmBonus = Math.min(3 + ((int) skillValue / Unarmed.ironArmIncreaseLevel), Unarmed.ironArmMaxBonusDamage);
+        if (skillValue >= ((Unarmed.ironArmMaxBonusDamage - 3) * Unarmed.ironArmIncreaseLevel)) {
+            ironArmBonus = String.valueOf(Unarmed.ironArmMaxBonusDamage);
+        }
+        else {
+            ironArmBonus = String.valueOf(3 + (skillValue / Unarmed.ironArmIncreaseLevel));
        }

        // IRON GRIP
-        if (canIronGrip) {
-            String[] ironGripStrings = calculateAbilityDisplayValues(Unarmed.ironGripMaxBonusLevel, Unarmed.ironGripMaxChance);
-            ironGripChance = ironGripStrings[0];
-            ironGripChanceLucky = ironGripStrings[1];
-        }
+        String[] ironGripStrings = calculateAbilityDisplayValues(Unarmed.ironGripMaxBonusLevel, Unarmed.ironGripMaxChance);
+        ironGripChance = ironGripStrings[0];
+        ironGripChanceLucky = ironGripStrings[1];
    }

    @Override
@@ -113,19 +108,39 @@ public class UnarmedCommand extends SkillCommand {
        }

        if (canDeflect) {
-            player.sendMessage(LocaleLoader.getString("Unarmed.Ability.Chance.ArrowDeflect", deflectChance) + (isLucky ? LocaleLoader.getString("Perks.Lucky.Bonus", deflectChanceLucky) : ""));
+            if (isLucky) {
+                player.sendMessage(LocaleLoader.getString("Unarmed.Ability.Chance.ArrowDeflect", deflectChance) + LocaleLoader.getString("Perks.lucky.bonus", deflectChanceLucky));
+            }
+            else {
+                player.sendMessage(LocaleLoader.getString("Unarmed.Ability.Chance.ArrowDeflect", deflectChance));
+            }
        }

        if (canDisarm) {
-            player.sendMessage(LocaleLoader.getString("Unarmed.Ability.Chance.Disarm", disarmChance) + (isLucky ? LocaleLoader.getString("Perks.Lucky.Bonus", disarmChanceLucky) : ""));
+            if (isLucky) {
+                player.sendMessage(LocaleLoader.getString("Unarmed.Ability.Chance.Disarm", disarmChance) + LocaleLoader.getString("Perks.lucky.bonus", disarmChanceLucky));
+            }
+            else {
+                player.sendMessage(LocaleLoader.getString("Unarmed.Ability.Chance.Disarm", disarmChance));
+            }
        }

        if (canIronGrip) {
-            player.sendMessage(LocaleLoader.getString("Unarmed.Ability.Chance.IronGrip", ironGripChance) + (isLucky ? LocaleLoader.getString("Perks.Lucky.Bonus", ironGripChanceLucky) : ""));
+            if (isLucky) {
+                player.sendMessage(LocaleLoader.getString("Unarmed.Ability.Chance.IronGrip", ironGripChance) + LocaleLoader.getString("Perks.lucky.bonus", ironGripChanceLucky));
+            }
+            else {
+                player.sendMessage(LocaleLoader.getString("Unarmed.Ability.Chance.IronGrip", ironGripChance));
+            }
        }

        if (canBerserk) {
-            player.sendMessage(LocaleLoader.getString("Unarmed.Ability.Berserk.Length", berserkLength) + (hasEndurance ? LocaleLoader.getString("Perks.ActivationTime.Bonus", berserkLengthEndurance) : ""));
+            if (hasEndurance) {
+                player.sendMessage(LocaleLoader.getString("Unarmed.Ability.Berserk.Length", berserkLength) + LocaleLoader.getString("Perks.activationtime.bonus", berserkLengthEndurance));
+            }
+            else {
+                player.sendMessage(LocaleLoader.getString("Unarmed.Ability.Berserk.Length", berserkLength));
+            }
        }
    }
 }
--- a/src/main/java/com/gmail/nossr50/commands/skills/WoodcuttingCommand.java
+++ b/src/main/java/com/gmail/nossr50/commands/skills/WoodcuttingCommand.java
@@ -15,6 +15,7 @@ public class WoodcuttingCommand extends SkillCommand {
    private boolean canTreeFell;
    private boolean canLeafBlow;
    private boolean canDoubleDrop;
+    private boolean doubleDropsDisabled;

    public WoodcuttingCommand() {
        super(SkillType.WOODCUTTING);
@@ -23,30 +24,27 @@ public class WoodcuttingCommand extends SkillCommand {
    @Override
    protected void dataCalculations() {
        // TREE FELLER
-        if (canTreeFell) {
-            String[] treeFellerStrings = calculateLengthDisplayValues();
-            treeFellerLength = treeFellerStrings[0];
-            treeFellerLengthEndurance = treeFellerStrings[1];
-        }
+        String[] treeFellerStrings = calculateLengthDisplayValues();
+        treeFellerLength = treeFellerStrings[0];
+        treeFellerLengthEndurance = treeFellerStrings[1];

        // DOUBLE DROPS
-        if (canDoubleDrop) {
-            String[] doubleDropStrings = calculateAbilityDisplayValues(Woodcutting.doubleDropsMaxLevel, Woodcutting.doubleDropsMaxChance);
-            doubleDropChance = doubleDropStrings[0];
-            doubleDropChanceLucky = doubleDropStrings[1];
-        }
+        String[] doubleDropStrings = calculateAbilityDisplayValues(Woodcutting.doubleDropsMaxLevel, Woodcutting.doubleDropsMaxChance);
+        doubleDropChance = doubleDropStrings[0];
+        doubleDropChanceLucky = doubleDropStrings[1];
    }

    @Override
    protected void permissionsCheck() {
        canTreeFell = Permissions.treeFeller(player);
-        canDoubleDrop = Permissions.doubleDrops(player, skill) && !skill.getDoubleDropsDisabled();
+        canDoubleDrop = Permissions.doubleDrops(player, skill);
        canLeafBlow = Permissions.leafBlower(player);
+        doubleDropsDisabled = skill.getDoubleDropsDisabled();
    }

    @Override
    protected boolean effectsHeaderPermissions() {
-        return canDoubleDrop || canLeafBlow || canTreeFell;
+        return (canDoubleDrop && !doubleDropsDisabled) || canLeafBlow || canTreeFell;
    }

    @Override
@@ -61,14 +59,14 @@ public class WoodcuttingCommand extends SkillCommand {
            player.sendMessage(LocaleLoader.getString("Effects.Template", LocaleLoader.getString("Woodcutting.Effect.2"), LocaleLoader.getString("Woodcutting.Effect.3")));
        }

-        if (canDoubleDrop) {
+        if (canDoubleDrop && !doubleDropsDisabled) {
            player.sendMessage(LocaleLoader.getString("Effects.Template", LocaleLoader.getString("Woodcutting.Effect.4"), LocaleLoader.getString("Woodcutting.Effect.5")));
        }
    }

    @Override
    protected boolean statsHeaderPermissions() {
-        return canDoubleDrop || canLeafBlow || canTreeFell;
+        return (canDoubleDrop && !doubleDropsDisabled) || canLeafBlow || canTreeFell;
    }

    @Override
@@ -84,12 +82,22 @@ public class WoodcuttingCommand extends SkillCommand {
            }
        }

-        if (canDoubleDrop) {
-            player.sendMessage(LocaleLoader.getString("Woodcutting.Ability.Chance.DDrop", doubleDropChance) + (isLucky ? LocaleLoader.getString("Perks.Lucky.Bonus", doubleDropChanceLucky) : ""));
+        if (canDoubleDrop && !doubleDropsDisabled) {
+            if (isLucky) {
+                player.sendMessage(LocaleLoader.getString("Woodcutting.Ability.Chance.DDrop", doubleDropChance) + LocaleLoader.getString("Perks.lucky.bonus", doubleDropChanceLucky));
+            }
+            else {
+                player.sendMessage(LocaleLoader.getString("Woodcutting.Ability.Chance.DDrop", doubleDropChance));
+            }
        }

        if (canTreeFell) {
-            player.sendMessage(LocaleLoader.getString("Woodcutting.Ability.Length", treeFellerLength) + (hasEndurance ? LocaleLoader.getString("Perks.ActivationTime.Bonus", treeFellerLengthEndurance) : ""));
+            if (hasEndurance) {
+                player.sendMessage(LocaleLoader.getString("Woodcutting.Ability.Length", treeFellerLength) + LocaleLoader.getString("Perks.activationtime.bonus", treeFellerLengthEndurance));
+            }
+            else {
+                player.sendMessage(LocaleLoader.getString("Woodcutting.Ability.Length", treeFellerLength));
+            }
        }
    }
 }
--- a/src/main/java/com/gmail/nossr50/commands/spout/MchudCommand.java
+++ b/src/main/java/com/gmail/nossr50/commands/spout/MchudCommand.java
@@ -0,0 +1,29 @@
+package com.gmail.nossr50.commands.spout;
+
+import org.bukkit.command.Command;
+import org.bukkit.command.CommandSender;
+
+import com.gmail.nossr50.datatypes.spout.huds.HudType;
+import com.gmail.nossr50.locale.LocaleLoader;
+
+public class MchudCommand extends SpoutCommand {
+    @Override
+    protected boolean noArguments(Command command, CommandSender sender, String[] args) {
+        return false;
+    }
+
+    @Override
+    protected boolean oneArgument(Command command, CommandSender sender, String[] args) {
+        for (HudType hudType : HudType.values()) {
+            if (hudType.toString().equalsIgnoreCase(args[0])) {
+                playerProfile.setHudType(hudType);
+                spoutHud.initializeXpBar();
+                spoutHud.updateXpBar();
+                return true;
+            }
+        }
+
+        sender.sendMessage(LocaleLoader.getString("Commands.mchud.Invalid"));
+        return true;
+    }
+}
--- a/src/main/java/com/gmail/nossr50/commands/spout/SpoutCommand.java
+++ b/src/main/java/com/gmail/nossr50/commands/spout/SpoutCommand.java
@@ -0,0 +1,54 @@
+package com.gmail.nossr50.commands.spout;
+
+import org.bukkit.command.Command;
+import org.bukkit.command.CommandExecutor;
+import org.bukkit.command.CommandSender;
+import org.bukkit.entity.Player;
+
+import com.gmail.nossr50.mcMMO;
+import com.gmail.nossr50.config.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 CommandExecutor {
+    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.spoutEnabled || !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);
+}
--- a/src/main/java/com/gmail/nossr50/commands/spout/XplockCommand.java
+++ b/src/main/java/com/gmail/nossr50/commands/spout/XplockCommand.java
@@ -0,0 +1,69 @@
+package com.gmail.nossr50.commands.spout;
+
+import org.bukkit.command.Command;
+import org.bukkit.command.CommandSender;
+
+import com.gmail.nossr50.datatypes.skills.SkillType;
+import com.gmail.nossr50.locale.LocaleLoader;
+import com.gmail.nossr50.util.Permissions;
+import com.gmail.nossr50.util.skills.SkillUtils;
+
+public class XplockCommand extends SpoutCommand {
+    @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 (args[0].equalsIgnoreCase("on")) {
+            lockXpBar(sender, spoutHud.getLastGained());
+            return true;
+        }
+
+        if (args[0].equalsIgnoreCase("off")) {
+            unlockXpBar(sender);
+            return true;
+        }
+
+        if (!SkillUtils.isSkill(args[0])) {
+            sender.sendMessage(LocaleLoader.getString("Commands.Skill.Invalid"));
+            return true;
+        }
+
+        SkillType skill = SkillType.getSkill(args[0]);
+
+        if (skill.isChildSkill()) {
+            sender.sendMessage("Child skills are not yet supported by this command."); // TODO: Localize this
+            return true;
+        }
+
+        if (!Permissions.xplock(sender, skill)) {
+            sender.sendMessage(command.getPermissionMessage());
+            return true;
+        }
+
+        lockXpBar(sender, 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"));
+    }
+}
--- a/src/main/java/com/gmail/nossr50/config/AdvancedConfig.java
+++ b/src/main/java/com/gmail/nossr50/config/AdvancedConfig.java
@@ -1,14 +1,10 @@
 package com.gmail.nossr50.config;

-import java.util.ArrayList;
-import java.util.List;
-
 public class AdvancedConfig extends AutoUpdateConfigLoader {
    private static AdvancedConfig instance;

    private AdvancedConfig() {
        super("advanced.yml");
-        validate();
    }

    public static AdvancedConfig getInstance() {
@@ -19,785 +15,25 @@ public class AdvancedConfig extends AutoUpdateConfigLoader {
        return instance;
    }

-    @Override
-    protected boolean validateKeys() {
-        // Validate all the settings!
-        List<String> reason = new ArrayList<String>();
-
-        /* GENERAL */
-        if (getAbilityLength() < 1) {
-            reason.add("Skills.General.Ability_IncreaseLevel should be at least 1!");
-        }
-
-        if (getEnchantBuff() < 1) {
-            reason.add("Skills.General.Ability_EnchantBuff should be at least 1!");
-        }
-
-        /* ACROBATICS */
-        if (getDodgeChanceMax() < 1) {
-            reason.add("Skills.Acrobatics.Dodge_ChanceMax should be at least 1!");
-        }
-
-        if (getDodgeMaxBonusLevel() < 1) {
-            reason.add("Skills.Acrobatics.Dodge_MaxBonusLevel should be at least 1!");
-        }
-
-        if (getDodgeDamageModifier() <= 1) {
-            reason.add("Skills.Acrobatics.Dodge_DamageModifier should be greater than 1!");
-        }
-
-        if (getRollChanceMax() < 1) {
-            reason.add("Skills.Acrobatics.Roll_ChanceMax should be at least 1!");
-        }
-
-        if (getRollMaxBonusLevel() < 1) {
-            reason.add("Skills.Acrobatics.Roll_MaxBonusLevel should be at least 1!");
-        }
-
-        if (getRollDamageThreshold() < 0) {
-            reason.add("Skills.Acrobatics.Roll_DamageThreshold should be at least 0!");
-        }
-
-        if (getGracefulRollChanceMax() < 1) {
-            reason.add("Skills.Acrobatics.GracefulRoll_ChanceMax should be at least 1!");
-        }
-
-        if (getGracefulRollMaxBonusLevel() < 1) {
-            reason.add("Skills.Acrobatics.GracefulRoll_MaxBonusLevel should be at least 1!");
-        }
-
-        if (getGracefulRollDamageThreshold() < 0) {
-            reason.add("Skills.Acrobatics.GracefulRoll_DamageThreshold should be at least 0!");
-        }
-
-        if (getDodgeXPModifier() < 0) {
-            reason.add("Skills.Acrobatics.Dodge_XP_Modifier should be at least 0!");
-        }
-
-        if (getRollXPModifier() < 0) {
-            reason.add("Skills.Acrobatics.Roll_XP_Modifier should be at least 0!");
-        }
-
-        if (getFallXPModifier() < 0) {
-            reason.add("Skills.Acrobatics.Fall_XP_Modifier should be at least 0!");
-        }
-
-        /* ARCHERY */
-        if (getSkillShotIncreaseLevel() < 1) {
-            reason.add("Skills.Archery.SkillShot_IncreaseLevel should be at least 1!");
-        }
-
-        if (getSkillShotIncreasePercentage() <= 0) {
-            reason.add("Skills.Archery.SkillShot_IncreasePercentage should be greater than 0!");
-        }
-
-        if (getSkillShotBonusMax() < 0) {
-            reason.add("Skills.Archery.SkillShot_MaxBonus should be at least 0!");
-        }
-
-        if (getDazeBonusMax() < 1) {
-            reason.add("Skills.Acrobatics.Daze_MaxChance should be at least 1!");
-        }
-
-        if (getDazeMaxBonusLevel() < 1) {
-            reason.add("Skills.Acrobatics.Daze_MaxBonusLevel should be at least 1!");
-        }
-
-        if (getDazeModifier() < 0) {
-            reason.add("Skills.Acrobatics.Daze_BonusDamage should be at least 0!");
-        }
-
-        if (getRetrieveChanceMax() < 1) {
-            reason.add("Skills.Acrobatics.Retrieve_MaxBonus should be at least 1!");
-        }
-
-        if (getRetrieveMaxBonusLevel() < 1) {
-            reason.add("Skills.Acrobatics.Retrieve_MaxBonusLevel should be at least 1!");
-        }
-
-        if (getForceMultiplier() < 0) {
-            reason.add("Skills.Acrobatics.Force_Multiplier should be at least 0!");
-        }
-
-        /* AXES */
-        if (getBonusDamageAxesBonusMax() < 1) {
-            reason.add("Skills.Axes.DamageIncrease_MaxBonus should be at least 1!");
-        }
-
-        if (getBonusDamageAxesMaxBonusLevel() < 1) {
-            reason.add("Skills.Axes.DamageIncrease_MaxBonusLevel should be at least 1!");
-        }
-
-        if (getAxesCriticalChance() < 1) {
-            reason.add("Skills.Axes.AxesCritical_MaxChance should be at least 1!");
-        }
-
-        if (getAxesCriticalMaxBonusLevel() < 1) {
-            reason.add("Skills.Axes.AxesCritical_MaxBonusLevel should be at least 1!");
-        }
-
-        if (getAxesCriticalPVPModifier() < 1) {
-            reason.add("Skills.Axes.AxesCritical_PVP_Modifier should be at least 1!");
-        }
-
-        if (getAxesCriticalPVEModifier() < 1) {
-            reason.add("Skills.Axes.AxesCritical_PVE_Modifier should be at least 1!");
-        }
-
-        if (getGreaterImpactChance() < 1) {
-            reason.add("Skills.Axes.GreaterImpact_Chance should be at least 1!");
-        }
-
-        if (getGreaterImpactModifier() < 1) {
-            reason.add("Skills.Axes.GreaterImpact_KnockbackModifier should be at least 1!");
-        }
-
-        if (getGreaterImpactBonusDamage() < 1) {
-            reason.add("Skills.Axes.GreaterImpact_BonusDamage should be at least 1!");
-        }
-
-        if (getArmorImpactIncreaseLevel() < 1) {
-            reason.add("Skills.Axes.ArmorImpact_IncreaseLevel should be at least 1!");
-        }
-
-        if (getImpactChance() < 1) {
-            reason.add("Skills.Axes.ArmorImpact_Chance should be at least 1!");
-        }
-
-        if (getArmorImpactMaxDurabilityDamage() < 1) {
-            reason.add("Skills.Axes.ArmorImpact_MaxPercentageDurabilityDamage should be at least 1!");
-        }
-
-        if (getSkullSplitterModifier() < 1) {
-            reason.add("Skills.Axes.SkullSplitter_DamagerModifier should be at least 1!");
-        }
-
-        /* FISHING */
-        if (getFishingTierLevelsTier1() >= getFishingTierLevelsTier2()) {
-            reason.add("Skills.Fishing.Tier_Levels.Tier1 should be less than Skills.Fishing.Tier_Levels.Tier2!");
-        }
-
-        if (getFishingTierLevelsTier2() >= getFishingTierLevelsTier3()) {
-            reason.add("Skills.Fishing.Tier_Levels.Tier2 should be less than Skills.Fishing.Tier_Levels.Tier3!");
-        }
-
-        if (getFishingTierLevelsTier3() >= getFishingTierLevelsTier4()) {
-            reason.add("Skills.Fishing.Tier_Levels.Tier3 should be less than Skills.Fishing.Tier_Levels.Tier4!");
-        }
-
-        if (getFishingTierLevelsTier4() >= getFishingTierLevelsTier5()) {
-            reason.add("Skills.Fishing.Tier_Levels.Tier4 should be less than Skills.Fishing.Tier_Levels.Tier5!");
-        }
-
-        if (getFishingMagicMultiplier() <= 0) {
-            reason.add("Skills.Fishing.MagicHunter_Multiplier should be greater than 0!");
-        }
-
-        if (getFishermanDietRankChange() < 1) {
-            reason.add("Skills.Fishing.Fisherman_Diet_RankChange should be at least 1!");
-        }
-
-        if (getIceFishingUnlockLevel() < 1) {
-            reason.add("Skills.Fishing.Ice_Fishing_UnlockLevel should be at least 1!");
-        }
-
-        if (getShakeUnlockLevel() < 1) {
-            reason.add("Skills.Fishing.Shake_UnlockLevel should be at least 1!");
-        }
-
-        if (getShakeChanceRank1() > getShakeChanceRank2()) {
-            reason.add("Skills.Fishing.Shake_Chance.Rank_1 should be less or equal to Skills.Fishing.Shake_Chance.Rank_2!");
-        }
-
-        if (getShakeChanceRank2() > getShakeChanceRank3()) {
-            reason.add("Skills.Fishing.Shake_Chance.Rank_2 should be less or equal to Skills.Fishing.Shake_Chance.Rank_3!");
-        }
-
-        if (getShakeChanceRank3() > getShakeChanceRank4()) {
-            reason.add("Skills.Fishing.Shake_Chance.Rank_3 should be less or equal to Skills.Fishing.Shake_Chance.Rank_4!");
-        }
-
-        if (getShakeChanceRank4() > getShakeChanceRank5()) {
-            reason.add("Skills.Fishing.Shake_Chance.Rank_4 should be less or equal to Skills.Fishing.Shake_Chance.Rank_5!");
-        }
-
-        if (getFishingVanillaXPModifierRank1() > getFishingVanillaXPModifierRank2()) {
-            reason.add("Skills.Fishing.VanillaXPBoost.Rank_1 should be less or equal to Skills.Fishing.VanillaXPBoost.Rank_2!");
-        }
-
-        if (getFishingVanillaXPModifierRank2() > getFishingVanillaXPModifierRank3()) {
-            reason.add("Skills.Fishing.VanillaXPBoost.Rank_2 should be less or equal to Skills.Fishing.VanillaXPBoost.Rank_3!");
-        }
-
-        if (getFishingVanillaXPModifierRank3() > getFishingVanillaXPModifierRank4()) {
-            reason.add("Skills.Fishing.VanillaXPBoost.Rank_3 should be less or equal to Skills.Fishing.VanillaXPBoost.Rank_4!");
-        }
-
-        if (getFishingVanillaXPModifierRank4() > getFishingVanillaXPModifierRank5()) {
-            reason.add("Skills.Fishing.VanillaXPBoost.Rank_4 should be less or equal to Skills.Fishing.VanillaXPBoost.Rank_5!");
-        }
-
-        if (getFishingVanillaXPModifierRank1() < 0) {
-            reason.add("Skills.Fishing.VanillaXPBoost.Rank_1 should be at least 0!");
-        }
-
-        if (getFishingVanillaXPModifierRank2() < 0) {
-            reason.add("Skills.Fishing.VanillaXPBoost.Rank_2 should be at least 0!");
-        }
-
-        if (getFishingVanillaXPModifierRank3() < 0) {
-            reason.add("Skills.Fishing.VanillaXPBoost.Rank_3 should be at least 0!");
-        }
-
-        if (getFishingVanillaXPModifierRank4() < 0) {
-            reason.add("Skills.Fishing.VanillaXPBoost.Rank_4 should be at least 0!");
-        }
-
-        if (getFishingVanillaXPModifierRank5() < 0) {
-            reason.add("Skills.Fishing.VanillaXPBoost.Rank_5 should be at least 0!");
-        }
-
-        /* HERBALISM */
-        if (getFarmerDietRankChange() < 1) {
-            reason.add("Skills.Herbalism.Farmer_Diet_RankChange should be at least 1!");
-        }
-
-        if (getGreenThumbStageChange() < 1) {
-            reason.add("Skills.Herbalism.GreenThumb_StageChange should be at least 1!");
-        }
-
-        if (getGreenThumbChanceMax() < 1) {
-            reason.add("Skills.Herbalism.GreenThumb_ChanceMax should be at least 1!");
-        }
-
-        if (getGreenThumbMaxLevel() < 1) {
-            reason.add("Skills.Herbalism.GreenThumb_MaxBonusLevel should be at least 1!");
-        }
-
-        if (getHerbalismDoubleDropsChanceMax() < 1) {
-            reason.add("Skills.Herbalism.DoubleDrops_ChanceMax should be at least 1!");
-        }
-
-        if (getHerbalismDoubleDropsMaxLevel() < 1) {
-            reason.add("Skills.Herbalism.DoubleDrops_MaxBonusLevel should be at least 1!");
-        }
-
-        if (getHylianLuckChanceMax() < 1) {
-            reason.add("Skills.Herbalism.HylianLuck_ChanceMax should be at least 1!");
-        }
-
-        if (getHylianLuckMaxLevel() < 1) {
-            reason.add("Skills.Herbalism.HylianLuck_MaxBonusLevel should be at least 1!");
-        }
-
-        if (getShroomThumbChanceMax() < 1) {
-            reason.add("Skills.Herbalism.ShroomThumb_ChanceMax should be at least 1!");
-        }
-
-        if (getShroomThumbMaxLevel() < 1) {
-            reason.add("Skills.Herbalism.ShroomThumb_MaxBonusLevel should be at least 1!");
-        }
-
-        /* MINING */
-        if (getMiningDoubleDropChance() < 1) {
-            reason.add("Skills.Mining.DoubleDrops_ChanceMax should be at least 1!");
-        }
-
-        if (getMiningDoubleDropMaxLevel() < 1) {
-            reason.add("Skills.Mining.DoubleDrops_MaxBonusLevel should be at least 1!");
-        }
-
-        if (getBlastMiningRank1() > getBlastMiningRank2()) {
-            reason.add("Skills.Mining.BlastMining_Rank1 should be less or equal to Skills.Mining.BlastMining_Rank2!");
-        }
-
-        if (getBlastMiningRank2() > getBlastMiningRank3()) {
-            reason.add("Skills.Mining.BlastMining_Rank2 should be less or equal to Skills.Mining.BlastMining_Rank3!");
-        }
-
-        if (getBlastMiningRank3() > getBlastMiningRank4()) {
-            reason.add("Skills.Mining.BlastMining_Rank3 should be less or equal to Skills.Mining.BlastMining_Rank4!");
-        }
-
-        if (getBlastMiningRank4() > getBlastMiningRank5()) {
-            reason.add("Skills.Mining.BlastMining_Rank4 should be less or equal to Skills.Mining.BlastMining_Rank5!");
-        }
-
-        if (getBlastMiningRank5() > getBlastMiningRank6()) {
-            reason.add("Skills.Mining.BlastMining_Rank5 should be less or equal to Skills.Mining.BlastMining_Rank6!");
-        }
-
-        if (getBlastMiningRank6() > getBlastMiningRank7()) {
-            reason.add("Skills.Mining.BlastMining_Rank6 should be less or equal to Skills.Mining.BlastMining_Rank7!");
-        }
-
-        if (getBlastMiningRank7() > getBlastMiningRank8()) {
-            reason.add("Skills.Mining.BlastMining_Rank7 should be less or equal to Skills.Mining.BlastMining_Rank8!");
-        }
-
-        if (getBlastDamageDecreaseRank1() > getBlastDamageDecreaseRank2()) {
-            reason.add("Skills.Mining.BlastDamageDecrease_Rank1 should be less or equal to Skills.Mining.BlastDamageDecrease_Rank2!");
-        }
-
-        if (getBlastDamageDecreaseRank2() > getBlastDamageDecreaseRank3()) {
-            reason.add("Skills.Mining.BlastDamageDecrease_Rank2 should be less or equal to Skills.Mining.BlastDamageDecrease_Rank3!");
-        }
-
-        if (getBlastDamageDecreaseRank3() > getBlastDamageDecreaseRank4()) {
-            reason.add("Skills.Mining.BlastDamageDecrease_Rank3 should be less or equal to Skills.Mining.BlastDamageDecrease_Rank4!");
-        }
-
-        if (getBlastDamageDecreaseRank4() > getBlastDamageDecreaseRank5()) {
-            reason.add("Skills.Mining.BlastDamageDecrease_Rank4 should be less or equal to Skills.Mining.BlastDamageDecrease_Rank5!");
-        }
-
-        if (getBlastDamageDecreaseRank5() > getBlastDamageDecreaseRank6()) {
-            reason.add("Skills.Mining.BlastDamageDecrease_Rank5 should be less or equal to Skills.Mining.BlastDamageDecrease_Rank6!");
-        }
-
-        if (getBlastDamageDecreaseRank6() > getBlastDamageDecreaseRank7()) {
-            reason.add("Skills.Mining.BlastDamageDecrease_Rank6 should be less or equal to Skills.Mining.BlastDamageDecrease_Rank7!");
-        }
-
-        if (getBlastDamageDecreaseRank7() > getBlastDamageDecreaseRank8()) {
-            reason.add("Skills.Mining.BlastDamageDecrease_Rank7 should be less or equal to Skills.Mining.BlastDamageDecrease_Rank8!");
-        }
-
-        if (getOreBonusRank1() > getOreBonusRank2()) {
-            reason.add("Skills.Mining.OreBonus_Rank1 should be less or equal to Skills.Mining.OreBonus_Rank2!");
-        }
-
-        if (getOreBonusRank2() > getOreBonusRank3()) {
-            reason.add("Skills.Mining.OreBonus_Rank2 should be less or equal to Skills.Mining.OreBonus_Rank3!");
-        }
-
-        if (getOreBonusRank3() > getOreBonusRank4()) {
-            reason.add("Skills.Mining.OreBonus_Rank3 should be less or equal to Skills.Mining.OreBonus_Rank4!");
-        }
-
-        if (getOreBonusRank4() > getOreBonusRank5()) {
-            reason.add("Skills.Mining.OreBonus_Rank4 should be less or equal to Skills.Mining.OreBonus_Rank5!");
-        }
-
-        if (getOreBonusRank5() > getOreBonusRank6()) {
-            reason.add("Skills.Mining.OreBonus_Rank5 should be less or equal to Skills.Mining.OreBonus_Rank6!");
-        }
-
-        if (getOreBonusRank6() > getOreBonusRank7()) {
-            reason.add("Skills.Mining.OreBonus_Rank6 should be less or equal to Skills.Mining.OreBonus_Rank7!");
-        }
-
-        if (getOreBonusRank7() > getOreBonusRank8()) {
-            reason.add("Skills.Mining.OreBonus_Rank7 should be less or equal to Skills.Mining.OreBonus_Rank8!");
-        }
-
-        if (getDebrisReductionRank1() > getDebrisReductionRank2()) {
-            reason.add("Skills.Mining.DebrisReduction_Rank1 should be less or equal to Skills.Mining.DebrisReduction_Rank2!");
-        }
-
-        if (getDebrisReductionRank2() > getDebrisReductionRank3()) {
-            reason.add("Skills.Mining.DebrisReduction_Rank2 should be less or equal to Skills.Mining.DebrisReduction_Rank3!");
-        }
-
-        if (getDebrisReductionRank3() > getDebrisReductionRank4()) {
-            reason.add("Skills.Mining.DebrisReduction_Rank3 should be less or equal to Skills.Mining.DebrisReduction_Rank4!");
-        }
-
-        if (getDebrisReductionRank4() > getDebrisReductionRank5()) {
-            reason.add("Skills.Mining.DebrisReduction_Rank4 should be less or equal to Skills.Mining.DebrisReduction_Rank5!");
-        }
-
-        if (getDebrisReductionRank5() > getDebrisReductionRank6()) {
-            reason.add("Skills.Mining.DebrisReduction_Rank5 should be less or equal to Skills.Mining.DebrisReduction_Rank6!");
-        }
-
-        if (getDebrisReductionRank6() > getDebrisReductionRank7()) {
-            reason.add("Skills.Mining.DebrisReduction_Rank6 should be less or equal to Skills.Mining.DebrisReduction_Rank7!");
-        }
-
-        if (getDebrisReductionRank7() > getDebrisReductionRank8()) {
-            reason.add("Skills.Mining.DebrisReduction_Rank7 should be less or equal to Skills.Mining.DebrisReduction_Rank8!");
-        }
-
-        if (getDropMultiplierRank1() > getDropMultiplierRank2()) {
-            reason.add("Skills.Mining.DropMultiplier_Rank1 should be less or equal to Skills.Mining.DropMultiplier_Rank2!");
-        }
-
-        if (getDropMultiplierRank2() > getDropMultiplierRank3()) {
-            reason.add("Skills.Mining.DropMultiplier_Rank2 should be less or equal to Skills.Mining.DropMultiplier_Rank3!");
-        }
-
-        if (getDropMultiplierRank3() > getDropMultiplierRank4()) {
-            reason.add("Skills.Mining.DropMultiplier_Rank3 should be less or equal to Skills.Mining.DropMultiplier_Rank4!");
-        }
-
-        if (getDropMultiplierRank4() > getDropMultiplierRank5()) {
-            reason.add("Skills.Mining.DropMultiplier_Rank4 should be less or equal to Skills.Mining.DropMultiplier_Rank5!");
-        }
-
-        if (getDropMultiplierRank5() > getDropMultiplierRank6()) {
-            reason.add("Skills.Mining.DropMultiplier_Rank5 should be less or equal to Skills.Mining.DropMultiplier_Rank6!");
-        }
-
-        if (getDropMultiplierRank6() > getDropMultiplierRank7()) {
-            reason.add("Skills.Mining.DropMultiplier_Rank6 should be less or equal to Skills.Mining.DropMultiplier_Rank7!");
-        }
-
-        if (getDropMultiplierRank7() > getDropMultiplierRank8()) {
-            reason.add("Skills.Mining.DropMultiplier_Rank7 should be less or equal to Skills.Mining.DropMultiplier_Rank8!");
-        }
-
-        if (getBlastRadiusModifierRank1() > getBlastRadiusModifierRank2()) {
-            reason.add("Skills.Mining.BlastRadiusModifier_Rank1 should be less or equal to Skills.Mining.BlastRadiusModifier_Rank2!");
-        }
-
-        if (getBlastRadiusModifierRank2() > getBlastRadiusModifierRank3()) {
-            reason.add("Skills.Mining.BlastRadiusModifier_Rank2 should be less or equal to Skills.Mining.BlastRadiusModifier_Rank3!");
-        }
-
-        if (getBlastRadiusModifierRank3() > getBlastRadiusModifierRank4()) {
-            reason.add("Skills.Mining.BlastRadiusModifier_Rank3 should be less or equal to Skills.Mining.BlastRadiusModifier_Rank4!");
-        }
-
-        if (getBlastRadiusModifierRank4() > getBlastRadiusModifierRank5()) {
-            reason.add("Skills.Mining.BlastRadiusModifier_Rank4 should be less or equal to Skills.Mining.BlastRadiusModifier_Rank5!");
-        }
-
-        if (getBlastRadiusModifierRank5() > getBlastRadiusModifierRank6()) {
-            reason.add("Skills.Mining.BlastRadiusModifier_Rank5 should be less or equal to Skills.Mining.BlastRadiusModifier_Rank6!");
-        }
-
-        if (getBlastRadiusModifierRank6() > getBlastRadiusModifierRank7()) {
-            reason.add("Skills.Mining.BlastRadiusModifier_Rank6 should be less or equal to Skills.Mining.BlastRadiusModifier_Rank7!");
-        }
-
-        if (getBlastRadiusModifierRank7() > getBlastRadiusModifierRank8()) {
-            reason.add("Skills.Mining.BlastRadiusModifier_Rank7 should be less or equal to Skills.Mining.BlastRadiusModifier_Rank8!");
-        }
-
-        /* REPAIR */
-        if (getRepairMasteryMaxBonus() < 1) {
-            reason.add("Skills.Repair.RepairMastery_MaxBonusPercentage should be at least 1!");
-        }
-
-        if (getRepairMasteryMaxLevel() < 1) {
-            reason.add("Skills.Repair.RepairMastery_MaxBonusLevel should be at least 1!");
-        }
-
-        if (getSuperRepairChanceMax() < 1) {
-            reason.add("Skills.Repair.SuperRepair_ChanceMax should be at least 1!");
-        }
-
-        if (getSuperRepairMaxLevel() < 1) {
-            reason.add("Skills.Repair.SuperRepair_MaxBonusLevel should be at least 1!");
-        }
-
-        if (getSalvageUnlockLevel() < 1) {
-            reason.add("Skills.Repair.Salvage_UnlockLevel should be at least 1!");
-        }
-
-        if (getArcaneForgingDowngradeChanceRank1() < 0 || getArcaneForgingDowngradeChanceRank1() > 100) {
-            reason.add("Skills.Repair.Arcane_Forging.Downgrades.Chance.Rank_1 only accepts values from 0 to 100!");
-        }
-
-        if (getArcaneForgingDowngradeChanceRank2() < 0 || getArcaneForgingDowngradeChanceRank2() > 100) {
-            reason.add("Skills.Repair.Arcane_Forging.Downgrades.Chance.Rank_2 only accepts values from 0 to 100!");
-        }
-
-        if (getArcaneForgingDowngradeChanceRank3() < 0 || getArcaneForgingDowngradeChanceRank3() > 100) {
-            reason.add("Skills.Repair.Arcane_Forging.Downgrades.Chance.Rank_3 only accepts values from 0 to 100!");
-        }
-
-        if (getArcaneForgingDowngradeChanceRank4() < 0 || getArcaneForgingDowngradeChanceRank4() > 100) {
-            reason.add("Skills.Repair.Arcane_Forging.Downgrades.Chance.Rank_4 only accepts values from 0 to 100!");
-        }
-
-        if (getArcaneForgingKeepEnchantsChanceRank1() < 0 || getArcaneForgingKeepEnchantsChanceRank1() > 100) {
-            reason.add("Skills.Repair.Arcane_Forging.Keep_Enchants.Chance.Rank_1 only accepts values from 0 to 100!");
-        }
-
-        if (getArcaneForgingKeepEnchantsChanceRank2() < 0 || getArcaneForgingKeepEnchantsChanceRank2() > 100) {
-            reason.add("Skills.Repair.Arcane_Forging.Keep_Enchants.Chance.Rank_2 only accepts values from 0 to 100!");
-        }
-
-        if (getArcaneForgingKeepEnchantsChanceRank3() < 0 || getArcaneForgingKeepEnchantsChanceRank3() > 100) {
-            reason.add("Skills.Repair.Arcane_Forging.Keep_Enchants.Chance.Rank_3 only accepts values from 0 to 100!");
-        }
-
-        if (getArcaneForgingKeepEnchantsChanceRank4() < 0 || getArcaneForgingKeepEnchantsChanceRank4() > 100) {
-            reason.add("Skills.Repair.Arcane_Forging.Keep_Enchants.Chance.Rank_4 only accepts values from 0 to 100!");
-        }
-
-        if (getArcaneForgingRankLevels1() < 0) {
-            reason.add("Skills.Repair.Arcane_Forging.Rank_Levels.Rank_1 should be at least 0!");
-        }
-
-        if (getArcaneForgingRankLevels2() < 0) {
-            reason.add("Skills.Repair.Arcane_Forging.Rank_Levels.Rank_2 should be at least 0!");
-        }
-
-        if (getArcaneForgingRankLevels3() < 0) {
-            reason.add("Skills.Repair.Arcane_Forging.Rank_Levels.Rank_3 should be at least 0!");
-        }
-
-        if (getArcaneForgingRankLevels4() < 0) {
-            reason.add("Skills.Repair.Arcane_Forging.Rank_Levels.Rank_4 should be at least 0!");
-        }
-
-        /* SMELTING */
-        if (getBurnModifierMaxLevel() < 1) {
-            reason.add("Skills.Smelting.FuelEfficiency_MaxBonusLevel should be at least 1!");
-        }
-
-        if (getBurnTimeMultiplier() < 1) {
-            reason.add("Skills.Smelting.FuelEfficiency_Multiplier should be at least 1!");
-        }
-
-        if (getSecondSmeltMaxLevel() < 1) {
-            reason.add("Skills.Smelting.SecondSmelt_MaxBonusLevel should be at least 1!");
-        }
-
-        if (getSecondSmeltMaxChance() < 1) {
-            reason.add("Skills.Smelting.SecondSmelt_MaxBonusChance should be at least 1!");
-        }
-
-        if (getFluxMiningUnlockLevel() < 1) {
-            reason.add("Skills.Smelting.FluxMining_UnlockLevel should be at least 1!");
-        }
-
-        if (getFluxMiningChance() < 1) {
-            reason.add("Skills.Smelting.FluxMining_Chance should be at least 1!");
-        }
-
-        if (getSmeltingVanillaXPBoostRank1Level() > getSmeltingVanillaXPBoostRank2Level()) {
-            reason.add("Skills.Smelting.VanillaXPBoost_Rank1Level should be less or equal to Skills.Smelting.VanillaXPBoost_Rank2Level!");
-        }
-
-        if (getSmeltingVanillaXPBoostRank2Level() > getSmeltingVanillaXPBoostRank3Level()) {
-            reason.add("Skills.Smelting.VanillaXPBoost_Rank2Level should be less or equal to Skills.Smelting.VanillaXPBoost_Rank3Level!");
-        }
-
-        if (getSmeltingVanillaXPBoostRank3Level() > getSmeltingVanillaXPBoostRank4Level()) {
-            reason.add("Skills.Smelting.VanillaXPBoost_Rank3Level should be less or equal to Skills.Smelting.VanillaXPBoost_Rank4Level!");
-        }
-
-        if (getSmeltingVanillaXPBoostRank4Level() > getSmeltingVanillaXPBoostRank5Level()) {
-            reason.add("Skills.Smelting.VanillaXPBoost_Rank4Level should be less or equal to Skills.Smelting.VanillaXPBoost_Rank5Level!");
-        }
-
-        if (getSmeltingVanillaXPBoostRank1Multiplier() < 1) {
-            reason.add("Skills.Smelting.VanillaXPBoost_Rank1Multiplier should be at least 1!");
-        }
-
-        if (getSmeltingVanillaXPBoostRank2Multiplier() < 1) {
-            reason.add("Skills.Smelting.VanillaXPBoost_Rank2Multiplier should be at least 1!");
-        }
-
-        if (getSmeltingVanillaXPBoostRank3Multiplier() < 1) {
-            reason.add("Skills.Smelting.VanillaXPBoost_Rank3Multiplier should be at least 1!");
-        }
-
-        if (getSmeltingVanillaXPBoostRank4Multiplier() < 1) {
-            reason.add("Skills.Smelting.VanillaXPBoost_Rank4Multiplier should be at least 1!");
-        }
-
-        if (getSmeltingVanillaXPBoostRank5Multiplier() < 1) {
-            reason.add("Skills.Smelting.VanillaXPBoost_Rank5Multiplier should be at least 1!");
-        }
-
-        /* SWORDS */
-        if (getBleedChanceMax() < 1) {
-            reason.add("Skills.Swords.Bleed_ChanceMax should be at least 1!");
-        }
-
-        if (getBleedMaxBonusLevel() < 1) {
-            reason.add("Skills.Swords.Bleed_MaxBonusLevel should be at least 1!");
-        }
-
-        if (getBleedMaxTicks() < 1) {
-            reason.add("Skills.Swords.Bleed_MaxTicks should be at least 1!");
-        }
-
-        if (getBleedMaxTicks() < getBleedBaseTicks()) {
-            reason.add("Skills.Swords.Bleed_MaxTicks should be at least Skills.Swords.Bleed_BaseTicks!");
-        }
-
-        if (getBleedBaseTicks() < 1) {
-            reason.add("Skills.Swords.Bleed_BaseTicks should be at least 1!");
-        }
-
-        if (getCounterChanceMax() < 1) {
-            reason.add("Skills.Swords.Counter_ChanceMax should be at least 1!");
-        }
-
-        if (getCounterMaxBonusLevel() < 1) {
-            reason.add("Skills.Swords.Counter_MaxBonusLevel should be at least 1!");
-        }
-
-        if (getCounterModifier() < 1) {
-            reason.add("Skills.Swords.Counter_DamageModifier should be at least 1!");
-        }
-
-        if (getSerratedStrikesModifier() < 1) {
-            reason.add("Skills.Swords.SerratedStrikes_DamageModifier should be at least 1!");
-        }
-
-        if (getSerratedStrikesTicks() < 1) {
-            reason.add("Skills.Swords.SerratedStrikes_BleedTicks should be at least 1!");
-        }
-
-        /* TAMING */
-
-        if (getGoreChanceMax() < 1) {
-            reason.add("Skills.Taming.Gore_ChanceMax should be at least 1!");
-        }
-
-        if (getGoreMaxBonusLevel() < 1) {
-            reason.add("Skills.Taming.Gore_MaxBonusLevel should be at least 1!");
-        }
-
-        if (getGoreBleedTicks() < 1) {
-            reason.add("Skills.Taming.Gore_BleedTicks should be at least 1!");
-        }
-
-        if (getGoreModifier() < 1) {
-            reason.add("Skills.Taming.Gore_Modifier should be at least 1!");
-        }
-
-        if (getFastFoodUnlock() < 1) {
-            reason.add("Skills.Taming.FastFood_UnlockLevel should be at least 1!");
-        }
-
-        if (getFastFoodChance() < 1) {
-            reason.add("Skills.Taming.FastFood_Chance should be at least 1!");
-        }
-
-        if (getEnviromentallyAwareUnlock() < 1) {
-            reason.add("Skills.Taming.EnvironmentallyAware_UnlockLevel should be at least 1!");
-        }
-
-        if (getThickFurUnlock() < 1) {
-            reason.add("Skills.Taming.ThickFur_UnlockLevel should be at least 1!");
-        }
-
-        if (getThickFurModifier() < 1) {
-            reason.add("Skills.Taming.ThickFur_Modifier should be at least 1!");
-        }
-
-        if (getHolyHoundUnlock() < 1) {
-            reason.add("Skills.Taming.HolyHound_UnlockLevel should be at least 1!");
-        }
-
-        if (getShockProofUnlock() < 1) {
-            reason.add("Skills.Taming.ShockProof_UnlockLevel should be at least 1!");
-        }
-
-        if (getShockProofModifier() < 1) {
-            reason.add("Skills.Taming.ShockProof_Modifier should be at least 1!");
-        }
-
-        if (getSharpenedClawsUnlock() < 1) {
-            reason.add("Skills.Taming.SharpenedClaws_UnlockLevel should be at least 1!");
-        }
-
-        if (getSharpenedClawsBonus() < 1) {
-            reason.add("Skills.Taming.SharpenedClaws_Bonus should be at least 1!");
-        }
-
-
-        /* UNARMED */
-        if (getDisarmChanceMax() < 1) {
-            reason.add("Skills.Unarmed.Disarm_ChanceMax should be at least 1!");
-        }
-
-        if (getDisarmMaxBonusLevel() < 1) {
-            reason.add("Skills.Unarmed.Disarm_MaxBonusLevel should be at least 1!");
-        }
-
-        if (getDeflectChanceMax() < 1) {
-            reason.add("Skills.Unarmed.Deflect_ChanceMax should be at least 1!");
-        }
-
-        if (getDeflectMaxBonusLevel() < 1) {
-            reason.add("Skills.Unarmed.Deflect_MaxBonusLevel should be at least 1!");
-        }
-
-        if (getIronGripChanceMax() < 1) {
-            reason.add("Skills.Unarmed.IronGrip_ChanceMax should be at least 1!");
-        }
-
-        if (getIronGripMaxBonusLevel() < 1) {
-            reason.add("Skills.Unarmed.IronGrip_MaxBonusLevel should be at least 1!");
-        }
-
-        if (getIronArmMinBonus() < 0) {
-            reason.add("Skills.Unarmed.IronArm_BonusMin should be at least 0!");
-        }
-
-        if (getIronArmMaxBonus() < 0) {
-            reason.add("Skills.Unarmed.IronArm_BonusMax should be at least 0!");
-        }
-
-        if (getIronArmMaxBonus() < getIronArmMinBonus()) {
-            reason.add("Skills.Unarmed.IronArm_BonusMax should be greater than or equal to Skills.Unarmed.IronArm_BonusMin!");
-        }
-
-        if (getIronArmIncreaseLevel() < 1) {
-            reason.add("Skills.Unarmed.IronArm_IncreaseLevel should be at least 1!");
-        }
-
-        /* WOODCUTTING */
-        if (getLeafBlowUnlockLevel() < 1) {
-            reason.add("Skills.Woodcutting.LeafBlower_UnlockLevel should be at least 1!");
-        }
-
-        if (getWoodcuttingDoubleDropChance() < 1) {
-            reason.add("Skills.Woodcutting.DoubleDrops_ChanceMax should be at least 1!");
-        }
-
-        if (getWoodcuttingDoubleDropMaxLevel() < 1) {
-            reason.add("Skills.Woodcutting.DoubleDrops_MaxBonusLevel should be at least 1!");
-        }
-
-        /* KRAKEN */
-        if (getKrakenTriesBeforeRelease() < 1) {
-            reason.add("Kraken.Tries_Before_Release should be at least 1!");
-        }
-
-        if (getKrakenHealth() < 1) {
-            reason.add("Kraken.Health should be at least 1!");
-        }
-
-        if (getKrakenAttackInterval() < 1) {
-            reason.add("Kraken.Attack_Interval_Seconds should be at least 1!");
-        }
-
-        if (getKrakenAttackDamage() < 1) {
-            reason.add("Kraken.Attack_Damage should be at least 1!");
-        }
-
-        return noErrorsInConfig(reason);
-    }
-
    @Override
    protected void loadKeys() {}

    /* GENERAL */
    public int getAbilityLength() { return config.getInt("Skills.General.Ability_IncreaseLevel", 50); }
-    public int getEnchantBuff() { return config.getInt("Skills.General.Ability_EnchantBuff", 5); }

    /* ACROBATICS */
    public double getDodgeChanceMax() { return config.getDouble("Skills.Acrobatics.Dodge_ChanceMax", 20.0D); }
    public int getDodgeMaxBonusLevel() { return config.getInt("Skills.Acrobatics.Dodge_MaxBonusLevel", 800); }
-    public double getDodgeDamageModifier() { return config.getDouble("Skills.Acrobatics.Dodge_DamageModifier", 2.0D); }
+    public int getDodgeDamageModifier() { return config.getInt("Skills.Acrobatics.Dodge_DamageModifer", 2); }

    public double getRollChanceMax() { return config.getDouble("Skills.Acrobatics.Roll_ChanceMax", 100.0D); }
    public int getRollMaxBonusLevel() { return config.getInt("Skills.Acrobatics.Roll_MaxBonusLevel", 1000); }
-    public double getRollDamageThreshold() { return config.getDouble("Skills.Acrobatics.Roll_DamageThreshold", 7.0D); }
+    public int getRollDamageThreshold() { return config.getInt("Skills.Acrobatics.Roll_DamageThreshold", 7); }

    public double getGracefulRollChanceMax() { return config.getDouble("Skills.Acrobatics.GracefulRoll_ChanceMax", 100.0D); }
    public int getGracefulRollMaxBonusLevel() { return config.getInt("Skills.Acrobatics.GracefulRoll_MaxBonusLevel", 500); }
-    public double getGracefulRollDamageThreshold() { return config.getDouble("Skills.Acrobatics.GracefulRoll_DamageThreshold", 14.0D); }
+    public int getGracefulRollDamageThreshold() { return config.getInt("Skills.Acrobatics.GracefulRoll_DamageThreshold", 14); }
+    public int getGracefulRollSuccessModifer() { return config.getInt("Skills.Acrobatics.GracefulRoll_SuccessModifier", 2); }

    public int getDodgeXPModifier() { return config.getInt("Skills.Acrobatics.Dodge_XP_Modifier", 120); }
    public int getRollXPModifier() { return config.getInt("Skills.Acrobatics.Roll_XP_Modifier", 80); }
@@ -807,19 +43,16 @@ public class AdvancedConfig extends AutoUpdateConfigLoader {
    public int getSkillShotIncreaseLevel() { return config.getInt("Skills.Archery.SkillShot_IncreaseLevel", 50); }
    public double getSkillShotIncreasePercentage() { return config.getDouble("Skills.Archery.SkillShot_IncreasePercentage", 0.1D); }
    public double getSkillShotBonusMax() { return config.getDouble("Skills.Archery.SkillShot_MaxBonus", 2.0D); }
-    public double getSkillShotDamageMax() { return config.getDouble("Skills.Archery.SkillShot_MaxDamage", 9.0D); }

    public double getDazeBonusMax() { return config.getDouble("Skills.Archery.Daze_MaxChance", 50.0D); }
    public int getDazeMaxBonusLevel() { return config.getInt("Skills.Archery.Daze_MaxBonusLevel", 1000); }
-    public double getDazeModifier() { return config.getDouble("Skills.Archery.Daze_BonusDamage", 4.0D); }
+    public int getDazeModifier() { return config.getInt("Skills.Archery.Daze_BonusDamage", 4); }

    public double getRetrieveChanceMax() { return config.getDouble("Skills.Archery.Retrieve_MaxBonus", 100.0D); }
    public int getRetrieveMaxBonusLevel() { return config.getInt("Skills.Archery.Retrieve_MaxBonusLevel", 1000); }

-    public double getForceMultiplier() { return config.getDouble("Skills.Archery.Force_Multiplier", 2.0D); }
-
    /* AXES */
-    public double getBonusDamageAxesBonusMax() { return config.getDouble("Skills.Axes.DamageIncrease_MaxBonus", 4.0D); }
+    public int getBonusDamageAxesBonusMax() { return config.getInt("Skills.Axes.DamageIncrease_MaxBonus", 4); }
    public int getBonusDamageAxesMaxBonusLevel() { return config.getInt("Skills.Axes.DamageIncrease_MaxBonusLevel", 200); }

    public double getAxesCriticalChance() { return config.getDouble("Skills.Axes.AxesCritical_MaxChance", 37.50D); }
@@ -828,14 +61,14 @@ public class AdvancedConfig extends AutoUpdateConfigLoader {
    public double getAxesCriticalPVEModifier() { return config.getDouble("Skills.Axes.AxesCritical_PVE_Modifier", 2.0D); }

    public double getGreaterImpactChance() { return config.getDouble("Skills.Axes.GreaterImpact_Chance", 25.0D); }
-    public double getGreaterImpactModifier() { return config.getDouble("Skills.Axes.GreaterImpact_KnockbackModifier", 1.5D); }
-    public double getGreaterImpactBonusDamage() { return config.getDouble("Skills.Axes.GreaterImpact_BonusDamage", 2.0D); }
+    public double getGreaterImpactModifier() { return config.getDouble("Skills.Axes.GreaterImpact_KnockbackModifier", 1.5); }
+    public int getGreaterImpactBonusDamage() { return config.getInt("Skills.Axes.GreaterImpact_BonusDamage", 2); }

    public int getArmorImpactIncreaseLevel() { return config.getInt("Skills.Axes.ArmorImpact_IncreaseLevel", 50); }
    public double getImpactChance() { return config.getDouble("Skills.Axes.ArmorImpact_Chance", 25.0D); }
    public double getArmorImpactMaxDurabilityDamage() { return config.getDouble("Skills.Axes.ArmorImpact_MaxPercentageDurabilityDamage", 20.0D); }

-    public double getSkullSplitterModifier() { return config.getDouble("Skills.Axes.SkullSplitter_DamagerModifier", 2.0D); }
+    public int getSkullSplitterModifier() { return config.getInt("Skills.Axes.SkullSplitter_DamagerModifier", 2); }

    /* EXCAVATION */
    //Nothing to configure, everything is already configurable in config.yml
@@ -847,19 +80,17 @@ public class AdvancedConfig extends AutoUpdateConfigLoader {
    public int getFishingTierLevelsTier4() { return config.getInt("Skills.Fishing.Tier_Levels.Tier4", 600); }
    public int getFishingTierLevelsTier5() { return config.getInt("Skills.Fishing.Tier_Levels.Tier5", 800); }

-    public double getFishingMagicMultiplier() { return config.getDouble("Skills.Fishing.MagicHunter_Multiplier", 5.0D); }
+    public int getFishingMagicMultiplier() { return config.getInt("Skills.Fishing.MagicHunter_Multiplier", 5); }

    public int getFishermanDietRankChange() { return config.getInt("Skills.Fishing.Fisherman_Diet_RankChange", 200); }

-    public int getIceFishingUnlockLevel() { return config.getInt("Skills.Fishing.Ice_Fishing_UnlockLevel", 50); }
-
    /* Shake */
    public int getShakeUnlockLevel() { return config.getInt("Skills.Fishing.Shake_UnlockLevel", 150); }
-    public double getShakeChanceRank1() { return config.getDouble("Skills.Fishing.Shake_Chance.Rank_1", 25.0D); }
-    public double getShakeChanceRank2() { return config.getDouble("Skills.Fishing.Shake_Chance.Rank_2", 40.0D); }
-    public double getShakeChanceRank3() { return config.getDouble("Skills.Fishing.Shake_Chance.Rank_3", 55.0D); }
-    public double getShakeChanceRank4() { return config.getDouble("Skills.Fishing.Shake_Chance.Rank_4", 60.0D); }
-    public double getShakeChanceRank5() { return config.getDouble("Skills.Fishing.Shake_Chance.Rank_5", 75.0D); }
+    public int getShakeChanceRank1() { return config.getInt("Skills.Fishing.Shake_Chance.Rank_1", 25); }
+    public int getShakeChanceRank2() { return config.getInt("Skills.Fishing.Shake_Chance.Rank_2", 40); }
+    public int getShakeChanceRank3() { return config.getInt("Skills.Fishing.Shake_Chance.Rank_3", 55); }
+    public int getShakeChanceRank4() { return config.getInt("Skills.Fishing.Shake_Chance.Rank_4", 60); }
+    public int getShakeChanceRank5() { return config.getInt("Skills.Fishing.Shake_Chance.Rank_5", 75); }

    /* Vanilla XP Boost */
    public int getFishingVanillaXPModifierRank1() { return config.getInt("Skills.Fishing.VanillaXPBoost.Rank_1", 1); }
@@ -947,21 +178,18 @@ public class AdvancedConfig extends AutoUpdateConfigLoader {
    public int getRepairMasteryMaxLevel() { return config.getInt("Skills.Repair.RepairMastery_MaxBonusLevel", 1000); }
    public double getSuperRepairChanceMax() { return config.getDouble("Skills.Repair.SuperRepair_ChanceMax", 100.0D); }
    public int getSuperRepairMaxLevel() { return config.getInt("Skills.Repair.SuperRepair_MaxBonusLevel", 1000); }
-    public int getSalvageUnlockLevel() { return config.getInt("Skills.Repair.Salvage_UnlockLevel", 600); }

    /* Arcane Forging */
    public boolean getArcaneForgingDowngradeEnabled() { return config.getBoolean("Skills.Repair.Arcane_Forging.Downgrades.Enabled", true); }
-    public double getArcaneForgingDowngradeChanceRank1() { return config.getDouble("Skills.Repair.Arcane_Forging.Downgrades.Chance.Rank_1", 75.0D); }
-    public double getArcaneForgingDowngradeChanceRank2() { return config.getDouble("Skills.Repair.Arcane_Forging.Downgrades.Chance.Rank_2", 50.0D); }
-    public double getArcaneForgingDowngradeChanceRank3() { return config.getDouble("Skills.Repair.Arcane_Forging.Downgrades.Chance.Rank_3", 25.0D); }
-    public double getArcaneForgingDowngradeChanceRank4() { return config.getDouble("Skills.Repair.Arcane_Forging.Downgrades.Chance.Rank_4", 15.0D); }
-
+    public int getArcaneForgingDowngradeChanceRank1() { return config.getInt("Skills.Repair.Arcane_Forging.Downgrades.Chance.Rank_1", 75); }
+    public int getArcaneForgingDowngradeChanceRank2() { return config.getInt("Skills.Repair.Arcane_Forging.Downgrades.Chance.Rank_2", 50); }
+    public int getArcaneForgingDowngradeChanceRank3() { return config.getInt("Skills.Repair.Arcane_Forging.Downgrades.Chance.Rank_3", 25); }
+    public int getArcaneForgingDowngradeChanceRank4() { return config.getInt("Skills.Repair.Arcane_Forging.Downgrades.Chance.Rank_4", 15); }
    public boolean getArcaneForgingEnchantLossEnabled() { return config.getBoolean("Skills.Repair.Arcane_Forging.May_Lose_Enchants", true); }
-    public double getArcaneForgingKeepEnchantsChanceRank1() { return config.getDouble("Skills.Repair.Arcane_Forging.Keep_Enchants.Chance.Rank_1", 10.0D); }
-    public double getArcaneForgingKeepEnchantsChanceRank2() { return config.getDouble("Skills.Repair.Arcane_Forging.Keep_Enchants.Chance.Rank_2", 20.0D); }
-    public double getArcaneForgingKeepEnchantsChanceRank3() { return config.getDouble("Skills.Repair.Arcane_Forging.Keep_Enchants.Chance.Rank_3", 30.0D); }
-    public double getArcaneForgingKeepEnchantsChanceRank4() { return config.getDouble("Skills.Repair.Arcane_Forging.Keep_Enchants.Chance.Rank_4", 40.0D); }
-
+    public int getArcaneForgingKeepEnchantsChanceRank1() { return config.getInt("Skills.Repair.Arcane_Forging.Keep_Enchants.Chance.Rank_1", 10); }
+    public int getArcaneForgingKeepEnchantsChanceRank2() { return config.getInt("Skills.Repair.Arcane_Forging.Keep_Enchants.Chance.Rank_2", 20); }
+    public int getArcaneForgingKeepEnchantsChanceRank3() { return config.getInt("Skills.Repair.Arcane_Forging.Keep_Enchants.Chance.Rank_3", 30); }
+    public int getArcaneForgingKeepEnchantsChanceRank4() { return config.getInt("Skills.Repair.Arcane_Forging.Keep_Enchants.Chance.Rank_4", 40); }
    public int getArcaneForgingRankLevels1() { return config.getInt("Skills.Repair.Arcane_Forging.Rank_Levels.Rank_1", 100); }
    public int getArcaneForgingRankLevels2() { return config.getInt("Skills.Repair.Arcane_Forging.Rank_Levels.Rank_2", 250); }
    public int getArcaneForgingRankLevels3() { return config.getInt("Skills.Repair.Arcane_Forging.Rank_Levels.Rank_3", 500); }
@@ -995,35 +223,34 @@ public class AdvancedConfig extends AutoUpdateConfigLoader {
    public int getBleedMaxTicks() { return config.getInt("Skills.Swords.Bleed_MaxTicks", 3); }
    public int getBleedBaseTicks() { return config.getInt("Skills.Swords.Bleed_BaseTicks", 2); }

-    public boolean getCounterRequiresBlock() { return config.getBoolean("Skills.Swords.Counter_RequiresBlock"); }
    public double getCounterChanceMax() { return config.getDouble("Skills.Swords.Counter_ChanceMax", 30.0D); }
    public int getCounterMaxBonusLevel() { return config.getInt("Skills.Swords.Counter_MaxBonusLevel", 600); }
-    public double getCounterModifier() { return config.getDouble("Skills.Swords.Counter_DamageModifier", 2.0D); }
+    public int getCounterModifier() { return config.getInt("Skills.Swords.Counter_DamageModifier", 2); }

-    public double getSerratedStrikesModifier() { return config.getDouble("Skills.Swords.SerratedStrikes_DamageModifier", 4.0D); }
+    public int getSerratedStrikesModifier() { return config.getInt("Skills.Swords.SerratedStrikes_DamageModifier", 4); }
    public int getSerratedStrikesTicks() { return config.getInt("Skills.Swords.SerratedStrikes_BleedTicks", 5); }

    /* TAMING */
-    public double getGoreChanceMax() { return config.getDouble("Skills.Taming.Gore_ChanceMax", 100.0D); }
+    public double getGoreChanceMax() { return config.getInt("Skills.Taming.Gore_ChanceMax", 100); }
    public int getGoreMaxBonusLevel() { return config.getInt("Skills.Taming.Gore_MaxBonusLevel", 1000); }
    public int getGoreBleedTicks() { return config.getInt("Skills.Taming.Gore_BleedTicks", 2); }
-    public double getGoreModifier() { return config.getDouble("Skills.Taming.Gore_Modifier", 2.0D); }
+    public int getGoreModifier() { return config.getInt("Skills.Taming.Gore_Modifier", 2); }

    public int getFastFoodUnlock() { return config.getInt("Skills.Taming.FastFood_UnlockLevel", 50); }
-    public double getFastFoodChance() { return config.getDouble("Skills.Taming.FastFood_Chance", 50.0D); }
+    public double getFastFoodChance() { return config.getInt("Skills.Taming.FastFood_Chance", 50); }

    public int getEnviromentallyAwareUnlock() { return config.getInt("Skills.Taming.EnvironmentallyAware_UnlockLevel", 100); }

    public int getThickFurUnlock() { return config.getInt("Skills.Taming.ThickFur_UnlockLevel", 250); }
-    public double getThickFurModifier() { return config.getDouble("Skills.Taming.ThickFur_Modifier", 2.0D); }
+    public int getThickFurModifier() { return config.getInt("Skills.Taming.ThickFur_Modifier", 2); }

    public int getHolyHoundUnlock() {return config.getInt("Skills.Taming.HolyHound_UnlockLevel", 375); }

    public int getShockProofUnlock() { return config.getInt("Skills.Taming.ShockProof_UnlockLevel", 500); }
-    public double getShockProofModifier() { return config.getDouble("Skills.Taming.ShockProof_Modifier", 6.0D); }
+    public int getShockProofModifier() { return config.getInt("Skills.Taming.ShockProof_Modifier", 6); }

    public int getSharpenedClawsUnlock() { return config.getInt("Skills.Taming.SharpenedClaws_UnlockLevel", 750); }
-    public double getSharpenedClawsBonus() { return config.getDouble("Skills.Taming.SharpenedClaws_Bonus", 2.0D); }
+    public int getSharpenedClawsBonus() { return config.getInt("Skills.Taming.SharpenedClaws_Bonus", 2); }

    /* UNARMED */
    public double getDisarmChanceMax() { return config.getDouble("Skills.Unarmed.Disarm_ChanceMax", 33.0D); }
@@ -1035,8 +262,7 @@ public class AdvancedConfig extends AutoUpdateConfigLoader {
    public double getIronGripChanceMax() { return config.getDouble("Skills.Unarmed.IronGrip_ChanceMax", 100.0D); }
    public int getIronGripMaxBonusLevel() { return config.getInt("Skills.Unarmed.IronGrip_MaxBonusLevel", 1000); }

-    public double getIronArmMinBonus() { return config.getDouble("Skills.Unarmed.IronArm_BonusMin", 3.0D); }
-    public double getIronArmMaxBonus() { return config.getDouble("Skills.Unarmed.IronArm_BonusMax", 8.0D); }
+    public int getIronArmMaxBonus() { return config.getInt("Skills.Unarmed.IronArm_BonusMax", 8); }
    public int getIronArmIncreaseLevel() { return config.getInt("Skills.Unarmed.IronArm_IncreaseLevel", 50); }

    /* WOODCUTTING */
@@ -1045,17 +271,9 @@ public class AdvancedConfig extends AutoUpdateConfigLoader {
    public double getWoodcuttingDoubleDropChance() { return config.getDouble("Skills.Woodcutting.DoubleDrops_ChanceMax", 100.0D); }
    public int getWoodcuttingDoubleDropMaxLevel() { return config.getInt("Skills.Woodcutting.DoubleDrops_MaxBonusLevel", 1000); }

-    /* KRAKEN STUFF */
-    public boolean getKrakenEnabled() { return config.getBoolean("Kraken.Enabled", true); }
-    public boolean getKrakenGlobalSoundsEnabled() { return config.getBoolean("Kraken.Global_Sounds", true); }
-    public boolean getKrakenEscapeAllowed() { return config.getBoolean("Kraken.Allow_Escaping", false); }
-    public int getKrakenTriesBeforeRelease() { return config.getInt("Kraken.Tries_Before_Release", 50); }
-    public double getKrakenHealth() { return config.getDouble("Kraken.Health", 50.0D); }
-    public String getKrakenName() { return config.getString("Kraken.Name", "The Kraken"); }
-    public String getServerUnleashMessage() { return config.getString("Kraken.Unleashed_Message.Server", ""); }
-    public String getPlayerUnleashMessage() { return config.getString("Kraken.Unleashed_Message.Player", ""); }
-    public String getPlayerDefeatMessage() { return config.getString("Kraken.Defeated_Message.Killed", ""); }
-    public String getPlayerEscapeMessage() { return config.getString("Kraken.Defeated_Message.Escape", ""); }
-    public int getKrakenAttackInterval() { return config.getInt("Kraken.Attack_Interval_Seconds", 1); }
-    public double getKrakenAttackDamage() { return config.getDouble("Kraken.Attack_Damage", 1.0D); }
+    /* SPOUT STUFF*/
+    public int getSpoutNotificationTier1() { return config.getInt("Spout.Notifications.Tier1", 200); }
+    public int getSpoutNotificationTier2() { return config.getInt("Spout.Notifications.Tier2", 400); }
+    public int getSpoutNotificationTier3() { return config.getInt("Spout.Notifications.Tier3", 600); }
+    public int getSpoutNotificationTier4() { return config.getInt("Spout.Notifications.Tier4", 800); }
 }
--- a/src/main/java/com/gmail/nossr50/config/AutoUpdateConfigLoader.java
+++ b/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.replaceAll("[//s]", "").startsWith("#")) {
+            while (output.indexOf('#') != -1) {
                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.contains(key)) {
+                    if (output.indexOf(key) != -1) {
                        output = output.substring(0, output.indexOf(key)) + comments.get(key) + output.substring(output.indexOf(key));
                    }
                }
--- a/src/main/java/com/gmail/nossr50/config/Config.java
+++ b/src/main/java/com/gmail/nossr50/config/Config.java
@@ -1,14 +1,11 @@
 package com.gmail.nossr50.config;

-import java.util.ArrayList;
-import java.util.List;
 import java.util.Set;

 import org.bukkit.Material;
 import org.bukkit.configuration.ConfigurationSection;
 import org.bukkit.entity.EntityType;

-import com.gmail.nossr50.datatypes.MobHealthbarType;
 import com.gmail.nossr50.datatypes.skills.AbilityType;
 import com.gmail.nossr50.datatypes.skills.SkillType;
 import com.gmail.nossr50.util.StringUtils;
@@ -18,7 +15,6 @@ public class Config extends AutoUpdateConfigLoader {

    private Config() {
        super("config.yml");
-        validate();
    }

    public static Config getInstance() {
@@ -29,147 +25,6 @@ public class Config extends AutoUpdateConfigLoader {
        return instance;
    }

-    @Override
-    protected boolean validateKeys() {
-        // Validate all the settings!
-        List<String> reason = new ArrayList<String>();
-
-        /* General Settings */
-        if (getSaveInterval() <= 0) {
-            reason.add("General.Save_Interval should be greater than 0!");
-        }
-
-        /* Mob Healthbar */
-        if (getMobHealthbarTime() == 0) {
-            reason.add("Mob_Healthbar.Display_Time cannot be 0! Set to -1 to disable or set a valid value.");
-        }
-
-        /* Scoreboards */
-        if (getMcrankScoreboardTime() != -1 && getMcrankScoreboardTime() <= 0) {
-            reason.add("Scoreboards.Mcrank.Display_Time should be greater than 0 or -1!");
-        }
-
-        if (getMcstatsScoreboardTime() != -1 && getMcstatsScoreboardTime() <= 0) {
-            reason.add("Scoreboards.Mcstats.Display_Time should be greater than 0 or -1!");
-        }
-
-        if (getMctopScoreboardTime() != -1 && getMctopScoreboardTime() <= 0) {
-            reason.add("Scoreboards.Mctop.Display_Time should be greater than 0 or -1!");
-        }
-
-        if (getInspectScoreboardTime() != -1 && getInspectScoreboardTime() <= 0) {
-            reason.add("Scoreboards.Inspect.Display_Time should be greater than 0 or -1!");
-        }
-
-        if (getSkillScoreboardTime() != -1 && getSkillScoreboardTime() <= 0) {
-            reason.add("Scoreboards.Skillname.Display_Time should be greater than 0 or -1!");
-        }
-
-        /* Database Purging */
-        if (getPurgeInterval() < -1) {
-            reason.add("Database_Purging.Purge_Interval should be greater than, or equal to -1!");
-        }
-
-        if (getOldUsersCutoff() != -1 && getOldUsersCutoff() <= 0) {
-            reason.add("Database_Purging.Old_User_Cutoff should be greater than 0 or -1!");
-        }
-
-        /* Hardcore Mode */
-        if (getHardcoreDeathStatPenaltyPercentage() < 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() {}

@@ -190,44 +45,8 @@ public class Config extends AutoUpdateConfigLoader {
    public boolean getVerboseLoggingEnabled() { return config.getBoolean("General.Verbose_Logging", false); }
    public boolean getConfigOverwriteEnabled() { return config.getBoolean("General.Config_Update_Overwrite", true); }

-    public String getPartyChatPrefix() { return config.getString("Commands.partychat.Chat_Prefix_Format", "[[GREEN]]([[WHITE]]{0}[[GREEN]])"); }
-    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); }
-
-    /* Mob Healthbar */
-    public MobHealthbarType getMobHealthbarDefault() {
-        try {
-            return MobHealthbarType.valueOf(config.getString("Mob_Healthbar.Display_Type", "HEARTS").toUpperCase().trim());
-        }
-        catch (IllegalArgumentException ex) {
-            return MobHealthbarType.HEARTS;
-        }
-    }
-
-    public int getMobHealthbarTime() { return config.getInt("Mob_Healthbar.Display_Time", 3); }
-
-    /* Scoreboards */
-    public boolean getMcrankScoreboardEnabled() { return config.getBoolean("Scoreboards.Mcrank.Use", true); }
-    public int getMcrankScoreboardTime() { return config.getInt("Scoreboards.Mcrank.Display_Time", 10); }
-
-    public boolean getMcstatsScoreboardsEnabled() { return config.getBoolean("Scoreboards.Mcstats.Use", true); }
-    public int getMcstatsScoreboardTime() { return config.getInt("Scoreboards.Mcstats.Display_Time", 10); }
-
-    public boolean getMctopScoreboardEnabled() { return config.getBoolean("Scoreboards.Mctop.Use", true); }
-    public int getMctopScoreboardTime() { return config.getInt("Scoreboards.Mctop.Display_Time", 10); }
-
-    public boolean getInspectScoreboardEnabled() { return config.getBoolean("Scoreboards.Inspect.Use", true); }
-    public int getInspectScoreboardTime() { return config.getInt("Scoreboards.Inspect.Display_Time", 10); }
-
-    public boolean getSkillScoreboardEnabled() { return config.getBoolean("Scoreboards.Skillname.Use", true); }
-    public int getSkillScoreboardTime() { return config.getInt("Scoreboards.Skillname.Display_Time", 10); }
-
-    public boolean getPowerLevelsEnabled() { return config.getBoolean("Scoreboards.Power_Level.Use", false); }
+    public boolean getPartyDisplayNames() { return config.getBoolean("Commands.p.Use_Display_Names", true); }
+    public boolean getAdminDisplayNames() { return config.getBoolean("Commands.a.Use_Display_Names", true); }

    /* Database Purging */
    public int getPurgeInterval() { return config.getInt("Database_Purging.Purge_Interval", -1); }
@@ -236,37 +55,44 @@ public class Config extends AutoUpdateConfigLoader {
    /* 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("MySQL.Database.Name"); }
-    public String getMySQLUserName() { return getStringIncludingInts("MySQL.Database.User_Name"); }
+    public String getMySQLDatabaseName() { return getStringIncludingInts(config, "MySQL.Database.Name"); }
+    public String getMySQLUserName() { return getStringIncludingInts(config, "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"); }

-    private String getStringIncludingInts(String key) {
-        String str = config.getString(key);
-
-        if (str == null) {
-            str = String.valueOf(config.getInt(key));
+    public String getMySQLUserPassword() {
+        if (getStringIncludingInts(config, "MySQL.Database.User_Password") != null) {
+            return getStringIncludingInts(config, "MySQL.Database.User_Password");
        }

-        if (str.equals("0")) {
+        return "";
+    }
+
+    private static String getStringIncludingInts(ConfigurationSection cfg, String key) {
+        String str = cfg.getString(key);
+
+        if (str == null) {
+            str = String.valueOf(cfg.getInt(key));
+        }
+
+        if (str == "0") {
            str = "No value set for '" + key + "'";
        }
        return str;
    }

    /* Hardcore Mode */
-    public boolean getHardcoreStatLossEnabled(SkillType skillType) { return config.getBoolean("Hardcore.Death_Stat_Loss.Enabled." + StringUtils.getCapitalized(skillType.toString()), false); }
-    public void setHardcoreStatLossEnabled(SkillType skillType, boolean enabled) { config.set("Hardcore.Death_Stat_Loss.Enabled." + StringUtils.getCapitalized(skillType.toString()), enabled); }
+    public boolean getHardcoreEnabled() { return config.getBoolean("Hardcore.Enabled", false); }
+    public void setHardcoreEnabled(boolean enabled) { config.set("Hardcore.Enabled", enabled); }

-    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 double getHardcoreDeathStatPenaltyPercentage() { return config.getDouble("Hardcore.Death_Stat_Loss_Penalty_Percentage", 75.0); }
+    public void setHardcoreDeathStatPenaltyPercentage(double value) { config.set("Hardcore.Death_Stat_Loss_Penalty_Percentage", value); }

-    public boolean getHardcoreVampirismEnabled(SkillType skillType) { return config.getBoolean("Hardcore.Vampirism.Enabled." + StringUtils.getCapitalized(skillType.toString()), false); }
-    public void setHardcoreVampirismEnabled(SkillType skillType, boolean enabled) { config.set("Hardcore.Vampirism.Enabled." + StringUtils.getCapitalized(skillType.toString()), enabled); }
+    public double getHardcoreVampirismStatLeechPercentage() { return config.getDouble("Hardcore.Vampirism_Stat_Leech_Percentage", 5.0); }
+    public void setHardcoreVampirismStatLeechPercentage(double value) { config.set("Hardcore.Vampirism_Stat_Leech_Percentage", value); }

-    public double getHardcoreVampirismStatLeechPercentage() { return config.getDouble("Hardcore.Vampirism.Leech_Percentage", 5.0D); }
-    public void setHardcoreVampirismStatLeechPercentage(double value) { config.set("Hardcore.Vampirism.Leech_Percentage", value); }
+    public boolean getHardcoreVampirismEnabled() { return config.getBoolean("Hardcore.Vampirism", false); }
+    public void setHardcoreVampirismEnabled(boolean enabled) { config.set("Hardcore.Vampirism", enabled); }

    /* SMP Mods */
    public boolean getToolModsEnabled() { return config.getBoolean("Mods.Tool_Mods_Enabled", false); }
@@ -275,14 +101,9 @@ public class Config extends AutoUpdateConfigLoader {
    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 Material getChimaeraItem() { return Material.matchMaterial(config.getString("Items.Chimaera_Wing.Item_Name", "Feather")); }
+    public int getChimaeraCost() { return config.getInt("Items.Chimaera_Wing.Feather_Cost", 10); }
+    public int getChimaeraItemId() { return config.getInt("Items.Chimaera_Wing.Item_ID", 288); }
    public boolean getChimaeraEnabled() { return config.getBoolean("Items.Chimaera_Wing.Enabled", true); }
-    public boolean getChimaeraPreventUseUnderground() { return config.getBoolean("Items.Chimaera_Wing.Prevent_Use_Underground", true); }
-    public int getChimaeraCooldown() { return config.getInt("Items.Chimaera_Wing.Cooldown", 240); }
-    public int getChimaeraWarmup() { return config.getInt("Items.Chimaera_Wing.Warmup", 5); }
-    public int getChimaeraRecentlyHurtCooldown() { return config.getInt("Items.Chimaera_Wing.RecentlyHurt_Cooldown", 60); }

    /* Particles */
    public boolean getAbilityActivationEffectEnabled() { return config.getBoolean("Particles.Ability_Activation", true); }
@@ -290,31 +111,23 @@ public class Config extends AutoUpdateConfigLoader {
    public boolean getDodgeEffectEnabled() { return config.getBoolean("Particles.Dodge", true); }
    public boolean getBleedEffectEnabled() { return config.getBoolean("Particles.Bleed", true); }
    public boolean getGreaterImpactEffectEnabled() { return config.getBoolean("Particles.Greater_Impact", true); }
-    public boolean getLevelUpEffectsEnabled() { return config.getBoolean("Particles.LevelUp_Enabled", true); }
-    public int getLevelUpEffectsTier() { return config.getInt("Particles.LevelUp_Tier", 100); }
-    public boolean getLargeFireworks() { return config.getBoolean("Particles.LargeFireworks", true); }

    /* PARTY SETTINGS */
    public int getAutoPartyKickInterval() { return config.getInt("Party.AutoKick_Interval", 12); }
    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.1D); }
-    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.5D); }
+    public double getPartyShareBonusBase() { return config.getDouble("Party.Sharing.ExpShare_bonus_base", 1.1); }
+    public double getPartyShareBonusIncrease() { return config.getDouble("Party.Sharing.ExpShare_bonus_increase", 0.05); }
+    public double getPartyShareBonusCap() { return config.getDouble("Party.Sharing.ExpShare_bonus_cap", 1.5); }
    public boolean getItemShareEnabled() { return config.getBoolean("Party.Sharing.ItemShare_enabled", true); }
-    public double getPartyShareRange() { return config.getDouble("Party.Sharing.Range", 75.0D); }
+    public double getPartyShareRange() { return config.getDouble("Party.Sharing.Range", 75.0); }

    /* Party Teleport Settings */
-    public int getPTPCommandCooldown() { return config.getInt("Commands.ptp.Cooldown", 120); }
-    public int getPTPCommandWarmup() { return config.getInt("Commands.ptp.Warmup", 5); }
-    public int getPTPCommandRecentlyHurtCooldown() { return config.getInt("Commands.ptp.RecentlyHurt_Cooldown", 60); }
+    public int getPTPCommandCooldown() { return config.getInt("Commands.ptp.Cooldown", 30); }
    public int getPTPCommandTimeout() { return config.getInt("Commands.ptp.Request_Timeout", 300); }
    public boolean getPTPCommandConfirmRequired() { return config.getBoolean("Commands.ptp.Confirm_Required", true); }
    public boolean getPTPCommandWorldPermissions() { return config.getBoolean("Commands.ptp.World_Based_Permissions", false); }

-    /* Inspect command distance */
-    public double getInspectDistance() { return config.getDouble("Commands.inspect.Max_Distance", 30.0D); }
-
    /*
     * ABILITY SETTINGS
     */
@@ -325,9 +138,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 getMaxLength(AbilityType ability) { return config.getInt("Abilities.Max_Seconds." + ability.toString()); }
+    public int getMaxTicks(AbilityType ability) { return config.getInt("Abilities.Max_Seconds." + ability.toString()); }

    /* Durability Settings */
+    public boolean getAbilitiesDamageTools() { return config.getBoolean("Abilities.Tools.Durability_Loss_Enabled", true); }
    public int getAbilityToolDamage() { return config.getInt("Abilities.Tools.Durability_Loss", 2); }

    /* Thresholds */
@@ -336,6 +150,8 @@ 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) {
@@ -356,33 +172,42 @@ 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 Material getDetonatorItem() { return Material.matchMaterial(config.getString("Skills.Mining.Detonator_Name", "FLINT_AND_STEEL")); }
+    public int getDetonatorItemID() { return config.getInt("Skills.Mining.Detonator_ID", 259); }

    /* Repair */
    public boolean getRepairAnvilMessagesEnabled() { return config.getBoolean("Skills.Repair.Anvil_Messages", 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_ID", "GOLD_BLOCK")); }
+    public int getRepairAnvilId() { return config.getInt("Skills.Repair.Anvil_ID", 42); }
+    public boolean getSalvageEnabled() { return config.getBoolean("Skills.Repair.Salvage_enabled", true); }
+    public int getSalvageAnvilId() { return config.getInt("Skills.Repair.Salvage_Anvil_ID", 41); }
+    public int getSalvageUnlockLevel() { return config.getInt("Skills.Repair.Salvage_UnlockLevel", 600); }
    public boolean getSalvageTools() { return config.getBoolean("Skills.Repair.Salvage_tools", true); }
    public boolean getSalvageArmor() { return config.getBoolean("Skills.Repair.Salvage_armor", true); }
-    public boolean getRepairConfirmRequired() { return config.getBoolean("Skills.Repair.Confirm_Required", true); }

    /* Unarmed */
    public boolean getUnarmedBlockCrackerSmoothbrickToCracked() { return config.getBoolean("Skills.Unarmed.Block_Cracker.SmoothBrick_To_CrackedBrick", true); }

    /* Taming */
-    public int getTamingCOTWHorseCost() { return config.getInt("Skills.Taming.Call_Of_The_Wild.Apples_Required", 10); }
+    public int getTamingXPWolf() { return config.getInt("Experience.Taming.Animal_Taming.Wolf", 250); }
+    public int getTamingXPOcelot() { return config.getInt("Experience.Taming.Animal_Taming.Ocelot", 500); }
    public int getTamingCOTWWolfCost() { return config.getInt("Skills.Taming.Call_Of_The_Wild.Bones_Required", 10); }
    public int getTamingCOTWOcelotCost() { return config.getInt("Skills.Taming.Call_Of_The_Wild.Fish_Required", 10); }
-    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 boolean getWoodcuttingRequiresTool() { return config.getBoolean("Skills.Woodcutting.Requires_Axe", true); }
+
+    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); }
@@ -406,4 +231,27 @@ public class Config extends AutoUpdateConfigLoader {
    /* PVP & PVE Settings */
    public boolean getPVPEnabled(SkillType skill) { return config.getBoolean("Skills." + StringUtils.getCapitalized(skill.toString()) + ".Enabled_For_PVP", true); }
    public boolean getPVEEnabled(SkillType skill) { return config.getBoolean("Skills." + StringUtils.getCapitalized(skill.toString()) + ".Enabled_For_PVE", true); }
+
+    /*
+     * XP SETTINGS
+     */
+
+    /* General Settings */
+    public boolean getExperienceGainsMobspawnersEnabled() { return config.getBoolean("Experience.Gains.Mobspawners.Enabled", false); }
+    public boolean getExperienceGainsPlayerVersusPlayerEnabled() { return config.getBoolean("Experience.PVP.Rewards", true); }
+
+    public double getExperienceGainsGlobalMultiplier() { return config.getDouble("Experience.Gains.Multiplier.Global", 1.0); }
+    public void setExperienceGainsGlobalMultiplier(double value) { config.set("Experience.Gains.Multiplier.Global", value); }
+
+    /* Combat XP Multipliers */
+    public double getPlayerVersusPlayerXP() { return config.getDouble("Experience.Gains.Multiplier.PVP", 1.0); }
+    public double getCombatXP(EntityType entity) { return config.getDouble("Experience.Combat.Multiplier." + StringUtils.getPrettyEntityTypeString(entity).replace(" ", "_")); }
+
+    public double getAnimalsXP() { return config.getDouble("Experience.Combat.Multiplier.Animals", 1.0); }
+    public double getWitherSkeletonXP() { return config.getDouble("Experience.Combat.Multiplier.Wither_Skeleton", 4.0); }
+
+
+    /* XP Formula Multiplier */
+    public int getFormulaMultiplierCurve() { return config.getInt("Experience.Formula.Curve_Modifier", 20); }
+    public double getForumulaMultiplier(SkillType skill) { return config.getDouble("Experience.Formula.Multiplier." + StringUtils.getCapitalized(skill.toString())); }
 }
--- a/src/main/java/com/gmail/nossr50/config/ConfigLoader.java
+++ b/src/main/java/com/gmail/nossr50/config/ConfigLoader.java
@@ -1,12 +1,9 @@
 package com.gmail.nossr50.config;

 import java.io.File;
-import java.io.FileNotFoundException;
 import java.io.FileOutputStream;
-import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
-import java.util.List;

 import org.bukkit.configuration.file.FileConfiguration;
 import org.bukkit.configuration.file.YamlConfiguration;
@@ -33,11 +30,11 @@ public abstract class ConfigLoader {

    protected void loadFile() {
        if (!configFile.exists()) {
-            plugin.debug("Creating mcMMO " + fileName + " File...");
+            plugin.getLogger().info("Creating mcMMO " + fileName + " File...");
            createFile();
        }
        else {
-            plugin.debug("Loading mcMMO " + fileName + " File...");
+            plugin.getLogger().info("Loading mcMMO " + fileName + " File...");
        }

        config = YamlConfiguration.loadConfiguration(configFile);
@@ -46,76 +43,38 @@ public abstract class ConfigLoader {
    protected abstract void loadKeys();

    protected void createFile() {
+        if (configFile.exists()) {
+            return;
+        }
+
        configFile.getParentFile().mkdirs();

        InputStream inputStream = plugin.getResource(fileName);

-        if (inputStream == null) {
-            plugin.getLogger().severe("Missing resource file: '" + fileName + "' please notify the plugin authors");
-            return;
-        }
-
-        OutputStream outputStream = null;
-
-        try {
-            outputStream = new FileOutputStream(configFile);
-
-            int read;
-            byte[] bytes = new byte[1024];
-
-            while ((read = inputStream.read(bytes)) != -1) {
-                outputStream.write(bytes, 0, read);
-            }
-        }
-        catch (FileNotFoundException e) {
-            e.printStackTrace();
-        }
-        catch (IOException e) {
-            e.printStackTrace();
-        }
-        finally {
-            if (outputStream != null) {
-                try {
-                    outputStream.close();
-                }
-                catch (IOException e) {
-                    e.printStackTrace();
-                }
-            }
-
+        if (inputStream != null) {
            try {
-                inputStream.close();
+                copyStreamToFile(inputStream, configFile);
            }
-            catch (IOException e) {
+            catch (Exception e) {
                e.printStackTrace();
            }
        }
-    }
-
-    protected boolean validateKeys() {
-        return true;
-    }
-
-    protected boolean noErrorsInConfig(List<String> issues) {
-        for (String issue : issues) {
-            plugin.getLogger().warning(issue);
-        }
-
-        return issues.isEmpty();
-    }
-
-    protected void validate() {
-        if (validateKeys()) {
-            plugin.debug("No errors found in " + fileName + "!");
-        }
        else {
-            plugin.getLogger().warning("Errors were found in " + fileName + "! mcMMO was disabled!");
-            plugin.getServer().getPluginManager().disablePlugin(plugin);
-            plugin.noErrorsInConfigFiles = false;
+            plugin.getLogger().severe("Missing resource file: '" + fileName + "' please notify the plugin authors");
        }
    }

-    public File getFile() {
-        return configFile;
+    private static void copyStreamToFile(InputStream inputStream, File file) throws Exception {
+        OutputStream outputStream = new FileOutputStream(file);
+
+        int read = 0;
+        byte[] bytes = new byte[1024];
+
+        while ((read = inputStream.read(bytes)) != -1) {
+            outputStream.write(bytes, 0, read);
+        }
+
+        inputStream.close();
+        outputStream.close();
    }
 }
--- a/src/main/java/com/gmail/nossr50/config/HiddenConfig.java
+++ b/src/main/java/com/gmail/nossr50/config/HiddenConfig.java
@@ -11,7 +11,6 @@ public class HiddenConfig {
    private static boolean chunkletsEnabled;
    private static int conversionRate;
    private static boolean useEnchantmentBuffs;
-    private static boolean resendChunksAfterBlockAbility;

    public HiddenConfig(String fileName) {
        HiddenConfig.fileName = fileName;
@@ -32,7 +31,6 @@ public class HiddenConfig {
            chunkletsEnabled = config.getBoolean("Options.Chunklets", true);
            conversionRate = config.getInt("Options.ConversionRate", 1);
            useEnchantmentBuffs = config.getBoolean("Options.EnchantmentBuffs", true);
-            resendChunksAfterBlockAbility = config.getBoolean("Options.RefreshChunks", false);
        }
    }

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

@@ -20,10 +17,14 @@ public class CustomArmorConfig extends ConfigLoader {

    private List<Repairable> repairables;

-    private List<Material> customBoots       = new ArrayList<Material>();
-    private List<Material> customChestplates = new ArrayList<Material>();
-    private List<Material> customHelmets     = new ArrayList<Material>();
-    private List<Material> customLeggings    = new ArrayList<Material>();
+    public List<Integer> customBootIDs       = new ArrayList<Integer>();
+    public List<Integer> customChestplateIDs = new ArrayList<Integer>();
+    public List<Integer> customHelmetIDs     = new ArrayList<Integer>();
+    public List<Integer> customLeggingIDs    = new ArrayList<Integer>();
+    public List<Integer> customIDs           = new ArrayList<Integer>();
+
+    public List<CustomItem> customArmorList = new ArrayList<CustomItem>();
+    public HashMap<Integer, CustomItem> customArmor = new HashMap<Integer, CustomItem>();

    public CustomArmorConfig() {
        super("ModConfigs", "armor.yml");
@@ -50,13 +51,13 @@ public class CustomArmorConfig extends ConfigLoader {
    protected void loadKeys() {
        repairables = new ArrayList<Repairable>();

-        loadArmor("Boots", customBoots);
-        loadArmor("Chestplates", customChestplates);
-        loadArmor("Helmets", customHelmets);
-        loadArmor("Leggings", customLeggings);
+        loadArmor("Boots", customBootIDs);
+        loadArmor("Chestplates", customChestplateIDs);
+        loadArmor("Helmets", customHelmetIDs);
+        loadArmor("Leggings", customLeggingIDs);
    }

-    private void loadArmor(String armorType, List<Material> materialList) {
+    private void loadArmor(String armorType, List<Integer> idList) {
        ConfigurationSection armorSection = config.getConfigurationSection(armorType);

        if (armorSection == null) {
@@ -66,55 +67,35 @@ public class CustomArmorConfig extends ConfigLoader {
        Set<String> armorConfigSet = armorSection.getKeys(false);

        for (String armorName : armorConfigSet) {
-            Material armorMaterial = Material.matchMaterial(armorName);
+            int id = config.getInt(armorType + "." + armorName + ".ID", 0);
+            boolean repairable = config.getBoolean(armorType + "." + armorName + ".Repairable");
+            int repairID = config.getInt(armorType + "." + armorName + ".Repair_Material_ID", 0);
+            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 (armorMaterial == null) {
-                plugin.getLogger().warning("Invalid material name. This item will be skipped.");
+            if (id == 0) {
+                plugin.getLogger().warning("Missing ID. This item will be skipped.");
                continue;
            }

-            boolean repairable = config.getBoolean(armorType + "." + armorName + ".Repairable");
-            Material repairMaterial = Material.matchMaterial(config.getString(armorType + "." + armorName + ".Repair_Material", ""));
-
-            if (repairMaterial == null) {
+            if (repairable && (repairID == 0 || repairQuantity == 0 || durability == 0)) {
                plugin.getLogger().warning("Incomplete repair information. This item will be unrepairable.");
                repairable = false;
            }

+            CustomItem armor;
+
            if (repairable) {
-                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, repairQuantity, 0, durability, RepairItemType.ARMOR, RepairMaterialType.OTHER, 1.0));
+                repairables.add(RepairableFactory.getRepairable(id, repairID, repairData, repairQuantity, durability));
            }

-            materialList.add(armorMaterial);
+            armor = new CustomItem(id, durability);
+
+            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);
-    }
 }
--- a/src/main/java/com/gmail/nossr50/config/mods/CustomBlockConfig.java
+++ b/src/main/java/com/gmail/nossr50/config/mods/CustomBlockConfig.java
@@ -1,11 +1,9 @@
 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;
@@ -16,16 +14,17 @@ import com.gmail.nossr50.datatypes.mods.CustomBlock;
 public class CustomBlockConfig extends ConfigLoader {
    private static CustomBlockConfig instance;

-    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>();
+    public List<ItemStack> customExcavationBlocks  = new ArrayList<ItemStack>();
+    public List<ItemStack> customHerbalismBlocks   = new ArrayList<ItemStack>();
+    public List<ItemStack> customMiningBlocks      = new ArrayList<ItemStack>();
+    public List<ItemStack> customWoodcuttingBlocks = new ArrayList<ItemStack>();
+    public List<ItemStack> customOres              = new ArrayList<ItemStack>();
+    public List<ItemStack> 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>();

-    private HashMap<MaterialData, CustomBlock> customBlockMap = new HashMap<MaterialData, CustomBlock>();
+    public List<CustomBlock> customBlocks = new ArrayList<CustomBlock>();

    public CustomBlockConfig() {
        super("ModConfigs", "blocks.yml");
@@ -49,7 +48,7 @@ public class CustomBlockConfig extends ConfigLoader {
        loadBlocks("Ability_Blocks", customAbilityBlocks);
    }

-    private void loadBlocks(String skillType, List<MaterialData> blockList) {
+    private void loadBlocks(String skillType, List<ItemStack> blockList) {
        ConfigurationSection skillSection = config.getConfigurationSection(skillType);

        if (skillSection == null) {
@@ -59,96 +58,63 @@ public class CustomBlockConfig extends ConfigLoader {
        Set<String> skillConfigSet = skillSection.getKeys(false);

        for (String blockName : skillConfigSet) {
-            String[] blockInfo = blockName.split("[|]");
-
-            Material blockMaterial = Material.matchMaterial(blockInfo[0]);
-
-            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")) {
-                continue;
-            }
-
-            int xp = config.getInt(skillType + "." + blockName + ".XP_Gain");
-
-            boolean shouldDropItem = config.getBoolean(skillType + "." + blockName + ".Drop_Item");
-            Material dropMaterial = Material.matchMaterial(config.getString(skillType + "." + blockName + ".Drop_Item_Name"));
-
-            if (shouldDropItem && dropMaterial == null) {
-                plugin.getLogger().warning("Incomplete item drop information. This block will drop itself. - " + blockInfo[0]);
-                shouldDropItem = false;
-            }
-
-            ItemStack itemDrop;
-
-            if (shouldDropItem) {
-                byte dropData = (byte) config.getInt(skillType + "." + blockName + ".Drop_Item_Data_Value");
-                itemDrop = (new MaterialData(dropMaterial, dropData)).toItemStack(1);
-            }
-            else {
-                itemDrop = blockMaterialData.toItemStack(1);
-            }
-
+            int id = config.getInt(skillType + "." + blockName + ".ID", 0);
+            byte data = (byte) config.getInt(skillType + "." + blockName + ".Data_Value", 0);
+            int xp = config.getInt(skillType + "." + blockName + ".XP_Gain", 0);
+            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;
+            ItemStack itemDrop;
+            ItemStack blockItem;
+
+            if (id == 0) {
+                plugin.getLogger().warning("Missing ID. This block will be skipped.");
+                continue;
+            }
+
+            if (skillType.equals("Ability_Blocks")) {
+                blockItem = (new MaterialData(id, data)).toItemStack(1);
+
+                blockList.add(blockItem);
+                continue;
+            }
+
+            if (dropItem && dropID == 0) {
+                plugin.getLogger().warning("Incomplete item drop information. This block will drop itself.");
+                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(blockMaterialData);
+                customOres.add(blockItem);
            }
            else if (skillType.equals("Woodcutting")) {
                if (config.getBoolean(skillType + "." + blockName + ".Is_Log")) {
-                    customLogs.add(blockMaterialData);
+                    customLogs.add(blockItem);
                }
                else {
-                    customLeaves.add(blockMaterialData);
-                    xp = 0; // Leaves don't grant XP
+                    customLeaves.add(blockItem);
+                    block.setXpGain(0); // Leaves don't grant XP
                }
            }

-            customBlockMap.put(blockMaterialData, new CustomBlock(minimumDropAmount, maxiumDropAmount, itemDrop, xp));
+            blockList.add(blockItem);
+            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);
-    }
 }
--- a/src/main/java/com/gmail/nossr50/config/mods/CustomEntityConfig.java
+++ b/src/main/java/com/gmail/nossr50/config/mods/CustomEntityConfig.java
@@ -1,21 +1,26 @@
 package com.gmail.nossr50.config.mods;

-import java.util.HashMap;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Set;

-import org.bukkit.Material;
-import org.bukkit.entity.Entity;
-import org.bukkit.material.MaterialData;
+import org.bukkit.configuration.ConfigurationSection;
+import org.bukkit.entity.EntityType;
+import org.bukkit.inventory.ItemStack;

 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;

-    private HashMap<String, CustomEntity> customEntityClassMap = new HashMap<String, CustomEntity>();
-    private HashMap<String, CustomEntity> customEntityTypeMap  = new HashMap<String, CustomEntity>();
+    public List<Integer> customEntityIds        = new ArrayList<Integer>();
+    public List<Integer> customHostileEntityIds = new ArrayList<Integer>();
+    public List<Integer> customNeutralEntityIds = new ArrayList<Integer>();
+    public List<Integer> customPassiveEntityIds = new ArrayList<Integer>();
+
+    public List<EntityType> customEntityTypes = new ArrayList<EntityType>();
+    public List<CustomEntity> customEntities = new ArrayList<CustomEntity>();

    public CustomEntityConfig() {
        super("ModConfigs", "entities.yml");
@@ -32,81 +37,48 @@ public class CustomEntityConfig extends ConfigLoader {

    @Override
    protected void loadKeys() {
-        for (String entityName : config.getKeys(false)) {
-            Class<?> clazz = null;
-            String className = config.getString(entityName + ".Class", "");
+        loadMobs("Hostile", customHostileEntityIds);
+        loadMobs("Neutral", customNeutralEntityIds);
+        loadMobs("Passive", customPassiveEntityIds);
+    }

-            try {
-                clazz = ClassUtils.getClass(className);
-            }
-            catch (ClassNotFoundException e) {
-                plugin.getLogger().warning("Invalid class (" + className + ") detected for " + entityName + ".");
-                plugin.getLogger().warning("This custom entity may not function properly.");
+    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 : entityConfigSet) {
+            int id = config.getInt(entityType + "." + entityName + ".ID", 0);
+            EntityType type = EntityType.fromId(id);
+            double xpMultiplier = config.getDouble(entityType + "." + entityName + ".XP_Multiplier", 1.0D);
+            boolean canBeTamed = config.getBoolean(entityType + "." + entityName + ".Tameable", false);
+            int tamingXp = config.getInt(entityType + "." + entityName + "Taming_XP", 0);
+            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;
            }

-            String entityTypeName = entityName.replace("_", ".");
-            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.");
+            if (canBeSummoned && (callOfTheWildId == 0 || callOfTheWildAmount == 0)) {
+                plugin.getLogger().warning("Incomplete Call of the Wild information. This enitity will not be able to be summoned by Call of the Wild.");
                canBeSummoned = false;
            }

-            CustomEntity entity = new CustomEntity(xpMultiplier, canBeTamed, tamingXp, canBeSummoned, (canBeSummoned ? new MaterialData(callOfTheWildMaterial, callOfTheWildData).toItemStack(1) : null), callOfTheWildAmount);
+            entity = new CustomEntity(id, type, xpMultiplier, canBeTamed, tamingXp, canBeSummoned, new ItemStack(callOfTheWildId, callOfTheWildData), callOfTheWildAmount);

-            customEntityTypeMap.put(entityTypeName, entity);
-            customEntityClassMap.put(clazz == null ? null : clazz.getName(), entity);
+            entityIdList.add(id);
+            customEntityTypes.add(type);
+            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);
-    }
 }
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
bm01	e41adf769b	Created an Ability class to be consistent with Tool	2013-03-04 00:18:23 +01:00
bm01	e80f60ccee	Fixed Tool objects being shared by all players	2013-03-04 00:01:53 +01:00
bm01	12b548bf46	Moved ability and tool stuff from McMMOPlayer to SkillManager classes Warning: Because Woodcutting and Repair don't have a "proper" manager class, this doesn't work yet.	2013-03-03 23:27:51 +01:00