Fixed stuff being in wrong package. Start of cleanup to m.java.

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

@@ -68,13 +68,13 @@ public class Combat {
 
             combatAbilityChecks(attacker);
             
-            if (m.isSwords(itemInHand) && mcPermissions.getInstance().swords(attacker)) {
+            if (ItemChecks.isSword(itemInHand) && mcPermissions.getInstance().swords(attacker)) {
                 if (!pluginx.misc.bleedTracker.contains(target)) {
                     Swords.bleedCheck(attacker, target, pluginx);
                 }
 
                 if (PPa.getSerratedStrikesMode()) {
-                    Swords.applySerratedStrikes(attacker, event, pluginx);
+                    applyAbilityAoE(attacker, target, damage, pluginx, SkillType.SWORDS);
                 }
 
                 if (targetType.equals(EntityType.PLAYER)) {
@@ -84,13 +84,13 @@ public class Combat {
                     PvEExperienceGain(attacker, PPa, target, damage, SkillType.SWORDS);
                 }
             }
-            else if (m.isAxes(itemInHand) && mcPermissions.getInstance().axes(attacker)) {
+            else if (ItemChecks.isAxe(itemInHand) && mcPermissions.getInstance().axes(attacker)) {
                 Axes.axesBonus(attacker, event);
-                Axes.axeCriticalCheck(attacker, event, pluginx);
+                Axes.axeCriticalCheck(attacker, event);
                 Axes.impact(attacker, target, event);
 
                 if (PPa.getSkullSplitterMode()) {
-                    Axes.applyAoeDamage(attacker, event, pluginx);
+                    applyAbilityAoE(attacker, target, damage, pluginx, SkillType.AXES);
                 }
                 
                 if (targetType.equals(EntityType.PLAYER)) {
@@ -270,7 +270,6 @@ public class Combat {
     public 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()) {
@@ -294,7 +293,6 @@ public class Combat {
     public 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()) {
@@ -308,6 +306,15 @@ public class Combat {
         }
     }
 
+    /**
+     * Process PVP experience gain.
+     *
+     * @param attacker The attacking player
+     * @param PPa The profile of the attacking player
+     * @param defender The defending player
+     * @param damage The initial damage amount
+     * @param skillType The skill being used
+     */
     private static void PvPExperienceGain(Player attacker, PlayerProfile PPa, Player defender, int damage, SkillType skillType) {
         if (!LoadProperties.pvpxp) {
             return;
@@ -325,6 +332,15 @@ public class Combat {
           }
     }
 
+    /**
+     * Process PVE experience gain.
+     *
+     * @param attacker The attacking player
+     * @param PPa The profile of the attacking player
+     * @param target The defending entity
+     * @param damage The initial damage amount
+     * @param skillType The skill being used
+     */
     private static void PvEExperienceGain(Player attacker, PlayerProfile PPa, LivingEntity target, int damage, SkillType skillType) {
         int xp = getXp(target, damage);
 
@@ -332,6 +348,13 @@ public class Combat {
         Skills.XpCheckSkill(skillType, attacker);
     }
 
+    /**
+     * Cap the XP based on the remaining health of an entity.
+     *
+     * @param hpLeft Amount of HP remaining
+     * @param damage Amount of damage being dealt
+     * @return the modified XP amount
+     */
     private static int capXP(int hpLeft, int damage) {
         int xp;
 
@@ -425,4 +448,106 @@ public class Combat {
         }
         return xp;
     }
+
+    /**
+     * 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;
+
+                    //Reasons why the target shouldn't be hit
+                    if (owner.equals(attacker)) {
+                        continue;
+                    }
+
+                    if (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) && !plugin.misc.bleedTracker.contains(entity)) {
+                        plugin.misc.addToBleedQue(livingEntity);
+                    }
+
+                    dealDamage(livingEntity, damageAmount, attacker);
+                    numberOfTargets--;
+                }
+            }
+        }
+    }
 }

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

@@ -28,8 +28,7 @@ import java.util.ArrayList;
 import java.util.Properties;
 
 import com.gmail.nossr50.config.LoadProperties;
-
+import com.gmail.nossr50.datatypes.DatabaseUpdate;
-import datatypes.DatabaseUpdate;
 
 public class Database {
 

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

@@ -0,0 +1,200 @@
+/*
+ * 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 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;
+        }
+    }
+}

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

@@ -84,7 +84,7 @@ public class InspectCommand implements CommandExecutor {
             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)));
+            sender.sendMessage(mcLocale.getString("mcPlayerListener.PowerLevel") + ChatColor.GREEN + (m.getPowerLevel(target, PPt)));
         } else {
             if(sender instanceof Player && !player.isOp())
             {

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

@@ -71,7 +71,7 @@ public class McstatsCommand implements CommandExecutor {
 			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/datatypes/DatabaseUpdate.java

@@ -16,7 +16,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-package datatypes;
+package com.gmail.nossr50.datatypes;
 
 public enum DatabaseUpdate {
     FISHING,

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

@@ -3,7 +3,7 @@ package com.gmail.nossr50.datatypes;
 import org.bukkit.Material;
 import org.bukkit.inventory.ItemStack;
 
-import com.gmail.nossr50.m;
+import com.gmail.nossr50.ItemChecks;
 import com.gmail.nossr50.locale.mcLocale;
 
 public enum ToolType
@@ -129,17 +129,17 @@ public enum ToolType
 		switch(this)
 		{
 		case AXE:
-			return m.isAxes(is);
+			return ItemChecks.isAxe(is);
 		case FISTS:
 			return is.getType().equals(Material.AIR);
 		case HOE:
-			return m.isHoe(is);
+			return ItemChecks.isHoe(is);
 		case PICKAXE:
-			return m.isMiningPick(is);
+			return ItemChecks.isMiningPick(is);
 		case SHOVEL:
-			return m.isShovel(is);
+			return ItemChecks.isShovel(is);
 		case SWORD:
-			return m.isSwords(is);
+			return ItemChecks.isSword(is);
 		}
 		return false;
 	}

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

@@ -16,6 +16,7 @@
 */
 package com.gmail.nossr50.listeners;
 
+import com.gmail.nossr50.ItemChecks;
 import com.gmail.nossr50.Users;
 import com.gmail.nossr50.m;
 import com.gmail.nossr50.mcMMO;
@@ -153,7 +154,7 @@ public class mcBlockListener implements Listener
     	 */
     	if(mcPermissions.getInstance().mining(player))
     	{
-    		if(LoadProperties.miningrequirespickaxe && m.isMiningPick(inhand))
+    		if(LoadProperties.miningrequirespickaxe && ItemChecks.isMiningPick(inhand))
     			Mining.miningBlockCheck(player, block, plugin);
     		else if(!LoadProperties.miningrequirespickaxe)
     			Mining.miningBlockCheck(player, block, plugin);
@@ -165,7 +166,7 @@ public class mcBlockListener implements Listener
     	
    		if(mcPermissions.getInstance().woodcutting(player) && id == 17)
    		{
-   			if(LoadProperties.woodcuttingrequiresaxe && m.isAxes(inhand))
+   			if(LoadProperties.woodcuttingrequiresaxe && ItemChecks.isAxe(inhand))
 				WoodCutting.woodcuttingBlockCheck(player, block, plugin);
    			else if(!LoadProperties.woodcuttingrequiresaxe)
     			WoodCutting.woodcuttingBlockCheck(player, block, plugin);
@@ -179,7 +180,7 @@ public class mcBlockListener implements Listener
     	 */
     	if(Excavation.canBeGigaDrillBroken(block) && mcPermissions.getInstance().excavation(player) && block.getData() != (byte) 5)
     	{
-    		if(LoadProperties.excavationRequiresShovel && m.isShovel(inhand))
+    		if(LoadProperties.excavationRequiresShovel && ItemChecks.isShovel(inhand))
     			Excavation.excavationProcCheck(block, player);
     		else if(!LoadProperties.excavationRequiresShovel)
     			Excavation.excavationProcCheck(block, player);
@@ -207,7 +208,7 @@ public class mcBlockListener implements Listener
     	/*
     	 * ABILITY PREPARATION CHECKS
     	 */
-    	if(m.abilityBlockCheck(block))
+    	if(m.abilityBlockCheck(mat))
     	{
 	   		if(PP.getHoePreparationMode() && Herbalism.canBeGreenTerra(block))
 	   			Skills.abilityCheck(player, SkillType.HERBALISM);
@@ -239,7 +240,7 @@ public class mcBlockListener implements Listener
     	 */
     	if(PP.getGigaDrillBreakerMode() && Excavation.canBeGigaDrillBroken(block) && m.blockBreakSimulate(block, player, true) && mcPermissions.getInstance().excavationAbility(player))
     	{	
-    		if(LoadProperties.excavationRequiresShovel && m.isShovel(inhand))
+    		if(LoadProperties.excavationRequiresShovel && ItemChecks.isShovel(inhand))
     		{
     			event.setInstaBreak(true);
     			Excavation.gigaDrillBreaker(player, block);
@@ -275,7 +276,7 @@ public class mcBlockListener implements Listener
     	{
     		if(LoadProperties.miningrequirespickaxe)
     		{
-    			if(m.isMiningPick(inhand)){
+    			if(ItemChecks.isMiningPick(inhand)){
     			    
     				event.setInstaBreak(true);
     				Mining.SuperBreakerBlockCheck(player, block, plugin);
@@ -296,7 +297,7 @@ public class mcBlockListener implements Listener
     	{	
     		if(LoadProperties.woodcuttingrequiresaxe)
     		{
-    			if(m.isAxes(inhand)){
+    			if(ItemChecks.isAxe(inhand)){
     				event.setInstaBreak(true);
     				WoodCutting.leafBlower(player, block);
     			}

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

@@ -46,6 +46,7 @@ import org.bukkit.inventory.ItemStack;
 
 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;
@@ -171,13 +172,13 @@ public class mcPlayerListener implements Listener
 		Action action = event.getAction();
 		Block block = event.getClickedBlock();
 		ItemStack is = player.getItemInHand();
+		Material mat = block.getType();
 		
 		/*
 		 * Ability checks
 		 */
 		if(action == Action.RIGHT_CLICK_BLOCK)
 		{
-			Material mat = block.getType();
 
 			if(block != null && mcPermissions.getInstance().repair(player) && block.getTypeId() == LoadProperties.anvilID && (Repair.isTools(is) || Repair.isArmor(is)))
 			{
@@ -186,9 +187,9 @@ public class mcPlayerListener implements Listener
 				player.updateInventory();
 			}
 
-			if(LoadProperties.enableAbilities && m.abilityBlockCheck(block))
+			if(LoadProperties.enableAbilities && m.abilityBlockCheck(mat))
 			{
-				if(block != null && m.isHoe(is) && !mat.equals(Material.DIRT) && !mat.equals(Material.GRASS) && !mat.equals(Material.SOIL))
+				if(block != null && ItemChecks.isHoe(is) && !mat.equals(Material.DIRT) && !mat.equals(Material.GRASS) && !mat.equals(Material.SOIL))
 					Skills.activationCheck(player, SkillType.HERBALISM);
 				
 				Skills.activationCheck(player, SkillType.AXES);
@@ -256,7 +257,7 @@ public class mcPlayerListener implements Listener
 		 */
 		if(action == Action.RIGHT_CLICK_AIR)
 			Item.itemchecks(player);
-		if(action == Action.RIGHT_CLICK_BLOCK && m.abilityBlockCheck(block))
+		if(action == Action.RIGHT_CLICK_BLOCK && m.abilityBlockCheck(mat))
 			Item.itemchecks(player);
 		
 		if(player.isSneaking() && mcPermissions.getInstance().taming(player) && (action == Action.LEFT_CLICK_AIR || action == Action.LEFT_CLICK_BLOCK))

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

@@ -23,10 +23,9 @@ import org.bukkit.entity.Player;
 import org.bukkit.entity.Wolf;
 import org.bukkit.event.entity.EntityDamageByEntityEvent;
 import org.bukkit.inventory.ItemStack;
-import org.bukkit.plugin.Plugin;
+
-import com.gmail.nossr50.Combat;
+import com.gmail.nossr50.ItemChecks;
 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;
@@ -46,7 +45,7 @@ public class Axes {
         
         event.setDamage(event.getDamage() + bonus);
     }
-	public static void axeCriticalCheck(Player attacker, EntityDamageByEntityEvent event, Plugin pluginx)
+	public static void axeCriticalCheck(Player attacker, EntityDamageByEntityEvent event)
 	{
     	Entity x = event.getEntity();
     	
@@ -62,7 +61,7 @@ public class Axes {
     		}
     	}
     	PlayerProfile PPa = Users.getProfile(attacker);
-    	if(m.isAxes(attacker.getItemInHand()) && mcPermissions.getInstance().axes(attacker)){
+    	if(ItemChecks.isAxe(attacker.getItemInHand()) && mcPermissions.getInstance().axes(attacker)){
     		if(PPa.getSkillLevel(SkillType.AXES) >= 750){
     			if(Math.random() * 2000 <= 750 && !x.isDead()){
     				if(x instanceof Player){
@@ -132,72 +131,4 @@ public class Axes {
         }
 	}
 	
-	public static void applyAoeDamage(Player attacker, EntityDamageByEntityEvent event, Plugin pluginx)
-	{
-		int targets = 0;
-		
-		int dmgAmount = (event.getDamage()/2);
-        
-        //Setup minimum damage
-        if(dmgAmount < 1)
-            dmgAmount = 1;
-    	
-    	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(hurrDurr.getOwner() instanceof Player)
-		    		{
-		    			Player owner = (Player) hurrDurr.getOwner();
-			    		if(owner == attacker)
-			    			return;
-			    		if(Party.getInstance().inSameParty(attacker, owner))
-			    			return;
-		    		}
-				}
-    			
-    			//Damage nearby LivingEntities
-    			if(derp instanceof LivingEntity && targets >= 1)
-    			{
-    				if(derp instanceof Player)
-	    			{
-	    				Player target = (Player)derp;
-	    				
-	    				if(Users.getProfile(target).getGodMode())
-	    					continue;
-
-	    				if(target.getName().equals(attacker.getName()))
-	    					continue;
-	    				
-	    				if(Party.getInstance().inSameParty(attacker, target))
-	    					continue;
-	    				
-	    				if(target.isDead())
-	    					continue;
-	    				
-	    				if(targets >= 1 && derp.getWorld().getPVP())
-	    				{
-	    				    Combat.dealDamage(target, dmgAmount, attacker);
-	    					target.sendMessage(mcLocale.getString("Axes.HitByCleave"));
-	    					targets--;
-	    					continue;
-	    				}
-	    			}
-    				else
-	    			{			
-	    				LivingEntity target = (LivingEntity)derp;
-    					Combat.dealDamage(target, dmgAmount, attacker);
-	    				targets--;
-	    			}
-    			}
-    		}
-    	}
-	}
 }

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

@@ -188,7 +188,7 @@ public class Mining
     public static void SuperBreakerBlockCheck(Player player, Block block, mcMMO plugin)
     {
     	Material type = block.getType();
-    	int tier = m.getTier(player);
+    	int tier = m.getTier(player.getItemInHand());
     	int durabilityLoss = LoadProperties.abilityDurabilityLoss;
     	PlayerAnimationEvent armswing = new PlayerAnimationEvent(player);
 		

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

@@ -27,8 +27,8 @@ import org.bukkit.entity.Player;
 import org.bukkit.inventory.ItemStack;
 import org.bukkit.inventory.PlayerInventory;
 
+import com.gmail.nossr50.ItemChecks;
 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.spout.SpoutStuff;
@@ -181,11 +181,11 @@ public class Repair {
 			dif = (short) (dif * modify);
 		if(!boost)
 			dif = (short) (dif / modify);
-		if(m.isShovel(is))
+		if(ItemChecks.isShovel(is))
 			dif = (short) (dif / 3);
-		if(m.isSwords(is))
+		if(ItemChecks.isSword(is))
 			dif = (short) (dif / 2);
-		if(m.isHoe(is))
+		if(ItemChecks.isHoe(is))
 			dif = (short) (dif / 2);
 		
 		PP.addXP(SkillType.REPAIR, dif*10, player);
@@ -452,19 +452,19 @@ public class Repair {
 		short maxDurability = is.getType().getMaxDurability();
 		int ramt = 0;
 		
-		if(m.isShovel(is))
+		if(ItemChecks.isShovel(is))
 			ramt = maxDurability;
-		else if(m.isHoe(is) || m.isSwords(is) || is.getTypeId() == 359)
+		else if(ItemChecks.isHoe(is) || ItemChecks.isSword(is) || is.getTypeId() == 359)
 			ramt = maxDurability / 2;
-		else if(m.isAxes(is) || m.isMiningPick(is) || isBow(is))
+		else if(ItemChecks.isAxe(is) || ItemChecks.isMiningPick(is) || isBow(is))
 			ramt = maxDurability / 3;
-		else if(m.isBoots(is))
+		else if(ItemChecks.isBoots(is))
 			ramt = maxDurability / 4;
-		else if(m.isHelmet(is))
+		else if(ItemChecks.isHelmet(is))
 			ramt = maxDurability / 5;
-		else if(m.isPants(is))
+		else if(ItemChecks.isPants(is))
 			ramt = maxDurability / 7;
-		else if(m.isChestplate(is))
+		else if(ItemChecks.isChestplate(is))
 			ramt = maxDurability / 8;
 				
 		return repairCalculate(player, durability, ramt);

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

@@ -141,7 +141,7 @@ public class Skills
 		if(skillType != SkillType.ALL)
 			ps.statVal = PP.getSkillLevel(skillType);
 		else
-			ps.statVal = m.getPowerLevel(player);
+			ps.statVal = m.getPowerLevel(player, PP);
 		ps.name = player.getName();
 		Leaderboard.updateLeaderboard(ps, skillType);
 	}

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

@@ -22,8 +22,8 @@ import org.bukkit.entity.Player;
 import org.bukkit.entity.Wolf;
 import org.bukkit.event.entity.EntityDamageByEntityEvent;
 import com.gmail.nossr50.Combat;
+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.datatypes.PlayerProfile;
@@ -49,7 +49,7 @@ public class Swords
 	    			return;
     		}
     	}
-    	if(mcPermissions.getInstance().swords(attacker) && m.isSwords(attacker.getItemInHand())){
+    	if(mcPermissions.getInstance().swords(attacker) && ItemChecks.isSword(attacker.getItemInHand())){
 			if(PPa.getSkillLevel(SkillType.SWORDS) >= 750)
 			{
 				if(Math.random() * 1000 <= 750)
@@ -77,73 +77,6 @@ public class Swords
 			}
 		}
     }
-    public static void applySerratedStrikes(Player attacker, EntityDamageByEntityEvent event, mcMMO pluginx)
-    {
-    	int targets = 0;
-    	
-    	int dmgAmount = (event.getDamage()/4);
-        
-        //Setup minimum damage
-        if(dmgAmount < 1)
-            dmgAmount = 1;
-    	
-    	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(hurrDurr.getOwner() instanceof Player)
-		    		{
-		    			Player owner = (Player) hurrDurr.getOwner();
-			    		if(owner == attacker)
-			    			return;
-			    		if(Party.getInstance().inSameParty(attacker, owner))
-			    			return;
-		    		}
-				}
-    			//Damage nearby LivingEntities
-    			if(derp instanceof LivingEntity && targets >= 1)
-    			{
-    				if(derp instanceof Player)
-	    			{
-	    				Player target = (Player)derp;
-	    				
-	    				if(target.getName().equals(attacker.getName()))
-	    					continue;
-	    				
-	    				if(Users.getProfile(target).getGodMode())
-	    					continue;
-	    				
-	    				if(Party.getInstance().inSameParty(attacker, target))
-	    					continue;
-	    				if(targets >= 1 && derp.getWorld().getPVP())
-	    				{
-	    					Combat.dealDamage(target, dmgAmount, attacker);
-	    					target.sendMessage(mcLocale.getString("Swords.HitBySerratedStrikes"));
-	        				Users.getProfile(target).addBleedTicks(5);
-	    					targets--;
-	    					continue;
-	    				}
-	    			} 
-    				else
-	    			{
-	    				if(!pluginx.misc.bleedTracker.contains(derp))
-	    					pluginx.misc.addToBleedQue((LivingEntity)derp);
-	    				
-	    				LivingEntity target = (LivingEntity)derp;
-    					Combat.dealDamage(target, dmgAmount, attacker);
-	    				targets--;
-	    			}
-    			}
-    		}
-    	}
-	}
     
     public static void counterAttackChecks(EntityDamageByEntityEvent event)
     {
@@ -159,7 +92,7 @@ public class Swords
 		   	{
 		   		Player defender = (Player)event.getEntity();
 		   		PlayerProfile PPd = Users.getProfile(defender);
-		   		if(m.isSwords(defender.getItemInHand()) && mcPermissions.getInstance().swords(defender))
+		   		if(ItemChecks.isSword(defender.getItemInHand()) && mcPermissions.getInstance().swords(defender))
 		   		{
 		    		if(PPd.getSkillLevel(SkillType.SWORDS) >= 600)
 		    		{