Refactoring to match Master branch.

*Basic framework for Staves is now done.*

Changelog.txt

@@ -7,6 +7,28 @@ Key:
   ! Change
   - Removal
 
+Version 1.3.06-dev
+ + Added permissions check to skill functions
+ + Added API functions for obtaining offline profiles & profiles via player names
+ + Added API functions for admin & party chat
+ + Added Iron Grip skill to Unarmed which gives players an chance to keep from being disarmed.
+ = Fixed bug where Herbalism required double drops permission to give XP
+ = Fixed bug where {0} would be displayed in front of your power level in mcstats
+ = Fixed mmoupdate not being useable from console
+ = Fixed bug with repairing wooden tools
+ = Fixed bug with Nether Wart not awarding XP
+ = Fixed bug with fishing treasures when treasures list is empty
+ = Fixed bug with only getting one level when there was enough XP for multiple levels.
+ ! Changed how the tree feller threshold worked for the better
+ ! Changed mcremove to no longer kick players when they are removed from database
+ ! Changed mcremove to work on offline users for FlatFile
+ ! Changed PlayerProfile constructor to always take a boolean
+ ! Changed getPlayerProfile function to work for online & offline users
+ ! Changed Archery's Daze to deal 4 DMG on proc (2 Hearts)
+ ! Changed /addlevel command to work for offline users
+ ! Changed party & admin chat handling to be nicer to developers
+ ! Changed UpdateXPBar function to hopefully avoid errors
+
 Version 1.3.05
  + Added Skill Shot to Archery which increases damage dealt by 10% every 50 skill levels (caps at 200%)
  + Added ExperienceAPI and PartyAPI classes for developer use
@@ -20,6 +42,7 @@ Version 1.3.05
  = Fixed bug where Skull Splitter & Serrated Strikes could be used without permissions.
  = Fixed bug where API functions were set to static
  = Fixed bug where mmoedit threw errors when modifying an offline user
+ = Fixed dupe exploit with Blast Mining
  ! Changed Tree Feller to account for ability durability loss but not leaves.
  ! Changed bypass node for Arcane Forging to not default to true for OPs
  - Removed Ignition from Archery

pom.xml

@@ -2,7 +2,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>com.gmail.nossr50.mcMMO</groupId>
     <artifactId>mcMMO</artifactId>
-    <version>1.3.05</version>
+    <version>1.3.06-dev</version>
     <name>mcMMO</name>
     <url>https://github.com/mcMMO-Dev/mcMMO</url>
     <issueManagement>

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

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

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

@@ -2,9 +2,9 @@ package com.gmail.nossr50.api;
 
 import org.bukkit.entity.Player;
 
-import com.gmail.nossr50.Users;
 import com.gmail.nossr50.datatypes.SkillType;
-import com.gmail.nossr50.skills.Skills;
+import com.gmail.nossr50.util.Skills;
+import com.gmail.nossr50.util.Users;
 
 public class ExperienceAPI {
 

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

@@ -7,8 +7,8 @@ import java.util.ArrayList;
 import org.bukkit.Bukkit;
 import org.bukkit.entity.Player;
 
-import com.gmail.nossr50.Users;
 import com.gmail.nossr50.party.Party;
+import com.gmail.nossr50.util.Users;
 
 public class PartyAPI {
 

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

@@ -3,12 +3,12 @@ package com.gmail.nossr50.commands;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 
-import com.gmail.nossr50.Users;
-import com.gmail.nossr50.mcPermissions;
 import com.gmail.nossr50.datatypes.PlayerProfile;
 import com.gmail.nossr50.datatypes.SkillType;
 import com.gmail.nossr50.locale.mcLocale;
-import com.gmail.nossr50.skills.Skills;
+import com.gmail.nossr50.util.Skills;
+import com.gmail.nossr50.util.Users;
+import com.gmail.nossr50.util.mcPermissions;
 
 public class CommandHelper {
 
@@ -32,6 +32,15 @@ public class CommandHelper {
         return false;
     }
 
+    public static boolean noConsoleUsage(CommandSender sender) {
+        if (!(sender instanceof Player)) {
+            sender.sendMessage(mcLocale.getString("Commands.NoConsole"));
+            return true;
+        }
+
+        return false;
+    }
+    
     /**
      * Print out details on Gathering skills. Only for online players.
      *

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

@@ -1,17 +1,20 @@
 package com.gmail.nossr50.commands.general;
 
 import org.bukkit.ChatColor;
+import org.bukkit.OfflinePlayer;
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandExecutor;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 
-import com.gmail.nossr50.Users;
-import com.gmail.nossr50.m;
 import com.gmail.nossr50.mcMMO;
 import com.gmail.nossr50.commands.CommandHelper;
+import com.gmail.nossr50.datatypes.PlayerProfile;
 import com.gmail.nossr50.datatypes.SkillType;
-import com.gmail.nossr50.skills.Skills;
+import com.gmail.nossr50.locale.mcLocale;
+import com.gmail.nossr50.util.Skills;
+import com.gmail.nossr50.util.Users;
+import com.gmail.nossr50.util.m;
 
 public class AddlevelsCommand implements CommandExecutor{
     private final mcMMO plugin;
@@ -22,11 +25,12 @@ public class AddlevelsCommand implements CommandExecutor{
 
     @Override
     public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
-        Player modifiedPlayer;
+        OfflinePlayer modifiedPlayer;
+        PlayerProfile PP;
         int levels;
         SkillType skill;
         String skillName;
-        String usage = ChatColor.RED + "Proper usage is /addlevels <playername> <skillname> <levels>"; //TODO: Needs more locale.
+        String usage = ChatColor.RED + "Proper usage is /addlevels [playername] <skill> <level>"; //TODO: Needs more locale.
 
         if (CommandHelper.noCommandPermissions(sender, "mcmmo.tools.mmoedit")) {
             return true;
@@ -39,6 +43,7 @@ public class AddlevelsCommand implements CommandExecutor{
                     modifiedPlayer = (Player) sender;
                     levels = Integer.valueOf(args[1]);
                     skill = Skills.getSkillType(args[0]);
+                    PP = Users.getProfile(modifiedPlayer);
 
                     if (skill.equals(SkillType.ALL)) {
                         skillName = "all skills";
@@ -47,7 +52,7 @@ public class AddlevelsCommand implements CommandExecutor{
                         skillName = m.getCapitalized(skill.toString());
                     }
 
-                    Users.getProfile(modifiedPlayer).addLevels(skill, levels);
+                    PP.addLevels(skill, levels);
                     sender.sendMessage(ChatColor.GREEN + "You were awarded " + levels + " levels in " + skillName + "!"); //TODO: Needs more locale.
                 }
             }
@@ -58,10 +63,16 @@ public class AddlevelsCommand implements CommandExecutor{
             return true;
 
         case 3:
-            modifiedPlayer = plugin.getServer().getPlayer(args[0]);
+            modifiedPlayer = plugin.getServer().getOfflinePlayer(args[0]);
             String playerName = modifiedPlayer.getName();
+            PP = Users.getProfile(modifiedPlayer);
 
-            if (modifiedPlayer != null && m.isInt(args[2]) && Skills.isSkill(args[1])) {
+            if (!PP.isLoaded()) {
+                sender.sendMessage(mcLocale.getString("Commands.DoesNotExist"));
+                return true;
+            }
+
+            if (m.isInt(args[2]) && Skills.isSkill(args[1])) {
                 levels = Integer.valueOf(args[2]);
                 skill = Skills.getSkillType(args[1]);
                 String message;
@@ -78,7 +89,13 @@ public class AddlevelsCommand implements CommandExecutor{
                 }
 
                 sender.sendMessage(message);
-                modifiedPlayer.sendMessage(ChatColor.GREEN + "You were awarded " + levels + " levels in " + skillName + "!"); //TODO: Needs more locale.
+
+                if (modifiedPlayer.isOnline()) {
+                    ((Player) modifiedPlayer).sendMessage(ChatColor.GREEN + "You were awarded " + levels + " levels in " + skillName + "!"); //TODO: Needs more locale.
+                }
+            }
+            else {
+                sender.sendMessage(usage);
             }
 
             return true;

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

@@ -6,13 +6,14 @@ 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.commands.CommandHelper;
 import com.gmail.nossr50.datatypes.SkillType;
-import com.gmail.nossr50.skills.Skills;
+import com.gmail.nossr50.util.Skills;
+import com.gmail.nossr50.util.Users;
+import com.gmail.nossr50.util.m;
 
+//TODO: Any way we can make this work for offline use?
 public class AddxpCommand implements CommandExecutor {
     private final mcMMO plugin;
 
@@ -26,7 +27,7 @@ public class AddxpCommand implements CommandExecutor {
         int xp;
         SkillType skill;
         String skillName;
-        String usage = ChatColor.RED + "Proper usage is /addxp <playername> <skillname> <xp>"; //TODO: Needs more locale.
+        String usage = ChatColor.RED + "Proper usage is /addxp [player] <skill> <xp>"; //TODO: Needs more locale.
 
         if (CommandHelper.noCommandPermissions(sender, "mcmmo.tools.mmoedit")) {
             return true;
@@ -95,6 +96,9 @@ public class AddxpCommand implements CommandExecutor {
                     Skills.XpCheckSkill(skill, modifiedPlayer);
                 }
             }
+            else {
+                sender.sendMessage(usage);
+            }
 
             return true;
 

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

@@ -1,17 +1,18 @@
 package com.gmail.nossr50.commands.general;
 
+import org.bukkit.OfflinePlayer;
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandExecutor;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 
-import com.gmail.nossr50.Users;
-import com.gmail.nossr50.m;
 import com.gmail.nossr50.mcMMO;
 import com.gmail.nossr50.commands.CommandHelper;
 import com.gmail.nossr50.datatypes.PlayerProfile;
 import com.gmail.nossr50.datatypes.SkillType;
 import com.gmail.nossr50.locale.mcLocale;
+import com.gmail.nossr50.util.Users;
+import com.gmail.nossr50.util.m;
 
 public class InspectCommand implements CommandExecutor {
     private final mcMMO plugin;
@@ -22,9 +23,9 @@ public class InspectCommand implements CommandExecutor {
 
     @Override
     public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
-        Player target;
+        OfflinePlayer target;
         PlayerProfile PP;
-        String usage = "Proper usage is /inspect <playername>"; //TODO: Needs more locale.
+        String usage = "Proper usage is /inspect <player>"; //TODO: Needs more locale.
 
         if (CommandHelper.noCommandPermissions(sender, "mcmmo.commands.inspect")) {
             return true;
@@ -32,32 +33,33 @@ public class InspectCommand implements CommandExecutor {
 
         switch (args.length) {
         case 1:
-            target = plugin.getServer().getPlayer(args[0]);
+            target = plugin.getServer().getOfflinePlayer(args[0]);
+            PP = Users.getProfile(target);
 
-            if (target != null) {
-                PP = Users.getProfile(target);
+            if (target.isOnline()) {
+                Player player = (Player) target;
 
-                if (sender instanceof Player && !sender.isOp() && !m.isNear(((Player) sender).getLocation(), target.getLocation(), 5.0)) {
+                if (sender instanceof Player && !sender.isOp() && !m.isNear(((Player) sender).getLocation(), player.getLocation(), 5.0)) {
                     sender.sendMessage(mcLocale.getString("Inspect.TooFar"));
                     return true;
                 }
 
                 sender.sendMessage(mcLocale.getString("Inspect.Stats", new Object[] { target.getName() }));
-                CommandHelper.printGatheringSkills(target, sender);
-                CommandHelper.printCombatSkills(target, sender);
-                CommandHelper.printMiscSkills(target, sender);
+                CommandHelper.printGatheringSkills(player, sender);
+                CommandHelper.printCombatSkills(player, sender);
+                CommandHelper.printMiscSkills(player, sender);
                 sender.sendMessage(mcLocale.getString("mcPlayerListener.PowerLevel", new Object[] { PP.getPowerLevel() }));
+
+                return true;
             }
             else {
-                PP = Users.getOfflineProfile(args[0]);
-
                 if (sender instanceof Player && !sender.isOp()) {
                     sender.sendMessage(mcLocale.getString("Inspect.Offline"));
                     return true;
                 }
 
                 if (!PP.isLoaded()) {
-                    sender.sendMessage(mcLocale.getString("Inspect.DoesNotExist"));
+                    sender.sendMessage(mcLocale.getString("Commands.DoesNotExist"));
                     return true;
                 }
 
@@ -80,9 +82,9 @@ public class InspectCommand implements CommandExecutor {
                 sender.sendMessage(mcLocale.getString("Stats.MiscHeader"));
                 sender.sendMessage(mcLocale.getString("m.SkillStats", new Object[] { mcLocale.getString("mcPlayerListener.AcrobaticsSkill"), PP.getSkillLevel(SkillType.ACROBATICS), PP.getSkillXpLevel(SkillType.ACROBATICS), PP.getXpToLevel(SkillType.ACROBATICS) }));
                 sender.sendMessage(mcLocale.getString("m.SkillStats", new Object[] { mcLocale.getString("mcPlayerListener.RepairSkill"), PP.getSkillLevel(SkillType.REPAIR), PP.getSkillXpLevel(SkillType.REPAIR), PP.getXpToLevel(SkillType.REPAIR) }));
-            }
 
-            return true;
+                return true;
+            }
 
         default:
             sender.sendMessage(usage);

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

@@ -1,77 +1,35 @@
 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.mcPermissions;
+import com.gmail.nossr50.commands.CommandHelper;
 import com.gmail.nossr50.datatypes.PlayerProfile;
-import com.gmail.nossr50.datatypes.SkillType;
 import com.gmail.nossr50.locale.mcLocale;
-import com.gmail.nossr50.skills.Skills;
+import com.gmail.nossr50.util.Users;
 
 public class McstatsCommand 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 (!(sender instanceof Player)) {
-            sender.sendMessage("This command does not support console useage."); //TODO: Needs more locale.
+    @Override
+    public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
+        if (CommandHelper.noConsoleUsage(sender)) {
             return true;
         }
 
-		PlayerProfile PP = Users.getProfile(player);
+        Player player = (Player) sender;
+        PlayerProfile PP = Users.getProfile(player);
 
-		player.sendMessage(mcLocale.getString("mcPlayerListener.YourStats"));
+        player.sendMessage(mcLocale.getString("mcPlayerListener.YourStats"));
+        player.sendMessage(mcLocale.getString("mcPlayerListener.NoSkillNote"));
 
-		player.sendMessage(mcLocale.getString("mcPlayerListener.NoSkillNote"));
+        CommandHelper.printGatheringSkills(player);
+        CommandHelper.printCombatSkills(player);
+        CommandHelper.printMiscSkills(player);
 
-		ChatColor header = ChatColor.GOLD;
+        player.sendMessage(mcLocale.getString("mcPlayerListener.PowerLevel", new Object[] { PP.getPowerLevel() }));
 
-		if (Skills.hasGatheringSkills(player)) {
-			player.sendMessage(header + "-=GATHERING SKILLS=-"); //TODO: Needs more locale.
-			if (mcPermissions.getInstance().excavation(player))
-				player.sendMessage(Skills.getSkillStats(mcLocale.getString("mcPlayerListener.ExcavationSkill"), PP.getSkillLevel(SkillType.EXCAVATION), PP.getSkillXpLevel(SkillType.EXCAVATION), PP.getXpToLevel(SkillType.EXCAVATION)));
-			if (mcPermissions.getInstance().fishing(player))
-				player.sendMessage(Skills.getSkillStats(mcLocale.getString("mcPlayerListener.FishingSkill"), PP.getSkillLevel(SkillType.FISHING), PP.getSkillXpLevel(SkillType.FISHING), PP.getXpToLevel(SkillType.FISHING)));
-			if (mcPermissions.getInstance().herbalism(player))
-				player.sendMessage(Skills.getSkillStats(mcLocale.getString("mcPlayerListener.HerbalismSkill"), PP.getSkillLevel(SkillType.HERBALISM), PP.getSkillXpLevel(SkillType.HERBALISM), PP.getXpToLevel(SkillType.HERBALISM)));
-			if (mcPermissions.getInstance().mining(player))
-				player.sendMessage(Skills.getSkillStats(mcLocale.getString("mcPlayerListener.MiningSkill"), PP.getSkillLevel(SkillType.MINING), PP.getSkillXpLevel(SkillType.MINING), PP.getXpToLevel(SkillType.MINING)));
-			if (mcPermissions.getInstance().woodcutting(player))
-				player.sendMessage(Skills.getSkillStats(mcLocale.getString("mcPlayerListener.WoodcuttingSkill"), PP.getSkillLevel(SkillType.WOODCUTTING), PP.getSkillXpLevel(SkillType.WOODCUTTING), PP.getXpToLevel(SkillType.WOODCUTTING)));
-		}
-		if (Skills.hasCombatSkills(player)) {
-			player.sendMessage(header + "-=COMBAT SKILLS=-"); //TODO: Needs more locale.
-			if (mcPermissions.getInstance().axes(player))
-				player.sendMessage(Skills.getSkillStats(mcLocale.getString("mcPlayerListener.AxesSkill"), PP.getSkillLevel(SkillType.AXES), PP.getSkillXpLevel(SkillType.AXES), PP.getXpToLevel(SkillType.AXES)));
-			if (mcPermissions.getInstance().archery(player))
-				player.sendMessage(Skills.getSkillStats(mcLocale.getString("mcPlayerListener.ArcherySkill"), PP.getSkillLevel(SkillType.ARCHERY), PP.getSkillXpLevel(SkillType.ARCHERY), PP.getXpToLevel(SkillType.ARCHERY)));
-			if (mcPermissions.getInstance().swords(player))
-				player.sendMessage(Skills.getSkillStats(mcLocale.getString("mcPlayerListener.SwordsSkill"), PP.getSkillLevel(SkillType.SWORDS), PP.getSkillXpLevel(SkillType.SWORDS), PP.getXpToLevel(SkillType.SWORDS)));
-			if (mcPermissions.getInstance().taming(player))
-				player.sendMessage(Skills.getSkillStats(mcLocale.getString("mcPlayerListener.TamingSkill"), PP.getSkillLevel(SkillType.TAMING), PP.getSkillXpLevel(SkillType.TAMING), PP.getXpToLevel(SkillType.TAMING)));
-			if (mcPermissions.getInstance().unarmed(player))
-				player.sendMessage(Skills.getSkillStats(mcLocale.getString("mcPlayerListener.UnarmedSkill"), PP.getSkillLevel(SkillType.UNARMED), PP.getSkillXpLevel(SkillType.UNARMED), PP.getXpToLevel(SkillType.UNARMED)));
-		}
-
-		if (Skills.hasMiscSkills(player)) {
-			player.sendMessage(header + "-=MISC SKILLS=-"); //TODO: Needs more locale.
-			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().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 + (PP.getPowerLevel()));
-
-		return true;
-	}
+        return true;
+    }
 }

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

@@ -1,116 +1,108 @@
 package com.gmail.nossr50.commands.general;
 
 import org.bukkit.ChatColor;
+import org.bukkit.OfflinePlayer;
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandExecutor;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 
-import com.gmail.nossr50.Users;
-import com.gmail.nossr50.m;
-import com.gmail.nossr50.mcPermissions;
+import com.gmail.nossr50.mcMMO;
+import com.gmail.nossr50.commands.CommandHelper;
 import com.gmail.nossr50.datatypes.PlayerProfile;
+import com.gmail.nossr50.datatypes.SkillType;
 import com.gmail.nossr50.locale.mcLocale;
-import com.gmail.nossr50.skills.Skills;
+import com.gmail.nossr50.util.Skills;
+import com.gmail.nossr50.util.Users;
+import com.gmail.nossr50.util.m;
 
 public class MmoeditCommand implements CommandExecutor {
+    private final mcMMO plugin;
 
-	@Override
-	public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
-		Player player = null;
-        if (sender instanceof Player) 
-        {
-            player = (Player) sender;
+    public MmoeditCommand(mcMMO instance) {
+        this.plugin = instance;
+    }
+
+    @Override
+    public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
+        OfflinePlayer modifiedPlayer;
+        PlayerProfile PP;
+        int newValue;
+        SkillType skill;
+        String skillName;
+        String usage = ChatColor.RED + "Proper usage is /mmoedit [player] <skill> <level>"; //TODO: Needs more locale.
+
+        if (CommandHelper.noCommandPermissions(sender, "mcmmo.tools.mmoedit")) {
+            return true;
         }
-		
-        if (player != null && !mcPermissions.getInstance().mmoedit(player)) {
-			sender.sendMessage("This command requires permissions."); //TODO: Needs more locale.
-			return true;
-		}
 
-		if (!(sender instanceof Player)) 
-		{
-			if (args.length < 2) 
-			{
-				System.out.println("Usage is /mmoedit playername skillname newvalue"); //TODO: Needs more locale.
-				return true;
-			} else if (args.length == 3)
-			{
-			    PlayerProfile PPt = null;
-			    
-			    if(Users.players.containsKey(args[0].toLowerCase())) {
-			        PPt = Users.players.get(args[0].toLowerCase());
-			    } else
-			        PPt = Users.getOfflineProfile(args[0]); //Only grab offline profile if the above failed
-			        
-			    if(!PPt.isLoaded())
-		        {
-		            sender.sendMessage("Player does not exist in the database!"); //TODO: Needs more locale.
-		            return true;
-		        }
-			    
-				if (m.isInt(args[2]) && Skills.isSkill(args[1])) 
-				{
-					int newvalue = Integer.valueOf(args[2]);
-					Users.getOfflineProfile(args[0]).modifyskill(Skills.getSkillType(args[1]), newvalue);
-					System.out.println(args[1] + " has been modified for " + args[0] + "."); //TODO: Needs more locale.
-				}
-			} else 
-			{
-				System.out.println("Usage is /mmoedit playername skillname newvalue"); //TODO: Needs more locale.
-			}
+        switch (args.length) {
+        case 2:
+            if (sender instanceof Player) {
+                if (m.isInt(args[1]) && Skills.isSkill(args[0])) {
+                    modifiedPlayer = (Player) sender;
+                    newValue = Integer.valueOf(args[1]);
+                    skill = Skills.getSkillType(args[0]);
+                    PP = Users.getProfile(modifiedPlayer);
 
-			return true;
-		}
+                    if (skill.equals(SkillType.ALL)) {
+                        skillName = "all skills";
+                    }
+                    else {
+                        skillName = m.getCapitalized(skill.toString());
+                    }
 
-		if (!mcPermissions.getInstance().mmoedit(player)) 
-		{
-			player.sendMessage(ChatColor.YELLOW + "[mcMMO] " + ChatColor.DARK_RED + mcLocale.getString("mcPlayerListener.NoPermission"));
-			return true;
-		}
-		
-		if (args.length < 2) 
-		{
-			player.sendMessage(ChatColor.RED + "Usage is /mmoedit playername skillname newvalue"); //TODO: Needs more locale.
-			return true;
-		}
-		if (args.length == 3) 
-		{
-		    PlayerProfile PPt = null;
-            
-            if(Users.players.containsKey(args[0].toLowerCase())) {
-                PPt = Users.players.get(args[0].toLowerCase());
+                    PP.modifySkill(skill, newValue);
+                    sender.sendMessage(ChatColor.GREEN + "Your level in " + skillName + " was set to " + newValue + "!"); //TODO: Needs more locale.
+                }
+            }
+            else {
+                sender.sendMessage(usage);
             }
-            
-            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!"); //TODO: Needs more locale.
-	            return true;
-	        }
-		    
-			if (m.isInt(args[2]) && Skills.isSkill(args[1])) 
-			{
-				int newvalue = Integer.valueOf(args[2]);
-				PPt.modifyskill(Skills.getSkillType(args[1]), newvalue);
-				player.sendMessage(ChatColor.RED + args[1] + " has been modified for "+args[0]); //TODO: Needs more locale.
-			}
-		} 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."); //TODO: Needs more locale.
-			}
-		} else 
-		{
-			player.sendMessage(ChatColor.RED + "Usage is /mmoedit playername skillname newvalue"); //TODO: Needs more locale.
-		}
 
-		return true;
-	}
+            return true;
+
+        case 3:
+            modifiedPlayer = plugin.getServer().getOfflinePlayer(args[0]);
+            String playerName = modifiedPlayer.getName();
+            PP = Users.getProfile(modifiedPlayer);
+
+            if (!PP.isLoaded()) {
+                sender.sendMessage(mcLocale.getString("Commands.DoesNotExist"));
+                return true;
+            }
+
+            if (m.isInt(args[2]) && Skills.isSkill(args[1])) {
+                newValue = Integer.valueOf(args[2]);
+                skill = Skills.getSkillType(args[1]);
+                String message;
+
+                Users.getProfile(modifiedPlayer).modifySkill(skill, newValue);
+
+                if (skill.equals(SkillType.ALL)) {
+                    skillName = "all skills";
+                    message = ChatColor.RED + "All skills have been modified for " + playerName + "."; //TODO: Use locale
+                }
+                else {
+                    skillName = m.getCapitalized(skill.toString());
+                    message = ChatColor.RED + skillName + " has been modified for " + playerName + "."; //TODO: Use locale
+                }
+
+                sender.sendMessage(message);
+
+                if (modifiedPlayer.isOnline()) {
+                    ((Player) modifiedPlayer).sendMessage(ChatColor.GREEN + "Your level in " + skillName + " was set to " + newValue + "!"); //TODO: Needs more locale.
+                }
+            }
+            else {
+                sender.sendMessage(usage);
+            }
+
+            return true;
+
+        default:
+            sender.sendMessage(usage);
+            return true;
+        }
+    }
 }

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

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

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

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

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

@@ -1,44 +1,38 @@
 package com.gmail.nossr50.commands.mc;
 
-import org.bukkit.ChatColor;
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandExecutor;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 
-import com.gmail.nossr50.Users;
-import com.gmail.nossr50.mcPermissions;
+import com.gmail.nossr50.commands.CommandHelper;
 import com.gmail.nossr50.datatypes.PlayerProfile;
 import com.gmail.nossr50.locale.mcLocale;
+import com.gmail.nossr50.util.Users;
 
 public class McabilityCommand implements CommandExecutor {
-	@Override
-	public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
-        Player player = null;
-        if (sender instanceof Player) {
-            player = (Player) sender;
+
+    @Override
+    public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
+        if (CommandHelper.noConsoleUsage(sender)) {
+            return true;
         }
 
-		if (player != null && !mcPermissions.getInstance().mcAbility(player)) {
-			player.sendMessage(ChatColor.YELLOW + "[mcMMO] " + ChatColor.DARK_RED + mcLocale.getString("mcPlayerListener.NoPermission"));
-			return true;
-		}
+        if (CommandHelper.noCommandPermissions(sender, "mcmmo.admin")) {
+            return true;
+        }
 
-		if (!(sender instanceof Player)) {
-			sender.sendMessage("This command does not support console useage."); //TODO: Needs more locale.
-			return true;
-		}
+        PlayerProfile PP = Users.getProfile((Player) sender);
 
-		PlayerProfile PP = Users.getProfile(player);
+        if (PP.getAbilityUse()) {
+            sender.sendMessage(mcLocale.getString("mcPlayerListener.AbilitiesOff"));
+        }
+        else {
+            sender.sendMessage(mcLocale.getString("mcPlayerListener.AbilitiesOn"));
+        }
 
-		if (PP.getAbilityUse()) {
-			player.sendMessage(mcLocale.getString("mcPlayerListener.AbilitiesOff"));
-			PP.toggleAbilityUse();
-		} else {
-			player.sendMessage(mcLocale.getString("mcPlayerListener.AbilitiesOn"));
-			PP.toggleAbilityUse();
-		}
+        PP.toggleAbilityUse();
 
-		return true;
-	}
+        return true;
+    }
 }

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

@@ -6,58 +6,67 @@ import org.bukkit.command.CommandExecutor;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 
-import com.gmail.nossr50.mcPermissions;
+import com.gmail.nossr50.commands.CommandHelper;
 import com.gmail.nossr50.locale.mcLocale;
+import com.gmail.nossr50.util.mcPermissions;
 
+//TODO: Rework this whole thing. It's ugly.
 public class MccCommand implements CommandExecutor {
-	@Override
-	public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
 
-		if (!(sender instanceof Player)) {
-			sender.sendMessage("This command does not support console useage.");
-			return true;
-		}
+    @Override
+    public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
+        if (CommandHelper.noConsoleUsage(sender)) {
+            return true;
+        }
 
-		Player player = (Player) sender;
+        Player player = (Player) sender;
 
-		player.sendMessage(ChatColor.RED + "---[]" + ChatColor.YELLOW + "mcMMO Commands" + ChatColor.RED + "[]---"); //TODO: Needs more locale.
+        player.sendMessage(ChatColor.RED + "---[]" + ChatColor.YELLOW + "mcMMO Commands" + ChatColor.RED + "[]---"); //TODO: Needs more locale.
 
-		if (mcPermissions.getInstance().party(player)) {
-			player.sendMessage(mcLocale.getString("m.mccPartyCommands"));
-			player.sendMessage("/party " + mcLocale.getString("m.mccParty"));
-			player.sendMessage("/party q " + mcLocale.getString("m.mccPartyQ"));
+        if (mcPermissions.getInstance().party(player)) {
+            player.sendMessage(mcLocale.getString("m.mccPartyCommands"));
+            player.sendMessage("/party " + mcLocale.getString("m.mccParty"));
+            player.sendMessage("/party q " + mcLocale.getString("m.mccPartyQ"));
 
-			if (mcPermissions.getInstance().partyChat(player))
-				player.sendMessage("/p " + mcLocale.getString("m.mccPartyToggle"));
+            if (mcPermissions.getInstance().partyChat(player)) {
+                player.sendMessage("/p " + mcLocale.getString("m.mccPartyToggle"));
+            }
 
-			player.sendMessage("/invite " + mcLocale.getString("m.mccPartyInvite"));
-			player.sendMessage("/invite " + mcLocale.getString("m.mccPartyAccept"));
+            player.sendMessage("/invite " + mcLocale.getString("m.mccPartyInvite"));
+            player.sendMessage("/invite " + mcLocale.getString("m.mccPartyAccept"));
 
-			if (mcPermissions.getInstance().partyTeleport(player))
-				player.sendMessage("/ptp " + mcLocale.getString("m.mccPartyTeleport"));
-		}
-		player.sendMessage(mcLocale.getString("m.mccOtherCommands"));
-		player.sendMessage("/mcstats " + ChatColor.RED + mcLocale.getString("m.mccStats"));
-		player.sendMessage("/mctop <skillname> <page> " + ChatColor.RED + mcLocale.getString("m.mccLeaderboards"));
+            if (mcPermissions.getInstance().partyTeleport(player)) {
+                player.sendMessage("/ptp " + mcLocale.getString("m.mccPartyTeleport"));
+            }
+        }
 
-		if (mcPermissions.getInstance().mcAbility(player))
-			player.sendMessage("/mcability " + ChatColor.RED + mcLocale.getString("m.mccToggleAbility"));
+        player.sendMessage(mcLocale.getString("m.mccOtherCommands"));
+        player.sendMessage("/mcstats " + ChatColor.RED + mcLocale.getString("m.mccStats"));
+        player.sendMessage("/mctop <skillname> <page> " + ChatColor.RED + mcLocale.getString("m.mccLeaderboards"));
 
-		if (mcPermissions.getInstance().adminChat(player))
-			player.sendMessage("/a " + ChatColor.RED + mcLocale.getString("m.mccAdminToggle"));
+        if (mcPermissions.getInstance().mcAbility(player)) {
+            player.sendMessage("/mcability " + ChatColor.RED + mcLocale.getString("m.mccToggleAbility"));
+        }
 
-		if (mcPermissions.getInstance().inspect(player))
-			player.sendMessage("/inspect " + mcLocale.getString("m.mccInspect"));
+        if (mcPermissions.getInstance().adminChat(player)) {
+            player.sendMessage("/a " + ChatColor.RED + mcLocale.getString("m.mccAdminToggle"));
+        }
 
-		if (mcPermissions.getInstance().mmoedit(player))
-			player.sendMessage("/mmoedit " + mcLocale.getString("m.mccMmoedit"));
+        if (mcPermissions.getInstance().inspect(player)) {
+            player.sendMessage("/inspect " + mcLocale.getString("m.mccInspect"));
+        }
 
-		if (mcPermissions.getInstance().mcgod(player))
-			player.sendMessage("/mcgod " + ChatColor.RED + mcLocale.getString("m.mccMcGod"));
+        if (mcPermissions.getInstance().mmoedit(player)) {
+            player.sendMessage("/mmoedit " + mcLocale.getString("m.mccMmoedit"));
+        }
 
-		player.sendMessage(mcLocale.getString("m.mccSkillInfo"));
-		player.sendMessage("/mcmmo " + mcLocale.getString("m.mccModDescription"));
+        if (mcPermissions.getInstance().mcgod(player)) {
+            player.sendMessage("/mcgod " + ChatColor.RED + mcLocale.getString("m.mccMcGod"));
+        }
 
-		return true;
-	}
+        player.sendMessage(mcLocale.getString("m.mccSkillInfo"));
+        player.sendMessage("/mcmmo " + mcLocale.getString("m.mccModDescription"));
+
+        return true;
+    }
 }

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

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

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

@@ -1,10 +1,10 @@
 package com.gmail.nossr50.commands.mc;
 
 import org.bukkit.ChatColor;
+import org.bukkit.Material;
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandExecutor;
 import org.bukkit.command.CommandSender;
-import org.bukkit.entity.Player;
 import org.getspout.spoutapi.player.SpoutPlayer;
 
 import com.gmail.nossr50.config.LoadProperties;
@@ -12,32 +12,26 @@ import com.gmail.nossr50.locale.mcLocale;
 
 public class McmmoCommand implements CommandExecutor {
 
-	@Override
-	public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
+    @Override
+    public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
+        String description = mcLocale.getString("mcMMO.Description", new Object[] { "mcc" });
+        String[] mcSplit = description.split(",");
 
-		if (!(sender instanceof Player)) {
-			sender.sendMessage("This command does not support console useage."); //TODO: Needs more locale.
-			return true;
-		}
+        for (String x : mcSplit) {
+            sender.sendMessage(x);
+        }
 
-		Player player = (Player) sender;
+        if (LoadProperties.donateMessage) {
+            if (LoadProperties.spoutEnabled && sender instanceof SpoutPlayer) {
+                SpoutPlayer sPlayer = (SpoutPlayer) sender;
 
-		String description = mcLocale.getString("mcMMO.Description", new Object[] { "mcc" });
-		String[] mcSplit = description.split(",");
+                sPlayer.sendNotification(ChatColor.YELLOW + "[mcMMO]" + ChatColor.GOLD + " Donate!", ChatColor.GREEN + "nossr50@gmail.com", Material.DIAMOND);
+            }
 
-		for (String x : mcSplit) {
-			player.sendMessage(x);
-		}
+            sender.sendMessage(ChatColor.DARK_AQUA + "Donation Info:");
+            sender.sendMessage(ChatColor.GOLD + " - " + ChatColor.GREEN + "nossr50@gmail.com" + ChatColor.GOLD + " Paypal");
+        }
 
-		if (LoadProperties.spoutEnabled && player instanceof SpoutPlayer) {
-			SpoutPlayer sPlayer = (SpoutPlayer) player;
-			if (LoadProperties.donateMessage)
-				sPlayer.sendMessage(ChatColor.YELLOW + "[mcMMO]"+ChatColor.GOLD+" Donate! Paypal "+ChatColor.GREEN+"nossr50@gmail.com"); //Where'd our notification go?
-		} else {
-			if (LoadProperties.donateMessage)
-			    player.sendMessage(ChatColor.YELLOW + "[mcMMO]"+ChatColor.GOLD+" Donate! Paypal "+ChatColor.GREEN+"nossr50@gmail.com");
-		}
-
-		return true;
-	}
+        return true;
+    }
 }

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

@@ -6,13 +6,13 @@ 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.datatypes.AbilityType;
 import com.gmail.nossr50.datatypes.PlayerProfile;
 import com.gmail.nossr50.datatypes.ToolType;
 import com.gmail.nossr50.locale.mcLocale;
+import com.gmail.nossr50.util.Users;
+import com.gmail.nossr50.util.mcPermissions;
 
 public class McrefreshCommand implements CommandExecutor {
 	private final mcMMO plugin;

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

@@ -1,5 +1,9 @@
 package com.gmail.nossr50.commands.mc;
 
+import java.io.BufferedReader;
+import java.io.FileReader;
+import java.io.FileWriter;
+
 import org.bukkit.Bukkit;
 import org.bukkit.ChatColor;
 import org.bukkit.command.Command;
@@ -7,13 +11,15 @@ 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;
+import com.gmail.nossr50.util.Users;
+import com.gmail.nossr50.util.mcPermissions;
 
 public class McremoveCommand implements CommandExecutor {
+    String location = "plugins/mcMMO/FlatFileStuff/mcmmo.users";
+    
     @Override
     public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
         Player player = null;
@@ -68,42 +74,52 @@ public class McremoveCommand implements CommandExecutor {
 
             sender.sendMessage("User "+playerName+" removed from MySQL DB!"); //TODO: Needs more locale.
         } 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!"); //TODO: Needs more locale.
-                } else {
-                    sender.sendMessage("[mcMMO] This command is not fully functional for FlatFile yet, the player needs to be online."); //TODO: Needs more locale.
-                    return true;
-                }
+            if(removeFlatFileUser(playerName)) {
+                sender.sendMessage(ChatColor.GREEN+"[mcMMO] It worked! User was removed.");
             } else {
-                sender.sendMessage("[mcMMO] This command is not fully functional for FlatFile yet, the player needs to be online."); //TODO: Needs more locale.
-                return true;
+                sender.sendMessage(ChatColor.RED+"[mcMMO] Couldn't find the user, remember its case sensitive!");
             }
         }
         
         //Force PlayerProfile stuff to update
-        if(Bukkit.getServer().getPlayer(playerName) != null)
+        if(Bukkit.getServer().getPlayer(playerName) != null && Users.players.containsKey(playerName.toLowerCase()))
         {
-            Player targetPlayer = Bukkit.getServer().getPlayer(playerName);
-            if(targetPlayer.isOnline())
-            {
-                targetPlayer.kickPlayer("[mcMMO] Stats have been reset! Rejoin!"); //TODO: Needs more locale.
-                Users.removeUserByName(playerName);
-            } else {
-                Users.removeUser(targetPlayer);
-            }
-        } else {
-            Users.removeUserByName(playerName);
+            Users.players.remove(playerName.toLowerCase());
+            Users.addUser(Bukkit.getServer().getPlayer(playerName));
         }
         
         sender.sendMessage("[mcMMO] mcremove operation completed."); //TODO: Needs more locale.
         
         return true;
     }
+    
+    private boolean removeFlatFileUser(String playerName) {
+        boolean worked = false;
+        try {
+            FileReader file = new FileReader(location);
+            BufferedReader in = new BufferedReader(file);
+            StringBuilder writer = new StringBuilder();
+            String line = "";
+            while ((line = in.readLine()) != null) {
+                /* Write out the same file but when we get to the player we want to remove we skip his line */
+                if(!line.split(":")[0].equalsIgnoreCase(playerName))
+                {
+                    writer.append(line).append("\r\n");
+                } else {
+                    System.out.println("User found, removing...");
+                    worked = true;
+                    continue; //Skip the player
+                }
+            }
+            
+            in.close();
+            FileWriter out = new FileWriter(location); //Write out the new file
+            out.write(writer.toString());
+            out.close();
+            return worked;
+        } catch (Exception e) {
+            Bukkit.getLogger().severe("Exception while reading " + location + " (Are you sure you formatted it correctly?)" + e.toString());
+            return worked;
+        }
+    }
 }

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

@@ -7,13 +7,13 @@ import org.bukkit.ChatColor;
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandExecutor;
 import org.bukkit.command.CommandSender;
-import com.gmail.nossr50.Leaderboard;
-import com.gmail.nossr50.m;
 import com.gmail.nossr50.mcMMO;
 import com.gmail.nossr50.config.LoadProperties;
 import com.gmail.nossr50.datatypes.SkillType;
 import com.gmail.nossr50.locale.mcLocale;
-import com.gmail.nossr50.skills.Skills;
+import com.gmail.nossr50.util.Leaderboard;
+import com.gmail.nossr50.util.Skills;
+import com.gmail.nossr50.util.m;
 
 public class MctopCommand implements CommandExecutor {
 	@Override

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

@@ -7,11 +7,11 @@ 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.events.chat.McMMOAdminChatEvent;
 import com.gmail.nossr50.locale.mcLocale;
+import com.gmail.nossr50.util.Users;
+import com.gmail.nossr50.util.mcPermissions;
 
 public class ACommand implements CommandExecutor {
 
@@ -27,6 +27,13 @@ public class ACommand implements CommandExecutor {
 				aMessage = aMessage + " " + args[i];
 			}
 
+			McMMOAdminChatEvent chatEvent = new McMMOAdminChatEvent("Console", aMessage);
+			Bukkit.getPluginManager().callEvent(chatEvent);
+
+			if(chatEvent.isCancelled()) return true;
+
+			aMessage = chatEvent.getMessage();
+
 			String aPrefix = ChatColor.AQUA + "{" + ChatColor.WHITE + "*Console*" + ChatColor.AQUA + "} ";
 
 			Bukkit.getLogger().info("[A]<*Console*> " + aMessage);
@@ -55,14 +62,11 @@ public class ACommand implements CommandExecutor {
 			for (int i = 1; i <= args.length - 1; i++) {
 				aMessage = aMessage + " " + args[i];
 			}
+			
+            Users.getProfile(player).toggleAdminChat();
+            player.chat(aMessage);
+            Users.getProfile(player).toggleAdminChat();
 
-			String name = (LoadProperties.aDisplayNames) ? player.getDisplayName() : player.getName();
-			String aPrefix = ChatColor.AQUA + "{" + ChatColor.WHITE + name + ChatColor.AQUA + "} ";
-			Bukkit.getLogger().info("[A]<" + name + "> " + aMessage);
-			for (Player herp : Bukkit.getServer().getOnlinePlayers()) {
-				if (mcPermissions.getInstance().adminChat(herp) || herp.isOp())
-					herp.sendMessage(aPrefix + aMessage);
-			}
 			return true;
 		}
 

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

@@ -7,13 +7,13 @@ import org.bukkit.command.CommandExecutor;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 
-import com.gmail.nossr50.Users;
-import com.gmail.nossr50.mcPermissions;
 import com.gmail.nossr50.datatypes.PlayerProfile;
 import com.gmail.nossr50.events.party.McMMOPartyChangeEvent;
 import com.gmail.nossr50.events.party.McMMOPartyChangeEvent.EventReason;
 import com.gmail.nossr50.locale.mcLocale;
 import com.gmail.nossr50.party.Party;
+import com.gmail.nossr50.util.Users;
+import com.gmail.nossr50.util.mcPermissions;
 
 public class AcceptCommand implements CommandExecutor {
 	@Override

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

@@ -6,12 +6,12 @@ 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.datatypes.PlayerProfile;
 import com.gmail.nossr50.locale.mcLocale;
 import com.gmail.nossr50.party.Party;
+import com.gmail.nossr50.util.Users;
+import com.gmail.nossr50.util.mcPermissions;
 
 public class InviteCommand implements CommandExecutor {
 	private final mcMMO plugin;

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

@@ -7,12 +7,11 @@ 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.events.chat.McMMOPartyChatEvent;
 import com.gmail.nossr50.locale.mcLocale;
-import com.gmail.nossr50.party.Party;
+import com.gmail.nossr50.util.Users;
+import com.gmail.nossr50.util.mcPermissions;
 
 public class PCommand implements CommandExecutor {
 	public PCommand() {}
@@ -29,6 +28,13 @@ public class PCommand implements CommandExecutor {
 				pMessage = pMessage + " " + args[i];
 			}
 
+			McMMOPartyChatEvent chatEvent = new McMMOPartyChatEvent("Console", args[0], pMessage);
+			Bukkit.getPluginManager().callEvent(chatEvent);
+
+			if(chatEvent.isCancelled()) return true;
+
+			pMessage = chatEvent.getMessage();
+
 			String pPrefix = ChatColor.GREEN + "(" + ChatColor.WHITE + "*Console*" + ChatColor.GREEN + ") ";
 
 			Bukkit.getLogger().info("[P](" + args[0] + ")" + "<*Console*> " + pMessage);
@@ -63,17 +69,10 @@ public class PCommand implements CommandExecutor {
 			for (int i = 1; i <= args.length - 1; i++) {
 				pMessage = pMessage + " " + args[i];
 			}
-
-			String name = (LoadProperties.pDisplayNames) ? player.getDisplayName() : player.getName();
-			String pPrefix = ChatColor.GREEN + "(" + ChatColor.WHITE + name + ChatColor.GREEN + ") ";
-			Bukkit.getLogger().info("[P](" + PP.getParty() + ")<" + name + "> " + pMessage);
-
-			for (Player herp : Bukkit.getServer().getOnlinePlayers()) {
-				if (Users.getProfile(herp).inParty()) {
-					if (Party.getInstance().inSameParty(herp, player))
-						herp.sendMessage(pPrefix + pMessage);
-				}
-			}
+			
+			PP.togglePartyChat();
+			player.chat(pMessage);
+			PP.togglePartyChat();
 
 			return true;
 		}

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

@@ -7,13 +7,13 @@ import org.bukkit.command.CommandExecutor;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 
-import com.gmail.nossr50.Users;
-import com.gmail.nossr50.mcPermissions;
 import com.gmail.nossr50.datatypes.PlayerProfile;
 import com.gmail.nossr50.events.party.McMMOPartyChangeEvent;
 import com.gmail.nossr50.events.party.McMMOPartyChangeEvent.EventReason;
 import com.gmail.nossr50.locale.mcLocale;
 import com.gmail.nossr50.party.Party;
+import com.gmail.nossr50.util.Users;
+import com.gmail.nossr50.util.mcPermissions;
 
 public class PartyCommand implements CommandExecutor {
 	@Override

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

@@ -7,14 +7,14 @@ 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.datatypes.PlayerProfile;
 import com.gmail.nossr50.events.party.McMMOPartyTeleportEvent;
 import com.gmail.nossr50.locale.mcLocale;
 import com.gmail.nossr50.party.Party;
+import com.gmail.nossr50.util.Users;
+import com.gmail.nossr50.util.mcPermissions;
 
 public class PtpCommand implements CommandExecutor {
 	private final mcMMO plugin;

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

@@ -5,12 +5,13 @@ 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.commands.CommandHelper;
 import com.gmail.nossr50.datatypes.PlayerProfile;
 import com.gmail.nossr50.datatypes.SkillType;
 import com.gmail.nossr50.locale.mcLocale;
 import com.gmail.nossr50.util.Page;
+import com.gmail.nossr50.util.Users;
+import com.gmail.nossr50.util.mcPermissions;
 
 public class AcrobaticsCommand implements CommandExecutor {
 	@Override
@@ -21,6 +22,10 @@ public class AcrobaticsCommand implements CommandExecutor {
 			return true;
 		}
 
+        if (CommandHelper.noCommandPermissions(sender, "mcmmo.skills.acrobatics")) {
+            return true;
+        }
+        
 		Player player = (Player) sender;
 		PlayerProfile PP = Users.getProfile(player);
 

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

@@ -5,12 +5,13 @@ 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.commands.CommandHelper;
 import com.gmail.nossr50.datatypes.PlayerProfile;
 import com.gmail.nossr50.datatypes.SkillType;
 import com.gmail.nossr50.locale.mcLocale;
 import com.gmail.nossr50.util.Page;
+import com.gmail.nossr50.util.Users;
+import com.gmail.nossr50.util.mcPermissions;
 
 public class ArcheryCommand implements CommandExecutor {
 	@Override
@@ -20,6 +21,9 @@ public class ArcheryCommand implements CommandExecutor {
 			return true;
 		}
 
+        if (CommandHelper.noCommandPermissions(sender, "mcmmo.skills.archery")) {
+            return true;
+        }
 		Player player = (Player) sender;
 		PlayerProfile PP = Users.getProfile(player);
 

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

@@ -5,11 +5,12 @@ 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.commands.CommandHelper;
 import com.gmail.nossr50.datatypes.PlayerProfile;
 import com.gmail.nossr50.datatypes.SkillType;
 import com.gmail.nossr50.locale.mcLocale;
+import com.gmail.nossr50.util.Users;
+import com.gmail.nossr50.util.mcPermissions;
 
 public class AxesCommand implements CommandExecutor {
 	@Override
@@ -19,6 +20,9 @@ public class AxesCommand implements CommandExecutor {
 			return true;
 		}
 
+        if (CommandHelper.noCommandPermissions(sender, "mcmmo.skills.axes")) {
+            return true;
+        }
 		Player player = (Player) sender;
 		PlayerProfile PP = Users.getProfile(player);
 

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

@@ -5,12 +5,13 @@ 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.commands.CommandHelper;
 import com.gmail.nossr50.datatypes.PlayerProfile;
 import com.gmail.nossr50.datatypes.SkillType;
 import com.gmail.nossr50.locale.mcLocale;
 import com.gmail.nossr50.util.Page;
+import com.gmail.nossr50.util.Users;
+import com.gmail.nossr50.util.mcPermissions;
 
 public class ExcavationCommand implements CommandExecutor {
 	@Override
@@ -20,6 +21,9 @@ public class ExcavationCommand implements CommandExecutor {
 			return true;
 		}
 
+        if (CommandHelper.noCommandPermissions(sender, "mcmmo.skills.excavation")) {
+            return true;
+        }
 		Player player = (Player) sender;
 		PlayerProfile PP = Users.getProfile(player);
 

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

@@ -5,13 +5,14 @@ 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.commands.CommandHelper;
 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.skills.gathering.Fishing;
 import com.gmail.nossr50.util.Page;
+import com.gmail.nossr50.util.Users;
+import com.gmail.nossr50.util.mcPermissions;
 
 public class FishingCommand implements CommandExecutor {
 	@Override
@@ -21,6 +22,10 @@ public class FishingCommand implements CommandExecutor {
 			return true;
 		}
 
+        if (CommandHelper.noCommandPermissions(sender, "mcmmo.skills.fishing")) {
+            return true;
+        }
+
 		Player player = (Player) sender;
 		PlayerProfile PP = Users.getProfile(player);
 

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

@@ -5,12 +5,13 @@ 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.commands.CommandHelper;
 import com.gmail.nossr50.datatypes.PlayerProfile;
 import com.gmail.nossr50.datatypes.SkillType;
 import com.gmail.nossr50.locale.mcLocale;
 import com.gmail.nossr50.util.Page;
+import com.gmail.nossr50.util.Users;
+import com.gmail.nossr50.util.mcPermissions;
 
 public class HerbalismCommand implements CommandExecutor {
 	@Override
@@ -20,6 +21,10 @@ public class HerbalismCommand implements CommandExecutor {
 			return true;
 		}
 
+        if (CommandHelper.noCommandPermissions(sender, "mcmmo.skills.herbalism")) {
+            return true;
+        }
+        
 		Player player = (Player) sender;
 		PlayerProfile PP = Users.getProfile(player);
 

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

@@ -5,12 +5,13 @@ 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.commands.CommandHelper;
 import com.gmail.nossr50.datatypes.PlayerProfile;
 import com.gmail.nossr50.datatypes.SkillType;
 import com.gmail.nossr50.locale.mcLocale;
 import com.gmail.nossr50.util.Page;
+import com.gmail.nossr50.util.Users;
+import com.gmail.nossr50.util.mcPermissions;
 
 public class MiningCommand implements CommandExecutor {
 	@Override
@@ -20,6 +21,10 @@ public class MiningCommand implements CommandExecutor {
 			return true;
 		}
 
+        if (CommandHelper.noCommandPermissions(sender, "mcmmo.skills.mining")) {
+            return true;
+        }
+        
 		Player player = (Player) sender;
 		PlayerProfile PP = Users.getProfile(player);
 

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

@@ -5,14 +5,15 @@ 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.commands.CommandHelper;
 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.Repair;
+import com.gmail.nossr50.skills.misc.Repair;
 import com.gmail.nossr50.util.Page;
+import com.gmail.nossr50.util.Users;
+import com.gmail.nossr50.util.mcPermissions;
 
 public class RepairCommand implements CommandExecutor {
 	@Override
@@ -22,6 +23,9 @@ public class RepairCommand implements CommandExecutor {
 			return true;
 		}
 
+        if (CommandHelper.noCommandPermissions(sender, "mcmmo.skills.repair")) {
+            return true;
+        }
 		Player player = (Player) sender;
 		PlayerProfile PP = Users.getProfile(player);
 

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

@@ -5,12 +5,13 @@ 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.commands.CommandHelper;
 import com.gmail.nossr50.datatypes.PlayerProfile;
 import com.gmail.nossr50.datatypes.SkillType;
 import com.gmail.nossr50.locale.mcLocale;
 import com.gmail.nossr50.util.Page;
+import com.gmail.nossr50.util.Users;
+import com.gmail.nossr50.util.mcPermissions;
 
 public class SwordsCommand implements CommandExecutor {
 	@Override
@@ -20,6 +21,9 @@ public class SwordsCommand implements CommandExecutor {
 			return true;
 		}
 
+        if (CommandHelper.noCommandPermissions(sender, "mcmmo.skills.swords")) {
+            return true;
+        }
 		Player player = (Player) sender;
 		PlayerProfile PP = Users.getProfile(player);
 

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

@@ -5,13 +5,14 @@ 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.commands.CommandHelper;
 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;
+import com.gmail.nossr50.util.Users;
+import com.gmail.nossr50.util.mcPermissions;
 
 public class TamingCommand implements CommandExecutor {
 	@Override
@@ -21,6 +22,9 @@ public class TamingCommand implements CommandExecutor {
 			return true;
 		}
 
+        if (CommandHelper.noCommandPermissions(sender, "mcmmo.skills.taming")) {
+            return true;
+        }
 		Player player = (Player) sender;
 		PlayerProfile PP = Users.getProfile(player);
 

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

@@ -5,12 +5,13 @@ 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.commands.CommandHelper;
 import com.gmail.nossr50.datatypes.PlayerProfile;
 import com.gmail.nossr50.datatypes.SkillType;
 import com.gmail.nossr50.locale.mcLocale;
 import com.gmail.nossr50.util.Page;
+import com.gmail.nossr50.util.Users;
+import com.gmail.nossr50.util.mcPermissions;
 
 public class UnarmedCommand implements CommandExecutor {
 	@Override
@@ -20,6 +21,10 @@ public class UnarmedCommand implements CommandExecutor {
 			return true;
 		}
 
+        if (CommandHelper.noCommandPermissions(sender, "mcmmo.skills.unarmed")) {
+            return true;
+        }
+        
 		Player player = (Player) sender;
 		PlayerProfile PP = Users.getProfile(player);
 
@@ -32,7 +37,7 @@ public class UnarmedCommand implements CommandExecutor {
 			percentage = "33.3";
 
 		if (PP.getSkillLevel(SkillType.UNARMED) < 1000)
-			arrowpercentage = String.valueOf(((skillvalue / 1000) * 100) / 2);
+			arrowpercentage = String.valueOf((skillvalue / 2000) * 100);
 		else
 			arrowpercentage = "50";
 

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

@@ -5,12 +5,13 @@ 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.commands.CommandHelper;
 import com.gmail.nossr50.datatypes.PlayerProfile;
 import com.gmail.nossr50.datatypes.SkillType;
 import com.gmail.nossr50.locale.mcLocale;
 import com.gmail.nossr50.util.Page;
+import com.gmail.nossr50.util.Users;
+import com.gmail.nossr50.util.mcPermissions;
 
 public class WoodcuttingCommand implements CommandExecutor {
 	@Override
@@ -20,6 +21,9 @@ public class WoodcuttingCommand implements CommandExecutor {
 			return true;
 		}
 
+        if (CommandHelper.noCommandPermissions(sender, "mcmmo.skills.woodcutting")) {
+            return true;
+        }
 		Player player = (Player) sender;
 		PlayerProfile PP = Users.getProfile(player);
 		

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

@@ -5,12 +5,12 @@ 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.datatypes.HUDType;
 import com.gmail.nossr50.datatypes.HUDmmo;
 import com.gmail.nossr50.datatypes.PlayerProfile;
 import com.gmail.nossr50.spout.SpoutStuff;
+import com.gmail.nossr50.util.Users;
 
 public class MchudCommand implements CommandExecutor {
 	@Override

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

@@ -6,14 +6,14 @@ import org.bukkit.command.CommandExecutor;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 
-import com.gmail.nossr50.Users;
-import com.gmail.nossr50.m;
-import com.gmail.nossr50.mcPermissions;
 import com.gmail.nossr50.config.LoadProperties;
 import com.gmail.nossr50.datatypes.PlayerProfile;
 import com.gmail.nossr50.locale.mcLocale;
-import com.gmail.nossr50.skills.Skills;
 import com.gmail.nossr50.spout.SpoutStuff;
+import com.gmail.nossr50.util.Skills;
+import com.gmail.nossr50.util.Users;
+import com.gmail.nossr50.util.m;
+import com.gmail.nossr50.util.mcPermissions;
 
 public class XplockCommand implements CommandExecutor {
 	@Override

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

@@ -25,7 +25,6 @@ public class LoadProperties extends ConfigLoader{
                           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;
 
@@ -460,9 +459,6 @@ public class LoadProperties extends ConfigLoader{
         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);

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

@@ -3,12 +3,12 @@ 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;
+import com.gmail.nossr50.skills.gathering.Excavation;
+import com.gmail.nossr50.skills.gathering.Herbalism;
+import com.gmail.nossr50.skills.gathering.Mining;
+import com.gmail.nossr50.util.mcPermissions;
 
 public enum AbilityType {
     BERSERK(LoadProperties.berserkCooldown, mcLocale.getString("Skills.BerserkOn"), mcLocale.getString("Skills.BerserkOff"), "Skills.BerserkPlayer", mcLocale.getString("Skills.YourBerserk"), "Skills.BerserkPlayerOff"),

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

@@ -10,11 +10,11 @@ import org.getspout.spoutapi.gui.RenderPriority;
 import org.getspout.spoutapi.gui.Widget;
 import org.getspout.spoutapi.player.SpoutPlayer;
 
-import com.gmail.nossr50.Users;
-import com.gmail.nossr50.m;
 import com.gmail.nossr50.mcMMO;
 import com.gmail.nossr50.config.LoadProperties;
 import com.gmail.nossr50.spout.SpoutStuff;
+import com.gmail.nossr50.util.Users;
+import com.gmail.nossr50.util.m;
 
 public class HUDmmo {
     private int center_x = 427 / 2;

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

@@ -14,8 +14,8 @@ import org.bukkit.entity.Player;
 import com.gmail.nossr50.config.LoadProperties;
 import com.gmail.nossr50.events.experience.McMMOPlayerXpGainEvent;
 import com.gmail.nossr50.party.Party;
-import com.gmail.nossr50.Users;
-import com.gmail.nossr50.m;
+import com.gmail.nossr50.util.Users;
+import com.gmail.nossr50.util.m;
 import com.gmail.nossr50.mcMMO;
 
 public class PlayerProfile {
@@ -63,38 +63,6 @@ public class PlayerProfile {
     private String playerName;
     private String location = "plugins/mcMMO/FlatFileStuff/mcmmo.users";
 
-    public PlayerProfile(String name) {
-        hud = LoadProperties.defaulthud;
-        playerName = name;
-
-        for (AbilityType abilityType : AbilityType.values()) {
-            skillsDATS.put(abilityType, 0);
-        }
-
-        for (SkillType skillType : SkillType.values()) {
-            if (skillType != SkillType.ALL) {
-                skills.put(skillType, 0);
-                skillsXp.put(skillType, 0);
-            }
-        }
-
-        if (LoadProperties.useMySQL) {
-            if (!loadMySQL()) {
-                addMySQLPlayer();
-                loadMySQL(); //This is probably not needed anymore, could just delete. // So can we remove this whole function, or just this line?
-            }
-        }
-        else if (!load()) {
-            addPlayer();
-        }
-
-        lastlogin = ((Long) (System.currentTimeMillis() / 1000)).intValue();
-    }
-
-    /*
-     * Why do we even have this? The only time it's called, it's false.
-     * Why not combine the two?
-     */
     public PlayerProfile(String name, boolean addNew) {
         hud = LoadProperties.defaulthud;
         playerName = name;
@@ -113,7 +81,6 @@ public class PlayerProfile {
         if (LoadProperties.useMySQL) {
             if (!loadMySQL() && addNew) {
                 addMySQLPlayer();
-                loadMySQL(); //This is probably not needed anymore, could just delete. // So can we remove this whole function, or just this line?
             }
         }
         else if (!load() && addNew) {
@@ -151,7 +118,7 @@ public class PlayerProfile {
             }
             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);                
+                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
@@ -997,6 +964,10 @@ public class PlayerProfile {
         return skillsXp.get(skillType);
     }
 
+    public void skillUp(SkillType skillType, int newValue) {
+        skills.put(skillType, skills.get(skillType) + newValue);
+    }
+
     /**
      * Adds XP to the player, doesn't calculate for XP Rate
      *
@@ -1071,13 +1042,34 @@ public class PlayerProfile {
         lastgained = skillType;
     }
 
+    /**
+     * Remove XP from a skill.
+     *
+     * @param skillType Type of skill to modify
+     * @param xp Amount of xp to remove
+     */
+    public void removeXP(SkillType skillType, int xp) {
+        if (skillType.equals(SkillType.ALL)) {
+            for (SkillType skill : SkillType.values()) {
+                if (skill.equals(SkillType.ALL)) {
+                    continue;
+                }
+
+                skillsXp.put(skill, skillsXp.get(skill) - xp);
+            }
+        }
+        else {
+            skillsXp.put(skillType, skillsXp.get(skillType) - xp);
+        }
+    }
+
     /**
      * Modify a skill level.
      *
      * @param skillType Type of skill to modify
      * @param newValue New level value for the skill
      */
-    public void modifyskill(SkillType skillType, int newValue) {
+    public void modifySkill(SkillType skillType, int newValue) {
         if (skillType.equals(SkillType.ALL)) {
             for (SkillType skill : SkillType.values()) {
                 if (skill.equals(SkillType.ALL)) {

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

@@ -2,9 +2,9 @@ package com.gmail.nossr50.datatypes;
 
 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.util.Users;
+import com.gmail.nossr50.util.mcPermissions;
 
 public enum SkillType {
     ACROBATICS(LoadProperties.levelCapAcrobatics, LoadProperties.acrobaticsxpmodifier),

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

@@ -0,0 +1,7 @@
+package com.gmail.nossr50.datatypes;
+
+public enum StaffType {
+    BLAZE_ROD,
+    STICK,
+    BONE;
+}

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

@@ -3,8 +3,8 @@ 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;
+import com.gmail.nossr50.util.ItemChecks;
 
 public enum ToolType {
     AXE(mcLocale.getString("Skills.LowerAxe"), mcLocale.getString("Skills.ReadyAxe")),

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

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

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

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

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

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

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

@@ -2,23 +2,23 @@ package com.gmail.nossr50.listeners;
 
 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.datatypes.AbilityType;
 import com.gmail.nossr50.datatypes.PlayerProfile;
 import com.gmail.nossr50.datatypes.SkillType;
 import com.gmail.nossr50.datatypes.ToolType;
-import com.gmail.nossr50.skills.Excavation;
-import com.gmail.nossr50.skills.Herbalism;
-import com.gmail.nossr50.skills.Mining;
-import com.gmail.nossr50.skills.Repair;
-import com.gmail.nossr50.skills.Skills;
-import com.gmail.nossr50.skills.WoodCutting;
+import com.gmail.nossr50.skills.gathering.Excavation;
+import com.gmail.nossr50.skills.gathering.Herbalism;
+import com.gmail.nossr50.skills.gathering.Mining;
+import com.gmail.nossr50.skills.gathering.WoodCutting;
+import com.gmail.nossr50.skills.misc.Repair;
 import com.gmail.nossr50.spout.SpoutSounds;
+import com.gmail.nossr50.util.BlockChecks;
+import com.gmail.nossr50.util.ItemChecks;
+import com.gmail.nossr50.util.Skills;
+import com.gmail.nossr50.util.Users;
+import com.gmail.nossr50.util.mcPermissions;
 import com.gmail.nossr50.events.fake.FakeBlockBreakEvent;
 import com.gmail.nossr50.events.fake.FakePlayerAnimationEvent;
 
@@ -41,10 +41,10 @@ import org.bukkit.metadata.FixedMetadataValue;
 
 import org.getspout.spoutapi.sound.SoundEffect;
 
-public class mcBlockListener implements Listener {
+public class BlockListener implements Listener {
     private final mcMMO plugin;
 
-    public mcBlockListener(final mcMMO plugin) {
+    public BlockListener(final mcMMO plugin) {
         this.plugin = plugin;
     }
 
@@ -155,7 +155,7 @@ public class mcBlockListener implements Listener {
             Herbalism.herbalismProcCheck(block, player, event, plugin);
         }
 
-        if (mcPermissions.getInstance().herbalismDoubleDrops(player) && Herbalism.canBeGreenTerra(mat)) {
+        if (mcPermissions.getInstance().herbalism(player) && Herbalism.canBeGreenTerra(mat)) {
             Herbalism.herbalismProcCheck(block, player, event, plugin);
         }
 

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

@@ -22,11 +22,7 @@ import org.bukkit.event.entity.ExplosionPrimeEvent;
 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;
@@ -34,16 +30,21 @@ import com.gmail.nossr50.events.fake.FakeEntityDamageByEntityEvent;
 import com.gmail.nossr50.events.fake.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;
+import com.gmail.nossr50.skills.combat.Archery;
+import com.gmail.nossr50.skills.combat.Staves;
+import com.gmail.nossr50.skills.combat.Taming;
+import com.gmail.nossr50.skills.gathering.BlastMining;
+import com.gmail.nossr50.skills.misc.Acrobatics;
+import com.gmail.nossr50.util.Combat;
+import com.gmail.nossr50.util.Skills;
+import com.gmail.nossr50.util.Users;
+import com.gmail.nossr50.util.m;
+import com.gmail.nossr50.util.mcPermissions;
 
-public class mcEntityListener implements Listener {
+public class EntityListener implements Listener {
     private final mcMMO plugin;
 
-    public mcEntityListener(final mcMMO plugin) {
+    public EntityListener(final mcMMO plugin) {
         this.plugin = plugin;
     }
 
@@ -78,6 +79,7 @@ public class mcEntityListener implements Listener {
 
             if (!m.isInvincible(livingDefender, event)) {
                 Combat.combatChecks(event, plugin);
+                Staves.altFireCheck(event);
             }
         }
     }
@@ -175,7 +177,7 @@ public class mcEntityListener implements Listener {
      *
      * @param event The event to monitor
      */
-    @EventHandler (priority = EventPriority.HIGH, ignoreCancelled = true)
+    @EventHandler (priority = EventPriority.HIGHEST, ignoreCancelled = true)
     public void onExplosionPrime(ExplosionPrimeEvent event) {
         Entity entity = event.getEntity();
 
@@ -197,7 +199,7 @@ public class mcEntityListener implements Listener {
      *
      * @param event The event to monitor
      */
-    @EventHandler (priority = EventPriority.HIGH, ignoreCancelled = true)
+    @EventHandler (priority = EventPriority.HIGHEST, ignoreCancelled = true)
     public void onEnitityExplode(EntityExplodeEvent event) {
         Entity entity = event.getEntity();
 

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

@@ -1,5 +1,8 @@
 package com.gmail.nossr50.listeners;
 
+import java.util.HashSet;
+import java.util.Set;
+
 import org.bukkit.Bukkit;
 import org.bukkit.ChatColor;
 import org.bukkit.Material;
@@ -13,6 +16,7 @@ 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.PlayerEggThrowEvent;
 import org.bukkit.event.player.PlayerFishEvent;
 import org.bukkit.event.player.PlayerFishEvent.State;
 import org.bukkit.event.player.PlayerInteractEvent;
@@ -22,13 +26,7 @@ import org.bukkit.event.player.PlayerPickupItemEvent;
 import org.bukkit.event.player.PlayerQuitEvent;
 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.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;
@@ -36,19 +34,28 @@ 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.events.chat.McMMOAdminChatEvent;
+import com.gmail.nossr50.events.chat.McMMOPartyChatEvent;
 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;
+import com.gmail.nossr50.skills.combat.Staves;
+import com.gmail.nossr50.skills.combat.Taming;
+import com.gmail.nossr50.skills.gathering.BlastMining;
+import com.gmail.nossr50.skills.gathering.Fishing;
+import com.gmail.nossr50.skills.gathering.Herbalism;
+import com.gmail.nossr50.skills.misc.Repair;
+import com.gmail.nossr50.util.BlockChecks;
+import com.gmail.nossr50.util.Combat;
+import com.gmail.nossr50.util.Item;
+import com.gmail.nossr50.util.ItemChecks;
+import com.gmail.nossr50.util.Skills;
+import com.gmail.nossr50.util.Users;
+import com.gmail.nossr50.util.mcPermissions;
 
-public class mcPlayerListener implements Listener {
+public class PlayerListener implements Listener {
     private mcMMO plugin;
 
-    public mcPlayerListener(mcMMO instance) {
+    public PlayerListener(mcMMO instance) {
         plugin = instance;
     }
 
@@ -235,6 +242,9 @@ public class mcPlayerListener implements Listener {
                 BlastMining.remoteDetonation(player, plugin);
             }
 
+            /* STAFF CHECKS */
+            Staves.altFire(is.getType(), player, plugin);
+
             break;
 
         case RIGHT_CLICK_AIR:
@@ -258,6 +268,9 @@ public class mcPlayerListener implements Listener {
                 BlastMining.remoteDetonation(player, plugin);
             }
 
+            /* STAFF CHECKS */
+            Staves.altFire(is.getType(), player, plugin);
+
             break;
 
         case LEFT_CLICK_AIR:
@@ -291,51 +304,56 @@ public class mcPlayerListener implements Listener {
         PlayerProfile PP = Users.getProfile(player);
         boolean partyChat = PP.getPartyChatMode();
         boolean adminChat = PP.getAdminChatMode();
+        Set<Player> recipients = event.getRecipients();
+
+        Set<Player> intendedRecipients = new HashSet<Player>();
+        ChatColor color = null;
 
         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();
-            }
+                McMMOPartyChatEvent chatEvent = new McMMOPartyChatEvent(player.getName(), PP.getParty(), event.getMessage());
+                plugin.getServer().getPluginManager().callEvent(chatEvent);
 
-            String format = color + "(" + ChatColor.WHITE + name + color + ") " + event.getMessage();
+                if(chatEvent.isCancelled()) return;
 
-            for (Player x : plugin.getServer().getOnlinePlayers()) {
-                if (partyChat && Party.getInstance().inSameParty(player, x))
-                    x.sendMessage(format);
-                else if (adminChat && (x.isOp() || mcPermissions.getInstance().adminChat(x))) {
-                    x.sendMessage(format);
+                event.setMessage(chatEvent.getMessage());
+
+                for (Player x : plugin.getServer().getOnlinePlayers()) {
+                    if (Party.getInstance().inSameParty(player, x)) {
+                        intendedRecipients.add(x);
+                    }
                 }
+
+                event.setFormat(color + "(" + ChatColor.WHITE + "%1$s" + color + ") %2$s");
             }
 
-            Bukkit.getLogger().info(logHeader + name + ">" + event.getMessage());
+            if (adminChat) {
+                color = ChatColor.AQUA;
+
+                McMMOAdminChatEvent chatEvent = new McMMOAdminChatEvent(player.getName(), event.getMessage());
+                plugin.getServer().getPluginManager().callEvent(chatEvent);
+
+                if(chatEvent.isCancelled()) return;
+
+                event.setMessage(chatEvent.getMessage());
+
+                for (Player x : plugin.getServer().getOnlinePlayers()) {
+                    if (x.isOp() || mcPermissions.getInstance().adminChat(x)) {
+                        intendedRecipients.add(x);
+                    }
+                }
+
+                event.setFormat(color + "{" + ChatColor.WHITE + "%1$s" + color + "} %2$s");
+            }
+
+            recipients.retainAll(intendedRecipients);
         }
     }
 
@@ -364,4 +382,11 @@ public class mcPlayerListener implements Listener {
             event.getPlayer().chat(message.replaceFirst(command, plugin.aliasMap.get(command)));
         }
     }
+
+    @EventHandler(priority = EventPriority.NORMAL)
+    public void onPlayerEggThrow(PlayerEggThrowEvent event) {
+        if (event.getEgg().hasMetadata("mcmmoFiredFromStaff") && event.isHatching()) {
+            event.setHatching(false);
+        }
+    }
 }

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

@@ -8,7 +8,7 @@ import com.gmail.nossr50.events.experience.McMMOPlayerXpGainEvent;
 /**
  * Listener for listening to our own events, only really useful for catching errors
  */
-public class mcSelfListener implements Listener {
+public class SelfListener implements Listener {
 
     /**
      * Monitor internal XP gain events.

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

@@ -6,15 +6,15 @@ import org.getspout.spoutapi.event.input.KeyPressedEvent;
 import org.getspout.spoutapi.gui.ScreenType;
 import org.getspout.spoutapi.player.SpoutPlayer;
 
-import com.gmail.nossr50.Users;
 import com.gmail.nossr50.mcMMO;
 import com.gmail.nossr50.datatypes.popups.PopupMMO;
 import com.gmail.nossr50.spout.SpoutStuff;
+import com.gmail.nossr50.util.Users;
 
-public class mcSpoutInputListener implements Listener {
+public class SpoutInputListener implements Listener {
     private mcMMO plugin;
 
-    public mcSpoutInputListener(mcMMO plugin) {
+    public SpoutInputListener(mcMMO plugin) {
         this.plugin = plugin;
     }
 

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

@@ -6,21 +6,21 @@ import org.bukkit.event.Listener;
 import org.getspout.spoutapi.event.spout.SpoutCraftEnableEvent;
 import org.getspout.spoutapi.player.SpoutPlayer;
 
-import com.gmail.nossr50.Users;
 import com.gmail.nossr50.mcMMO;
 import com.gmail.nossr50.config.LoadProperties;
 import com.gmail.nossr50.datatypes.HUDmmo;
 import com.gmail.nossr50.datatypes.PlayerProfile;
 import com.gmail.nossr50.spout.SpoutStuff;
+import com.gmail.nossr50.util.Users;
 
-public class mcSpoutListener implements Listener {
+public class SpoutListener implements Listener {
     //Why do we have this here? We never use it...
     mcMMO plugin = null;
-    
-    public mcSpoutListener(mcMMO pluginx) {
+
+    public SpoutListener(mcMMO pluginx) {
         plugin = pluginx;
     }
-    
+
     /**
      * Monitor SpoutCraftEnable events.
      *
@@ -30,13 +30,13 @@ public class mcSpoutListener implements Listener {
     public void onSpoutCraftEnable(SpoutCraftEnableEvent event) {
         SpoutPlayer sPlayer = event.getPlayer();
         PlayerProfile PPs = Users.getProfile(sPlayer);
-        
+
         //TODO: Add custom titles based on skills
         if (LoadProperties.showPowerLevel) {
-            sPlayer.setTitle(sPlayer.getName()+ "\n" + ChatColor.YELLOW + "P" + ChatColor.GOLD + "lvl" 
+            sPlayer.setTitle(sPlayer.getName()+ "\n" + ChatColor.YELLOW + "P" + ChatColor.GOLD + "lvl"
         + ChatColor.WHITE+"." + ChatColor.GREEN + String.valueOf(PPs.getPowerLevel()));
         }
-        
+
         if (sPlayer.isSpoutCraftEnabled()) {
             SpoutStuff.playerHUDs.put(sPlayer, new HUDmmo(sPlayer)); //Setup Party HUD stuff
             

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

@@ -6,7 +6,6 @@ import org.getspout.spoutapi.event.screen.ButtonClickEvent;
 import org.getspout.spoutapi.event.screen.ScreenCloseEvent;
 import org.getspout.spoutapi.player.SpoutPlayer;
 
-import com.gmail.nossr50.Users;
 import com.gmail.nossr50.mcMMO;
 import com.gmail.nossr50.datatypes.HUDType;
 import com.gmail.nossr50.datatypes.HUDmmo;
@@ -16,12 +15,13 @@ import com.gmail.nossr50.datatypes.buttons.ButtonHUDStyle;
 import com.gmail.nossr50.datatypes.buttons.ButtonPartyToggle;
 import com.gmail.nossr50.datatypes.popups.PopupMMO;
 import com.gmail.nossr50.spout.SpoutStuff;
+import com.gmail.nossr50.util.Users;
 
-public class mcSpoutScreenListener implements Listener {
+public class SpoutScreenListener implements Listener {
     //Why do we have this here? We never use it...
     mcMMO plugin = null;
 
-    public mcSpoutScreenListener(mcMMO pluginx) {
+    public SpoutScreenListener(mcMMO pluginx) {
         plugin = pluginx;
     }
 

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

@@ -8,9 +8,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.listeners.mcBlockListener;
-import com.gmail.nossr50.listeners.mcEntityListener;
-import com.gmail.nossr50.listeners.mcPlayerListener;
+import com.gmail.nossr50.util.Database;
+import com.gmail.nossr50.util.Leaderboard;
+import com.gmail.nossr50.util.Metrics;
+import com.gmail.nossr50.util.Users;
+import com.gmail.nossr50.listeners.BlockListener;
+import com.gmail.nossr50.listeners.EntityListener;
+import com.gmail.nossr50.listeners.PlayerListener;
 import com.gmail.nossr50.locale.mcLocale;
 import com.gmail.nossr50.party.Party;
 
@@ -25,6 +29,7 @@ import java.io.InputStream;
 import java.util.HashMap;
 
 import org.bukkit.Bukkit;
+import org.bukkit.OfflinePlayer;
 import org.bukkit.plugin.Plugin;
 import org.bukkit.plugin.PluginDescriptionFile;
 import org.bukkit.plugin.java.JavaPlugin;
@@ -41,12 +46,14 @@ public class mcMMO extends JavaPlugin {
     public static File file = new File(maindirectory + File.separator + "config.yml");
     public static File versionFile = new File(maindirectory + File.separator + "VERSION");
 
-    private final mcPlayerListener playerListener = new mcPlayerListener(this);
-    private final mcBlockListener blockListener = new mcBlockListener(this);
-    private final mcEntityListener entityListener = new mcEntityListener(this);
+    private final PlayerListener playerListener = new PlayerListener(this);
+    private final BlockListener blockListener = new BlockListener(this);
+    private final EntityListener entityListener = new EntityListener(this);
 
     //Alias - Command
     public HashMap<String, String> aliasMap = new HashMap<String, String>();
+
+    //Various trackers
     public HashMap<Entity, Integer> arrowTracker = new HashMap<Entity, Integer>();
     public HashMap<Integer, Player> tntTracker = new HashMap<Integer, Player>();
 
@@ -167,6 +174,30 @@ public class mcMMO extends JavaPlugin {
         return Users.getProfile(player);
     }
 
+    /**
+     * Get profile of the player by name.
+     * </br>
+     * This function is designed for API usage.
+     *
+     * @param player Name of player whose profile to get
+     * @return the PlayerProfile object
+     */
+    public PlayerProfile getPlayerProfileByName(String playerName) {
+        return Users.getProfileByName(playerName);
+    }
+
+    /**
+     * Get profile of the offline player.
+     * </br>
+     * This function is designed for API usage.
+     *
+     * @param player Offline player whose profile to get
+     * @return the PlayerProfile object
+     */
+    public PlayerProfile getOfflinePlayerProfile(OfflinePlayer player) {
+        return Users.getProfile(player);
+    }
+
     /**
      * Things to be run when the plugin is disabled.
      */
@@ -284,7 +315,7 @@ public class mcMMO extends JavaPlugin {
         }
 
         if (LoadProperties.mmoeditEnable) {
-            getCommand("mmoedit").setExecutor(new MmoeditCommand());
+            getCommand("mmoedit").setExecutor(new MmoeditCommand(this));
         }
 
         if (LoadProperties.inspectEnable) {

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

@@ -13,10 +13,10 @@ import java.util.HashMap;
 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.util.Users;
 
 public class Party {
     public static String partyPlayersFile = mcMMO.maindirectory + File.separator + "FlatFileStuff" + File.separator + "partyPlayers";

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

@@ -5,7 +5,7 @@ import org.bukkit.entity.Player;
 
 import com.gmail.nossr50.datatypes.PlayerProfile;
 import com.gmail.nossr50.datatypes.SkillType;
-import com.gmail.nossr50.skills.Skills;
+import com.gmail.nossr50.util.Skills;
 
 public class GainXp implements Runnable {
     private Player player = null;

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

@@ -2,7 +2,7 @@ package com.gmail.nossr50.runnables;
 
 import org.bukkit.entity.Player;
 
-import com.gmail.nossr50.Users;
+import com.gmail.nossr50.util.Users;
 
 public class RemoveProfileFromMemoryTask implements Runnable {
     private Player player;
@@ -16,7 +16,7 @@ public class RemoveProfileFromMemoryTask implements Runnable {
         String playerName = player.getName();
         //Check if the profile still exists (stuff like MySQL reconnection removes profiles)
         if (Users.players.containsKey(playerName.toLowerCase())) {
-            Users.getProfile(playerName).save(); //We save here so players don't quit/reconnect to cause lag
+            Users.getProfileByName(playerName).save(); //We save here so players don't quit/reconnect to cause lag
             Users.removeUserByName(playerName);
         }
     }

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

@@ -5,9 +5,9 @@ import java.io.FileReader;
 
 import org.bukkit.Bukkit;
 
-import com.gmail.nossr50.m;
 import com.gmail.nossr50.mcMMO;
 import com.gmail.nossr50.config.LoadProperties;
+import com.gmail.nossr50.util.m;
 
 public class SQLConversionTask implements Runnable {
 

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

@@ -5,11 +5,11 @@ 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;
+import com.gmail.nossr50.util.Combat;
+import com.gmail.nossr50.util.Users;
 
 public class mcBleedTimer implements Runnable {
     private final mcMMO plugin;

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

@@ -2,8 +2,8 @@ package com.gmail.nossr50.runnables;
 
 import org.bukkit.entity.Player;
 
-import com.gmail.nossr50.Users;
 import com.gmail.nossr50.mcMMO;
+import com.gmail.nossr50.util.Users;
 
 public class mcSaveTimer implements Runnable {
     private final mcMMO plugin;

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

@@ -2,12 +2,12 @@ package com.gmail.nossr50.runnables;
 
 import org.bukkit.entity.Player;
 
-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.util.Skills;
+import com.gmail.nossr50.util.Users;
 
 public class mcTimer implements Runnable {
     private final mcMMO plugin;

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

@@ -1,4 +1,4 @@
-package com.gmail.nossr50.skills;
+package com.gmail.nossr50.skills.combat;
 
 import java.util.Random;
 
@@ -8,13 +8,14 @@ import org.bukkit.entity.Entity;
 import org.bukkit.entity.Player;
 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.util.Combat;
+import com.gmail.nossr50.util.Users;
+import com.gmail.nossr50.util.m;
+import com.gmail.nossr50.util.mcPermissions;
 
 public class Archery {
 
@@ -62,6 +63,7 @@ public class Archery {
 
         if (random.nextInt(2000) <= skillCheck && mcPermissions.getInstance().daze(attacker)) {
             defender.teleport(loc);
+            Combat.dealDamage(defender, 4);
             defender.sendMessage(mcLocale.getString("Combat.TouchedFuzzy"));
             attacker.sendMessage(mcLocale.getString("Combat.TargetDazed"));
         }

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

@@ -1,4 +1,4 @@
-package com.gmail.nossr50.skills;
+package com.gmail.nossr50.skills.combat;
 
 import java.util.Random;
 
@@ -11,12 +11,12 @@ import org.bukkit.event.entity.EntityDamageByEntityEvent;
 import org.bukkit.inventory.ItemStack;
 import org.bukkit.inventory.PlayerInventory;
 
-import com.gmail.nossr50.Users;
-import com.gmail.nossr50.m;
 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.util.Users;
+import com.gmail.nossr50.util.m;
 
 public class Axes {
 

src/main/java/com/gmail/nossr50/skills/combat/Staves.java

@@ -0,0 +1,372 @@
+package com.gmail.nossr50.skills.combat;
+
+import java.util.Collection;
+
+import org.bukkit.Material;
+import org.bukkit.entity.Egg;
+import org.bukkit.entity.Entity;
+import org.bukkit.entity.EntityType;
+import org.bukkit.entity.LivingEntity;
+import org.bukkit.entity.Player;
+import org.bukkit.entity.Projectile;
+import org.bukkit.entity.SmallFireball;
+import org.bukkit.entity.Snowball;
+import org.bukkit.event.entity.EntityDamageByEntityEvent;
+import org.bukkit.metadata.FixedMetadataValue;
+import org.bukkit.potion.PotionEffect;
+import org.bukkit.potion.PotionEffectType;
+
+import com.gmail.nossr50.mcMMO;
+import com.gmail.nossr50.party.Party;
+import com.gmail.nossr50.runnables.mcBleedTimer;
+
+public class Staves {
+
+    /**
+     * Handle the projectile effects from the staves.
+     *
+     * @param event The event to modify
+     */
+    public static void altFireCheck(EntityDamageByEntityEvent event) {
+        LivingEntity defender = (LivingEntity) event.getEntity();
+        Entity attacker = event.getDamager();
+
+        if (attacker.hasMetadata("mcmmoFiredFromStaff")) {
+            event.setDamage(0);
+
+            Projectile projectile = (Projectile) attacker;
+            Player shooter = (Player) projectile.getShooter();
+            EntityType type = attacker.getType();
+
+            projectileEffects(defender, shooter, type);
+        }
+    }
+
+    /**
+     * Fire a projectile on alt-fire from a staff.
+     *
+     * @param type The type of staff
+     * @param attacker The attacking player
+     * @param plugin mcMMO plugin instance
+     */
+    public static void altFire(Material type, Player attacker, mcMMO plugin) {
+        Projectile projectile;
+
+        if (attacker.getItemInHand().getAmount() > 1) {
+            return;
+        }
+
+        switch (type) {
+        case BLAZE_ROD:
+            projectile = attacker.launchProjectile(SmallFireball.class);
+            ((SmallFireball) projectile).setIsIncendiary(false);
+            ((SmallFireball) projectile).setYield(0f);
+            break;
+
+        case BONE:
+            projectile = attacker.launchProjectile(Snowball.class);
+            break;
+
+        case STICK:
+            projectile = attacker.launchProjectile(Egg.class);
+            break;
+
+        default:
+            return;
+        }
+
+        projectile.setMetadata("mcmmoFiredFromStaff", new FixedMetadataValue(plugin, true));
+    }
+
+    /**
+     * Handle the effects of the Bone's direct hit.
+     *
+     * @param defender The defending player
+     * @param attacker The attacking player
+     */
+    public static void boneEffect(Player defender, Player attacker) {
+        float xpLost = expLossCalculate();
+        float xpGained = expGainCalculate();
+
+        float attackerXP = attacker.getExp();
+        float defenderXP = defender.getExp();
+        int attackerLevel = attacker.getLevel();
+        int defenderLevel = defender.getLevel();
+
+        if (Party.getInstance().inSameParty(defender, attacker)) {
+
+            //Drain XP
+            if (attackerXP - xpLost < 0f) {
+                if (attackerLevel != 0) {
+                    attacker.setLevel(attackerLevel - 1);
+                    attacker.setExp(1f - xpLost);
+                    attacker.sendMessage("You transfered some XP to your ally!"); //TODO: Use mcLocale
+                }
+                else {
+                    attacker.sendMessage("You don't have enough XP to transfer!"); //TODO: Use mcLocale
+                    return;
+                }
+            }
+            else {
+                attacker.setExp(attackerXP - xpLost);
+                attacker.sendMessage("You transfered some XP to your ally!"); //TODO: Use mcLocale
+            }
+
+            //Reward XP
+            if (defenderXP + xpGained >= 1f) {
+                defender.setLevel(defenderLevel + 1);
+                defender.setExp(0f + xpGained);
+                defender.sendMessage("You were given XP from your ally!"); //TODO: Use mcLocale
+            }
+            else {
+                defender.setExp(defenderXP + xpGained);
+                defender.sendMessage("You were given XP from your ally!"); //TODO: Use mcLocale
+            }
+        }
+        else {
+
+            //Drain XP
+            if (defenderXP - xpLost < 0f) {
+                if (defenderLevel != 0) {
+                    defender.setLevel(defenderLevel - 1);
+                    defender.setExp(1f - xpLost);
+                    defender.sendMessage("You were drained of XP!"); //TODO: Use mcLocale
+                }
+                else {
+                    attacker.sendMessage("Your enemy doesn't have enough XP to drain!"); //TODO: Use mcLocale
+                    return;
+                }
+            }
+            else {
+                defender.setExp(defenderXP - xpLost);
+                defender.sendMessage("You were drained of XP!"); //TODO: Use mcLocale
+            }
+
+            //Reward XP
+            if (attackerXP + xpGained >= 1f) {
+                attacker.setLevel(attackerLevel + 1);
+                attacker.setExp(0f + xpGained);
+                attacker.sendMessage("You gained XP from your enemy!"); //TODO: Use mcLocale
+            }
+            else {
+                attacker.setExp(attackerXP + xpGained);
+                attacker.sendMessage("You gained XP from your enemy!"); //TODO: Use mcLocale
+            }
+        }
+    }
+
+    /**
+     * Handle the effects of the Blaze Rod's direct hit.
+     *
+     * @param target The defending entity
+     * @param attacker The attacking player
+     */
+    public static void blazeRodEffect(LivingEntity target, Player attacker) {
+        if (target instanceof Player && Party.getInstance().inSameParty((Player) target, attacker)) {
+            target.setFireTicks(0);
+            mcBleedTimer.remove(target);
+
+            for (PotionEffect effect : target.getActivePotionEffects()) {
+                if (effect.getType().equals(PotionEffectType.POISON) || effect.getType().equals(PotionEffectType.WEAKNESS) || effect.getType().equals(PotionEffectType.SLOW)) {
+                    target.removePotionEffect(effect.getType());
+                }
+            }
+
+            attacker.sendMessage("Your ally was cured of all status effects!"); //TODO: Use locale
+            ((Player) target).sendMessage("You were cured of all status effects!"); //TODO: Use locale
+        }
+        else {
+            if (target.getFireTicks() + fireTicksCalculate() > target.getMaxFireTicks()) {
+                target.setFireTicks(target.getMaxFireTicks());
+            }
+            else {
+                target.setFireTicks(target.getFireTicks() + fireTicksCalculate());
+            }
+
+            attacker.sendMessage("You set your enemy on fire!"); //TODO: Use locale
+
+            if (target instanceof Player) {
+                ((Player) target).sendMessage("You were set on fire!"); //TODO: Use locale
+            }
+        }
+    }
+
+    /**
+     * Handle the effects of the Stick's direct hit.
+     *
+     * @param target The defending entity
+     * @param attacker The attacking player
+     */
+    public static void stickEffect(LivingEntity target, Player attacker) {
+        if (target instanceof Player && Party.getInstance().inSameParty((Player) target, attacker)) {
+            Player defender = (Player) target;
+            defender.addPotionEffect(new PotionEffect(PotionEffectType.HEAL, 1, amplifierCalulate()));
+
+            /* Do we WANT to heal food along with health? */
+            if (defender.getFoodLevel() + amplifierCalulate() > 20) {
+                defender.setFoodLevel(20);
+            }
+            else {
+                defender.setFoodLevel(defender.getFoodLevel() + amplifierCalulate());
+            }
+
+            attacker.sendMessage("Your ally was healed!"); //TODO: Use locale
+            defender.sendMessage("You were healed!"); //TODO: Use locale
+        }
+        else {
+            target.addPotionEffect(new PotionEffect(PotionEffectType.HARM, 1, amplifierCalulate()));
+
+            attacker.sendMessage("Your enemy was harmed!"); //TODO: Use locale
+            if (target instanceof Player) {
+                ((Player) target).sendMessage("You were harmed!"); //TODO: Use locale
+            }
+        }
+    }
+
+    /**
+     * Handle the special effects from the staff projectiles.
+     *
+     * @param defender The defending entity
+     * @param shooter The attacking player
+     * @param type The type of projectile
+     */
+    private static void projectileEffects(LivingEntity target, Player shooter, EntityType projectile) {
+        final int TICKS_PER_SECOND = 20;
+        final int MAX_SLOW_DURATION_SECONDS = 240;
+        final int MAX_SPEED_DURATION_SECONDS = 480;
+        final int MAX_WEAKNESS_DURATION_SECONDS = 240;
+        final int MAX_STRENGTH_DURATION_SECONDS = 480;
+        final int MAX_POISON_DURATION_SECONDS = 120;
+        final int MAX_REGEN_DURATION_SECONDS = 120;
+
+        Collection<PotionEffect> potionEffects = target.getActivePotionEffects();
+
+        int duration = durationCalulate();
+        int amplifier = amplifierCalulate();
+        PotionEffectType potionType = null;
+
+        if (target instanceof Player && Party.getInstance().inSameParty((Player) target, shooter)) {
+            switch (projectile) {
+            case EGG:
+                potionType = PotionEffectType.REGENERATION;
+                break;
+
+            case SMALL_FIREBALL:
+                potionType = PotionEffectType.SPEED;
+                break;
+
+            case SNOWBALL:
+                potionType = PotionEffectType.INCREASE_DAMAGE;
+                break;
+
+            default:
+                break;
+            }
+        }
+        else {
+            switch (projectile) {
+            case EGG:
+                potionType = PotionEffectType.POISON;
+                break;
+
+            case SMALL_FIREBALL:
+                potionType = PotionEffectType.SLOW;
+                break;
+
+            case SNOWBALL:
+                potionType = PotionEffectType.WEAKNESS;
+                break;
+
+            default:
+                break;
+            }
+        }
+
+        for (PotionEffect effect : potionEffects) {
+            if (effect.getType().equals(potionType)) {
+                duration = duration + effect.getDuration();
+                break;
+            }
+        }
+
+        if (potionType.equals(PotionEffectType.SLOW) && duration > (TICKS_PER_SECOND * MAX_SLOW_DURATION_SECONDS)) {
+            duration = (TICKS_PER_SECOND * MAX_SLOW_DURATION_SECONDS);
+        }
+        else if (potionType.equals(PotionEffectType.SPEED) && duration > (TICKS_PER_SECOND * MAX_SPEED_DURATION_SECONDS)) {
+            duration = (TICKS_PER_SECOND * MAX_SPEED_DURATION_SECONDS);
+        }
+        else if (potionType.equals(PotionEffectType.WEAKNESS) && duration > (TICKS_PER_SECOND * MAX_WEAKNESS_DURATION_SECONDS)) {
+            duration = (TICKS_PER_SECOND * MAX_WEAKNESS_DURATION_SECONDS);
+        }
+        else if (potionType.equals(PotionEffectType.INCREASE_DAMAGE) && duration > (TICKS_PER_SECOND * MAX_STRENGTH_DURATION_SECONDS)) {
+            duration = (TICKS_PER_SECOND * MAX_STRENGTH_DURATION_SECONDS);
+        }
+        else if (potionType.equals(PotionEffectType.POISON) && duration > (TICKS_PER_SECOND * MAX_POISON_DURATION_SECONDS)) {
+            duration = (TICKS_PER_SECOND * MAX_POISON_DURATION_SECONDS);
+        }
+        else if (potionType.equals(PotionEffectType.REGENERATION) && duration > (TICKS_PER_SECOND * MAX_REGEN_DURATION_SECONDS)) {
+            duration = (TICKS_PER_SECOND * MAX_REGEN_DURATION_SECONDS);
+        }
+
+        target.addPotionEffect(new PotionEffect(potionType, duration, amplifier));
+
+        if (potionType.equals(PotionEffectType.SLOW)) {
+            shooter.sendMessage("Your enemy was slowed!"); //TODO: Use mcLocale
+            if (target instanceof Player) {
+                ((Player) target).sendMessage("You were slowed!"); //TODO: Use mcLocale
+            }
+        }
+        else if (potionType.equals(PotionEffectType.SPEED)) {
+            shooter.sendMessage("Your ally's speed was boosted!"); //TODO: Use mcLocale
+            ((Player) target).sendMessage("Your speed was boosted!"); //TODO: Use mcLocale
+        }
+        else if (potionType.equals(PotionEffectType.WEAKNESS)) {
+            shooter.sendMessage("Your enemy was weakened!"); //TODO: Use mcLocale
+            if (target instanceof Player) {
+                ((Player) target).sendMessage("You were weakened!"); //TODO: Use mcLocale
+            }
+        }
+        else if (potionType.equals(PotionEffectType.INCREASE_DAMAGE)) {
+            shooter.sendMessage("Your ally was strengthened!"); //TODO: Use mcLocale
+            ((Player) target).sendMessage("You were strengthened!"); //TODO: Use mcLocale
+        }
+        else if (potionType.equals(PotionEffectType.POISON)) {
+            shooter.sendMessage("Your enemy was poisoned!"); //TODO: Use mcLocale
+            if (target instanceof Player) {
+                ((Player) target).sendMessage("You were poisoned!"); //TODO: Use mcLocale
+            }
+        }
+        else if (potionType.equals(PotionEffectType.REGENERATION)) {
+            shooter.sendMessage("Your ally's began regaining health!"); //TODO: Use mcLocale
+            ((Player) target).sendMessage("You began regaining health!"); //TODO: Use mcLocale
+        }
+    }
+
+    private static int durationCalulate() {
+        //TODO: Calculate duration based off time held
+        return 80;
+    }
+
+
+    private static int amplifierCalulate() {
+        //TODO: Calculate amplifier based off skill level
+        return 10;
+    }
+
+
+    private static float expLossCalculate() {
+        //TODO: Calculate exp lost based on skill level
+        return 0.25f;
+    }
+
+
+    private static float expGainCalculate() {
+        //TODO: Calculate exp gained based on skill level
+        return 0.10f;
+    }
+
+    private static int fireTicksCalculate() {
+        //TODO: Calculate based on skill level
+        return 2;
+    }
+}

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

@@ -1,4 +1,4 @@
-package com.gmail.nossr50.skills;
+package com.gmail.nossr50.skills.combat;
 
 import java.util.Random;
 
@@ -9,17 +9,17 @@ 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;
 import com.gmail.nossr50.datatypes.SkillType;
 import com.gmail.nossr50.locale.mcLocale;
 import com.gmail.nossr50.party.Party;
 import com.gmail.nossr50.runnables.mcBleedTimer;
+import com.gmail.nossr50.util.Combat;
+import com.gmail.nossr50.util.ItemChecks;
+import com.gmail.nossr50.util.Users;
+import com.gmail.nossr50.util.m;
+import com.gmail.nossr50.util.mcPermissions;
 
 public class Swords {
 

src/main/java/com/gmail/nossr50/skills/combat/Taming.java

@@ -1,4 +1,4 @@
-package com.gmail.nossr50.skills;
+package com.gmail.nossr50.skills.combat;
 
 import java.util.Random;
 
@@ -18,15 +18,15 @@ import org.bukkit.event.entity.EntityDamageEvent.DamageCause;
 import org.bukkit.inventory.ItemStack;
 import org.bukkit.metadata.FixedMetadataValue;
 
-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.runnables.mcBleedTimer;
+import com.gmail.nossr50.util.Users;
+import com.gmail.nossr50.util.m;
+import com.gmail.nossr50.util.mcPermissions;
 
 public class Taming {
 

src/main/java/com/gmail/nossr50/skills/combat/Unarmed.java

@@ -1,18 +1,19 @@
-package com.gmail.nossr50.skills;
+package com.gmail.nossr50.skills.combat;
 
 import java.util.Random;
 
+import org.bukkit.ChatColor;
 import org.bukkit.Material;
 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.mcPermissions;
 import com.gmail.nossr50.datatypes.PlayerProfile;
 import com.gmail.nossr50.datatypes.SkillType;
 import com.gmail.nossr50.locale.mcLocale;
+import com.gmail.nossr50.util.Users;
+import com.gmail.nossr50.util.m;
+import com.gmail.nossr50.util.mcPermissions;
 
 public class Unarmed {
 
@@ -43,16 +44,17 @@ public class Unarmed {
      * @param PPa Profile of the attacking player
      * @param defender The defending player
      */
-    public static void disarmProcCheck(PlayerProfile PPa, Player defender) {
+    public static void disarmProcCheck(Player attacker, Player defender) {
         final int MAX_BONUS_LEVEL = 1000;
 
+        PlayerProfile PPa = Users.getProfile(attacker);
         int skillLevel = PPa.getSkillLevel(SkillType.UNARMED);
         int skillCheck = m.skillCheck(skillLevel, MAX_BONUS_LEVEL);
 
         ItemStack inHand = defender.getItemInHand();
 
         if (!inHand.getType().equals(Material.AIR)) {
-            if (random.nextInt(3000) <= skillCheck) {
+            if (random.nextInt(3000) <= skillCheck && ironGrip(defender, attacker)) {
                 defender.sendMessage(mcLocale.getString("Skills.Disarmed"));
 
                 m.mcDropItem(defender.getLocation(), inHand);
@@ -78,4 +80,21 @@ public class Unarmed {
             defender.sendMessage(mcLocale.getString("Combat.ArrowDeflect"));
         }
     }
+
+    public static boolean ironGrip(Player defender, Player attacker) {
+        final int MAX_BONUS_LEVEL = 1000;
+
+        PlayerProfile PPd = Users.getProfile(defender);
+        int skillLevel = PPd.getSkillLevel(SkillType.UNARMED);
+        int skillCheck = m.skillCheck(skillLevel, MAX_BONUS_LEVEL);
+
+        if (random.nextInt(1000) <= skillCheck) {
+            defender.sendMessage(ChatColor.GREEN + "Your iron grip kept you from being disarmed!"); //TODO: Use locale
+            attacker.sendMessage(ChatColor.RED + "Your opponent has an iron grip!"); //TODO: Use locale
+            return true;
+        }
+        else {
+            return false;
+        }
+    }
 }

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

@@ -1,4 +1,4 @@
-package com.gmail.nossr50.skills;
+package com.gmail.nossr50.skills.gathering;
 
 import java.util.ArrayList;
 import java.util.HashSet;
@@ -15,14 +15,15 @@ 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;
+import com.gmail.nossr50.util.BlockChecks;
+import com.gmail.nossr50.util.Skills;
+import com.gmail.nossr50.util.Users;
+import com.gmail.nossr50.util.m;
 
 public class BlastMining {
 
@@ -261,14 +262,14 @@ public class BlastMining {
             AbilityType ability = AbilityType.BLAST_MINING;
 
             /* Check Cooldown */
-            if(!Skills.cooldownOver(PP.getSkillDATS(ability) * TIME_CONVERSION_FACTOR, ability.getCooldown())) {
+            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)) {
+            for (Player y : player.getWorld().getPlayers()) {
+                if (y != player && m.isNear(player.getLocation(), y.getLocation(), MAX_DISTANCE_AWAY)) {
                     y.sendMessage(ability.getAbilityPlayer(player));
                 }
             }

src/main/java/com/gmail/nossr50/skills/gathering/Excavation.java

@@ -1,4 +1,4 @@
-package com.gmail.nossr50.skills;
+package com.gmail.nossr50.skills.gathering;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -12,9 +12,10 @@ import org.bukkit.entity.Player;
 import org.bukkit.inventory.ItemStack;
 
 import com.gmail.nossr50.spout.SpoutSounds;
-import com.gmail.nossr50.Users;
-import com.gmail.nossr50.m;
-import com.gmail.nossr50.mcPermissions;
+import com.gmail.nossr50.util.Skills;
+import com.gmail.nossr50.util.Users;
+import com.gmail.nossr50.util.m;
+import com.gmail.nossr50.util.mcPermissions;
 import com.gmail.nossr50.config.LoadProperties;
 import com.gmail.nossr50.config.LoadTreasures;
 import com.gmail.nossr50.datatypes.PlayerProfile;

src/main/java/com/gmail/nossr50/skills/gathering/Fishing.java

@@ -1,4 +1,4 @@
-package com.gmail.nossr50.skills;
+package com.gmail.nossr50.skills.gathering;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -17,16 +17,17 @@ import org.bukkit.event.player.PlayerFishEvent;
 import org.bukkit.inventory.ItemStack;
 import org.bukkit.material.Wool;
 
-import com.gmail.nossr50.Combat;
-import com.gmail.nossr50.ItemChecks;
-import com.gmail.nossr50.Users;
-import com.gmail.nossr50.m;
 import com.gmail.nossr50.config.LoadProperties;
 import com.gmail.nossr50.config.LoadTreasures;
 import com.gmail.nossr50.datatypes.PlayerProfile;
 import com.gmail.nossr50.datatypes.SkillType;
 import com.gmail.nossr50.datatypes.treasure.FishingTreasure;
 import com.gmail.nossr50.locale.mcLocale;
+import com.gmail.nossr50.util.Combat;
+import com.gmail.nossr50.util.ItemChecks;
+import com.gmail.nossr50.util.Skills;
+import com.gmail.nossr50.util.Users;
+import com.gmail.nossr50.util.m;
 
 public class Fishing {
 
@@ -98,11 +99,13 @@ public class Fishing {
         }
 
         if (LoadProperties.fishingDrops) {
-            FishingTreasure treasure = rewards.get(random.nextInt(rewards.size()));
+            if (rewards.size() > 0) {
+                FishingTreasure treasure = rewards.get(random.nextInt(rewards.size()));
 
-            if (random.nextDouble() * 100 <= treasure.getDropChance()) {
-                Users.getProfile(player).addXP(SkillType.FISHING, treasure.getXp());
-                theCatch.setItemStack(treasure.getDrop());
+                if (random.nextDouble() * 100 <= treasure.getDropChance()) {
+                    Users.getProfile(player).addXP(SkillType.FISHING, treasure.getXp());
+                    theCatch.setItemStack(treasure.getDrop());
+                }
             }
         }
         else {
@@ -115,7 +118,6 @@ public class Fishing {
             theCatch.getItemStack().setDurability((short) (random.nextInt(maxDurability))); //Change durability to random value
         }
 
-        m.mcDropItem(player.getLocation(), new ItemStack(Material.RAW_FISH)); //Always drop a fish
         PP.addXP(SkillType.FISHING, LoadProperties.mfishing);
         Skills.XpCheckSkill(SkillType.FISHING, player);
     }

src/main/java/com/gmail/nossr50/skills/gathering/Herbalism.java

@@ -1,4 +1,4 @@
-package com.gmail.nossr50.skills;
+package com.gmail.nossr50.skills.gathering;
 
 import java.util.Random;
 
@@ -12,16 +12,17 @@ import org.bukkit.event.block.BlockBreakEvent;
 import org.bukkit.inventory.ItemStack;
 import org.bukkit.inventory.PlayerInventory;
 
-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.AbilityType;
 import com.gmail.nossr50.datatypes.PlayerProfile;
 import com.gmail.nossr50.datatypes.SkillType;
 import com.gmail.nossr50.locale.mcLocale;
 import com.gmail.nossr50.runnables.GreenThumbTimer;
+import com.gmail.nossr50.util.Skills;
+import com.gmail.nossr50.util.Users;
+import com.gmail.nossr50.util.m;
+import com.gmail.nossr50.util.mcPermissions;
 
 public class Herbalism {
 
@@ -90,6 +91,7 @@ public class Herbalism {
         case CROPS:
         case JACK_O_LANTERN:
         case MELON_BLOCK:
+        case NETHER_WARTS:
         case PUMPKIN:
         case RED_MUSHROOM:
         case RED_ROSE:
@@ -227,8 +229,7 @@ public class Herbalism {
 
         if (mat == null) {
             return;
-        }
-        else {
+        } else if (mcPermissions.getInstance().herbalismDoubleDrops(player)) {
             ItemStack is = new ItemStack(mat);
 
             if (herbLevel > MAX_BONUS_LEVEL || random.nextInt(1000) <= herbLevel) {
@@ -250,10 +251,10 @@ public class Herbalism {
                     m.mcDropItem(loc, is);
                 }
             }
-
-            PP.addXP(SkillType.HERBALISM, xp);
-            Skills.XpCheckSkill(SkillType.HERBALISM, player);
         }
+        
+        PP.addXP(SkillType.HERBALISM, xp);
+        Skills.XpCheckSkill(SkillType.HERBALISM, player);
     }
 
     /**

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

@@ -1,4 +1,4 @@
-package com.gmail.nossr50.skills;
+package com.gmail.nossr50.skills.gathering;
 
 import java.util.Random;
 
@@ -12,11 +12,12 @@ import org.bukkit.inventory.ItemStack;
 import org.getspout.spoutapi.sound.SoundEffect;
 import org.bukkit.enchantments.Enchantment;
 
-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.SpoutSounds;
+import com.gmail.nossr50.util.Skills;
+import com.gmail.nossr50.util.Users;
+import com.gmail.nossr50.util.m;
+import com.gmail.nossr50.util.mcPermissions;
 import com.gmail.nossr50.datatypes.PlayerProfile;
 import com.gmail.nossr50.datatypes.SkillType;
 import com.gmail.nossr50.events.fake.FakePlayerAnimationEvent;

src/main/java/com/gmail/nossr50/skills/gathering/WoodCutting.java

@@ -1,4 +1,4 @@
-package com.gmail.nossr50.skills;
+package com.gmail.nossr50.skills.gathering;
 
 import java.util.ArrayList;
 import java.util.Random;
@@ -12,16 +12,17 @@ import org.bukkit.material.Tree;
 import org.bukkit.event.block.BlockBreakEvent;
 import org.bukkit.Bukkit;
 
-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.PlayerProfile;
 import com.gmail.nossr50.datatypes.SkillType;
 import com.gmail.nossr50.events.fake.FakePlayerAnimationEvent;
 import com.gmail.nossr50.locale.mcLocale;
 import com.gmail.nossr50.spout.SpoutSounds;
+import com.gmail.nossr50.util.Combat;
+import com.gmail.nossr50.util.Skills;
+import com.gmail.nossr50.util.Users;
+import com.gmail.nossr50.util.m;
+import com.gmail.nossr50.util.mcPermissions;
 
 import org.getspout.spoutapi.sound.SoundEffect;
 
@@ -53,7 +54,7 @@ public class WoodCutting {
      * @param PP The PlayerProfile of the player
      */
     private static void removeBlocks(ArrayList<Block> toBeFelled, Player player, PlayerProfile PP) {
-        if (toBeFelled.size() > LoadProperties.treeFellerThreshold) {
+        if (toBeFelled.size() >= LoadProperties.treeFellerThreshold) {
             player.sendMessage(mcLocale.getString("Skills.Woodcutting.TreeFellerThreshold"));
             return;
         }
@@ -186,6 +187,10 @@ public class WoodCutting {
      */
     private static void processTreeFelling(Block currentBlock, ArrayList<Block> toBeFelled) {
         Material type = currentBlock.getType();
+        
+        if(toBeFelled.size() >= LoadProperties.treeFellerThreshold) {
+            return;
+        }
 
         if (type.equals(Material.LOG) || type.equals(Material.LEAVES)) {
             toBeFelled.add(currentBlock);

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

@@ -1,4 +1,4 @@
-package com.gmail.nossr50.skills;
+package com.gmail.nossr50.skills.misc;
 
 import java.util.Random;
 
@@ -6,13 +6,14 @@ 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;
+import com.gmail.nossr50.util.Skills;
+import com.gmail.nossr50.util.Users;
+import com.gmail.nossr50.util.m;
+import com.gmail.nossr50.util.mcPermissions;
 
 public class Acrobatics {
 

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

@@ -1,4 +1,4 @@
-package com.gmail.nossr50.skills;
+package com.gmail.nossr50.skills.misc;
 
 import java.util.Map;
 import java.util.Random;
@@ -11,15 +11,17 @@ import org.bukkit.enchantments.Enchantment;
 import org.bukkit.entity.Player;
 import org.bukkit.inventory.ItemStack;
 import org.bukkit.inventory.PlayerInventory;
+
 import org.getspout.spoutapi.SpoutManager;
 import org.getspout.spoutapi.player.SpoutPlayer;
 
-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.SpoutSounds;
+import com.gmail.nossr50.util.ItemChecks;
+import com.gmail.nossr50.util.Skills;
+import com.gmail.nossr50.util.Users;
+import com.gmail.nossr50.util.m;
+import com.gmail.nossr50.util.mcPermissions;
 import com.gmail.nossr50.datatypes.PlayerProfile;
 import com.gmail.nossr50.datatypes.SkillType;
 import com.gmail.nossr50.events.skills.McMMOPlayerRepairCheckEvent;
@@ -484,5 +486,6 @@ public class Repair {
         int slot = inventory.first(Material.WOOD);
         ItemStack item = inventory.getItem(slot);
         item.setAmount(item.getAmount() - 1);
+        inventory.setItem(slot, item);
     }
 }

src/main/java/com/gmail/nossr50/spout/SpoutStuff.java

@@ -20,24 +20,24 @@ import org.getspout.spoutapi.SpoutManager;
 import org.getspout.spoutapi.keyboard.Keyboard;
 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.datatypes.PlayerProfile;
 import com.gmail.nossr50.datatypes.popups.PopupMMO;
 import com.gmail.nossr50.datatypes.SkillType;
-import com.gmail.nossr50.listeners.mcSpoutInputListener;
-import com.gmail.nossr50.listeners.mcSpoutListener;
-import com.gmail.nossr50.listeners.mcSpoutScreenListener;
+import com.gmail.nossr50.listeners.SpoutInputListener;
+import com.gmail.nossr50.listeners.SpoutListener;
+import com.gmail.nossr50.listeners.SpoutScreenListener;
+import com.gmail.nossr50.util.Users;
+import com.gmail.nossr50.util.m;
 
 public class SpoutStuff {
 
     static mcMMO plugin = (mcMMO) Bukkit.getServer().getPluginManager().getPlugin("mcMMO");
 
-    private final static mcSpoutListener spoutListener = new mcSpoutListener(plugin);
-    private final static mcSpoutInputListener spoutInputListener = new mcSpoutInputListener(plugin);
-    private final static mcSpoutScreenListener spoutScreenListener = new mcSpoutScreenListener(plugin);
+    private final static SpoutListener spoutListener = new SpoutListener(plugin);
+    private final static SpoutInputListener spoutInputListener = new SpoutInputListener(plugin);
+    private final static SpoutScreenListener spoutScreenListener = new SpoutScreenListener(plugin);
 
     public static HashMap<Player, HUDmmo> playerHUDs = new HashMap<Player, HUDmmo>();
     public static HashMap<SpoutPlayer, PopupMMO> playerScreens = new HashMap<SpoutPlayer, PopupMMO>();

src/main/java/com/gmail/nossr50/util/BlockChecks.java

@@ -1,4 +1,4 @@
-package com.gmail.nossr50;
+package com.gmail.nossr50.util;
 
 import org.bukkit.Material;
 

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

@@ -1,4 +1,4 @@
-package com.gmail.nossr50;
+package com.gmail.nossr50.util;
 
 import org.bukkit.Bukkit;
 import org.bukkit.Material;
@@ -15,6 +15,7 @@ import org.bukkit.event.entity.EntityDamageEvent;
 import org.bukkit.event.entity.EntityDamageEvent.DamageCause;
 import org.bukkit.inventory.ItemStack;
 
+import com.gmail.nossr50.mcMMO;
 import com.gmail.nossr50.config.LoadProperties;
 import com.gmail.nossr50.datatypes.AbilityType;
 import com.gmail.nossr50.datatypes.PlayerProfile;
@@ -26,13 +27,13 @@ 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;
-import com.gmail.nossr50.skills.Skills;
-import com.gmail.nossr50.skills.Swords;
-import com.gmail.nossr50.skills.Taming;
-import com.gmail.nossr50.skills.Unarmed;
+import com.gmail.nossr50.skills.combat.Archery;
+import com.gmail.nossr50.skills.combat.Axes;
+import com.gmail.nossr50.skills.combat.Staves;
+import com.gmail.nossr50.skills.combat.Swords;
+import com.gmail.nossr50.skills.combat.Taming;
+import com.gmail.nossr50.skills.combat.Unarmed;
+import com.gmail.nossr50.skills.misc.Acrobatics;
 
 public class Combat {
 
@@ -100,7 +101,7 @@ public class Combat {
                 }
 
                 if (targetType.equals(EntityType.PLAYER) && mcPermissions.getInstance().disarm(attacker)) {
-                    Unarmed.disarmProcCheck(PPa, (Player) target);
+                    Unarmed.disarmProcCheck(attacker, (Player) target);
                 }
 
                 startGainXp(attacker, PPa, target, SkillType.UNARMED, plugin);
@@ -108,6 +109,18 @@ public class Combat {
             else if (itemInHand.getType().equals(Material.BONE) && mcPermissions.getInstance().beastLore(attacker)) {
                 Taming.beastLore(event, target, attacker);
             }
+            else if (itemInHand.getType().equals(Material.BONE)) {
+                event.setDamage(0);
+                Staves.boneEffect((Player) target, attacker);
+            }
+            else if (itemInHand.getType().equals(Material.BLAZE_ROD)) {
+                event.setDamage(0);
+                Staves.blazeRodEffect(target, attacker);
+            }
+            else if (itemInHand.getType().equals(Material.STICK)) {
+                event.setDamage(0);
+                Staves.stickEffect(target, attacker);
+            }
             break;
 
         case WOLF:
@@ -204,10 +217,8 @@ public class Combat {
                 
                 /* Every 100 skill levels Archery gains 20% damage bonus, set that here */
                 //TODO: Work in progress for balancing out Archery, will work on it more later...
-                //System.out.println("DEBUG 0: "+event.getDamage());
                 int archeryBonus = (int)(event.getDamage() * dmgBonusPercent);
                 event.setDamage(event.getDamage() + archeryBonus);
-                //System.out.println("DEBUG 1: "+event.getDamage());
                 
                 if (mcPermissions.getInstance().trackArrows(attacker)) {
                     Archery.trackArrows(pluginx, target, PPa);

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

@@ -1,4 +1,4 @@
-package com.gmail.nossr50;
+package com.gmail.nossr50.util;
 
 import java.sql.Connection;
 import java.sql.DriverManager;
@@ -12,6 +12,7 @@ import java.util.Properties;
 import org.bukkit.Bukkit;
 import org.bukkit.entity.Player;
 
+import com.gmail.nossr50.mcMMO;
 import com.gmail.nossr50.config.LoadProperties;
 import com.gmail.nossr50.datatypes.DatabaseUpdate;
 import com.gmail.nossr50.datatypes.PlayerProfile;

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

@@ -1,4 +1,4 @@
-package com.gmail.nossr50;
+package com.gmail.nossr50.util;
 
 import org.bukkit.ChatColor;
 import org.bukkit.Material;
@@ -7,7 +7,6 @@ import org.bukkit.entity.Player;
 import org.bukkit.inventory.ItemStack;
 
 import com.gmail.nossr50.locale.mcLocale;
-import com.gmail.nossr50.skills.Skills;
 import com.gmail.nossr50.config.LoadProperties;
 import com.gmail.nossr50.datatypes.PlayerProfile;
 

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

@@ -1,4 +1,4 @@
-package com.gmail.nossr50;
+package com.gmail.nossr50.util;
 
 import org.bukkit.Material;
 import org.bukkit.inventory.ItemStack;

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

@@ -1,4 +1,4 @@
-package com.gmail.nossr50;
+package com.gmail.nossr50.util;
 
 import java.io.BufferedReader;
 import java.io.File;

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

@@ -1,4 +1,4 @@
-package com.gmail.nossr50;
+package com.gmail.nossr50.util;
 
 import org.bukkit.Bukkit;
 import org.bukkit.configuration.file.YamlConfiguration;

src/main/java/com/gmail/nossr50/util/Page.java

@@ -5,7 +5,6 @@ import java.util.ArrayList;
 import org.bukkit.ChatColor;
 import org.bukkit.entity.Player;
 
-import com.gmail.nossr50.m;
 import com.gmail.nossr50.datatypes.SkillType;
 import com.gmail.nossr50.locale.mcLocale;
 

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

@@ -1,4 +1,4 @@
-package com.gmail.nossr50.skills;
+package com.gmail.nossr50.util;
 
 import org.bukkit.Bukkit;
 import org.bukkit.ChatColor;
@@ -9,10 +9,6 @@ import org.bukkit.inventory.ItemStack;
 import org.getspout.spoutapi.SpoutManager;
 import org.getspout.spoutapi.player.SpoutPlayer;
 
-import com.gmail.nossr50.Leaderboard;
-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;
 import com.gmail.nossr50.datatypes.AbilityType;
@@ -102,20 +98,12 @@ public class Skills {
         /* Woodcutting & Axes need to be treated differently.
          * Basically the tool always needs to ready and we check to see if the cooldown is over when the user takes action
          */
-        if (skill == SkillType.WOODCUTTING || skill == SkillType.AXES) {
-            if (tool.inHand(inHand) && !PP.getToolPreparationMode(tool)) {
-                if (LoadProperties.enableAbilityMessages) {
-                    player.sendMessage(tool.getRaiseTool());
+        if (ability.getPermissions(player) && tool.inHand(inHand) && !PP.getToolPreparationMode(tool)) {
+            if (skill != SkillType.WOODCUTTING && skill != SkillType.AXES) {
+                if (!PP.getAbilityMode(ability) && !cooldownOver(PP.getSkillDATS(ability) * TIME_CONVERSION_FACTOR, ability.getCooldown())) {
+                    player.sendMessage(mcLocale.getString("Skills.TooTired") + ChatColor.YELLOW + " (" + calculateTimeLeft(PP.getSkillDATS(ability) * TIME_CONVERSION_FACTOR, ability.getCooldown()) + "s)");
+                    return;
                 }
-
-                PP.setToolPreparationATS(tool, System.currentTimeMillis());
-                PP.setToolPreparationMode(tool, true);
-            }
-        }
-        else if (ability.getPermissions(player) && tool.inHand(inHand) && !PP.getToolPreparationMode(tool)) {
-            if (!PP.getAbilityMode(ability) && !cooldownOver(PP.getSkillDATS(ability) * TIME_CONVERSION_FACTOR, ability.getCooldown())) {
-                player.sendMessage(mcLocale.getString("Skills.TooTired") + ChatColor.YELLOW + " (" + calculateTimeLeft(PP.getSkillDATS(ability) * TIME_CONVERSION_FACTOR, ability.getCooldown()) + "s)");
-                return;
             }
 
             if (LoadProperties.enableAbilityMessages) {
@@ -196,8 +184,9 @@ public class Skills {
 
             while (PP.getSkillXpLevel(skillType) >= PP.getXpToLevel(skillType)) {
                 if ((skillType.getMaxLevel() >= PP.getSkillLevel(skillType) + 1) && (m.getPowerLevelCap() >= PP.getPowerLevel() + 1)) {
+                    PP.removeXP(skillType, PP.getXpToLevel(skillType));
                     skillups++;
-                    PP.addLevels(skillType, 1);
+                    PP.skillUp(skillType, 1);
 
                     McMMOPlayerLevelUpEvent eventToFire = new McMMOPlayerLevelUpEvent(player, skillType);
                     Bukkit.getPluginManager().callEvent(eventToFire);
@@ -220,15 +209,14 @@ public class Skills {
 
                 if (sPlayer.isSpoutCraftEnabled()) {
                     if (LoadProperties.xpbar) {
-                        SpoutStuff.updateXpBar(sPlayer);
+                        SpoutStuff.updateXpBar(player);
                     }
 
                     SpoutStuff.levelUpNotification(skillType, sPlayer);
-                    
+
                     /* Update custom titles */
                     if(LoadProperties.showPowerLevel) {
-                        sPlayer.setTitle(sPlayer.getName()+ "\n" + ChatColor.YELLOW + "P" + ChatColor.GOLD + "lvl" 
-                                + ChatColor.WHITE+"." + ChatColor.GREEN + String.valueOf(PP.getPowerLevel()));
+                        sPlayer.setTitle(sPlayer.getName()+ "\n" + ChatColor.YELLOW + "P" + ChatColor.GOLD + "lvl" + ChatColor.WHITE + "." + ChatColor.GREEN + String.valueOf(PP.getPowerLevel()));
                     }
                 }
                 else {
@@ -245,7 +233,7 @@ public class Skills {
             SpoutPlayer sPlayer = (SpoutPlayer) player;
             if (sPlayer.isSpoutCraftEnabled()) {
                 if (LoadProperties.xpbar) {
-                    SpoutStuff.updateXpBar(sPlayer);
+                    SpoutStuff.updateXpBar(player);
                 }
             }
         }
@@ -295,25 +283,6 @@ public class Skills {
             return false;
         }
     }
-    
-    /**
-     * Get the format string for 
-     * @param skillname
-     * @param level
-     * @param XP
-     * @param XPToLevel
-     * @return
-     */
-    public static String getSkillStats(String skillname, Integer level, Integer XP, Integer XPToLevel) {
-        //TODO: Ditch this function in favor of better locale setup.
-
-        ChatColor parColor = ChatColor.DARK_AQUA;
-        ChatColor xpColor = ChatColor.GRAY;
-        ChatColor LvlColor = ChatColor.GREEN;
-        ChatColor skillColor = ChatColor.YELLOW;
-
-        return skillColor + skillname + LvlColor + level + parColor +" XP" + "(" + xpColor + XP + parColor + "/" + xpColor + XPToLevel + parColor + ")";
-    }
 
     /**
      * Check if the player has any combat skill permissions.

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

@@ -1,10 +1,11 @@
-package com.gmail.nossr50;
+package com.gmail.nossr50.util;
 
 import java.io.File;
 import java.io.FileWriter;
 import java.io.IOException;
 import java.util.HashMap;
 
+import org.bukkit.Bukkit;
 import org.bukkit.OfflinePlayer;
 import org.bukkit.entity.Player;
 import com.gmail.nossr50.datatypes.PlayerProfile;
@@ -44,7 +45,7 @@ public class Users {
      */
     public static void addUser(Player player) {
         if (!players.containsKey(player.getName().toLowerCase())) {
-            players.put(player.getName().toLowerCase(), new PlayerProfile(player.getName()));
+            players.put(player.getName().toLowerCase(), new PlayerProfile(player.getName(), true));
         }
     }
 
@@ -88,51 +89,36 @@ public class Users {
     }
 
     /**
-     * Get the profile of an online player.
+     * Get the profile of a player.
      *
      * @param player The player whose profile to retrieve
      * @return the player's profile
      */
-    public static PlayerProfile getProfile(Player player) {
-        return getProfile(player.getName());
+    public static PlayerProfile getProfile(OfflinePlayer player) {
+        return getProfileByName(player.getName());
     }
-    
+
     /**
-     * Get the profile of an online player.
+     * Get the profile of a player by name.
      *
-     * @param player The player whose profile to retrieve
+     * @param player The name of 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());
+    public static PlayerProfile getProfileByName(String playerName) {
+        if (Bukkit.getServer().getOfflinePlayer(playerName).isOnline() || players.containsKey(playerName.toLowerCase())) {
+            if (players.get(playerName.toLowerCase()) != null) {
+                return players.get(playerName.toLowerCase());
+            }
+            else {
+                players.put(playerName.toLowerCase(), new PlayerProfile(playerName, true));
+                return players.get(playerName.toLowerCase());
+            }
         }
         else {
-            players.put(playerName.toLowerCase(), new PlayerProfile(playerName));
-            return players.get(playerName.toLowerCase());
+            return new PlayerProfile(playerName, false);
         }
     }
 
-    /**
-     * Get the profile of an offline player.
-     *
-     * @param player The player whose profile to retrieve
-     * @return the player's profile
-     */
-    public static PlayerProfile getOfflineProfile(OfflinePlayer player) {
-        return getOfflineProfile(player.getName());
-    }
-
-    /**
-     * 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.
      *

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

@@ -1,4 +1,4 @@
-package com.gmail.nossr50;
+package com.gmail.nossr50.util;
 
 import java.util.Random;
 

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

@@ -1,4 +1,4 @@
-package com.gmail.nossr50;
+package com.gmail.nossr50.util;
 
 import org.bukkit.entity.Player;
 
@@ -30,7 +30,7 @@ public class mcPermissions {
     }
 
     public boolean arcaneBypass(Player player) {
-        return player.hasPermission(("mcmmo.bypass.arcanebypass"));
+        return player.hasPermission("mcmmo.bypass.arcanebypass");
     }
 
     /*

src/main/resources/config.yml

@@ -315,10 +315,8 @@ Commands:
         Cooldown: 30
     p:
         Enabled: true
-        Display_Names: true
     a:
         Enabled: true
-        Display_Names: true
 
 #
 #  Settings for Spout features

src/main/resources/locale/locale_de.properties

@@ -76,7 +76,7 @@ m.XPGainArchery=[[YELLOW]]Monster/Spieler angreifen
 m.EffectsArchery1_0=[[YELLOW]]Entzuenden
 m.EffectsArchery1_1=[[AQUA]]25% Chance das Feind Feuer faengt
 m.EffectsArchery2_0=[[YELLOW]]Blenden (Spieler)
-m.EffectsArchery2_1=[[AQUA]]Disorientiert Feinde
+m.EffectsArchery2_1=Disorients foes and deals 4 DMG
 m.EffectsArchery3_0=[[YELLOW]]Schaden+
 m.EffectsArchery3_1=[[AQUA]]Modifiziert Schaden
 m.EffectsArchery4_0=[[YELLOW]]Pfeil Rueckgewinnung
@@ -227,7 +227,7 @@ mcPlayerListener.AdminChatOn=nur Adminchat [[YELLOW]]an
 mcPlayerListener.AdminChatOff=nur Adminchat [[RED]]aus
 mcPlayerListener.MOTD=[[YELLOW]]Auf diesem Server laeuft mcMMO {0}. Hilfe: [[AQUA]]/{1}[[YELLOW]]              [[DARK_GRAY]]<frei Uebersetzt von Jobsti>
 mcPlayerListener.WIKI=[[AQUA]]http://mcmmo.wikia.com[[YELLOW]] - mcMMO Wiki
-mcPlayerListener.PowerLevel=[[DARK_RED]]POWER LEVEL: 
+mcPlayerListener.PowerLevel=[[DARK_RED]]POWER LEVEL: [[GREEN]]{0}
 mcPlayerListener.PowerLevelLeaderboard=[[DARK_AQUA]]____ mcMMO[[YELLOW]] Power Level [[DARK_AQUA]]Rangliste ____
 mcPlayerListener.SkillLeaderboard=[[DARK_AQUA]]____ mcMMO [[YELLOW]]{0}[[DARK_AQUA]] Rangliste ____
 mcPlayerListener.RepairSkill=[[YELLOW]]Reparieren Skill [[DARK_AQUA]](Repair):
@@ -437,4 +437,14 @@ m.EffectsTaming7_2=[[GRAY]]COTW HOW-TO: Crouch and right click with {0} Bones/Fi
 m.EffectsTaming1_1=Bone-whacking inspects wolves/ocelots
 Combat.BeastLoreHealth=[[DARK_AQUA]]Health ([[GREEN]]{0}[[DARK_AQUA]]/{1})
 m.TamingSummonOcelotFailed=[[RED]]You have too many ocelots nearby to summon any more.
-m.ArcherySkillShot=[[RED]]Skill Shot Bonus Damage: [[YELLOW]]{0}%
+m.ArcherySkillShot=[[RED]]Skill Shot Bonus Damage: [[YELLOW]]{0}%
+m.SkillStats=[[YELLOW]]{0}[[GREEN]]{1}[[DARK_AQUA]] XP([[GRAY]]{2}[[DARK_AQUA]]/[[GRAY]]{3}[[DARK_AQUA]])
+Inspect.TooFar=[[RED]]You are too far away to inspect that player!
+Inspect.Offline = [[RED]]That player is offline, inspecting offline players is limited to Ops!
+Commands.DoesNotExist = [[RED]]Player does not exist in the database!
+Inspect.Stats=[[GREEN]]mcMMO Stats for [[YELLOW]]{0}
+Inspect.OfflineStats=mcMMO Stats for Offline Player [[YELLOW]]{0}
+Stats.GatheringHeader=[[GOLD]]-=GATHERING SKILLS=-
+Stats.CombatHeader=[[GOLD]]-=COMBAT SKILLS=-
+Stats.MiscHeader=[[GOLD]]-=MISC SKILLS=-
+Commands.NoConsole=This command does not support console usage.

src/main/resources/locale/locale_en_us.properties

@@ -76,7 +76,7 @@ m.XPGainArchery=Attacking Monsters
 m.EffectsArchery1_0=Skill Shot
 m.EffectsArchery1_1=Increases damage done by Bows
 m.EffectsArchery2_0=Daze (Players)
-m.EffectsArchery2_1=Disorients foes
+m.EffectsArchery2_1=Disorients foes and deals 4 DMG
 m.EffectsArchery3_0=Damage+
 m.EffectsArchery3_1=Modifies Damage
 m.EffectsArchery4_0=Arrow Retrieval
@@ -302,7 +302,7 @@ m.LVL=[[DARK_GRAY]]LVL: [[GREEN]]{0} [[DARK_AQUA]]XP[[YELLOW]]([[GOLD]]{1}[[YELL
 Combat.BeastLore=[[GREEN]]**BEAST LORE**
 Combat.BeastLoreOwner=[[DARK_AQUA]]Owner ([[RED]]{0}[[DARK_AQUA]])
 Combat.BeastLoreHealth=[[DARK_AQUA]]Health ([[GREEN]]{0}[[DARK_AQUA]]/{1})
-mcMMO.Description=[[DARK_AQUA]]About the [[YELLOW]]mcMMO[[DARK_AQUA]] Project:,[[GOLD]]mcMMO is an [[RED]]open source[[GOLD]] RPG mod created in February 2011,[[GOLD]]by [[BLUE]]nossr50[[GOLD]]. The goal is to provide a quality RPG experience.,[[DARK_AQUA]]Tips:,[[GOLD]] - [[GREEN]]Use [[RED]]/mcc[[GREEN]] to see commands,[[GOLD]] - [[GREEN]]Type [[RED]]/SKILLNAME[[GREEN]] to see detailed skill info,[[DARK_AQUA]]Developers:,[[GOLD]] - [[GREEN]]nossr50 [[BLUE]](Project Lead),[[GOLD]] - [[GREEN]]GJ [[BLUE]](Senior Developer),[[GOLD]] - [[GREEN]]NuclearW [[BLUE]](Developer),[[DARK_AQUA]]Useful Links:,[[GOLD]] - [[GREEN]]issues.mcmmo.org[[GOLD]] Bug Reporting,[[GOLD]] - [[GREEN]]#mcmmo @ irc.esper.net[[GOLD]] IRC Chat,[[GOLD]] - [[GREEN]]http://bit.ly/H6XwFb[[GOLD]] Bukkit Forum Thread,[[DARK_AQUA]]Donation Info:
+mcMMO.Description=[[DARK_AQUA]]About the [[YELLOW]]mcMMO[[DARK_AQUA]] Project:,[[GOLD]]mcMMO is an [[RED]]open source[[GOLD]] RPG mod created in February 2011,[[GOLD]]by [[BLUE]]nossr50[[GOLD]]. The goal is to provide a quality RPG experience.,[[DARK_AQUA]]Tips:,[[GOLD]] - [[GREEN]]Use [[RED]]/mcc[[GREEN]] to see commands,[[GOLD]] - [[GREEN]]Type [[RED]]/SKILLNAME[[GREEN]] to see detailed skill info,[[DARK_AQUA]]Developers:,[[GOLD]] - [[GREEN]]nossr50 [[BLUE]](Project Lead),[[GOLD]] - [[GREEN]]GJ [[BLUE]](Senior Developer),[[GOLD]] - [[GREEN]]NuclearW [[BLUE]](Developer),[[DARK_AQUA]]Useful Links:,[[GOLD]] - [[GREEN]]issues.mcmmo.org[[GOLD]] Bug Reporting,[[GOLD]] - [[GREEN]]#mcmmo @ irc.esper.net[[GOLD]] IRC Chat,[[GOLD]] - [[GREEN]]http://bit.ly/H6XwFb[[GOLD]] Bukkit Forum Thread
 Party.Locked=[[RED]]Party is locked, only party leader may invite.
 Party.IsntLocked=[[GRAY]]Party is not locked
 Party.Unlocked=[[GRAY]]Party is unlocked
@@ -321,12 +321,12 @@ Party.PasswordSet=[[GREEN]]Party password set to {0}
 Party.CouldNotKick=[[DARK_RED]]Could not kick player {0}
 Party.NotInYourParty=[[DARK_RED]]{0} is not in your party
 Party.CouldNotSetOwner=[[DARK_RED]]Could not set owner to {0}
-Commands.xprate.proper=[[DARK_AQUA]]Proper usage is /{0} [integer] [true:false]
-Commands.xprate.proper2=[[DARK_AQUA]]Also you can type /{0} reset to turn everything back to normal
-Commands.xprate.proper3=[[RED]]Enter true or false for the second value
+Commands.xprate.proper=[[RED]]Proper usage to change the XP rate is /xprate <integer> <true/false>
+Commands.xprate.proper2=[[RED]]Proper usage to reset the XP rate to default is /xprate reset
+Commands.xprate.proper3=[[RED]]Please specify true or false to indicate if this is an xp event or not
 Commands.xprate.over=[[RED]]mcMMO XP Rate Event is OVER!!
 Commands.xprate.started=[[GOLD]]XP EVENT FOR mcMMO HAS STARTED!
-Commands.xprate.started2=[[GOLD]]mcMMO XP RATE IS NOW {0}x!!
+Commands.xprate.started2=[[GOLD]]mcMMO XP RATE IS NOW {0}x!
 Commands.xplock.locked=[[GOLD]]Your XP BAR is now locked to {0}!
 Commands.xplock.unlocked=[[GOLD]]Your XP BAR is now [[GREEN]]UNLOCKED[[GOLD]]!
 Commands.xplock.invalid=[[RED]]That is not a valid skillname! Try /xplock mining
@@ -434,10 +434,11 @@ m.EffectsTaming1_1=Bone-whacking inspects wolves/ocelots
 m.SkillStats=[[YELLOW]]{0}[[GREEN]]{1}[[DARK_AQUA]] XP([[GRAY]]{2}[[DARK_AQUA]]/[[GRAY]]{3}[[DARK_AQUA]])
 Inspect.TooFar=[[RED]]You are too far away to inspect that player!
 Inspect.Offline = [[RED]]That player is offline, inspecting offline players is limited to Ops!
-Inspect.DoesNotExist = [[RED]]Player does not exist in the database!
+Commands.DoesNotExist = [[RED]]Player does not exist in the database!
 Inspect.Stats=[[GREEN]]mcMMO Stats for [[YELLOW]]{0}
 Inspect.OfflineStats=mcMMO Stats for Offline Player [[YELLOW]]{0}
 Stats.GatheringHeader=[[GOLD]]-=GATHERING SKILLS=-
 Stats.CombatHeader=[[GOLD]]-=COMBAT SKILLS=-
 Stats.MiscHeader=[[GOLD]]-=MISC SKILLS=-
-m.ArcherySkillShot=[[RED]]Skill Shot Bonus Damage: [[YELLOW]]{0}%
+m.ArcherySkillShot=[[RED]]Skill Shot Bonus Damage: [[YELLOW]]{0}%
+Commands.NoConsole=This command does not support console usage.

src/main/resources/locale/locale_es_es.properties

@@ -77,7 +77,7 @@ m.XPGainArchery=Ataque a monstruos
 m.EffectsArchery1_0=Ignicion
 m.EffectsArchery1_1=25% de posibilidades de que un enemigo arda en llamas
 m.EffectsArchery2_0=Aturdir (Jugadores)
-m.EffectsArchery2_1=Desorienta a los enemigos
+m.EffectsArchery2_1=Disorients foes and deals 4 DMG
 m.EffectsArchery3_0=+ Daño
 m.EffectsArchery3_1=Modifica el daño
 m.EffectsArchery4_0=Recuperación de flecha
@@ -228,7 +228,7 @@ mcPlayerListener.AdminChatOn=Solo Chat de Admins [[GREEN]]Activado
 mcPlayerListener.AdminChatOff=Solo Chat de Admins [[RED]]Desactivado
 mcPlayerListener.MOTD=[[BLUE]]Este server esta ejecutando mcMMO {0} escribe [[YELLOW]]/{1}[[BLUE]] para obtener ayuda.
 mcPlayerListener.WIKI=[[GREEN]]http://mcmmo.wikia.com[[BLUE]] - mcMMO Wiki
-mcPlayerListener.PowerLevel=[[DARK_RED]]NIVEL DE PODER: 
+mcPlayerListener.PowerLevel=[[DARK_RED]]NIVEL DE PODER: [[GREEN]]{0}
 mcPlayerListener.PowerLevelLeaderboard=[[YELLOW]]--mcMMO[[BLUE]] Nivel de Poder [[YELLOW]]Ranking de lideres--
 mcPlayerListener.SkillLeaderboard=[[YELLOW]]--mcMMO [[BLUE]]{0}[[YELLOW]] Ranking de lideres--
 mcPlayerListener.RepairSkill=Reparar: 
@@ -429,4 +429,14 @@ XPRate.Event = [[GOLD]]mcMMO is currently in an XP rate event! XP rate is {0}x!
 BlastMining.Boom = [[GRAY]]**BOOM**
 Party.Forbidden=[mcMMO] Parties not permitted on this world (See Permissions)
 m.TamingSummonOcelotFailed=[[RED]]You have too many ocelots nearby to summon any more.
-m.ArcherySkillShot=[[RED]]Skill Shot Bonus Damage: [[YELLOW]]{0}%
+m.ArcherySkillShot=[[RED]]Skill Shot Bonus Damage: [[YELLOW]]{0}%
+m.SkillStats=[[YELLOW]]{0}[[GREEN]]{1}[[DARK_AQUA]] XP([[GRAY]]{2}[[DARK_AQUA]]/[[GRAY]]{3}[[DARK_AQUA]])
+Inspect.TooFar=[[RED]]You are too far away to inspect that player!
+Inspect.Offline = [[RED]]That player is offline, inspecting offline players is limited to Ops!
+Commands.DoesNotExist = [[RED]]Player does not exist in the database!
+Inspect.Stats=[[GREEN]]mcMMO Stats for [[YELLOW]]{0}
+Inspect.OfflineStats=mcMMO Stats for Offline Player [[YELLOW]]{0}
+Stats.GatheringHeader=[[GOLD]]-=GATHERING SKILLS=-
+Stats.CombatHeader=[[GOLD]]-=COMBAT SKILLS=-
+Stats.MiscHeader=[[GOLD]]-=MISC SKILLS=-
+Commands.NoConsole=This command does not support console usage.

src/main/resources/locale/locale_fi.properties

@@ -77,7 +77,7 @@ m.XPGainArchery=Hy
 m.EffectsArchery1_0=Sytytys
 m.EffectsArchery1_1=25% Todennäköisyys että vihollinen syttyy tuleen
 m.EffectsArchery2_0=Pökerrys (Pelaajat)
-m.EffectsArchery2_1=Saa viholliset pois tolaltaan
+m.EffectsArchery2_1=Disorients foes and deals 4 DMG
 m.EffectsArchery3_0=Vahinko+
 m.EffectsArchery3_1=Muokkaa vahinkoa
 m.EffectsArchery4_0=Nuolenkeräys
@@ -228,7 +228,7 @@ mcPlayerListener.AdminChatOn=Vain admin juttelu [[GREEN]]P
 mcPlayerListener.AdminChatOff=Vain admin juttelu [[RED]]Pois päältä
 mcPlayerListener.MOTD=[[BLUE]]Tällä serverillä on mcMMO {0} kirjoita [[YELLOW]]/{1}[[BLUE]] apua varten.
 mcPlayerListener.WIKI=[[GREEN]]http://mcmmo.wikia.com[[BLUE]] - mcMMO Wiki
-mcPlayerListener.PowerLevel=[[DARK_RED]]VOIMATASO: 
+mcPlayerListener.PowerLevel=[[DARK_RED]]VOIMATASO: [[GREEN]]{0}
 mcPlayerListener.PowerLevelLeaderboard=[[YELLOW]]--mcMMO[[BLUE]] Voimataso [[YELLOW]]Tulostaulukko--
 mcPlayerListener.SkillLeaderboard=[[YELLOW]]--mcMMO [[BLUE]]{0}[[YELLOW]] Tulostaulukko--
 mcPlayerListener.RepairSkill=[[YELLOW]]Korjaus: 
@@ -422,4 +422,14 @@ Combat.BeastLore=[[GREEN]]**BEAST LORE**
 Combat.BeastLoreOwner=[[DARK_AQUA]]Owner ([[RED]]{0}[[DARK_AQUA]])
 Combat.BeastLoreHealth=[[DARK_AQUA]]Health ([[GREEN]]{0}[[DARK_AQUA]]/{1})
 m.TamingSummonOcelotFailed=[[RED]]You have too many ocelots nearby to summon any more.
-m.ArcherySkillShot=[[RED]]Skill Shot Bonus Damage: [[YELLOW]]{0}%
+m.ArcherySkillShot=[[RED]]Skill Shot Bonus Damage: [[YELLOW]]{0}%
+m.SkillStats=[[YELLOW]]{0}[[GREEN]]{1}[[DARK_AQUA]] XP([[GRAY]]{2}[[DARK_AQUA]]/[[GRAY]]{3}[[DARK_AQUA]])
+Inspect.TooFar=[[RED]]You are too far away to inspect that player!
+Inspect.Offline = [[RED]]That player is offline, inspecting offline players is limited to Ops!
+Commands.DoesNotExist = [[RED]]Player does not exist in the database!
+Inspect.Stats=[[GREEN]]mcMMO Stats for [[YELLOW]]{0}
+Inspect.OfflineStats=mcMMO Stats for Offline Player [[YELLOW]]{0}
+Stats.GatheringHeader=[[GOLD]]-=GATHERING SKILLS=-
+Stats.CombatHeader=[[GOLD]]-=COMBAT SKILLS=-
+Stats.MiscHeader=[[GOLD]]-=MISC SKILLS=-
+Commands.NoConsole=This command does not support console usage.

src/main/resources/locale/locale_fr.properties

@@ -77,7 +77,7 @@ m.XPGainArchery=Attaquer les monstres
 m.EffectsArchery1_0=Allumage
 m.EffectsArchery1_1=25% de chances que l'ennemi s'enflamme
 m.EffectsArchery2_0=Étourdir (les joueurs)
-m.EffectsArchery2_1=Étourdi les joueurs
+m.EffectsArchery2_1=Disorients foes and deals 4 DMG
 m.EffectsArchery3_0=Dégâts+
 m.EffectsArchery3_1=Augmente les dégâts
 m.EffectsArchery4_0=Récupération de flèches
@@ -228,7 +228,7 @@ mcPlayerListener.AdminChatOn=Admin Chat uniquement [[GREEN]]On
 mcPlayerListener.AdminChatOff=Admin Chat uniquement [[RED]]Off
 mcPlayerListener.MOTD=[[BLUE]]Ce serveur fonctionne avec mcMMO {0} [[YELLOW]]/{1}[[BLUE]] pour voir l'aide.
 mcPlayerListener.WIKI=[[GREEN]]http://mcmmo.wikia.com[[BLUE]] - mcMMO Wiki - [[YELLOW]]Traduit par avalondrey & Misa
-mcPlayerListener.PowerLevel=[[DARK_RED]]POWER LEVEL: 
+mcPlayerListener.PowerLevel=[[DARK_RED]]POWER LEVEL: [[GREEN]]{0}
 mcPlayerListener.PowerLevelLeaderboard=[[YELLOW]]--mcMMO[[BLUE]] Power Level [[YELLOW]]Leaderboard--
 mcPlayerListener.SkillLeaderboard=[[YELLOW]]--mcMMO [[BLUE]]{0}[[YELLOW]] Leaderboard--
 mcPlayerListener.RepairSkill=[[YELLOW]]Réparation (/Repair) : 
@@ -429,4 +429,14 @@ XPRate.Event = [[GOLD]]mcMMO is currently in an XP rate event! XP rate is {0}x!
 BlastMining.Boom = [[GRAY]]**BOOM**
 Party.Forbidden=[mcMMO] Parties not permitted on this world (See Permissions)
 m.TamingSummonOcelotFailed=[[RED]]You have too many ocelots nearby to summon any more.
-m.ArcherySkillShot=[[RED]]Skill Shot Bonus Damage: [[YELLOW]]{0}%
+m.ArcherySkillShot=[[RED]]Skill Shot Bonus Damage: [[YELLOW]]{0}%
+m.SkillStats=[[YELLOW]]{0}[[GREEN]]{1}[[DARK_AQUA]] XP([[GRAY]]{2}[[DARK_AQUA]]/[[GRAY]]{3}[[DARK_AQUA]])
+Inspect.TooFar=[[RED]]You are too far away to inspect that player!
+Inspect.Offline = [[RED]]That player is offline, inspecting offline players is limited to Ops!
+Commands.DoesNotExist = [[RED]]Player does not exist in the database!
+Inspect.Stats=[[GREEN]]mcMMO Stats for [[YELLOW]]{0}
+Inspect.OfflineStats=mcMMO Stats for Offline Player [[YELLOW]]{0}
+Stats.GatheringHeader=[[GOLD]]-=GATHERING SKILLS=-
+Stats.CombatHeader=[[GOLD]]-=COMBAT SKILLS=-
+Stats.MiscHeader=[[GOLD]]-=MISC SKILLS=-
+Commands.NoConsole=This command does not support console usage.

src/main/resources/locale/locale_it.properties

@@ -77,7 +77,7 @@ m.XPGainArchery=Attacca mostri
 m.EffectsArchery1_0=Accensione
 m.EffectsArchery1_1=25% La chance contro i nemici si accende
 m.EffectsArchery2_0=Stordimento (Giocatori)
-m.EffectsArchery2_1=Disorienta i nemici
+m.EffectsArchery2_1=Disorients foes and deals 4 DMG
 m.EffectsArchery3_0=Danno+
 m.EffectsArchery3_1=Danni modificati
 m.EffectsArchery4_0=Richiamo della freccia
@@ -230,7 +230,7 @@ mcPlayerListener.AdminChatOn=Admin Chat  [[GREEN]]Attiva
 mcPlayerListener.AdminChatOff=Admin Chat [[RED]]Disattiva
 mcPlayerListener.MOTD=[[BLUE]]Questo server tiene McMmmo {0} scrivi [[YELLOW]]/{1}[[BLUE]] per la lista aiuti.
 mcPlayerListener.WIKI=[[GREEN]]http://mcmmo.wikia.com[[BLUE]] - mcMMO Wiki
-mcPlayerListener.PowerLevel=[[DARK_RED]]Livello di potenza: 
+mcPlayerListener.PowerLevel=[[DARK_RED]]Livello di potenza: [[GREEN]]{0}
 mcPlayerListener.PowerLevelLeaderboard=[[YELLOW]]--mcMMO[[BLUE]] Livello di potenza [[YELLOW]]Classifica--
 mcPlayerListener.SkillLeaderboard=[[YELLOW]]--mcMMO [[BLUE]]{0}[[YELLOW]] Classifica--
 mcPlayerListener.RepairSkill=Riparazioni: 
@@ -431,4 +431,14 @@ XPRate.Event = [[GOLD]]mcMMO ha un'evento in corso -> XP aumentato! la XP Rate e
 BlastMining.Boom = [[GRAY]]**BOOM**
 Party.Forbidden=[mcMMO] I party non sono permessi in questo mondo (Controlla i Permessi)
 m.TamingSummonOcelotFailed=[[RED]]Hai troppi gattopardi con te per poterne chiamare altri.
-m.ArcherySkillShot=[[RED]]Skill Shot Bonus Damage: [[YELLOW]]{0}%
+m.ArcherySkillShot=[[RED]]Skill Shot Bonus Damage: [[YELLOW]]{0}%
+m.SkillStats=[[YELLOW]]{0}[[GREEN]]{1}[[DARK_AQUA]] XP([[GRAY]]{2}[[DARK_AQUA]]/[[GRAY]]{3}[[DARK_AQUA]])
+Inspect.TooFar=[[RED]]You are too far away to inspect that player!
+Inspect.Offline = [[RED]]That player is offline, inspecting offline players is limited to Ops!
+Commands.DoesNotExist = [[RED]]Player does not exist in the database!
+Inspect.Stats=[[GREEN]]mcMMO Stats for [[YELLOW]]{0}
+Inspect.OfflineStats=mcMMO Stats for Offline Player [[YELLOW]]{0}
+Stats.GatheringHeader=[[GOLD]]-=GATHERING SKILLS=-
+Stats.CombatHeader=[[GOLD]]-=COMBAT SKILLS=-
+Stats.MiscHeader=[[GOLD]]-=MISC SKILLS=-
+Commands.NoConsole=This command does not support console usage.

src/main/resources/locale/locale_nl.properties

@@ -83,7 +83,7 @@ m.XPGainArchery=Schiet op vijanden
 m.EffectsArchery1_0=Brandende pijl
 m.EffectsArchery1_1=25% kans dat een vijand verbrand
 m.EffectsArchery2_0=Verdoof (Players)
-m.EffectsArchery2_1=Gedesorienteerde vijanden
+m.EffectsArchery2_1=Disorients foes and deals 4 DMG
 m.EffectsArchery3_0=Schade+
 m.EffectsArchery3_1=Verhoogt schade
 m.EffectsArchery4_0=Pijlen terugkrijgen
@@ -234,7 +234,7 @@ mcPlayerListener.AdminChatOn=Alleen Admin Chat [[GREEN]]aan
 mcPlayerListener.AdminChatOff=Alleen Admin Chat [[RED]]uit
 mcPlayerListener.MOTD=[[BLUE]]Deze server werkt op mcMMO {0} type [[YELLOW]]/{1}[[BLUE]] voor hulp.
 mcPlayerListener.WIKI=[[GREEN]]http://mcmmo.wikia.com[[BLUE]] - mcMMO Wiki
-mcPlayerListener.PowerLevel=[[DARK_RED]]POWER LEVEL: 
+mcPlayerListener.PowerLevel=[[DARK_RED]]POWER LEVEL: [[GREEN]]{0}
 mcPlayerListener.PowerLevelLeaderboard=[[YELLOW]]--mcMMO[[BLUE]] Power Level [[YELLOW]]Highscore--
 mcPlayerListener.SkillLeaderboard=[[YELLOW]]--mcMMO [[BLUE]]{0}[[YELLOW]] Highscore--
 mcPlayerListener.RepairSkill=Repareren: 
@@ -435,4 +435,14 @@ XPRate.Event = [[GOLD]]mcMMO is currently in an XP rate event! XP rate is {0}x!
 BlastMining.Boom = [[GRAY]]**BOOM**
 Party.Forbidden=[mcMMO] Parties not permitted on this world (See Permissions)
 m.TamingSummonOcelotFailed=[[RED]]You have too many ocelots nearby to summon any more.
-m.ArcherySkillShot=[[RED]]Skill Shot Bonus Damage: [[YELLOW]]{0}%
+m.ArcherySkillShot=[[RED]]Skill Shot Bonus Damage: [[YELLOW]]{0}%
+m.SkillStats=[[YELLOW]]{0}[[GREEN]]{1}[[DARK_AQUA]] XP([[GRAY]]{2}[[DARK_AQUA]]/[[GRAY]]{3}[[DARK_AQUA]])
+Inspect.TooFar=[[RED]]You are too far away to inspect that player!
+Inspect.Offline = [[RED]]That player is offline, inspecting offline players is limited to Ops!
+Commands.DoesNotExist = [[RED]]Player does not exist in the database!
+Inspect.Stats=[[GREEN]]mcMMO Stats for [[YELLOW]]{0}
+Inspect.OfflineStats=mcMMO Stats for Offline Player [[YELLOW]]{0}
+Stats.GatheringHeader=[[GOLD]]-=GATHERING SKILLS=-
+Stats.CombatHeader=[[GOLD]]-=COMBAT SKILLS=-
+Stats.MiscHeader=[[GOLD]]-=MISC SKILLS=-
+Commands.NoConsole=This command does not support console usage.