Refactoring to match Master branch.

*Basic framework for Staves is now done.*

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

@@ -4,10 +4,10 @@ import org.bukkit.Bukkit;
 import org.bukkit.ChatColor;
 import org.bukkit.entity.Player;
 
-import com.gmail.nossr50.Users;
-import com.gmail.nossr50.mcPermissions;
 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 {
     /**

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 {
 

src/main/java/com/gmail/nossr50/commands/general/AddlevelsCommand.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.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.skills.Skills;
+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;

src/main/java/com/gmail/nossr50/commands/general/AddxpCommand.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.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 {

src/main/java/com/gmail/nossr50/commands/general/InspectCommand.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.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;

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

@@ -5,10 +5,10 @@ import org.bukkit.command.CommandExecutor;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 
-import com.gmail.nossr50.Users;
 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 McstatsCommand implements CommandExecutor {
 

src/main/java/com/gmail/nossr50/commands/general/MmoeditCommand.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.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.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;

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

@@ -7,10 +7,10 @@ import org.bukkit.command.CommandExecutor;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 
-import com.gmail.nossr50.Users;
 import com.gmail.nossr50.commands.CommandHelper;
 import com.gmail.nossr50.config.LoadProperties;
 import com.gmail.nossr50.runnables.SQLConversionTask;
+import com.gmail.nossr50.util.Users;
 
 public class MmoupdateCommand implements CommandExecutor {
 

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

@@ -6,10 +6,10 @@ import org.bukkit.command.CommandExecutor;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 
-import com.gmail.nossr50.m;
 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;

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

@@ -5,10 +5,10 @@ import org.bukkit.command.CommandExecutor;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 
-import com.gmail.nossr50.Users;
 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 {
 

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

@@ -6,9 +6,9 @@ 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 {

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

@@ -5,10 +5,10 @@ import org.bukkit.command.CommandExecutor;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 
-import com.gmail.nossr50.Users;
 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 {
 

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

@@ -11,11 +11,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.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";

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.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 {
 

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,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.datatypes.PlayerProfile;
 import com.gmail.nossr50.events.chat.McMMOPartyChatEvent;
 import com.gmail.nossr50.locale.mcLocale;
+import com.gmail.nossr50.util.Users;
+import com.gmail.nossr50.util.mcPermissions;
 
 public class PCommand implements CommandExecutor {
 	public PCommand() {}

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,13 +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

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

@@ -5,13 +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

src/main/java/com/gmail/nossr50/commands/skills/AxesCommand.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.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

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

@@ -5,13 +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

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

@@ -5,14 +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

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

@@ -5,13 +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

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

@@ -5,13 +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

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

@@ -5,15 +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

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

@@ -5,13 +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

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

@@ -5,14 +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

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

@@ -5,13 +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

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

@@ -5,13 +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

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/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.gathering.Excavation;
-import com.gmail.nossr50.skills.Herbalism;
+import com.gmail.nossr50.skills.gathering.Herbalism;
-import com.gmail.nossr50.skills.Mining;
+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.util.Users;
-import com.gmail.nossr50.m;
+import com.gmail.nossr50.util.m;
 import com.gmail.nossr50.mcMMO;
 
 public class PlayerProfile {

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/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.gathering.Excavation;
-import com.gmail.nossr50.skills.Herbalism;
+import com.gmail.nossr50.skills.gathering.Herbalism;
-import com.gmail.nossr50.skills.Mining;
+import com.gmail.nossr50.skills.gathering.Mining;
-import com.gmail.nossr50.skills.Repair;
+import com.gmail.nossr50.skills.gathering.WoodCutting;
-import com.gmail.nossr50.skills.Skills;
+import com.gmail.nossr50.skills.misc.Repair;
-import com.gmail.nossr50.skills.WoodCutting;
 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;
     }
 

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.combat.Archery;
-import com.gmail.nossr50.skills.Archery;
+import com.gmail.nossr50.skills.combat.Staves;
-import com.gmail.nossr50.skills.BlastMining;
+import com.gmail.nossr50.skills.combat.Taming;
-import com.gmail.nossr50.skills.Skills;
+import com.gmail.nossr50.skills.gathering.BlastMining;
-import com.gmail.nossr50.skills.Taming;
+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);
             }
         }
     }

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

@@ -16,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;
@@ -25,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;
@@ -43,17 +38,24 @@ 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.combat.Staves;
-import com.gmail.nossr50.skills.Fishing;
+import com.gmail.nossr50.skills.combat.Taming;
-import com.gmail.nossr50.skills.Herbalism;
+import com.gmail.nossr50.skills.gathering.BlastMining;
-import com.gmail.nossr50.skills.Repair;
+import com.gmail.nossr50.skills.gathering.Fishing;
-import com.gmail.nossr50.skills.Skills;
+import com.gmail.nossr50.skills.gathering.Herbalism;
-import com.gmail.nossr50.skills.Taming;
+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;
     }
 
@@ -240,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:
@@ -263,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:
@@ -374,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,18 +6,18 @@ 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;
     }
 

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.util.Database;
-import com.gmail.nossr50.listeners.mcEntityListener;
+import com.gmail.nossr50.util.Leaderboard;
-import com.gmail.nossr50.listeners.mcPlayerListener;
+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;
 
@@ -42,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 PlayerListener playerListener = new PlayerListener(this);
-    private final mcBlockListener blockListener = new mcBlockListener(this);
+    private final BlockListener blockListener = new BlockListener(this);
-    private final mcEntityListener entityListener = new mcEntityListener(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>();
 

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;

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,14 +8,14 @@ import org.bukkit.entity.Entity;
 import org.bukkit.entity.Player;
 import org.bukkit.inventory.ItemStack;
 
-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.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 {
 

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,4 +1,4 @@
-package com.gmail.nossr50.skills;
+package com.gmail.nossr50.skills.combat;
 
 import java.util.Random;
 
@@ -8,12 +8,12 @@ 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 {
 

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()) {
+            for (Player y : player.getWorld().getPlayers()) {
-                if(y != player && m.isNear(player.getLocation(), y.getLocation(), MAX_DISTANCE_AWAY)) {
+                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.util.Skills;
-import com.gmail.nossr50.m;
+import com.gmail.nossr50.util.Users;
-import com.gmail.nossr50.mcPermissions;
+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 {
 

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 {
 

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;
 

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;
@@ -15,12 +15,13 @@ 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;

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.SpoutInputListener;
-import com.gmail.nossr50.listeners.mcSpoutListener;
+import com.gmail.nossr50.listeners.SpoutListener;
-import com.gmail.nossr50.listeners.mcSpoutScreenListener;
+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 SpoutListener spoutListener = new SpoutListener(plugin);
-    private final static mcSpoutInputListener spoutInputListener = new mcSpoutInputListener(plugin);
+    private final static SpoutInputListener spoutInputListener = new SpoutInputListener(plugin);
-    private final static mcSpoutScreenListener spoutScreenListener = new mcSpoutScreenListener(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.combat.Archery;
-import com.gmail.nossr50.skills.Archery;
+import com.gmail.nossr50.skills.combat.Axes;
-import com.gmail.nossr50.skills.Axes;
+import com.gmail.nossr50.skills.combat.Staves;
-import com.gmail.nossr50.skills.Skills;
+import com.gmail.nossr50.skills.combat.Swords;
-import com.gmail.nossr50.skills.Swords;
+import com.gmail.nossr50.skills.combat.Taming;
-import com.gmail.nossr50.skills.Taming;
+import com.gmail.nossr50.skills.combat.Unarmed;
-import com.gmail.nossr50.skills.Unarmed;
+import com.gmail.nossr50.skills.misc.Acrobatics;
 
 public class Combat {
 
@@ -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:

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;

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

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

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;