Updating to for 1.3.03 release.

be stored by String instead of Player

.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,149 @@
 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.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

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.03</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/BlockChecks.java

@@ -0,0 +1,119 @@
+package com.gmail.nossr50;
+
+import org.bukkit.Material;
+
+import com.gmail.nossr50.config.LoadProperties;
+
+public class BlockChecks {
+
+    /**
+     * Checks to see if a block type awards XP.
+     *
+     * @param material The type of Block to check
+     * @return true if the block type awards XP, false otherwise
+     */
+    public static boolean shouldBeWatched(Material material) {
+        switch (material) {
+        case BROWN_MUSHROOM:
+        case CACTUS:
+        case CLAY:
+        case COAL_ORE:
+        case DIAMOND_ORE:
+        case DIRT:
+        case ENDER_STONE:
+        case GLOWING_REDSTONE_ORE:
+        case GLOWSTONE:
+        case GOLD_ORE:
+        case GRASS:
+        case GRAVEL:
+        case IRON_ORE:
+        case JACK_O_LANTERN:
+        case LAPIS_ORE:
+        case LOG:
+        case MELON_BLOCK:
+        case MOSSY_COBBLESTONE:
+        case MYCEL:
+        case NETHERRACK:
+        case OBSIDIAN:
+        case PUMPKIN:
+        case RED_MUSHROOM:
+        case RED_ROSE:
+        case REDSTONE_ORE:
+        case SAND:
+        case SANDSTONE:
+        case SOUL_SAND:
+        case STONE:
+        case SUGAR_CANE_BLOCK:
+        case VINE:
+        case WATER_LILY:
+        case YELLOW_FLOWER:
+            return true;
+
+        default:
+            return false;
+        }
+    }
+
+    /**
+     * Check if a block should allow for the activation of abilities.
+     *
+     * @param material The type of Block to check
+     * @return true if the block should allow ability activation, false otherwise
+     */
+    public static boolean abilityBlockCheck(Material material) {
+        switch (material) {
+        case BED_BLOCK:
+        case BREWING_STAND:
+        case BOOKSHELF:
+        case BURNING_FURNACE:
+        case CAKE_BLOCK:
+        case CHEST:
+        case DISPENSER:
+        case ENCHANTMENT_TABLE:
+        case FENCE_GATE:
+        case FURNACE:
+        case IRON_DOOR_BLOCK:
+        case JUKEBOX:
+        case LEVER:
+        case NOTE_BLOCK:
+        case STONE_BUTTON:
+        case TRAP_DOOR:
+        case WALL_SIGN:
+        case WOODEN_DOOR:
+        case WORKBENCH:
+            return false;
+
+        default:
+            break;
+        }
+
+        if (Material.getMaterial(LoadProperties.anvilID).equals(material)) {
+            return false;
+        }
+        else {
+            return true;
+        }
+    }
+
+    /**
+     * Check if a block type is an ore.
+     *
+     * @param material The type of Block to check
+     * @return true if the Block is an ore, false otherwise
+     */
+    public static boolean isOre(Material material) {
+        switch (material) {
+        case COAL_ORE:
+        case DIAMOND_ORE:
+        case GLOWING_REDSTONE_ORE:
+        case GOLD_ORE:
+        case IRON_ORE:
+        case LAPIS_ORE:
+        case REDSTONE_ORE:
+            return true;
+
+        default:
+            return false;
+        }
+    }
+}

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

@@ -1,34 +1,29 @@
-/*
-	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.Material;
+import org.bukkit.entity.AnimalTamer;
+import org.bukkit.entity.Animals;
+import org.bukkit.entity.Arrow;
+import org.bukkit.entity.Entity;
+import org.bukkit.entity.EntityType;
+import org.bukkit.entity.LivingEntity;
+import org.bukkit.entity.Player;
+import org.bukkit.entity.Wolf;
 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 org.bukkit.inventory.ItemStack;
 
 import com.gmail.nossr50.config.LoadProperties;
 import com.gmail.nossr50.datatypes.PlayerProfile;
 import com.gmail.nossr50.datatypes.SkillType;
+import com.gmail.nossr50.events.FakeEntityDamageByEntityEvent;
+import com.gmail.nossr50.events.FakeEntityDamageEvent;
 import com.gmail.nossr50.locale.mcLocale;
 import com.gmail.nossr50.party.Party;
+import com.gmail.nossr50.runnables.GainXp;
+import com.gmail.nossr50.runnables.mcBleedTimer;
 import com.gmail.nossr50.skills.Acrobatics;
 import com.gmail.nossr50.skills.Archery;
 import com.gmail.nossr50.skills.Axes;
@@ -37,427 +32,437 @@ 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);
+public class Combat {
 
-						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);
-    	}
+    /**
+     * Apply combat modifiers and process and XP gain.
+     *
+     * @param event The event to run the combat checks on.
+     * @param plugin mcMMO plugin instance
+     */
+    public static void combatChecks(EntityDamageByEntityEvent event, mcMMO plugin) {
+        if (event.getDamage() == 0 || event.getEntity().isDead()) {
+            return;
+        }
+
+        Entity damager = event.getDamager();
+        LivingEntity target = (LivingEntity) event.getEntity();
+        EntityType damagerType = damager.getType();
+        EntityType targetType = target.getType();
+
+        switch (damagerType) {
+        case PLAYER:
+            Player attacker = (Player) event.getDamager();
+            ItemStack itemInHand = attacker.getItemInHand();
+            PlayerProfile PPa = Users.getProfile(attacker);
+
+            combatAbilityChecks(attacker);
+
+            if (ItemChecks.isSword(itemInHand) && mcPermissions.getInstance().swords(attacker)) {
+                if (!mcBleedTimer.contains(target) && mcPermissions.getInstance().swordsBleed(attacker)) {
+                    Swords.bleedCheck(attacker, target, plugin);
+                }
+
+                if (PPa.getSerratedStrikesMode()) {
+                    applyAbilityAoE(attacker, target, event.getDamage(), plugin, SkillType.SWORDS);
+                }
+
+                startGainXp(attacker, PPa, target, SkillType.SWORDS, plugin);
+            }
+            else if (ItemChecks.isAxe(itemInHand) && mcPermissions.getInstance().axes(attacker)) {
+                if (mcPermissions.getInstance().axeBonus(attacker)) {
+                    Axes.axesBonus(attacker, event);
+                }
+
+                if (mcPermissions.getInstance().criticalHit(attacker)) {
+                    Axes.axeCriticalCheck(attacker, event);
+                }
+
+                if (mcPermissions.getInstance().impact(attacker)) {
+                    Axes.impact(attacker, target, event);
+                }
+
+                if (PPa.getSkullSplitterMode()) {
+                    applyAbilityAoE(attacker, target, event.getDamage(), plugin, SkillType.AXES);
+                }
+
+                startGainXp(attacker, PPa, target, SkillType.AXES, plugin);
+            }
+            else if (itemInHand.getType().equals(Material.AIR) && mcPermissions.getInstance().unarmed(attacker)) {
+                if (mcPermissions.getInstance().unarmedBonus(attacker)) {
+                    Unarmed.unarmedBonus(PPa, event);
+                }
+
+                if (PPa.getBerserkMode() && mcPermissions.getInstance().berserk(attacker)) {
+                    event.setDamage((int) (event.getDamage() * 1.5));
+                }
+
+                if (targetType.equals(EntityType.PLAYER) && mcPermissions.getInstance().disarm(attacker)) {
+                    Unarmed.disarmProcCheck(PPa, (Player) target);
+                }
+
+                startGainXp(attacker, PPa, target, SkillType.UNARMED, plugin);
+            }
+            else if (itemInHand.getType().equals(Material.BONE) && mcPermissions.getInstance().beastLore(attacker)) {
+                Taming.beastLore(event, target, attacker);
+            }
+            break;
+
+        case WOLF:
+            Wolf wolf = (Wolf) damager;
+
+            if (wolf.isTamed() && wolf.getOwner() instanceof Player) {
+                Player master = (Player) wolf.getOwner();
+                PlayerProfile PPo = Users.getProfile(master);
+
+                if (mcPermissions.getInstance().taming(master)) {
+                    if (mcPermissions.getInstance().fastFoodService(master)) {
+                        Taming.fastFoodService(PPo, wolf, event);
+                    }
+
+                    if (mcPermissions.getInstance().sharpenedclaws(master)) {
+                        Taming.sharpenedClaws(PPo, event);
+                    }
+
+                    if (mcPermissions.getInstance().gore(master)) {
+                        Taming.gore(PPo, event, master, plugin);
+                    }
+
+                    startGainXp(master, PPo, target, SkillType.TAMING, plugin);
+                }
+            }
+            break;
+
+        case ARROW:
+            archeryCheck((EntityDamageByEntityEvent) event, plugin);
+            break;
+
+        default:
+            break;
+        }
+
+        if (targetType.equals(EntityType.PLAYER)) {
+            Swords.counterAttackChecks(event);
+            Acrobatics.dodgeChecks(event);
+        }
     }
-	
+
+    /**
+     * Process combat abilities based on weapon preparation modes.
+     *
+     * @param attacker The player attacking
+     */
+    public static void combatAbilityChecks(Player attacker) {
+        PlayerProfile PPa = Users.getProfile(attacker);
+
+        if (PPa.getAxePreparationMode()) {
+            Skills.abilityCheck(attacker, SkillType.AXES);
+        }
+        else if (PPa.getSwordsPreparationMode()) {
+            Skills.abilityCheck(attacker, SkillType.SWORDS);
+        }
+        else if (PPa.getFistsPreparationMode()) {
+            Skills.abilityCheck(attacker, SkillType.UNARMED);
+        }
+    }
+
+    /**
+     * Process archery abilities.
+     *
+     * @param event The event to run the archery checks on.
+     * @param pluginx mcMMO plugin instance
+     */
+    public static void archeryCheck(EntityDamageByEntityEvent event, mcMMO pluginx) {
+        Arrow arrow = (Arrow) event.getDamager();
+        LivingEntity shooter = arrow.getShooter();
+        LivingEntity target = (LivingEntity) event.getEntity();
+
+        if (target instanceof Player) {
+            Player defender = (Player) target;
+
+            if (mcPermissions.getInstance().unarmed(defender) && defender.getItemInHand().getType().equals(Material.AIR)) {
+                Unarmed.deflectCheck(defender, event);
+            }
+        }
+
+        if (shooter instanceof Player) {
+            Player attacker = (Player) shooter;
+            PlayerProfile PPa = Users.getProfile(attacker);
+            int damage = event.getDamage();
+
+            if (mcPermissions.getInstance().archery(attacker) && damage > 0) {
+                if (mcPermissions.getInstance().trackArrows(attacker)) {
+                    Archery.trackArrows(pluginx, target, PPa);
+                }
+
+                if (mcPermissions.getInstance().ignition(attacker)) {
+                    Archery.ignitionCheck(target, attacker);
+                }
+
+                startGainXp(attacker, PPa, target, SkillType.ARCHERY, pluginx);
+
+                if (target instanceof Player) {
+                    Player defender = (Player) target;
+                    PlayerProfile PPd = Users.getProfile(defender);
+
+                    if (PPa.inParty() && PPd.inParty() && Party.getInstance().inSameParty(defender, attacker)) {
+                        event.setCancelled(true);
+                        return;
+                    }
+
+                    Archery.dazeCheck(defender, 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);
+    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());
+    private static void dealDamage(LivingEntity target, int dmg, DamageCause cause) {
+        if (LoadProperties.eventCallback) {
+            EntityDamageEvent ede = (EntityDamageEvent) new FakeEntityDamageEvent(target, cause, dmg);
+            Bukkit.getPluginManager().callEvent(ede);
+
+            if (ede.isCancelled()) {
+                return;
+            }
+
+            target.damage(ede.getDamage());
+        }
+        else {
+            target.damage(dmg);
+        }
     }
-    
+
     /**
      * 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());
+    private static void dealDamage(LivingEntity target, int dmg, Player attacker) {
+        if (LoadProperties.eventCallback) {
+            EntityDamageEvent ede = (EntityDamageByEntityEvent) new FakeEntityDamageByEntityEvent(attacker, target, EntityDamageEvent.DamageCause.ENTITY_ATTACK, dmg);
+            Bukkit.getPluginManager().callEvent(ede);
+
+            if (ede.isCancelled()) {
+                return;
+            }
+
+            target.damage(ede.getDamage());
+        }
+        else {
+            target.damage(dmg);
+        }
     }
-    
-    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;
+
+    /**
+     * Apply Area-of-Effect ability actions.
+     *
+     * @param attacker The attacking player
+     * @param target The defending entity
+     * @param damage The initial damage amount
+     * @param plugin mcMMO plugin instance
+     * @param type The type of skill being used
+     */
+    private static void applyAbilityAoE(Player attacker, LivingEntity target, int damage, mcMMO plugin, SkillType type) {
+        int numberOfTargets = m.getTier(attacker.getItemInHand()); //The higher the weapon tier, the more targets you hit
+        int damageAmount = 0;
+
+        if (type.equals(SkillType.AXES)) {
+            damageAmount = damage / 2;
+        }
+        else if (type.equals(SkillType.SWORDS)) {
+            damageAmount = damage / 4;
+        }
+
+        if (damageAmount < 1) {
+            damageAmount = 1;
+        }
+
+        for (Entity entity : target.getNearbyEntities(2.5, 2.5, 2.5)) {
+            EntityType entityType = entity.getType();
+
+            if (entityType.equals(EntityType.WOLF)) {
+                Wolf wolf = (Wolf) entity;
+                AnimalTamer tamer = wolf.getOwner();
+
+                if (tamer instanceof Player) {
+                    Player owner = (Player) tamer;
+
+                    if (owner.equals(attacker) || Party.getInstance().inSameParty(attacker, owner)) {
+                        continue;
+                    }
+                }
+            }
+
+            if (entity instanceof LivingEntity && numberOfTargets >= 1) {
+                if (entityType.equals(EntityType.PLAYER)) {
+                    Player defender = (Player) entity;
+                    PlayerProfile PP = Users.getProfile(defender);
+
+                    //Reasons why the target shouldn't be hit
+                    if (PP.getGodMode()) {
+                        continue;
+                    }
+
+                    if (defender.getName().equals(attacker.getName())) { //Is this even possible?
+                        continue;
+                    }
+
+                    if (Party.getInstance().inSameParty(attacker, defender)) {
+                        continue;
+                    }
+
+                    if (defender.isDead()) {
+                        continue;
+                    }
+
+                    //Apply effect to players only if PVP is enabled
+                    if (target.getWorld().getPVP()) {
+                        String message = "";
+
+                        if (type.equals(SkillType.AXES)) {
+                            message = mcLocale.getString("Axes.HitByCleave");
+                        }
+                        else if (type.equals(SkillType.SWORDS)) {
+                            message = mcLocale.getString("Swords.HitBySerratedStrikes");
+                        }
+
+                        dealDamage(defender, damageAmount, attacker);
+                        defender.sendMessage(message);
+
+                        if (type.equals(SkillType.SWORDS)) {
+                            PP.addBleedTicks(5);
+                        }
+
+                        numberOfTargets--;
+                    }
+                }
+                else {
+                    LivingEntity livingEntity = (LivingEntity) entity;
+
+                    if (type.equals(SkillType.SWORDS)) {
+                        mcBleedTimer.add(livingEntity);
+                    }
+
+                    dealDamage(livingEntity, damageAmount, attacker);
+                    numberOfTargets--;
+                }
+            }
+        }
     }
-    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;
+
+    /**
+     * Start the task that gives combat XP.
+     *
+     * @param attacker The attacking player
+     * @param PP The player's PlayerProfile
+     * @param target The defending entity
+     * @param skillType The skill being used
+     * @param plugin mcMMO plugin instance
+     */
+    public static void startGainXp(Player attacker, PlayerProfile PP, LivingEntity target, SkillType skillType, mcMMO pluginx) {
+        double baseXP = 0;
+
+        if (target instanceof Player) {
+            if (!LoadProperties.pvpxp) {
+                return;
+            }
+
+            Player defender = (Player) target;
+            PlayerProfile PPd = Users.getProfile(defender);
+
+            if (System.currentTimeMillis() >= (PPd.getRespawnATS() * 1000) + 5000 && ((PPd.getLastLogin() + 5) * 1000) < System.currentTimeMillis() && defender.getHealth() >= 1) {
+                baseXP = 20 * LoadProperties.pvpxprewardmodifier;
+            }
+        }
+        else if (!target.hasMetadata("mcmmoFromMobSpawner")) {
+            if (target instanceof Animals && !target.hasMetadata("mcmmoSummoned")) {
+                baseXP = LoadProperties.animalXP;
+            }
+            else {
+                EntityType type = target.getType();
+
+                switch (type) {
+                case BLAZE:
+                    baseXP = LoadProperties.blazeXP;
+                    break;
+
+                case CAVE_SPIDER:
+                    baseXP = LoadProperties.cavespiderXP;
+                    break;
+
+                case CREEPER:
+                    baseXP = LoadProperties.creeperXP;
+                    break;
+
+                case ENDER_DRAGON:
+                    baseXP = LoadProperties.enderdragonXP;
+                    break;
+
+                case ENDERMAN:
+                    baseXP = LoadProperties.endermanXP;
+                    break;
+
+                case GHAST:
+                    baseXP = LoadProperties.ghastXP;
+                    break;
+
+                case MAGMA_CUBE:
+                    baseXP = LoadProperties.magmacubeXP;
+                    break;
+
+                case PIG_ZOMBIE:
+                    baseXP = LoadProperties.pigzombieXP;
+                    break;
+
+                case SILVERFISH:
+                    baseXP = LoadProperties.silverfishXP;
+                    break;
+
+                case SKELETON:
+                    baseXP = LoadProperties.skeletonXP;
+                    break;
+
+                case SLIME:
+                    baseXP = LoadProperties.slimeXP;
+                    break;
+
+                case SPIDER:
+                    baseXP = LoadProperties.spiderXP;
+                    break;
+
+                case ZOMBIE:
+                    baseXP = LoadProperties.zombieXP;
+                    break;
+
+                default:
+                    break;
+                }
+            }
+
+            baseXP *= 10;
+        }
+
+        if (baseXP != 0) {
+            Bukkit.getScheduler().scheduleSyncDelayedTask(pluginx, new GainXp(attacker, PP, skillType, baseXP, target), 0);
+        }
     }
 }

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

@@ -1,211 +1,302 @@
-/*
-	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.sql.PreparedStatement;
 import java.util.HashMap;
 import java.util.ArrayList;
-import java.sql.PreparedStatement;
+import java.util.Properties;
+
+import org.bukkit.Bukkit;
 
 import com.gmail.nossr50.config.LoadProperties;
+import com.gmail.nossr50.datatypes.DatabaseUpdate;
 
 public class Database {
 
-	private mcMMO plugin;
-	private String connectionString;
+    private String connectionString = "jdbc:mysql://" + LoadProperties.MySQLserverName + ":" + LoadProperties.MySQLport + "/" + LoadProperties.MySQLdbName + "?user=" + LoadProperties.MySQLuserName + "&password=" + LoadProperties.MySQLdbPass;
+    private Connection conn = null;
+    private mcMMO plugin = null;
+    private long reconnectTimestamp = 0;
 
-	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 Database(mcMMO instance) {
+        plugin = instance;
+        connect(); //Connect to MySQL
 
-	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;
-		}
-	}
+        // Load the driver instance
+        try {
+            Class.forName("com.mysql.jdbc.Driver");
+            DriverManager.getConnection(connectionString);
+        }
+        catch (ClassNotFoundException e) {
+            Bukkit.getLogger().warning(e.getLocalizedMessage());
+        }
+        catch (SQLException ex) {
+            Bukkit.getLogger().warning(ex.getLocalizedMessage());
+            printErrors(ex);
+        }
+    }
 
-	// 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());
-		}
+    /**
+     * Attempt to connect to the mySQL database.
+     */
+    public void connect() {
+        try {
+            System.out.println("[mcMMO] Attempting connection to MySQL...");
+            Properties conProperties = new Properties();
+            conProperties.put("autoReconnect", "false");
+            conProperties.put("maxReconnects", "0");
+            conn = DriverManager.getConnection(connectionString, conProperties);
+            System.out.println("[mcMMO] Connection to MySQL was a success!");
+        }
+        catch (SQLException ex) {
+            System.out.println("[mcMMO] Connection to MySQL failed!");
+            ex.printStackTrace();
+            printErrors(ex);
+        }
+    }
 
-		return result;
-	}
+    /**
+     * Attempt to create the database 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',"
+                + "`blast_mining` 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;");
 
-	// 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;
-	}
-}
+        checkDatabaseStructure(DatabaseUpdate.FISHING);
+        checkDatabaseStructure(DatabaseUpdate.BLAST_MINING);
+    }
+
+    /**
+     * Check database structure for missing values.
+     *
+     * @param update Type of data to check updates for
+     */
+    public void checkDatabaseStructure(DatabaseUpdate update) {
+        String sql = null;
+        ResultSet rs = null;
+        HashMap<Integer, ArrayList<String>> Rows = new HashMap<Integer, ArrayList<String>>();
+
+        switch (update) {
+        case BLAST_MINING:
+            sql = "SELECT * FROM  `"+LoadProperties.MySQLtablePrefix+"cooldowns` ORDER BY  `"+LoadProperties.MySQLtablePrefix+"cooldowns`.`blast_mining` ASC LIMIT 0 , 30";
+            break;
+        case FISHING:
+            sql = "SELECT * FROM  `"+LoadProperties.MySQLtablePrefix+"experience` ORDER BY  `"+LoadProperties.MySQLtablePrefix+"experience`.`fishing` ASC LIMIT 0 , 30";
+            break;
+        default:
+            break;
+        }
+
+        try {
+            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);
+                }
+            }
+        }
+        catch (SQLException ex) {
+            if (update.equals(DatabaseUpdate.BLAST_MINING)) {
+                System.out.println("Updating mcMMO MySQL tables for Blast Mining...");
+                write("ALTER TABLE `"+LoadProperties.MySQLtablePrefix + "cooldowns` ADD `blast_mining` int(32) NOT NULL DEFAULT '0' ;");
+            }
+            else if (update.equals(DatabaseUpdate.FISHING)) {
+                System.out.println("Updating mcMMO MySQL tables for Fishing...");
+                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' ;");
+            }
+        }
+    }
+
+    /**
+     * Attempt to write the SQL query.
+     *
+     * @param sql Query to write.
+     * @return true if the query was successfully written, false otherwise.
+     */
+    public boolean write(String sql) {
+        if (isConnected()) {
+            try {
+                PreparedStatement stmt = conn.prepareStatement(sql);
+                stmt.executeUpdate();
+                return true;
+            }
+            catch (SQLException ex) {
+                printErrors(ex);
+                return false;
+            }
+        }
+        else {
+            attemptReconnect();
+        }
+        return false;
+    }
+
+    /**
+     * Get the Integer. Only return first row / first field.
+     *
+     * @param sql SQL query to execute
+     * @return the value in the first row / first field
+     */
+    public Integer getInt(String sql) {
+        ResultSet rs = null;
+        Integer result = 0;
+
+        if (isConnected()) {
+            try {
+                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;
+                    }
+                }
+            }
+            catch (SQLException ex) {
+                printErrors(ex);
+            }
+        }
+        else {
+            attemptReconnect();
+        }
+        return result;
+    }
+    
+    /**
+     * Get connection status
+     * 
+     * @return the boolean value for whether or not we are connected
+     */
+    public boolean isConnected() {
+        if(conn == null)
+            return false;
+        
+        try {
+            return conn.isValid(3);
+        } catch (SQLException e) {
+            return false;
+        }
+    }
+    
+    /**
+     * Schedules a Sync Delayed Task with the Bukkit Scheduler to attempt reconnection after a minute has elapsed
+     * This will check for a connection being present or not to prevent unneeded reconnection attempts
+     */
+    public void attemptReconnect() {
+        if(reconnectTimestamp+60000 < System.currentTimeMillis()) //Only reconnect if another attempt hasn't been made recently
+        {
+            System.out.println("[mcMMO] Connection to MySQL was lost! Attempting to reconnect in 60 seconds...");
+            reconnectTimestamp = System.currentTimeMillis();
+            Bukkit.getScheduler().scheduleSyncDelayedTask(plugin,     
+            new Runnable() {
+                public void run() {
+                    if (!isConnected()) {
+                        connect();
+                    }
+                }
+            }, 20*60);
+        }
+    }
+
+    /**
+     * Read SQL query.
+     *
+     * @param sql SQL query to read
+     * @return the rows in this SQL query
+     */
+    public HashMap<Integer, ArrayList<String>> read(String sql) {
+        ResultSet rs = null;
+        HashMap<Integer, ArrayList<String>> Rows = new HashMap<Integer, ArrayList<String>>();
+
+        if (isConnected()) {
+            try {
+                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);
+                    }
+                }
+            }
+            catch (SQLException ex) {
+                printErrors(ex);
+            }
+        }
+        else {
+            attemptReconnect();
+        }
+        return Rows;
+    }
+
+    private static void printErrors(SQLException ex) {
+        System.out.println("SQLException: " + ex.getMessage());
+        System.out.println("SQLState: " + ex.getSQLState());
+        System.out.println("VendorError: " + ex.getErrorCode());
+    }
+}

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

@@ -1,104 +1,64 @@
-/*
-	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.ChatColor;
 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.locale.mcLocale;
+import com.gmail.nossr50.skills.Skills;
+import com.gmail.nossr50.config.LoadProperties;
 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$
-    		}
-    	}
-	}
+
+    /**
+     * Check for item usage.
+     *
+     * @param player Player whose item usage to check
+     */
+    public static void itemchecks(Player player) {
+        ItemStack inhand = player.getItemInHand();
+
+        if (LoadProperties.chimaeraWingEnable && inhand.getTypeId() == LoadProperties.chimaeraId) {
+            chimaerawing(player);
+        }
+    }
+
+    private static void chimaerawing(Player player) {
+        PlayerProfile PP = Users.getProfile(player);
+        ItemStack is = player.getItemInHand();
+        Block block = player.getLocation().getBlock();
+        int amount = is.getAmount();
+
+        if (mcPermissions.getInstance().chimaeraWing(player) && is.getTypeId() == LoadProperties.chimaeraId) {
+            if (Skills.cooldownOver(PP.getRecentlyHurt(), 60) && amount >= LoadProperties.feathersConsumedByChimaeraWing) {
+                player.setItemInHand(new ItemStack(LoadProperties.chimaeraId, amount - LoadProperties.feathersConsumedByChimaeraWing));
+
+                for (int y = 0; block.getY() + y < player.getWorld().getMaxHeight(); y++) {
+                    if (!block.getRelative(0, y, 0).getType().equals(Material.AIR)) {
+                        player.sendMessage(mcLocale.getString("Item.ChimaeraWingFail"));
+                        player.teleport(block.getRelative(0, y - 1, 0).getLocation());
+                        return;
+                    }
+                }
+
+                if (player.getBedSpawnLocation() != null && player.getBedSpawnLocation().getBlock().getType().equals(Material.BED_BLOCK)) {
+                    player.teleport(player.getBedSpawnLocation());
+                }
+                else {
+                    player.teleport(player.getWorld().getSpawnLocation());
+                }
+
+                player.sendMessage(mcLocale.getString("Item.ChimaeraWingPass"));
+            }
+            else if (!Skills.cooldownOver(PP.getRecentlyHurt(), 60) && is.getAmount() >= LoadProperties.feathersConsumedByChimaeraWing) {
+                player.sendMessage(mcLocale.getString("Item.InjuredWait", new Object[] {Skills.calculateTimeLeft(PP.getRecentlyHurt(), 60)}));
+            }
+            else if (is.getAmount() <= LoadProperties.feathersConsumedByChimaeraWing) {
+                player.sendMessage(mcLocale.getString("Skills.NeedMore")+ " " + ChatColor.GRAY + m.prettyItemString(LoadProperties.chimaeraId));
+            }
+        }
+    }
 }

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

@@ -0,0 +1,380 @@
+package com.gmail.nossr50;
+
+import org.bukkit.Material;
+import org.bukkit.inventory.ItemStack;
+
+public class ItemChecks {
+
+    /**
+     * Checks if the item is a sword.
+     *
+     * @param is Item to check
+     * @return true if the item is a sword, false otherwise
+     */
+    public static boolean isSword(ItemStack is) {
+        switch (is.getType()) {
+        case DIAMOND_SWORD:
+        case GOLD_SWORD:
+        case IRON_SWORD:
+        case STONE_SWORD:
+        case WOOD_SWORD:
+            return true;
+
+        default:
+            return false;
+        }
+    }
+
+    /**
+     * Checks if the item is a hoe.
+     *
+     * @param is Item to check
+     * @return true if the item is a hoe, false otherwise
+     */
+    public static boolean isHoe(ItemStack is) {
+        switch (is.getType()) {
+        case DIAMOND_HOE:
+        case GOLD_HOE:
+        case IRON_HOE:
+        case STONE_HOE:
+        case WOOD_HOE:
+            return true;
+
+        default:
+            return false;
+        }
+    }
+
+    /**
+     * Checks if the item is a shovel.
+     *
+     * @param is Item to check
+     * @return true if the item is a shovel, false otherwise
+     */
+    public static boolean isShovel(ItemStack is) {
+        switch (is.getType()) {
+        case DIAMOND_SPADE:
+        case GOLD_SPADE:
+        case IRON_SPADE:
+        case STONE_SPADE:
+        case WOOD_SPADE:
+            return true;
+
+        default:
+            return false;
+        }
+    }
+
+    /**
+     * Checks if the item is an axe.
+     *
+     * @param is Item to check
+     * @return true if the item is an axe, false otherwise
+     */
+    public static boolean isAxe(ItemStack is) {
+        switch (is.getType()) {
+        case DIAMOND_AXE:
+        case GOLD_AXE:
+        case IRON_AXE:
+        case STONE_AXE:
+        case WOOD_AXE:
+            return true;
+
+        default:
+            return false;
+        }
+    }
+
+    /**
+     * Checks if the item is a pickaxe.
+     *
+     * @param is Item to check
+     * @return true if the item is a pickaxe, false otherwise
+     */
+    public static boolean isMiningPick(ItemStack is) {
+        switch (is.getType()) {
+        case DIAMOND_PICKAXE:
+        case GOLD_PICKAXE:
+        case IRON_PICKAXE:
+        case STONE_PICKAXE:
+        case WOOD_PICKAXE:
+            return true;
+
+        default:
+            return false;
+        }
+    }
+
+    /**
+     * Checks if the item is a helmet.
+     *
+     * @param is Item to check
+     * @return true if the item is a helmet, false otherwise
+     */
+    public static boolean isHelmet(ItemStack is) {
+        switch (is.getType()) {
+        case DIAMOND_HELMET:
+        case GOLD_HELMET:
+        case IRON_HELMET:
+        case LEATHER_HELMET:
+            return true;
+
+        default:
+            return false;
+        }
+    }
+
+    /**
+     * Checks if the item is a chestplate.
+     *
+     * @param is Item to check
+     * @return true if the item is a chestplate, false otherwise
+     */
+    public static boolean isChestplate(ItemStack is) {
+        switch (is.getType()) {
+        case DIAMOND_CHESTPLATE:
+        case GOLD_CHESTPLATE:
+        case IRON_CHESTPLATE:
+        case LEATHER_CHESTPLATE:
+            return true;
+
+        default:
+            return false;
+        }
+    }
+
+    /**
+     * Checks if the item is a pair of pants.
+     *
+     * @param is Item to check
+     * @return true if the item is a pair of pants, false otherwise
+     */
+    public static boolean isPants(ItemStack is) {
+        switch (is.getType()) {
+        case DIAMOND_LEGGINGS:
+        case GOLD_LEGGINGS:
+        case IRON_LEGGINGS:
+        case LEATHER_LEGGINGS:
+            return true;
+
+        default:
+            return false;
+        }
+    }
+
+    /**
+     * Checks if the item is a pair of boots.
+     *
+     * @param is Item to check
+     * @return true if the item is a pair of boots, false otherwise
+     */
+    public static boolean isBoots(ItemStack is) {
+        switch (is.getType()) {
+        case DIAMOND_BOOTS:
+        case GOLD_BOOTS:
+        case IRON_BOOTS:
+        case LEATHER_BOOTS:
+            return true;
+
+        default:
+            return false;
+        }
+    }
+
+    /**
+     * Checks to see if an item is a wearable armor piece.
+     *
+     * @param is Item to check
+     * @return true if the item is armor, false otherwise
+     */
+    public static boolean isArmor(ItemStack is) {
+        return isLeatherArmor(is) || isGoldArmor(is) || isIronArmor(is) || isDiamondArmor(is);
+    }
+
+    /**
+     * Checks to see if an item is a leather armor piece.
+     *
+     * @param is Item to check
+     * @return true if the item is leather armor, false otherwise
+     */
+    public static boolean isLeatherArmor(ItemStack is) {
+        switch (is.getType()) {
+        case LEATHER_BOOTS:
+        case LEATHER_CHESTPLATE:
+        case LEATHER_HELMET:
+        case LEATHER_LEGGINGS:
+            return true;
+
+        default:
+            return false;
+        }
+    }
+
+    /**
+     * Checks to see if an item is a gold armor piece.
+     *
+     * @param is Item to check
+     * @return true if the item is gold armor, false otherwise
+     */
+    public static boolean isGoldArmor(ItemStack is) {
+        switch (is.getType()) {
+        case GOLD_BOOTS:
+        case GOLD_CHESTPLATE:
+        case GOLD_HELMET:
+        case GOLD_LEGGINGS:
+            return true;
+
+        default:
+            return false;
+        }
+    }
+
+    /**
+     * Checks to see if an item is an iron armor piece.
+     *
+     * @param is Item to check
+     * @return true if the item is iron armor, false otherwise
+     */
+    public static boolean isIronArmor(ItemStack is) {
+        switch (is.getType()) {
+        case IRON_BOOTS:
+        case IRON_CHESTPLATE:
+        case IRON_HELMET:
+        case IRON_LEGGINGS:
+            return true;
+
+        default:
+            return false;
+        }
+    }
+
+    /**
+     * Checks to see if an item is a diamond armor piece.
+     *
+     * @param is Item to check
+     * @return true if the item is diamond armor, false otherwise
+     */
+    public static boolean isDiamondArmor(ItemStack is) {
+        switch (is.getType()) {
+        case DIAMOND_BOOTS:
+        case DIAMOND_CHESTPLATE:
+        case DIAMOND_HELMET:
+        case DIAMOND_LEGGINGS:
+            return true;
+
+        default:
+            return false;
+        }
+    }
+
+    /**
+     * Checks to see if an item is a tool.
+     *
+     * @param is Item to check
+     * @return true if the item is a tool, false otherwise
+     */
+    public static boolean isTool(ItemStack is) {
+        return isStoneTool(is) || isWoodTool(is) || isGoldTool(is) || isIronTool(is) || isDiamondTool(is) || is.getType().equals(Material.BOW);
+    }
+
+    /**
+     * Checks to see if an item is a stone tool.
+     *
+     * @param is Item to check
+     * @return true if the item is a stone tool, false otherwise
+     */
+    public static boolean isStoneTool(ItemStack is) {
+        switch (is.getType()) {
+        case STONE_AXE:
+        case STONE_HOE:
+        case STONE_PICKAXE:
+        case STONE_SPADE:
+        case STONE_SWORD:
+            return true;
+
+        default:
+            return false;
+        }
+    }
+
+    /**
+     * Checks to see if an item is a wooden tool.
+     *
+     * @param is Item to check
+     * @return true if the item is a wooden tool, false otherwise
+     */
+    public static boolean isWoodTool(ItemStack is) {
+        switch (is.getType()) {
+        case WOOD_AXE:
+        case WOOD_HOE:
+        case WOOD_PICKAXE:
+        case WOOD_SPADE:
+        case WOOD_SWORD:
+            return true;
+
+        default:
+            return false;
+        }
+    }
+
+    /**
+     * Checks to see if an item is a gold tool.
+     *
+     * @param is Item to check
+     * @return true if the item is a stone tool, false otherwise
+     */
+    public static boolean isGoldTool(ItemStack is) {
+        switch (is.getType()) {
+        case GOLD_AXE:
+        case GOLD_HOE:
+        case GOLD_PICKAXE:
+        case GOLD_SPADE:
+        case GOLD_SWORD:
+            return true;
+
+        default:
+            return false;
+        }
+    }
+
+    /**
+     * Checks to see if an item is an iron tool.
+     *
+     * @param is Item to check
+     * @return true if the item is an iron tool, false otherwise
+     */
+    public static boolean isIronTool(ItemStack is) {
+        switch (is.getType()) {
+        case IRON_AXE:
+        case IRON_HOE:
+        case IRON_PICKAXE:
+        case IRON_SPADE:
+        case IRON_SWORD:
+        case SHEARS:
+            return true;
+
+        default:
+            return false;
+        }
+    }
+
+    /**
+     * Checks to see if an item is a diamond tool.
+     *
+     * @param is Item to check
+     * @return true if the item is a diamond tool, false otherwise
+     */
+    public static boolean isDiamondTool(ItemStack is) {
+        switch (is.getType()) {
+        case DIAMOND_AXE:
+        case DIAMOND_HOE:
+        case DIAMOND_PICKAXE:
+        case DIAMOND_SPADE:
+        case DIAMOND_SWORD:
+            return true;
+
+        default:
+            return false;
+        }
+    }
+}

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

@@ -1,19 +1,3 @@
-/*
-	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;
@@ -22,258 +6,286 @@ 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 org.bukkit.Bukkit;
 
 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);
+public class Leaderboard {
+    static String location = "plugins/mcMMO/FlatFileStuff/mcmmo.users";
 
-    			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$
+    /**
+     * Create the leaderboards.
+     */
+    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 PowerLevel = new Tree();
+
+        //Add Data To Trees
+        try {
+            FileReader file = new FileReader(location);
+            BufferedReader in = new BufferedReader(file);
+            String line = "";
+            ArrayList<String> players = new ArrayList<String>();
+
+            while ((line = in.readLine()) != null) {
+                String[] character = line.split(":");
+                String p = character[0];
+                int powerLevel = 0;
+
+                //Prevent the same player from being added multiple times
+                if (players.contains(p)) {
+                    continue;
+                }
+                else {
+                    players.add(p);
+                }
+
+                if (character.length > 1 && m.isInt(character[1])) {
+                    Mining.add(p, Integer.valueOf(character[1]));
+                    powerLevel += Integer.valueOf(character[1]);
+                }
+
+                if (character.length > 5 && m.isInt(character[5])) {
+                    WoodCutting.add(p, Integer.valueOf(character[5]));
+                    powerLevel += Integer.valueOf(character[5]);
+                }
+
+                if (character.length > 7 && m.isInt(character[7])) {
+                    Repair.add(p, Integer.valueOf(character[7]));
+                    powerLevel += Integer.valueOf(character[7]);
+                }
+
+                if (character.length > 8 && m.isInt(character[8])) {
+                    Unarmed.add(p, Integer.valueOf(character[8]));
+                    powerLevel += Integer.valueOf(character[8]);
+                }
+
+                if (character.length > 9 && m.isInt(character[9])) {
+                    Herbalism.add(p, Integer.valueOf(character[9]));
+                    powerLevel += Integer.valueOf(character[9]);
+                }
+
+                if (character.length > 10 && m.isInt(character[10])) {
+                    Excavation.add(p, Integer.valueOf(character[10]));
+                    powerLevel += Integer.valueOf(character[10]);
+                }
+
+                if (character.length > 11 && m.isInt(character[11])) {
+                    Archery.add(p, Integer.valueOf(character[11]));
+                    powerLevel += Integer.valueOf(character[11]);
+                }
+
+                if (character.length > 12 && m.isInt(character[12])) {
+                    Swords.add(p, Integer.valueOf(character[12]));
+                    powerLevel += Integer.valueOf(character[12]);
+                }
+
+                if (character.length > 13 && m.isInt(character[13])) {
+                    Axes.add(p, Integer.valueOf(character[13]));
+                    powerLevel += Integer.valueOf(character[13]);
+                }
+
+                if (character.length > 14 && m.isInt(character[14])) {
+                    Acrobatics.add(p, Integer.valueOf(character[14]));
+                    powerLevel += Integer.valueOf(character[14]);
+                }
+
+                if (character.length > 24 && m.isInt(character[24])) {
+                    Taming.add(p, Integer.valueOf(character[24]));
+                    powerLevel += Integer.valueOf(character[24]);
+                }
+
+                if (character.length > 34 && m.isInt(character[34])) {
+                    Fishing.add(p, Integer.valueOf(character[34]));
+                    powerLevel += Integer.valueOf(character[34]);
+                }
+
+                PowerLevel.add(p, powerLevel);
+            }
+            in.close();
         }
+        catch (Exception e) {
+            Bukkit.getLogger().severe(("Exception while reading " + location + " (Are you sure you formatted it correctly?)" + e.toString()));
+        }
+
         //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$
+        leaderWrite(Mining.inOrder(), SkillType.MINING);
+        leaderWrite(WoodCutting.inOrder(), SkillType.WOODCUTTING);
+        leaderWrite(Repair.inOrder(), SkillType.REPAIR);
+        leaderWrite(Unarmed.inOrder(), SkillType.UNARMED);
+        leaderWrite(Herbalism.inOrder(), SkillType.HERBALISM);
+        leaderWrite(Excavation.inOrder(), SkillType.EXCAVATION);
+        leaderWrite(Archery.inOrder(), SkillType.ARCHERY);
+        leaderWrite(Swords.inOrder(), SkillType.SWORDS);
+        leaderWrite(Axes.inOrder(), SkillType.AXES);
+        leaderWrite(Acrobatics.inOrder(), SkillType.ACROBATICS);
+        leaderWrite(Taming.inOrder(), SkillType.TAMING);
+        leaderWrite(Fishing.inOrder(), SkillType.FISHING);
+        leaderWrite(PowerLevel.inOrder(), SkillType.ALL);
+    }
+
+    /**
+     * Write to the leaderboards.
+     *
+     * @param ps Stats to write to the leaderboard
+     * @param skillType Skill type to write the leaderboard of
+     */
+    private static void leaderWrite(PlayerStat[] ps, SkillType skillType) {
+        String theLocation = "plugins/mcMMO/FlatFileStuff/Leaderboards/" + skillType + ".mcmmo";
+        File theDir = new File(theLocation); 
+
+        //CHECK IF THE FILE EXISTS
+        if (!theDir.exists()) {
+            FileWriter writer = null;
+
+            try {
+                writer = new FileWriter(theLocation);
+            }
+            catch (Exception e) {
+                Bukkit.getLogger().severe(("Exception while creating " + theLocation + e.toString()));
+            }
+            finally {
+                try {
+                    if (writer != null) {
+                        writer.close();
+                    }
+                }
+                catch (IOException e) {
+                    Bukkit.getLogger().severe("Exception while closing writer for " + theLocation + e.toString());
+                }
+            }
         }
+        else {
+            try {
+                FileReader file = new FileReader(theLocation);
+                BufferedReader in = new BufferedReader(file);
+                StringBuilder writer = new StringBuilder();
+
+                for (PlayerStat p : ps) {
+                    if (p.name.equals("$mcMMO_DummyInfo")) {
+                        continue;
+                    }
+
+                    if (p.statVal == 0) {
+                        continue;
+                    }
+
+                    writer.append(p.name + ":" + p.statVal);
+                    writer.append("\r\n");
+                }
+
+                in.close();
+                FileWriter out = new FileWriter(theLocation);
+                out.write(writer.toString());
+                out.close();
+            }
+            catch (Exception e) {
+                Bukkit.getLogger().severe("Exception while writing to " + theLocation + " (Are you sure you formatted it correctly?)" + e.toString());
+            }
+        }
+    }
+
+    /**
+     * Retrieve leaderboard info.
+     *
+     * @param skillName Skill to retrieve info on.
+     * @param pagenumber Which page in the leaderboards to retrieve
+     * @return the requested leaderboard information
+     */
+    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 = "";
+            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) {
+            Bukkit.getLogger().severe("Exception while reading " + theLocation + " (Are you sure you formatted it correctly?)" + e.toString());
+        }
+
         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);
+    }
+
+    /**
+     * Update the leaderboards.
+     *
+     * @param ps Stats to update the leaderboard with.
+     * @param skillType Skill whose leaderboard is being updated.
+     */
+    public static void updateLeaderboard(PlayerStat ps, SkillType skillType) {
+        if (LoadProperties.useMySQL) {
+            return;
+        }
+
+        String theLocation = "plugins/mcMMO/FlatFileStuff/Leaderboards/" + skillType + ".mcmmo";
+
+        try {
+            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
+            String line = "";
+            Boolean inserted = false;
+
+            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) {
+                    writer.append(ps.name + ":" + ps.statVal).append("\r\n");
+                    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)) {
+                    writer.append(line).append("\r\n");
+                }
+            }
+
+            if(!inserted) {
+                writer.append(ps.name + ":" + ps.statVal).append("\r\n");
+            }
+
+            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$
         }
-	}
+        catch (Exception e) {
+            Bukkit.getLogger().severe("Exception while writing to " + theLocation + " (Are you sure you formatted it correctly?)" + e.toString());
+        }
+    }
 }

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

@@ -0,0 +1,541 @@
+package com.gmail.nossr50;
+
+import org.bukkit.Bukkit;
+import org.bukkit.configuration.file.YamlConfiguration;
+import org.bukkit.plugin.Plugin;
+import org.bukkit.plugin.PluginDescriptionFile;
+
+import java.io.BufferedReader;
+import java.io.File;
+import java.io.IOException;
+import java.io.InputStreamReader;
+import java.io.OutputStreamWriter;
+import java.io.UnsupportedEncodingException;
+import java.net.Proxy;
+import java.net.URL;
+import java.net.URLConnection;
+import java.net.URLEncoder;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.LinkedHashSet;
+import java.util.Map;
+import java.util.Set;
+import java.util.UUID;
+
+public class Metrics {
+
+    /**
+     * The current revision number
+     */
+    private final static int REVISION = 5;
+
+    /**
+     * The base url of the metrics domain
+     */
+    private static final String BASE_URL = "http://metrics.griefcraft.com";
+
+    /**
+     * The url used to report a server's status
+     */
+    private static final String REPORT_URL = "/report/%s";
+
+    /**
+     * The file where guid and opt out is stored in
+     */
+    private static final String CONFIG_FILE = "plugins/PluginMetrics/config.yml";
+
+    /**
+     * The separator to use for custom data. This MUST NOT change unless you are hosting your own
+     * version of metrics and want to change it.
+     */
+    private static final String CUSTOM_DATA_SEPARATOR = "~~";
+
+    /**
+     * Interval of time to ping (in minutes)
+     */
+    private final static int PING_INTERVAL = 10;
+
+    /**
+     * A map of all of the graphs for each plugin
+     */
+    private Map<Plugin, Set<Graph>> graphs = Collections.synchronizedMap(new HashMap<Plugin, Set<Graph>>());
+
+    /**
+     * A convenient map of the default Graph objects (used by addCustomData mainly)
+     */
+    private Map<Plugin, Graph> defaultGraphs = Collections.synchronizedMap(new HashMap<Plugin, Graph>());
+
+    /**
+     * The plugin configuration file
+     */
+    private final YamlConfiguration configuration;
+
+    /**
+     * Unique server id
+     */
+    private String guid;
+
+    public Metrics() throws IOException {
+        // load the config
+        File file = new File(CONFIG_FILE);
+        configuration = YamlConfiguration.loadConfiguration(file);
+
+        // add some defaults
+        configuration.addDefault("opt-out", false);
+        configuration.addDefault("guid", UUID.randomUUID().toString());
+
+        // Do we need to create the file?
+        if (configuration.get("guid", null) == null) {
+            configuration.options().header("http://metrics.griefcraft.com").copyDefaults(true);
+            configuration.save(file);
+        }
+
+        // Load the guid then
+        guid = configuration.getString("guid");
+    }
+
+    /**
+     * Construct and create a Graph that can be used to separate specific plotters to their own graphs
+     * on the metrics website. Plotters can be added to the graph object returned.
+     *
+     * @param plugin
+     * @param type
+     * @param name
+     * @return Graph object created. Will never return NULL under normal circumstances unless bad parameters are given
+     */
+    public Graph createGraph(Plugin plugin, Graph.Type type, String name) {
+        if (plugin == null || type == null || name == null) {
+            throw new IllegalArgumentException("All arguments must not be null");
+        }
+
+        // Construct the graph object
+        Graph graph = new Graph(type, name);
+
+        // Get the graphs for the plugin
+        Set<Graph> graphs = getOrCreateGraphs(plugin);
+
+        // Now we can add our graph
+        graphs.add(graph);
+
+        // and return back
+        return graph;
+    }
+
+    /**
+     * Adds a custom data plotter for a given plugin
+     *
+     * @param plugin
+     * @param plotter
+     */
+    public void addCustomData(Plugin plugin, Plotter plotter) {
+        // The default graph for the plugin
+        Graph graph = getOrCreateDefaultGraph(plugin);
+
+        // Add the plotter to the graph o/
+        graph.addPlotter(plotter);
+
+        // Ensure the default graph is included in the submitted graphs
+        getOrCreateGraphs(plugin).add(graph);
+    }
+
+    /**
+     * Begin measuring a plugin
+     *
+     * @param plugin
+     */
+    public void beginMeasuringPlugin(final Plugin plugin) {
+        // Did we opt out?
+        if (configuration.getBoolean("opt-out", false)) {
+            return;
+        }
+
+        // Begin hitting the server with glorious data
+        plugin.getServer().getScheduler().scheduleAsyncRepeatingTask(plugin, new Runnable() {
+            private boolean firstPost = true;
+
+            public void run() {
+                try {
+                    // We use the inverse of firstPost because if it is the first time we are posting,
+                    // it is not a interval ping, so it evaluates to FALSE
+                    // Each time thereafter it will evaluate to TRUE, i.e PING!
+                    postPlugin(plugin, !firstPost);
+
+                    // After the first post we set firstPost to false
+                    // Each post thereafter will be a ping
+                    firstPost = false;
+                } catch (IOException e) {
+                    System.out.println("[Metrics] " + e.getMessage());
+                }
+            }
+        }, 0, PING_INTERVAL * 1200);
+    }
+
+    /**
+     * Generic method that posts a plugin to the metrics website
+     *
+     * @param plugin
+     */
+    private void postPlugin(Plugin plugin, boolean isPing) throws IOException {
+        // The plugin's description file containg all of the plugin data such as name, version, author, etc
+        PluginDescriptionFile description = plugin.getDescription();
+
+        // The author string, created with description.getAuthors()
+        // Authors are separated by a comma
+        String authors = "";
+
+        // Add each author to the string
+        for (String author : description.getAuthors()) {
+            authors += author + ", ";
+        }
+
+        // If there were any authors at all, we need to remove the last 2 characters
+        // the last 2 characters are the last comma and space
+        if (!authors.isEmpty()) {
+            authors = authors.substring(0, authors.length() - 2);
+        }
+
+        // Construct the post data
+        String data = encode("guid") + '=' + encode(guid)
+                + encodeDataPair("authors", authors)
+                + encodeDataPair("version", description.getVersion())
+                + encodeDataPair("server", Bukkit.getVersion())
+                + encodeDataPair("players", Integer.toString(Bukkit.getServer().getOnlinePlayers().length))
+                + encodeDataPair("revision", String.valueOf(REVISION));
+
+        // If we're pinging, append it
+        if (isPing) {
+            data += encodeDataPair("ping", "true");
+        }
+
+        // Add any custom data available for the plugin
+        Set<Graph> graphs = getOrCreateGraphs(plugin);
+
+        // Acquire a lock on the graphs, which lets us make the assumption we also lock everything
+        // inside of the graph (e.g plotters)
+        synchronized(graphs) {
+            Iterator<Graph> iter = graphs.iterator();
+
+            while (iter.hasNext()) {
+                Graph graph = iter.next();
+
+                // Because we have a lock on the graphs set already, it is reasonable to assume
+                // that our lock transcends down to the individual plotters in the graphs also.
+                // Because our methods are private, no one but us can reasonably access this list
+                // without reflection so this is a safe assumption without adding more code.
+                for (Plotter plotter : graph.getPlotters()) {
+                    // The key name to send to the metrics server
+                    // The format is C-GRAPHNAME-PLOTTERNAME where separator - is defined at the top
+                    // Legacy (R4) submitters use the format Custom%s, or CustomPLOTTERNAME
+                    String key = String.format("C%s%s%s%s", CUSTOM_DATA_SEPARATOR, graph.getName(), CUSTOM_DATA_SEPARATOR, plotter.getColumnName());
+
+                    // The value to send, which for the foreseeable future is just the string
+                    // value of plotter.getValue()
+                    String value = Integer.toString(plotter.getValue());
+
+                    // Add it to the http post data :)
+                    data += encodeDataPair(key, value);
+                }
+            }
+        }
+
+        // Create the url
+        URL url = new URL(BASE_URL + String.format(REPORT_URL, plugin.getDescription().getName()));
+
+        // Connect to the website
+        URLConnection connection;
+
+        // Mineshafter creates a socks proxy, so we can safely bypass it
+        // It does not reroute POST requests so we need to go around it
+        if (isMineshafterPresent()) {
+            connection = url.openConnection(Proxy.NO_PROXY);
+        } else {
+            connection = url.openConnection();
+        }
+
+        connection.setDoOutput(true);
+
+        // Write the data
+        OutputStreamWriter writer = new OutputStreamWriter(connection.getOutputStream());
+        writer.write(data);
+        writer.flush();
+
+        // Now read the response
+        BufferedReader reader = new BufferedReader(new InputStreamReader(connection.getInputStream()));
+        String response = reader.readLine();
+
+        // close resources
+        writer.close();
+        reader.close();
+
+        if (response.startsWith("ERR")) {
+            throw new IOException(response); //Throw the exception
+        } else {
+            // Is this the first update this hour?
+            if (response.contains("OK This is your first update this hour")) {
+                synchronized (graphs) {
+                    Iterator<Graph> iter = graphs.iterator();
+
+                    while (iter.hasNext()) {
+                        Graph graph = iter.next();
+
+                        for (Plotter plotter : graph.getPlotters()) {
+                            plotter.reset();
+                        }
+                    }
+                }
+            }
+        }
+        //if (response.startsWith("OK")) - We should get "OK" followed by an optional description if everything goes right
+    }
+
+    /**
+     * Get or create the Set of graphs for a specific plugin
+     *
+     * @param plugin
+     * @return
+     */
+    private Set<Graph> getOrCreateGraphs(Plugin plugin) {
+        Set<Graph> theGraphs = graphs.get(plugin);
+
+        // Create the Set if it does not already exist
+        if (theGraphs == null) {
+            theGraphs = Collections.synchronizedSet(new HashSet<Graph>());
+            graphs.put(plugin, theGraphs);
+        }
+
+        return theGraphs;
+    }
+
+    /**
+     * Get the default graph for a plugin and if it does not exist, create one
+     *
+     * @param plugin
+     * @return
+     */
+    private Graph getOrCreateDefaultGraph(Plugin plugin) {
+        Graph graph = defaultGraphs.get(plugin);
+
+        // Not yet created :(
+        if (graph == null) {
+            graph = new Graph(Graph.Type.Line, "Default");
+            defaultGraphs.put(plugin, graph);
+        }
+
+        return graph;
+    }
+
+    /**
+     * Check if mineshafter is present. If it is, we need to bypass it to send POST requests
+     *
+     * @return
+     */
+    private boolean isMineshafterPresent() {
+        try {
+            Class.forName("mineshafter.MineServer");
+            return true;
+        } catch (Exception e) {
+            return false;
+        }
+    }
+
+    /**
+     * Encode a key/value data pair to be used in a HTTP post request. This INCLUDES a & so the first
+     * key/value pair MUST be included manually, e.g:
+     * <p>
+     *     String httpData = encode("guid") + "=" + encode("1234") + encodeDataPair("authors") + "..";
+     * </p>
+     *
+     * @param key
+     * @param value
+     * @return
+     */
+    private static String encodeDataPair(String key, String value) throws UnsupportedEncodingException {
+        return "&" + encode(key) + "=" + encode(value);
+    }
+
+    /**
+     * Encode text as UTF-8
+     *
+     * @param text
+     * @return
+     */
+    private static String encode(String text) throws UnsupportedEncodingException {
+        return URLEncoder.encode(text, "UTF-8");
+    }
+
+    /**
+     * Represents a custom graph on the website
+     */
+    public static class Graph {
+
+        /**
+         * The graph's type that will be visible on the website
+         */
+        public static enum Type {
+
+            /**
+             * A simple line graph which also includes a scrollable timeline viewer to view
+             * as little or as much of the data as possible.
+             */
+            Line,
+
+            /**
+             * An area graph. This is the same as a line graph except the area under the curve is shaded
+             */
+            Area,
+
+            /**
+             * A column graph, which is a graph where the data is represented by columns on the vertical axis,
+             * i.e they go up and down.
+             */
+            Column,
+
+            /**
+             * A pie graph. The graph is generated by taking the data for the last hour and summing it
+             * together. Then the percentage for each plotter is calculated via round( (plot / total) * 100, 2 )
+             */
+            Pie
+
+        }
+
+        /**
+         * What the graph should be plotted as
+         */
+        private final Type type;
+
+        /**
+         * The graph's name, alphanumeric and spaces only :)
+         * If it does not comply to the above when submitted, it is rejected
+         */
+        private final String name;
+
+        /**
+         * The set of plotters that are contained within this graph
+         */
+        private final Set<Plotter> plotters = new LinkedHashSet<Plotter>();
+
+        private Graph(Type type, String name) {
+            this.type = type;
+            this.name = name;
+        }
+
+        /**
+         * Gets the graph's name
+         *
+         * @return
+         */
+        public String getName() {
+            return name;
+        }
+
+        /**
+         * Add a plotter to the graph, which will be used to plot entries
+         *
+         * @param plotter
+         */
+        public void addPlotter(Plotter plotter) {
+            plotters.add(plotter);
+        }
+
+        /**
+         * Remove a plotter from the graph
+         *
+         * @param plotter
+         */
+        public void removePlotter(Plotter plotter) {
+            plotters.remove(plotter);
+        }
+
+        /**
+         * Gets an <b>unmodifiable</b> set of the plotter objects in the graph
+         * @return
+         */
+        public Set<Plotter> getPlotters() {
+            return Collections.unmodifiableSet(plotters);
+        }
+
+        @Override
+        public int hashCode() {
+            return (type.hashCode() * 17) ^ name.hashCode();
+        }
+
+        @Override
+        public boolean equals(Object object) {
+            if (!(object instanceof Graph)) {
+                return false;
+            }
+
+            Graph graph = (Graph) object;
+            return graph.type == type && graph.name.equals(name);
+        }
+
+    }
+
+    /**
+     * Interface used to collect custom data for a plugin
+     */
+    public static abstract class Plotter {
+
+        /**
+         * The plot's name
+         */
+        private final String name;
+
+        /**
+         * Construct a plotter with the default plot name
+         */
+        public Plotter() {
+            this("Default");
+        }
+
+        /**
+         * Construct a plotter with a specific plot name
+         *
+         * @param name
+         */
+        public Plotter(String name) {
+            this.name = name;
+        }
+
+        /**
+         * Get the current value for the plotted point
+         *
+         * @return
+         */
+        public abstract int getValue();
+
+        /**
+         * Get the column name for the plotted point
+         *
+         * @return the plotted point's column name
+         */
+        public String getColumnName() {
+            return name;
+        }
+
+        /**
+         * Called after the website graphs have been updated
+         */
+        public void reset() {
+        }
+
+        @Override
+        public int hashCode() {
+            return getColumnName().hashCode() + getValue();
+        }
+
+        @Override
+        public boolean equals(Object object) {
+            if (!(object instanceof Plotter)) {
+                return false;
+            }
+
+            Plotter plotter = (Plotter) object;
+            return plotter.name.equals(name) && plotter.getValue() == getValue();
+        }
+
+    }
+
+}

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

@@ -1,112 +1,142 @@
-/*
-	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.io.File;
+import java.io.FileWriter;
+import java.io.IOException;
 import java.util.HashMap;
 
-import org.bukkit.entity.*;
+import org.bukkit.entity.Player;
 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();
+
+    public static HashMap<String, PlayerProfile> players = new HashMap<String, PlayerProfile>();
+
+    /**
+     * Load users.
+     */
+    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();
-			}
-		}
+
+        if (!theDir.exists()) {
+            try {
+                FileWriter writer = new FileWriter(theDir);
+                writer.close();
+            }
+            catch (IOException e) {
+                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);
-    	}
+    /**
+     * Add a new user.
+     *
+     * @param player The player to create a user record for
+     */
+    public static void addUser(Player player) {
+        if (!players.containsKey(player.getName().toLowerCase())) {
+            players.put(player.getName().toLowerCase(), new PlayerProfile(player.getName()));
+        }
     }
 
-    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);
-    	}
+    /**
+     * Clear all users.
+     */
+    public static void clearUsers() {
+        players.clear();
+    }
+
+    /**
+     * Get all PlayerProfiles.
+     *
+     * @return a HashMap containing the PlayerProfile of everyone in the database
+     */
+    public static HashMap<String, PlayerProfile> getProfiles() {
+        return players;
+    }
+
+    /**
+     * Remove a user from the database.
+     *
+     * @param player The player to remove
+     */
+    public static void removeUser(Player player) {
+
+        //Only remove PlayerProfile if user is offline and we have it in memory
+        if (!player.isOnline() && players.containsKey(player.getName().toLowerCase())) {
+            players.get(player.getName().toLowerCase()).save();
+            players.remove(player.getName().toLowerCase());
+        }
+    }
+
+    /**
+     * Remove a user from the DB by name.
+     *
+     * @param playerName The name of the player to remove
+     */
+    public static void removeUserByName(String playerName) {
+        players.remove(playerName.toLowerCase());
+    }
+
+    /**
+     * Get the profile of an online player.
+     *
+     * @param player The player whose profile to retrieve
+     * @return the player's profile
+     */
+    public static PlayerProfile getProfile(Player player) {
+        if(players.get(player.getName().toLowerCase()) != null) {
+            return players.get(player.getName().toLowerCase());
+        }
+        else {
+            players.put(player.getName().toLowerCase(), new PlayerProfile(player.getName()));
+            return players.get(player.getName().toLowerCase());
+        }
     }
     
+    /**
+     * Get the profile of an online player.
+     *
+     * @param player The player whose profile to retrieve
+     * @return the player's profile
+     */
+    public static PlayerProfile getProfile(String playerName) {
+        if(players.get(playerName.toLowerCase()) != null) {
+            return players.get(playerName.toLowerCase());
+        }
+        else {
+            players.put(playerName.toLowerCase(), new PlayerProfile(playerName));
+            return players.get(playerName.toLowerCase());
+        }
+    }
+
+    /**
+     * Get the profile of an offline player.
+     *
+     * @param playerName Name of the player whose profile to retrieve
+     * @return the player's profile
+     */
+    public static PlayerProfile getOfflineProfile(String playerName) {
+        return new PlayerProfile(playerName, false);
+    }
+
+    /**
+     * Get an instance of this class.
+     *
+     * @return an instance of this class
+     */
     public static Users getInstance() {
-		if (instance == null) {
-			instance = new Users();
-		}
-		return instance;
-	}
-
-}
+        if (instance == null) {
+            instance = new Users();
+        }
+        return instance;
+    }
+}

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

@@ -0,0 +1,81 @@
+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.datatypes.PlayerProfile;
+import com.gmail.nossr50.locale.mcLocale;
+import com.gmail.nossr50.skills.Skills;
+
+public class AddlevelsCommand implements CommandExecutor{
+	private final mcMMO plugin;
+
+	public AddlevelsCommand(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 (player != null && !mcPermissions.getInstance().mmoedit(player)) {
+			sender.sendMessage("This command requires permissions.");
+			return true;
+		}
+
+		if (!(sender instanceof Player)) {
+			if (args.length < 2) {
+				System.out.println("Usage is /addlevels playername skillname levels");
+				return true;
+			} else if (args.length == 3) {
+				if ((plugin.getServer().getPlayer(args[0]) != null) && m.isInt(args[2]) && Skills.isSkill(args[1])) {
+					int levels = Integer.valueOf(args[2]);
+					Users.getProfile(plugin.getServer().getPlayer(args[0])).addLevels(Skills.getSkillType(args[1]), levels);
+					System.out.println(args[1] + " has been modified for " + plugin.getServer().getPlayer(args[0]).getName() + ".");
+				}
+			} else {
+				System.out.println("Usage is /addlevels playername skillname levels");
+			}
+
+			return true;
+		}
+
+		PlayerProfile PP = Users.getProfile(player);
+
+		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 /addlevels playername skillname levels");
+			return true;
+		}
+		if (args.length == 3) {
+			if ((plugin.getServer().getPlayer(args[0]) != null) && m.isInt(args[2]) && Skills.isSkill(args[1])) {
+				int levels = Integer.valueOf(args[2]);
+				Users.getProfile(plugin.getServer().getPlayer(args[0])).addLevels(Skills.getSkillType(args[1]), levels);
+				player.sendMessage(ChatColor.RED + args[1] + " has been modified.");
+			}
+		} else if (args.length == 2) {
+			if (m.isInt(args[1]) && Skills.isSkill(args[0])) {
+				int levels = Integer.valueOf(args[1]);
+				PP.addLevels(Skills.getSkillType(args[0]), levels);
+				player.sendMessage(ChatColor.RED + args[0] + " has been modified.");
+			}
+		} else {
+			player.sendMessage(ChatColor.RED + "Usage is /addlevels playername skillname newvalue");
+		}
+
+		return true;
+	}
+}

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

@@ -10,7 +10,6 @@ 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;
 
@@ -33,11 +32,6 @@ public class AddxpCommand implements CommandExecutor {
 			return true;
 		}
 
-		if (!LoadProperties.addxpEnable) {
-			sender.sendMessage("This command is not enabled.");
-			return true;
-		}
-
 		if (!(sender instanceof Player)) {
 			if (args.length < 2) {
 				// No console aliasing yet
@@ -47,7 +41,7 @@ public class AddxpCommand implements CommandExecutor {
 			} 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]));
+					Users.getProfile(plugin.getServer().getPlayer(args[0])).addXPOverrideNoBonus(Skills.getSkillType(args[1]), newvalue);
 					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]));

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,126 @@
+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.datatypes.PlayerProfile;
+import com.gmail.nossr50.datatypes.SkillType;
+import com.gmail.nossr50.locale.mcLocale;
+import com.gmail.nossr50.skills.Skills;
+
+public class InspectCommand implements CommandExecutor {
+    private final mcMMO plugin;
+
+    public InspectCommand(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 (sender instanceof Player  && !mcPermissions.getInstance().inspect(player)) {
+            sender.sendMessage(ChatColor.YELLOW + "[mcMMO] " + ChatColor.DARK_RED + mcLocale.getString("mcPlayerListener.NoPermission"));
+            return true;
+        }
+        
+        if (args.length < 1) {
+            sender.sendMessage(ChatColor.RED + "Proper usage is /inspect <playername>");
+            return true;
+        }
+        
+        // if split[1] is an online player
+        if (plugin.getServer().getPlayer(args[0]) != null) 
+        {
+            Player target = plugin.getServer().getPlayer(args[0]);
+            PlayerProfile PPt = Users.getProfile(target);
+            
+            //If they are not an Op they have to be close
+            if(sender instanceof Player && !player.isOp() && !m.isNear(player.getLocation(), target.getLocation(), 5))
+            {
+                sender.sendMessage("You are too far away to inspect that player!");
+            }
+            
+            sender.sendMessage(ChatColor.GREEN + "mcMMO Stats for " + ChatColor.YELLOW + target.getName());
+
+            sender.sendMessage(ChatColor.GOLD + "-=GATHERING SKILLS=-");
+            if (mcPermissions.getInstance().excavation(target))
+                sender.sendMessage(Skills.getSkillStats(mcLocale.getString("mcPlayerListener.ExcavationSkill"), PPt.getSkillLevel(SkillType.EXCAVATION), PPt.getSkillXpLevel(SkillType.EXCAVATION), PPt.getXpToLevel(SkillType.EXCAVATION)));
+            if (mcPermissions.getInstance().fishing(target))
+                sender.sendMessage(Skills.getSkillStats(mcLocale.getString("mcPlayerListener.FishingSkill"), PPt.getSkillLevel(SkillType.FISHING), PPt.getSkillXpLevel(SkillType.FISHING), PPt.getXpToLevel(SkillType.FISHING)));
+            if (mcPermissions.getInstance().herbalism(target))
+                sender.sendMessage(Skills.getSkillStats(mcLocale.getString("mcPlayerListener.HerbalismSkill"), PPt.getSkillLevel(SkillType.HERBALISM), PPt.getSkillXpLevel(SkillType.HERBALISM), PPt.getXpToLevel(SkillType.HERBALISM)));
+            if (mcPermissions.getInstance().mining(target))
+                sender.sendMessage(Skills.getSkillStats(mcLocale.getString("mcPlayerListener.MiningSkill"), PPt.getSkillLevel(SkillType.MINING), PPt.getSkillXpLevel(SkillType.MINING), PPt.getXpToLevel(SkillType.MINING)));
+            if (mcPermissions.getInstance().woodcutting(target))
+                sender.sendMessage(Skills.getSkillStats(mcLocale.getString("mcPlayerListener.WoodcuttingSkill"), PPt.getSkillLevel(SkillType.WOODCUTTING), PPt.getSkillXpLevel(SkillType.WOODCUTTING), PPt.getXpToLevel(SkillType.WOODCUTTING)));
+
+            sender.sendMessage(ChatColor.GOLD + "-=COMBAT SKILLS=-");
+            if (mcPermissions.getInstance().axes(target))
+                sender.sendMessage(Skills.getSkillStats(mcLocale.getString("mcPlayerListener.AxesSkill"), PPt.getSkillLevel(SkillType.AXES), PPt.getSkillXpLevel(SkillType.AXES), PPt.getXpToLevel(SkillType.AXES)));
+            if (mcPermissions.getInstance().archery(target))
+                sender.sendMessage(Skills.getSkillStats(mcLocale.getString("mcPlayerListener.ArcherySkill"), PPt.getSkillLevel(SkillType.ARCHERY), PPt.getSkillXpLevel(SkillType.ARCHERY), PPt.getXpToLevel(SkillType.ARCHERY)));
+            if (mcPermissions.getInstance().swords(target))
+                sender.sendMessage(Skills.getSkillStats(mcLocale.getString("mcPlayerListener.SwordsSkill"), PPt.getSkillLevel(SkillType.SWORDS), PPt.getSkillXpLevel(SkillType.SWORDS), PPt.getXpToLevel(SkillType.SWORDS)));
+            if (mcPermissions.getInstance().taming(target))
+                sender.sendMessage(Skills.getSkillStats(mcLocale.getString("mcPlayerListener.TamingSkill"), PPt.getSkillLevel(SkillType.TAMING), PPt.getSkillXpLevel(SkillType.TAMING), PPt.getXpToLevel(SkillType.TAMING)));
+            if (mcPermissions.getInstance().unarmed(target))
+                sender.sendMessage(Skills.getSkillStats(mcLocale.getString("mcPlayerListener.UnarmedSkill"), PPt.getSkillLevel(SkillType.UNARMED), PPt.getSkillXpLevel(SkillType.UNARMED), PPt.getXpToLevel(SkillType.UNARMED)));
+
+            sender.sendMessage(ChatColor.GOLD + "-=MISC SKILLS=-");
+            if (mcPermissions.getInstance().acrobatics(target))
+                sender.sendMessage(Skills.getSkillStats(mcLocale.getString("mcPlayerListener.AcrobaticsSkill"), PPt.getSkillLevel(SkillType.ACROBATICS), PPt.getSkillXpLevel(SkillType.ACROBATICS), PPt.getXpToLevel(SkillType.ACROBATICS)));
+            if (mcPermissions.getInstance().repair(target))
+                sender.sendMessage(Skills.getSkillStats(mcLocale.getString("mcPlayerListener.RepairSkill"), PPt.getSkillLevel(SkillType.REPAIR), PPt.getSkillXpLevel(SkillType.REPAIR), PPt.getXpToLevel(SkillType.REPAIR)));
+
+            sender.sendMessage(mcLocale.getString("mcPlayerListener.PowerLevel") + ChatColor.GREEN + (m.getPowerLevel(target, PPt)));
+        } else {
+            if(sender instanceof Player && !player.isOp())
+            {
+                sender.sendMessage("That player is offline, inspecting offline players is limited to Ops!");
+                return true;
+            }
+            
+            PlayerProfile PPt = Users.getOfflineProfile(args[0]);
+            
+            if(!PPt.isLoaded())
+            {
+                sender.sendMessage("Player does not exist in the database!");
+                return true;
+            }
+            
+            sender.sendMessage(ChatColor.GREEN + "mcMMO Stats for Offline Player " + ChatColor.YELLOW + args[0]);
+
+            sender.sendMessage(ChatColor.GOLD + "-=GATHERING SKILLS=-");
+                sender.sendMessage(Skills.getSkillStats(mcLocale.getString("mcPlayerListener.ExcavationSkill"), PPt.getSkillLevel(SkillType.EXCAVATION), PPt.getSkillXpLevel(SkillType.EXCAVATION), PPt.getXpToLevel(SkillType.EXCAVATION)));
+                sender.sendMessage(Skills.getSkillStats(mcLocale.getString("mcPlayerListener.FishingSkill"), PPt.getSkillLevel(SkillType.FISHING), PPt.getSkillXpLevel(SkillType.FISHING), PPt.getXpToLevel(SkillType.FISHING)));
+                sender.sendMessage(Skills.getSkillStats(mcLocale.getString("mcPlayerListener.HerbalismSkill"), PPt.getSkillLevel(SkillType.HERBALISM), PPt.getSkillXpLevel(SkillType.HERBALISM), PPt.getXpToLevel(SkillType.HERBALISM)));
+                sender.sendMessage(Skills.getSkillStats(mcLocale.getString("mcPlayerListener.MiningSkill"), PPt.getSkillLevel(SkillType.MINING), PPt.getSkillXpLevel(SkillType.MINING), PPt.getXpToLevel(SkillType.MINING)));
+                sender.sendMessage(Skills.getSkillStats(mcLocale.getString("mcPlayerListener.WoodcuttingSkill"), PPt.getSkillLevel(SkillType.WOODCUTTING), PPt.getSkillXpLevel(SkillType.WOODCUTTING), PPt.getXpToLevel(SkillType.WOODCUTTING)));
+
+            sender.sendMessage(ChatColor.GOLD + "-=COMBAT SKILLS=-");
+                sender.sendMessage(Skills.getSkillStats(mcLocale.getString("mcPlayerListener.AxesSkill"), PPt.getSkillLevel(SkillType.AXES), PPt.getSkillXpLevel(SkillType.AXES), PPt.getXpToLevel(SkillType.AXES)));
+                sender.sendMessage(Skills.getSkillStats(mcLocale.getString("mcPlayerListener.ArcherySkill"), PPt.getSkillLevel(SkillType.ARCHERY), PPt.getSkillXpLevel(SkillType.ARCHERY), PPt.getXpToLevel(SkillType.ARCHERY)));
+                sender.sendMessage(Skills.getSkillStats(mcLocale.getString("mcPlayerListener.SwordsSkill"), PPt.getSkillLevel(SkillType.SWORDS), PPt.getSkillXpLevel(SkillType.SWORDS), PPt.getXpToLevel(SkillType.SWORDS)));
+                sender.sendMessage(Skills.getSkillStats(mcLocale.getString("mcPlayerListener.TamingSkill"), PPt.getSkillLevel(SkillType.TAMING), PPt.getSkillXpLevel(SkillType.TAMING), PPt.getXpToLevel(SkillType.TAMING)));
+                sender.sendMessage(Skills.getSkillStats(mcLocale.getString("mcPlayerListener.UnarmedSkill"), PPt.getSkillLevel(SkillType.UNARMED), PPt.getSkillXpLevel(SkillType.UNARMED), PPt.getXpToLevel(SkillType.UNARMED)));
+
+            sender.sendMessage(ChatColor.GOLD + "-=MISC SKILLS=-");
+                sender.sendMessage(Skills.getSkillStats(mcLocale.getString("mcPlayerListener.AcrobaticsSkill"), PPt.getSkillLevel(SkillType.ACROBATICS), PPt.getSkillXpLevel(SkillType.ACROBATICS), PPt.getXpToLevel(SkillType.ACROBATICS)));
+                sender.sendMessage(Skills.getSkillStats(mcLocale.getString("mcPlayerListener.RepairSkill"), PPt.getSkillLevel(SkillType.REPAIR), PPt.getSkillXpLevel(SkillType.REPAIR), PPt.getXpToLevel(SkillType.REPAIR)));
+        }
+
+        return true;
+    }
+}

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

@@ -8,47 +8,26 @@ 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;
-	}
+public class McstatsCommand implements CommandExecutor {
 
 	@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;
-				}
-			}
-		}
+        if (!(sender instanceof Player)) {
+            sender.sendMessage("This command does not support console useage.");
+            return true;
+        }
 
 		PlayerProfile PP = Users.getProfile(player);
 
@@ -77,8 +56,6 @@ public class StatsCommand implements CommandExecutor {
 				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))
@@ -91,14 +68,10 @@ public class StatsCommand implements CommandExecutor {
 			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)));
+		player.sendMessage(mcLocale.getString("mcPlayerListener.PowerLevel") + ChatColor.GREEN + (m.getPowerLevel(player, PP)));
 
 		return true;
 	}

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

@@ -8,24 +8,18 @@ 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.locale.mcLocale;
 import com.gmail.nossr50.skills.Skills;
 
 public class MmoeditCommand implements CommandExecutor {
-	private final mcMMO plugin;
-
-	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) {
+        if (sender instanceof Player) 
+        {
             player = (Player) sender;
         }
 		
@@ -34,51 +28,88 @@ public class MmoeditCommand implements CommandExecutor {
 			return true;
 		}
 
-		if (!LoadProperties.mmoeditEnable) {
-			sender.sendMessage("This command is not enabled.");
-			return true;
-		}
-
-		if (!(sender instanceof Player)) {
-			if (args.length < 2) {
+		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])) {
+			} else if (args.length == 3)
+			{
+			    PlayerProfile PPt = null;
+			    
+			    if(Users.players.containsKey(args[0].toLowerCase())) {
+			        PPt = Users.players.get(args[0].toLowerCase());
+			    }
+			    
+			    if(PPt == null)
+			        Users.getOfflineProfile(args[0]); //Only grab offline profile if the above failed
+			        
+			    if(!PPt.isLoaded())
+		        {
+		            sender.sendMessage("Player does not exist in the database!");
+		            return true;
+		        }
+			    
+				if (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() + ".");
+					Users.getOfflineProfile(args[0]).modifyskill(Skills.getSkillType(args[1]), newvalue);
+					System.out.println(args[1] + " has been modified for " + args[0] + ".");
 				}
-			} else {
+			} else 
+			{
 				System.out.println("Usage is /mmoedit playername skillname newvalue");
 			}
 
 			return true;
 		}
 
-		PlayerProfile PP = Users.getProfile(player);
-
-		if (!mcPermissions.getInstance().mmoedit(player)) {
+		if (!mcPermissions.getInstance().mmoedit(player)) 
+		{
 			player.sendMessage(ChatColor.YELLOW + "[mcMMO] " + ChatColor.DARK_RED + mcLocale.getString("mcPlayerListener.NoPermission"));
 			return true;
 		}
-		if (args.length < 2) {
+		
+		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])) {
+		if (args.length == 3) 
+		{
+		    PlayerProfile PPt = null;
+            
+            if(Users.players.containsKey(args[0].toLowerCase())) {
+                PPt = Users.players.get(args[0].toLowerCase());
+            }
+            
+            if(PPt == null)
+                Users.getOfflineProfile(args[0]); //Only grab offline profile if the above failed
+            
+		    if(!PPt.isLoaded())
+	        {
+	            sender.sendMessage("Player does not exist in the database!");
+	            return true;
+	        }
+		    
+			if (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.");
+				PPt.modifyskill(Skills.getSkillType(args[1]), newvalue);
+				player.sendMessage(ChatColor.RED + args[1] + " has been modified for "+args[0]);
 			}
-		} else if (args.length == 2) {
-			if (m.isInt(args[1]) && Skills.isSkill(args[0])) {
+		} else if (args.length == 2) 
+		{
+			if (m.isInt(args[1]) && Skills.isSkill(args[0])) 
+			{
+			    PlayerProfile PP = Users.getProfile(player);
 				int newvalue = Integer.valueOf(args[1]);
 				PP.modifyskill(Skills.getSkillType(args[0]), newvalue);
 				player.sendMessage(ChatColor.RED + args[0] + " has been modified.");
 			}
-		} else {
+		} else 
+		{
 			player.sendMessage(ChatColor.RED + "Usage is /mmoedit playername skillname newvalue");
 		}
 

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

@@ -8,9 +8,10 @@ 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.locale.mcLocale;
+import com.gmail.nossr50.runnables.SQLConversionTask;
 
 public class MmoupdateCommand implements CommandExecutor {
 	@Override
@@ -28,7 +29,7 @@ public class MmoupdateCommand implements CommandExecutor {
 		}
 		player.sendMessage(ChatColor.GRAY + "Starting conversion...");
 		Users.clearUsers();
-		m.convertToMySQL();
+		convertToMySQL();
 		for (Player x : Bukkit.getServer().getOnlinePlayers()) {
 			Users.addUser(x);
 		}
@@ -36,4 +37,15 @@ public class MmoupdateCommand implements CommandExecutor {
 
 		return true;
 	}
-}
+	
+	/**
+     * Convert FlatFile data to MySQL data.
+     */
+    private void convertToMySQL() {
+        if (!LoadProperties.useMySQL) {
+            return;
+        }
+
+        Bukkit.getScheduler().scheduleAsyncDelayedTask(Bukkit.getPluginManager().getPlugin("mcMMO"), new SQLConversionTask(), 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/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

@@ -19,10 +19,6 @@ public class XprateCommand implements CommandExecutor {
 	
 	@Override
 	public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
-		if (!LoadProperties.xprateEnable) {
-			sender.sendMessage("This command is not enabled.");
-			return true;
-		}
 
 		if (!(sender instanceof Player)) {
 			if(args.length <= 0)

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

@@ -1,12 +1,13 @@
 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.config.LoadProperties;
+import com.gmail.nossr50.mcPermissions;
 import com.gmail.nossr50.datatypes.PlayerProfile;
 import com.gmail.nossr50.locale.mcLocale;
 
@@ -18,13 +19,8 @@ public class McabilityCommand implements CommandExecutor {
             player = (Player) sender;
         }
 
-		if (player != null && player.hasPermission("mcmmo.commands.ability")) {
-			sender.sendMessage("This command requires permissions.");
-			return true;
-		}
-
-		if (!LoadProperties.mcabilityEnable) {
-			sender.sendMessage("This command is not enabled.");
+		if (player != null && !mcPermissions.getInstance().mcAbility(player)) {
+			player.sendMessage(ChatColor.YELLOW + "[mcMMO] " + ChatColor.DARK_RED + mcLocale.getString("mcPlayerListener.NoPermission"));
 			return true;
 		}
 

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

@@ -7,16 +7,11 @@ 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;
 
 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.");
@@ -42,22 +37,17 @@ public class MccCommand implements CommandExecutor {
 				player.sendMessage("/ptp " + mcLocale.getString("m.mccPartyTeleport"));
 		}
 		player.sendMessage(mcLocale.getString("m.mccOtherCommands"));
-		player.sendMessage("/stats " + ChatColor.RED + " " + mcLocale.getString("m.mccStats"));
+		player.sendMessage("/mcstats " + ChatColor.RED + " " + mcLocale.getString("m.mccStats"));
 		player.sendMessage("/mctop <skillname> <page> " + ChatColor.RED + mcLocale.getString("m.mccLeaderboards"));
 
-		if (mcPermissions.getInstance().mySpawn(player)) {
-			player.sendMessage("/myspawn " + ChatColor.RED + mcLocale.getString("m.mccMySpawn"));
-			player.sendMessage("/clearmyspawn " + ChatColor.RED + mcLocale.getString("m.mccClearMySpawn"));
-		}
-
 		if (mcPermissions.getInstance().mcAbility(player))
 			player.sendMessage("/mcability" + ChatColor.RED + " " + mcLocale.getString("m.mccToggleAbility"));
 
 		if (mcPermissions.getInstance().adminChat(player))
 			player.sendMessage("/a " + ChatColor.RED + mcLocale.getString("m.mccAdminToggle"));
 
-		if (mcPermissions.getInstance().whois(player))
-			player.sendMessage("/whois " + mcLocale.getString("m.mccWhois"));
+		if (mcPermissions.getInstance().inspect(player))
+			player.sendMessage("/inspect " + mcLocale.getString("m.mccInspect"));
 
 		if (mcPermissions.getInstance().mmoedit(player))
 			player.sendMessage("/mmoedit" + mcLocale.getString("m.mccMmoedit"));

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

@@ -8,17 +8,12 @@ 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 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.");

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

@@ -14,10 +14,6 @@ public class McmmoCommand implements CommandExecutor {
 
 	@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 (!(sender instanceof Player)) {
 			sender.sendMessage("This command does not support console useage.");
@@ -26,7 +22,6 @@ public class McmmoCommand implements CommandExecutor {
 
 		Player player = (Player) sender;
 
-		player.sendMessage(ChatColor.RED + "-----[]" + ChatColor.GREEN + "mcMMO" + ChatColor.RED + "[]-----");
 		String description = mcLocale.getString("mcMMO.Description", new Object[] { "mcc" });
 		String[] mcSplit = description.split(",");
 
@@ -37,10 +32,10 @@ public class McmmoCommand implements CommandExecutor {
 		if (LoadProperties.spoutEnabled && player instanceof SpoutPlayer) {
 			SpoutPlayer sPlayer = (SpoutPlayer) player;
 			if (LoadProperties.donateMessage)
-				sPlayer.sendMessage(ChatColor.GREEN + "[mcMMO] Donate! Paypal theno1yeti@gmail.com");
+				sPlayer.sendMessage(ChatColor.YELLOW + "[mcMMO]"+ChatColor.GOLD+" Donate! Paypal "+ChatColor.GREEN+"theno1yeti@gmail.com");
 		} else {
 			if (LoadProperties.donateMessage)
-				player.sendMessage(ChatColor.GREEN + "If you like my work you can donate via Paypal: theno1yeti@gmail.com");
+			    player.sendMessage(ChatColor.YELLOW + "[mcMMO]"+ChatColor.GOLD+" Donate! Paypal "+ChatColor.GREEN+"theno1yeti@gmail.com");
 		}
 
 		return true;

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

@@ -9,7 +9,6 @@ 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.datatypes.PlayerProfile;
 import com.gmail.nossr50.locale.mcLocale;
 
@@ -22,10 +21,6 @@ public class McrefreshCommand implements CommandExecutor {
 
 	@Override
 	public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
-		if (!LoadProperties.mcrefreshEnable) {
-			sender.sendMessage("This command is not enabled.");
-			return true;
-		}
 
 		if (!(sender instanceof Player)) {
 			sender.sendMessage("This command does not support console useage.");

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

@@ -0,0 +1,109 @@
+package com.gmail.nossr50.commands.mc;
+
+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.mcMMO;
+import com.gmail.nossr50.mcPermissions;
+import com.gmail.nossr50.config.LoadProperties;
+import com.gmail.nossr50.locale.mcLocale;
+
+public class McremoveCommand implements CommandExecutor {
+    @Override
+    public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
+        Player player = null;
+        
+        if (sender instanceof Player) {
+            player = (Player) sender;
+        }
+
+        if (player != null && !mcPermissions.getInstance().mcremove(player)) {
+            player.sendMessage(ChatColor.YELLOW + "[mcMMO] " + ChatColor.DARK_RED + mcLocale.getString("mcPlayerListener.NoPermission"));
+            return true;
+        }
+        
+        if(args.length == 0)
+        {
+            sender.sendMessage("Correct usage is /mcremove [Player Name]");
+            return true;
+        }
+        
+        String playerName = args[0]; //Player that we are going to remove
+        
+        //If the server is using MySQL
+        if(LoadProperties.useMySQL)
+        {
+            int userId = mcMMO.database.getInt("SELECT id FROM "+LoadProperties.MySQLtablePrefix+"users WHERE user = '" + playerName + "'");
+            
+            //Remove user from tables
+            mcMMO.database.write("DELETE FROM "
+                    +LoadProperties.MySQLdbName+"."
+                    +LoadProperties.MySQLtablePrefix+"users WHERE "
+                    +LoadProperties.MySQLtablePrefix+"users.id="+userId);
+            
+            mcMMO.database.write("DELETE FROM "
+                    +LoadProperties.MySQLdbName+"."
+                    +LoadProperties.MySQLtablePrefix+"cooldowns WHERE "
+                    +LoadProperties.MySQLtablePrefix+"cooldowns.user_id="+userId);
+            
+            mcMMO.database.write("DELETE FROM "
+                    +LoadProperties.MySQLdbName+"."
+                    +LoadProperties.MySQLtablePrefix+"huds WHERE "
+                    +LoadProperties.MySQLtablePrefix+"huds.user_id="+userId);
+            
+            mcMMO.database.write("DELETE FROM "
+                    +LoadProperties.MySQLdbName+"."
+                    +LoadProperties.MySQLtablePrefix+"skills WHERE "
+                    +LoadProperties.MySQLtablePrefix+"skills.user_id="+userId);
+            
+            mcMMO.database.write("DELETE FROM "
+            +LoadProperties.MySQLdbName+"."
+            +LoadProperties.MySQLtablePrefix+"experience WHERE "
+            +LoadProperties.MySQLtablePrefix+"experience.user_id="+userId);
+
+            sender.sendMessage("User "+playerName+" removed from MySQL DB!");
+        } else {
+            //FlatFile removal
+            //TODO: Properly remove users from FlatFile, it's going to be a huge bitch with how our FlatFile system works. Let's adopt SQLite support.
+            if(Bukkit.getServer().getPlayer(playerName) != null)
+            {
+                Player targetPlayer = Bukkit.getServer().getPlayer(playerName);
+                if(targetPlayer.isOnline()) 
+                {
+                    Users.getProfile(targetPlayer).resetAllData();
+                    sender.sendMessage("User "+playerName+" removed from FlatFile DB!");
+                } else {
+                    sender.sendMessage("[mcMMO] This command is not fully functional for FlatFile yet, the player needs to be online.");
+                    return true;
+                }
+            } else {
+                sender.sendMessage("[mcMMO] This command is not fully functional for FlatFile yet, the player needs to be online.");
+                return true;
+            }
+        }
+        
+        //Force PlayerProfile stuff to update
+        if(Bukkit.getServer().getPlayer(playerName) != null)
+        {
+            Player targetPlayer = Bukkit.getServer().getPlayer(playerName);
+            if(targetPlayer.isOnline())
+            {
+                targetPlayer.kickPlayer("[mcMMO] Stats have been reset! Rejoin!");
+                Users.removeUserByName(playerName);
+            } else {
+                Users.removeUser(targetPlayer);
+            }
+        } else {
+            Users.removeUserByName(playerName);
+        }
+        
+        sender.sendMessage("[mcMMO] mcremove operation completed.");
+        
+        return true;
+    }
+}

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

@@ -7,8 +7,6 @@ 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;
@@ -20,17 +18,6 @@ import com.gmail.nossr50.skills.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;
-		}
-
-		Player player = (Player) sender;
 
 		if (LoadProperties.useMySQL == false) {
 			/*
@@ -39,7 +26,7 @@ public class MctopCommand implements CommandExecutor {
 			if (args.length == 0) {
 				int p = 1;
 				String[] info = Leaderboard.retrieveInfo(SkillType.ALL.toString(), p);
-				player.sendMessage(mcLocale.getString("mcPlayerListener.PowerLevelLeaderboard"));
+				sender.sendMessage(mcLocale.getString("mcPlayerListener.PowerLevelLeaderboard"));
 				int n = 1 * p; // Position
 				for (String x : info) {
 					if (x != null) {
@@ -48,7 +35,7 @@ public class MctopCommand implements CommandExecutor {
 							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]);
+						sender.sendMessage(digit + ". " + ChatColor.GREEN + splitx[1] + " - " + ChatColor.WHITE + splitx[0]);
 						n++;
 					}
 				}
@@ -68,7 +55,7 @@ public class MctopCommand implements CommandExecutor {
 					pt = 10;
 				}
 				String[] info = Leaderboard.retrieveInfo(SkillType.ALL.toString(), p);
-				player.sendMessage(mcLocale.getString("mcPlayerListener.PowerLevelLeaderboard"));
+				sender.sendMessage(mcLocale.getString("mcPlayerListener.PowerLevelLeaderboard"));
 				int n = 1 * pt; // Position
 				for (String x : info) {
 					if (x != null) {
@@ -77,7 +64,7 @@ public class MctopCommand implements CommandExecutor {
 							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]);
+						sender.sendMessage(digit + ". " + ChatColor.GREEN + splitx[1] + " - " + ChatColor.WHITE + splitx[0]);
 						n++;
 					}
 				}
@@ -104,7 +91,7 @@ public class MctopCommand implements CommandExecutor {
 				String capitalized = firstLetter.toUpperCase() + remainder.toLowerCase();
 
 				String[] info = Leaderboard.retrieveInfo(args[0].toUpperCase(), p);
-				player.sendMessage(mcLocale.getString("mcPlayerListener.SkillLeaderboard", new Object[] { capitalized }));
+				sender.sendMessage(mcLocale.getString("mcPlayerListener.SkillLeaderboard", new Object[] { capitalized }));
 				int n = 1 * pt; // Position
 				for (String x : info) {
 					if (x != null) {
@@ -113,7 +100,7 @@ public class MctopCommand implements CommandExecutor {
 							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]);
+						sender.sendMessage(digit + ". " + ChatColor.GREEN + splitx[1] + " - " + ChatColor.WHITE + splitx[0]);
 						n++;
 					}
 				}
@@ -132,7 +119,7 @@ public class MctopCommand implements CommandExecutor {
 				String remainder = args[0].substring(1); // Get remainder of word.
 				String capitalized = firstLetter.toUpperCase() + remainder.toLowerCase();
 
-				player.sendMessage(mcLocale.getString("mcPlayerListener.SkillLeaderboard", new Object[] { capitalized }));
+				sender.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]);
@@ -142,28 +129,28 @@ public class MctopCommand implements CommandExecutor {
 						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 ");
+					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 = 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)
+						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));
+						HashMap<Integer, ArrayList<String>> username = mcMMO.database.read("SELECT user FROM " + LoadProperties.MySQLtablePrefix + "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));
 					}
 					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 ");
+				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)
+					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));
+					HashMap<Integer, ArrayList<String>> username = mcMMO.database.read("SELECT user FROM " + LoadProperties.MySQLtablePrefix + "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));
 				}
 				return true;
 			}
 			if (args.length >= 0) {
-				player.sendMessage(mcLocale.getString("mcPlayerListener.PowerLevelLeaderboard"));
+				sender.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]);
@@ -173,21 +160,21 @@ public class MctopCommand implements CommandExecutor {
 						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 ");
+					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)
+						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));
+						HashMap<Integer, ArrayList<String>> username = mcMMO.database.read("SELECT user FROM " + LoadProperties.MySQLtablePrefix + "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));
 					}
 					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 ");
+				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)
+					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));
+					HashMap<Integer, ArrayList<String>> username = mcMMO.database.read("SELECT user FROM " + LoadProperties.MySQLtablePrefix + "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));
 					// System.out.println(username.get(1).get(0));
 					// System.out.println("Mining : " + userslist.get(i).get(0) + ", User id : " + userslist.get(i).get(1));
 				}

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

@@ -1,8 +1,5 @@
 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;
@@ -17,11 +14,8 @@ import com.gmail.nossr50.datatypes.PlayerProfile;
 import com.gmail.nossr50.locale.mcLocale;
 
 public class ACommand implements CommandExecutor {
-	private Logger log;
 
-	public ACommand() {
-		this.log = Logger.getLogger("Minecraft");
-	}
+	public ACommand() {}
 
 	@Override
 	public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
@@ -35,7 +29,7 @@ public class ACommand implements CommandExecutor {
 
 			String aPrefix = ChatColor.AQUA + "{" + ChatColor.WHITE + "*Console*" + ChatColor.AQUA + "} ";
 
-			log.log(Level.INFO, "[A]<*Console*> " + aMessage);
+			Bukkit.getLogger().info("[A]<*Console*> " + aMessage);
 
 			for (Player herp : Bukkit.getServer().getOnlinePlayers()) {
 				if (mcPermissions.getInstance().adminChat(herp) || herp.isOp())
@@ -64,7 +58,7 @@ public class ACommand implements CommandExecutor {
 
 			String name = (LoadProperties.aDisplayNames) ? player.getDisplayName() : player.getName();
 			String aPrefix = ChatColor.AQUA + "{" + ChatColor.WHITE + name + ChatColor.AQUA + "} ";
-			log.log(Level.INFO, "[A]<" + name + "> " + aMessage);
+			Bukkit.getLogger().info("[A]<" + name + "> " + aMessage);
 			for (Player herp : Bukkit.getServer().getOnlinePlayers()) {
 				if (mcPermissions.getInstance().adminChat(herp) || herp.isOp())
 					herp.sendMessage(aPrefix + aMessage);
@@ -83,10 +77,8 @@ public class ACommand implements CommandExecutor {
 	
 			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;

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

@@ -8,7 +8,6 @@ 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;
 import com.gmail.nossr50.party.Party;
@@ -16,10 +15,6 @@ import com.gmail.nossr50.party.Party;
 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;
-		}
 
 		if (!(sender instanceof Player)) {
 			sender.sendMessage("This command does not support console useage.");

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

@@ -9,7 +9,6 @@ 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.datatypes.PlayerProfile;
 import com.gmail.nossr50.locale.mcLocale;
 import com.gmail.nossr50.party.Party;
@@ -23,10 +22,6 @@ public class InviteCommand implements CommandExecutor {
 
 	@Override
 	public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
-		if (!LoadProperties.inviteEnable) {
-			sender.sendMessage("This command is not enabled.");
-			return true;
-		}
 
 		if (!(sender instanceof Player)) {
 			sender.sendMessage("This command does not support console useage.");

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

@@ -1,8 +1,5 @@
 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;
@@ -18,18 +15,10 @@ import com.gmail.nossr50.locale.mcLocale;
 import com.gmail.nossr50.party.Party;
 
 public class PCommand implements CommandExecutor {
-	private Logger log;
-
-	public PCommand() {
-		this.log = Logger.getLogger("Minecraft");
-	}
+	public PCommand() {}
 
 	@Override
 	public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
-		if (!LoadProperties.partyEnable) {
-			sender.sendMessage("This command is not enabled.");
-			return true;
-		}
 
 		// Console message?
 		if (!(sender instanceof Player)) {
@@ -42,7 +31,7 @@ public class PCommand implements CommandExecutor {
 
 			String pPrefix = ChatColor.GREEN + "(" + ChatColor.WHITE + "*Console*" + ChatColor.GREEN + ") ";
 
-			log.log(Level.INFO, "[P](" + args[0] + ")" + "<*Console*> " + pMessage);
+			Bukkit.getLogger().info("[P](" + args[0] + ")" + "<*Console*> " + pMessage);
 
 			for (Player herp : Bukkit.getServer().getOnlinePlayers()) {
 				if (Users.getProfile(herp).inParty()) {
@@ -65,6 +54,11 @@ public class PCommand implements CommandExecutor {
 		// Not a toggle, a message
 
 		if (args.length >= 1) {
+			if(!PP.inParty()) {
+				player.sendMessage("You're not in a party."); //TODO: Use mcLocale
+				return true;
+			}
+			
 			String pMessage = args[0];
 			for (int i = 1; i <= args.length - 1; i++) {
 				pMessage = pMessage + " " + args[i];
@@ -72,7 +66,7 @@ public class PCommand implements CommandExecutor {
 
 			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);
+			Bukkit.getLogger().info("[P](" + PP.getParty() + ")<" + name + "> " + pMessage);
 
 			for (Player herp : Bukkit.getServer().getOnlinePlayers()) {
 				if (Users.getProfile(herp).inParty()) {
@@ -90,10 +84,8 @@ public class PCommand implements CommandExecutor {
 		PP.togglePartyChat();
 
 		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"));
 		}
 

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

@@ -9,7 +9,6 @@ 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;
 import com.gmail.nossr50.party.Party;
@@ -17,10 +16,6 @@ import com.gmail.nossr50.party.Party;
 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;
-		}
 
 		if (!(sender instanceof Player)) {
 			sender.sendMessage("This command does not support console useage.");
@@ -73,6 +68,44 @@ public class PartyCommand implements CommandExecutor {
 			}
 			player.sendMessage(mcLocale.getString("mcPlayerListener.YouAreInParty", new Object[] { PP.getParty() }));
 			player.sendMessage(mcLocale.getString("mcPlayerListener.PartyMembers") + " (" + tempList + ChatColor.GREEN + ")");
+			
+			//Master Apprentice Stuff
+			//Show the player all their bonuses when they type /party
+			
+			/*
+			for(Player a : Party.getInstance().getPartyMembers(player))
+			{
+			    if(Party.getInstance().isPartyLeader(a.getName(), PP.getParty()) && !a.getName().equals(player.getName()))
+			    {
+			        PlayerProfile LP = Users.getProfile(a);
+			        for(SkillType type : SkillType.values())
+			        {
+			            //Skip this one
+			            if(type == SkillType.ALL)
+			                continue;
+			            
+			            if(LP.getSkillLevel(type) > PP.getSkillLevel(type))
+			            {
+			                //Tell them what their skill bonus is for this skill
+        			        int leaderLevel = LP.getSkillLevel(type); 
+        		            int difference = leaderLevel - PP.getSkillLevel(type);
+        		            
+        		            double bonusModifier = (difference*0.75D)/100D;
+        		            double trueBonus = bonusModifier * 100;
+        		            player.sendMessage("You get "+trueBonus+"% more XP from "+type.toString());
+        		            //double percent = (trueBonus/100)*100;
+			            } else
+			            {
+			                //Tell them they have no bonus.. or not
+			            }
+			        }
+			    } else if(Party.getInstance().isPartyLeader(a.getName(), PP.getParty()) && a.getName().equals(player.getName()))
+			    {
+			        //Tell them they are providing bonuses
+			    }
+			}
+			*/
+            
 			return true;
 		} else if (args.length == 1) {
 			if (args[0].equals("q") && PP.inParty()) {

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

@@ -12,6 +12,7 @@ import com.gmail.nossr50.mcPermissions;
 import com.gmail.nossr50.config.LoadProperties;
 import com.gmail.nossr50.datatypes.PlayerProfile;
 import com.gmail.nossr50.locale.mcLocale;
+import com.gmail.nossr50.party.Party;
 
 public class PtpCommand implements CommandExecutor {
 	private final mcMMO plugin;
@@ -22,10 +23,6 @@ public class PtpCommand implements CommandExecutor {
 
 	@Override
 	public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
-		if (!LoadProperties.ptpEnable) {
-			sender.sendMessage("This command is not enabled.");
-			return true;
-		}
 
 		if (!(sender instanceof Player)) {
 			sender.sendMessage("This command does not support console useage.");
@@ -39,10 +36,24 @@ public class PtpCommand implements CommandExecutor {
 			player.sendMessage(ChatColor.YELLOW + "[mcMMO] " + ChatColor.DARK_RED + mcLocale.getString("mcPlayerListener.NoPermission"));
 			return true;
 		}
+		
+		if(!Party.getInstance().isParty(PP.getParty()))
+		{
+		    player.sendMessage(ChatColor.RED+"You are not in a party!");
+		    return true;
+		}
+		
+		if(PP.getRecentlyHurt()+(LoadProperties.ptpCommandCooldown*1000) > System.currentTimeMillis())
+		{
+		    player.sendMessage(ChatColor.RED+"You've been hurt in the last " + LoadProperties.ptpCommandCooldown + " seconds and cannnot teleport.");
+		    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");
 		}
@@ -54,9 +65,11 @@ public class PtpCommand implements CommandExecutor {
 				player.teleport(target);
 				player.sendMessage(ChatColor.GREEN + "You have teleported to " + target.getName());
 				target.sendMessage(ChatColor.GREEN + player.getName() + " has teleported to you.");
+			} else {
+			    player.sendMessage(ChatColor.RED + "That player is in a different party than you.");
 			}
 		}
 
 		return true;
 	}
-}
+}

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

@@ -10,11 +10,13 @@ import com.gmail.nossr50.mcPermissions;
 import com.gmail.nossr50.datatypes.PlayerProfile;
 import com.gmail.nossr50.datatypes.SkillType;
 import com.gmail.nossr50.locale.mcLocale;
+import com.gmail.nossr50.util.Page;
 
 public class AcrobaticsCommand implements CommandExecutor {
 	@Override
 	public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
-		if (!(sender instanceof Player)) {
+		if (!(sender instanceof Player))
+		{
 			sender.sendMessage("This command does not support console useage.");
 			return true;
 		}
@@ -46,7 +48,9 @@ public class AcrobaticsCommand implements CommandExecutor {
 		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 }));
-
+		
+		Page.grabGuidePageForSkill(SkillType.ACROBATICS, player, args);
+		
 		return true;
 	}
-}
+}

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

@@ -10,6 +10,7 @@ import com.gmail.nossr50.mcPermissions;
 import com.gmail.nossr50.datatypes.PlayerProfile;
 import com.gmail.nossr50.datatypes.SkillType;
 import com.gmail.nossr50.locale.mcLocale;
+import com.gmail.nossr50.util.Page;
 
 public class ArcheryCommand implements CommandExecutor {
 	@Override
@@ -57,6 +58,8 @@ public class ArcheryCommand implements CommandExecutor {
 		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) }));
+		
+		Page.grabGuidePageForSkill(SkillType.ARCHERY, player, args);
 
 		return true;
 	}

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

@@ -26,11 +26,17 @@ public class AxesCommand implements CommandExecutor {
 
 		float skillvalue = (float) PP.getSkillLevel(SkillType.AXES);
 		if (PP.getSkillLevel(SkillType.AXES) < 750)
-			percentage = String.valueOf((skillvalue / 1000) * 100);
+			percentage = String.valueOf((skillvalue / 2000) * 100);
 		else
-			percentage = "75";
+			percentage = "37.5";
+		
+		int bonusDmg = Users.getProfile(player).getSkillLevel(SkillType.AXES)/50;
+		if(bonusDmg > 4)
+		    bonusDmg = 4;
 
 		int ticks = 2;
+		short durDmg = 5;
+		durDmg+=Users.getProfile(player).getSkillLevel(SkillType.AXES)/30;
 		int x = PP.getSkillLevel(SkillType.AXES);
 		while (x >= 50) {
 			x -= 50;
@@ -47,15 +53,15 @@ public class AxesCommand implements CommandExecutor {
 		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.EffectsTemplate", new Object[] { mcLocale.getString("m.EffectsAxes4_0"), mcLocale.getString("m.EffectsAxes4_1") }));
+        player.sendMessage(mcLocale.getString("m.EffectsTemplate", new Object[] { mcLocale.getString("m.EffectsAxes5_0"), mcLocale.getString("m.EffectsAxes5_1") }));
 		player.sendMessage(mcLocale.getString("m.SkillHeader", new Object[] { mcLocale.getString("m.YourStats") }));
 		player.sendMessage(mcLocale.getString("m.AxesCritChance", new Object[] { percentage }));
-
-		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") }));
-
-		player.sendMessage(mcLocale.getString("m.AxesSkullLength", new Object[] { ticks }));
+		
+		player.sendMessage(mcLocale.getString("m.AbilityBonusTemplate", new Object[] { mcLocale.getString("m.AbilBonusAxes1_0"), mcLocale.getString("m.AbilBonusAxes1_1", new Object[] {bonusDmg}) }));
+        player.sendMessage(mcLocale.getString("m.AbilityBonusTemplate", new Object[] { mcLocale.getString("m.AbilBonusAxes2_0"), mcLocale.getString("m.AbilBonusAxes2_1", new Object[] {durDmg}) }));
+        player.sendMessage(mcLocale.getString("m.AbilityBonusTemplate", new Object[] { mcLocale.getString("m.AbilBonusAxes3_0"), mcLocale.getString("m.AbilBonusAxes3_1", new Object[] {2}) }));
+        player.sendMessage(mcLocale.getString("m.AxesSkullLength", new Object[] { ticks }));
 
 		return true;
 	}

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

@@ -10,6 +10,7 @@ import com.gmail.nossr50.mcPermissions;
 import com.gmail.nossr50.datatypes.PlayerProfile;
 import com.gmail.nossr50.datatypes.SkillType;
 import com.gmail.nossr50.locale.mcLocale;
+import com.gmail.nossr50.util.Page;
 
 public class ExcavationCommand implements CommandExecutor {
 	@Override
@@ -29,6 +30,7 @@ public class ExcavationCommand implements CommandExecutor {
 			ticks++;
 		}
 
+		player.sendMessage("");
 		player.sendMessage(mcLocale.getString("m.SkillHeader", new Object[] { mcLocale.getString("m.SkillExcavation") }));
 		player.sendMessage(mcLocale.getString("m.XPGain", new Object[] { mcLocale.getString("m.XPGainExcavation") }));
 
@@ -39,8 +41,10 @@ public class ExcavationCommand implements CommandExecutor {
 		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 }));
+		player.sendMessage(mcLocale.getString("m.ExcavationGigaDrillBreakerLength", new Object[] { ticks }));
 
+		Page.grabGuidePageForSkill(SkillType.EXCAVATION, player, args);
+		
 		return true;
 	}
 }

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

@@ -11,6 +11,7 @@ import com.gmail.nossr50.datatypes.PlayerProfile;
 import com.gmail.nossr50.datatypes.SkillType;
 import com.gmail.nossr50.locale.mcLocale;
 import com.gmail.nossr50.skills.Fishing;
+import com.gmail.nossr50.util.Page;
 
 public class FishingCommand implements CommandExecutor {
 	@Override
@@ -41,6 +42,8 @@ public class FishingCommand implements CommandExecutor {
 			player.sendMessage(mcLocale.getString("m.AbilityLockTemplate", new Object[] { mcLocale.getString("m.AbilLockFishing1") }));
 		else
 			player.sendMessage(mcLocale.getString("m.ShakeInfo", new Object[] { Fishing.getFishingLootTier(PP) }));
+		
+		Page.grabGuidePageForSkill(SkillType.FISHING, player, args);
 
 		return true;
 	}

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

@@ -10,6 +10,7 @@ import com.gmail.nossr50.mcPermissions;
 import com.gmail.nossr50.datatypes.PlayerProfile;
 import com.gmail.nossr50.datatypes.SkillType;
 import com.gmail.nossr50.locale.mcLocale;
+import com.gmail.nossr50.util.Page;
 
 public class HerbalismCommand implements CommandExecutor {
 	@Override
@@ -29,6 +30,10 @@ public class HerbalismCommand implements CommandExecutor {
 			bonus++;
 		if (PP.getSkillLevel(SkillType.HERBALISM) >= 600)
 			bonus++;
+		if (PP.getSkillLevel(SkillType.HERBALISM) >= 800)
+			bonus++;
+		if (PP.getSkillLevel(SkillType.HERBALISM) >= 1000)
+			bonus++;
 
 		int ticks = 2;
 		int x = PP.getSkillLevel(SkillType.HERBALISM);
@@ -51,12 +56,16 @@ public class HerbalismCommand implements CommandExecutor {
 		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.EffectsHerbalism4_0"), mcLocale.getString("m.EffectsHerbalism4_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.HerbalismFoodPlus", new Object[] { bonus } ));
 		player.sendMessage(mcLocale.getString("m.HerbalismDoubleDropChance", new Object[] { percentage }));
+		
+		Page.grabGuidePageForSkill(SkillType.HERBALISM, player, args);
 
 		return true;
 	}

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

@@ -10,6 +10,7 @@ import com.gmail.nossr50.mcPermissions;
 import com.gmail.nossr50.datatypes.PlayerProfile;
 import com.gmail.nossr50.datatypes.SkillType;
 import com.gmail.nossr50.locale.mcLocale;
+import com.gmail.nossr50.util.Page;
 
 public class MiningCommand implements CommandExecutor {
 	@Override
@@ -30,6 +31,46 @@ public class MiningCommand implements CommandExecutor {
 			x -= 50;
 			ticks++;
 		}
+		
+		int rank = 0;
+		int damage = 0;
+		int radius = 0;
+		if(PP.getSkillLevel(SkillType.MINING) >= 125 && PP.getSkillLevel(SkillType.MINING) < 250)
+			rank = 1;
+		if(PP.getSkillLevel(SkillType.MINING) >= 250 && PP.getSkillLevel(SkillType.MINING) < 375){
+			rank = 2;
+			radius = 1;
+		}
+		if(PP.getSkillLevel(SkillType.MINING) >= 375 && PP.getSkillLevel(SkillType.MINING) < 500){
+			rank = 3;
+			radius = 1;
+		}
+		if(PP.getSkillLevel(SkillType.MINING) >= 500 && PP.getSkillLevel(SkillType.MINING) < 625){
+			rank = 4;
+			damage = 25;
+			radius = 2;
+		}
+		if(PP.getSkillLevel(SkillType.MINING) >= 625 && PP.getSkillLevel(SkillType.MINING) < 750){
+			rank = 5;
+			damage = 25;
+			radius = 2;
+		}
+		if(PP.getSkillLevel(SkillType.MINING) >= 750 && PP.getSkillLevel(SkillType.MINING) < 875){
+			rank = 6;
+			damage = 50;
+			radius = 3;
+		}
+		if(PP.getSkillLevel(SkillType.MINING) >= 875 && PP.getSkillLevel(SkillType.MINING) < 1000){
+			rank = 7;
+			damage = 50;
+			radius = 3;
+		}
+		if(PP.getSkillLevel(SkillType.MINING) >= 1000){
+			rank = 8;
+			damage = 100;
+			radius = 4;
+		}
+		
 		player.sendMessage(mcLocale.getString("m.SkillHeader", new Object[] { mcLocale.getString("m.SkillMining") }));
 		player.sendMessage(mcLocale.getString("m.XPGain", new Object[] { mcLocale.getString("m.XPGainMining") }));
 
@@ -39,10 +80,53 @@ public class MiningCommand implements CommandExecutor {
 		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.EffectsTemplate", new Object[] { mcLocale.getString("m.EffectsMining3_0"), mcLocale.getString("m.EffectsMining3_1") }));
+		player.sendMessage(mcLocale.getString("m.EffectsTemplate", new Object[] { mcLocale.getString("m.EffectsMining4_0"), mcLocale.getString("m.EffectsMining4_1") }));
+		player.sendMessage(mcLocale.getString("m.EffectsTemplate", new Object[] { mcLocale.getString("m.EffectsMining5_0"), mcLocale.getString("m.EffectsMining5_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 (PP.getSkillLevel(SkillType.MINING) < 125)
+			player.sendMessage(mcLocale.getString("m.AbilityLockTemplate", new Object[] { mcLocale.getString("m.AbilLockMining1") }));
+		else{
+			switch (rank){
+			case 1:
+				player.sendMessage(mcLocale.getString("m.MiningBlastMining", new Object[] { rank, mcLocale.getString("m.BlastMining1") }));
+				break;
+			case 2:
+				player.sendMessage(mcLocale.getString("m.MiningBlastMining", new Object[] { rank, mcLocale.getString("m.BlastMining2") }));
+				break;
+			case 3:
+				player.sendMessage(mcLocale.getString("m.MiningBlastMining", new Object[] { rank, mcLocale.getString("m.BlastMining3") }));
+				break;
+			case 4:
+				player.sendMessage(mcLocale.getString("m.MiningBlastMining", new Object[] { rank, mcLocale.getString("m.BlastMining4") }));
+				break;
+			case 5:
+				player.sendMessage(mcLocale.getString("m.MiningBlastMining", new Object[] { rank, mcLocale.getString("m.BlastMining5") }));
+				break;
+			case 6:
+				player.sendMessage(mcLocale.getString("m.MiningBlastMining", new Object[] { rank, mcLocale.getString("m.BlastMining6") }));
+				break;
+			case 7:
+				player.sendMessage(mcLocale.getString("m.MiningBlastMining", new Object[] { rank, mcLocale.getString("m.BlastMining7") }));
+				break;
+			case 8:
+				player.sendMessage(mcLocale.getString("m.MiningBlastMining", new Object[] { rank, mcLocale.getString("m.BlastMining8") }));
+				break;
+			}
+		}
+		if (PP.getSkillLevel(SkillType.MINING) < 250)
+			player.sendMessage(mcLocale.getString("m.AbilityLockTemplate", new Object[] { mcLocale.getString("m.AbilLockMining2") }));
+		else
+			player.sendMessage(mcLocale.getString("m.MiningBiggerBombs", new Object[] { radius }));
+		if (PP.getSkillLevel(SkillType.MINING) < 500)
+			player.sendMessage(mcLocale.getString("m.AbilityLockTemplate", new Object[] { mcLocale.getString("m.AbilLockMining3") }));
+		else
+			player.sendMessage(mcLocale.getString("m.MiningDemolitionsExpertDamageDecrease", new Object[] { damage }));
+		
+		Page.grabGuidePageForSkill(SkillType.MINING, player, args);
+		
 		return true;
 	}
 }

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

@@ -12,6 +12,7 @@ import com.gmail.nossr50.datatypes.PlayerProfile;
 import com.gmail.nossr50.datatypes.SkillType;
 import com.gmail.nossr50.locale.mcLocale;
 import com.gmail.nossr50.skills.Repair;
+import com.gmail.nossr50.util.Page;
 
 public class RepairCommand implements CommandExecutor {
 	@Override
@@ -42,12 +43,12 @@ public class RepairCommand implements CommandExecutor {
 		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"));
-
+		player.sendMessage(mcLocale.getString("m.ArcaneForgingRank", new Object[] { Repair.getArcaneForgingRank(PP.getSkillLevel(SkillType.REPAIR)) }));
+		player.sendMessage(mcLocale.getString("m.ArcaneEnchantKeepChance", new Object[] { Repair.getEnchantChance(Repair.getArcaneForgingRank(PP.getSkillLevel(SkillType.REPAIR))) }));
+		player.sendMessage(mcLocale.getString("m.ArcaneEnchantDowngradeChance", new Object[] { Repair.getDowngradeChance(Repair.getArcaneForgingRank(PP.getSkillLevel(SkillType.REPAIR))) }));
+		
+		Page.grabGuidePageForSkill(SkillType.REPAIR, player, args);
+		
 		return true;
 	}
 }

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

@@ -10,6 +10,7 @@ import com.gmail.nossr50.mcPermissions;
 import com.gmail.nossr50.datatypes.PlayerProfile;
 import com.gmail.nossr50.datatypes.SkillType;
 import com.gmail.nossr50.locale.mcLocale;
+import com.gmail.nossr50.util.Page;
 
 public class SwordsCommand implements CommandExecutor {
 	@Override
@@ -61,8 +62,10 @@ public class SwordsCommand implements CommandExecutor {
 		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.SwordsBleedChance", new Object[] { percentage }));
 		player.sendMessage(mcLocale.getString("m.SwordsSSLength", new Object[] { ticks }));
+		
+		Page.grabGuidePageForSkill(SkillType.SWORDS, player, args);
 
 		return true;
 	}

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

@@ -11,6 +11,7 @@ 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.util.Page;
 
 public class TamingCommand implements CommandExecutor {
 	@Override
@@ -40,6 +41,7 @@ public class TamingCommand implements CommandExecutor {
 		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.EffectsTemplate", new Object[] { mcLocale.getString("m.EffectsTaming8_0"), mcLocale.getString("m.EffectsTaming8_1") }));
 		player.sendMessage(mcLocale.getString("m.EffectsTaming7_2", new Object[] { LoadProperties.bonesConsumedByCOTW }));
 		player.sendMessage(mcLocale.getString("m.SkillHeader", new Object[] { mcLocale.getString("m.YourStats") }));
 
@@ -62,8 +64,14 @@ public class TamingCommand implements CommandExecutor {
 			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 (PP.getSkillLevel(SkillType.TAMING) < 50)
+            player.sendMessage(mcLocale.getString("m.AbilityLockTemplate", new Object[] { mcLocale.getString("m.AbilLockTaming5") }));
+		else
+	          player.sendMessage(mcLocale.getString("m.AbilityBonusTemplate", new Object[] { mcLocale.getString("m.AbilBonusTaming5_0"), mcLocale.getString("m.AbilBonusTaming5_1") }));
+		
 		player.sendMessage(mcLocale.getString("m.TamingGoreChance", new Object[] { percentage }));
+		
+		Page.grabGuidePageForSkill(SkillType.TAMING, player, args);
 
 		return true;
 	}

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

@@ -10,6 +10,7 @@ import com.gmail.nossr50.mcPermissions;
 import com.gmail.nossr50.datatypes.PlayerProfile;
 import com.gmail.nossr50.datatypes.SkillType;
 import com.gmail.nossr50.locale.mcLocale;
+import com.gmail.nossr50.util.Page;
 
 public class UnarmedCommand implements CommandExecutor {
 	@Override
@@ -26,9 +27,9 @@ public class UnarmedCommand implements CommandExecutor {
 		float skillvalue = (float) PP.getSkillLevel(SkillType.UNARMED);
 
 		if (PP.getSkillLevel(SkillType.UNARMED) < 1000)
-			percentage = String.valueOf((skillvalue / 4000) * 100);
+			percentage = String.valueOf((skillvalue / 3000) * 100);
 		else
-			percentage = "25";
+			percentage = "33.3";
 
 		if (PP.getSkillLevel(SkillType.UNARMED) < 1000)
 			arrowpercentage = String.valueOf(((skillvalue / 1000) * 100) / 2);
@@ -41,6 +42,11 @@ public class UnarmedCommand implements CommandExecutor {
 			x -= 50;
 			ticks++;
 		}
+		
+		int bonus = 3 + (PP.getSkillLevel(SkillType.UNARMED)/50);
+		
+		if(bonus > 8)
+		    bonus = 8;
 
 		player.sendMessage(mcLocale.getString("m.SkillHeader", new Object[] { mcLocale.getString("m.SkillUnarmed") }));
 		player.sendMessage(mcLocale.getString("m.XPGain", new Object[] { mcLocale.getString("m.XPGainUnarmed") }));
@@ -52,22 +58,17 @@ public class UnarmedCommand implements CommandExecutor {
 		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.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 (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") }));
-		}
+		player.sendMessage(mcLocale.getString("m.AbilityBonusTemplate", new Object[] { mcLocale.getString("m.AbilBonusUnarmed2_0"), mcLocale.getString("m.AbilBonusUnarmed2_1", new Object[] {bonus}) }));
 
 		player.sendMessage(mcLocale.getString("m.UnarmedBerserkLength", new Object[] { ticks }));
+		
+		Page.grabGuidePageForSkill(SkillType.UNARMED, player, args);
 
 		return true;
 	}

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

@@ -10,6 +10,7 @@ import com.gmail.nossr50.mcPermissions;
 import com.gmail.nossr50.datatypes.PlayerProfile;
 import com.gmail.nossr50.datatypes.SkillType;
 import com.gmail.nossr50.locale.mcLocale;
+import com.gmail.nossr50.util.Page;
 
 public class WoodcuttingCommand implements CommandExecutor {
 	@Override
@@ -51,6 +52,8 @@ public class WoodcuttingCommand implements CommandExecutor {
 		player.sendMessage(mcLocale.getString("m.WoodCuttingDoubleDropChance", new Object[] { percentage }));
 		player.sendMessage(mcLocale.getString("m.WoodCuttingTreeFellerLength", new Object[] { ticks }));
 		
+		Page.grabGuidePageForSkill(SkillType.WOODCUTTING, player, args);
+		
 		return true;
 	}
 }

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

@@ -0,0 +1,55 @@
+package com.gmail.nossr50.config;
+
+import java.io.File;
+import java.io.IOException;
+
+import org.bukkit.configuration.file.FileConfiguration;
+
+import com.gmail.nossr50.mcMMO;
+
+public abstract class ConfigLoader {
+
+    protected static File configFile;
+    protected static File dataFolder;
+    protected final mcMMO plugin;
+    protected static FileConfiguration config;
+
+    public ConfigLoader(mcMMO plugin, String fileName){
+        this.plugin = plugin;
+        dataFolder = plugin.getDataFolder();
+        configFile = new File(dataFolder, File.separator + fileName);
+    }
+
+    /**
+     * Load this config file.
+     */
+    protected abstract void load();
+
+    /**
+     * Save this config file.
+     */
+    private static void saveConfig() {
+        try {
+            config.save(configFile);
+        }
+        catch (IOException e) {
+            e.printStackTrace();
+        }
+    }
+
+    /**
+     * Add the defaults to this config file.
+     */
+    protected void addDefaults() {
+
+        // Load from included config.yml
+        config.options().copyDefaults(true);
+        saveConfig();
+    }
+
+    /**
+     * Load the keys from this config file.
+     */
+    protected abstract void loadKeys();
+
+}

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

@@ -1,439 +1,479 @@
-/*
-	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 class LoadProperties extends ConfigLoader{
 
-	public static String MySQLtablePrefix, MySQLuserName,
-			MySQLserverName, MySQLdbName, MySQLdbPass, nWood, nStone, 
-			nIron, nGold, nDiamond, locale, nString, nLeather;
+    /*
+     * GENERAL SETTINGS
+     */
 
-	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;
+    /* General Settings */
+    public static String locale;
+    public static Boolean enableMotd, statsTracking, eventCallback;
+    public static int 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;
+    /* mySQL */
+    public static Boolean useMySQL;
+    public static String MySQLtablePrefix, MySQLuserName, MySQLserverName, MySQLdbName, MySQLdbPass;
+    public static int MySQLport;
 
-	public static HUDType defaulthud;
-	protected static File configFile;
-	protected static File dataFolder;
-	protected final mcMMO plugin;
-	protected static FileConfiguration config;
+    /* Commands */
+    public static Boolean xplockEnable, xprateEnable, mccEnable, mcmmoEnable,
+                          partyEnable, inviteEnable, acceptEnable, inspectEnable,
+                          mcstatsEnable, addxpEnable, ptpEnable, mmoeditEnable,
+                          mcremoveEnable, mcgodEnable, mcabilityEnable, mctopEnable,
+                          addlevelsEnable, mcrefreshEnable, aEnable, pEnable;
+    public static Boolean aDisplayNames, pDisplayNames;
+    public static int ptpCommandCooldown;
+    public static Boolean donateMessage;
 
-	public LoadProperties(mcMMO plugin) {
-		this.plugin = plugin;
-		dataFolder = plugin.getDataFolder();
-		configFile = new File(dataFolder, File.separator + "config.yml");
-		config = plugin.getConfig();
-	}
+    /* Tool Level Requirements */
+    public static Boolean perLevelTools;
+    public static int sAxe, sHoe, sShovel, sSword, sPickaxe;
+    public static int iAxe, iHoe, iShovel, iSword, iPickaxe;
+    public static int gAxe, gHoe, gShovel, gSword, gPickaxe;
+    public static int dAxe, dHoe, dShovel, dSword, dPickaxe;
 
-	public void load() {
-		// If not exist, copy from the jar
-		if (!configFile.exists()) {
-			dataFolder.mkdir();
-			plugin.saveDefaultConfig();
-		}
-		addDefaults();
-		loadKeys();
-	}
+    /* Items */
+    public static Boolean chimaeraWingEnable;
+    public static int chimaeraId, feathersConsumedByChimaeraWing;
 
-	private Boolean readBoolean(String root, Boolean def) {
-		Boolean result = config.getBoolean(root, def);
-		return result;
-	}
+    /*
+     * ABILITY SETTINGS
+     */
 
-	private Double readDouble(String root, Double def) {
-		Double result = config.getDouble(root, def);
-		return result;
-	}
+    /* General Settings */
+    public static Boolean enableOnlyActivateWhenSneaking, enableAbilityMessages, enableAbilities;
 
-	private Integer readInteger(String root, Integer def) {
-		Integer result = config.getInt(root, def);
-		return result;
-	}
+    /* Durability Settings */
+    public static Boolean toolsLoseDurabilityFromAbilities;
+    public static int abilityDurabilityLoss;
 
-	public static String readString(String root, String def) {
-		String result = config.getString(root, def);
-		return result;
-	}
+    /* Cooldowns */
+    public static int superBreakerCooldown, blastMiningCooldown, greenTerraCooldown,
+                      gigaDrillBreakerCooldown, treeFellerCooldown, berserkCooldown,
+                      serratedStrikeCooldown, skullSplitterCooldown;
 
-	private static void saveConfig() {
-		try {
-			config.save(configFile);
-		} catch (IOException e) {
-			e.printStackTrace();
-		}
-	}
+    /* Thresholds */
+    public static int treeFellerThreshold;
 
-	private void addDefaults() {
-		// Load from included config.yml
-		config.options().copyDefaults(true);
-		saveConfig();
-	}
+    /*
+     * SKILL SETTINGS
+     */
 
-	private void loadKeys() {
-		plugin.getLogger().info("Loading Config File...");
+    /* Tool Requirements */
+    public static Boolean miningrequirespickaxe, excavationRequiresShovel, woodcuttingrequiresaxe;
 
-		// Setup default HUD
-		String temp = readString("Spout.HUD.Default", "STANDARD");
-		for (HUDType x : HUDType.values()) {
-			if (x.toString().equalsIgnoreCase(temp)) {
-				defaulthud = x;
-			}
-		}
+    /* Excavation */
+    public static int mbase;
 
-		enableAbilityMessages = readBoolean("Abilities.Messages", true);
-		enableAbilities = readBoolean("Abilities.Enabled", true);
+    /* Fishing */
+    public static Boolean fishingDrops;
+    public static int fishingTier1, fishingTier2, fishingTier3, fishingTier4, fishingTier5;
+    public static int mfishing;
 
-		donateMessage = readBoolean("Commands.mcmmo.Donate_Message", true);
-		xpGainsMobSpawners = readBoolean("XP.Gains.Mobspawners.Enabled", false);
+    /* Herbalism */
+    public static Boolean herbalismHungerBonus, wheatRegrowth;
+    public static int mmelon, mcactus, mmushroom, mflower, msugar, mpumpkin, mwheat, mvines, mlilypad, mnetherwart;
+    public static Boolean enableCobbleToMossy, enableSmoothToMossy, enableDirtToGrass;
 
-		bonesConsumedByCOTW = readInteger("Skills.Taming.Call_Of_The_Wild.Bones_Required", 10);
+    /* Mining */
+    public static int msandstone, mgold, mdiamond, miron, mredstone, mlapis, mobsidian, mnetherrack, mglowstone, mcoal, mstone, mendstone, mmossstone;
+    public static int detonatorID;
 
-		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);
+    /* Repair */
+    public static Boolean repairArmor, repairTools;
+    public static Boolean anvilmessages;
+    public static int rWood, rStone, rIron, rGold, rDiamond, rString, rLeather;
+    public static int anvilID;
+    public static int repairStoneLevel, repairIronLevel, repairGoldLevel, repairdiamondlevel;
 
-		showFaces = readBoolean("Spout.Party.HUD.Show_Faces", true);
-		showDisplayName = readBoolean("Spout.Party.HUD.Show_Display_Name", false);
-		partybar = readBoolean("Spout.Party.HUD.Enabled", true);
+    /* Taming */
+    public static int mtameWolf, mtameOcelot;
+    public static int bonesConsumedByCOTW, fishConsumedByCOTW;
 
-		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);
+    /* Woodcutting */
+    public static int moak, mbirch, mspruce, mjungle;
 
-		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);
+    /* Arcane Forging */
+    public static Boolean mayDowngradeEnchants, mayLoseEnchants;
+    public static int arcaneRank1, arcaneRank2, arcaneRank3, arcaneRank4;
+    public static int downgradeRank1, downgradeRank2, downgradeRank3, downgradeRank4;
+    public static int keepEnchantsRank1, keepEnchantsRank2, keepEnchantsRank3, keepEnchantsRank4;
 
-		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);
+    /* Level Caps */
+    public static int levelCapAcrobatics, levelCapArchery, levelCapAxes, levelCapExcavation,
+                      levelCapFishing, levelCapHerbalism, levelCapMining, levelCapRepair,
+                      levelCapSwords, levelCapTaming, levelCapUnarmed, levelCapWoodcutting;
 
-		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);
+    /*
+     * XP SETTINGS
+     */
 
-		mpine = readInteger("Experience.Woodcutting.Pine", 70);
-		mbirch = readInteger("Experience.Woodcutting.Birch", 80);
-		mspruce = readInteger("Experience.Woodcutting.Spruce", 90);
+    /* General Settings */
+    public static Boolean xpGainsMobSpawners, pvpxp;
+    public static int xpGainMultiplier;
 
-		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);
+    /* Combat XP Multipliers */
+    public static double pvpxprewardmodifier;
+    public static double animalXP, creeperXP, skeletonXP, spiderXP, ghastXP, slimeXP,
+                         zombieXP, pigzombieXP, endermanXP, cavespiderXP, silverfishXP,
+                         blazeXP, magmacubeXP, enderdragonXP;
 
-		mfishing = readInteger("Experience.Fishing.Base", 800);
+    /* XP Formula Multiplier */
+    public static double tamingxpmodifier, miningxpmodifier, repairxpmodifier, woodcuttingxpmodifier,
+                         fishingxpmodifier, unarmedxpmodifier, herbalismxpmodifier, excavationxpmodifier,
+                         archeryxpmodifier, swordsxpmodifier, axesxpmodifier, acrobaticsxpmodifier;
 
-		enableOnlyActivateWhenSneaking = readBoolean("Abilities.Activation.Only_Activate_When_Sneaking", false);
+    /*
+     * SPOUT SETTINGS
+     */
 
-		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);
+    public static Boolean spoutEnabled;
 
-		MySQLserverName = readString("MySQL.Server.Address", "localhost");
-		if (readString("MySQL.Database.User.Password", null) != null)
-			MySQLdbPass = readString("MySQL.Database.User.Password", null);
-		else
-			MySQLdbPass = "";
+    /* Spout Party HUD */
+    public static Boolean showDisplayName, showFaces, partybar;
 
-		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);
+    /* Spout XP Bar */
+    public static Boolean xpbar, xpicon;
+    public static int xpbar_x, xpbar_y, xpicon_x, xpicon_y;
 
-		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);
+    /* Spout HUD Colors */
+    public static double xpbackground_r, xpbackground_g, xpbackground_b;
+    public static double xpborder_r, xpborder_g, xpborder_b;
+    public static double fishing_r, fishing_g, fishing_b;
+    public static double acrobatics_r, acrobatics_g, acrobatics_b;
+    public static double archery_r, archery_g, archery_b;
+    public static double axes_r, axes_g, axes_b;
+    public static double excavation_r, excavation_g, excavation_b;
+    public static double herbalism_r, herbalism_g, herbalism_b;
+    public static double mining_r, mining_g, mining_b;
+    public static double repair_r, repair_g, repair_b;
+    public static double swords_r, swords_g, swords_b;
+    public static double taming_r, taming_g, taming_b;
+    public static double unarmed_r, unarmed_g, unarmed_b;
+    public static double woodcutting_r, woodcutting_g, woodcutting_b;
 
-		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);
+    /*
+     * CONFIG LOADING
+     */
 
-		xpGainMultiplier = readInteger("Experience.Gains.Multiplier.Global", 1);
-		toolsLoseDurabilityFromAbilities = readBoolean("Abilities.Tools.Durability_Loss_Enabled", true);
-		abilityDurabilityLoss = readInteger("Abilities.Tools.Durability_Loss", 2);
+    public static HUDType defaulthud;
 
-		feathersConsumedByChimaeraWing = readInteger("Items.Chimaera_Wing.Feather_Cost", 10);
-		chimaeraId = readInteger("Items.Chimaera_Wing.Item_ID", 288);
-		chimaeraWingEnable = readBoolean("Items.Chimaera_Wing.Enabled", true);
+    public LoadProperties(mcMMO plugin) {
+        super(plugin, "config.yml");
+        config = plugin.getConfig();
+    }
 
-		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);
+    @Override
+    public void load() {
 
-		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);
+        // If it doesn't exist, copy it from the .jar
+        if (!configFile.exists()) {
+            dataFolder.mkdir();
+            plugin.saveDefaultConfig();
+        }
 
-		anvilmessages = readBoolean("Skills.Repair.Anvil_Messages", true);
-		anvilID = readInteger("Skills.Repair.Anvil_ID", 42);
+        addDefaults();
+        loadKeys();
+    }
 
-		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);
+    @Override
+    protected void loadKeys() {
+        plugin.getLogger().info("Loading mcMMO config.yml File...");
 
-		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);
+        // Setup default HUD
+        String temp = config.getString("Spout.HUD.Default", "STANDARD");
+        for (HUDType x : HUDType.values()) {
+            if (x.toString().equalsIgnoreCase(temp)) {
+                defaulthud = x;
+            }
+        }
 
-		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);
+        enableAbilityMessages = config.getBoolean("Abilities.Messages", true);
+        enableAbilities = config.getBoolean("Abilities.Enabled", 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);
+        donateMessage = config.getBoolean("Commands.mcmmo.Donate_Message", true);
+        xpGainsMobSpawners = config.getBoolean("Experience.Gains.Mobspawners.Enabled", false);
 
-		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);
-	}
+        bonesConsumedByCOTW = config.getInt("Skills.Taming.Call_Of_The_Wild.Bones_Required", 10);
+        fishConsumedByCOTW = config.getInt("Skills.Taming.Call_Of_The_Wild.Fish_Required", 10);
+
+        xpbar = config.getBoolean("Spout.XP.Bar.Enabled", true);
+        xpicon = config.getBoolean("Spout.XP.Icon.Enabled", true);
+        xpbar_x = config.getInt("Spout.XP.Bar.X_POS", 95);
+        xpbar_y = config.getInt("Spout.XP.Bar.Y_POS", 6);
+        xpicon_x = config.getInt("Spout.XP.Icon.X_POS", 78);
+        xpicon_y = config.getInt("Spout.XP.Icon.Y_POS", 2);
+
+        showFaces = config.getBoolean("Spout.Party.HUD.Show_Faces", true);
+        showDisplayName = config.getBoolean("Spout.Party.HUD.Show_Display_Name", false);
+        partybar = config.getBoolean("Spout.Party.HUD.Enabled", true);
+
+        acrobatics_r = config.getDouble("Spout.HUD.Retro.Colors.Acrobatics.RED", 0.3);
+        acrobatics_g = config.getDouble("Spout.HUD.Retro.Colors.Acrobatics.GREEN", 0.3);
+        acrobatics_b = config.getDouble("Spout.HUD.Retro.Colors.Acrobatics.BLUE", 0.75);
+        archery_r = config.getDouble("Spout.HUD.Retro.Colors.Archery.RED", 0.3);
+        archery_g = config.getDouble("Spout.HUD.Retro.Colors.Archery.GREEN", 0.3);
+        archery_b = config.getDouble("Spout.HUD.Retro.Colors.Archery.BLUE", 0.75);
+        axes_r = config.getDouble("Spout.HUD.Retro.Colors.Axes.RED", 0.3);
+        axes_g = config.getDouble("Spout.HUD.Retro.Colors.Axes.GREEN", 0.3);
+        axes_b = config.getDouble("Spout.HUD.Retro.Colors.Axes.BLUE", 0.75);
+        excavation_r = config.getDouble("Spout.HUD.Retro.Colors.Excavation.RED", 0.3);
+        excavation_g = config.getDouble("Spout.HUD.Retro.Colors.Excavation.GREEN", 0.3);
+        excavation_b = config.getDouble("Spout.HUD.Retro.Colors.Excavation.BLUE", 0.75);
+        herbalism_r = config.getDouble("Spout.HUD.Retro.Colors.Herbalism.RED", 0.3);
+        herbalism_g = config.getDouble("Spout.HUD.Retro.Colors.Herbalism.GREEN", 0.3);
+        herbalism_b = config.getDouble("Spout.HUD.Retro.Colors.Herbalism.BLUE", 0.75);
+        mining_r = config.getDouble("Spout.HUD.Retro.Colors.Mining.RED", 0.3);
+        mining_g = config.getDouble("Spout.HUD.Retro.Colors.Mining.GREEN", 0.3);
+        mining_b = config.getDouble("Spout.HUD.Retro.Colors.Mining.BLUE", 0.75);
+        repair_r = config.getDouble("Spout.HUD.Retro.Colors.Repair.RED", 0.3);
+        repair_g = config.getDouble("Spout.HUD.Retro.Colors.Repair.GREEN", 0.3);
+        repair_b = config.getDouble("Spout.HUD.Retro.Colors.Repair.BLUE", 0.75);
+        swords_r = config.getDouble("Spout.HUD.Retro.Colors.Swords.RED", 0.3);
+        swords_g = config.getDouble("Spout.HUD.Retro.Colors.Swords.GREEN", 0.3);
+        swords_b = config.getDouble("Spout.HUD.Retro.Colors.Swords.BLUE", 0.75);
+        taming_r = config.getDouble("Spout.HUD.Retro.Colors.Taming.RED", 0.3);
+        taming_g = config.getDouble("Spout.HUD.Retro.Colors.Taming.GREEN", 0.3);
+        taming_b = config.getDouble("Spout.HUD.Retro.Colors.Taming.BLUE", 0.75);
+        unarmed_r = config.getDouble("Spout.HUD.Retro.Colors.Unarmed.RED", 0.3);
+        unarmed_g = config.getDouble("Spout.HUD.Retro.Colors.Unarmed.GREEN", 0.3);
+        unarmed_b = config.getDouble("Spout.HUD.Retro.Colors.Unarmed.BLUE", 0.75);
+        woodcutting_r = config.getDouble("Spout.HUD.Retro.Colors.Woodcutting.RED", 0.3);
+        woodcutting_g = config.getDouble("Spout.HUD.Retro.Colors.Woodcutting.GREEN", 0.3);
+        woodcutting_b = config.getDouble("Spout.HUD.Retro.Colors.Woodcutting.BLUE", 0.75);
+        fishing_r = config.getDouble("Spout.HUD.Retro.Colors.Fishing.RED", 0.3);
+        fishing_g = config.getDouble("Spout.HUD.Retro.Colors.Fishing.GREEN", 0.3);
+        fishing_b = config.getDouble("Spout.HUD.Retro.Colors.Fishing.BLUE", 0.75);
+
+        xpborder_r = config.getDouble("Spout.HUD.Retro.Colors.Border.RED", 0.0);
+        xpborder_g = config.getDouble("Spout.HUD.Retro.Colors.Border.GREEN", 0.0);
+        xpborder_b = config.getDouble("Spout.HUD.Retro.Colors.Border.BLUE", 0.0);
+        xpbackground_r = config.getDouble("Spout.HUD.Retro.Colors.Background.RED", 0.75);
+        xpbackground_g = config.getDouble("Spout.HUD.Retro.Colors.Background.GREEN", 0.75);
+        xpbackground_b = config.getDouble("Spout.HUD.Retro.Colors.Background.BLUE", 0.75);
+
+        mbase = config.getInt("Experience.Excavation.Base", 40);
+
+        msugar = config.getInt("Experience.Herbalism.Sugar_Cane", 30);
+        mwheat = config.getInt("Experience.Herbalism.Wheat", 50);
+        mcactus = config.getInt("Experience.Herbalism.Cactus", 30);
+        mpumpkin = config.getInt("Experience.Herbalism.Pumpkin", 20);
+        mflower = config.getInt("Experience.Herbalism.Flowers", 100);
+        mmushroom = config.getInt("Experience.Herbalism.Mushrooms", 150);
+        mmelon = config.getInt("Experience.Herbalism.Melon", 20);
+        mnetherwart = config.getInt("Experience.Herbalism.Nether_Wart", 50);
+        mlilypad = config.getInt("Experience.Herbalism.Lily_Pads", 100);
+        mvines = config.getInt("Experience.Herbalism.Vines", 10);
+        herbalismHungerBonus = config.getBoolean("Skills.Herbalism.Hunger_Bonus", true);
+        wheatRegrowth = config.getBoolean("Skills.Herbalism.Instant_Wheat_Regrowth", true);
+
+        moak = config.getInt("Experience.Woodcutting.Oak", 70);
+        mbirch = config.getInt("Experience.Woodcutting.Birch", 90);
+        mspruce = config.getInt("Experience.Woodcutting.Spruce", 80);
+        mjungle = config.getInt("Experience.Woodcutting.Jungle", 100);
+
+        mgold = config.getInt("Experience.Mining.Gold", 250);
+        mdiamond = config.getInt("Experience.Mining.Diamond", 750);
+        miron = config.getInt("Experience.Mining.Iron", 250);
+        mredstone = config.getInt("Experience.Mining.Redstone", 150);
+        mlapis = config.getInt("Experience.Mining.Lapis", 400);
+        mobsidian = config.getInt("Experience.Mining.Obsidian", 150);
+        mnetherrack = config.getInt("Experience.Mining.Netherrack", 30);
+        mglowstone = config.getInt("Experience.Mining.Glowstone", 30);
+        mcoal = config.getInt("Experience.Mining.Coal", 100);
+        mstone = config.getInt("Experience.Mining.Stone", 30);
+        msandstone = config.getInt("Experience.Mining.Sandstone", 30);
+        mendstone = config.getInt("Experience.Mining.End_Stone", 150);
+        mmossstone = config.getInt("Experience.Mining.Moss_Stone", 30);
+
+        mtameWolf = config.getInt("Experience.Taming.Animal_Taming.Wolf", 250);
+        mtameOcelot = config.getInt("Experience.Taming.Animal_Taming.Ocelot", 500);
+
+        mfishing = config.getInt("Experience.Fishing.Base", 800);
+
+        enableOnlyActivateWhenSneaking = config.getBoolean("Abilities.Activation.Only_Activate_When_Sneaking", false);
+
+        greenTerraCooldown = config.getInt("Abilities.Cooldowns.Green_Terra", 240);
+        superBreakerCooldown = config.getInt("Abilities.Cooldowns.Super_Breaker", 240);
+        gigaDrillBreakerCooldown = config.getInt("Abilities.Cooldowns.Giga_Drill_Breaker", 240);
+        treeFellerThreshold = config.getInt("Abilities.Limits.Tree_Feller_Threshold", 500);
+        treeFellerCooldown = config.getInt("Abilities.Cooldowns.Tree_Feller", 240);
+        berserkCooldown = config.getInt("Abilities.Cooldowns.Berserk", 240);
+        serratedStrikeCooldown = config.getInt("Abilities.Cooldowns.Serrated_Strikes", 240);
+        skullSplitterCooldown = config.getInt("Abilities.Cooldowns.Skull_Splitter", 240);
+        blastMiningCooldown = config.getInt("Abilities.Cooldowns.Blast_Mining", 60);
+
+        MySQLserverName = config.getString("MySQL.Server.Address", "localhost");
+
+        if (config.getString("MySQL.Database.User_Password", null) != null) {
+            MySQLdbPass = config.getString("MySQL.Database.User_Password", null);
+        }
+        else {
+            MySQLdbPass = "";
+        }
+
+        MySQLdbName = config.getString("MySQL.Database.Name", "DatabaseName");
+        MySQLuserName = config.getString("MySQL.Database.User_Name", "UserName");
+        MySQLtablePrefix = config.getString("MySQL.Database.TablePrefix", "mcmmo_");
+        MySQLport = config.getInt("MySQL.Server.Port", 3306);
+        useMySQL = config.getBoolean("MySQL.Enabled", false);
+
+        locale = config.getString("General.Locale", "en_us");
+        enableMotd = config.getBoolean("General.MOTD_Enabled", true);
+        saveInterval = config.getInt("General.Save_Interval", 10);
+        statsTracking = config.getBoolean("General.Stats_Tracking", true);
+        eventCallback = config.getBoolean("General.Event_Callback", true);
+        perLevelTools = config.getBoolean("General.Per_Level_Tools", false);
+
+        enableCobbleToMossy = config.getBoolean("Skills.Herbalism.Green_Thumb.Cobble_To_Mossy", true);
+        enableSmoothToMossy = config.getBoolean("Skills.Herbalism.Green_Thumb.SmoothBrick_To_MossyBrick", true);
+        enableDirtToGrass = config.getBoolean("Skills.Herbalism.Green_Thumb.Dirt_To_Grass", true);
+
+        xpGainMultiplier = config.getInt("Experience.Gains.Multiplier.Global", 1);
+        toolsLoseDurabilityFromAbilities = config.getBoolean("Abilities.Tools.Durability_Loss_Enabled", true);
+        abilityDurabilityLoss = config.getInt("Abilities.Tools.Durability_Loss", 2);
+
+        feathersConsumedByChimaeraWing = config.getInt("Items.Chimaera_Wing.Feather_Cost", 10);
+        chimaeraId = config.getInt("Items.Chimaera_Wing.Item_ID", 288);
+        chimaeraWingEnable = config.getBoolean("Items.Chimaera_Wing.Enabled", true);
+        dAxe = config.getInt("Items.Diamond.Axe", 750);
+        dHoe = config.getInt("Items.Diamond.Hoe", 750);
+        dShovel = config.getInt("Items.Diamond.Shovel", 750);
+        dSword = config.getInt("Items.Diamond.Sword", 750);
+        dPickaxe = config.getInt("Items.Diamond.Pickaxe", 750);
+        gAxe = config.getInt("Items.Gold.Axe", 500);
+        gHoe = config.getInt("Items.Gold.Hoe", 500);
+        gShovel = config.getInt("Items.Gold.Shovel", 500);
+        gSword = config.getInt("Items.Gold.Sword", 500);
+        gPickaxe = config.getInt("Items.Gold.Pickaxe", 500);
+        iAxe = config.getInt("Items.Iron.Axe", 250);
+        iHoe = config.getInt("Items.Iron.Hoe", 250);
+        iShovel = config.getInt("Items.Iron.Shovel", 250);
+        iSword = config.getInt("Items.Iron.Sword", 250);
+        iPickaxe = config.getInt("Items.Iron.Pickaxe", 250);
+        sAxe = config.getInt("Items.Stone.Axe", 0);
+        sHoe = config.getInt("Items.Stone.Hoe", 0);
+        sShovel = config.getInt("Items.Stone.Shovel", 0);
+        sSword = config.getInt("Items.Stone.Sword", 0);
+        sPickaxe = config.getInt("Items.Stone.Pickaxe", 0);
+
+        pvpxp = config.getBoolean("Experience.PVP.Rewards", true);
+        pvpxprewardmodifier = config.getDouble("Experience.Gains.Multiplier.PVP", 1.0);
+
+        miningrequirespickaxe = config.getBoolean("Skills.Mining.Requires_Pickaxe", true);
+        excavationRequiresShovel = config.getBoolean("Skills.Excavation.Requires_Shovel", true);
+        woodcuttingrequiresaxe = config.getBoolean("Skills.Woodcutting.Requires_Axe", true);
+        repairArmor = config.getBoolean("Skills.Repair.Can_Repair_Armor", true);
+        repairTools = config.getBoolean("Skills.Repair.Can_Repair_Tools", true);
+        repairdiamondlevel = config.getInt("Skills.Repair.Diamond.Level_Required", 50);
+        repairIronLevel = config.getInt("Skills.Repair.Iron.Level_Required", 0);
+        repairGoldLevel = config.getInt("Skills.Repair.Gold.Level_Required", 0);
+        repairStoneLevel = config.getInt("Skills.Repair.Stone.Level_Required", 0);
+
+        tamingxpmodifier = config.getDouble("Experience.Formula.Multiplier.Taming", 1.0);
+        miningxpmodifier = config.getDouble("Experience.Formula.Multiplier.Mining", 1.0);
+        repairxpmodifier = config.getDouble("Experience.Formula.Multiplier.Repair", 1.0);
+        woodcuttingxpmodifier = config.getDouble("Experience.Formula.Multiplier.Woodcutting", 1.0);
+        unarmedxpmodifier = config.getDouble("Experience.Formula.Multiplier.Unarmed", 1.0);
+        herbalismxpmodifier = config.getDouble("Experience.Formula.Multiplier.Herbalism", 1.0);
+        excavationxpmodifier = config.getDouble("Experience.Formula.Multiplier.Excavation", 1.0);
+        archeryxpmodifier = config.getDouble("Experience.Formula.Multiplier.Archery", 1.0);
+        swordsxpmodifier = config.getDouble("Experience.Formula.Multiplier.Swords", 1.0);
+        axesxpmodifier = config.getDouble("Experience.Formula.Multiplier.Axes", 1.0);
+        acrobaticsxpmodifier = config.getDouble("Experience.Formula.Multiplier.Acrobatics", 1.0);
+        fishingxpmodifier = config.getDouble("Experience.Forumla.Multiplier.Fishing", 1.0);
+
+        anvilmessages = config.getBoolean("Skills.Repair.Anvil_Messages", true);
+        anvilID = config.getInt("Skills.Repair.Anvil_ID", 42);
+
+        rGold = config.getInt("Skills.Repair.Gold.ID", 266);
+        rStone = config.getInt("Skills.Repair.Stone.ID", 4);
+        rWood = config.getInt("Skills.Repair.Wood.ID", 5);
+        rDiamond = config.getInt("Skills.Repair.Diamond.ID", 264);
+        rIron = config.getInt("Skills.Repair.Iron.ID", 265);
+        rString = config.getInt("Skills.Repair.String.ID", 287);
+        rLeather = config.getInt("Skills.Repair.Leather.ID", 334);
+
+        levelCapAcrobatics = config.getInt("Skills.Acrobatics.Level_Cap", 0);
+        levelCapArchery = config.getInt("Skills.Archery.Level_Cap", 0);
+        levelCapAxes = config.getInt("Skills.Axes.Level_Cap", 0);
+        levelCapExcavation = config.getInt("Skills.Excavation.Level_Cap", 0);
+        levelCapFishing = config.getInt("Skills.Fishing.Level_Cap", 0);
+        levelCapHerbalism = config.getInt("Skills.Herbalism.Level_Cap", 0);
+        levelCapMining = config.getInt("Skills.Mining.Level_Cap", 0);
+        levelCapRepair = config.getInt("Skills.Repair.Level_Cap", 0);
+        levelCapSwords = config.getInt("Skills.Swords.Level_Cap", 0);
+        levelCapTaming = config.getInt("Skills.Taming.Level_Cap", 0);
+        levelCapUnarmed = config.getInt("Skills.Unarmed.Level_Cap", 0);
+        levelCapWoodcutting = config.getInt("Skills.Woodcutting.Level_Cap", 0);
+
+        mayDowngradeEnchants = config.getBoolean("Arcane_Forging.Downgrades.Enabled", true);
+        downgradeRank1 = config.getInt("Arcane_Forging.Downgrades.Chance.Rank_1", 75);
+        downgradeRank2 = config.getInt("Arcane_Forging.Downgrades.Chance.Rank_2", 50);
+        downgradeRank3 = config.getInt("Arcane_Forging.Downgrades.Chance.Rank_3", 25);
+        downgradeRank4 = config.getInt("Arcane_Forging.Downgrades.Chance.Rank_4", 15);
+        mayLoseEnchants = config.getBoolean("Arcane_Forging.May_Lose_Enchants", true);
+        keepEnchantsRank1 = config.getInt("Arcane_Forging.Keep_Enchants.Chance.Rank_1", 10);
+        keepEnchantsRank2 = config.getInt("Arcane_Forging.Keep_Enchants.Chance.Rank_2", 20);
+        keepEnchantsRank3 = config.getInt("Arcane_Forging.Keep_Enchants.Chance.Rank_3", 30);
+        keepEnchantsRank4 = config.getInt("Arcane_Forging.Keep_Enchants.Chance.Rank_4", 40);
+        arcaneRank1 = config.getInt("Arcane_Forging.Rank_Levels.Rank_1", 100);
+        arcaneRank2 = config.getInt("Arcane_Forging.Rank_Levels.Rank_2", 250);
+        arcaneRank3 = config.getInt("Arcane_Forging.Rank_Levels.Rank_3", 500);
+        arcaneRank4 = config.getInt("Arcane_Forging.Rank_Levels.Rank_4", 750);
+
+        fishingDrops = config.getBoolean("Fishing.Drops_Enabled", true);
+        fishingTier1 = config.getInt("Fishing.Tier_Levels.Tier1", 0);
+        fishingTier2 = config.getInt("Fishing.Tier_Levels.Tier2", 200);
+        fishingTier3 = config.getInt("Fishing.Tier_Levels.Tier3", 400);
+        fishingTier4 = config.getInt("Fishing.Tier_Levels.Tier4", 600);
+        fishingTier5 = config.getInt("Fishing.Tier_Levels.Tier5", 800);
+
+        xplockEnable = config.getBoolean("Commands.xplock.Enabled", true);
+        xprateEnable = config.getBoolean("Commands.xprate.Enabled", true);
+        mctopEnable = config.getBoolean("Commands.mctop.Enabled", true);
+        addxpEnable = config.getBoolean("Commands.addxp.Enabled", true);
+        addlevelsEnable = config.getBoolean("Commands.addlevels.Enabled", true);
+        mcabilityEnable = config.getBoolean("Commands.mcability.Enabled", true);
+        mcrefreshEnable = config.getBoolean("Commands.mcrefresh.Enabled", true);
+        mcmmoEnable = config.getBoolean("Commands.mcmmo.Enabled", true);
+        mccEnable = config.getBoolean("Commands.mcc.Enabled", true);
+        mcgodEnable = config.getBoolean("Commands.mcgod.Enabled", true);
+        mcstatsEnable = config.getBoolean("Commands.mcstats.Enabled", true);
+        mmoeditEnable = config.getBoolean("Commands.mmoedit.Enabled", true);
+        mcremoveEnable = config.getBoolean("Commands.mcremove.Enable", true);
+        ptpEnable = config.getBoolean("Commands.ptp.Enabled", true);
+        partyEnable = config.getBoolean("Commands.party.Enabled", true);
+        inspectEnable = config.getBoolean("Commands.inspect.Enabled", true);
+        inviteEnable = config.getBoolean("Commands.invite.Enabled", true);
+        acceptEnable = config.getBoolean("Commands.accept.Enabled", true);
+        aEnable = config.getBoolean("Commands.a.Enabled", true);
+        pEnable = config.getBoolean("Commands.p.Enabled", true);
+
+        aDisplayNames = config.getBoolean("Commands.a.Display_Names", true);
+        pDisplayNames = config.getBoolean("Commands.p.Display_Names", true);
+
+        ptpCommandCooldown = config.getInt("Commands.ptp.Cooldown", 30);
+
+        animalXP = config.getDouble("Experience.Combat.Multiplier.Animals", 1.0);
+        creeperXP = config.getDouble("Experience.Combat.Multiplier.Creeper", 4.0);
+        skeletonXP = config.getDouble("Experience.Combat.Multiplier.Skeleton", 2.0);
+        spiderXP = config.getDouble("Experience.Combat.Multiplier.Spider", 3.0);
+        ghastXP = config.getDouble("Experience.Combat.Multiplier.Ghast", 3.0);
+        slimeXP = config.getDouble("Experience.Combat.Multiplier.Slime", 2.0);
+        zombieXP = config.getDouble("Experience.Combat.Multiplier.Zombie", 2.0);
+        pigzombieXP = config.getDouble("Experience.Combat.Multiplier.Pig_Zombie", 3.0);
+        endermanXP = config.getDouble("Experience.Combat.Multiplier.Enderman", 2.0);
+        cavespiderXP = config.getDouble("Experience.Combat.Multiplier.Cave_Spider", 3.0);
+        silverfishXP = config.getDouble("Experience.Combat.Multiplier.Silverfish", 3.0);
+        blazeXP = config.getDouble("Experience.Combat.Multiplier.Blaze", 3.0);
+        magmacubeXP = config.getDouble("Experience.Combat.Multiplier.Magma_Cube", 2.0);
+        enderdragonXP = config.getDouble("Experience.Combat.Multiplier.Ender_Dragon", 8.0);
+
+        detonatorID = config.getInt("Skills.Mining.Detonator_ID", 259);
+    }
 }

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

@@ -0,0 +1,286 @@
+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.Bukkit;
+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 LoadTreasures extends ConfigLoader{
+
+    public static List<ExcavationTreasure> excavationFromDirt = new ArrayList<ExcavationTreasure>();
+    public static List<ExcavationTreasure> excavationFromGrass = new ArrayList<ExcavationTreasure>();
+    public static List<ExcavationTreasure> excavationFromSand = new ArrayList<ExcavationTreasure>();
+    public static List<ExcavationTreasure> excavationFromGravel = new ArrayList<ExcavationTreasure>();
+    public static List<ExcavationTreasure> excavationFromClay = new ArrayList<ExcavationTreasure>();
+    public static List<ExcavationTreasure> excavationFromMycel = new ArrayList<ExcavationTreasure>();
+    public static List<ExcavationTreasure> excavationFromSoulSand = new ArrayList<ExcavationTreasure>();
+    public static List<FishingTreasure> fishingRewardsTier1 = new ArrayList<FishingTreasure>();
+    public static List<FishingTreasure> fishingRewardsTier2 = new ArrayList<FishingTreasure>();
+    public static List<FishingTreasure> fishingRewardsTier3 = new ArrayList<FishingTreasure>();
+    public static List<FishingTreasure> fishingRewardsTier4 = new ArrayList<FishingTreasure>();
+    public static List<FishingTreasure> fishingRewardsTier5 = new ArrayList<FishingTreasure>();
+
+    public LoadTreasures(mcMMO plugin) {
+        super(plugin, "treasures.yml");
+        config = plugin.getTreasuresConfig();
+    }
+
+    @Override
+    public void load() {
+
+        // If it doesn't exist, copy it from the .jar
+        if (!configFile.exists()) {
+            dataFolder.mkdir();
+            plugin.saveTreasuresConfig();
+        }
+
+        addDefaults();
+        loadKeys();
+    }
+
+    @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("Invlid 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 <= LoadProperties.fishingTier1 && maxLevel >= LoadProperties.fishingTier1) {
+                    fishingRewardsTier1.add(fTreasure);
+                }
+
+                if(dropLevel <= LoadProperties.fishingTier2 && maxLevel >= LoadProperties.fishingTier2) {
+                    fishingRewardsTier2.add(fTreasure);
+                }
+
+                if (dropLevel <= LoadProperties.fishingTier3 && maxLevel >= LoadProperties.fishingTier3) {
+                    fishingRewardsTier3.add(fTreasure);
+                }
+
+                if (dropLevel <= LoadProperties.fishingTier4 && maxLevel >= LoadProperties.fishingTier4) {
+                    fishingRewardsTier4.add(fTreasure);
+                }
+
+                if (dropLevel <= LoadProperties.fishingTier5 && maxLevel >= LoadProperties.fishingTier5) {
+                    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) {
+                Bukkit.getLogger().warning(issue);
+            }
+            return false;
+        }
+    }
+}

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/datatypes/AbilityType.java

@@ -1,11 +1,291 @@
 package com.gmail.nossr50.datatypes;
 
+import org.bukkit.Material;
+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.skills.Excavation;
+import com.gmail.nossr50.skills.Herbalism;
+import com.gmail.nossr50.skills.Mining;
+
 public enum AbilityType {
-BERSERK,
-SUPER_BREAKER,
-GIGA_DRILL_BREAKER,
-GREEN_TERRA,
-SKULL_SPLIITER,
-TREE_FELLER,
-SERRATED_STRIKES;
+    BERSERK(LoadProperties.berserkCooldown, mcLocale.getString("Skills.BerserkOn"), mcLocale.getString("Skills.BerserkOff"), "Skills.BerserkPlayer", mcLocale.getString("Skills.YourBerserk"), "Skills.BerserkPlayerOff"),
+    SUPER_BREAKER(LoadProperties.superBreakerCooldown, mcLocale.getString("Skills.SuperBreakerOn"), mcLocale.getString("Skills.SuperBreakerOff"), "Skills.SuperBreakerPlayer", mcLocale.getString("Skills.YourSuperBreaker"), "Skills.SuperBreakerPlayerOff"),
+    GIGA_DRILL_BREAKER(LoadProperties.gigaDrillBreakerCooldown, mcLocale.getString("Skills.GigaDrillBreakerOn"), mcLocale.getString("Skills.GigaDrillBreakerOff"), "Skills.GigaDrillBreakerPlayer", mcLocale.getString("Skills.YourGigaDrillBreaker"), "Skills.GigaDrillBreakerPlayerOff"),
+    GREEN_TERRA(LoadProperties.greenTerraCooldown, mcLocale.getString("Skills.GreenTerraOn"), mcLocale.getString("Skills.GreenTerraOff"), "Skills.GreenTerraPlayer", mcLocale.getString("Skills.YourGreenTerra"), mcLocale.getString("Skills.GreenTerraPlayerOff")),
+    SKULL_SPLIITER(LoadProperties.skullSplitterCooldown, mcLocale.getString("Skills.SkullSplitterOn"), mcLocale.getString("Skills.SkullSplitterOff"), "Skills.SkullSplitterPlayer", mcLocale.getString("Skills.YourSkullSplitter"), "Skills.SkullSplitterPlayerOff"),
+    TREE_FELLER(LoadProperties.treeFellerCooldown, mcLocale.getString("Skills.TreeFellerOn"), mcLocale.getString("Skills.TreeFellerOff"), "Skills.TreeFellerPlayer", mcLocale.getString("Skills.YourTreeFeller"), "Skills.TreeFellerPlayerOff"),
+    SERRATED_STRIKES(LoadProperties.skullSplitterCooldown, mcLocale.getString("Skills.SerratedStrikesOn"), mcLocale.getString("Skills.SerratedStrikesOff"), "Skills.SerratedStrikesPlayer", mcLocale.getString("Skills.YourSerratedStrikes"), "Skills.SerratedStrikesPlayerOff"),
+    BLAST_MINING(LoadProperties.blastMiningCooldown, null, null, "Skills.BlastMiningPlayer", mcLocale.getString("Skills.YourBlastMining"), null),
+    LEAF_BLOWER(0, null, null, null, null, null);
+
+    private int cooldown;
+    private String abilityOn;
+    private String abilityOff;
+    private String abilityPlayer;
+    private String abilityRefresh;
+    private String abilityPlayerOff;
+
+    private AbilityType(int cooldown, String abilityOn, String abilityOff, String abilityPlayer, String abilityRefresh, String abilityPlayerOff) {
+        this.cooldown = cooldown;
+        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 this.abilityOn;
+    }
+
+    public String getAbilityOff() {
+        return this.abilityOff;
+    }
+
+    public String getAbilityPlayer(Player player) {
+        return mcLocale.getString(this.abilityPlayer, new Object[] {player.getName()});
+    }
+
+    public String getAbilityPlayerOff(Player player) {
+        return mcLocale.getString(this.abilityPlayerOff, new Object[] {player.getName()});
+    }
+
+    public String getAbilityRefresh() {
+        return this.abilityRefresh;
+    }
+
+    /**
+     * Get the mode of this ability.
+     *
+     * @param PP PlayerProfile of the player using the ability
+     * @return true if the ability is enabled, false otherwise
+     */
+    public boolean getMode(PlayerProfile PP) {
+        switch (this) {
+        case BERSERK:
+            return PP.getBerserkMode();
+
+        case SUPER_BREAKER:
+            return PP.getSuperBreakerMode();
+
+        case GIGA_DRILL_BREAKER:
+            return PP.getGigaDrillBreakerMode();
+
+        case GREEN_TERRA:
+            return PP.getGreenTerraMode();
+
+        case SKULL_SPLIITER:
+            return PP.getSkullSplitterMode();
+
+        case TREE_FELLER:
+            return PP.getTreeFellerMode();
+
+        case SERRATED_STRIKES:
+            return PP.getSerratedStrikesMode();
+
+        default:
+            return false;
+        }
+    }
+
+    /**
+     * Set the mode of this ability.
+     *
+     * @param PP PlayerProfile of the player using the ability
+     * @param bool Mode to set the ability to
+     */
+    public void setMode(PlayerProfile PP, boolean bool) {
+        switch (this) {
+        case BERSERK:
+            PP.setBerserkMode(bool);
+            break;
+
+        case SUPER_BREAKER:
+            PP.setSuperBreakerMode(bool);
+            break;
+
+        case GIGA_DRILL_BREAKER:
+            PP.setGigaDrillBreakerMode(bool);
+            break;
+
+        case GREEN_TERRA:
+            PP.setGreenTerraMode(bool);
+            break;
+
+        case SKULL_SPLIITER:
+            PP.setSkullSplitterMode(bool);
+            break;
+
+        case TREE_FELLER:
+            PP.setTreeFellerMode(bool);
+            break;
+
+        case SERRATED_STRIKES:
+            PP.setSerratedStrikesMode(bool);
+            break;
+
+        default:
+            break;
+        }
+    }
+
+    /**
+     * Get the informed state of this ability
+     *
+     * @param PP PlayerProfile of the player using the ability
+     * @return true if the ability is informed, false otherwise
+     */
+    public boolean getInformed(PlayerProfile PP) {
+        switch (this) {
+        case BERSERK:
+            return PP.getBerserkInformed();
+
+        case BLAST_MINING:
+            return PP.getBlastMiningInformed();
+
+        case SUPER_BREAKER:
+            return PP.getSuperBreakerInformed();
+
+        case GIGA_DRILL_BREAKER:
+            return PP.getGigaDrillBreakerInformed();
+
+        case GREEN_TERRA:
+            return PP.getGreenTerraInformed();
+
+        case SKULL_SPLIITER:
+            return PP.getSkullSplitterInformed();
+
+        case TREE_FELLER:
+            return PP.getTreeFellerInformed();
+
+        case SERRATED_STRIKES:
+            return PP.getSerratedStrikesInformed();
+
+        default:
+            return false;
+        }
+    }
+
+    /**
+     * Set the informed state of this ability.
+     *
+     * @param PP PlayerProfile of the player using the ability
+     * @param bool Informed state to set the ability to
+     */
+    public void setInformed(PlayerProfile PP, boolean bool) {
+        switch (this) {
+        case BERSERK:
+            PP.setBerserkInformed(bool);
+            break;
+
+        case BLAST_MINING:
+            PP.setBlastMiningInformed(bool);
+            break;
+
+        case SUPER_BREAKER:
+            PP.setSuperBreakerInformed(bool);
+            break;
+
+        case GIGA_DRILL_BREAKER:
+            PP.setGigaDrillBreakerInformed(bool);
+            break;
+
+        case GREEN_TERRA:
+            PP.setGreenTerraInformed(bool);
+            break;
+
+        case SKULL_SPLIITER:
+            PP.setSkullSplitterInformed(bool);
+            break;
+
+        case TREE_FELLER:
+            PP.setTreeFellerInformed(bool);
+            break;
+
+        case SERRATED_STRIKES:
+            PP.setSerratedStrikesInformed(bool);
+            break;
+
+        default:
+            break;
+        }
+    }
+
+    /**
+     * 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) {
+        switch (this) {
+        case BERSERK:
+            return mcPermissions.getInstance().berserk(player);
+
+        case BLAST_MINING:
+            return mcPermissions.getInstance().blastMining(player);
+
+        case GIGA_DRILL_BREAKER:
+            return mcPermissions.getInstance().gigaDrillBreaker(player);
+
+        case GREEN_TERRA:
+            return mcPermissions.getInstance().greenTerra(player);
+
+        case LEAF_BLOWER:
+            return mcPermissions.getInstance().leafBlower(player);
+
+        case SERRATED_STRIKES:
+            return mcPermissions.getInstance().serratedStrikes(player);
+
+        case SKULL_SPLIITER:
+            return mcPermissions.getInstance().skullSplitter(player);
+
+        case SUPER_BREAKER:
+            return mcPermissions.getInstance().superBreaker(player);
+
+        case TREE_FELLER:
+            return mcPermissions.getInstance().treeFeller(player);
+
+        default:
+            return false;
+        }
+    }
+
+    /**
+     * Check if a block is affected by this ability.
+     *
+     * @param material The block type to check
+     * @return true if the block is affected by this ability, false otherwise
+     */
+    public boolean blockCheck(Material material) {
+        switch (this) {
+        case BERSERK:
+            return (Excavation.canBeGigaDrillBroken(material) || material.equals(Material.SNOW));
+
+        case GIGA_DRILL_BREAKER:
+            return Excavation.canBeGigaDrillBroken(material);
+
+        case GREEN_TERRA:
+            return Herbalism.makeMossy(material);
+
+        case LEAF_BLOWER:
+            return material.equals(Material.LEAVES);
+
+        case SUPER_BREAKER:
+            return Mining.canBeSuperBroken(material);
+
+        case TREE_FELLER:
+            return material.equals(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,19 +1,3 @@
-/*
-	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;
@@ -252,7 +236,7 @@ public class HUDmmo
 		((GenericTexture) xpicon).setUrl(m.getCapitalized(theType.toString())+".png");
 		xpicon.setDirty(true);
 
-		((GenericTexture) xpbar).setUrl(SpoutStuff.getUrlBar(SpoutStuff.getXpInc(PP.getSkillXpLevel(theType), PP.getXpToLevel(theType), HUDType.STANDARD)));
+		((GenericTexture) xpbar).setUrl(getUrlBar(getXpInc(PP.getSkillXpLevel(theType), PP.getXpToLevel(theType), HUDType.STANDARD)));
 		xpbar.setDirty(true);
 		
 		SpoutManager.getPlayer(player).getMainScreen().setDirty(true);
@@ -272,16 +256,82 @@ public class HUDmmo
 		if(theType == null)
 			return;
 		
-		Color color = SpoutStuff.getRetroColor(theType);
+		Color color = 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);
+			xpfill.setBottomColor(color).setTopColor(color).setWidth(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 static Color getRetroColor(SkillType type) {
+        switch (type) {
+            case ACROBATICS:
+                return new Color((float) LoadProperties.acrobatics_r, (float) LoadProperties.acrobatics_g, (float) LoadProperties.acrobatics_b, 1f);
+            case ARCHERY:
+                return new Color((float) LoadProperties.archery_r, (float)LoadProperties.archery_g, (float)LoadProperties.archery_b, 1f);
+            case AXES:
+                return new Color((float) LoadProperties.axes_r, (float)LoadProperties.axes_g, (float)LoadProperties.axes_b, 1f);
+            case EXCAVATION:
+                return new Color((float)LoadProperties.excavation_r, (float)LoadProperties.excavation_g, (float)LoadProperties.excavation_b, 1f);
+            case HERBALISM:
+                return new Color((float)LoadProperties.herbalism_r, (float)LoadProperties.herbalism_g, (float)LoadProperties.herbalism_b, 1f);
+            case MINING:
+                return new Color((float)LoadProperties.mining_r, (float)LoadProperties.mining_g, (float)LoadProperties.mining_b, 1f);
+            case REPAIR:
+                return new Color((float)LoadProperties.repair_r, (float)LoadProperties.repair_g, (float)LoadProperties.repair_b, 1f);
+            case SWORDS:
+                return new Color((float)LoadProperties.swords_r, (float)LoadProperties.swords_g, (float)LoadProperties.swords_b, 1f);
+            case TAMING:
+                return new Color((float)LoadProperties.taming_r, (float)LoadProperties.taming_g, (float)LoadProperties.taming_b, 1f);
+            case UNARMED:
+                return new Color((float)LoadProperties.unarmed_r, (float)LoadProperties.unarmed_g, (float)LoadProperties.unarmed_b, 1f);
+            case WOODCUTTING:
+                return new Color((float)LoadProperties.woodcutting_r, (float)LoadProperties.woodcutting_g, (float)LoadProperties.woodcutting_b, 1f);
+            case FISHING:
+                return new Color((float)LoadProperties.fishing_r, (float)LoadProperties.fishing_g, (float)LoadProperties.fishing_b, 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);
+    }
 }

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

@@ -1,19 +1,3 @@
-/*
-	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.io.BufferedReader;
@@ -22,14 +6,9 @@ import java.io.FileReader;
 import java.io.FileWriter;
 import java.util.HashMap;
 import java.util.ArrayList;
-import java.util.logging.Level;
-import java.util.logging.Logger;
-
 
 import org.bukkit.Bukkit;
-import org.bukkit.ChatColor;
 import org.bukkit.GameMode;
-import org.bukkit.Location;
 import org.bukkit.entity.Player;
 import com.gmail.nossr50.config.LoadProperties;
 import com.gmail.nossr50.events.McMMOPlayerXpGainEvent;
@@ -38,27 +17,23 @@ import com.gmail.nossr50.Users;
 import com.gmail.nossr50.m;
 import com.gmail.nossr50.mcMMO;
 
-
-
 public class PlayerProfile
 {
-    protected final Logger log = Logger.getLogger("Minecraft");
-    
     //HUD
     private HUDType hud;
     
     //MISC
-	private String party, myspawn, myspawnworld, invite;
+	private String party, invite;
 	
 	//TOGGLES
-	private boolean partyhud = true, spoutcraft = false, filling = false, xpbarlocked = false, placedAnvil = false, partyChatMode = false, adminChatMode = false, godMode = false, greenTerraMode, partyChatOnly = false, greenTerraInformed = true, berserkInformed = true, skullSplitterInformed = true, gigaDrillBreakerInformed = true, 
-	superBreakerInformed = true, serratedStrikesInformed = true, treeFellerInformed = true, dead, abilityuse = true, treeFellerMode, superBreakerMode, gigaDrillBreakerMode, 
+	private boolean loaded = false, partyhud = true, spoutcraft = false, xpbarlocked = false, placedAnvil = false, partyChatMode = false, adminChatMode = false, godMode = false, greenTerraMode, partyChatOnly = false, greenTerraInformed = true, berserkInformed = true, skullSplitterInformed = true, gigaDrillBreakerInformed = true, 
+	superBreakerInformed = true, blastMiningInformed = true, serratedStrikesInformed = true, treeFellerInformed = true, abilityuse = true, treeFellerMode, superBreakerMode, gigaDrillBreakerMode, 
 	serratedStrikesMode, hoePreparationMode = false, shovelPreparationMode = false, swordsPreparationMode = false, fistsPreparationMode = false, pickaxePreparationMode = false, axePreparationMode = false, skullSplitterMode, berserkMode;
 	
 	//TIMESTAMPS
 	//ATS = (Time of) Activation Time Stamp
 	//DATS = (Time of) Deactivation Time Stamp
-	private int xpGainATS = 0, recentlyHurt = 0, mySpawnATS, respawnATS, hoePreparationATS, shovelPreparationATS, swordsPreparationATS, fistsPreparationATS, axePreparationATS, pickaxePreparationATS;
+	private int xpGainATS = 0, recentlyHurt = 0, respawnATS, hoePreparationATS, shovelPreparationATS, swordsPreparationATS, fistsPreparationATS, axePreparationATS, pickaxePreparationATS;
 	
 	private SkillType lastgained = null, skillLock = null;
 	
@@ -74,7 +49,7 @@ public class PlayerProfile
 	
     String location = "plugins/mcMMO/FlatFileStuff/mcmmo.users";
         
-	public PlayerProfile(Player player)
+	public PlayerProfile(String name)
 	{
 		hud = LoadProperties.defaulthud;
 		//Setup the HashMap for ability DATS
@@ -93,18 +68,51 @@ public class PlayerProfile
 			}
 		}
 		
-		playerName = player.getName();
+		playerName = name;
 		if (LoadProperties.useMySQL) 
 		{
-			if(!loadMySQL(player)) {
-				addMySQLPlayer(player);
-				loadMySQL(player);//This is probably not needed anymore, could just delete
+			if(!loadMySQL()) {
+				addMySQLPlayer();
+				loadMySQL();//This is probably not needed anymore, could just delete
 			}
 		} else {
-			if(!load()) { addPlayer(); }			
+			if(!load()) { addPlayer();}
 		}
 		lastlogin = ((Long) (System.currentTimeMillis()/1000)).intValue();
 	}
+	
+	public PlayerProfile(String name, boolean addNew)
+    {
+        hud = LoadProperties.defaulthud;
+        //Setup the HashMap for ability DATS
+        for(AbilityType abilityType : AbilityType.values())
+        {
+            skillsDATS.put(abilityType, 0);
+        }
+        
+        //Setup the HashMap for the skills
+        for(SkillType skillType : SkillType.values())
+        {
+            if(skillType != SkillType.ALL)
+            {
+                skills.put(skillType, 0);
+                skillsXp.put(skillType, 0);
+            }
+        }
+        
+        playerName = name;
+        if (LoadProperties.useMySQL) 
+        {
+            if(!loadMySQL() && addNew) {
+                addMySQLPlayer();
+                loadMySQL();//This is probably not needed anymore, could just delete
+            }
+        } else {
+            if(!load() && addNew) { addPlayer(); loaded = true; }
+        }
+        lastlogin = ((Long) (System.currentTimeMillis()/1000)).intValue();
+    }
+	
 	public int getLastLogin()
 	{
 		return lastlogin;
@@ -114,18 +122,18 @@ public class PlayerProfile
 		return userid;
 	}
 	
-	public boolean loadMySQL(Player p) 
+	public boolean loadMySQL() 
 	{
 		Integer id = 0;
-		id = mcMMO.database.GetInt("SELECT id FROM "+LoadProperties.MySQLtablePrefix+"users WHERE user = '" + p.getName() + "'");
+		id = mcMMO.database.getInt("SELECT id FROM "+LoadProperties.MySQLtablePrefix+"users WHERE user = '" + playerName + "'");
 		if(id == 0)
 			return false;
 		this.userid = id;
 		if (id > 0) {
-			HashMap<Integer, ArrayList<String>> huds = mcMMO.database.Read("SELECT hudtype FROM "+LoadProperties.MySQLtablePrefix+"huds WHERE user_id = " + id);
+			HashMap<Integer, ArrayList<String>> huds = mcMMO.database.read("SELECT hudtype FROM "+LoadProperties.MySQLtablePrefix+"huds WHERE user_id = " + id);
 			if(huds.get(1) == null)
 			{
-				mcMMO.database.Write("INSERT INTO "+LoadProperties.MySQLtablePrefix+"huds (user_id) VALUES ("+id+")");
+				mcMMO.database.write("INSERT INTO "+LoadProperties.MySQLtablePrefix+"huds (user_id) VALUES ("+id+")");
 			} else {
 				if(huds.get(1).get(0) != null)
 				{
@@ -140,20 +148,17 @@ public class PlayerProfile
 					hud = LoadProperties.defaulthud;
 				}
 			}
-			HashMap<Integer, ArrayList<String>> users = mcMMO.database.Read("SELECT lastlogin, party FROM "+LoadProperties.MySQLtablePrefix+"users WHERE id = " + id);
+			HashMap<Integer, ArrayList<String>> users = mcMMO.database.read("SELECT lastlogin, party FROM "+LoadProperties.MySQLtablePrefix+"users WHERE id = " + id);
 				//lastlogin = Integer.parseInt(users.get(1).get(0));
-				party = users.get(1).get(1);
-			HashMap<Integer, ArrayList<String>> spawn = mcMMO.database.Read("SELECT world, x, y, z FROM "+LoadProperties.MySQLtablePrefix+"spawn WHERE user_id = " + id);
-				myspawnworld = spawn.get(1).get(0);
-				myspawn = spawn.get(1).get(1) + "," + spawn.get(1).get(2) + "," + spawn.get(1).get(3);				
-			HashMap<Integer, ArrayList<String>> cooldowns = mcMMO.database.Read("SELECT mining, woodcutting, unarmed, herbalism, excavation, swords, axes FROM "+LoadProperties.MySQLtablePrefix+"cooldowns WHERE user_id = " + id);
+				party = users.get(1).get(1);				
+			HashMap<Integer, ArrayList<String>> cooldowns = mcMMO.database.read("SELECT mining, woodcutting, unarmed, herbalism, excavation, swords, axes, blast_mining FROM "+LoadProperties.MySQLtablePrefix+"cooldowns WHERE user_id = " + id);
 			/*
 			 * I'm still learning MySQL, this is a fix for adding a new table
 			 * its not pretty but it works
 			 */
 			if(cooldowns.get(1) == null)
 			{
-				mcMMO.database.Write("INSERT INTO "+LoadProperties.MySQLtablePrefix+"cooldowns (user_id) VALUES ("+id+")");
+				mcMMO.database.write("INSERT INTO "+LoadProperties.MySQLtablePrefix+"cooldowns (user_id) VALUES ("+id+")");
 			}
 			else
 			{
@@ -164,8 +169,9 @@ public class PlayerProfile
 				skillsDATS.put(AbilityType.GIGA_DRILL_BREAKER, Integer.valueOf(cooldowns.get(1).get(4)));
 				skillsDATS.put(AbilityType.SERRATED_STRIKES, Integer.valueOf(cooldowns.get(1).get(5)));
 				skillsDATS.put(AbilityType.SKULL_SPLIITER, Integer.valueOf(cooldowns.get(1).get(6)));
+				skillsDATS.put(AbilityType.BLAST_MINING, Integer.valueOf(cooldowns.get(1).get(7)));
 			}
-			HashMap<Integer, ArrayList<String>> stats = mcMMO.database.Read("SELECT taming, mining, repair, woodcutting, unarmed, herbalism, excavation, archery, swords, axes, acrobatics, fishing FROM "+LoadProperties.MySQLtablePrefix+"skills WHERE user_id = " + id);
+			HashMap<Integer, ArrayList<String>> stats = mcMMO.database.read("SELECT taming, mining, repair, woodcutting, unarmed, herbalism, excavation, archery, swords, axes, acrobatics, fishing FROM "+LoadProperties.MySQLtablePrefix+"skills WHERE user_id = " + id);
 				skills.put(SkillType.TAMING, Integer.valueOf(stats.get(1).get(0)));
 				skills.put(SkillType.MINING, Integer.valueOf(stats.get(1).get(1)));
 				skills.put(SkillType.REPAIR, Integer.valueOf(stats.get(1).get(2)));
@@ -178,7 +184,7 @@ public class PlayerProfile
 				skills.put(SkillType.AXES, Integer.valueOf(stats.get(1).get(9)));
 				skills.put(SkillType.ACROBATICS, Integer.valueOf(stats.get(1).get(10)));
 				skills.put(SkillType.FISHING, Integer.valueOf(stats.get(1).get(11)));
-			HashMap<Integer, ArrayList<String>> experience = mcMMO.database.Read("SELECT taming, mining, repair, woodcutting, unarmed, herbalism, excavation, archery, swords, axes, acrobatics, fishing FROM "+LoadProperties.MySQLtablePrefix+"experience WHERE user_id = " + id);
+			HashMap<Integer, ArrayList<String>> experience = mcMMO.database.read("SELECT taming, mining, repair, woodcutting, unarmed, herbalism, excavation, archery, swords, axes, acrobatics, fishing FROM "+LoadProperties.MySQLtablePrefix+"experience WHERE user_id = " + id);
 				skillsXp.put(SkillType.TAMING, Integer.valueOf(experience.get(1).get(0)));
 				skillsXp.put(SkillType.MINING, Integer.valueOf(experience.get(1).get(1)));
 				skillsXp.put(SkillType.REPAIR, Integer.valueOf(experience.get(1).get(2)));
@@ -191,20 +197,20 @@ public class PlayerProfile
 				skillsXp.put(SkillType.AXES, Integer.valueOf(experience.get(1).get(9)));
 				skillsXp.put(SkillType.ACROBATICS, Integer.valueOf(experience.get(1).get(10)));
 				skillsXp.put(SkillType.FISHING, Integer.valueOf(experience.get(1).get(11)));
+			loaded = true;
 			return true;
 		}
 		else {
 			return false;
 		}		
 	}
-	public void addMySQLPlayer(Player p) {
+	public void addMySQLPlayer() {
 		Integer id = 0;
-		mcMMO.database.Write("INSERT INTO "+LoadProperties.MySQLtablePrefix+"users (user, lastlogin) VALUES ('" + p.getName() + "'," + System.currentTimeMillis() / 1000 +")");
-		id = mcMMO.database.GetInt("SELECT id FROM "+LoadProperties.MySQLtablePrefix+"users WHERE user = '" + p.getName() + "'");
-		mcMMO.database.Write("INSERT INTO "+LoadProperties.MySQLtablePrefix+"cooldowns (user_id) VALUES ("+id+")");
-		mcMMO.database.Write("INSERT INTO "+LoadProperties.MySQLtablePrefix+"spawn (user_id) VALUES ("+id+")");
-		mcMMO.database.Write("INSERT INTO "+LoadProperties.MySQLtablePrefix+"skills (user_id) VALUES ("+id+")");
-		mcMMO.database.Write("INSERT INTO "+LoadProperties.MySQLtablePrefix+"experience (user_id) VALUES ("+id+")");
+		mcMMO.database.write("INSERT INTO "+LoadProperties.MySQLtablePrefix+"users (user, lastlogin) VALUES ('" + playerName + "'," + System.currentTimeMillis() / 1000 +")");
+		id = mcMMO.database.getInt("SELECT id FROM "+LoadProperties.MySQLtablePrefix+"users WHERE user = '" + playerName + "'");
+		mcMMO.database.write("INSERT INTO "+LoadProperties.MySQLtablePrefix+"cooldowns (user_id) VALUES ("+id+")");
+		mcMMO.database.write("INSERT INTO "+LoadProperties.MySQLtablePrefix+"skills (user_id) VALUES ("+id+")");
+		mcMMO.database.write("INSERT INTO "+LoadProperties.MySQLtablePrefix+"experience (user_id) VALUES ("+id+")");
 		this.userid = id;
 	}
 	
@@ -225,9 +231,6 @@ public class PlayerProfile
     			//Get Mining
     			if(character.length > 1 && m.isInt(character[1]))
     				skills.put(SkillType.MINING, Integer.valueOf(character[1]));
-    			//Myspawn
-    			if(character.length > 2)
-    				myspawn = character[2];
     			//Party
     			if(character.length > 3)
     				party = character[3];
@@ -270,8 +273,6 @@ public class PlayerProfile
     				skillsXp.put(SkillType.AXES, Integer.valueOf(character[21]));
     			if(character.length > 22 && m.isInt(character[22]))
     				skillsXp.put(SkillType.ACROBATICS, Integer.valueOf(character[22]));
-    			if(character.length > 23 && m.isInt(character[23]))
-    				myspawnworld = character[23];
     			if(character.length > 24 && m.isInt(character[24]))
     				skills.put(SkillType.TAMING, Integer.valueOf(character[24]));
     			if(character.length > 25 && m.isInt(character[25]))
@@ -304,13 +305,15 @@ public class PlayerProfile
     				skills.put(SkillType.FISHING, Integer.valueOf(character[34]));
     			if(character.length > 35)
     				skillsXp.put(SkillType.FISHING, Integer.valueOf(character[35]));
+    			if(character.length > 36)
+    			    skillsDATS.put(AbilityType.BLAST_MINING, Integer.valueOf(character[36]));
             	in.close();
+            	loaded = true;
     			return true;
         	}
         	in.close();
         } catch (Exception e) {
-            log.log(Level.SEVERE, "Exception while reading "
-            		+ location + " (Are you sure you formatted it correctly?)", e);
+            Bukkit.getLogger().severe("Exception while reading " + location + " (Are you sure you formatted it correctly?)" + e.toString());
         }
         return false;
 	}
@@ -321,12 +324,11 @@ public class PlayerProfile
     	// if we are using mysql save to database
     	if (LoadProperties.useMySQL) 
     	{
-    		mcMMO.database.Write("UPDATE "+LoadProperties.MySQLtablePrefix+"huds SET "
+    		mcMMO.database.write("UPDATE "+LoadProperties.MySQLtablePrefix+"huds SET "
     				+" hudtype = '"+hud.toString()+"' WHERE user_id = "+this.userid);
-    		mcMMO.database.Write("UPDATE "+LoadProperties.MySQLtablePrefix+"users SET lastlogin = " + timestamp.intValue() + " WHERE id = " + this.userid);
-    		mcMMO.database.Write("UPDATE "+LoadProperties.MySQLtablePrefix+"users SET party = '"+this.party+"' WHERE id = " +this.userid);
-    		mcMMO.database.Write("UPDATE "+LoadProperties.MySQLtablePrefix+"spawn SET world = '" + this.myspawnworld + "', x = " +getX()+", y = "+getY()+", z = "+getZ()+" WHERE user_id = "+this.userid);
-    		mcMMO.database.Write("UPDATE "+LoadProperties.MySQLtablePrefix+"cooldowns SET "
+    		mcMMO.database.write("UPDATE "+LoadProperties.MySQLtablePrefix+"users SET lastlogin = " + timestamp.intValue() + " WHERE id = " + this.userid);
+    		mcMMO.database.write("UPDATE "+LoadProperties.MySQLtablePrefix+"users SET party = '"+this.party+"' WHERE id = " +this.userid);
+    		mcMMO.database.write("UPDATE "+LoadProperties.MySQLtablePrefix+"cooldowns SET "
     				+" mining = " + skillsDATS.get(AbilityType.SUPER_BREAKER)
     				+", woodcutting = " + skillsDATS.get(AbilityType.TREE_FELLER)
     				+", unarmed = " + skillsDATS.get(AbilityType.BERSERK)
@@ -334,8 +336,9 @@ public class PlayerProfile
     				+", excavation = " + skillsDATS.get(AbilityType.GIGA_DRILL_BREAKER)
     				+", swords = " + skillsDATS.get(AbilityType.SERRATED_STRIKES)
     				+", axes = " + skillsDATS.get(AbilityType.SKULL_SPLIITER)
+    				+", blast_mining = " + skillsDATS.get(AbilityType.BLAST_MINING)
     				+" WHERE user_id = "+this.userid);
-    		mcMMO.database.Write("UPDATE "+LoadProperties.MySQLtablePrefix+"skills SET "
+    		mcMMO.database.write("UPDATE "+LoadProperties.MySQLtablePrefix+"skills SET "
     				+"  taming = "+skills.get(SkillType.TAMING)
     				+", mining = "+skills.get(SkillType.MINING)
     				+", repair = "+skills.get(SkillType.REPAIR)
@@ -349,7 +352,7 @@ public class PlayerProfile
     				+", acrobatics = "+skills.get(SkillType.ACROBATICS)
     				+", fishing = "+skills.get(SkillType.FISHING)
     				+" WHERE user_id = "+this.userid);
-    		mcMMO.database.Write("UPDATE "+LoadProperties.MySQLtablePrefix+"experience SET "
+    		mcMMO.database.write("UPDATE "+LoadProperties.MySQLtablePrefix+"experience SET "
     				+"  taming = "+skillsXp.get(SkillType.TAMING)
     				+", mining = "+skillsXp.get(SkillType.MINING)
     				+", repair = "+skillsXp.get(SkillType.REPAIR)
@@ -386,7 +389,7 @@ public class PlayerProfile
 	        		} else {
 	        			writer.append(playerName + ":");
 	        			writer.append(skills.get(SkillType.MINING) + ":");
-	        			writer.append(myspawn + ":");
+	        			writer.append("" + ":");
 	        			writer.append(party+":");
 	        			writer.append(skillsXp.get(SkillType.MINING) + ":");
 	        			writer.append(skills.get(SkillType.WOODCUTTING) + ":");
@@ -407,7 +410,7 @@ public class PlayerProfile
 	        			writer.append(skillsXp.get(SkillType.SWORDS) + ":");
 	        			writer.append(skillsXp.get(SkillType.AXES) + ":");
 	        			writer.append(skillsXp.get(SkillType.ACROBATICS) + ":");
-	        			writer.append(myspawnworld+":");
+	        			writer.append(""+":");
 	        			writer.append(skills.get(SkillType.TAMING) + ":");
 	        			writer.append(skillsXp.get(SkillType.TAMING) + ":");
 	        			//Need to store the DATS of abilities nao
@@ -422,6 +425,7 @@ public class PlayerProfile
 	        			writer.append(hud.toString()+":");
 	        			writer.append(skills.get(SkillType.FISHING) + ":");
 	        			writer.append(skillsXp.get(SkillType.FISHING) + ":");
+	        			writer.append(String.valueOf(skillsDATS.get(AbilityType.BLAST_MINING)) + ":");
 	        			writer.append("\r\n");                   			
 	        		}
 	        	}
@@ -431,10 +435,33 @@ public class PlayerProfile
 	            out.write(writer.toString());
 	            out.close();
 	        } catch (Exception e) {
-	                log.log(Level.SEVERE, "Exception while writing to " + location + " (Are you sure you formatted it correctly?)", e);
+	            Bukkit.getLogger().severe("Exception while writing to " + location + " (Are you sure you formatted it correctly?)" + e.toString());
 	        }
     	}
 	}
+
+    public void resetAllData()
+    {
+        //This will reset everything to default values and then save the information to FlatFile/MySQL
+        for(SkillType skillType : SkillType.values())
+        {
+            if(skillType == SkillType.ALL)
+                continue;
+            skills.put(skillType, 0);
+            skillsXp.put(skillType, 0);
+        }
+        
+        for(AbilityType abilityType : AbilityType.values())
+        {
+            skillsDATS.put(abilityType, 0);
+        }
+        
+        //Misc stuff
+        party = "";
+        
+        save();
+    }
+    
     public void addPlayer()
     {
         try {
@@ -445,7 +472,7 @@ public class PlayerProfile
             //Add the player to the end
             out.append(playerName + ":");
             out.append(0 + ":"); //mining
-            out.append(myspawn+":");
+            out.append(""+":");
             out.append(party+":");
             out.append(0+":"); //XP
             out.append(0+":"); //woodcutting
@@ -466,7 +493,7 @@ public class PlayerProfile
             out.append(0+":"); //swordsXP
             out.append(0+":"); //axesXP
             out.append(0+":"); //acrobaticsXP
-            out.append(myspawnworld+":");
+            out.append(""+":");
             out.append(0+":"); //taming
             out.append(0+":"); //tamingXP
             out.append(0+":"); //DATS
@@ -479,19 +506,24 @@ public class PlayerProfile
             out.append(LoadProperties.defaulthud.toString()+":");//HUD
             out.append(0+":"); //Fishing
             out.append(0+":"); //FishingXP
+            out.append(0+":"); //Blast Mining
 
             //Add more in the same format as the line above
             
 			out.newLine();
 			out.close();
         } catch (Exception e) {
-                log.log(Level.SEVERE, "Exception while writing to " + location + " (Are you sure you formatted it correctly?)", e);
+            Bukkit.getLogger().severe("Exception while writing to " + location + " (Are you sure you formatted it correctly?)" + e.toString());
         }
     }
     public void togglePartyHUD()
     {
     	partyhud = !partyhud;
     }
+    public boolean isLoaded()
+    {
+        return loaded;
+    }
     public boolean getPartyHUD()
     {
     	return partyhud;
@@ -500,15 +532,6 @@ public class PlayerProfile
     {
     	spoutcraft = !spoutcraft;
     }
-    
-    public boolean isFilling()
-    {
-    	return filling;
-    }
-    public void toggleFilling()
-    {
-    	filling = !filling;
-    }
     public HUDType getHUDType()
     {
     	return hud;
@@ -592,13 +615,6 @@ public class PlayerProfile
 	{
 		abilityuse = !abilityuse;
 	}
-	public long getMySpawnATS(){
-		return mySpawnATS;
-	}
-	public void setMySpawnATS(long newvalue)
-	{
-		mySpawnATS = (int) (newvalue/1000);
-	}
 	public void decreaseBleedTicks()
 	{
 		bleedticks--;
@@ -608,9 +624,17 @@ public class PlayerProfile
 	}
 	public void setBleedTicks(Integer newvalue){
 		bleedticks = newvalue;
+		
+		//Cap maximum ticks at 10
+        if(bleedticks > 10)
+            bleedticks = 10;
 	}
 	public void addBleedTicks(Integer newvalue){
 		bleedticks+=newvalue;
+		
+		//Cap maximum ticks at 10
+		if(bleedticks > 10)
+		    bleedticks = 10;
 	}
 	/*
 	 * EXPLOIT PREVENTION
@@ -624,7 +648,7 @@ public class PlayerProfile
 	public boolean getHoePreparationMode(){
 		return hoePreparationMode;
 	}
-	public void setHoePreparationMode(Boolean bool){
+	public void setHoePreparationMode(boolean bool){
 		hoePreparationMode = bool;
 	}
 	public long getHoePreparationATS(){
@@ -640,7 +664,7 @@ public class PlayerProfile
 	public boolean getSwordsPreparationMode(){
 		return swordsPreparationMode;
 	}
-	public void setSwordsPreparationMode(Boolean bool){
+	public void setSwordsPreparationMode(boolean bool){
 		swordsPreparationMode = bool;
 	}
 	public long getSwordsPreparationATS(){
@@ -655,7 +679,7 @@ public class PlayerProfile
 	public boolean getShovelPreparationMode(){
 		return shovelPreparationMode;
 	}
-	public void setShovelPreparationMode(Boolean bool){
+	public void setShovelPreparationMode(boolean bool){
 		shovelPreparationMode = bool;
 	}
 	public long getShovelPreparationATS(){
@@ -670,7 +694,7 @@ public class PlayerProfile
 	public boolean getFistsPreparationMode(){
 		return fistsPreparationMode;
 	}
-	public void setFistsPreparationMode(Boolean bool){
+	public void setFistsPreparationMode(boolean bool){
 		fistsPreparationMode = bool;
 	}
 	public long getFistsPreparationATS(){
@@ -685,7 +709,7 @@ public class PlayerProfile
 	public boolean getAxePreparationMode(){
 		return axePreparationMode;
 	}
-	public void setAxePreparationMode(Boolean bool){
+	public void setAxePreparationMode(boolean bool){
 		axePreparationMode = bool;
 	}
 	public long getAxePreparationATS(){
@@ -700,7 +724,7 @@ public class PlayerProfile
 	public boolean getPickaxePreparationMode(){
 		return pickaxePreparationMode;
 	}
-	public void setPickaxePreparationMode(Boolean bool){
+	public void setPickaxePreparationMode(boolean bool){
 		pickaxePreparationMode = bool;
 	}
 	public long getPickaxePreparationATS(){
@@ -713,13 +737,13 @@ public class PlayerProfile
 	 * GREEN TERRA MODE
 	 */
 	public boolean getGreenTerraInformed() {return greenTerraInformed;}
-	public void setGreenTerraInformed(Boolean bool){
+	public void setGreenTerraInformed(boolean bool){
 		greenTerraInformed = bool;
 	}
 	public boolean getGreenTerraMode(){
 		return greenTerraMode;
 	}
-	public void setGreenTerraMode(Boolean bool){
+	public void setGreenTerraMode(boolean bool){
 		greenTerraMode = bool;
 	}
 	
@@ -727,78 +751,82 @@ public class PlayerProfile
 	 * BERSERK MODE
 	 */
 	public boolean getBerserkInformed() {return berserkInformed;}
-	public void setBerserkInformed(Boolean bool){
+	public void setBerserkInformed(boolean bool){
 		berserkInformed = bool;
 	}
 	public boolean getBerserkMode(){
 		return berserkMode;
 	}
-	public void setBerserkMode(Boolean bool){
+	public void setBerserkMode(boolean bool){
 		berserkMode = bool;
 	}
 	/*
 	 * SKULL SPLITTER
 	 */
 	public boolean getSkullSplitterInformed() {return skullSplitterInformed;}
-	public void setSkullSplitterInformed(Boolean bool){
+	public void setSkullSplitterInformed(boolean bool){
 		skullSplitterInformed = bool;
 	}
 	public boolean getSkullSplitterMode(){
 		return skullSplitterMode;
 	}
-	public void setSkullSplitterMode(Boolean bool){
+	public void setSkullSplitterMode(boolean bool){
 		skullSplitterMode = bool;
 	}
 	/*
 	 * SERRATED STRIKES
 	 */
 	public boolean getSerratedStrikesInformed() {return serratedStrikesInformed;}
-	public void setSerratedStrikesInformed(Boolean bool){
+	public void setSerratedStrikesInformed(boolean bool){
 		serratedStrikesInformed = bool;
 	}
 	public boolean getSerratedStrikesMode(){
 		return serratedStrikesMode;
 	}
-	public void setSerratedStrikesMode(Boolean bool){
+	public void setSerratedStrikesMode(boolean bool){
 		serratedStrikesMode = bool;
 	}
 	/*
 	 * GIGA DRILL BREAKER
 	 */
 	public boolean getGigaDrillBreakerInformed() {return gigaDrillBreakerInformed;}
-	public void setGigaDrillBreakerInformed(Boolean bool){
+	public void setGigaDrillBreakerInformed(boolean bool){
 		gigaDrillBreakerInformed = bool;
 	}
 	public boolean getGigaDrillBreakerMode(){
 		return gigaDrillBreakerMode;
 	}
-	public void setGigaDrillBreakerMode(Boolean bool){
+	public void setGigaDrillBreakerMode(boolean bool){
 		gigaDrillBreakerMode = bool;
 	}
 	/*
 	 * TREE FELLER STUFF
 	 */
 	public boolean getTreeFellerInformed() {return treeFellerInformed;}
-	public void setTreeFellerInformed(Boolean bool){
+	public void setTreeFellerInformed(boolean bool){
 		treeFellerInformed = bool;
 	}
 	public boolean getTreeFellerMode(){
 		return treeFellerMode;
 	}
-	public void setTreeFellerMode(Boolean bool){
+	public void setTreeFellerMode(boolean bool){
 		treeFellerMode = bool;
 	}
 	/*
 	 * MINING
 	 */
 	public boolean getSuperBreakerInformed() {return superBreakerInformed;}
-	public void setSuperBreakerInformed(Boolean bool){
+	public void setSuperBreakerInformed(boolean bool){
 		superBreakerInformed = bool;
 	}
+	public boolean getBlastMiningInformed() {return blastMiningInformed;}
+	public void setBlastMiningInformed(boolean bool){
+	    blastMiningInformed = bool;
+	}
 	public boolean getSuperBreakerMode(){
 		return superBreakerMode;
 	}
-	public void setSuperBreakerMode(Boolean bool){
+	public void setSuperBreakerMode(boolean bool){
 		superBreakerMode = bool;
 	}
 	public long getRecentlyHurt(){
@@ -825,7 +853,9 @@ public class PlayerProfile
 	}
 	public long getSkillDATS(AbilityType abilityType)
     {
-	    long convertedBack = skillsDATS.get(abilityType) * 1000;
+	    //Is this actually unused, or should it actually be returning the convertedBack variable?
+	    //It *is* unused, I don't think I put this here so I'm going to comment it out - nossr50
+		//long convertedBack = skillsDATS.get(abilityType) * 1000;
         return skillsDATS.get(abilityType);
     }
     public void setSkillDATS(AbilityType abilityType, long value)
@@ -840,6 +870,32 @@ public class PlayerProfile
             skillsDATS.put(x, 0);
         }
     }
+    
+    /**
+     * Adds XP to the player, doesn't calculate for XP Rate
+     * @param skillType The skill to add XP to
+     * @param newvalue The amount of XP to add
+     */
+    public void addXPOverrideNoBonus(SkillType skillType, int newvalue)
+    {
+        if(skillType == SkillType.ALL)
+        {
+            for(SkillType x : SkillType.values())
+            {
+                if(x == SkillType.ALL)
+                    continue;
+                Bukkit.getPluginManager().callEvent(new McMMOPlayerXpGainEvent(Bukkit.getPlayer(playerName), x, newvalue));
+                skillsXp.put(x, skillsXp.get(x)+newvalue);
+            }
+        } else {
+            int xp = newvalue;
+
+            Bukkit.getPluginManager().callEvent(new McMMOPlayerXpGainEvent(Bukkit.getPlayer(playerName), skillType, xp));
+            skillsXp.put(skillType, skillsXp.get(skillType)+xp);
+            lastgained = skillType;
+        }
+    }
+    
 	/**
 	 * Adds XP to the player, this ignores skill modifiers
 	 * @param skillType The skill to add XP to
@@ -865,8 +921,9 @@ public class PlayerProfile
 			lastgained = skillType;
 		}
 	}
+	
 	/**
-	 * Adds XP to the player, this is affected by skill modifiers
+	 * Adds XP to the player, this is affected by skill modifiers and xp rate
 	 * @param skillType The skill to add XP to
 	 * @param newvalue The amount of XP to add
 	 */
@@ -879,7 +936,7 @@ public class PlayerProfile
 		xpGainATS = (int) (System.currentTimeMillis()/1000);
 		
 		double bonusModifier = 0;
-		String leaderName = "";
+		//String leaderName = "";
 		
 		if(inParty())
 		{
@@ -887,8 +944,8 @@ public class PlayerProfile
 			{
 				if(x.isOnline() && !x.getName().equals(thisplayer.getName()) && Party.getInstance().isPartyLeader(x.getName(), this.getParty()))
 				{
-					leaderName = x.getName();
-					if(m.getDistance(thisplayer.getLocation(), x.getLocation()) < 25)
+					//leaderName = x.getName();
+					if(m.isNear(thisplayer.getLocation(), x.getLocation(), 25))
 					{
 						PlayerProfile PartyLeader = Users.getProfile(x);
 						if(PartyLeader.getSkillLevel(skillType) >= this.getSkillLevel(skillType))
@@ -948,6 +1005,9 @@ public class PlayerProfile
 			case AXES:
 				xp=(int) (xp/LoadProperties.axesxpmodifier);
 				break;
+			case FISHING:
+				xp=(int) (xp/LoadProperties.fishingxpmodifier);
+				break;
 			}
 			xp=xp*LoadProperties.xpGainMultiplier;
 			
@@ -957,10 +1017,7 @@ public class PlayerProfile
 					bonusModifier = 2;
 				
 				double trueBonus = bonusModifier * xp;
-				double oldxp = xp;
 				xp+=trueBonus;
-				double percent = (trueBonus/oldxp)*100;
-				thisplayer.sendMessage(ChatColor.GREEN+"XP: "+oldxp+" Bonus XP: "+trueBonus+" Total: "+xp+ChatColor.GOLD+" [Master: "+leaderName+" " +" +"+(int)percent+"%]");
 			}
 			Bukkit.getPluginManager().callEvent(new McMMOPlayerXpGainEvent(Bukkit.getPlayer(playerName), skillType, xp));
 			skillsXp.put(skillType, skillsXp.get(skillType)+xp);
@@ -1030,9 +1087,46 @@ public class PlayerProfile
 			skillsXp.put(SkillType.FISHING, 0);
 		} else {
 			skills.put(skillType, newvalue);
-			skillsXp.put(skillType, newvalue);
+			skillsXp.put(skillType, 0);
+		}
+		save(); //This will make mctop update for MySQL
+	}
+	
+	public void addLevels(SkillType skillType, int levels)
+	{
+		if(skillType == SkillType.ALL)
+		{
+			skills.put(SkillType.TAMING, skills.get(SkillType.TAMING)+levels);
+			skills.put(SkillType.MINING, skills.get(SkillType.MINING)+levels);
+			skills.put(SkillType.WOODCUTTING, skills.get(SkillType.WOODCUTTING)+levels);
+			skills.put(SkillType.REPAIR, skills.get(SkillType.REPAIR)+levels);
+			skills.put(SkillType.HERBALISM, skills.get(SkillType.HERBALISM)+levels);
+			skills.put(SkillType.ACROBATICS, skills.get(SkillType.ACROBATICS)+levels);
+			skills.put(SkillType.SWORDS, skills.get(SkillType.SWORDS)+levels);
+			skills.put(SkillType.ARCHERY, skills.get(SkillType.ARCHERY)+levels);
+			skills.put(SkillType.UNARMED, skills.get(SkillType.UNARMED)+levels);
+			skills.put(SkillType.EXCAVATION, skills.get(SkillType.EXCAVATION)+levels);
+			skills.put(SkillType.AXES, skills.get(SkillType.AXES)+levels);
+			skills.put(SkillType.FISHING, skills.get(SkillType.FISHING)+levels);
+			
+			skillsXp.put(SkillType.TAMING, 0);
+			skillsXp.put(SkillType.MINING, 0);
+			skillsXp.put(SkillType.WOODCUTTING, 0);
+			skillsXp.put(SkillType.REPAIR, 0);
+			skillsXp.put(SkillType.HERBALISM, 0);
+			skillsXp.put(SkillType.ACROBATICS, 0);
+			skillsXp.put(SkillType.SWORDS, 0);
+			skillsXp.put(SkillType.ARCHERY, 0);
+			skillsXp.put(SkillType.UNARMED, 0);
+			skillsXp.put(SkillType.EXCAVATION, 0);
+			skillsXp.put(SkillType.AXES, 0);
+			skillsXp.put(SkillType.FISHING, 0);
+		} else {
+			skills.put(skillType, skills.get(skillType)+levels);
+			skillsXp.put(skillType, 0);
 		}
 	}
+	
 	public Integer getXpToLevel(SkillType skillType)
 	{
 		return (int) ((1020+(skills.get(skillType) *  20)));
@@ -1067,72 +1161,9 @@ public class PlayerProfile
     		return false;
     	}
     }
-    public String getMySpawnWorld()
+    
+    public String getPlayerName()
     {
-    	if(myspawnworld != null && !myspawnworld.equals("") && !myspawnworld.equals("null")){
-    		return myspawnworld;
-    	} else {
-    		return Bukkit.getServer().getWorlds().get(0).toString();
-    	}
-    }
-    //Save a users spawn location
-    public void setMySpawn(double x, double y, double z, String myspawnworldlocation){
-    	myspawn = x+","+y+","+z;
-    	myspawnworld = myspawnworldlocation;
-    }
-    public String getX(){
-    	if(myspawn != null)
-    	{
-    	String[] split = myspawn.split(",");
-    	return split[0];
-    	} 
-    	else
-    		return null;
-    }
-    public String getY(){
-    	if(myspawn != null)
-    	{
-    	String[] split = myspawn.split(",");
-    	return split[1];
-    	} 
-    	else
-    		return null;
-    }
-    public String getZ(){
-    	if(myspawn != null)
-    	{
-    	String[] split = myspawn.split(",");
-    	return split[2];
-    	} 
-    	else
-    		return null;
-    }
-    public boolean isDead(){
-    	return dead;
-    }
-    public Location getMySpawn(Player player)
-    {
-    	Location loc = null;
-    	if(myspawn != null)
-    	{
-    		if(m.isDouble(getX()) && m.isDouble(getY()) && m.isDouble(getZ()))
-    				loc = new Location(player.getWorld(),(Double.parseDouble(getX())), Double.parseDouble(getY()), Double.parseDouble(getZ()));
-    		else
-    			return null;
-    	} else
-    		return null;
-    	
-    	loc.setYaw(0);
-    	loc.setPitch(0);
-    	if(loc.getX() != 0 && loc.getY() != 0 && loc.getZ() != 0 && loc.getWorld() != null)
-    	{
-    		if(Bukkit.getServer().getWorld(this.getMySpawnWorld()) != null)
-    			loc.setWorld(Bukkit.getServer().getWorld(this.getMySpawnWorld()));
-    		else
-    			loc.setWorld(Bukkit.getServer().getWorlds().get(0));
-    		return loc;
-    	} else {
-    		return null;
-    	}
+        return playerName;
     }
 }	

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,96 @@
-/*
-	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.entity.Player;
+
+import com.gmail.nossr50.mcPermissions;
+import com.gmail.nossr50.config.LoadProperties;
+
 public enum SkillType 
 {
-	ACROBATICS,
-	ALCHEMY,
+	ACROBATICS(LoadProperties.levelCapAcrobatics),
 	ALL, //This one is just for convenience
-	ARCHERY,
-	AXES,
-	EXCAVATION,
-	ENCHANTING,
-	FISHING,
-	HERBALISM,
-	MINING,
-	REPAIR,
-	SWORDS,
-	TAMING,
-	UNARMED,
-	WOODCUTTING;
+	ARCHERY(LoadProperties.levelCapArchery),
+	AXES(AbilityType.SKULL_SPLIITER, LoadProperties.levelCapAxes, ToolType.AXE),
+	EXCAVATION(AbilityType.GIGA_DRILL_BREAKER, LoadProperties.levelCapExcavation, ToolType.SHOVEL),
+	FISHING(LoadProperties.levelCapFishing),
+	HERBALISM(AbilityType.GREEN_TERRA, LoadProperties.levelCapHerbalism, ToolType.HOE),
+	MINING(AbilityType.SUPER_BREAKER, LoadProperties.levelCapMining, ToolType.PICKAXE),
+	REPAIR(LoadProperties.levelCapRepair),
+	SWORDS(AbilityType.SERRATED_STRIKES, LoadProperties.levelCapSwords, ToolType.SWORD),
+	TAMING(LoadProperties.levelCapTaming),
+	UNARMED(AbilityType.BERSERK, LoadProperties.levelCapUnarmed, ToolType.FISTS),
+	WOODCUTTING(AbilityType.TREE_FELLER, LoadProperties.levelCapWoodcutting, ToolType.AXE);
+	
+	private AbilityType ability;
+	private int maxLevel;
+	private ToolType tool;
+	
+	private SkillType()
+	{
+		this.ability = null;
+		this.maxLevel = 0;
+		this.tool = null;
+	}
+	
+	private SkillType(AbilityType ability, int maxLevel, ToolType tool)
+	{
+		this.ability = ability;
+		this.maxLevel = maxLevel;
+		this.tool = tool;
+	}
+	
+	private SkillType(int maxLevel)
+	{
+		this(null, maxLevel, null);
+	}
+	
+	public AbilityType getAbility()
+	{
+		return this.ability;
+	}
+	
+	public int getMaxLevel()
+	{
+		if(maxLevel > 0)
+			return maxLevel;
+		else
+			return Integer.MAX_VALUE;
+	}
+	
+	public ToolType getTool()
+	{
+		return this.tool;
+	}
+	
+	public boolean getPermissions(Player player)
+	{
+		switch(this)
+		{
+		case ACROBATICS:
+			return mcPermissions.getInstance().acrobatics(player);
+		case ARCHERY:
+			return mcPermissions.getInstance().archery(player);
+		case AXES:
+			return mcPermissions.getInstance().axes(player);
+		case EXCAVATION:
+			return mcPermissions.getInstance().excavation(player);
+		case FISHING:
+			return mcPermissions.getInstance().fishing(player);
+		case HERBALISM:
+			return mcPermissions.getInstance().herbalism(player);
+		case MINING:
+			return mcPermissions.getInstance().mining(player);
+		case REPAIR:
+			return mcPermissions.getInstance().repair(player);
+		case SWORDS:
+			return mcPermissions.getInstance().swords(player);
+		case TAMING:
+			return mcPermissions.getInstance().taming(player);
+		case UNARMED:
+			return mcPermissions.getInstance().unarmed(player);
+		case WOODCUTTING:
+			return mcPermissions.getInstance().woodcutting(player);
+		}
+		return false;
+	}
 }

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

@@ -0,0 +1,147 @@
+package com.gmail.nossr50.datatypes;
+
+import org.bukkit.Material;
+import org.bukkit.inventory.ItemStack;
+
+import com.gmail.nossr50.ItemChecks;
+import com.gmail.nossr50.locale.mcLocale;
+
+public enum ToolType
+{
+	AXE(mcLocale.getString("Skills.LowerAxe"), mcLocale.getString("Skills.ReadyAxe")),
+	FISTS(mcLocale.getString("Skills.LowerFists"), mcLocale.getString("Skills.ReadyFists")),
+	HOE(mcLocale.getString("Skills.LowerHoe"), mcLocale.getString("Skills.ReadyHoe")),
+	PICKAXE(mcLocale.getString("Skills.LowerPickAxe"), mcLocale.getString("Skills.ReadyPickAxe")),
+	SHOVEL(mcLocale.getString("Skills.LowerShovel"), mcLocale.getString("Skills.ReadyShovel")),
+	SWORD(mcLocale.getString("Skills.LowerSword"), mcLocale.getString("Skills.ReadySword"));
+	
+	private String lowerTool;
+	private String raiseTool;
+	
+	private ToolType(String lowerTool, String raiseTool)
+	{
+		this.lowerTool = lowerTool;
+		this.raiseTool = raiseTool;
+	}
+	
+	public String getLowerTool()
+	{
+		return this.lowerTool;
+	}
+	
+	public String getRaiseTool()
+	{
+		return this.raiseTool;
+	}
+	
+	public boolean getToolMode(PlayerProfile PP)
+	{
+		switch(this)
+		{
+		case AXE:
+			return PP.getAxePreparationMode();
+		case FISTS:
+			return PP.getFistsPreparationMode();
+		case HOE:
+			return PP.getHoePreparationMode();
+		case PICKAXE:
+			return PP.getPickaxePreparationMode();
+		case SHOVEL:
+			return PP.getShovelPreparationMode();
+		case SWORD:
+			return PP.getSwordsPreparationMode();
+		}
+		return false;
+	}
+	
+	public void setToolMode(PlayerProfile PP, boolean bool)
+	{
+		switch(this)
+		{
+		case AXE:
+			 PP.setAxePreparationMode(bool);
+			 break;
+		case FISTS:
+			 PP.setFistsPreparationMode(bool);
+			 break;
+		case HOE:
+			 PP.setHoePreparationMode(bool);
+			 break;
+		case PICKAXE:
+			 PP.setPickaxePreparationMode(bool);
+			 break;
+		case SHOVEL:
+			 PP.setShovelPreparationMode(bool);
+			 break;
+		case SWORD:
+			PP.setSwordsPreparationMode(bool);
+			break;
+		}
+	}
+	
+	public long getToolATS(PlayerProfile PP)
+	{
+		switch(this)
+		{
+		case AXE:
+			return PP.getAxePreparationATS();
+		case FISTS:
+			return PP.getFistsPreparationATS();
+		case HOE:
+			return PP.getHoePreparationATS();
+		case PICKAXE:
+			return PP.getPickaxePreparationATS();
+		case SHOVEL:
+			return PP.getShovelPreparationATS();
+		case SWORD:
+			return PP.getSwordsPreparationATS();
+		}
+		return 0;
+	}
+	
+	public void setToolATS(PlayerProfile PP, long ats)
+	{
+		switch(this)
+		{
+		case AXE:
+			PP.setAxePreparationATS(ats);
+			break;
+		case FISTS:
+			PP.setFistsPreparationATS(ats);
+			break;
+		case HOE:
+			PP.setHoePreparationATS(ats);
+			break;
+		case PICKAXE:
+			PP.setPickaxePreparationATS(ats);
+			break;
+		case SHOVEL:
+			PP.setShovelPreparationATS(ats);
+			break;
+		case SWORD:
+			PP.setSwordsPreparationATS(ats);
+			break;
+		}
+	}
+	
+	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.isMiningPick(is);
+		case SHOVEL:
+			return ItemChecks.isShovel(is);
+		case SWORD:
+			return ItemChecks.isSword(is);
+		}
+		return false;
+	}
+	
+}

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

@@ -1,19 +1,3 @@
-/*
-	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;
@@ -22,34 +6,49 @@ import com.gmail.nossr50.datatypes.PlayerStat;
 
 public class Tree {
 
-	TreeNode root = null;
+    private TreeNode root = null;
 
-	public Tree(){}
+    public Tree(){}
 
-	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()]);
-		}
-	}
+    /**
+     * 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);
+        }
+    }
 
+    /**
+     * 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,19 +1,3 @@
-/*
-	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;

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

@@ -1,19 +1,3 @@
-/*
-	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;

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

@@ -1,19 +1,3 @@
-/*
-	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;

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

@@ -1,19 +1,3 @@
-/*
-	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;

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

@@ -1,19 +1,3 @@
-/*
-	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;

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

@@ -0,0 +1,127 @@
+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,50 @@
+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/FakeBlockBreakEvent.java

@@ -0,0 +1,15 @@
+package com.gmail.nossr50.events;
+
+import java.util.ArrayList;
+
+import org.bukkit.block.Block;
+import org.bukkit.entity.Player;
+import org.bukkit.event.block.BlockBreakEvent;
+import org.bukkit.inventory.ItemStack;
+
+public class FakeBlockBreakEvent extends BlockBreakEvent {
+
+	public FakeBlockBreakEvent(Block theBlock, Player player) {
+		super(theBlock, player, new ArrayList<ItemStack>(theBlock.getDrops()));
+	}
+}

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

@@ -0,0 +1,10 @@
+package com.gmail.nossr50.events;
+
+import org.bukkit.entity.Entity;
+import org.bukkit.event.entity.EntityDamageByEntityEvent;
+
+public class FakeEntityDamageByEntityEvent extends EntityDamageByEntityEvent {
+	public FakeEntityDamageByEntityEvent(Entity damager, Entity damagee, DamageCause cause, int damage) {
+		super(damager, damagee, cause, damage);
+	}
+}

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

@@ -0,0 +1,10 @@
+package com.gmail.nossr50.events;
+
+import org.bukkit.entity.Entity;
+import org.bukkit.event.entity.EntityDamageEvent;
+
+public class FakeEntityDamageEvent extends EntityDamageEvent{
+    public FakeEntityDamageEvent(Entity damagee, DamageCause cause, int damage) {
+        super(damagee, cause, damage);
+    }
+}

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

@@ -1,19 +1,3 @@
-/*
-	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;
@@ -25,7 +9,6 @@ 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;

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

@@ -1,19 +1,3 @@
-/*
-	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;
@@ -25,7 +9,6 @@ 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;

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

@@ -1,19 +1,3 @@
-/*
-	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;
@@ -22,7 +6,6 @@ import org.bukkit.event.HandlerList;
 
 import com.gmail.nossr50.datatypes.SkillType;
 
-@SuppressWarnings("serial")
 public class McMMOPlayerXpGainEvent extends Event {
 	private Player player;
 	private SkillType skill;

src/main/java/com/gmail/nossr50/listeners/mcBlockListener.java

@@ -1,423 +1,332 @@
-/*
-	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.listeners;
 
-import com.gmail.nossr50.Users;
-import com.gmail.nossr50.m;
+import java.util.List;
+
+import com.gmail.nossr50.BlockChecks;
+import com.gmail.nossr50.ItemChecks;
 import com.gmail.nossr50.mcMMO;
 import com.gmail.nossr50.mcPermissions;
+import com.gmail.nossr50.Users;
 import com.gmail.nossr50.config.LoadProperties;
-import com.gmail.nossr50.spout.SpoutStuff;
+import com.gmail.nossr50.datatypes.AbilityType;
 import com.gmail.nossr50.datatypes.PlayerProfile;
 import com.gmail.nossr50.datatypes.SkillType;
+import com.gmail.nossr50.skills.Excavation;
+import com.gmail.nossr50.skills.Herbalism;
+import com.gmail.nossr50.skills.Mining;
+import com.gmail.nossr50.skills.Skills;
+import com.gmail.nossr50.skills.WoodCutting;
+import com.gmail.nossr50.spout.SpoutSounds;
 
 import org.bukkit.Bukkit;
+import org.bukkit.CropState;
 import org.bukkit.Material;
-import org.bukkit.Statistic;
 import org.bukkit.block.Block;
-import org.bukkit.enchantments.Enchantment;
+import org.bukkit.block.BlockFace;
 import org.bukkit.entity.Player;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.EventPriority;
 import org.bukkit.event.Listener;
 import org.bukkit.event.block.BlockBreakEvent;
 import org.bukkit.event.block.BlockDamageEvent;
-import org.bukkit.event.block.BlockFromToEvent;
+import org.bukkit.event.block.BlockPistonExtendEvent;
+import org.bukkit.event.block.BlockPistonRetractEvent;
 import org.bukkit.event.block.BlockPlaceEvent;
 import org.bukkit.event.player.PlayerAnimationEvent;
 import org.bukkit.inventory.ItemStack;
+import org.bukkit.metadata.FixedMetadataValue;
 
 import org.getspout.spoutapi.SpoutManager;
 import org.getspout.spoutapi.player.SpoutPlayer;
 import org.getspout.spoutapi.sound.SoundEffect;
 
 import com.gmail.nossr50.locale.mcLocale;
-import com.gmail.nossr50.skills.*;
-import com.gmail.nossr50.datatypes.FakeBlockBreakEvent;
+import com.gmail.nossr50.events.FakeBlockBreakEvent;
 
-public class mcBlockListener implements Listener 
-{
+public class mcBlockListener implements Listener {
     private final mcMMO plugin;
 
-    public mcBlockListener(final mcMMO plugin) 
-    {
+    public mcBlockListener(final mcMMO plugin) {
         this.plugin = plugin;
     }
-    
+
+    /**
+     * Monitor BlockPistonExtend events.
+     *
+     * @param event The event to monitor
+     */
     @EventHandler(priority = EventPriority.MONITOR)
-    public void onBlockPlace(BlockPlaceEvent event) 
-    { 
-    	if(event.isCancelled()) return;
+    public void onBlockPistonExtend(BlockPistonExtendEvent event) {
+        List<Block> blocks = event.getBlocks();
+        BlockFace direction = event.getDirection();
 
-    	//Setup some basic vars
-    	Block block;
-    	Player player = event.getPlayer();
-    	
-    	
-    	//When blocks are placed on snow this event reports the wrong block.
-    	if (event.getBlockReplacedState() != null && event.getBlockReplacedState().getTypeId() == 78) 
-    	{
-    		block = event.getBlockAgainst();
-    	}
-    	else 
-    	{
-    		block = event.getBlock();
-    	}
-    	
-    	//TNT placement checks - needed for Blast Mining
-    	if(block.getTypeId() == 46)
-    	{
-    		PlayerProfile PP = Users.getProfile(player);
-    		int skill = PP.getSkillLevel(SkillType.MINING);
-    		plugin.misc.tntTracker.put(block, skill);
-    	}
-    	
-    	//Check if the blocks placed should be monitored so they do not give out XP in the future
-    	if(m.shouldBeWatched(block))
-    	{
-    		int id = block.getTypeId();
-    		
-    		//Only needed for blocks that use their block data (wood, pumpkins, etc.)
-    		if (id == 17 || id == 73 || id == 74 || id == 81 || id == 83 || id == 86 || id == 91 || id == 106 || id == 98)
-    			plugin.misc.blockWatchList.add(block);
-    		else {
-    			//block.setData((byte) 5); //Change the byte
-    			//The following is a method to get around a breakage in 1.1-R2 and onward
-    			//it should be removed as soon as functionality to change a block
-    			//in this event returns.
-    			plugin.changeQueue.push(block);
-    		}
-    	}
-    	
-    	if(block.getTypeId() == LoadProperties.anvilID && LoadProperties.anvilmessages)
-    	{
-    		PlayerProfile PP = Users.getProfile(player);
-    		if(LoadProperties.spoutEnabled)
-    		{
-    			SpoutPlayer sPlayer = SpoutManager.getPlayer(player);
-	    		if(sPlayer.isSpoutCraftEnabled())
-	    		{
-	    			if(!PP.getPlacedAnvil())
-	    			{
-	    				sPlayer.sendNotification("[mcMMO] Anvil Placed", "Right click to repair!", Material.IRON_BLOCK);
-	    				PP.togglePlacedAnvil();
-	    			}
-	    		}
-	    		else
-	    		{
-	    			if(!PP.getPlacedAnvil())
-	    			{
-	    				event.getPlayer().sendMessage(mcLocale.getString("mcBlockListener.PlacedAnvil")); //$NON-NLS-1$
-	    				PP.togglePlacedAnvil();
-	    			}
-	    		}
-    		}
-    		else
-    		{
-    			if(!PP.getPlacedAnvil())
-    			{
-    				event.getPlayer().sendMessage(mcLocale.getString("mcBlockListener.PlacedAnvil")); //$NON-NLS-1$
-    				PP.togglePlacedAnvil();
-    			}
-    		}
-    	}
-    }
+        for (Block b : blocks) {
+            if (b.hasMetadata("mcmmoPlacedBlock")) {
+                b.getRelative(direction).setMetadata("mcmmoNeedsTracking", new FixedMetadataValue(plugin, true));
+                b.removeMetadata("mcmmoPlacedBlock", plugin);
+                }
+        }
 
-    @EventHandler(priority = EventPriority.MONITOR)
-    public void onBlockBreak(BlockBreakEvent event) 
-    {
-    	Player player = event.getPlayer();
-    	PlayerProfile PP = Users.getProfile(player);
-    	Block block = event.getBlock();
-    	ItemStack inhand = player.getItemInHand();
-    	if(event.isCancelled())
-    		return;
-    	if (event instanceof FakeBlockBreakEvent) 
-    		return;
-    	
-   		/*
-   		 * HERBALISM
-   		 */
-    	
-    	//TNT removal checks - needed for Blast Mining
-    	if(block.getTypeId() == 46)
-    	{
-    		plugin.misc.tntTracker.remove(block);
-    	}
-    	
-    	//Green Terra
-   		if(PP.getHoePreparationMode() && mcPermissions.getInstance().herbalismAbility(player) && block.getTypeId() == 59 && block.getData() == (byte) 0x07)
-   		{
-   			Herbalism.greenTerraCheck(player, block);
-   		}
-   		
-   		//Wheat && Triple drops
-   		if(PP.getGreenTerraMode() && Herbalism.canBeGreenTerra(block))
-   		{
-   			Herbalism.herbalismProcCheck(block, player, event, plugin);
-   			Herbalism.greenTerraWheat(player, block, event, plugin);
-   		}
-   		
-   		
-    	/*
-    	 * MINING
-    	 */
-   		
-    	if(mcPermissions.getInstance().mining(player))
-    	{
-    		if(LoadProperties.miningrequirespickaxe)
-    		{
-    			if(m.isMiningPick(inhand))
-    			{
-    				Mining.miningBlockCheck(player, block, plugin);
-    			}
-    		} else 
-    		{
-    			Mining.miningBlockCheck(player, block, plugin);
-    		}
-    	}
-    	
-    	
-    	/*
-   		 * WOOD CUTTING
-   		 */
-    	
-   		if(mcPermissions.getInstance().woodcutting(player))
-   		{
-   			if(LoadProperties.woodcuttingrequiresaxe)
-   			{
-				if(m.isAxes(inhand))
-				{
-					WoodCutting.woodcuttingBlockCheck(player, block, plugin);
-    			}
-    		} else 
-    		{
-    			WoodCutting.woodcuttingBlockCheck(player, block, plugin);
-   			}
-    			
-    		/*
-    		 * IF PLAYER IS USING TREEFELLER
-    		 */
-   			if(mcPermissions.getInstance().woodCuttingAbility(player) 
-   					&& PP.getTreeFellerMode() 
-   					&& block.getTypeId() == 17
-   					&& m.blockBreakSimulate(block, player))
-   			{
-   				if(LoadProperties.spoutEnabled)
-   					SpoutStuff.playSoundForPlayer(SoundEffect.EXPLODE, player, block.getLocation());
-   				
-    			WoodCutting.treeFeller(block, player, plugin);
-    			for(Block blockx : plugin.misc.treeFeller)
-    			{
-    				if(blockx != null)
-    				{
-    					Material mat = Material.getMaterial(block.getTypeId());
-    					byte type = 0;
-    					if(block.getTypeId() == 17)
-    						type = block.getData();
-    					ItemStack item = new ItemStack(mat, 1, (byte)0, type);
-    					if(blockx.getTypeId() == 17)
-    					{
-    						m.mcDropItem(blockx.getLocation(), item);
-    						//XP WOODCUTTING
-    						if(!plugin.misc.blockWatchList.contains(block))
-    						{
-	    						WoodCutting.woodCuttingProcCheck(player, blockx);
-	    						PP.addXP(SkillType.WOODCUTTING, LoadProperties.mpine, player);
-    						}
-    					}
-    					if(blockx.getTypeId() == 18)
-    					{
-    						mat = Material.SAPLING;
-    						
-    						item = new ItemStack(mat, 1, (short)0, (byte)(blockx.getData()-8));
-    						
-    						if(Math.random() * 10 > 9)
-    							m.mcDropItem(blockx.getLocation(), item);
-    					}
-    					if(blockx.getType() != Material.AIR)
-    						player.incrementStatistic(Statistic.MINE_BLOCK, event.getBlock().getType());
-    					blockx.setType(Material.AIR);
-    				}
-    			}
-    			if(LoadProperties.toolsLoseDurabilityFromAbilities)
-    	    	{
-    	    		if(!player.getItemInHand().containsEnchantment(Enchantment.DURABILITY))
-    	    			m.damageTool(player, (short) LoadProperties.abilityDurabilityLoss);
-    	    	}
-    			plugin.misc.treeFeller.clear();
-    		}
-    	}
-    	/*
-    	 * EXCAVATION
-    	 */
-    	if(Excavation.canBeGigaDrillBroken(block) && mcPermissions.getInstance().excavation(player) && block.getData() != (byte) 5)
-    		Excavation.excavationProcCheck(block.getType(), block.getLocation(), player);
-    	/*
-    	 * HERBALISM
-    	 */
-    	if(PP.getHoePreparationMode() && mcPermissions.getInstance().herbalism(player) && Herbalism.canBeGreenTerra(block))
-    	{
-    		Herbalism.greenTerraCheck(player, block);
-    	}
-    	if(mcPermissions.getInstance().herbalism(player) && block.getData() != (byte) 5)
-			Herbalism.herbalismProcCheck(block, player, event, plugin);
-    	
-    	//Change the byte back when broken
-    	if(block.getData() == 5 && m.shouldBeWatched(block))
-    	{
-    		block.setData((byte) 0);
-    		if(plugin.misc.blockWatchList.contains(block))
-    		{
-    			plugin.misc.blockWatchList.remove(block);
-    		}
-    	}
-    }
-
-    @EventHandler(priority = EventPriority.HIGHEST)
-    public void onBlockDamage(BlockDamageEvent event) 
-    {
-    	if(event.isCancelled())
-    		return;
-    	Player player = event.getPlayer();
-    	PlayerProfile PP = Users.getProfile(player);
-    	ItemStack inhand = player.getItemInHand();
-    	Block block = event.getBlock();
-
-    	/*
-    	 * ABILITY PREPARATION CHECKS
-    	 */
-   		if(PP.getHoePreparationMode() && Herbalism.canBeGreenTerra(block))
-    		Herbalism.greenTerraCheck(player, block);
-    	if(PP.getAxePreparationMode() && block.getTypeId() == 17)
-    		WoodCutting.treeFellerCheck(player, block);
-    	if(PP.getPickaxePreparationMode() && Mining.canBeSuperBroken(block))
-    		Mining.superBreakerCheck(player, block);
-    	if(PP.getShovelPreparationMode() && Excavation.canBeGigaDrillBroken(block))
-    		Excavation.gigaDrillBreakerActivationCheck(player, block);
-    	if(PP.getFistsPreparationMode() && (Excavation.canBeGigaDrillBroken(block) || block.getTypeId() == 78))
-    		Unarmed.berserkActivationCheck(player);
-    	
-    	/*
-    	 * TREE FELLAN STUFF
-    	 */
-    	if(LoadProperties.spoutEnabled && block.getTypeId() == 17 && Users.getProfile(player).getTreeFellerMode())
-    		SpoutStuff.playSoundForPlayer(SoundEffect.FIZZ, player, block.getLocation());
-    	
-    	/*
-    	 * GREEN TERRA STUFF
-    	 */
-    	if(PP.getGreenTerraMode() && mcPermissions.getInstance().herbalismAbility(player) && PP.getGreenTerraMode())
-    	{
-   			Herbalism.greenTerra(player, block);
-   		}
-    	
-    	/*
-    	 * GIGA DRILL BREAKER CHECKS
-    	 */
-    	if(PP.getGigaDrillBreakerMode()
-    		&& Excavation.canBeGigaDrillBroken(block)
-    		&& m.blockBreakSimulate(block, player) 
-    		&& mcPermissions.getInstance().excavationAbility(player))
-    	{	
-    		if(LoadProperties.excavationRequiresShovel)
-    		{
-    			if(m.isShovel(inhand)){
-    				event.setInstaBreak(true);
-    				Excavation.gigaDrillBreaker(player, block);
-    			}
-    		} else {
-    			event.setInstaBreak(true);
-    			Excavation.gigaDrillBreaker(player, block);
-    		}
-    	}
-    	/*
-    	 * BERSERK MODE CHECKS
-    	 */
-    	if(PP.getBerserkMode() 
-    		&& m.blockBreakSimulate(block, player) 
-    		&& player.getItemInHand().getTypeId() == 0 
-    		&& (Excavation.canBeGigaDrillBroken(block) || block.getTypeId() == 78)
-    		&& mcPermissions.getInstance().unarmedAbility(player))
-    	{
-    		event.setInstaBreak(true);
-			PlayerAnimationEvent armswing = new PlayerAnimationEvent(player);
-			Bukkit.getPluginManager().callEvent(armswing);
-			
-    		if(LoadProperties.spoutEnabled)
-    			SpoutStuff.playSoundForPlayer(SoundEffect.POP, player, block.getLocation());
-    	}
-    	
-    	/*
-    	 * SUPER BREAKER CHECKS
-    	 */
-    	if(PP.getSuperBreakerMode() 
-    		&& Mining.canBeSuperBroken(block)
-    		&& m.blockBreakSimulate(block, player)
-    		&& mcPermissions.getInstance().miningAbility(player))
-    	{
-    		if(LoadProperties.miningrequirespickaxe)
-    		{
-    			if(m.isMiningPick(inhand)){
-    				event.setInstaBreak(true);
-    				Mining.SuperBreakerBlockCheck(player, block, plugin);
-    			}
-    		} else {
-    			event.setInstaBreak(true);
-    			Mining.SuperBreakerBlockCheck(player, block, plugin);
-    		}
-    	}
-    	
-    	/*
-    	 * LEAF BLOWER CHECKS
-    	 */
-    	if(block.getTypeId() == 18 
-    		&& mcPermissions.getInstance().woodCuttingAbility(player) 
-    		&& PP.getSkillLevel(SkillType.WOODCUTTING) >= 100 
-    		&& m.blockBreakSimulate(block, player))
-    	{	
-    		if(LoadProperties.woodcuttingrequiresaxe)
-    		{
-    			if(m.isAxes(inhand)){
-    				event.setInstaBreak(true);
-    				WoodCutting.leafBlower(player, block);
-    			}
-    		}
-    		else{
-    			event.setInstaBreak(true);
-    			WoodCutting.leafBlower(player, block);
-    		}
-    		
-    	}
-    	
-    	if(block.getType() == Material.AIR && plugin.misc.blockWatchList.contains(block))
-    	{
-    		plugin.misc.blockWatchList.remove(block);
-    	}
-    }
-    
-    @EventHandler
-    public void onBlockFromTo(BlockFromToEvent event) 
-    {
-        Block blockFrom = event.getBlock();
-        Block blockTo = event.getToBlock();
-        if(m.shouldBeWatched(blockFrom) && blockFrom.getData() == (byte)5)
-        {
-        	blockTo.setData((byte)5);
+        for (Block b : blocks) {
+            if (b.getRelative(direction).hasMetadata("mcmmoNeedsTracking")) {
+                b.getRelative(direction).setMetadata("mcmmoPlacedBlock", new FixedMetadataValue(plugin, true));
+                b.getRelative(direction).removeMetadata("mcmmoNeedsTracking", plugin);
+            }
         }
     }
-}
+
+    /**
+     * Monitor BlockPistonRetract events.
+     *
+     * @param event The event to monitor
+     */
+    @EventHandler(priority = EventPriority.MONITOR)
+    public void onBlockPistonRetract(BlockPistonRetractEvent event) {
+        Block block = event.getRetractLocation().getBlock();
+
+        if (block.hasMetadata("mcmmoPlacedBlock")) {
+            block.removeMetadata("mcmmoPlacedBlock", plugin);
+            event.getBlock().getRelative(event.getDirection()).setMetadata("mcmmoPlacedBlock", new FixedMetadataValue(plugin, true));
+        }
+    }
+
+    /**
+     * Monitor BlockPlace events.
+     *
+     * @param event The event to monitor
+     */
+    @EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true)
+    public void onBlockPlace(BlockPlaceEvent event) {
+        Block block;
+        Player player = event.getPlayer();
+
+        //When blocks are placed on snow this event reports the wrong block.
+        if (event.getBlockReplacedState() != null && event.getBlockReplacedState().getType().equals(Material.SNOW)) {
+            block = event.getBlockAgainst();
+        }
+        else {
+            block = event.getBlock();
+        }
+
+        int id = block.getTypeId();
+        Material mat = block.getType();
+
+        /* Code to prevent issues with placed falling Sand/Gravel not being tracked */
+        if (mat.equals(Material.SAND) || mat.equals(Material.GRAVEL)) {
+            for (int y = -1;  y + block.getY() >= 0; y--) {
+                if (block.getRelative(0, y, 0).getType().equals(Material.AIR)) {
+                    continue;
+                }
+                else {
+                    Block newLocation = block.getRelative(0, y+1, 0);
+                    newLocation.setMetadata("mcmmoPlacedBlock", new FixedMetadataValue(plugin, true));
+                    break;
+                }
+            }
+        }
+
+        /* Check if the blocks placed should be monitored so they do not give out XP in the future */
+        if (BlockChecks.shouldBeWatched(mat)) {
+            block.setMetadata("mcmmoPlacedBlock", new FixedMetadataValue(plugin, true));
+        }
+
+        if (id == LoadProperties.anvilID && LoadProperties.anvilmessages) {
+            PlayerProfile PP = Users.getProfile(player);
+
+            if (!PP.getPlacedAnvil()) {
+                if (LoadProperties.spoutEnabled) {
+                    SpoutPlayer sPlayer = SpoutManager.getPlayer(player);
+
+                    if (sPlayer.isSpoutCraftEnabled()) {
+                        sPlayer.sendNotification("[mcMMO] Anvil Placed", "Right click to repair!", Material.getMaterial(id));
+                    }
+                }
+                else {
+                    event.getPlayer().sendMessage(mcLocale.getString("mcBlockListener.PlacedAnvil"));
+                }
+
+                PP.togglePlacedAnvil();
+            }
+        }
+    }
+
+    /**
+     * Monitor BlockBreak events.
+     *
+     * @param event The event to monitor
+     */
+    @EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true)
+    public void onBlockBreak(BlockBreakEvent event) {
+        Player player = event.getPlayer();
+        PlayerProfile PP = Users.getProfile(player);
+        Block block = event.getBlock();
+        Material mat = block.getType();
+        ItemStack inhand = player.getItemInHand();
+
+        if(event instanceof FakeBlockBreakEvent) {
+            return;
+        }
+
+        /*
+         * HERBALISM
+         */
+
+        /* Green Terra */
+        if (PP.getHoePreparationMode() && mcPermissions.getInstance().greenTerra(player) && ((mat.equals(Material.CROPS) && block.getData() == CropState.RIPE.getData()) || Herbalism.canBeGreenTerra(mat))) {
+            Skills.abilityCheck(player, SkillType.HERBALISM);
+        }
+
+        /* Triple drops */
+        if (PP.getGreenTerraMode() && Herbalism.canBeGreenTerra(mat)) {
+            Herbalism.herbalismProcCheck(block, player, event, plugin);
+            Herbalism.herbalismProcCheck(block, player, event, plugin); //Called twice for triple drop functionality
+        }
+
+        if (mcPermissions.getInstance().herbalismDoubleDrops(player) && Herbalism.canBeGreenTerra(mat)) {
+            Herbalism.herbalismProcCheck(block, player, event, plugin);
+        }
+
+        /*
+         * MINING
+         */
+
+        if (mcPermissions.getInstance().mining(player) && Mining.canBeSuperBroken(mat)) {
+            if (LoadProperties.miningrequirespickaxe && ItemChecks.isMiningPick(inhand)) {
+                Mining.miningBlockCheck(player, block);
+            }
+            else if (!LoadProperties.miningrequirespickaxe) {
+                Mining.miningBlockCheck(player, block);
+            }
+        }
+
+        /*
+         * WOOD CUTTING
+         */
+
+        if (mcPermissions.getInstance().woodcutting(player) && mat.equals(Material.LOG)) {
+            if (LoadProperties.woodcuttingrequiresaxe && ItemChecks.isAxe(inhand)) {
+                WoodCutting.woodcuttingBlockCheck(player, block);
+            }
+            else if (!LoadProperties.woodcuttingrequiresaxe) {
+                WoodCutting.woodcuttingBlockCheck(player, block);
+            }
+        }
+
+        if (PP.getTreeFellerMode() && mcPermissions.getInstance().treeFeller(player)) {
+            WoodCutting.treeFeller(event);
+        }
+
+        /*
+         * EXCAVATION
+         */
+
+        if (Excavation.canBeGigaDrillBroken(mat) && mcPermissions.getInstance().excavation(player) && !block.hasMetadata("mcmmoPlacedBlock")) {
+            if (LoadProperties.excavationRequiresShovel && ItemChecks.isShovel(inhand)) {
+                Excavation.excavationProcCheck(block, player);
+            }
+            else if (!LoadProperties.excavationRequiresShovel) {
+                Excavation.excavationProcCheck(block, player);
+            }
+        }
+
+        //Remove metadata when broken
+        if (block.hasMetadata("mcmmoPlacedBlock") && BlockChecks.shouldBeWatched(mat)) {
+            block.removeMetadata("mcmmoPlacedBlock", plugin);
+        }
+    }
+
+    /**
+     * Monitor BlockDamage events.
+     *
+     * @param event The event to monitor
+     */
+    @EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true)
+    public void onBlockDamage(BlockDamageEvent event) {
+        final int LEAF_BLOWER_LEVEL = 100;
+
+        Player player = event.getPlayer();
+        PlayerProfile PP = Users.getProfile(player);
+        ItemStack inhand = player.getItemInHand();
+        Block block = event.getBlock();
+        Material mat = block.getType();
+
+        /*
+         * ABILITY PREPARATION CHECKS
+         */
+        if (BlockChecks.abilityBlockCheck(mat)) {
+            if (PP.getHoePreparationMode() && (Herbalism.canBeGreenTerra(mat) || Herbalism.makeMossy(mat))) {
+                Skills.abilityCheck(player, SkillType.HERBALISM);
+            }
+            else if (PP.getAxePreparationMode() && mat.equals(Material.LOG) && mcPermissions.getInstance().treeFeller(player)) {  //Why are we checking the permissions here?
+                Skills.abilityCheck(player, SkillType.WOODCUTTING);
+            }
+            else if (PP.getPickaxePreparationMode() && Mining.canBeSuperBroken(mat)) {
+                Skills.abilityCheck(player, SkillType.MINING);
+            }
+            else if (PP.getShovelPreparationMode() && Excavation.canBeGigaDrillBroken(mat)) {
+                Skills.abilityCheck(player, SkillType.EXCAVATION);
+            }
+            else if (PP.getFistsPreparationMode() && (Excavation.canBeGigaDrillBroken(mat) || mat.equals(Material.SNOW))) {
+                Skills.abilityCheck(player, SkillType.UNARMED);
+            }
+        }
+
+        /* TREE FELLER SOUNDS */
+        if (LoadProperties.spoutEnabled && mat.equals(Material.LOG) && PP.getTreeFellerMode()) {
+            SpoutSounds.playSoundForPlayer(SoundEffect.FIZZ, player, block.getLocation());
+        }
+
+        /*
+         * ABILITY TRIGGER CHECKS
+         */
+        if (PP.getGreenTerraMode() && mcPermissions.getInstance().greenTerra(player) && Herbalism.makeMossy(mat)) {
+            Herbalism.greenTerra(player, block);
+        }
+        else if (PP.getGigaDrillBreakerMode() && Skills.triggerCheck(player, block, AbilityType.GIGA_DRILL_BREAKER)) {
+            if (LoadProperties.excavationRequiresShovel && ItemChecks.isShovel(inhand)) {
+                event.setInstaBreak(true);
+                Excavation.gigaDrillBreaker(player, block);
+            }
+            else if (!LoadProperties.excavationRequiresShovel) {
+                event.setInstaBreak(true);
+                Excavation.gigaDrillBreaker(player, block);
+            }
+        }
+        else if (PP.getBerserkMode() && Skills.triggerCheck(player, block, AbilityType.BERSERK)) {
+            if (inhand.getType().equals(Material.AIR)) {
+                PlayerAnimationEvent armswing = new PlayerAnimationEvent(player);
+                Bukkit.getPluginManager().callEvent(armswing);
+
+                event.setInstaBreak(true);
+            }
+
+            if (LoadProperties.spoutEnabled) {
+                SpoutSounds.playSoundForPlayer(SoundEffect.POP, player, block.getLocation());
+            }
+        }
+        else if (PP.getSuperBreakerMode() && Skills.triggerCheck(player, block, AbilityType.SUPER_BREAKER)) {
+            if (LoadProperties.miningrequirespickaxe && ItemChecks.isMiningPick(inhand)) {
+                event.setInstaBreak(true);
+                Mining.SuperBreakerBlockCheck(player, block);
+            }
+            else if (!LoadProperties.miningrequirespickaxe) {
+                event.setInstaBreak(true);
+                Mining.SuperBreakerBlockCheck(player, block);
+            }
+        }
+        else if (PP.getSkillLevel(SkillType.WOODCUTTING) >= LEAF_BLOWER_LEVEL && mat.equals(Material.LEAVES)) {
+            if (LoadProperties.woodcuttingrequiresaxe && ItemChecks.isAxe(inhand)) {
+                if (Skills.triggerCheck(player, block, AbilityType.LEAF_BLOWER)) {
+                    event.setInstaBreak(true);
+                    WoodCutting.leafBlower(player, block);
+                }
+            }
+            else if (!LoadProperties.woodcuttingrequiresaxe && !inhand.getType().equals(Material.SHEARS)) {
+                if (Skills.triggerCheck(player, block, AbilityType.LEAF_BLOWER)) {
+                    event.setInstaBreak(true);
+                    WoodCutting.leafBlower(player, block);
+                }
+            }
+        }
+    }
+}

src/main/java/com/gmail/nossr50/listeners/mcEntityListener.java

@@ -1,27 +1,12 @@
-/*
-	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.listeners;
 
-import org.bukkit.block.Block;
+import org.bukkit.Material;
 import org.bukkit.entity.Entity;
+import org.bukkit.entity.EntityType;
 import org.bukkit.entity.LivingEntity;
 import org.bukkit.entity.Player;
-import org.bukkit.entity.Wolf;
 import org.bukkit.entity.TNTPrimed;
+import org.bukkit.entity.Wolf;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.EventPriority;
 import org.bukkit.event.Listener;
@@ -32,233 +17,298 @@ import org.bukkit.event.entity.EntityDamageEvent;
 import org.bukkit.event.entity.EntityDamageEvent.DamageCause;
 import org.bukkit.event.entity.EntityDeathEvent;
 import org.bukkit.event.entity.EntityExplodeEvent;
+import org.bukkit.event.entity.EntityTameEvent;
 import org.bukkit.event.entity.ExplosionPrimeEvent;
-import org.bukkit.inventory.ItemStack;
+import org.bukkit.event.entity.FoodLevelChangeEvent;
+import org.bukkit.metadata.FixedMetadataValue;
 
 import com.gmail.nossr50.Combat;
 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.events.FakeEntityDamageByEntityEvent;
+import com.gmail.nossr50.events.FakeEntityDamageEvent;
 import com.gmail.nossr50.party.Party;
+import com.gmail.nossr50.runnables.mcBleedTimer;
 import com.gmail.nossr50.skills.Acrobatics;
+import com.gmail.nossr50.skills.Archery;
 import com.gmail.nossr50.skills.BlastMining;
 import com.gmail.nossr50.skills.Skills;
 import com.gmail.nossr50.skills.Taming;
 
-
-public class mcEntityListener implements Listener 
-{
-	private final mcMMO plugin;
+public class mcEntityListener implements Listener {
+    private final mcMMO plugin;
 
     public mcEntityListener(final mcMMO plugin) {
         this.plugin = plugin;
     }
 
-    @EventHandler(priority = EventPriority.LOW)
-    public void onEntityDamage(EntityDamageEvent event) 
-    {
-    	if(event.isCancelled())
-    		return;
-    	//Check for world pvp flag
-    	if(event instanceof EntityDamageByEntityEvent)
-    	{
-    		EntityDamageByEntityEvent eventb = (EntityDamageByEntityEvent)event;
-    		if(eventb.getEntity() instanceof Player && eventb.getDamager() instanceof Player && !event.getEntity().getWorld().getPVP())
-    			return;
-    	}
-    	/*
-    	 * CHECK FOR INVULNERABILITY
-    	 */
-    	if(event.getEntity() instanceof Player)
-    	{
-    		Player defender = (Player)event.getEntity();
-    		PlayerProfile PPd = Users.getProfile(defender);
-    		if(defender != null && PPd.getGodMode())
-    			event.setCancelled(true);
-    		if(PPd == null)
-    			Users.addUser(defender);
-    	}
-    	
-    	/*
-    	 * Demolitions Expert
-    	 
-    	if(event.getCause() == DamageCause.BLOCK_EXPLOSION)
-    	{
-    		if(event.getEntity() instanceof Player)
-    		{
-    			Player player = (Player)event.getEntity();
-    			BlastMining.demolitionsExpertise(player, event);
-    		}
-    	}
-    	*/
-    	
-    	if(event.getEntity() instanceof LivingEntity)
-    	{
-    		//CraftEntity cEntity = (CraftEntity)event.getEntity();
-	    	//if(cEntity.getHandle() instanceof EntityLiving)
-	    	{
-		    	LivingEntity entityliving = (LivingEntity)event.getEntity();
-		    	if(entityliving.getNoDamageTicks() < entityliving.getMaximumNoDamageTicks()/2.0F)
-		    	{
-			    	Entity x = event.getEntity();
-			    	DamageCause type = event.getCause();
-			    	if(event.getEntity() instanceof Wolf && ((Wolf)event.getEntity()).isTamed() && Taming.getOwner(((Wolf)event.getEntity()), plugin) != null)
-			    	{
-			    		Wolf theWolf = (Wolf) event.getEntity();
-				    	Player master = Taming.getOwner(theWolf, plugin);
-				    	PlayerProfile PPo = Users.getProfile(master);
-				    	if(master == null || PPo == null)
-				    		return;
-			    		//Environmentally Aware
-						if((event.getCause() == DamageCause.CONTACT || event.getCause() == DamageCause.LAVA || event.getCause() == DamageCause.FIRE) && PPo.getSkillLevel(SkillType.TAMING) >= 100)
-						{
-							if(event.getDamage() < ((Wolf) event.getEntity()).getHealth())
-							{
-								event.getEntity().teleport(Taming.getOwner(theWolf, plugin).getLocation());
-								master.sendMessage(mcLocale.getString("mcEntityListener.WolfComesBack")); //$NON-NLS-1$
-								event.getEntity().setFireTicks(0);
-							}
-						}
-						if(event.getCause() == DamageCause.FALL && PPo.getSkillLevel(SkillType.TAMING) >= 100)
-						{
-							event.setCancelled(true);
-						}
-						
-						//Thick Fur
-						if(event.getCause() == DamageCause.FIRE_TICK)
-						{
-							event.getEntity().setFireTicks(0);
-						}
-			    	}
-			    	
-			    	/*
-			    	 * ACROBATICS
-			    	 */
-			    	if(x instanceof Player){
-				    	Player player = (Player)x;
-				    	if(type == DamageCause.FALL){
-				    		Acrobatics.acrobaticsCheck(player, event);
-				    	}
-			    	}
-			    	
-			    	/*
-			    	 * Entity Damage by Entity checks
-			    	 */
-			    	if(event instanceof EntityDamageByEntityEvent && !event.isCancelled())
-			    	{
-			    		EntityDamageByEntityEvent eventb = (EntityDamageByEntityEvent) event;
-			    		Entity f = eventb.getDamager();
-			    		Entity e = event.getEntity();
-			    		/*
-			    		 * PARTY CHECKS
-			    		 */
-			    		if(e instanceof Player && f instanceof Player)
-			    		{
-			        		Player defender = (Player)e;
-			        		Player attacker = (Player)f;
-			        		if(Party.getInstance().inSameParty(defender, attacker))
-			        			event.setCancelled(true);
-			    		}
-			    		Combat.combatChecks(event, plugin);	
-			        }
-			    	/*
-			    	 * Check to see if the defender took damage so we can apply recently hurt
-			    	 */
-			    	if(event.getEntity() instanceof Player)
-			    	{
-			    		Player herpderp = (Player)event.getEntity();
-			    		if(!event.isCancelled() && event.getDamage() >= 1)
-			    		{
-			    			Users.getProfile(herpderp).setRecentlyHurt(System.currentTimeMillis());
-			    		}
-			    	}
-		    	}
-	    	}
-    	}
+    /**
+     * Monitor EntityDamageByEntity events.
+     *
+     * @param event The event to monitor
+     */
+    @EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true)
+    public void onEntityDamageByEntity(EntityDamageByEntityEvent event) {
+        if (event instanceof FakeEntityDamageByEntityEvent) {
+            return;
+        }
+
+        Entity defender = event.getEntity();
+        Entity attacker = event.getDamager();
+
+        if (attacker instanceof Player && defender instanceof Player) {
+            if (!defender.getWorld().getPVP()) {
+                return;
+            }
+
+            if (Party.getInstance().inSameParty((Player)defender, (Player)attacker)) {
+                event.setCancelled(true);
+                return;
+            }
+        }
+
+        /* Check for invincibility */
+        if (defender instanceof LivingEntity) {
+            LivingEntity livingDefender = (LivingEntity)defender;
+
+            if (!m.isInvincible(livingDefender, event)) {
+                Combat.combatChecks(event, plugin);
+            }
+        }
     }
 
-    @EventHandler
-    public void onEntityDeath(EntityDeathEvent event) 
-    {
-    	Entity x = event.getEntity();
-    	x.setFireTicks(0);
-    	
-    	//Remove bleed track
-    	if(plugin.misc.bleedTracker.contains((LivingEntity)x))
-    		plugin.misc.addToBleedRemovalQue((LivingEntity)x);
-    	
-		Skills.arrowRetrievalCheck(x, plugin);
-		/*
-		if(Config.getInstance().isMobSpawnTracked(x)){
-			Config.getInstance().removeMobSpawnTrack(x);
-		}
-		*/
-    	if(x instanceof Player){
-    		Player player = (Player)x;
-    		Users.getProfile(player).setBleedTicks(0);
-    	}
-    	
+    /**
+     * Monitor EntityDamage events.
+     *
+     * @param event The event to monitor
+     */
+    @EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true)
+    public void onEntityDamage(EntityDamageEvent event) {
+        if (event instanceof FakeEntityDamageEvent) {
+            return;
+        }
+
+        Entity entity = event.getEntity();
+        EntityType type = entity.getType();
+        DamageCause cause = event.getCause();
+        
+        switch(type) {
+        case PLAYER:
+
+            /* Check for invincibility */
+            Player player = (Player) entity;
+            PlayerProfile PP = Users.getProfile(player);
+
+            if (PP.getGodMode()) {
+                event.setCancelled(true);
+                return;
+            }
+
+            if (!m.isInvincible(player, event)) {
+                if (cause == DamageCause.FALL && mcPermissions.getInstance().acrobatics(player)) {
+                    Acrobatics.acrobaticsCheck(player, event);
+                }
+                else if (cause == DamageCause.BLOCK_EXPLOSION && mcPermissions.getInstance().demolitionsExpertise(player)) {
+                    BlastMining.demolitionsExpertise(player, event);
+                }
+
+                if (event.getDamage() >= 1) {
+                    PP.setRecentlyHurt(System.currentTimeMillis());
+                }
+            }
+            break;
+
+        case WOLF:
+            Wolf wolf = (Wolf) entity;
+
+            if ((!m.isInvincible(wolf, event)) && wolf.isTamed() && (wolf.getOwner() instanceof Player)) {
+                Taming.preventDamage(event);
+            }
+            break;
+
+        default:
+            break;
+        }
     }
 
-    @EventHandler
-    public void onCreatureSpawn(CreatureSpawnEvent event) 
-    {
-    	SpawnReason reason = event.getSpawnReason();
-    	
-    	if(reason == SpawnReason.SPAWNER && !LoadProperties.xpGainsMobSpawners)
-    	{
-    		plugin.misc.mobSpawnerList.add(event.getEntity());
-    	}
-    }
-    
-    /*
-	@EventHandler (priority = EventPriority.LOW)
-	public void onExplosionPrime(ExplosionPrimeEvent event)
-	{
-		if(event.getEntity() instanceof TNTPrimed)
-		{
-			Block block = event.getEntity().getLocation().getBlock();
-			
-			if(plugin.misc.tntTracker.get(block) != null)
-			{
-				int skillLevel = plugin.misc.tntTracker.get(block);
-				BlastMining.biggerBombs(skillLevel, event);
-			}
-		}		
-	}
-	
-	
-	@EventHandler (priority = EventPriority.LOW)
-	public void onEnitityExplode(EntityExplodeEvent event)
-	{
-		if(event.getEntity() instanceof TNTPrimed)
-		{
-			Block block = event.getLocation().getBlock();
+    /**
+     * Monitor EntityDeath events.
+     *
+     * @param event The event to monitor
+     */
+    @EventHandler (priority = EventPriority.MONITOR)
+    public void onEntityDeath(EntityDeathEvent event) {
+        LivingEntity x = event.getEntity();
+        x.setFireTicks(0);
 
-			if(plugin.misc.tntTracker.get(block) != null)
-			{
-				int skillLevel = plugin.misc.tntTracker.get(block);
-				BlastMining.dropProcessing(skillLevel, event, plugin);
-			}
-		}
-	}
-	*/
-    
-	public boolean isBow(ItemStack is){
-		if (is.getTypeId() == 261){
-			return true;
-		} else {
-			return false;
-		}
-	}
-	public boolean isPlayer(Entity entity){
-    	if (entity instanceof Player) {
-    	    return true;
-    	} else{
-    		return false;
-    	}
+        /* Remove bleed track */
+        mcBleedTimer.remove(x);
+
+        Archery.arrowRetrievalCheck(x, plugin);
+
+        if (x instanceof Player) {
+            Users.getProfile((Player)x).setBleedTicks(0);
+        }
+    }
+
+    /**
+     * Monitor CreatureSpawn events.
+     *
+     * @param event The event to monitor
+     */
+    @EventHandler (priority = EventPriority.MONITOR)
+    public void onCreatureSpawn(CreatureSpawnEvent event) {
+        if (event.getSpawnReason().equals(SpawnReason.SPAWNER) && !LoadProperties.xpGainsMobSpawners) {
+            event.getEntity().setMetadata("mcmmoFromMobSpawner", new FixedMetadataValue(plugin, true));
+        }
+    }
+
+    /**
+     * Monitor ExplosionPrime events.
+     *
+     * @param event The event to monitor
+     */
+    @EventHandler (priority = EventPriority.LOW)
+    public void onExplosionPrime(ExplosionPrimeEvent event) {
+        Entity entity = event.getEntity();
+
+        if (entity instanceof TNTPrimed) {
+            int id = entity.getEntityId();
+
+            if (plugin.tntTracker.containsKey(id)) {
+                Player player = plugin.tntTracker.get(id);
+
+                if (mcPermissions.getInstance().biggerBombs(player)) {
+                    BlastMining.biggerBombs(player, event);
+                }
+            }
+        }
+    }
+
+    /**
+     * Monitor EntityExplode events.
+     *
+     * @param event The event to monitor
+     */
+    @EventHandler (priority = EventPriority.LOW)
+    public void onEnitityExplode(EntityExplodeEvent event) {
+        Entity entity = event.getEntity();
+
+        if (event.getEntity() instanceof TNTPrimed) {
+            int id = entity.getEntityId();
+
+            if (plugin.tntTracker.containsKey(id)) {
+                Player player = plugin.tntTracker.get(id);
+                BlastMining.dropProcessing(player, event);
+                plugin.tntTracker.remove(id);
+            }
+        }
+    }
+
+    /**
+     * Monitor FoodLevelChange events.
+     *
+     * @param event The event to monitor
+     */
+    @EventHandler (priority = EventPriority.LOW)
+    public void onFoodLevelChange(FoodLevelChangeEvent event) {
+        if (LoadProperties.herbalismHungerBonus) {
+            if (event.getEntity() instanceof Player) {
+                Player player = (Player) event.getEntity();
+                PlayerProfile PP = Users.getProfile(player);
+                int currentFoodLevel = player.getFoodLevel();
+                int newFoodLevel = event.getFoodLevel();
+
+                /* Some foods have 3 ranks
+                 * Some foods have 5 ranks
+                 * The number of ranks is based on how 'common' the item is
+                 * We can adjust this quite easily if we find something is giving too much of a bonus
+                 */
+
+                if (newFoodLevel > currentFoodLevel) {
+                    Material food = player.getItemInHand().getType();
+                    int herbLevel = PP.getSkillLevel(SkillType.HERBALISM);
+                    int foodChange = newFoodLevel - currentFoodLevel;
+                    int rankChange = 0;
+
+                    switch (food) {
+                    case BREAD:
+                        /* BREAD RESTORES 2 1/2 HUNGER - RESTORES 5 HUNGER @ 1000 */
+                        rankChange = 200;
+                        break;
+
+                    case COOKIE:
+                        /* COOKIE RESTORES 1/2 HUNGER - RESTORES 2 HUNGER @ 1000 */
+                        rankChange = 400;
+                        break;
+
+                    case MELON:
+                        /* MELON RESTORES  1 HUNGER - RESTORES 2 1/2 HUNGER @ 1000 */
+                        rankChange = 400;
+                        break;
+
+                    case MUSHROOM_SOUP:
+                        /* MUSHROOM SOUP RESTORES 4 HUNGER - RESTORES 6 1/2 HUNGER @ 1000 */
+                        rankChange = 200;
+                        break;
+
+                    default:
+                        return;
+                    }
+
+                    for (int i = 200; i <= 1000; i += rankChange) {
+                        if (herbLevel >= i) {
+                            foodChange++;
+                        }
+                    }
+
+                    /* Make sure we don't go over the max value */
+                    newFoodLevel = currentFoodLevel + foodChange;
+                    if (newFoodLevel > 20) {
+                        event.setFoodLevel(20);
+                    }
+                    else {
+                        event.setFoodLevel(newFoodLevel);
+                    }
+                }
+            }
+        }
+    }
+
+    /**
+     * Monitor EntityTame events.
+     *
+     * @param event The event to watch
+     */
+    @EventHandler (priority = EventPriority.MONITOR)
+    public void onEntityTame(EntityTameEvent event) {
+        Player player = (Player) event.getOwner();
+
+        if (mcPermissions.getInstance().taming(player) && !event.getEntity().hasMetadata("mcmmoSummoned")) {
+            PlayerProfile PP = Users.getProfile(player);
+            EntityType type = event.getEntityType();
+            int xp = 0;
+
+            switch (type) {
+            case WOLF:
+                xp = LoadProperties.mtameWolf;
+                break;
+
+            case OCELOT:
+                xp = LoadProperties.mtameOcelot;
+                break;
+
+            default:
+                break;
+            }
+
+            PP.addXP(SkillType.TAMING, xp, player);
+            Skills.XpCheckSkill(SkillType.TAMING, player);
+        }
     }
 }

src/main/java/com/gmail/nossr50/listeners/mcPlayerListener.java

@@ -1,39 +1,16 @@
-/*
-	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.listeners;
 
-import java.util.logging.Level;
-import java.util.logging.Logger;
-
 import org.bukkit.Bukkit;
 import org.bukkit.ChatColor;
-import org.bukkit.Location;
 import org.bukkit.Material;
-import org.bukkit.World;
 import org.bukkit.block.Block;
-import org.bukkit.entity.CreatureType;
-import org.bukkit.entity.Entity;
-import org.bukkit.entity.LivingEntity;
+import org.bukkit.entity.EntityType;
 import org.bukkit.entity.Player;
-import org.bukkit.entity.Wolf;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.EventPriority;
 import org.bukkit.event.Listener;
 import org.bukkit.event.block.Action;
+import org.bukkit.event.player.PlayerChangedWorldEvent;
 import org.bukkit.event.player.PlayerChatEvent;
 import org.bukkit.event.player.PlayerCommandPreprocessEvent;
 import org.bukkit.event.player.PlayerFishEvent;
@@ -43,320 +20,347 @@ import org.bukkit.event.player.PlayerJoinEvent;
 import org.bukkit.event.player.PlayerLoginEvent;
 import org.bukkit.event.player.PlayerPickupItemEvent;
 import org.bukkit.event.player.PlayerQuitEvent;
-import org.bukkit.event.player.PlayerRespawnEvent;
 import org.bukkit.inventory.ItemStack;
 
+import com.gmail.nossr50.BlockChecks;
 import com.gmail.nossr50.Combat;
 import com.gmail.nossr50.Item;
+import com.gmail.nossr50.ItemChecks;
 import com.gmail.nossr50.Users;
-import com.gmail.nossr50.m;
 import com.gmail.nossr50.mcMMO;
 import com.gmail.nossr50.mcPermissions;
 import com.gmail.nossr50.commands.general.XprateCommand;
 import com.gmail.nossr50.config.LoadProperties;
+import com.gmail.nossr50.runnables.RemoveProfileFromMemoryTask;
 import com.gmail.nossr50.spout.SpoutStuff;
-import com.gmail.nossr50.spout.mmoHelper;
 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.BlastMining;
 import com.gmail.nossr50.skills.Fishing;
 import com.gmail.nossr50.skills.Herbalism;
 import com.gmail.nossr50.skills.Repair;
 import com.gmail.nossr50.skills.Skills;
+import com.gmail.nossr50.skills.Taming;
 
+public class mcPlayerListener implements Listener {
+    private mcMMO plugin;
 
-public class mcPlayerListener implements Listener 
-{
-	protected static final Logger log = Logger.getLogger("Minecraft"); //$NON-NLS-1$
-	public Location spawn = null;
-	private mcMMO plugin;
+    public mcPlayerListener(mcMMO instance) {
+        plugin = instance;
+    }
 
-	public mcPlayerListener(mcMMO instance) 
-	{
-		plugin = instance;
-	}
+    /**
+     * Monitor PlayerChangedWorld events.
+     *
+     * @param event The event to watch
+     */
+    @EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true)
+    public void onPlayerWorldChangeEvent(PlayerChangedWorldEvent event) {
+        Player player = event.getPlayer();
+        PlayerProfile PP = Users.getProfile(player);
 
-	@EventHandler
-	public void onPlayerFish(PlayerFishEvent event) 
-	{
-		if(mcPermissions.getInstance().fishing(event.getPlayer()))
-		{
-			if(event.getState() == State.CAUGHT_FISH)
-			{
-				if(event.getCaught() instanceof Item)
-				{
-					Fishing.processResults(event);
-				}
-			} else if (event.getState() == State.CAUGHT_ENTITY)
-			{
-				if(Users.getProfile(event.getPlayer()).getSkillLevel(SkillType.FISHING) >= 150 && event.getCaught() instanceof LivingEntity)
-				{
-					Fishing.shakeMob(event);
-				}
-			}
-		}
-	}
+        if (PP.getGodMode()) {
+            if (!mcPermissions.getInstance().mcgod(player)) {
+                PP.toggleGodMode();
+                player.sendMessage(mcLocale.getString("GodMode.Forbidden"));
+            }
+        }
 
-	@EventHandler
-	public void onPlayerPickupItem(PlayerPickupItemEvent event) 
-	{
-		if(Users.getProfile(event.getPlayer()).getBerserkMode())
-		{
-			 event.setCancelled(true);
-		}
-	}
+        if (PP.inParty()) {
+            if (!mcPermissions.getInstance().party(player)) {
+                PP.removeParty();
+                player.sendMessage(mcLocale.getString("Party.Forbidden"));
+            }
+        }
+    }
 
-	@EventHandler
-	public void onPlayerRespawn(PlayerRespawnEvent event) 
-	{
-		
-		Player player = event.getPlayer();
-		PlayerProfile PP = Users.getProfile(player);
-		if(LoadProperties.enableMySpawn && mcPermissions.getInstance().mySpawn(player))
-		{
-			if(player != null && PP != null)
-			{
-				PP.setRespawnATS(System.currentTimeMillis());
-				
-				Location mySpawn = PP.getMySpawn(player);
-				
-				if(mySpawn != null)
-				{
-					{
-						event.setRespawnLocation(mySpawn);
-					}
-				}
-			}
-		}
-	}
-	
-	@EventHandler
-	public void onPlayerLogin(PlayerLoginEvent event) 
-	{
-		Users.addUser(event.getPlayer());
-	}
+    /**
+     * Monitor PlayerFish events.
+     *
+     * @param event The event to watch
+     */
+    @EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true)
+    public void onPlayerFish(PlayerFishEvent event) {
+        Player player = event.getPlayer();
 
-	@EventHandler
-	public void onPlayerQuit(PlayerQuitEvent event) 
-	{
-		
-		/*
-		 * GARBAGE COLLECTION
-		 */
-		//Discard the PlayerProfile object
-		Player player = event.getPlayer();
-		
-		if(LoadProperties.spoutEnabled)
-		{
-			if(SpoutStuff.playerHUDs.containsKey(player))
-				SpoutStuff.playerHUDs.remove(player);
-			if(mmoHelper.containers.containsKey(player))
-				mmoHelper.containers.remove(player);
-		}
-		
-		//Bleed it out
-		if(Users.getProfile(player).getBleedTicks() > 0) Combat.dealDamage(player, Users.getProfile(player).getBleedTicks()*2);
-		
-		//Save PlayerData to MySQL/FlatFile on player quit
-		Users.getProfile(player).save();
-		
-		//Remove PlayerProfile
-		Users.removeUser(event.getPlayer());
-	}
+        if (mcPermissions.getInstance().fishing(player)) {
+            State state = event.getState();
 
-	@EventHandler
-	public void onPlayerJoin(PlayerJoinEvent event) 
-	{
-		Player player = event.getPlayer();
-		if(mcPermissions.getInstance().motd(player) && LoadProperties.enableMotd)
-		{
-			player.sendMessage(mcLocale.getString("mcPlayerListener.MOTD", new Object[] {plugin.getDescription().getVersion(), "mcmmo"}));
-			player.sendMessage(mcLocale.getString("mcPlayerListener.WIKI"));
-		}
-		//THIS IS VERY BAD WAY TO DO THINGS, NEED BETTER WAY
-		if(XprateCommand.xpevent)
-			player.sendMessage(ChatColor.GOLD+"mcMMO is currently in an XP rate event! XP rate is "+LoadProperties.xpGainMultiplier+"x!");
-	}
+            switch (state) {
+            case CAUGHT_FISH:
+                Fishing.processResults(event);
+                break;
 
-	@EventHandler(priority = EventPriority.MONITOR)
-	public void onPlayerInteract(PlayerInteractEvent event) 
-	{
-		Player player = event.getPlayer();
-		PlayerProfile PP = Users.getProfile(player);
-		Action action = event.getAction();
-		Block block = event.getClickedBlock();
+            case CAUGHT_ENTITY:
+                if (Users.getProfile(player).getSkillLevel(SkillType.FISHING) >= 150 && mcPermissions.getInstance().shakeMob(player)) {
+                    Fishing.shakeMob(event);
+                }
+                break;
 
-		/*
-		 * Ability checks
-		 */
-		if(action == Action.RIGHT_CLICK_BLOCK)
-		{
-			ItemStack is = player.getItemInHand();
-			if(LoadProperties.enableMySpawn && block != null && player != null)
-			{
-				if(block.getTypeId() == 26 && mcPermissions.getInstance().setMySpawn(player))
-				{
-					Location loc = player.getLocation();
-					if(mcPermissions.getInstance().setMySpawn(player)){
-						PP.setMySpawn(loc.getX(), loc.getY(), loc.getZ(), loc.getWorld().getName());
-					}
-					//player.sendMessage(mcLocale.getString("mcPlayerListener.MyspawnSet"));
-				}
-			}
+            default:
+                break;
+            }
+        }
+    }
 
-			if(block != null && player != null && mcPermissions.getInstance().repair(player) 
-					&& event.getClickedBlock().getTypeId() == LoadProperties.anvilID && (Repair.isTools(player.getItemInHand()) || Repair.isArmor(player.getItemInHand())))
-			{
-				Repair.repairCheck(player, is, event.getClickedBlock());
-				event.setCancelled(true);
-				player.updateInventory();
-			}
+    /**
+     * Monitor PlaterPickupItem events.
+     *
+     * @param event The event to watch
+     */
+    @EventHandler(ignoreCancelled = true)
+    public void onPlayerPickupItem(PlayerPickupItemEvent event) {
+        if (Users.getProfile(event.getPlayer()).getBerserkMode()) {
+             event.setCancelled(true);
+        }
+    }
 
-			if(LoadProperties.enableAbilities && m.abilityBlockCheck(block))
-			{
-				if(block != null && m.isHoe(player.getItemInHand()) && block.getTypeId() != 3 && block.getTypeId() != 2 && block.getTypeId() != 60){
-					Skills.hoeReadinessCheck(player);
-				}
-				Skills.abilityActivationCheck(player);
-			}
+    /**
+     * Monitor PlayerLogin events.
+     *
+     * @param event The event to watch
+     */
+    @EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true)
+    public void onPlayerLogin(PlayerLoginEvent event) {
+        Users.addUser(event.getPlayer());
+    }
 
-			//GREEN THUMB
-			if(block != null && mcPermissions.getInstance().herbalism(player) && (block.getType() == Material.COBBLESTONE || block.getType() == Material.DIRT || block.getType() == Material.SMOOTH_BRICK) && player.getItemInHand().getType() == Material.SEEDS)
-			{
-				boolean pass = false;
-				if(Herbalism.hasSeeds(player))
-				{
-					Herbalism.removeSeeds(player);
-					
-					if(block.getType() == Material.DIRT || block.getType() == Material.COBBLESTONE || block.getType() == Material.SMOOTH_BRICK)
-					{
-						if(Math.random() * 1500 <= PP.getSkillLevel(SkillType.HERBALISM) && m.blockBreakSimulate(block, player))
-						{
-							switch(block.getType())
-							{
-							case COBBLESTONE:
-								if(LoadProperties.enableCobbleToMossy) {
-									block.setType(Material.MOSSY_COBBLESTONE);
-									pass = true;
-								}
-								break;
-							case DIRT:
-								if(LoadProperties.enableDirtToGrass) {
-									pass = true;
-									block.setType(Material.GRASS);
-								}
-								break;
-							case SMOOTH_BRICK:
-								if(LoadProperties.enableSmoothToMossy) {
-									pass = true;
-									block.setData((byte)1);
-								}
-								break;
-							}
-							if(pass == false)
-								player.sendMessage(mcLocale.getString("mcPlayerListener.GreenThumbFail"));
-						}
-					}
-				}
-				return;
-			}
-		}
-		if(LoadProperties.enableAbilities && action == Action.RIGHT_CLICK_AIR)
-		{
-			Skills.hoeReadinessCheck(player);
-			Skills.abilityActivationCheck(player);
-		}
-		
-		/*
-		 * ITEM CHECKS
-		 */
-		if(action == Action.RIGHT_CLICK_AIR)
-			Item.itemchecks(player, plugin);
-		if(action == Action.RIGHT_CLICK_BLOCK)
-		{
-			if(m.abilityBlockCheck(event.getClickedBlock()))
-				Item.itemchecks(player, plugin);
-		}
-		
-		if(player.isSneaking() && mcPermissions.getInstance().taming(player) && (action == Action.RIGHT_CLICK_AIR || action == Action.RIGHT_CLICK_BLOCK))
-		{
-			if(player.getItemInHand().getType() == Material.BONE && player.getItemInHand().getAmount() > 9)
-			{
-				for(Entity x : player.getNearbyEntities(40, 40, 40))
-				{
-					if(x instanceof Wolf)
-					{
-						player.sendMessage(mcLocale.getString("m.TamingSummonFailed"));
-						return;
-					}
-				}
-				World world = player.getWorld();
-				world.spawnCreature(player.getLocation(), CreatureType.WOLF);
-				
-				ItemStack[] inventory = player.getInventory().getContents();
-    	    	for(ItemStack x : inventory){
-    	    		if(x != null && x.getAmount() > LoadProperties.bonesConsumedByCOTW-1 && x.getType() == Material.BONE){
-    	    			if(x.getAmount() >= LoadProperties.bonesConsumedByCOTW)
-    	    			{
-    	    				x.setAmount(x.getAmount() - LoadProperties.bonesConsumedByCOTW);
-    	    				player.getInventory().setContents(inventory);
-        	    			player.updateInventory();
-        	    			break;
-    	    			} else {
-    	    				x.setAmount(0);
-    	    				x.setTypeId(0);
-    	    				player.getInventory().setContents(inventory);
-        	    			player.updateInventory();
-        	    			break;
-    	    			}
-    	    		}
-    	    	}
-    	    	player.sendMessage(mcLocale.getString("m.TamingSummon"));
-			}
-		}
-	}
+    /**
+     * Monitor PlayerQuit events.
+     *
+     * @param event The event to watch
+     */
+    @EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true)
+    public void onPlayerQuit(PlayerQuitEvent event) {
+        Player player = event.getPlayer();
+        PlayerProfile PP = Users.getProfile(player);
 
-	@EventHandler(priority = EventPriority.LOW)
-	public void onPlayerChat(PlayerChatEvent event) 
-	{
-		Player player = event.getPlayer();
-		PlayerProfile PP = Users.getProfile(player);
-		if(PP.getPartyChatMode())
-		{
-			event.setCancelled(true);
-			String name = (LoadProperties.pDisplayNames) ? player.getDisplayName() : player.getName();
-			String format = ChatColor.GREEN + "(" + ChatColor.WHITE + name + ChatColor.GREEN + ") "+event.getMessage();
-			for(Player x : Bukkit.getServer().getOnlinePlayers())
-			{
-				if(Party.getInstance().inSameParty(player, x))
-					x.sendMessage(format);
-			}
-			log.log(Level.INFO, "[P]"+format);
-		} else if (PP.getAdminChatMode()) {
-			event.setCancelled(true);
-			String name = (LoadProperties.aDisplayNames) ? player.getDisplayName() : player.getName();
-			String format = ChatColor.AQUA + "{" + ChatColor.WHITE + name + ChatColor.AQUA + "} "+event.getMessage();
-			for(Player x : Bukkit.getServer().getOnlinePlayers())
-			{
-				if(x.isOp() || mcPermissions.getInstance().adminChat(x))
-					x.sendMessage(format);
-			}
-			log.log(Level.INFO, "[A]"+format);
-		}
-	}
+        /* GARBAGE COLLECTION */
 
-	// Dynamically aliasing commands need to be re-done.
-	// For now, using a command with an alias will send both the original command, and the mcMMO command
-	@EventHandler(priority = EventPriority.LOWEST)
-	public void onPlayerCommandPreprocess(PlayerCommandPreprocessEvent event) {
-		String message = event.getMessage();
-		if(!message.startsWith("/")) return;
-		String command = message.substring(1).split(" ")[0];
-		if(plugin.aliasMap.containsKey(command)) {
-			if(command.equalsIgnoreCase(plugin.aliasMap.get(command))) return;
-			//event.setCancelled(true);
-			event.getPlayer().chat(message.replaceFirst(command, plugin.aliasMap.get(command)));
-		}
-	}
-}
+        //Remove Spout Stuff
+        if(LoadProperties.spoutEnabled && SpoutStuff.playerHUDs.containsKey(player)) {
+            SpoutStuff.playerHUDs.remove(player);
+        }
+
+        //Bleed it out
+        if(PP.getBleedTicks() > 0) {
+            Combat.dealDamage(player, PP.getBleedTicks()*2);
+        }
+
+        //Schedule PlayerProfile removal 2 minutes after quitting
+        Bukkit.getScheduler().scheduleSyncDelayedTask(plugin, new RemoveProfileFromMemoryTask(player), 2400);
+    }
+
+    /**
+     * Monitor PlayerJoin events.
+     *
+     * @param event The event to watch
+     */
+    @EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true)
+    public void onPlayerJoin(PlayerJoinEvent event) {
+        Player player = event.getPlayer();
+
+        if (mcPermissions.getInstance().motd(player) && LoadProperties.enableMotd) {
+            player.sendMessage(mcLocale.getString("mcPlayerListener.MOTD", new Object[] {plugin.getDescription().getVersion(), "mcmmo"}));
+            player.sendMessage(mcLocale.getString("mcPlayerListener.WIKI"));
+        }
+
+        //THIS IS VERY BAD WAY TO DO THINGS, NEED BETTER WAY
+        if (XprateCommand.xpevent) {
+            player.sendMessage(mcLocale.getString("XPRate.Event", new Object[] {LoadProperties.xpGainMultiplier}));
+        }
+    }
+
+    /**
+     * Monitor PlayerInteract events.
+     *
+     * @param event The event to watch
+     */
+    @EventHandler(priority = EventPriority.LOW)
+    public void onPlayerInteract(PlayerInteractEvent event) {
+        Player player = event.getPlayer();
+
+        Action action = event.getAction();
+        Block block = event.getClickedBlock();
+        ItemStack is = player.getItemInHand();
+        Material mat;
+
+        /* Fix for NPE on interacting with air */
+        if (block == null) {
+            mat = Material.AIR;
+        }
+        else {
+            mat = block.getType();
+        }
+
+        switch (action) {
+        case RIGHT_CLICK_BLOCK:
+
+            /* REPAIR CHECKS */
+            if (mcPermissions.getInstance().repair(player) && block.getTypeId() == LoadProperties.anvilID && (ItemChecks.isTool(is) || ItemChecks.isArmor(is))) {
+                Repair.repairCheck(player, is);
+                event.setCancelled(true);
+                player.updateInventory();
+            }
+
+            /* ACTIVATION CHECKS */
+            if (LoadProperties.enableAbilities && BlockChecks.abilityBlockCheck(mat)) {
+                if (!mat.equals(Material.DIRT) && !mat.equals(Material.GRASS) && !mat.equals(Material.SOIL)) {
+                    Skills.activationCheck(player, SkillType.HERBALISM);
+                }
+
+                Skills.activationCheck(player, SkillType.AXES);
+                Skills.activationCheck(player, SkillType.EXCAVATION);
+                Skills.activationCheck(player, SkillType.MINING);
+                Skills.activationCheck(player, SkillType.SWORDS);
+                Skills.activationCheck(player, SkillType.UNARMED);
+                Skills.activationCheck(player, SkillType.WOODCUTTING);
+            }
+
+            /* GREEN THUMB CHECK */
+            if (mcPermissions.getInstance().greenThumbBlocks(player) && Herbalism.makeMossy(mat) && is.getType().equals(Material.SEEDS)) {
+                Herbalism.greenThumbBlocks(is, player, block);
+            }
+
+            /* ITEM CHECKS */
+            if (BlockChecks.abilityBlockCheck(mat)) {
+                Item.itemchecks(player);
+            }
+
+            /* BLAST MINING CHECK */
+            if (mcPermissions.getInstance().blastMining(player) && is.getTypeId() == LoadProperties.detonatorID) {
+                BlastMining.remoteDetonation(player, plugin);
+            }
+
+            break;
+
+        case RIGHT_CLICK_AIR:
+
+            /* ACTIVATION CHECKS */
+            if (LoadProperties.enableAbilities) {
+                Skills.activationCheck(player, SkillType.AXES);
+                Skills.activationCheck(player, SkillType.EXCAVATION);
+                Skills.activationCheck(player, SkillType.HERBALISM);
+                Skills.activationCheck(player, SkillType.MINING);
+                Skills.activationCheck(player, SkillType.SWORDS);
+                Skills.activationCheck(player, SkillType.UNARMED);
+                Skills.activationCheck(player, SkillType.WOODCUTTING);
+            }
+
+            /* ITEM CHECKS */
+            Item.itemchecks(player);
+
+            /* BLAST MINING CHECK */
+            if (mcPermissions.getInstance().blastMining(player) && is.getTypeId() == LoadProperties.detonatorID) {
+                BlastMining.remoteDetonation(player, plugin);
+            }
+
+            break;
+
+        case LEFT_CLICK_AIR:
+        case LEFT_CLICK_BLOCK:
+
+            /* CALL OF THE WILD CHECKS */
+            if (player.isSneaking() && mcPermissions.getInstance().taming(player)) {
+                if (is.getType().equals(Material.RAW_FISH)) {
+                    Taming.animalSummon(EntityType.OCELOT, player, plugin);
+                }
+                else if (is.getType().equals(Material.BONE)) {
+                    Taming.animalSummon(EntityType.WOLF, player, plugin);
+                }
+            }
+
+            break;
+
+        default:
+            break;
+        }
+    }
+
+    /**
+     * Monitor PlayerChat events.
+     *
+     * @param event The event to watch
+     */
+    @EventHandler(priority = EventPriority.LOW, ignoreCancelled = true)
+    public void onPlayerChat(PlayerChatEvent event) {
+        Player player = event.getPlayer();
+        PlayerProfile PP = Users.getProfile(player);
+        boolean partyChat = PP.getPartyChatMode();
+        boolean adminChat = PP.getAdminChatMode();
+
+        if (partyChat || adminChat) {
+            event.setCancelled(true);
+
+            String name = "";
+            boolean displayNames = false;
+            ChatColor color = ChatColor.WHITE;
+            String logHeader = "";
+
+            /* Set the pChat & aChat specific stuff */
+            if (partyChat) {
+                if (!PP.inParty()) {
+                    player.sendMessage("You're not in a party, type /p to leave party chat mode."); //TODO: Use mcLocale
+                    return;
+                }
+
+                displayNames = LoadProperties.pDisplayNames;
+                color = ChatColor.GREEN;
+                logHeader = "[P](" + PP.getParty() + ")<";
+            }
+            else if (adminChat) {
+                displayNames = LoadProperties.aDisplayNames;
+                color = ChatColor.AQUA;
+                logHeader = "[A]<";
+            }
+
+            /* Format & display */
+            if (displayNames) {
+                name = player.getDisplayName();
+            }
+            else {
+                name = player.getName();
+            }
+
+            String format = color + "(" + ChatColor.WHITE + name + color + ") " + event.getMessage();
+
+            for (Player x : Bukkit.getServer().getOnlinePlayers()) {
+                if (partyChat && Party.getInstance().inSameParty(player, x))
+                    x.sendMessage(format);
+                else if (adminChat && (x.isOp() || mcPermissions.getInstance().adminChat(x))) {
+                    x.sendMessage(format);
+                }
+            }
+
+            Bukkit.getLogger().info(logHeader + name + ">" + event.getMessage());
+        }
+    }
+
+    // Dynamically aliasing commands need to be re-done.
+    // For now, using a command with an alias will send both the original command, and the mcMMO command
+
+    /**
+     * Monitor PlayerCommandPreprocess events.
+     *
+     * @param event The event to watch
+     */
+    @EventHandler(priority = EventPriority.LOWEST)
+    public void onPlayerCommandPreprocess(PlayerCommandPreprocessEvent event) {
+        String message = event.getMessage();
+        
+        if (!message.startsWith("/")) {
+            return;
+        }
+
+        String command = message.substring(1).split(" ")[0];
+
+        if (plugin.aliasMap.containsKey(command)) {
+            if(command.equalsIgnoreCase(plugin.aliasMap.get(command))) {
+                return;
+            }
+            event.getPlayer().chat(message.replaceFirst(command, plugin.aliasMap.get(command)));
+        }
+    }
+}

src/main/java/com/gmail/nossr50/listeners/mcSelfListener.java

@@ -1,19 +1,3 @@
-/*
-	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.listeners;
 
 import org.bukkit.event.EventHandler;
@@ -25,16 +9,24 @@ import com.gmail.nossr50.events.McMMOPlayerXpGainEvent;
  * Listener for listening to our own events, only really useful for catching errors
  */
 public class mcSelfListener implements Listener {
-	@EventHandler
-	public void onPlayerXpGain(McMMOPlayerXpGainEvent event) {
-		int xp = event.getXpGained();
-		if(xp < 0) {
-			try {
-				throw new Exception("Gained negative XP!");
-			} catch (Exception e) {
-				System.out.println(e.getMessage());
-				e.printStackTrace();
-			}
-		}
-	}
+
+    /**
+     * Monitor internal XP gain events.
+     *
+     * @param event The event to watch
+     */
+    @EventHandler
+    public void onPlayerXpGain(McMMOPlayerXpGainEvent event) {
+        int xp = event.getXpGained();
+
+        if(xp < 0) {
+            try {
+                throw new Exception("Gained negative XP!");
+            }
+            catch (Exception e) {
+                System.out.println(e.getMessage());
+                e.printStackTrace();
+            }
+        }
+    }
 }

src/main/java/com/gmail/nossr50/listeners/mcSpoutInputListener.java

@@ -1,19 +1,3 @@
-/*
-	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.listeners;
 
 import org.bukkit.event.EventHandler;
@@ -27,37 +11,38 @@ import com.gmail.nossr50.mcMMO;
 import com.gmail.nossr50.datatypes.popups.PopupMMO;
 import com.gmail.nossr50.spout.SpoutStuff;
 
-public class mcSpoutInputListener implements Listener
-{
-	mcMMO plugin = null;
-	
-	public mcSpoutInputListener(mcMMO pluginx)
-	{
-		plugin = pluginx;
-	}
-	
-	@EventHandler
-	public void onKeyPressedEvent(KeyPressedEvent event) 
-	{
-		if(!event.getPlayer().isSpoutCraftEnabled() || event.getPlayer().getMainScreen().getActivePopup() != null)
-			return;
-		if(event.getScreenType() != ScreenType.GAME_SCREEN)
-			return;
-		
-		SpoutPlayer sPlayer = event.getPlayer();
-		
-		if(event.getKey() == SpoutStuff.keypress)
-		{
-			if(!SpoutStuff.playerScreens.containsKey(sPlayer))
-			{
-				PopupMMO mmoPop = new PopupMMO(sPlayer, Users.getProfile(sPlayer), plugin);
-				SpoutStuff.playerScreens.put(sPlayer, mmoPop);
-				sPlayer.getMainScreen().attachPopupScreen(SpoutStuff.playerScreens.get(sPlayer));	
-				sPlayer.getMainScreen().setDirty(true);
-			} else {
-				sPlayer.getMainScreen().attachPopupScreen(SpoutStuff.playerScreens.get(sPlayer));	
-				sPlayer.getMainScreen().setDirty(true);
-			}
-		}
-	}
-}
+public class mcSpoutInputListener implements Listener {
+    private mcMMO plugin;
+
+    public mcSpoutInputListener(mcMMO plugin) {
+        this.plugin = plugin;
+    }
+
+    /**
+     * Monitor Spout KeyPressed events.
+     *
+     * @param event The event to watch
+     */
+    @EventHandler
+    public void onKeyPressedEvent(KeyPressedEvent event) {
+        SpoutPlayer sPlayer = event.getPlayer();
+
+        if (!sPlayer.isSpoutCraftEnabled() || sPlayer.getMainScreen().getActivePopup() != null || event.getScreenType() != ScreenType.GAME_SCREEN) {
+            return;
+        }
+
+        if (event.getKey() == SpoutStuff.keypress) {
+            if (!SpoutStuff.playerScreens.containsKey(sPlayer)) {
+                PopupMMO mmoPop = new PopupMMO(sPlayer, Users.getProfile(sPlayer), plugin);
+
+                SpoutStuff.playerScreens.put(sPlayer, mmoPop);
+                sPlayer.getMainScreen().attachPopupScreen(SpoutStuff.playerScreens.get(sPlayer));
+                sPlayer.getMainScreen().setDirty(true);
+            }
+            else {
+                sPlayer.getMainScreen().attachPopupScreen(SpoutStuff.playerScreens.get(sPlayer));
+                sPlayer.getMainScreen().setDirty(true);
+            }
+        }
+    }
+}

src/main/java/com/gmail/nossr50/listeners/mcSpoutListener.java

@@ -1,19 +1,3 @@
-/*
-	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.listeners;
 
 import org.bukkit.event.EventHandler;
@@ -22,30 +6,32 @@ import org.getspout.spoutapi.event.spout.SpoutCraftEnableEvent;
 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.datatypes.HUDmmo;
 import com.gmail.nossr50.spout.SpoutStuff;
 
-public class mcSpoutListener implements Listener
-{
-	mcMMO plugin = null;
-	
-	public mcSpoutListener(mcMMO pluginx)
-	{
-		plugin = pluginx;
-	}
-	
-	@EventHandler
-	public void onSpoutCraftEnable(SpoutCraftEnableEvent event) 
-	{
-		SpoutPlayer sPlayer = event.getPlayer();
-		if(sPlayer.isSpoutCraftEnabled())
-		{
-			//Setup Party HUD stuff
-			SpoutStuff.playerHUDs.put(sPlayer, new HUDmmo(sPlayer));
+public class mcSpoutListener implements Listener {
+    //Why do we have this here? We never use it...
+    mcMMO plugin = null;
+    
+    public mcSpoutListener(mcMMO pluginx) {
+        plugin = pluginx;
+    }
+    
+    /**
+     * Monitor SpoutCraftEnable events.
+     *
+     * @param event The event to watch
+     */
+    @EventHandler
+    public void onSpoutCraftEnable(SpoutCraftEnableEvent event) {
+        SpoutPlayer sPlayer = event.getPlayer();
 
-			//Party.update(sPlayer);
-			Users.getProfile(sPlayer).toggleSpoutEnabled();
-		}
-	}
+        if (sPlayer.isSpoutCraftEnabled()) {
+            SpoutStuff.playerHUDs.put(sPlayer, new HUDmmo(sPlayer)); //Setup Party HUD stuff
+            Users.getProfile(sPlayer).toggleSpoutEnabled();
+            sPlayer.setTitle(String.valueOf(m.getPowerLevel(sPlayer, Users.getProfile(sPlayer))));
+        }
+    }
 }

src/main/java/com/gmail/nossr50/listeners/mcSpoutScreenListener.java

@@ -1,19 +1,3 @@
-/*
-	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.listeners;
 
 import org.bukkit.event.EventHandler;
@@ -33,65 +17,75 @@ import com.gmail.nossr50.datatypes.buttons.ButtonPartyToggle;
 import com.gmail.nossr50.datatypes.popups.PopupMMO;
 import com.gmail.nossr50.spout.SpoutStuff;
 
-public class mcSpoutScreenListener implements Listener
-{
-	mcMMO plugin = null;
-	public mcSpoutScreenListener(mcMMO pluginx)
-	{
-		plugin = pluginx;
-	}
-	
-	@EventHandler
-	public void onButtonClick(ButtonClickEvent event) 
-	{
-		SpoutPlayer sPlayer = event.getPlayer();
-		PlayerProfile PP = Users.getProfile(sPlayer);
-		
-		if(event.getButton() instanceof ButtonHUDStyle)
-		{
-			if(SpoutStuff.playerHUDs.containsKey(sPlayer))
-			{
-				SpoutStuff.playerHUDs.get(sPlayer).resetHUD();
-				SpoutStuff.playerHUDs.remove(sPlayer);
-				
-				switch(PP.getHUDType())
-				{
-				case RETRO:
-					PP.setHUDType(HUDType.STANDARD);
-					break;
-				case STANDARD:
-					PP.setHUDType(HUDType.SMALL);
-					break;
-				case SMALL:
-					PP.setHUDType(HUDType.DISABLED);
-					break;
-				case DISABLED:
-					PP.setHUDType(HUDType.RETRO);
-				}
-				
-				SpoutStuff.playerHUDs.put(sPlayer, new HUDmmo(sPlayer));
-				
-				SpoutStuff.playerScreens.get(sPlayer).updateButtons(PP);
-			}
-		} else if (event.getButton() instanceof ButtonEscape)
-		{
-			sPlayer.getMainScreen().closePopup();
-		} else if (event.getButton() instanceof ButtonPartyToggle)
-		{
-			PP.togglePartyHUD();
-			ButtonPartyToggle bpt = (ButtonPartyToggle)event.getButton();
-			bpt.updateText(PP);
-			SpoutStuff.playerHUDs.get(sPlayer).resetHUD();
-			SpoutStuff.playerHUDs.get(sPlayer).initializeHUD(sPlayer);
-		}
-	}
-	
-	@EventHandler
-	public void onScreenClose(ScreenCloseEvent event) 
-	{
-		if(event.getScreen() instanceof PopupMMO)
-		{
-			SpoutStuff.playerScreens.remove(event.getPlayer());
-		}
-	}
-}
+public class mcSpoutScreenListener implements Listener {
+    //Why do we have this here? We never use it...
+    mcMMO plugin = null;
+
+    public mcSpoutScreenListener(mcMMO pluginx) {
+        plugin = pluginx;
+    }
+
+    /**
+     * Monitor Spout ButtonClick events.
+     *
+     * @param event The event to watch
+     */
+    @EventHandler
+    public void onButtonClick(ButtonClickEvent event) {
+        SpoutPlayer sPlayer = event.getPlayer();
+        PlayerProfile PP = Users.getProfile(sPlayer);
+        
+        if (event.getButton() instanceof ButtonHUDStyle) {
+            if (SpoutStuff.playerHUDs.containsKey(sPlayer)) {
+                SpoutStuff.playerHUDs.get(sPlayer).resetHUD();
+                SpoutStuff.playerHUDs.remove(sPlayer);
+                
+                switch (PP.getHUDType()) {
+                case RETRO:
+                    PP.setHUDType(HUDType.STANDARD);
+                    break;
+
+                case STANDARD:
+                    PP.setHUDType(HUDType.SMALL);
+                    break;
+
+                case SMALL:
+                    PP.setHUDType(HUDType.DISABLED);
+                    break;
+
+                case DISABLED:
+                    PP.setHUDType(HUDType.RETRO);
+                    break;
+
+                default:
+                    break;
+                }
+
+                SpoutStuff.playerHUDs.put(sPlayer, new HUDmmo(sPlayer));
+                SpoutStuff.playerScreens.get(sPlayer).updateButtons(PP);
+            }
+        }
+        else if (event.getButton() instanceof ButtonEscape) {
+            sPlayer.getMainScreen().closePopup();
+        }
+        else if (event.getButton() instanceof ButtonPartyToggle) {
+            PP.togglePartyHUD();
+            ButtonPartyToggle bpt = (ButtonPartyToggle) event.getButton();
+            bpt.updateText(PP);
+            SpoutStuff.playerHUDs.get(sPlayer).resetHUD();
+            SpoutStuff.playerHUDs.get(sPlayer).initializeHUD(sPlayer);
+        }
+    }
+
+    /**
+     * Monitor Spout ScreenClose events.
+     *
+     * @param event The event to watch
+     */
+    @EventHandler
+    public void onScreenClose(ScreenCloseEvent event) {
+        if (event.getScreen() instanceof PopupMMO) {
+            SpoutStuff.playerScreens.remove(event.getPlayer());
+        }
+    }
+}

src/main/java/com/gmail/nossr50/locale/mcLocale.java

@@ -1,19 +1,3 @@
-/*
-	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.locale;
 
 import java.text.MessageFormat;

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

@@ -1,528 +1,281 @@
-/*
-	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.FileReader;
-import java.util.logging.Level;
-import java.util.logging.Logger;
-
 import org.bukkit.Bukkit;
 import org.bukkit.Location;
 import org.bukkit.Material;
 import org.bukkit.block.Block;
-import org.bukkit.entity.*;
+import org.bukkit.entity.LivingEntity;
+import org.bukkit.entity.Player;
+import org.bukkit.event.entity.EntityDamageEvent;
+import org.bukkit.event.player.PlayerAnimationEvent;
 import org.bukkit.inventory.ItemStack;
-import com.gmail.nossr50.config.*;
+
 import com.gmail.nossr50.datatypes.PlayerProfile;
-import com.gmail.nossr50.datatypes.FakeBlockBreakEvent;
 import com.gmail.nossr50.datatypes.SkillType;
+import com.gmail.nossr50.events.FakeBlockBreakEvent;
 import com.gmail.nossr50.events.McMMOItemSpawnEvent;
 
-public class m 
-{
-	public static final Logger log = Logger.getLogger("Minecraft"); 
-	/*
-	 * I'm storing my misc functions/methods in here in an unorganized manner. Spheal with it.
-	 * This is probably the most embarrassing part of my code for mcMMO
-	 * I really should find an organized place for these things!
-	 */
-	
-	public static String getCapitalized(String target)
-	{
-		String firstLetter = target.substring(0,1);
-		String remainder   = target.substring(1);
-		String capitalized = firstLetter.toUpperCase() + remainder.toLowerCase();
-		
-		return capitalized;
-	}
-	public static int getInt(String string)
-	{
-		if(isInt(string))
-		{
-			return Integer.parseInt(string);
-		}
-		else
-		{
-			return 0;
-		}
-	}
-	
-	public static Double getDouble(String string)
-	{
-		if(isDouble(string))
-		{
-			return Double.parseDouble(string);
-		}
-		else
-		{
-			return (double) 0;
-		}
-	}
-	
-	public static boolean isDouble(String string)
-	{
-		try 
-		{
-			Double.parseDouble(string);
-		}
-		catch(NumberFormatException nFE) {
-			return false;
-		}
-		return true;
-	}
-	
-	public static boolean shouldBeWatched(Block block)
-	{
-		int id = block.getTypeId();
-		return shouldBeWatched(id);
-	}
-	public static boolean shouldBeWatched(int id) {
-		return id == 2 || id == 3 || id == 12 || id == 13 || id == 82 || //Excavation
-				id == 1 || id == 14 || id == 15 || id == 16 || id == 21 || id == 24 || id == 49 || id == 56 || id == 73 || id == 74 || id == 87 || id == 89 || id == 112 || id == 121 || id == 48 || id == 98 || //Mining
-				id == 17 || id == 37 || id == 38 || id == 39 || id == 40 || id == 81 || id == 83 || id == 86 || id == 91 || id == 103 || id == 106 || id == 111 || //Woodcutting & Herbalism
-				id == LoadProperties.anvilID; //Anvil
-	}
-	
-	public static int getPowerLevel(Player player)
-	{
-		PlayerProfile PP = Users.getProfile(player);
-		int x = 0;
-		if(mcPermissions.getInstance().taming(player))
-			x+=PP.getSkillLevel(SkillType.TAMING);
-		if(mcPermissions.getInstance().mining(player))
-			x+=PP.getSkillLevel(SkillType.MINING);
-		if(mcPermissions.getInstance().woodcutting(player))
-			x+=PP.getSkillLevel(SkillType.WOODCUTTING);
-		if(mcPermissions.getInstance().unarmed(player))
-			x+=PP.getSkillLevel(SkillType.UNARMED);
-		if(mcPermissions.getInstance().herbalism(player))
-			x+=PP.getSkillLevel(SkillType.HERBALISM);
-		if(mcPermissions.getInstance().excavation(player))
-			x+=PP.getSkillLevel(SkillType.EXCAVATION);
-		if(mcPermissions.getInstance().archery(player))
-			x+=PP.getSkillLevel(SkillType.ARCHERY);
-		if(mcPermissions.getInstance().swords(player))
-			x+=PP.getSkillLevel(SkillType.SWORDS);
-		if(mcPermissions.getInstance().axes(player))
-			x+=PP.getSkillLevel(SkillType.AXES);
-		if(mcPermissions.getInstance().acrobatics(player))
-			x+=PP.getSkillLevel(SkillType.ACROBATICS);
-		if(mcPermissions.getInstance().repair(player))
-			x+=PP.getSkillLevel(SkillType.REPAIR);
-		if(mcPermissions.getInstance().fishing(player))
-			x+=PP.getSkillLevel(SkillType.FISHING);
-		return x;
-	}
+public class m {
 
-	public static boolean blockBreakSimulate(Block block, Player player)
-	{
-		FakeBlockBreakEvent event = new FakeBlockBreakEvent(block, player);
-		if(block != null && player != null){
-			Bukkit.getServer().getPluginManager().callEvent(event);
-			if(!event.isCancelled())
-			{
-				return true; //Return true if not cancelled
-			} else {
-				return false; //Return false if cancelled
-			}
-		} else {
-			return false; //Return false if something went wrong
-		}
-	}
+    /**
+     * Gets a capitalized version of the target string.
+     *
+     * @param target String to capitalize
+     * @return the capitalized string
+     */
+    public static String getCapitalized(String target) {
+        String firstLetter = target.substring(0,1);
+        String remainder = target.substring(1);
+        String capitalized = firstLetter.toUpperCase() + remainder.toLowerCase();
 
-	public static void damageTool(Player player, short damage)
-	{
-		if(player.getItemInHand().getTypeId() == 0)
-			return;
-		player.getItemInHand().setDurability((short) (player.getItemInHand().getDurability() + damage));
-		if(player.getItemInHand().getDurability() >= getMaxDurability(getTier(player), player.getItemInHand()))
-		{
-			ItemStack[] inventory = player.getInventory().getContents();
-			for(ItemStack x : inventory)
-			{
-				if(x != null && x.getTypeId() == player.getItemInHand().getTypeId() && x.getDurability() == player.getItemInHand().getDurability()){
-					x.setTypeId(0);
-					x.setAmount(0);
-					player.getInventory().setContents(inventory);
-					return;
-				}
-			}
-		}
-	}
-	public static Integer getTier(Player player)
-	{
-		int i = player.getItemInHand().getTypeId();
-		if(i == 268 || i == 269 || i == 270 || i == 271 || i == 290){
-			return 1; //WOOD
-		} else if (i == 272 || i == 273 || i == 274 || i == 275 || i == 291){
-			return 2; //STONE
-		} else if (i == 256 || i == 257 || i == 258 || i == 267 || i == 292){
-			return 3; //IRON
-		} else if (i == 283 || i == 284 || i == 285 || i == 286 || i == 294){
-			return 1; //GOLD
-		} else if (i == 276 || i == 277 || i == 278 || i == 279 || i == 293){
-			return 4; //DIAMOND
-		} else {
-			return 1; //UNRECOGNIZED
-		}
-	}
-	public static Integer getMaxDurability(Integer tier, ItemStack item)
-	{
-		int id = item.getTypeId();
-		if(tier == 1){
-			if((id == 283 || id == 284 || id == 285 || id == 286 || id == 294)){
-				return 33; //GOLD
-			} else {
-				return 60; //WOOD
-			}
-		} else if (tier == 2){
-			return 132;
-		} else if (tier == 3){
-			return 251;
-		} else if (tier == 4){
-			return 1562;
-		} else {
-			return 0;
-		}
-	}
+        return capitalized;
+    }
 
-	public static double getDistance(Location loca, Location locb)
-	{
-		return Math.sqrt(Math.pow(loca.getX() - locb.getX(), 2) + Math.pow(loca.getY() - locb.getY(), 2)
-				+ Math.pow(loca.getZ() - locb.getZ(), 2));
-	}
+    /**
+     * Gets a nicely formatted string version of an item name from a given item ID.
+     *
+     * @param itemID The ID of the item to convert to string.
+     * @return the nicely formatting string
+     */
+    public static String prettyItemString(int itemID) {
+        String baseString = Material.getMaterial(itemID).toString();
+        String[] substrings = baseString.split("_");
+        String prettyString = "";
+        int size = 1;
 
-	public static boolean abilityBlockCheck(Block block)
-	{
-		int i = block.getTypeId();
-		if(i == 107 ||i == 117 || i == 116 || i == 96 || i == 68 || i == 355 || i == 26 || i == 323 || i == 25 || i == 54 || i == 69 || i == 92 || i == 77 || i == 58 || i == 61 || i == 62 || i == LoadProperties.anvilID || i == 71 || i == 64 || i == 84 || i == 324 || i == 330){
-			return false;
-		} else {
-			return true;
-		}
-	}
+        for (String s : substrings) {
+            prettyString = prettyString.concat(m.getCapitalized(s));
 
-	public static boolean isBlockAround(Location loc, Integer radius, Integer typeid)
-	{
-		Block blockx = loc.getBlock();
-		int ox = blockx.getX();
-		int oy = blockx.getY();
-		int oz = blockx.getZ();
-		for (int cx = -radius; cx <= radius; cx++) {
-			for (int cy = -radius; cy <= radius; cy++) {
-				for (int cz = -radius; cz <= radius; cz++) {
-					Block block = loc.getWorld().getBlockAt(ox + cx, oy + cy, oz + cz);
-					if (block.getTypeId() == typeid) {
-						return true;
-					}
-				}
-			}
-		}
-		return false;
-	}
+            if (size < substrings.length) {
+                prettyString = prettyString.concat(" ");
+            }
 
-	public static Integer calculateHealth(Integer health, Integer newvalue){
-		if((health + newvalue) > 20){
-			return 20;
-		} else {
-			return health+newvalue;
-		}
-	}
-	public Integer calculateMinusHealth(Integer health, Integer newvalue){
-		if((health - newvalue) < 1){
-			return 0;
-		} else {
-			return health-newvalue;
-		}
-	}
-	public static boolean isInt(String string)
-	{
-		try 
-		{
-			Integer.parseInt(string);
-		}
-		catch(NumberFormatException nFE) 
-		{
-			return false;
-		}
-		return true;
-	}
-	public static void mcDropItem(Location location, int id)
-	{
-		if(location == null) return;
-		
-		Material mat = Material.getMaterial(id);
-		ItemStack item = new ItemStack(mat, 1, (byte) 0, (byte) 0);
-		mcDropItem(location, item);
-	}
-	public static void mcDropItem(Location location, ItemStack itemStack) {
-		// We can't get the item until we spawn it and we want to make it cancellable, so we have a custom event.
-		McMMOItemSpawnEvent event = new McMMOItemSpawnEvent(location, itemStack);
-		Bukkit.getPluginManager().callEvent(event);
-		if(event.isCancelled()) return;
-		
-		location.getWorld().dropItemNaturally(location, itemStack);
-	}
+            size++;
+        }
 
-	public static boolean isSwords(ItemStack is)
-	{
-		int id = is.getTypeId();
-		return id == 268 || id == 267 || id == 272 || id == 283 || id == 276;
-	}
-	
-	public static boolean isHoe(ItemStack is)
-	{
-		int id = is.getTypeId();
-		return id == 290 || id == 291 || id == 292 || id == 293 || id == 294;
-	}
-	
-	public static boolean isShovel(ItemStack is)
-	{	
-		int id = is.getTypeId();
-		return id == 269 || id == 273 || id == 277 || id == 284 || id == 256;
-	}
-	
-	public static boolean isAxes(ItemStack is)
-	{	
-		int id = is.getTypeId();
-		return id == 271 || id == 258 || id == 286 || id == 279 || id == 275;
-	}
-	
-	public static boolean isMiningPick(ItemStack is)
-	{
-		int id = is.getTypeId();
-		return id == 270 || id == 274 || id == 285 || id == 257 || id == 278;
-	}
-//	public boolean isGold(ItemStack is)
-//	{
-//		int id = is.getTypeId();
-//		return id == 283 || id == 284 || id == 285 || id == 286 || id == 294 || id == 314 || id == 315 || id == 316 || id == 317;
-//	}
-	public static void convertToMySQL()
-	{
-		if(!LoadProperties.useMySQL)
-			return;
-		
-		Bukkit.getScheduler().scheduleAsyncDelayedTask(Bukkit.getServer().getPluginManager().getPlugin("mcMMO"), new Runnable(){
-			public void run() {
-				String location = "plugins/mcMMO/FlatFileStuff/mcmmo.users";
-				try {
-					//Open the user file
-					FileReader file = new FileReader(location);
-					BufferedReader in = new BufferedReader(file);
-					String line = "";
-					String playerName = null, mining = null, party = null, miningXP = null, woodcutting = null, woodCuttingXP = null, repair = null, unarmed = null, herbalism = null, excavation = null, archery = null, swords = null, axes = null, acrobatics = null, repairXP = null, unarmedXP = null, herbalismXP = null, excavationXP = null, archeryXP = null, swordsXP = null, axesXP = null, acrobaticsXP = null, taming = null, tamingXP = null, fishing = null, fishingXP = null;
-					int id = 0, theCount = 0;
-					while ((line = in.readLine()) != null) {
-						//Find if the line contains the player we want.
-						String[] character = line.split(":");
-						playerName = character[0];
-						//Check for things we don't want put in the DB
-						if (playerName == null
-								|| playerName.equals("null")
-								|| playerName
-										.equals("#Storage place for user information"))
-							continue;
+        return prettyString;
+    }
 
-						//Get Mining
-						if (character.length > 1)
-							mining = character[1];
-						//Party
-						if (character.length > 3)
-							party = character[3];
-						//Mining XP
-						if (character.length > 4)
-							miningXP = character[4];
-						if (character.length > 5)
-							woodcutting = character[5];
-						if (character.length > 6)
-							woodCuttingXP = character[6];
-						if (character.length > 7)
-							repair = character[7];
-						if (character.length > 8)
-							unarmed = character[8];
-						if (character.length > 9)
-							herbalism = character[9];
-						if (character.length > 10)
-							excavation = character[10];
-						if (character.length > 11)
-							archery = character[11];
-						if (character.length > 12)
-							swords = character[12];
-						if (character.length > 13)
-							axes = character[13];
-						if (character.length > 14)
-							acrobatics = character[14];
-						if (character.length > 15)
-							repairXP = character[15];
-						if (character.length > 16)
-							unarmedXP = character[16];
-						if (character.length > 17)
-							herbalismXP = character[17];
-						if (character.length > 18)
-							excavationXP = character[18];
-						if (character.length > 19)
-							archeryXP = character[19];
-						if (character.length > 20)
-							swordsXP = character[20];
-						if (character.length > 21)
-							axesXP = character[21];
-						if (character.length > 22)
-							acrobaticsXP = character[22];
-						if (character.length > 24)
-							taming = character[24];
-						if (character.length > 25)
-							tamingXP = character[25];
-						if (character.length > 34)
-							fishing = character[34];
-						if (character.length > 35)
-							fishingXP = character[35];
+    /**
+     * Gets the int represented by this string.
+     *
+     * @param string The string to parse
+     * @return the int represented by this string
+     */
+    public static int getInt(String string) {
+        if (isInt(string)) {
+            return Integer.parseInt(string);
+        }
+        else {
+            return 0;
+        }
+    }
 
-						//Check to see if the user is in the DB
-						id = mcMMO.database.GetInt("SELECT id FROM "
-								+ LoadProperties.MySQLtablePrefix
-								+ "users WHERE user = '" + playerName + "'");
+    /**
+     * Checks to see if an entity is currently invincible.
+     *
+     * @param le The LivingEntity to check
+     * @param event The event the entity is involved in
+     * @return true if the entity is invincible, false otherwise
+     */
+    public static boolean isInvincible(LivingEntity le, EntityDamageEvent event) {
 
-						if (id > 0) {
-							theCount++;
-							//Update the skill values
-							mcMMO.database.Write("UPDATE "
-									+ LoadProperties.MySQLtablePrefix
-									+ "users SET lastlogin = " + 0
-									+ " WHERE id = " + id);
-							//if(getDouble(x) > 0 && getDouble(y) > 0 && getDouble(z) > 0)
-							//mcMMO.database.Write("UPDATE "+LoadProperties.MySQLtablePrefix+"spawn SET world = '" + myspawnworld + "', x = " +getDouble(x)+", y = "+getDouble(y)+", z = "+getDouble(z)+" WHERE user_id = "+id);
-							mcMMO.database.Write("UPDATE "
-									+ LoadProperties.MySQLtablePrefix
-									+ "skills SET " + "  taming = taming+"
-									+ getInt(taming) + ", mining = mining+"
-									+ getInt(mining) + ", repair = repair+"
-									+ getInt(repair)
-									+ ", woodcutting = woodcutting+"
-									+ getInt(woodcutting)
-									+ ", unarmed = unarmed+" + getInt(unarmed)
-									+ ", herbalism = herbalism+"
-									+ getInt(herbalism)
-									+ ", excavation = excavation+"
-									+ getInt(excavation)
-									+ ", archery = archery+" + getInt(archery)
-									+ ", swords = swords+" + getInt(swords)
-									+ ", axes = axes+" + getInt(axes)
-									+ ", acrobatics = acrobatics+"
-									+ getInt(acrobatics)
-									+ ", fishing = fishing+" + getInt(fishing)
-									+ " WHERE user_id = " + id);
-							mcMMO.database.Write("UPDATE "
-									+ LoadProperties.MySQLtablePrefix
-									+ "experience SET " + "  taming = "
-									+ getInt(tamingXP) + ", mining = "
-									+ getInt(miningXP) + ", repair = "
-									+ getInt(repairXP) + ", woodcutting = "
-									+ getInt(woodCuttingXP) + ", unarmed = "
-									+ getInt(unarmedXP) + ", herbalism = "
-									+ getInt(herbalismXP) + ", excavation = "
-									+ getInt(excavationXP) + ", archery = "
-									+ getInt(archeryXP) + ", swords = "
-									+ getInt(swordsXP) + ", axes = "
-									+ getInt(axesXP) + ", acrobatics = "
-									+ getInt(acrobaticsXP) + ", fishing = "
-									+ getInt(fishingXP) + " WHERE user_id = "
-									+ id);
-						} else {
-							theCount++;
-							//Create the user in the DB
-							mcMMO.database.Write("INSERT INTO "
-									+ LoadProperties.MySQLtablePrefix
-									+ "users (user, lastlogin) VALUES ('"
-									+ playerName + "',"
-									+ System.currentTimeMillis() / 1000 + ")");
-							id = mcMMO.database
-									.GetInt("SELECT id FROM "
-											+ LoadProperties.MySQLtablePrefix
-											+ "users WHERE user = '"
-											+ playerName + "'");
-							mcMMO.database.Write("INSERT INTO "
-									+ LoadProperties.MySQLtablePrefix
-									+ "spawn (user_id) VALUES (" + id + ")");
-							mcMMO.database.Write("INSERT INTO "
-									+ LoadProperties.MySQLtablePrefix
-									+ "skills (user_id) VALUES (" + id + ")");
-							mcMMO.database.Write("INSERT INTO "
-									+ LoadProperties.MySQLtablePrefix
-									+ "experience (user_id) VALUES (" + id
-									+ ")");
-							//Update the skill values
-							mcMMO.database.Write("UPDATE "
-									+ LoadProperties.MySQLtablePrefix
-									+ "users SET lastlogin = " + 0
-									+ " WHERE id = " + id);
-							mcMMO.database.Write("UPDATE "
-									+ LoadProperties.MySQLtablePrefix
-									+ "users SET party = '" + party
-									+ "' WHERE id = " + id);
-							/*
-							if(getDouble(x) > 0 && getDouble(y) > 0 && getDouble(z) > 0)
-								mcMMO.database.Write("UPDATE "+LoadProperties.MySQLtablePrefix+"spawn SET world = '" + myspawnworld + "', x = " +getDouble(x)+", y = "+getDouble(y)+", z = "+getDouble(z)+" WHERE user_id = "+id);
-							 */
-							mcMMO.database.Write("UPDATE "
-									+ LoadProperties.MySQLtablePrefix
-									+ "skills SET " + "  taming = "
-									+ getInt(taming) + ", mining = "
-									+ getInt(mining) + ", repair = "
-									+ getInt(repair) + ", woodcutting = "
-									+ getInt(woodcutting) + ", unarmed = "
-									+ getInt(unarmed) + ", herbalism = "
-									+ getInt(herbalism) + ", excavation = "
-									+ getInt(excavation) + ", archery = "
-									+ getInt(archery) + ", swords = "
-									+ getInt(swords) + ", axes = "
-									+ getInt(axes) + ", acrobatics = "
-									+ getInt(acrobatics) + ", fishing = "
-									+ getInt(fishing) + " WHERE user_id = "
-									+ id);
-							mcMMO.database.Write("UPDATE "
-									+ LoadProperties.MySQLtablePrefix
-									+ "experience SET " + "  taming = "
-									+ getInt(tamingXP) + ", mining = "
-									+ getInt(miningXP) + ", repair = "
-									+ getInt(repairXP) + ", woodcutting = "
-									+ getInt(woodCuttingXP) + ", unarmed = "
-									+ getInt(unarmedXP) + ", herbalism = "
-									+ getInt(herbalismXP) + ", excavation = "
-									+ getInt(excavationXP) + ", archery = "
-									+ getInt(archeryXP) + ", swords = "
-									+ getInt(swordsXP) + ", axes = "
-									+ getInt(axesXP) + ", acrobatics = "
-									+ getInt(acrobaticsXP) + ", fishing = "
-									+ getInt(fishingXP) + " WHERE user_id = "
-									+ id);
-						}
-					}
-					System.out
-							.println("[mcMMO] MySQL Updated from users file, "
-									+ theCount
-									+ " items added/updated to MySQL DB");
-					in.close();
-				} catch (Exception e) {
-					log.log(Level.SEVERE, "Exception while reading " + location
-							+ " (Are you sure you formatted it correctly?)", e);
-				}
-			}
-		}, 1);
-	}
+        /*
+         * So apparently if you do more damage to a LivingEntity than its last damage int you bypass the invincibility.
+         * So yeah, this is for that.
+         */
+        if (le.getNoDamageTicks() > le.getMaximumNoDamageTicks() / 2.0F && event.getDamage() <= le.getLastDamage()) {
+            return true;
+        }
+        else {
+            return false;
+        }
+    }
+
+    /**
+     * Gets the power level of a player.
+     *
+     * @param player The player to get the power level of
+     * @param PP The profile of the player
+     * @return the power level of the player
+     */
+    public static int getPowerLevel(Player player, PlayerProfile PP) {
+        int powerLevel = 0;
+
+        for (SkillType type : SkillType.values()) {
+            if (type.getPermissions(player)) {
+                powerLevel += PP.getSkillLevel(type);
+            }
+        }
+
+        return powerLevel;
+    }
+
+    /**
+     * Simulate a block break event.
+     *
+     * @param block The block to break
+     * @param player The player breaking the block
+     * @param shouldArmSwing true if an armswing event should be fired, false otherwise
+     * @return true if the event wasn't cancelled, false otherwise
+     */
+    public static boolean blockBreakSimulate(Block block, Player player, Boolean shouldArmSwing) {
+
+        //Support for NoCheat
+        if (shouldArmSwing) {
+            PlayerAnimationEvent armswing = new PlayerAnimationEvent(player);
+            Bukkit.getPluginManager().callEvent(armswing);
+        }
+
+        FakeBlockBreakEvent event = new FakeBlockBreakEvent(block, player);
+        Bukkit.getPluginManager().callEvent(event);
+
+        if (!event.isCancelled()) {
+            return true;
+        }
+        else {
+            return false;
+        }
+    }
+
+    /**
+     * Get the upgrade tier of the item in hand.
+     *
+     * @param inHand The item to check the tier of
+     * @return the tier of the item
+     */
+    public static Integer getTier(ItemStack inHand) {
+        int tier = 0;
+
+        if (ItemChecks.isWoodTool(inHand)) {
+            tier = 1;
+        }
+        else if (ItemChecks.isStoneTool(inHand)) {
+            tier = 2;
+        }
+        else if (ItemChecks.isIronTool(inHand)) {
+            tier = 3;
+        }
+        else if(ItemChecks.isGoldTool(inHand)) {
+            tier = 1;
+        }
+        else if(ItemChecks.isDiamondTool(inHand))
+            tier = 4;
+
+        return tier;
+    }
+
+    /**
+     * Determine if two locations are near each other.
+     *
+     * @param first The first location
+     * @param second The second location
+     * @param maxDistance The max distance apart
+     * @return true if the distance between <code>first</code> and <code>second</code> is less than <code>maxDistance</code>, false otherwise
+     */
+    public static boolean isNear(Location first, Location second, int maxDistance) {
+        double relX = first.getX() - second.getX();
+        double relY = first.getY() - second.getY();
+        double relZ = first.getZ() - second.getZ();
+        double dist = (relX * relX) + (relY * relY) + (relZ * relZ);
+
+        if (dist < maxDistance * maxDistance) {
+            return true;
+        }
+        else {
+            return false;
+        }
+    }
+
+    /**
+     * Determine if a string represents an Integer
+     *
+     * @param string String to check
+     * @return true if the string is an Integer, false otherwise
+     */
+    public static boolean isInt(String string) {
+        try {
+            Integer.parseInt(string);
+            return true;
+        }
+        catch (NumberFormatException nFE) {
+            return false;
+        }
+    }
+
+    /**
+     * Drop items at a given location.
+     *
+     * @param location The location to drop the items at
+     * @param is The items to drop
+     * @param quantity The amount of items to drop
+     */
+    public static void mcDropItems(Location location, ItemStack is, int quantity) {
+        for (int i = 0; i < quantity; i++) {
+            mcDropItem(location, is);
+        }
+    }
+
+    /**
+     * Randomly drop an item at a given location.
+     *
+     * @param location The location to drop the items at
+     * @param is The item to drop
+     * @param chance The percentage chance for the item to drop
+     */
+    public static void mcRandomDropItem(Location location, ItemStack is, double chance) {
+        if (Math.random() * 100 < chance) {
+            mcDropItem(location, is);
+        }
+    }
+
+    /**
+     * Randomly drop items at a given location.
+     *
+     * @param location The location to drop the items at
+     * @param is The item to drop
+     * @param chance The percentage chance for the item to drop
+     * @param quantity The amount of items to drop
+     */
+    public static void mcRandomDropItems(Location location, ItemStack is, int chance, int quantity) {
+        for(int i = 0; i < quantity; i++) {
+            mcRandomDropItem(location, is, chance);
+        }
+    }
+
+    /**
+     * Drop an item at a given location.
+     *
+     * @param location The location to drop the item at
+     * @param itemStack The item to drop
+     */
+    public static void mcDropItem(Location location, ItemStack itemStack) {
+
+        // We can't get the item until we spawn it and we want to make it cancellable, so we have a custom event.
+        McMMOItemSpawnEvent event = new McMMOItemSpawnEvent(location, itemStack);
+        Bukkit.getPluginManager().callEvent(event);
+
+        if (event.isCancelled()) {
+            return;
+        }
+        else {
+            location.getWorld().dropItemNaturally(location, itemStack);
+        }
+    }
+
+    /**
+     * Check if a skill level is higher than the max bonus level of the ability.
+     *
+     * @param skillLevel Skill level to check
+     * @param maxLevel Max level of the ability
+     * @return whichever value is lower
+     */
+    public static int skillCheck(int skillLevel, int maxLevel) {
+        if (skillLevel > maxLevel) {
+            return maxLevel;
+        }
+        else {
+            return skillLevel;
+        }
+    }
 }

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

@@ -1,20 +1,3 @@
-/*
-	Copyright (C) 2012  Matt 'The Yeti' Burnett & mcMMO Development
-	Copyright (C) 2010-2011 'nossr50'
-
-    This program 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.
-
-    This program 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 this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
 package com.gmail.nossr50;
 
 import com.gmail.nossr50.datatypes.PlayerProfile;
@@ -26,15 +9,13 @@ import com.gmail.nossr50.commands.party.*;
 import com.gmail.nossr50.commands.general.*;
 import com.gmail.nossr50.config.*;
 import com.gmail.nossr50.runnables.*;
+import com.gmail.nossr50.skills.Skills;
 import com.gmail.nossr50.spout.SpoutStuff;
 import com.gmail.nossr50.listeners.mcBlockListener;
 import com.gmail.nossr50.listeners.mcEntityListener;
 import com.gmail.nossr50.listeners.mcPlayerListener;
 import com.gmail.nossr50.locale.mcLocale;
 import com.gmail.nossr50.party.Party;
-import com.gmail.nossr50.skills.*;
-
-import org.bukkit.Bukkit;
 
 import java.io.BufferedInputStream;
 import java.io.BufferedReader;
@@ -45,317 +26,541 @@ import java.io.FileNotFoundException;
 import java.io.FileReader;
 import java.io.FileWriter;
 import java.io.IOException;
-import java.util.ArrayDeque;
+import java.io.InputStream;
 import java.util.ArrayList;
 import java.util.HashMap;
-import java.util.logging.Level;
-import java.util.logging.Logger;
 
+import org.bukkit.Bukkit;
+import org.bukkit.plugin.Plugin;
 import org.bukkit.plugin.PluginDescriptionFile;
 import org.bukkit.plugin.java.JavaPlugin;
 import org.bukkit.plugin.PluginManager;
-import org.bukkit.block.Block;
+import org.bukkit.scheduler.BukkitScheduler;
+import org.bukkit.configuration.file.FileConfiguration;
+import org.bukkit.configuration.file.YamlConfiguration;
+import org.bukkit.entity.Entity;
 import org.bukkit.entity.Player;
 import org.getspout.spoutapi.SpoutManager;
 import org.getspout.spoutapi.player.FileManager;
 
+public class mcMMO extends JavaPlugin {
 
-public class mcMMO extends JavaPlugin 
-{
-	
-	public static String maindirectory = "plugins" + File.separator + "mcMMO";
-	File file = new File(maindirectory + File.separator + "config.yml");
-	static File versionFile = new File(maindirectory + File.separator + "VERSION");
-	public static final Logger log = Logger.getLogger("Minecraft"); 
-	
-	private final mcPlayerListener playerListener = new mcPlayerListener(this);
-	private final mcBlockListener blockListener = new mcBlockListener(this);
-	private final mcEntityListener entityListener = new mcEntityListener(this);
+    public static String maindirectory = "plugins" + File.separator + "mcMMO";
+    public static File file = new File(maindirectory + File.separator + "config.yml");
+    public static File versionFile = new File(maindirectory + File.separator + "VERSION");
 
-	private Runnable mcMMO_Timer = new mcTimer(this); //BLEED AND REGENERATION
-	private Runnable mcMMO_SaveTimer = new mcSaveTimer(this); //Periodic saving of Player Data
-	private Runnable ChangeDataValueTimer = new ChangeDataValueTimer(this);		//R2 block place workaround
-	//private Timer mcMMO_SpellTimer = new Timer(true);
+    private final mcPlayerListener playerListener = new mcPlayerListener(this);
+    private final mcBlockListener blockListener = new mcBlockListener(this);
+    private final mcEntityListener entityListener = new mcEntityListener(this);
 
-	//Alias - Command
-	public HashMap<String, String> aliasMap = new HashMap<String, String>();
-	
-	public static Database database = null;
-	public Misc misc = new Misc(this);
+    //Alias - Command
+    public HashMap<String, String> aliasMap = new HashMap<String, String>();
+    public HashMap<Entity, Integer> arrowTracker = new HashMap<Entity, Integer>();
+    public HashMap<Integer, Player> tntTracker = new HashMap<Integer, Player>();
 
-	//Config file stuff
-	LoadProperties config;
-	//Jar stuff
-	public static File mcmmo;
-	
-	//Queue for block data change for R2+ fix
-	public ArrayDeque<Block> changeQueue = new ArrayDeque<Block>();
+    public static Database database = null;
 
-	public void onEnable() 
-	{
-		mcmmo = this.getFile();
-		new File(maindirectory).mkdir();
-		
-		if(!versionFile.exists()) 
-		{
-			updateVersion();
-		} else 
-		{
-			String vnum = readVersion();
-			//This will be changed to whatever version preceded when we actually need updater code.
-			//Version 1.0.48 is the first to implement this, no checking before that version can be done.
-			if(vnum.equalsIgnoreCase("1.0.48")) {
-				updateFrom(1);
-			}
-			//Just add in more else if blocks for versions that need updater code.  Increment the updateFrom age int as we do so.
-			//Catch all for versions not matching and no specific code being needed
-			else if(!vnum.equalsIgnoreCase(this.getDescription().getVersion())) updateFrom(-1);
-		}
-		
-		this.config = new LoadProperties(this);
-		this.config.load();
-		
-		Party.getInstance().loadParties();
-		new Party(this);
-		
-		if(!LoadProperties.useMySQL)
-			Users.getInstance().loadUsers(); //Load Users file
-		/*
-		 * REGISTER EVENTS
-		 */
+    //Config file stuff
+    LoadProperties config;
+    LoadTreasures config2;
 
-		PluginManager pm = getServer().getPluginManager();
+    //Jar stuff
+    public static File mcmmo;
 
-		if(pm.getPlugin("Spout") != null)
-			LoadProperties.spoutEnabled = true;
-		else
-			LoadProperties.spoutEnabled = false;
-		
-		//Register events
-		pm.registerEvents(playerListener, this);
-		pm.registerEvents(blockListener, this);
-		pm.registerEvents(entityListener, this);
+    /**
+     * Things to be run when the plugin is enabled.
+     */
+    public void onEnable() {
+        final Plugin thisPlugin = this;
+        mcmmo = this.getFile();
+        new File(maindirectory).mkdir();
 
-		PluginDescriptionFile pdfFile = this.getDescription();
+        if (!versionFile.exists()) {
+            updateVersion();
+        }
+        else {
+            String vnum = readVersion();
 
-		if(LoadProperties.useMySQL)
-		{
-			database = new Database(this);
-			database.createStructure();
-		} else
-			Leaderboard.makeLeaderboards(); //Make the leaderboards
+            //This will be changed to whatever version preceded when we actually need updater code.
+            //Version 1.0.48 is the first to implement this, no checking before that version can be done.
+            if (vnum.equalsIgnoreCase("1.0.48")) {
+                updateFrom(1);
+            }
 
-		for(Player player : getServer().getOnlinePlayers()){Users.addUser(player);} //In case of reload add all users back into PlayerProfile   
-		System.out.println(pdfFile.getName() + " version " + pdfFile.getVersion() + " is enabled!" );
-		
-		//Periodic save timer (Saves every 10 minutes)
-		Bukkit.getServer().getScheduler().scheduleSyncRepeatingTask(this, mcMMO_SaveTimer, 0, LoadProperties.saveInterval * 1200);
-		
-		Bukkit.getServer().getScheduler().scheduleSyncRepeatingTask(this, mcMMO_Timer, 0, 20);
-		//R2+ block place fix
-		Bukkit.getServer().getScheduler().scheduleSyncRepeatingTask(this, ChangeDataValueTimer, 0, 10);
-		
-		registerCommands();
-		
-		//Spout Stuff
-		if(LoadProperties.spoutEnabled)
-		{
-			SpoutStuff.setupSpoutConfigs();
-			SpoutStuff.registerCustomEvent();
-			SpoutStuff.extractFiles(); //Extract source materials
-			
-			FileManager FM = SpoutManager.getFileManager();
-			FM.addToPreLoginCache(this, SpoutStuff.getFiles());
-		}
-	}
+            //Just add in more else if blocks for versions that need updater code.  Increment the updateFrom age int as we do so.
+            //Catch all for versions not matching and no specific code being needed
+            else if (!vnum.equalsIgnoreCase(this.getDescription().getVersion())) {
+                updateFrom(-1);
+            }
+        }
 
-	public PlayerProfile getPlayerProfile(Player player)
-	{
-		return Users.getProfile(player);
-	}
-	
-	public void checkXp(Player player, SkillType skillType)
-	{
-		if(skillType == SkillType.ALL)
-			Skills.XpCheckAll(player);
-		else
-			Skills.XpCheckSkill(skillType, player);
-	}
-	
-	public boolean inSameParty(Player playera, Player playerb)
-	{
-		if(Users.getProfile(playera).inParty() && Users.getProfile(playerb).inParty()){
-			if(Users.getProfile(playera).getParty().equals(Users.getProfile(playerb).getParty())){
-				return true;
-			} else {
-				return false;
-			}
-		} else {
-			return false;
-		}
-	}
-	public ArrayList<String> getParties(){
-		String location = "plugins/mcMMO/mcmmo.users"; 
-		ArrayList<String> parties = new ArrayList<String>();
-		try {
-			//Open the users file
-			FileReader file = new FileReader(location);
-			BufferedReader in = new BufferedReader(file);
-			String line = ""; 
-			while((line = in.readLine()) != null)
-			{
-				String[] character = line.split(":"); 
-				String theparty = null;
-				//Party
-				if(character.length > 3)
-					theparty = character[3];
-				if(!parties.contains(theparty))
-					parties.add(theparty);
-			}
-			in.close();
-		} catch (Exception e) {
-			log.log(Level.SEVERE, "Exception while reading " 
-					+ location + " (Are you sure you formatted it correctly?)", e); 
-		}
-		return parties;
-	}
-	public static String getPartyName(Player player){
-		PlayerProfile PP = Users.getProfile(player);
-		return PP.getParty();
-	}
-	public static boolean inParty(Player player){
-		PlayerProfile PP = Users.getProfile(player);
-		return PP.inParty();
-	}
+        this.config = new LoadProperties(this);
+        this.config.load();
 
-	public void onDisable() 
-	{
-	    //Make sure to save player information if the server shuts down
-		for(Player x : Bukkit.getServer().getOnlinePlayers())
-		{
-		    Users.getProfile(x).save();
-		}
-	    
-	    Bukkit.getServer().getScheduler().cancelTasks(this); //This removes our tasks
-		
-		System.out.println("mcMMO was disabled."); //How informative!
-	}
-	
-	private void registerCommands() {
-		//Register aliases with the aliasmap (used in the playercommandpreprocessevent to ugly alias them to actual commands)
-		//Skills commands
-		aliasMap.put(mcLocale.getString("m.SkillAcrobatics").toLowerCase(), "acrobatics");
-		aliasMap.put(mcLocale.getString("m.SkillArchery").toLowerCase(), "archery");
-		aliasMap.put(mcLocale.getString("m.SkillAxes").toLowerCase(), "axes");
-		aliasMap.put(mcLocale.getString("m.SkillExcavation").toLowerCase(), "excavation");
-		aliasMap.put(mcLocale.getString("m.SkillFishing").toLowerCase(), "fishing");
-		aliasMap.put(mcLocale.getString("m.SkillHerbalism").toLowerCase(), "herbalism");
-		aliasMap.put(mcLocale.getString("m.SkillMining").toLowerCase(), "mining");
-		aliasMap.put(mcLocale.getString("m.SkillRepair").toLowerCase(), "repair");
-		aliasMap.put(mcLocale.getString("m.SkillSwords").toLowerCase(), "swords");
-		aliasMap.put(mcLocale.getString("m.SkillTaming").toLowerCase(), "taming");
-		aliasMap.put(mcLocale.getString("m.SkillUnarmed").toLowerCase(), "unarmed");
-		aliasMap.put(mcLocale.getString("m.SkillWoodCutting").toLowerCase(), "woodcutting");
-		
-		
-		//Register commands
-		//Skills commands
-		getCommand("acrobatics").setExecutor(new AcrobaticsCommand());
-		getCommand("archery").setExecutor(new ArcheryCommand());
-		getCommand("axes").setExecutor(new AxesCommand());
-		getCommand("excavation").setExecutor(new ExcavationCommand());
-		getCommand("fishing").setExecutor(new FishingCommand());
-		getCommand("herbalism").setExecutor(new HerbalismCommand());
-		getCommand("mining").setExecutor(new MiningCommand());
-		getCommand("repair").setExecutor(new RepairCommand());
-		getCommand("swords").setExecutor(new SwordsCommand());
-		getCommand("taming").setExecutor(new TamingCommand());
-		getCommand("unarmed").setExecutor(new UnarmedCommand());
-		getCommand("woodcutting").setExecutor(new WoodcuttingCommand());
-		
-		//Mc* commands
-		if(LoadProperties.mcabilityEnable) getCommand("mcability").setExecutor(new McabilityCommand());
-		if(LoadProperties.mccEnable) getCommand("mcc").setExecutor(new MccCommand());
-		if(LoadProperties.mcgodEnable) getCommand("mcgod").setExecutor(new McgodCommand());
-		if(LoadProperties.mcmmoEnable) getCommand("mcmmo").setExecutor(new McmmoCommand());
-		if(LoadProperties.mcrefreshEnable) getCommand("mcrefresh").setExecutor(new McrefreshCommand(this));
-		if(LoadProperties.mctopEnable) getCommand("mctop").setExecutor(new MctopCommand());
-		
-		//Party commands
-		if(LoadProperties.acceptEnable) getCommand("accept").setExecutor(new AcceptCommand());
-		if(LoadProperties.aEnable) getCommand("a").setExecutor(new ACommand());
-		if(LoadProperties.inviteEnable) getCommand("invite").setExecutor(new InviteCommand(this));
-		if(LoadProperties.partyEnable) getCommand("party").setExecutor(new PartyCommand());
-		if(LoadProperties.pEnable) getCommand("p").setExecutor(new PCommand());
-		if(LoadProperties.ptpEnable) getCommand("ptp").setExecutor(new PtpCommand(this));
-		
-		//Other commands
-		if(LoadProperties.addxpEnable) getCommand("addxp").setExecutor(new AddxpCommand(this));
-		if(LoadProperties.clearmyspawnEnable) getCommand("clearmyspawn").setExecutor(new ClearmyspawnCommand());
-		if(LoadProperties.mmoeditEnable) getCommand("mmoedit").setExecutor(new MmoeditCommand(this));
-		getCommand("mmoupdate").setExecutor(new MmoupdateCommand());
-		if(LoadProperties.myspawnEnable) getCommand("myspawn").setExecutor(new MyspawnCommand());
-		if(LoadProperties.statsEnable) getCommand("stats").setExecutor(new StatsCommand(this));
-		if(LoadProperties.whoisEnable) getCommand("whois").setExecutor(new WhoisCommand(this));
-		if(LoadProperties.xprateEnable) getCommand("xprate").setExecutor(new XprateCommand());
-		
-		//Spout commands
-		getCommand("mchud").setExecutor(new MchudCommand());
-		if(LoadProperties.xplockEnable) getCommand("xplock").setExecutor(new XplockCommand());
-		
-	}
+        this.config2 = new LoadTreasures(this);
+        this.config2.load();
 
-	/*
-	 * It is important to always assume that you are updating from the lowest possible version.
-	 * Thus, every block of updater code should be complete and self-contained; finishing all 
-	 * SQL transactions and closing all file handlers, such that the next block of updater code
-	 * if called will handle updating as expected.
-	 */
-	public void updateFrom(int age) {
-		//No updater code needed, just update the version.
-		if(age == -1) {
-			updateVersion();
-			return;
-		}
-		//Updater code from age 1 goes here
-		if(age <= 1) {
-			//Since age 1 is an example for now, we will just let it do nothing.
-			
-		}
-		//If we are updating from age 1 but we need more to reach age 2, this will run too.
-		if(age <= 2) {
-			
-		}
-		updateVersion();
-	}
-	
-	public void updateVersion() {
-		try {
-			versionFile.createNewFile();
-			BufferedWriter vout = new BufferedWriter(new FileWriter(versionFile));
-			vout.write(this.getDescription().getVersion());
-			vout.close();
-		} catch (IOException ex) {
-			ex.printStackTrace();
-		} catch (SecurityException ex) {
-			ex.printStackTrace();
-		}
-	}
+        Party.getInstance().loadParties();
+        new Party(this);
 
-	public String readVersion() {
-		byte[] buffer = new byte[(int) versionFile.length()];
-		BufferedInputStream f = null;
-		try {
-			f = new BufferedInputStream(new FileInputStream(versionFile));
-			f.read(buffer);
-		} catch (FileNotFoundException ex) {
-			ex.printStackTrace();
-		} catch (IOException ex) {
-			ex.printStackTrace();
-		} finally {
-			if (f != null) try { f.close(); } catch (IOException ignored) { }
-		}
-		
-		return new String(buffer);
-	}
-}
+        if (!LoadProperties.useMySQL) {
+            Users.getInstance().loadUsers();
+        }
+
+        PluginManager pm = getServer().getPluginManager();
+
+        if (pm.getPlugin("Spout") != null) {
+            LoadProperties.spoutEnabled = true;
+        }
+        else {
+            LoadProperties.spoutEnabled = false;
+        }
+
+        //Register events
+        pm.registerEvents(playerListener, this);
+        pm.registerEvents(blockListener, this);
+        pm.registerEvents(entityListener, this);
+
+        PluginDescriptionFile pdfFile = this.getDescription();
+
+        //Setup the leaderboards
+        if (LoadProperties.useMySQL) {
+            database = new Database(this);
+            database.createStructure();
+        }
+        else {
+            Leaderboard.makeLeaderboards();
+        }
+
+        for (Player player : getServer().getOnlinePlayers()) {
+            Users.addUser(player); //In case of reload add all users back into PlayerProfile
+        }
+
+        System.out.println(pdfFile.getName() + " version " + pdfFile.getVersion() + " is enabled!" );
+
+        BukkitScheduler scheduler = getServer().getScheduler();
+
+        //Periodic save timer (Saves every 10 minutes)
+        scheduler.scheduleSyncRepeatingTask(this, new mcSaveTimer(this), 0, LoadProperties.saveInterval * 1200);
+        //Regen & Cooldown timer (Runs every second)
+        scheduler.scheduleSyncRepeatingTask(this, new mcTimer(this), 0, 20);
+        //Bleed timer (Runs every two seconds)
+        scheduler.scheduleSyncRepeatingTask(this, new mcBleedTimer(this), 0, 40);
+
+        registerCommands();
+
+        //Spout Stuff
+        if (LoadProperties.spoutEnabled) {
+            SpoutStuff.setupSpoutConfigs();
+            SpoutStuff.registerCustomEvent();
+            SpoutStuff.extractFiles(); //Extract source materials
+
+            FileManager FM = SpoutManager.getFileManager();
+            FM.addToPreLoginCache(this, SpoutStuff.getFiles());
+        }
+
+        if (LoadProperties.statsTracking) {
+            //Plugin Metrics running in a new thread
+            new Thread(new Runnable() {
+                public void run() {
+                    try {
+                        // create a new metrics object
+                        Metrics metrics = new Metrics();
+
+                        // 'this' in this context is the Plugin object
+                        metrics.beginMeasuringPlugin(thisPlugin);
+                    }
+                    catch (IOException e) {
+                        System.out.println("Failed to submit stats.");
+                    }
+                }
+            }).start();
+        }
+    }
+
+    /**
+     * Get profile of the player.
+     * </br>
+     * This function is designed for API usage.
+     *
+     * @param player Player whose profile to get
+     * @return the PlayerProfile object
+     */
+    public PlayerProfile getPlayerProfile(Player player) {
+        return Users.getProfile(player);
+    }
+
+    /**
+     * Check the XP of a player.
+     * </br>
+     * This function is designed for API usage.
+     *
+     * @param player
+     * @param skillType
+     */
+    public void checkXp(Player player, SkillType skillType) {
+        if (skillType == SkillType.ALL) {
+            Skills.XpCheckAll(player);
+        }
+        else {
+            Skills.XpCheckSkill(skillType, player);
+        }
+    }
+
+    /**
+     * 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 boolean inSameParty(Player playera, Player playerb) {
+        if (Users.getProfile(playera).inParty() && Users.getProfile(playerb).inParty()) {
+            if (Users.getProfile(playera).getParty().equals(Users.getProfile(playerb).getParty())) {
+                return true;
+            }
+            else {
+                return false;
+            }
+        }
+        else {
+            return false;
+        }
+    }
+
+    /**
+     * Get a list of all current party names.
+     * </br>
+     * This function is designed for API usage.
+     *
+     * @return the list of parties.
+     */
+    public ArrayList<String> getParties() {
+        String location = "plugins/mcMMO/mcmmo.users";
+        ArrayList<String> parties = new ArrayList<String>();
+
+        try {
+
+            //Open the users file
+            FileReader file = new FileReader(location);
+            BufferedReader in = new BufferedReader(file);
+            String line = "";
+
+            while((line = in.readLine()) != null) {
+                String[] character = line.split(":");
+                String theparty = null;
+
+                //Party
+                if (character.length > 3) {
+                    theparty = character[3];
+                }
+
+                if (!parties.contains(theparty)) {
+                    parties.add(theparty);
+                }
+            }
+            in.close();
+        }
+        catch (Exception e) {
+            Bukkit.getLogger().severe("Exception while reading " + location + " (Are you sure you formatted it correctly?)" + e.toString());
+        }
+        return parties;
+    }
+
+    /**
+     * 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) {
+        PlayerProfile PP = Users.getProfile(player);
+        return PP.getParty();
+    }
+
+    /**
+     * 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) {
+        PlayerProfile PP = Users.getProfile(player);
+        return PP.inParty();
+    }
+
+    /**
+     * Things to be run when the plugin is disabled.
+     */
+    public void onDisable() {
+
+        //Make sure to save player information if the server shuts down
+        for (PlayerProfile x : Users.getProfiles().values()) {
+            x.save();
+        }
+
+        Bukkit.getServer().getScheduler().cancelTasks(this); //This removes our tasks
+        System.out.println("mcMMO was disabled."); //How informative!
+    }
+
+    /**
+     * Register the commands.
+     */
+    private void registerCommands() {
+
+        //Register aliases with the aliasmap (used in the playercommandpreprocessevent to ugly alias them to actual commands)
+        //Skills commands
+        aliasMap.put(mcLocale.getString("m.SkillAcrobatics").toLowerCase(), "acrobatics");
+        aliasMap.put(mcLocale.getString("m.SkillArchery").toLowerCase(), "archery");
+        aliasMap.put(mcLocale.getString("m.SkillAxes").toLowerCase(), "axes");
+        aliasMap.put(mcLocale.getString("m.SkillExcavation").toLowerCase(), "excavation");
+        aliasMap.put(mcLocale.getString("m.SkillFishing").toLowerCase(), "fishing");
+        aliasMap.put(mcLocale.getString("m.SkillHerbalism").toLowerCase(), "herbalism");
+        aliasMap.put(mcLocale.getString("m.SkillMining").toLowerCase(), "mining");
+        aliasMap.put(mcLocale.getString("m.SkillRepair").toLowerCase(), "repair");
+        aliasMap.put(mcLocale.getString("m.SkillSwords").toLowerCase(), "swords");
+        aliasMap.put(mcLocale.getString("m.SkillTaming").toLowerCase(), "taming");
+        aliasMap.put(mcLocale.getString("m.SkillUnarmed").toLowerCase(), "unarmed");
+        aliasMap.put(mcLocale.getString("m.SkillWoodCutting").toLowerCase(), "woodcutting");
+
+        //Register commands
+        //Skills commands
+        getCommand("acrobatics").setExecutor(new AcrobaticsCommand());
+        getCommand("archery").setExecutor(new ArcheryCommand());
+        getCommand("axes").setExecutor(new AxesCommand());
+        getCommand("excavation").setExecutor(new ExcavationCommand());
+        getCommand("fishing").setExecutor(new FishingCommand());
+        getCommand("herbalism").setExecutor(new HerbalismCommand());
+        getCommand("mining").setExecutor(new MiningCommand());
+        getCommand("repair").setExecutor(new RepairCommand());
+        getCommand("swords").setExecutor(new SwordsCommand());
+        getCommand("taming").setExecutor(new TamingCommand());
+        getCommand("unarmed").setExecutor(new UnarmedCommand());
+        getCommand("woodcutting").setExecutor(new WoodcuttingCommand());
+
+        //mc* commands
+        if (LoadProperties.mcremoveEnable) {
+            getCommand("mcremove").setExecutor(new McremoveCommand());
+        }
+
+        if (LoadProperties.mcabilityEnable) {
+            getCommand("mcability").setExecutor(new McabilityCommand());
+        }
+
+        if (LoadProperties.mccEnable) {
+            getCommand("mcc").setExecutor(new MccCommand());
+        }
+
+        if (LoadProperties.mcgodEnable) {
+            getCommand("mcgod").setExecutor(new McgodCommand());
+        }
+
+        if (LoadProperties.mcmmoEnable) {
+            getCommand("mcmmo").setExecutor(new McmmoCommand());
+        }
+
+        if (LoadProperties.mcrefreshEnable) {
+            getCommand("mcrefresh").setExecutor(new McrefreshCommand(this));
+        }
+
+        if (LoadProperties.mctopEnable) {
+            getCommand("mctop").setExecutor(new MctopCommand());
+        }
+
+        if (LoadProperties.mcstatsEnable) {
+            getCommand("mcstats").setExecutor(new McstatsCommand());
+        }
+
+        //Party commands
+        if (LoadProperties.acceptEnable) {
+            getCommand("accept").setExecutor(new AcceptCommand());
+        }
+
+        if (LoadProperties.aEnable) {
+            getCommand("a").setExecutor(new ACommand());
+        }
+
+        if (LoadProperties.inviteEnable) {
+            getCommand("invite").setExecutor(new InviteCommand(this));
+        }
+
+        if (LoadProperties.partyEnable) {
+            getCommand("party").setExecutor(new PartyCommand());
+        }
+
+        if (LoadProperties.pEnable) {
+            getCommand("p").setExecutor(new PCommand());
+        }
+
+        if (LoadProperties.ptpEnable) {
+            getCommand("ptp").setExecutor(new PtpCommand(this));
+        }
+
+        //Other commands
+        if (LoadProperties.addxpEnable) {
+            getCommand("addxp").setExecutor(new AddxpCommand(this));
+        }
+
+        if (LoadProperties.addlevelsEnable) {
+            getCommand("addlevels").setExecutor(new AddlevelsCommand(this));
+        }
+
+        if (LoadProperties.mmoeditEnable) {
+            getCommand("mmoedit").setExecutor(new MmoeditCommand());
+        }
+
+        if (LoadProperties.inspectEnable) {
+            getCommand("inspect").setExecutor(new InspectCommand(this));
+        }
+
+        if (LoadProperties.xprateEnable) {
+            getCommand("xprate").setExecutor(new XprateCommand());
+        }
+
+        getCommand("mmoupdate").setExecutor(new MmoupdateCommand());
+
+        //Spout commands
+        if (LoadProperties.xplockEnable) {
+            getCommand("xplock").setExecutor(new XplockCommand());
+        }
+
+        getCommand("mchud").setExecutor(new MchudCommand());
+    }
+
+    /**
+     * Update mcMMO from a given version
+     * </p>
+     * It is important to always assume that you are updating from the lowest possible version.
+     * Thus, every block of updater code should be complete and self-contained; finishing all 
+     * SQL transactions and closing all file handlers, such that the next block of updater code
+     * if called will handle updating as expected.
+     *
+     * @param age Specifies which updater code to run
+     */
+    public void updateFrom(int age) {
+
+        //No updater code needed, just update the version.
+        if (age == -1) {
+            updateVersion();
+            return;
+        }
+
+        //Updater code from age 1 goes here
+        if (age <= 1) {
+            //Since age 1 is an example for now, we will just let it do nothing.
+        }
+
+        //If we are updating from age 1 but we need more to reach age 2, this will run too.
+        if (age <= 2) {
+
+        }
+        updateVersion();
+    }
+
+    /**
+     * Update the version file.
+     */
+    public void updateVersion() {
+        try {
+            versionFile.createNewFile();
+            BufferedWriter vout = new BufferedWriter(new FileWriter(versionFile));
+            vout.write(this.getDescription().getVersion());
+            vout.close();
+        }
+        catch (IOException ex) {
+            ex.printStackTrace();
+        }
+        catch (SecurityException ex) {
+            ex.printStackTrace();
+        }
+    }
+
+    /**
+     * Get the current mcMMO version.
+     *
+     * @return a String representing the current mcMMO version
+     */
+    public String readVersion() {
+        byte[] buffer = new byte[(int) versionFile.length()];
+        BufferedInputStream f = null;
+
+        try {
+            f = new BufferedInputStream(new FileInputStream(versionFile));
+            f.read(buffer);
+        }
+        catch (FileNotFoundException ex) {
+            ex.printStackTrace();
+        }
+        catch (IOException ex) {
+            ex.printStackTrace();
+        }
+        finally {
+            if (f != null) {
+                try {
+                    f.close();
+                    }
+                catch (IOException ignored) {}
+            }
+        }
+        return new String(buffer);
+    }
+
+    /*
+     * Boilerplate Custom Config Stuff
+     */
+
+    private FileConfiguration treasuresConfig = null;
+    private File treasuresConfigFile = null;
+
+    /**
+     * Reload the Treasures.yml file.
+     */
+    public void reloadTreasuresConfig() {
+        if (treasuresConfigFile == null) {
+            treasuresConfigFile = new File(getDataFolder(), "treasures.yml");
+        }
+
+        treasuresConfig = YamlConfiguration.loadConfiguration(treasuresConfigFile);
+        InputStream defConfigStream = getResource("treasures.yml"); // Look for defaults in the jar
+
+        if (defConfigStream != null) {
+            YamlConfiguration defConfig = YamlConfiguration.loadConfiguration(defConfigStream);
+            treasuresConfig.setDefaults(defConfig);
+        }
+    }
+
+    /**
+     * Get the Treasures config information.
+     *
+     * @return the configuration object for treasures.yml
+     */
+    public FileConfiguration getTreasuresConfig() {
+        if (treasuresConfig == null) {
+            reloadTreasuresConfig();
+        }
+
+        return treasuresConfig;
+    }
+
+    /**
+     * Save the Treasures config informtion.
+     */
+    public void saveTreasuresConfig() {
+        if (treasuresConfig == null || treasuresConfigFile == null) {
+            return;
+        }
+
+        try {
+            treasuresConfig.save(treasuresConfigFile);
+        }
+        catch (IOException ex) {
+            Bukkit.getLogger().severe("Could not save config to " + treasuresConfigFile + ex.toString());
+        }
+    }
+}

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

@@ -1,147 +1,394 @@
-/*
-	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.entity.Player;
 
-public class mcPermissions 
-{
+public class mcPermissions {
     private static volatile mcPermissions instance;
-    
+
     public boolean permission(Player player, String perm) {
         return player.hasPermission(perm);
     }
 
-    public boolean admin(Player player){
-        return player.hasPermission("mcmmo.admin");
-    }
-    public boolean mcrefresh(Player player) {
-        return player.hasPermission("mcmmo.tools.mcrefresh");
-    }
-    public boolean mmoedit(Player player) {
-        return player.hasPermission("mcmmo.tools.mmoedit");
-    }
-    public boolean herbalismAbility(Player player){
-        return player.hasPermission("mcmmo.ability.herbalism");
-    }
-    public boolean excavationAbility(Player player){
-        return player.hasPermission("mcmmo.ability.excavation");
-    }
-    public boolean unarmedAbility(Player player){
-    	return player.hasPermission("mcmmo.ability.unarmed");
-    }
-    public boolean chimaeraWing(Player player){
-    	return player.hasPermission("mcmmo.item.chimaerawing");
-    }
-    public boolean miningAbility(Player player){
-    	return player.hasPermission("mcmmo.ability.mining");
-    }
-    public boolean axesAbility(Player player){
-    	return player.hasPermission("mcmmo.ability.axes");
+    public static mcPermissions getInstance() {
+        if (instance == null) {
+            instance = new mcPermissions();
+        }
+
+        return instance;
     }
 
-    public boolean swordsAbility(Player player){
-    	return player.hasPermission("mcmmo.ability.swords");
-    }
-    public boolean woodCuttingAbility(Player player) {
-    	return player.hasPermission("mcmmo.ability.woodcutting");
-    }
-    public boolean mcgod(Player player) {
-    	return player.hasPermission("mcmmo.tools.mcgod");
-    }
-    public boolean regeneration(Player player){
-    	return player.hasPermission("mcmmo.regeneration");
-    }
+    /*
+     * GENERIC PERMISSIONS
+     */
+
     public boolean motd(Player player) {
         return player.hasPermission("mcmmo.motd");
     }
+
+    public boolean admin(Player player) {
+        return player.hasPermission("mcmmo.admin");
+    }
+
+    public boolean arcaneBypass(Player player) {
+        return player.hasPermission(("mcmmo.repair.arcanebypass"));
+    }
+
+    /*
+     * MCMMO.TOOLS.*
+     */
+
+    public boolean mcrefresh(Player player) {
+        return player.hasPermission("mcmmo.tools.mcrefresh");
+    }
+
+    public boolean mcremove(Player player) {
+        return player.hasPermission("mcmmo.tools.mcremove");
+    }
+
+    public boolean mmoedit(Player player) {
+        return player.hasPermission("mcmmo.tools.mmoedit");
+    }
+
+    public boolean mcgod(Player player) {
+        return player.hasPermission("mcmmo.tools.mcgod");
+    }
+
+    /*
+     * MCMMO.ABILITY.TAMING.*
+     */
+
+    public boolean fastFoodService(Player player) {
+        return player.hasPermission("mcmmo.ability.taming.fastfoodservice");
+    }
+
+    public boolean sharpenedclaws(Player player) {
+        return player.hasPermission("mcmmo.ability.taming.sharpenedclaws");
+    }
+
+    public boolean gore(Player player) {
+        return player.hasPermission("mcmmo.ability.taming.gore");
+    }
+
+    public boolean callOfTheWild(Player player) {
+        return player.hasPermission("mcmmo.ability.taming.callofthewild");
+    }
+
+    public boolean environmentallyAware(Player player) {
+        return player.hasPermission("mcmmo.ability.taming.environmentallyaware");
+    }
+
+    public boolean thickFur(Player player) {
+        return player.hasPermission("mcmmo.ability.taming.thickfur");
+    }
+
+    public boolean shockProof(Player player) {
+        return player.hasPermission("mcmmo.ability.taming.shockproof");
+    }
+
+    public boolean beastLore(Player player) {
+        return player.hasPermission("mcmmo.ability.taming.beastlore");
+    }
+
+    /*
+     * MCMMO.ABILITY.FISHING.*
+     */
+
+    public boolean shakeMob(Player player) {
+        return player.hasPermission("mcmmo.ability.fishing.shakemob");
+    }
+
+    /*
+     * MCMMO.ABILITY.MINING.*
+     */
+
+    public boolean superBreaker(Player player) {
+        return player.hasPermission("mcmmo.ability.mining.superbreaker");
+    }
+
+    public boolean miningDoubleDrops(Player player) {
+        return player.hasPermission("mcmmo.ability.mining.doubledrops");
+    }
+
+    /*
+     * MCMMO.ABILITY.WOODCUTTING.*
+     */
+
+    public boolean treeFeller(Player player) {
+        return player.hasPermission("mcmmo.ability.woodcutting.treefeller");
+    }
+
+    public boolean leafBlower(Player player) {
+        return player.hasPermission("mcmmo.ability.woodcutting.leafblower");
+    }
+
+    public boolean woodcuttingDoubleDrops(Player player) {
+        return player.hasPermission("mcmmo.ability.woodcutting.doubledrops");
+    }
+
+    /*
+     * MCMMO.ABILITY.REPAIR.*
+     */
+
+    public boolean repairBonus(Player player) {
+        return player.hasPermission("mcmmo.ability.repair.repairbonus");
+    }
+
+    public boolean arcaneForging(Player player) {
+        return player.hasPermission("mcmmo.ability.repair.arcaneforging");
+    }
+
+    public boolean stoneRepair(Player player) {
+        return player.hasPermission("mcmmo.ability.repair.stonerepair");
+    }
+
+    public boolean ironRepair(Player player) {
+        return player.hasPermission("mcmmo.ability.repair.ironrepair");
+    }
+
+    public boolean goldRepair(Player player) {
+        return player.hasPermission("mcmmo.ability.repair.goldrepair");
+    }
+
+    public boolean diamondRepair(Player player) {
+        return player.hasPermission("mcmmo.ability.repair.diamondrepair");
+    }
+
+    public boolean armorRepair(Player player) {
+        return player.hasPermission("mcmmo.ability.repair.armorrepair");
+    }
+
+    public boolean toolRepair(Player player) {
+        return player.hasPermission("mcmmo.ability.repair.toolrepair");
+    }
+
+    /*
+     * MCMMO.ABILITY.UNARMED.*
+     */
+
+    public boolean unarmedBonus(Player player) {
+        return player.hasPermission("mcmmo.ability.unarmed.bonusdamage");
+    }
+
+    public boolean disarm(Player player) {
+        return player.hasPermission("mcmmo.ability.unarmed.disarm");
+    }
+
+    public boolean berserk(Player player) {
+        return player.hasPermission("mcmmo.ability.unarmed.berserk");
+    }
+
+    public boolean deflect(Player player) {
+        return player.hasPermission("mcmmo.ability.unarmed.deflect");
+    }
+
+    /*
+     * MCMMO.ABILITY.ARCHERY.*
+     */
+
+    public boolean trackArrows(Player player) {
+        return player.hasPermission("mcmmo.ability.archery.trackarrows");
+    }
+
+    public boolean ignition(Player player) {
+        return player.hasPermission("mcmmo.ability.archery.ignition");
+    }
+
+    public boolean daze(Player player) {
+        return player.hasPermission("mcmmo.ability.archery.daze");
+    }
+
+    /*
+     * MCMMO.ABILITY.HERBALISM.*
+     */
+
+    public boolean herbalismDoubleDrops(Player player) {
+        return player.hasPermission("mcmmo.ability.herbalism.doubledrops");
+    }
+
+    public boolean greenTerra(Player player) {
+        return player.hasPermission("mcmmo.ability.herbalism.greenterra");
+    }
+
+    public boolean greenThumbBlocks(Player player) {
+        return player.hasPermission("mcmmo.ability.herbalism.greenthumbblocks");
+    }
+
+    public boolean greenThumbWheat(Player player) {
+        return player.hasPermission("mcmmo.ability.herbalism.greenthumbwheat");
+    }
+
+    /*
+     * MCMMO.ABILITY.EXCAVATION.*
+     */
+
+    public boolean gigaDrillBreaker(Player player) {
+        return player.hasPermission("mcmmo.ability.excavation.gigadrillbreaker");
+    }
+
+    public boolean excavationTreasures(Player player) {
+        return player.hasPermission("mcmmo.ability.excavation.treasures");
+    }
+
+    /*
+     * MCMMO.ABILITY.SWORDS.*
+     */
+
+    public boolean swordsBleed(Player player) {
+        return player.hasPermission("mcmmo.ability.swords.bleed");
+    }
+
+    public boolean serratedStrikes(Player player) {
+        return player.hasPermission("mcmmo.ability.swords.serratedstrikes");
+    }
+
+    public boolean counterAttack(Player player) {
+        return player.hasPermission("mcmmo.ability.swords.counterattack");
+    }
+
+    /*
+     * MCMMO.ABILITY.AXES.*
+     */
+
+    public boolean skullSplitter(Player player) {
+        return player.hasPermission("mcmmo.ability.axes.skullsplitter");
+    }
+
+    public boolean axeBonus(Player player) {
+        return player.hasPermission("mcmmo.ability.axes.bonusdamage");
+    }
+
+    public boolean criticalHit(Player player) {
+        return player.hasPermission("mcmmo.ability.axes.criticalhit");
+    }
+
+    public boolean impact(Player player) {
+        return player.hasPermission("mcmmo.ability.axes.impact");
+    }
+
+    /*
+     * MCMMO.ABILITY.ACROBATICS.*
+     */
+
+    public boolean roll(Player player) {
+        return player.hasPermission("mcmmo.ability.acrobatics.roll");
+    }
+
+    public boolean gracefulRoll(Player player) {
+        return player.hasPermission("mcmmo.ability.acrobatics.gracefulroll");
+    }
+
+    public boolean dodge(Player player) {
+        return player.hasPermission("mcmmo.ability.acrobatics.dodge");
+    }
+
+    /*
+     * MCMMO.ABILITY.BLASTMINING.*
+     */
+
+    public boolean biggerBombs(Player player) {
+        return player.hasPermission("mcmmo.ability.blastmining.biggerbombs");
+    }
+
+    public boolean demolitionsExpertise(Player player) {
+        return player.hasPermission("mcmmo.ability.blastmining.demolitionsexpertise");
+    }
+
+    /*
+     * MCMMO.ITEM.*
+     */
+
+    public boolean chimaeraWing(Player player) {
+        return player.hasPermission("mcmmo.item.chimaerawing");
+    }
+
+    /*
+     * MCMMO.COMMANDS.*
+     */
+
     public boolean mcAbility(Player player) {
         return player.hasPermission("mcmmo.commands.ability");
     }
-    public boolean mySpawn(Player player) {
-        return player.hasPermission("mcmmo.commands.myspawn");
-    }
-    public boolean setMySpawn(Player player) {
-        return player.hasPermission("mcmmo.commands.setmyspawn");
-    }
-    public boolean partyChat(Player player) {
-        return player.hasPermission("mcmmo.chat.partychat");
-    }
-    public boolean partyLock(Player player) {
-        return player.hasPermission("mcmmo.chat.partylock");
-    }
+
     public boolean partyTeleport(Player player) {
         return player.hasPermission("mcmmo.commands.ptp");
     }
-    public boolean whois(Player player) {
-        return player.hasPermission("mcmmo.commands.whois");
+
+    public boolean inspect(Player player) {
+        return player.hasPermission("mcmmo.commands.inspect");
     }
+
     public boolean party(Player player) {
         return player.hasPermission("mcmmo.commands.party");
     }
+
+    /*
+     * MCMMO.CHAT.*
+     */
+
+    public boolean partyChat(Player player) {
+        return player.hasPermission("mcmmo.chat.partychat");
+    }
+
+    public boolean partyLock(Player player) {
+        return player.hasPermission("mcmmo.chat.partylock");
+    }
+
     public boolean adminChat(Player player) {
         return player.hasPermission("mcmmo.chat.adminchat");
     }
-    public static mcPermissions getInstance() {
-    	if (instance == null) {
-    	    instance = new mcPermissions();
-    	}
-    	return instance;
-    }
+
+    /*
+     * MCMMO.SKILLS.*
+     */
 
     public boolean taming(Player player) {
         return player.hasPermission("mcmmo.skills.taming");
     }
+
     public boolean mining(Player player) {
         return player.hasPermission("mcmmo.skills.mining");
     }
+
+    public boolean blastMining(Player player) {
+        return player.hasPermission("mcmmo.skills.blastmining");
+    }
+
     public boolean fishing(Player player) {
         return player.hasPermission("mcmmo.skills.fishing");
     }
-    public boolean alchemy(Player player) {
-        return player.hasPermission("mcmmo.skills.alchemy");
-    }
-    public boolean enchanting(Player player) {
-        return player.hasPermission("mcmmo.skills.enchanting");
-    }
+
     public boolean woodcutting(Player player) {
         return player.hasPermission("mcmmo.skills.woodcutting");
     }
+
     public boolean repair(Player player) {
         return player.hasPermission("mcmmo.skills.repair");
     }
+
     public boolean unarmed(Player player) {
         return player.hasPermission("mcmmo.skills.unarmed");
     }
+
     public boolean archery(Player player) {
         return player.hasPermission("mcmmo.skills.archery");
     }
+
     public boolean herbalism(Player player) {
         return player.hasPermission("mcmmo.skills.herbalism");
     }
+
     public boolean excavation(Player player) {
         return player.hasPermission("mcmmo.skills.excavation");
     }
+
     public boolean swords(Player player) {
         return player.hasPermission("mcmmo.skills.swords");
     }
+
     public boolean axes(Player player) {
         return player.hasPermission("mcmmo.skills.axes");
     }
+
     public boolean acrobatics(Player player) {
         return player.hasPermission("mcmmo.skills.acrobatics");
     }

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

@@ -1,19 +1,3 @@
-/*
-	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.party;
 
 import java.io.EOFException;
@@ -30,15 +14,14 @@ import java.util.Iterator;
 
 import org.bukkit.Bukkit;
 import org.bukkit.entity.Player;
+
 import com.gmail.nossr50.Users;
 import com.gmail.nossr50.mcMMO;
 import com.gmail.nossr50.datatypes.PlayerProfile;
 import com.gmail.nossr50.locale.mcLocale;
-import com.gmail.nossr50.spout.util.ArrayListString;
 
 
-public class Party 
-{
+public class Party {
 	/*
 	 * This file is part of mmoMinecraft (http://code.google.com/p/mmo-minecraft/).
 	 * 
@@ -145,22 +128,6 @@ public class Party
         }
     	return players;
     }
-    public ArrayListString getPartyMembersByName(Player player)
-    {
-    	ArrayListString players = new ArrayListString();
-    	
-    	for(Player p : Bukkit.getServer().getOnlinePlayers())
-        {
-        	if(p.isOnline())
-        	{
-                if(inSameParty(player, p))
-                {
-                	players.add(p.getName());
-                }
-            }
-        }
-    	return players;
-    }
     
     public void informPartyMembersOwnerChange(String newOwner) {
     	Player newOwnerPlayer = plugin.getServer().getPlayer(newOwner);
@@ -410,7 +377,7 @@ public class Party
 				ObjectInputStream obj = new ObjectInputStream(new FileInputStream(partyPlayersFile));
 				this.partyPlayers = (HashMap<String, HashMap<String, Boolean>>)obj.readObject();
 			} catch (FileNotFoundException e) { e.printStackTrace();
-			} catch (EOFException e) { mcMMO.log.info("partyPlayersFile empty.");
+			} catch (EOFException e) { Bukkit.getLogger().info("partyPlayersFile empty.");
 			} catch (IOException e) { e.printStackTrace();
 			} catch (ClassNotFoundException e) { e.printStackTrace(); }
     	}
@@ -420,7 +387,7 @@ public class Party
 				ObjectInputStream obj = new ObjectInputStream(new FileInputStream(partyLocksFile));
 				this.partyLocks = (HashMap<String, Boolean>)obj.readObject();
 			} catch (FileNotFoundException e) { e.printStackTrace();
-			} catch (EOFException e) { mcMMO.log.info("partyLocksFile empty.");
+			} catch (EOFException e) { Bukkit.getLogger().info("partyLocksFile empty.");
 			} catch (IOException e) { e.printStackTrace();
 			} catch (ClassNotFoundException e) { e.printStackTrace(); }
     	}
@@ -430,7 +397,7 @@ public class Party
 				ObjectInputStream obj = new ObjectInputStream(new FileInputStream(partyPasswordsFile));
 				this.partyPasswords = (HashMap<String, String>)obj.readObject();
 			} catch (FileNotFoundException e) { e.printStackTrace();
-			} catch (EOFException e) { mcMMO.log.info("partyPasswordsFile empty.");
+			} catch (EOFException e) { Bukkit.getLogger().info("partyPasswordsFile empty.");
 			} catch (IOException e) { e.printStackTrace();
 			} catch (ClassNotFoundException e) { e.printStackTrace(); }
     	}

src/main/java/com/gmail/nossr50/runnables/ChangeDataValueTimer.java

@@ -1,47 +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.runnables;
-
-import org.bukkit.block.Block;
-
-import com.gmail.nossr50.mcMMO;
-
-/*
- * This file was created for a breakage introduced in 1.1-R2
- * It should be removed afterwards if the breakage is removed.
- */
-public class ChangeDataValueTimer implements Runnable {
-	private mcMMO plugin;
-	
-	public ChangeDataValueTimer(mcMMO instance) {
-		this.plugin = instance;
-	}
-	
-	public void run() {
-		int size = plugin.changeQueue.size();
-		if(size == 0) return;
-		if(size > 25) {
-			size = (int) Math.floor(size / 10);
-		}
-		
-		for(int i = 0; i < size; i++) {
-			Block change = plugin.changeQueue.poll();
-			if(change == null) continue;
-			change.setData((byte) 5);
-		}
-	}
-}

src/main/java/com/gmail/nossr50/runnables/GainXp.java

@@ -0,0 +1,45 @@
+package com.gmail.nossr50.runnables;
+
+import org.bukkit.entity.LivingEntity;
+import org.bukkit.entity.Player;
+
+import com.gmail.nossr50.datatypes.PlayerProfile;
+import com.gmail.nossr50.datatypes.SkillType;
+import com.gmail.nossr50.skills.Skills;
+
+public class GainXp implements Runnable {
+    private Player player = null;
+    private PlayerProfile PP = null;
+    private double baseXp = 0;
+    private SkillType skillType = null;
+    private LivingEntity target = null;
+    private int baseHealth = 0;
+
+    public GainXp(Player player, PlayerProfile PP, SkillType skillType, double baseXp, LivingEntity target) {
+        this.player = player;
+        this.PP = PP;
+        this.skillType = skillType;
+        this.baseXp = baseXp;
+        this.target = target;
+        baseHealth = target.getHealth();
+    }
+
+    @Override
+    public void run() {
+        int health = target.getHealth();
+        int damage =  baseHealth - health;
+
+        //May avoid negative xp, we don't know what other plugins do with the entity health
+        if (damage <= 0) {
+            return;
+        }
+
+        //Don't reward the player for overkills
+        if (health < 0) {
+            damage += health;
+        }
+
+        PP.addXP(skillType, (int) (damage * baseXp), player);
+        Skills.XpCheckSkill(skillType, player);
+    }
+}

src/main/java/com/gmail/nossr50/runnables/GreenThumbTimer.java

@@ -0,0 +1,42 @@
+package com.gmail.nossr50.runnables;
+
+import org.bukkit.CropState;
+import org.bukkit.Material;
+import org.bukkit.block.Block;
+
+import com.gmail.nossr50.datatypes.PlayerProfile;
+import com.gmail.nossr50.datatypes.SkillType;
+
+public class GreenThumbTimer implements Runnable {
+    private Block block;
+    private PlayerProfile PP;
+
+    public GreenThumbTimer(Block block, PlayerProfile PP) {
+        this.block = block;
+        this.PP = PP;
+    }
+
+    @Override
+    public void run() {
+        block.setType(Material.CROPS);
+
+        //This replants the wheat at a certain stage in development based on Herbalism Skill
+        if (!PP.getGreenTerraMode()) {
+            if (PP.getSkillLevel(SkillType.HERBALISM) >= 600) {
+                block.setData(CropState.MEDIUM.getData());
+            }
+            else if (PP.getSkillLevel(SkillType.HERBALISM) >= 400) {
+                block.setData(CropState.SMALL.getData());
+            }
+            else if (PP.getSkillLevel(SkillType.HERBALISM) >= 200) {
+                block.setData(CropState.VERY_SMALL.getData());
+            }
+            else {
+                block.setData(CropState.GERMINATED.getData());
+            }
+        }
+        else {
+            block.setData(CropState.MEDIUM.getData());
+        }
+    }
+}

src/main/java/com/gmail/nossr50/runnables/RemoveProfileFromMemoryTask.java

@@ -0,0 +1,19 @@
+package com.gmail.nossr50.runnables;
+
+import org.bukkit.entity.Player;
+
+import com.gmail.nossr50.Users;
+
+public class RemoveProfileFromMemoryTask implements Runnable {
+	private Player player;
+
+	public RemoveProfileFromMemoryTask(Player player) {
+		this.player = player;
+	}
+
+	@Override
+	public void run() {
+	    Users.getProfile(player.getName()).save(); //We save here so players don't quit/reconnect to cause lag
+		Users.removeUserByName(player.getName());
+	}
+}

src/main/java/com/gmail/nossr50/runnables/SQLConversionTask.java

@@ -0,0 +1,284 @@
+package com.gmail.nossr50.runnables;
+
+import java.io.BufferedReader;
+import java.io.FileReader;
+
+import org.bukkit.Bukkit;
+
+import com.gmail.nossr50.m;
+import com.gmail.nossr50.mcMMO;
+import com.gmail.nossr50.config.LoadProperties;
+
+public class SQLConversionTask implements Runnable {
+    public SQLConversionTask() {}
+
+    @Override
+    public void run() {
+        String location = "plugins/mcMMO/FlatFileStuff/mcmmo.users";
+
+        try {
+            FileReader file = new FileReader(location);
+            BufferedReader in = new BufferedReader(file);
+            String line = "";
+            String playerName = null;
+            String party = null;
+            String mining = null;
+            String woodcutting = null;
+            String repair = null;
+            String unarmed = null;
+            String herbalism = null;
+            String excavation = null;
+            String archery = null;
+            String swords = null;
+            String axes = null;
+            String acrobatics = null;
+            String taming = null;
+            String fishing = null;
+            String miningXP = null;
+            String woodCuttingXP = null;
+            String repairXP = null;
+            String unarmedXP = null;
+            String herbalismXP = null;
+            String excavationXP = null;
+            String archeryXP = null;
+            String swordsXP = null;
+            String axesXP = null;
+            String acrobaticsXP = null;
+            String tamingXP = null;
+            String fishingXP = null;
+            int id = 0;
+            int theCount = 0;
+
+            while ((line = in.readLine()) != null) {
+
+                //Find if the line contains the player we want.
+                String[] character = line.split(":");
+                playerName = character[0];
+
+                //Check for things we don't want put in the DB
+                if (playerName == null || playerName.equals("null") || playerName.equals("#Storage place for user information")) {
+                    continue;
+                }
+
+                if (character.length > 1) {
+                    mining = character[1];
+                }
+
+                if (character.length > 3) {
+                    party = character[3];
+                }
+
+                if (character.length > 4) {
+                    miningXP = character[4];
+                }
+
+                if (character.length > 5) {
+                    woodcutting = character[5];
+                }
+
+                if (character.length > 6) {
+                    woodCuttingXP = character[6];
+                }
+
+                if (character.length > 7) {
+                    repair = character[7];
+                }
+
+                if (character.length > 8) {
+                    unarmed = character[8];
+                }
+
+                if (character.length > 9) {
+                    herbalism = character[9];
+                }
+
+                if (character.length > 10) {
+                    excavation = character[10];
+                }
+
+                if (character.length > 11) {
+                    archery = character[11];
+                }
+
+                if (character.length > 12) {
+                    swords = character[12];
+                }
+
+                if (character.length > 13) {
+                    axes = character[13];
+                }
+
+                if (character.length > 14) {
+                    acrobatics = character[14];
+                }
+
+                if (character.length > 15) {
+                    repairXP = character[15];
+                }
+
+                if (character.length > 16) {
+                    unarmedXP = character[16];
+                }
+
+                if (character.length > 17) {
+                    herbalismXP = character[17];
+                }
+
+                if (character.length > 18) {
+                    excavationXP = character[18];
+                }
+
+                if (character.length > 19) {
+                    archeryXP = character[19];
+                }
+
+                if (character.length > 20) {
+                    swordsXP = character[20];
+                }
+
+                if (character.length > 21) {
+                    axesXP = character[21];
+                }
+
+                if (character.length > 22) {
+                    acrobaticsXP = character[22];
+                }
+
+                if (character.length > 24) {
+                    taming = character[24];
+                }
+
+                if (character.length > 25) {
+                    tamingXP = character[25];
+                }
+
+                if (character.length > 34) {
+                    fishing = character[34];
+                }
+
+                if (character.length > 35) {
+                    fishingXP = character[35];
+                }
+
+                //Check to see if the user is in the DB
+                id = mcMMO.database.getInt("SELECT id FROM "
+                        + LoadProperties.MySQLtablePrefix
+                        + "users WHERE user = '" + playerName + "'");
+
+                if (id > 0) {
+                    theCount++;
+
+                    //Update the skill values
+                    mcMMO.database.write("UPDATE "
+                            + LoadProperties.MySQLtablePrefix
+                            + "users SET lastlogin = " + 0
+                            + " WHERE id = " + id);
+                    mcMMO.database.write("UPDATE "
+                            + LoadProperties.MySQLtablePrefix
+                            + "skills SET " + "  taming = taming+"
+                            + m.getInt(taming) + ", mining = mining+"
+                            + m.getInt(mining) + ", repair = repair+"
+                            + m.getInt(repair)
+                            + ", woodcutting = woodcutting+"
+                            + m.getInt(woodcutting)
+                            + ", unarmed = unarmed+" + m.getInt(unarmed)
+                            + ", herbalism = herbalism+"
+                            + m.getInt(herbalism)
+                            + ", excavation = excavation+"
+                            + m.getInt(excavation)
+                            + ", archery = archery+" + m.getInt(archery)
+                            + ", swords = swords+" + m.getInt(swords)
+                            + ", axes = axes+" + m.getInt(axes)
+                            + ", acrobatics = acrobatics+"
+                            + m.getInt(acrobatics)
+                            + ", fishing = fishing+" + m.getInt(fishing)
+                            + " WHERE user_id = " + id);
+                    mcMMO.database.write("UPDATE "
+                            + LoadProperties.MySQLtablePrefix
+                            + "experience SET " + "  taming = "
+                            + m.getInt(tamingXP) + ", mining = "
+                            + m.getInt(miningXP) + ", repair = "
+                            + m.getInt(repairXP) + ", woodcutting = "
+                            + m.getInt(woodCuttingXP) + ", unarmed = "
+                            + m.getInt(unarmedXP) + ", herbalism = "
+                            + m.getInt(herbalismXP) + ", excavation = "
+                            + m.getInt(excavationXP) + ", archery = "
+                            + m.getInt(archeryXP) + ", swords = "
+                            + m.getInt(swordsXP) + ", axes = "
+                            + m.getInt(axesXP) + ", acrobatics = "
+                            + m.getInt(acrobaticsXP) + ", fishing = "
+                            + m.getInt(fishingXP) + " WHERE user_id = "
+                            + id);
+                }
+                else {
+                    theCount++;
+
+                    //Create the user in the DB
+                    mcMMO.database.write("INSERT INTO "
+                            + LoadProperties.MySQLtablePrefix
+                            + "users (user, lastlogin) VALUES ('"
+                            + playerName + "',"
+                            + System.currentTimeMillis() / 1000 + ")");
+                    id = mcMMO.database.getInt("SELECT id FROM "
+                                    + LoadProperties.MySQLtablePrefix
+                                    + "users WHERE user = '"
+                                    + playerName + "'");
+                    mcMMO.database.write("INSERT INTO "
+                            + LoadProperties.MySQLtablePrefix
+                            + "skills (user_id) VALUES (" + id + ")");
+                    mcMMO.database.write("INSERT INTO "
+                            + LoadProperties.MySQLtablePrefix
+                            + "experience (user_id) VALUES (" + id
+                            + ")");
+                    //Update the skill values
+                    mcMMO.database.write("UPDATE "
+                            + LoadProperties.MySQLtablePrefix
+                            + "users SET lastlogin = " + 0
+                            + " WHERE id = " + id);
+                    mcMMO.database.write("UPDATE "
+                            + LoadProperties.MySQLtablePrefix
+                            + "users SET party = '" + party
+                            + "' WHERE id = " + id);
+                    mcMMO.database.write("UPDATE "
+                            + LoadProperties.MySQLtablePrefix
+                            + "skills SET " + "  taming = "
+                            + m.getInt(taming) + ", mining = "
+                            + m.getInt(mining) + ", repair = "
+                            + m.getInt(repair) + ", woodcutting = "
+                            + m.getInt(woodcutting) + ", unarmed = "
+                            + m.getInt(unarmed) + ", herbalism = "
+                            + m.getInt(herbalism) + ", excavation = "
+                            + m.getInt(excavation) + ", archery = "
+                            + m.getInt(archery) + ", swords = "
+                            + m.getInt(swords) + ", axes = "
+                            + m.getInt(axes) + ", acrobatics = "
+                            + m.getInt(acrobatics) + ", fishing = "
+                            + m.getInt(fishing) + " WHERE user_id = "
+                            + id);
+                    mcMMO.database.write("UPDATE "
+                            + LoadProperties.MySQLtablePrefix
+                            + "experience SET " + "  taming = "
+                            + m.getInt(tamingXP) + ", mining = "
+                            + m.getInt(miningXP) + ", repair = "
+                            + m.getInt(repairXP) + ", woodcutting = "
+                            + m.getInt(woodCuttingXP) + ", unarmed = "
+                            + m.getInt(unarmedXP) + ", herbalism = "
+                            + m.getInt(herbalismXP) + ", excavation = "
+                            + m.getInt(excavationXP) + ", archery = "
+                            + m.getInt(archeryXP) + ", swords = "
+                            + m.getInt(swordsXP) + ", axes = "
+                            + m.getInt(axesXP) + ", acrobatics = "
+                            + m.getInt(acrobaticsXP) + ", fishing = "
+                            + m.getInt(fishingXP) + " WHERE user_id = "
+                            + id);
+                }
+            }
+
+            System.out.println("[mcMMO] MySQL Updated from users file, " + theCount + " items added/updated to MySQL DB");
+            in.close();
+        }
+        catch (Exception e) {
+            Bukkit.getLogger().severe("Exception while reading " + location + " (Are you sure you formatted it correctly?)" + e.toString());
+        }
+    }
+}

src/main/java/com/gmail/nossr50/runnables/mcBleedTimer.java

@@ -0,0 +1,142 @@
+package com.gmail.nossr50.runnables;
+
+import java.util.HashSet;
+
+import org.bukkit.entity.LivingEntity;
+import org.bukkit.entity.Player;
+
+import com.gmail.nossr50.Combat;
+import com.gmail.nossr50.Users;
+import com.gmail.nossr50.mcMMO;
+import com.gmail.nossr50.datatypes.PlayerProfile;
+import com.gmail.nossr50.locale.mcLocale;
+
+public class mcBleedTimer implements Runnable {
+    private final mcMMO plugin;
+
+    private static HashSet<LivingEntity> bleedList = new HashSet<LivingEntity>();
+    private static HashSet<LivingEntity> bleedAddList = new HashSet<LivingEntity>();
+    private static HashSet<LivingEntity> bleedRemoveList = new HashSet<LivingEntity>();
+
+    private static boolean lock = false;
+
+    public mcBleedTimer(final mcMMO plugin) {
+        this.plugin = plugin;
+    }
+
+    @Override
+    public void run() {
+        updateBleedList();
+
+        // Player bleed simulation
+        for (Player player : plugin.getServer().getOnlinePlayers()) {
+            if (player == null) {
+                continue;
+            }
+
+            PlayerProfile PP = Users.getProfile(player);
+            if (PP == null) {
+                continue;
+            }
+
+            if (PP.getBleedTicks() >= 1) {
+
+                //Never kill with Bleeding
+                if (player.getHealth() - 2 < 0) {
+                    if (player.getHealth() - 1 > 0) {
+                        Combat.dealDamage(player, 1);
+                    }
+                }
+                else {
+                    Combat.dealDamage(player, 2);
+                }
+
+                PP.decreaseBleedTicks();
+                
+                if (PP.getBleedTicks() == 0) {
+                    player.sendMessage(mcLocale.getString("Swords.StoppedBleeding"));
+                }
+            }
+        }
+
+        // Non-player bleed simulation
+        bleedSimulate();
+    }
+
+    private void bleedSimulate() {
+        lock = true;
+
+        // Bleed monsters/animals
+        for (LivingEntity entity : bleedList) {
+            if ((entity == null || entity.isDead())) {
+                remove(entity);
+                continue;
+            }
+            else {
+                Combat.dealDamage(entity, 2);
+            }
+        }
+
+        // Unlock list now that we are done
+        lock = false;
+    }
+
+    private void updateBleedList() {
+        if (lock) {
+            plugin.getLogger().warning("mcBleedTimer attempted to update the bleedList but the list was locked!");
+        }
+        else {
+            bleedList.removeAll(bleedRemoveList);
+            bleedRemoveList.clear();
+
+            bleedList.addAll(bleedAddList);
+            bleedAddList.clear();
+        }
+    }
+
+    /**
+     * Remove a LivingEntity from the bleedList if it is in it
+     * 
+     * @param entity LivingEntity to remove
+     */
+    public static void remove(LivingEntity entity) {
+        if (lock) {
+            if (!bleedRemoveList.contains(entity)) {
+                bleedRemoveList.add(entity);
+            }
+        }
+        else {
+            if (bleedList.contains(entity)) {
+                bleedList.remove(entity);
+            }
+        }
+    }
+
+    /**
+     * Add a LivingEntity to the bleedList if it is not in it.
+     *
+     * @param entity LivingEntity to add
+     */
+    public static void add(LivingEntity entity) {
+        if (lock) {
+            if (!bleedAddList.contains(entity)) {
+                bleedAddList.add(entity);
+            }
+        }
+        else {
+            if (!bleedList.contains(entity)){
+                bleedList.add(entity);
+            }
+        }
+    }
+
+    /**
+     * Check to see if a LivingEntity is in the bleedList
+     * 
+     * @param entity LivingEntity to check if in the bleedList
+     * @return true if in the list, false if not
+     */
+    public static boolean contains(LivingEntity entity) {
+        return (bleedList.contains(entity) || bleedAddList.contains(entity));
+    }
+}

src/main/java/com/gmail/nossr50/runnables/mcSaveTimer.java

@@ -1,19 +1,3 @@
-/*
-    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.runnables;
 
 import org.bukkit.entity.Player;
@@ -29,6 +13,7 @@ public class mcSaveTimer implements Runnable {
         this.plugin = plugin;
     }
     
+    @Override
     public void run() 
     {
         //All player data will be saved periodically through this

src/main/java/com/gmail/nossr50/runnables/mcTimer.java

@@ -1,34 +1,17 @@
-/*
-	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.runnables;
+
 import org.bukkit.entity.*;
 
-import com.gmail.nossr50.Combat;
 import com.gmail.nossr50.Users;
 import com.gmail.nossr50.mcMMO;
+import com.gmail.nossr50.datatypes.AbilityType;
 import com.gmail.nossr50.datatypes.PlayerProfile;
+import com.gmail.nossr50.datatypes.SkillType;
 import com.gmail.nossr50.skills.Skills;
-import com.gmail.nossr50.skills.Swords;
-
 
 public class mcTimer implements Runnable
 {
 	private final mcMMO plugin;
-	int thecount = 1;
 
     public mcTimer(final mcMMO plugin) 
     {
@@ -50,33 +33,25 @@ public class mcTimer implements Runnable
 			/*
 			 * MONITOR SKILLS
 			 */
-			Skills.monitorSkills(player, PP, curTime);
+			Skills.monitorSkill(player, PP, curTime, SkillType.AXES);
+			Skills.monitorSkill(player, PP, curTime, SkillType.EXCAVATION);
+			Skills.monitorSkill(player, PP, curTime, SkillType.HERBALISM);
+			Skills.monitorSkill(player, PP, curTime, SkillType.MINING);
+			Skills.monitorSkill(player, PP, curTime, SkillType.SWORDS);
+			Skills.monitorSkill(player, PP, curTime, SkillType.UNARMED);
+			Skills.monitorSkill(player, PP, curTime, SkillType.WOODCUTTING);
 			
 			/*
 			 * COOLDOWN MONITORING
 			 */
-			Skills.watchCooldowns(player, PP, curTime);
-			
-			/*
-			 * PLAYER BLEED MONITORING
-			 */
-			if(thecount % 2 == 0 && PP.getBleedTicks() >= 1)
-			{
-        		Combat.dealDamage(player, 2);
-        		PP.decreaseBleedTicks();
-        	}
-		
-			/*
-			 * NON-PLAYER BLEED MONITORING
-			 */
-			
-			if(thecount % 2 == 0)
-				Swords.bleedSimulate(plugin);
-			
-			//SETUP FOR HP REGEN/BLEED
-			thecount++;
-			if(thecount >= 81)
-				thecount = 1;
+			Skills.watchCooldown(player, PP, curTime, AbilityType.SKULL_SPLIITER);
+			Skills.watchCooldown(player, PP, curTime, AbilityType.GIGA_DRILL_BREAKER);
+			Skills.watchCooldown(player, PP, curTime, AbilityType.GREEN_TERRA);
+			Skills.watchCooldown(player, PP, curTime, AbilityType.SUPER_BREAKER);
+			Skills.watchCooldown(player, PP, curTime, AbilityType.SERRATED_STRIKES);
+			Skills.watchCooldown(player, PP, curTime, AbilityType.BERSERK);
+			Skills.watchCooldown(player, PP, curTime, AbilityType.TREE_FELLER);
+			Skills.watchCooldown(player, PP, curTime, AbilityType.BLAST_MINING);
 		}
 	}
 }

src/main/java/com/gmail/nossr50/skills/Acrobatics.java

@@ -1,105 +1,125 @@
-/*
-	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.skills;
 
-import org.bukkit.ChatColor;
 import org.bukkit.entity.Player;
 import org.bukkit.event.entity.EntityDamageByEntityEvent;
 import org.bukkit.event.entity.EntityDamageEvent;
 
 import com.gmail.nossr50.Users;
+import com.gmail.nossr50.m;
 import com.gmail.nossr50.mcPermissions;
 import com.gmail.nossr50.datatypes.PlayerProfile;
 import com.gmail.nossr50.datatypes.SkillType;
-
+import com.gmail.nossr50.locale.mcLocale;
+import com.gmail.nossr50.party.Party;
 
 public class Acrobatics {
-	public static void acrobaticsCheck(Player player, EntityDamageEvent event)
-	{
-    	if(player != null && mcPermissions.getInstance().acrobatics(player))
-    	{
-    		PlayerProfile PP = Users.getProfile(player);
-    		int acrovar = PP.getSkillLevel(SkillType.ACROBATICS);
-    		
-    		if(player.isSneaking())
-    			acrovar = acrovar * 2;
-    		
-			if(Math.random() * 1000 <= acrovar && !event.isCancelled())
-			{
-				int threshold = 7;
-				if(player.isSneaking())
-					threshold = 14;
-				
-				int newDamage = event.getDamage() - threshold;
-				if(newDamage < 0)
-					newDamage = 0;
-				/*
-				 * Check for death
-				 */
-				if(player.getHealth() - newDamage >= 1){
-					if(!event.isCancelled())
-						PP.addXP(SkillType.ACROBATICS, (event.getDamage() * 8)*10, player);
-					Skills.XpCheckSkill(SkillType.ACROBATICS, player);
-					event.setDamage(newDamage);
-					if(event.getDamage() <= 0)
-						event.setCancelled(true);
-					if(player.isSneaking()){
-						player.sendMessage(ChatColor.GREEN+"**GRACEFUL ROLL**");
-					} else {
-						player.sendMessage("**ROLL**");
-					}
-				}
-			} else if (!event.isCancelled()){
-				if(player.getHealth() - event.getDamage() >= 1){
-					PP.addXP(SkillType.ACROBATICS, (event.getDamage() * 12)*10, player);
-					Skills.XpCheckSkill(SkillType.ACROBATICS, player);
-				}
-			}
-    	}
+
+    /**
+     * Check for fall damage reduction.
+     *
+     * @param player The player whose fall damage to modify
+     * @param event The event to check
+     */
+    public static void acrobaticsCheck(Player player, EntityDamageEvent event) {
+        final int ROLL_XP_MODIFIER = 80;
+        final int FALL_XP_MODIFIER = 120;
+        final int MAX_BONUS_LEVEL = 1000;
+
+        PlayerProfile PP = Users.getProfile(player);
+        int acrovar = PP.getSkillLevel(SkillType.ACROBATICS);
+        boolean gracefulRoll = player.isSneaking();
+        int damage = event.getDamage();
+        int health = player.getHealth();
+
+        if (!mcPermissions.getInstance().gracefulRoll(player)) {
+            gracefulRoll = false;
+        }
+
+        if (gracefulRoll) {
+            acrovar = acrovar * 2;
+        }
+
+        if ((acrovar > MAX_BONUS_LEVEL || Math.random() * 1000 <= acrovar) && mcPermissions.getInstance().roll(player)) {
+            int threshold = 7;
+
+            if (gracefulRoll) {
+                threshold = threshold * 2;
+            }
+
+            int newDamage = damage - threshold;
+
+            if (newDamage < 0) {
+                newDamage = 0;
+            }
+
+            /* Check for death */
+            if (health - damage >= 1) {
+                PP.addXP(SkillType.ACROBATICS, damage * ROLL_XP_MODIFIER, player);
+                Skills.XpCheckSkill(SkillType.ACROBATICS, player);
+
+                event.setDamage(newDamage);
+
+                if (event.getDamage() <= 0) {
+                    event.setCancelled(true);
+                }
+
+                if (gracefulRoll) {
+                    player.sendMessage(mcLocale.getString("Acrobatics.GracefulRoll"));
+                }
+                else {
+                    player.sendMessage(mcLocale.getString("Acrobatics.Roll"));
+                }
+            }
+        }
+        else if (health - damage >= 1) {
+            PP.addXP(SkillType.ACROBATICS, event.getDamage() * FALL_XP_MODIFIER, player);
+            Skills.XpCheckSkill(SkillType.ACROBATICS, player);
+        }
+    }
+
+    /**
+     * Check for dodge damage reduction.
+     *
+     * @param event The event to check
+     */
+    public static void dodgeChecks(EntityDamageByEntityEvent event) {
+        final int DODGE_MODIFIER = 120;
+        final int MAX_BONUS_LEVEL = 800;
+
+        Player defender = (Player) event.getEntity();
+        PlayerProfile PPd = Users.getProfile(defender);
+        int damage = event.getDamage();
+
+        /* PARTY CHECK */
+        if (event.getDamager() instanceof Player) {
+            Player attacker = (Player) event.getDamager();
+
+            if (Party.getInstance().inSameParty(defender, attacker)) {
+                return;
+            }
+        }
+
+        if (mcPermissions.getInstance().acrobatics(defender)) {
+            int skillLevel = PPd.getSkillLevel(SkillType.ACROBATICS);
+            int skillCheck = m.skillCheck(skillLevel, MAX_BONUS_LEVEL);
+
+            if (Math.random() * 4000 <= skillCheck && mcPermissions.getInstance().dodge(defender)) {
+                defender.sendMessage(mcLocale.getString("Acrobatics.Dodge"));
+
+                if (System.currentTimeMillis() >= (5000 + PPd.getRespawnATS()) && defender.getHealth() >= 1) {
+                    PPd.addXP(SkillType.ACROBATICS, damage * DODGE_MODIFIER, defender);
+                    Skills.XpCheckSkill(SkillType.ACROBATICS, defender);
+                }
+
+                int newDamage = damage / 2;
+
+                if (newDamage <= 0) {
+                    event.setDamage(1);
+                }
+                else {
+                    event.setDamage(newDamage);
+                }
+            }
+        }
     }
-	public static void dodgeChecks(EntityDamageByEntityEvent event){
-		Player defender = (Player) event.getEntity();
-		PlayerProfile PPd = Users.getProfile(defender);
-		
-		if(mcPermissions.getInstance().acrobatics(defender)){
-			if(PPd.getSkillLevel(SkillType.ACROBATICS) <= 800){
-	    		if(Math.random() * 4000 <= PPd.getSkillLevel(SkillType.ACROBATICS)){
-	    			defender.sendMessage(ChatColor.GREEN+"**DODGE**");
-	    			if(System.currentTimeMillis() >= 5000 + PPd.getRespawnATS() && defender.getHealth() >= 1){
-	    				PPd.addXP(SkillType.ACROBATICS, (event.getDamage() * 12)*1, defender);
-	    				Skills.XpCheckSkill(SkillType.ACROBATICS, defender);
-	    			}
-	    			event.setDamage(event.getDamage() / 2);
-	    			//Needs to do minimal damage
-	    			if(event.getDamage() <= 0)
-	    				event.setDamage(1);
-	    		}
-			} else if(Math.random() * 4000 <= 800) {
-				defender.sendMessage(ChatColor.GREEN+"**DODGE**");
-				if(System.currentTimeMillis() >= 5000 + PPd.getRespawnATS() && defender.getHealth() >= 1){
-					PPd.addXP(SkillType.ACROBATICS, (event.getDamage() * 12)*10, defender);
-					Skills.XpCheckSkill(SkillType.ACROBATICS, defender);
-				}
-				event.setDamage(event.getDamage() / 2);
-				//Needs to deal minimal damage
-				if(event.getDamage() <= 0)
-					event.setDamage(1);
-			}
-		}
-	}
-	
 }

src/main/java/com/gmail/nossr50/skills/Alchemy.java

@@ -1,5 +0,0 @@
-package com.gmail.nossr50.skills;
-
-public class Alchemy {
-
-}

src/main/java/com/gmail/nossr50/skills/Archery.java

@@ -1,119 +1,124 @@
-/*
-	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.skills;
 
 import org.bukkit.Location;
+import org.bukkit.Material;
 import org.bukkit.entity.Entity;
 import org.bukkit.entity.Player;
-import org.bukkit.event.entity.EntityDamageByEntityEvent;
+import org.bukkit.inventory.ItemStack;
+
 import com.gmail.nossr50.Users;
+import com.gmail.nossr50.m;
 import com.gmail.nossr50.mcMMO;
+import com.gmail.nossr50.mcPermissions;
 import com.gmail.nossr50.datatypes.PlayerProfile;
 import com.gmail.nossr50.datatypes.SkillType;
 import com.gmail.nossr50.locale.mcLocale;
 import com.gmail.nossr50.party.Party;
 
-public class Archery 
-{
-	public static void trackArrows(mcMMO pluginx, Entity x, EntityDamageByEntityEvent event, Player attacker)
-	{
-		PlayerProfile PPa = Users.getProfile(attacker);
-		if(!pluginx.misc.arrowTracker.containsKey(x) && event.getDamage() > 0)
-		{
-			pluginx.misc.arrowTracker.put(x, 0);
-			if(attacker != null)
-			{
-				if(PPa.getSkillLevel(SkillType.ARCHERY) > 1000 || (Math.random() * 1000 <= PPa.getSkillLevel(SkillType.ARCHERY)))
-				{
-					pluginx.misc.arrowTracker.put(x, 1);
-				}
-			}
-		} else 
-		{
-			if(event.getDamage() > 0)
-			{
-				if(attacker != null)
-				{
-				    if(PPa.getSkillLevel(SkillType.ARCHERY) > 1000 || (Math.random() * 1000 <= PPa.getSkillLevel(SkillType.ARCHERY)))
-					{
-						pluginx.misc.arrowTracker.put(x, 1);
-					}
-				}
-			}
-		}
-	}
-	public static void ignitionCheck(Entity x, EntityDamageByEntityEvent event, Player attacker)
-	{
-		//Check to see if PVP for this world is disabled before executing
-		if(!x.getWorld().getPVP())
-			return;
-		
-		PlayerProfile PPa = Users.getProfile(attacker);
-		if(Math.random() * 100 >= 75)
-		{
-			
-			int ignition = 20;	
-			if(PPa.getSkillLevel(SkillType.ARCHERY) >= 200)
-				ignition+=20;
-			if(PPa.getSkillLevel(SkillType.ARCHERY) >= 400)
-				ignition+=20;
-			if(PPa.getSkillLevel(SkillType.ARCHERY) >= 600)
-				ignition+=20;
-			if(PPa.getSkillLevel(SkillType.ARCHERY) >= 800)
-				ignition+=20;
-			if(PPa.getSkillLevel(SkillType.ARCHERY) >= 1000)
-				ignition+=20;
-			
-			if(x instanceof Player)
-			{
-				Player Defender = (Player)x;
-				if(!Party.getInstance().inSameParty(attacker, Defender))
-				{
-					event.getEntity().setFireTicks(ignition);
-					attacker.sendMessage(mcLocale.getString("Combat.Ignition")); //$NON-NLS-1$
-					Defender.sendMessage(mcLocale.getString("Combat.BurningArrowHit")); //$NON-NLS-1$
-				}
-			} else {
-			event.getEntity().setFireTicks(ignition);
-			attacker.sendMessage(mcLocale.getString("Combat.Ignition")); //$NON-NLS-1$
-			}
-		}
-	}
-	public static void dazeCheck(Player defender, Player attacker)
-	{
-		PlayerProfile PPa = Users.getProfile(attacker);
-		
-		Location loc = defender.getLocation();
-		if(Math.random() * 10 > 5)
-		{
-		loc.setPitch(90);
-		} else {
-			loc.setPitch(-90);
-		}
-		if(PPa.getSkillLevel(SkillType.ARCHERY) >= 1000){
-			if(Math.random() * 1000 <= 500){
-				defender.teleport(loc);
-				defender.sendMessage(mcLocale.getString("Combat.TouchedFuzzy")); //$NON-NLS-1$
-				attacker.sendMessage(mcLocale.getString("Combat.TargetDazed")); //$NON-NLS-1$ //$NON-NLS-2$
-			}
-		} else if(Math.random() * 2000 <= PPa.getSkillLevel(SkillType.ARCHERY)){
-			defender.teleport(loc);
-			defender.sendMessage(mcLocale.getString("Combat.TouchedFuzzy")); //$NON-NLS-1$
-			attacker.sendMessage(mcLocale.getString("Combat.TargetDazed")); //$NON-NLS-1$ //$NON-NLS-2$
-		}
-	}
+public class Archery {
+
+    /**
+     * Track arrows fired for later retrieval.
+     *
+     * @param plugin mcMMO plugin instance
+     * @param entity Entity damaged by the arrow
+     * @param PPa PlayerProfile of the player firing the arrow
+     */
+    public static void trackArrows(mcMMO plugin, Entity entity, PlayerProfile PPa) {
+        final int MAX_BONUS_LEVEL = 1000;
+        int skillLevel = PPa.getSkillLevel(SkillType.ARCHERY);
+
+        if (!plugin.arrowTracker.containsKey(entity)) {
+            plugin.arrowTracker.put(entity, 0);
+        }
+
+        if (skillLevel > MAX_BONUS_LEVEL || (Math.random() * 1000 <= skillLevel)) {
+            plugin.arrowTracker.put(entity, 1);
+        }
+    }
+
+    /**
+     * Check for ignition on arrow hit.
+     *
+     * @param entity Entity damaged by the arrow
+     * @param attacker Player who fired the arrow
+     */
+    public static void ignitionCheck(Entity entity, Player attacker) {
+
+        //Check to see if PVP for this world is disabled before executing
+        if (!entity.getWorld().getPVP()) {
+            return;
+        }
+
+        final int IGNITION_CHANCE = 25;
+        final int MAX_IGNITION_TICKS = 120;
+
+        PlayerProfile PPa = Users.getProfile(attacker);
+
+        if (Math.random() * 100 <= IGNITION_CHANCE) {
+            int ignition = 20;
+
+            /* Add 20 ticks for every 200 skill levels */
+            ignition += (PPa.getSkillLevel(SkillType.ARCHERY) / 200) * 20;
+
+            if (ignition > MAX_IGNITION_TICKS) {
+                ignition = MAX_IGNITION_TICKS;
+            }
+
+            if (entity instanceof Player) {
+                Player defender = (Player) entity;
+
+                if (!Party.getInstance().inSameParty(attacker, defender)) {
+                    defender.setFireTicks(defender.getFireTicks() + ignition);
+                    attacker.sendMessage(mcLocale.getString("Combat.Ignition"));
+                    defender.sendMessage(mcLocale.getString("Combat.BurningArrowHit"));
+                }
+            }
+            else {
+                entity.setFireTicks(entity.getFireTicks() + ignition);
+                attacker.sendMessage(mcLocale.getString("Combat.Ignition"));
+            }
+        }
+    }
+
+    /**
+     * Check for Daze.
+     *
+     * @param defender Defending player
+     * @param attacker Attacking player
+     */
+    public static void dazeCheck(Player defender, Player attacker) {
+        final int MAX_BONUS_LEVEL = 1000;
+
+        int skillLevel = Users.getProfile(attacker).getSkillLevel(SkillType.ARCHERY);
+        Location loc = defender.getLocation();
+        int skillCheck = m.skillCheck(skillLevel, MAX_BONUS_LEVEL);
+
+        if (Math.random() * 10 > 5) {
+            loc.setPitch(90);
+        }
+        else {
+            loc.setPitch(-90);
+        }
+
+        if (Math.random() * 2000 <= skillCheck && mcPermissions.getInstance().daze(attacker)) {
+            defender.teleport(loc);
+            defender.sendMessage(mcLocale.getString("Combat.TouchedFuzzy"));
+            attacker.sendMessage(mcLocale.getString("Combat.TargetDazed"));
+        }
+    }
+
+    /**
+     * Check for arrow retrieval.
+     *
+     * @param entity The entity hit by the arrows
+     * @param plugin mcMMO plugin instance
+     */
+    public static void arrowRetrievalCheck(Entity entity, mcMMO plugin) {
+        if (plugin.arrowTracker.containsKey(entity)) {
+            m.mcDropItems(entity.getLocation(), new ItemStack(Material.ARROW), plugin.arrowTracker.get(entity));
+        }
+
+        plugin.arrowTracker.remove(entity);
+    }
 }

src/main/java/com/gmail/nossr50/skills/Axes.java

@@ -1,175 +1,159 @@
-/*
-	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.skills;
 
-import org.bukkit.ChatColor;
+import org.bukkit.entity.AnimalTamer;
 import org.bukkit.entity.Entity;
 import org.bukkit.entity.LivingEntity;
 import org.bukkit.entity.Player;
 import org.bukkit.entity.Wolf;
 import org.bukkit.event.entity.EntityDamageByEntityEvent;
-import org.bukkit.plugin.Plugin;
+import org.bukkit.inventory.ItemStack;
+import org.bukkit.inventory.PlayerInventory;
 
-import com.gmail.nossr50.locale.mcLocale;
-import com.gmail.nossr50.Combat;
 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.datatypes.AbilityType;
 import com.gmail.nossr50.datatypes.PlayerProfile;
 import com.gmail.nossr50.datatypes.SkillType;
+import com.gmail.nossr50.locale.mcLocale;
 import com.gmail.nossr50.party.Party;
 
 public class Axes {
-	public static void skullSplitterCheck(Player player){
-    	PlayerProfile PP = Users.getProfile(player);
-    	if(m.isAxes(player.getItemInHand()) && mcPermissions.getInstance().axesAbility(player)){
-    		/*
-    		 * CHECK FOR AXE PREP MODE
-    		 */
-    		if(PP.getAxePreparationMode())
-    		{
-    			PP.setAxePreparationMode(false);
-    		}
-    		int ticks = 2;
-    		int x = PP.getSkillLevel(SkillType.AXES);
-    		while(x >= 50){
-    			x-=50;
-    			ticks++;
-    		}
 
-    		if(!PP.getSkullSplitterMode() && Skills.cooldownOver(player, (PP.getSkillDATS(AbilityType.SKULL_SPLIITER)*1000), LoadProperties.skullSplitterCooldown))
-    		{
-    			player.sendMessage(mcLocale.getString("Skills.SkullSplitterOn"));
-    			for(Player y : player.getWorld().getPlayers()){
-	    			if(y != null && y != player && m.getDistance(player.getLocation(), y.getLocation()) < 10)
-	    				y.sendMessage(mcLocale.getString("Skills.SkullSplitterPlayer", new Object[] {player.getName()}));
-	    		}
-    			PP.setSkillDATS(AbilityType.SKULL_SPLIITER, System.currentTimeMillis()+(ticks*1000));
-    			PP.setSkullSplitterMode(true);
-    		}
-    		if(!PP.getSkullSplitterMode() && !Skills.cooldownOver(player, (PP.getSkillDATS(AbilityType.SKULL_SPLIITER)*1000), LoadProperties.skullSplitterCooldown)){
-    			player.sendMessage(mcLocale.getString("Skills.TooTired")
-    					+ChatColor.YELLOW+" ("+Skills.calculateTimeLeft(player, (PP.getSkillDATS(AbilityType.SKULL_SPLIITER)*1000), LoadProperties.skullSplitterCooldown)+"s)");
-    		}
-    	}
-    }
-	public static void axeCriticalCheck(Player attacker, EntityDamageByEntityEvent event, Plugin pluginx)
-	{
-    	Entity x = event.getEntity();
-    	
-    	if(x instanceof Wolf){
-    		Wolf wolf = (Wolf)x;
-    		if(Taming.getOwner(wolf, pluginx) != null)
-    		{
-	    		if(Taming.getOwner(wolf, pluginx) == attacker)
-	    			return;
-	    		if(Party.getInstance().inSameParty(attacker, Taming.getOwner(wolf, pluginx)))
-	    			return;
-    		}
-    	}
-    	PlayerProfile PPa = Users.getProfile(attacker);
-    	if(m.isAxes(attacker.getItemInHand()) && mcPermissions.getInstance().axes(attacker)){
-    		if(PPa.getSkillLevel(SkillType.AXES) >= 750){
-    			if(Math.random() * 1000 <= 750 && !x.isDead()){
-    				if(x instanceof Player){
-    					int damage = (event.getDamage() * 2) - (event.getDamage() / 2);
-    					event.setDamage(damage);
-    					Player player = (Player)x;
-    					player.sendMessage(ChatColor.DARK_RED + "You were CRITICALLY hit!");
-    				}
-    				else {
-    					int damage = event.getDamage() * 2;
-        				event.setDamage(damage);
-        			}
-    				attacker.sendMessage(ChatColor.RED+"CRITICAL HIT!");
-    			}
-    		} else if(Math.random() * 1000 <= PPa.getSkillLevel(SkillType.AXES) && !x.isDead()){
-    			if(x instanceof Player){
-    				int damage = (event.getDamage() * 2) - (event.getDamage() / 2);
-					event.setDamage(damage);
-    				Player player = (Player)x;
-    				player.sendMessage(ChatColor.DARK_RED + "You were CRITICALLY hit!");
-    			}
-    			else {
-    				int damage = event.getDamage() * 2;
-    				event.setDamage(damage);
-    			}
-				attacker.sendMessage(ChatColor.RED+"CRITICAL HIT!");
-    		}
-    	}
-    }
-	
-	public static void applyAoeDamage(Player attacker, EntityDamageByEntityEvent event, Plugin pluginx)
-	{
-		int targets = 0;
-    	
-    	if(event.getEntity() instanceof LivingEntity)
-    	{
-    		LivingEntity x = (LivingEntity) event.getEntity();
-	    	targets = m.getTier(attacker);
-	    	
-    	for(Entity derp : x.getNearbyEntities(2.5, 2.5, 2.5))
-    	{
-    			//Make sure the Wolf is not friendly
-    			if(derp instanceof Wolf)
-    			{
-					Wolf hurrDurr = (Wolf)derp;
-					if(Taming.getOwner(hurrDurr, pluginx) == attacker)
-						continue;
-					if(Party.getInstance().inSameParty(attacker, Taming.getOwner(hurrDurr, pluginx)))
-						continue;
-				}
-    			//Damage nearby LivingEntities
-    			if(derp instanceof LivingEntity && targets >= 1)
-    			{
-    				if(derp instanceof Player)
-	    			{
-	    				Player target = (Player)derp;
-	    				
-	    				if(Users.getProfile(target).getGodMode())
-	    					continue;
+    /**
+     * Apply bonus to damage done by axes.
+     *
+     * @param attacker The attacking player
+     * @param event The event to modify
+     */
+    public static void axesBonus(Player attacker, EntityDamageByEntityEvent event) {
+        final int MAX_BONUS = 4;
 
-	    				if(target.getName().equals(attacker.getName()))
-	    					continue;
-	    				
-	    				if(Party.getInstance().inSameParty(attacker, target))
-	    					continue;
-	    				
-	    				if(target.isDead())
-	    					continue;
-	    				
-	    				if(targets >= 1 && derp.getWorld().getPVP() && !target.isDead())
-	    				{
-	    					Combat.dealDamage(target, event.getDamage() / 2, attacker);
-	    					target.sendMessage(ChatColor.DARK_RED+"Struck by CLEAVE!");
-	    					targets--;
-	    					continue;
-	    				}
-	    			} 
-    				else
-	    			{			
-	    				LivingEntity target = (LivingEntity)derp;
-    					Combat.dealDamage(target, event.getDamage() / 2, attacker);
-	    				targets--;
-	    			}
-    			}
-    		}
-    	}
-	}
+        int bonus = 0;
+
+        /* Add 1 DMG for every 50 skill levels */
+        bonus += Users.getProfile(attacker).getSkillLevel(SkillType.AXES) / 50;
+
+        if (bonus > MAX_BONUS) {
+            bonus = MAX_BONUS;
+        }
+
+        event.setDamage(event.getDamage() + bonus);
+    }
+
+    /**
+     * Check for critical chances on axe damage.
+     *
+     * @param attacker The attacking player
+     * @param event The event to modify
+     */
+    public static void axeCriticalCheck(Player attacker, EntityDamageByEntityEvent event) {
+        Entity entity = event.getEntity();
+
+        if (entity instanceof Wolf) {
+            Wolf wolf = (Wolf) entity;
+
+            if (wolf.isTamed()) {
+                AnimalTamer tamer = wolf.getOwner();
+
+                if (tamer instanceof Player) {
+                    Player owner = (Player) tamer;
+
+                    if (owner == attacker || Party.getInstance().inSameParty(attacker, owner)) {
+                        return;
+                    }
+                }
+            }
+        }
+
+        final int MAX_BONUS_LEVEL = 750;
+        final double PVP_MODIFIER = 1.5;
+        final int PVE_MODIFIER = 2;
+
+        PlayerProfile PPa = Users.getProfile(attacker);
+        int skillLevel = PPa.getSkillLevel(SkillType.AXES);
+        int skillCheck = m.skillCheck(skillLevel, MAX_BONUS_LEVEL);
+
+        if (Math.random() * 2000 <= skillCheck && !entity.isDead()){
+            int damage = event.getDamage();
+
+            if (entity instanceof Player){
+                event.setDamage((int) (damage * PVP_MODIFIER));
+                Player player = (Player) entity;
+                player.sendMessage(mcLocale.getString("Axes.HitCritically"));
+            }
+            else {
+                event.setDamage(damage * PVE_MODIFIER);
+            }
+            attacker.sendMessage(mcLocale.getString("Axes.CriticalHit"));
+        }
+    }
+
+    /**
+     * Check for Impact ability.
+     *
+     * @param attacker The attacking player
+     * @param target The defending entity
+     * @param event The event to modify
+     */
+    public static void impact(Player attacker, LivingEntity target, EntityDamageByEntityEvent event) {
+
+        /*
+         * TODO: Finish this skill. The idea is you will greatly damage an opponents armor.
+         * When they are unarmored, you have a proc that will stun them and deal additional damage.
+         */
+        if (target instanceof Player) {
+            Player targetPlayer = (Player) target;
+            short durabilityDamage = 5; //Start with 5 durability damage
+
+            /* Every 30 Skill Levels you gain 1 durability damage */
+            durabilityDamage += Users.getProfile(attacker).getSkillLevel(SkillType.AXES)/30;
+
+            if (!hasArmor(targetPlayer)) {
+                applyImpact(attacker, target, event);
+            }
+            else {
+                for (ItemStack armor : targetPlayer.getInventory().getArmorContents()) {
+                    armor.setDurability((short) (armor.getDurability() + durabilityDamage)); //Damage armor piece
+                }
+                targetPlayer.updateInventory();
+            }
+        }
+        else {
+            applyImpact(attacker, target, event); //Since mobs are technically unarmored, this will always trigger
+        }
+    }
+
+    /**
+     * Apply impact ability.
+     *
+     * @param attacker The attacking player
+     * @param target The defending entity
+     * @param event The event to modify
+     */
+    private static void applyImpact(Player attacker, LivingEntity target, EntityDamageByEntityEvent event) {
+        final int GREATER_IMPACT_CHANCE = 25;
+        final double GREATER_IMPACT_MULTIPLIER = 1.5;
+
+        if (Math.random() * 100 <= GREATER_IMPACT_CHANCE) {
+            event.setDamage(event.getDamage() + 2);
+            target.setVelocity(attacker.getLocation().getDirection().normalize().multiply(GREATER_IMPACT_MULTIPLIER));
+            attacker.sendMessage(mcLocale.getString("Axes.GreaterImpactOnEnemy"));
+        }
+    }
+
+    /**
+     * Check if a player has armor.
+     *
+     * @param player Player whose armor to check
+     * @return true if the player has armor, false otherwise
+     */
+    private static boolean hasArmor(Player player) {
+        PlayerInventory inventory = player.getInventory();
+
+        if (inventory.getBoots() != null || inventory.getChestplate() != null || inventory.getHelmet() != null || inventory.getLeggings() != null) {
+            return true;
+        }
+        else {
+            return false;
+        }
+    }
 }

src/main/java/com/gmail/nossr50/skills/BlastMining.java

@@ -1,385 +1,285 @@
-/*
-	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.skills;
 
 import java.util.ArrayList;
+import java.util.HashSet;
 import java.util.Iterator;
 import java.util.List;
 
-import org.bukkit.Location;
+import org.bukkit.ChatColor;
 import org.bukkit.Material;
 import org.bukkit.block.Block;
 import org.bukkit.entity.Player;
-import org.bukkit.inventory.ItemStack;
+import org.bukkit.entity.TNTPrimed;
 import org.bukkit.event.entity.EntityDamageEvent;
 import org.bukkit.event.entity.EntityExplodeEvent;
 import org.bukkit.event.entity.ExplosionPrimeEvent;
+
+import com.gmail.nossr50.BlockChecks;
 import com.gmail.nossr50.Users;
 import com.gmail.nossr50.m;
 import com.gmail.nossr50.mcMMO;
+import com.gmail.nossr50.datatypes.AbilityType;
 import com.gmail.nossr50.datatypes.PlayerProfile;
 import com.gmail.nossr50.datatypes.SkillType;
+import com.gmail.nossr50.locale.mcLocale;
 
-public class BlastMining{
-	
-	public static void explosionBlockDrops(Block block, Location loc)
-	{
-    	int id = block.getTypeId();
-    	Material mat = Material.getMaterial(id);
-		byte damage = 0;
-		ItemStack item = new ItemStack(mat, 1, (byte)0, damage);
-		
-		if(id != 89 && id != 73 && id != 74 && id != 56 && id != 21 && id != 1 && id != 16 && id != 112 && id != 121 && id != 48)
-		{
-			m.mcDropItem(loc, item);
-			return;
-		}
-			
-		switch (id)
-		{
-		//GLOWSTONE
-		case 89:
-			mat = Material.getMaterial(348);
-			item = new ItemStack(mat, 1, (byte)0, damage);
-			m.mcDropItem(loc, item);
-			m.mcDropItem(loc, item);
-			if(Math.random() * 10 > 5)
-				m.mcDropItem(loc, item);
-			if(Math.random() * 10 > 5)
-				m.mcDropItem(loc, item);
-			break;
-		//REDSTONE
-		case 73:
-			mat = Material.getMaterial(331);
-			item = new ItemStack(mat, 1, (byte)0, damage);
-			m.mcDropItem(loc, item);
-			m.mcDropItem(loc, item);
-			m.mcDropItem(loc, item);
-			m.mcDropItem(loc, item);
-			if(Math.random() * 10 > 5)
-				m.mcDropItem(loc, item);
-			break;
-		case 74:
-			mat = Material.getMaterial(331);
-			item = new ItemStack(mat, 1, (byte)0, damage);
-			m.mcDropItem(loc, item);
-			m.mcDropItem(loc, item);
-			m.mcDropItem(loc, item);
-			m.mcDropItem(loc, item);
-			if(Math.random() * 10 > 5)
-				m.mcDropItem(loc, item);
-			break;
-		//LAPIS
-		case 21:
-			mat = Material.getMaterial(351);
-			item = new ItemStack(mat, 1, (byte)0,(byte)0x4);
-			m.mcDropItem(loc, item);
-			m.mcDropItem(loc, item);
-			m.mcDropItem(loc, item);
-			m.mcDropItem(loc, item);
-			if(Math.random() * 10 > 5)
-				m.mcDropItem(loc, item);
-			if(Math.random() * 10 > 5)
-				m.mcDropItem(loc, item);
-			if(Math.random() * 10 > 5)
-				m.mcDropItem(loc, item);
-			if(Math.random() * 10 > 5)
-				m.mcDropItem(loc, item);
-			break;
-		//DIAMOND
-		case 56:
-			mat = Material.getMaterial(264);
-			item = new ItemStack(mat, 1, (byte)0, damage);
-			m.mcDropItem(loc, item);
-			break;
-		//STONE
-		case 1:
-			mat = Material.getMaterial(4);
-			item = new ItemStack(mat, 1, (byte)0, damage);
-			m.mcDropItem(loc, item);
-			break;
-		//COAL
-		case 16:
-			mat = Material.getMaterial(263);
-			item = new ItemStack(mat, 1, (byte)0, damage);
-			m.mcDropItem(loc, item);
-			break;
-		}
-	}
-	
-	/*
-	 * Process the drops from the explosion
-	 */
-	public static void dropProcessing(int skillLevel, EntityExplodeEvent event, mcMMO plugin)
-	{
-		float yield = event.getYield(); 
-		List<Block> blocks = event.blockList();
-		Iterator<Block> iterator = blocks.iterator();
-		
-		List<Block> ores = new ArrayList<Block>();
-		List<Block> debris = new ArrayList<Block>();
-		
-		while(iterator.hasNext())
-		{
-			Block temp = iterator.next();
-			int id = temp.getTypeId();
-			if(id == 14 || id == 15 || id == 16 || id == 21 || id == 56 || id == 73 || id == 74)
-			{
-				ores.add(temp);
-			}
-			else
-			{
-				debris.add(temp);
-			}
-		}
-		
-		//Normal explosion
-		if(skillLevel < 125)
-			return;
-		
-		//+5% ores
-		if(skillLevel >= 125 && skillLevel < 250)
-		{
-			event.setYield(0);
-			Iterator<Block> iterator2 = ores.iterator();
-			Iterator<Block> iterator3 = debris.iterator();
-			while(iterator2.hasNext())
-			{
-				Block temp = iterator2.next();
-				if(Math.random() < (yield + .05))
-				{
-					if(temp.getData() != 5 && plugin.misc.blockWatchList.contains(temp));
-						explosionBlockDrops(temp, event.getLocation());
-				}
-			}
-			while(iterator3.hasNext())
-			{
-				Block temp = iterator3.next();
-				if(Math.random() < yield)
-				{
-					if(temp.getData() != 5 && plugin.misc.blockWatchList.contains(temp));
-						explosionBlockDrops(temp, event.getLocation());
-				}
-			}
-		}
-		
-		//+10% ores
-		if(skillLevel >= 250 && skillLevel < 375)
-		{
-			event.setYield(0);
-			Iterator<Block> iterator2 = ores.iterator();
-			Iterator<Block> iterator3 = debris.iterator();
-			while(iterator2.hasNext())
-			{
-				Block temp = iterator2.next();
-				if(Math.random() < (yield + .10))
-				{
-					if(temp.getData() != 5 && plugin.misc.blockWatchList.contains(temp));
-						explosionBlockDrops(temp, event.getLocation());
-				}
-			}
-			while(iterator3.hasNext())
-			{
-				Block temp = iterator3.next();
-				if(Math.random() < yield)
-				{
-					if(temp.getData() != 5 && plugin.misc.blockWatchList.contains(temp));
-						explosionBlockDrops(temp, event.getLocation());
-				}
-			}
-		}
-		
-		//No debris, +15% ores
-		if(skillLevel >= 375 && skillLevel < 500)
-		{
-			event.setYield(0);
-			Iterator<Block> iterator2 = ores.iterator();
+public class BlastMining {
 
-			while(iterator2.hasNext())
-			{
-				Block temp = iterator2.next();
-				if(Math.random() < (yield + .15))
-				{
-					if(temp.getData() != 5 && plugin.misc.blockWatchList.contains(temp));
-						explosionBlockDrops(temp, event.getLocation());
-				}
-			}
-		}
-		
-		//No debris, +20% ores
-		if(skillLevel >= 500 && skillLevel < 625)
-		{
-			event.setYield(0);
-			Iterator<Block> iterator2 = ores.iterator();
+    /**
+     * Handler for what blocks drop from the explosion.
+     *
+     * @param ores List of ore blocks destroyed by the explosion
+     * @param debris List of non-ore blocks destroyed by the explosion
+     * @param yield Percentage of blocks to drop
+     * @param oreBonus Percentage bonus for ore drops
+     * @param debrisReduction Percentage reduction for non-ore drops
+     * @param extraDrops Number of times to drop each block
+     * @return A list of blocks dropped from the explosion
+     */
+    private static List<Block> explosionYields(List<Block> ores, List<Block> debris, float yield, float oreBonus, float debrisReduction, int extraDrops) {
+        Iterator<Block> iterator2 = ores.iterator();
+        List<Block> blocksDropped = new ArrayList<Block>();
 
-			while(iterator2.hasNext())
-			{
-				Block temp = iterator2.next();
-				if(Math.random() < (yield + .20))
-				{
-					if(temp.getData() != 5 && plugin.misc.blockWatchList.contains(temp));
-						explosionBlockDrops(temp, event.getLocation());
-				}
-			}
-		}
-		
-		//Double Drops, No Debris, +25% ores
-		if(skillLevel >= 625 && skillLevel < 750)
-		{
-			event.setYield(0);
-			Iterator<Block> iterator2 = ores.iterator();
+        while (iterator2.hasNext()) {
+            Block temp = iterator2.next();
 
-			while(iterator2.hasNext())
-			{
-				Block temp = iterator2.next();
-				if(Math.random() < (yield + .25))
-				{
-					if(temp.getData() != 5 && plugin.misc.blockWatchList.contains(temp));
-						explosionBlockDrops(temp, event.getLocation());
-					if(Math.random() * 1000 <= skillLevel)
-					{
-						if(temp.getData() != 5 && plugin.misc.blockWatchList.contains(temp));
-							explosionBlockDrops(temp, event.getLocation());
-					}
-				}
-			}
-		}
-		
-		//Double Drops, No Debris, +30% ores
-		if(skillLevel >= 750 && skillLevel < 875)
-		{
-			event.setYield(0);
-			Iterator<Block> iterator2 = ores.iterator();
+            if ((float) Math.random() < (yield + oreBonus)) {
+                blocksDropped.add(temp);
+                Mining.miningDrops(temp);
 
-			while(iterator2.hasNext())
-			{
-				Block temp = iterator2.next();
-				if(Math.random() < (yield + .30))
-				{
-					if(temp.getData() != 5 && plugin.misc.blockWatchList.contains(temp));
-						explosionBlockDrops(temp, event.getLocation());
-					if(Math.random() * 1000 <= skillLevel)
-					{
-						if(temp.getData() != 5 && plugin.misc.blockWatchList.contains(temp));
-							explosionBlockDrops(temp, event.getLocation());
-					}
-				}
-			}
-		}
-				
-		//Triple Drops, No debris, +35% ores
-		if(skillLevel >= 875 && skillLevel < 1000)		
-		{
-			event.setYield(0);
-			Iterator<Block> iterator2 = ores.iterator();
+                if (!temp.hasMetadata("mcmmoPlacedBlock")) {
+                    if (extraDrops == 2) {
+                        blocksDropped.add(temp);
+                        Mining.miningDrops(temp);
+                    }
+                    if (extraDrops == 3) {
+                        blocksDropped.add(temp);
+                        Mining.miningDrops(temp);
+                    }
+                }
+            }
+        }
 
-			while(iterator2.hasNext())
-			{
-				Block temp = iterator2.next();
-				if(Math.random() * 100 < (yield + .35))
-				{
-					if(temp.getData() != 5 && plugin.misc.blockWatchList.contains(temp));
-						explosionBlockDrops(temp, event.getLocation());
-					if(Math.random() * 1000 <= skillLevel || skillLevel > 1000) 
-					{
-						if(temp.getData() != 5 && plugin.misc.blockWatchList.contains(temp));
-						explosionBlockDrops(temp, event.getLocation());
-					}
-					if(Math.random() * 1000 <= skillLevel || skillLevel > 1000)
-					{
-						if(temp.getData() != 5 && plugin.misc.blockWatchList.contains(temp));
-							explosionBlockDrops(temp, event.getLocation());
-					}
-				}
-			}
-		}
+        if (yield - debrisReduction != 0) {
+            Iterator<Block> iterator3 = debris.iterator();
 
-		//Triple Drops, No debris, +40% ores
-		if(skillLevel >= 1000)
-		{
-			event.setYield(0);
-			Iterator<Block> iterator2 = ores.iterator();
+            while (iterator3.hasNext()) {
+                Block temp = iterator3.next();
 
-			while(iterator2.hasNext())
-			{
-				Block temp = iterator2.next();
-				if(Math.random() * 100 < (yield + .40))
-				{
-					if(temp.getData() != 5 && plugin.misc.blockWatchList.contains(temp));
-						explosionBlockDrops(temp, event.getLocation());
-					if(Math.random() * 1000 <= skillLevel || skillLevel > 1000) 
-					{
-						if(temp.getData() != 5 && plugin.misc.blockWatchList.contains(temp));
-						explosionBlockDrops(temp, event.getLocation());
-					}
-					if(Math.random() * 1000 <= skillLevel || skillLevel > 1000)
-					{
-						if(temp.getData() != 5 && plugin.misc.blockWatchList.contains(temp));
-							explosionBlockDrops(temp, event.getLocation());
-					}
-				}
-			}
-		}
-	}
-	
-	/*
-	 * Bigger Bombs (Unlocked at Mining 250)
-	 * 
-	 * Increases radius of explosion by 1 at 250.
-	 * Increases radius of explosion by 2 at 500.
-	 * Increases radius of explosion by 3 at 750.
-	 * Increases radius of explosion by 4 at 1000.
-	 */
-	public static void biggerBombs(int skillLevel, ExplosionPrimeEvent event)
-	{
-		float radius = event.getRadius();
-		if(skillLevel < 250)
-			return;
-		if(skillLevel >= 250)
-			radius++;
-		if(skillLevel >= 500)
-			radius++;
-		if(skillLevel >= 750)
-			radius++;
-		if(skillLevel >= 1000)
-			radius++;
-		
-		event.setRadius(radius);
-	}
-	
-	/*
-	 * Demolitions Expertise (Unlocked at Mining 500) 
-	 * 
-	 * Reduces explosion damage to 1/4 of normal at 500.
-	 * Reduces explosion damage to 1/2 of normal at 1000.
-	 */
-	public static void demolitionsExpertise(Player player, EntityDamageEvent event)
-	{
-		PlayerProfile PP = Users.getProfile(player);
-		int skill = PP.getSkillLevel(SkillType.MINING);
-		int damage = event.getDamage();
-		if(skill < 500)
-			return;
-		if(skill >= 500 && skill < 1000)
-			damage = damage/4;
-		if(skill >= 1000)
-			damage = damage/2;
-		
-		event.setDamage(damage);
-	}
+                if ((float) Math.random() < (yield - debrisReduction))
+                    Mining.miningDrops(temp);
+            }
+        }
 
-}
+        return blocksDropped;
+    }
+
+    /**
+     * Handler for explosion drops and XP gain.
+     *
+     * @param player Player triggering the explosion
+     * @param event Event whose explosion is being processed
+     */
+    public static void dropProcessing(Player player, EntityExplodeEvent event) {
+        final int RANK_1_LEVEL = 125;
+        final int RANK_2_LEVEL = 250;
+        final int RANK_3_LEVEL = 375;
+        final int RANK_4_LEVEL = 500;
+        final int RANK_5_LEVEL = 625;
+        final int RANK_6_LEVEL = 750;
+        final int RANK_7_LEVEL = 875;
+        final int RANK_8_LEVEL = 1000;
+
+        int skillLevel = Users.getProfile(player).getSkillLevel(SkillType.MINING);
+        float yield = event.getYield();
+        List<Block> blocks = event.blockList();
+        Iterator<Block> iterator = blocks.iterator();
+
+        List<Block> ores = new ArrayList<Block>();
+        List<Block> debris = new ArrayList<Block>();
+        List<Block> xp = new ArrayList<Block>();
+
+        while (iterator.hasNext()) {
+            Block temp = iterator.next();
+
+            if (BlockChecks.isOre(temp.getType())) {
+                ores.add(temp);
+            }
+            else {
+                debris.add(temp);
+            }
+        }
+
+        //Normal explosion
+        if (skillLevel < RANK_1_LEVEL) {
+            return;
+        }
+
+        event.setYield(0);
+
+        //Triple Drops, No debris, +70% ores
+        if (skillLevel >= RANK_8_LEVEL) {
+            xp = explosionYields(ores, debris, yield, .70f, .30f, 3);
+        }
+
+        //Triple Drops, No debris, +65% ores
+        else if (skillLevel >= RANK_7_LEVEL) {
+            xp = explosionYields(ores, debris, yield, .65f, .30f, 3);
+        }
+
+        //Double Drops, No Debris, +60% ores
+        else if (skillLevel >= RANK_6_LEVEL) {
+            xp = explosionYields(ores, debris, yield, .60f, .30f, 2);
+        }
+
+        //Double Drops, No Debris, +55% ores
+        else if (skillLevel >= RANK_5_LEVEL) {
+            xp = explosionYields(ores, debris, yield, .55f, .30f, 2);
+        }
+
+        //No debris, +50% ores
+        else if (skillLevel >= RANK_4_LEVEL) {
+            xp = explosionYields(ores, debris, yield, .50f, .30f, 1);
+        }
+
+        //No debris, +45% ores
+        else if (skillLevel >= RANK_3_LEVEL) {
+            xp = explosionYields(ores, debris, yield, .45f, .30f, 1);
+        }
+
+        //+40% ores, -20% debris
+        else if (skillLevel >= RANK_2_LEVEL) {
+            xp = explosionYields(ores, debris, yield, .40f, .20f, 1);
+        }
+
+        //+35% ores, -10% debris
+        else if (skillLevel >= RANK_1_LEVEL) {
+            xp = explosionYields(ores, debris, yield, .35f, .10f, 1);
+        }
+
+        for (Block block : xp) {
+            if (!block.hasMetadata("mcmmoPlacedBlock")) {
+                Mining.miningXP(player, block);
+            }
+        }
+    }
+
+    /**
+     * Increases the blast radius of the explosion.
+     *
+     * @param player Player triggering the explosion
+     * @param event Event whose explosion radius is being changed
+     */
+    public static void biggerBombs(Player player, ExplosionPrimeEvent event) {
+        final int RANK_1_LEVEL = 250;
+        final int RANK_2_LEVEL = 500;
+        final int RANK_3_LEVEL = 750;
+        final int RANK_4_LEVEL = 1000;
+
+        int skillLevel = Users.getProfile(player).getSkillLevel(SkillType.MINING);
+        float radius = event.getRadius();
+
+        if (skillLevel < RANK_1_LEVEL) {
+            return;
+        }
+
+        if (skillLevel >= RANK_1_LEVEL) {
+            radius++;
+        }
+
+        if (skillLevel >= RANK_2_LEVEL) {
+            radius++;
+        }
+
+        if (skillLevel >= RANK_3_LEVEL) {
+            radius++;
+        }
+
+        if (skillLevel >= RANK_4_LEVEL) {
+            radius++;
+        }
+
+        event.setRadius(radius);
+    }
+
+    /**
+     * Decreases damage dealt by the explosion.
+     *
+     * @param player Player triggering the explosion
+     * @param event Event whose explosion damage is being reduced
+     */
+    public static void demolitionsExpertise(Player player, EntityDamageEvent event) {
+        final int RANK_1_LEVEL = 500;
+        final int RANK_2_LEVEL = 750;
+        final int RANK_3_LEVEL = 1000;
+
+        int skill = Users.getProfile(player).getSkillLevel(SkillType.MINING);
+        int damage = event.getDamage();
+
+        if (skill < RANK_1_LEVEL) {
+            return;
+        }
+
+        if (skill >= RANK_3_LEVEL) {
+            damage = 0;
+        }
+        else if (skill >= RANK_2_LEVEL) {
+            damage = damage / 2;
+        }
+        else if (skill >= RANK_1_LEVEL) {
+            damage = damage/4;
+        }
+
+        event.setDamage(damage);
+    }
+
+    /**
+     * Remotely detonate TNT for Blast Mining.
+     *
+     * @param player Player detonating the TNT
+     * @param plugin mcMMO plugin instance
+     */
+    public static void remoteDetonation(Player player, mcMMO plugin) {
+        final byte SNOW = 78;
+        final byte AIR = 0;
+        final int BLOCKS_AWAY = 100;
+        final int TIME_CONVERSION_FACTOR = 1000;
+
+        PlayerProfile PP = Users.getProfile(player);
+        HashSet<Byte> transparent = new HashSet<Byte>();
+
+        transparent.add(SNOW);
+        transparent.add(AIR);
+
+        Block block = player.getTargetBlock(transparent, BLOCKS_AWAY);
+
+        if (block.getType().equals(Material.TNT) && m.blockBreakSimulate(block, player, true) && PP.getSkillLevel(SkillType.MINING) >= 125) {
+            final int MAX_DISTANCE_AWAY = 10;
+            AbilityType ability = AbilityType.BLAST_MINING;
+
+            /* Check Cooldown */
+            if(!Skills.cooldownOver(PP.getSkillDATS(ability) * TIME_CONVERSION_FACTOR, ability.getCooldown())) {
+                player.sendMessage(mcLocale.getString("Skills.TooTired") + ChatColor.YELLOW + " (" + Skills.calculateTimeLeft(PP.getSkillDATS(ability) * TIME_CONVERSION_FACTOR, ability.getCooldown()) + "s)");
+                return;
+            }
+
+            /* Send message to nearby players */
+            for(Player y : player.getWorld().getPlayers()) {
+                if(y != player && m.isNear(player.getLocation(), y.getLocation(), MAX_DISTANCE_AWAY)) {
+                    y.sendMessage(ability.getAbilityPlayer(player));
+                }
+            }
+
+            player.sendMessage(mcLocale.getString("BlastMining.Boom"));
+
+            /* Create the TNT entity */
+            TNTPrimed tnt = player.getWorld().spawn(block.getLocation(), TNTPrimed.class);
+            plugin.tntTracker.put(tnt.getEntityId(), player);
+            block.setType(Material.AIR);
+            tnt.setFuseTicks(0);
+
+            PP.setSkillDATS(ability, System.currentTimeMillis()); //Save DATS for Blast Mining
+            PP.setBlastMiningInformed(false);
+        }
+    }
+}

src/main/java/com/gmail/nossr50/skills/Enchanting.java

@@ -1,5 +0,0 @@
-package com.gmail.nossr50.skills;
-
-public class Enchanting {
-
-}