Return to HashMap!

until RB.

.gitignore

@@ -33,4 +33,10 @@
 .idea/
 
 # Project Stuff
-/src/main/resources/mcMMO
+/src/main/resources/mcMMO
+
+# Other Libraries
+*.jar
+
+# Atlassian Stuff
+/atlassian-ide-plugin.xml

Changelog.txt

@@ -1,8 +1,324 @@
 Changelog:
-#Versions without changelogs probably had very small misc fixes, like tweaks to the source code
+Versions without changelogs probably had very small misc fixes, like tweaks to the source code
+
+Key:
+  + Addition
+  = Fix
+  ! Change
+  - Removal
+
+Version 1.3.09
+ + Added compatibility with AntiCheat (Which I highly recommend to prevent cheating)
+ + Added several permission nodes to give individual users special perks (Double/Triple/Quadruple XP)
+ + Added reduced cooldown permission nodes as special perks (1/4, 1/3, 1/2 cooldown)
+ + Added increased activation time permissions nodes as special perks (+4, +8, and +12 seconds)
+ + Added API for plugins to add custom tools directly via Spout - repair / abilities do not work ATM
+ + Added offline party members to the list displayed by /party
+ + Added possibility to kick offline members from parties
+ = Fixed bug that would cause a NPE for players that had no parties
+ = Fixed Vampirism not notifying the correct amount of stolen levels
+ = Fixed bug with Acrobatics not saving you from deadly falls
+ = Fixed /mcremove being applied only after a reload
+ = Fixed Archery PVE disablement not working properly
+ = Fixed possible NPE when a projectile is shot by a dispenser or doesn't have any shooter
+ = Fixed issue with NoCheatPlus and Serrated Strikes / Skull Splitter (fight.noswing)
+ = Fixed tiny memory leak concerning Archery
+ = Fixed bug where you could receive Archery XP from Potions
+ = Fixed bug where Chunklets for the < 64 y coordinates would not be properly loaded
+ = Fixed exploit with block duplication via piston pushing
+ = Fixed bug with falling sand/gravel not being tracked
+ = Fixed bug with Tree Feller not working with custom axes
+ = Fixed bug with locale strings when trying to teleport to a non-existent player
+ = Fixed bug with Tree Feller changing durability before checking for axe splintering
+ = Fixed bug with Repair Mastery permission due to typo
+ = Fixed bug with repairing items that use metadata
+ = Fixed bug with Chunklets not being reloaded on /reload
+ = Fixed possible NPE when falling with no item in hand
+ ! API methods can now only be used in a static way
+ ! Arrows shot from a bow having the Infinity enchantment can no longer be retrieved
+ ! Arrows that aren't shot by an entity are now able to be dodged (currently only from dispensers)
+ ! Changed Spout settings to be in their own config file (spout.yml)
+ ! Changed file format for parties (parties.yml), previous files are no longer used
+ ! Changed mcMMO to inform on corrupt Chunklets and make new ones
+
+Version 1.3.08
+ + Added more notifications about Vampirism and Hardcore mode on player death
+ + Added information about Hardcore mode when joining a server running Hardcore mode
+ + Added new hidden.yml inside the jar for very sensitive config options for advanced users
+ + Added option to disable Chunklets for servers which do not have doubledrops and do not care about xp farming
+ + Added new "Max_Seconds" setting in config.yml to limit the max time of abilities
+ + Added new repair configs to allow customization of the repair skill
+ + Added message to inform users about hardcore mode on login
+ = Fixed exploit where you could gain tons of Acrobatics XP from spamming Ender Pearls
+ = Fixed normal pistons marking a block as user-placed on retract if it wasn't a sticky piston (thanks turt2live!)
+ = Fixed handling of the Unbreaking enchantment so that tools are actually damaged as they should now
+ = Fixed hurting pet cats with serrated strikes
+ ! Changed Hardcore Vampirism to require the victim to have at least half the skill level of the killer in order for vampirism to proc (this is to avoid exploitation)
+ ! Changed Hardcore Vampirism to steal a minimum of 1 skill level from a player no matter the percentage
+ ! Changed Hardcore & Vampirism to not be executed if percentages were set to zero or below
+ ! Changed Vampirism to actually remove stats from the victim
+ ! Changed Vampirism to inform the victim of their stat loss
+ ! Changed Mining to allow Silk Touch to work again since the dupe exploit has been fixed.
+ ! Changed Metrics to also report if the server uses plugin profiling
+ - Removed level and item settings from Repair skill in config.yml
+
+Version 1.3.07
+ + Added ability to gain XP from custom blocks. Enable custom blocks in the config file, then enter the data in the blocks.yml file.
+ + Added ability to gain XP with custom tools. Enable custom tools in the config file, then enter the data in the tools.yml file.
+ + Added ability to repair custom tools. Enable custom tools in the config file, then enter the data in the tools.yml file.
+ + Added ability to repair custom armor. Enable custom armor in the config file, then enter the data in the armor.yml file.
+ + Added functionality which makes a new folder in all world files "mcmmo_data" to store player placed block information in
+ + Added new configurable Hardcore mode functionality to mcMMO
+ + Added new configurable Vampirism PVP stat leech for Hardcore mode
+ + Added new bypass permission node for the negative penalties of Hardcore mode 'mcmmo.bypass.hardcoremode'
+ + Added configurable level curve multiplier which allows for tweaking the steepness of the XP needed to level formula
+ + Added a permission node for Archery bonus damage
+ + Added a permission node for Greater Impact ability
+ + Added permission nodes for Treasure & Magic Hunter for Fishing
+ + Added a permission node for Farmer's Diet
+ + Added config options for enabling/disabling specific double drops
+ + Added automatic zip backup of flatfile database & config files
+ + Added config options to enable/disable specific skills for PVP & PVE
+ = Fixed bug where Tree Feller was looking at the wrong blocks for determining how much to take down.
+ = Fixed bug where Green Terra consumed seeds even on Mossy Stone Brick
+ = Fixed bug where the client didn't reflect the Stone Brick to Mossy Stone Brick change
+ = Fixed bug where an arrow could bounce off entities on daze proc
+ = Fixed bug where a player could gain Acrobatics experience while riding a cart
+ = Fixed /party not working properly with 2 arguments
+ = Fixed /party not showing properly the member list
+ = Fixed /ability not checking the right permission
+ = Fixed rare NPE on /party command
+ = Fixed Arrow Retrieval dropping only one arrow
+ = Fixed /p and /a incompatibilities with bChatManager
+ = Fixed Iron Grip working reversely
+ = Fixed NPE when user clicked the HUD button with Spout
+ = Fixed bug where the permission node for Impact didn't work
+ = Fixed some bypass nodes defaulting true for Ops
+ = Fixed bug with trying to use Chimera Wing while standing on a half-block
+ = Fixed duplication bug when a placed block was mined after a server restart
+ = Fixed exploit where shooting yourself with an arrow gave Archery XP
+ ! Changed the mcMMO motd to link to the new website rather than the wiki
+ ! Changed bleeding ticks damage to 1 from 2
+ ! Changed Mining to ignore blocks when the pick is enchanted with Silk Touch
+ ! Changed Super Breaker to be non-functional when used with a Silk Touch enchanted pick
+ ! Changed MySQL to save player information 50ms apart from each other to reduce the load on the MySQL server
+ ! Changed the permission node for Blast Mining detonation to mcmmo.ability.blastmining.detonate (was mcmmo.skills.blastmining) for the sake of consistency
+ ! Changed skill commands to only display what you have permissions for
+ ! Changed mcMMO to use a new storage system for player placed blocks
+ - Removed some unused permission nodes
+ - Removed a few config options in favor of permissions nodes (Hunger Bonus, Armor/Tool Repair, Instant Wheat Regrowth)
+ - Removed level requirement for repairing string tools from the config file
+
+Version 1.3.06
+ + Added Iron Golem XP for aggressive golems
+ + Added permissions check to skill functions
+ + Added API functions for obtaining offline profiles & profiles via player names
+ + Added API functions for admin & party chat
+ + Added Iron Grip skill to Unarmed which gives players an chance to keep from being disarmed.
+ + Added some new languages to the locale files.
+ = Fixed Green Thumb consuming 2 seeds instead of 1
+ = Fixed exploit where you could teleport to yourself with PTP to prevent things like fall damage
+ = Fixed NPE error with Metrics on startup
+ = Fixed bug where Herbalism required double drops permission to give XP
+ = Fixed bug where {0} would be displayed in front of your power level in mcstats
+ = Fixed mmoupdate not being useable from console
+ = Fixed bug with repairing wooden tools
+ = Fixed bug with Nether Wart not awarding XP
+ = Fixed bug with fishing treasures when treasures list is empty
+ = Fixed bug with only getting one level when there was enough XP for multiple levels.
+ = Fixed bugs with the way /mctop displayed
+ = Fixed issues with custom characters & locale files.
+ = Fixed double explosion for Blast Mining
+ = Fixed Blast Mining not giving triple drops when it should
+ ! Changed Bleeding to now stack to a finite number on Monsters and will wear off eventually
+ ! Changed how we handled the config file to prevent any bugs when returning values
+ ! Changed locale files to use a new naming scheme. This breaks ALL old locale files. If you want to assist with re-translating anything, go to getlocalization.com/mcMMO
+ ! Changed /mcremove to check for users in the MySQL DB before sending queries to remove them
+ ! Changed how the tree feller threshold worked for the better
+ ! Changed /mcremove to no longer kick players when they are removed from database
+ ! Changed /mcremove to work on offline users for FlatFile
+ ! Changed PlayerProfile constructor to always take a boolean
+ ! Changed getPlayerProfile function to work for online & offline users
+ ! Changed Archery's Daze to deal 4 DMG on proc (2 Hearts)
+ ! Changed /addlevel command to work for offline users
+ ! Changed party & admin chat handling to be nicer to developers
+ ! Changed /mcrefresh to work from console
+ ! Changed /mcrefresh to work for offline players
+ ! Changed UpdateXPBar function to hopefully avoid errors
+ ! Changed /party to show offline party members
+ ! Changed Blast Mining requirements, now asks for the player to be crouching
+
+Version 1.3.05
+ + Added Skill Shot to Archery which increases damage dealt by 10% every 50 skill levels (caps at 200%)
+ + Added ExperienceAPI and PartyAPI classes for developer use
+ + Added ability to cap overall power level
+ + Added showing powerlevel below a persons name if you run Spout (optional)
+ = Fixed errors when Spout would disable itself after start-up
+ = Fixed XP bar not updating when XP was gained
+ = Fixed bug with repairing wooden tools
+ = Fixed bug where spawned wolves only had 8 health.
+ = Fixed bug where rare Treasures from Excavation were dropping too often
+ = Fixed bug where Skull Splitter & Serrated Strikes could be used without permissions.
+ = Fixed bug where API functions were set to static
+ = Fixed bug where mmoedit threw errors when modifying an offline user
+ = Fixed dupe exploit with Blast Mining
+ ! Changed Tree Feller to account for ability durability loss but not leaves.
+ ! Changed bypass node for Arcane Forging to not default to true for OPs
+ - Removed Ignition from Archery
+ - Removed McMMOPlayerRepairEvent - was basically a duplicate of McMMOPlayerRepairCheck but couldn't be cancelled.
+
+Version 1.3.04
+ + Added McMMOPlayerRepairEvent for API usage - fires after completion of a repair.
+ + Added McMMOPlayerRepairCheckEvent for API usage - fires before repair process begins, can be cancelled.
+ + Added ability to get skill level from McMMOPlayerExperience events
+ + Added McMMOPartyTeleportEvent for API usage - fires before a successful teleportation would occur.
+ + Added McMMOPartyChangeEvent for API usage - fires whenever a player joins or leaves a party
+ = Fixed Shake ability dropping bonemeal instead of ink for squids.
+ = Fixed Green Terra & Super Breaker awarding 4x drops at high levels.
+ = Fixed summoned ocelots never changing skins.
+ = Fixed bug with Disarm not working
+ = Fixed some API functions not being visible
+ = Fixed bug where /ptp worked on dead party members
+ ! Changed MySQL to reload all player information on reconnection
+ ! Changed event package structure - be sure to update these if you're using the API in your plugin
+
+Version 1.3.03
+ + Added Ocelots to Taming XP tables
+ + Added ability to summon Ocelots with Call of the Wild
+ + Added offline user functionality to mmoedit
+ + Added bookshelves to list of blocks that don't trigger abilities.
+ + Added 'mcmmo.repair.arcanebypass' permission node to bypass Arcane Repair and keep your enchantments
+ + Added config option to disable Herbalism's instant wheat replanting
+ + Added LOTS of new permissions nodes. *CHECK PLUGIN.YML FOR UPDATES*
+ + Added Italian locale file - thanks Luxius96!
+ + Added ability to inspect Ocelots with Beast Lore
+ + Added console functionality to mctop
+ = Fixed Green Terra not awarding Triple Drops
+ = Fixed ClassCastException from Taming preventDamage checks
+ = Fixed issue with Blast Mining not seeing TNT for detonation due to snow
+ = Fixed issue with block interaction returning NPEs
+ = Fixed issue where every block broken had a mining check applied
+ = Fixed issue where every block broken had a herbalism check applied
+ = Fixed issue where blocks weren't being removed from the watchlist
+ = Fixed exploit where you could use /ptp to teleport to anyone
+ = Fixed bug where Green Terra didn't work on Stone Brick
+ = Fixed bug where Tree Feller could be used without permissions
+ = Fixed exploit where falling sand & gravel weren't tracked
+ = Fixed exploit where Acrobatics could be leveled via Dodge on party members.
+ = Fixed exploit where you could gain combat XP on animals summoned by Call of the Wild
+ ! Changed mcMMO to save profiles only when the profile is about to be discarded rather than on player quit
+ ! Changed MySQL to try to reconnect every 60 seconds rather than infinitely which caused server hangs
+ ! Changed mcMMO to be better about saving player information on server shutdown
+ ! Changed PTP to prevent teleporting if you've been hurt in the last 30 seconds (configurable)
+ ! Changed Chimera Wing failure check to use the maxWorldHeight.
+ ! Changed inspect failed message to say inspect rather than whois
+ ! Changed Call of the Wild to activate on left-click rather than right-click
+ ! Changed Blast Mining to track based on Entity ID vs. Location
+ ! Changed mmoedit to save a profile when used (this will make mctop update)
+ ! Changed a few Runnable tasks to have their own classes
+ ! Changed parties so that a player will leave their existing party if they enter a world where they don't have party permissions.
+ ! Changed Call of the Wild to summon animals already tamed.
+ ! Changed mob spawner tracking to use new Metadata API
+ ! Changed block watch list to use new Metadata API
+ ! Changed around a few config options, including the ones for mySQL. *YOU NEED TO REDO YOUR CONFIG FILE*
+ - Removed 'true/false' debug message from Inspect command
+
+Version 1.3.02
+ + Added in game guides for Mining, Excavation, and Acrobatics. Simply type /skillname ? to access them
+ ! Changed Tree Feller to hand out 1/4 of normal XP for each JUNGLE LOG block it fells
+ ! Changed Tree Feller to only fell trees if you have enough durability
+ ! Changed Tree Feller to cause injury if your axe splinters from a failed Tree Feller attempt
+ ! Changed invincibility checks in EntityDamage listeners to accommodate for vanilla MC behaviour
+ ! Changed Ignition to add fire ticks rather than replacing them.
+ ! Changed Axes critical to have a max critical rate of 37.5% down from 75%
+ = Fixed bug where Taming defensive checks got called twice
+ = Fixed Shake not working correctly
+ = Fixed bug with Axes command displaying wrong Greater Impact bonus damage
+ = Fixed bug where Impact didn't apply bonus damage
+ = Fixed Impact proccing multiple times in a row
+ = Fixed bug where PVE skills didn't level
+
+Version 1.3.01
+ = Fixed bug where Tree Feller had no cooldown
+ = Fixed bug with activating Skull Splitter after using Tree Feller
+ 
+Version 1.3.00
+ + Added ability to customize drops for Excavation skill (treasures.yml)
+ + Added ability to customize drops for Fishing skill (treasures.yml)
+ + Added messages to nearby players when your abilities wear off
+ + Added jungle trees to Woodcutting XP tables
+ + Added player notification for when they stop Bleeding
+ + Added configuration option to control mcMMO reporting damage events
+ + Added hunger regain bonuses to Herbalism skill
+ + Added Blast Mining subskills to Mining
+ + Added Fast Food Service subskill to Taming
+ + Added size limit to Tree Feller in config as Tree Feller Threshold
+ + Added /inspect (works on offline players)
+ + Added /addlevels commands
+ + Added /mcremove command which lets you remove users from MySQL or FlatFile
+ + Added config values for XP multipliers for different hostile mobs
+ + Added 'mcmmo.commands.inspect' permission node for the new /inspect command
+ + Added Impact & Greater Impact subskills to Axes
+ + Re-added mcMMO reporting damage events
+ = Fixed bug with updating MySQL tables to include fishing on servers using custom table prefixes
+ = Fixed bug where Disarm didn't work at all ever
+ = Fixed bug where Swords command showed Bleed Length twice instead of Bleed Chance
+ = Fixed bug where Tree Feller wasn't checking for Tree Feller permission
+ = Fixed bug where Leaf Blower required Tree Feller permissions rather than Woodcutting permissions
+ = Fixed Leaf Blower preventing the use of shears to collect leaves
+ = Fixed Green Thumb & Green Terra not consuming or requiring seeds to replant Wheat
+ = Fixed Super Breaker & Giga Drill Breaker failing to damage tools
+ = Fixed Tree Feller not giving proper XP for different kinds of trees
+ = Fixed Skill Abilities conflicting with NoCheat
+ = Fixed memory leak with mob spawner tracking
+ = Fixed /mcability not respecting permissions
+ = Prettied up new config files
+ = Various skill function optimizations
+ ! Changed how mcMMO calculates distance between two points (optimizations)
+ ! Changed how mcMMO handles MySQL connections (optimizations)
+ ! Changed the description /mcmmo provides to be more up to date and relevant
+ ! Changed mcMMO user information to be stored for 2 minutes after log out to reduce lag on rejoins
+ ! Changed Food+ to be named Farmer's Diet in Herbalism
+ ! Changed default values of Woodcutting XP tables
+ ! Changed 'Pine' to be renamed 'Oak' in Woodcutting XP tables
+ ! Changed the name of Unarmed Apprentice/Mastery to Iron Arm Style
+ ! Changed Axes to gain bonus damage every 50 skill levels
+ ! Changed Unarmed to start with a +3 DMG (1 Heart = 2 DMG) bonus from Iron Arm Style to make leveling it more viable
+ ! Changed Unarmed to gain bonus damage every 50 skill levels
+ ! Changed Unarmed to gain more bonus damage total than before
+ ! Changed Unarmed to have a max disarm chance of 33.3% rather than 25%
+ ! Changed Tree Feller to take down entire trees
+ ! Changed mob spawn tracking to use Unique Entity ID instead of Entity Object
+ ! Changed stats command name to mcstats for better plugin compatibility
+ ! Changed god mode to turn off if player enters world where he does not have mcgod permission
+ ! Changed Taming to also gain XP from animal taming
+ ! Changed Swords Bleeding effect to never kill
+ ! Changed Bleeding to never go beyond 10 ticks
+ ! Changed to use Bukkit's built-in ignoreCancelledEvents system
+ ! Changed chat logging for /p & /a
+ ! Changed Tree Feller to use per-use ArrayList
+ - Removed /mcstats console functionality
+ - Removed /whois command (replaced with /inspect which has similar functionality)
+ - Removed Master/Apprentice chat notifications to reduce spam
+ - Removed MySpawn system (You can still use Chimaera Wings) due to being outdated and unwanted
+ - Removed duplicate settings in config.yml
+ - Removed unused settings from config.yml (HP Regen)
+ - Removed Nether Brick from Mining XP Tables
+ - Removed Stone Brick from Mining XP Tables
+ 
+Version 1.2.12
+ - Fixed issue that caused terrible MySQL performance and negative XP on levelup (Issue #134)
+ - Fixed addxp command taking xprate and skill modifiers into account
+ - Added anonymous usage statistics (you can opt out in plugins/PluginMetrics/config.yml)
+ - Modified onEntityDamage priority to have better compatibility with other plugins (Factions, WorldGuard, etc...)
+ - Fixed /mcgod & /mmoedit permissions defaulting to true
+ - Fixed Fishing not working or handing out XP
+ - Fixed error with Skull Splitter / Serrated Strikes that caused server instability and log spam
+ - Fixed config.yml not having values for End Stone & other new mining blocks
+ - Fixed Green Thumb/Green Terra not correctly planting wheat (Issue #133)
 
 Version 1.2.11
- - Removed legacy Permission & PEX support.  SuperPerms support only now.
+ - Removed legacy Permission & PEX dependency. (PEX still works fine with mcMMO)
  - Made Smooth Brick to Mossy Brick and Dirt to Grass for green thumb configurable (Issue #120)
  - Added MagmaCube to XP tables
  - Made optimizations to Skull Splitter/Serrated Strikes

README.creole

@@ -1,6 +1,9 @@
 == mcMMO
 **The RPG lovers mod**
 
+=== Forums
+http://forums.mcmmo.info Talk with developers and the community about mcMMO here
+
 === Brief Description
 mcMMO takes core Minecraft game mechanics and expands them to add an extensive RPG experience, the goal of the project has always been a quality RPG experience. Everything in mcMMO is carefully thought out and is constantly improving. mcMMO adds eleven skills to train in and level in, while also offering a high level of customization for server admins. There are countless features, including custom sounds, graphical elements, and more added when running mcMMO in conjunction with Spout. I carefully read feedback and evaluate the mechanics of mcMMO in every update to provide an ever-evolving experience.
 

extras/repair.chain.yml

@@ -0,0 +1,73 @@
+#
+# 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 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.
+## This defaults to OTHER.
+#
+# MaterialType: This is the type of the material of the item to be repaired, this is only important for permissions.
+## Valid values are STRING, LEATHER, WOOD, STONE, IRON, GOLD, DIAMOND, and OTHER
+## This defaults to OTHER.
+#
+# RepairMaterialId: This is the id of the item used to repair this repairable.
+## This is required to be set.
+#
+# RepairMaterialMetadata: This is the metadata of the item used to repair this repairable.
+## A value of -1 means to ignore all metadata when repairing.
+## This defaults to -1
+#
+# MaximumDurability: This is the maximum durability of the item.
+## This is required to be set.
+#
+# MinimumLevel: This is the minimum repair level needed to repair this item.
+## 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.
+## This is typically the number of the repair material needed to create a new item, for example for a sword it is 2, for an axe it is 3
+## This defaults to 2
+#
+# XpMultiplier: This is the amount to multiply the xp bonus by.
+## This defaults to 1
+#
+#
+# The following is an example of a repair.*.yml config which adds the ability to repair Chainmail armor using fire.
+#
+#
+###
+Repairables:
+    ChainHelmet:
+        ItemId: 302
+        ItemType: ARMOR
+        RepairMaterialId: 51
+        MaximumDurability: 165
+        MinimumQuantity: 5
+        XpMultiplier: 2
+    ChainChest:
+        ItemId: 303
+        ItemType: ARMOR
+        RepairMaterialId: 51
+        MaximumDurability: 240
+        MinimumQuantity: 8
+        XpMultiplier: 2
+    ChainLegs:
+        ItemId: 304
+        ItemType: ARMOR
+        RepairMaterialId: 51
+        MaximumDurability: 225
+        MinimumQuantity: 7
+        XpMultiplier: 2
+    ChainBoots:
+        ItemId: 305
+        ItemType: ARMOR
+        RepairMaterialId: 51
+        RepairMaterialMetadata: -1
+        MaximumDurability: 195
+        MinimumQuantity: 4
+        XpMultiplier: 2

pom.xml

@@ -2,12 +2,12 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>com.gmail.nossr50.mcMMO</groupId>
     <artifactId>mcMMO</artifactId>
-    <version>1.2.11</version>
+    <version>1.3.09</version>
     <name>mcMMO</name>
-    <url>https://github.com/TheYeti/mcMMO</url>
+    <url>https://github.com/mcMMO-Dev/mcMMO</url>
     <issueManagement>
-        <system>GitHub</system>
-        <url>https://github.com/TheYeti/mcMMO/issues</url>
+        <url>http://issues.mcmmo.org</url>
+        <system>JIRA</system>
     </issueManagement>
     <build>
         <finalName>mcMMO</finalName>
@@ -95,19 +95,29 @@
     </build>
     <repositories>
         <repository>
+            <snapshots>
+                <enabled>true</enabled>
+                <updatePolicy>always</updatePolicy>
+                <checksumPolicy>fail</checksumPolicy>
+            </snapshots> 
             <id>bukkit-repo</id>
             <url>http://repo.bukkit.org/content/groups/public/</url>
         </repository>
         <repository>
+            <snapshots>
+                <enabled>true</enabled>
+                <updatePolicy>always</updatePolicy>
+                <checksumPolicy>fail</checksumPolicy>
+            </snapshots> 
         	<id>spout-repo</id>
-        	<url>http://nexus.getspout.org/content/groups/public/</url>
+        	<url>http://nexus.spout.org/content/groups/public/</url>
         </repository>
     </repositories>
     <dependencies>
         <dependency>
             <groupId>org.bukkit</groupId>
             <artifactId>bukkit</artifactId>
-            <version>1.1-R4-SNAPSHOT</version>
+            <version>LATEST</version>
             <type>jar</type>
             <scope>compile</scope>
         </dependency>

src/main/java/com/gmail/nossr50/Combat.java

@@ -1,463 +0,0 @@
-/*
-	This file is part of mcMMO.
-
-    mcMMO is free software: you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    mcMMO is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with mcMMO.  If not, see <http://www.gnu.org/licenses/>.
-*/
-package com.gmail.nossr50;
-
-import org.bukkit.Bukkit;
-import org.bukkit.World;
-import org.bukkit.entity.*;
-import org.bukkit.event.entity.EntityDamageByEntityEvent;
-import org.bukkit.event.entity.EntityDamageEvent;
-import org.bukkit.event.entity.EntityDamageEvent.DamageCause;
-import org.bukkit.plugin.Plugin;
-
-import com.gmail.nossr50.config.LoadProperties;
-import com.gmail.nossr50.datatypes.PlayerProfile;
-import com.gmail.nossr50.datatypes.SkillType;
-import com.gmail.nossr50.locale.mcLocale;
-import com.gmail.nossr50.party.Party;
-import com.gmail.nossr50.skills.Acrobatics;
-import com.gmail.nossr50.skills.Archery;
-import com.gmail.nossr50.skills.Axes;
-import com.gmail.nossr50.skills.Skills;
-import com.gmail.nossr50.skills.Swords;
-import com.gmail.nossr50.skills.Taming;
-import com.gmail.nossr50.skills.Unarmed;
-
-public class Combat 
-{
-	public static void combatChecks(EntityDamageEvent event, mcMMO pluginx)
-	{
-		if(event.isCancelled() || event.getDamage() == 0)
-			return;
-		
-		if(event instanceof EntityDamageByEntityEvent)
-		{	
-			/*
-			 * OFFENSIVE CHECKS FOR PLAYERS VERSUS ENTITIES
-			 */
-			if(((EntityDamageByEntityEvent) event).getDamager() instanceof Player)
-			{
-				//Declare Things
-				EntityDamageByEntityEvent eventb = (EntityDamageByEntityEvent) event;
-				Player attacker = (Player)((EntityDamageByEntityEvent) event).getDamager();
-				PlayerProfile PPa = Users.getProfile(attacker);
-				
-				//Damage modifiers
-				if(mcPermissions.getInstance().unarmed(attacker) && attacker.getItemInHand().getTypeId() == 0) //Unarmed
-					Unarmed.unarmedBonus(attacker, eventb);
-				if(m.isAxes(attacker.getItemInHand()) && mcPermissions.getInstance().axes(attacker) && Users.getProfile(attacker).getSkillLevel(SkillType.AXES) >= 500)
-				{
-					int damage = event.getDamage()+4;
-				    event.setDamage(damage);
-				}
-				
-				//If there are any abilities to activate
-		    	combatAbilityChecks(attacker, PPa, pluginx);
-		    	
-		    	//Check for offensive procs
-		    	if(!(((EntityDamageByEntityEvent) event).getDamager() instanceof Arrow))
-		    	{
-			    	if(mcPermissions.getInstance().axes(attacker))
-			    		Axes.axeCriticalCheck(attacker, eventb, pluginx); //Axe Critical Checks
-			    	
-			    	if(!pluginx.misc.bleedTracker.contains((LivingEntity) event.getEntity())) //Swords Bleed
-			   			Swords.bleedCheck(attacker, (LivingEntity)event.getEntity(), pluginx);
-			    	
-				   	if(event.getEntity() instanceof Player && mcPermissions.getInstance().unarmed(attacker))
-				   	{
-				   		Player defender = (Player)event.getEntity();
-				   		Unarmed.disarmProcCheck(attacker, defender);
-				    }
-			    	
-			    	//Modify the event damage if Attacker is Berserk
-			    	if(PPa.getBerserkMode())
-			    		event.setDamage(event.getDamage() + (event.getDamage() / 2));
-		       	
-			   		//Handle Ability Interactions
-			   		if(PPa.getSkullSplitterMode() && m.isAxes(attacker.getItemInHand()))
-		       			Axes.applyAoeDamage(attacker, eventb, pluginx);
-		      		if(PPa.getSerratedStrikesMode() && m.isSwords(attacker.getItemInHand()))
-		       			Swords.applySerratedStrikes(attacker, eventb, pluginx);
-		      		
-		      		//Experience
-		      		if(event.getEntity() instanceof Player)
-		      		{
-		      			Player defender = (Player)event.getEntity();
-		      			PlayerProfile PPd = Users.getProfile(defender);
-			    		if(attacker != null && defender != null && LoadProperties.pvpxp)
-			    		{
-			    			if(System.currentTimeMillis() >= (PPd.getRespawnATS()*1000) + 5000 
-			    					&& ((PPd.getLastLogin()+5)*1000) < System.currentTimeMillis()
-			    					&& defender.getHealth() >= 1)
-			    			{
-			    				//Prevent a ridiculous amount of XP being granted by capping it at the remaining health of the mob
-				      			int hpLeft = defender.getHealth(), xpinc = 0;
-				      			
-				      			if(hpLeft < event.getDamage())
-				      			{
-				      			    if(hpLeft > 0)
-				      			        xpinc = hpLeft;
-				      			    else
-				      			        xpinc = 0;
-				      			} else
-				      				xpinc = event.getDamage();
-				      			
-			    				int xp = (int) (xpinc * 2 * LoadProperties.pvpxprewardmodifier);
-			    				
-				    			if(m.isAxes(attacker.getItemInHand()) && mcPermissions.getInstance().axes(attacker))
-				    				PPa.addXP(SkillType.AXES, xp*10, attacker);
-				    			if(m.isSwords(attacker.getItemInHand()) && mcPermissions.getInstance().swords(attacker))
-				    				PPa.addXP(SkillType.SWORDS, xp*10, attacker);
-				    			if(attacker.getItemInHand().getTypeId() == 0 && mcPermissions.getInstance().unarmed(attacker))
-				    				PPa.addXP(SkillType.UNARMED, xp*10, attacker);
-			    			}
-			    		}
-		      		}
-		      		
-		      		if(!pluginx.misc.mobSpawnerList.contains(event.getEntity()))
-		      		{
-		      			int xp = getXp(event.getEntity(), event);
-
-						if(m.isSwords(attacker.getItemInHand()) && mcPermissions.getInstance().swords(attacker))
-							PPa.addXP(SkillType.SWORDS, xp*10, attacker);
-						else if(m.isAxes(attacker.getItemInHand()) && mcPermissions.getInstance().axes(attacker))
-							PPa.addXP(SkillType.AXES, xp*10, attacker);
-						else if(attacker.getItemInHand().getTypeId() == 0 && mcPermissions.getInstance().unarmed(attacker))
-							PPa.addXP(SkillType.UNARMED, xp*10, attacker);
-		      		}
-		      		Skills.XpCheckAll(attacker);
-		      		
-		      		if(event.getEntity() instanceof Wolf)
-		      		{
-		      			Wolf theWolf = (Wolf)event.getEntity();
-		      			
-		      			if(attacker.getItemInHand().getTypeId() == 352 && mcPermissions.getInstance().taming(attacker))
-		      			{
-		      				event.setCancelled(true);
-		      				if(theWolf.isTamed())
-		      				{
-		      				attacker.sendMessage(mcLocale.getString("Combat.BeastLore")+" "+
-		      						mcLocale.getString("Combat.BeastLoreOwner", new Object[] {Taming.getOwnerName(theWolf)})+" "+
-		      						mcLocale.getString("Combat.BeastLoreHealthWolfTamed", new Object[] {theWolf.getHealth()}));
-		      				} 
-		      				else
-		      				{
-		      					attacker.sendMessage(mcLocale.getString("Combat.BeastLore")+" "+
-		      							mcLocale.getString("Combat.BeastLoreHealthWolf", new Object[] {theWolf.getHealth()}));
-		      				}
-		      			}
-		      		}
-				}
-			}
-		}
-		
-		/*
-		 * OFFENSIVE CHECKS FOR WOLVES VERSUS ENTITIES
-		 */
-		if(event instanceof EntityDamageByEntityEvent && ((EntityDamageByEntityEvent) event).getDamager() instanceof Wolf)
-		{
-			EntityDamageByEntityEvent eventb = (EntityDamageByEntityEvent) event;
-			Wolf theWolf = (Wolf) eventb.getDamager();
-			if(theWolf.isTamed() && Taming.ownerOnline(theWolf, pluginx))
-			{
-				if(Taming.getOwner(theWolf, pluginx) == null)
-					return;
-				Player master = Taming.getOwner(theWolf, pluginx);
-				PlayerProfile PPo = Users.getProfile(master);
-				
-				if(mcPermissions.getInstance().taming(master))
-				{
-					//Sharpened Claws
-					if(PPo.getSkillLevel(SkillType.TAMING) >= 750)
-					{
-						event.setDamage(event.getDamage() + 2);
-					}
-					
-					//Gore
-					if(Math.random() * 1000 <= PPo.getSkillLevel(SkillType.TAMING))
-					{
-						event.setDamage(event.getDamage() * 2);
-						
-						if(event.getEntity() instanceof Player)
-						{
-							Player target = (Player)event.getEntity();
-							target.sendMessage(mcLocale.getString("Combat.StruckByGore")); //$NON-NLS-1$
-							Users.getProfile(target).setBleedTicks(2);
-						}
-						else
-							pluginx.misc.addToBleedQue((LivingEntity) event.getEntity());
-						
-						master.sendMessage(mcLocale.getString("Combat.Gore")); //$NON-NLS-1$
-					}
-					if(!event.getEntity().isDead() && !pluginx.misc.mobSpawnerList.contains(event.getEntity()))
-					{
-						int xp = getXp(event.getEntity(), event);
-						Users.getProfile(master).addXP(SkillType.TAMING, xp*10, master);
-						
-						if(event.getEntity() instanceof Player)
-						{
-							xp = (event.getDamage() * 2);
-							Users.getProfile(master).addXP(SkillType.TAMING, (int)((xp*10)*1.5), master);
-						}
-						Skills.XpCheckSkill(SkillType.TAMING, master);
-					}
-				}
-			}
-		}
-		//Another offensive check for Archery
-		if(event instanceof EntityDamageByEntityEvent && event.getCause() == DamageCause.PROJECTILE && ((EntityDamageByEntityEvent) event).getDamager() instanceof Arrow)
-			archeryCheck((EntityDamageByEntityEvent)event, pluginx);
-			
-		/*
-		 * DEFENSIVE CHECKS
-		 */
-		if(event instanceof EntityDamageByEntityEvent && event.getEntity() instanceof Player)
-		{
-			Swords.counterAttackChecks((EntityDamageByEntityEvent)event);
-			Acrobatics.dodgeChecks((EntityDamageByEntityEvent)event);
-		}
-		/*
-		 * DEFENSIVE CHECKS FOR WOLVES
-		 */
-		
-		if(event.getEntity() instanceof Wolf)
-		{
-			Wolf theWolf = (Wolf) event.getEntity();
-			
-			if(theWolf.isTamed() && Taming.ownerOnline(theWolf, pluginx))
-			{
-				if(Taming.getOwner(theWolf, pluginx) == null)
-					return;
-				
-				Player master = Taming.getOwner(theWolf, pluginx);
-				PlayerProfile PPo = Users.getProfile(master);
-				if(mcPermissions.getInstance().taming(master))
-				{				
-					//Shock-Proof
-					if((event.getCause() == DamageCause.ENTITY_EXPLOSION || event.getCause() == DamageCause.BLOCK_EXPLOSION) && PPo.getSkillLevel(SkillType.TAMING) >= 500)
-					{
-						event.setDamage(2);
-					}
-					
-					//Thick Fur
-					if(PPo.getSkillLevel(SkillType.TAMING) >= 250)
-						event.setDamage(event.getDamage() / 2);
-				}
-			}
-		}
-	}
-	
-	public static void combatAbilityChecks(Player attacker, PlayerProfile PPa, Plugin pluginx)
-	{
-		//Check to see if any abilities need to be activated
-		if(PPa.getAxePreparationMode())
-			Axes.skullSplitterCheck(attacker);
-		if(PPa.getSwordsPreparationMode())
-			Swords.serratedStrikesActivationCheck(attacker);
-		if(PPa.getFistsPreparationMode())
-			Unarmed.berserkActivationCheck(attacker);
-	}
-	public static void archeryCheck(EntityDamageByEntityEvent event, mcMMO pluginx)
-	{
-		Arrow arrow = (Arrow)event.getDamager();
-    	Entity y = arrow.getShooter();
-    	Entity x = event.getEntity();
-    	if(x instanceof Player)
-    	{
-    		Player defender = (Player)x;
-    		PlayerProfile PPd = Users.getProfile(defender);
-    		if(PPd == null)
-    			Users.addUser(defender);
-    		if(mcPermissions.getInstance().unarmed(defender) && defender.getItemInHand().getTypeId() == 0)
-    		{
-	    		if(defender != null && PPd.getSkillLevel(SkillType.UNARMED) >= 1000)
-	    		{
-	    			if(Math.random() * 1000 <= 500)
-	    			{
-	    				event.setCancelled(true);
-	    				defender.sendMessage(mcLocale.getString("Combat.ArrowDeflect")); //$NON-NLS-1$
-	    				return;
-	    			}
-	    		} else if(defender != null && Math.random() * 1000 <= (PPd.getSkillLevel(SkillType.UNARMED) / 2))
-	    		{
-	    			event.setCancelled(true);
-	    			defender.sendMessage(mcLocale.getString("Combat.ArrowDeflect")); //$NON-NLS-1$
-	    			return;
-	    		}
-    		}
-    	}
-    	/*
-    	 * If attacker is player
-    	 */
-    	if(y instanceof Player)
-    	{
-    		Player attacker = (Player)y;
-    		PlayerProfile PPa = Users.getProfile(attacker);
-    		if(mcPermissions.getInstance().archery(attacker))
-    		{
-    			Archery.trackArrows(pluginx, x, event, attacker);
-    			
-    			/*
-    			 * IGNITION
-    			 */
-    			Archery.ignitionCheck(x, event, attacker);
-    		/*
-    		 * Defender is Monster
-    		 */
-    		if(!pluginx.misc.mobSpawnerList.contains(x))
-    		{
-    			int xp = getXp(event.getEntity(), event);
-				PPa.addXP(SkillType.ARCHERY, xp*10, attacker);
-    		}
-    		/*
-    		 * Attacker is Player
-    		 */
-    		if(x instanceof Player){
-    			Player defender = (Player)x;
-    			PlayerProfile PPd = Users.getProfile(defender);
-    			/*
-    			 * Stuff for the daze proc
-    			 */
-    	    		if(PPa.inParty() && PPd.inParty())
-    	    		{
-    					if(Party.getInstance().inSameParty(defender, attacker))
-    					{
-    						event.setCancelled(true);
-    						return;
-    					}
-    	    		}
-    	    		/*
-    	    		 * PVP XP
-    	    		 */
-    	    		if(LoadProperties.pvpxp && !Party.getInstance().inSameParty(attacker, defender) 
-    	    				&& ((PPd.getLastLogin()+5)*1000) < System.currentTimeMillis() && !attacker.getName().equals(defender.getName()))
-    	    		{
-    	    			int xp = (int) ((event.getDamage() * 2) * 10);
-    	    			PPa.addXP(SkillType.ARCHERY, xp, attacker);
-    	    		}
-    				/*
-    				 * DAZE PROC
-    				 */
-    	    		Archery.dazeCheck(defender, attacker);
-    			}
-    		}
-    		Skills.XpCheckSkill(SkillType.ARCHERY, attacker);
-    	}
-    }
-	
-    /**
-     * Attempt to damage target for value dmg with reason CUSTOM
-     * 
-     * @param target LivingEntity which to attempt to damage
-     * @param dmg Amount of damage to attempt to do
-     */
-    public static void dealDamage(LivingEntity target, int dmg){
-    	dealDamage(target, dmg, EntityDamageEvent.DamageCause.CUSTOM);
-    }
-    
-    /**
-     * Attempt to damage target for value dmg with reason cause
-     * 
-     * @param target LivingEntity which to attempt to damage
-     * @param dmg Amount of damage to attempt to do
-     * @param cause DamageCause to pass to damage event
-     */
-    public static void dealDamage(LivingEntity target, int dmg, DamageCause cause) {
-    	EntityDamageEvent ede = new EntityDamageEvent(target, cause, dmg);
-    	Bukkit.getPluginManager().callEvent(ede);
-    	if(ede.isCancelled()) return;
-    	
-    	target.damage(ede.getDamage());
-    }
-    
-    /**
-     * Attempt to damage target for value dmg with reason ENTITY_ATTACK with damager attacker
-     * 
-     * @param target LivingEntity which to attempt to damage
-     * @param dmg Amount of damage to attempt to do
-     * @param attacker Player to pass to event as damager
-     */
-    public static void dealDamage(LivingEntity target, int dmg, Player attacker) {
-    	EntityDamageEvent ede = new EntityDamageByEntityEvent(attacker, target, EntityDamageEvent.DamageCause.ENTITY_ATTACK, dmg);
-    	Bukkit.getPluginManager().callEvent(ede);
-    	if(ede.isCancelled()) return;
-    	
-    	target.damage(ede.getDamage());
-    }
-    
-    public static boolean pvpAllowed(EntityDamageByEntityEvent event, World world)
-    {
-    	if(!event.getEntity().getWorld().getPVP())
-    		return false;
-    	//If it made it this far, pvp is enabled
-    	return true;
-    }
-    public static int getXp(Entity entity, EntityDamageEvent event)
-    {
-    	int xp = 0;
-    	if(entity instanceof LivingEntity)
-    	{
-    		LivingEntity le = (LivingEntity)entity;
-	    	//Prevent a ridiculous amount of XP being granted by capping it at the remaining health of the entity
-			int hpLeft = le.getHealth(), xpinc = 0;
-				
-			if(hpLeft < event.getDamage())
-            {
-			    if(hpLeft > 0)
-			        xpinc = hpLeft;
-                else
-                    xpinc = 0;
-            } 
-			else
-			    xpinc = event.getDamage();
-			
-	    	if(entity instanceof Animals)
-	    	{
-		    	xp = (int) (xpinc * 1);
-	    	} else
-	    	{
-	    		if(entity instanceof Enderman)
-					xp = (xpinc * 2);
-		    	else if(entity instanceof Creeper)
-					xp = (xpinc * 4);
-		    	else if(entity instanceof Silverfish)
-					xp = (xpinc * 3);
-		    	else if(entity instanceof CaveSpider)
-					xp = (xpinc * 3);
-		    	else if(entity instanceof Spider)
-					xp = (xpinc * 3);
-		    	else if(entity instanceof Skeleton)
-					xp = (xpinc * 2);
-		    	else if(entity instanceof Zombie)
-					xp = (xpinc * 2);
-		    	else if(entity instanceof PigZombie)
-					xp = (xpinc * 3);
-		    	else if(entity instanceof Slime)
-					xp = (xpinc * 2);
-		    	else if(entity instanceof Ghast)
-					xp = (xpinc * 3);
-		    	else if(entity instanceof Blaze)
-		    		xp = (xpinc * 3);
-		    	else if(entity instanceof EnderDragon)
-		    		xp = (xpinc * 8);
-		    	else if(entity instanceof MagmaCube)
-					xp = (xpinc * 2);
-	    	}
-    	}
-    	return xp;
-    }
-}

src/main/java/com/gmail/nossr50/Database.java

@@ -1,211 +0,0 @@
-/*
-	This file is part of mcMMO.
-
-    mcMMO is free software: you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    mcMMO is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with mcMMO.  If not, see <http://www.gnu.org/licenses/>.
-*/
-package com.gmail.nossr50;
-
-import java.sql.Connection;
-import java.sql.DriverManager;
-import java.sql.ResultSet;
-import java.sql.SQLException;
-import java.util.HashMap;
-import java.util.ArrayList;
-import java.sql.PreparedStatement;
-
-import com.gmail.nossr50.config.LoadProperties;
-
-public class Database {
-
-	private mcMMO plugin;
-	private String connectionString;
-
-	public Database(mcMMO instance) {
-		this.plugin = instance;
-		this.connectionString = "jdbc:mysql://" + LoadProperties.MySQLserverName + ":" + LoadProperties.MySQLport + "/" + LoadProperties.MySQLdbName + "?user=" + LoadProperties.MySQLuserName + "&password=" + LoadProperties.MySQLdbPass;
-		// Load the driver instance
-		try {
-			Class.forName("com.mysql.jdbc.Driver");
-			DriverManager.getConnection(connectionString);
-		} catch (ClassNotFoundException e) {
-			plugin.getServer().getLogger().warning(e.getLocalizedMessage());
-		} catch (SQLException e) {
-			plugin.getServer().getLogger().warning(e.getLocalizedMessage());
-			System.out.println("SQLException: " + e.getMessage());
-			System.out.println("SQLState: " + e.getSQLState());
-			System.out.println("VendorError: " + e.getErrorCode());
-		}
-	}
-	//Create the DB structure
-	public void createStructure() {
-		Write("CREATE TABLE IF NOT EXISTS `" + LoadProperties.MySQLtablePrefix + "huds` (`user_id` int(10) unsigned NOT NULL,"
-				+ "`hudtype` varchar(50) NOT NULL DEFAULT '',"
-				+ "PRIMARY KEY (`user_id`)) ENGINE=MyISAM DEFAULT CHARSET=latin1;");
-		Write("CREATE TABLE IF NOT EXISTS `" + LoadProperties.MySQLtablePrefix + "users` (`id` int(10) unsigned NOT NULL AUTO_INCREMENT,"
-				+ "`user` varchar(40) NOT NULL,"
-				+ "`lastlogin` int(32) unsigned NOT NULL,"
-				+ "`party` varchar(100) NOT NULL DEFAULT '',"
-				+ "PRIMARY KEY (`id`),"
-				+ "UNIQUE KEY `user` (`user`)) ENGINE=MyISAM  DEFAULT CHARSET=latin1 AUTO_INCREMENT=1;");
-		Write("CREATE TABLE IF NOT EXISTS `" + LoadProperties.MySQLtablePrefix + "cooldowns` (`user_id` int(10) unsigned NOT NULL,"
-				+ "`taming` int(32) unsigned NOT NULL DEFAULT '0',"
-				+ "`mining` int(32) unsigned NOT NULL DEFAULT '0',"
-				+ "`woodcutting` int(32) unsigned NOT NULL DEFAULT '0',"
-				+ "`repair` int(32) unsigned NOT NULL DEFAULT '0',"
-				+ "`unarmed` int(32) unsigned NOT NULL DEFAULT '0',"
-				+ "`herbalism` int(32) unsigned NOT NULL DEFAULT '0',"
-				+ "`excavation` int(32) unsigned NOT NULL DEFAULT '0',"
-				+ "`archery` int(32) unsigned NOT NULL DEFAULT '0',"
-				+ "`swords` int(32) unsigned NOT NULL DEFAULT '0',"
-				+ "`axes` int(32) unsigned NOT NULL DEFAULT '0',"
-				+ "`acrobatics` int(32) unsigned NOT NULL DEFAULT '0',"
-				+ "PRIMARY KEY (`user_id`)) ENGINE=MyISAM DEFAULT CHARSET=latin1;");
-		Write("CREATE TABLE IF NOT EXISTS `" + LoadProperties.MySQLtablePrefix + "skills` (`user_id` int(10) unsigned NOT NULL,"
-				+ "`taming` int(10) unsigned NOT NULL DEFAULT '0',"
-				+ "`mining` int(10) unsigned NOT NULL DEFAULT '0',"
-				+ "`woodcutting` int(10) unsigned NOT NULL DEFAULT '0',"
-				+ "`repair` int(10) unsigned NOT NULL DEFAULT '0',"
-				+ "`unarmed` int(10) unsigned NOT NULL DEFAULT '0',"
-				+ "`herbalism` int(10) unsigned NOT NULL DEFAULT '0',"
-				+ "`excavation` int(10) unsigned NOT NULL DEFAULT '0',"
-				+ "`archery` int(10) unsigned NOT NULL DEFAULT '0',"
-				+ "`swords` int(10) unsigned NOT NULL DEFAULT '0',"
-				+ "`axes` int(10) unsigned NOT NULL DEFAULT '0',"
-				+ "`acrobatics` int(10) unsigned NOT NULL DEFAULT '0',"
-				+ "PRIMARY KEY (`user_id`)) ENGINE=MyISAM DEFAULT CHARSET=latin1;");
-		Write("CREATE TABLE IF NOT EXISTS `" + LoadProperties.MySQLtablePrefix + "experience` (`user_id` int(10) unsigned NOT NULL,"
-				+ "`taming` int(10) unsigned NOT NULL DEFAULT '0',"
-				+ "`mining` int(10) unsigned NOT NULL DEFAULT '0',"
-				+ "`woodcutting` int(10) unsigned NOT NULL DEFAULT '0',"
-				+ "`repair` int(10) unsigned NOT NULL DEFAULT '0',"
-				+ "`unarmed` int(10) unsigned NOT NULL DEFAULT '0',"
-				+ "`herbalism` int(10) unsigned NOT NULL DEFAULT '0',"
-				+ "`excavation` int(10) unsigned NOT NULL DEFAULT '0',"
-				+ "`archery` int(10) unsigned NOT NULL DEFAULT '0',"
-				+ "`swords` int(10) unsigned NOT NULL DEFAULT '0',"
-				+ "`axes` int(10) unsigned NOT NULL DEFAULT '0',"
-				+ "`acrobatics` int(10) unsigned NOT NULL DEFAULT '0',"
-				+ "PRIMARY KEY (`user_id`)) ENGINE=MyISAM DEFAULT CHARSET=latin1;");
-		Write("CREATE TABLE IF NOT EXISTS `" + LoadProperties.MySQLtablePrefix + "spawn` (`user_id` int(10) NOT NULL,"
-				+ "`x` int(64) NOT NULL DEFAULT '0',"
-				+ "`y` int(64) NOT NULL DEFAULT '0',"
-				+ "`z` int(64) NOT NULL DEFAULT '0',"
-				+ "`world` varchar(50) NOT NULL DEFAULT '',"
-				+ "PRIMARY KEY (`user_id`)) ENGINE=MyISAM DEFAULT CHARSET=latin1;");
-		
-		Write("DROP TABLE IF EXISTS `"+LoadProperties.MySQLtablePrefix+"skills2`");
-		Write("DROP TABLE IF EXISTS `"+LoadProperties.MySQLtablePrefix+"experience2`");
-		
-		checkDatabaseStructure();
-	}
-
-	public void checkDatabaseStructure()
-	{
-		String sql = "SELECT * FROM  `mcmmo_experience` ORDER BY  `"+LoadProperties.MySQLtablePrefix+"experience`.`fishing` ASC LIMIT 0 , 30";
-		
-		ResultSet rs = null;
-		HashMap<Integer, ArrayList<String>> Rows = new HashMap<Integer, ArrayList<String>>();
-		try {
-			Connection conn = DriverManager.getConnection(connectionString);
-			PreparedStatement stmt = conn.prepareStatement(sql);
-			if (stmt.executeQuery() != null) {
-				stmt.executeQuery();
-				rs = stmt.getResultSet();
-				while (rs.next()) {
-					ArrayList<String> Col = new ArrayList<String>();
-					for (int i = 1; i <= rs.getMetaData().getColumnCount(); i++) {
-						Col.add(rs.getString(i));
-					}
-					Rows.put(rs.getRow(), Col);
-				}
-			}
-			conn.close();
-		} catch (SQLException ex) {
-			System.out.println("Updating mcMMO MySQL tables...");
-			Write("ALTER TABLE `"+LoadProperties.MySQLtablePrefix + "skills` ADD `fishing` int(10) NOT NULL DEFAULT '0' ;");
-			Write("ALTER TABLE `"+LoadProperties.MySQLtablePrefix + "experience` ADD `fishing` int(10) NOT NULL DEFAULT '0' ;");
-		}
-	}
-	
-	// write query
-	public boolean Write(String sql) {
-		try {
-			Connection conn = DriverManager.getConnection(connectionString);
-			PreparedStatement stmt = conn.prepareStatement(sql);
-			stmt.executeUpdate();
-			conn.close();
-			return true;
-		} catch (SQLException ex) {
-			System.out.println("SQLException: " + ex.getMessage());
-			System.out.println("SQLState: " + ex.getSQLState());
-			System.out.println("VendorError: " + ex.getErrorCode());
-			return false;
-		}
-	}
-
-	// Get Int
-	// only return first row / first field
-	public Integer GetInt(String sql) {
-		ResultSet rs = null;
-		Integer result = 0;
-		try {
-			Connection conn = DriverManager.getConnection(connectionString);
-			PreparedStatement stmt = conn.prepareStatement(sql);
-			stmt = conn.prepareStatement(sql);
-			if (stmt.executeQuery() != null) {
-				stmt.executeQuery();
-				rs = stmt.getResultSet();
-				if (rs.next()) {
-					result = rs.getInt(1);
-				} else {
-					result = 0;
-				}
-			}
-			conn.close();
-		} catch (SQLException ex) {
-			System.out.println("SQLException: " + ex.getMessage());
-			System.out.println("SQLState: " + ex.getSQLState());
-			System.out.println("VendorError: " + ex.getErrorCode());
-		}
-
-		return result;
-	}
-
-	// read query
-	public HashMap<Integer, ArrayList<String>> Read(String sql) {
-		ResultSet rs = null;
-		HashMap<Integer, ArrayList<String>> Rows = new HashMap<Integer, ArrayList<String>>();
-		try {
-			Connection conn = DriverManager.getConnection(connectionString);
-			PreparedStatement stmt = conn.prepareStatement(sql);
-			if (stmt.executeQuery() != null) {
-				stmt.executeQuery();
-				rs = stmt.getResultSet();
-				while (rs.next()) {
-					ArrayList<String> Col = new ArrayList<String>();
-					for (int i = 1; i <= rs.getMetaData().getColumnCount(); i++) {
-						Col.add(rs.getString(i));
-					}
-					Rows.put(rs.getRow(), Col);
-				}
-			}
-			conn.close();
-		} catch (SQLException ex) {
-			System.out.println("SQLException: " + ex.getMessage());
-			System.out.println("SQLState: " + ex.getSQLState());
-			System.out.println("VendorError: " + ex.getErrorCode());
-		}
-		return Rows;
-	}
-}

src/main/java/com/gmail/nossr50/Item.java

@@ -1,104 +0,0 @@
-/*
-	This file is part of mcMMO.
-
-    mcMMO is free software: you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    mcMMO is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with mcMMO.  If not, see <http://www.gnu.org/licenses/>.
-*/
-package com.gmail.nossr50;
-
-import org.bukkit.Location;
-import org.bukkit.Material;
-import org.bukkit.block.Block;
-import org.bukkit.entity.Player;
-import org.bukkit.inventory.ItemStack;
-import org.bukkit.plugin.Plugin;
-import com.gmail.nossr50.config.*;
-import com.gmail.nossr50.locale.mcLocale;
-import com.gmail.nossr50.skills.*;
-
-import com.gmail.nossr50.datatypes.PlayerProfile;
-
-public class Item {
-	
-	public static void itemchecks(Player player, Plugin plugin)
-	{
-		ItemStack inhand = player.getItemInHand();
-		if(LoadProperties.chimaeraWingEnable && inhand.getTypeId() == LoadProperties.chimaeraId)
-		{
-			chimaerawing(player, plugin);
-		}
-	}
-	
-	@SuppressWarnings("deprecation")
-	public static void chimaerawing(Player player, Plugin plugin)
-	{
-		PlayerProfile PP = Users.getProfile(player);
-		ItemStack is = player.getItemInHand();
-		Block block = player.getLocation().getBlock();
-		if(mcPermissions.getInstance().chimaeraWing(player) && is.getTypeId() == LoadProperties.chimaeraId)
-		{
-    		if(Skills.cooldownOver(player, PP.getRecentlyHurt(), 60) && is.getAmount() >= LoadProperties.feathersConsumedByChimaeraWing)
-    		{
-    			Block derp = player.getLocation().getBlock();
-    			int y = derp.getY();
-    			ItemStack[] inventory = player.getInventory().getContents();
-    	    	for(ItemStack x : inventory){
-    	    		if(x != null && x.getTypeId() == LoadProperties.chimaeraId){
-    	    			if(x.getAmount() >= LoadProperties.feathersConsumedByChimaeraWing + 1)
-    	    			{
-    	    				x.setAmount(x.getAmount() - LoadProperties.feathersConsumedByChimaeraWing);
-    	    				player.getInventory().setContents(inventory);
-        	    			player.updateInventory();
-        	    			break;
-    	    			} else {
-    	    				x.setAmount(0);
-    	    				x.setTypeId(0);
-    	    				player.getInventory().setContents(inventory);
-        	    			player.updateInventory();
-        	    			break;
-    	    			}
-    	    		}
-    	    	}
-    			while(y < 127)
-    			{
-    				y++;
-    				if(player != null)
-    				{
-    					if(player.getLocation().getWorld().getBlockAt(block.getX(), y, block.getZ()).getType() != Material.AIR)
-    					{
-	    					player.sendMessage(mcLocale.getString("Item.ChimaeraWingFail")); //$NON-NLS-1$
-	    					player.teleport(player.getLocation().getWorld().getBlockAt(block.getX(), (y - 1), block.getZ()).getLocation());
-	    					return;
-    					}
-    				}
-    			}
-    			if(PP.getMySpawn(player) != null)
-    			{
-    				Location mySpawn = PP.getMySpawn(player);
-    				if(mySpawn != null){
-	    				player.teleport(mySpawn); //Do it twice to prevent weird stuff
-	    				player.teleport(mySpawn);
-    				}
-    			} else {
-    				player.teleport(player.getWorld().getSpawnLocation());
-    			}
-    			player.sendMessage(mcLocale.getString("Item.ChimaeraWingPass")); //$NON-NLS-1$
-    		} else if (!Skills.cooldownOver(player, PP.getRecentlyHurt(), 60) && is.getAmount() >= 10) 
-    		{
-    			player.sendMessage(mcLocale.getString("Item.InjuredWait", new Object[] {Skills.calculateTimeLeft(player, PP.getRecentlyHurt(), 60)})); //$NON-NLS-1$
-    		} else if (is.getTypeId() == LoadProperties.chimaeraId && is.getAmount() <= 9){
-    			player.sendMessage(mcLocale.getString("Item.NeedFeathers")); //$NON-NLS-1$
-    		}
-    	}
-	}
-}

src/main/java/com/gmail/nossr50/Leaderboard.java

@@ -1,279 +0,0 @@
-/*
-	This file is part of mcMMO.
-
-    mcMMO is free software: you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    mcMMO is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with mcMMO.  If not, see <http://www.gnu.org/licenses/>.
-*/
-package com.gmail.nossr50;
-
-import java.io.BufferedReader;
-import java.io.File;
-import java.io.FileReader;
-import java.io.FileWriter;
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.logging.Level;
-import java.util.logging.Logger;
-
-import com.gmail.nossr50.config.LoadProperties;
-import com.gmail.nossr50.datatypes.PlayerStat;
-import com.gmail.nossr50.datatypes.SkillType;
-import com.gmail.nossr50.datatypes.Tree;
-
-public class Leaderboard 
-{
-	static String location = "plugins/mcMMO/FlatFileStuff/mcmmo.users"; //$NON-NLS-1$
-	protected static final Logger log = Logger.getLogger("Minecraft"); //$NON-NLS-1$
-	
-	/*
-	 * Read from the file
-	 */
-	public static void makeLeaderboards()
-	{
-		//Make Trees
-		Tree Mining = new Tree();
-		Tree WoodCutting = new Tree();
-		Tree Herbalism = new Tree();
-		Tree Excavation = new Tree();
-		Tree Acrobatics = new Tree();
-		Tree Repair = new Tree();
-		Tree Swords = new Tree();
-		Tree Axes = new Tree();
-		Tree Archery = new Tree();
-		Tree Unarmed = new Tree();
-		Tree Taming = new Tree();
-		Tree Fishing = new Tree();
-		Tree Enchanting = new Tree();
-		Tree Alchemy = new Tree();
-		Tree PowerLevel = new Tree();
-		
-		//Add Data To Trees
-		try {
-        	//Open the user file
-        	FileReader file = new FileReader(location);
-        	BufferedReader in = new BufferedReader(file);
-        	String line = ""; //$NON-NLS-1$
-        	ArrayList<String> players = new ArrayList<String>();
-        	while((line = in.readLine()) != null)
-        	{
-        		String[] character = line.split(":"); //$NON-NLS-1$
-        		String p = character[0];
-        		
-        		//Prevent the same player from being added multiple times
-        		if(players.contains(p))
-        			continue;
-        		else
-        			players.add(p);
-
-    			int Plvl = 0;
-    			
-    			if(character.length > 1 && m.isInt(character[1]))
-    			{
-    				Mining.add(p, Integer.valueOf(character[1]));
-    				Plvl += Integer.valueOf(character[1]);
-    			}
-    			if(character.length > 5 && m.isInt(character[5])){
-    				WoodCutting.add(p, Integer.valueOf(character[5]));
-    				Plvl += Integer.valueOf(character[5]);
-    			}
-    			if(character.length > 7 && m.isInt(character[7])){
-    				Repair.add(p, Integer.valueOf(character[7]));
-    				Plvl += Integer.valueOf(character[7]);
-    			}
-    			if(character.length > 8 && m.isInt(character[8])){
-    				Unarmed.add(p, Integer.valueOf(character[8]));
-    				Plvl += Integer.valueOf(character[8]);
-    			}
-    			if(character.length > 9 && m.isInt(character[9])){
-    				Herbalism.add(p, Integer.valueOf(character[9]));
-    				Plvl += Integer.valueOf(character[9]);
-    			}
-    			if(character.length > 10 && m.isInt(character[10])){
-    				Excavation.add(p, Integer.valueOf(character[10]));
-    				Plvl += Integer.valueOf(character[10]);
-    			}
-    			if(character.length > 11 && m.isInt(character[11])){
-    				Archery.add(p, Integer.valueOf(character[11]));
-    				Plvl += Integer.valueOf(character[11]);
-    			}
-    			if(character.length > 12 && m.isInt(character[12])){
-    				Swords.add(p, Integer.valueOf(character[12]));
-    				Plvl += Integer.valueOf(character[12]);
-    			}
-    			if(character.length > 13 && m.isInt(character[13])){
-    				Axes.add(p, Integer.valueOf(character[13]));
-    				Plvl += Integer.valueOf(character[13]);
-    			}
-    			if(character.length > 14 && m.isInt(character[14])){
-    				Acrobatics.add(p, Integer.valueOf(character[14]));
-    				Plvl += Integer.valueOf(character[14]);
-    			}
-    			if(character.length > 24 && m.isInt(character[24])){
-    				Taming.add(p, Integer.valueOf(character[24]));
-    				Plvl += Integer.valueOf(character[24]);
-    			}
-    			if(character.length > 34 && m.isInt(character[34]))
-    			{
-    				Fishing.add(p, Integer.valueOf(character[34]));
-    				Plvl += Integer.valueOf(character[34]);
-    			}
-    			
-    			PowerLevel.add(p, Plvl);
-        	}
-        	in.close();
-        } catch (Exception e) {
-            log.log(Level.SEVERE, "Exception while reading " //$NON-NLS-1$
-            		+ location + " (Are you sure you formatted it correctly?)", e); //$NON-NLS-1$
-        }
-        //Write the leader board files
-        leaderWrite(Mining.inOrder(), SkillType.MINING); //$NON-NLS-1$
-        leaderWrite(WoodCutting.inOrder(), SkillType.WOODCUTTING); //$NON-NLS-1$
-        leaderWrite(Repair.inOrder(), SkillType.REPAIR); //$NON-NLS-1$
-        leaderWrite(Unarmed.inOrder(), SkillType.UNARMED); //$NON-NLS-1$
-        leaderWrite(Herbalism.inOrder(), SkillType.HERBALISM); //$NON-NLS-1$
-        leaderWrite(Excavation.inOrder(), SkillType.EXCAVATION); //$NON-NLS-1$
-        leaderWrite(Archery.inOrder(), SkillType.ARCHERY); //$NON-NLS-1$
-        leaderWrite(Swords.inOrder(), SkillType.SWORDS); //$NON-NLS-1$
-        leaderWrite(Axes.inOrder(), SkillType.AXES); //$NON-NLS-1$
-        leaderWrite(Acrobatics.inOrder(), SkillType.ACROBATICS); //$NON-NLS-1$
-        leaderWrite(Taming.inOrder(), SkillType.TAMING); //$NON-NLS-1$
-        leaderWrite(Fishing.inOrder(), SkillType.FISHING); //$NON-NLS-1$
-        leaderWrite(Alchemy.inOrder(), SkillType.ALCHEMY); //$NON-NLS-1$
-        leaderWrite(Enchanting.inOrder(), SkillType.ENCHANTING); //$NON-NLS-1$
-        leaderWrite(PowerLevel.inOrder(), SkillType.ALL); //$NON-NLS-1$
-	}
-	public static void leaderWrite(PlayerStat[] ps, SkillType skillType)
-	{
-		String theLocation = "plugins/mcMMO/FlatFileStuff/Leaderboards/" + skillType + ".mcmmo"; //$NON-NLS-1$ //$NON-NLS-2$
-		//CHECK IF THE FILE EXISTS
-		File theDir = new File(theLocation);
-		if(!theDir.exists())
-		{
-			//properties = new PropertiesFile(location);
-			FileWriter writer = null;
-			try {
-				writer = new FileWriter(theLocation);
-			} catch (Exception e) {
-				log.log(Level.SEVERE, "Exception while creating " + theLocation, e); //$NON-NLS-1$
-			} finally {
-				try {
-					if (writer != null) {
-						writer.close();
-					}
-				} catch (IOException e) {
-					log.log(Level.SEVERE, "Exception while closing writer for " + theLocation, e); //$NON-NLS-1$
-				}
-			}
-		} else {
-			try {
-	        	FileReader file = new FileReader(theLocation);
-	
-	    		//HERP
-	            BufferedReader in = new BufferedReader(file);
-	            StringBuilder writer = new StringBuilder();
-	            
-	        	for(PlayerStat p : ps)
-	        	{
-	        		if(p.name.equals("$mcMMO_DummyInfo")) //$NON-NLS-1$
-	        			continue;
-	        		if(p.statVal == 0)
-	        			continue;
-	        		writer.append(p.name + ":" + p.statVal); //$NON-NLS-1$
-	        		writer.append("\r\n");  //$NON-NLS-1$
-	        	}
-	        	
-	        	in.close();
-	        	//Write the new file
-	            FileWriter out = new FileWriter(theLocation);
-	            out.write(writer.toString());
-	            out.close();
-	        } catch (Exception e) {
-	                log.log(Level.SEVERE, "Exception while writing to " + theLocation + " (Are you sure you formatted it correctly?)", e); //$NON-NLS-1$ //$NON-NLS-2$
-	        }
-		}
-		//Create/open the file
-		//Loop through backward writing each player
-		//Close the file
-	}
-	
-	public static String[] retrieveInfo(String skillName, int pagenumber)
-	{
-		String theLocation = "plugins/mcMMO/FlatFileStuff/Leaderboards/" + skillName + ".mcmmo"; //$NON-NLS-1$ //$NON-NLS-2$
-		try {
-        	FileReader file = new FileReader(theLocation);
-        	BufferedReader in = new BufferedReader(file);
-        	
-        	int destination = (pagenumber - 1) * 10; //How many lines to skip through
-        	int x = 0; //how many lines we've gone through
-        	int y = 0; //going through the lines
-        	String line = ""; //$NON-NLS-1$
-        	String[] info = new String[10]; //what to return
-        	while((line = in.readLine()) != null && y < 10)
-        	{
-        		x++;
-        		if(x >= destination && y < 10){
-        			info[y] = line.toString();
-        			y++;
-        		}
-        	}
-        	in.close();
-        	return info;
-        } catch (Exception e) {
-            log.log(Level.SEVERE, "Exception while reading " //$NON-NLS-1$
-            		+ theLocation + " (Are you sure you formatted it correctly?)", e); //$NON-NLS-1$
-        }
-        return null; //Shouldn't get here
-	}
-	public static void updateLeaderboard(PlayerStat ps, SkillType skillType)
-	{
-		if(LoadProperties.useMySQL)
-			return;
-		String theLocation = "plugins/mcMMO/FlatFileStuff/Leaderboards/" + skillType + ".mcmmo"; //$NON-NLS-1$ //$NON-NLS-2$
-		try {
-        	//Open the file
-        	FileReader file = new FileReader(theLocation);
-            BufferedReader in = new BufferedReader(file);
-            StringBuilder writer = new StringBuilder();
-        	String line = ""; //$NON-NLS-1$
-        	Boolean inserted = false;
-        	//While not at the end of the file
-        	while((line = in.readLine()) != null)
-        	{
-        		//Insert the player into the line before it finds a smaller one
-        		if(Integer.valueOf(line.split(":")[1]) < ps.statVal && !inserted) //$NON-NLS-1$
-        		{
-        			writer.append(ps.name + ":" + ps.statVal).append("\r\n"); //$NON-NLS-1$ //$NON-NLS-2$
-        			inserted = true;
-        		}
-        		//Write anything that isn't the player already in the file so we remove the duplicate
-        		if(!line.split(":")[0].equalsIgnoreCase(ps.name)) //$NON-NLS-1$
-        		{
-                    writer.append(line).append("\r\n"); //$NON-NLS-1$
-        		}
-        	}
-        	
-        	if(!inserted)
-        	{
-    			writer.append(ps.name + ":" + ps.statVal).append("\r\n"); //$NON-NLS-1$ //$NON-NLS-2$
-        	}
-        	
-        	in.close();
-        	//Write the new file
-            FileWriter out = new FileWriter(theLocation);
-            out.write(writer.toString());
-            out.close();
-        } catch (Exception e) {
-                log.log(Level.SEVERE, "Exception while writing to " + theLocation + " (Are you sure you formatted it correctly?)", e); //$NON-NLS-1$ //$NON-NLS-2$
-        }
-	}
-}

src/main/java/com/gmail/nossr50/Users.java

@@ -1,112 +0,0 @@
-/*
-	This file is part of mcMMO.
-
-    mcMMO is free software: you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    mcMMO is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with mcMMO.  If not, see <http://www.gnu.org/licenses/>.
-*/
-package com.gmail.nossr50;
-
-import java.io.*;
-import java.util.Properties;
-import java.util.logging.Logger;
-import java.util.HashMap;
-
-import org.bukkit.entity.*;
-import com.gmail.nossr50.datatypes.PlayerProfile;
-
-
-public class Users {
-    private static volatile Users instance;
-    protected static final Logger log = Logger.getLogger("Minecraft");
-    String location = "plugins/mcMMO/FlatFileStuff/mcmmo.users";
-    String directory = "plugins/mcMMO/FlatFileStuff/";
-    String directoryb = "plugins/mcMMO/FlatFileStuff/Leaderboards/";
-    
-    //public static ArrayList<PlayerProfile> players;
-    public static HashMap<Player, PlayerProfile> players = new HashMap<Player, PlayerProfile>();
-    private Properties properties = new Properties();
-    
-    //To load
-    public void load() throws IOException {
-        properties.load(new FileInputStream(location));
-    }
-    //To save
-    public void save() 
-    {
-        try 
-        {
-	        properties.store(new FileOutputStream(location), null);
-	        }catch(IOException ex) {
-	        }
-    }
-    
-    public void loadUsers()
-    {
-    	new File(directory).mkdir();
-    	new File(directoryb).mkdir();
-        File theDir = new File(location);
-		if(!theDir.exists())
-		{
-			try {
-				FileWriter writer = new FileWriter(theDir);
-				writer.close();
-			} catch (IOException e) {
-				// TODO Auto-generated catch block
-				e.printStackTrace();
-			}
-		}
-    }
-
-	
-    public static void addUser(Player player)
-    {
-    	players.put(player, new PlayerProfile(player));
-    }
-    public static void clearUsers()
-    {
-    	players.clear();
-    }
-    public static HashMap<Player, PlayerProfile> getProfiles(){
-    	return players;
-    }
-    
-    public static void removeUser(Player player)
-    {    	
-    	PlayerProfile PP = Users.getProfile(player);
-    	
-    	if(PP != null)
-    	{
-	    	PP.save();
-	    	if(players.containsKey(player))
-	    		players.remove(player);
-    	}
-    }
-
-    public static PlayerProfile getProfile(Player player){
-    	if(players.get(player) != null)
-    		return players.get(player);
-    	else
-    	{
-    		players.put(player, new PlayerProfile(player));
-    		return players.get(player);
-    	}
-    }
-    
-    public static Users getInstance() {
-		if (instance == null) {
-			instance = new Users();
-		}
-		return instance;
-	}
-
-}

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

@@ -0,0 +1,71 @@
+package com.gmail.nossr50.api;
+
+import org.bukkit.ChatColor;
+import org.bukkit.entity.Player;
+
+import com.gmail.nossr50.mcMMO;
+import com.gmail.nossr50.events.chat.McMMOAdminChatEvent;
+import com.gmail.nossr50.events.chat.McMMOPartyChatEvent;
+import com.gmail.nossr50.util.Permissions;
+import com.gmail.nossr50.util.Users;
+
+public final class ChatAPI {
+
+    private ChatAPI() {}
+
+    /**
+     * Send a message to all members of a party
+     * </br>
+     * This function is designed for API usage.
+     *
+     * @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
+     */
+    public static void sendPartyChat(String sender, String party, String message) {
+        McMMOPartyChatEvent chatEvent = new McMMOPartyChatEvent(sender, party, message);
+        mcMMO.p.getServer().getPluginManager().callEvent(chatEvent);
+
+        if (chatEvent.isCancelled()) {
+            return;
+        }
+
+        String pPrefix = ChatColor.GREEN + "(" + ChatColor.WHITE + chatEvent.getSender() + ChatColor.GREEN + ") ";
+
+        mcMMO.p.getLogger().info("[P](" + chatEvent.getParty() + ")" + "<" + chatEvent.getSender() + "> " + chatEvent.getMessage());
+
+        for (Player player : mcMMO.p.getServer().getOnlinePlayers()) {
+            if (Users.getProfile(player).inParty()) {
+                if (Users.getProfile(player).getParty().getName().equalsIgnoreCase(chatEvent.getParty())) {
+                    player.sendMessage(pPrefix + chatEvent.getMessage());
+                }
+            }
+        }
+    }
+
+    /**
+     * Send a message to administrators
+     * </br>
+     * This function is designed for API usage.
+     *
+     * @param sender The name of the sender to display in the chat
+     * @param message The message to send
+     */
+    public static void sendAdminChat(String sender, String message) {
+        McMMOAdminChatEvent chatEvent = new McMMOAdminChatEvent(sender, message);
+        mcMMO.p.getServer().getPluginManager().callEvent(chatEvent);
+
+        if (chatEvent.isCancelled()) {
+            return;
+        }
+
+        String aPrefix = ChatColor.AQUA + "{" + ChatColor.WHITE + chatEvent.getSender() + ChatColor.AQUA + "} ";
+
+        mcMMO.p.getLogger().info("[A]<" + chatEvent.getSender() + "> " + chatEvent.getMessage());
+
+        for (Player player : mcMMO.p.getServer().getOnlinePlayers()) {
+            if (Permissions.getInstance().adminChat(player) || player.isOp())
+                player.sendMessage(aPrefix + chatEvent.getMessage());
+        }
+    }
+}

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

@@ -0,0 +1,138 @@
+package com.gmail.nossr50.api;
+
+import org.bukkit.entity.Player;
+
+import com.gmail.nossr50.datatypes.SkillType;
+import com.gmail.nossr50.util.Skills;
+import com.gmail.nossr50.util.Users;
+
+public final class ExperienceAPI {
+
+    private ExperienceAPI() {}
+
+    /**
+     * Check the XP of a player. This should be called after giving XP to process level-ups.
+     *
+     * @param player The player to check
+     * @param skillType The skill to check
+     */
+    private static void checkXP(Player player, SkillType skillType) {
+        if (skillType.equals(SkillType.ALL)) {
+            Skills.xpCheckAll(player, Users.getProfile(player));
+        }
+        else {
+            Skills.xpCheckSkill(skillType, player, Users.getProfile(player));
+        }
+    }
+
+    /**
+     * Adds XP to the player, doesn't calculate for XP Rate or other modifiers.
+     * </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
+     */
+    public static void addRawXP(Player player, SkillType skillType, int XP) {
+        Users.getProfile(player).addXPOverride(skillType, XP);
+        checkXP(player, skillType);
+    }
+
+    /**
+     * Adds XP to the player, calculates for XP Rate but not skill modifiers.
+     * </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
+     */
+    public static void addMultipliedXP(Player player, SkillType skillType, int XP) {
+        Users.getProfile(player).addXPOverrideBonus(skillType, XP);
+        checkXP(player, skillType);
+    }
+
+    /**
+     * Adds XP to the player, calculates for XP Rate and skill modifiers.
+     * </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
+     */
+    public static void addXP(Player player, SkillType skillType, int XP) {
+        Users.getProfile(player).addXP(skillType, XP);
+        checkXP(player, skillType);
+    }
+
+    /**
+     * 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
+     */
+    public static int getXP(Player player, SkillType skillType) {
+        return Users.getProfile(player).getSkillXpLevel(skillType);
+    }
+
+    /**
+     * 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 amount of XP left before leveling up a specifc skill
+     */
+    public static int getXPToNextLevel(Player player, SkillType skillType) {
+        return Users.getProfile(player).getXpToLevel(skillType);
+    }
+
+    /**
+     * 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
+     * @param notify True if this should fire a level up notification, false otherwise.
+     */
+    public static void addLevel(Player player, SkillType skillType, int levels, boolean notify) {
+        Users.getProfile(player).addLevels(skillType, levels);
+
+        if (notify) {
+            checkXP(player, skillType);
+        }
+    }
+
+    /**
+     * Get the level a player has in a specific skill.
+     * </br>
+     * This function is designed for API usage.
+     *
+     * @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
+     */
+    public static int getLevel(Player player, SkillType skillType) {
+        return Users.getProfile(player).getSkillLevel(skillType);
+    }
+
+    /**
+     * Gets the power level of a player.
+     * </br>
+     * This function is designed for API usage.
+     *
+     * @param player The player to get the power level for
+     * @return the power level of the player
+     */
+    public static int getPowerLevel(Player player) {
+        return Users.getProfile(player).getPowerLevel();
+    }
+}

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

@@ -0,0 +1,145 @@
+package com.gmail.nossr50.api;
+
+import java.util.List;
+
+import org.bukkit.entity.Player;
+
+import com.gmail.nossr50.party.Party;
+import com.gmail.nossr50.party.PartyManager;
+import com.gmail.nossr50.util.Users;
+
+public final class PartyAPI {
+
+    private PartyAPI() {}
+
+    /**
+     * Get the name of the party a player is in.
+     * </br>
+     * 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
+     */
+    public static String getPartyName(Player player) {
+        return Users.getProfile(player).getParty().getName();
+    }
+
+    /**
+     * Checks if a player is in a party.
+     * </br>
+     * This function is designed for API usage.
+     *
+     * @param player The player to check
+     * @return true if the player is in a party, false otherwise
+     */
+    public static boolean inParty(Player player) {
+        return Users.getProfile(player).inParty();
+    }
+
+    /**
+     * Check if two players are in the same party.
+     * </br>
+     * This function is designed for API usage.
+     *
+     * @param playera The first player to check
+     * @param playerb The second player to check
+     * @return true if the two players are in the same party, false otherwise
+     */
+    public static boolean inSameParty(Player playera, Player playerb) {
+        return PartyManager.getInstance().inSameParty(playera, playerb);
+    }
+
+    /**
+     * Get a list of all current parties.
+     * </br>
+     * This function is designed for API usage.
+     *
+     * @return the list of parties.
+     */
+    public static List<Party> getParties() {
+        return PartyManager.getInstance().getParties();
+    }
+
+    /**
+     * Add a player to a party.
+     * </br>
+     * This function is designed for API usage.
+     *
+     * @param player The player to add to the party
+     * @param partyName The party to add the player to
+     */
+    public static void addToParty(Player player, String partyName) {
+        PartyManager.getInstance().addToParty(player.getName(), Users.getProfile(player), PartyManager.getInstance().getParty(partyName)); //TODO this will throw a NPE if the party doesn't exist
+    }
+
+    /**
+     * Remove a player from a party.
+     * </br>
+     * This function is designed for API usage.
+     *
+     * @param player The player to remove
+     */
+    public static void removeFromParty(Player player) {
+        PartyManager.getInstance().removeFromParty(player.getName(), Users.getProfile(player).getParty());
+    }
+
+    /**
+     * Get the leader of a party.
+     * </br>
+     * This function is designed for API usage.
+     *
+     * @param partyName The party name
+     * @return the leader of the party
+     */
+    public static String getPartyLeader(String partyName) {
+        return PartyManager.getInstance().getPartyLeader(partyName);
+    }
+
+    /**
+     * Set the leader of a party.
+     * </br>
+     * This function is designed for API usage.
+     *
+     * @param partyName The name of the party to set the leader of
+     * @param player The player to set as leader
+     */
+    public static void setPartyLeader(String partyName, String player) {
+        PartyManager.getInstance().setPartyLeader(player, PartyManager.getInstance().getParty(partyName));
+    }
+
+    /**
+     * Get a list of all players in this player's party.
+     * </br>
+     * This function is designed for API usage.
+     *
+     * @param player The player to check
+     * @return all the players in the player's party
+     */
+    public static List<String> getAllMembers(Player player) {
+        return PartyManager.getInstance().getAllMembers(player);
+    }
+
+    /**
+     * Get a list of all online players in this party.
+     * </br>
+     * This function is designed for API usage.
+     *
+     * @param partyName The party to check
+     * @return all online players in this party
+     */
+    public static List<Player> getOnlineMembers(String partyName) {
+        return PartyManager.getInstance().getOnlineMembers(partyName);
+    }
+
+    /**
+     * Get a list of all online players in this player's party.
+     * </br>
+     * This function is designed for API usage.
+     *
+     * @param player The player to check
+     * @return all online players in the player's party
+     */
+    public static List<Player> getOnlineMembers(Player player) {
+        return PartyManager.getInstance().getOnlineMembers(player);
+    }
+}

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

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

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

@@ -0,0 +1,144 @@
+package com.gmail.nossr50.commands;
+
+import org.bukkit.command.CommandSender;
+import org.bukkit.entity.Player;
+
+import com.gmail.nossr50.datatypes.PlayerProfile;
+import com.gmail.nossr50.datatypes.SkillType;
+import com.gmail.nossr50.locale.LocaleLoader;
+import com.gmail.nossr50.util.Permissions;
+import com.gmail.nossr50.util.Skills;
+import com.gmail.nossr50.util.Users;
+
+public class CommandHelper {
+
+    /**
+     * Checks for command permissions.
+     *
+     * @param sender The command sender
+     * @param permission The permission to check
+     * @return true if the sender is a player without permissions, false otherwise
+     */
+    public static boolean noCommandPermissions(CommandSender sender, String permission) {
+        if (sender instanceof Player) {
+            Player player = (Player) sender;
+
+            if (player != null && !Permissions.getInstance().permission(player, permission)) {
+                player.sendMessage(LocaleLoader.getString("mcMMO.NoPermission"));
+                return true;
+            }
+        }
+
+        return false;
+    }
+
+    public static boolean noConsoleUsage(CommandSender sender) {
+        if (!(sender instanceof Player)) {
+            sender.sendMessage(LocaleLoader.getString("Commands.NoConsole"));
+            return true;
+        }
+
+        return false;
+    }
+
+    /**
+     * Print out details on Gathering skills. Only for online players.
+     *
+     * @param inspect The player to retrieve stats for
+     * @param display The sender to display stats to
+     */
+    public static void printGatheringSkills(Player inspect, CommandSender display) {
+        if (Skills.hasGatheringSkills(inspect)) {
+            PlayerProfile PP = Users.getProfile(inspect);
+
+            display.sendMessage(LocaleLoader.getString("Stats.Header.Gathering"));
+
+            if (Permissions.getInstance().excavation(inspect)) {
+                display.sendMessage(LocaleLoader.getString("Skills.Stats", new Object[] { LocaleLoader.getString("Excavation.Listener"), PP.getSkillLevel(SkillType.EXCAVATION), PP.getSkillXpLevel(SkillType.EXCAVATION), PP.getXpToLevel(SkillType.EXCAVATION) }));
+            }
+
+            if (Permissions.getInstance().fishing(inspect)) {
+                display.sendMessage(LocaleLoader.getString("Skills.Stats", new Object[] { LocaleLoader.getString("Fishing.Listener"), PP.getSkillLevel(SkillType.FISHING), PP.getSkillXpLevel(SkillType.FISHING), PP.getXpToLevel(SkillType.FISHING) }));
+            }
+
+            if (Permissions.getInstance().herbalism(inspect)) {
+                display.sendMessage(LocaleLoader.getString("Skills.Stats", new Object[] { LocaleLoader.getString("Herbalism.Listener"), PP.getSkillLevel(SkillType.HERBALISM), PP.getSkillXpLevel(SkillType.HERBALISM), PP.getXpToLevel(SkillType.HERBALISM) }));
+            }
+
+            if (Permissions.getInstance().mining(inspect)) {
+                display.sendMessage(LocaleLoader.getString("Skills.Stats", new Object[] { LocaleLoader.getString("Mining.Listener"), PP.getSkillLevel(SkillType.MINING), PP.getSkillXpLevel(SkillType.MINING), PP.getXpToLevel(SkillType.MINING) }));
+            }
+
+            if (Permissions.getInstance().woodcutting(inspect)) {
+                display.sendMessage(LocaleLoader.getString("Skills.Stats", new Object[] { LocaleLoader.getString("Woodcutting.Listener"), PP.getSkillLevel(SkillType.WOODCUTTING), PP.getSkillXpLevel(SkillType.WOODCUTTING), PP.getXpToLevel(SkillType.WOODCUTTING) }));
+            }
+        }
+    }
+
+    public static void printGatheringSkills(Player player) {
+        printGatheringSkills(player, player);
+    }
+
+    /**
+     * Print out details on Combat skills. Only for online players.
+     *
+     * @param inspect The player to retrieve stats for
+     * @param display The sender to display stats to
+     */
+    public static void printCombatSkills(Player inspect, CommandSender display) {
+        if (Skills.hasCombatSkills(inspect)) {
+            PlayerProfile PP = Users.getProfile(inspect);
+
+            display.sendMessage(LocaleLoader.getString("Stats.Header.Combat"));
+
+            if (Permissions.getInstance().axes(inspect)) {
+                display.sendMessage(LocaleLoader.getString("Skills.Stats", new Object[] { LocaleLoader.getString("Axes.Listener"), PP.getSkillLevel(SkillType.AXES), PP.getSkillXpLevel(SkillType.AXES), PP.getXpToLevel(SkillType.AXES) }));
+            }
+
+            if (Permissions.getInstance().archery(inspect)) {
+                display.sendMessage(LocaleLoader.getString("Skills.Stats", new Object[] { LocaleLoader.getString("Archery.Listener"), PP.getSkillLevel(SkillType.ARCHERY), PP.getSkillXpLevel(SkillType.ARCHERY), PP.getXpToLevel(SkillType.ARCHERY) }));
+            }
+
+            if (Permissions.getInstance().swords(inspect)) {
+                display.sendMessage(LocaleLoader.getString("Skills.Stats", new Object[] { LocaleLoader.getString("Swords.Listener"), PP.getSkillLevel(SkillType.SWORDS), PP.getSkillXpLevel(SkillType.SWORDS), PP.getXpToLevel(SkillType.SWORDS) }));
+            }
+
+            if (Permissions.getInstance().taming(inspect)) {
+                display.sendMessage(LocaleLoader.getString("Skills.Stats", new Object[] { LocaleLoader.getString("Taming.Listener"), PP.getSkillLevel(SkillType.TAMING), PP.getSkillXpLevel(SkillType.TAMING), PP.getXpToLevel(SkillType.TAMING) }));
+            }
+
+            if (Permissions.getInstance().unarmed(inspect)) {
+                display.sendMessage(LocaleLoader.getString("Skills.Stats", new Object[] { LocaleLoader.getString("Unarmed.Listener"), PP.getSkillLevel(SkillType.UNARMED), PP.getSkillXpLevel(SkillType.UNARMED), PP.getXpToLevel(SkillType.UNARMED) }));
+            }
+        }
+    }
+
+    public static void printCombatSkills(Player player) {
+        printCombatSkills(player, player);
+    }
+
+    /**
+     * Print out details on Misc skills. Only for online players.
+     *
+     * @param inspect The player to retrieve stats for
+     * @param display The sender to display stats to
+     */
+    public static void printMiscSkills(Player inspect, CommandSender display) {
+        if (Skills.hasMiscSkills(inspect)) {
+            PlayerProfile PP = Users.getProfile(inspect);
+            display.sendMessage(LocaleLoader.getString("Stats.Header.Misc"));
+
+            if (Permissions.getInstance().acrobatics(inspect)) {
+                display.sendMessage(LocaleLoader.getString("Skills.Stats", new Object[] { LocaleLoader.getString("Acrobatics.Listener"), PP.getSkillLevel(SkillType.ACROBATICS), PP.getSkillXpLevel(SkillType.ACROBATICS), PP.getXpToLevel(SkillType.ACROBATICS) }));
+            }
+
+            if (Permissions.getInstance().repair(inspect)) {
+                display.sendMessage(LocaleLoader.getString("Skills.Stats", new Object[] { LocaleLoader.getString("Repair.Listener"), PP.getSkillLevel(SkillType.REPAIR), PP.getSkillXpLevel(SkillType.REPAIR), PP.getXpToLevel(SkillType.REPAIR) }));
+            }
+        }
+    }
+
+    public static void printMiscSkills(Player player) {
+        printMiscSkills(player, player);
+    }
+}

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

@@ -0,0 +1,85 @@
+package com.gmail.nossr50.commands;
+
+import java.text.DecimalFormat;
+
+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.PlayerProfile;
+import com.gmail.nossr50.datatypes.SkillType;
+import com.gmail.nossr50.locale.LocaleLoader;
+import com.gmail.nossr50.util.Misc;
+import com.gmail.nossr50.util.Page;
+import com.gmail.nossr50.util.Permissions;
+import com.gmail.nossr50.util.Users;
+
+public abstract class SkillCommand implements CommandExecutor {
+    private SkillType skill;
+    private String skillString;
+    private String permission;
+
+    protected Player player;
+    protected PlayerProfile profile;
+    protected float skillValue;
+
+    protected DecimalFormat percent = new DecimalFormat("##0.00%");
+    protected Permissions permInstance = Permissions.getInstance();
+
+    public SkillCommand(SkillType skill) {
+        this.skill = skill;
+        this.skillString = Misc.getCapitalized(skill.toString());
+        this.permission = "mcmmo.skills." + skillString.toLowerCase();
+    }
+
+    @Override
+    public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
+        if (CommandHelper.noConsoleUsage(sender)) {
+            return true;
+        }
+
+        if (CommandHelper.noCommandPermissions(sender, permission)) {
+            return true;
+        }
+
+        player = (Player) sender;
+        profile = Users.getProfile(player);
+
+        skillValue = profile.getSkillLevel(skill);
+        dataCalculations();
+        permissionsCheck();
+
+        player.sendMessage(LocaleLoader.getString("Skills.Header", new Object[] { LocaleLoader.getString(skillString + ".SkillName") }));
+        player.sendMessage(LocaleLoader.getString("Commands.XPGain", new Object[] { LocaleLoader.getString("Commands.XPGain." + skillString) }));
+        player.sendMessage(LocaleLoader.getString("Effects.Level", new Object[] { profile.getSkillLevel(skill), profile.getSkillXpLevel(skill), profile.getXpToLevel(skill) }));
+
+        if (effectsHeaderPermissions()) {
+            player.sendMessage(LocaleLoader.getString("Skills.Header", new Object[] { LocaleLoader.getString("Effects.Effects") }));
+        }
+
+        effectsDisplay();
+
+        if (statsHeaderPermissions()) {
+            player.sendMessage(LocaleLoader.getString("Skills.Header", new Object[] { LocaleLoader.getString("Commands.Stats.Self") }));
+        }
+
+        statsDisplay();
+
+        Page.grabGuidePageForSkill(skill, player, args);
+
+        return true;
+    }
+
+    protected abstract void dataCalculations();
+
+    protected abstract void permissionsCheck();
+
+    protected abstract boolean effectsHeaderPermissions();
+
+    protected abstract void effectsDisplay();
+
+    protected abstract boolean statsHeaderPermissions();
+
+    protected abstract void statsDisplay();
+}

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

@@ -0,0 +1,118 @@
+package com.gmail.nossr50.commands.general;
+
+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.commands.CommandHelper;
+import com.gmail.nossr50.datatypes.PlayerProfile;
+import com.gmail.nossr50.datatypes.SkillType;
+import com.gmail.nossr50.locale.LocaleLoader;
+import com.gmail.nossr50.util.Misc;
+import com.gmail.nossr50.util.Skills;
+import com.gmail.nossr50.util.Users;
+
+public class AddlevelsCommand implements CommandExecutor{
+    private final mcMMO plugin;
+
+    public AddlevelsCommand (mcMMO plugin) {
+        this.plugin = plugin;
+    }
+
+    @Override
+    public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
+        OfflinePlayer modifiedPlayer;
+        PlayerProfile PP;
+        int levels;
+        SkillType skill;
+        String skillName;
+        String usage = ChatColor.RED + "Proper usage is /addlevels [player] <skill> <level>"; //TODO: Needs more locale.
+
+        if (CommandHelper.noCommandPermissions(sender, "mcmmo.tools.mmoedit")) {
+            return true;
+        }
+
+        switch (args.length) {
+        case 2:
+            if (sender instanceof Player) {
+                if (!Skills.isSkill(args[0])) {
+                    sender.sendMessage(LocaleLoader.getString("Commands.Skill.Invalid"));
+                    return true;
+                }
+
+                if (Misc.isInt(args[1])) {
+                    modifiedPlayer = (Player) sender;
+                    levels = Integer.valueOf(args[1]);
+                    skill = Skills.getSkillType(args[0]);
+                    PP = Users.getProfile(modifiedPlayer);
+
+                    if (skill.equals(SkillType.ALL)) {
+                        skillName = "all skills";
+                    }
+                    else {
+                        skillName = Misc.getCapitalized(skill.toString());
+                    }
+
+                    PP.addLevels(skill, levels);
+                    sender.sendMessage(ChatColor.GREEN + "You were awarded " + levels + " levels in " + skillName + "!"); //TODO: Needs more locale.
+                }
+            }
+            else {
+                sender.sendMessage(usage);
+            }
+
+            return true;
+
+        case 3:
+            modifiedPlayer = plugin.getServer().getOfflinePlayer(args[0]);
+            String playerName = modifiedPlayer.getName();
+            PP = Users.getProfile(modifiedPlayer);
+
+            if (!PP.isLoaded()) {
+                sender.sendMessage(LocaleLoader.getString("Commands.DoesNotExist"));
+                return true;
+            }
+
+            if (!Skills.isSkill(args[1])) {
+                sender.sendMessage(LocaleLoader.getString("Commands.Skill.Invalid"));
+                return true;
+            }
+
+            if (Misc.isInt(args[2])) {
+                levels = Integer.valueOf(args[2]);
+                skill = Skills.getSkillType(args[1]);
+                String message;
+
+                Users.getProfile(modifiedPlayer).addLevels(skill, levels);
+
+                if (skill.equals(SkillType.ALL)) {
+                    skillName = "all skills";
+                    message = ChatColor.RED + "All skills have been modified for " + playerName + "."; //TODO: Use locale
+                }
+                else {
+                    skillName = Misc.getCapitalized(skill.toString());
+                    message = ChatColor.RED + skillName + " has been modified for " + playerName + "."; //TODO: Use locale
+                }
+
+                sender.sendMessage(message);
+
+                if (modifiedPlayer.isOnline()) {
+                    ((Player) modifiedPlayer).sendMessage(ChatColor.GREEN + "You were awarded " + levels + " levels in " + skillName + "!"); //TODO: Needs more locale.
+                }
+            }
+            else {
+                sender.sendMessage(usage);
+            }
+
+            return true;
+
+        default:
+            sender.sendMessage(usage);
+            return true;
+        }
+    }
+}

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

@@ -6,84 +6,127 @@ import org.bukkit.command.CommandExecutor;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 
-import com.gmail.nossr50.Users;
-import com.gmail.nossr50.m;
 import com.gmail.nossr50.mcMMO;
-import com.gmail.nossr50.mcPermissions;
-import com.gmail.nossr50.config.LoadProperties;
-import com.gmail.nossr50.locale.mcLocale;
-import com.gmail.nossr50.skills.Skills;
+import com.gmail.nossr50.commands.CommandHelper;
+import com.gmail.nossr50.datatypes.PlayerProfile;
+import com.gmail.nossr50.datatypes.SkillType;
+import com.gmail.nossr50.locale.LocaleLoader;
+import com.gmail.nossr50.util.Misc;
+import com.gmail.nossr50.util.Skills;
+import com.gmail.nossr50.util.Users;
 
+//TODO: Any way we can make this work for offline use?
 public class AddxpCommand implements CommandExecutor {
-	private final mcMMO plugin;
+    private final mcMMO plugin;
 
-	public AddxpCommand(mcMMO instance) {
-		this.plugin = instance;
-	}
+    public AddxpCommand (mcMMO plugin) {
+        this.plugin = plugin;
+    }
 
-	@Override
-	public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
-		Player player = null;
-        if (sender instanceof Player) {
-            player = (Player) sender;
+    @Override
+    public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
+        Player modifiedPlayer;
+        int xp;
+        SkillType skill;
+        String skillName;
+        String usage = ChatColor.RED + "Proper usage is /addxp [playername] <skill> <xp>"; //TODO: Needs more locale.
+
+        if (CommandHelper.noCommandPermissions(sender, "mcmmo.tools.mmoedit")) {
+            return true;
         }
-        
-        if (player != null && !mcPermissions.getInstance().mmoedit(player)) {
-			sender.sendMessage("This command requires permissions.");
-			return true;
-		}
 
-		if (!LoadProperties.addxpEnable) {
-			sender.sendMessage("This command is not enabled.");
-			return true;
-		}
+        switch (args.length) {
+        case 2:
+            if (sender instanceof Player) {
+                if (!Skills.isSkill(args[1])) {
+                    sender.sendMessage(LocaleLoader.getString("Commands.Skill.Invalid"));
+                    return true;
+                }
 
-		if (!(sender instanceof Player)) {
-			if (args.length < 2) {
-				// No console aliasing yet
-				// System.out.println("Usage is /"+LoadProperties.addxp+" playername skillname xp");
-				System.out.println("Usage is /addxp playername skillname xp");
-				return true;
-			} else if (args.length == 3) {
-				if ((plugin.getServer().getPlayer(args[0]) != null) && m.isInt(args[2]) && Skills.isSkill(args[1])) {
-					int newvalue = Integer.valueOf(args[2]);
-					Users.getProfile(plugin.getServer().getPlayer(args[0])).addXP(Skills.getSkillType(args[1]), newvalue, plugin.getServer().getPlayer(args[0]));
-					plugin.getServer().getPlayer(args[0]).sendMessage(ChatColor.GREEN + "Experience granted!");
-					System.out.println(args[1] + " has been modified for " + plugin.getServer().getPlayer(args[0]).getName() + ".");
-					Skills.XpCheckAll(plugin.getServer().getPlayer(args[0]));
-				}
-			} else {
-				// No console aliasing yet
-				// System.out.println("Usage is /"+LoadProperties.addxp+" playername skillname xp");
-				System.out.println("Usage is /addxp playername skillname xp");
-			}
-			return true;
-		}
+                if (Misc.isInt(args[1])) {
+                    modifiedPlayer = (Player) sender;
+                    xp = Integer.valueOf(args[1]);
+                    skill = Skills.getSkillType(args[0]);
 
-		if (!mcPermissions.getInstance().mmoedit(player)) {
-			player.sendMessage(ChatColor.YELLOW + "[mcMMO] " + ChatColor.DARK_RED + mcLocale.getString("mcPlayerListener.NoPermission"));
-			return true;
-		}
-		if (args.length < 2) {
-			player.sendMessage(ChatColor.RED + "Usage is /addxp playername skillname xp");
-			return true;
-		}
-		if (args.length == 3) {
-			if ((plugin.getServer().getPlayer(args[0]) != null) && m.isInt(args[2]) && Skills.isSkill(args[1])) {
-				int newvalue = Integer.valueOf(args[2]);
-				Users.getProfile(plugin.getServer().getPlayer(args[0])).addXP(Skills.getSkillType(args[1]), newvalue, plugin.getServer().getPlayer(args[0]));
-				plugin.getServer().getPlayer(args[0]).sendMessage(ChatColor.GREEN + "Experience granted!");
-				player.sendMessage(ChatColor.RED + args[1] + " has been modified.");
-				Skills.XpCheckAll(plugin.getServer().getPlayer(args[0]));
-			}
-		} else if (args.length == 2 && m.isInt(args[1]) && Skills.isSkill(args[0])) {
-			int newvalue = Integer.valueOf(args[1]);
-			Users.getProfile(player).addXP(Skills.getSkillType(args[0]), newvalue, player);
-			player.sendMessage(ChatColor.RED + args[0] + " has been modified.");
-		} else {
-			player.sendMessage(ChatColor.RED + "Usage is /addxp playername skillname xp");
-		}
+                    PlayerProfile profile = Users.getProfile(modifiedPlayer);
+                    profile.addXPOverride(skill, xp);
 
-		return true;
-	}
+                    if (skill.equals(SkillType.ALL)) {
+                        skillName = "all skills";
+                    }
+                    else {
+                        skillName = Misc.getCapitalized(skill.toString());
+                    }
+
+                    modifiedPlayer.sendMessage(ChatColor.GREEN + "You were awarded " + xp + " experience in " + skillName + "!"); //TODO: Needs more locale.
+
+                    if (skill.equals(SkillType.ALL)) {
+                        Skills.xpCheckAll(modifiedPlayer, profile);
+                    }
+                    else {
+                        Skills.xpCheckSkill(skill, modifiedPlayer, profile);
+                    }
+                }
+                else {
+                    sender.sendMessage(usage);
+                }
+            }
+            else {
+                sender.sendMessage(usage);
+            }
+
+            return true;
+
+        case 3:
+            modifiedPlayer = plugin.getServer().getPlayer(args[0]);
+            String playerName = modifiedPlayer.getName();
+            PlayerProfile profile = Users.getProfile(modifiedPlayer);
+
+            if (!profile.isLoaded()) {
+                sender.sendMessage(LocaleLoader.getString("Commands.DoesNotExist"));
+                return true;
+            }
+
+            if (!Skills.isSkill(args[1])) {
+                sender.sendMessage(LocaleLoader.getString("Commands.Skill.Invalid"));
+                return true;
+            }
+
+            if (Misc.isInt(args[2])) {
+                xp = Integer.valueOf(args[2]);
+                skill = Skills.getSkillType(args[1]);
+                String message;
+
+                profile.addXPOverride(skill, xp);
+
+                if (skill.equals(SkillType.ALL)) {
+                    skillName = "all skills";
+                    message = ChatColor.RED + "All skills have been modified for " + playerName + "."; //TODO: Use locale
+                }
+                else {
+                    skillName = Misc.getCapitalized(skill.toString());
+                    message = ChatColor.RED + skillName + " has been modified for " + playerName + "."; //TODO: Use locale
+                }
+
+                sender.sendMessage(message);
+                modifiedPlayer.sendMessage(ChatColor.GREEN + "You were awarded " + xp + " experience in " + skillName + "!"); //TODO: Needs more locale.
+
+                if (skill.equals(SkillType.ALL)) {
+                    Skills.xpCheckAll(modifiedPlayer, profile);
+                }
+                else {
+                    Skills.xpCheckSkill(skill, modifiedPlayer, profile);
+                }
+            }
+            else {
+                sender.sendMessage(usage);
+            }
+
+            return true;
+
+        default:
+            sender.sendMessage(usage);
+            return true;
+        }
+    }
 }

src/main/java/com/gmail/nossr50/commands/general/ClearmyspawnCommand.java

@@ -1,46 +0,0 @@
-package com.gmail.nossr50.commands.general;
-
-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.entity.Player;
-
-import com.gmail.nossr50.Users;
-import com.gmail.nossr50.mcPermissions;
-import com.gmail.nossr50.config.LoadProperties;
-import com.gmail.nossr50.datatypes.PlayerProfile;
-import com.gmail.nossr50.locale.mcLocale;
-
-public class ClearmyspawnCommand implements CommandExecutor {
-	@Override
-	public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
-		if (!LoadProperties.clearmyspawnEnable || !LoadProperties.enableMySpawn) {
-			sender.sendMessage("This command is not enabled.");
-			return true;
-		}
-
-		if (!(sender instanceof Player)) {
-			sender.sendMessage("This command does not support console useage.");
-			return true;
-		}
-
-		Player player = (Player) sender;
-		PlayerProfile PP = Users.getProfile(player);
-
-		if (!mcPermissions.getInstance().mySpawn(player)) {
-			player.sendMessage(ChatColor.YELLOW + "[mcMMO] " + ChatColor.DARK_RED + mcLocale.getString("mcPlayerListener.NoPermission"));
-			return true;
-		}
-
-		double x = Bukkit.getServer().getWorlds().get(0).getSpawnLocation().getX();
-		double y = Bukkit.getServer().getWorlds().get(0).getSpawnLocation().getY();
-		double z = Bukkit.getServer().getWorlds().get(0).getSpawnLocation().getZ();
-		String worldname = Bukkit.getServer().getWorlds().get(0).getName();
-		PP.setMySpawn(x, y, z, worldname);
-		player.sendMessage(mcLocale.getString("mcPlayerListener.MyspawnCleared"));
-
-		return true;
-	}
-}

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

@@ -0,0 +1,95 @@
+package com.gmail.nossr50.commands.general;
+
+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.commands.CommandHelper;
+import com.gmail.nossr50.datatypes.PlayerProfile;
+import com.gmail.nossr50.datatypes.SkillType;
+import com.gmail.nossr50.locale.LocaleLoader;
+import com.gmail.nossr50.util.Misc;
+import com.gmail.nossr50.util.Permissions;
+import com.gmail.nossr50.util.Users;
+
+public class InspectCommand implements CommandExecutor {
+    private final mcMMO plugin;
+
+    public InspectCommand (mcMMO plugin) {
+        this.plugin = plugin;
+    }
+
+    @Override
+    public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
+        OfflinePlayer target;
+        PlayerProfile PP;
+        String usage = "Proper usage is /inspect <player>"; //TODO: Needs more locale.
+
+        if (CommandHelper.noCommandPermissions(sender, "mcmmo.commands.inspect")) {
+            return true;
+        }
+
+        switch (args.length) {
+        case 1:
+            target = plugin.getServer().getOfflinePlayer(args[0]);
+            PP = Users.getProfile(target);
+
+            if (target.isOnline()) {
+                Player player = (Player) target;
+
+                if (sender instanceof Player && !sender.isOp() && !Misc.isNear(((Player) sender).getLocation(), player.getLocation(), 5.0) && !Permissions.getInstance().inspectDistanceBypass((Player) sender)) {
+                    sender.sendMessage(LocaleLoader.getString("Inspect.TooFar"));
+                    return true;
+                }
+
+                sender.sendMessage(LocaleLoader.getString("Inspect.Stats", new Object[] { target.getName() }));
+                CommandHelper.printGatheringSkills(player, sender);
+                CommandHelper.printCombatSkills(player, sender);
+                CommandHelper.printMiscSkills(player, sender);
+                sender.sendMessage(LocaleLoader.getString("Commands.PowerLevel", new Object[] { PP.getPowerLevel() }));
+
+                return true;
+            }
+            else {
+                if (sender instanceof Player && !sender.isOp() && !Permissions.getInstance().inspectOfflineBypass((Player) sender)) {
+                    sender.sendMessage(LocaleLoader.getString("Inspect.Offline"));
+                    return true;
+                }
+
+                if (!PP.isLoaded()) {
+                    sender.sendMessage(LocaleLoader.getString("Commands.DoesNotExist"));
+                    return true;
+                }
+
+                sender.sendMessage(LocaleLoader.getString("Inspect.OfflineStats", new Object[] { args[0] }));
+
+                sender.sendMessage(LocaleLoader.getString("Stats.Header.Gathering"));
+                sender.sendMessage(LocaleLoader.getString("Skills.Stats", new Object[] { LocaleLoader.getString("Excavation.Listener"), PP.getSkillLevel(SkillType.EXCAVATION), PP.getSkillXpLevel(SkillType.EXCAVATION), PP.getXpToLevel(SkillType.EXCAVATION) }));
+                sender.sendMessage(LocaleLoader.getString("Skills.Stats", new Object[] { LocaleLoader.getString("Fishing.Listener"), PP.getSkillLevel(SkillType.FISHING), PP.getSkillXpLevel(SkillType.FISHING), PP.getXpToLevel(SkillType.FISHING) }));
+                sender.sendMessage(LocaleLoader.getString("Skills.Stats", new Object[] { LocaleLoader.getString("Herbalism.Listener"), PP.getSkillLevel(SkillType.HERBALISM), PP.getSkillXpLevel(SkillType.HERBALISM), PP.getXpToLevel(SkillType.HERBALISM) }));
+                sender.sendMessage(LocaleLoader.getString("Skills.Stats", new Object[] { LocaleLoader.getString("Mining.Listener"), PP.getSkillLevel(SkillType.MINING), PP.getSkillXpLevel(SkillType.MINING), PP.getXpToLevel(SkillType.MINING) }));
+                sender.sendMessage(LocaleLoader.getString("Skills.Stats", new Object[] { LocaleLoader.getString("Woodcutting.Listener"), PP.getSkillLevel(SkillType.WOODCUTTING), PP.getSkillXpLevel(SkillType.WOODCUTTING), PP.getXpToLevel(SkillType.WOODCUTTING) }));
+
+                sender.sendMessage(LocaleLoader.getString("Stats.Header.Combat"));
+                sender.sendMessage(LocaleLoader.getString("Skills.Stats", new Object[] { LocaleLoader.getString("Axes.Listener"), PP.getSkillLevel(SkillType.AXES), PP.getSkillXpLevel(SkillType.AXES), PP.getXpToLevel(SkillType.AXES) }));
+                sender.sendMessage(LocaleLoader.getString("Skills.Stats", new Object[] { LocaleLoader.getString("Archery.Listener"), PP.getSkillLevel(SkillType.ARCHERY), PP.getSkillXpLevel(SkillType.ARCHERY), PP.getXpToLevel(SkillType.ARCHERY) }));
+                sender.sendMessage(LocaleLoader.getString("Skills.Stats", new Object[] { LocaleLoader.getString("Swords.Listener"), PP.getSkillLevel(SkillType.SWORDS), PP.getSkillXpLevel(SkillType.SWORDS), PP.getXpToLevel(SkillType.SWORDS) }));
+                sender.sendMessage(LocaleLoader.getString("Skills.Stats", new Object[] { LocaleLoader.getString("Taming.Listener"), PP.getSkillLevel(SkillType.TAMING), PP.getSkillXpLevel(SkillType.TAMING), PP.getXpToLevel(SkillType.TAMING) }));
+                sender.sendMessage(LocaleLoader.getString("Skills.Stats", new Object[] { LocaleLoader.getString("Unarmed.Listener"), PP.getSkillLevel(SkillType.UNARMED), PP.getSkillXpLevel(SkillType.UNARMED), PP.getXpToLevel(SkillType.UNARMED) }));
+
+                sender.sendMessage(LocaleLoader.getString("Stats.Header.Misc"));
+                sender.sendMessage(LocaleLoader.getString("Skills.Stats", new Object[] { LocaleLoader.getString("Acrobatics.Listener"), PP.getSkillLevel(SkillType.ACROBATICS), PP.getSkillXpLevel(SkillType.ACROBATICS), PP.getXpToLevel(SkillType.ACROBATICS) }));
+                sender.sendMessage(LocaleLoader.getString("Skills.Stats", new Object[] { LocaleLoader.getString("Repair.Listener"), PP.getSkillLevel(SkillType.REPAIR), PP.getSkillXpLevel(SkillType.REPAIR), PP.getXpToLevel(SkillType.REPAIR) }));
+
+                return true;
+            }
+
+        default:
+            sender.sendMessage(usage);
+            return true;
+        }
+    }
+}

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

@@ -0,0 +1,35 @@
+package com.gmail.nossr50.commands.general;
+
+import org.bukkit.command.Command;
+import org.bukkit.command.CommandExecutor;
+import org.bukkit.command.CommandSender;
+import org.bukkit.entity.Player;
+
+import com.gmail.nossr50.commands.CommandHelper;
+import com.gmail.nossr50.datatypes.PlayerProfile;
+import com.gmail.nossr50.locale.LocaleLoader;
+import com.gmail.nossr50.util.Users;
+
+public class McstatsCommand implements CommandExecutor {
+
+    @Override
+    public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
+        if (CommandHelper.noConsoleUsage(sender)) {
+            return true;
+        }
+
+        Player player = (Player) sender;
+        PlayerProfile PP = Users.getProfile(player);
+
+        player.sendMessage(LocaleLoader.getString("Stats.Own.Stats"));
+        player.sendMessage(LocaleLoader.getString("mcMMO.NoSkillNote"));
+
+        CommandHelper.printGatheringSkills(player);
+        CommandHelper.printCombatSkills(player);
+        CommandHelper.printMiscSkills(player);
+
+        player.sendMessage(LocaleLoader.getString("Commands.PowerLevel", new Object[] { String.valueOf(PP.getPowerLevel()) }));
+
+        return true;
+    }
+}

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

@@ -1,87 +1,115 @@
 package com.gmail.nossr50.commands.general;
 
 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.Users;
-import com.gmail.nossr50.m;
-import com.gmail.nossr50.mcMMO;
-import com.gmail.nossr50.mcPermissions;
-import com.gmail.nossr50.config.LoadProperties;
+import com.gmail.nossr50.commands.CommandHelper;
 import com.gmail.nossr50.datatypes.PlayerProfile;
-import com.gmail.nossr50.locale.mcLocale;
-import com.gmail.nossr50.skills.Skills;
+import com.gmail.nossr50.datatypes.SkillType;
+import com.gmail.nossr50.locale.LocaleLoader;
+import com.gmail.nossr50.util.Misc;
+import com.gmail.nossr50.util.Skills;
+import com.gmail.nossr50.util.Users;
 
 public class MmoeditCommand implements CommandExecutor {
-	private final mcMMO plugin;
+    @Override
+    public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
+        OfflinePlayer modifiedPlayer;
+        PlayerProfile playerProfile;
+        int newValue;
+        SkillType skill;
+        String skillName;
+        String usage = ChatColor.RED + "Proper usage is /mmoedit [player] <skill> <level>"; //TODO: Needs more locale.
 
-	public MmoeditCommand(mcMMO instance) {
-		this.plugin = instance;
-	}
-
-	@Override
-	public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
-		Player player = null;
-        if (sender instanceof Player) {
-            player = (Player) sender;
+        if (CommandHelper.noCommandPermissions(sender, "mcmmo.tools.mmoedit")) {
+            return true;
         }
-		
-        if (player != null && !mcPermissions.getInstance().mmoedit(player)) {
-			sender.sendMessage("This command requires permissions.");
-			return true;
-		}
 
-		if (!LoadProperties.mmoeditEnable) {
-			sender.sendMessage("This command is not enabled.");
-			return true;
-		}
+        switch (args.length) {
+        case 2:
+            if (sender instanceof Player) {
+                if (!Skills.isSkill(args[0])) {
+                    sender.sendMessage(LocaleLoader.getString("Commands.Skill.Invalid"));
+                    return true;
+                }
 
-		if (!(sender instanceof Player)) {
-			if (args.length < 2) {
-				System.out.println("Usage is /mmoedit playername skillname newvalue");
-				return true;
-			} else if (args.length == 3) {
-				if ((plugin.getServer().getPlayer(args[0]) != null) && m.isInt(args[2]) && Skills.isSkill(args[1])) {
-					int newvalue = Integer.valueOf(args[2]);
-					Users.getProfile(plugin.getServer().getPlayer(args[0])).modifyskill(Skills.getSkillType(args[1]), newvalue);
-					System.out.println(args[1] + " has been modified for " + plugin.getServer().getPlayer(args[0]).getName() + ".");
-				}
-			} else {
-				System.out.println("Usage is /mmoedit playername skillname newvalue");
-			}
+                if (Misc.isInt(args[1])) {
+                    modifiedPlayer = (Player) sender;
+                    newValue = Integer.valueOf(args[1]);
+                    skill = Skills.getSkillType(args[0]);
+                    playerProfile = Users.getProfile(modifiedPlayer);
 
-			return true;
-		}
+                    if (skill.equals(SkillType.ALL)) {
+                        skillName = "all skills";
+                    }
+                    else {
+                        skillName = Misc.getCapitalized(skill.toString());
+                    }
 
-		PlayerProfile PP = Users.getProfile(player);
+                    playerProfile.modifySkill(skill, newValue);
+                    sender.sendMessage(ChatColor.GREEN + "Your level in " + skillName + " was set to " + newValue + "!"); //TODO: Needs more locale.
+                }
+                else {
+                    sender.sendMessage(usage);
+                }
+            }
+            else {
+                sender.sendMessage(usage);
+            }
 
-		if (!mcPermissions.getInstance().mmoedit(player)) {
-			player.sendMessage(ChatColor.YELLOW + "[mcMMO] " + ChatColor.DARK_RED + mcLocale.getString("mcPlayerListener.NoPermission"));
-			return true;
-		}
-		if (args.length < 2) {
-			player.sendMessage(ChatColor.RED + "Usage is /mmoedit playername skillname newvalue");
-			return true;
-		}
-		if (args.length == 3) {
-			if ((plugin.getServer().getPlayer(args[0]) != null) && m.isInt(args[2]) && Skills.isSkill(args[1])) {
-				int newvalue = Integer.valueOf(args[2]);
-				Users.getProfile(plugin.getServer().getPlayer(args[0])).modifyskill(Skills.getSkillType(args[1]), newvalue);
-				player.sendMessage(ChatColor.RED + args[1] + " has been modified.");
-			}
-		} else if (args.length == 2) {
-			if (m.isInt(args[1]) && Skills.isSkill(args[0])) {
-				int newvalue = Integer.valueOf(args[1]);
-				PP.modifyskill(Skills.getSkillType(args[0]), newvalue);
-				player.sendMessage(ChatColor.RED + args[0] + " has been modified.");
-			}
-		} else {
-			player.sendMessage(ChatColor.RED + "Usage is /mmoedit playername skillname newvalue");
-		}
+            return true;
 
-		return true;
-	}
+        case 3:
+            if (!Misc.isInt(args[2])) {
+                sender.sendMessage(usage);
+                return true;
+            }
+
+            skill = Skills.getSkillType(args[1]);
+
+            if (skill == null) {
+                sender.sendMessage(LocaleLoader.getString("Commands.Skill.Invalid"));
+                return true;
+            }
+
+            if (skill.equals(SkillType.ALL)) {
+                skillName = "all skills";
+            }
+            else {
+                skillName = Misc.getCapitalized(skill.toString());
+            }
+
+            newValue = Integer.valueOf(args[2]);
+            playerProfile = Users.getProfile(args[0]);
+
+            if (playerProfile != null) {
+                Player player = playerProfile.getPlayer();
+
+                if (player.isOnline()) {
+                    player.sendMessage(ChatColor.GREEN + "Your level in " + skillName + " was set to " + newValue + "!"); //TODO: Needs more locale.
+                }
+            }
+            else {
+                playerProfile = new PlayerProfile(null, args[0], false);
+
+                if (!playerProfile.isLoaded()) {
+                    sender.sendMessage(LocaleLoader.getString("Commands.DoesNotExist"));
+                    return true;
+                }
+            }
+
+            sender.sendMessage(ChatColor.RED + skillName + " has been modified for " + args[0] + "."); //TODO: Use locale
+            playerProfile.modifySkill(skill, newValue);
+            playerProfile.save();
+            return true;
+
+        default:
+            sender.sendMessage(usage);
+            return true;
+        }
+    }
 }

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

@@ -1,39 +1,51 @@
 package com.gmail.nossr50.commands.general;
 
-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.entity.Player;
 
-import com.gmail.nossr50.Users;
-import com.gmail.nossr50.m;
-import com.gmail.nossr50.mcPermissions;
-import com.gmail.nossr50.locale.mcLocale;
+import com.gmail.nossr50.mcMMO;
+import com.gmail.nossr50.commands.CommandHelper;
+import com.gmail.nossr50.config.Config;
+import com.gmail.nossr50.runnables.SQLConversionTask;
+import com.gmail.nossr50.util.Users;
 
 public class MmoupdateCommand implements CommandExecutor {
-	@Override
-	public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
-		if (!(sender instanceof Player)) {
-			sender.sendMessage("This command does not support console useage.");
-			return true;
-		}
+    private final mcMMO plugin;
 
-		Player player = (Player) sender;
+    public MmoupdateCommand (mcMMO plugin) {
+        this.plugin = plugin;
+    }
 
-		if (!mcPermissions.getInstance().admin(player)) {
-			player.sendMessage(ChatColor.YELLOW + "[mcMMO] " + ChatColor.DARK_RED + mcLocale.getString("mcPlayerListener.NoPermission"));
-			return true;
-		}
-		player.sendMessage(ChatColor.GRAY + "Starting conversion...");
-		Users.clearUsers();
-		m.convertToMySQL();
-		for (Player x : Bukkit.getServer().getOnlinePlayers()) {
-			Users.addUser(x);
-		}
-		player.sendMessage(ChatColor.GREEN + "Conversion finished!");
+    @Override
+    public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
+        if (CommandHelper.noCommandPermissions(sender, "mcmmo.admin")) {
+            return true;
+        }
 
-		return true;
-	}
+        sender.sendMessage(ChatColor.GRAY + "Starting conversion..."); //TODO: Needs more locale.
+        Users.clearUsers();
+        convertToMySQL();
+
+        for (Player x : plugin.getServer().getOnlinePlayers()) {
+            Users.addUser(x);
+        }
+
+        sender.sendMessage(ChatColor.GREEN + "Conversion finished!"); //TODO: Needs more locale.
+
+        return true;
+    }
+
+    /**
+     * Convert FlatFile data to MySQL data.
+     */
+    private void convertToMySQL() {
+        if (!Config.getInstance().getUseMySQL()) {
+            return;
+        }
+
+        plugin.getServer().getScheduler().scheduleAsyncDelayedTask(plugin, new SQLConversionTask(plugin), 1);
+    }
 }

src/main/java/com/gmail/nossr50/commands/general/MyspawnCommand.java

@@ -1,58 +0,0 @@
-package com.gmail.nossr50.commands.general;
-
-import org.bukkit.ChatColor;
-import org.bukkit.Location;
-import org.bukkit.command.Command;
-import org.bukkit.command.CommandExecutor;
-import org.bukkit.command.CommandSender;
-import org.bukkit.entity.Player;
-
-import com.gmail.nossr50.Users;
-import com.gmail.nossr50.mcPermissions;
-import com.gmail.nossr50.config.LoadProperties;
-import com.gmail.nossr50.datatypes.PlayerProfile;
-import com.gmail.nossr50.locale.mcLocale;
-
-public class MyspawnCommand implements CommandExecutor {
-	@Override
-	public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
-		if (!LoadProperties.myspawnEnable || !LoadProperties.enableMySpawn) {
-			sender.sendMessage("This command is not enabled.");
-			return true;
-		}
-
-		if (!(sender instanceof Player)) {
-			sender.sendMessage("This command does not support console useage.");
-			return true;
-		}
-
-		Player player = (Player) sender;
-		PlayerProfile PP = Users.getProfile(player);
-
-		if (!mcPermissions.getInstance().mySpawn(player)) {
-			player.sendMessage(ChatColor.YELLOW + "[mcMMO] " + ChatColor.DARK_RED + mcLocale.getString("mcPlayerListener.NoPermission"));
-			return true;
-		}
-		if (System.currentTimeMillis() < (PP.getMySpawnATS() * 1000) + 3600000) {
-			long x = (((PP.getMySpawnATS() * 1000) + 3600000) - System.currentTimeMillis());
-			int y = (int) (x / 60000);
-			int z = (int) ((x / 1000) - (y * 60));
-			player.sendMessage(mcLocale.getString("mcPlayerListener.MyspawnTimeNotice", new Object[] { y, z }));
-			return true;
-		}
-		PP.setMySpawnATS(System.currentTimeMillis());
-		if (PP.getMySpawn(player) != null) {
-			Location mySpawn = PP.getMySpawn(player);
-
-			if (mySpawn != null) {
-				// It's done twice because it acts oddly when you are in another world
-				player.teleport(mySpawn);
-				player.teleport(mySpawn);
-			}
-		} else {
-			player.sendMessage(mcLocale.getString("mcPlayerListener.MyspawnNotExist"));
-		}
-
-		return true;
-	}
-}

src/main/java/com/gmail/nossr50/commands/general/StatsCommand.java

@@ -1,105 +0,0 @@
-package com.gmail.nossr50.commands.general;
-
-import org.bukkit.ChatColor;
-import org.bukkit.command.Command;
-import org.bukkit.command.CommandExecutor;
-import org.bukkit.command.CommandSender;
-import org.bukkit.entity.Player;
-
-import com.gmail.nossr50.Users;
-import com.gmail.nossr50.m;
-import com.gmail.nossr50.mcMMO;
-import com.gmail.nossr50.mcPermissions;
-import com.gmail.nossr50.config.LoadProperties;
-import com.gmail.nossr50.datatypes.PlayerProfile;
-import com.gmail.nossr50.datatypes.SkillType;
-import com.gmail.nossr50.locale.mcLocale;
-import com.gmail.nossr50.skills.Skills;
-
-public class StatsCommand implements CommandExecutor {
-	private final mcMMO plugin;
-
-	public StatsCommand(mcMMO instance) {
-		this.plugin = instance;
-	}
-
-	@Override
-	public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
-		if (!LoadProperties.statsEnable) {
-			sender.sendMessage("This command is not enabled.");
-			return true;
-		}
-
-		Player player = null;
-        if (sender instanceof Player) {
-            player = (Player) sender;
-        }
-
-		if (!(sender instanceof Player)) {
-			if(args.length != 1) {
-				sender.sendMessage("Usage: stats <username>");
-				return true;
-			} else {
-				Player temp = plugin.getServer().getPlayer(args[0]);
-				if(temp == null) {
-					sender.sendMessage("Could not find player: " + args[0]);
-					return true;
-				} else {
-					player = temp;
-				}
-			}
-		}
-
-		PlayerProfile PP = Users.getProfile(player);
-
-		player.sendMessage(mcLocale.getString("mcPlayerListener.YourStats"));
-
-		player.sendMessage(mcLocale.getString("mcPlayerListener.NoSkillNote"));
-
-		ChatColor header = ChatColor.GOLD;
-
-		if (Skills.hasGatheringSkills(player)) {
-			player.sendMessage(header + "-=GATHERING SKILLS=-");
-			if (mcPermissions.getInstance().excavation(player))
-				player.sendMessage(Skills.getSkillStats(mcLocale.getString("mcPlayerListener.ExcavationSkill"), PP.getSkillLevel(SkillType.EXCAVATION), PP.getSkillXpLevel(SkillType.EXCAVATION), PP.getXpToLevel(SkillType.EXCAVATION)));
-			if (mcPermissions.getInstance().fishing(player))
-				player.sendMessage(Skills.getSkillStats(mcLocale.getString("mcPlayerListener.FishingSkill"), PP.getSkillLevel(SkillType.FISHING), PP.getSkillXpLevel(SkillType.FISHING), PP.getXpToLevel(SkillType.FISHING)));
-			if (mcPermissions.getInstance().herbalism(player))
-				player.sendMessage(Skills.getSkillStats(mcLocale.getString("mcPlayerListener.HerbalismSkill"), PP.getSkillLevel(SkillType.HERBALISM), PP.getSkillXpLevel(SkillType.HERBALISM), PP.getXpToLevel(SkillType.HERBALISM)));
-			if (mcPermissions.getInstance().mining(player))
-				player.sendMessage(Skills.getSkillStats(mcLocale.getString("mcPlayerListener.MiningSkill"), PP.getSkillLevel(SkillType.MINING), PP.getSkillXpLevel(SkillType.MINING), PP.getXpToLevel(SkillType.MINING)));
-			if (mcPermissions.getInstance().woodcutting(player))
-				player.sendMessage(Skills.getSkillStats(mcLocale.getString("mcPlayerListener.WoodcuttingSkill"), PP.getSkillLevel(SkillType.WOODCUTTING), PP.getSkillXpLevel(SkillType.WOODCUTTING), PP.getXpToLevel(SkillType.WOODCUTTING)));
-		}
-		if (Skills.hasCombatSkills(player)) {
-			player.sendMessage(header + "-=COMBAT SKILLS=-");
-			if (mcPermissions.getInstance().axes(player))
-				player.sendMessage(Skills.getSkillStats(mcLocale.getString("mcPlayerListener.AxesSkill"), PP.getSkillLevel(SkillType.AXES), PP.getSkillXpLevel(SkillType.AXES), PP.getXpToLevel(SkillType.AXES)));
-			if (mcPermissions.getInstance().archery(player))
-				player.sendMessage(Skills.getSkillStats(mcLocale.getString("mcPlayerListener.ArcherySkill"), PP.getSkillLevel(SkillType.ARCHERY), PP.getSkillXpLevel(SkillType.ARCHERY), PP.getXpToLevel(SkillType.ARCHERY)));
-			// if(mcPermissions.getInstance().sorcery(player))
-			// player.sendMessage(Skills.getSkillStats(mcLocale.getString("mcPlayerListener.SorcerySkill"), PP.getSkill("sorcery"), PP.getSkill("sorceryXP"), PP.getXpToLevel("excavation")));
-			if (mcPermissions.getInstance().swords(player))
-				player.sendMessage(Skills.getSkillStats(mcLocale.getString("mcPlayerListener.SwordsSkill"), PP.getSkillLevel(SkillType.SWORDS), PP.getSkillXpLevel(SkillType.SWORDS), PP.getXpToLevel(SkillType.SWORDS)));
-			if (mcPermissions.getInstance().taming(player))
-				player.sendMessage(Skills.getSkillStats(mcLocale.getString("mcPlayerListener.TamingSkill"), PP.getSkillLevel(SkillType.TAMING), PP.getSkillXpLevel(SkillType.TAMING), PP.getXpToLevel(SkillType.TAMING)));
-			if (mcPermissions.getInstance().unarmed(player))
-				player.sendMessage(Skills.getSkillStats(mcLocale.getString("mcPlayerListener.UnarmedSkill"), PP.getSkillLevel(SkillType.UNARMED), PP.getSkillXpLevel(SkillType.UNARMED), PP.getXpToLevel(SkillType.UNARMED)));
-		}
-
-		if (Skills.hasMiscSkills(player)) {
-			player.sendMessage(header + "-=MISC SKILLS=-");
-			if (mcPermissions.getInstance().acrobatics(player))
-				player.sendMessage(Skills.getSkillStats(mcLocale.getString("mcPlayerListener.AcrobaticsSkill"), PP.getSkillLevel(SkillType.ACROBATICS), PP.getSkillXpLevel(SkillType.ACROBATICS), PP.getXpToLevel(SkillType.ACROBATICS)));
-			// if(mcPermissions.getInstance().alchemy(player))
-			// player.sendMessage(Skills.getSkillStats(mcLocale.getString("mcPlayerListener.AlchemySkill"), PP.getSkillLevel(SkillType.ALCHEMY), PP.getSkillXpLevel(SkillType.ALCHEMY), PP.getXpToLevel(SkillType.ALCHEMY)));
-			// if(mcPermissions.getInstance().enchanting(player))
-			// player.sendMessage(Skills.getSkillStats(mcLocale.getString("mcPlayerListener.EnchantingSkill"), PP.getSkillLevel(SkillType.ENCHANTING), PP.getSkillXpLevel(SkillType.ENCHANTING), PP.getXpToLevel(SkillType.ENCHANTING)));
-			if (mcPermissions.getInstance().repair(player))
-				player.sendMessage(Skills.getSkillStats(mcLocale.getString("mcPlayerListener.RepairSkill"), PP.getSkillLevel(SkillType.REPAIR), PP.getSkillXpLevel(SkillType.REPAIR), PP.getXpToLevel(SkillType.REPAIR)));
-		}
-		player.sendMessage(mcLocale.getString("mcPlayerListener.PowerLevel") + ChatColor.GREEN + (m.getPowerLevel(player)));
-
-		return true;
-	}
-}

src/main/java/com/gmail/nossr50/commands/general/WhoisCommand.java

@@ -1,106 +0,0 @@
-package com.gmail.nossr50.commands.general;
-
-import org.bukkit.ChatColor;
-import org.bukkit.command.Command;
-import org.bukkit.command.CommandExecutor;
-import org.bukkit.command.CommandSender;
-import org.bukkit.entity.Player;
-
-import com.gmail.nossr50.Users;
-import com.gmail.nossr50.m;
-import com.gmail.nossr50.mcMMO;
-import com.gmail.nossr50.mcPermissions;
-import com.gmail.nossr50.config.LoadProperties;
-import com.gmail.nossr50.datatypes.PlayerProfile;
-import com.gmail.nossr50.datatypes.SkillType;
-import com.gmail.nossr50.locale.mcLocale;
-import com.gmail.nossr50.skills.Skills;
-
-public class WhoisCommand implements CommandExecutor {
-	private final mcMMO plugin;
-
-	public WhoisCommand(mcMMO instance) {
-		this.plugin = instance;
-	}
-
-	@Override
-	public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
-		if (!LoadProperties.whoisEnable) {
-			sender.sendMessage("This command is not enabled.");
-			return true;
-		}
-
-		Player player = null;
-        if (sender instanceof Player) {
-            player = (Player) sender;
-        }
-
-		if (player != null  && !mcPermissions.getInstance().whois(player)) {
-			player.sendMessage(ChatColor.YELLOW + "[mcMMO] " + ChatColor.DARK_RED + mcLocale.getString("mcPlayerListener.NoPermission"));
-			return true;
-		}
-
-		if (!(sender instanceof Player)) {
-			sender.sendMessage("This command does not support console useage.");
-			return true;
-		}
-		
-		if (args.length < 1) {
-			player.sendMessage(ChatColor.RED + "Proper usage is /whois <playername>");
-			return true;
-		}
-		// if split[1] is a player
-		if (plugin.getServer().getPlayer(args[0]) != null) {
-			Player target = plugin.getServer().getPlayer(args[0]);
-			PlayerProfile PPt = Users.getProfile(target);
-
-			player.sendMessage(ChatColor.GREEN + "~~WHOIS RESULTS~~");
-			player.sendMessage(target.getName());
-			if (PPt.inParty())
-				player.sendMessage("Party: " + PPt.getParty());
-			player.sendMessage("Health: " + target.getHealth() + ChatColor.GRAY + " (20 is full health)");
-			player.sendMessage("OP: " + target.isOp());
-			player.sendMessage(ChatColor.GREEN + "mcMMO Stats for " + ChatColor.YELLOW + target.getName());
-
-			player.sendMessage(ChatColor.GOLD + "-=GATHERING SKILLS=-");
-			if (mcPermissions.getInstance().excavation(target))
-				player.sendMessage(Skills.getSkillStats(mcLocale.getString("mcPlayerListener.ExcavationSkill"), PPt.getSkillLevel(SkillType.EXCAVATION), PPt.getSkillXpLevel(SkillType.EXCAVATION), PPt.getXpToLevel(SkillType.EXCAVATION)));
-			if (mcPermissions.getInstance().fishing(target))
-				player.sendMessage(Skills.getSkillStats(mcLocale.getString("mcPlayerListener.FishingSkill"), PPt.getSkillLevel(SkillType.FISHING), PPt.getSkillXpLevel(SkillType.FISHING), PPt.getXpToLevel(SkillType.FISHING)));
-			if (mcPermissions.getInstance().herbalism(target))
-				player.sendMessage(Skills.getSkillStats(mcLocale.getString("mcPlayerListener.HerbalismSkill"), PPt.getSkillLevel(SkillType.HERBALISM), PPt.getSkillXpLevel(SkillType.HERBALISM), PPt.getXpToLevel(SkillType.HERBALISM)));
-			if (mcPermissions.getInstance().mining(target))
-				player.sendMessage(Skills.getSkillStats(mcLocale.getString("mcPlayerListener.MiningSkill"), PPt.getSkillLevel(SkillType.MINING), PPt.getSkillXpLevel(SkillType.MINING), PPt.getXpToLevel(SkillType.MINING)));
-			if (mcPermissions.getInstance().woodcutting(target))
-				player.sendMessage(Skills.getSkillStats(mcLocale.getString("mcPlayerListener.WoodcuttingSkill"), PPt.getSkillLevel(SkillType.WOODCUTTING), PPt.getSkillXpLevel(SkillType.WOODCUTTING), PPt.getXpToLevel(SkillType.WOODCUTTING)));
-
-			player.sendMessage(ChatColor.GOLD + "-=COMBAT SKILLS=-");
-			if (mcPermissions.getInstance().axes(target))
-				player.sendMessage(Skills.getSkillStats(mcLocale.getString("mcPlayerListener.AxesSkill"), PPt.getSkillLevel(SkillType.AXES), PPt.getSkillXpLevel(SkillType.AXES), PPt.getXpToLevel(SkillType.AXES)));
-			if (mcPermissions.getInstance().archery(player))
-				player.sendMessage(Skills.getSkillStats(mcLocale.getString("mcPlayerListener.ArcherySkill"), PPt.getSkillLevel(SkillType.ARCHERY), PPt.getSkillXpLevel(SkillType.ARCHERY), PPt.getXpToLevel(SkillType.ARCHERY)));
-			// if(mcPermissions.getInstance().sorcery(target))
-			// player.sendMessage(Skills.getSkillStats(mcLocale.getString("mcPlayerListener.SorcerySkill"), PPt.getSkill("sorcery"), PPt.getSkill("sorceryXP"), PPt.getXpToLevel("excavation")));
-			if (mcPermissions.getInstance().swords(target))
-				player.sendMessage(Skills.getSkillStats(mcLocale.getString("mcPlayerListener.SwordsSkill"), PPt.getSkillLevel(SkillType.SWORDS), PPt.getSkillXpLevel(SkillType.SWORDS), PPt.getXpToLevel(SkillType.SWORDS)));
-			if (mcPermissions.getInstance().taming(target))
-				player.sendMessage(Skills.getSkillStats(mcLocale.getString("mcPlayerListener.TamingSkill"), PPt.getSkillLevel(SkillType.TAMING), PPt.getSkillXpLevel(SkillType.TAMING), PPt.getXpToLevel(SkillType.TAMING)));
-			if (mcPermissions.getInstance().unarmed(target))
-				player.sendMessage(Skills.getSkillStats(mcLocale.getString("mcPlayerListener.UnarmedSkill"), PPt.getSkillLevel(SkillType.UNARMED), PPt.getSkillXpLevel(SkillType.UNARMED), PPt.getXpToLevel(SkillType.UNARMED)));
-
-			player.sendMessage(ChatColor.GOLD + "-=MISC SKILLS=-");
-			if (mcPermissions.getInstance().acrobatics(target))
-				player.sendMessage(Skills.getSkillStats(mcLocale.getString("mcPlayerListener.AcrobaticsSkill"), PPt.getSkillLevel(SkillType.ACROBATICS), PPt.getSkillXpLevel(SkillType.ACROBATICS), PPt.getXpToLevel(SkillType.ACROBATICS)));
-			// if(mcPermissions.getInstance().alchemy(target))
-			// player.sendMessage(Skills.getSkillStats(mcLocale.getString("mcPlayerListener.AlchemySkill"), PPt.getSkillLevel(SkillType.ALCHEMY), PPt.getSkillXpLevel(SkillType.ALCHEMY), PPt.getXpToLevel(SkillType.ALCHEMY)));
-			// if(mcPermissions.getInstance().enchanting(target))
-			// player.sendMessage(Skills.getSkillStats(mcLocale.getString("mcPlayerListener.EnchantingSkill"), PPt.getSkillLevel(SkillType.ENCHANTING), PPt.getSkillXpLevel(SkillType.ENCHANTING), PPt.getXpToLevel(SkillType.ENCHANTING)));
-			if (mcPermissions.getInstance().repair(target))
-				player.sendMessage(Skills.getSkillStats(mcLocale.getString("mcPlayerListener.RepairSkill"), PPt.getSkillLevel(SkillType.REPAIR), PPt.getSkillXpLevel(SkillType.REPAIR), PPt.getXpToLevel(SkillType.REPAIR)));
-
-			player.sendMessage(mcLocale.getString("mcPlayerListener.PowerLevel") + ChatColor.GREEN + (m.getPowerLevel(target)));
-		}
-
-		return true;
-	}
-}

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

@@ -1,128 +1,93 @@
 package com.gmail.nossr50.commands.general;
 
-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.entity.Player;
 
-import com.gmail.nossr50.m;
-import com.gmail.nossr50.mcPermissions;
-import com.gmail.nossr50.config.LoadProperties;
-import com.gmail.nossr50.locale.mcLocale;
+import com.gmail.nossr50.mcMMO;
+import com.gmail.nossr50.commands.CommandHelper;
+import com.gmail.nossr50.config.Config;
+import com.gmail.nossr50.locale.LocaleLoader;
+import com.gmail.nossr50.util.Misc;
 
 public class XprateCommand implements CommandExecutor {
-	private static int oldrate = LoadProperties.xpGainMultiplier;
-	
-	public static boolean xpevent = false;
-	
-	@Override
-	public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
-		if (!LoadProperties.xprateEnable) {
-			sender.sendMessage("This command is not enabled.");
-			return true;
-		}
+    private final mcMMO plugin;
+    private static int oldrate = Config.getInstance().xpGainMultiplier;
+    public static boolean xpevent = false;
 
-		if (!(sender instanceof Player)) {
-			if(args.length <= 0)
-			{
-				System.out.println(mcLocale.getString("Commands.xprate.proper", new Object[] {"xprate"}));
-				System.out.println(mcLocale.getString("Commands.xprate.proper2", new Object[] {"xprate"}));
-			}
-			
-			if(args.length == 1 && args[0].equalsIgnoreCase("reset"))
-			{
-				if(xpevent)
-				{
-					for(Player x : Bukkit.getServer().getOnlinePlayers())
-						x.sendMessage(mcLocale.getString("Commands.xprate.over"));
-					xpevent = !xpevent;
-					LoadProperties.xpGainMultiplier = oldrate;
-				} else
-				{
-					LoadProperties.xpGainMultiplier = oldrate;
-				}
-			}
-			
-			if(args.length >= 1 && m.isInt(args[0]))
-			{
-				oldrate = LoadProperties.xpGainMultiplier;
-				
-				if(args.length >= 2 && (args[1].equalsIgnoreCase("true") || args[1].equalsIgnoreCase("false")))
-				{
-					if(args[1].equalsIgnoreCase("true"))
-						xpevent = true;
-					else
-						xpevent = false;
-				} else
-				{
-					System.out.println(mcLocale.getString("Commands.xprate.proper3"));
-					return true;
-				}
-				LoadProperties.xpGainMultiplier = m.getInt(args[0]);
-				if(xpevent = true)
-					for(Player x : Bukkit.getServer().getOnlinePlayers())
-					{
-						x.sendMessage(ChatColor.GOLD+"XP EVENT FOR mcMMO HAS STARTED!");
-						x.sendMessage(ChatColor.GOLD+"mcMMO XP RATE IS NOW "+LoadProperties.xpGainMultiplier+"x!!");
-					}
-				
-				System.out.println("The XP RATE was modified to "+LoadProperties.xpGainMultiplier);
-			}
-			
-			return true;
-		}
-		
-		Player player = (Player) sender;
-		
-		if(!mcPermissions.getInstance().admin(player))
-		{
-			player.sendMessage(ChatColor.YELLOW+"[mcMMO] "+ChatColor.DARK_RED +mcLocale.getString("mcPlayerListener.NoPermission"));  
-			return true;
-		}
-		if(args.length <= 0)
-		{
-			player.sendMessage(mcLocale.getString("Commands.xprate.proper", new Object[] {"xprate"}));
-			player.sendMessage(mcLocale.getString("Commands.xprate.proper2", new Object[] {"xprate"}));
-		}
-		if(args.length == 1 && args[0].equalsIgnoreCase("reset"))
-		{
-			if(xpevent)
-			{
-				for(Player x : Bukkit.getServer().getOnlinePlayers())
-					x.sendMessage(mcLocale.getString("Commands.xprate.over"));
-				xpevent = !xpevent;
-				LoadProperties.xpGainMultiplier = oldrate;
-			} else
-			{
-				LoadProperties.xpGainMultiplier = oldrate;
-			}
-		}
-		if(args.length >= 1 && m.isInt(args[0]))
-		{
-			oldrate = LoadProperties.xpGainMultiplier;
-			
-			if(args.length >= 2 && (args[1].equalsIgnoreCase("true") || args[1].equalsIgnoreCase("false")))
-			{
-				if(args[1].equalsIgnoreCase("true"))
-					xpevent = true;
-				else
-					xpevent = false;
-			} else
-			{
-				player.sendMessage(mcLocale.getString("Commands.xprate.proper3"));
-				return true;
-			}
-			LoadProperties.xpGainMultiplier = m.getInt(args[0]);
-			if(xpevent = true)
-				for(Player x : Bukkit.getServer().getOnlinePlayers())
-				{
-					x.sendMessage(mcLocale.getString("Commands.xprate.started"));
-					x.sendMessage(mcLocale.getString("Commands.xprate.started2", new Object[] {LoadProperties.xpGainMultiplier}));
-				}
-		}
-		
-		return true;
-	}
+    public XprateCommand (mcMMO plugin) {
+        this.plugin = plugin;
+    }
+
+    @Override
+    public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
+        String usage1 = LocaleLoader.getString("Commands.xprate.proper.0");
+        String usage2 = LocaleLoader.getString("Commands.xprate.proper.1");
+        String usage3 = LocaleLoader.getString("Commands.xprate.proper.2");
+
+        if (CommandHelper.noCommandPermissions(sender, "mcmmo.admin")) {
+            return true;
+        }
+
+        switch (args.length) {
+        case 1:
+            if (args[0].equalsIgnoreCase("reset")) {
+                if (xpevent) {
+                    for (Player x : plugin.getServer().getOnlinePlayers()) {
+                        x.sendMessage(LocaleLoader.getString("Commands.xprate.over"));
+                    }
+
+                    xpevent = !xpevent;
+                    Config.getInstance().xpGainMultiplier = oldrate;
+                }
+                else {
+                    Config.getInstance().xpGainMultiplier = oldrate;
+                }
+            }
+            else if (Misc.isInt(args[0])) {
+                sender.sendMessage(usage3);
+            }
+            else {
+                sender.sendMessage(usage2);
+            }
+
+            return true;
+
+        case 2:
+            if (Misc.isInt(args[0])) {
+                oldrate = Config.getInstance().xpGainMultiplier;
+
+                if (args[1].equalsIgnoreCase("true") || args[1].equalsIgnoreCase("false")) {
+                    xpevent = Boolean.valueOf(args[1]);
+                }
+                else {
+                    sender.sendMessage(usage3);
+                }
+
+                Config.getInstance().xpGainMultiplier = Misc.getInt(args[0]);
+
+                if (xpevent) {
+                    for (Player x : plugin.getServer().getOnlinePlayers()) {
+                        x.sendMessage(LocaleLoader.getString("Commands.xprate.started.0"));
+                        x.sendMessage(LocaleLoader.getString("Commands.xprate.started.1", new Object[] {Config.getInstance().xpGainMultiplier}));
+                    }
+                }
+                else {
+                    sender.sendMessage("The XP RATE was modified to " + Config.getInstance().xpGainMultiplier); //TODO: Locale
+                }
+            }
+            else {
+                sender.sendMessage(usage1);
+                sender.sendMessage(usage2);
+            }
+
+            return true;
+
+        default:
+            sender.sendMessage(usage1);
+            sender.sendMessage(usage2);
+            return true;
+        }
+    }
 }

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

@@ -5,44 +5,34 @@ import org.bukkit.command.CommandExecutor;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 
-import com.gmail.nossr50.Users;
-import com.gmail.nossr50.config.LoadProperties;
+import com.gmail.nossr50.commands.CommandHelper;
 import com.gmail.nossr50.datatypes.PlayerProfile;
-import com.gmail.nossr50.locale.mcLocale;
+import com.gmail.nossr50.locale.LocaleLoader;
+import com.gmail.nossr50.util.Users;
 
 public class McabilityCommand implements CommandExecutor {
-	@Override
-	public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
-        Player player = null;
-        if (sender instanceof Player) {
-            player = (Player) sender;
+
+    @Override
+    public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
+        if (CommandHelper.noConsoleUsage(sender)) {
+            return true;
         }
 
-		if (player != null && player.hasPermission("mcmmo.commands.ability")) {
-			sender.sendMessage("This command requires permissions.");
-			return true;
-		}
+        if (CommandHelper.noCommandPermissions(sender, "mcmmo.commands.ability")) {
+            return true;
+        }
 
-		if (!LoadProperties.mcabilityEnable) {
-			sender.sendMessage("This command is not enabled.");
-			return true;
-		}
+        PlayerProfile PP = Users.getProfile((Player) sender);
 
-		if (!(sender instanceof Player)) {
-			sender.sendMessage("This command does not support console useage.");
-			return true;
-		}
+        if (PP.getAbilityUse()) {
+            sender.sendMessage(LocaleLoader.getString("Commands.Ability.Off"));
+        }
+        else {
+            sender.sendMessage(LocaleLoader.getString("Commands.Ability.On"));
+        }
 
-		PlayerProfile PP = Users.getProfile(player);
+        PP.toggleAbilityUse();
 
-		if (PP.getAbilityUse()) {
-			player.sendMessage(mcLocale.getString("mcPlayerListener.AbilitiesOff"));
-			PP.toggleAbilityUse();
-		} else {
-			player.sendMessage(mcLocale.getString("mcPlayerListener.AbilitiesOn"));
-			PP.toggleAbilityUse();
-		}
-
-		return true;
-	}
+        return true;
+    }
 }

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

@@ -6,68 +6,67 @@ import org.bukkit.command.CommandExecutor;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 
-import com.gmail.nossr50.mcPermissions;
-import com.gmail.nossr50.config.LoadProperties;
-import com.gmail.nossr50.locale.mcLocale;
+import com.gmail.nossr50.commands.CommandHelper;
+import com.gmail.nossr50.locale.LocaleLoader;
+import com.gmail.nossr50.util.Permissions;
 
+//TODO: Rework this whole thing. It's ugly. Also is missing all the admin & spout commands.
 public class MccCommand implements CommandExecutor {
-	@Override
-	public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
-		if (!LoadProperties.mccEnable) {
-			sender.sendMessage("This command is not enabled.");
-			return true;
-		}
 
-		if (!(sender instanceof Player)) {
-			sender.sendMessage("This command does not support console useage.");
-			return true;
-		}
+    @Override
+    public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
+        if (CommandHelper.noConsoleUsage(sender)) {
+            return true;
+        }
 
-		Player player = (Player) sender;
+        Player player = (Player) sender;
 
-		player.sendMessage(ChatColor.RED + "---[]" + ChatColor.YELLOW + "mcMMO Commands" + ChatColor.RED + "[]---");
+        player.sendMessage(ChatColor.RED + "---[]" + ChatColor.YELLOW + "mcMMO Commands" + ChatColor.RED + "[]---"); //TODO: Needs more locale.
 
-		if (mcPermissions.getInstance().party(player)) {
-			player.sendMessage(mcLocale.getString("m.mccPartyCommands"));
-			player.sendMessage("/party " + mcLocale.getString("m.mccParty"));
-			player.sendMessage("/party q " + mcLocale.getString("m.mccPartyQ"));
+        if (Permissions.getInstance().party(player)) {
+            player.sendMessage(LocaleLoader.getString("Commands.Party.Commands"));
+            player.sendMessage("/party " + LocaleLoader.getString("Commands.Party"));
+            player.sendMessage("/party q " + LocaleLoader.getString("Commands.Party.Quit"));
 
-			if (mcPermissions.getInstance().partyChat(player))
-				player.sendMessage("/p " + mcLocale.getString("m.mccPartyToggle"));
+            if (Permissions.getInstance().partyChat(player)) {
+                player.sendMessage("/p " + LocaleLoader.getString("Commands.Party.Toggle"));
+            }
 
-			player.sendMessage("/invite " + mcLocale.getString("m.mccPartyInvite"));
-			player.sendMessage("/invite " + mcLocale.getString("m.mccPartyAccept"));
+            player.sendMessage("/invite " + LocaleLoader.getString("Commands.Party.Invite"));
+            player.sendMessage("/accept " + LocaleLoader.getString("Commands.Party.Accept"));
 
-			if (mcPermissions.getInstance().partyTeleport(player))
-				player.sendMessage("/ptp " + mcLocale.getString("m.mccPartyTeleport"));
-		}
-		player.sendMessage(mcLocale.getString("m.mccOtherCommands"));
-		player.sendMessage("/stats " + ChatColor.RED + " " + mcLocale.getString("m.mccStats"));
-		player.sendMessage("/mctop <skillname> <page> " + ChatColor.RED + mcLocale.getString("m.mccLeaderboards"));
+            if (Permissions.getInstance().partyTeleport(player)) {
+                player.sendMessage("/ptp " + LocaleLoader.getString("Commands.Party.Teleport"));
+            }
+        }
 
-		if (mcPermissions.getInstance().mySpawn(player)) {
-			player.sendMessage("/myspawn " + ChatColor.RED + mcLocale.getString("m.mccMySpawn"));
-			player.sendMessage("/clearmyspawn " + ChatColor.RED + mcLocale.getString("m.mccClearMySpawn"));
-		}
+        player.sendMessage(LocaleLoader.getString("Commands.Other"));
+        player.sendMessage("/mcstats " + LocaleLoader.getString("Commands.Stats"));
+        player.sendMessage("/mctop " + LocaleLoader.getString("Commands.Leaderboards"));
 
-		if (mcPermissions.getInstance().mcAbility(player))
-			player.sendMessage("/mcability" + ChatColor.RED + " " + mcLocale.getString("m.mccToggleAbility"));
+        if (Permissions.getInstance().mcAbility(player)) {
+            player.sendMessage("/mcability " + LocaleLoader.getString("Commands.ToggleAbility"));
+        }
 
-		if (mcPermissions.getInstance().adminChat(player))
-			player.sendMessage("/a " + ChatColor.RED + mcLocale.getString("m.mccAdminToggle"));
+        if (Permissions.getInstance().adminChat(player)) {
+            player.sendMessage("/a " + LocaleLoader.getString("Commands.AdminToggle"));
+        }
 
-		if (mcPermissions.getInstance().whois(player))
-			player.sendMessage("/whois " + mcLocale.getString("m.mccWhois"));
+        if (Permissions.getInstance().inspect(player)) {
+            player.sendMessage("/inspect " + LocaleLoader.getString("Commands.Inspect"));
+        }
 
-		if (mcPermissions.getInstance().mmoedit(player))
-			player.sendMessage("/mmoedit" + mcLocale.getString("m.mccMmoedit"));
+        if (Permissions.getInstance().mmoedit(player)) {
+            player.sendMessage("/mmoedit " + LocaleLoader.getString("Commands.mmoedit"));
+        }
 
-		if (mcPermissions.getInstance().mcgod(player))
-			player.sendMessage("/mcgod" + ChatColor.RED + " " + mcLocale.getString("m.mccMcGod"));
+        if (Permissions.getInstance().mcgod(player)) {
+            player.sendMessage("/mcgod " + LocaleLoader.getString("Commands.mcgod"));
+        }
 
-		player.sendMessage(mcLocale.getString("m.mccSkillInfo"));
-		player.sendMessage("/mcmmo " + mcLocale.getString("m.mccModDescription"));
+        player.sendMessage(LocaleLoader.getString("Commands.SkillInfo"));
+        player.sendMessage("/mcmmo " + LocaleLoader.getString("Commands.ModDescription"));
 
-		return true;
-	}
+        return true;
+    }
 }

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

@@ -1,48 +1,38 @@
 package com.gmail.nossr50.commands.mc;
 
-import org.bukkit.ChatColor;
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandExecutor;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 
-import com.gmail.nossr50.Users;
-import com.gmail.nossr50.mcPermissions;
-import com.gmail.nossr50.config.LoadProperties;
+import com.gmail.nossr50.commands.CommandHelper;
 import com.gmail.nossr50.datatypes.PlayerProfile;
-import com.gmail.nossr50.locale.mcLocale;
+import com.gmail.nossr50.locale.LocaleLoader;
+import com.gmail.nossr50.util.Users;
 
 public class McgodCommand implements CommandExecutor {
-	@Override
-	public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
-		if (!LoadProperties.mcgodEnable) {
-			sender.sendMessage("This command is not enabled.");
-			return true;
-		}
 
-		if (!(sender instanceof Player)) {
-			sender.sendMessage("This command does not support console useage.");
-			return true;
-		}
+    @Override
+    public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
+        if (CommandHelper.noConsoleUsage(sender)) {
+            return true;
+        }
 
-		Player player = (Player) sender;
-		PlayerProfile PP = Users.getProfile(player);
+        if (CommandHelper.noCommandPermissions(sender, "mcmmo.tools.mcgod")) {
+            return true;
+        }
 
-		if (!mcPermissions.getInstance().mcgod(player)) {
-			player.sendMessage(ChatColor.YELLOW + "[mcMMO] " + ChatColor.DARK_RED + mcLocale.getString("mcPlayerListener.NoPermission"));
-			return true;
-		}
+        PlayerProfile PP = Users.getProfile((Player) sender);
 
-        if (mcPermissions.getInstance().mcgod(player)) {
-			if (PP.getGodMode()) {
-				player.sendMessage(mcLocale.getString("mcPlayerListener.GodModeDisabled"));
-				PP.toggleGodMode();
-			} else {
-				player.sendMessage(mcLocale.getString("mcPlayerListener.GodModeEnabled"));
-				PP.toggleGodMode();
-			}
-		}
+        if (PP.getGodMode()) {
+            sender.sendMessage(LocaleLoader.getString("Commands.GodMode.Disabled"));
+        }
+        else {
+            sender.sendMessage(LocaleLoader.getString("Commands.GodMode.Enabled"));
+        }
 
-		return true;
-	}
+        PP.toggleGodMode();
+
+        return true;
+    }
 }

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

@@ -1,48 +1,34 @@
 package com.gmail.nossr50.commands.mc;
 
 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.bukkit.entity.Player;
 import org.getspout.spoutapi.player.SpoutPlayer;
 
-import com.gmail.nossr50.config.LoadProperties;
-import com.gmail.nossr50.locale.mcLocale;
+import com.gmail.nossr50.mcMMO;
+import com.gmail.nossr50.config.Config;
+import com.gmail.nossr50.locale.LocaleLoader;
 
 public class McmmoCommand implements CommandExecutor {
+    @Override
+    public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
+        String description = LocaleLoader.getString("mcMMO.Description");
+        String[] mcSplit = description.split(",");
+        sender.sendMessage(mcSplit);
 
-	@Override
-	public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
-		if (!LoadProperties.mcmmoEnable) {
-			sender.sendMessage("This command is not enabled.");
-			return true;
-		}
+        if (Config.getInstance().getDonateMessageEnabled()) {
+            if (mcMMO.spoutEnabled && sender instanceof SpoutPlayer) {
+                SpoutPlayer sPlayer = (SpoutPlayer) sender;
 
-		if (!(sender instanceof Player)) {
-			sender.sendMessage("This command does not support console useage.");
-			return true;
-		}
+                sPlayer.sendNotification(ChatColor.YELLOW + "[mcMMO]" + ChatColor.GOLD + " Donate!", ChatColor.GREEN + "mcmmodev@gmail.com", Material.DIAMOND);
+            }
 
-		Player player = (Player) sender;
+            sender.sendMessage(ChatColor.DARK_AQUA + "Donation Info:");
+            sender.sendMessage(ChatColor.GOLD + " - " + ChatColor.GREEN + "mcmmodev@gmail.com" + ChatColor.GOLD + " Paypal");
+        }
 
-		player.sendMessage(ChatColor.RED + "-----[]" + ChatColor.GREEN + "mcMMO" + ChatColor.RED + "[]-----");
-		String description = mcLocale.getString("mcMMO.Description", new Object[] { "mcc" });
-		String[] mcSplit = description.split(",");
-
-		for (String x : mcSplit) {
-			player.sendMessage(x);
-		}
-
-		if (LoadProperties.spoutEnabled && player instanceof SpoutPlayer) {
-			SpoutPlayer sPlayer = (SpoutPlayer) player;
-			if (LoadProperties.donateMessage)
-				sPlayer.sendMessage(ChatColor.GREEN + "[mcMMO] Donate! Paypal theno1yeti@gmail.com");
-		} else {
-			if (LoadProperties.donateMessage)
-				player.sendMessage(ChatColor.GREEN + "If you like my work you can donate via Paypal: theno1yeti@gmail.com");
-		}
-
-		return true;
-	}
+        return true;
+    }
 }

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

@@ -1,72 +1,75 @@
 package com.gmail.nossr50.commands.mc;
 
 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.Users;
 import com.gmail.nossr50.mcMMO;
-import com.gmail.nossr50.mcPermissions;
-import com.gmail.nossr50.config.LoadProperties;
+import com.gmail.nossr50.commands.CommandHelper;
 import com.gmail.nossr50.datatypes.PlayerProfile;
-import com.gmail.nossr50.locale.mcLocale;
+import com.gmail.nossr50.locale.LocaleLoader;
+import com.gmail.nossr50.util.Users;
 
 public class McrefreshCommand implements CommandExecutor {
-	private final mcMMO plugin;
+    private final mcMMO plugin;
 
-	public McrefreshCommand(mcMMO instance) {
-		this.plugin = instance;
-	}
+    public McrefreshCommand(mcMMO instance) {
+        this.plugin = instance;
+    }
 
-	@Override
-	public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
-		if (!LoadProperties.mcrefreshEnable) {
-			sender.sendMessage("This command is not enabled.");
-			return true;
-		}
+    @Override
+    public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
+        OfflinePlayer player;
+        PlayerProfile PP;
+        String usage = ChatColor.RED + "Proper usage is /mcrefresh [player]"; //TODO: Needs more locale
 
-		if (!(sender instanceof Player)) {
-			sender.sendMessage("This command does not support console useage.");
-			return true;
-		}
+        if (CommandHelper.noCommandPermissions(sender, "mcmmo.tools.mcrefresh")) {
+            return true;
+        }
 
-		Player player = (Player) sender;
-		PlayerProfile PP = Users.getProfile(player);
+        switch (args.length) {
+        case 0:
+            if (sender instanceof Player) {
+                player = (Player) sender;
+                PP = Users.getProfile(player);
+            }
+            else {
+                sender.sendMessage(usage);
+                return true;
+            }
+            break;
 
-		if (!mcPermissions.getInstance().mcrefresh(player)) {
-			player.sendMessage(ChatColor.YELLOW + "[mcMMO] " + ChatColor.DARK_RED + mcLocale.getString("mcPlayerListener.NoPermission"));
-			return true;
-		}
-		if (args.length >= 1 && (plugin.getServer().getPlayer(args[0]) != null)) {
-			player.sendMessage("You have refreshed " + args[0] + "'s cooldowns!");
-			player = plugin.getServer().getPlayer(args[0]);
-		}
+        case 1:
+            player = plugin.getServer().getOfflinePlayer(args[0]);
+            PP = Users.getProfile(player);
+            String playerName = player.getName();
 
-		/*
-		 * PREP MODES
-		 */
-		PP = Users.getProfile(player);
-		PP.setRecentlyHurt((long) 0);
-		PP.setHoePreparationMode(false);
-		PP.setAxePreparationMode(false);
-		PP.setFistsPreparationMode(false);
-		PP.setSwordsPreparationMode(false);
-		PP.setPickaxePreparationMode(false);
+            if (!PP.isLoaded()) {
+                sender.sendMessage(LocaleLoader.getString("Commands.DoesNotExist"));
+                return true;
+            }
 
+            sender.sendMessage("You have refreshed " + playerName + "'s cooldowns!"); //TODO: Use locale
 
-		//RESET COOLDOWNS
-		PP.resetCooldowns();
-		PP.setGreenTerraMode(false);
-		PP.setGigaDrillBreakerMode(false);
-		PP.setSerratedStrikesMode(false);
-		PP.setSuperBreakerMode(false);
-		PP.setTreeFellerMode(false);
-		PP.setBerserkMode(false);
+            break;
 
-		player.sendMessage(mcLocale.getString("mcPlayerListener.AbilitiesRefreshed"));
+        default:
+            sender.sendMessage(usage);
+            return true;
+        }
 
-		return true;
-	}
+        PP.setRecentlyHurt(0);
+        PP.resetCooldowns();
+        PP.resetToolPrepMode();
+        PP.resetAbilityMode();
+
+        if (player.isOnline()) {
+            ((Player) player).sendMessage(LocaleLoader.getString("Ability.Generic.Refresh"));
+        }
+
+        return true;
+    }
 }

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

@@ -0,0 +1,149 @@
+package com.gmail.nossr50.commands.mc;
+
+import java.io.BufferedReader;
+import java.io.FileReader;
+import java.io.FileWriter;
+
+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.commands.CommandHelper;
+import com.gmail.nossr50.config.Config;
+import com.gmail.nossr50.datatypes.PlayerProfile;
+import com.gmail.nossr50.locale.LocaleLoader;
+import com.gmail.nossr50.util.Users;
+
+public class McremoveCommand implements CommandExecutor {
+    private final String location;
+    private final mcMMO plugin;
+
+    public McremoveCommand (mcMMO plugin) {
+        this.plugin = plugin;
+        this.location = mcMMO.usersFile;
+    }
+
+    @Override
+    public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
+        String playerName;
+        String tablePrefix = Config.getInstance().getMySQLTablePrefix();
+        String databaseName = Config.getInstance().getMySQLDatabaseName();
+        String usage = ChatColor.RED + "Proper usage is /mcremove <player>"; //TODO: Needs more locale.
+        String success;
+
+        if (CommandHelper.noCommandPermissions(sender, "mcmmo.tools.mcremove")) {
+            return true;
+        }
+
+        switch (args.length) {
+        case 1:
+            playerName = args[0];
+            success = ChatColor.GREEN + playerName + " was successfully removed from the database!"; //TODO: Locale
+            break;
+
+        default:
+            sender.sendMessage(usage);
+            return true;
+        }
+
+        /* MySQL */
+        if (Config.getInstance().getUseMySQL()) {
+            int userId = 0;
+            userId = mcMMO.database.getInt("SELECT id FROM " + tablePrefix + "users WHERE user = '" + playerName + "'");
+
+            if (userId > 0) {
+                mcMMO.database.write("DELETE FROM "
+                        + databaseName + "."
+                        + tablePrefix + "users WHERE "
+                        + tablePrefix + "users.id=" + userId);
+
+                mcMMO.database.write("DELETE FROM "
+                        + databaseName + "."
+                        + tablePrefix + "cooldowns WHERE "
+                        + tablePrefix + "cooldowns.user_id=" + userId);
+
+                mcMMO.database.write("DELETE FROM "
+                        + databaseName + "."
+                        + tablePrefix + "huds WHERE "
+                        + tablePrefix + "huds.user_id=" + userId);
+
+                mcMMO.database.write("DELETE FROM "
+                        + databaseName + "."
+                        + tablePrefix + "skills WHERE "
+                        + tablePrefix + "skills.user_id=" + userId);
+
+                mcMMO.database.write("DELETE FROM "
+                        + databaseName + "."
+                        + tablePrefix + "experience WHERE "
+                        + tablePrefix + "experience.user_id=" + userId);
+
+                sender.sendMessage(success);
+
+            }
+            else {
+                sender.sendMessage(LocaleLoader.getString("Commands.DoesNotExist"));
+            }
+        }
+        else {
+            if (removeFlatFileUser(playerName)) {
+                sender.sendMessage(success);
+            }
+            else {
+                sender.sendMessage(LocaleLoader.getString("Commands.DoesNotExist"));
+            }
+        }
+
+        //Force PlayerProfile stuff to update
+        OfflinePlayer player = plugin.getServer().getOfflinePlayer(playerName);
+        PlayerProfile playerProfile = Users.getProfile(player);
+
+        if (playerProfile != null) {
+            Users.getProfiles().remove(playerProfile);
+
+            if (player.isOnline()) {
+                Users.addUser((Player) player);
+            }
+        }
+
+        return true;
+    }
+
+    private boolean removeFlatFileUser(String playerName) {
+        boolean worked = false;
+
+        try {
+            FileReader file = new FileReader(location);
+            BufferedReader in = new BufferedReader(file);
+            StringBuilder writer = new StringBuilder();
+            String line = "";
+
+            while ((line = in.readLine()) != null) {
+
+                /* Write out the same file but when we get to the player we want to remove, we skip his line. */
+                if (!line.split(":")[0].equalsIgnoreCase(playerName)) {
+                    writer.append(line).append("\r\n");
+                }
+                else {
+                    System.out.println("User found, removing...");
+                    worked = true;
+                    continue; //Skip the player
+                }
+            }
+
+            in.close();
+            FileWriter out = new FileWriter(location); //Write out the new file
+            out.write(writer.toString());
+            out.close();
+
+            return worked;
+        }
+        catch (Exception e) {
+            plugin.getLogger().severe("Exception while reading " + location + " (Are you sure you formatted it correctly?)" + e.toString());
+            return worked;
+        }
+    }
+}

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

@@ -7,193 +7,149 @@ import org.bukkit.ChatColor;
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandExecutor;
 import org.bukkit.command.CommandSender;
-import org.bukkit.entity.Player;
 
-import com.gmail.nossr50.Leaderboard;
-import com.gmail.nossr50.m;
 import com.gmail.nossr50.mcMMO;
-import com.gmail.nossr50.config.LoadProperties;
-import com.gmail.nossr50.datatypes.SkillType;
-import com.gmail.nossr50.locale.mcLocale;
-import com.gmail.nossr50.skills.Skills;
+import com.gmail.nossr50.config.Config;
+import com.gmail.nossr50.locale.LocaleLoader;
+import com.gmail.nossr50.util.Leaderboard;
+import com.gmail.nossr50.util.Misc;
+import com.gmail.nossr50.util.Skills;
 
 public class MctopCommand implements CommandExecutor {
-	@Override
-	public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
-		if (!LoadProperties.mctopEnable) {
-			sender.sendMessage("This command is not enabled.");
-			return true;
-		}
 
-		if (!(sender instanceof Player)) {
-			sender.sendMessage("This command does not support console useage.");
-			return true;
-		}
+    @Override
+    public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
+        String usage = ChatColor.RED + "Proper usage is /mctop [skill] [page]"; //TODO: Needs more locale.
 
-		Player player = (Player) sender;
+        if (!Config.getInstance().getUseMySQL()) {
 
-		if (LoadProperties.useMySQL == false) {
-			/*
-			 * POWER LEVEL INFO RETRIEVAL
-			 */
-			if (args.length == 0) {
-				int p = 1;
-				String[] info = Leaderboard.retrieveInfo(SkillType.ALL.toString(), p);
-				player.sendMessage(mcLocale.getString("mcPlayerListener.PowerLevelLeaderboard"));
-				int n = 1 * p; // Position
-				for (String x : info) {
-					if (x != null) {
-						String digit = String.valueOf(n);
-						if (n < 10)
-							digit = "0" + String.valueOf(n);
-						String[] splitx = x.split(":");
-						// Format: 1. Playername - skill value
-						player.sendMessage(digit + ". " + ChatColor.GREEN + splitx[1] + " - " + ChatColor.WHITE + splitx[0]);
-						n++;
-					}
-				}
-			}
-			if (args.length >= 1 && m.isInt(args[0])) {
-				int p = 1;
-				// Grab page value if specified
-				if (args.length >= 1) {
-					if (m.isInt(args[0])) {
-						p = Integer.valueOf(args[0]);
-					}
-				}
-				int pt = p;
-				if (p > 1) {
-					pt -= 1;
-					pt += (pt * 10);
-					pt = 10;
-				}
-				String[] info = Leaderboard.retrieveInfo(SkillType.ALL.toString(), p);
-				player.sendMessage(mcLocale.getString("mcPlayerListener.PowerLevelLeaderboard"));
-				int n = 1 * pt; // Position
-				for (String x : info) {
-					if (x != null) {
-						String digit = String.valueOf(n);
-						if (n < 10)
-							digit = "0" + String.valueOf(n);
-						String[] splitx = x.split(":");
-						// Format: 1. Playername - skill value
-						player.sendMessage(digit + ". " + ChatColor.GREEN + splitx[1] + " - " + ChatColor.WHITE + splitx[0]);
-						n++;
-					}
-				}
-			}
-			/*
-			 * SKILL SPECIFIED INFO RETRIEVAL
-			 */
-			if (args.length >= 1 && Skills.isSkill(args[0])) {
-				int p = 1;
-				// Grab page value if specified
-				if (args.length >= 2) {
-					if (m.isInt(args[1])) {
-						p = Integer.valueOf(args[1]);
-					}
-				}
-				int pt = p;
-				if (p > 1) {
-					pt -= 1;
-					pt += (pt * 10);
-					pt = 10;
-				}
-				String firstLetter = args[0].substring(0, 1); // Get first letter
-				String remainder = args[0].substring(1); // Get remainder of word.
-				String capitalized = firstLetter.toUpperCase() + remainder.toLowerCase();
+            switch (args.length) {
+            case 0:
+                flatfileDisplay(1, "ALL", sender);
+                return true;
 
-				String[] info = Leaderboard.retrieveInfo(args[0].toUpperCase(), p);
-				player.sendMessage(mcLocale.getString("mcPlayerListener.SkillLeaderboard", new Object[] { capitalized }));
-				int n = 1 * pt; // Position
-				for (String x : info) {
-					if (x != null) {
-						String digit = String.valueOf(n);
-						if (n < 10)
-							digit = "0" + String.valueOf(n);
-						String[] splitx = x.split(":");
-						// Format: 1. Playername - skill value
-						player.sendMessage(digit + ". " + ChatColor.GREEN + splitx[1] + " - " + ChatColor.WHITE + splitx[0]);
-						n++;
-					}
-				}
-			}
-		} else {
-			/*
-			 * MYSQL LEADERBOARDS
-			 */
-			String powerlevel = "taming+mining+woodcutting+repair+unarmed+herbalism+excavation+archery+swords+axes+acrobatics+fishing";
-			if (args.length >= 1 && Skills.isSkill(args[0])) {
-				/*
-				 * Create a nice consistent capitalized leaderboard name
-				 */
-				String lowercase = args[0].toLowerCase(); // For the query
-				String firstLetter = args[0].substring(0, 1); // Get first letter
-				String remainder = args[0].substring(1); // Get remainder of word.
-				String capitalized = firstLetter.toUpperCase() + remainder.toLowerCase();
+            case 1:
+                if (Misc.isInt(args[0])) {
+                    flatfileDisplay(Integer.valueOf(args[0]), "ALL", sender);
+                }
+                else if (Skills.isSkill(args[0])) {
+                    flatfileDisplay(1, args[0].toUpperCase(), sender);
+                }
+                else {
+                    sender.sendMessage(LocaleLoader.getString("Commands.Skill.Invalid"));
+                }
 
-				player.sendMessage(mcLocale.getString("mcPlayerListener.SkillLeaderboard", new Object[] { capitalized }));
-				if (args.length >= 2 && m.isInt(args[1])) {
-					int n = 1; // For the page number
-					int n2 = Integer.valueOf(args[1]);
-					if (n2 > 1) {
-						// Figure out the 'page' here
-						n = 10;
-						n = n * (n2 - 1);
-					}
-					// If a page number is specified
-					HashMap<Integer, ArrayList<String>> userslist = mcMMO.database.Read("SELECT " + lowercase + ", user_id FROM " + LoadProperties.MySQLtablePrefix + "skills WHERE " + lowercase + " > 0 ORDER BY `" + LoadProperties.MySQLtablePrefix + "skills`.`" + lowercase + "` DESC ");
+                return true;
 
-					for (int i = n; i <= n + 10; i++) {
-						if (i > userslist.size() || mcMMO.database.Read("SELECT user FROM " + LoadProperties.MySQLtablePrefix + "users WHERE id = '" + Integer.valueOf(userslist.get(i).get(1)) + "'") == null)
-							break;
-						HashMap<Integer, ArrayList<String>> username = mcMMO.database.Read("SELECT user FROM " + LoadProperties.MySQLtablePrefix + "users WHERE id = '" + Integer.valueOf(userslist.get(i).get(1)) + "'");
-						player.sendMessage(String.valueOf(i) + ". " + ChatColor.GREEN + userslist.get(i).get(0) + " - " + ChatColor.WHITE + username.get(1).get(0));
-					}
-					return true;
-				}
-				// If no page number is specified
-				HashMap<Integer, ArrayList<String>> userslist = mcMMO.database.Read("SELECT " + lowercase + ", user_id FROM " + LoadProperties.MySQLtablePrefix + "skills WHERE " + lowercase + " > 0 ORDER BY `" + LoadProperties.MySQLtablePrefix + "skills`.`" + lowercase + "` DESC ");
-				for (int i = 1; i <= 10; i++) { // i<=userslist.size()
-					if (i > userslist.size() || mcMMO.database.Read("SELECT user FROM " + LoadProperties.MySQLtablePrefix + "users WHERE id = '" + Integer.valueOf(userslist.get(i).get(1)) + "'") == null)
-						break;
-					HashMap<Integer, ArrayList<String>> username = mcMMO.database.Read("SELECT user FROM " + LoadProperties.MySQLtablePrefix + "users WHERE id = '" + Integer.valueOf(userslist.get(i).get(1)) + "'");
-					player.sendMessage(String.valueOf(i) + ". " + ChatColor.GREEN + userslist.get(i).get(0) + " - " + ChatColor.WHITE + username.get(1).get(0));
-				}
-				return true;
-			}
-			if (args.length >= 0) {
-				player.sendMessage(mcLocale.getString("mcPlayerListener.PowerLevelLeaderboard"));
-				if (args.length >= 1 && m.isInt(args[0])) {
-					int n = 1; // For the page number
-					int n2 = Integer.valueOf(args[0]);
-					if (n2 > 1) {
-						// Figure out the 'page' here
-						n = 10;
-						n = n * (n2 - 1);
-					}
-					// If a page number is specified
-					HashMap<Integer, ArrayList<String>> userslist = mcMMO.database.Read("SELECT " + powerlevel + ", user_id FROM " + LoadProperties.MySQLtablePrefix + "skills WHERE " + powerlevel + " > 0 ORDER BY " + powerlevel + " DESC ");
-					for (int i = n; i <= n + 10; i++) {
-						if (i > userslist.size() || mcMMO.database.Read("SELECT user FROM " + LoadProperties.MySQLtablePrefix + "users WHERE id = '" + Integer.valueOf(userslist.get(i).get(1)) + "'") == null)
-							break;
-						HashMap<Integer, ArrayList<String>> username = mcMMO.database.Read("SELECT user FROM " + LoadProperties.MySQLtablePrefix + "users WHERE id = '" + Integer.valueOf(userslist.get(i).get(1)) + "'");
-						player.sendMessage(String.valueOf(i) + ". " + ChatColor.GREEN + userslist.get(i).get(0) + " - " + ChatColor.WHITE + username.get(1).get(0));
-					}
-					return true;
-				}
-				HashMap<Integer, ArrayList<String>> userslist = mcMMO.database.Read("SELECT " + powerlevel + ", user_id FROM " + LoadProperties.MySQLtablePrefix + "skills WHERE " + powerlevel + " > 0 ORDER BY " + powerlevel + " DESC ");
-				for (int i = 1; i <= 10; i++) {
-					if (i > userslist.size() || mcMMO.database.Read("SELECT user FROM " + LoadProperties.MySQLtablePrefix + "users WHERE id = '" + Integer.valueOf(userslist.get(i).get(1)) + "'") == null)
-						break;
-					HashMap<Integer, ArrayList<String>> username = mcMMO.database.Read("SELECT user FROM " + LoadProperties.MySQLtablePrefix + "users WHERE id = '" + Integer.valueOf(userslist.get(i).get(1)) + "'");
-					player.sendMessage(String.valueOf(i) + ". " + ChatColor.GREEN + userslist.get(i).get(0) + " - " + ChatColor.WHITE + username.get(1).get(0));
-					// System.out.println(username.get(1).get(0));
-					// System.out.println("Mining : " + userslist.get(i).get(0) + ", User id : " + userslist.get(i).get(1));
-				}
-			}
-		}
+            case 2:
+                if (!Skills.isSkill(args[0])) {
+                    sender.sendMessage(LocaleLoader.getString("Commands.Skill.Invalid"));
+                    return true;
+                }
 
-		return true;
-	}
+                if (Misc.isInt(args[1])) {
+                    flatfileDisplay(Integer.valueOf(args[1]), args[0].toUpperCase(), sender);
+                }
+                else {
+                    sender.sendMessage(usage);
+                }
+
+                return true;
+
+            default:
+                sender.sendMessage(usage);
+                return true;
+            }
+        }
+        else {
+            String powerlevel = "taming+mining+woodcutting+repair+unarmed+herbalism+excavation+archery+swords+axes+acrobatics+fishing";
+
+            switch (args.length) {
+            case 0:
+                sqlDisplay(1, powerlevel, sender);
+                return true;
+
+            case 1:
+                if (Misc.isInt(args[0])) {
+                    sqlDisplay(Integer.valueOf(args[0]), powerlevel, sender);
+                }
+                else if (Skills.isSkill(args[0])) {
+                    sqlDisplay(1, args[0].toLowerCase(), sender);
+                }
+                else {
+                    sender.sendMessage(LocaleLoader.getString("Commands.Skill.Invalid"));
+                }
+
+                return true;
+
+            case 2:
+                if (!Skills.isSkill(args[0])) {
+                    sender.sendMessage(LocaleLoader.getString("Commands.Skill.Invalid"));
+                    return true;
+                }
+
+                if (Misc.isInt(args[1])) {
+                    sqlDisplay(Integer.valueOf(args[1]), args[0].toLowerCase(), sender);
+                }
+                else {
+                    sender.sendMessage(usage);
+                }
+
+                return true;
+
+            default:
+                sender.sendMessage(usage);
+                return true;
+            }
+        }
+    }
+
+    private void flatfileDisplay(int page, String skill, CommandSender sender) {
+        String[] info = Leaderboard.retrieveInfo(skill, page);
+
+        if (skill == "ALL") {
+            sender.sendMessage(LocaleLoader.getString("Commands.PowerLevel.Leaderboard"));
+        }
+        else {
+            sender.sendMessage(LocaleLoader.getString("Commands.Skill.Leaderboard", new Object[] { Misc.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++;
+            }
+        }
+    }
+
+    private void sqlDisplay(int page, String query, CommandSender sender) {
+        String tablePrefix = Config.getInstance().getMySQLTablePrefix();
+        HashMap<Integer, ArrayList<String>> userslist = mcMMO.database.read("SELECT " + query + ", user_id FROM " + tablePrefix + "skills WHERE " + query + " > 0 ORDER BY " + query + " DESC ");
+
+        if (query == "taming+mining+woodcutting+repair+unarmed+herbalism+excavation+archery+swords+axes+acrobatics+fishing") {
+            sender.sendMessage(LocaleLoader.getString("Commands.PowerLevel.Leaderboard"));
+        }
+        else {
+            sender.sendMessage(LocaleLoader.getString("Commands.Skill.Leaderboard", new Object[] { Misc.getCapitalized(query) }));
+        }
+
+        for (int i = (page * 10) - 9; i <= (page * 10); i++) {
+            if (i > userslist.size() || mcMMO.database.read("SELECT user FROM " + tablePrefix + "users WHERE id = '" + Integer.valueOf(userslist.get(i).get(1)) + "'") == null) {
+                break;
+            }
+
+            HashMap<Integer, ArrayList<String>> username = mcMMO.database.read("SELECT user FROM " + tablePrefix + "users WHERE id = '" + Integer.valueOf(userslist.get(i).get(1)) + "'");
+            sender.sendMessage(String.valueOf(i) + ". " + ChatColor.GREEN + userslist.get(i).get(0) + " - " + ChatColor.WHITE + username.get(1).get(0));
+        }
+    }
 }

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

@@ -1,94 +1,108 @@
 package com.gmail.nossr50.commands.party;
 
-import java.util.logging.Level;
-import java.util.logging.Logger;
-
-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.entity.Player;
 
-import com.gmail.nossr50.Users;
-import com.gmail.nossr50.mcPermissions;
-import com.gmail.nossr50.config.LoadProperties;
+import com.gmail.nossr50.mcMMO;
+import com.gmail.nossr50.commands.CommandHelper;
 import com.gmail.nossr50.datatypes.PlayerProfile;
-import com.gmail.nossr50.locale.mcLocale;
+import com.gmail.nossr50.events.chat.McMMOAdminChatEvent;
+import com.gmail.nossr50.locale.LocaleLoader;
+import com.gmail.nossr50.util.Permissions;
+import com.gmail.nossr50.util.Users;
 
 public class ACommand implements CommandExecutor {
-	private Logger log;
+    private final mcMMO plugin;
 
-	public ACommand() {
-		this.log = Logger.getLogger("Minecraft");
-	}
+    public ACommand (mcMMO plugin) {
+        this.plugin = plugin;
+    }
 
-	@Override
-	public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
+    @Override
+    public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
+        PlayerProfile PP;
+        String usage = ChatColor.RED + "Proper usage is /a <message>"; //TODO: Needs more locale.
 
-		// Console message?
-		if (!(sender instanceof Player) && args.length >= 1) {
-			String aMessage = args[0];
-			for (int i = 1; i <= args.length - 1; i++) {
-				aMessage = aMessage + " " + args[i];
-			}
-
-			String aPrefix = ChatColor.AQUA + "{" + ChatColor.WHITE + "*Console*" + ChatColor.AQUA + "} ";
-
-			log.log(Level.INFO, "[A]<*Console*> " + aMessage);
-
-			for (Player herp : Bukkit.getServer().getOnlinePlayers()) {
-				if (mcPermissions.getInstance().adminChat(herp) || herp.isOp())
-					herp.sendMessage(aPrefix + aMessage);
-			}
-			return true;
-		}
-
-		Player player = null;
-        if (sender instanceof Player) {
-            player = (Player) sender;
+        if (CommandHelper.noCommandPermissions(sender, "mcmmo.chat.adminchat")) {
+            return true;
         }
 
-		if (player != null && !mcPermissions.getInstance().adminChat(player) && !player.isOp()) {
-			player.sendMessage(ChatColor.YELLOW + "[mcMMO] " + ChatColor.DARK_RED + mcLocale.getString("mcPlayerListener.NoPermission"));
-			return true;
-		}
+        switch (args.length) {
+        case 0:
+            if (sender instanceof Player) {
+                PP = Users.getProfile((Player) sender);
 
-		// Not a toggle, a message
+                if (PP.getPartyChatMode()) {
+                    PP.togglePartyChat();
+                }
 
-		if (args.length >= 1) {
-			String aMessage = args[0];
-			for (int i = 1; i <= args.length - 1; i++) {
-				aMessage = aMessage + " " + args[i];
-			}
+                PP.toggleAdminChat();
 
-			String name = (LoadProperties.aDisplayNames) ? player.getDisplayName() : player.getName();
-			String aPrefix = ChatColor.AQUA + "{" + ChatColor.WHITE + name + ChatColor.AQUA + "} ";
-			log.log(Level.INFO, "[A]<" + name + "> " + aMessage);
-			for (Player herp : Bukkit.getServer().getOnlinePlayers()) {
-				if (mcPermissions.getInstance().adminChat(herp) || herp.isOp())
-					herp.sendMessage(aPrefix + aMessage);
-			}
-			return true;
-		}
+                if (PP.getAdminChatMode()) {
+                    sender.sendMessage(LocaleLoader.getString("Commands.AdminChat.On"));
+                }
+                else {
+                    sender.sendMessage(LocaleLoader.getString("Commands.AdminChat.Off"));
+                }
+            }
+            else {
+                sender.sendMessage(usage);
+            }
 
-		if(player != null)
-		{
-			PlayerProfile PP = Users.getProfile(player);
-			
-			if (PP.getPartyChatMode())
-				PP.togglePartyChat();
-	
-			PP.toggleAdminChat();
-	
-			if (PP.getAdminChatMode()) {
-				player.sendMessage(mcLocale.getString("mcPlayerListener.AdminChatOn"));
-				// player.sendMessage(ChatColor.AQUA + "Admin chat toggled " + ChatColor.GREEN + "On");
-			} else {
-				player.sendMessage(mcLocale.getString("mcPlayerListener.AdminChatOff"));
-				// player.sendMessage(ChatColor.AQUA + "Admin chat toggled " + ChatColor.RED + "Off");
-			}
-		}
-		return true;
-	}
+            return true;
+
+        default:
+            String message = args[0];
+
+            for (int i = 1; i < args.length; i++) {
+                message = message + " " + args [i];
+            }
+
+            if (sender instanceof Player) {
+                Player player = (Player) sender;
+
+                McMMOAdminChatEvent chatEvent = new McMMOAdminChatEvent(player.getName(), message);
+                plugin.getServer().getPluginManager().callEvent(chatEvent);
+
+                if (chatEvent.isCancelled()) {
+                    return true;
+                }
+
+                message = chatEvent.getMessage();
+                String prefix = ChatColor.AQUA + "{" + ChatColor.WHITE + player.getName() + ChatColor.AQUA + "} ";
+
+                plugin.getLogger().info("[A]<" + player.getName() + "> " + message);
+
+                for (Player p : plugin.getServer().getOnlinePlayers()) {
+                    if (Permissions.getInstance().adminChat(player) || player.isOp()) {
+                        p.sendMessage(prefix + message);
+                    }
+                }
+            }
+            else {
+                McMMOAdminChatEvent chatEvent = new McMMOAdminChatEvent("Console", message);
+                plugin.getServer().getPluginManager().callEvent(chatEvent);
+
+                if (chatEvent.isCancelled()) {
+                    return true;
+                }
+
+                message = chatEvent.getMessage();
+                String prefix = ChatColor.AQUA + "{" + ChatColor.WHITE + "*Console*" + ChatColor.AQUA + "} ";
+
+                plugin.getLogger().info("[A]<*Console*> " + message);
+
+                for (Player player : plugin.getServer().getOnlinePlayers()) {
+                    if (Permissions.getInstance().adminChat(player) || player.isOp()) {
+                        player.sendMessage(prefix + message);
+                    }
+                }
+            }
+
+            return true;
+        }
+    }
 }

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

@@ -1,52 +1,70 @@
 package com.gmail.nossr50.commands.party;
 
-import org.bukkit.ChatColor;
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandExecutor;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 
-import com.gmail.nossr50.Users;
-import com.gmail.nossr50.mcPermissions;
-import com.gmail.nossr50.config.LoadProperties;
+import com.gmail.nossr50.mcMMO;
+import com.gmail.nossr50.commands.CommandHelper;
 import com.gmail.nossr50.datatypes.PlayerProfile;
-import com.gmail.nossr50.locale.mcLocale;
+import com.gmail.nossr50.events.party.McMMOPartyChangeEvent;
+import com.gmail.nossr50.events.party.McMMOPartyChangeEvent.EventReason;
+import com.gmail.nossr50.locale.LocaleLoader;
 import com.gmail.nossr50.party.Party;
+import com.gmail.nossr50.party.PartyManager;
+import com.gmail.nossr50.util.Users;
 
 public class AcceptCommand implements CommandExecutor {
-	@Override
-	public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
-		if (!LoadProperties.acceptEnable) {
-			sender.sendMessage("This command is not enabled.");
-			return true;
-		}
+    private final mcMMO plugin;
 
-		if (!(sender instanceof Player)) {
-			sender.sendMessage("This command does not support console useage.");
-			return true;
-		}
+    public AcceptCommand (mcMMO plugin) {
+        this.plugin = plugin;
+    }
 
-		Player player = (Player) sender;
-		PlayerProfile PP = Users.getProfile(player);
+    @Override
+    public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
+        if (CommandHelper.noConsoleUsage(sender)) {
+            return true;
+        }
 
-		if (!mcPermissions.getInstance().party(player)) {
-			player.sendMessage(ChatColor.YELLOW + "[mcMMO] " + ChatColor.DARK_RED + mcLocale.getString("mcPlayerListener.NoPermission"));
-			return true;
-		}
+        if (CommandHelper.noCommandPermissions(sender, "mcmmo.commands.party")) {
+            return true;
+        }
 
-		if (PP.hasPartyInvite()) {
-			Party Pinstance = Party.getInstance();
+        Player player = (Player) sender;
+        PlayerProfile playerProfile = Users.getProfile(player);
 
-			if (PP.inParty()) {
-				Pinstance.removeFromParty(player, PP);
-			}
-			PP.acceptInvite();
-			Pinstance.addToParty(player, PP, PP.getParty(), true);
+        if (playerProfile.hasPartyInvite()) {
+            PartyManager partyManagerInstance = PartyManager.getInstance();
 
-		} else {
-			player.sendMessage(mcLocale.getString("mcPlayerListener.NoInvites"));
-		}
+            if (playerProfile.inParty()) {
+                Party party = playerProfile.getParty();
+                McMMOPartyChangeEvent event = new McMMOPartyChangeEvent(player, party.getName(), playerProfile.getInvite().getName(), EventReason.CHANGED_PARTIES);
 
-		return true;
-	}
+                plugin.getServer().getPluginManager().callEvent(event);
+
+                if (event.isCancelled()) {
+                    return true;
+                }
+
+                partyManagerInstance.removeFromParty(player.getName(), party);
+            }
+            else {
+                McMMOPartyChangeEvent event = new McMMOPartyChangeEvent(player, null, playerProfile.getInvite().getName(), EventReason.JOINED_PARTY);
+                plugin.getServer().getPluginManager().callEvent(event);
+
+                if (event.isCancelled()) {
+                    return true;
+                }
+            }
+
+            partyManagerInstance.joinInvitedParty(player, playerProfile);
+        }
+        else {
+            player.sendMessage(LocaleLoader.getString("mcMMO.NoInvites"));
+        }
+
+        return true;
+    }
 }

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

@@ -6,68 +6,69 @@ import org.bukkit.command.CommandExecutor;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 
-import com.gmail.nossr50.Users;
 import com.gmail.nossr50.mcMMO;
-import com.gmail.nossr50.mcPermissions;
-import com.gmail.nossr50.config.LoadProperties;
+import com.gmail.nossr50.commands.CommandHelper;
 import com.gmail.nossr50.datatypes.PlayerProfile;
-import com.gmail.nossr50.locale.mcLocale;
+import com.gmail.nossr50.locale.LocaleLoader;
 import com.gmail.nossr50.party.Party;
+import com.gmail.nossr50.party.PartyManager;
+import com.gmail.nossr50.util.Users;
 
+//TODO: Make this work from console.
 public class InviteCommand implements CommandExecutor {
-	private final mcMMO plugin;
+    private final mcMMO plugin;
 
-	public InviteCommand(mcMMO instance) {
-		this.plugin = instance;
-	}
+    public InviteCommand(mcMMO instance) {
+        this.plugin = instance;
+    }
 
-	@Override
-	public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
-		if (!LoadProperties.inviteEnable) {
-			sender.sendMessage("This command is not enabled.");
-			return true;
-		}
+    @Override
+    public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
+        String usage = ChatColor.RED + "Proper usage is /invite <player>"; //TODO: Needs more locale.
 
-		if (!(sender instanceof Player)) {
-			sender.sendMessage("This command does not support console useage.");
-			return true;
-		}
+        if (CommandHelper.noConsoleUsage(sender)) {
+            return true;
+        }
 
-		Player player = (Player) sender;
-		PlayerProfile PP = Users.getProfile(player);
+        if (CommandHelper.noCommandPermissions(sender, "mcmmo.commands.party")) {
+            return true;
+        }
 
-		if (!mcPermissions.getInstance().party(player)) {
-			player.sendMessage(ChatColor.YELLOW + "[mcMMO] " + ChatColor.DARK_RED + mcLocale.getString("mcPlayerListener.NoPermission"));
-			return true;
-		}
+        switch (args.length) {
+        case 1:
+            Player player = (Player) sender;
+            PlayerProfile playerProfile = Users.getProfile(player);
 
-		Party Pinstance = Party.getInstance();
+            if (!playerProfile.inParty()) {
+                player.sendMessage(LocaleLoader.getString("Commands.Party.None"));
+                return true;
+            }
 
-		if (!PP.inParty()) {
-			player.sendMessage(mcLocale.getString("mcPlayerListener.NotInParty"));
-			return true;
-		}
-		if (args.length < 1) {
-			player.sendMessage(ChatColor.RED + "Usage is /invite <playername>");
-			return true;
-		}
-		if (PP.inParty() && args.length >= 1 && (plugin.getServer().getPlayer(args[0]) != null)) {
-			if (Pinstance.canInvite(player, PP)) {
-				Player target = plugin.getServer().getPlayer(args[0]);
-				PlayerProfile PPt = Users.getProfile(target);
-				PPt.modifyInvite(PP.getParty());
+            Player target = plugin.getServer().getPlayer(args[0]);
 
-				player.sendMessage(mcLocale.getString("mcPlayerListener.InviteSuccess"));
-				// target.sendMessage(ChatColor.RED+"ALERT: "+ChatColor.GREEN+"You have received a party invite for "+PPt.getInvite()+" from "+player.getName());
-				target.sendMessage(mcLocale.getString("mcPlayerListener.ReceivedInvite1", new Object[] { PPt.getInvite(), player.getName() }));
-				// target.sendMessage(ChatColor.YELLOW+"Type "+ChatColor.GREEN+LoadProperties.accept+ChatColor.YELLOW+" to accept the invite");
-				target.sendMessage(mcLocale.getString("mcPlayerListener.ReceivedInvite2", new Object[] { "/accept" }));
-			} else {
-				player.sendMessage(mcLocale.getString("Party.Locked"));
-				return true;
-			}
-		}
+            if (target != null) {
+                if (PartyManager.getInstance().canInvite(player, playerProfile)) {
+                    Party party = playerProfile.getParty();
+                    
+                    Users.getProfile(target).setInvite(party);
+                    player.sendMessage(LocaleLoader.getString("Commands.Invite.Success"));
+                    target.sendMessage(LocaleLoader.getString("Commands.Party.Invite.0", new Object[] {party.getName(), player.getName()}));
+                    target.sendMessage(LocaleLoader.getString("Commands.Party.Invite.1"));
+                    return true;
+                }
+                else {
+                    player.sendMessage(LocaleLoader.getString("Party.Locked"));
+                    return true;
+                }
+            }
+            else {
+                player.sendMessage(LocaleLoader.getString("Party.Player.Invalid"));
+                return true;
+            }
 
-		return true;
-	}
+        default:
+            sender.sendMessage(usage);
+            return true;
+        }
+    }
 }

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

@@ -1,102 +1,127 @@
 package com.gmail.nossr50.commands.party;
 
-import java.util.logging.Level;
-import java.util.logging.Logger;
-
-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.entity.Player;
 
-import com.gmail.nossr50.Users;
-import com.gmail.nossr50.mcPermissions;
-import com.gmail.nossr50.config.LoadProperties;
+import com.gmail.nossr50.mcMMO;
+import com.gmail.nossr50.commands.CommandHelper;
 import com.gmail.nossr50.datatypes.PlayerProfile;
-import com.gmail.nossr50.locale.mcLocale;
+import com.gmail.nossr50.events.chat.McMMOPartyChatEvent;
+import com.gmail.nossr50.locale.LocaleLoader;
 import com.gmail.nossr50.party.Party;
+import com.gmail.nossr50.party.PartyManager;
+import com.gmail.nossr50.util.Users;
 
 public class PCommand implements CommandExecutor {
-	private Logger log;
+    private final mcMMO plugin;
 
-	public PCommand() {
-		this.log = Logger.getLogger("Minecraft");
-	}
+    public PCommand (mcMMO plugin) {
+        this.plugin = plugin;
+    }
 
-	@Override
-	public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
-		if (!LoadProperties.partyEnable) {
-			sender.sendMessage("This command is not enabled.");
-			return true;
-		}
+    @Override
+    public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
+        PlayerProfile PP;
+        String usage = ChatColor.RED + "Proper usage is /p <party-name> <message>"; //TODO: Needs more locale.
 
-		// Console message?
-		if (!(sender instanceof Player)) {
-			if (args.length < 2)
-				return true;
-			String pMessage = args[1];
-			for (int i = 2; i <= args.length - 1; i++) {
-				pMessage = pMessage + " " + args[i];
-			}
+        if (CommandHelper.noCommandPermissions(sender, "mcmmo.commands.party")) {
+            return true;
+        }
 
-			String pPrefix = ChatColor.GREEN + "(" + ChatColor.WHITE + "*Console*" + ChatColor.GREEN + ") ";
+        switch (args.length) {
+        case 0:
+            if (sender instanceof Player) {
+                PP = Users.getProfile((Player) sender);
 
-			log.log(Level.INFO, "[P](" + args[0] + ")" + "<*Console*> " + pMessage);
+                if (PP.getAdminChatMode()) {
+                    PP.toggleAdminChat();
+                }
 
-			for (Player herp : Bukkit.getServer().getOnlinePlayers()) {
-				if (Users.getProfile(herp).inParty()) {
-					if (Users.getProfile(herp).getParty().equalsIgnoreCase(args[0])) {
-						herp.sendMessage(pPrefix + pMessage);
-					}
-				}
-			}
-			return true;
-		}
+                PP.togglePartyChat();
 
-		Player player = (Player) sender;
-		PlayerProfile PP = Users.getProfile(player);
+                if (PP.getPartyChatMode()) {
+                    sender.sendMessage(LocaleLoader.getString("Commands.Party.Chat.On"));
+                }
+                else {
+                    sender.sendMessage(LocaleLoader.getString("Commands.Party.Chat.Off"));
+                }
+            }
+            else {
+                sender.sendMessage(usage);
+            }
 
-		if (!mcPermissions.getInstance().party(player)) {
-			player.sendMessage(ChatColor.YELLOW + "[mcMMO] " + ChatColor.DARK_RED + mcLocale.getString("mcPlayerListener.NoPermission"));
-			return true;
-		}
+            return true;
 
-		// Not a toggle, a message
+        default:
+            if (sender instanceof Player) {
+                Player player = (Player) sender;
+                Party party = Users.getProfile(player).getParty();
 
-		if (args.length >= 1) {
-			String pMessage = args[0];
-			for (int i = 1; i <= args.length - 1; i++) {
-				pMessage = pMessage + " " + args[i];
-			}
+                if (party == null) {
+                    player.sendMessage(LocaleLoader.getString("Commands.Party.None"));
+                    return true;
+                }
 
-			String name = (LoadProperties.pDisplayNames) ? player.getDisplayName() : player.getName();
-			String pPrefix = ChatColor.GREEN + "(" + ChatColor.WHITE + name + ChatColor.GREEN + ") ";
-			log.log(Level.INFO, "[P](" + PP.getParty() + ")" + "<" + name + "> " + pMessage);
+                String message = args[0];
 
-			for (Player herp : Bukkit.getServer().getOnlinePlayers()) {
-				if (Users.getProfile(herp).inParty()) {
-					if (Party.getInstance().inSameParty(herp, player))
-						herp.sendMessage(pPrefix + pMessage);
-				}
-			}
+                for (int i = 1; i < args.length; i++) {
+                    message = message + " " + args [i];
+                }
 
-			return true;
-		}
+                McMMOPartyChatEvent chatEvent = new McMMOPartyChatEvent(player.getName(), party.getName(), message);
+                plugin.getServer().getPluginManager().callEvent(chatEvent);
 
-		if (PP.getAdminChatMode())
-			PP.toggleAdminChat();
+                if (chatEvent.isCancelled()) {
+                    return true;
+                }
 
-		PP.togglePartyChat();
+                message = chatEvent.getMessage();
+                String prefix = ChatColor.GREEN + "(" + ChatColor.WHITE + player.getName() + ChatColor.GREEN + ") ";
 
-		if (PP.getPartyChatMode()) {
-			// player.sendMessage(ChatColor.GREEN + "Party Chat Toggled On");
-			player.sendMessage(mcLocale.getString("mcPlayerListener.PartyChatOn"));
-		} else {
-			// player.sendMessage(ChatColor.GREEN + "Party Chat Toggled " + ChatColor.RED + "Off");
-			player.sendMessage(mcLocale.getString("mcPlayerListener.PartyChatOff"));
-		}
+                plugin.getLogger().info("[P](" + party.getName() + ")" + "<" + player.getName() + "> " + message);
 
-		return true;
-	}
+                for (Player member : party.getOnlineMembers()) {
+                    member.sendMessage(prefix + message);
+                }
+            }
+            else {
+                if (args.length < 2) {
+                    sender.sendMessage(usage);
+                    return true;
+                }
+
+                if (!PartyManager.getInstance().isParty(args[0])) {
+                    sender.sendMessage(LocaleLoader.getString("Party.InvalidName"));
+                    return true;
+                }
+
+                String message = args[1];
+
+                for (int i = 2; i < args.length; i++) {
+                    message = message + " " + args [i];
+                }
+
+                McMMOPartyChatEvent chatEvent = new McMMOPartyChatEvent("Console", args[0], message);
+                plugin.getServer().getPluginManager().callEvent(chatEvent);
+
+                if (chatEvent.isCancelled()) {
+                    return true;
+                }
+
+                message = chatEvent.getMessage();
+                String prefix = ChatColor.GREEN + "(" + ChatColor.WHITE + "*Console*" + ChatColor.GREEN + ") ";
+
+                plugin.getLogger().info("[P](" + args[0] + ")" + "<*Console*> " + message);
+
+                for (Player member : PartyManager.getInstance().getOnlineMembers(args[0])) {
+                    member.sendMessage(prefix + message);
+                }
+            }
+
+            return true;
+        }
+    }
 }

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

@@ -1,192 +1,242 @@
 package com.gmail.nossr50.commands.party;
 
-import org.bukkit.Bukkit;
 import org.bukkit.ChatColor;
+import org.bukkit.Server;
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandExecutor;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 
-import com.gmail.nossr50.Users;
-import com.gmail.nossr50.mcPermissions;
-import com.gmail.nossr50.config.LoadProperties;
+import com.gmail.nossr50.mcMMO;
+import com.gmail.nossr50.commands.CommandHelper;
 import com.gmail.nossr50.datatypes.PlayerProfile;
-import com.gmail.nossr50.locale.mcLocale;
+import com.gmail.nossr50.events.party.McMMOPartyChangeEvent;
+import com.gmail.nossr50.events.party.McMMOPartyChangeEvent.EventReason;
+import com.gmail.nossr50.locale.LocaleLoader;
 import com.gmail.nossr50.party.Party;
+import com.gmail.nossr50.party.PartyManager;
+import com.gmail.nossr50.util.Users;
 
 public class PartyCommand implements CommandExecutor {
-	@Override
-	public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
-		if (!LoadProperties.partyEnable) {
-			sender.sendMessage("This command is not enabled.");
-			return true;
-		}
+    private final mcMMO plugin;
 
-		if (!(sender instanceof Player)) {
-			sender.sendMessage("This command does not support console useage.");
-			return true;
-		}
+    public PartyCommand (mcMMO plugin) {
+        this.plugin = plugin;
+    }
 
-		Player player = (Player) sender;
-		PlayerProfile PP = Users.getProfile(player);
+    @Override
+    public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
+        if (CommandHelper.noConsoleUsage(sender)) {
+            return true;
+        }
 
-		if (!mcPermissions.getInstance().party(player)) {
-			player.sendMessage(ChatColor.YELLOW + "[mcMMO] " + ChatColor.DARK_RED + mcLocale.getString("mcPlayerListener.NoPermission"));
-			return true;
-		}
+        if (CommandHelper.noCommandPermissions(sender, "mcmmo.commands.party")) {
+            return true;
+        }
 
-		Party Pinstance = Party.getInstance();
+        Player player = (Player) sender;
+        String playerName = player.getName();
+        PlayerProfile playerProfile = Users.getProfile(player);
 
-		if (PP.inParty() && (!Pinstance.isParty(PP.getParty()) || !Pinstance.isInParty(player, PP))) {
-			Pinstance.addToParty(player, PP, PP.getParty(), false);
-		}
+        PartyManager partyManagerInstance = PartyManager.getInstance();
+        Party party = playerProfile.getParty();
 
-		if (args.length == 0 && !PP.inParty()) {
-			player.sendMessage(mcLocale.getString("Party.Help1", new Object[] { "/party "}));
-			player.sendMessage(mcLocale.getString("Party.Help2", new Object[] { "/party "}));
-			player.sendMessage(mcLocale.getString("Party.Help3", new Object[] { "/party " }));
-			return true;
-		} else if (args.length == 0 && PP.inParty()) {
-			String tempList = "";
-			int x = 0;
-			for (Player p : Bukkit.getServer().getOnlinePlayers()) {
-				if (PP.getParty().equals(Users.getProfile(p).getParty())) {
-					if (p != null && x + 1 >= Pinstance.partyCount(player, Bukkit.getServer().getOnlinePlayers())) {
-						if (Pinstance.isPartyLeader(p.getName(), PP.getParty())) {
-							tempList += ChatColor.GOLD + p.getName();
-							x++;
-						} else {
-							tempList += ChatColor.WHITE + p.getName();
-							x++;
-						}
-					}
-					if (p != null && x < Pinstance.partyCount(player, Bukkit.getServer().getOnlinePlayers())) {
-						if (Pinstance.isPartyLeader(p.getName(), PP.getParty())) {
-							tempList += ChatColor.GOLD + p.getName() + ", ";
-							x++;
-						} else {
-							tempList += ChatColor.WHITE + p.getName() + ", ";
-							x++;
-						}
-					}
-				}
-			}
-			player.sendMessage(mcLocale.getString("mcPlayerListener.YouAreInParty", new Object[] { PP.getParty() }));
-			player.sendMessage(mcLocale.getString("mcPlayerListener.PartyMembers") + " (" + tempList + ChatColor.GREEN + ")");
-			return true;
-		} else if (args.length == 1) {
-			if (args[0].equals("q") && PP.inParty()) {
-				Pinstance.removeFromParty(player, PP);
+        switch (args.length) {
+        case 0:
+            if (party == null) {
+                player.sendMessage(LocaleLoader.getString("Party.Help.0"));
+                player.sendMessage(LocaleLoader.getString("Party.Help.1"));
+                player.sendMessage(LocaleLoader.getString("Party.Help.2"));
+            }
+            else {
+                Server server = plugin.getServer();
+                String leader = party.getLeader();
+                StringBuffer tempList = new StringBuffer();
 
-				player.sendMessage(mcLocale.getString("mcPlayerListener.LeftParty"));
-				return true;
-			} else if (args[0].equalsIgnoreCase("?")) {
-				player.sendMessage(mcLocale.getString("Party.Help4", new Object[] { "/party " }));
-				player.sendMessage(mcLocale.getString("Party.Help2", new Object[] { "/party " }));
-				player.sendMessage(mcLocale.getString("Party.Help5", new Object[] { "/party " }));
-				player.sendMessage(mcLocale.getString("Party.Help6", new Object[] { "/party " }));
-				player.sendMessage(mcLocale.getString("Party.Help7", new Object[] { "/party " }));
-				player.sendMessage(mcLocale.getString("Party.Help8", new Object[] { "/party " }));
-				player.sendMessage(mcLocale.getString("Party.Help9", new Object[] { "/party " }));
-			} else if (args[0].equalsIgnoreCase("lock")) {
-				if (PP.inParty()) {
-					if (Pinstance.isPartyLeader(player.getName(), PP.getParty())) {
-						Pinstance.lockParty(PP.getParty());
-						player.sendMessage(mcLocale.getString("Party.Locked"));
-					} else {
-						player.sendMessage(mcLocale.getString("Party.NotOwner"));
-					}
-				} else {
-					player.sendMessage(mcLocale.getString("Party.InvalidName"));
-				}
-			} else if (args[0].equalsIgnoreCase("unlock")) {
-				if (PP.inParty()) {
-					if (Pinstance.isPartyLeader(player.getName(), PP.getParty())) {
-						Pinstance.unlockParty(PP.getParty());
-						player.sendMessage(mcLocale.getString("Party.Unlocked"));
-					} else {
-						player.sendMessage(mcLocale.getString("Party.NotOwner"));
-					}
-				} else {
-					player.sendMessage(mcLocale.getString("Party.InvalidName"));
-				}
-				// Party debugging command.
-				// } else if (args[0].equalsIgnoreCase("dump")) {
-				// Pinstance.dump(player);
-			} else {
-				if (PP.inParty()) {
-					Pinstance.removeFromParty(player, PP);
-				}
-				Pinstance.addToParty(player, PP, args[0], false);
-				return true;
-			}
-		} else if (args.length == 2 && PP.inParty()) {
-			if (args[0].equalsIgnoreCase("password")) {
-				if (Pinstance.isPartyLeader(player.getName(), PP.getParty())) {
-					if (Pinstance.isPartyLocked(PP.getParty())) {
-						Pinstance.setPartyPassword(PP.getParty(), args[1]);
-						player.sendMessage(mcLocale.getString("Party.PasswordSet", new Object[] { args[1] }));
-					} else {
-						player.sendMessage(mcLocale.getString("Party.IsntLocked"));
-					}
-				} else {
-					player.sendMessage(mcLocale.getString("Party.NotOwner"));
-				}
-			} else if (args[0].equalsIgnoreCase("kick")) {
-				if (Pinstance.isPartyLeader(player.getName(), PP.getParty())) {
-					if (Pinstance.isPartyLocked(PP.getParty())) {
-						Player tPlayer = null;
-						if (Bukkit.getServer().getPlayer(args[1]) != null)
-							tPlayer = Bukkit.getServer().getPlayer(args[1]);
-						if (tPlayer == null) {
-							player.sendMessage(mcLocale.getString("Party.CouldNotKick", new Object[] { args[1] }));
-						}
-						if (!Pinstance.inSameParty(player, tPlayer)) {
-							player.sendMessage(mcLocale.getString("Party.NotInYourParty", new Object[] { tPlayer.getName() }));
-						} else {
-							// Not an admin
-							if (!mcPermissions.getInstance().admin(player)) {
-								// Can't kick an admin
-								if (mcPermissions.getInstance().admin(tPlayer)) {
-									player.sendMessage(mcLocale.getString("Party.CouldNotKick", new Object[] { tPlayer.getName() }));
-								}
-							}
-							PlayerProfile tPP = Users.getProfile(tPlayer);
+                for (String otherPlayerName : party.getMembers()) {
+                    if (leader.equals(otherPlayerName)) {
+                        tempList.append(ChatColor.GOLD);
+                    }
+                    else if (server.getPlayer(otherPlayerName) != null) {
+                        tempList.append(ChatColor.WHITE);
+                    }
+                    else {
+                        tempList.append(ChatColor.GRAY);
+                    }
 
-							Pinstance.removeFromParty(tPlayer, tPP);
+                    tempList.append(otherPlayerName + " ");
+                }
 
-							tPlayer.sendMessage(mcLocale.getString("mcPlayerListener.LeftParty"));
-						}
-					} else {
-						player.sendMessage(mcLocale.getString("Party.IsntLocked"));
-					}
-				} else {
-					player.sendMessage(mcLocale.getString("Party.NotOwner"));
-				}
-			} else if (args[0].equalsIgnoreCase("owner")) {
-				if (Pinstance.isPartyLeader(player.getName(), PP.getParty())) {
-					Player tPlayer = null;
-					if (Bukkit.getServer().getPlayer(args[1]) != null)
-						tPlayer = Bukkit.getServer().getPlayer(args[1]);
-					if (tPlayer == null) {
-						player.sendMessage(mcLocale.getString("Party.CouldNotSetOwner", new Object[] { args[1] }));
-					}
-					if (!Pinstance.inSameParty(player, tPlayer)) {
-						player.sendMessage(mcLocale.getString("Party.CouldNotSetOwner", new Object[] { tPlayer.getName() }));
-					} else {
-						Pinstance.setPartyLeader(PP.getParty(), tPlayer.getName());
-					}
-				} else {
-					player.sendMessage(mcLocale.getString("Party.NotOwner"));
-				}
-			} else {
-				Pinstance.removeFromParty(player, PP);
-				Pinstance.addToParty(player, PP, args[0], false, args[1]);
-			}
-		} else if (args.length == 2 && !PP.inParty()) {
-			Pinstance.addToParty(player, PP, args[0], false, args[1]);
-		}
+                player.sendMessage(LocaleLoader.getString("Commands.Party.InParty", new Object[] {party.getName()}));
+                player.sendMessage(LocaleLoader.getString("Commands.Party.Members", new Object[] {tempList}));
+            }
 
-		return true;
-	}
+            return true;
+
+        case 1:
+            if (args[0].equalsIgnoreCase("q")) {
+                if (party != null) {
+                    McMMOPartyChangeEvent event = new McMMOPartyChangeEvent(player, party.getName(), null, EventReason.LEFT_PARTY);
+                    plugin.getServer().getPluginManager().callEvent(event);
+
+                    if (event.isCancelled()) {
+                        return true;
+                    }
+
+                    partyManagerInstance.removeFromParty(playerName, party);
+                    player.sendMessage(LocaleLoader.getString("Commands.Party.Leave"));
+                }
+                else {
+                    player.sendMessage("Commands.Party.None");
+                }
+            }
+            else if (args[0].equals("?")) {
+                player.sendMessage(LocaleLoader.getString("Party.Help.3"));
+                player.sendMessage(LocaleLoader.getString("Party.Help.1"));
+                player.sendMessage(LocaleLoader.getString("Party.Help.4"));
+                player.sendMessage(LocaleLoader.getString("Party.Help.5"));
+                player.sendMessage(LocaleLoader.getString("Party.Help.6"));
+                player.sendMessage(LocaleLoader.getString("Party.Help.7"));
+            }
+            else if (args[0].equalsIgnoreCase("lock")) {
+                if (party != null) {
+                    if (party.getLeader().equals(playerName)) {
+                        if (party.isLocked()) {
+                            player.sendMessage(LocaleLoader.getString("Party.IsLocked"));
+                        }
+                        else {
+                            party.setLocked(true);
+                            player.sendMessage(LocaleLoader.getString("Party.Locked"));
+                        }
+                    }
+                    else {
+                        player.sendMessage(LocaleLoader.getString("Party.NotOwner"));
+                    }
+                }
+                else {
+                    player.sendMessage("Commands.Party.None");
+                }
+            }
+            else if (args[0].equalsIgnoreCase("unlock")) {
+                if (party != null) {
+                    if (party.getLeader().equals(playerName)) {
+                        if (!party.isLocked()) {
+                            player.sendMessage(LocaleLoader.getString("Party.IsntLocked"));
+                        }
+                        else {
+                            party.setLocked(false);
+                            player.sendMessage(LocaleLoader.getString("Party.Unlocked"));
+                        }
+                    }
+                    else {
+                        player.sendMessage(LocaleLoader.getString("Party.NotOwner"));
+                    }
+                }
+                else {
+                    player.sendMessage("Commands.Party.None");
+                }
+            }
+            else {
+                if (party != null) {
+                    McMMOPartyChangeEvent event = new McMMOPartyChangeEvent(player, party.getName(), args[0], EventReason.CHANGED_PARTIES);
+                    plugin.getServer().getPluginManager().callEvent(event);
+
+                    if (event.isCancelled()) {
+                        return true;
+                    }
+
+                    partyManagerInstance.removeFromParty(playerName, party);
+                }
+                else {
+                    McMMOPartyChangeEvent event = new McMMOPartyChangeEvent(player, null, args[0], EventReason.JOINED_PARTY);
+                    plugin.getServer().getPluginManager().callEvent(event);
+
+                    if (event.isCancelled()) {
+                        return true;
+                    }
+                }
+
+                partyManagerInstance.joinParty(player, playerProfile, args[0], null);
+            }
+
+            return true;
+
+        case 2:
+            if (playerProfile.inParty()) {
+                if (args[0].equalsIgnoreCase("password")) {
+                    if (party.getLeader().equals(playerName)) {
+                        party.setLocked(true);
+                        party.setPassword(args[1]);
+                        player.sendMessage(LocaleLoader.getString("Party.PasswordSet", new Object[] {args[1]}));
+                    }
+                    else {
+                        player.sendMessage(LocaleLoader.getString("Party.NotOwner"));
+                    }
+                }
+                else if (args[0].equalsIgnoreCase("kick")) {
+                    if (party.getLeader().equals(playerName)) {
+                        if (!party.getMembers().contains(args[1])) {
+                            player.sendMessage(LocaleLoader.getString("Party.NotInYourParty", new Object[] {args[1]}));
+                            return true;
+                        }
+                        else {
+                            String partyName = party.getName();
+                            McMMOPartyChangeEvent event = new McMMOPartyChangeEvent(player, partyName, null, EventReason.KICKED_FROM_PARTY);
+
+                            plugin.getServer().getPluginManager().callEvent(event);
+
+                            if (event.isCancelled()) {
+                                return true;
+                            }
+
+                            partyManagerInstance.removeFromParty(args[1], party);
+                        }
+                    }
+                    else {
+                        player.sendMessage(LocaleLoader.getString("Party.NotOwner"));
+                    }
+                }
+                else if (args[0].equalsIgnoreCase("owner")) {
+                    if (party.getLeader().equals(playerName)) {
+                        if (!party.getMembers().contains(args[1])) {
+                            player.sendMessage(LocaleLoader.getString("Party.NotInYourParty", new Object[] {args[1]}));
+                            return true;
+                        }
+                        else {
+                            partyManagerInstance.setPartyLeader(args[1], party);
+                        }
+                    }
+                }
+                else {
+                    McMMOPartyChangeEvent event = new McMMOPartyChangeEvent(player, party.getName(), args[0], EventReason.CHANGED_PARTIES);
+                    plugin.getServer().getPluginManager().callEvent(event);
+
+                    if (event.isCancelled()) {
+                        return true;
+                    }
+
+                    partyManagerInstance.removeFromParty(playerName, party);
+                    partyManagerInstance.joinParty(player, playerProfile, args[0], args[1]);
+                }
+            }
+            else {
+                McMMOPartyChangeEvent event = new McMMOPartyChangeEvent(player, null, args[0], EventReason.JOINED_PARTY);
+                plugin.getServer().getPluginManager().callEvent(event);
+
+                if (event.isCancelled()) {
+                    return true;
+                }
+
+                partyManagerInstance.joinParty(player, playerProfile, args[0], args[1]);
+            }
+
+            return true;
+
+        default:
+            player.sendMessage(LocaleLoader.getString("Party.Help.0"));
+            player.sendMessage(LocaleLoader.getString("Party.Help.1"));
+            player.sendMessage(LocaleLoader.getString("Party.Help.2"));
+            return true;
+        }
+    }
 }

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

@@ -6,57 +6,83 @@ import org.bukkit.command.CommandExecutor;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 
-import com.gmail.nossr50.Users;
 import com.gmail.nossr50.mcMMO;
-import com.gmail.nossr50.mcPermissions;
-import com.gmail.nossr50.config.LoadProperties;
+import com.gmail.nossr50.commands.CommandHelper;
+import com.gmail.nossr50.config.Config;
 import com.gmail.nossr50.datatypes.PlayerProfile;
-import com.gmail.nossr50.locale.mcLocale;
+import com.gmail.nossr50.events.party.McMMOPartyTeleportEvent;
+import com.gmail.nossr50.locale.LocaleLoader;
+import com.gmail.nossr50.party.PartyManager;
+import com.gmail.nossr50.util.Users;
 
 public class PtpCommand implements CommandExecutor {
-	private final mcMMO plugin;
+    private final mcMMO plugin;
 
-	public PtpCommand(mcMMO instance) {
-		this.plugin = instance;
-	}
+    public PtpCommand(mcMMO instance) {
+        this.plugin = instance;
+    }
 
-	@Override
-	public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
-		if (!LoadProperties.ptpEnable) {
-			sender.sendMessage("This command is not enabled.");
-			return true;
-		}
+    @Override
+    public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
+        String usage = ChatColor.RED + "Proper usage is /ptp <player>"; //TODO: Needs more locale.
 
-		if (!(sender instanceof Player)) {
-			sender.sendMessage("This command does not support console useage.");
-			return true;
-		}
+        if (CommandHelper.noConsoleUsage(sender)) {
+            return true;
+        }
 
-		Player player = (Player) sender;
-		PlayerProfile PP = Users.getProfile(player);
+        if (CommandHelper.noCommandPermissions(sender, "mcmmo.commands.ptp")) {
+            return true;
+        }
 
-		if (!mcPermissions.getInstance().partyTeleport(player)) {
-			player.sendMessage(ChatColor.YELLOW + "[mcMMO] " + ChatColor.DARK_RED + mcLocale.getString("mcPlayerListener.NoPermission"));
-			return true;
-		}
-		if (args.length < 1) {
-			player.sendMessage(ChatColor.RED + "Usage is /ptp <playername>");
-			return true;
-		}
-		if (plugin.getServer().getPlayer(args[0]) == null) {
-			player.sendMessage("That is not a valid player");
-		}
+        switch (args.length) {
+        case 1:
+            Player player = (Player) sender;
+            PlayerProfile PP = Users.getProfile(player);
 
-		if (plugin.getServer().getPlayer(args[0]) != null) {
-			Player target = plugin.getServer().getPlayer(args[0]);
-			PlayerProfile PPt = Users.getProfile(target);
-			if (PP.getParty().equals(PPt.getParty())) {
-				player.teleport(target);
-				player.sendMessage(ChatColor.GREEN + "You have teleported to " + target.getName());
-				target.sendMessage(ChatColor.GREEN + player.getName() + " has teleported to you.");
-			}
-		}
+            if (PP.getRecentlyHurt() + (Config.getInstance().getPTPCommandCooldown() * 1000) > System.currentTimeMillis()) {
+                player.sendMessage(LocaleLoader.getString("Party.Teleport.Hurt", new Object[] { Config.getInstance().getPTPCommandCooldown() }));
+                return true;
+            }
 
-		return true;
-	}
-}
+            Player target = plugin.getServer().getPlayer(args[0]);
+
+            if (player.equals(target)) {
+                player.sendMessage("You can't teleport to yourself!"); //TODO: Use locale
+                return true;
+            }
+
+            if (target == null) {
+                player.sendMessage(LocaleLoader.getString("Party.Player.Invalid"));
+                return true;
+            }
+
+            if (target.isDead()) {
+                player.sendMessage(LocaleLoader.getString("Party.Teleport.Dead"));
+                return true;
+            }
+
+            if (PartyManager.getInstance().inSameParty(player, target)) {
+                McMMOPartyTeleportEvent event = new McMMOPartyTeleportEvent(player, target, PP.getParty().getName());
+                plugin.getServer().getPluginManager().callEvent(event);
+
+                if (event.isCancelled()) {
+                    return true;
+                }
+
+                player.teleport(target);
+                player.sendMessage(LocaleLoader.getString("Party.Teleport.Player", new Object[] { target.getName() }));
+                target.sendMessage(LocaleLoader.getString("Party.Teleport.Target", new Object[] { player.getName() }));
+            }
+            else {
+                player.sendMessage(LocaleLoader.getString("Party.NotInYourParty", new Object[] { target.getName() }));
+                return true;
+            }
+
+            return true;
+
+        default:
+            sender.sendMessage(usage);
+            return true;
+        }
+   }
+}

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

@@ -1,52 +1,90 @@
 package com.gmail.nossr50.commands.skills;
 
-import org.bukkit.command.Command;
-import org.bukkit.command.CommandExecutor;
-import org.bukkit.command.CommandSender;
-import org.bukkit.entity.Player;
-
-import com.gmail.nossr50.Users;
-import com.gmail.nossr50.mcPermissions;
-import com.gmail.nossr50.datatypes.PlayerProfile;
+import com.gmail.nossr50.commands.SkillCommand;
 import com.gmail.nossr50.datatypes.SkillType;
-import com.gmail.nossr50.locale.mcLocale;
+import com.gmail.nossr50.locale.LocaleLoader;
 
-public class AcrobaticsCommand implements CommandExecutor {
-	@Override
-	public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
-		if (!(sender instanceof Player)) {
-			sender.sendMessage("This command does not support console useage.");
-			return true;
-		}
+public class AcrobaticsCommand extends SkillCommand {
+    private String dodgeChance;
+    private String rollChance;
+    private String gracefulRollChance;
 
-		Player player = (Player) sender;
-		PlayerProfile PP = Users.getProfile(player);
+    private boolean canDodge;
+    private boolean canRoll;
+    private boolean canGracefulRoll;
 
-		String dodgepercentage;
-		float skillvalue = (float) PP.getSkillLevel(SkillType.ACROBATICS);
-		String percentage = String.valueOf((skillvalue / 1000) * 100);
-		String gracepercentage = String.valueOf(((skillvalue / 1000) * 100) * 2);
+    public AcrobaticsCommand() {
+        super(SkillType.ACROBATICS);
+    }
 
-		if (PP.getSkillLevel(SkillType.ACROBATICS) <= 800)
-			dodgepercentage = String.valueOf((skillvalue / 4000 * 100));
-		else
-			dodgepercentage = "20";
+    @Override
+    protected void dataCalculations() {
+        if (skillValue >= 1000) {
+            dodgeChance = "20.00%";
+            rollChance = "100.00%";
+            gracefulRollChance = "100.00%";
+        }
+        else if (skillValue >= 800) {
+            dodgeChance = "20.00%";
+            rollChance = percent.format(skillValue / 1000);
+            gracefulRollChance = "100.00%";
+        }
+        else if (skillValue >= 500) {
+            dodgeChance = percent.format(skillValue / 4000);
+            rollChance = percent.format(skillValue / 1000);
+            gracefulRollChance = "100.00%";
+        }
+        else {
+            dodgeChance = percent.format(skillValue / 4000);
+            rollChance = percent.format(skillValue / 1000);
+            gracefulRollChance = percent.format(skillValue / 500);
+        }
+    }
 
-		player.sendMessage(mcLocale.getString("m.SkillHeader", new Object[] { mcLocale.getString("m.SkillAcrobatics") }));
-		player.sendMessage(mcLocale.getString("m.XPGain", new Object[] { mcLocale.getString("m.XPGainAcrobatics") }));
+    @Override
+    protected void permissionsCheck() {
+        canDodge = permInstance.dodge(player);
+        canRoll = permInstance.roll(player);
+        canGracefulRoll = permInstance.gracefulRoll(player);
+    }
 
-		if (mcPermissions.getInstance().acrobatics(player))
-			player.sendMessage(mcLocale.getString("m.LVL", new Object[] { PP.getSkillLevel(SkillType.ACROBATICS), PP.getSkillXpLevel(SkillType.ACROBATICS), PP.getXpToLevel(SkillType.ACROBATICS) }));
+    @Override
+    protected boolean effectsHeaderPermissions() {
+        return canDodge || canGracefulRoll || canRoll;
+    }
 
-		player.sendMessage(mcLocale.getString("m.SkillHeader", new Object[] { mcLocale.getString("m.Effects") }));
-		player.sendMessage(mcLocale.getString("m.EffectsTemplate", new Object[] { mcLocale.getString("m.EffectsAcrobatics1_0"), mcLocale.getString("m.EffectsAcrobatics1_1") }));
-		player.sendMessage(mcLocale.getString("m.EffectsTemplate", new Object[] { mcLocale.getString("m.EffectsAcrobatics2_0"), mcLocale.getString("m.EffectsAcrobatics2_1") }));
-		player.sendMessage(mcLocale.getString("m.EffectsTemplate", new Object[] { mcLocale.getString("m.EffectsAcrobatics3_0"), mcLocale.getString("m.EffectsAcrobatics3_1") }));
-		player.sendMessage(mcLocale.getString("m.SkillHeader", new Object[] { mcLocale.getString("m.YourStats") }));
-		player.sendMessage(mcLocale.getString("m.AcrobaticsRollChance", new Object[] { percentage }));
-		player.sendMessage(mcLocale.getString("m.AcrobaticsGracefulRollChance", new Object[] { gracepercentage }));
-		player.sendMessage(mcLocale.getString("m.AcrobaticsDodgeChance", new Object[] { dodgepercentage }));
+    @Override
+    protected void effectsDisplay() {
+        if (canRoll) {
+            player.sendMessage(LocaleLoader.getString("Effects.Template", new Object[] { LocaleLoader.getString("Acrobatics.Effect.0"), LocaleLoader.getString("Acrobatics.Effect.1") }));
+        }
 
-		return true;
-	}
-}
+        if (canGracefulRoll) {
+            player.sendMessage(LocaleLoader.getString("Effects.Template", new Object[] { LocaleLoader.getString("Acrobatics.Effect.2"), LocaleLoader.getString("Acrobatics.Effect.3") }));
+        }
+
+        if (canDodge) {
+            player.sendMessage(LocaleLoader.getString("Effects.Template", new Object[] { LocaleLoader.getString("Acrobatics.Effect.4"), LocaleLoader.getString("Acrobatics.Effect.5") }));
+        }
+    }
+
+    @Override
+    protected boolean statsHeaderPermissions() {
+        return canDodge || canGracefulRoll || canRoll;
+    }
+
+    @Override
+    protected void statsDisplay() {
+        if (canRoll) {
+            player.sendMessage(LocaleLoader.getString("Acrobatics.Roll.Chance", new Object[] { rollChance }));
+        }
+
+        if (canGracefulRoll) {
+            player.sendMessage(LocaleLoader.getString("Acrobatics.Roll.GraceChance", new Object[] { gracefulRollChance }));
+        }
+
+        if (canDodge) {
+            player.sendMessage(LocaleLoader.getString("Acrobatics.DodgeChance", new Object[] { dodgeChance }));
+        }
+    }
+}

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

@@ -1,63 +1,80 @@
 package com.gmail.nossr50.commands.skills;
 
-import org.bukkit.command.Command;
-import org.bukkit.command.CommandExecutor;
-import org.bukkit.command.CommandSender;
-import org.bukkit.entity.Player;
-
-import com.gmail.nossr50.Users;
-import com.gmail.nossr50.mcPermissions;
-import com.gmail.nossr50.datatypes.PlayerProfile;
+import com.gmail.nossr50.commands.SkillCommand;
 import com.gmail.nossr50.datatypes.SkillType;
-import com.gmail.nossr50.locale.mcLocale;
+import com.gmail.nossr50.locale.LocaleLoader;
 
-public class ArcheryCommand implements CommandExecutor {
-	@Override
-	public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
-		if (!(sender instanceof Player)) {
-			sender.sendMessage("This command does not support console useage.");
-			return true;
-		}
+public class ArcheryCommand extends SkillCommand {
+    private String skillShotBonus;
+    private String dazeChance;
+    private String retrieveChance;
 
-		Player player = (Player) sender;
-		PlayerProfile PP = Users.getProfile(player);
+    private boolean canSkillShot;
+    private boolean canDaze;
+    private boolean canRetrieve;
 
-		float skillvalue = (float) PP.getSkillLevel(SkillType.ARCHERY);
-		String percentage = String.valueOf((skillvalue / 1000) * 100);
+    public ArcheryCommand() {
+        super(SkillType.ARCHERY);
+    }
 
-		int ignition = 20;
-		if (PP.getSkillLevel(SkillType.ARCHERY) >= 200)
-			ignition += 20;
-		if (PP.getSkillLevel(SkillType.ARCHERY) >= 400)
-			ignition += 20;
-		if (PP.getSkillLevel(SkillType.ARCHERY) >= 600)
-			ignition += 20;
-		if (PP.getSkillLevel(SkillType.ARCHERY) >= 800)
-			ignition += 20;
-		if (PP.getSkillLevel(SkillType.ARCHERY) >= 1000)
-			ignition += 20;
+    @Override
+    protected void dataCalculations() {
+        if (skillValue >= 1000) {
+            skillShotBonus = "200.00%";
+            dazeChance = "50.00%";
+            retrieveChance = "100.00%";
+        }
+        else {
+            skillShotBonus = percent.format(((int) skillValue / 50) * 0.1D); //TODO: Not sure if this is the best way to calculate this or not...
+            dazeChance = percent.format(skillValue / 2000);
+            retrieveChance = percent.format(skillValue / 1000);
+        }
+    }
 
-		String percentagedaze;
-		if (PP.getSkillLevel(SkillType.ARCHERY) < 1000)
-			percentagedaze = String.valueOf((skillvalue / 2000) * 100);
-		else
-			percentagedaze = "50";
+    @Override
+    protected void permissionsCheck() {
+        canSkillShot = permInstance.archeryBonus(player);
+        canDaze = permInstance.daze(player);
+        canRetrieve = permInstance.trackArrows(player);
+    }
 
-		player.sendMessage(mcLocale.getString("m.SkillHeader", new Object[] { mcLocale.getString("m.SkillArchery") }));
-		player.sendMessage(mcLocale.getString("m.XPGain", new Object[] { mcLocale.getString("m.XPGainArchery") }));
+    @Override
+    protected boolean effectsHeaderPermissions() {
+        return canSkillShot || canDaze || canRetrieve;
+    }
 
-		if (mcPermissions.getInstance().archery(player))
-			player.sendMessage(mcLocale.getString("m.LVL", new Object[] { PP.getSkillLevel(SkillType.ARCHERY), PP.getSkillXpLevel(SkillType.ARCHERY), PP.getXpToLevel(SkillType.ARCHERY) }));
+    @Override
+    protected void effectsDisplay() {
+        if (canSkillShot) {
+            player.sendMessage(LocaleLoader.getString("Effects.Template", new Object[] { LocaleLoader.getString("Archery.Effect.0"), LocaleLoader.getString("Archery.Effect.1") }));
+        }
 
-		player.sendMessage(mcLocale.getString("m.SkillHeader", new Object[] { mcLocale.getString("m.Effects") }));
-		player.sendMessage(mcLocale.getString("m.EffectsTemplate", new Object[] { mcLocale.getString("m.EffectsArchery1_0"), mcLocale.getString("m.EffectsArchery1_1") }));
-		player.sendMessage(mcLocale.getString("m.EffectsTemplate", new Object[] { mcLocale.getString("m.EffectsArchery2_0"), mcLocale.getString("m.EffectsArchery2_1") }));
-		player.sendMessage(mcLocale.getString("m.EffectsTemplate", new Object[] { mcLocale.getString("m.EffectsArchery4_0"), mcLocale.getString("m.EffectsArchery4_1") }));
-		player.sendMessage(mcLocale.getString("m.SkillHeader", new Object[] { mcLocale.getString("m.YourStats") }));
-		player.sendMessage(mcLocale.getString("m.ArcheryDazeChance", new Object[] { percentagedaze }));
-		player.sendMessage(mcLocale.getString("m.ArcheryRetrieveChance", new Object[] { percentage }));
-		player.sendMessage(mcLocale.getString("m.ArcheryIgnitionLength", new Object[] { (ignition / 20) }));
+        if (canDaze) {
+            player.sendMessage(LocaleLoader.getString("Effects.Template", new Object[] { LocaleLoader.getString("Archery.Effect.2"), LocaleLoader.getString("Archery.Effect.3") }));
+        }
 
-		return true;
-	}
+        if (canRetrieve) {
+            player.sendMessage(LocaleLoader.getString("Effects.Template", new Object[] { LocaleLoader.getString("Archery.Effect.4"), LocaleLoader.getString("Archery.Effect.5") }));
+        }
+    }
+
+    @Override
+    protected boolean statsHeaderPermissions() {
+        return canSkillShot || canDaze || canRetrieve;
+    }
+
+    @Override
+    protected void statsDisplay() {
+        if (canSkillShot) {
+            player.sendMessage(LocaleLoader.getString("Archery.Combat.SkillshotBonus", new Object[] { skillShotBonus }));
+        }
+
+        if (canDaze) {
+            player.sendMessage(LocaleLoader.getString("Archery.Combat.DazeChance", new Object[] { dazeChance }));
+        }
+
+        if (canRetrieve) {
+            player.sendMessage(LocaleLoader.getString("Archery.Combat.RetrieveChance", new Object[] { retrieveChance }));
+        }
+    }
 }

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

@@ -1,62 +1,108 @@
 package com.gmail.nossr50.commands.skills;
 
-import org.bukkit.command.Command;
-import org.bukkit.command.CommandExecutor;
-import org.bukkit.command.CommandSender;
-import org.bukkit.entity.Player;
-
-import com.gmail.nossr50.Users;
-import com.gmail.nossr50.mcPermissions;
-import com.gmail.nossr50.datatypes.PlayerProfile;
+import com.gmail.nossr50.commands.SkillCommand;
 import com.gmail.nossr50.datatypes.SkillType;
-import com.gmail.nossr50.locale.mcLocale;
+import com.gmail.nossr50.locale.LocaleLoader;
 
-public class AxesCommand implements CommandExecutor {
-	@Override
-	public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
-		if (!(sender instanceof Player)) {
-			sender.sendMessage("This command does not support console useage.");
-			return true;
-		}
+public class AxesCommand extends SkillCommand {
+    private String critChance;
+    private String bonusDamage;
+    private String impactDamage;
+    private String greaterImpactDamage;
+    private String skullSplitterLength;
 
-		Player player = (Player) sender;
-		PlayerProfile PP = Users.getProfile(player);
+    private boolean canSkullSplitter;
+    private boolean canCritical;
+    private boolean canBonusDamage;
+    private boolean canImpact;
+    private boolean canGreaterImpact;
 
-		String percentage;
+    public AxesCommand() {
+        super(SkillType.AXES);
+    }
 
-		float skillvalue = (float) PP.getSkillLevel(SkillType.AXES);
-		if (PP.getSkillLevel(SkillType.AXES) < 750)
-			percentage = String.valueOf((skillvalue / 1000) * 100);
-		else
-			percentage = "75";
+    @Override
+    protected void dataCalculations() {
+        impactDamage = String.valueOf(5 + ((int) skillValue / 30));
+        skullSplitterLength = String.valueOf(2 + ((int) skillValue / 50));
+        greaterImpactDamage = "2";
 
-		int ticks = 2;
-		int x = PP.getSkillLevel(SkillType.AXES);
-		while (x >= 50) {
-			x -= 50;
-			ticks++;
-		}
+        if (skillValue >= 750) {
+            critChance = "37.50";
+            bonusDamage = "4";
+        }
+        else if (skillValue >= 200) {
+            critChance = percent.format(skillValue / 2000);
+            bonusDamage = "4";
+        }
+        else {
+            critChance = percent.format(skillValue / 2000);
+            bonusDamage = String.valueOf((int) skillValue / 50);
+        }
+    }
 
-		player.sendMessage(mcLocale.getString("m.SkillHeader", new Object[] { mcLocale.getString("m.SkillAxes") }));
-		player.sendMessage(mcLocale.getString("m.XPGain", new Object[] { mcLocale.getString("m.XPGainAxes") }));
+    @Override
+    protected void permissionsCheck() {
+        canSkullSplitter = permInstance.skullSplitter(player);
+        canCritical = permInstance.criticalHit(player);
+        canBonusDamage = permInstance.axeBonus(player);
+        canImpact = permInstance.impact(player);
+        canGreaterImpact = permInstance.greaterImpact(player);
+    }
 
-		if (mcPermissions.getInstance().axes(player))
-			player.sendMessage(mcLocale.getString("m.LVL", new Object[] { PP.getSkillLevel(SkillType.AXES), PP.getSkillXpLevel(SkillType.AXES), PP.getXpToLevel(SkillType.AXES) }));
+    @Override
+    protected boolean effectsHeaderPermissions() {
+        return canSkullSplitter || canCritical || canBonusDamage || canImpact || canGreaterImpact;
+    }
 
-		player.sendMessage(mcLocale.getString("m.SkillHeader", new Object[] { mcLocale.getString("m.Effects") }));
-		player.sendMessage(mcLocale.getString("m.EffectsTemplate", new Object[] { mcLocale.getString("m.EffectsAxes1_0"), mcLocale.getString("m.EffectsAxes1_1") }));
-		player.sendMessage(mcLocale.getString("m.EffectsTemplate", new Object[] { mcLocale.getString("m.EffectsAxes2_0"), mcLocale.getString("m.EffectsAxes2_1") }));
-		player.sendMessage(mcLocale.getString("m.EffectsTemplate", new Object[] { mcLocale.getString("m.EffectsAxes3_0"), mcLocale.getString("m.EffectsAxes3_1") }));
-		player.sendMessage(mcLocale.getString("m.SkillHeader", new Object[] { mcLocale.getString("m.YourStats") }));
-		player.sendMessage(mcLocale.getString("m.AxesCritChance", new Object[] { percentage }));
+    @Override
+    protected void effectsDisplay() {
+        if (canSkullSplitter) {
+            player.sendMessage(LocaleLoader.getString("Effects.Template", new Object[] { LocaleLoader.getString("Axes.Effect.0"), LocaleLoader.getString("Axes.Effect.1") }));
+        }
 
-		if (PP.getSkillLevel(SkillType.AXES) < 500)
-			player.sendMessage(mcLocale.getString("m.AbilityLockTemplate", new Object[] { mcLocale.getString("m.AbilLockAxes1") }));
-		else
-			player.sendMessage(mcLocale.getString("m.AbilityBonusTemplate", new Object[] { mcLocale.getString("m.AbilBonusAxes1_0"), mcLocale.getString("m.AbilBonusAxes1_1") }));
+        if (canCritical) {
+            player.sendMessage(LocaleLoader.getString("Effects.Template", new Object[] { LocaleLoader.getString("Axes.Effect.2"), LocaleLoader.getString("Axes.Effect.3") }));
+        }
 
-		player.sendMessage(mcLocale.getString("m.AxesSkullLength", new Object[] { ticks }));
+        if (canBonusDamage) {
+            player.sendMessage(LocaleLoader.getString("Effects.Template", new Object[] { LocaleLoader.getString("Axes.Effect.4"), LocaleLoader.getString("Axes.Effect.5") }));
+        }
 
-		return true;
-	}
+        if (canImpact) {
+            player.sendMessage(LocaleLoader.getString("Effects.Template", new Object[] { LocaleLoader.getString("Axes.Effect.6"), LocaleLoader.getString("Axes.Effect.7") }));
+        }
+
+        if (canGreaterImpact) {
+            player.sendMessage(LocaleLoader.getString("Effects.Template", new Object[] { LocaleLoader.getString("Axes.Effect.8"), LocaleLoader.getString("Axes.Effect.9") }));
+        }
+    }
+
+    @Override
+    protected boolean statsHeaderPermissions() {
+        return canSkullSplitter || canCritical || canBonusDamage || canImpact || canGreaterImpact;
+    }
+
+    @Override
+    protected void statsDisplay() {
+        if (canBonusDamage) {
+            player.sendMessage(LocaleLoader.getString("Ability.Generic.Template", new Object[] { LocaleLoader.getString("Axes.Ability.Bonus.0"), LocaleLoader.getString("Axes.Ability.Bonus.1", new Object[] {bonusDamage}) }));
+        }
+
+        if (canImpact) {
+            player.sendMessage(LocaleLoader.getString("Ability.Generic.Template", new Object[] { LocaleLoader.getString("Axes.Ability.Bonus.2"), LocaleLoader.getString("Axes.Ability.Bonus.3", new Object[] {impactDamage}) }));
+        }
+
+        if (canGreaterImpact) {
+            player.sendMessage(LocaleLoader.getString("Ability.Generic.Template", new Object[] { LocaleLoader.getString("Axes.Ability.Bonus.4"), LocaleLoader.getString("Axes.Ability.Bonus.5", new Object[] {greaterImpactDamage}) }));
+        }
+
+        if (canCritical) {
+            player.sendMessage(LocaleLoader.getString("Axes.Combat.CritChance", new Object[] { critChance }));
+        }
+
+        if (canSkullSplitter) {
+            player.sendMessage(LocaleLoader.getString("Axes.Combat.SS.Length", new Object[] { skullSplitterLength }));
+        }
+    }
 }

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

@@ -1,46 +1,55 @@
 package com.gmail.nossr50.commands.skills;
 
-import org.bukkit.command.Command;
-import org.bukkit.command.CommandExecutor;
-import org.bukkit.command.CommandSender;
-import org.bukkit.entity.Player;
-
-import com.gmail.nossr50.Users;
-import com.gmail.nossr50.mcPermissions;
-import com.gmail.nossr50.datatypes.PlayerProfile;
+import com.gmail.nossr50.commands.SkillCommand;
 import com.gmail.nossr50.datatypes.SkillType;
-import com.gmail.nossr50.locale.mcLocale;
+import com.gmail.nossr50.locale.LocaleLoader;
 
-public class ExcavationCommand implements CommandExecutor {
-	@Override
-	public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
-		if (!(sender instanceof Player)) {
-			sender.sendMessage("This command does not support console useage.");
-			return true;
-		}
+public class ExcavationCommand extends SkillCommand {
+    private String gigaDrillBreakerLength;
 
-		Player player = (Player) sender;
-		PlayerProfile PP = Users.getProfile(player);
+    private boolean canGigaDrill;
+    private boolean canTreasureHunt;
 
-		int ticks = 2;
-		int x = PP.getSkillLevel(SkillType.EXCAVATION);
-		while (x >= 50) {
-			x -= 50;
-			ticks++;
-		}
+    public ExcavationCommand() {
+        super(SkillType.EXCAVATION);
+    }
 
-		player.sendMessage(mcLocale.getString("m.SkillHeader", new Object[] { mcLocale.getString("m.SkillExcavation") }));
-		player.sendMessage(mcLocale.getString("m.XPGain", new Object[] { mcLocale.getString("m.XPGainExcavation") }));
+    @Override
+    protected void dataCalculations() {
+        gigaDrillBreakerLength = String.valueOf(2 + ((int) skillValue / 50));
+    }
 
-		if (mcPermissions.getInstance().excavation(player))
-			player.sendMessage(mcLocale.getString("m.LVL", new Object[] { PP.getSkillLevel(SkillType.EXCAVATION), PP.getSkillXpLevel(SkillType.EXCAVATION), PP.getXpToLevel(SkillType.EXCAVATION) }));
+    @Override
+    protected void permissionsCheck() {
+        canGigaDrill = permInstance.gigaDrillBreaker(player);
+        canTreasureHunt = permInstance.excavationTreasures(player);
+    }
 
-		player.sendMessage(mcLocale.getString("m.SkillHeader", new Object[] { mcLocale.getString("m.Effects") }));
-		player.sendMessage(mcLocale.getString("m.EffectsTemplate", new Object[] { mcLocale.getString("m.EffectsExcavation1_0"), mcLocale.getString("m.EffectsExcavation1_1") }));
-		player.sendMessage(mcLocale.getString("m.EffectsTemplate", new Object[] { mcLocale.getString("m.EffectsExcavation2_0"), mcLocale.getString("m.EffectsExcavation2_1") }));
-		player.sendMessage(mcLocale.getString("m.SkillHeader", new Object[] { mcLocale.getString("m.YourStats") }));
-		player.sendMessage(mcLocale.getString("m.ExcavationGreenTerraLength", new Object[] { ticks }));
+    @Override
+    protected boolean effectsHeaderPermissions() {
+        return canGigaDrill || canTreasureHunt;
+    }
 
-		return true;
-	}
+    @Override
+    protected void effectsDisplay() {
+        if (canGigaDrill) {
+            player.sendMessage(LocaleLoader.getString("Effects.Template", new Object[] { LocaleLoader.getString("Excavation.Effect.0"), LocaleLoader.getString("Excavation.Effect.1") }));
+        }
+
+        if (canTreasureHunt) {
+            player.sendMessage(LocaleLoader.getString("Effects.Template", new Object[] { LocaleLoader.getString("Excavation.Effect.2"), LocaleLoader.getString("Excavation.Effect.3") }));
+        }
+    }
+
+    @Override
+    protected boolean statsHeaderPermissions() {
+        return canGigaDrill;
+    }
+
+    @Override
+    protected void statsDisplay() {
+        if (canGigaDrill) {
+            player.sendMessage(LocaleLoader.getString("Excavation.Effect.Length", new Object[] { gigaDrillBreakerLength }));
+        }
+    }
 }

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

@@ -1,47 +1,78 @@
 package com.gmail.nossr50.commands.skills;
 
-import org.bukkit.command.Command;
-import org.bukkit.command.CommandExecutor;
-import org.bukkit.command.CommandSender;
-import org.bukkit.entity.Player;
-
-import com.gmail.nossr50.Users;
-import com.gmail.nossr50.mcPermissions;
-import com.gmail.nossr50.datatypes.PlayerProfile;
+import com.gmail.nossr50.commands.SkillCommand;
 import com.gmail.nossr50.datatypes.SkillType;
-import com.gmail.nossr50.locale.mcLocale;
-import com.gmail.nossr50.skills.Fishing;
+import com.gmail.nossr50.locale.LocaleLoader;
+import com.gmail.nossr50.skills.gathering.Fishing;
 
-public class FishingCommand implements CommandExecutor {
-	@Override
-	public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
-		if (!(sender instanceof Player)) {
-			sender.sendMessage("This command does not support console useage.");
-			return true;
-		}
+public class FishingCommand extends SkillCommand {
+    private int lootTier;
+    private String magicChance;
 
-		Player player = (Player) sender;
-		PlayerProfile PP = Users.getProfile(player);
+    private boolean canTreasureHunt;
+    private boolean canMagicHunt;
+    private boolean canShake;
 
-		player.sendMessage(mcLocale.getString("m.SkillHeader", new Object[] { mcLocale.getString("m.SkillFishing") }));
-		player.sendMessage(mcLocale.getString("m.XPGain", new Object[] { mcLocale.getString("m.XPGainFishing") }));
+    public FishingCommand() {
+        super(SkillType.FISHING);
+    }
 
-		if (mcPermissions.getInstance().fishing(player))
-			player.sendMessage(mcLocale.getString("m.LVL", new Object[] { PP.getSkillLevel(SkillType.FISHING), PP.getSkillXpLevel(SkillType.FISHING), PP.getXpToLevel(SkillType.FISHING) }));
+    @Override
+    protected void dataCalculations() {
+        lootTier = Fishing.getFishingLootTier(profile);
+        magicChance = percent.format((float) lootTier / 15);
+    }
 
-		player.sendMessage(mcLocale.getString("m.SkillHeader", new Object[] { mcLocale.getString("m.Effects") }));
-		player.sendMessage(mcLocale.getString("m.EffectsTemplate", new Object[] { mcLocale.getString("m.EffectsFishing1_0"), mcLocale.getString("m.EffectsFishing1_1") }));
-		player.sendMessage(mcLocale.getString("m.EffectsTemplate", new Object[] { mcLocale.getString("m.EffectsFishing2_0"), mcLocale.getString("m.EffectsFishing2_1") }));
-		player.sendMessage(mcLocale.getString("m.EffectsTemplate", new Object[] { mcLocale.getString("m.EffectsFishing3_0"), mcLocale.getString("m.EffectsFishing3_1") }));
-		player.sendMessage(mcLocale.getString("m.SkillHeader", new Object[] { mcLocale.getString("m.YourStats") }));
-		player.sendMessage(mcLocale.getString("m.FishingRank", new Object[] { Fishing.getFishingLootTier(PP) }));
-		player.sendMessage(mcLocale.getString("m.FishingMagicInfo"));
+    @Override
+    protected void permissionsCheck() {
+        canTreasureHunt = permInstance.fishingTreasures(player);
+        canMagicHunt = permInstance.fishingMagic(player);
+        canShake = permInstance.shakeMob(player);
+    }
 
-		if (PP.getSkillLevel(SkillType.FISHING) < 150)
-			player.sendMessage(mcLocale.getString("m.AbilityLockTemplate", new Object[] { mcLocale.getString("m.AbilLockFishing1") }));
-		else
-			player.sendMessage(mcLocale.getString("m.ShakeInfo", new Object[] { Fishing.getFishingLootTier(PP) }));
+    @Override
+    protected boolean effectsHeaderPermissions() {
+        return canTreasureHunt || canMagicHunt || canShake;
+    }
 
-		return true;
-	}
+    @Override
+    protected void effectsDisplay() {
+        if (canTreasureHunt) {
+            player.sendMessage(LocaleLoader.getString("Effects.Template", new Object[] { LocaleLoader.getString("Fishing.Effect.0"), LocaleLoader.getString("Fishing.Effect.1") }));
+        }
+
+        if (canMagicHunt) {
+            player.sendMessage(LocaleLoader.getString("Effects.Template", new Object[] { LocaleLoader.getString("Fishing.Effect.2"), LocaleLoader.getString("Fishing.Effect.3") }));
+        }
+
+        if (canShake) {
+            player.sendMessage(LocaleLoader.getString("Effects.Template", new Object[] { LocaleLoader.getString("Fishing.Effect.4"), LocaleLoader.getString("Fishing.Effect.5") }));
+        }
+    }
+
+    @Override
+    protected boolean statsHeaderPermissions() {
+        return canTreasureHunt || canMagicHunt || canShake;
+    }
+
+    @Override
+    protected void statsDisplay() {
+        if (canTreasureHunt) {
+            player.sendMessage(LocaleLoader.getString("Fishing.Ability.Rank", new Object[] { lootTier }));
+        }
+
+        if (canMagicHunt) {
+            player.sendMessage(LocaleLoader.getString("Fishing.Enchant.Chance", new Object[] { magicChance }));
+        }
+
+        if (canShake) {
+            //TODO: Do we really need to display this twice? Not like there are any associated stats.
+            if (skillValue < 150) {
+                player.sendMessage(LocaleLoader.getString("Ability.Generic.Template.Lock", new Object[] { LocaleLoader.getString("Fishing.Ability.Locked.0") }));
+            }
+            else {
+                player.sendMessage(LocaleLoader.getString("Fishing.Ability.Shake"));
+            }
+        }
+    }
 }

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

@@ -1,63 +1,141 @@
 package com.gmail.nossr50.commands.skills;
 
-import org.bukkit.command.Command;
-import org.bukkit.command.CommandExecutor;
-import org.bukkit.command.CommandSender;
-import org.bukkit.entity.Player;
-
-import com.gmail.nossr50.Users;
-import com.gmail.nossr50.mcPermissions;
-import com.gmail.nossr50.datatypes.PlayerProfile;
+import com.gmail.nossr50.commands.SkillCommand;
+import com.gmail.nossr50.config.Config;
 import com.gmail.nossr50.datatypes.SkillType;
-import com.gmail.nossr50.locale.mcLocale;
+import com.gmail.nossr50.locale.LocaleLoader;
 
-public class HerbalismCommand implements CommandExecutor {
-	@Override
-	public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
-		if (!(sender instanceof Player)) {
-			sender.sendMessage("This command does not support console useage.");
-			return true;
-		}
+public class HerbalismCommand extends SkillCommand {
+    private String greenTerraLength;
+    private String greenThumbChance;
+    private String greenThumbStage;
+    private String farmersDietRank;
+    private String doubleDropChance;
 
-		Player player = (Player) sender;
-		PlayerProfile PP = Users.getProfile(player);
+    private boolean canGreenTerra;
+    private boolean canGreenThumbWheat;
+    private boolean canGreenThumbBlocks;
+    private boolean canFarmersDiet;
+    private boolean canDoubleDrop;
+    private boolean doubleDropsDisabled;
 
-		int bonus = 0;
-		if (PP.getSkillLevel(SkillType.HERBALISM) >= 200)
-			bonus++;
-		if (PP.getSkillLevel(SkillType.HERBALISM) >= 400)
-			bonus++;
-		if (PP.getSkillLevel(SkillType.HERBALISM) >= 600)
-			bonus++;
+    public HerbalismCommand() {
+        super(SkillType.HERBALISM);
+    }
 
-		int ticks = 2;
-		int x = PP.getSkillLevel(SkillType.HERBALISM);
-		while (x >= 50) {
-			x -= 50;
-			ticks++;
-		}
+    @Override
+    protected void dataCalculations() {
+        greenTerraLength = String.valueOf(2 + ((int) skillValue / 50));
 
-		float skillvalue = (float) PP.getSkillLevel(SkillType.HERBALISM);
+        if (skillValue >= 1500) {
+            greenThumbChance = "100.00%";
+            greenThumbStage = "4";
+            farmersDietRank = "5";
+            doubleDropChance = "100.00%";
+        }
+        else if (skillValue >= 1000) {
+            greenThumbChance = percent.format(skillValue / 1500);
+            greenThumbStage = "4";
+            farmersDietRank = "5";
+            doubleDropChance = "100.00%";
+        }
+        else if (skillValue >= 800) {
+            greenThumbChance = percent.format(skillValue / 1500);
+            greenThumbStage = "4";
+            farmersDietRank = "4";
+            doubleDropChance = percent.format(skillValue / 1000);
+        }
+        else if (skillValue >= 600) {
+            greenThumbChance = percent.format(skillValue / 1500);
+            greenThumbStage = "4";
+            farmersDietRank = "3";
+            doubleDropChance = percent.format(skillValue / 1000);
+        }
+        else if (skillValue >= 400) {
+            greenThumbChance = percent.format(skillValue / 1500);
+            greenThumbStage = "3";
+            farmersDietRank = "2";
+            doubleDropChance = percent.format(skillValue / 1000);
+        }
+        else if (skillValue >= 200) {
+            greenThumbChance = percent.format(skillValue / 1500);
+            greenThumbStage = "2";
+            farmersDietRank = "1";
+            doubleDropChance = percent.format(skillValue / 1000);
+        }
+        else {
+            greenThumbChance = percent.format(skillValue / 1500);
+            greenThumbStage = "1";
+            farmersDietRank = "1";
+            doubleDropChance = percent.format(skillValue / 1000);
+        }
+    }
 
-		String percentage = String.valueOf((skillvalue / 1000) * 100);
-		String gpercentage = String.valueOf((skillvalue / 1500) * 100);
-		player.sendMessage(mcLocale.getString("m.SkillHeader", new Object[] { mcLocale.getString("m.SkillHerbalism") }));
-		player.sendMessage(mcLocale.getString("m.XPGain", new Object[] { mcLocale.getString("m.XPGainHerbalism") }));
+    @Override
+    protected void permissionsCheck() {
+        Config configInstance = Config.getInstance();
 
-		if (mcPermissions.getInstance().herbalism(player))
-			player.sendMessage(mcLocale.getString("m.LVL", new Object[] { PP.getSkillLevel(SkillType.HERBALISM), PP.getSkillXpLevel(SkillType.HERBALISM), PP.getXpToLevel(SkillType.HERBALISM) }));
+        canGreenTerra = permInstance.greenTerra(player);
+        canGreenThumbWheat = permInstance.greenThumbWheat(player);
+        canGreenThumbBlocks = permInstance.greenThumbBlocks(player);
+        canFarmersDiet = permInstance.farmersDiet(player);
+        canDoubleDrop = permInstance.herbalismDoubleDrops(player);
+        doubleDropsDisabled = configInstance.herbalismDoubleDropsDisabled();
+    }
 
-		player.sendMessage(mcLocale.getString("m.SkillHeader", new Object[] { mcLocale.getString("m.Effects") }));
-		player.sendMessage(mcLocale.getString("m.EffectsTemplate", new Object[] { mcLocale.getString("m.EffectsHerbalism1_0"), mcLocale.getString("m.EffectsHerbalism1_1") }));
-		player.sendMessage(mcLocale.getString("m.EffectsTemplate", new Object[] { mcLocale.getString("m.EffectsHerbalism2_0"), mcLocale.getString("m.EffectsHerbalism2_1") }));
-		player.sendMessage(mcLocale.getString("m.EffectsTemplate", new Object[] { mcLocale.getString("m.EffectsHerbalism3_0"), mcLocale.getString("m.EffectsHerbalism3_1") }));
-		player.sendMessage(mcLocale.getString("m.EffectsTemplate", new Object[] { mcLocale.getString("m.EffectsHerbalism5_0"), mcLocale.getString("m.EffectsHerbalism5_1") }));
-		player.sendMessage(mcLocale.getString("m.SkillHeader", new Object[] { mcLocale.getString("m.YourStats") }));
-		player.sendMessage(mcLocale.getString("m.HerbalismGreenTerraLength", new Object[] { ticks }));
-		player.sendMessage(mcLocale.getString("m.HerbalismGreenThumbChance", new Object[] { gpercentage }));
-		player.sendMessage(mcLocale.getString("m.HerbalismGreenThumbStage", new Object[] { bonus }));
-		player.sendMessage(mcLocale.getString("m.HerbalismDoubleDropChance", new Object[] { percentage }));
+    @Override
+    protected boolean effectsHeaderPermissions() {
+        return canGreenTerra || (canDoubleDrop && !doubleDropsDisabled) || canFarmersDiet || canGreenThumbBlocks || canGreenThumbWheat;
+    }
 
-		return true;
-	}
+    @Override
+    protected void effectsDisplay() {
+        if (canGreenTerra) {
+            player.sendMessage(LocaleLoader.getString("Effects.Template", new Object[] { LocaleLoader.getString("Herbalism.Effect.0"), LocaleLoader.getString("Herbalism.Effect.1") }));
+        }
+
+        if (canGreenThumbWheat) {
+            player.sendMessage(LocaleLoader.getString("Effects.Template", new Object[] { LocaleLoader.getString("Herbalism.Effect.2"), LocaleLoader.getString("Herbalism.Effect.3") }));
+        }
+
+        if (canGreenThumbBlocks) {
+            player.sendMessage(LocaleLoader.getString("Effects.Template", new Object[] { LocaleLoader.getString("Herbalism.Effect.4"), LocaleLoader.getString("Herbalism.Effect.5") }));
+        }
+
+        if (canFarmersDiet) {
+            player.sendMessage(LocaleLoader.getString("Effects.Template", new Object[] { LocaleLoader.getString("Herbalism.Effect.6"), LocaleLoader.getString("Herbalism.Effect.7") }));
+        }
+
+        if (canDoubleDrop && !doubleDropsDisabled) {
+            player.sendMessage(LocaleLoader.getString("Effects.Template", new Object[] { LocaleLoader.getString("Herbalism.Effect.8"), LocaleLoader.getString("Herbalism.Effect.9") }));
+        }
+    }
+
+    @Override
+    protected boolean statsHeaderPermissions() {
+        return canGreenTerra || (canDoubleDrop && !doubleDropsDisabled) || canFarmersDiet || canGreenThumbBlocks || canGreenThumbWheat;
+    }
+
+    @Override
+    protected void statsDisplay() {
+        if (canGreenTerra) {
+            player.sendMessage(LocaleLoader.getString("Herbalism.Ability.GTe.Length", new Object[] { greenTerraLength }));
+        }
+
+        if (canGreenThumbBlocks || canGreenThumbWheat) {
+            player.sendMessage(LocaleLoader.getString("Herbalism.Ability.GTh.Chance", new Object[] { greenThumbChance }));
+        }
+
+        if (canGreenThumbWheat) {
+            player.sendMessage(LocaleLoader.getString("Herbalism.Ability.GTh.Stage", new Object[] { greenThumbStage }));
+        }
+
+        if (canFarmersDiet) {
+            player.sendMessage(LocaleLoader.getString("Herbalism.Ability.FD", new Object[] { farmersDietRank } ));
+        }
+
+        if (canDoubleDrop && !doubleDropsDisabled) {
+            player.sendMessage(LocaleLoader.getString("Herbalism.Ability.DoubleDropChance", new Object[] { doubleDropChance }));
+        }
+    }
 }

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

@@ -1,48 +1,169 @@
 package com.gmail.nossr50.commands.skills;
 
-import org.bukkit.command.Command;
-import org.bukkit.command.CommandExecutor;
-import org.bukkit.command.CommandSender;
-import org.bukkit.entity.Player;
-
-import com.gmail.nossr50.Users;
-import com.gmail.nossr50.mcPermissions;
-import com.gmail.nossr50.datatypes.PlayerProfile;
+import com.gmail.nossr50.commands.SkillCommand;
+import com.gmail.nossr50.config.Config;
 import com.gmail.nossr50.datatypes.SkillType;
-import com.gmail.nossr50.locale.mcLocale;
+import com.gmail.nossr50.locale.LocaleLoader;
+import com.gmail.nossr50.util.Misc;
 
-public class MiningCommand implements CommandExecutor {
-	@Override
-	public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
-		if (!(sender instanceof Player)) {
-			sender.sendMessage("This command does not support console useage.");
-			return true;
-		}
+public class MiningCommand extends SkillCommand {
+    private String doubleDropChance;
+    private String superBreakerLength;
+    private String blastMiningRank;
+    private String blastRadiusIncrease;
+    private String blastDamageDecrease;
 
-		Player player = (Player) sender;
-		PlayerProfile PP = Users.getProfile(player);
+    private boolean canSuperBreaker;
+    private boolean canDoubleDrop;
+    private boolean canBlast;
+    private boolean canBiggerBombs;
+    private boolean canDemoExpert;
+    private boolean doubleDropsDisabled;
 
-		float skillvalue = (float) PP.getSkillLevel(SkillType.MINING);
-		String percentage = String.valueOf((skillvalue / 1000) * 100);
-		int ticks = 2;
-		int x = PP.getSkillLevel(SkillType.MINING);
-		while (x >= 50) {
-			x -= 50;
-			ticks++;
-		}
-		player.sendMessage(mcLocale.getString("m.SkillHeader", new Object[] { mcLocale.getString("m.SkillMining") }));
-		player.sendMessage(mcLocale.getString("m.XPGain", new Object[] { mcLocale.getString("m.XPGainMining") }));
+    public MiningCommand() {
+        super(SkillType.MINING);
+    }
 
-		if (mcPermissions.getInstance().mining(player))
-			player.sendMessage(mcLocale.getString("m.LVL", new Object[] { PP.getSkillLevel(SkillType.MINING), PP.getSkillXpLevel(SkillType.MINING), PP.getXpToLevel(SkillType.MINING) }));
+    @Override
+    protected void dataCalculations() {
+        superBreakerLength = String.valueOf(2 + ((int) skillValue / 50));
 
-		player.sendMessage(mcLocale.getString("m.SkillHeader", new Object[] { mcLocale.getString("m.Effects") }));
-		player.sendMessage(mcLocale.getString("m.EffectsTemplate", new Object[] { mcLocale.getString("m.EffectsMining1_0"), mcLocale.getString("m.EffectsMining1_1") }));
-		player.sendMessage(mcLocale.getString("m.EffectsTemplate", new Object[] { mcLocale.getString("m.EffectsMining2_0"), mcLocale.getString("m.EffectsMining2_1") }));
-		player.sendMessage(mcLocale.getString("m.SkillHeader", new Object[] { mcLocale.getString("m.YourStats") }));
-		player.sendMessage(mcLocale.getString("m.MiningDoubleDropChance", new Object[] { percentage }));
-		player.sendMessage(mcLocale.getString("m.MiningSuperBreakerLength", new Object[] { ticks }));
+        if (skillValue >= 1000) {
+            blastMiningRank = "8";
+            blastDamageDecrease = "100.00%";
+            blastRadiusIncrease = "4";
+            doubleDropChance = "100.00%";
+        }
+        else if (skillValue >= 875) {
+            blastMiningRank = "7";
+            blastDamageDecrease = "50.00%";
+            blastRadiusIncrease = "3";
+            doubleDropChance = percent.format(skillValue / 1000);
+        }
+        else if (skillValue >= 750) {
+            blastMiningRank = "6";
+            blastDamageDecrease = "50.00%";
+            blastRadiusIncrease = "3";
+            doubleDropChance = percent.format(skillValue / 1000);
+        }
+        else if (skillValue >= 625) {
+            blastMiningRank = "5";
+            blastDamageDecrease = "25.00%";
+            blastRadiusIncrease = "2";
+            doubleDropChance = percent.format(skillValue / 1000);
+        }
+        else if (skillValue >= 500) {
+            blastMiningRank = "4";
+            blastDamageDecrease = "25.00%";
+            blastRadiusIncrease = "2";
+            doubleDropChance = percent.format(skillValue / 1000);
+        }
+        else if (skillValue >= 375) {
+            blastMiningRank = "3";
+            blastDamageDecrease = "0.00%";
+            blastRadiusIncrease = "1";
+            doubleDropChance = percent.format(skillValue / 1000);
+        }
+        else if (skillValue >= 250) {
+            blastMiningRank = "2";
+            blastDamageDecrease = "0.00%";
+            blastRadiusIncrease = "1";
+            doubleDropChance = percent.format(skillValue / 1000);
+        }
+        else if (skillValue >= 125) {
+            blastMiningRank = "1";
+            blastDamageDecrease = "0.00%";
+            blastRadiusIncrease = "0";
+            doubleDropChance = percent.format(skillValue / 1000);
+        }
+        else {
+            blastMiningRank = "0";
+            blastDamageDecrease = "0.00%";
+            blastRadiusIncrease = "0";
+            doubleDropChance = percent.format(skillValue / 1000);
+        }
+    }
 
-		return true;
-	}
+    @Override
+    protected void permissionsCheck() {
+        Config configInstance = Config.getInstance();
+
+        canBiggerBombs = permInstance.biggerBombs(player);
+        canBlast = permInstance.blastMining(player);
+        canDemoExpert = permInstance.demolitionsExpertise(player);
+        canDoubleDrop = permInstance.miningDoubleDrops(player);
+        canSuperBreaker = permInstance.superBreaker(player);
+        doubleDropsDisabled = configInstance.miningDoubleDropsDisabled();
+    }
+
+    @Override
+    protected boolean effectsHeaderPermissions() {
+        return canBiggerBombs || canBlast || canDemoExpert || (canDoubleDrop && !doubleDropsDisabled) || canSuperBreaker;
+    }
+
+    @Override
+    protected void effectsDisplay() {
+        if (canSuperBreaker) {
+            player.sendMessage(LocaleLoader.getString("Effects.Template", new Object[] { LocaleLoader.getString("Mining.Effect.0"), LocaleLoader.getString("Mining.Effect.1") }));
+        }
+
+        if (canDoubleDrop && !doubleDropsDisabled) {
+            player.sendMessage(LocaleLoader.getString("Effects.Template", new Object[] { LocaleLoader.getString("Mining.Effect.2"), LocaleLoader.getString("Mining.Effect.3") }));
+        }
+
+        if (canBlast) {
+            player.sendMessage(LocaleLoader.getString("Effects.Template", new Object[] { LocaleLoader.getString("Mining.Effect.4"), LocaleLoader.getString("Mining.Effect.5") }));
+        }
+
+        if (canBiggerBombs) {
+            player.sendMessage(LocaleLoader.getString("Effects.Template", new Object[] { LocaleLoader.getString("Mining.Effect.6"), LocaleLoader.getString("Mining.Effect.7") }));
+        }
+
+        if (canDemoExpert) {
+            player.sendMessage(LocaleLoader.getString("Effects.Template", new Object[] { LocaleLoader.getString("Mining.Effect.8"), LocaleLoader.getString("Mining.Effect.9") }));
+        }
+    }
+
+    @Override
+    protected boolean statsHeaderPermissions() {
+        return canBiggerBombs || canBlast || canDemoExpert || (canDoubleDrop && !doubleDropsDisabled) || canSuperBreaker;
+    }
+
+    @Override
+    protected void statsDisplay() {
+        if (canDoubleDrop && !doubleDropsDisabled) {
+            player.sendMessage(LocaleLoader.getString("Mining.Effect.DropChance", new Object[] { doubleDropChance }));
+        }
+
+        if (canSuperBreaker) {
+            player.sendMessage(LocaleLoader.getString("Mining.Ability.Length", new Object[] { superBreakerLength }));
+        }
+
+        if (canBlast) {
+            if (skillValue < 125) {
+                player.sendMessage(LocaleLoader.getString("Ability.Generic.Template.Lock", new Object[] { LocaleLoader.getString("Mining.Ability.Locked.0") }));
+            }
+            else {
+                player.sendMessage(LocaleLoader.getString("Mining.Blast.Rank", new Object[] { blastMiningRank, LocaleLoader.getString("Mining.Blast.Effect." + (Misc.getInt(blastMiningRank) - 1)) }));
+            }
+        }
+
+        if (canBiggerBombs) {
+            if (skillValue < 250) {
+                player.sendMessage(LocaleLoader.getString("Ability.Generic.Template.Lock", new Object[] { LocaleLoader.getString("Mining.Ability.Locked.1") }));
+            }
+            else {
+                player.sendMessage(LocaleLoader.getString("Mining.Blast.Radius.Increase", new Object[] { blastRadiusIncrease }));
+            }
+        }
+
+        if (canDemoExpert) {
+            if (skillValue < 500) {
+                player.sendMessage(LocaleLoader.getString("Ability.Generic.Template.Lock", new Object[] { LocaleLoader.getString("Mining.Ability.Locked.2") }));
+            }
+            else {
+                player.sendMessage(LocaleLoader.getString("Mining.Effect.Decrease", new Object[] { blastDamageDecrease }));
+            }
+        }
+    }
 }

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

@@ -1,53 +1,142 @@
 package com.gmail.nossr50.commands.skills;
 
-import org.bukkit.command.Command;
-import org.bukkit.command.CommandExecutor;
-import org.bukkit.command.CommandSender;
-import org.bukkit.entity.Player;
-
-import com.gmail.nossr50.Users;
-import com.gmail.nossr50.mcPermissions;
-import com.gmail.nossr50.config.LoadProperties;
-import com.gmail.nossr50.datatypes.PlayerProfile;
+import com.gmail.nossr50.mcMMO;
+import com.gmail.nossr50.commands.SkillCommand;
+import com.gmail.nossr50.config.Config;
 import com.gmail.nossr50.datatypes.SkillType;
-import com.gmail.nossr50.locale.mcLocale;
-import com.gmail.nossr50.skills.Repair;
+import com.gmail.nossr50.locale.LocaleLoader;
+import com.gmail.nossr50.skills.repair.Repair;
+import com.gmail.nossr50.skills.repair.Repairable;
 
-public class RepairCommand implements CommandExecutor {
-	@Override
-	public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
-		if (!(sender instanceof Player)) {
-			sender.sendMessage("This command does not support console useage.");
-			return true;
-		}
+public class RepairCommand extends SkillCommand {
+    private int arcaneForgingRank;
+    private String repairMasteryBonus;
+    private String superRepairChance;
 
-		Player player = (Player) sender;
-		PlayerProfile PP = Users.getProfile(player);
+    private boolean canSuperRepair;
+    private boolean canMasterRepair;
+    private boolean canArcaneForge;
+    private boolean canRepairStone;
+    private boolean canRepairIron;
+    private boolean canRepairGold;
+    private boolean canRepairDiamond;
+    private boolean canRepairString;
+    private boolean canRepairLeather;
+    private boolean canRepairWood;
 
-		float skillvalue = (float) PP.getSkillLevel(SkillType.REPAIR);
-		String percentage = String.valueOf((skillvalue / 1000) * 100);
-		String repairmastery = String.valueOf((skillvalue / 500) * 100);
-		player.sendMessage(mcLocale.getString("m.SkillHeader", new Object[] { mcLocale.getString("m.SkillRepair") }));
-		player.sendMessage(mcLocale.getString("m.XPGain", new Object[] { mcLocale.getString("m.XPGainRepair") }));
+    private int diamondLevel;
+    private int goldLevel;
+    private int ironLevel;
+    private int stoneLevel;
 
-		if (mcPermissions.getInstance().repair(player))
-			player.sendMessage(mcLocale.getString("m.LVL", new Object[] { PP.getSkillLevel(SkillType.REPAIR), PP.getSkillXpLevel(SkillType.REPAIR), PP.getXpToLevel(SkillType.REPAIR) }));
+    public RepairCommand() {
+        super(SkillType.REPAIR);
+    }
 
-		player.sendMessage(mcLocale.getString("m.SkillHeader", new Object[] { mcLocale.getString("m.Effects") }));
-		player.sendMessage(mcLocale.getString("m.EffectsTemplate", new Object[] { mcLocale.getString("m.EffectsRepair1_0"), mcLocale.getString("m.EffectsRepair1_1") }));
-		player.sendMessage(mcLocale.getString("m.EffectsTemplate", new Object[] { mcLocale.getString("m.EffectsRepair2_0"), mcLocale.getString("m.EffectsRepair2_1") }));
-		player.sendMessage(mcLocale.getString("m.EffectsTemplate", new Object[] { mcLocale.getString("m.EffectsRepair3_0"), mcLocale.getString("m.EffectsRepair3_1") }));
-		player.sendMessage(mcLocale.getString("m.EffectsTemplate", new Object[] { mcLocale.getString("m.EffectsRepair4_0", new Object[] { LoadProperties.repairdiamondlevel }), mcLocale.getString("m.EffectsRepair4_1") }));
-		player.sendMessage(mcLocale.getString("m.EffectsTemplate", new Object[] { mcLocale.getString("m.EffectsRepair5_0"), mcLocale.getString("m.EffectsRepair5_1") }));
-		player.sendMessage(mcLocale.getString("m.SkillHeader", new Object[] { mcLocale.getString("m.YourStats") }));
-		player.sendMessage(mcLocale.getString("m.RepairRepairMastery", new Object[] { repairmastery }));
-		player.sendMessage(mcLocale.getString("m.RepairSuperRepairChance", new Object[] { percentage }));
-		player.sendMessage(mcLocale.getString("m.ArcaneForgingRank", new Object[] { Repair.getArcaneForgingRank(PP) }));
-		player.sendMessage(mcLocale.getString("m.ArcaneEnchantKeepChance", new Object[] { Repair.getEnchantChance(Repair.getArcaneForgingRank(PP)) }));
-		player.sendMessage(mcLocale.getString("m.ArcaneEnchantDowngradeChance", new Object[] { Repair.getDowngradeChance(Repair.getArcaneForgingRank(PP)) }));
-		player.sendMessage(mcLocale.getString("m.ArcaneForgingMilestones"));
-		player.sendMessage(mcLocale.getString("m.ArcaneForgingMilestones2"));
+    @Override
+    protected void dataCalculations() {
+        // We're using pickaxes here, not the best but it works
+        Repairable diamondRepairable = mcMMO.repairManager.getRepairable(278);
+        Repairable goldRepairable = mcMMO.repairManager.getRepairable(285);
+        Repairable ironRepairable = mcMMO.repairManager.getRepairable(257);
+        Repairable stoneRepairable = mcMMO.repairManager.getRepairable(274);
 
-		return true;
-	}
+        diamondLevel = (diamondRepairable == null) ? 0 : diamondRepairable.getMinimumLevel();
+        goldLevel = (goldRepairable == null) ? 0 : goldRepairable.getMinimumLevel();
+        ironLevel = (ironRepairable == null) ? 0 : ironRepairable.getMinimumLevel();
+        stoneLevel = (stoneRepairable == null) ? 0 : stoneRepairable.getMinimumLevel();
+
+        repairMasteryBonus = percent.format(skillValue / 500);
+
+        if (skillValue >= 1000) {
+            superRepairChance = "100.00%";
+        }
+        else {
+            superRepairChance = percent.format(skillValue / 1000);
+        }
+
+        arcaneForgingRank = Repair.getArcaneForgingRank(profile);
+    }
+
+    @Override
+    protected void permissionsCheck() {
+        canSuperRepair = permInstance.repairBonus(player);
+        canMasterRepair = permInstance.repairMastery(player);
+        canArcaneForge = permInstance.arcaneForging(player);
+        canRepairDiamond = permInstance.diamondRepair(player);
+        canRepairGold = permInstance.goldRepair(player);
+        canRepairIron = permInstance.ironRepair(player);
+        canRepairStone = permInstance.stoneRepair(player);
+        canRepairString = permInstance.stringRepair(player);
+        canRepairLeather = permInstance.leatherRepair(player);
+        canRepairWood = permInstance.woodRepair(player);
+    }
+
+    @Override
+    protected boolean effectsHeaderPermissions() {
+        return canArcaneForge || canRepairDiamond || canRepairGold || canRepairIron || canMasterRepair || canRepairStone || canSuperRepair || canRepairString || canRepairWood || canRepairLeather;
+    }
+
+    @Override
+    protected void effectsDisplay() {
+        player.sendMessage(LocaleLoader.getString("Effects.Template", new Object[] { LocaleLoader.getString("Repair.Effect.0"), LocaleLoader.getString("Repair.Effect.1") }));
+
+        if (canMasterRepair) {
+            player.sendMessage(LocaleLoader.getString("Effects.Template", new Object[] { LocaleLoader.getString("Repair.Effect.2"), LocaleLoader.getString("Repair.Effect.3") }));
+        }
+
+        if (canSuperRepair) {
+            player.sendMessage(LocaleLoader.getString("Effects.Template", new Object[] { LocaleLoader.getString("Repair.Effect.4"), LocaleLoader.getString("Repair.Effect.5") }));
+        }
+
+        /* Repair Level Requirements */
+
+        if (canRepairStone && stoneLevel > 0) {
+            player.sendMessage(LocaleLoader.getString("Effects.Template", new Object[] { LocaleLoader.getString("Repair.Effect.14", new Object[] { stoneLevel }), LocaleLoader.getString("Repair.Effect.15") }));
+        }
+
+        if (canRepairIron && ironLevel > 0) {
+            player.sendMessage(LocaleLoader.getString("Effects.Template", new Object[] { LocaleLoader.getString("Repair.Effect.12", new Object[] { ironLevel }), LocaleLoader.getString("Repair.Effect.13") }));
+        }
+
+        if (canRepairGold && goldLevel > 0) {
+            player.sendMessage(LocaleLoader.getString("Effects.Template", new Object[] { LocaleLoader.getString("Repair.Effect.10", new Object[] { goldLevel }), LocaleLoader.getString("Repair.Effect.11") }));
+        }
+
+        if (canRepairDiamond && diamondLevel > 0) {
+            player.sendMessage(LocaleLoader.getString("Effects.Template", new Object[] { LocaleLoader.getString("Repair.Effect.6", new Object[] { diamondLevel }), LocaleLoader.getString("Repair.Effect.7") }));
+        }
+
+        if (canArcaneForge) {
+            player.sendMessage(LocaleLoader.getString("Effects.Template", new Object[] { LocaleLoader.getString("Repair.Effect.8"), LocaleLoader.getString("Repair.Effect.9") }));
+        }
+    }
+
+    @Override
+    protected boolean statsHeaderPermissions() {
+        return canArcaneForge || canMasterRepair || canSuperRepair;
+    }
+
+    @Override
+    protected void statsDisplay() {
+        if (canMasterRepair) {
+            player.sendMessage(LocaleLoader.getString("Repair.Skills.Mastery", new Object[] { repairMasteryBonus }));
+        }
+
+        if (canSuperRepair) {
+            player.sendMessage(LocaleLoader.getString("Repair.Skills.Super.Chance", new Object[] { superRepairChance }));
+        }
+
+        if (canArcaneForge) {
+            player.sendMessage(LocaleLoader.getString("Repair.Arcane.Rank", new Object[] { arcaneForgingRank }));
+
+            if (Config.getInstance().getArcaneForgingEnchantLossEnabled()) {
+                player.sendMessage(LocaleLoader.getString("Repair.Arcane.Chance.Success", new Object[] { Repair.getEnchantChance(arcaneForgingRank) }));
+            }
+
+            if (Config.getInstance().getArcaneForgingDowngradeEnabled()) {
+                player.sendMessage(LocaleLoader.getString("Repair.Arcane.Chance.Downgrade", new Object[] { Repair.getDowngradeChance(arcaneForgingRank) }));
+            }
+        }
+    }
 }

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

@@ -1,69 +1,91 @@
 package com.gmail.nossr50.commands.skills;
 
-import org.bukkit.command.Command;
-import org.bukkit.command.CommandExecutor;
-import org.bukkit.command.CommandSender;
-import org.bukkit.entity.Player;
-
-import com.gmail.nossr50.Users;
-import com.gmail.nossr50.mcPermissions;
-import com.gmail.nossr50.datatypes.PlayerProfile;
+import com.gmail.nossr50.commands.SkillCommand;
 import com.gmail.nossr50.datatypes.SkillType;
-import com.gmail.nossr50.locale.mcLocale;
+import com.gmail.nossr50.locale.LocaleLoader;
 
-public class SwordsCommand implements CommandExecutor {
-	@Override
-	public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
-		if (!(sender instanceof Player)) {
-			sender.sendMessage("This command does not support console useage.");
-			return true;
-		}
+public class SwordsCommand extends SkillCommand {
+    private String counterAttackChance;
+    private String bleedLength;
+    private String bleedChance;
+    private String serratedStrikesLength;
 
-		Player player = (Player) sender;
-		PlayerProfile PP = Users.getProfile(player);
+    private boolean canCounter;
+    private boolean canSerratedStrike;
+    private boolean canBleed;
 
-		int bleedrank = 2;
-		String percentage, counterattackpercentage;
+    public SwordsCommand() {
+        super(SkillType.SWORDS);
+    }
 
-		float skillvalue = (float) PP.getSkillLevel(SkillType.SWORDS);
-		if (PP.getSkillLevel(SkillType.SWORDS) < 750)
-			percentage = String.valueOf((skillvalue / 1000) * 100);
-		else
-			percentage = "75";
+    @Override
+    protected void dataCalculations() {
+        serratedStrikesLength = String.valueOf(2 + ((int) skillValue / 50));
 
-		if (skillvalue >= 750)
-			bleedrank += 1;
+        if (skillValue >= 750) {
+            bleedLength = "3";
+            bleedChance = "75.00%";
+            counterAttackChance = "30.00%";
+        }
+        else if (skillValue >= 600) {
+            bleedLength = "2";
+            bleedChance = percent.format(skillValue / 1000);
+            counterAttackChance = "30.00%";
+        }
+        else {
+            bleedLength = "2";
+            bleedChance = percent.format(skillValue / 1000);
+            counterAttackChance = percent.format(skillValue / 2000);
+        }
+    }
 
-		if (PP.getSkillLevel(SkillType.SWORDS) <= 600)
-			counterattackpercentage = String.valueOf((skillvalue / 2000) * 100);
-		else
-			counterattackpercentage = "30";
+    @Override
+    protected void permissionsCheck() {
+        canBleed = permInstance.swordsBleed(player);
+        canCounter = permInstance.counterAttack(player);
+        canSerratedStrike = permInstance.serratedStrikes(player);
+    }
 
-		int ticks = 2;
-		int x = PP.getSkillLevel(SkillType.SWORDS);
-		while (x >= 50) {
-			x -= 50;
-			ticks++;
-		}
+    @Override
+    protected boolean effectsHeaderPermissions() {
+        return canBleed || canCounter || canSerratedStrike;
+    }
 
-		player.sendMessage(mcLocale.getString("m.SkillHeader", new Object[] { mcLocale.getString("m.SkillSwords") }));
-		player.sendMessage(mcLocale.getString("m.XPGain", new Object[] { mcLocale.getString("m.XPGainSwords") }));
-		
-		if (mcPermissions.getInstance().swords(player))
-			player.sendMessage(mcLocale.getString("m.LVL", new Object[] { PP.getSkillLevel(SkillType.SWORDS), PP.getSkillXpLevel(SkillType.SWORDS), PP.getXpToLevel(SkillType.SWORDS) }));
-		
-		player.sendMessage(mcLocale.getString("m.SkillHeader", new Object[] { mcLocale.getString("m.Effects") }));
-		player.sendMessage(mcLocale.getString("m.EffectsTemplate", new Object[] { mcLocale.getString("m.EffectsSwords1_0"), mcLocale.getString("m.EffectsSwords1_1") }));
-		player.sendMessage(mcLocale.getString("m.EffectsTemplate", new Object[] { mcLocale.getString("m.EffectsSwords2_0"), mcLocale.getString("m.EffectsSwords2_1") }));
-		player.sendMessage(mcLocale.getString("m.EffectsTemplate", new Object[] { mcLocale.getString("m.EffectsSwords3_0"), mcLocale.getString("m.EffectsSwords3_1") }));
-		player.sendMessage(mcLocale.getString("m.EffectsTemplate", new Object[] { mcLocale.getString("m.EffectsSwords5_0"), mcLocale.getString("m.EffectsSwords5_1") }));
-		player.sendMessage(mcLocale.getString("m.SkillHeader", new Object[] { mcLocale.getString("m.YourStats") }));
-		player.sendMessage(mcLocale.getString("m.SwordsCounterAttChance", new Object[] { counterattackpercentage }));
-		player.sendMessage(mcLocale.getString("m.SwordsBleedLength", new Object[] { bleedrank }));
-		player.sendMessage(mcLocale.getString("m.SwordsTickNote"));
-		player.sendMessage(mcLocale.getString("m.SwordsBleedLength", new Object[] { percentage }));
-		player.sendMessage(mcLocale.getString("m.SwordsSSLength", new Object[] { ticks }));
+    @Override
+    protected void effectsDisplay() {
+        if (canCounter) {
+            player.sendMessage(LocaleLoader.getString("Effects.Template", new Object[] { LocaleLoader.getString("Swords.Effect.0"), LocaleLoader.getString("Swords.Effect.1") }));
+        }
 
-		return true;
-	}
+        if (canSerratedStrike) {
+            player.sendMessage(LocaleLoader.getString("Effects.Template", new Object[] { LocaleLoader.getString("Swords.Effect.2"), LocaleLoader.getString("Swords.Effect.3") }));
+            player.sendMessage(LocaleLoader.getString("Effects.Template", new Object[] { LocaleLoader.getString("Swords.Effect.4"), LocaleLoader.getString("Swords.Effect.5") }));
+        }
+
+        if (canBleed) {
+            player.sendMessage(LocaleLoader.getString("Effects.Template", new Object[] { LocaleLoader.getString("Swords.Effect.6"), LocaleLoader.getString("Swords.Effect.7") }));
+        }
+    }
+
+    @Override
+    protected boolean statsHeaderPermissions() {
+        return canBleed || canCounter || canSerratedStrike;
+    }
+
+    @Override
+    protected void statsDisplay() {
+        if (canCounter) {
+            player.sendMessage(LocaleLoader.getString("Swords.Combat.Counter.Chance", new Object[] { counterAttackChance }));
+        }
+
+        if (canBleed) {
+            player.sendMessage(LocaleLoader.getString("Swords.Combat.Bleed.Length", new Object[] { bleedLength }));
+            player.sendMessage(LocaleLoader.getString("Swords.Combat.Bleed.Note"));
+            player.sendMessage(LocaleLoader.getString("Swords.Combat.Bleed.Chance", new Object[] { bleedChance }));
+        }
+
+        if (canSerratedStrike) {
+            player.sendMessage(LocaleLoader.getString("Swords.SS.Length", new Object[] { serratedStrikesLength }));
+        }
+    }
 }

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

@@ -1,70 +1,145 @@
 package com.gmail.nossr50.commands.skills;
 
-import org.bukkit.command.Command;
-import org.bukkit.command.CommandExecutor;
-import org.bukkit.command.CommandSender;
-import org.bukkit.entity.Player;
-
-import com.gmail.nossr50.Users;
-import com.gmail.nossr50.mcPermissions;
-import com.gmail.nossr50.config.LoadProperties;
-import com.gmail.nossr50.datatypes.PlayerProfile;
+import com.gmail.nossr50.commands.SkillCommand;
+import com.gmail.nossr50.config.Config;
 import com.gmail.nossr50.datatypes.SkillType;
-import com.gmail.nossr50.locale.mcLocale;
+import com.gmail.nossr50.locale.LocaleLoader;
 
-public class TamingCommand implements CommandExecutor {
-	@Override
-	public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
-		if (!(sender instanceof Player)) {
-			sender.sendMessage("This command does not support console useage.");
-			return true;
-		}
+public class TamingCommand extends SkillCommand {
+    private String goreChance;
 
-		Player player = (Player) sender;
-		PlayerProfile PP = Users.getProfile(player);
+    private boolean canBeastLore;
+    private boolean canGore;
+    private boolean canSharpenedClaws;
+    private boolean canEnvironmentallyAware;
+    private boolean canThickFur;
+    private boolean canShockProof;
+    private boolean canCallWild;
+    private boolean canFastFood;
 
-		float skillvalue = (float) PP.getSkillLevel(SkillType.TAMING);
-		String percentage = String.valueOf((skillvalue / 1000) * 100);
+    public TamingCommand() {
+        super(SkillType.TAMING);
+    }
 
-		player.sendMessage(mcLocale.getString("m.SkillHeader", new Object[] { mcLocale.getString("m.SkillTaming") }));
-		player.sendMessage(mcLocale.getString("m.XPGain", new Object[] { mcLocale.getString("m.XPGainTaming") }));
+    @Override
+    protected void dataCalculations() {
+        if (skillValue >= 1000) {
+            goreChance = "100.00%";
+        }
+        else {
+            goreChance = percent.format(skillValue / 1000);
+        }    }
 
-		if (mcPermissions.getInstance().taming(player))
-			player.sendMessage(mcLocale.getString("m.LVL", new Object[] { PP.getSkillLevel(SkillType.TAMING), PP.getSkillXpLevel(SkillType.TAMING), PP.getXpToLevel(SkillType.TAMING) }));
+    @Override
+    protected void permissionsCheck() {
+        canBeastLore = permInstance.beastLore(player);
+        canCallWild = permInstance.callOfTheWild(player);
+        canEnvironmentallyAware = permInstance.environmentallyAware(player);
+        canFastFood = permInstance.fastFoodService(player);
+        canGore = permInstance.gore(player);
+        canSharpenedClaws = permInstance.sharpenedClaws(player);
+        canShockProof = permInstance.shockProof(player);
+        canThickFur = permInstance.thickFur(player);
+    }
 
-		player.sendMessage(mcLocale.getString("m.SkillHeader", new Object[] { mcLocale.getString("m.Effects") }));
-		player.sendMessage(mcLocale.getString("m.EffectsTemplate", new Object[] { mcLocale.getString("m.EffectsTaming1_0"), mcLocale.getString("m.EffectsTaming1_1") }));
-		player.sendMessage(mcLocale.getString("m.EffectsTemplate", new Object[] { mcLocale.getString("m.EffectsTaming2_0"), mcLocale.getString("m.EffectsTaming2_1") }));
-		player.sendMessage(mcLocale.getString("m.EffectsTemplate", new Object[] { mcLocale.getString("m.EffectsTaming3_0"), mcLocale.getString("m.EffectsTaming3_1") }));
-		player.sendMessage(mcLocale.getString("m.EffectsTemplate", new Object[] { mcLocale.getString("m.EffectsTaming4_0"), mcLocale.getString("m.EffectsTaming4_1") }));
-		player.sendMessage(mcLocale.getString("m.EffectsTemplate", new Object[] { mcLocale.getString("m.EffectsTaming5_0"), mcLocale.getString("m.EffectsTaming5_1") }));
-		player.sendMessage(mcLocale.getString("m.EffectsTemplate", new Object[] { mcLocale.getString("m.EffectsTaming6_0"), mcLocale.getString("m.EffectsTaming6_1") }));
-		player.sendMessage(mcLocale.getString("m.EffectsTemplate", new Object[] { mcLocale.getString("m.EffectsTaming7_0"), mcLocale.getString("m.EffectsTaming7_1") }));
-		player.sendMessage(mcLocale.getString("m.EffectsTaming7_2", new Object[] { LoadProperties.bonesConsumedByCOTW }));
-		player.sendMessage(mcLocale.getString("m.SkillHeader", new Object[] { mcLocale.getString("m.YourStats") }));
+    @Override
+    protected boolean effectsHeaderPermissions() {
+        return canBeastLore || canCallWild || canEnvironmentallyAware || canFastFood || canGore || canSharpenedClaws || canShockProof || canThickFur;
+    }
 
-		if (PP.getSkillLevel(SkillType.TAMING) < 100)
-			player.sendMessage(mcLocale.getString("m.AbilityLockTemplate", new Object[] { mcLocale.getString("m.AbilLockTaming1") }));
-		else
-			player.sendMessage(mcLocale.getString("m.AbilityBonusTemplate", new Object[] { mcLocale.getString("m.AbilBonusTaming1_0"), mcLocale.getString("m.AbilBonusTaming1_1") }));
+    @Override
+    protected void effectsDisplay() {
+        Config configInstance = Config.getInstance();
 
-		if (PP.getSkillLevel(SkillType.TAMING) < 250)
-			player.sendMessage(mcLocale.getString("m.AbilityLockTemplate", new Object[] { mcLocale.getString("m.AbilLockTaming2") }));
-		else
-			player.sendMessage(mcLocale.getString("m.AbilityBonusTemplate", new Object[] { mcLocale.getString("m.AbilBonusTaming2_0"), mcLocale.getString("m.AbilBonusTaming2_1") }));
+        if (canBeastLore) {
+            player.sendMessage(LocaleLoader.getString("Effects.Template", new Object[] { LocaleLoader.getString("Taming.Effect.0"), LocaleLoader.getString("Taming.Effect.1") }));
+        }
 
-		if (PP.getSkillLevel(SkillType.TAMING) < 500)
-			player.sendMessage(mcLocale.getString("m.AbilityLockTemplate", new Object[] { mcLocale.getString("m.AbilLockTaming3") }));
-		else
-			player.sendMessage(mcLocale.getString("m.AbilityBonusTemplate", new Object[] { mcLocale.getString("m.AbilBonusTaming3_0"), mcLocale.getString("m.AbilBonusTaming3_1") }));
+        if (canGore) {
+            player.sendMessage(LocaleLoader.getString("Effects.Template", new Object[] { LocaleLoader.getString("Taming.Effect.2"), LocaleLoader.getString("Taming.Effect.3") }));
+        }
 
-		if (PP.getSkillLevel(SkillType.TAMING) < 750)
-			player.sendMessage(mcLocale.getString("m.AbilityLockTemplate", new Object[] { mcLocale.getString("m.AbilLockTaming4") }));
-		else
-			player.sendMessage(mcLocale.getString("m.AbilityBonusTemplate", new Object[] { mcLocale.getString("m.AbilBonusTaming4_0"), mcLocale.getString("m.AbilBonusTaming4_1") }));
+        if (canSharpenedClaws) {
+            player.sendMessage(LocaleLoader.getString("Effects.Template", new Object[] { LocaleLoader.getString("Taming.Effect.4"), LocaleLoader.getString("Taming.Effect.5") }));
+        }
 
-		player.sendMessage(mcLocale.getString("m.TamingGoreChance", new Object[] { percentage }));
+        if (canEnvironmentallyAware) {
+            player.sendMessage(LocaleLoader.getString("Effects.Template", new Object[] { LocaleLoader.getString("Taming.Effect.6"), LocaleLoader.getString("Taming.Effect.7") }));
+        }
 
-		return true;
-	}
+        if (canThickFur) {
+            player.sendMessage(LocaleLoader.getString("Effects.Template", new Object[] { LocaleLoader.getString("Taming.Effect.8"), LocaleLoader.getString("Taming.Effect.9") }));
+        }
+
+        if (canShockProof) {
+            player.sendMessage(LocaleLoader.getString("Effects.Template", new Object[] { LocaleLoader.getString("Taming.Effect.10"), LocaleLoader.getString("Taming.Effect.11") }));
+        }
+
+        if (canFastFood) {
+            player.sendMessage(LocaleLoader.getString("Effects.Template", new Object[] { LocaleLoader.getString("Taming.Effect.16"), LocaleLoader.getString("Taming.Effect.17") }));
+        }
+
+        if (canCallWild) {
+            player.sendMessage(LocaleLoader.getString("Effects.Template", new Object[] { LocaleLoader.getString("Taming.Effect.12"), LocaleLoader.getString("Taming.Effect.13") }));
+            player.sendMessage(LocaleLoader.getString("Taming.Effect.14", new Object[] { configInstance.getTamingCOTWOcelotCost() }));
+            player.sendMessage(LocaleLoader.getString("Taming.Effect.15", new Object[] { configInstance.getTamingCOTWWolfCost() }));
+        }
+    }
+
+    @Override
+    protected boolean statsHeaderPermissions() {
+        return canEnvironmentallyAware || canFastFood || canGore || canSharpenedClaws || canShockProof || canThickFur;
+    }
+
+    @Override
+    protected void statsDisplay() {
+        if (canFastFood) {
+            if (skillValue < 50) {
+                player.sendMessage(LocaleLoader.getString("Ability.Generic.Template.Lock", new Object[] { LocaleLoader.getString("Taming.Ability.Locked.4") }));
+            }
+            else {
+                player.sendMessage(LocaleLoader.getString("Ability.Generic.Template", new Object[] { LocaleLoader.getString("Taming.Ability.Bonus.8"), LocaleLoader.getString("Taming.Ability.Bonus.9") }));
+            }
+        }
+
+        if (canEnvironmentallyAware) {
+            if (skillValue < 100) {
+                player.sendMessage(LocaleLoader.getString("Ability.Generic.Template.Lock", new Object[] { LocaleLoader.getString("Taming.Ability.Locked.0") }));
+            }
+            else {
+                player.sendMessage(LocaleLoader.getString("Ability.Generic.Template", new Object[] { LocaleLoader.getString("Taming.Ability.Bonus.0"), LocaleLoader.getString("Taming.Ability.Bonus.1") }));
+            }
+        }
+
+        if (canThickFur) {
+            if (skillValue < 250) {
+                player.sendMessage(LocaleLoader.getString("Ability.Generic.Template.Lock", new Object[] { LocaleLoader.getString("Taming.Ability.Locked.1") }));
+            }
+            else {
+                player.sendMessage(LocaleLoader.getString("Ability.Generic.Template", new Object[] { LocaleLoader.getString("Taming.Ability.Bonus.2"), LocaleLoader.getString("Taming.Ability.Bonus.3") }));
+            }
+        }
+
+        if (canShockProof) {
+            if (skillValue < 500) {
+                player.sendMessage(LocaleLoader.getString("Ability.Generic.Template.Lock", new Object[] { LocaleLoader.getString("Taming.Ability.Locked.2") }));
+            }
+            else {
+                player.sendMessage(LocaleLoader.getString("Ability.Generic.Template", new Object[] { LocaleLoader.getString("Taming.Ability.Bonus.4"), LocaleLoader.getString("Taming.Ability.Bonus.5") }));
+            }
+        }
+
+        if (canSharpenedClaws) {
+            if (skillValue < 750) {
+                player.sendMessage(LocaleLoader.getString("Ability.Generic.Template.Lock", new Object[] { LocaleLoader.getString("Taming.Ability.Locked.3") }));
+            }
+            else {
+                player.sendMessage(LocaleLoader.getString("Ability.Generic.Template", new Object[] { LocaleLoader.getString("Taming.Ability.Bonus.6"), LocaleLoader.getString("Taming.Ability.Bonus.7") }));
+            }
+        }
+
+        if (canGore) {
+            player.sendMessage(LocaleLoader.getString("Taming.Combat.Chance.Gore", new Object[] { goreChance }));
+        }
+    }
 }

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

@@ -1,74 +1,97 @@
 package com.gmail.nossr50.commands.skills;
 
-import org.bukkit.command.Command;
-import org.bukkit.command.CommandExecutor;
-import org.bukkit.command.CommandSender;
-import org.bukkit.entity.Player;
-
-import com.gmail.nossr50.Users;
-import com.gmail.nossr50.mcPermissions;
-import com.gmail.nossr50.datatypes.PlayerProfile;
+import com.gmail.nossr50.commands.SkillCommand;
 import com.gmail.nossr50.datatypes.SkillType;
-import com.gmail.nossr50.locale.mcLocale;
+import com.gmail.nossr50.locale.LocaleLoader;
 
-public class UnarmedCommand implements CommandExecutor {
-	@Override
-	public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
-		if (!(sender instanceof Player)) {
-			sender.sendMessage("This command does not support console useage.");
-			return true;
-		}
+public class UnarmedCommand extends SkillCommand {
+    private String berserkLength;
+    private String deflectChance;
+    private String disarmChance;
+    private String ironArmBonus;
 
-		Player player = (Player) sender;
-		PlayerProfile PP = Users.getProfile(player);
+    private boolean canBerserk;
+    private boolean canDisarm;
+    private boolean canBonusDamage;
+    private boolean canDeflect;
 
-		String percentage, arrowpercentage;
-		float skillvalue = (float) PP.getSkillLevel(SkillType.UNARMED);
+    public UnarmedCommand() {
+        super(SkillType.UNARMED);
+    }
 
-		if (PP.getSkillLevel(SkillType.UNARMED) < 1000)
-			percentage = String.valueOf((skillvalue / 4000) * 100);
-		else
-			percentage = "25";
+    @Override
+    protected void dataCalculations() {
+        berserkLength = String.valueOf(2 + ((int) skillValue / 50));
 
-		if (PP.getSkillLevel(SkillType.UNARMED) < 1000)
-			arrowpercentage = String.valueOf(((skillvalue / 1000) * 100) / 2);
-		else
-			arrowpercentage = "50";
+        if (skillValue >= 1000) {
+            disarmChance = "33.33%";
+            deflectChance = "50.00%";
+            ironArmBonus = "8";
+        }
+        else if (skillValue >= 250) {
+            disarmChance = percent.format(skillValue / 3000);
+            deflectChance = percent.format(skillValue / 2000);
+            ironArmBonus = "8";
+        }
+        else {
+            disarmChance = percent.format(skillValue / 3000);
+            deflectChance = percent.format(skillValue / 2000);
+            ironArmBonus = String.valueOf(3 + ((int) skillValue / 50));
+        }    }
 
-		int ticks = 2;
-		int x = PP.getSkillLevel(SkillType.UNARMED);
-		while (x >= 50) {
-			x -= 50;
-			ticks++;
-		}
+    @Override
+    protected void permissionsCheck() {
+        canBerserk = permInstance.berserk(player);
+        canBonusDamage = permInstance.unarmedBonus(player);
+        canDeflect = permInstance.deflect(player);
+        canDisarm = permInstance.disarm(player);
+    }
 
-		player.sendMessage(mcLocale.getString("m.SkillHeader", new Object[] { mcLocale.getString("m.SkillUnarmed") }));
-		player.sendMessage(mcLocale.getString("m.XPGain", new Object[] { mcLocale.getString("m.XPGainUnarmed") }));
+    @Override
+    protected boolean effectsHeaderPermissions() {
+        return canBerserk || canBonusDamage || canDeflect || canDisarm;
+    }
 
-		if (mcPermissions.getInstance().unarmed(player))
-			player.sendMessage(mcLocale.getString("m.LVL", new Object[] { PP.getSkillLevel(SkillType.UNARMED), PP.getSkillXpLevel(SkillType.UNARMED), PP.getXpToLevel(SkillType.UNARMED) }));
+    @Override
+    protected void effectsDisplay() {
+        if (canBerserk) {
+            player.sendMessage(LocaleLoader.getString("Effects.Template", new Object[] { LocaleLoader.getString("Unarmed.Effect.0"), LocaleLoader.getString("Unarmed.Effect.1") }));
+        }
 
-		player.sendMessage(mcLocale.getString("m.SkillHeader", new Object[] { mcLocale.getString("m.Effects") }));
-		player.sendMessage(mcLocale.getString("m.EffectsTemplate", new Object[] { mcLocale.getString("m.EffectsUnarmed1_0"), mcLocale.getString("m.EffectsUnarmed1_1") }));
-		player.sendMessage(mcLocale.getString("m.EffectsTemplate", new Object[] { mcLocale.getString("m.EffectsUnarmed2_0"), mcLocale.getString("m.EffectsUnarmed2_1") }));
-		player.sendMessage(mcLocale.getString("m.EffectsTemplate", new Object[] { mcLocale.getString("m.EffectsUnarmed3_0"), mcLocale.getString("m.EffectsUnarmed3_1") }));
-		player.sendMessage(mcLocale.getString("m.EffectsTemplate", new Object[] { mcLocale.getString("m.EffectsUnarmed4_0"), mcLocale.getString("m.EffectsUnarmed4_1") }));
-		player.sendMessage(mcLocale.getString("m.EffectsTemplate", new Object[] { mcLocale.getString("m.EffectsUnarmed5_0"), mcLocale.getString("m.EffectsUnarmed5_1") }));
-		player.sendMessage(mcLocale.getString("m.SkillHeader", new Object[] { mcLocale.getString("m.YourStats") }));
-		player.sendMessage(mcLocale.getString("m.UnarmedArrowDeflectChance", new Object[] { arrowpercentage }));
-		player.sendMessage(mcLocale.getString("m.UnarmedDisarmChance", new Object[] { percentage }));
+        if (canDisarm) {
+            player.sendMessage(LocaleLoader.getString("Effects.Template", new Object[] { LocaleLoader.getString("Unarmed.Effect.2"), LocaleLoader.getString("Unarmed.Effect.3") }));
+        }
 
-		if (PP.getSkillLevel(SkillType.UNARMED) < 250) {
-			player.sendMessage(mcLocale.getString("m.AbilityLockTemplate", new Object[] { mcLocale.getString("m.AbilLockUnarmed1") }));
-		} else if (PP.getSkillLevel(SkillType.UNARMED) >= 250 && PP.getSkillLevel(SkillType.UNARMED) < 500) {
-			player.sendMessage(mcLocale.getString("m.AbilityBonusTemplate", new Object[] { mcLocale.getString("m.AbilBonusUnarmed1_0"), mcLocale.getString("m.AbilBonusUnarmed1_1") }));
-			player.sendMessage(mcLocale.getString("m.AbilityLockTemplate", new Object[] { mcLocale.getString("m.AbilLockUnarmed2") }));
-		} else {
-			player.sendMessage(mcLocale.getString("m.AbilityBonusTemplate", new Object[] { mcLocale.getString("m.AbilBonusUnarmed2_0"), mcLocale.getString("m.AbilBonusUnarmed2_1") }));
-		}
+        if (canBonusDamage) {
+            player.sendMessage(LocaleLoader.getString("Effects.Template", new Object[] { LocaleLoader.getString("Unarmed.Effect.4"), LocaleLoader.getString("Unarmed.Effect.5") }));
+        }
 
-		player.sendMessage(mcLocale.getString("m.UnarmedBerserkLength", new Object[] { ticks }));
+        if (canDeflect) {
+            player.sendMessage(LocaleLoader.getString("Effects.Template", new Object[] { LocaleLoader.getString("Unarmed.Effect.6"), LocaleLoader.getString("Unarmed.Effect.7") }));
+        }
+    }
 
-		return true;
-	}
+    @Override
+    protected boolean statsHeaderPermissions() {
+        return canBerserk || canBonusDamage || canDeflect || canDisarm;
+    }
+
+    @Override
+    protected void statsDisplay() {
+        if (canBonusDamage) {
+            player.sendMessage(LocaleLoader.getString("Ability.Generic.Template", new Object[] { LocaleLoader.getString("Unarmed.Ability.Bonus.0"), LocaleLoader.getString("Unarmed.Ability.Bonus.1", new Object[] {ironArmBonus}) }));
+        }
+
+        if (canDeflect) {
+            player.sendMessage(LocaleLoader.getString("Unarmed.Ability.Chance.ArrowDeflect", new Object[] { deflectChance }));
+        }
+
+        if (canDisarm) {
+            player.sendMessage(LocaleLoader.getString("Unarmed.Ability.Chance.Disarm", new Object[] { disarmChance }));
+        }
+
+        if (canBerserk) {
+            player.sendMessage(LocaleLoader.getString("Unarmed.Ability.Berserk.Length", new Object[] { berserkLength }));
+        }
+    }
 }

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

@@ -1,56 +1,88 @@
 package com.gmail.nossr50.commands.skills;
 
-import org.bukkit.command.Command;
-import org.bukkit.command.CommandExecutor;
-import org.bukkit.command.CommandSender;
-import org.bukkit.entity.Player;
-
-import com.gmail.nossr50.Users;
-import com.gmail.nossr50.mcPermissions;
-import com.gmail.nossr50.datatypes.PlayerProfile;
+import com.gmail.nossr50.commands.SkillCommand;
+import com.gmail.nossr50.config.Config;
 import com.gmail.nossr50.datatypes.SkillType;
-import com.gmail.nossr50.locale.mcLocale;
+import com.gmail.nossr50.locale.LocaleLoader;
 
-public class WoodcuttingCommand implements CommandExecutor {
-	@Override
-	public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
-		if (!(sender instanceof Player)) {
-			sender.sendMessage("This command does not support console useage.");
-			return true;
-		}
+public class WoodcuttingCommand extends SkillCommand {
+    private String treeFellerLength;
+    private String doubleDropChance;
 
-		Player player = (Player) sender;
-		PlayerProfile PP = Users.getProfile(player);
-		
-		float skillvalue = (float) PP.getSkillLevel(SkillType.WOODCUTTING);
-		int ticks = 2;
-		int x = PP.getSkillLevel(SkillType.WOODCUTTING);
-		while (x >= 50) {
-			x -= 50;
-			ticks++;
-		}
-		String percentage = String.valueOf((skillvalue / 1000) * 100);
-		
-		player.sendMessage(mcLocale.getString("m.SkillHeader", new Object[] { mcLocale.getString("m.SkillWoodCutting") }));
-		player.sendMessage(mcLocale.getString("m.XPGain", new Object[] { mcLocale.getString("m.XPGainWoodCutting") }));
-		
-		if (mcPermissions.getInstance().woodcutting(player))
-			player.sendMessage(mcLocale.getString("m.LVL", new Object[] { PP.getSkillLevel(SkillType.WOODCUTTING), PP.getSkillXpLevel(SkillType.WOODCUTTING), PP.getXpToLevel(SkillType.WOODCUTTING) }));
-		
-		player.sendMessage(mcLocale.getString("m.SkillHeader", new Object[] { mcLocale.getString("m.Effects") }));
-		player.sendMessage(mcLocale.getString("m.EffectsTemplate", new Object[] { mcLocale.getString("m.EffectsWoodCutting1_0"), mcLocale.getString("m.EffectsWoodCutting1_1") }));
-		player.sendMessage(mcLocale.getString("m.EffectsTemplate", new Object[] { mcLocale.getString("m.EffectsWoodCutting2_0"), mcLocale.getString("m.EffectsWoodCutting2_1") }));
-		player.sendMessage(mcLocale.getString("m.EffectsTemplate", new Object[] { mcLocale.getString("m.EffectsWoodCutting3_0"), mcLocale.getString("m.EffectsWoodCutting3_1") }));
-		player.sendMessage(mcLocale.getString("m.SkillHeader", new Object[] { mcLocale.getString("m.YourStats") }));
-		
-		if (PP.getSkillLevel(SkillType.WOODCUTTING) < 100)
-			player.sendMessage(mcLocale.getString("m.AbilityLockTemplate", new Object[] { mcLocale.getString("m.AbilLockWoodCutting1") }));
-		else
-			player.sendMessage(mcLocale.getString("m.AbilityBonusTemplate", new Object[] { mcLocale.getString("m.AbilBonusWoodCutting1_0"), mcLocale.getString("m.AbilBonusWoodCutting1_1") }));
-		
-		player.sendMessage(mcLocale.getString("m.WoodCuttingDoubleDropChance", new Object[] { percentage }));
-		player.sendMessage(mcLocale.getString("m.WoodCuttingTreeFellerLength", new Object[] { ticks }));
-		
-		return true;
-	}
+    private boolean canTreeFell;
+    private boolean canLeafBlow;
+    private boolean canDoubleDrop;
+    private boolean doubleDropsDisabled;
+
+    public WoodcuttingCommand() {
+        super(SkillType.WOODCUTTING);
+    }
+
+    @Override
+    protected void dataCalculations() {
+        treeFellerLength = String.valueOf(2 + ((int) skillValue / 50));
+
+        if (skillValue >= 1000) {
+            doubleDropChance = "100.00%";
+        }
+        else {
+            doubleDropChance = percent.format(skillValue / 1000);
+        }
+    }
+
+    @Override
+    protected void permissionsCheck() {
+        Config configInstance = Config.getInstance();
+
+        canTreeFell = permInstance.treeFeller(player);
+        canDoubleDrop = permInstance.woodcuttingDoubleDrops(player);
+        canLeafBlow = permInstance.leafBlower(player);
+        doubleDropsDisabled = configInstance.woodcuttingDoubleDropsDisabled();
+    }
+
+    @Override
+    protected boolean effectsHeaderPermissions() {
+        return (canDoubleDrop && !doubleDropsDisabled) || canLeafBlow || canTreeFell;
+    }
+
+    @Override
+    protected void effectsDisplay() {
+        if (canTreeFell) {
+            player.sendMessage(LocaleLoader.getString("Effects.Template", new Object[] { LocaleLoader.getString("Woodcutting.Effect.0"), LocaleLoader.getString("Woodcutting.Effect.1") }));
+        }
+
+        if (canLeafBlow) {
+            player.sendMessage(LocaleLoader.getString("Effects.Template", new Object[] { LocaleLoader.getString("Woodcutting.Effect.2"), LocaleLoader.getString("Woodcutting.Effect.3") }));
+        }
+
+        if (canDoubleDrop && !doubleDropsDisabled) {
+            player.sendMessage(LocaleLoader.getString("Effects.Template", new Object[] { LocaleLoader.getString("Woodcutting.Effect.4"), LocaleLoader.getString("Woodcutting.Effect.5") }));
+        }
+    }
+
+    @Override
+    protected boolean statsHeaderPermissions() {
+        return (canDoubleDrop && !doubleDropsDisabled) || canLeafBlow || canTreeFell;
+    }
+
+    @Override
+    protected void statsDisplay() {
+        //TODO: Remove? Basically duplicates the above.
+        if (canLeafBlow) {
+            if (skillValue < 100) {
+                player.sendMessage(LocaleLoader.getString("Ability.Generic.Template.Lock", new Object[] { LocaleLoader.getString("Woodcutting.Ability.Locked.0") }));
+            }
+            else {
+                player.sendMessage(LocaleLoader.getString("Ability.Generic.Template", new Object[] { LocaleLoader.getString("Woodcutting.Ability.0"), LocaleLoader.getString("Woodcutting.Ability.1") }));
+            }
+        }
+
+        if (canDoubleDrop && !doubleDropsDisabled) {
+            player.sendMessage(LocaleLoader.getString("Woodcutting.Ability.Chance.DDrop", new Object[] { doubleDropChance }));
+        }
+
+        if (canTreeFell) {
+            player.sendMessage(LocaleLoader.getString("Woodcutting.Ability.Length", new Object[] { treeFellerLength }));
+        }
+    }
 }

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

@@ -1,50 +1,77 @@
 package com.gmail.nossr50.commands.spout;
 
+import org.bukkit.ChatColor;
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandExecutor;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 
-import com.gmail.nossr50.Users;
-import com.gmail.nossr50.config.LoadProperties;
+import com.gmail.nossr50.mcMMO;
+import com.gmail.nossr50.commands.CommandHelper;
+import com.gmail.nossr50.config.SpoutConfig;
 import com.gmail.nossr50.datatypes.HUDType;
 import com.gmail.nossr50.datatypes.HUDmmo;
 import com.gmail.nossr50.datatypes.PlayerProfile;
+import com.gmail.nossr50.locale.LocaleLoader;
 import com.gmail.nossr50.spout.SpoutStuff;
+import com.gmail.nossr50.util.Users;
 
 public class MchudCommand implements CommandExecutor {
-	@Override
-	public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
-		if (!LoadProperties.spoutEnabled) {
-			sender.sendMessage("This command is not enabled.");
-			return true;
-		}
+    private final mcMMO plugin;
 
-		if (!(sender instanceof Player)) {
-			sender.sendMessage("This command does not support console useage.");
-			return true;
-		}
+    public MchudCommand (mcMMO plugin) {
+        this.plugin = plugin;
+    }
 
-		Player player = (Player) sender;
-		PlayerProfile PP = Users.getProfile(player);
-		
-		if(args.length >= 1)
-		{
-			for(HUDType x : HUDType.values())
-			{
-				if(x.toString().toLowerCase().equals(args[0].toLowerCase()))
-				{
-					if(SpoutStuff.playerHUDs.containsKey(player))
-					{
-						SpoutStuff.playerHUDs.get(player).resetHUD();
-						SpoutStuff.playerHUDs.remove(player);
-						PP.setHUDType(x);
-						SpoutStuff.playerHUDs.put(player, new HUDmmo(player));
-					}
-				}
-			}
-		}
-		
-		return true;
-	}
+    @Override
+    public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
+        String usage = ChatColor.RED + "Proper usage is /mchud <hud-type>"; //TODO: Locale
+        String invalid = ChatColor.RED + "That is not a valid HUD type."; //TODO: Locale
+
+        if (CommandHelper.noConsoleUsage(sender)) {
+            return true;
+        }
+
+        if (!mcMMO.spoutEnabled || !SpoutConfig.getInstance().getXPBarEnabled()) {
+            sender.sendMessage(LocaleLoader.getString("Commands.Disabled"));
+            return true;
+        }
+
+        switch (args.length) {
+        case 1:
+            Player player = (Player) sender;
+            PlayerProfile PP = Users.getProfile(player);
+            HUDType hud;
+
+            if (args[0].equalsIgnoreCase("disabled")) {
+                hud = HUDType.DISABLED;
+            }
+            else if (args[0].equalsIgnoreCase("standard")) {
+                hud = HUDType.STANDARD;
+            }
+            else if (args[0].equalsIgnoreCase("small")) {
+                hud = HUDType.SMALL;
+            }
+            else if (args[0].equalsIgnoreCase("retro")) {
+                hud = HUDType.RETRO;
+            }
+            else {
+                player.sendMessage(invalid);
+                return true;
+            }
+
+            if (SpoutStuff.playerHUDs.containsKey(player)) {
+                SpoutStuff.playerHUDs.get(player).resetHUD();
+                SpoutStuff.playerHUDs.remove(player);
+                PP.setHUDType(hud);
+                SpoutStuff.playerHUDs.put(player, new HUDmmo(player, plugin));
+            }
+
+            return true;
+
+        default:
+            sender.sendMessage(usage);
+            return true;
+        }
+    }
 }

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

@@ -6,57 +6,76 @@ import org.bukkit.command.CommandExecutor;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 
-import com.gmail.nossr50.Users;
-import com.gmail.nossr50.m;
-import com.gmail.nossr50.mcPermissions;
-import com.gmail.nossr50.config.LoadProperties;
+import com.gmail.nossr50.mcMMO;
+import com.gmail.nossr50.commands.CommandHelper;
+import com.gmail.nossr50.config.Config;
+import com.gmail.nossr50.config.SpoutConfig;
 import com.gmail.nossr50.datatypes.PlayerProfile;
-import com.gmail.nossr50.locale.mcLocale;
-import com.gmail.nossr50.skills.Skills;
+import com.gmail.nossr50.datatypes.SkillType;
+import com.gmail.nossr50.locale.LocaleLoader;
 import com.gmail.nossr50.spout.SpoutStuff;
+import com.gmail.nossr50.util.Misc;
+import com.gmail.nossr50.util.Permissions;
+import com.gmail.nossr50.util.Skills;
+import com.gmail.nossr50.util.Users;
 
 public class XplockCommand implements CommandExecutor {
-	@Override
-	public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
-		if (!LoadProperties.spoutEnabled || !LoadProperties.xpbar || !LoadProperties.xplockEnable) {
-			sender.sendMessage("This command is not enabled.");
-			return true;
-		}
+    @Override
+    public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
+        String usage = ChatColor.RED + "Proper usage is /xplock [skill]";
 
-		if (!(sender instanceof Player)) {
-			sender.sendMessage("This command does not support console useage.");
-			return true;
-		}
+        if (CommandHelper.noConsoleUsage(sender)) {
+            return true;
+        }
 
-		Player player = (Player) sender;
-		PlayerProfile PP = Users.getProfile(player);
+        if (!mcMMO.spoutEnabled || !SpoutConfig.getInstance().getXPBarEnabled() || !Config.getInstance().getCommandXPLockEnabled()) {
+            sender.sendMessage(LocaleLoader.getString("Commands.Disabled"));
+            return true;
+        }
 
-		if (args.length >= 1 && Skills.isSkill(args[0]) && mcPermissions.getInstance().permission(player, "mcmmo.skills." + Skills.getSkillType(args[0]).toString().toLowerCase())) {
-			if (PP.getXpBarLocked()) {
-				PP.setSkillLock(Skills.getSkillType(args[0]));
-				player.sendMessage(mcLocale.getString("Commands.xplock.locked", new Object[] { m.getCapitalized(PP.getSkillLock().toString()) }));
-			} else {
-				PP.setSkillLock(Skills.getSkillType(args[0]));
-				PP.toggleXpBarLocked();
-				player.sendMessage(mcLocale.getString("Commands.xplock.locked", new Object[] { m.getCapitalized(PP.getSkillLock().toString()) }));
-			}
-			SpoutStuff.updateXpBar(player);
-		} else if (args.length < 1) {
-			if (PP.getXpBarLocked()) {
-				PP.toggleXpBarLocked();
-				player.sendMessage(mcLocale.getString("Commands.xplock.unlocked"));
-			} else if (PP.getLastGained() != null) {
-				PP.toggleXpBarLocked();
-				PP.setSkillLock(PP.getLastGained());
-				player.sendMessage(mcLocale.getString("Commands.xplock.locked", new Object[] { m.getCapitalized(PP.getSkillLock().toString()) }));
-			}
-		} else if (args.length >= 1 && !Skills.isSkill(args[0])) {
-			player.sendMessage("Commands.xplock.invalid");
-		} else if (args.length >= 2 && Skills.isSkill(args[0]) && !mcPermissions.getInstance().permission(player, "mcmmo.skills." + Skills.getSkillType(args[0]).toString().toLowerCase())) {
-			player.sendMessage(ChatColor.YELLOW + "[mcMMO] " + ChatColor.DARK_RED + mcLocale.getString("mcPlayerListener.NoPermission"));
-			return true;
-		}
+        Player player = (Player) sender;
+        PlayerProfile PP = Users.getProfile(player);
 
-		return true;
-	}
+        switch (args.length) {
+        case 0:
+            if (PP.getXpBarLocked()) {
+                PP.toggleXpBarLocked();
+                player.sendMessage(LocaleLoader.getString("Commands.xplock.unlocked"));
+                return true;
+            }
+
+            SkillType lastGained = PP.getLastGained();
+
+            if (lastGained != null) {
+                PP.toggleXpBarLocked();
+                PP.setSkillLock(lastGained);
+                player.sendMessage(LocaleLoader.getString("Commands.xplock.locked", new Object[] { Misc.getCapitalized(lastGained.toString()) }));
+                return true;
+            }
+
+        case 1:
+            if (Skills.isSkill(args[0])) {
+                if (Permissions.getInstance().permission(player, "mcmmo.skills." + args[0].toLowerCase())) {
+                    PP.setXpBarLocked(true);
+                    PP.setSkillLock(Skills.getSkillType(args[0]));
+                    SpoutStuff.updateXpBar(player);
+
+                    player.sendMessage(LocaleLoader.getString("Commands.xplock.locked", new Object[] { Misc.getCapitalized(args[0]) }));
+                    return true;
+                }
+                else {
+                    player.sendMessage(LocaleLoader.getString("mcMMO.NoPermission"));
+                    return true;
+                }
+            }
+            else {
+                player.sendMessage(LocaleLoader.getString("Commands.Skill.Invalid"));
+                return true;
+            }
+
+        default:
+            player.sendMessage(usage);
+            return true;
+        }
+    }
 }

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

@@ -0,0 +1,388 @@
+package com.gmail.nossr50.config;
+
+import java.util.Iterator;
+import java.util.Set;
+
+import org.bukkit.configuration.ConfigurationSection;
+
+import com.gmail.nossr50.mcMMO;
+
+public class Config extends ConfigLoader {
+    public int xpGainMultiplier = 1;
+    private static Config instance;
+
+    public static Config getInstance() {
+        if (instance == null) {
+            instance = new Config(mcMMO.p);
+            instance.load();
+        }
+
+        return instance;
+    }
+
+    /*
+     * GENERAL SETTINGS
+     */
+
+    /* General Settings */
+    public String getLocale() { return config.getString("General.Locale", "en_us"); }
+    public boolean getMOTDEnabled() { return config.getBoolean("General.MOTD_Enabled", true); }
+    public int getSaveInterval() { return config.getInt("General.Save_Interval", 10); }
+    public boolean getStatsTrackingEnabled() { return config.getBoolean("General.Stats_Tracking", true); }
+    public boolean getEventCallbackEnabled() { return config.getBoolean("General.Event_Callback", true); }
+
+    /* mySQL */
+    public boolean getUseMySQL() { return config.getBoolean("MySQL.Enabled", false); }
+    public String getMySQLTablePrefix() { return config.getString("MySQL.Database.TablePrefix", "mcmmo_"); }
+    public String getMySQLDatabaseName() { return config.getString("MySQL.Database.Name", "DatabaseName"); }
+    public String getMySQLUserName() { return config.getString("MySQL.Database.User_Name", "UserName"); } //Really should be labeled under MySQL.User_Name instead...
+    public int getMySQLServerPort() { return config.getInt("MySQL.Server.Port", 3306); }
+    public String getMySQLServerName() { return config.getString("MySQL.Server.Address", "localhost"); }
+
+    public String getMySQLUserPassword() {
+        if (config.getString("MySQL.Database.User_Password", null) != null) {
+            return config.getString("MySQL.Database.User_Password", null);
+        }
+        else {
+            return "";
+        }
+    }
+
+    /* Hardcore Mode */
+    public boolean getHardcoreEnabled() { return config.getBoolean("Hardcore.Enabled", false); }
+    public double getHardcoreDeathStatPenaltyPercentage() { return config.getDouble("Hardcore.Death_Stat_Loss_Penalty_Percentage", 75); }
+    public double getHardcoreVampirismStatLeechPercentage() { return config.getDouble("Hardcore.Vampirism_Stat_Leech_Percentage", 5); }
+    public boolean getHardcoreVampirismEnabled() { return config.getBoolean("Hardcore.Vampirism", false); }
+
+    /* SMP Mods */
+    public boolean getToolModsEnabled() { return config.getBoolean("Mods.Tool_Mods_Enabled", false); }
+    public boolean getArmorModsEnabled() { return config.getBoolean("Mods.Tool_Mods_Enabled", false); }
+    public boolean getBlockModsEnabled() { return config.getBoolean("Mods.Block_Mods_Enabled", false); }
+
+    /* Commands */
+    public boolean getCommandXPLockEnabled() { return config.getBoolean("Commands.xplock.Enabled", true); }
+    public boolean getCommandXPRateEnabled() { return config.getBoolean("Commands.xprate.Enabled", true); }
+    public boolean getCommandMCTopEnabled() { return config.getBoolean("Commands.mctop.Enabled", true); }
+    public boolean getCommandAddXPEnabled() { return config.getBoolean("Commands.addxp.Enabled", true); }
+    public boolean getCommandAddLevelsEnabled() { return config.getBoolean("Commands.addlevels.Enabled", true); }
+    public boolean getCommandMCAbilityEnabled() { return config.getBoolean("Commands.mcability.Enabled", true); }
+    public boolean getCommandMCRefreshEnabled() { return config.getBoolean("Commands.mcrefresh.Enabled", true); }
+    public boolean getCommandmcMMOEnabled() { return config.getBoolean("Commands.mcmmo.Enabled", true); }
+    public boolean getCommandMCCEnabled() { return config.getBoolean("Commands.mcc.Enabled", true); }
+    public boolean getCommandMCGodEnabled() { return config.getBoolean("Commands.mcgod.Enabled", true); }
+    public boolean getCommandMCStatsEnabled() { return config.getBoolean("Commands.mcstats.Enabled", true); }
+    public boolean getCommandMmoeditEnabled() { return config.getBoolean("Commands.mmoedit.Enabled", true); }
+    public boolean getCommandMCRemoveEnabled() { return config.getBoolean("Commands.mcremove.Enable", true); }
+    public boolean getCommandPTPEnabled() { return config.getBoolean("Commands.ptp.Enabled", true); }
+    public boolean getCommandPartyEnabled() { return config.getBoolean("Commands.party.Enabled", true); }
+    public boolean getCommandInspectEnabled() { return config.getBoolean("Commands.inspect.Enabled", true); }
+    public boolean getCommandInviteEnabled() { return config.getBoolean("Commands.invite.Enabled", true); }
+    public boolean getCommandAcceptEnabled() { return config.getBoolean("Commands.accept.Enabled", true); }
+    public boolean getCommandAdminChatAEnabled() { return config.getBoolean("Commands.a.Enabled", true); }
+    public boolean getCommandPartyChatPEnabled() { return config.getBoolean("Commands.p.Enabled", true); }
+
+    public int getPTPCommandCooldown() { return config.getInt("Commands.ptp.Cooldown", 30); }
+    public boolean getDonateMessageEnabled() { return config.getBoolean("Commands.mcmmo.Donate_Message", true); }
+
+    /* Items */
+    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); }
+
+    /*
+     * ABILITY SETTINGS
+     */
+
+    /* General Settings */
+    public boolean getAbilityMessagesEnabled() { return config.getBoolean("Abilities.Messages", true); }
+    public boolean getAbilitiesEnabled() { return config.getBoolean("Abilities.Enabled", true); }
+    public boolean getAbilitiesOnlyActivateWhenSneaking() { return config.getBoolean("Abilities.Activation.Only_Activate_When_Sneaking", false); }
+
+    /* Durability Settings */
+    public boolean getAbilitiesDamageTools() { return config.getBoolean("Abilities.Tools.Durability_Loss_Enabled", true); }
+    public int getAbilityToolDamage() { return config.getInt("Abilities.Tools.Durability_Loss", 2); }
+
+    /* Cooldowns */
+    public int getAbilityCooldownGreenTerra() { return config.getInt("Abilities.Cooldowns.Green_Terra", 240); }
+    public int getAbilityCooldownSuperBreaker() { return config.getInt("Abilities.Cooldowns.Super_Breaker", 240); }
+    public int getAbilityCooldownGigaDrillBreaker() { return config.getInt("Abilities.Cooldowns.Giga_Drill_Breaker", 240); }
+    public int getAbilityCooldownTreeFeller() { return config.getInt("Abilities.Cooldowns.Tree_Feller", 240); }
+    public int getAbilityCooldownBerserk() { return config.getInt("Abilities.Cooldowns.Berserk", 240); }
+    public int getAbilityCooldownSerratedStrikes() { return config.getInt("Abilities.Cooldowns.Serrated_Strikes", 240); }
+    public int getAbilityCooldownSkullSplitter() { return config.getInt("Abilities.Cooldowns.Skull_Splitter", 240); }
+    public int getAbilityCooldownBlastMining() { return config.getInt("Abilities.Cooldowns.Blast_Mining", 60); }
+
+    /* Max ticks */
+    public int getAbilityMaxTicksGreenTerra() { return config.getInt("Abilities.Max_Seconds.Green_Terra", 0); }
+    public int getAbilityMaxTicksSuperBreaker() { return config.getInt("Abilities.Max_Seconds.Super_Breaker", 0); }
+    public int getAbilityMaxTicksGigaDrillBreaker() { return config.getInt("Abilities.Max_Seconds.Giga_Drill_Breaker", 0); }
+    public int getAbilityMaxTicksTreeFeller() { return config.getInt("Abilities.Max_Seconds.Tree_Feller", 0); }
+    public int getAbilityMaxTicksBerserk() { return config.getInt("Abilities.Max_Seconds.Berserk", 0); }
+    public int getAbilityMaxTicksSerratedStrikes() { return config.getInt("Abilities.Max_Seconds.Serrated_Strikes", 0); }
+    public int getAbilityMaxTicksSkullSplitter() { return config.getInt("Abilities.Max_Seconds.Skull_Splitter", 0); }
+    public int getAbilityMaxTicksBlastMining() { return config.getInt("Abilities.Max_Seconds.Blast_Mining", 0); }
+
+    /* Thresholds */
+    public int getTreeFellerThreshold() { return config.getInt("Abilities.Limits.Tree_Feller_Threshold", 500); }
+
+    /*
+     * SKILL SETTINGS
+     */
+
+    /* Tool Requirements */
+    public boolean getMiningRequiresTool() { return config.getBoolean("Skills.Mining.Requires_Pickaxe", true); }
+    public boolean getExcavationRequiresTool() { return config.getBoolean("Skills.Excavation.Requires_Shovel", true); }
+    public boolean getWoodcuttingRequiresTool() { return config.getBoolean("Skills.Woodcutting.Requires_Axe", true); }
+
+    /* Excavation */
+    public int getExcavationBaseXP() { return config.getInt("Experience.Excavation.Base", 40); }
+
+    /* Fishing */
+    public int getFishingBaseXP() { return config.getInt("Experience.Fishing.Base", 800); }
+    public boolean getFishingDropsEnabled() { return config.getBoolean("Fishing.Drops_Enabled", true); }
+    public int getFishingTierLevelsTier1() { return config.getInt("Fishing.Tier_Levels.Tier1", 0); }
+    public int getFishingTierLevelsTier2() { return config.getInt("Fishing.Tier_Levels.Tier2", 200); }
+    public int getFishingTierLevelsTier3() { return config.getInt("Fishing.Tier_Levels.Tier3", 400); }
+    public int getFishingTierLevelsTier4() { return config.getInt("Fishing.Tier_Levels.Tier4", 600); }
+    public int getFishingTierLevelsTier5() { return config.getInt("Fishing.Tier_Levels.Tier5", 800); }
+
+    /* Herbalism */
+    public int getHerbalismXPSugarCane() { return config.getInt("Experience.Herbalism.Sugar_Cane", 30); }
+    public int getHerbalismXPWheat() { return config.getInt("Experience.Herbalism.Wheat", 50); }
+    public int getHerbalismXPCactus() { return config.getInt("Experience.Herbalism.Cactus", 30); }
+    public int getHerbalismXPPumpkin() { return config.getInt("Experience.Herbalism.Pumpkin", 20); }
+    public int getHerbalismXPFlowers() { return config.getInt("Experience.Herbalism.Flowers", 100); }
+    public int getHerbalismXPMushrooms() { return config.getInt("Experience.Herbalism.Mushrooms", 150); }
+    public int getHerbalismXPMelon() { return config.getInt("Experience.Herbalism.Melon", 20); }
+    public int getHerbalismXPNetherWart() { return config.getInt("Experience.Herbalism.Nether_Wart", 50); }
+    public int getHerbalismXPLilyPads() { return config.getInt("Experience.Herbalism.Lily_Pads", 100); }
+    public int getHerbalismXPVines() { return config.getInt("Experience.Herbalism.Vines", 10); }
+
+    public boolean getHerbalismGreenThumbCobbleToMossy() { return config.getBoolean("Skills.Herbalism.Green_Thumb.Cobble_To_Mossy", true); }
+    public boolean getHerbalismGreenThumbSmoothbrickToMossy() { return config.getBoolean("Skills.Herbalism.Green_Thumb.SmoothBrick_To_MossyBrick", true); }
+    public boolean getHerbalismGreenThumbDirtToGrass() { return config.getBoolean("Skills.Herbalism.Green_Thumb.Dirt_To_Grass", true); }
+
+    public boolean getBrownMushroomsDoubleDropsEnabled() { return config.getBoolean("Double_Drops.Herbalism.Brown_Mushrooms", true); }
+    public boolean getCactiDoubleDropsEnabled() { return config.getBoolean("Double_Drops.Herbalism.Cacti", true); }
+    public boolean getWheatDoubleDropsEnabled() { return config.getBoolean("Double_Drops.Herbalism.Wheat", true); }
+    public boolean getMelonsDoubleDropsEnabled() { return config.getBoolean("Double_Drops.Herbalism.Melons", true); }
+    public boolean getNetherWartsDoubleDropsEnabled() { return config.getBoolean("Double_Drops.Herbalism.Nether_Warts", true); }
+    public boolean getPumpkinsDoubleDropsEnabled() { return config.getBoolean("Double_Drops.Herbalism.Pumpkins", true); }
+    public boolean getRedMushroomsDoubleDropsEnabled() { return config.getBoolean("Double_Drops.Herbalism.Red_Mushrooms", true); }
+    public boolean getRedRosesDoubleDropsEnabled() { return config.getBoolean("Double_Drops.Herbalism.Red_Roses", true); }
+    public boolean getSugarCaneDoubleDropsEnabled() { return config.getBoolean("Double_Drops.Herbalism.Sugar_Cane", true); }
+    public boolean getVinesDoubleDropsEnabled() { return config.getBoolean("Double_Drops.Herbalism.Vines", true); }
+    public boolean getWaterLiliesDoubleDropsEnabled() { return config.getBoolean("Double_Drops.Herbalism.Water_Lilies", true); }
+    public boolean getYellowFlowersDoubleDropsEnabled() { return config.getBoolean("Double_Drops.Herbalism.Yellow_Flowers", true); }
+
+    public boolean herbalismDoubleDropsDisabled() {
+        ConfigurationSection section = config.getConfigurationSection("Double_Drops.Herbalism");
+        Set<String> keys = section.getKeys(false);
+        Iterator<String> iterator = keys.iterator();
+
+        boolean disabled = true;
+
+        while (iterator.hasNext()) {
+            String key = iterator.next();
+
+            if (config.getBoolean("Double_Drops.Herbalism." + key)) {
+                disabled = false;
+                break;
+            }
+        }
+
+        return disabled;
+    }
+
+    /* Mining */
+    public int getMiningXPGoldOre() { return config.getInt("Experience.Mining.Gold", 250); }
+    public int getMiningXPDiamondOre() { return config.getInt("Experience.Mining.Diamond", 750); }
+    public int getMiningXPIronOre() { return config.getInt("Experience.Mining.Iron", 250); }
+    public int getMiningXPRedstoneOre() { return config.getInt("Experience.Mining.Redstone", 150); }
+    public int getMiningXPLapisOre() { return config.getInt("Experience.Mining.Lapis", 400); }
+    public int getMiningXPObsidian() { return config.getInt("Experience.Mining.Obsidian", 150); }
+    public int getMiningXPNetherrack() { return config.getInt("Experience.Mining.Netherrack", 30); }
+    public int getMiningXPGlowstone() { return config.getInt("Experience.Mining.Glowstone", 30); }
+    public int getMiningXPCoalOre() { return config.getInt("Experience.Mining.Coal", 100); }
+    public int getMiningXPStone() { return config.getInt("Experience.Mining.Stone", 30); }
+    public int getMiningXPSandstone() { return config.getInt("Experience.Mining.Sandstone", 30); }
+    public int getMiningXPEndStone() { return config.getInt("Experience.Mining.End_Stone", 150); }
+    public int getMiningXPMossyStone() { return config.getInt("Experience.Mining.Moss_Stone", 30); }
+
+    public boolean getCoalDoubleDropsEnabled() { return config.getBoolean("Double_Drops.Mining.Coal", true); }
+    public boolean getDiamondDoubleDropsEnabled() { return config.getBoolean("Double_Drops.Mining.Diamond", true); }
+    public boolean getEndStoneDoubleDropsEnabled() { return config.getBoolean("Double_Drops.Mining.End_Stone", true); }
+    public boolean getGlowstoneDoubleDropsEnabled() { return config.getBoolean("Double_Drops.Mining.Glowstone", true); }
+    public boolean getGoldDoubleDropsEnabled() { return config.getBoolean("Double_Drops.Mining.Gold", true); }
+    public boolean getIronDoubleDropsEnabled() { return config.getBoolean("Double_Drops.Mining.Iron", true); }
+    public boolean getLapisDoubleDropsEnabled() { return config.getBoolean("Double_Drops.Mining.Lapis", true); }
+    public boolean getMossyCobblestoneDoubleDropsEnabled() { return config.getBoolean("Double_Drops.Mining.Moss_Stone", true); }
+    public boolean getNetherrackDoubleDropsEnabled() { return config.getBoolean("Double_Drops.Mining.Netherrack", true); }
+    public boolean getObsidianDoubleDropsEnabled() { return config.getBoolean("Double_Drops.Mining.Obsidian", true); }
+    public boolean getRedstoneDoubleDropsEnabled() { return config.getBoolean("Double_Drops.Mining.Redstone", true); }
+    public boolean getSandstoneDoubleDropsEnabled() { return config.getBoolean("Double_Drops.Mining.Sandstone", true); }
+    public boolean getStoneDoubleDropsEnabled() { return config.getBoolean("Double_Drops.Mining.Stone", true); }
+
+    public boolean miningDoubleDropsDisabled() {
+        ConfigurationSection section = config.getConfigurationSection("Double_Drops.Mining");
+        Set<String> keys = section.getKeys(false);
+        Iterator<String> iterator = keys.iterator();
+
+        boolean disabled = true;
+
+        while (iterator.hasNext()) {
+            String key = iterator.next();
+
+            if (config.getBoolean("Double_Drops.Mining." + key)) {
+                disabled = false;
+                break;
+            }
+        }
+
+        return disabled;
+    }
+
+    public int getDetonatorItemID() { return config.getInt("Skills.Mining.Detonator_ID", 259); }
+
+    /* Repair */
+    public boolean getRepairAnvilMessagesEnabled() { return config.getBoolean("Skills.Repair.Anvil_Messages", true); }
+    public int getRepairAnvilId() { return config.getInt("Skills.Repair.Anvil_ID", 42); }
+
+    /* Taming */
+    public int getTamingXPWolf() { return config.getInt("Experience.Taming.Animal_Taming.Wolf", 250); }
+    public int getTamingXPOcelot() { return config.getInt("Experience.Taming.Animal_Taming.Ocelot", 500); }
+    public int getTamingCOTWWolfCost() { return config.getInt("Skills.Taming.Call_Of_The_Wild.Bones_Required", 10); }
+    public int getTamingCOTWOcelotCost() { return config.getInt("Skills.Taming.Call_Of_The_Wild.Fish_Required", 10); }
+
+    /* Woodcutting */
+    public int getWoodcuttingXPOak() { return config.getInt("Experience.Woodcutting.Oak", 70); }
+    public int getWoodcuttingXPBirch() { return config.getInt("Experience.Woodcutting.Birch", 90); }
+    public int getWoodcuttingXPSpruce() { return config.getInt("Experience.Woodcutting.Spruce", 80); }
+    public int getWoodcuttingXPJungle() { return config.getInt("Experience.Woodcutting.Jungle", 100); }
+
+    public boolean getOakDoubleDropsEnabled() { return config.getBoolean("Double_Drops.Woodcutting.Oak", true); }
+    public boolean getBirchDoubleDropsEnabled() { return config.getBoolean("Double_Drops.Woodcutting.Birch", true); }
+    public boolean getSpruceDoubleDropsEnabled() { return config.getBoolean("Double_Drops.Woodcutting.Spruce", true); }
+    public boolean getJungleDoubleDropsEnabled() { return config.getBoolean("Double_Drops.Woodcutting.Jungle", true); }
+
+    public boolean woodcuttingDoubleDropsDisabled() {
+        ConfigurationSection section = config.getConfigurationSection("Double_Drops.Woodcutting");
+        Set<String> keys = section.getKeys(false);
+        Iterator<String> iterator = keys.iterator();
+
+        boolean disabled = true;
+
+        while (iterator.hasNext()) {
+            String key = iterator.next();
+
+            if (config.getBoolean("Double_Drops.Woodcutting." + key)) {
+                disabled = false;
+                break;
+            }
+        }
+
+        return disabled;
+    }
+
+    /* Arcane Forging */
+    public boolean getArcaneForgingDowngradeEnabled() { return config.getBoolean("Arcane_Forging.Downgrades.Enabled", true); }
+    public int getArcaneForgingDowngradeChanceRank1() { return config.getInt("Arcane_Forging.Downgrades.Chance.Rank_1", 75); }
+    public int getArcaneForgingDowngradeChanceRank2() { return config.getInt("Arcane_Forging.Downgrades.Chance.Rank_2", 50); }
+    public int getArcaneForgingDowngradeChanceRank3() { return config.getInt("Arcane_Forging.Downgrades.Chance.Rank_3", 25); }
+    public int getArcaneForgingDowngradeChanceRank4() { return config.getInt("Arcane_Forging.Downgrades.Chance.Rank_4", 15); }
+    public boolean getArcaneForgingEnchantLossEnabled() { return config.getBoolean("Arcane_Forging.May_Lose_Enchants", true); }
+    public int getArcaneForgingKeepEnchantsChanceRank1() { return config.getInt("Arcane_Forging.Keep_Enchants.Chance.Rank_1", 10); }
+    public int getArcaneForgingKeepEnchantsChanceRank2() { return config.getInt("Arcane_Forging.Keep_Enchants.Chance.Rank_2", 20); }
+    public int getArcaneForgingKeepEnchantsChanceRank3() { return config.getInt("Arcane_Forging.Keep_Enchants.Chance.Rank_3", 30); }
+    public int getArcaneForgingKeepEnchantsChanceRank4() { return config.getInt("Arcane_Forging.Keep_Enchants.Chance.Rank_4", 40); }
+    public int getArcaneForgingRankLevels1() { return config.getInt("Arcane_Forging.Rank_Levels.Rank_1", 100); }
+    public int getArcaneForgingRankLevels2() { return config.getInt("Arcane_Forging.Rank_Levels.Rank_2", 250); }
+    public int getArcaneForgingRankLevels3() { return config.getInt("Arcane_Forging.Rank_Levels.Rank_3", 500); }
+    public int getArcaneForgingRankLevels4() { return config.getInt("Arcane_Forging.Rank_Levels.Rank_4", 750); }
+
+    /* Level Caps */
+    public int getLevelCapAcrobatics() { return config.getInt("Skills.Acrobatics.Level_Cap", 0); }
+    public int getLevelCapArchery() { return config.getInt("Skills.Archery.Level_Cap", 0); }
+    public int getLevelCapAxes() { return config.getInt("Skills.Axes.Level_Cap", 0); }
+    public int getLevelCapExcavation() { return config.getInt("Skills.Excavation.Level_Cap", 0); }
+    public int getLevelCapFishing() { return config.getInt("Skills.Fishing.Level_Cap", 0); }
+    public int getLevelCapHerbalism() { return config.getInt("Skills.Herbalism.Level_Cap", 0); }
+    public int getLevelCapMining() { return config.getInt("Skills.Mining.Level_Cap", 0); }
+    public int getLevelCapRepair() { return config.getInt("Skills.Repair.Level_Cap", 0); }
+    public int getLevelCapSwords() { return config.getInt("Skills.Swords.Level_Cap", 0); }
+    public int getLevelCapTaming() { return config.getInt("Skills.Taming.Level_Cap", 0); }
+    public int getLevelCapUnarmed() { return config.getInt("Skills.Unarmed.Level_Cap", 0); }
+    public int getLevelCapWoodcutting() { return config.getInt("Skills.Woodcutting.Level_Cap", 0); }
+    public int getPowerLevelCap() { return config.getInt("General.Power_Level_Cap", 0); }
+
+    /* PVP & PVE Settings */
+    public boolean getAcrobaticsPVP() { return config.getBoolean("Skills.Acrobatics.Enabled_For_PVP", true); }
+    public boolean getAcrobaticsPVE() { return config.getBoolean("Skills.Acrobatics.Enabled_For_PVE", true); }
+    public boolean getArcheryPVP() { return config.getBoolean("Skills.Archery.Enabled_For_PVP", true); }
+    public boolean getArcheryPVE() { return config.getBoolean("Skills.Archery.Enabled_For_PVE", true); }
+    public boolean getAxesPVP() { return config.getBoolean("Skills.Axes.Enabled_For_PVP", true); }
+    public boolean getAxesPVE() { return config.getBoolean("Skills.Axes.Enabled_For_PVE", true); }
+    public boolean getSwordsPVP() { return config.getBoolean("Skills.Swords.Enabled_For_PVP", true); }
+    public boolean getSwordsPVE() { return config.getBoolean("Skills.Swords.Enabled_For_PVE", true); }
+    public boolean getTamingPVP() { return config.getBoolean("Skills.Taming.Enabled_For_PVP", true); }
+    public boolean getTamingPVE() { return config.getBoolean("Skills.Taming.Enabled_For_PVE", true); }
+    public boolean getUnarmedPVP() { return config.getBoolean("Skills.Unarmed.Enabled_For_PVP", true); }
+    public boolean getUnarmedPVE() { return config.getBoolean("Skills.Unarmed.Enabled_For_PVE", true); }
+
+    /*
+     * XP SETTINGS
+     */
+
+    /* General Settings */
+    public boolean getExperienceGainsMobspawnersEnabled() { return config.getBoolean("Experience.Gains.Mobspawners.Enabled", false); }
+    public boolean getExperienceGainsPlayerVersusPlayerEnabled() { return config.getBoolean("Experience.PVP.Rewards", true); }
+    public int getExperienceGainsGlobalMultiplier() { return config.getInt("Experience.Gains.Multiplier.Global", 1); }
+
+    /* Combat XP Multipliers */
+    public double getPlayerVersusPlayerXP() { return config.getDouble("Experience.Gains.Multiplier.PVP", 1.0); }
+    public double getAnimalsXP() { return config.getDouble("Experience.Combat.Multiplier.Animals", 1.0); }
+    public double getCreeperXP() { return config.getDouble("Experience.Combat.Multiplier.Creeper", 4.0); }
+    public double getSkeletonXP() { return config.getDouble("Experience.Combat.Multiplier.Skeleton", 2.0); }
+    public double getSpiderXP() { return config.getDouble("Experience.Combat.Multiplier.Spider", 3.0); }
+    public double getGhastXP() { return config.getDouble("Experience.Combat.Multiplier.Ghast", 3.0); }
+    public double getSlimeXP() { return config.getDouble("Experience.Combat.Multiplier.Slime", 2.0); }
+    public double getZombieXP() { return config.getDouble("Experience.Combat.Multiplier.Zombie", 2.0); }
+    public double getPigZombieXP() { return config.getDouble("Experience.Combat.Multiplier.Pig_Zombie", 3.0); }
+    public double getEndermanXP() { return config.getDouble("Experience.Combat.Multiplier.Enderman", 2.0); }
+    public double getCaveSpiderXP() { return config.getDouble("Experience.Combat.Multiplier.Cave_Spider", 3.0); }
+    public double getSilverfishXP() { return config.getDouble("Experience.Combat.Multiplier.Silverfish", 3.0); }
+    public double getBlazeXP() { return config.getDouble("Experience.Combat.Multiplier.Blaze", 3.0); }
+    public double getMagmaCubeXP() { return config.getDouble("Experience.Combat.Multiplier.Magma_Cube", 2.0); }
+    public double getEnderDragonXP() { return config.getDouble("Experience.Combat.Multiplier.Ender_Dragon", 8.0); }
+    public double getIronGolemXP() { return config.getDouble("Experience.Combat.Multiplier.Iron_Golem", 2.0); }
+
+    /* XP Formula Multiplier */
+    public int getFormulaMultiplierCurve() { return config.getInt("Experience.Formula.Curve_Modifier", 20); }
+    public double getFormulaMultiplierTaming() { return config.getDouble("Experience.Formula.Multiplier.Taming", 1.0); }
+    public double getFormulaMultiplierMining() { return config.getDouble("Experience.Formula.Multiplier.Mining", 1.0); }
+    public double getFormulaMultiplierRepair() { return config.getDouble("Experience.Formula.Multiplier.Repair", 1.0); }
+    public double getFormulaMultiplierWoodcutting() { return config.getDouble("Experience.Formula.Multiplier.Woodcutting", 1.0); }
+    public double getFormulaMultiplierUnarmed() { return config.getDouble("Experience.Formula.Multiplier.Unarmed", 1.0); }
+    public double getFormulaMultiplierHerbalism() { return config.getDouble("Experience.Formula.Multiplier.Herbalism", 1.0); }
+    public double getFormulaMultiplierExcavation() { return config.getDouble("Experience.Formula.Multiplier.Excavation", 1.0); }
+    public double getFormulaMultiplierArchery() { return config.getDouble("Experience.Formula.Multiplier.Archery", 1.0); }
+    public double getFormulaMultiplierSwords() { return config.getDouble("Experience.Formula.Multiplier.Swords", 1.0); }
+    public double getFormulaMultiplierAxes() { return config.getDouble("Experience.Formula.Multiplier.Axes", 1.0); }
+    public double getFormulaMultiplierAcrobatics() { return config.getDouble("Experience.Formula.Multiplier.Acrobatics", 1.0); }
+    public double getFormulaMultiplierFishing() { return config.getDouble("Experience.Formula.Multiplier.Fishing", 1.0); }
+
+    /*
+     * CONFIG LOADING
+     */
+
+    private Config(mcMMO plugin) {
+        super(plugin, "config.yml");
+        saveIfNotExist();
+        xpGainMultiplier = getExperienceGainsGlobalMultiplier();
+    }
+
+    @Override
+    protected void loadKeys() {
+        plugin.getLogger().info("Loading mcMMO config.yml File...");
+    }
+}

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

@@ -0,0 +1,77 @@
+package com.gmail.nossr50.config;
+
+import java.io.File;
+import java.io.IOException;
+
+import org.bukkit.configuration.file.FileConfiguration;
+import org.bukkit.configuration.file.YamlConfiguration;
+
+import com.gmail.nossr50.mcMMO;
+
+public abstract class ConfigLoader {
+    protected String fileName;
+    protected File configFile;
+    protected File dataFolder;
+    protected final mcMMO plugin;
+    protected FileConfiguration config;
+
+    public ConfigLoader(mcMMO plugin, String fileName){
+        this.plugin = plugin;
+        this.fileName = fileName;
+        dataFolder = plugin.getDataFolder();
+        configFile = new File(dataFolder, File.separator + fileName);
+        config = YamlConfiguration.loadConfiguration(configFile);
+    }
+
+    /**
+     * Load this config file.
+     */
+    public void load() {
+        if (!configFile.exists()) {
+            dataFolder.mkdir();
+            saveConfig();
+        }
+
+        addDefaults();
+        loadKeys();
+    }
+
+    /**
+     * Save this config file.
+     */
+    private void saveConfig() {
+        try {
+            config.save(configFile);
+        }
+        catch (IOException ex) {
+            plugin.getLogger().severe("Could not save config to " + configFile + ex);
+        }
+    }
+
+    protected void saveIfNotExist() {
+        if (!configFile.exists()) {
+            if (plugin.getResource(fileName) != null) {
+                plugin.saveResource(fileName, false);
+            }
+        }
+        rereadFromDisk();
+    }
+
+    protected void rereadFromDisk() {
+        config = YamlConfiguration.loadConfiguration(configFile);
+    }
+
+    /**
+     * Add the defaults to this config file.
+     */
+    protected void addDefaults() {
+        config.options().copyDefaults(true);
+        saveConfig();
+    }
+
+    /**
+     * Load the keys from this config file.
+     */
+    protected abstract void loadKeys();
+
+}

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

@@ -0,0 +1,46 @@
+package com.gmail.nossr50.config;
+
+import org.bukkit.configuration.file.YamlConfiguration;
+
+import com.gmail.nossr50.mcMMO;
+
+public class HiddenConfig extends ConfigLoader {
+    private static String fileName;
+    private static HiddenConfig instance;
+    private static YamlConfiguration config;
+
+    private static boolean chunkletsEnabled;
+
+    public HiddenConfig(mcMMO plugin, String fileName) {
+        super(plugin, fileName);
+        HiddenConfig.fileName = fileName;
+    }
+
+
+    public static HiddenConfig getInstance() {
+        if (instance == null) {
+            instance = new HiddenConfig(mcMMO.p, "hidden.yml");
+            instance.load();
+        }
+
+        return instance;
+    }
+
+    @Override
+    public void load() {
+        if (plugin.getResource(fileName) != null) {
+            loadKeys();
+        }
+    }
+
+    @Override
+    protected void loadKeys() {
+        config = YamlConfiguration.loadConfiguration(plugin.getResource(fileName));
+
+        chunkletsEnabled = config.getBoolean("Options.Chunklets", true);
+    }
+
+    public boolean getChunkletsEnabled() {
+        return chunkletsEnabled;
+    }
+}

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

@@ -1,439 +0,0 @@
-/*
-	This file is part of mcMMO.
-
-    mcMMO is free software: you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    mcMMO is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with mcMMO.  If not, see <http://www.gnu.org/licenses/>.
- */
-package com.gmail.nossr50.config;
-
-import com.gmail.nossr50.mcMMO;
-import java.io.File;
-import java.io.IOException;
-
-import org.bukkit.configuration.file.FileConfiguration;
-
-import com.gmail.nossr50.datatypes.HUDType;
-
-public class LoadProperties {
-	public static Boolean enableOnlyActivateWhenSneaking,
-			enableAbilityMessages, enableAbilities, showDisplayName, showFaces,
-			watch, xplockEnable, xpbar, xpicon, partybar, string, bucket, web,
-			xprateEnable, slimeballs, spoutEnabled, donateMessage,
-			chimaeraWingEnable, xpGainsMobSpawners, myspawnEnable, mccEnable,
-			mcmmoEnable, partyEnable, inviteEnable, acceptEnable, whoisEnable,
-			statsEnable, addxpEnable, ptpEnable, mmoeditEnable,
-			clearmyspawnEnable, mcgodEnable, mcabilityEnable, mctopEnable,
-			mcrefreshEnable, aEnable, pEnable, enableMotd, enableMySpawn,
-			enableRegen, enableCobbleToMossy, useMySQL, cocoabeans, mushrooms,
-			toolsLoseDurabilityFromAbilities, pvpxp, miningrequirespickaxe,
-			excavationRequiresShovel, woodcuttingrequiresaxe, eggs, apples,
-			cake, music, diamond, glowstone, slowsand, sulphur, netherrack,
-			bones, coal, clay, anvilmessages, mayDowngradeEnchants,
-			mayLoseEnchants, fishingDrops, leatherArmor, ironArmor, goldArmor,
-			diamondArmor, woodenTools, stoneTools, ironTools, goldTools,
-			diamondTools, enderPearl, blazeRod, records, glowstoneDust,
-			fishingDiamonds, aDisplayNames, pDisplayNames, enableSmoothToMossy,
-			enableDirtToGrass;
-
-	public static String MySQLtablePrefix, MySQLuserName,
-			MySQLserverName, MySQLdbName, MySQLdbPass, nWood, nStone, 
-			nIron, nGold, nDiamond, locale, nString, nLeather;
-
-	public static int mfishing, mwatch, xpbar_x, xpbar_y, xpicon_x, xpicon_y,
-			mstring, mbucket, mweb, chimaeraId, msandstone, mcocoa,
-			water_thunder, cure_self, cure_other, mslimeballs, mbones,
-			msulphur, mslowsand, mmushroom2, mglowstone2, mmelon, mmusic,
-			mdiamond2, mbase, mapple, meggs, mcake, mpine, mbirch, mspruce,
-			mcactus, mmushroom, mflower, msugar, mpumpkin, mwheat, mgold,
-			mdiamond, miron, mredstone, mlapis, mobsidian, mnetherrack,
-			mglowstone, mcoal, mstone, MySQLport, xpGainMultiplier,
-			superBreakerCooldown, greenTerraCooldown, gigaDrillBreakerCooldown,
-			treeFellerCooldown, berserkCooldown, serratedStrikeCooldown,
-			skullSplitterCooldown, abilityDurabilityLoss,
-			feathersConsumedByChimaeraWing, bonesConsumedByCOTW,
-			repairdiamondlevel, rWood, rStone, rIron, rGold, rDiamond, rString,
-			rLeather, downgradeRank1, downgradeRank2, downgradeRank3,
-			downgradeRank4, keepEnchantsRank1, keepEnchantsRank2,
-			keepEnchantsRank3, keepEnchantsRank4, fishingDropChanceTier1,
-			fishingDropChanceTier2, fishingDropChanceTier3,
-			fishingDropChanceTier4, fishingDropChanceTier5, mnetherwart,
-			mvines, mlilypad, mnetherbrick, mendstone, mmossstone, mstonebrick,
-			levelCapAcrobatics, levelCapArchery, levelCapAxes, levelCapExcavation,
-			levelCapFishing, levelCapHerbalism, levelCapMining, levelCapRepair,
-			levelCapSwords, levelCapTaming, levelCapUnarmed, levelCapWoodcutting,
-			anvilID, saveInterval;
-
-	public static double xpbackground_r, xpbackground_g, xpbackground_b,
-			xpborder_r, xpborder_g, xpborder_b, fishing_r, fishing_g,
-			fishing_b, acrobatics_r, acrobatics_g, acrobatics_b, archery_r,
-			archery_g, archery_b, axes_r, axes_g, axes_b, excavation_r,
-			excavation_g, excavation_b, herbalism_r, herbalism_g, herbalism_b,
-			mining_r, mining_g, mining_b, repair_r, repair_g, repair_b,
-			swords_r, swords_g, swords_b, taming_r, taming_g, taming_b,
-			unarmed_r, unarmed_g, unarmed_b, woodcutting_r, woodcutting_g,
-			woodcutting_b, pvpxprewardmodifier, tamingxpmodifier,
-			miningxpmodifier, repairxpmodifier, woodcuttingxpmodifier,
-			sorceryxpmodifier, unarmedxpmodifier, herbalismxpmodifier,
-			excavationxpmodifier, archeryxpmodifier, swordsxpmodifier,
-			axesxpmodifier, acrobaticsxpmodifier;
-
-	public static HUDType defaulthud;
-	protected static File configFile;
-	protected static File dataFolder;
-	protected final mcMMO plugin;
-	protected static FileConfiguration config;
-
-	public LoadProperties(mcMMO plugin) {
-		this.plugin = plugin;
-		dataFolder = plugin.getDataFolder();
-		configFile = new File(dataFolder, File.separator + "config.yml");
-		config = plugin.getConfig();
-	}
-
-	public void load() {
-		// If not exist, copy from the jar
-		if (!configFile.exists()) {
-			dataFolder.mkdir();
-			plugin.saveDefaultConfig();
-		}
-		addDefaults();
-		loadKeys();
-	}
-
-	private Boolean readBoolean(String root, Boolean def) {
-		Boolean result = config.getBoolean(root, def);
-		return result;
-	}
-
-	private Double readDouble(String root, Double def) {
-		Double result = config.getDouble(root, def);
-		return result;
-	}
-
-	private Integer readInteger(String root, Integer def) {
-		Integer result = config.getInt(root, def);
-		return result;
-	}
-
-	public static String readString(String root, String def) {
-		String result = config.getString(root, def);
-		return result;
-	}
-
-	private static void saveConfig() {
-		try {
-			config.save(configFile);
-		} catch (IOException e) {
-			e.printStackTrace();
-		}
-	}
-
-	private void addDefaults() {
-		// Load from included config.yml
-		config.options().copyDefaults(true);
-		saveConfig();
-	}
-
-	private void loadKeys() {
-		plugin.getLogger().info("Loading Config File...");
-
-		// Setup default HUD
-		String temp = readString("Spout.HUD.Default", "STANDARD");
-		for (HUDType x : HUDType.values()) {
-			if (x.toString().equalsIgnoreCase(temp)) {
-				defaulthud = x;
-			}
-		}
-
-		enableAbilityMessages = readBoolean("Abilities.Messages", true);
-		enableAbilities = readBoolean("Abilities.Enabled", true);
-
-		donateMessage = readBoolean("Commands.mcmmo.Donate_Message", true);
-		xpGainsMobSpawners = readBoolean("XP.Gains.Mobspawners.Enabled", false);
-
-		bonesConsumedByCOTW = readInteger("Skills.Taming.Call_Of_The_Wild.Bones_Required", 10);
-
-		xpbar = readBoolean("Spout.XP.Bar.Enabled", true);
-		// web_url = readString("Spout.Images.URL_DIR",
-		// "http://mcmmo.rycochet.net/mcmmo/");
-		xpicon = readBoolean("Spout.XP.Icon.Enabled", true);
-		xpbar_x = readInteger("Spout.XP.Bar.X_POS", 95);
-		xpbar_y = readInteger("Spout.XP.Bar.Y_POS", 6);
-		xpicon_x = readInteger("Spout.XP.Icon.X_POS", 78);
-		xpicon_y = readInteger("Spout.XP.Icon.Y_POS", 2);
-
-		showFaces = readBoolean("Spout.Party.HUD.Show_Faces", true);
-		showDisplayName = readBoolean("Spout.Party.HUD.Show_Display_Name", false);
-		partybar = readBoolean("Spout.Party.HUD.Enabled", true);
-
-		acrobatics_r = readDouble("Spout.HUD.Retro.Colors.Acrobatics.RED", 0.3);
-		acrobatics_g = readDouble("Spout.HUD.Retro.Colors.Acrobatics.GREEN", 0.3);
-		acrobatics_b = readDouble("Spout.HUD.Retro.Colors.Acrobatics.BLUE", 0.75);
-		archery_r = readDouble("Spout.HUD.Retro.Colors.Archery.RED", 0.3);
-		archery_g = readDouble("Spout.HUD.Retro.Colors.Archery.GREEN", 0.3);
-		archery_b = readDouble("Spout.HUD.Retro.Colors.Archery.BLUE", 0.75);
-		axes_r = readDouble("Spout.HUD.Retro.Colors.Axes.RED", 0.3);
-		axes_g = readDouble("Spout.HUD.Retro.Colors.Axes.GREEN", 0.3);
-		axes_b = readDouble("Spout.HUD.Retro.Colors.Axes.BLUE", 0.75);
-		excavation_r = readDouble("Spout.HUD.Retro.Colors.Excavation.RED", 0.3);
-		excavation_g = readDouble("Spout.HUD.Retro.Colors.Excavation.GREEN", 0.3);
-		excavation_b = readDouble("Spout.HUD.Retro.Colors.Excavation.BLUE", 0.75);
-		herbalism_r = readDouble("Spout.HUD.Retro.Colors.Herbalism.RED", 0.3);
-		herbalism_g = readDouble("Spout.HUD.Retro.Colors.Herbalism.GREEN", 0.3);
-		herbalism_b = readDouble("Spout.HUD.Retro.Colors.Herbalism.BLUE", 0.75);
-		mining_r = readDouble("Spout.HUD.Retro.Colors.Mining.RED", 0.3);
-		mining_g = readDouble("Spout.HUD.Retro.Colors.Mining.GREEN", 0.3);
-		mining_b = readDouble("Spout.HUD.Retro.Colors.Mining.BLUE", 0.75);
-		repair_r = readDouble("Spout.HUD.Retro.Colors.Repair.RED", 0.3);
-		repair_g = readDouble("Spout.HUD.Retro.Colors.Repair.GREEN", 0.3);
-		repair_b = readDouble("Spout.HUD.Retro.Colors.Repair.BLUE", 0.75);
-		swords_r = readDouble("Spout.HUD.Retro.Colors.Swords.RED", 0.3);
-		swords_g = readDouble("Spout.HUD.Retro.Colors.Swords.GREEN", 0.3);
-		swords_b = readDouble("Spout.HUD.Retro.Colors.Swords.BLUE", 0.75);
-		taming_r = readDouble("Spout.HUD.Retro.Colors.Taming.RED", 0.3);
-		taming_g = readDouble("Spout.HUD.Retro.Colors.Taming.GREEN", 0.3);
-		taming_b = readDouble("Spout.HUD.Retro.Colors.Taming.BLUE", 0.75);
-		unarmed_r = readDouble("Spout.HUD.Retro.Colors.Unarmed.RED", 0.3);
-		unarmed_g = readDouble("Spout.HUD.Retro.Colors.Unarmed.GREEN", 0.3);
-		unarmed_b = readDouble("Spout.HUD.Retro.Colors.Unarmed.BLUE", 0.75);
-		woodcutting_r = readDouble("Spout.HUD.Retro.Colors.Woodcutting.RED", 0.3);
-		woodcutting_g = readDouble("Spout.HUD.Retro.Colors.Woodcutting.GREEN", 0.3);
-		woodcutting_b = readDouble("Spout.HUD.Retro.Colors.Woodcutting.BLUE", 0.75);
-		fishing_r = readDouble("Spout.HUD.Retro.Colors.Fishing.RED", 0.3);
-		fishing_g = readDouble("Spout.HUD.Retro.Colors.Fishing.GREEN", 0.3);
-		fishing_b = readDouble("Spout.HUD.Retro.Colors.Fishing.BLUE", 0.75);
-
-		xpborder_r = readDouble("Spout.HUD.Retro.Colors.Border.RED", 0.0);
-		xpborder_g = readDouble("Spout.HUD.Retro.Colors.Border.GREEN", 0.0);
-		xpborder_b = readDouble("Spout.HUD.Retro.Colors.Border.BLUE", 0.0);
-		xpbackground_r = readDouble("Spout.HUD.Retro.Colors.Background.RED", 0.75);
-		xpbackground_g = readDouble("Spout.HUD.Retro.Colors.Background.GREEN", 0.75);
-		xpbackground_b = readDouble("Spout.HUD.Retro.Colors.Background.BLUE", 0.75);
-
-		msulphur = readInteger("Experience.Excavation.Sulphur", 30);
-		mbones = readInteger("Experience.Excavation.Bones", 30);
-		mbase = readInteger("Experience.Excavation.Base", 40);
-		mmushroom2 = readInteger("Experience.Excavation.Mushroom", 80);
-		mslowsand = readInteger("Experience.Excavation.Slowsand", 80);
-		mglowstone2 = readInteger("Experience.Excavation.Glowstone", 80);
-		mmusic = readInteger("Experience.Excavation.Music", 3000);
-		mdiamond2 = readInteger("Experience.Excavation.Diamond", 1000);
-		mapple = readInteger("Experience.Excavation.Apple", 100);
-		meggs = readInteger("Experience.Excavation.Eggs", 100);
-		mcake = readInteger("Experience.Excavation.Cake", 3000);
-		mcocoa = readInteger("Experience.Excavation.Cocoa_Beans", 100);
-		mslimeballs = readInteger("Experience.Excavation.Slimeballs", 100);
-		mstring = readInteger("Experience.Excavation.String", 200);
-		mbucket = readInteger("Experience.Excavation.Bucket", 100);
-		mweb = readInteger("Experience.Excavation.Web", 150);
-		mwatch = readInteger("Experience.Excavation.Watch", 200);
-
-		msugar = readInteger("Experience.Herbalism.Sugar_Cane", 30);
-		mwheat = readInteger("Experience.Herbalism.Wheat", 50);
-		mcactus = readInteger("Experience.Herbalism.Cactus", 30);
-		mpumpkin = readInteger("Experience.Herbalism.Pumpkin", 20);
-		mflower = readInteger("Experience.Herbalism.Flowers", 100);
-		mmushroom = readInteger("Experience.Herbalism.Mushrooms", 150);
-		mmelon = readInteger("Experience.Herbalism.Melon", 20);
-		mnetherwart = readInteger("Experience.Herbalism.Nether_Wart", 50);
-		mlilypad = readInteger("Experience.Herbalism.Lily_Pads", 100);
-		mvines = readInteger("Experience.Herbalism.Vines", 10);
-
-		mpine = readInteger("Experience.Woodcutting.Pine", 70);
-		mbirch = readInteger("Experience.Woodcutting.Birch", 80);
-		mspruce = readInteger("Experience.Woodcutting.Spruce", 90);
-
-		mgold = readInteger("Experience.Mining.Gold", 250);
-		mdiamond = readInteger("Experience.Mining.Diamond", 750);
-		miron = readInteger("Experience.Mining.Iron", 250);
-		mredstone = readInteger("Experience.Mining.Redstone", 150);
-		mlapis = readInteger("Experience.Mining.Lapis", 400);
-		mobsidian = readInteger("Experience.Mining.Obsidian", 150);
-		mnetherrack = readInteger("Experience.Mining.Netherrack", 30);
-		mglowstone = readInteger("Experience.Mining.Glowstone", 30);
-		mcoal = readInteger("Experience.Mining.Coal", 100);
-		mstone = readInteger("Experience.Mining.Stone", 30);
-		msandstone = readInteger("Experience.Mining.Sandstone", 30);
-		mnetherbrick = readInteger("Experience.Mining.Nether_Brick", 30);
-		mendstone = readInteger("Experience.Mining.End_Stone", 150);
-		mmossstone = readInteger("Experience.Mining.Moss_Stone", 30);
-		mstonebrick = readInteger("Experience.Mining.Stone_Brick", 30);
-
-		mfishing = readInteger("Experience.Fishing.Base", 800);
-
-		enableOnlyActivateWhenSneaking = readBoolean("Abilities.Activation.Only_Activate_When_Sneaking", false);
-
-		greenTerraCooldown = readInteger("Abilities.Cooldowns.Green_Terra", 240);
-		superBreakerCooldown = readInteger("Abilities.Cooldowns.Super_Breaker", 240);
-		gigaDrillBreakerCooldown = readInteger("Abilities.Cooldowns.Giga_Drill_Breaker", 240);
-		treeFellerCooldown = readInteger("Abilities.Cooldowns.Tree_Feller", 240);
-		berserkCooldown = readInteger("Abilities.Cooldowns.Berserk", 240);
-		serratedStrikeCooldown = readInteger("Abilities.Cooldowns.Serrated_Strikes", 240);
-		skullSplitterCooldown = readInteger("Abilities.Cooldowns.Skull_Splitter", 240);
-
-		MySQLserverName = readString("MySQL.Server.Address", "localhost");
-		if (readString("MySQL.Database.User.Password", null) != null)
-			MySQLdbPass = readString("MySQL.Database.User.Password", null);
-		else
-			MySQLdbPass = "";
-
-		MySQLdbName = readString("MySQL.Database.Name", "DatabaseName");
-		MySQLuserName = readString("MySQL.Database.User.Name", "UserName");
-		MySQLtablePrefix = readString("MySQL.Database.TablePrefix", "mcmmo_");
-		MySQLport = readInteger("MySQL.Server.Port", 3306);
-		useMySQL = readBoolean("MySQL.Enabled", false);
-
-		locale = readString("General.Locale", "en_us");
-		enableMotd = readBoolean("General.MOTD.Enabled", true);
-		enableMySpawn = readBoolean("General.MySpawn.Enabled", true);
-		enableRegen = readBoolean("General.HP_Regeneration.Enabled", true);
-		saveInterval = readInteger("General.Save_Interval", 10);
-
-		enableCobbleToMossy = readBoolean("Skills.Herbalism.Green_Thumb.Cobble_To_Mossy", true);
-		enableSmoothToMossy = readBoolean("Skills.Herbalism.Green_Thumb.SmoothBrick_To_MossyBrick", true);
-		enableDirtToGrass = readBoolean("Skills.Herbalism.Green_Thumb.Dirt_To_Grass", true);
-
-		xpGainMultiplier = readInteger("Experience.Gains.Multiplier.Global", 1);
-		toolsLoseDurabilityFromAbilities = readBoolean("Abilities.Tools.Durability_Loss_Enabled", true);
-		abilityDurabilityLoss = readInteger("Abilities.Tools.Durability_Loss", 2);
-
-		feathersConsumedByChimaeraWing = readInteger("Items.Chimaera_Wing.Feather_Cost", 10);
-		chimaeraId = readInteger("Items.Chimaera_Wing.Item_ID", 288);
-		chimaeraWingEnable = readBoolean("Items.Chimaera_Wing.Enabled", true);
-
-		pvpxp = readBoolean("XP.PVP.Rewards", true);
-		pvpxprewardmodifier = readDouble("Experience.Gains.Multiplier.PVP", 1.0);
-		miningrequirespickaxe = readBoolean("Skills.Mining.Requires_Pickaxe", true);
-		excavationRequiresShovel = readBoolean("Skills.Excavation.Requires_Shovel", true);
-		woodcuttingrequiresaxe = readBoolean("Skills.Woodcutting.Requires_Axe", true);
-		repairdiamondlevel = readInteger("Skills.Repair.Diamond.Level_Required", 50);
-
-		sorceryxpmodifier = readDouble("Experience.Formula.Multiplier.Sorcery", 1.0);
-		tamingxpmodifier = readDouble("Experience.Formula.Multiplier.Taming", 1.0);
-		miningxpmodifier = readDouble("Experience.Formula.Multiplier.Mining", 1.0);
-		repairxpmodifier = readDouble("Experience.Formula.Multiplier.Repair", 1.0);
-		woodcuttingxpmodifier = readDouble("Experience.Formula.Multiplier.Woodcutting", 1.0);
-		unarmedxpmodifier = readDouble("Experience.Formula.Multiplier.Unarmed", 1.0);
-		herbalismxpmodifier = readDouble("Experience.Formula.Multiplier.Herbalism", 1.0);
-		excavationxpmodifier = readDouble("Experience.Formula.Multiplier.Excavation", 1.0);
-		archeryxpmodifier = readDouble("Experience.Formula.Multiplier.Archery", 1.0);
-		swordsxpmodifier = readDouble("Experience.Formula.Multiplier.Swords", 1.0);
-		axesxpmodifier = readDouble("Experience.Formula.Multiplier.Axes", 1.0);
-		acrobaticsxpmodifier = readDouble("Experience.Formula.Multiplier.Acrobatics", 1.0);
-
-		anvilmessages = readBoolean("Skills.Repair.Anvil_Messages", true);
-		anvilID = readInteger("Skills.Repair.Anvil_ID", 42);
-
-		rGold = readInteger("Skills.Repair.Gold.ID", 266);
-		nGold = readString("Skills.Repair.Gold.Name", "Gold Bars");
-		rStone = readInteger("Skills.Repair.Stone.ID", 4);
-		nStone = readString("Skills.Repair.Stone.Name", "Cobblestone");
-		rWood = readInteger("Skills.Repair.Wood.ID", 5);
-		nWood = readString("Skills.Repair.Wood.Name", "Wood Planks");
-		rDiamond = readInteger("Skills.Repair.Diamond.ID", 264);
-		nDiamond = readString("Skills.Repair.Diamond.Name", "Diamond");
-		rIron = readInteger("Skills.Repair.Iron.ID", 265);
-		nIron = readString("Skills.Repair.Iron.Name", "Iron Bars");
-		rString = readInteger("Skills.Repair.String.ID", 287);
-		nString = readString("Skills.Repair.String.Name", "String");
-		rLeather = readInteger("Skills.Repair.Leather.ID", 334);
-		nLeather = readString("Skills.Repair.Leather.Name", "Leather");
-		
-		levelCapAcrobatics = readInteger("Skills.Acrobatics.Level_Cap", 0);
-		levelCapArchery = readInteger("Skills.Archery.Level_Cap", 0);
-		levelCapAxes = readInteger("Skills.Axes.Level_Cap", 0);
-		levelCapExcavation = readInteger("Skills.Excavation.Level_Cap", 0);
-		levelCapFishing = readInteger("Skills.Fishing.Level_Cap", 0);
-		levelCapHerbalism = readInteger("Skills.Herbalism.Level_Cap", 0);
-		levelCapMining = readInteger("Skills.Mining.Level_Cap", 0);
-		levelCapRepair = readInteger("Skills.Repair.Level_Cap", 0);
-		levelCapSwords = readInteger("Skills.Swords.Level_Cap", 0);
-		levelCapTaming = readInteger("Skills.Taming.Level_Cap", 0);
-		levelCapUnarmed = readInteger("Skills.Unarmed.Level_Cap", 0);
-		levelCapWoodcutting = readInteger("Skills.Woodcutting.Level_Cap", 0);
-
-		mayDowngradeEnchants = readBoolean("Arcane_Forging.Downgrades.Enabled", true);
-		downgradeRank1 = readInteger("Arcane_Forging.Downgrades.Chance.Rank_1", 75);
-		downgradeRank2 = readInteger("Arcane_Forging.Downgrades.Chance.Rank_2", 50);
-		downgradeRank3 = readInteger("Arcane_Forging.Downgrades.Chance.Rank_3", 25);
-		downgradeRank4 = readInteger("Arcane_Forging.Downgrades.Chance.Rank_4", 15);
-		mayLoseEnchants = readBoolean("Arcane_Forging.May_Lose_Enchants.Enabled", true);
-		keepEnchantsRank1 = readInteger("Arcane_Forging.Keep_Enchants.Chance.Rank_1", 10);
-		keepEnchantsRank2 = readInteger("Arcane_Forging.Keep_Enchants.Chance.Rank_2", 20);
-		keepEnchantsRank3 = readInteger("Arcane_Forging.Keep_Enchants.Chance.Rank_3", 30);
-		keepEnchantsRank4 = readInteger("Arcane_Forging.Keep_Enchants.Chance.Rank_4", 40);
-
-		cocoabeans = readBoolean("Excavation.Drops.Cocoa_Beans", true);
-		mushrooms = readBoolean("Excavation.Drops.Mushrooms", true);
-		glowstone = readBoolean("Excavation.Drops.Glowstone", true);
-		eggs = readBoolean("Excavation.Drops.Eggs", true);
-		apples = readBoolean("Excavation.Drops.Apples", true);
-		cake = readBoolean("Excavation.Drops.Cake", true);
-		music = readBoolean("Excavation.Drops.Music", true);
-		diamond = readBoolean("Excavation.Drops.Diamond", true);
-		slowsand = readBoolean("Excavation.Drops.Slowsand", true);
-		sulphur = readBoolean("Excavation.Drops.Sulphur", true);
-		netherrack = readBoolean("Excavation.Drops.Netherrack", true);
-		bones = readBoolean("Excavation.Drops.Bones", true);
-		slimeballs = readBoolean("Excavation.Drops.Slimeballs", true);
-		watch = readBoolean("Excavation.Drops.Watch", true);
-		string = readBoolean("Excavation.Drops.String", true);
-		bucket = readBoolean("Excavation.Drops.Bucket", true);
-		web = readBoolean("Excavation.Drops.Web", true);
-
-		fishingDrops = readBoolean("Fishing.Drops.Item_Drops_Enabled", true);
-		fishingDropChanceTier1 = readInteger("Fishing.Drops.Drop_Chance.Tier_1", 20);
-		fishingDropChanceTier2 = readInteger("Fishing.Drops.Drop_Chance.Tier_2", 25);
-		fishingDropChanceTier3 = readInteger("Fishing.Drops.Drop_Chance.Tier_3", 30);
-		fishingDropChanceTier4 = readInteger("Fishing.Drops.Drop_Chance.Tier_4", 35);
-		fishingDropChanceTier5 = readInteger("Fishing.Drops.Drop_Chance.Tier_5", 40);
-		leatherArmor = readBoolean("Fishing.Drops.Leather_Armor", true);
-		ironArmor = readBoolean("Fishing.Drops.Iron_Armor", true);
-		goldArmor = readBoolean("Fishing.Drops.Gold_Armor", true);
-		diamondArmor = readBoolean("Fishing.Drops.Diamond_Armor", true);
-		woodenTools = readBoolean("Fishing.Drops.Wooden_Tools", true);
-		stoneTools = readBoolean("Fishing.Drops.Stone_Tools", true);
-		ironTools = readBoolean("Fishing.Drops.Iron_Tools", true);
-		goldTools = readBoolean("Fishing.Drops.Gold_Tools", true);
-		diamondTools = readBoolean("Fishing.Drops.Diamond_Tools", true);
-		enderPearl = readBoolean("Fishing.Drops.Ender_Pearl", true);
-		blazeRod = readBoolean("Fishing.Drops.Blaze_Rod", true);
-		records = readBoolean("Fishing.Drops.Records", true);
-		glowstoneDust = readBoolean("Fishing.Drops.Glowstone_Dust", true);
-		fishingDiamonds = readBoolean("Fishing.Drops.Diamonds", true);
-
-		xplockEnable = readBoolean("Commands.xplock.Enabled", true);
-		xprateEnable = readBoolean("Commands.xprate.Enabled", true);
-		mctopEnable = readBoolean("Commands.mctop.Enabled", true);
-		addxpEnable = readBoolean("Commands.addxp.Enabled", true);
-		mcabilityEnable = readBoolean("Commands.mcability.Enabled", true);
-		mcrefreshEnable = readBoolean("Commands.mcrefresh.Enabled", true);
-		mcmmoEnable = readBoolean("Commands.mcmmo.Enabled", true);
-		mccEnable = readBoolean("Commands.mcc.Enabled", true);
-		mcgodEnable = readBoolean("Commands.mcgod.Enabled", true);
-		statsEnable = readBoolean("Commands.stats.Enabled", true);
-		mmoeditEnable = readBoolean("Commands.mmoedit.Enabled", true);
-		ptpEnable = readBoolean("Commands.ptp.Enabled", true);
-		partyEnable = readBoolean("Commands.party.Enabled", true);
-		myspawnEnable = readBoolean("Commands.myspawn.Enabled", true);
-		whoisEnable = readBoolean("Commands.whois.Enabled", true);
-		inviteEnable = readBoolean("Commands.invite.Enabled", true);
-		acceptEnable = readBoolean("Commands.accept.Enabled", true);
-		clearmyspawnEnable = readBoolean("Commands.clearmyspawn.Enabled", true);
-		aEnable = readBoolean("Commands.a.Enabled", true);
-		pEnable = readBoolean("Commands.p.Enabled", true);
-		
-		aDisplayNames = readBoolean("Commands.a.Display_Names", true);
-		pDisplayNames = readBoolean("Commands.p.Display_Names", true);
-	}
-}

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

@@ -1,92 +0,0 @@
-/*
-	This file is part of mcMMO.
-
-    mcMMO is free software: you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    mcMMO is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with mcMMO.  If not, see <http://www.gnu.org/licenses/>.
-*/
-package com.gmail.nossr50.config;
-
-import java.util.*;
-import java.util.logging.Logger;
-
-import org.bukkit.block.Block;
-import org.bukkit.entity.Entity;
-import org.bukkit.entity.LivingEntity;
-
-import com.gmail.nossr50.mcMMO;
-
-public class Misc 
-{
-    String location = "mcmmo.properties";
-    
-    protected static final Logger log = Logger.getLogger("Minecraft");
-    
-    public ArrayList<Entity> mobSpawnerList = new ArrayList<Entity>();
-    public HashSet<Block> blockWatchList = new HashSet<Block>();
-    public ArrayList<Block> treeFeller = new ArrayList<Block>();
-    public HashMap<Entity, Integer> arrowTracker = new HashMap<Entity, Integer>();
-    public ArrayList<LivingEntity> bleedTracker = new ArrayList<LivingEntity>();
-    public HashMap<Block, Integer> tntTracker = new HashMap<Block, Integer>();
-    mcMMO plugin = null;
-    
-    //BLEED QUE STUFF
-    public LivingEntity[] bleedQue = new LivingEntity[20];
-    public int bleedQuePos = 0;
-    public LivingEntity[] bleedRemovalQue = new LivingEntity[20];
-    public int bleedRemovalQuePos = 0;
-
-    public Misc(mcMMO mcMMO) 
-    {
-		plugin = mcMMO;
-	}
-    
-    public void addToBleedQue(LivingEntity entity)
-    {
-    	//Assign entity to empty position
-    	bleedQue[bleedQuePos] = entity;
-    	
-    	//Move position up by 1 increment
-    	bleedQuePos++;
-    	
-    	//Check if array is full
-    	if(bleedQuePos >= bleedQue.length)
-    	{
-    		//Create new temporary array
-    		LivingEntity[] temp = new LivingEntity[bleedQue.length*2];
-    		//Copy data from bleedQue to temporary array
-    		System.arraycopy(bleedQue, 0, temp, 0, bleedQue.length);
-    		//Point bleedQue to new array
-    		bleedQue = temp;
-    	}
-    }
-    
-    public void addToBleedRemovalQue(LivingEntity entity)
-    {
-    	//Assign entity to empty position
-    	bleedRemovalQue[bleedRemovalQuePos] = entity;
-    	
-    	//Move position up by 1 increment
-    	bleedRemovalQuePos++;
-    	
-    	//Check if array is full
-    	if(bleedRemovalQuePos >= bleedRemovalQue.length)
-    	{
-    		//Create new temporary array
-    		LivingEntity[] temp = new LivingEntity[bleedRemovalQue.length*2];
-    		//Copy data from bleedRemovalQue to temporary array
-    		System.arraycopy(bleedRemovalQue, 0, temp, 0, bleedRemovalQue.length);
-    		//Point bleedRemovalQue to new array
-    		bleedRemovalQue = temp;
-    	}
-    }
-}

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

@@ -0,0 +1,115 @@
+package com.gmail.nossr50.config;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Set;
+
+import org.bukkit.configuration.ConfigurationSection;
+import org.bukkit.configuration.file.YamlConfiguration;
+
+import com.gmail.nossr50.mcMMO;
+import com.gmail.nossr50.skills.repair.RepairItemType;
+import com.gmail.nossr50.skills.repair.RepairMaterialType;
+import com.gmail.nossr50.skills.repair.Repairable;
+import com.gmail.nossr50.skills.repair.RepairableFactory;
+
+public class RepairConfig extends ConfigLoader {
+    private List<Repairable> repairables;
+
+    public RepairConfig(mcMMO plugin, String fileName) {
+        super(plugin, fileName);
+        this.config = YamlConfiguration.loadConfiguration(this.configFile);
+    }
+
+    @Override
+    public void load() {
+        loadKeys();
+    }
+
+    @Override
+    protected void loadKeys() {
+        repairables = new ArrayList<Repairable>();
+
+        ConfigurationSection section = config.getConfigurationSection("Repairables");
+        Set<String> keys = section.getKeys(false);
+
+        for (String key : keys) {
+            // Validate all the things!
+            List<String> reason = new ArrayList<String>();
+
+            if (!config.contains("Repairables." + key + ".ItemId")) {
+                reason.add(key + " is missing ItemId");
+            }
+
+            if (!config.contains("Repairables." + key + ".RepairMaterialId")) {
+                reason.add(key + " is missing RepairMaterialId");
+            }
+
+            if (!config.contains("Repairables." + key + ".MaximumDurability")) {
+                reason.add(key + " is missing MaximumDurability");
+            }
+
+            int itemId = config.getInt("Repairables." + key + ".ItemId", 0);
+            int repairMaterialId = config.getInt("Repairables." + key + ".RepairMaterialId", 0);
+            int maximumDurability = config.getInt("Repairables." + key + ".MaximumDurability", 0);
+
+            int repairMetadata = config.getInt("Repairables." + key + ".RepairMaterialMetadata", -1);
+            int minimumLevel = config.getInt("Repairables." + key + ".MinimumLevel", 0);
+            int minimumQuantity = config.getInt("Repairables." + key + ".MinimumQuantity", 2);
+            double xpMultiplier = config.getDouble("Repairables." + key + ".XpMultiplier", 1);
+
+            RepairItemType repairItemType = RepairItemType.OTHER;
+            RepairMaterialType repairMaterialType = RepairMaterialType.OTHER;
+
+            String repairItemTypeString = config.getString("Repairables." + key + ".ItemType", "OTHER");
+            String repairMaterialTypeString = config.getString("Repairables." + key + ".MaterialType", "OTHER");
+
+            if (minimumLevel < 0) {
+                reason.add(key + " has an invalid MinimumLevel of " + minimumLevel);
+            }
+
+            if (minimumQuantity < 0) {
+                reason.add(key + " has an invalid MinimumQuantity of " + minimumQuantity);
+            }
+
+            try {
+                repairItemType = RepairItemType.valueOf(repairItemTypeString);
+            }
+            catch (IllegalArgumentException ex) {
+                reason.add(key + " has an invalid ItemType of " + repairItemTypeString);
+            }
+
+            try {
+                repairMaterialType = RepairMaterialType.valueOf(repairMaterialTypeString);
+            }
+            catch (IllegalArgumentException ex) {
+                reason.add(key + " has an invalid MaterialType of " + repairMaterialTypeString);
+            }
+
+            if (noErrorsInRepairable(reason)) {
+                Repairable repairable = RepairableFactory.getRepairable(itemId, repairMaterialId, (byte) repairMetadata, minimumLevel, minimumQuantity, (short) maximumDurability, repairItemType, repairMaterialType, xpMultiplier);
+                repairables.add(repairable);
+            }
+        }
+    }
+
+    protected List<Repairable> getLoadedRepairables() {
+        if (repairables == null) {
+            return new ArrayList<Repairable>();
+        }
+
+        return repairables;
+    }
+
+    private boolean noErrorsInRepairable(List<String> issues) {
+        if (issues.isEmpty()) {
+            return true;
+        }
+        else {
+            for (String issue : issues) {
+                plugin.getLogger().warning(issue);
+            }
+            return false;
+        }
+    }
+}

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

@@ -0,0 +1,56 @@
+package com.gmail.nossr50.config;
+
+import java.io.File;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.regex.Pattern;
+
+import com.gmail.nossr50.mcMMO;
+import com.gmail.nossr50.skills.repair.Repairable;
+
+public class RepairConfigManager {
+    private List<Repairable> repairables;
+
+    public RepairConfigManager(mcMMO plugin) {
+        repairables = new ArrayList<Repairable>();
+
+        Pattern pattern = Pattern.compile("repair\\.(?:.+)\\.yml");
+        File dataFolder = plugin.getDataFolder();
+        File vanilla = new File(dataFolder, "repair.vanilla.yml");
+
+        if (!vanilla.exists()) {
+            plugin.saveResource("repair.vanilla.yml", false);
+        }
+
+        for (String location : dataFolder.list()) {
+            if (!pattern.matcher(location).matches()) {
+                continue;
+            }
+
+            plugin.getLogger().info("Loading " + location + " repair config file...");
+
+            File file = new File(dataFolder, location);
+
+            if (file.isDirectory()) {
+                continue;
+            }
+
+            RepairConfig rConfig = new RepairConfig(plugin, location);
+            rConfig.load();
+
+            List<Repairable> rConfigRepairables = rConfig.getLoadedRepairables();
+
+            if (rConfigRepairables != null) {
+                repairables.addAll(rConfigRepairables);
+            }
+        }
+    }
+
+    public List<Repairable> getLoadedRepairables() {
+        if (repairables == null) {
+            return new ArrayList<Repairable>();
+        }
+
+        return repairables;
+    }
+}

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

@@ -0,0 +1,98 @@
+package com.gmail.nossr50.config;
+
+import com.gmail.nossr50.mcMMO;
+import com.gmail.nossr50.datatypes.HUDType;
+
+public class SpoutConfig extends ConfigLoader {
+    private static SpoutConfig instance;
+
+    public static SpoutConfig getInstance() {
+        if (instance == null) {
+            instance = new SpoutConfig(mcMMO.p);
+            instance.load();
+        }
+
+        return instance;
+    }
+
+    public HUDType defaulthud;
+
+    private SpoutConfig(mcMMO plugin) {
+        super(plugin, "spout.yml");
+        saveIfNotExist();
+    }
+
+    public boolean getShowPowerLevel() { return config.getBoolean("HUD.Show_Power_Level", true); }
+    public String getMenuKey() { return config.getString("Menu.Key", "KEY_M"); }
+
+    /* XP Bar */
+    public boolean getXPBarEnabled() { return config.getBoolean("XP.Bar.Enabled", true); }
+    public boolean getXPBarIconEnabled() { return config.getBoolean("XP.Icon.Enabled", true); }
+    public int getXPBarXPosition() { return config.getInt("XP.Bar.X_POS", 95); }
+    public int getXPBarYPosition() { return config.getInt("XP.Bar.Y_POS", 6); }
+    public int getXPIconXPosition() { return config.getInt("XP.Icon.X_POS", 78); }
+    public int getXPIconYPosition() { return config.getInt("XP.Icon.Y_POS", 2); }
+
+    /* HUD Colors */
+    public double getRetroHUDXPBorderRed() { return config.getDouble("HUD.Retro.Colors.Border.RED", 0.0); }
+    public double getRetroHUDXPBorderGreen() { return config.getDouble("HUD.Retro.Colors.Border.GREEN", 0.0); }
+    public double getRetroHUDXPBorderBlue() { return config.getDouble("HUD.Retro.Colors.Border.BLUE", 0.0); }
+    public double getRetroHUDXPBackgroundRed() { return config.getDouble("HUD.Retro.Colors.Background.RED", 0.75); }
+    public double getRetroHUDXPBackgroundGreen() { return config.getDouble("HUD.Retro.Colors.Background.GREEN", 0.75); }
+    public double getRetroHUDXPBackgroundBlue() { return config.getDouble("HUD.Retro.Colors.Background.BLUE", 0.75); }
+
+    public double getRetroHUDAcrobaticsRed() { return config.getDouble("HUD.Retro.Colors.Acrobatics.RED", 0.3); }
+    public double getRetroHUDAcrobaticsGreen() { return config.getDouble("HUD.Retro.Colors.Acrobatics.GREEN", 0.3); }
+    public double getRetroHUDAcrobaticsBlue() { return config.getDouble("HUD.Retro.Colors.Acrobatics.BLUE", 0.75); }
+    public double getRetroHUDArcheryRed() { return config.getDouble("HUD.Retro.Colors.Archery.RED", 0.3); }
+    public double getRetroHUDArcheryGreen() { return config.getDouble("HUD.Retro.Colors.Archery.GREEN", 0.3); }
+    public double getRetroHUDArcheryBlue() { return config.getDouble("HUD.Retro.Colors.Archery.BLUE", 0.75); }
+    public double getRetroHUDAxesRed() { return config.getDouble("HUD.Retro.Colors.Axes.RED", 0.3); }
+    public double getRetroHUDAxesGreen() { return config.getDouble("HUD.Retro.Colors.Axes.GREEN", 0.3); }
+    public double getRetroHUDAxesBlue() { return config.getDouble("HUD.Retro.Colors.Axes.BLUE", 0.75); }
+    public double getRetroHUDExcavationRed() { return config.getDouble("HUD.Retro.Colors.Excavation.RED", 0.3); }
+    public double getRetroHUDExcavationGreen() { return config.getDouble("HUD.Retro.Colors.Excavation.GREEN", 0.3); }
+    public double getRetroHUDExcavationBlue() { return config.getDouble("HUD.Retro.Colors.Excavation.BLUE", 0.75); }
+    public double getRetroHUDHerbalismRed() { return config.getDouble("HUD.Retro.Colors.Herbalism.RED", 0.3); }
+    public double getRetroHUDHerbalismGreen() { return config.getDouble("HUD.Retro.Colors.Herbalism.GREEN", 0.3); }
+    public double getRetroHUDHerbalismBlue() { return config.getDouble("HUD.Retro.Colors.Herbalism.BLUE", 0.75); }
+    public double getRetroHUDMiningRed() { return config.getDouble("HUD.Retro.Colors.Mining.RED", 0.3); }
+    public double getRetroHUDMiningGreen() { return config.getDouble("HUD.Retro.Colors.Mining.GREEN", 0.3); }
+    public double getRetroHUDMiningBlue() { return config.getDouble("HUD.Retro.Colors.Mining.BLUE", 0.75); }
+    public double getRetroHUDRepairRed() { return config.getDouble("HUD.Retro.Colors.Repair.RED", 0.3); }
+    public double getRetroHUDRepairGreen() { return config.getDouble("HUD.Retro.Colors.Repair.GREEN", 0.3); }
+    public double getRetroHUDRepairBlue() { return config.getDouble("HUD.Retro.Colors.Repair.BLUE", 0.75); }
+    public double getRetroHUDSwordsRed() { return config.getDouble("HUD.Retro.Colors.Swords.RED", 0.3); }
+    public double getRetroHUDSwordsGreen() { return config.getDouble("HUD.Retro.Colors.Swords.GREEN", 0.3); }
+    public double getRetroHUDSwordsBlue() { return config.getDouble("HUD.Retro.Colors.Swords.BLUE", 0.75); }
+    public double getRetroHUDTamingRed() { return config.getDouble("HUD.Retro.Colors.Taming.RED", 0.3); }
+    public double getRetroHUDTamingGreen() { return config.getDouble("HUD.Retro.Colors.Taming.GREEN", 0.3); }
+    public double getRetroHUDTamingBlue() { return config.getDouble("HUD.Retro.Colors.Taming.BLUE", 0.75); }
+    public double getRetroHUDUnarmedRed() { return config.getDouble("HUD.Retro.Colors.Unarmed.RED", 0.3); }
+    public double getRetroHUDUnarmedGreen() { return config.getDouble("HUD.Retro.Colors.Unarmed.GREEN", 0.3); }
+    public double getRetroHUDUnarmedBlue() { return config.getDouble("HUD.Retro.Colors.Unarmed.BLUE", 0.75); }
+    public double getRetroHUDWoodcuttingRed() { return config.getDouble("HUD.Retro.Colors.Woodcutting.RED", 0.3); }
+    public double getRetroHUDWoodcuttingGreen() { return config.getDouble("HUD.Retro.Colors.Woodcutting.GREEN", 0.3); }
+    public double getRetroHUDWoodcuttingBlue() { return config.getDouble("HUD.Retro.Colors.Woodcutting.BLUE", 0.75); }
+    public double getRetroHUDFishingRed() { return config.getDouble("HUD.Retro.Colors.Fishing.RED", 0.3); }
+    public double getRetroHUDFishingGreen() { return config.getDouble("HUD.Retro.Colors.Fishing.GREEN", 0.3); }
+    public double getRetroHUDFishingBlue() { return config.getDouble("HUD.Retro.Colors.Fishing.BLUE", 0.75); }
+
+    @Override
+    protected void loadKeys() {
+        plugin.getLogger().info("Loading mcMMO spout.yml File...");
+
+        // Setup default HUD
+        String temp = config.getString("Spout.HUD.Default", "STANDARD");
+
+        for (HUDType x : HUDType.values()) {
+            if (x.toString().equalsIgnoreCase(temp.toString())) {
+                defaulthud = x;
+            }
+        }
+
+        if (defaulthud == null) {
+            defaulthud = HUDType.STANDARD;
+        }
+    }
+}

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

@@ -0,0 +1,282 @@
+package com.gmail.nossr50.config;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+
+import org.bukkit.Material;
+import org.bukkit.configuration.ConfigurationSection;
+import org.bukkit.inventory.ItemStack;
+
+import com.gmail.nossr50.mcMMO;
+import com.gmail.nossr50.datatypes.treasure.ExcavationTreasure;
+import com.gmail.nossr50.datatypes.treasure.FishingTreasure;
+import com.gmail.nossr50.datatypes.treasure.Treasure;
+
+public class TreasuresConfig extends ConfigLoader{
+    private static TreasuresConfig instance;
+
+    public static TreasuresConfig getInstance() {
+        if (instance == null) {
+            instance = new TreasuresConfig(mcMMO.p);
+            instance.load();
+        }
+
+        return instance;
+    }
+
+    public List<ExcavationTreasure> excavationFromDirt = new ArrayList<ExcavationTreasure>();
+    public List<ExcavationTreasure> excavationFromGrass = new ArrayList<ExcavationTreasure>();
+    public List<ExcavationTreasure> excavationFromSand = new ArrayList<ExcavationTreasure>();
+    public List<ExcavationTreasure> excavationFromGravel = new ArrayList<ExcavationTreasure>();
+    public List<ExcavationTreasure> excavationFromClay = new ArrayList<ExcavationTreasure>();
+    public List<ExcavationTreasure> excavationFromMycel = new ArrayList<ExcavationTreasure>();
+    public List<ExcavationTreasure> excavationFromSoulSand = new ArrayList<ExcavationTreasure>();
+    public List<FishingTreasure> fishingRewardsTier1 = new ArrayList<FishingTreasure>();
+    public List<FishingTreasure> fishingRewardsTier2 = new ArrayList<FishingTreasure>();
+    public List<FishingTreasure> fishingRewardsTier3 = new ArrayList<FishingTreasure>();
+    public List<FishingTreasure> fishingRewardsTier4 = new ArrayList<FishingTreasure>();
+    public List<FishingTreasure> fishingRewardsTier5 = new ArrayList<FishingTreasure>();
+
+    private TreasuresConfig(mcMMO plugin) {
+        super(plugin, "treasures.yml");
+        saveIfNotExist();
+    }
+
+    @Override
+    protected void loadKeys() {
+        plugin.getLogger().info("Loading mcMMO treasures.yml File...");
+
+        Map<String, Treasure> treasures = new HashMap<String, Treasure>();
+        ConfigurationSection treasureSection = config.getConfigurationSection("Treasures");
+        Set<String> treasureConfigSet = treasureSection.getKeys(false);
+        Iterator<String> iterator = treasureConfigSet.iterator();
+
+        while (iterator.hasNext()) {
+            String treasureName = iterator.next();
+
+            // Validate all the things!
+            List<String> reason = new ArrayList<String>();
+
+            /*
+             * ID, Amount, and Data
+             */
+
+            if (!config.contains("Treasures." + treasureName + ".ID")) {
+                reason.add("Missing ID");
+            }
+
+            if (!config.contains("Treasures." + treasureName + ".Amount")) {
+                reason.add("Missing Amount");
+            }
+
+            if (!config.contains("Treasures." + treasureName + ".Data")) {
+                reason.add("Missing Data");
+            }
+
+            int id = config.getInt("Treasures." + treasureName + ".ID");
+            int amount = config.getInt("Treasures." + treasureName + ".Amount");
+            int data = config.getInt("Treasures." + treasureName + ".Data");
+
+            if (Material.getMaterial(id) == null) {
+                reason.add("Invalid id: " + id);
+            }
+
+            if (amount < 1) {
+                reason.add("Invalid amount: " + amount);
+            }
+
+            if (data > 127 || data < -128) {
+                reason.add("Invalid data: " + data);
+            }
+
+            /*
+             * XP, Drop Chance, and Drop Level
+             */
+
+            if (!config.contains("Treasures." + treasureName + ".XP")) {
+                reason.add("Missing XP");
+            }
+
+            if (!config.contains("Treasures." + treasureName + ".Drop_Chance")) {
+                reason.add("Missing Drop_Chance");
+            }
+
+            if (!config.contains("Treasures." + treasureName + ".Drop_Level")) {
+                reason.add("Missing Drop_Level");
+            }
+
+            int xp = config.getInt("Treasures." + treasureName + ".XP");
+            Double dropChance = config.getDouble("Treasures." + treasureName + ".Drop_Chance");
+            int dropLevel = config.getInt("Treasures." + treasureName + ".Drop_Level");
+
+            if (xp < 0) {
+                reason.add("Invalid xp: " + xp);
+            }
+
+            if (dropChance < 0) {
+                reason.add("Invalid Drop_Chance: " + dropChance);
+            }
+
+            if (dropLevel < 0) {
+                reason.add("Invalid Drop_Level: " + dropLevel);
+            }
+
+            /*
+             * Drops From & Max Level
+             */
+
+            ItemStack item = new ItemStack(id, amount, (short) 0, (byte) data);
+
+            if (config.getBoolean("Treasures." + treasureName + ".Drops_From.Fishing", false)) {
+                if (config.getConfigurationSection("Treasures." + treasureName + ".Drops_From").getKeys(false).size() != 1) {
+                    reason.add("Fishing drops cannot also be excavation drops");
+                }
+
+                if (!config.contains("Treasures." + treasureName + ".Max_Level")) {
+                    reason.add("Missing Max_Level");
+                }
+
+                int maxLevel = config.getInt("Treasures." + treasureName + ".Max_Level");
+
+                if (maxLevel < 0) {
+                    reason.add("Invalid Max_Level: " + maxLevel);
+                }
+
+                if (noErrorsInTreasure(reason)) {
+                    FishingTreasure fTreasure = new FishingTreasure(item, xp, dropChance, dropLevel, maxLevel);
+                    treasures.put(treasureName, fTreasure);
+                }
+            }
+            else {
+                ExcavationTreasure eTreasure = new ExcavationTreasure(item, xp, dropChance, dropLevel);
+
+                if (config.getBoolean("Treasures." + treasureName + ".Drops_From.Dirt", false)) {
+                    eTreasure.setDropsFromDirt();
+                }
+
+                if (config.getBoolean("Treasures." + treasureName + ".Drops_From.Grass", false)) {
+                    eTreasure.setDropsFromGrass();
+                }
+
+                if (config.getBoolean("Treasures." + treasureName + ".Drops_From.Sand", false)) {
+                    eTreasure.setDropsFromSand();
+                }
+
+                if (config.getBoolean("Treasures." + treasureName + ".Drops_From.Gravel", false)) {
+                    eTreasure.setDropsFromGravel();
+                }
+
+                if (config.getBoolean("Treasures." + treasureName + ".Drops_From.Clay", false)) {
+                    eTreasure.setDropsFromClay();
+                }
+
+                if (config.getBoolean("Treasures." + treasureName + ".Drops_From.Mycelium", false)) {
+                    eTreasure.setDropsFromMycel();
+                }
+
+                if (config.getBoolean("Treasures." + treasureName + ".Drops_From.Soul_Sand", false)) {
+                    eTreasure.setDropsFromSoulSand();
+                }
+
+                if (config.getBoolean("Treasures." + treasureName + ".Drops_From.Fishing", false)) {
+                    reason.add("Excavation drops cannot also be fishing drops");
+                }
+
+                if (noErrorsInTreasure(reason)) {
+                    treasures.put(treasureName, eTreasure);
+                }
+            }
+        }
+
+        List<String> excavationTreasures = config.getStringList("Excavation.Treasure");
+        List<String> fishingTreasures = config.getStringList("Fishing.Treasure");
+        Iterator<String> treasureIterator = treasures.keySet().iterator();
+
+        while (treasureIterator.hasNext()) {
+            String treasureKey = treasureIterator.next();
+            Treasure treasure = treasures.get(treasureKey);
+
+            if (treasure instanceof FishingTreasure) {
+                if (!fishingTreasures.contains(treasureKey)) {
+                    continue;
+                }
+
+                FishingTreasure fTreasure = (FishingTreasure) treasure;
+                int dropLevel = fTreasure.getDropLevel();
+                int maxLevel = fTreasure.getMaxLevel();
+
+                if(dropLevel <= Config.getInstance().getFishingTierLevelsTier1() && maxLevel >= Config.getInstance().getFishingTierLevelsTier1()) {
+                    fishingRewardsTier1.add(fTreasure);
+                }
+
+                if(dropLevel <= Config.getInstance().getFishingTierLevelsTier2() && maxLevel >= Config.getInstance().getFishingTierLevelsTier2()) {
+                    fishingRewardsTier2.add(fTreasure);
+                }
+
+                if (dropLevel <= Config.getInstance().getFishingTierLevelsTier3() && maxLevel >= Config.getInstance().getFishingTierLevelsTier3()) {
+                    fishingRewardsTier3.add(fTreasure);
+                }
+
+                if (dropLevel <= Config.getInstance().getFishingTierLevelsTier4() && maxLevel >= Config.getInstance().getFishingTierLevelsTier4()) {
+                    fishingRewardsTier4.add(fTreasure);
+                }
+
+                if (dropLevel <= Config.getInstance().getFishingTierLevelsTier5() && maxLevel >= Config.getInstance().getFishingTierLevelsTier5()) {
+                    fishingRewardsTier5.add(fTreasure);
+                }
+
+            }
+            else if (treasure instanceof ExcavationTreasure) {
+                if (!excavationTreasures.contains(treasureKey)) {
+                    continue;
+                }
+
+                ExcavationTreasure eTreasure = (ExcavationTreasure) treasure;
+
+                if (eTreasure.getDropsFromDirt()) {
+                    excavationFromDirt.add(eTreasure);
+                }
+
+                if (eTreasure.getDropsFromGrass()) {
+                    excavationFromGrass.add(eTreasure);
+                }
+
+                if (eTreasure.getDropsFromSand()) {
+                    excavationFromSand.add(eTreasure);
+                }
+
+                if (eTreasure.getDropsFromGravel()) {
+                    excavationFromGravel.add(eTreasure);
+                }
+
+                if (eTreasure.getDropsFromClay()) {
+                    excavationFromClay.add(eTreasure);
+                }
+
+                if (eTreasure.getDropsFromMycel()) {
+                    excavationFromMycel.add(eTreasure);
+                }
+
+                if (eTreasure.getDropsFromSoulSand()) {
+                    excavationFromSoulSand.add(eTreasure);
+                }
+            }
+        }
+    }
+
+    private boolean noErrorsInTreasure(List<String> issues) {
+        if (issues.isEmpty()) {
+            return true;
+        }
+        else {
+            for (String issue : issues) {
+                plugin.getLogger().warning(issue);
+            }
+            return false;
+        }
+    }
+}

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

@@ -0,0 +1,97 @@
+package com.gmail.nossr50.config.mods;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Set;
+
+import org.bukkit.configuration.ConfigurationSection;
+
+import com.gmail.nossr50.mcMMO;
+import com.gmail.nossr50.datatypes.mods.CustomItem;
+import com.gmail.nossr50.skills.repair.Repairable;
+import com.gmail.nossr50.skills.repair.RepairableFactory;
+
+public class CustomArmorConfig extends ModConfigLoader{
+    private static CustomArmorConfig instance;
+
+    public static CustomArmorConfig getInstance() {
+        if (instance == null) {
+            instance = new CustomArmorConfig(mcMMO.p);
+        }
+
+        return instance;
+    }
+
+    private List<Repairable> repairables;
+
+    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(mcMMO plugin) {
+        super(plugin, "armor.yml");
+    }
+
+    @Override
+    protected void loadKeys() {
+        plugin.getLogger().info("Loading mcMMO armor.yml File...");
+        repairables = new ArrayList<Repairable>();
+
+        loadArmor("Boots", customBootIDs);
+        loadArmor("Chestplates", customChestplateIDs);
+        loadArmor("Helmets", customHelmetIDs);
+        loadArmor("Leggings", customLeggingIDs);
+    }
+
+    private void loadArmor(String armorType, List<Integer> idList) {
+        ConfigurationSection armorSection = config.getConfigurationSection(armorType);
+        Set<String> armorConfigSet = armorSection.getKeys(false);
+        Iterator<String> iterator = armorConfigSet.iterator();
+
+        while (iterator.hasNext()) {
+            String armorName = iterator.next();
+
+            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 (id == 0) {
+                plugin.getLogger().warning("Missing ID. This item will be skipped.");
+                continue;
+            }
+
+            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) {
+                repairables.add(RepairableFactory.getRepairable(id, repairID, repairData, repairQuantity, durability));
+            }
+
+            armor = new CustomItem(id, durability);
+
+            idList.add(id);
+            customIDs.add(id);
+            customArmorList.add(armor);
+            customArmor.put(id, armor);
+        }
+    }
+
+    public List<Repairable> getLoadedRepairables() {
+        if(repairables == null) return new ArrayList<Repairable>();
+        return repairables;
+    }
+}

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

@@ -0,0 +1,110 @@
+package com.gmail.nossr50.config.mods;
+
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Set;
+
+import org.bukkit.configuration.ConfigurationSection;
+import org.bukkit.inventory.ItemStack;
+
+import com.gmail.nossr50.mcMMO;
+import com.gmail.nossr50.datatypes.mods.CustomBlock;
+
+public class CustomBlocksConfig extends ModConfigLoader{
+    private static CustomBlocksConfig instance;
+
+    public static CustomBlocksConfig getInstance() {
+        if (instance == null) {
+            instance = new CustomBlocksConfig(mcMMO.p);
+        }
+
+        return instance;
+    }
+
+    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> customItems = new ArrayList<ItemStack>();
+    public List<CustomBlock> customBlocks = new ArrayList<CustomBlock>();
+
+    public CustomBlocksConfig(mcMMO plugin) {
+        super(plugin, "blocks.yml");
+    }
+
+    @Override
+    protected void loadKeys() {
+        plugin.getLogger().info("Loading mcMMO blocks.yml File...");
+
+        loadBlocks("Excavation", customExcavationBlocks);
+        loadBlocks("Herbalism", customHerbalismBlocks);
+        loadBlocks("Mining", customMiningBlocks);
+        loadBlocks("Woodcutting", customWoodcuttingBlocks);
+    }
+
+    private void loadBlocks(String skillType, List<ItemStack> blockList) {
+        ConfigurationSection skillSection = config.getConfigurationSection(skillType);
+        Set<String> skillConfigSet = skillSection.getKeys(false);
+        Iterator<String> iterator = skillConfigSet.iterator();
+
+        while (iterator.hasNext()) {
+            String blockName = iterator.next();
+
+            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 dropAmount = config.getInt(skillType + "." + blockName + ".Drop_Item_Amount", 1);
+
+            if (id == 0) {
+                plugin.getLogger().warning("Missing ID. This block will be skipped.");
+                continue;
+            }
+
+            if (dropItem && dropID == 0) {
+                plugin.getLogger().warning("Incomplete item drop information. This block will drop itself.");
+                dropItem = false;
+            }
+
+            CustomBlock block;
+            ItemStack itemDrop;
+            ItemStack blockItem;
+
+            if (dropItem) {
+                itemDrop = new ItemStack(dropID, dropAmount, (short) 0, dropData);
+            }
+            else {
+                itemDrop = new ItemStack(id, dropAmount, (short) 0, data);
+            }
+
+            block = new CustomBlock(itemDrop, tier, xp, data, id);
+            blockItem = new ItemStack(id, 1, (short) 0, data);
+
+            if (skillType.equals("Mining") && config.getBoolean(skillType + "." + blockName + ".Is_Ore")) {
+                customOres.add(blockItem);
+            }
+            else if (skillType.equals("Woodcutting")) {
+                if (config.getBoolean(skillType + "." + blockName + ".Is_Log")) {
+                    customLogs.add(blockItem);
+                }
+                else {
+                    customLeaves.add(blockItem);
+                    block.setXpGain(0); //Leaves don't grant XP
+                }
+            }
+
+            blockList.add(blockItem);
+            customItems.add(blockItem);
+            customBlocks.add(block);
+        }
+    }
+}

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

@@ -0,0 +1,104 @@
+package com.gmail.nossr50.config.mods;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Set;
+
+import org.bukkit.configuration.ConfigurationSection;
+
+import com.gmail.nossr50.mcMMO;
+import com.gmail.nossr50.datatypes.mods.CustomTool;
+import com.gmail.nossr50.skills.repair.Repairable;
+import com.gmail.nossr50.skills.repair.RepairableFactory;
+
+public class CustomToolsConfig extends ModConfigLoader {
+    private static CustomToolsConfig instance;
+
+    public static CustomToolsConfig getInstance() {
+        if (instance == null) {
+            instance = new CustomToolsConfig(mcMMO.p);
+        }
+
+        return instance;
+    }
+
+    private List<Repairable> repairables;
+
+    public List<Integer> customAxeIDs = new ArrayList<Integer>();
+    public List<Integer> customBowIDs = new ArrayList<Integer>();
+    public List<Integer> customHoeIDs = new ArrayList<Integer>();
+    public List<Integer> customPickaxeIDs = new ArrayList<Integer>();
+    public List<Integer> customShovelIDs = new ArrayList<Integer>();
+    public List<Integer> customSwordIDs = new ArrayList<Integer>();
+
+    public List<Integer> customIDs = new ArrayList<Integer>();
+    public List<CustomTool> customToolList = new ArrayList<CustomTool>();
+    public HashMap<Integer, CustomTool> customTools = new HashMap<Integer, CustomTool>();
+
+    private CustomToolsConfig(mcMMO plugin) {
+        super(plugin, "tools.yml");
+    }
+
+    @Override
+    protected void loadKeys() {
+        plugin.getLogger().info("Loading mcMMO tools.yml File...");
+        repairables = new ArrayList<Repairable>();
+
+        loadTool("Axes", customAxeIDs);
+        loadTool("Bows", customBowIDs);
+        loadTool("Hoes", customHoeIDs);
+        loadTool("Pickaxes", customPickaxeIDs);
+        loadTool("Shovels", customShovelIDs);
+        loadTool("Swords", customSwordIDs);
+    }
+
+    private void loadTool(String toolType, List<Integer> idList) {
+        ConfigurationSection toolSection = config.getConfigurationSection(toolType);
+        Set<String> toolConfigSet = toolSection.getKeys(false);
+        Iterator<String> iterator = toolConfigSet.iterator();
+
+        while (iterator.hasNext()) {
+            String toolName = iterator.next();
+
+            int id = config.getInt(toolType + "." + toolName + ".ID", 0);
+            double multiplier = config.getDouble(toolType + "." + toolName + ".XP_Modifier", 1.0);
+            boolean abilityEnabled = config.getBoolean(toolType + "." + toolName + ".Ability_Enabled", true);
+            int tier = config.getInt(toolType + "." + toolName + ".Tier", 1);
+            boolean repairable = config.getBoolean(toolType + "." + toolName + ".Repairable");
+            int repairID = config.getInt(toolType + "." + toolName + ".Repair_Material_ID", 0);
+            byte repairData = (byte) config.getInt(toolType + "." + toolName + ".Repair_Material_Data_Value", 0);
+            int repairQuantity = config.getInt(toolType + "." + toolName + ".Repair_Material_Quantity", 0);
+            short durability = (short) config.getInt(toolType + "." + toolName + ".Durability", 0);
+
+            if (id == 0) {
+                plugin.getLogger().warning("Missing ID. This item will be skipped.");
+                continue;
+            }
+
+            if (repairable && (repairID == 0 || repairQuantity == 0 || durability == 0)) {
+                plugin.getLogger().warning("Incomplete repair information. This item will be unrepairable.");
+                repairable = false;
+            }
+
+            CustomTool tool;
+
+            if (repairable) {
+                repairables.add(RepairableFactory.getRepairable(id, repairID, repairData, repairQuantity, durability));
+            }
+
+            tool = new CustomTool(tier, abilityEnabled, multiplier, durability, id);
+
+            idList.add(id);
+            customIDs.add(id);
+            customToolList.add(tool);
+            customTools.put(id, tool);
+        }
+    }
+
+    public List<Repairable> getLoadedRepairables() {
+        if(repairables == null) return new ArrayList<Repairable>();
+        return repairables;
+    }
+}

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

@@ -0,0 +1,13 @@
+package com.gmail.nossr50.config.mods;
+
+import java.io.File;
+
+import com.gmail.nossr50.mcMMO;
+import com.gmail.nossr50.config.ConfigLoader;
+
+public abstract class ModConfigLoader extends ConfigLoader{
+
+    public ModConfigLoader(mcMMO plugin, String fileName) {
+        super(plugin, "ModConfigs" + File.separator + fileName);
+    }
+}

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

@@ -1,11 +1,212 @@
-package com.gmail.nossr50.datatypes;
-
-public enum AbilityType {
-BERSERK,
-SUPER_BREAKER,
-GIGA_DRILL_BREAKER,
-GREEN_TERRA,
-SKULL_SPLIITER,
-TREE_FELLER,
-SERRATED_STRIKES;
-}
+package com.gmail.nossr50.datatypes;
+
+import org.bukkit.Material;
+import org.bukkit.block.Block;
+import org.bukkit.entity.Player;
+
+import com.gmail.nossr50.config.Config;
+import com.gmail.nossr50.locale.LocaleLoader;
+import com.gmail.nossr50.util.BlockChecks;
+import com.gmail.nossr50.util.Permissions;
+
+public enum AbilityType {
+    BERSERK(
+            Config.getInstance().getAbilityCooldownBerserk(),
+            Config.getInstance().getAbilityMaxTicksBerserk(),
+            "Unarmed.Skills.Berserk.On",
+            "Unarmed.Skills.Berserk.Off",
+            "Unarmed.Skills.Berserk.Other.On",
+            "Unarmed.Skills.Berserk.Refresh",
+            "Unarmed.Skills.Berserk.Other.Off"),
+
+    SUPER_BREAKER(
+            Config.getInstance().getAbilityCooldownSuperBreaker(),
+            Config.getInstance().getAbilityMaxTicksSuperBreaker(),
+            "Mining.Skills.SuperBreaker.On",
+            "Mining.Skills.SuperBreaker.Off",
+            "Mining.Skills.SuperBreaker.Other.On",
+            "Mining.Skills.SuperBreaker.Refresh",
+            "Mining.Skills.SuperBreaker.Other.Off"),
+
+    GIGA_DRILL_BREAKER(
+            Config.getInstance().getAbilityCooldownGigaDrillBreaker(),
+            Config.getInstance().getAbilityMaxTicksGigaDrillBreaker(),
+            "Excavation.Skills.GigaDrillBreaker.On",
+            "Excavation.Skills.GigaDrillBreaker.Off",
+            "Excavation.Skills.GigaDrillBreaker.Other.On",
+            "Excavation.Skills.GigaDrillBreaker.Refresh",
+            "Excavation.Skills.GigaDrillBreaker.Other.Off"),
+
+    GREEN_TERRA(
+            Config.getInstance().getAbilityCooldownGreenTerra(),
+            Config.getInstance().getAbilityMaxTicksGreenTerra(),
+            "Herbalism.Skills.GTe.On",
+            "Herbalism.Skills.GTe.Off",
+            "Herbalism.Skills.GTe.Other.On",
+            "Herbalism.Skills.GTe.Refresh",
+            "Herbalism.Skills.GTe.Other.Off"),
+
+    SKULL_SPLIITER(
+            Config.getInstance().getAbilityCooldownSkullSplitter(),
+            Config.getInstance().getAbilityMaxTicksSkullSplitter(),
+            "Axes.Skills.SS.On",
+            "Axes.Skills.SS.Off",
+            "Axes.Skills.SS.Other.On",
+            "Axes.Skills.SS.Refresh",
+            "Axes.Skills.SS.Other.Off"),
+
+    TREE_FELLER(
+            Config.getInstance().getAbilityCooldownTreeFeller(),
+            Config.getInstance().getAbilityMaxTicksTreeFeller(),
+            "Woodcutting.Skills.TreeFeller.On",
+            "Woodcutting.Skills.TreeFeller.Off",
+            "Woodcutting.Skills.TreeFeller.Other.On",
+            "Woodcutting.Skills.TreeFeller.Refresh",
+            "Woodcutting.Skills.TreeFeller.Other.Off"),
+
+    SERRATED_STRIKES(
+            Config.getInstance().getAbilityCooldownSerratedStrikes(),
+            Config.getInstance().getAbilityMaxTicksSerratedStrikes(),
+            "Swords.Skills.SS.On",
+            "Swords.Skills.SS.Off",
+            "Swords.Skills.SS.Other.On",
+            "Swords.Skills.SS.Refresh",
+            "Swords.Skills.SS.Other.Off"),
+
+    BLAST_MINING(
+            Config.getInstance().getAbilityCooldownBlastMining(),
+            Config.getInstance().getAbilityMaxTicksBlastMining(),
+            null,
+            null,
+            "Mining.Blast.Other.On",
+            "Mining.Blast.Refresh",
+            null),
+
+    LEAF_BLOWER(
+            0,
+            0,
+            null,
+            null,
+            null,
+            null,
+            null);
+
+    private int cooldown;
+    private int maxTicks;
+    private String abilityOn;
+    private String abilityOff;
+    private String abilityPlayer;
+    private String abilityRefresh;
+    private String abilityPlayerOff;
+
+    private AbilityType(int cooldown, int maxTicks, String abilityOn, String abilityOff, String abilityPlayer, String abilityRefresh, String abilityPlayerOff) {
+        this.cooldown = cooldown;
+        this.maxTicks = maxTicks;
+        this.abilityOn = abilityOn;
+        this.abilityOff = abilityOff;
+        this.abilityPlayer = abilityPlayer;
+        this.abilityRefresh = abilityRefresh;
+        this.abilityPlayerOff = abilityPlayerOff;
+    }
+
+    public int getCooldown() {
+        return this.cooldown;
+    }
+
+    public String getAbilityOn() {
+        return LocaleLoader.getString(this.abilityOn);
+    }
+
+    public String getAbilityOff() {
+        return LocaleLoader.getString(this.abilityOff);
+    }
+
+    public String getAbilityPlayer(Player player) {
+        return LocaleLoader.getString(this.abilityPlayer, new Object[] {player.getName()});
+    }
+
+    public String getAbilityPlayerOff(Player player) {
+        return LocaleLoader.getString(this.abilityPlayerOff, new Object[] {player.getName()});
+    }
+
+    public String getAbilityRefresh() {
+        return LocaleLoader.getString(this.abilityRefresh);
+    }
+
+    public int getMaxTicks() {
+        return this.maxTicks;
+    }
+
+    /**
+     * Get the permissions for this ability.
+     *
+     * @param player Player to check permissions for
+     * @return true if the player has permissions, false otherwise
+     */
+    public boolean getPermissions(Player player) {
+        Permissions permInstance = Permissions.getInstance();
+
+        switch (this) {
+        case BERSERK:
+            return permInstance.berserk(player);
+
+        case BLAST_MINING:
+            return permInstance.blastMining(player);
+
+        case GIGA_DRILL_BREAKER:
+            return permInstance.gigaDrillBreaker(player);
+
+        case GREEN_TERRA:
+            return permInstance.greenTerra(player);
+
+        case LEAF_BLOWER:
+            return permInstance.leafBlower(player);
+
+        case SERRATED_STRIKES:
+            return permInstance.serratedStrikes(player);
+
+        case SKULL_SPLIITER:
+            return permInstance.skullSplitter(player);
+
+        case SUPER_BREAKER:
+            return permInstance.superBreaker(player);
+
+        case TREE_FELLER:
+            return permInstance.treeFeller(player);
+
+        default:
+            return false;
+        }
+    }
+
+    /**
+     * Check if a block is affected by this ability.
+     *
+     * @param Block the block to check
+     * @return true if the block is affected by this ability, false otherwise
+     */
+    public boolean blockCheck(Block block) {
+        switch (this) {
+        case BERSERK:
+            return (BlockChecks.canBeGigaDrillBroken(block) || block.getType() == Material.SNOW);
+
+        case GIGA_DRILL_BREAKER:
+            return BlockChecks.canBeGigaDrillBroken(block);
+
+        case GREEN_TERRA:
+            return BlockChecks.makeMossy(block);
+
+        case LEAF_BLOWER:
+            return block.getType() == Material.LEAVES;
+
+        case SUPER_BREAKER:
+            return BlockChecks.canBeSuperBroken(block);
+
+        case TREE_FELLER:
+            return block.getType() == Material.LOG;
+
+        default:
+            return false;
+        }
+    }
+}

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

@@ -0,0 +1,6 @@
+package com.gmail.nossr50.datatypes;
+
+public enum DatabaseUpdate {
+    FISHING,
+    BLAST_MINING;
+}

src/main/java/com/gmail/nossr50/datatypes/FakeBlockBreakEvent.java

@@ -1,29 +0,0 @@
-/*
-	This file is part of mcMMO.
-
-    mcMMO is free software: you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    mcMMO is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with mcMMO.  If not, see <http://www.gnu.org/licenses/>.
-*/
-package com.gmail.nossr50.datatypes;
-
-import org.bukkit.block.Block;
-import org.bukkit.entity.Player;
-import org.bukkit.event.block.BlockBreakEvent;
-
-public class FakeBlockBreakEvent extends BlockBreakEvent {
-	private static final long serialVersionUID = 1L;
-
-	public FakeBlockBreakEvent(Block theBlock, Player player) {
-		super(theBlock, player);
-	}
-}

src/main/java/com/gmail/nossr50/datatypes/HUDType.java

@@ -1,25 +1,8 @@
-/*
-	This file is part of mcMMO.
-
-    mcMMO is free software: you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    mcMMO is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with mcMMO.  If not, see <http://www.gnu.org/licenses/>.
-*/
 package com.gmail.nossr50.datatypes;
 
-public enum HUDType 
-{
-	DISABLED,
-	STANDARD,
-	SMALL,
-	RETRO;
+public enum HUDType {
+    DISABLED,
+    STANDARD,
+    SMALL,
+    RETRO;
 }

src/main/java/com/gmail/nossr50/datatypes/HUDmmo.java

@@ -1,22 +1,5 @@
-/*
-	This file is part of mcMMO.
-
-    mcMMO is free software: you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    mcMMO is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with mcMMO.  If not, see <http://www.gnu.org/licenses/>.
-*/
 package com.gmail.nossr50.datatypes;
 
-import org.bukkit.Bukkit;
 import org.bukkit.entity.Player;
 import org.getspout.spoutapi.SpoutManager;
 import org.getspout.spoutapi.gui.Color;
@@ -26,262 +9,409 @@ import org.getspout.spoutapi.gui.RenderPriority;
 import org.getspout.spoutapi.gui.Widget;
 import org.getspout.spoutapi.player.SpoutPlayer;
 
-import com.gmail.nossr50.Users;
-import com.gmail.nossr50.m;
 import com.gmail.nossr50.mcMMO;
-import com.gmail.nossr50.config.LoadProperties;
+import com.gmail.nossr50.config.SpoutConfig;
 import com.gmail.nossr50.spout.SpoutStuff;
+import com.gmail.nossr50.util.Misc;
+import com.gmail.nossr50.util.Users;
 
-public class HUDmmo 
-{
-	int center_x = 427/2;
-	int center_y = 240/2;
-	
-	String playerName = null;
-	Widget xpbar = null;
-	GenericGradient xpfill = null;
-	GenericGradient xpbg = null;
-	GenericGradient xpicon_bg = null;
-	GenericGradient xpicon_border = null;
-	GenericTexture xpicon = null;
-	mcMMO plugin = (mcMMO) Bukkit.getServer().getPluginManager().getPlugin("mcMMO");
-	
-	public HUDmmo(Player player)
-	{
-		playerName = player.getName();
-		initializeHUD(player);
-	}
-	
-	public void initializeHUD(Player player)
-	{
-		//PlayerProfile PP = Users.getProfile(player);
-		HUDType type = Users.getProfile(player).getHUDType();
-		
-		//if(LoadProperties.partybar && PP.getPartyHUD())
-			//mmoHelper.initialize(SpoutManager.getPlayer(player), plugin); //PARTY HUD
-		
-		switch(type)
-		{
-			case RETRO:
-			{
-				initializeXpBarDisplayRetro(SpoutManager.getPlayer(player));
-				break;
-			}
-			case STANDARD:
-			{
-				initializeXpBarDisplayStandard(SpoutManager.getPlayer(player));
-				break;
-			}
-			case SMALL:
-			{
-				initializeXpBarDisplaySmall(SpoutManager.getPlayer(player));
-				break;
-			}
-			case DISABLED:
-			{
-				//Do nothing.. :)
-			}
-		}
-	}
-	
-	public void updateXpBarDisplay(HUDType type, Player player)
-	{
-		switch(type)
-		{
-		case RETRO:
-		{
-			updateXpBarRetro(player, Users.getProfile(player));
-			break;
-		}
-		case STANDARD:
-		{
-			updateXpBarStandard(player, Users.getProfile(player));
-			break;
-		}
-		case SMALL:
-		{
-			updateXpBarStandard(player, Users.getProfile(player));
-			break;
-		}
-		case DISABLED:
-		{
-			//Do nothing.. :)
-		}
-		}
-	}
-	
-	public void resetHUD()
-	{
-		SpoutPlayer sPlayer = SpoutStuff.getSpoutPlayer(playerName);
-		//PlayerProfile PP = Users.getProfile(sPlayer);
-		if(sPlayer != null)
-		{
-			sPlayer.getMainScreen().removeWidgets(plugin);
-			
-			//Reset the objects
-			xpbar = null;
-			xpfill = null;
-			xpbg = null;
-			xpicon = null;
-			
-			//if(LoadProperties.partybar && PP.getPartyHUD())
-				//mmoHelper.initialize(sPlayer, plugin);
-			
-			sPlayer.getMainScreen().setDirty(true);
-		}
-	}
-	
-	private void initializeXpBarDisplayRetro(SpoutPlayer sPlayer)
-	{
-		Color border = new Color((float)LoadProperties.xpborder_r, (float)LoadProperties.xpborder_g, (float)LoadProperties.xpborder_b, 1f);
-		Color green = new Color(0, 1f, 0, 1f);
-		Color background = new Color((float)LoadProperties.xpbackground_r, (float)LoadProperties.xpbackground_g, (float)LoadProperties.xpbackground_b, 1f);
-		Color darkbg = new Color(0.2f, 0.2f, 0.2f, 1f);
-		
-		xpicon = new GenericTexture();
-		xpbar = new GenericGradient();
-		xpfill = new GenericGradient();
-		xpbg = new GenericGradient();
-		
-		xpicon_bg = new GenericGradient();
-		xpicon_border = new GenericGradient();
-		
-		xpicon_bg.setBottomColor(darkbg).setTopColor(darkbg).setWidth(4).setHeight(4).setPriority(RenderPriority.High).setX(142).setY(10).setDirty(true);
-		xpicon_border.setBottomColor(border).setTopColor(border).setWidth(6).setHeight(6).setPriority(RenderPriority.Highest).setX(141).setY(9).setDirty(true);
-		
-		xpicon.setWidth(6).setHeight(6).setX(141).setY(9).setPriority(RenderPriority.Normal).setDirty(true);
-		xpicon.setUrl("Icon_r.png");
-		
-		xpbar.setWidth(128).setHeight(4).setX(149).setY(10);
-		((GenericGradient) xpbar).setBottomColor(border).setTopColor(border).setPriority(RenderPriority.Highest).setDirty(true);
-		
-		xpfill.setWidth(0).setHeight(2).setX(150).setY(11);
-		xpfill.setBottomColor(green).setTopColor(green).setPriority(RenderPriority.Lowest).setDirty(true);
-		
-		xpbg.setWidth(126).setHeight(2).setX(150).setY(11);
-		xpbg.setBottomColor(background).setTopColor(background).setPriority(RenderPriority.Low).setDirty(true);
-		
-		if(LoadProperties.xpbar)
-		{
-			sPlayer.getMainScreen().attachWidget(plugin, (GenericGradient)xpbar);
-			sPlayer.getMainScreen().attachWidget(plugin, (GenericGradient)xpfill);
-			sPlayer.getMainScreen().attachWidget(plugin, (GenericGradient)xpbg);
-			if(LoadProperties.xpicon)
-			{
-				sPlayer.getMainScreen().attachWidget(plugin, (GenericTexture)xpicon);
-				sPlayer.getMainScreen().attachWidget(plugin, (GenericGradient)xpicon_bg);
-			}
-			sPlayer.getMainScreen().attachWidget(plugin, (GenericGradient)xpicon_border);
-		}
-		
-		sPlayer.getMainScreen().setDirty(true);
-	}
-	
-	private void initializeXpBarDisplayStandard(SpoutPlayer sPlayer)
-	{
-		//Setup xp bar
-		xpbar = new GenericTexture();
-		
-		if(LoadProperties.xpbar && LoadProperties.xpicon)
-		{
-			xpicon = new GenericTexture();
-			
-			xpicon.setUrl("Icon.png");
-			
-			xpicon.setHeight(16).setWidth(32).setX(LoadProperties.xpicon_x).setY(LoadProperties.xpicon_y);
-			
-			xpicon.setDirty(true);
-			
-			sPlayer.getMainScreen().attachWidget(plugin, xpicon);
-		}
-		
-		if(LoadProperties.xpbar)
-		{
-			((GenericTexture)xpbar).setUrl("xpbar_inc000.png");
-			xpbar.setX(LoadProperties.xpbar_x).setY(LoadProperties.xpbar_y).setHeight(8).setWidth(256);
-		
-			sPlayer.getMainScreen().attachWidget(plugin, xpbar);
-		}
-		sPlayer.getMainScreen().setDirty(true);
-	}
-	
-	private void initializeXpBarDisplaySmall(SpoutPlayer sPlayer)
-	{
-		//Setup xp bar
-		xpbar = new GenericTexture();
-		
-		if(LoadProperties.xpbar && LoadProperties.xpicon)
-		{
-			xpicon = new GenericTexture();
-			
-			xpicon.setUrl("Icon.png");
-			
-			xpicon.setHeight(8).setWidth(16).setX(center_x-(8+64)).setY(LoadProperties.xpicon_y+2);
-			
-			xpicon.setDirty(true);
-			
-			sPlayer.getMainScreen().attachWidget(plugin, xpicon);
-		}
-		
-		if(LoadProperties.xpbar)
-		{
-			((GenericTexture)xpbar).setUrl("xpbar_inc000.png");
-			xpbar.setX(center_x-64).setY(LoadProperties.xpbar_y).setHeight(4).setWidth(128);
-		
-			sPlayer.getMainScreen().attachWidget(plugin, xpbar);
-		}
-		
-		sPlayer.getMainScreen().setDirty(true);
-	}
-	
-	private void updateXpBarStandard(Player player, PlayerProfile PP)
-	{
-		if(!LoadProperties.xpbar)
-			return;
-		
-		SkillType theType = null;
-		
-		if(PP.getXpBarLocked())
-			theType=PP.getSkillLock();
-		else
-			theType=PP.getLastGained();
-		
-		if(theType == null)
-			return;
-		
-		((GenericTexture) xpicon).setUrl(m.getCapitalized(theType.toString())+".png");
-		xpicon.setDirty(true);
+public class HUDmmo {
+    private int center_x = 427 / 2;
 
-		((GenericTexture) xpbar).setUrl(SpoutStuff.getUrlBar(SpoutStuff.getXpInc(PP.getSkillXpLevel(theType), PP.getXpToLevel(theType), HUDType.STANDARD)));
-		xpbar.setDirty(true);
-		
-		SpoutManager.getPlayer(player).getMainScreen().setDirty(true);
-	}
-	
-	private void updateXpBarRetro(Player player, PlayerProfile PP)
-	{
-		if(!LoadProperties.xpbar)
-			return;
-		SkillType theType = null;
-		
-		if(PP.getXpBarLocked() && PP.getSkillLock() != null)
-			theType=PP.getSkillLock();
-		else
-			theType=PP.getLastGained();
-		
-		if(theType == null)
-			return;
-		
-		Color color = SpoutStuff.getRetroColor(theType);
-		
-		if(xpicon != null && theType != null)
-			xpicon.setUrl(m.getCapitalized(theType.toString())+"_r.png");
-		
-		if(theType != null)
-			xpfill.setBottomColor(color).setTopColor(color).setWidth(SpoutStuff.getXpInc(PP.getSkillXpLevel(theType), PP.getXpToLevel(theType), HUDType.RETRO)).setDirty(true);
-		else
-			System.out.println("theType was null!");
-		
-		SpoutManager.getPlayer(player).getMainScreen().setDirty(true);
-	}
-}
+    private String playerName;
+    private final mcMMO plugin;
+
+    private Widget xpbar = null;
+    private GenericGradient xpfill = null;
+    private GenericGradient xpbg = null;
+    private GenericGradient xpicon_bg = null;
+    private GenericGradient xpicon_border = null;
+    private GenericTexture xpicon = null;
+
+    public HUDmmo(Player player, mcMMO plugin) {
+        this.playerName = player.getName();
+        this.plugin = plugin;
+        initializeHUD(player);
+    }
+
+    /**
+     * Initialize the HUD.
+     *
+     * @param player Player whose HUD to initialize
+     */
+    public void initializeHUD(Player player) {
+        HUDType type = Users.getProfile(player).getHUDType();
+        SpoutPlayer sPlayer = SpoutManager.getPlayer(player);
+
+        switch (type) {
+            case RETRO:
+                initializeXpBarDisplayRetro(sPlayer);
+                break;
+
+            case STANDARD:
+                initializeXpBarDisplayStandard(sPlayer);
+                break;
+
+            case SMALL:
+                initializeXpBarDisplaySmall(sPlayer);
+                break;
+
+            case DISABLED:
+                break;
+
+            default:
+                break;
+        }
+    }
+
+    /**
+     * Update the XP bar.
+     *
+     * @param type Type of XP bar
+     * @param player Player whose XP bar to update
+     */
+    public void updateXpBarDisplay(HUDType type, Player player) {
+        PlayerProfile PP = Users.getProfile(player);
+
+        switch (type) {
+        case RETRO:
+            updateXpBarRetro(player, PP);
+            break;
+
+        case STANDARD:
+            updateXpBarStandard(player, PP);
+            break;
+
+        case SMALL:
+            updateXpBarStandard(player, PP);
+            break;
+
+        case DISABLED:
+            break;
+
+        default:
+            break;
+        }
+    }
+
+    /**
+     * Reset a player's HUD.
+     */
+    public void resetHUD() {
+        SpoutPlayer sPlayer = SpoutStuff.getSpoutPlayer(playerName);
+
+        if (sPlayer != null) {
+            sPlayer.getMainScreen().removeWidgets(plugin);
+
+            //Reset the objects
+            xpbar = null;
+            xpfill = null;
+            xpbg = null;
+            xpicon = null;
+
+            sPlayer.getMainScreen().setDirty(true);
+        }
+    }
+
+    /**
+     * Initialize Retro XP bar.
+     *
+     * @param sPlayer Player to initialize XP bar for
+     */
+    private void initializeXpBarDisplayRetro(SpoutPlayer sPlayer) {
+        Color border = new Color((float) SpoutConfig.getInstance().getRetroHUDXPBorderRed(), (float) SpoutConfig.getInstance().getRetroHUDXPBorderGreen(), (float) SpoutConfig.getInstance().getRetroHUDXPBorderBlue(), 1f);
+        Color green = new Color(0f, 1f, 0f, 1f);
+        Color background = new Color((float) SpoutConfig.getInstance().getRetroHUDXPBackgroundRed(), (float) SpoutConfig.getInstance().getRetroHUDXPBackgroundGreen(), (float) SpoutConfig.getInstance().getRetroHUDXPBackgroundBlue(), 1f);
+        Color darkbg = new Color(0.2f, 0.2f, 0.2f, 1f);
+
+        xpicon = new GenericTexture();
+        xpbar = new GenericGradient();
+        xpfill = new GenericGradient();
+        xpbg = new GenericGradient();
+
+        xpicon_bg = new GenericGradient();
+        xpicon_border = new GenericGradient();
+
+        xpicon_bg.setBottomColor(darkbg);
+        xpicon_bg.setTopColor(darkbg);
+        xpicon_bg.setWidth(4);
+        xpicon_bg.setHeight(4);
+        xpicon_bg.setPriority(RenderPriority.High);
+        xpicon_bg.setX(142);
+        xpicon_bg.setY(10);
+        xpicon_bg.setDirty(true);
+
+        xpicon_border.setBottomColor(border);
+        xpicon_border.setTopColor(border);
+        xpicon_border.setWidth(6);
+        xpicon_border.setHeight(6);
+        xpicon_border.setPriority(RenderPriority.Highest);
+        xpicon_border.setX(141);
+        xpicon_border.setY(9);
+        xpicon_border.setDirty(true);
+
+        xpicon.setWidth(6);
+        xpicon.setHeight(6);
+        xpicon.setX(141);
+        xpicon.setY(9);
+        xpicon.setPriority(RenderPriority.Normal);
+        xpicon.setDirty(true);
+        xpicon.setUrl("Icon_r.png");
+
+        xpbar.setWidth(128);
+        xpbar.setHeight(4);
+        xpbar.setX(149);
+        xpbar.setY(10);
+        ((GenericGradient) xpbar).setBottomColor(border);
+        ((GenericGradient) xpbar).setTopColor(border);
+        xpbar.setPriority(RenderPriority.Highest);
+        xpbar.setDirty(true);
+
+        xpfill.setWidth(0);
+        xpfill.setHeight(2);
+        xpfill.setX(150);
+        xpfill.setY(11);
+        xpfill.setBottomColor(green);
+        xpfill.setTopColor(green);
+        xpfill.setPriority(RenderPriority.Lowest);
+        xpfill.setDirty(true);
+
+        xpbg.setWidth(126);
+        xpbg.setHeight(2);
+        xpbg.setX(150);
+        xpbg.setY(11);
+        xpbg.setBottomColor(background);
+        xpbg.setTopColor(background);
+        xpbg.setPriority(RenderPriority.Low);
+        xpbg.setDirty(true);
+
+        if (SpoutConfig.getInstance().getXPBarEnabled()) {
+            sPlayer.getMainScreen().attachWidget(plugin, xpbar);
+            sPlayer.getMainScreen().attachWidget(plugin, xpfill);
+            sPlayer.getMainScreen().attachWidget(plugin, xpbg);
+
+            if (SpoutConfig.getInstance().getXPBarIconEnabled()) {
+                sPlayer.getMainScreen().attachWidget(plugin, xpicon);
+                sPlayer.getMainScreen().attachWidget(plugin, xpicon_bg);
+                sPlayer.getMainScreen().attachWidget(plugin, xpicon_border);
+            }
+        }
+
+        sPlayer.getMainScreen().setDirty(true);
+    }
+
+    /**
+     * Initialize Standard XP bar.
+     *
+     * @param sPlayer Player to initialize XP bar for
+     */
+    public void initializeXpBarDisplayStandard(SpoutPlayer sPlayer) {
+        if (SpoutConfig.getInstance().getXPBarEnabled()) {
+            xpbar = new GenericTexture();
+
+            ((GenericTexture) xpbar).setUrl("xpbar_inc000.png");
+
+            xpbar.setX(SpoutConfig.getInstance().getXPBarXPosition());
+            xpbar.setY(SpoutConfig.getInstance().getXPBarYPosition());
+            xpbar.setHeight(8);
+            xpbar.setWidth(256);
+            xpbar.setPriority(RenderPriority.Lowest);
+
+            sPlayer.getMainScreen().attachWidget(plugin, xpbar);
+
+            if (SpoutConfig.getInstance().getXPBarIconEnabled()) {
+                xpicon = new GenericTexture();
+
+                xpicon.setUrl("Icon.png");
+                xpicon.setHeight(16);
+                xpicon.setWidth(32);
+                xpicon.setX(SpoutConfig.getInstance().getXPIconXPosition());
+                xpicon.setY(SpoutConfig.getInstance().getXPIconYPosition());
+                xpicon.setPriority(RenderPriority.High);
+                xpicon.setDirty(true);
+
+                sPlayer.getMainScreen().attachWidget(plugin, xpicon);
+            }
+        }
+
+        sPlayer.getMainScreen().setDirty(true);
+    }
+
+    /**
+     * Initialize Small XP bar.
+     *
+     * @param sPlayer Player to initialize XP bar for
+     */
+    private void initializeXpBarDisplaySmall(SpoutPlayer sPlayer) {
+        if (SpoutConfig.getInstance().getXPBarEnabled()) {
+            xpbar = new GenericTexture();
+
+            ((GenericTexture)xpbar).setUrl("xpbar_inc000.png");
+            xpbar.setX(center_x - 64);
+            xpbar.setY(SpoutConfig.getInstance().getXPBarYPosition());
+            xpbar.setHeight(4);
+            xpbar.setWidth(128);
+            xpbar.setPriority(RenderPriority.Lowest);
+
+            sPlayer.getMainScreen().attachWidget(plugin, xpbar);
+
+            if (SpoutConfig.getInstance().getXPBarIconEnabled()) {
+                xpicon = new GenericTexture();
+
+                xpicon.setUrl("Icon.png");
+                xpicon.setHeight(8);
+                xpicon.setWidth(16);
+                xpicon.setX(center_x - (8 + 64));
+                xpicon.setY(SpoutConfig.getInstance().getXPIconYPosition() + 2);
+                xpicon.setPriority(RenderPriority.High);
+                xpicon.setDirty(true);
+
+                sPlayer.getMainScreen().attachWidget(plugin, xpicon);
+            }
+        }
+
+        sPlayer.getMainScreen().setDirty(true);
+    }
+
+    /**
+     * Update XP bar for Standard & Small styles.
+     *
+     * @param player Player whose XP bar to update
+     * @param PP Profile of the given player
+     */
+    private void updateXpBarStandard(Player player, PlayerProfile PP) {
+        if (!SpoutConfig.getInstance().getXPBarEnabled()) {
+            return;
+        }
+
+        SkillType theType = getType(PP);
+
+        if (theType == null) { //Can this ever actually BE null? (Yes, it's null when the player has just logged in. It's not null when they gain XP in anything)
+            return;
+        }
+
+        xpicon.setUrl(Misc.getCapitalized(theType.toString()) + ".png");
+        xpicon.setDirty(true);
+
+        ((GenericTexture) xpbar).setUrl(getUrlBar(getXpInc(PP.getSkillXpLevel(theType), PP.getXpToLevel(theType), HUDType.STANDARD)));
+        xpbar.setDirty(true);
+
+        SpoutManager.getPlayer(player).getMainScreen().setDirty(true);
+    }
+
+    /**
+     * Update XP bar for Retro styles.
+     *
+     * @param player Player whose XP bar to update
+     * @param PP Profile of the given player
+     */
+    private void updateXpBarRetro(Player player, PlayerProfile PP) {
+        if (!SpoutConfig.getInstance().getXPBarEnabled()) {
+            return;
+        }
+
+        SkillType theType = getType(PP);
+
+        if (theType == null) { //Can this ever actually BE null? (Yes, it's null when the player has just logged in. It's not null when they gain XP in anything)
+            return;
+        }
+
+        Color color = getRetroColor(theType);
+
+        xpicon.setUrl(Misc.getCapitalized(theType.toString()) + "_r.png");
+
+        xpfill.setBottomColor(color);
+        xpfill.setTopColor(color);
+        xpfill.setWidth(getXpInc(PP.getSkillXpLevel(theType), PP.getXpToLevel(theType), HUDType.RETRO));
+        xpfill.setDirty(true);
+
+        SpoutManager.getPlayer(player).getMainScreen().setDirty(true);
+    }
+
+    private static Color getRetroColor(SkillType type) {
+        switch (type) {
+            case ACROBATICS:
+                return new Color((float) SpoutConfig.getInstance().getRetroHUDAcrobaticsRed(), (float) SpoutConfig.getInstance().getRetroHUDAcrobaticsGreen(), (float) SpoutConfig.getInstance().getRetroHUDAcrobaticsBlue(), 1f);
+
+            case ARCHERY:
+                return new Color((float) SpoutConfig.getInstance().getRetroHUDArcheryRed(), (float) SpoutConfig.getInstance().getRetroHUDArcheryGreen(), (float) SpoutConfig.getInstance().getRetroHUDArcheryBlue(), 1f);
+
+            case AXES:
+                return new Color((float) SpoutConfig.getInstance().getRetroHUDAxesRed(), (float) SpoutConfig.getInstance().getRetroHUDAxesGreen(), (float) SpoutConfig.getInstance().getRetroHUDAxesBlue(), 1f);
+
+            case EXCAVATION:
+                return new Color((float) SpoutConfig.getInstance().getRetroHUDExcavationRed(), (float) SpoutConfig.getInstance().getRetroHUDExcavationGreen(), (float) SpoutConfig.getInstance().getRetroHUDExcavationBlue(), 1f);
+
+            case HERBALISM:
+                return new Color((float) SpoutConfig.getInstance().getRetroHUDHerbalismRed(), (float) SpoutConfig.getInstance().getRetroHUDHerbalismGreen(), (float) SpoutConfig.getInstance().getRetroHUDHerbalismBlue(), 1f);
+
+            case MINING:
+                return new Color((float) SpoutConfig.getInstance().getRetroHUDMiningRed(), (float) SpoutConfig.getInstance().getRetroHUDMiningGreen(), (float) SpoutConfig.getInstance().getRetroHUDMiningBlue(), 1f);
+
+            case REPAIR:
+                return new Color((float) SpoutConfig.getInstance().getRetroHUDRepairRed(), (float) SpoutConfig.getInstance().getRetroHUDRepairGreen(), (float) SpoutConfig.getInstance().getRetroHUDRepairBlue(), 1f);
+
+            case SWORDS:
+                return new Color((float) SpoutConfig.getInstance().getRetroHUDSwordsRed(), (float) SpoutConfig.getInstance().getRetroHUDSwordsGreen(), (float) SpoutConfig.getInstance().getRetroHUDSwordsBlue(), 1f);
+
+            case TAMING:
+                return new Color((float) SpoutConfig.getInstance().getRetroHUDTamingRed(), (float) SpoutConfig.getInstance().getRetroHUDTamingGreen(), (float) SpoutConfig.getInstance().getRetroHUDTamingBlue(), 1f);
+
+            case UNARMED:
+                return new Color((float) SpoutConfig.getInstance().getRetroHUDUnarmedRed(), (float) SpoutConfig.getInstance().getRetroHUDUnarmedGreen(), (float) SpoutConfig.getInstance().getRetroHUDUnarmedBlue(), 1f);
+
+            case WOODCUTTING:
+                return new Color((float) SpoutConfig.getInstance().getRetroHUDWoodcuttingRed(), (float) SpoutConfig.getInstance().getRetroHUDWoodcuttingGreen(), (float) SpoutConfig.getInstance().getRetroHUDWoodcuttingBlue(), 1f);
+
+            case FISHING:
+                return new Color((float) SpoutConfig.getInstance().getRetroHUDFishingRed(), (float) SpoutConfig.getInstance().getRetroHUDFishingGreen(), (float) SpoutConfig.getInstance().getRetroHUDFishingBlue(), 1f);
+
+            default:
+                return new Color(0.3f, 0.3f, 0.75f, 1f);
+        }
+    }
+
+    private static String getUrlBar(Integer number) {
+        char[] num = number.toString().toCharArray();
+
+        switch (num.length) {
+        case 1:
+            return "xpbar_inc00" + number + ".png";
+
+        case 2:
+            return "xpbar_inc0" + number + ".png";
+
+        default:
+            return "xpbar_inc" + number + ".png";
+        }
+    }
+
+    private static Integer getXpInc(int skillxp, int xptolevel, HUDType hud) {
+        double percentage = (double) skillxp / xptolevel;
+        double inc;
+
+        switch (hud) {
+        case RETRO:
+            inc = 0.0079365079365079;
+            break;
+
+        case STANDARD:
+            inc = 0.0039370078740157;
+            break;
+
+        default:
+            return 1;
+        }
+
+        return (int) (percentage / inc);
+    }
+
+    private static SkillType getType(PlayerProfile PP) {
+        if (PP.getXpBarLocked()) {
+            return PP.getSkillLock();
+        }
+        else {
+            return PP.getLastGained();
+        }
+    }
+}

src/main/java/com/gmail/nossr50/datatypes/PlayerStat.java

@@ -1,23 +1,6 @@
-/*
-	This file is part of mcMMO.
-
-    mcMMO is free software: you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    mcMMO is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with mcMMO.  If not, see <http://www.gnu.org/licenses/>.
-*/
 package com.gmail.nossr50.datatypes;
 
-public class PlayerStat 
-{
-	public String name;
-	public int statVal = 0;
+public class PlayerStat {
+    public String name;
+    public int statVal = 0;
 }

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

@@ -1,36 +1,131 @@
-/*
-	This file is part of mcMMO.
-
-    mcMMO is free software: you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    mcMMO is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with mcMMO.  If not, see <http://www.gnu.org/licenses/>.
-*/
 package com.gmail.nossr50.datatypes;
 
-public enum SkillType 
-{
-	ACROBATICS,
-	ALCHEMY,
-	ALL, //This one is just for convenience
-	ARCHERY,
-	AXES,
-	EXCAVATION,
-	ENCHANTING,
-	FISHING,
-	HERBALISM,
-	MINING,
-	REPAIR,
-	SWORDS,
-	TAMING,
-	UNARMED,
-	WOODCUTTING;
+import org.bukkit.entity.Player;
+
+import com.gmail.nossr50.config.Config;
+import com.gmail.nossr50.util.Permissions;
+import com.gmail.nossr50.util.Users;
+
+public enum SkillType {
+    ACROBATICS(Config.getInstance().getLevelCapAcrobatics(), Config.getInstance().getFormulaMultiplierAcrobatics()),
+    ALL, //This one is just for convenience
+    ARCHERY(Config.getInstance().getLevelCapArchery(), Config.getInstance().getFormulaMultiplierArchery()),
+    AXES(AbilityType.SKULL_SPLIITER, Config.getInstance().getLevelCapAxes(), ToolType.AXE, Config.getInstance().getFormulaMultiplierAxes()),
+    EXCAVATION(AbilityType.GIGA_DRILL_BREAKER, Config.getInstance().getLevelCapExcavation(), ToolType.SHOVEL, Config.getInstance().getFormulaMultiplierExcavation()),
+    FISHING(Config.getInstance().getLevelCapFishing(), Config.getInstance().getFormulaMultiplierFishing()),
+    HERBALISM(AbilityType.GREEN_TERRA, Config.getInstance().getLevelCapHerbalism(), ToolType.HOE, Config.getInstance().getFormulaMultiplierHerbalism()),
+    MINING(AbilityType.SUPER_BREAKER, Config.getInstance().getLevelCapMining(), ToolType.PICKAXE, Config.getInstance().getFormulaMultiplierMining()),
+    REPAIR(Config.getInstance().getLevelCapRepair(), Config.getInstance().getFormulaMultiplierRepair()),
+    SWORDS(AbilityType.SERRATED_STRIKES, Config.getInstance().getLevelCapSwords(), ToolType.SWORD, Config.getInstance().getFormulaMultiplierSwords()),
+    TAMING(Config.getInstance().getLevelCapTaming(), Config.getInstance().getFormulaMultiplierTaming()),
+    UNARMED(AbilityType.BERSERK, Config.getInstance().getLevelCapUnarmed(), ToolType.FISTS, Config.getInstance().getFormulaMultiplierUnarmed()),
+    WOODCUTTING(AbilityType.TREE_FELLER, Config.getInstance().getLevelCapWoodcutting(), ToolType.AXE, Config.getInstance().getFormulaMultiplierWoodcutting());
+
+    private AbilityType ability;
+    private int maxLevel;
+    private ToolType tool;
+    private double xpModifier;
+
+    private SkillType() {
+        this.ability = null;
+        this.maxLevel = 0;
+        this.tool = null;
+        this.xpModifier = 0;
+    }
+
+    private SkillType(AbilityType ability, int maxLevel, ToolType tool, double xpModifier) {
+        this.ability = ability;
+        this.maxLevel = maxLevel;
+        this.tool = tool;
+        this.xpModifier = xpModifier;
+    }
+
+    private SkillType(int maxLevel, double xpModifier) {
+        this(null, maxLevel, null, xpModifier);
+    }
+
+    public AbilityType getAbility() {
+        return ability;
+    }
+
+    /**
+     * Get the max level of this skill.
+     *
+     * @return the max level of this skill
+     */
+    public int getMaxLevel() {
+        if (maxLevel > 0) {
+            return maxLevel;
+        }
+        else {
+            return Integer.MAX_VALUE;
+        }
+    }
+
+    public ToolType getTool() {
+        return tool;
+    }
+
+    /**
+     * Get the base permissions associated with this skill.
+     *
+     * @param player The player to check the permissions for
+     * @return true if the player has permissions, false otherwise
+     */
+    public boolean getPermissions(Player player) {
+        switch (this) {
+        case ACROBATICS:
+            return Permissions.getInstance().acrobatics(player);
+
+        case ARCHERY:
+            return Permissions.getInstance().archery(player);
+
+        case AXES:
+            return Permissions.getInstance().axes(player);
+
+        case EXCAVATION:
+            return Permissions.getInstance().excavation(player);
+
+        case FISHING:
+            return Permissions.getInstance().fishing(player);
+
+        case HERBALISM:
+            return Permissions.getInstance().herbalism(player);
+
+        case MINING:
+            return Permissions.getInstance().mining(player);
+
+        case REPAIR:
+            return Permissions.getInstance().repair(player);
+
+        case SWORDS:
+            return Permissions.getInstance().swords(player);
+
+        case TAMING:
+            return Permissions.getInstance().taming(player);
+
+        case UNARMED:
+            return Permissions.getInstance().unarmed(player);
+
+        case WOODCUTTING:
+            return Permissions.getInstance().woodcutting(player);
+
+        default:
+            return false;
+        }
+    }
+
+    public double getXpModifier() {
+        return xpModifier;
+    }
+
+    /**
+     * Get the skill level for this skill.
+     *
+     * @param player The player to check
+     * @return
+     */
+    public int getSkillLevel(Player player) {
+        return Users.getProfile(player).getSkillLevel(this);
+    }
 }

src/main/java/com/gmail/nossr50/datatypes/ToolType.java

@@ -0,0 +1,63 @@
+package com.gmail.nossr50.datatypes;
+
+import org.bukkit.Material;
+import org.bukkit.inventory.ItemStack;
+
+import com.gmail.nossr50.locale.LocaleLoader;
+import com.gmail.nossr50.util.ItemChecks;
+
+public enum ToolType {
+    AXE(LocaleLoader.getString("Axes.Ability.Lower"), LocaleLoader.getString("Axes.Ability.Ready")),
+    FISTS(LocaleLoader.getString("Unarmed.Ability.Lower"), LocaleLoader.getString("Unarmed.Ability.Ready")),
+    HOE(LocaleLoader.getString("Herbalism.Ability.Lower"), LocaleLoader.getString("Herbalism.Ability.Ready")),
+    PICKAXE(LocaleLoader.getString("Mining.Ability.Lower"), LocaleLoader.getString("Mining.Ability.Ready")),
+    SHOVEL(LocaleLoader.getString("Excavation.Ability.Lower"), LocaleLoader.getString("Excavation.Ability.Ready")),
+    SWORD(LocaleLoader.getString("Swords.Ability.Lower"), LocaleLoader.getString("Swords.Ability.Ready"));
+
+    private String lowerTool;
+    private String raiseTool;
+
+    private ToolType(String lowerTool, String raiseTool) {
+        this.lowerTool = lowerTool;
+        this.raiseTool = raiseTool;
+    }
+
+    public String getLowerTool() {
+        return lowerTool;
+    }
+
+    public String getRaiseTool() {
+        return raiseTool;
+    }
+
+    /**
+     * Check to see if the item is of the appropriate type.
+     *
+     * @param is The item to check
+     * @return true if the item is the right type, false otherwise
+     */
+    public boolean inHand(ItemStack is) {
+        switch (this) {
+        case AXE:
+            return ItemChecks.isAxe(is);
+
+        case FISTS:
+            return is.getType().equals(Material.AIR);
+
+        case HOE:
+            return ItemChecks.isHoe(is);
+
+        case PICKAXE:
+            return ItemChecks.isPickaxe(is);
+
+        case SHOVEL:
+            return ItemChecks.isShovel(is);
+
+        case SWORD:
+            return ItemChecks.isSword(is);
+
+        default:
+            return false;
+        }
+    }
+}

src/main/java/com/gmail/nossr50/datatypes/Tree.java

@@ -1,55 +1,50 @@
-/*
-	This file is part of mcMMO.
-
-    mcMMO is free software: you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    mcMMO is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with mcMMO.  If not, see <http://www.gnu.org/licenses/>.
-*/
 package com.gmail.nossr50.datatypes;
 
 import java.util.ArrayList;
 
-import com.gmail.nossr50.datatypes.PlayerStat;
-
 public class Tree {
 
-	TreeNode root = null;
+    private TreeNode root = null;
 
-	public Tree(){}
+    /**
+     * Add a node to this tree.
+     *
+     * @param p Player name
+     * @param in Stat value
+     */
+    public void add(String p, int in) {
+        if (root == null) {
+            root = new TreeNode(p, in);
+        }
+        else {
+            root.add(p, in);
+        }
+    }
 
-	public void add(String p, int in)
-	{
-		if(root == null){
-			root = new TreeNode(p, in);
-		}
-		else
-			root.add(p,in);
-	}
-	
-	public PlayerStat[] inOrder()
-	{
-		if(root != null){
-			ArrayList<PlayerStat> order = root.inOrder(new ArrayList<PlayerStat>());
-			return order.toArray(new PlayerStat[order.size()]);	
-		} else {
-			//Throw some dummy info in case the users file is empty
-			//It's not a good fix but its better than rewriting the whole system
-			ArrayList<PlayerStat> x = new ArrayList<PlayerStat>();
-			PlayerStat y = new PlayerStat();
-			y.name = "$mcMMO_DummyInfo";
-			y.statVal = 0;
-			x.add(y);
-			return x.toArray(new PlayerStat[x.size()]);
-		}
-	}
+    /**
+     * Retrieve an array of PlayerStats from the Tree.
+     *
+     * @return the player stats of this tree, in order
+     */
+    public PlayerStat[] inOrder() {
+        if (root != null) {
+            ArrayList<PlayerStat> order = root.inOrder(new ArrayList<PlayerStat>());
+            return order.toArray(new PlayerStat[order.size()]);
+        }
+        else {
 
+            /*
+             * Throw some dummy info in case the users file is empty.
+             * It's not a good fix but its better than rewriting the whole system.
+             */
+            ArrayList<PlayerStat> x = new ArrayList<PlayerStat>();
+            PlayerStat y = new PlayerStat();
+
+            y.name = "$mcMMO_DummyInfo";
+            y.statVal = 0;
+            x.add(y);
+
+            return x.toArray(new PlayerStat[x.size()]);
+        }
+    }
 }

src/main/java/com/gmail/nossr50/datatypes/TreeNode.java

@@ -1,65 +1,50 @@
-/*
-	This file is part of mcMMO.
-
-    mcMMO is free software: you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    mcMMO is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with mcMMO.  If not, see <http://www.gnu.org/licenses/>.
-*/
 package com.gmail.nossr50.datatypes;
 
 import java.util.ArrayList;
 
-import com.gmail.nossr50.datatypes.PlayerStat;
+public class TreeNode {
+    TreeNode left = null;
+    TreeNode right = null;
+    PlayerStat ps = new PlayerStat();
 
-public class TreeNode 
-{
-	TreeNode left = null
-	, right = null;
-	PlayerStat ps = new PlayerStat();
+    public TreeNode(String p, int in) {
+        ps.statVal = in;
+        ps.name = p;
+    }
 
-	public TreeNode(String p, int in) {ps.statVal = in; ps.name = p;}
+    public void add (String p, int in) {
+        if (in >= ps.statVal) {
+            if (left == null) {
+                left = new TreeNode(p, in);
+            }
+            else {
+                left.add(p, in);
+            }
+        }
+        else if(in < ps.statVal) {
+            if (right == null) {
+                right = new TreeNode(p, in);
+            }
+            else {
+                right.add(p, in);
+            }
+        }
+    }
 
-	public void add (String p, int in) 
-	{
-		if (in >= ps.statVal)
-		{
-			if (left == null)
-				left = new TreeNode(p,in);
-			else
-				left.add(p, in);
-		}
-		else if(in < ps.statVal)
-		{
-		if (right == null)
-			right = new TreeNode(p,in);
-		else
-			right.add(p, in);
-		}
-	}
-	
-	public ArrayList<PlayerStat> inOrder(ArrayList<PlayerStat> a)
-	{
-		//if left node is not null than assign arrayList(a) to left.inOrder()
-		
-		//GOES THROUGH THE ENTIRE LEFT BRANCH AND GRABS THE GREATEST NUMBER
-		
-		if(left != null)
-			a = left.inOrder(a);
-	
-		a.add(ps);
-	
-		if(right != null)
-			a = right.inOrder(a);
-	
-		return a;
-	}
+    public ArrayList<PlayerStat> inOrder(ArrayList<PlayerStat> a) {
+        //if left node is not null than assign arrayList(a) to left.inOrder()
+        //GOES THROUGH THE ENTIRE LEFT BRANCH AND GRABS THE GREATEST NUMBER
+
+        if (left != null) {
+            a = left.inOrder(a);
+        }
+
+        a.add(ps);
+
+        if (right != null) {
+            a = right.inOrder(a);
+        }
+
+        return a;
+    }
 }

src/main/java/com/gmail/nossr50/datatypes/buttons/ButtonEscape.java

@@ -1,29 +1,13 @@
-/*
-	This file is part of mcMMO.
-
-    mcMMO is free software: you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    mcMMO is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with mcMMO.  If not, see <http://www.gnu.org/licenses/>.
-*/
 package com.gmail.nossr50.datatypes.buttons;
 
 import org.getspout.spoutapi.gui.GenericButton;
 
-public class ButtonEscape extends GenericButton
-{
-	public ButtonEscape()
-	{
-		this.setText("EXIT");
-		this.setWidth(60).setHeight(20);
-		this.setDirty(true);
-	}
-}
+public class ButtonEscape extends GenericButton {
+
+    public ButtonEscape() {
+        this.setText("EXIT");
+        this.setWidth(60);
+        this.setHeight(20);
+        this.setDirty(true);
+    }
+}

src/main/java/com/gmail/nossr50/datatypes/buttons/ButtonHUDStyle.java

@@ -1,37 +1,14 @@
-/*
-	This file is part of mcMMO.
-
-    mcMMO is free software: you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    mcMMO is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with mcMMO.  If not, see <http://www.gnu.org/licenses/>.
-*/
 package com.gmail.nossr50.datatypes.buttons;
 
-import org.getspout.spoutapi.gui.GenericButton;
-
 import com.gmail.nossr50.datatypes.PlayerProfile;
 
-public class ButtonHUDStyle extends GenericButton
-{
-	public ButtonHUDStyle(PlayerProfile PP)
-	{
-		this.setText("HUD Type: "+PP.getHUDType().toString());
-		this.setTooltip("Change your HUD style!");
-		this.setWidth(120).setHeight(20);
-		this.setDirty(true);
-	}
-	public void updateText(PlayerProfile PP)
-	{
-		this.setText("HUD Type: "+PP.getHUDType().toString());
-		this.setDirty(true);
-	}
-}
+public class ButtonHUDStyle extends ButtonToggle {
+
+    public ButtonHUDStyle(PlayerProfile PP) {
+        super("HUD Type: ", PP.getHUDType().toString(), "Change your HUD style!"); //TODO: Needs more locale
+    }
+
+    public void updateText(PlayerProfile PP) {
+        super.updateText("HUD Type: ", PP.getHUDType().toString()); //TODO: Needs more locale
+    }
+}

src/main/java/com/gmail/nossr50/datatypes/buttons/ButtonPartyToggle.java

@@ -1,37 +1,14 @@
-/*
-	This file is part of mcMMO.
-
-    mcMMO is free software: you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    mcMMO is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with mcMMO.  If not, see <http://www.gnu.org/licenses/>.
-*/
 package com.gmail.nossr50.datatypes.buttons;
 
-import org.getspout.spoutapi.gui.GenericButton;
-
 import com.gmail.nossr50.datatypes.PlayerProfile;
 
-public class ButtonPartyToggle extends GenericButton
-{
-	public ButtonPartyToggle(PlayerProfile PP)
-	{
-		this.setText("Party HUD: "+PP.getPartyHUD());
-		this.setTooltip("Toggle the Party HUD!");
-		this.setWidth(120).setHeight(20);
-		this.setDirty(true);
-	}
-	public void updateText(PlayerProfile PP)
-	{
-		this.setText("Party HUD: "+PP.getPartyHUD());
-		this.setDirty(true);
-	}
-}
+public class ButtonPartyToggle extends ButtonToggle {
+
+    public ButtonPartyToggle(PlayerProfile PP) {
+        super("Party HUD: ", ((Boolean) PP.getPartyHUD()).toString(), "Toggle the Party HUD!"); //TODO: Needs more locale
+    }
+
+    public void updateText(PlayerProfile PP) {
+        super.updateText("Party HUD: ", ((Boolean) PP.getPartyHUD()).toString()); //TODO: Needs more locale
+    }
+}

src/main/java/com/gmail/nossr50/datatypes/buttons/ButtonToggle.java

@@ -0,0 +1,19 @@
+package com.gmail.nossr50.datatypes.buttons;
+
+import org.getspout.spoutapi.gui.GenericButton;
+
+public class ButtonToggle extends GenericButton{
+
+    public ButtonToggle(String text1, String text2, String tooltip) {
+        this.setText(text1 + text2);
+        this.setTooltip(tooltip);
+        this.setWidth(120);
+        this.setHeight(20);
+        this.setDirty(true);
+    }
+
+    public void updateText(String text1, String text2) {
+        this.setText(text1 + text2);
+        this.setDirty(true);
+    }
+}

src/main/java/com/gmail/nossr50/datatypes/mods/CustomBlock.java

@@ -0,0 +1,59 @@
+package com.gmail.nossr50.datatypes.mods;
+
+import org.bukkit.inventory.ItemStack;
+
+public class CustomBlock {
+    private int itemID;
+    private byte dataValue;
+    private int xpGain;
+    private int tier;
+    private ItemStack itemDrop;
+
+    public CustomBlock(ItemStack itemDrop, int tier, int xpGain, byte dataValue, int itemID) {
+        this.itemID = itemID;
+        this.dataValue = dataValue;
+        this.xpGain = xpGain;
+        this.tier = tier;
+        this.itemDrop = itemDrop;
+    }
+
+    public int getItemID() {
+        return itemID;
+    }
+
+    public void setItemID(int itemID) {
+        this.itemID = itemID;
+    }
+
+    public byte getDataValue() {
+        return dataValue;
+    }
+
+    public void setDataValue(byte dataValue) {
+        this.dataValue = dataValue;
+    }
+
+    public int getXpGain() {
+        return xpGain;
+    }
+
+    public void setXpGain(int xpGain) {
+        this.xpGain = xpGain;
+    }
+
+    public int getTier() {
+        return tier;
+    }
+
+    public void setTier(int tier) {
+        this.tier = tier;
+    }
+
+    public ItemStack getItemDrop() {
+        return itemDrop;
+    }
+
+    public void setItemDrop(ItemStack itemDrop) {
+        this.itemDrop = itemDrop;
+    }
+}

src/main/java/com/gmail/nossr50/datatypes/mods/CustomItem.java

@@ -0,0 +1,27 @@
+package com.gmail.nossr50.datatypes.mods;
+
+public class CustomItem {
+    protected int itemID;
+    protected short durability;
+
+    public CustomItem(int itemID, short durability) {
+        this.itemID = itemID;
+        this.durability = durability;
+    }
+
+    public int getItemID() {
+        return itemID;
+    }
+
+    public void setItemID(int itemID) {
+        this.itemID = itemID;
+    }
+
+    public short getDurability() {
+        return durability;
+    }
+
+    public void setDurability(short durability) {
+        this.durability = durability;
+    }
+}

src/main/java/com/gmail/nossr50/datatypes/mods/CustomTool.java

@@ -0,0 +1,38 @@
+package com.gmail.nossr50.datatypes.mods;
+
+public class CustomTool extends CustomItem {
+    private double xpMultiplier;
+    private boolean abilityEnabled;
+    private int tier;
+
+    public CustomTool(int tier, boolean abilityEnabled, double xpMultiplier, short durability, int itemID) {
+        super(itemID, durability);
+        this.xpMultiplier = xpMultiplier;
+        this.abilityEnabled = abilityEnabled;
+        this.tier = tier;
+    }
+
+    public double getXpMultiplier() {
+        return xpMultiplier;
+    }
+
+    public void setXpMultiplier(Double xpMultiplier) {
+        this.xpMultiplier = xpMultiplier;
+    }
+
+    public boolean isAbilityEnabled() {
+        return abilityEnabled;
+    }
+
+    public void setAbilityEnabled(boolean abilityEnabled) {
+        this.abilityEnabled = abilityEnabled;
+    }
+
+    public int getTier() {
+        return tier;
+    }
+
+    public void setTier(int tier) {
+        this.tier = tier;
+    }
+}

src/main/java/com/gmail/nossr50/datatypes/popups/PopupMMO.java

@@ -1,75 +1,58 @@
-/*
-	This file is part of mcMMO.
-
-    mcMMO is free software: you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    mcMMO is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with mcMMO.  If not, see <http://www.gnu.org/licenses/>.
-*/
 package com.gmail.nossr50.datatypes.popups;
 
 import org.bukkit.ChatColor;
 import org.bukkit.entity.Player;
 import org.getspout.spoutapi.gui.GenericLabel;
 import org.getspout.spoutapi.gui.GenericPopup;
+
 import com.gmail.nossr50.mcMMO;
-import com.gmail.nossr50.config.LoadProperties;
 import com.gmail.nossr50.datatypes.PlayerProfile;
 import com.gmail.nossr50.datatypes.buttons.ButtonEscape;
 import com.gmail.nossr50.datatypes.buttons.ButtonHUDStyle;
-import com.gmail.nossr50.datatypes.buttons.ButtonPartyToggle;
 
-public class PopupMMO extends GenericPopup
-{
-	ButtonHUDStyle HUDButton = null;
-	ButtonPartyToggle PartyButton = null;
-	ButtonEscape EscapeButton = null;
-	GenericLabel mcMMO_label = new GenericLabel();
-	GenericLabel tip_escape = new GenericLabel();
-	int center_x = 427/2;
-	int center_y = 240/2;
-	
-	public PopupMMO(Player player, PlayerProfile PP, mcMMO plugin)
-	{
-		//240, 427 are the bottom right
-		mcMMO_label.setText(ChatColor.GOLD+"~mcMMO Menu~");
-		mcMMO_label.setX(center_x-35).setY((center_y/2)-20).setDirty(true);
-		
-		tip_escape.setText(ChatColor.GRAY+"Press ESCAPE to exit!");
-		tip_escape.setX(mcMMO_label.getX()-15).setY(mcMMO_label.getY()+10).setDirty(true);
-		
-		HUDButton = new ButtonHUDStyle(PP);
-		HUDButton.setX(center_x-(HUDButton.getWidth()/2)).setY(center_y/2).setDirty(true);
-		
-		if(LoadProperties.partybar)
-		{
-			PartyButton = new ButtonPartyToggle(PP);
-			PartyButton.setX(center_x-(PartyButton.getWidth()/2)).setY(center_y/2+PartyButton.getHeight()).setDirty(true);
-			this.attachWidget(plugin, PartyButton);
-		}
-		
-		EscapeButton = new ButtonEscape();
-		EscapeButton.setX(center_x-(EscapeButton.getWidth()/2)).setY((center_y/2)+(HUDButton.getHeight()*2)+5).setDirty(true);
-		
-		this.attachWidget(plugin, HUDButton);
-		this.attachWidget(plugin, mcMMO_label);
-		this.attachWidget(plugin, tip_escape);
-		this.attachWidget(plugin, EscapeButton);
-		
-		this.setDirty(true);
-	}
-	
-	public void updateButtons(PlayerProfile PP)
-	{
-		HUDButton.updateText(PP);
-		this.setDirty(true);
-	}
+public class PopupMMO extends GenericPopup {
+
+    private ButtonHUDStyle HUDButton = null;
+    private ButtonEscape EscapeButton = null;
+    private GenericLabel mcMMO_label = new GenericLabel();
+    private GenericLabel tip_escape = new GenericLabel();
+    private int center_x = 427 / 2;
+    private int center_y = 240 / 2;
+
+    public PopupMMO(Player player, PlayerProfile PP, mcMMO plugin) {
+
+        //240, 427 are the bottom right
+        mcMMO_label.setText(ChatColor.GOLD + "~mcMMO Menu~"); //TODO: Needs more locale
+        mcMMO_label.setX(center_x - 35);
+        mcMMO_label.setY((center_y / 2) - 20);
+        mcMMO_label.setDirty(true);
+
+        tip_escape.setText(ChatColor.GRAY + "Press ESCAPE to exit!"); //TODO: Needs more locale
+        tip_escape.setX(mcMMO_label.getX() - 15);
+        tip_escape.setY(mcMMO_label.getY() + 10);
+        tip_escape.setDirty(true);
+
+        HUDButton = new ButtonHUDStyle(PP);
+        HUDButton.setX(center_x - (HUDButton.getWidth() / 2));
+        HUDButton.setY(center_y / 2);
+        HUDButton.setDirty(true);
+
+        EscapeButton = new ButtonEscape();
+        EscapeButton.setX(center_x - (EscapeButton.getWidth() / 2));
+        EscapeButton.setY((center_y / 2) + (HUDButton.getHeight() * 2) + 5);
+        EscapeButton.setDirty(true);
+
+        this.attachWidget(plugin, HUDButton);
+        this.attachWidget(plugin, mcMMO_label);
+        this.attachWidget(plugin, tip_escape);
+        this.attachWidget(plugin, EscapeButton);
+
+        this.setDirty(true);
+    }
+
+    public void updateButtons(PlayerProfile PP) {
+        HUDButton.updateText(PP);
+        //PartyButton.updateText(PP);
+        this.setDirty(true);
+    }
 }

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

@@ -0,0 +1,128 @@
+package com.gmail.nossr50.datatypes.treasure;
+
+import org.bukkit.inventory.ItemStack;
+
+public class ExcavationTreasure extends Treasure {
+
+    // dirt | grass | sand | gravel | clay | mycel | soulsand
+    // 00000001 - dirt      1
+    // 00000010 - grass     2
+    // 00000100 - sand      4
+    // 00001000 - gravel    8
+    // 00010000 - clay      16
+    // 00100000 - mycel     32
+    // 01000000 - soulsand  64
+    private byte dropsFrom = 0x0;
+
+    public ExcavationTreasure(ItemStack drop, int xp, Double dropChance, int dropLevel) {
+        super(drop, xp, dropChance, dropLevel);
+    }
+
+    // Raw getters and setters
+    public byte getDropsFrom() {
+        return dropsFrom;
+    }
+
+    public void setDropsFrom(byte dropsFrom) {
+        this.dropsFrom = dropsFrom;
+    }
+
+    // Getters
+    public boolean getDropsFromDirt() {
+        return getDropFromMask(1);
+    }
+
+    public boolean getDropsFromGrass() {
+        return getDropFromMask(2);
+    }
+
+    public boolean getDropsFromSand() {
+        return getDropFromMask(4);
+    }
+
+    public boolean getDropsFromGravel() {
+        return getDropFromMask(8);
+    }
+
+    public boolean getDropsFromClay() {
+        return getDropFromMask(16);
+    }
+
+    public boolean getDropsFromMycel() {
+        return getDropFromMask(32);
+    }
+
+    public boolean getDropsFromSoulSand() {
+        return getDropFromMask(64);
+    }
+
+    private boolean getDropFromMask(int mask) {
+        return ((dropsFrom & mask) > 0) ? true : false;
+    }
+
+    // Setters
+    public void setDropsFromDirt() {
+        setDropFromMask(1);
+    }
+
+    public void setDropsFromGrass() {
+        setDropFromMask(2);
+    }
+
+    public void setDropsFromSand() {
+        setDropFromMask(4);
+    }
+
+    public void setDropsFromGravel() {
+        setDropFromMask(8);
+    }
+
+    public void setDropsFromClay() {
+        setDropFromMask(16);
+    }
+
+    public void setDropsFromMycel() {
+        setDropFromMask(32);
+    }
+
+    public void setDropsFromSoulSand() {
+        setDropFromMask(64);
+    }
+
+    private void setDropFromMask(int mask) {
+        dropsFrom |= mask;
+    }
+
+    // Un-setters
+    public void unsetDropsFromDirt() {
+        unsetDropFromMask(1);
+    }
+
+    public void unsetDropsFromGrass() {
+        unsetDropFromMask(2);
+    }
+
+    public void unsetDropsFromSand() {
+        unsetDropFromMask(4);
+    }
+
+    public void unsetDropsFromGravel() {
+        unsetDropFromMask(8);
+    }
+
+    public void unsetDropsFromClay() {
+        unsetDropFromMask(16);
+    }
+
+    public void unsetDropsFromMycel() {
+        unsetDropFromMask(32);
+    }
+
+    public void unsetDropsFromSoulSand() {
+        unsetDropFromMask(64);
+    }
+
+    private void unsetDropFromMask(int mask) {
+        dropsFrom &= ~mask;
+    }
+}

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

@@ -0,0 +1,20 @@
+package com.gmail.nossr50.datatypes.treasure;
+
+import org.bukkit.inventory.ItemStack;
+
+public class FishingTreasure extends Treasure {
+    private int maxLevel;
+
+    public FishingTreasure(ItemStack drop, int xp, Double dropChance, int dropLevel, int maxLevel) {
+        super(drop, xp, dropChance, dropLevel);
+        this.setMaxLevel(maxLevel);
+    }
+
+    public int getMaxLevel() {
+        return maxLevel;
+    }
+
+    public void setMaxLevel(int maxLevel) {
+        this.maxLevel = maxLevel;
+    }
+}

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

@@ -0,0 +1,49 @@
+package com.gmail.nossr50.datatypes.treasure;
+
+import org.bukkit.inventory.ItemStack;
+
+public abstract class Treasure {
+    private int xp;
+    private double dropChance;
+    private int dropLevel;
+    private ItemStack drop;
+
+    public Treasure(ItemStack drop, int xp, Double dropChance, int dropLevel) {
+        this.drop = drop;
+        this.xp = xp;
+        this.dropChance = dropChance;
+        this.dropLevel = dropLevel;
+    }
+
+    public ItemStack getDrop() {
+        return drop;
+    }
+
+    public void setDrop(ItemStack drop) {
+        this.drop = drop;
+    }
+
+    public int getXp() {
+        return xp;
+    }
+
+    public void setXp(int xp) {
+        this.xp = xp;
+    }
+
+    public double getDropChance() {
+        return dropChance;
+    }
+
+    public void setDropChance(Double dropChance) {
+        this.dropChance = dropChance;
+    }
+
+    public int getDropLevel() {
+        return dropLevel;
+    }
+
+    public void setDropLevel(int dropLevel) {
+        this.dropLevel = dropLevel;
+    }
+}

src/main/java/com/gmail/nossr50/events/McMMOItemSpawnEvent.java

@@ -1,89 +0,0 @@
-/*
-	This file is part of mcMMO.
-
-    mcMMO is free software: you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    mcMMO is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with mcMMO.  If not, see <http://www.gnu.org/licenses/>.
-*/
-package com.gmail.nossr50.events;
-
-import org.bukkit.Location;
-import org.bukkit.event.Cancellable;
-import org.bukkit.event.Event;
-import org.bukkit.event.HandlerList;
-import org.bukkit.inventory.ItemStack;
-
-/**
- * Called when mcMMO is preparing to drop an item
- */
-@SuppressWarnings("serial")
-public class McMMOItemSpawnEvent extends Event implements Cancellable {
-	private Location location;
-	private ItemStack itemStack;
-	private boolean cancelled;
-	
-	public McMMOItemSpawnEvent(Location location, ItemStack itemStack) {
-		this.location = location;
-		this.itemStack = itemStack;
-		this.cancelled = false;
-	}
-	
-	/**
-	 * @return Location where the item will be dropped
-	 */
-	public Location getLocation() {
-		return location;
-	}
-	
-	/**
-	 * @param location Location where to drop the item
-	 */
-	public void setLocation(Location location) {
-		this.location = location;
-	}
-	
-	/**
-	 * @return ItemStack that will be dropped
-	 */
-	public ItemStack getItemStack() {
-		return itemStack;
-	}
-	
-	/**
-	 * @param itemStack ItemStack to drop
-	 */
-	public void setItemStack(ItemStack itemStack) {
-		this.itemStack = itemStack;
-	}
-	
-	/** Following are required for Cancellable **/
-	@Override
-	public boolean isCancelled() {
-		return cancelled;
-	}
-
-	@Override
-	public void setCancelled(boolean cancelled) {
-		this.cancelled = cancelled;
-	}
-	
-	/** Rest of file is required boilerplate for custom events **/
-	private static final HandlerList handlers = new HandlerList();
-	
-	public HandlerList getHandlers() {
-		return handlers;
-	}
-	
-	public static HandlerList getHandlerList() {
-		return handlers;
-	}
-}

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

@@ -1,71 +0,0 @@
-/*
-	This file is part of mcMMO.
-
-    mcMMO is free software: you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    mcMMO is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with mcMMO.  If not, see <http://www.gnu.org/licenses/>.
-*/
-package com.gmail.nossr50.events;
-
-import org.bukkit.entity.Player;
-import org.bukkit.event.Event;
-import org.bukkit.event.HandlerList;
-
-import com.gmail.nossr50.datatypes.SkillType;
-
-/**
- * Called when a user levels up in a skill
- */
-@SuppressWarnings("serial")
-public class McMMOPlayerLevelUpEvent extends Event {
-	private Player player;
-	private SkillType skill;
-	private int levelsGained;
-	
-	public McMMOPlayerLevelUpEvent(Player player, SkillType skill) {
-		this.player = player;
-		this.skill = skill;
-		this.levelsGained = 1;	// Always 1 for now as we call in the loop where the levelups are calculated, could change later!
-	}
-	
-	/**
-	 * @return Player leveling up
-	 */
-	public Player getPlayer() {
-		return player;
-	}
-	
-	/**
-	 * @return SkillType that is being leveled up
-	 */
-	public SkillType getSkill() {
-		return skill;
-	}
-	
-	/**
-	 * @return The number of levels gained in this event
-	 */
-	public int getLevelsGained() {
-		return levelsGained;
-	}
-	
-	/** Rest of file is required boilerplate for custom events **/
-	private static final HandlerList handlers = new HandlerList();
-	
-	public HandlerList getHandlers() {
-		return handlers;
-	}
-	
-	public static HandlerList getHandlerList() {
-		return handlers;
-	}
-}

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

@@ -1,68 +0,0 @@
-/*
-	This file is part of mcMMO.
-
-    mcMMO is free software: you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    mcMMO is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with mcMMO.  If not, see <http://www.gnu.org/licenses/>.
-*/
-package com.gmail.nossr50.events;
-
-import org.bukkit.entity.Player;
-import org.bukkit.event.Event;
-import org.bukkit.event.HandlerList;
-
-import com.gmail.nossr50.datatypes.SkillType;
-
-@SuppressWarnings("serial")
-public class McMMOPlayerXpGainEvent extends Event {
-	private Player player;
-	private SkillType skill;
-	private int xpGained;
-	
-	public McMMOPlayerXpGainEvent(Player player, SkillType skill, int xpGained) {
-		this.player = player;
-		this.skill = skill;
-		this.xpGained = xpGained;
-	}
-	
-	/**
-	 * @return Player gaining experience (can be null)
-	 */
-	public Player getPlayer() {
-		return player;
-	}
-	
-	/**
-	 * @return SkillType that is gaining experience
-	 */
-	public SkillType getSkill() {
-		return skill;
-	}
-	
-	/**
-	 * @return The number experience gained in this event
-	 */
-	public int getXpGained() {
-		return xpGained;
-	}
-	
-	/** Rest of file is required boilerplate for custom events **/
-	private static final HandlerList handlers = new HandlerList();
-	
-	public HandlerList getHandlers() {
-		return handlers;
-	}
-	
-	public static HandlerList getHandlerList() {
-		return handlers;
-	}
-}

src/main/java/com/gmail/nossr50/events/chat/McMMOAdminChatEvent.java

@@ -0,0 +1,11 @@
+package com.gmail.nossr50.events.chat;
+
+/**
+ * Called when a chat is sent to the admin chat channel
+ */
+public class McMMOAdminChatEvent extends McMMOChatEvent{
+
+    public McMMOAdminChatEvent(String sender, String message) {
+        super(sender, message);
+    }
+}

src/main/java/com/gmail/nossr50/events/chat/McMMOChatEvent.java

@@ -0,0 +1,60 @@
+package com.gmail.nossr50.events.chat;
+
+import org.bukkit.event.Cancellable;
+import org.bukkit.event.Event;
+import org.bukkit.event.HandlerList;
+
+public class McMMOChatEvent extends Event implements Cancellable{
+    private boolean cancelled;
+    private String sender;
+    private String message;
+
+    public McMMOChatEvent(String sender, String message) {
+        this.sender = sender;
+        this.message = message;
+    }
+
+    /**
+     * @return String name of the player who sent the chat, or "Console"
+     */
+    public String getSender() {
+        return sender;
+    }
+
+    /**
+     * @return String message that will be sent
+     */
+    public String getMessage() {
+        return message;
+    }
+
+    /**
+     * @param message String message to be sent in chat
+     */
+    public void setMessage(String message) {
+        this.message = message;
+    }
+
+    /** Rest of file is required boilerplate for custom events **/
+    private static final HandlerList handlers = new HandlerList();
+
+    @Override
+    public HandlerList getHandlers() {
+        return handlers;
+    }
+
+    public static HandlerList getHandlerList() {
+        return handlers;
+    }
+
+    /** Following are required for Cancellable **/
+    @Override
+    public boolean isCancelled() {
+        return cancelled;
+    }
+
+    @Override
+    public void setCancelled(boolean cancelled) {
+        this.cancelled = cancelled;
+    }
+}

src/main/java/com/gmail/nossr50/events/chat/McMMOPartyChatEvent.java

@@ -0,0 +1,20 @@
+package com.gmail.nossr50.events.chat;
+
+/**
+ * Called when a chat is sent to a party channel
+ */
+public class McMMOPartyChatEvent extends McMMOChatEvent{
+    private String party;
+
+    public McMMOPartyChatEvent(String sender, String party, String message) {
+        super(sender, message);
+        this.party = party;
+    }
+
+    /**
+     * @return String name of the party the message will be sent to
+     */
+    public String getParty() {
+        return party;
+    }
+}

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

@@ -0,0 +1,47 @@
+package com.gmail.nossr50.events.experience;
+
+import org.bukkit.entity.Player;
+import org.bukkit.event.HandlerList;
+import org.bukkit.event.player.PlayerEvent;
+
+import com.gmail.nossr50.datatypes.SkillType;
+
+/**
+ * Generic event for mcMMO experience events.
+ */
+public class McMMOPlayerExperienceEvent extends PlayerEvent {
+    protected SkillType skill;
+    protected int skillLevel;
+
+    public McMMOPlayerExperienceEvent(Player player, SkillType skill) {
+        super(player);
+        this.skill = skill;
+        this.skillLevel = skill.getSkillLevel(player);
+    }
+
+    /**
+     * @return The skill involved in this event
+     */
+    public SkillType getSkill() {
+        return skill;
+    }
+
+    /**
+     * @return The skill level of the skill involved in this event
+     */
+    public int getSkillLevel() {
+        return skillLevel;
+    }
+
+    /** Rest of file is required boilerplate for custom events **/
+    private static final HandlerList handlers = new HandlerList();
+
+    @Override
+    public HandlerList getHandlers() {
+        return handlers;
+    }
+
+    public static HandlerList getHandlerList() {
+        return handlers;
+    }
+}

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

@@ -0,0 +1,24 @@
+package com.gmail.nossr50.events.experience;
+
+import org.bukkit.entity.Player;
+
+import com.gmail.nossr50.datatypes.SkillType;
+
+/**
+ * Called when a user levels up in a skill
+ */
+public class McMMOPlayerLevelUpEvent extends McMMOPlayerExperienceEvent {
+    private int levelsGained;
+
+    public McMMOPlayerLevelUpEvent(Player player, SkillType skill) {
+        super(player, skill);
+        this.levelsGained = 1;    // Always 1 for now as we call in the loop where the levelups are calculated, could change later!
+    }
+
+    /**
+     * @return The number of levels gained in this event
+     */
+    public int getLevelsGained() {
+        return levelsGained;
+    }
+}

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

@@ -0,0 +1,24 @@
+package com.gmail.nossr50.events.experience;
+
+import org.bukkit.entity.Player;
+
+import com.gmail.nossr50.datatypes.SkillType;
+
+/**
+ * Called when a player gains XP in a skill
+ */
+public class McMMOPlayerXpGainEvent extends McMMOPlayerExperienceEvent {
+    private int xpGained;
+
+    public McMMOPlayerXpGainEvent(Player player, SkillType skill, int xpGained) {
+        super(player, skill);
+        this.xpGained = xpGained;
+    }
+
+    /**
+     * @return The amount of experience gained in this event
+     */
+    public int getXpGained() {
+        return xpGained;
+    }
+}

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

@@ -0,0 +1,15 @@
+package com.gmail.nossr50.events.fake;
+
+import org.bukkit.block.Block;
+import org.bukkit.entity.Player;
+import org.bukkit.event.block.BlockBreakEvent;
+
+/**
+ * Called when mcMMO breaks a block due to a special ability.
+ */
+public class FakeBlockBreakEvent extends BlockBreakEvent {
+
+    public FakeBlockBreakEvent(Block theBlock, Player player) {
+        super(theBlock, player);
+    }
+}

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

@@ -0,0 +1,16 @@
+package com.gmail.nossr50.events.fake;
+
+import org.bukkit.block.Block;
+import org.bukkit.entity.Player;
+import org.bukkit.event.block.BlockDamageEvent;
+import org.bukkit.inventory.ItemStack;
+
+/**
+ * Called when mcMMO damages a block due to a special ability.
+ */
+public class FakeBlockDamageEvent extends BlockDamageEvent {
+
+    public FakeBlockDamageEvent(Player player, Block block, ItemStack itemInHand, boolean instaBreak) {
+        super(player, block, itemInHand, instaBreak);
+    }
+}