Rearrange checks in PartyInviteCommand

Changelog.txt

@@ -9,19 +9,7 @@ Key:
 
 Version 1.4.08-dev
  + Added the possibility to gain experience when using Fishing "Shake"
- + Added config options to disable various sound effects
- + Smelting now works with custom ores - add smelting XP value to blocks.yml, or it will default to 1/10th of normal XP.
- + Added automatic cleanup of backups folder.
- + Added bypass permission for finding Fishing traps
- = Fixed bug with toggle commands not properly displaying the success message.
  = Fixed IllegalArgumentException caused by an empty Fishing treasure category
- = Fixed bug with Salvage not reading the config value for the anvil material.
- = Fixed exploit where you could receive smelting XP for improper items
- = Fixed bug where the Unbreaking enchantment was ignored when using "Super Breaker" or "Giga Drill Breaker"
- = Fixed bug which prevented players from gaining Acrobatics XP when the setting 'Prevent_XP_After_Teleport' was set to false
- = Fixed McMMOPlayerDisarmEvent reporting the skill level of the defending player, not the attacking player.
- = Fixed bug where arrow retrieval was not properly detecting entities that already existed in the tracker
- ! Updated localization files
 
 Version 1.4.07
  + Added XP boost to Acrobatics when wearing Boots of Feather Falling

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

@@ -50,34 +50,34 @@ public final class AbilityAPI {
     }
 
     public static void resetCooldowns(Player player) {
-        UserManager.getPlayer(player).resetCooldowns();
+        UserManager.getPlayer(player).getProfile().resetCooldowns();
     }
 
     public static void setBerserkCooldown(Player player, long cooldown) {
-        UserManager.getPlayer(player).setAbilityDATS(AbilityType.BERSERK, cooldown);
+        UserManager.getPlayer(player).getProfile().setSkillDATS(AbilityType.BERSERK, cooldown);
     }
 
     public static void setGigaDrillBreakerCooldown(Player player, long cooldown) {
-        UserManager.getPlayer(player).setAbilityDATS(AbilityType.GIGA_DRILL_BREAKER, cooldown);
+        UserManager.getPlayer(player).getProfile().setSkillDATS(AbilityType.GIGA_DRILL_BREAKER, cooldown);
     }
 
     public static void setGreenTerraCooldown(Player player, long cooldown) {
-        UserManager.getPlayer(player).setAbilityDATS(AbilityType.GREEN_TERRA, cooldown);
+        UserManager.getPlayer(player).getProfile().setSkillDATS(AbilityType.GREEN_TERRA, cooldown);
     }
 
     public static void setSerratedStrikesCooldown(Player player, long cooldown) {
-        UserManager.getPlayer(player).setAbilityDATS(AbilityType.SERRATED_STRIKES, cooldown);
+        UserManager.getPlayer(player).getProfile().setSkillDATS(AbilityType.SERRATED_STRIKES, cooldown);
     }
 
     public static void setSkullSplitterCooldown(Player player, long cooldown) {
-        UserManager.getPlayer(player).setAbilityDATS(AbilityType.SKULL_SPLITTER, cooldown);
+        UserManager.getPlayer(player).getProfile().setSkillDATS(AbilityType.SKULL_SPLITTER, cooldown);
     }
 
     public static void setSuperBreakerCooldown(Player player, long cooldown) {
-        UserManager.getPlayer(player).setAbilityDATS(AbilityType.SUPER_BREAKER, cooldown);
+        UserManager.getPlayer(player).getProfile().setSkillDATS(AbilityType.SUPER_BREAKER, cooldown);
     }
 
     public static void setTreeFellerCooldown(Player player, long cooldown) {
-        UserManager.getPlayer(player).setAbilityDATS(AbilityType.TREE_FELLER, cooldown);
+        UserManager.getPlayer(player).getProfile().setSkillDATS(AbilityType.TREE_FELLER, cooldown);
     }
 }

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

@@ -76,7 +76,7 @@ public final class ChatAPI {
      * @return true if the player is using party chat, false otherwise
      */
     public static boolean isUsingPartyChat(Player player) {
-        return UserManager.getPlayer(player).isChatEnabled(ChatMode.PARTY);
+        return UserManager.getPlayer(player).getPartyChatMode();
     }
 
     /**
@@ -86,7 +86,7 @@ public final class ChatAPI {
      * @return true if the player is using party chat, false otherwise
      */
     public static boolean isUsingPartyChat(String playerName) {
-        return UserManager.getPlayer(playerName).isChatEnabled(ChatMode.PARTY);
+        return UserManager.getPlayer(playerName).getPartyChatMode();
     }
 
     /**
@@ -96,7 +96,7 @@ public final class ChatAPI {
      * @return true if the player is using admin chat, false otherwise
      */
     public static boolean isUsingAdminChat(Player player) {
-        return UserManager.getPlayer(player).isChatEnabled(ChatMode.ADMIN);
+        return UserManager.getPlayer(player).getAdminChatMode();
     }
 
     /**
@@ -106,7 +106,7 @@ public final class ChatAPI {
      * @return true if the player is using admin chat, false otherwise
      */
     public static boolean isUsingAdminChat(String playerName) {
-        return UserManager.getPlayer(playerName).isChatEnabled(ChatMode.ADMIN);
+        return UserManager.getPlayer(playerName).getAdminChatMode();
     }
 
     /**
@@ -115,7 +115,7 @@ public final class ChatAPI {
      * @param player The player to toggle party chat on.
      */
     public static void togglePartyChat(Player player) {
-        UserManager.getPlayer(player).toggleChat(ChatMode.PARTY);
+        UserManager.getPlayer(player).togglePartyChat();
     }
 
     /**
@@ -124,7 +124,7 @@ public final class ChatAPI {
      * @param playerName The name of the player to toggle party chat on.
      */
     public static void togglePartyChat(String playerName) {
-        UserManager.getPlayer(playerName).toggleChat(ChatMode.PARTY);
+        UserManager.getPlayer(playerName).togglePartyChat();
     }
 
     /**
@@ -133,7 +133,7 @@ public final class ChatAPI {
      * @param player The player to toggle admin chat on.
      */
     public static void toggleAdminChat(Player player) {
-        UserManager.getPlayer(player).toggleChat(ChatMode.ADMIN);
+        UserManager.getPlayer(player).toggleAdminChat();
     }
 
     /**
@@ -142,7 +142,7 @@ public final class ChatAPI {
      * @param playerName The name of the player to toggle party chat on.
      */
     public static void toggleAdminChat(String playerName) {
-        UserManager.getPlayer(playerName).toggleChat(ChatMode.ADMIN);
+        UserManager.getPlayer(playerName).toggleAdminChat();
     }
 
     private static ChatManager getPartyChatManager(Plugin plugin, String party) {

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

@@ -184,7 +184,7 @@ public final class ExperienceAPI {
      * @throws UnsupportedOperationException if the given skill is a child skill
      */
     public static int getXP(Player player, String skillType) {
-        return UserManager.getPlayer(player).getSkillXpLevel(getNonChildSkillType(skillType));
+        return UserManager.getPlayer(player).getProfile().getSkillXpLevel(getNonChildSkillType(skillType));
     }
 
     /**
@@ -217,7 +217,7 @@ public final class ExperienceAPI {
      * @throws UnsupportedOperationException if the given skill is a child skill
      */
     public static float getXPRaw(Player player, String skillType) {
-        return UserManager.getPlayer(player).getSkillXpLevelRaw(getNonChildSkillType(skillType));
+        return UserManager.getPlayer(player).getProfile().getSkillXpLevelRaw(getNonChildSkillType(skillType));
     }
 
     /**
@@ -250,7 +250,7 @@ public final class ExperienceAPI {
      * @throws UnsupportedOperationException if the given skill is a child skill
      */
     public static int getXPToNextLevel(Player player, String skillType) {
-        return UserManager.getPlayer(player).getXpToLevel(getNonChildSkillType(skillType));
+        return UserManager.getPlayer(player).getProfile().getXpToLevel(getNonChildSkillType(skillType));
     }
 
     /**
@@ -323,7 +323,7 @@ public final class ExperienceAPI {
      * @throws InvalidSkillException if the given skill is not valid
      */
     public static void addLevel(Player player, String skillType, int levels) {
-        UserManager.getPlayer(player).addLevels(getSkillType(skillType), levels);
+        UserManager.getPlayer(player).getProfile().addLevels(getSkillType(skillType), levels);
     }
 
     /**
@@ -369,7 +369,7 @@ public final class ExperienceAPI {
      * @throws InvalidSkillException if the given skill is not valid
      */
     public static int getLevel(Player player, String skillType) {
-        return UserManager.getPlayer(player).getSkillLevel(getSkillType(skillType));
+        return UserManager.getPlayer(player).getProfile().getSkillLevel(getSkillType(skillType));
     }
 
     /**
@@ -492,7 +492,7 @@ public final class ExperienceAPI {
      * @throws InvalidSkillException if the given skill is not valid
      */
     public static void setLevel(Player player, String skillType, int skillLevel) {
-        UserManager.getPlayer(player).modifySkill(getSkillType(skillType), skillLevel);
+        UserManager.getPlayer(player).getProfile().modifySkill(getSkillType(skillType), skillLevel);
     }
 
     /**
@@ -524,7 +524,7 @@ public final class ExperienceAPI {
      * @throws UnsupportedOperationException if the given skill is a child skill
      */
     public static void setXP(Player player, String skillType, int newValue) {
-        UserManager.getPlayer(player).setSkillXpLevel(getNonChildSkillType(skillType), newValue);
+        UserManager.getPlayer(player).getProfile().setSkillXpLevel(getNonChildSkillType(skillType), newValue);
     }
 
     /**
@@ -557,7 +557,7 @@ public final class ExperienceAPI {
      * @throws UnsupportedOperationException if the given skill is a child skill
      */
     public static void removeXP(Player player, String skillType, int xp) {
-        UserManager.getPlayer(player).removeXp(getNonChildSkillType(skillType), xp);
+        UserManager.getPlayer(player).getProfile().removeXp(getNonChildSkillType(skillType), xp);
     }
 
     /**
@@ -582,7 +582,18 @@ public final class ExperienceAPI {
     private static void addOfflineXP(String playerName, SkillType skill, int XP) {
         PlayerProfile profile = getOfflineProfile(playerName);
 
-        profile.addXp(skill, XP);
+        if (skill.isChildSkill()) {
+            Set<SkillType> parentSkills = FamilyTree.getParents(skill);
+
+            for (SkillType parentSkill : parentSkills) {
+                profile.setSkillXpLevel(parentSkill, profile.getSkillLevel(parentSkill) + (XP / parentSkills.size()));
+            }
+
+            profile.save();
+            return;
+        }
+
+        profile.setSkillXpLevel(skill, profile.getSkillXpLevel(skill) + XP);
         profile.save();
     }
 

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

@@ -7,14 +7,14 @@ import java.util.Set;
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandSender;
 import org.bukkit.command.TabExecutor;
+import org.bukkit.entity.Player;
 import org.bukkit.util.StringUtil;
 
 import com.gmail.nossr50.datatypes.player.McMMOPlayer;
-import com.gmail.nossr50.util.Misc;
+import com.gmail.nossr50.locale.LocaleLoader;
 import com.gmail.nossr50.util.Permissions;
 import com.gmail.nossr50.util.commands.CommandUtils;
 import com.gmail.nossr50.util.player.UserManager;
-
 import com.google.common.collect.ImmutableList;
 
 public class KrakenCommand implements TabExecutor {
@@ -31,7 +31,7 @@ public class KrakenCommand implements TabExecutor {
                     return true;
                 }
 
-                UserManager.getPlayer(sender.getName()).getFishingManager().unleashTheKraken();
+                UserManager.getPlayer((Player) sender).getFishingManager().unleashTheKraken();
                 return true;
 
             case 1:
@@ -40,10 +40,10 @@ public class KrakenCommand implements TabExecutor {
                     return true;
                 }
 
-                String playerName = Misc.getMatchedPlayerName(args[0]);
-                McMMOPlayer mcMMOPlayer = UserManager.getPlayer(playerName);
+                McMMOPlayer mcMMOPlayer = UserManager.getPlayer(args[0], true);
 
-                if (!CommandUtils.checkPlayerExistence(sender, playerName, mcMMOPlayer)) {
+                if (mcMMOPlayer == null) {
+                    sender.sendMessage(LocaleLoader.getString("Commands.Offline"));
                     return true;
                 }
 

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

@@ -2,7 +2,6 @@ package com.gmail.nossr50.commands;
 
 import org.bukkit.command.CommandSender;
 
-import com.gmail.nossr50.datatypes.player.McMMOPlayer;
 import com.gmail.nossr50.locale.LocaleLoader;
 import com.gmail.nossr50.util.Permissions;
 
@@ -18,13 +17,13 @@ public class McabilityCommand extends ToggleCommand {
     }
 
     @Override
-    protected void applyCommandAction(McMMOPlayer mcMMOPlayer) {
-        mcMMOPlayer.getPlayer().sendMessage(LocaleLoader.getString("Commands.Ability." + (mcMMOPlayer.getAbilityUse() ? "Off" : "On")));
+    protected void applyCommandAction() {
+        player.sendMessage(LocaleLoader.getString("Commands.Ability." + (mcMMOPlayer.getAbilityUse() ? "Off" : "On")));
         mcMMOPlayer.toggleAbilityUse();
     }
 
     @Override
-    protected void sendSuccessMessage(CommandSender sender, String playerName) {
-        sender.sendMessage(LocaleLoader.getString("Commands.Ability.Toggle", playerName));
+    protected void sendSuccessMessage(CommandSender sender) {
+        sender.sendMessage(LocaleLoader.getString("Commands.Ability.Toggle"));
     }
 }

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

@@ -2,7 +2,6 @@ package com.gmail.nossr50.commands;
 
 import org.bukkit.command.CommandSender;
 
-import com.gmail.nossr50.datatypes.player.McMMOPlayer;
 import com.gmail.nossr50.locale.LocaleLoader;
 import com.gmail.nossr50.util.Permissions;
 
@@ -18,13 +17,13 @@ public class McgodCommand extends ToggleCommand {
     }
 
     @Override
-    protected void applyCommandAction(McMMOPlayer mcMMOPlayer) {
-        mcMMOPlayer.getPlayer().sendMessage(LocaleLoader.getString("Commands.GodMode." + (mcMMOPlayer.getGodMode() ? "Disabled" : "Enabled")));
+    protected void applyCommandAction() {
+        player.sendMessage(LocaleLoader.getString("Commands.GodMode." + (mcMMOPlayer.getGodMode() ? "Disabled" : "Enabled")));
         mcMMOPlayer.toggleGodMode();
     }
 
     @Override
-    protected void sendSuccessMessage(CommandSender sender, String playerName) {
-        sender.sendMessage(LocaleLoader.getString("Commands.GodMode.Toggle", playerName));
+    protected void sendSuccessMessage(CommandSender sender) {
+        sender.sendMessage(LocaleLoader.getString("Commands.GodMode.Success"));
     }
 }

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

@@ -2,7 +2,6 @@ package com.gmail.nossr50.commands;
 
 import org.bukkit.command.CommandSender;
 
-import com.gmail.nossr50.datatypes.player.McMMOPlayer;
 import com.gmail.nossr50.locale.LocaleLoader;
 import com.gmail.nossr50.util.Permissions;
 
@@ -18,17 +17,17 @@ public class McrefreshCommand extends ToggleCommand {
     }
 
     @Override
-    protected void applyCommandAction(McMMOPlayer mcMMOPlayer) {
+    protected void applyCommandAction() {
         mcMMOPlayer.setRecentlyHurt(0);
-        mcMMOPlayer.resetCooldowns();
+        mcMMOPlayer.getProfile().resetCooldowns();
         mcMMOPlayer.resetToolPrepMode();
         mcMMOPlayer.resetAbilityMode();
 
-        mcMMOPlayer.getPlayer().sendMessage(LocaleLoader.getString("Ability.Generic.Refresh"));
+        player.sendMessage(LocaleLoader.getString("Ability.Generic.Refresh"));
     }
 
     @Override
-    protected void sendSuccessMessage(CommandSender sender, String playerName) {
-        sender.sendMessage(LocaleLoader.getString("Commands.mcrefresh.Success", playerName));
+    protected void sendSuccessMessage(CommandSender sender) {
+        sender.sendMessage(LocaleLoader.getString("Commands.mcrefresh.Success", player.getName()));
     }
 }

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

@@ -2,7 +2,6 @@ package com.gmail.nossr50.commands;
 
 import java.util.ArrayList;
 import java.util.List;
-
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandSender;
 import org.bukkit.command.TabExecutor;
@@ -12,7 +11,6 @@ import com.gmail.nossr50.config.Config;
 import com.gmail.nossr50.locale.LocaleLoader;
 import com.gmail.nossr50.util.commands.CommandUtils;
 import com.gmail.nossr50.util.scoreboards.ScoreboardManager;
-
 import com.google.common.collect.ImmutableList;
 
 public class McscoreboardCommand implements TabExecutor {

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

@@ -11,10 +11,10 @@ import org.bukkit.entity.Player;
 import org.bukkit.util.StringUtil;
 
 import com.gmail.nossr50.datatypes.MobHealthbarType;
+import com.gmail.nossr50.datatypes.player.PlayerProfile;
 import com.gmail.nossr50.locale.LocaleLoader;
 import com.gmail.nossr50.util.commands.CommandUtils;
 import com.gmail.nossr50.util.player.UserManager;
-
 import com.google.common.collect.ImmutableList;
 
 public class MobhealthCommand implements TabExecutor {
@@ -39,9 +39,11 @@ public class MobhealthCommand implements TabExecutor {
 
         switch (args.length) {
             case 1:
+                PlayerProfile playerProfile = UserManager.getPlayer((Player) sender).getProfile();
+
                 try {
                     MobHealthbarType type = MobHealthbarType.valueOf(args[0].toUpperCase().trim());
-                    UserManager.getPlayer((Player) sender).getProfile().setMobHealthbarType(type);
+                    playerProfile.setMobHealthbarType(type);
                     sender.sendMessage(LocaleLoader.getString("Commands.Healthbars.Changed." + type.name()));
                     return true;
                 }

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

@@ -7,16 +7,19 @@ import java.util.Set;
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandSender;
 import org.bukkit.command.TabExecutor;
+import org.bukkit.entity.Player;
 import org.bukkit.util.StringUtil;
 
 import com.gmail.nossr50.datatypes.player.McMMOPlayer;
-import com.gmail.nossr50.util.Misc;
+import com.gmail.nossr50.locale.LocaleLoader;
 import com.gmail.nossr50.util.commands.CommandUtils;
 import com.gmail.nossr50.util.player.UserManager;
-
 import com.google.common.collect.ImmutableList;
 
 public abstract class ToggleCommand implements TabExecutor {
+    protected McMMOPlayer mcMMOPlayer;
+    protected Player player;
+
     @Override
     public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
         switch (args.length) {
@@ -30,7 +33,10 @@ public abstract class ToggleCommand implements TabExecutor {
                     return true;
                 }
 
-                applyCommandAction(UserManager.getPlayer(sender.getName()));
+                player = (Player) sender;
+                mcMMOPlayer = UserManager.getPlayer(player);
+
+                applyCommandAction();
                 return true;
 
             case 1:
@@ -39,19 +45,17 @@ public abstract class ToggleCommand implements TabExecutor {
                     return true;
                 }
 
-                String playerName = Misc.getMatchedPlayerName(args[0]);
-                McMMOPlayer mcMMOPlayer = UserManager.getPlayer(playerName);
+                mcMMOPlayer = UserManager.getPlayer(args[0], true);
 
-                if (!CommandUtils.checkPlayerExistence(sender, playerName, mcMMOPlayer)) {
+                if (mcMMOPlayer == null) {
+                    player.sendMessage(LocaleLoader.getString("Commands.Offline"));
                     return true;
                 }
 
-                if (CommandUtils.isOffline(sender, mcMMOPlayer.getPlayer())) {
-                    return true;
-                }
+                player = mcMMOPlayer.getPlayer();
 
-                applyCommandAction(mcMMOPlayer);
-                sendSuccessMessage(sender, playerName);
+                applyCommandAction();
+                sendSuccessMessage(sender);
                 return true;
 
             default:
@@ -72,6 +76,6 @@ public abstract class ToggleCommand implements TabExecutor {
 
     protected abstract boolean hasOtherPermission(CommandSender sender);
     protected abstract boolean hasSelfPermission(CommandSender sender);
-    protected abstract void applyCommandAction(McMMOPlayer mcMMOPlayer);
-    protected abstract void sendSuccessMessage(CommandSender sender, String playerName);
+    protected abstract void applyCommandAction();
+    protected abstract void sendSuccessMessage(CommandSender sender);
 }

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

@@ -18,7 +18,11 @@ import com.gmail.nossr50.util.commands.CommandUtils;
 import com.google.common.collect.ImmutableList;
 
 public class XprateCommand implements TabExecutor {
-    private final double ORIGINAL_XP_RATE = ExperienceConfig.getInstance().getExperienceGainsGlobalMultiplier();
+    private double originalRate;
+
+    public XprateCommand() {
+        originalRate = ExperienceConfig.getInstance().getExperienceGainsGlobalMultiplier();
+    }
 
     @Override
     public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
@@ -38,7 +42,7 @@ public class XprateCommand implements TabExecutor {
                     mcMMO.p.toggleXpEventEnabled();
                 }
 
-                ExperienceConfig.getInstance().setExperienceGainsGlobalMultiplier(ORIGINAL_XP_RATE);
+                ExperienceConfig.getInstance().setExperienceGainsGlobalMultiplier(originalRate);
                 return true;
 
             case 2:

src/main/java/com/gmail/nossr50/commands/chat/ChatCommand.java

@@ -21,8 +21,9 @@ import com.gmail.nossr50.util.player.UserManager;
 import com.google.common.collect.ImmutableList;
 
 public abstract class ChatCommand implements TabExecutor {
-    private ChatMode chatMode;
+    protected ChatMode chatMode;
     protected ChatManager chatManager;
+    private McMMOPlayer mcMMOPlayer;
 
     public ChatCommand(ChatMode chatMode) {
         this.chatMode = chatMode;
@@ -31,21 +32,19 @@ public abstract class ChatCommand implements TabExecutor {
 
     @Override
     public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
-        McMMOPlayer mcMMOPlayer;
-
         switch (args.length) {
             case 0:
                 if (CommandUtils.noConsoleUsage(sender)) {
                     return true;
                 }
 
-                mcMMOPlayer = UserManager.getPlayer(sender.getName());
+                mcMMOPlayer = UserManager.getPlayer((Player) sender);
 
-                if (mcMMOPlayer.isChatEnabled(chatMode)) {
-                    disableChatMode(mcMMOPlayer, sender);
+                if (chatMode.isEnabled(mcMMOPlayer)) {
+                    disableChatMode(sender);
                 }
                 else {
-                    enableChatMode(mcMMOPlayer, sender);
+                    enableChatMode(sender);
                 }
 
                 return true;
@@ -56,7 +55,9 @@ public abstract class ChatCommand implements TabExecutor {
                         return true;
                     }
 
-                    enableChatMode(UserManager.getPlayer(sender.getName()), sender);
+                    mcMMOPlayer = UserManager.getPlayer((Player) sender);
+
+                    enableChatMode(sender);
                     return true;
                 }
 
@@ -65,7 +66,9 @@ public abstract class ChatCommand implements TabExecutor {
                         return true;
                     }
 
-                    disableChatMode(UserManager.getPlayer(sender.getName()), sender);
+                    mcMMOPlayer = UserManager.getPlayer((Player) sender);
+
+                    disableChatMode(sender);
                     return true;
                 }
 
@@ -105,23 +108,23 @@ public abstract class ChatCommand implements TabExecutor {
 
     protected abstract void handleChatSending(CommandSender sender, String[] args);
 
-    private void enableChatMode(McMMOPlayer mcMMOPlayer, CommandSender sender) {
+    private void enableChatMode(CommandSender sender) {
         if (chatMode == ChatMode.PARTY && mcMMOPlayer.getParty() == null) {
             sender.sendMessage(LocaleLoader.getString("Commands.Party.None"));
             return;
         }
 
-        mcMMOPlayer.enableChat(chatMode);
+        chatMode.enable(mcMMOPlayer);
         sender.sendMessage(chatMode.getEnabledMessage());
     }
 
-    private void disableChatMode(McMMOPlayer mcMMOPlayer, CommandSender sender) {
+    private void disableChatMode(CommandSender sender) {
         if (chatMode == ChatMode.PARTY && mcMMOPlayer.getParty() == null) {
             sender.sendMessage(LocaleLoader.getString("Commands.Party.None"));
             return;
         }
 
-        mcMMOPlayer.disableChat(chatMode);
+        chatMode.disable(mcMMOPlayer);
         sender.sendMessage(chatMode.getDisabledMessage());
     }
 }

src/main/java/com/gmail/nossr50/commands/database/McconvertCommand.java

@@ -1,4 +1,4 @@
-package com.gmail.nossr50.commands;
+package com.gmail.nossr50.commands.database;
 
 import java.util.ArrayList;
 import java.util.Collections;
@@ -11,7 +11,6 @@ import org.bukkit.command.TabExecutor;
 import org.bukkit.util.StringUtil;
 
 import com.gmail.nossr50.mcMMO;
-import com.gmail.nossr50.commands.database.ConvertDatabaseCommand;
 import com.gmail.nossr50.commands.experience.ConvertExperienceCommand;
 import com.gmail.nossr50.database.DatabaseManagerFactory;
 import com.gmail.nossr50.datatypes.database.DatabaseType;
@@ -24,17 +23,23 @@ public class McconvertCommand implements TabExecutor {
     private static final List<String> DATABASE_TYPES;
     private static final List<String> SUBCOMMANDS = ImmutableList.of("database", "experience");
 
-    private CommandExecutor databaseConvertCommand = new ConvertDatabaseCommand();
+    private CommandExecutor databaseConvertCommand   = new ConvertDatabaseCommand();
     private CommandExecutor experienceConvertCommand = new ConvertExperienceCommand();
 
     static {
         ArrayList<String> formulaTypes = new ArrayList<String>();
-        ArrayList<String> databaseTypes = new ArrayList<String>();
 
         for (FormulaType type : FormulaType.values()) {
             formulaTypes.add(type.toString());
         }
 
+        Collections.sort(formulaTypes);
+        FORMULA_TYPES = ImmutableList.copyOf(formulaTypes);
+    }
+
+    static {
+        ArrayList<String> databaseTypes = new ArrayList<String>();
+
         for (DatabaseType type : DatabaseType.values()) {
             databaseTypes.add(type.toString());
         }
@@ -46,12 +51,8 @@ public class McconvertCommand implements TabExecutor {
             databaseTypes.add(DatabaseManagerFactory.getCustomDatabaseManagerClass().getName());
         }
 
-        Collections.sort(formulaTypes);
         Collections.sort(databaseTypes);
-
-        FORMULA_TYPES = ImmutableList.copyOf(formulaTypes);
         DATABASE_TYPES = ImmutableList.copyOf(databaseTypes);
-
     }
 
     @Override

src/main/java/com/gmail/nossr50/commands/database/MmoshowdbCommand.java

@@ -15,21 +15,19 @@ import com.google.common.collect.ImmutableList;
 public class MmoshowdbCommand implements TabExecutor {
     @Override
     public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
-        switch (args.length) {
-            case 0:
-                Class<?> clazz = DatabaseManagerFactory.getCustomDatabaseManagerClass();
-
-                if (clazz != null) {
-                    sender.sendMessage(LocaleLoader.getString("Commands.mmoshowdb", clazz.getName()));
-                    return true;
-                }
-
-                sender.sendMessage(LocaleLoader.getString("Commands.mmoshowdb", (Config.getInstance().getUseMySQL() ? "sql" : "flatfile")));
-                return true;
-
-            default:
-                return false;
+        if (args.length != 0) {
+            return false;
         }
+
+        Class<?> clazz = DatabaseManagerFactory.getCustomDatabaseManagerClass();
+
+        if (clazz != null) {
+            sender.sendMessage(LocaleLoader.getString("Commands.mmoshowdb", clazz.getName()));
+            return true;
+        }
+
+        sender.sendMessage(LocaleLoader.getString("Commands.mmoshowdb", (Config.getInstance().getUseMySQL() ? "sql" : "flatfile")));
+        return true;
     }
 
     @Override

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

@@ -1,9 +1,7 @@
 package com.gmail.nossr50.commands.experience;
 
 import org.bukkit.command.CommandSender;
-import org.bukkit.entity.Player;
 
-import com.gmail.nossr50.datatypes.player.PlayerProfile;
 import com.gmail.nossr50.datatypes.skills.SkillType;
 import com.gmail.nossr50.locale.LocaleLoader;
 import com.gmail.nossr50.util.EventUtils;
@@ -21,12 +19,11 @@ public class AddlevelsCommand extends ExperienceCommand {
     }
 
     @Override
-    protected void handleCommand(Player player, PlayerProfile profile, SkillType skill, int value) {
+    protected void handleCommand(SkillType skill) {
         float xpRemoved = profile.getSkillXpLevelRaw(skill);
         profile.addLevels(skill, value);
 
         if (player == null) {
-            profile.save();
             return;
         }
 
@@ -34,12 +31,12 @@ public class AddlevelsCommand extends ExperienceCommand {
     }
 
     @Override
-    protected void handlePlayerMessageAll(Player player, int value) {
+    protected void handlePlayerMessageAll() {
         player.sendMessage(LocaleLoader.getString("Commands.addlevels.AwardAll.1", value));
     }
 
     @Override
-    protected void handlePlayerMessageSkill(Player player, int value, SkillType skill) {
+    protected void handlePlayerMessageSkill() {
         player.sendMessage(LocaleLoader.getString("Commands.addlevels.AwardSkill.1", value, skill.getName()));
     }
 }

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

@@ -1,13 +1,10 @@
 package com.gmail.nossr50.commands.experience;
 
 import org.bukkit.command.CommandSender;
-import org.bukkit.entity.Player;
 
-import com.gmail.nossr50.datatypes.player.PlayerProfile;
 import com.gmail.nossr50.datatypes.skills.SkillType;
 import com.gmail.nossr50.locale.LocaleLoader;
 import com.gmail.nossr50.util.Permissions;
-import com.gmail.nossr50.util.player.UserManager;
 
 public class AddxpCommand extends ExperienceCommand {
     @Override
@@ -21,23 +18,22 @@ public class AddxpCommand extends ExperienceCommand {
     }
 
     @Override
-    protected void handleCommand(Player player, PlayerProfile profile, SkillType skill, int value) {
+    protected void handleCommand(SkillType skill) {
         if (player != null) {
-            UserManager.getPlayer(player).applyXpGain(skill, value);
+            mcMMOPlayer.applyXpGain(skill, value);
         }
         else {
-            profile.addXp(skill, value);
-            profile.save();
+            profile.addExperience(skill, value);
         }
     }
 
     @Override
-    protected void handlePlayerMessageAll(Player player, int value) {
+    protected void handlePlayerMessageAll() {
         player.sendMessage(LocaleLoader.getString("Commands.addxp.AwardAll", value));
     }
 
     @Override
-    protected void handlePlayerMessageSkill(Player player, int value, SkillType skill) {
+    protected void handlePlayerMessageSkill() {
         player.sendMessage(LocaleLoader.getString("Commands.addxp.AwardSkill", value, skill.getName()));
     }
 }

src/main/java/com/gmail/nossr50/commands/experience/ExperienceCommand.java

@@ -22,6 +22,14 @@ import com.gmail.nossr50.util.player.UserManager;
 import com.google.common.collect.ImmutableList;
 
 public abstract class ExperienceCommand implements TabExecutor {
+    protected McMMOPlayer mcMMOPlayer;
+    protected Player player;
+    protected PlayerProfile profile;
+
+    protected boolean allSkills;
+    protected SkillType skill;
+    protected int value;
+
     @Override
     public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
         switch (args.length) {
@@ -39,7 +47,12 @@ public abstract class ExperienceCommand implements TabExecutor {
                     return true;
                 }
 
-                editValues((Player) sender, UserManager.getPlayer(sender.getName()).getProfile(), SkillType.getSkill(args[0]), Integer.parseInt(args[1]));
+                player = (Player) sender;
+                mcMMOPlayer = UserManager.getPlayer(player);
+                profile = mcMMOPlayer.getProfile();
+
+                editValues();
+                cleanUp();
                 return true;
 
             case 3:
@@ -52,27 +65,28 @@ public abstract class ExperienceCommand implements TabExecutor {
                     return true;
                 }
 
-                SkillType skill = SkillType.getSkill(args[1]);
-                int value = Integer.parseInt(args[2]);
-
                 String playerName = Misc.getMatchedPlayerName(args[0]);
-                McMMOPlayer mcMMOPlayer = UserManager.getPlayer(playerName, true);
+                mcMMOPlayer = UserManager.getPlayer(playerName, true);
 
                 // If the mcMMOPlayer doesn't exist, create a temporary profile and check if it's present in the database. If it's not, abort the process.
                 if (mcMMOPlayer == null) {
-                    PlayerProfile profile = mcMMO.getDatabaseManager().loadPlayerProfile(playerName, false);
+                    profile = mcMMO.getDatabaseManager().loadPlayerProfile(playerName, false);
 
                     if (CommandUtils.unloadedProfile(sender, profile)) {
                         return true;
                     }
 
-                    editValues(null, profile, skill, value);
+                    editValues();
+                    profile.save(); // Since this is a temporary profile, we save it here.
                 }
                 else {
-                    editValues(mcMMOPlayer.getPlayer(), mcMMOPlayer.getProfile(), skill, value);
+                    profile = mcMMOPlayer.getProfile();
+                    player = mcMMOPlayer.getPlayer();
+                    editValues();
                 }
 
-                handleSenderMessage(sender, playerName, skill);
+                handleSenderMessage(sender, playerName);
+                cleanUp();
                 return true;
 
             default:
@@ -95,20 +109,42 @@ public abstract class ExperienceCommand implements TabExecutor {
 
     protected abstract boolean permissionsCheckSelf(CommandSender sender);
     protected abstract boolean permissionsCheckOthers(CommandSender sender);
-    protected abstract void handleCommand(Player player, PlayerProfile profile, SkillType skill, int value);
-    protected abstract void handlePlayerMessageAll(Player player, int value);
-    protected abstract void handlePlayerMessageSkill(Player player, int value, SkillType skill);
+    protected abstract void handleCommand(SkillType skill);
+    protected abstract void handlePlayerMessageAll();
+    protected abstract void handlePlayerMessageSkill();
 
     private boolean validateArguments(CommandSender sender, String skillName, String value) {
-        if (CommandUtils.isInvalidInteger(sender, value) || CommandUtils.isInvalidSkill(sender, skillName)) {
+        if (isInvalidInteger(sender, value) || isInvalidSkill(sender, skillName)) {
             return false;
         }
 
         return true;
     }
 
-    protected static void handleSenderMessage(CommandSender sender, String playerName, SkillType skill) {
-        if (skill == null) {
+    private boolean isInvalidInteger(CommandSender sender, String value) {
+        if (CommandUtils.isInvalidInteger(sender, value)) {
+            return true;
+        }
+
+        this.value = Integer.parseInt(value);
+        return false;
+    }
+
+    protected boolean isInvalidSkill(CommandSender sender, String skillName) {
+        if (skillName.equalsIgnoreCase("all")) {
+            allSkills = true;
+            return false;
+        }
+        else if (CommandUtils.isInvalidSkill(sender, skillName)) {
+            return true;
+        }
+
+        skill = SkillType.getSkill(skillName);
+        return false;
+    }
+
+    protected void handleSenderMessage(CommandSender sender, String playerName) {
+        if (allSkills) {
             sender.sendMessage(LocaleLoader.getString("Commands.addlevels.AwardAll.2", playerName));
         }
         else {
@@ -116,22 +152,27 @@ public abstract class ExperienceCommand implements TabExecutor {
         }
     }
 
-    protected void editValues(Player player, PlayerProfile profile, SkillType skill, int value) {
-        if (skill == null) {
+    protected void editValues() {
+        if (allSkills) {
             for (SkillType skillType : SkillType.values()) {
-                handleCommand(player, profile, skillType, value);
+                handleCommand(skillType);
             }
 
             if (player != null) {
-                handlePlayerMessageAll(player, value);
+                handlePlayerMessageAll();
             }
         }
         else {
-            handleCommand(player, profile, skill, value);
+            handleCommand(skill);
 
             if (player != null) {
-                handlePlayerMessageSkill(player, value, skill);
+                handlePlayerMessageSkill();
             }
         }
     }
+
+    private void cleanUp() {
+        allSkills = false;
+        player = null;
+    }
 }

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

@@ -1,9 +1,7 @@
 package com.gmail.nossr50.commands.experience;
 
 import org.bukkit.command.CommandSender;
-import org.bukkit.entity.Player;
 
-import com.gmail.nossr50.datatypes.player.PlayerProfile;
 import com.gmail.nossr50.datatypes.skills.SkillType;
 import com.gmail.nossr50.locale.LocaleLoader;
 import com.gmail.nossr50.util.EventUtils;
@@ -21,18 +19,13 @@ public class MmoeditCommand extends ExperienceCommand {
     }
 
     @Override
-    protected void handleCommand(Player player, PlayerProfile profile, SkillType skill, int value) {
+    protected void handleCommand(SkillType skill) {
         int skillLevel = profile.getSkillLevel(skill);
         float xpRemoved = profile.getSkillXpLevelRaw(skill);
 
         profile.modifySkill(skill, value);
 
-        if (player == null) {
-            profile.save();
-            return;
-        }
-
-        if (value == skillLevel) {
+        if (player == null || value == skillLevel) {
             return;
         }
 
@@ -40,12 +33,12 @@ public class MmoeditCommand extends ExperienceCommand {
     }
 
     @Override
-    protected void handlePlayerMessageAll(Player player, int value) {
+    protected void handlePlayerMessageAll() {
         player.sendMessage(LocaleLoader.getString("Commands.mmoedit.AllSkills.1", value));
     }
 
     @Override
-    protected void handlePlayerMessageSkill(Player player, int value, SkillType skill) {
+    protected void handlePlayerMessageSkill() {
         player.sendMessage(LocaleLoader.getString("Commands.mmoedit.Modified.1", skill.getName(), value));
     }
 }

src/main/java/com/gmail/nossr50/commands/experience/SkillresetCommand.java

@@ -1,18 +1,10 @@
 package com.gmail.nossr50.commands.experience;
 
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Set;
-
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandSender;
-import org.bukkit.command.TabExecutor;
 import org.bukkit.entity.Player;
-import org.bukkit.util.StringUtil;
 
 import com.gmail.nossr50.mcMMO;
-import com.gmail.nossr50.datatypes.player.McMMOPlayer;
-import com.gmail.nossr50.datatypes.player.PlayerProfile;
 import com.gmail.nossr50.datatypes.skills.SkillType;
 import com.gmail.nossr50.locale.LocaleLoader;
 import com.gmail.nossr50.util.EventUtils;
@@ -20,11 +12,18 @@ import com.gmail.nossr50.util.Misc;
 import com.gmail.nossr50.util.Permissions;
 import com.gmail.nossr50.util.commands.CommandUtils;
 import com.gmail.nossr50.util.player.UserManager;
-import com.google.common.collect.ImmutableList;
 
-public class SkillresetCommand implements TabExecutor {
+public class SkillresetCommand extends ExperienceCommand {
+    private CommandSender sender;
+    private Command command;
+    private int argsLength;
+
     @Override
     public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
+        this.command = command;
+        this.sender = sender;
+        argsLength = args.length;
+
         switch (args.length) {
             case 1:
                 if (CommandUtils.noConsoleUsage(sender)) {
@@ -36,11 +35,15 @@ public class SkillresetCommand implements TabExecutor {
                     return true;
                 }
 
-                if (CommandUtils.isInvalidSkill(sender, args[0])) {
+                if (isInvalidSkill(sender, args[0])) {
                     return true;
                 }
 
-                editValues((Player) sender, UserManager.getPlayer(sender.getName()).getProfile(), SkillType.getSkill(args[0]), args.length, sender, command);
+                player = (Player) sender;
+                mcMMOPlayer = UserManager.getPlayer(player);
+                profile = mcMMOPlayer.getProfile();
+
+                editValues();
                 return true;
 
             case 2:
@@ -49,30 +52,32 @@ public class SkillresetCommand implements TabExecutor {
                     return true;
                 }
 
-                if (CommandUtils.isInvalidSkill(sender, args[1])) {
+                if (isInvalidSkill(sender, args[1])) {
                     return true;
                 }
 
-                SkillType skill = SkillType.getSkill(args[1]);
-
                 String playerName = Misc.getMatchedPlayerName(args[0]);
-                McMMOPlayer mcMMOPlayer = UserManager.getPlayer(playerName, true);
+                mcMMOPlayer = UserManager.getPlayer(playerName, true);
 
                 // If the mcMMOPlayer doesn't exist, create a temporary profile and check if it's present in the database. If it's not, abort the process.
                 if (mcMMOPlayer == null) {
-                    PlayerProfile profile = mcMMO.getDatabaseManager().loadPlayerProfile(playerName, false);
+                    profile = mcMMO.getDatabaseManager().loadPlayerProfile(playerName, false);
 
                     if (CommandUtils.unloadedProfile(sender, profile)) {
                         return true;
                     }
 
-                    editValues(null, profile, skill, args.length, sender, command);
+                    editValues();
+                    profile.save(); // Since this is a temporary profile, we save it here.
                 }
                 else {
-                    editValues(mcMMOPlayer.getPlayer(), mcMMOPlayer.getProfile(), skill, args.length, sender, command);
+                    profile = mcMMOPlayer.getProfile();
+                    player = mcMMOPlayer.getPlayer();
+
+                    editValues();
                 }
 
-                ExperienceCommand.handleSenderMessage(sender, playerName, skill);
+                handleSenderMessage(sender, playerName);
                 return true;
 
             default:
@@ -81,38 +86,17 @@ public class SkillresetCommand implements TabExecutor {
     }
 
     @Override
-    public List<String> onTabComplete(CommandSender sender, Command command, String alias, String[] args) {
-        switch (args.length) {
-            case 1:
-                Set<String> playerNames = UserManager.getPlayerNames();
-                return StringUtil.copyPartialMatches(args[0], playerNames, new ArrayList<String>(playerNames.size()));
-            case 2:
-                return StringUtil.copyPartialMatches(args[1], SkillType.SKILL_NAMES, new ArrayList<String>(SkillType.SKILL_NAMES.size()));
-            default:
-                return ImmutableList.of();
-        }
+    protected boolean permissionsCheckSelf(CommandSender sender) {
+        return false;
     }
 
-    private void editValues(Player player, PlayerProfile profile, SkillType skill, int argsLength, CommandSender sender, Command command) {
-        if (skill == null) {
-            for (SkillType skillType : SkillType.values()) {
-                handleCommand(player, profile, skillType, argsLength, sender, command);
-            }
-
-            if (player != null) {
-                player.sendMessage(LocaleLoader.getString("Commands.Reset.All"));
-            }
-        }
-        else {
-            handleCommand(player, profile, skill, argsLength, sender, command);
-
-            if (player != null) {
-                player.sendMessage(LocaleLoader.getString("Commands.Reset.Single", skill.getName()));
-            }
-        }
+    @Override
+    protected boolean permissionsCheckOthers(CommandSender sender) {
+        return false;
     }
 
-    private void handleCommand(Player player, PlayerProfile profile, SkillType skill, int argsLength, CommandSender sender, Command command) {
+    @Override
+    protected void handleCommand(SkillType skill) {
         if (argsLength == 1 && !Permissions.skillreset(sender, skill) || (argsLength == 2 && !Permissions.skillresetOthers(sender, skill))) {
             sender.sendMessage(command.getPermissionMessage());
             return;
@@ -124,10 +108,19 @@ public class SkillresetCommand implements TabExecutor {
         profile.modifySkill(skill, 0);
 
         if (player == null) {
-            profile.save();
             return;
         }
 
         EventUtils.handleLevelChangeEvent(player, skill, levelsRemoved, xpRemoved, false);
     }
+
+    @Override
+    protected void handlePlayerMessageAll() {
+        player.sendMessage(LocaleLoader.getString("Commands.Reset.All"));
+    }
+
+    @Override
+    protected void handlePlayerMessageSkill() {
+        player.sendMessage(LocaleLoader.getString("Commands.Reset.Single", skill.getName()));
+    }
 }

src/main/java/com/gmail/nossr50/commands/hardcore/HardcoreCommand.java

@@ -1,7 +1,5 @@
 package com.gmail.nossr50.commands.hardcore;
 
-import org.bukkit.command.CommandSender;
-
 import com.gmail.nossr50.mcMMO;
 import com.gmail.nossr50.config.Config;
 import com.gmail.nossr50.datatypes.skills.SkillType;
@@ -10,18 +8,18 @@ import com.gmail.nossr50.util.Permissions;
 
 public class HardcoreCommand extends HardcoreModeCommand {
     @Override
-    protected boolean checkTogglePermissions(CommandSender sender) {
+    protected boolean checkTogglePermissions() {
         return Permissions.hardcoreToggle(sender);
     }
 
     @Override
-    protected boolean checkModifyPermissions(CommandSender sender) {
+    protected boolean checkModifyPermissions() {
         return Permissions.hardcoreModify(sender);
     }
 
     @Override
-    protected boolean checkEnabled(SkillType skill) {
-        if (skill == null) {
+    protected boolean checkEnabled(String skill) {
+        if (skill.equalsIgnoreCase("ALL")) {
             for (SkillType skillType : SkillType.values()) {
                 if (!skillType.getHardcoreStatLossEnabled()) {
                     return false;
@@ -31,35 +29,35 @@ public class HardcoreCommand extends HardcoreModeCommand {
             return true;
         }
 
-        return skill.getHardcoreStatLossEnabled();
+        return SkillType.getSkill(skill).getHardcoreStatLossEnabled();
     }
 
     @Override
-    protected void enable(SkillType skill) {
-        toggle(true, skill);
+    protected void enable(String skill) {
+        toggle(true);
     }
 
     @Override
-    protected void disable(SkillType skill) {
-        toggle(false, skill);
+    protected void disable(String skill) {
+        toggle(false);
     }
 
     @Override
-    protected void modify(CommandSender sender, double newPercentage) {
-        Config.getInstance().setHardcoreDeathStatPenaltyPercentage(newPercentage);
-        sender.sendMessage(LocaleLoader.getString("Hardcore.DeathStatLoss.PercentageChanged", percent.format(newPercentage / 100.0D)));
+    protected void modify() {
+        Config.getInstance().setHardcoreDeathStatPenaltyPercentage(newPercent);
+        sender.sendMessage(LocaleLoader.getString("Hardcore.DeathStatLoss.PercentageChanged", percent.format(newPercent / 100D)));
     }
 
-    private void toggle(boolean enable, SkillType skill) {
-        if (skill == null) {
+    private void toggle(boolean enable) {
+        if (skill.equalsIgnoreCase("ALL")) {
             for (SkillType skillType : SkillType.NON_CHILD_SKILLS) {
                 skillType.setHardcoreStatLossEnabled(enable);
             }
         }
         else {
-            skill.setHardcoreStatLossEnabled(enable);
+            SkillType.getSkill(skill).setHardcoreStatLossEnabled(enable);
         }
 
-        mcMMO.p.getServer().broadcastMessage(LocaleLoader.getString("Hardcore.Mode." + (enable ? "Enabled" : "Disabled"), LocaleLoader.getString("Hardcore.DeathStatLoss.Name"), (skill == null ? "all skills" : skill.getName())));
+        mcMMO.p.getServer().broadcastMessage(LocaleLoader.getString("Hardcore.Mode." + (enable ? "Enabled" : "Disabled"), LocaleLoader.getString("Hardcore.DeathStatLoss.Name"), skill));
     }
 }

src/main/java/com/gmail/nossr50/commands/hardcore/HardcoreModeCommand.java

@@ -17,22 +17,31 @@ import com.gmail.nossr50.util.commands.CommandUtils;
 import com.google.common.collect.ImmutableList;
 
 public abstract class HardcoreModeCommand implements TabExecutor {
-    protected final DecimalFormat percent = new DecimalFormat("##0.00%");
+    protected CommandSender sender;
+    protected double newPercent;
+    protected DecimalFormat percent;
+    protected String skill;
+
+    public HardcoreModeCommand() {
+        percent = new DecimalFormat("##0.00%");
+    }
 
     @Override
     public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
         switch (args.length) {
             case 0:
-                if (!checkTogglePermissions(sender)) {
+                this.sender = sender;
+
+                if (!checkTogglePermissions()) {
                     sender.sendMessage(command.getPermissionMessage());
                     return true;
                 }
 
-                if (checkEnabled(null)) {
-                    disable(null);
+                if (checkEnabled("ALL")) {
+                    disable("ALL");
                 }
                 else {
-                    enable(null);
+                    enable("ALL");
                 }
 
                 return true;
@@ -44,7 +53,7 @@ public abstract class HardcoreModeCommand implements TabExecutor {
                         return true;
                     }
 
-                    enable(null);
+                    enable("ALL");
                     return true;
                 }
 
@@ -54,11 +63,11 @@ public abstract class HardcoreModeCommand implements TabExecutor {
                         return true;
                     }
 
-                    disable(null);
+                    disable("ALL");
                     return true;
                 }
 
-                if (CommandUtils.isInvalidDouble(sender, args[0])) {
+                if (isInvalidPercentage(sender, args[0])) {
                     return true;
                 }
 
@@ -67,20 +76,16 @@ public abstract class HardcoreModeCommand implements TabExecutor {
                     return true;
                 }
 
-                modify(sender, Double.parseDouble(args[0]));
+                modify();
                 return true;
 
 
             case 2:
-                if (CommandUtils.isInvalidSkill(sender, args[0])) {
+                if (!args[0].equalsIgnoreCase("ALL") && CommandUtils.isChildSkill(sender, SkillType.getSkill(args[0]))) {
                     return true;
                 }
 
-                SkillType skill = SkillType.getSkill(args[0]);
-
-                if (!CommandUtils.isChildSkill(sender, skill)) {
-                    return true;
-                }
+                skill = args[0];
 
                 if (CommandUtils.shouldEnableToggle(args[1])) {
                     if (!Permissions.hardcoreToggle(sender)) {
@@ -98,7 +103,7 @@ public abstract class HardcoreModeCommand implements TabExecutor {
                         return true;
                     }
 
-                    enable(skill);
+                    disable(skill);
                     return true;
                 }
 
@@ -123,10 +128,19 @@ public abstract class HardcoreModeCommand implements TabExecutor {
         }
     }
 
-    protected abstract boolean checkTogglePermissions(CommandSender sender);
-    protected abstract boolean checkModifyPermissions(CommandSender sender);
-    protected abstract boolean checkEnabled(SkillType skill);
-    protected abstract void enable(SkillType skill);
-    protected abstract void disable(SkillType skill);
-    protected abstract void modify(CommandSender sender, double newPercentage);
+    protected abstract boolean checkTogglePermissions();
+    protected abstract boolean checkModifyPermissions();
+    protected abstract boolean checkEnabled(String skill);
+    protected abstract void enable(String skill);
+    protected abstract void disable(String skill);
+    protected abstract void modify();
+
+    private boolean isInvalidPercentage(CommandSender sender, String value) {
+        if (CommandUtils.isInvalidDouble(sender, value)) {
+            return true;
+        }
+
+        newPercent = Double.parseDouble(value);
+        return false;
+    }
 }

src/main/java/com/gmail/nossr50/commands/hardcore/VampirismCommand.java

@@ -1,7 +1,5 @@
 package com.gmail.nossr50.commands.hardcore;
 
-import org.bukkit.command.CommandSender;
-
 import com.gmail.nossr50.mcMMO;
 import com.gmail.nossr50.config.Config;
 import com.gmail.nossr50.datatypes.skills.SkillType;
@@ -10,18 +8,18 @@ import com.gmail.nossr50.util.Permissions;
 
 public class VampirismCommand extends HardcoreModeCommand {
     @Override
-    protected boolean checkTogglePermissions(CommandSender sender) {
+    protected boolean checkTogglePermissions() {
         return Permissions.vampirismToggle(sender);
     }
 
     @Override
-    protected boolean checkModifyPermissions(CommandSender sender) {
+    protected boolean checkModifyPermissions() {
         return Permissions.vampirismModify(sender);
     }
 
     @Override
-    protected boolean checkEnabled(SkillType skill) {
-        if (skill == null) {
+    protected boolean checkEnabled(String skill) {
+        if (skill.equalsIgnoreCase("ALL")) {
             for (SkillType skillType : SkillType.values()) {
                 if (!skillType.getHardcoreVampirismEnabled()) {
                     return false;
@@ -31,35 +29,35 @@ public class VampirismCommand extends HardcoreModeCommand {
             return true;
         }
 
-        return skill.getHardcoreVampirismEnabled();
+        return SkillType.getSkill(skill).getHardcoreVampirismEnabled();
     }
 
     @Override
-    protected void enable(SkillType skill) {
-        toggle(true, skill);
+    protected void enable(String skill) {
+        toggle(true);
     }
 
     @Override
-    protected void disable(SkillType skill) {
-        toggle(false, skill);
+    protected void disable(String skill) {
+        toggle(false);
     }
 
     @Override
-    protected void modify(CommandSender sender, double newPercentage) {
-        Config.getInstance().setHardcoreVampirismStatLeechPercentage(newPercentage);
-        sender.sendMessage(LocaleLoader.getString("Hardcore.Vampirism.PercentageChanged", percent.format(newPercentage / 100.0D)));
+    protected void modify() {
+        Config.getInstance().setHardcoreVampirismStatLeechPercentage(newPercent);
+        sender.sendMessage(LocaleLoader.getString("Hardcore.Vampirism.PercentageChanged", percent.format(newPercent / 100D)));
     }
 
-    private void toggle(boolean enable, SkillType skill) {
-        if (skill == null) {
+    private void toggle(boolean enable) {
+        if (skill.equalsIgnoreCase("ALL")) {
             for (SkillType skillType : SkillType.NON_CHILD_SKILLS) {
                 skillType.setHardcoreVampirismEnabled(enable);
             }
         }
         else {
-            skill.setHardcoreVampirismEnabled(enable);
+            SkillType.getSkill(skill).setHardcoreVampirismEnabled(enable);
         }
 
-        mcMMO.p.getServer().broadcastMessage(LocaleLoader.getString("Hardcore.Mode." + (enable ? "Enabled" : "Disabled"), LocaleLoader.getString("Hardcore.Vampirism.Name"), (skill == null ? "all skills" : skill)));
+        mcMMO.p.getServer().broadcastMessage(LocaleLoader.getString("Hardcore.Mode." + (enable ? "Enabled" : "Disabled"), LocaleLoader.getString("Hardcore.Vampirism.Name"), skill));
     }
 }

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

@@ -10,22 +10,24 @@ import com.gmail.nossr50.locale.LocaleLoader;
 import com.gmail.nossr50.util.player.UserManager;
 
 public class PartyChangePasswordCommand implements CommandExecutor {
+    private Party playerParty;
+
     @Override
     public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
-        Party party = UserManager.getPlayer((Player) sender).getParty();
+        playerParty = UserManager.getPlayer((Player) sender).getParty();
 
         switch (args.length) {
             case 1:
-                unprotectParty(party, sender);
+                unprotectParty(sender);
                 return true;
 
             case 2:
                 if (args[1].equalsIgnoreCase("clear") || args[1].equalsIgnoreCase("reset")) {
-                    unprotectParty(party, sender);
+                    unprotectParty(sender);
                     return true;
                 }
 
-                protectParty(party, sender, args[1]);
+                protectParty(sender, args[1]);
                 return true;
 
             default:
@@ -35,15 +37,15 @@ public class PartyChangePasswordCommand implements CommandExecutor {
         }
     }
 
-    private void unprotectParty(Party party, CommandSender sender) {
-        party.setLocked(true);
-        party.setPassword(null);
+    private void unprotectParty(CommandSender sender) {
+        playerParty.setLocked(true);
+        playerParty.setPassword(null);
         sender.sendMessage(LocaleLoader.getString("Party.Password.Removed"));
     }
 
-    private void protectParty(Party party, CommandSender sender, String password) {
-        party.setLocked(true);
-        party.setPassword(password);
+    private void protectParty(CommandSender sender, String password) {
+        playerParty.setLocked(true);
+        playerParty.setPassword(password);
         sender.sendMessage(LocaleLoader.getString("Party.Password.Set", password));
     }
 }

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

@@ -24,6 +24,9 @@ import com.gmail.nossr50.util.player.UserManager;
 import com.google.common.collect.ImmutableList;
 
 public class PartyCommand implements TabExecutor {
+    private McMMOPlayer mcMMOPlayer;
+    private Player player;
+
     private static final List<String> PARTY_SUBCOMMANDS;
     private static final List<String> EXPSHARE_COMPLETIONS = ImmutableList.of("none", "equal");
     private static final List<String> ITEMSHARE_COMPLETIONS = ImmutableList.of("none", "equal", "random", "loot", "mining", "herbalism", "woodcutting", "misc");
@@ -68,13 +71,13 @@ public class PartyCommand implements TabExecutor {
             return true;
         }
 
-        Player player = (Player) sender;
-        McMMOPlayer mcMMOPlayer = UserManager.getPlayer(player);
+        player = (Player) sender;
+        mcMMOPlayer = UserManager.getPlayer(player);
 
         if (args.length < 1) {
             if (!mcMMOPlayer.inParty()) {
                 sender.sendMessage(LocaleLoader.getString("Commands.Party.None"));
-                return printUsage(player);
+                return printUsage();
             }
 
             return partyInfoCommand.onCommand(sender, command, label, args);
@@ -83,7 +86,7 @@ public class PartyCommand implements TabExecutor {
         PartySubcommandType subcommand = PartySubcommandType.getSubcommand(args[0]);
 
         if (subcommand == null) {
-            return printUsage(player);
+            return printUsage();
         }
 
         // Can't use this for lock/unlock since they're handled by the same command
@@ -108,7 +111,7 @@ public class PartyCommand implements TabExecutor {
         // Party member commands
         if (!mcMMOPlayer.inParty()) {
             sender.sendMessage(LocaleLoader.getString("Commands.Party.None"));
-            return printUsage(player);
+            return printUsage();
         }
 
         switch (subcommand) {
@@ -208,7 +211,7 @@ public class PartyCommand implements TabExecutor {
         }
     }
 
-    private boolean printUsage(Player player) {
+    private boolean printUsage() {
         player.sendMessage(LocaleLoader.getString("Party.Help.0", "/party join"));
         player.sendMessage(LocaleLoader.getString("Party.Help.1", "/party create"));
         player.sendMessage(LocaleLoader.getString("Party.Help.2", "/party ?"));

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

@@ -14,6 +14,8 @@ import com.gmail.nossr50.util.commands.CommandUtils;
 import com.gmail.nossr50.util.player.UserManager;
 
 public class PartyExpShareCommand implements CommandExecutor {
+    private Party playerParty;
+
     @Override
     public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
         if (!Config.getInstance().getExpShareEnabled()) {
@@ -23,13 +25,13 @@ public class PartyExpShareCommand implements CommandExecutor {
 
         switch (args.length) {
             case 2:
-                Party party = UserManager.getPlayer((Player) sender).getParty();
+                playerParty = UserManager.getPlayer((Player) sender).getParty();
 
                 if (args[1].equalsIgnoreCase("none") || CommandUtils.shouldDisableToggle(args[1])) {
-                    handleChangingShareMode(party, ShareMode.NONE);
+                    handleChangingShareMode(ShareMode.NONE);
                 }
                 else if (args[1].equalsIgnoreCase("equal") || args[1].equalsIgnoreCase("even") || CommandUtils.shouldEnableToggle(args[1])) {
-                    handleChangingShareMode(party, ShareMode.EQUAL);
+                    handleChangingShareMode(ShareMode.EQUAL);
                 }
                 else {
                     sender.sendMessage(LocaleLoader.getString("Commands.Usage.2", "party", "expshare", "<NONE | EQUAL>"));
@@ -43,12 +45,12 @@ public class PartyExpShareCommand implements CommandExecutor {
         }
     }
 
-    private void handleChangingShareMode(Party party, ShareMode mode) {
-        party.setXpShareMode(mode);
+    private void handleChangingShareMode(ShareMode mode) {
+        playerParty.setXpShareMode(mode);
 
         String changeModeMessage = LocaleLoader.getString("Commands.Party.SetSharing", LocaleLoader.getString("Party.ShareType.Exp"), LocaleLoader.getString("Party.ShareMode." + StringUtils.getCapitalized(mode.toString())));
 
-        for (Player member : party.getOnlineMembers()) {
+        for (Player member : playerParty.getOnlineMembers()) {
             member.sendMessage(changeModeMessage);
         }
     }

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

@@ -16,33 +16,36 @@ import com.gmail.nossr50.party.PartyManager;
 import com.gmail.nossr50.util.player.UserManager;
 
 public class PartyInfoCommand implements CommandExecutor {
+    private McMMOPlayer mcMMOPlayer;
+    private Player player;
+    private Party playerParty;
+
     @Override
     public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
         switch (args.length) {
             case 0:
             case 1:
-                Player player = (Player) sender;
-                McMMOPlayer mcMMOPlayer = UserManager.getPlayer(player);
-                Party party = mcMMOPlayer.getParty();
+                player = (Player) sender;
+                mcMMOPlayer = UserManager.getPlayer(player);
+                playerParty = mcMMOPlayer.getParty();
 
-                displayPartyHeader(player, party);
-                displayShareModeInfo(party, player);
-                displayMemberInfo(player, mcMMOPlayer, party);
+                displayPartyHeader();
+                displayShareModeInfo();
+                displayMemberInfo();
                 return true;
-
             default:
                 sender.sendMessage(LocaleLoader.getString("Commands.Usage.1", "party", "info"));
                 return true;
         }
     }
 
-    private String createMembersList(Party party) {
+    private String createMembersList() {
         StringBuilder memberList = new StringBuilder();
 
-        for (String memberName : party.getMembers()) {
+        for (String memberName : playerParty.getMembers()) {
             Player member = mcMMO.p.getServer().getPlayerExact(memberName);
 
-            if (party.getLeader().equalsIgnoreCase(memberName)) {
+            if (playerParty.getLeader().equalsIgnoreCase(memberName)) {
                 memberList.append(ChatColor.GOLD);
             }
             else if (member != null) {
@@ -58,10 +61,10 @@ public class PartyInfoCommand implements CommandExecutor {
         return memberList.toString();
     }
 
-    private void displayShareModeInfo(Party party, Player player) {
+    private void displayShareModeInfo() {
         boolean xpShareEnabled = Config.getInstance().getExpShareEnabled();
         boolean itemShareEnabled = Config.getInstance().getItemShareEnabled();
-        boolean itemSharingActive = (party.getItemShareMode() != ShareMode.NONE);
+        boolean itemSharingActive = (playerParty.getItemShareMode() != ShareMode.NONE);
 
         if (!xpShareEnabled && !itemShareEnabled) {
             return;
@@ -72,11 +75,11 @@ public class PartyInfoCommand implements CommandExecutor {
         String separator = "";
 
         if (xpShareEnabled) {
-            expShareInfo = LocaleLoader.getString("Commands.Party.ExpShare", party.getXpShareMode().toString());
+            expShareInfo = LocaleLoader.getString("Commands.Party.ExpShare", playerParty.getXpShareMode().toString());
         }
 
         if (itemShareEnabled) {
-            itemShareInfo = LocaleLoader.getString("Commands.Party.ItemShare", party.getItemShareMode().toString());
+            itemShareInfo = LocaleLoader.getString("Commands.Party.ItemShare", playerParty.getItemShareMode().toString());
         }
 
         if (xpShareEnabled && itemShareEnabled) {
@@ -84,23 +87,28 @@ public class PartyInfoCommand implements CommandExecutor {
         }
 
         player.sendMessage(LocaleLoader.getString("Commands.Party.ShareMode") + expShareInfo + separator + itemShareInfo);
-
         if (itemSharingActive) {
-            player.sendMessage(LocaleLoader.getString("Commands.Party.ItemShareCategories", party.getItemShareCategories()));
+            player.sendMessage(LocaleLoader.getString("Commands.Party.ItemShareCategories", playerParty.getItemShareCategories()));
         }
     }
 
-    private void displayPartyHeader(Player player, Party party) {
+    private void displayPartyHeader() {
         player.sendMessage(LocaleLoader.getString("Commands.Party.Header"));
-        player.sendMessage(LocaleLoader.getString("Commands.Party.Status", party.getName(), LocaleLoader.getString("Party.Status." + (party.isLocked() ? "Locked" : "Unlocked"))));
+
+        if (playerParty.isLocked()) {
+            player.sendMessage(LocaleLoader.getString("Commands.Party.Status", playerParty.getName(), LocaleLoader.getString("Party.Status.Locked")));
+        }
+        else {
+            player.sendMessage(LocaleLoader.getString("Commands.Party.Status", playerParty.getName(), LocaleLoader.getString("Party.Status.Unlocked")));
+        }
     }
 
-    private void displayMemberInfo(Player player, McMMOPlayer mcMMOPlayer, Party party) {
+    private void displayMemberInfo() {
         int membersNear = PartyManager.getNearMembers(mcMMOPlayer).size();
-        int membersOnline = party.getOnlineMembers().size() - 1;
+        int membersOnline = playerParty.getOnlineMembers().size() - 1;
 
         player.sendMessage(LocaleLoader.getString("Commands.Party.Members.Header"));
         player.sendMessage(LocaleLoader.getString("Commands.Party.MembersNear", membersNear, membersOnline));
-        player.sendMessage(createMembersList(party));
+        player.sendMessage(createMembersList());
     }
 }

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

@@ -9,34 +9,23 @@ import com.gmail.nossr50.datatypes.party.Party;
 import com.gmail.nossr50.datatypes.player.McMMOPlayer;
 import com.gmail.nossr50.locale.LocaleLoader;
 import com.gmail.nossr50.party.PartyManager;
-import com.gmail.nossr50.util.Misc;
 import com.gmail.nossr50.util.commands.CommandUtils;
 import com.gmail.nossr50.util.player.UserManager;
 
 public class PartyInviteCommand implements CommandExecutor {
     @Override
     public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
+        if (CommandUtils.noConsoleUsage(sender)) {
+            return false;
+        }
         switch (args.length) {
             case 2:
-                String targetName = Misc.getMatchedPlayerName(args[1]);
-                McMMOPlayer mcMMOTarget = UserManager.getPlayer(targetName, true);
-
-                if (!CommandUtils.checkPlayerExistence(sender, targetName, mcMMOTarget)) {
-                    return false;
-                }
-
-                Player target = mcMMOTarget.getPlayer();
                 Player player = (Player) sender;
                 McMMOPlayer mcMMOPlayer = UserManager.getPlayer(player);
                 String playerName = player.getName();
 
-                if (player.equals(target)) {
-                    sender.sendMessage(LocaleLoader.getString("Party.Invite.Self"));
-                    return true;
-                }
-
-                if (PartyManager.inSameParty(player, target)) {
-                    sender.sendMessage(LocaleLoader.getString("Party.Player.InSameParty", targetName));
+                if (playerName.equalsIgnoreCase(args[1])) {
+                    player.sendMessage(LocaleLoader.getString("Party.Invite.Self"));
                     return true;
                 }
 
@@ -45,6 +34,20 @@ public class PartyInviteCommand implements CommandExecutor {
                     return true;
                 }
 
+                McMMOPlayer mcMMOTarget = UserManager.getPlayer(args[1], true);
+
+                if (mcMMOTarget == null) {
+                    player.sendMessage(LocaleLoader.getString("Commands.Offline"));
+                    return true;
+                }
+
+                Player target = mcMMOTarget.getPlayer();
+
+                if (PartyManager.inSameParty(player, target)) {
+                    sender.sendMessage(LocaleLoader.getString("Party.Player.InSameParty", target.getName()));
+                    return true;
+                }
+
                 Party playerParty = mcMMOPlayer.getParty();
                 mcMMOTarget.setPartyInvite(playerParty);
 

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

@@ -15,6 +15,8 @@ import com.gmail.nossr50.util.commands.CommandUtils;
 import com.gmail.nossr50.util.player.UserManager;
 
 public class PartyItemShareCommand implements CommandExecutor {
+    private Party playerParty;
+
     @Override
     public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
         if (!Config.getInstance().getItemShareEnabled()) {
@@ -22,10 +24,9 @@ public class PartyItemShareCommand implements CommandExecutor {
             return true;
         }
 
-        Party party = UserManager.getPlayer((Player) sender).getParty();
-
         switch (args.length) {
             case 2:
+                playerParty = UserManager.getPlayer((Player) sender).getParty();
                 ShareMode mode = ShareMode.getShareMode(args[1].toUpperCase());
 
                 if (mode == null) {
@@ -33,10 +34,11 @@ public class PartyItemShareCommand implements CommandExecutor {
                     return true;
                 }
 
-                handleChangingShareMode(party, mode);
+                handleChangingShareMode(mode);
                 return true;
 
             case 3:
+                playerParty = UserManager.getPlayer((Player) sender).getParty();
                 boolean toggle = false;
 
                 if (CommandUtils.shouldEnableToggle(args[2])) {
@@ -51,7 +53,7 @@ public class PartyItemShareCommand implements CommandExecutor {
                 }
 
                 try {
-                    handleToggleItemShareCategory(party, ItemShareType.valueOf(args[1].toUpperCase()), toggle);
+                    handleToggleItemShareCategory(ItemShareType.valueOf(args[1].toUpperCase()), toggle);
                 }
                 catch (IllegalArgumentException ex) {
                     sender.sendMessage(LocaleLoader.getString("Commands.Usage.2", "party", "itemshare", "<loot | mining | herbalism | woodcutting | misc> <true | false>"));
@@ -66,22 +68,22 @@ public class PartyItemShareCommand implements CommandExecutor {
         }
     }
 
-    private void handleChangingShareMode(Party party, ShareMode mode) {
-        party.setItemShareMode(mode);
+    private void handleChangingShareMode(ShareMode mode) {
+        playerParty.setItemShareMode(mode);
 
         String changeModeMessage = LocaleLoader.getString("Commands.Party.SetSharing", LocaleLoader.getString("Party.ShareType.Item"), LocaleLoader.getString("Party.ShareMode." + StringUtils.getCapitalized(mode.toString())));
 
-        for (Player member : party.getOnlineMembers()) {
+        for (Player member : playerParty.getOnlineMembers()) {
             member.sendMessage(changeModeMessage);
         }
     }
 
-    private void handleToggleItemShareCategory(Party party, ItemShareType type, boolean toggle) {
-        party.setSharingDrops(type, toggle);
+    private void handleToggleItemShareCategory(ItemShareType type, boolean toggle) {
+        playerParty.setSharingDrops(type, toggle);
 
         String toggleMessage = LocaleLoader.getString("Commands.Party.ToggleShareCategory", StringUtils.getCapitalized(type.toString()), toggle ? "enabled" : "disabled");
 
-        for (Player member : party.getOnlineMembers()) {
+        for (Player member : playerParty.getOnlineMembers()) {
             member.sendMessage(toggleMessage);
         }
     }

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

@@ -9,36 +9,23 @@ import com.gmail.nossr50.datatypes.party.Party;
 import com.gmail.nossr50.datatypes.player.McMMOPlayer;
 import com.gmail.nossr50.locale.LocaleLoader;
 import com.gmail.nossr50.party.PartyManager;
-import com.gmail.nossr50.util.Misc;
-import com.gmail.nossr50.util.commands.CommandUtils;
 import com.gmail.nossr50.util.player.UserManager;
 
 public class PartyJoinCommand implements CommandExecutor {
+    private McMMOPlayer mcMMOPlayer;
+    private Player player;
+    private Party targetParty;
+
     @Override
     public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
         switch (args.length) {
             case 2:
             case 3:
-                String targetName = Misc.getMatchedPlayerName(args[1]);
-                McMMOPlayer mcMMOTarget = UserManager.getPlayer(targetName);
+                player = (Player) sender;
+                mcMMOPlayer = UserManager.getPlayer(player);
 
-                if (!CommandUtils.checkPlayerExistence(sender, targetName, mcMMOTarget)) {
-                    return true;
-                }
-
-                Player target = mcMMOTarget.getPlayer();
-
-                if (!mcMMOTarget.inParty()) {
-                    sender.sendMessage(LocaleLoader.getString("Party.PlayerNotInParty", targetName));
-                    return true;
-                }
-
-                Player player = (Player) sender;
-                McMMOPlayer mcMMOPlayer = UserManager.getPlayer(player);
-                Party targetParty = mcMMOTarget.getParty();
-
-                if (player.equals(target) || (mcMMOPlayer.inParty() && mcMMOPlayer.getParty().equals(targetParty))) {
-                    sender.sendMessage(LocaleLoader.getString("Party.Join.Self"));
+                // Verify target exists and is in a different party than the player
+                if (!canJoinParty(sender, args[1])) {
                     return true;
                 }
 
@@ -73,4 +60,27 @@ public class PartyJoinCommand implements CommandExecutor {
 
         return null;
     }
+
+    private boolean canJoinParty(CommandSender sender, String targetName) {
+        // Short-circuit for joining your own party
+        if (sender.getName().equalsIgnoreCase(targetName)) {
+            sender.sendMessage(LocaleLoader.getString("Party.Join.Self"));
+            return false;
+        }
+
+        targetParty = PartyManager.getPlayerParty(targetName);
+
+        if (targetParty == null) {
+            sender.sendMessage(LocaleLoader.getString("Party.PlayerNotInParty", targetName));
+            return false;
+        }
+
+        // Can't join your own party
+        if (mcMMOPlayer.inParty() && mcMMOPlayer.getParty().equals(targetParty)) {
+            sender.sendMessage(LocaleLoader.getString("Party.Join.Self"));
+            return false;
+        }
+
+        return true;
+    }
 }

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

@@ -12,15 +12,19 @@ import com.gmail.nossr50.util.commands.CommandUtils;
 import com.gmail.nossr50.util.player.UserManager;
 
 public class PartyLockCommand implements CommandExecutor {
+    private Party playerParty;
+
     @Override
     public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
+        playerParty = UserManager.getPlayer((Player) sender).getParty();
+
         switch (args.length) {
             case 1:
                 if (args[0].equalsIgnoreCase("lock")) {
-                    togglePartyLock(sender, true);
+                    lockParty(sender, command.getPermissionMessage());
                 }
                 else if (args[0].equalsIgnoreCase("unlock")) {
-                    togglePartyLock(sender, false);
+                    unlockParty(sender, command.getPermissionMessage());
                 }
 
                 return true;
@@ -32,10 +36,10 @@ public class PartyLockCommand implements CommandExecutor {
                 }
 
                 if (CommandUtils.shouldEnableToggle(args[1])) {
-                    togglePartyLock(sender, true);
+                    lockParty(sender, command.getPermissionMessage());
                 }
                 else if (CommandUtils.shouldDisableToggle(args[1])) {
-                    togglePartyLock(sender, false);
+                    unlockParty(sender, command.getPermissionMessage());
                 }
                 else {
                     sendUsageStrings(sender);
@@ -49,25 +53,44 @@ public class PartyLockCommand implements CommandExecutor {
         }
     }
 
+    /**
+     * Handle locking a party.
+     */
+    private void lockParty(CommandSender sender, String permissionMessage) {
+        if (!Permissions.partySubcommand(sender, PartySubcommandType.LOCK)) {
+            sender.sendMessage(permissionMessage);
+            return;
+        }
+
+        if (playerParty.isLocked()) {
+            sender.sendMessage(LocaleLoader.getString("Party.IsLocked"));
+            return;
+        }
+
+        playerParty.setLocked(true);
+        sender.sendMessage(LocaleLoader.getString("Party.Locked"));
+    }
+
+    /**
+     * Handle unlocking a party.
+     */
+    private void unlockParty(CommandSender sender, String permissionMessage) {
+        if (!Permissions.partySubcommand(sender, PartySubcommandType.UNLOCK)) {
+            sender.sendMessage(permissionMessage);
+            return;
+        }
+
+        if (!playerParty.isLocked()) {
+            sender.sendMessage(LocaleLoader.getString("Party.IsntLocked"));
+            return;
+        }
+
+        playerParty.setLocked(false);
+        sender.sendMessage(LocaleLoader.getString("Party.Unlocked"));
+    }
+
     private void sendUsageStrings(CommandSender sender) {
         sender.sendMessage(LocaleLoader.getString("Commands.Usage.2", "party", "lock", "[on|off]"));
         sender.sendMessage(LocaleLoader.getString("Commands.Usage.1", "party", "unlock"));
     }
-
-    private void togglePartyLock(CommandSender sender, boolean lock) {
-        Party party = UserManager.getPlayer((Player) sender).getParty();
-
-        if (!Permissions.partySubcommand(sender, lock ? PartySubcommandType.LOCK : PartySubcommandType.UNLOCK)) {
-            sender.sendMessage(LocaleLoader.getString("mcMMO.NoPermission"));
-            return;
-        }
-
-        if (lock ? party.isLocked() : !party.isLocked()) {
-            sender.sendMessage(LocaleLoader.getString("Party." + (lock ? "IsLocked" : "IsntLocked")));
-            return;
-        }
-
-        party.setLocked(lock);
-        sender.sendMessage(LocaleLoader.getString("Party." + (lock ? "Locked" : "Unlocked")));
-    }
 }

src/main/java/com/gmail/nossr50/commands/party/teleport/PtpAcceptAnyCommand.java

@@ -3,8 +3,9 @@ package com.gmail.nossr50.commands.party.teleport;
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandExecutor;
 import org.bukkit.command.CommandSender;
+import org.bukkit.entity.Player;
 
-import com.gmail.nossr50.datatypes.party.PartyTeleportRecord;
+import com.gmail.nossr50.datatypes.player.McMMOPlayer;
 import com.gmail.nossr50.locale.LocaleLoader;
 import com.gmail.nossr50.util.Permissions;
 import com.gmail.nossr50.util.player.UserManager;
@@ -17,16 +18,17 @@ public class PtpAcceptAnyCommand implements CommandExecutor {
             return true;
         }
 
-        PartyTeleportRecord ptpRecord = UserManager.getPlayer(sender.getName()).getPartyTeleportRecord();
+        Player player = (Player) sender;
+        McMMOPlayer mcMMOPlayer = UserManager.getPlayer(player);
 
-        if (ptpRecord.isConfirmRequired()) {
-            sender.sendMessage(LocaleLoader.getString("Commands.ptp.AcceptAny.Disabled"));
+        if (mcMMOPlayer.getPtpConfirmRequired()) {
+            player.sendMessage(LocaleLoader.getString("Commands.ptp.AcceptAny.Disabled"));
         }
         else {
-            sender.sendMessage(LocaleLoader.getString("Commands.ptp.AcceptAny.Enabled"));
+            player.sendMessage(LocaleLoader.getString("Commands.ptp.AcceptAny.Enabled"));
         }
 
-        ptpRecord.toggleConfirmRequired();
+        mcMMOPlayer.togglePtpConfirmRequired();
         return true;
     }
 }

src/main/java/com/gmail/nossr50/commands/party/teleport/PtpAcceptCommand.java

@@ -7,7 +7,7 @@ import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 
 import com.gmail.nossr50.config.Config;
-import com.gmail.nossr50.datatypes.party.PartyTeleportRecord;
+import com.gmail.nossr50.datatypes.player.McMMOPlayer;
 import com.gmail.nossr50.locale.LocaleLoader;
 import com.gmail.nossr50.util.Misc;
 import com.gmail.nossr50.util.Permissions;
@@ -22,23 +22,23 @@ public class PtpAcceptCommand implements CommandExecutor {
         }
 
         Player player = (Player) sender;
-        PartyTeleportRecord ptpRecord = UserManager.getPlayer(player).getPartyTeleportRecord();
+        McMMOPlayer mcMMOPlayer = UserManager.getPlayer(player);
 
-        if (!ptpRecord.hasRequest()) {
+        if (!mcMMOPlayer.hasPtpRequest()) {
             player.sendMessage(LocaleLoader.getString("Commands.ptp.NoRequests"));
             return true;
         }
 
-        if ((ptpRecord.getTimeout() + Config.getInstance().getPTPCommandTimeout()) * Misc.TIME_CONVERSION_FACTOR < System.currentTimeMillis()) {
-            ptpRecord.removeRequest();
+        if ((mcMMOPlayer.getPtpTimeout() + Config.getInstance().getPTPCommandTimeout()) * Misc.TIME_CONVERSION_FACTOR < System.currentTimeMillis()) {
+            mcMMOPlayer.removePtpRequest();
             player.sendMessage(LocaleLoader.getString("Commands.ptp.RequestExpired"));
             return true;
         }
 
-        Player target = ptpRecord.getRequestor();
-        ptpRecord.removeRequest();
+        Player target = mcMMOPlayer.getPtpRequest();
+        mcMMOPlayer.removePtpRequest();
 
-        if (!PtpCommand.canTeleport(sender, player, target.getName())) {
+        if (!PtpCommand.canTeleport(player, target.getName())) {
             return true;
         }
 

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

@@ -13,7 +13,6 @@ import org.bukkit.util.StringUtil;
 
 import com.gmail.nossr50.mcMMO;
 import com.gmail.nossr50.config.Config;
-import com.gmail.nossr50.datatypes.party.PartyTeleportRecord;
 import com.gmail.nossr50.datatypes.player.McMMOPlayer;
 import com.gmail.nossr50.locale.LocaleLoader;
 import com.gmail.nossr50.party.PartyManager;
@@ -28,6 +27,9 @@ import com.gmail.nossr50.util.skills.SkillUtils;
 import com.google.common.collect.ImmutableList;
 
 public class PtpCommand implements TabExecutor {
+    private static Player target;
+    private static McMMOPlayer mcMMOTarget;
+
     public static final List<String> TELEPORT_SUBCOMMANDS = ImmutableList.of("toggle", "accept", "acceptany", "acceptall");
 
     private CommandExecutor ptpToggleCommand = new PtpToggleCommand();
@@ -75,7 +77,7 @@ public class PtpCommand implements TabExecutor {
                 }
 
                 int ptpCooldown = Config.getInstance().getPTPCommandCooldown();
-                long ptpLastUse = mcMMOPlayer.getPartyTeleportRecord().getLastUse();
+                long ptpLastUse = mcMMOPlayer.getPtpLastUse();
 
                 if (ptpCooldown > 0) {
                     int timeRemaining = SkillUtils.calculateTimeLeft(ptpLastUse * Misc.TIME_CONVERSION_FACTOR, ptpCooldown, player);
@@ -86,7 +88,7 @@ public class PtpCommand implements TabExecutor {
                     }
                 }
 
-                sendTeleportRequest(sender, player, Misc.getMatchedPlayerName(args[0]));
+                sendTeleportRequest(player, Misc.getMatchedPlayerName(args[0]));
                 return true;
 
             default:
@@ -111,23 +113,18 @@ public class PtpCommand implements TabExecutor {
         }
     }
 
-    private void sendTeleportRequest(CommandSender sender, Player player, String targetName) {
-        if (!canTeleport(sender, player, targetName)) {
+    private void sendTeleportRequest(Player player, String targetName) {
+        if (!canTeleport(player, targetName)) {
             return;
         }
 
-        McMMOPlayer mcMMOTarget = UserManager.getPlayer(targetName);
-        Player target = mcMMOTarget.getPlayer();
-
-        PartyTeleportRecord ptpRecord = mcMMOTarget.getPartyTeleportRecord();
-
-        if (!ptpRecord.isConfirmRequired()) {
+        if (!mcMMOTarget.getPtpConfirmRequired()) {
             handleTeleportWarmup(player, target);
             return;
         }
 
-        ptpRecord.setRequestor(player);
-        ptpRecord.actualizeTimeout();
+        mcMMOTarget.setPtpRequest(player);
+        mcMMOTarget.actualizePtpTimeout();
 
         player.sendMessage(LocaleLoader.getString("Commands.Invite.Success"));
 
@@ -135,26 +132,27 @@ public class PtpCommand implements TabExecutor {
         target.sendMessage(LocaleLoader.getString("Commands.ptp.Request2", Config.getInstance().getPTPCommandTimeout()));
     }
 
-    protected static boolean canTeleport(CommandSender sender, Player player, String targetName) {
-        McMMOPlayer mcMMOTarget = UserManager.getPlayer(targetName);
+    protected static boolean canTeleport(Player player, String targetName) {
+        target = mcMMO.p.getServer().getPlayerExact(targetName);
 
-        if (!CommandUtils.checkPlayerExistence(sender, targetName, mcMMOTarget)) {
+        if (target == null) {
+            player.sendMessage(LocaleLoader.getString("Commands.Offline"));
             return false;
         }
 
-        Player target = mcMMOTarget.getPlayer();
-
         if (player.equals(target)) {
             player.sendMessage(LocaleLoader.getString("Party.Teleport.Self"));
             return false;
         }
 
+        mcMMOTarget = UserManager.getPlayer(target);
+
         if (!PartyManager.inSameParty(player, target)) {
             player.sendMessage(LocaleLoader.getString("Party.NotInYourParty", targetName));
             return false;
         }
 
-        if (!mcMMOTarget.getPartyTeleportRecord().isEnabled()) {
+        if (!mcMMOTarget.getPtpEnabled()) {
             player.sendMessage(LocaleLoader.getString("Party.Teleport.Disabled", targetName));
             return false;
         }
@@ -169,7 +167,7 @@ public class PtpCommand implements TabExecutor {
 
     protected static void handleTeleportWarmup(Player teleportingPlayer, Player targetPlayer) {
         McMMOPlayer mcMMOPlayer = UserManager.getPlayer(teleportingPlayer);
-        McMMOPlayer mcMMOTarget = UserManager.getPlayer(targetPlayer);
+        mcMMOTarget = UserManager.getPlayer(targetPlayer);
 
         long warmup = Config.getInstance().getPTPCommandWarmup();
 

src/main/java/com/gmail/nossr50/commands/party/teleport/PtpToggleCommand.java

@@ -3,8 +3,9 @@ package com.gmail.nossr50.commands.party.teleport;
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandExecutor;
 import org.bukkit.command.CommandSender;
+import org.bukkit.entity.Player;
 
-import com.gmail.nossr50.datatypes.party.PartyTeleportRecord;
+import com.gmail.nossr50.datatypes.player.McMMOPlayer;
 import com.gmail.nossr50.locale.LocaleLoader;
 import com.gmail.nossr50.util.Permissions;
 import com.gmail.nossr50.util.player.UserManager;
@@ -17,16 +18,17 @@ public class PtpToggleCommand implements CommandExecutor {
             return true;
         }
 
-        PartyTeleportRecord ptpRecord = UserManager.getPlayer(sender.getName()).getPartyTeleportRecord();
+        Player player = (Player) sender;
+        McMMOPlayer mcMMOPlayer = UserManager.getPlayer(player);
 
-        if (ptpRecord.isEnabled()) {
-            sender.sendMessage(LocaleLoader.getString("Commands.ptp.Disabled"));
+        if (mcMMOPlayer.getPtpEnabled()) {
+            player.sendMessage(LocaleLoader.getString("Commands.ptp.Disabled"));
         }
         else {
-            sender.sendMessage(LocaleLoader.getString("Commands.ptp.Enabled"));
+            player.sendMessage(LocaleLoader.getString("Commands.ptp.Enabled"));
         }
 
-        ptpRecord.toggleEnabled();
+        mcMMOPlayer.togglePtpUse();
         return true;
     }
 }

src/main/java/com/gmail/nossr50/commands/player/MccooldownCommand.java

@@ -14,7 +14,6 @@ import com.gmail.nossr50.locale.LocaleLoader;
 import com.gmail.nossr50.util.commands.CommandUtils;
 import com.gmail.nossr50.util.player.UserManager;
 import com.gmail.nossr50.util.scoreboards.ScoreboardManager;
-
 import com.google.common.collect.ImmutableList;
 
 public class MccooldownCommand implements TabExecutor {

src/main/java/com/gmail/nossr50/commands/player/McrankCommand.java

@@ -19,7 +19,6 @@ import com.gmail.nossr50.util.Misc;
 import com.gmail.nossr50.util.Permissions;
 import com.gmail.nossr50.util.commands.CommandUtils;
 import com.gmail.nossr50.util.player.UserManager;
-
 import com.google.common.collect.ImmutableList;
 
 public class McrankCommand implements TabExecutor {

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

@@ -20,7 +20,6 @@ import com.gmail.nossr50.util.Permissions;
 import com.gmail.nossr50.util.StringUtils;
 import com.gmail.nossr50.util.commands.CommandUtils;
 import com.gmail.nossr50.util.player.UserManager;
-
 import com.google.common.collect.ImmutableList;
 
 public class MctopCommand implements TabExecutor {

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

@@ -1,10 +1,5 @@
 package com.gmail.nossr50.commands.skills;
 
-import java.util.ArrayList;
-import java.util.List;
-
-import org.bukkit.entity.Player;
-
 import com.gmail.nossr50.datatypes.skills.SkillType;
 import com.gmail.nossr50.locale.LocaleLoader;
 import com.gmail.nossr50.skills.acrobatics.Acrobatics;
@@ -27,71 +22,75 @@ public class AcrobaticsCommand extends SkillCommand {
     }
 
     @Override
-    protected void dataCalculations(Player player, float skillValue, boolean isLucky) {
+    protected void dataCalculations() {
         // DODGE
         if (canDodge) {
-            String[] dodgeStrings = calculateAbilityDisplayValues(skillValue, Acrobatics.dodgeMaxBonusLevel, Acrobatics.dodgeMaxChance, isLucky);
+            String[] dodgeStrings = calculateAbilityDisplayValues(Acrobatics.dodgeMaxBonusLevel, Acrobatics.dodgeMaxChance);
             dodgeChance = dodgeStrings[0];
             dodgeChanceLucky = dodgeStrings[1];
         }
 
         // ROLL
         if (canRoll) {
-            String[] rollStrings = calculateAbilityDisplayValues(skillValue, Acrobatics.rollMaxBonusLevel, Acrobatics.rollMaxChance, isLucky);
+            String[] rollStrings = calculateAbilityDisplayValues(Acrobatics.rollMaxBonusLevel, Acrobatics.rollMaxChance);
             rollChance = rollStrings[0];
             rollChanceLucky = rollStrings[1];
         }
 
         // GRACEFUL ROLL
         if (canGracefulRoll) {
-            String[] gracefulRollStrings = calculateAbilityDisplayValues(skillValue, Acrobatics.gracefulRollMaxBonusLevel, Acrobatics.gracefulRollMaxChance, isLucky);
+            String[] gracefulRollStrings = calculateAbilityDisplayValues(Acrobatics.gracefulRollMaxBonusLevel, Acrobatics.gracefulRollMaxChance);
             gracefulRollChance = gracefulRollStrings[0];
             gracefulRollChanceLucky = gracefulRollStrings[1];
         }
     }
 
     @Override
-    protected void permissionsCheck(Player player) {
+    protected void permissionsCheck() {
         canDodge = Permissions.dodge(player);
         canRoll = Permissions.roll(player);
         canGracefulRoll = Permissions.gracefulRoll(player);
     }
 
     @Override
-    protected List<String> effectsDisplay() {
-        List<String> messages = new ArrayList<String>();
-
-        if (canRoll) {
-            messages.add(LocaleLoader.getString("Effects.Template", LocaleLoader.getString("Acrobatics.Effect.0"), LocaleLoader.getString("Acrobatics.Effect.1")));
-        }
-
-        if (canGracefulRoll) {
-            messages.add(LocaleLoader.getString("Effects.Template", LocaleLoader.getString("Acrobatics.Effect.2"), LocaleLoader.getString("Acrobatics.Effect.3")));
-        }
-
-        if (canDodge) {
-            messages.add(LocaleLoader.getString("Effects.Template", LocaleLoader.getString("Acrobatics.Effect.4"), LocaleLoader.getString("Acrobatics.Effect.5")));
-        }
-
-        return messages;
+    protected boolean effectsHeaderPermissions() {
+        return canDodge || canGracefulRoll || canRoll;
     }
 
     @Override
-    protected List<String> statsDisplay(Player player, float skillValue, boolean hasEndurance, boolean isLucky) {
-        List<String> messages = new ArrayList<String>();
+    protected void effectsDisplay() {
+        luckyEffectsDisplay();
 
         if (canRoll) {
-            messages.add(LocaleLoader.getString("Acrobatics.Roll.Chance", rollChance) + (isLucky ? LocaleLoader.getString("Perks.Lucky.Bonus", rollChanceLucky) : ""));
+            player.sendMessage(LocaleLoader.getString("Effects.Template", LocaleLoader.getString("Acrobatics.Effect.0"), LocaleLoader.getString("Acrobatics.Effect.1")));
         }
 
         if (canGracefulRoll) {
-            messages.add(LocaleLoader.getString("Acrobatics.Roll.GraceChance", gracefulRollChance) + (isLucky ? LocaleLoader.getString("Perks.Lucky.Bonus", gracefulRollChanceLucky) : ""));
+            player.sendMessage(LocaleLoader.getString("Effects.Template", LocaleLoader.getString("Acrobatics.Effect.2"), LocaleLoader.getString("Acrobatics.Effect.3")));
         }
 
         if (canDodge) {
-            messages.add(LocaleLoader.getString("Acrobatics.DodgeChance", dodgeChance) + (isLucky ? LocaleLoader.getString("Perks.Lucky.Bonus", dodgeChanceLucky) : ""));
+            player.sendMessage(LocaleLoader.getString("Effects.Template", LocaleLoader.getString("Acrobatics.Effect.4"), LocaleLoader.getString("Acrobatics.Effect.5")));
+        }
+    }
+
+    @Override
+    protected boolean statsHeaderPermissions() {
+        return canDodge || canGracefulRoll || canRoll;
+    }
+
+    @Override
+    protected void statsDisplay() {
+        if (canRoll) {
+            player.sendMessage(LocaleLoader.getString("Acrobatics.Roll.Chance", rollChance) + (isLucky ? LocaleLoader.getString("Perks.Lucky.Bonus", rollChanceLucky) : ""));
         }
 
-        return messages;
+        if (canGracefulRoll) {
+            player.sendMessage(LocaleLoader.getString("Acrobatics.Roll.GraceChance", gracefulRollChance) + (isLucky ? LocaleLoader.getString("Perks.Lucky.Bonus", gracefulRollChanceLucky) : ""));
+        }
+
+        if (canDodge) {
+            player.sendMessage(LocaleLoader.getString("Acrobatics.DodgeChance", dodgeChance) + (isLucky ? LocaleLoader.getString("Perks.Lucky.Bonus", dodgeChanceLucky) : ""));
+        }
     }
 }

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

@@ -1,10 +1,5 @@
 package com.gmail.nossr50.commands.skills;
 
-import java.util.ArrayList;
-import java.util.List;
-
-import org.bukkit.entity.Player;
-
 import com.gmail.nossr50.datatypes.skills.SkillType;
 import com.gmail.nossr50.locale.LocaleLoader;
 import com.gmail.nossr50.skills.archery.Archery;
@@ -26,7 +21,7 @@ public class ArcheryCommand extends SkillCommand {
     }
 
     @Override
-    protected void dataCalculations(Player player, float skillValue, boolean isLucky) {
+    protected void dataCalculations() {
         // SKILL SHOT
         if (canSkillShot) {
             double bonus = (skillValue / Archery.skillShotIncreaseLevel) * Archery.skillShotIncreasePercentage;
@@ -35,61 +30,65 @@ public class ArcheryCommand extends SkillCommand {
 
         // DAZE
         if (canDaze) {
-            String[] dazeStrings = calculateAbilityDisplayValues(skillValue, Archery.dazeMaxBonusLevel, Archery.dazeMaxBonus, isLucky);
+            String[] dazeStrings = calculateAbilityDisplayValues(Archery.dazeMaxBonusLevel, Archery.dazeMaxBonus);
             dazeChance = dazeStrings[0];
             dazeChanceLucky = dazeStrings[1];
         }
 
         // RETRIEVE
         if (canRetrieve) {
-            String[] retrieveStrings = calculateAbilityDisplayValues(skillValue, Archery.retrieveMaxBonusLevel, Archery.retrieveMaxChance, isLucky);
+            String[] retrieveStrings = calculateAbilityDisplayValues(Archery.retrieveMaxBonusLevel, Archery.retrieveMaxChance);
             retrieveChance = retrieveStrings[0];
             retrieveChanceLucky = retrieveStrings[1];
         }
     }
 
     @Override
-    protected void permissionsCheck(Player player) {
+    protected void permissionsCheck() {
         canSkillShot = Permissions.bonusDamage(player, skill);
         canDaze = Permissions.daze(player);
         canRetrieve = Permissions.arrowRetrieval(player);
     }
 
     @Override
-    protected List<String> effectsDisplay() {
-        List<String> messages = new ArrayList<String>();
-
-        if (canSkillShot) {
-            messages.add(LocaleLoader.getString("Effects.Template", LocaleLoader.getString("Archery.Effect.0"), LocaleLoader.getString("Archery.Effect.1")));
-        }
-
-        if (canDaze) {
-            messages.add(LocaleLoader.getString("Effects.Template", LocaleLoader.getString("Archery.Effect.2"), LocaleLoader.getString("Archery.Effect.3", Archery.dazeModifier)));
-        }
-
-        if (canRetrieve) {
-            messages.add(LocaleLoader.getString("Effects.Template", LocaleLoader.getString("Archery.Effect.4"), LocaleLoader.getString("Archery.Effect.5")));
-        }
-
-        return messages;
+    protected boolean effectsHeaderPermissions() {
+        return canSkillShot || canDaze || canRetrieve;
     }
 
     @Override
-    protected List<String> statsDisplay(Player player, float skillValue, boolean hasEndurance, boolean isLucky) {
-        List<String> messages = new ArrayList<String>();
+    protected void effectsDisplay() {
+        luckyEffectsDisplay();
 
         if (canSkillShot) {
-            messages.add(LocaleLoader.getString("Archery.Combat.SkillshotBonus", skillShotBonus));
+            player.sendMessage(LocaleLoader.getString("Effects.Template", LocaleLoader.getString("Archery.Effect.0"), LocaleLoader.getString("Archery.Effect.1")));
         }
 
         if (canDaze) {
-            messages.add(LocaleLoader.getString("Archery.Combat.DazeChance", dazeChance) + (isLucky ? LocaleLoader.getString("Perks.Lucky.Bonus", dazeChanceLucky) : ""));
+            player.sendMessage(LocaleLoader.getString("Effects.Template", LocaleLoader.getString("Archery.Effect.2"), LocaleLoader.getString("Archery.Effect.3", Archery.dazeModifier)));
         }
 
         if (canRetrieve) {
-            messages.add(LocaleLoader.getString("Archery.Combat.RetrieveChance", retrieveChance) + (isLucky ? LocaleLoader.getString("Perks.Lucky.Bonus", retrieveChanceLucky) : ""));
+            player.sendMessage(LocaleLoader.getString("Effects.Template", LocaleLoader.getString("Archery.Effect.4"), LocaleLoader.getString("Archery.Effect.5")));
+        }
+    }
+
+    @Override
+    protected boolean statsHeaderPermissions() {
+        return canSkillShot || canDaze || canRetrieve;
+    }
+
+    @Override
+    protected void statsDisplay() {
+        if (canSkillShot) {
+            player.sendMessage(LocaleLoader.getString("Archery.Combat.SkillshotBonus", skillShotBonus));
         }
 
-        return messages;
+        if (canDaze) {
+            player.sendMessage(LocaleLoader.getString("Archery.Combat.DazeChance", dazeChance) + (isLucky ? LocaleLoader.getString("Perks.Lucky.Bonus", dazeChanceLucky) : ""));
+        }
+
+        if (canRetrieve) {
+            player.sendMessage(LocaleLoader.getString("Archery.Combat.RetrieveChance", retrieveChance) + (isLucky ? LocaleLoader.getString("Perks.Lucky.Bonus", retrieveChanceLucky) : ""));
+        }
     }
 }

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

@@ -1,10 +1,5 @@
 package com.gmail.nossr50.commands.skills;
 
-import java.util.ArrayList;
-import java.util.List;
-
-import org.bukkit.entity.Player;
-
 import com.gmail.nossr50.datatypes.skills.SkillType;
 import com.gmail.nossr50.locale.LocaleLoader;
 import com.gmail.nossr50.skills.axes.Axes;
@@ -29,7 +24,7 @@ public class AxesCommand extends SkillCommand {
     }
 
     @Override
-    protected void dataCalculations(Player player, float skillValue, boolean isLucky) {
+    protected void dataCalculations() {
         // IMPACT
         if (canImpact) {
             impactDamage = 1 + (skillValue / Axes.impactIncreaseLevel);
@@ -37,14 +32,14 @@ public class AxesCommand extends SkillCommand {
 
         // SKULL SPLITTER
         if (canSkullSplitter) {
-            String[] skullSplitterStrings = calculateLengthDisplayValues(player, skillValue);
+            String[] skullSplitterStrings = calculateLengthDisplayValues();
             skullSplitterLength = skullSplitterStrings[0];
             skullSplitterLengthEndurance = skullSplitterStrings[1];
         }
 
         // CRITICAL STRIKES
         if (canCritical) {
-            String[] criticalStrikeStrings = calculateAbilityDisplayValues(skillValue, Axes.criticalHitMaxBonusLevel, Axes.criticalHitMaxChance, isLucky);
+            String[] criticalStrikeStrings = calculateAbilityDisplayValues(Axes.criticalHitMaxBonusLevel, Axes.criticalHitMaxChance);
             critChance = criticalStrikeStrings[0];
             critChanceLucky = criticalStrikeStrings[1];
         }
@@ -56,7 +51,7 @@ public class AxesCommand extends SkillCommand {
     }
 
     @Override
-    protected void permissionsCheck(Player player) {
+    protected void permissionsCheck() {
         canSkullSplitter = Permissions.skullSplitter(player);
         canCritical = Permissions.criticalStrikes(player);
         canBonusDamage = Permissions.bonusDamage(player, skill);
@@ -65,56 +60,60 @@ public class AxesCommand extends SkillCommand {
     }
 
     @Override
-    protected List<String> effectsDisplay() {
-        List<String> messages = new ArrayList<String>();
-
-        if (canSkullSplitter) {
-            messages.add(LocaleLoader.getString("Effects.Template", LocaleLoader.getString("Axes.Effect.0"), LocaleLoader.getString("Axes.Effect.1")));
-        }
-
-        if (canCritical) {
-            messages.add(LocaleLoader.getString("Effects.Template", LocaleLoader.getString("Axes.Effect.2"), LocaleLoader.getString("Axes.Effect.3")));
-        }
-
-        if (canBonusDamage) {
-            messages.add(LocaleLoader.getString("Effects.Template", LocaleLoader.getString("Axes.Effect.4"), LocaleLoader.getString("Axes.Effect.5")));
-        }
-
-        if (canImpact) {
-            messages.add(LocaleLoader.getString("Effects.Template", LocaleLoader.getString("Axes.Effect.6"), LocaleLoader.getString("Axes.Effect.7")));
-        }
-
-        if (canGreaterImpact) {
-            messages.add(LocaleLoader.getString("Effects.Template", LocaleLoader.getString("Axes.Effect.8"), LocaleLoader.getString("Axes.Effect.9")));
-        }
-
-        return messages;
+    protected boolean effectsHeaderPermissions() {
+        return canSkullSplitter || canCritical || canBonusDamage || canImpact || canGreaterImpact;
     }
 
     @Override
-    protected List<String> statsDisplay(Player player, float skillValue, boolean hasEndurance, boolean isLucky) {
-        List<String> messages = new ArrayList<String>();
+    protected void effectsDisplay() {
+        luckyEffectsDisplay();
 
-        if (canBonusDamage) {
-            messages.add(LocaleLoader.getString("Ability.Generic.Template", LocaleLoader.getString("Axes.Ability.Bonus.0"), LocaleLoader.getString("Axes.Ability.Bonus.1", bonusDamage)));
-        }
-
-        if (canImpact) {
-            messages.add(LocaleLoader.getString("Ability.Generic.Template", LocaleLoader.getString("Axes.Ability.Bonus.2"), LocaleLoader.getString("Axes.Ability.Bonus.3", impactDamage)));
-        }
-
-        if (canGreaterImpact) {
-            messages.add(LocaleLoader.getString("Ability.Generic.Template", LocaleLoader.getString("Axes.Ability.Bonus.4"), LocaleLoader.getString("Axes.Ability.Bonus.5", Axes.greaterImpactBonusDamage)));
+        if (canSkullSplitter) {
+            player.sendMessage(LocaleLoader.getString("Effects.Template", LocaleLoader.getString("Axes.Effect.0"), LocaleLoader.getString("Axes.Effect.1")));
         }
 
         if (canCritical) {
-            messages.add(LocaleLoader.getString("Axes.Combat.CritChance", critChance) + (isLucky ? LocaleLoader.getString("Perks.Lucky.Bonus", critChanceLucky) : ""));
+            player.sendMessage(LocaleLoader.getString("Effects.Template", LocaleLoader.getString("Axes.Effect.2"), LocaleLoader.getString("Axes.Effect.3")));
+        }
+
+        if (canBonusDamage) {
+            player.sendMessage(LocaleLoader.getString("Effects.Template", LocaleLoader.getString("Axes.Effect.4"), LocaleLoader.getString("Axes.Effect.5")));
+        }
+
+        if (canImpact) {
+            player.sendMessage(LocaleLoader.getString("Effects.Template", LocaleLoader.getString("Axes.Effect.6"), LocaleLoader.getString("Axes.Effect.7")));
+        }
+
+        if (canGreaterImpact) {
+            player.sendMessage(LocaleLoader.getString("Effects.Template", LocaleLoader.getString("Axes.Effect.8"), LocaleLoader.getString("Axes.Effect.9")));
+        }
+    }
+
+    @Override
+    protected boolean statsHeaderPermissions() {
+        return canSkullSplitter || canCritical || canBonusDamage || canImpact || canGreaterImpact;
+    }
+
+    @Override
+    protected void statsDisplay() {
+        if (canBonusDamage) {
+            player.sendMessage(LocaleLoader.getString("Ability.Generic.Template", LocaleLoader.getString("Axes.Ability.Bonus.0"), LocaleLoader.getString("Axes.Ability.Bonus.1", bonusDamage)));
+        }
+
+        if (canImpact) {
+            player.sendMessage(LocaleLoader.getString("Ability.Generic.Template", LocaleLoader.getString("Axes.Ability.Bonus.2"), LocaleLoader.getString("Axes.Ability.Bonus.3", impactDamage)));
+        }
+
+        if (canGreaterImpact) {
+            player.sendMessage(LocaleLoader.getString("Ability.Generic.Template", LocaleLoader.getString("Axes.Ability.Bonus.4"), LocaleLoader.getString("Axes.Ability.Bonus.5", Axes.greaterImpactBonusDamage)));
+        }
+
+        if (canCritical) {
+            player.sendMessage(LocaleLoader.getString("Axes.Combat.CritChance", critChance) + (isLucky ? LocaleLoader.getString("Perks.Lucky.Bonus", critChanceLucky) : ""));
         }
 
         if (canSkullSplitter) {
-            messages.add(LocaleLoader.getString("Axes.Combat.SS.Length", skullSplitterLength) + (hasEndurance ? LocaleLoader.getString("Perks.ActivationTime.Bonus", skullSplitterLengthEndurance) : ""));
+            player.sendMessage(LocaleLoader.getString("Axes.Combat.SS.Length", skullSplitterLength) + (hasEndurance ? LocaleLoader.getString("Perks.ActivationTime.Bonus", skullSplitterLengthEndurance) : ""));
         }
-
-        return messages;
     }
 }

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

@@ -1,10 +1,5 @@
 package com.gmail.nossr50.commands.skills;
 
-import java.util.ArrayList;
-import java.util.List;
-
-import org.bukkit.entity.Player;
-
 import com.gmail.nossr50.datatypes.skills.SkillType;
 import com.gmail.nossr50.locale.LocaleLoader;
 import com.gmail.nossr50.util.Permissions;
@@ -21,44 +16,48 @@ public class ExcavationCommand extends SkillCommand {
     }
 
     @Override
-    protected void dataCalculations(Player player, float skillValue, boolean isLucky) {
+    protected void dataCalculations() {
         // GIGA DRILL BREAKER
         if (canGigaDrill) {
-            String gigaDrillStrings[] = calculateLengthDisplayValues(player, skillValue);
+            String gigaDrillStrings[] = calculateLengthDisplayValues();
             gigaDrillBreakerLength = gigaDrillStrings[0];
             gigaDrillBreakerLengthEndurance = gigaDrillStrings[1];
         }
     }
 
     @Override
-    protected void permissionsCheck(Player player) {
+    protected void permissionsCheck() {
         canGigaDrill = Permissions.gigaDrillBreaker(player);
         canTreasureHunt = Permissions.excavationTreasureHunter(player);
     }
 
     @Override
-    protected List<String> effectsDisplay() {
-        List<String> messages = new ArrayList<String>();
-
-        if (canGigaDrill) {
-            messages.add(LocaleLoader.getString("Effects.Template", LocaleLoader.getString("Excavation.Effect.0"), LocaleLoader.getString("Excavation.Effect.1")));
-        }
-
-        if (canTreasureHunt) {
-            messages.add(LocaleLoader.getString("Effects.Template", LocaleLoader.getString("Excavation.Effect.2"), LocaleLoader.getString("Excavation.Effect.3")));
-        }
-
-        return messages;
+    protected boolean effectsHeaderPermissions() {
+        return canGigaDrill || canTreasureHunt;
     }
 
     @Override
-    protected List<String> statsDisplay(Player player, float skillValue, boolean hasEndurance, boolean isLucky) {
-        List<String> messages = new ArrayList<String>();
+    protected void effectsDisplay() {
+        luckyEffectsDisplay();
 
         if (canGigaDrill) {
-            messages.add(LocaleLoader.getString("Excavation.Effect.Length", gigaDrillBreakerLength) + (hasEndurance ? LocaleLoader.getString("Perks.ActivationTime.Bonus", gigaDrillBreakerLengthEndurance) : ""));
+            player.sendMessage(LocaleLoader.getString("Effects.Template", LocaleLoader.getString("Excavation.Effect.0"), LocaleLoader.getString("Excavation.Effect.1")));
         }
 
-        return messages;
+        if (canTreasureHunt) {
+            player.sendMessage(LocaleLoader.getString("Effects.Template", LocaleLoader.getString("Excavation.Effect.2"), LocaleLoader.getString("Excavation.Effect.3")));
+        }
+    }
+
+    @Override
+    protected boolean statsHeaderPermissions() {
+        return canGigaDrill;
+    }
+
+    @Override
+    protected void statsDisplay() {
+        if (canGigaDrill) {
+            player.sendMessage(LocaleLoader.getString("Excavation.Effect.Length", gigaDrillBreakerLength) + (hasEndurance ? LocaleLoader.getString("Perks.ActivationTime.Bonus", gigaDrillBreakerLengthEndurance) : ""));
+        }
     }
 }

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

@@ -1,12 +1,8 @@
 package com.gmail.nossr50.commands.skills;
 
-import java.util.ArrayList;
-import java.util.List;
-
 import org.bukkit.Location;
 import org.bukkit.block.Biome;
 import org.bukkit.entity.EntityType;
-import org.bukkit.entity.Player;
 
 import com.gmail.nossr50.config.AdvancedConfig;
 import com.gmail.nossr50.config.treasure.TreasureConfig;
@@ -15,7 +11,6 @@ import com.gmail.nossr50.datatypes.treasure.Rarity;
 import com.gmail.nossr50.locale.LocaleLoader;
 import com.gmail.nossr50.skills.fishing.Fishing;
 import com.gmail.nossr50.skills.fishing.Fishing.Tier;
-import com.gmail.nossr50.skills.fishing.FishingManager;
 import com.gmail.nossr50.util.Permissions;
 import com.gmail.nossr50.util.player.UserManager;
 
@@ -48,55 +43,48 @@ public class FishingCommand extends SkillCommand {
     }
 
     @Override
-    protected void dataCalculations(Player player, float skillValue, boolean isLucky) {
-        FishingManager fishingManager = UserManager.getPlayer(player).getFishingManager();
+    protected void dataCalculations() {
         boolean isStorming = player.getWorld().hasStorm();
 
         // TREASURE HUNTER
         if (canTreasureHunt) {
-            lootTier = fishingManager.getLootTier();
+            lootTier = mcMMOPlayer.getFishingManager().getLootTier();
 
             // Item drop rates
-            trapTreasure = percent.format(TreasureConfig.getInstance().getItemDropRate(lootTier, Rarity.TRAP) / 100.0);
-            commonTreasure = percent.format(TreasureConfig.getInstance().getItemDropRate(lootTier, Rarity.COMMON) / 100.0);
-            uncommonTreasure = percent.format(TreasureConfig.getInstance().getItemDropRate(lootTier, Rarity.UNCOMMON) / 100.0);
-            rareTreasure = percent.format(TreasureConfig.getInstance().getItemDropRate(lootTier, Rarity.RARE) / 100.0);
-            epicTreasure = percent.format(TreasureConfig.getInstance().getItemDropRate(lootTier, Rarity.EPIC) / 100.0);
-            legendaryTreasure = percent.format(TreasureConfig.getInstance().getItemDropRate(lootTier, Rarity.LEGENDARY) / 100.0);
-            recordTreasure = percent.format(TreasureConfig.getInstance().getItemDropRate(lootTier, Rarity.RECORD) / 100.0);
+            trapTreasure = calculateAbilityDisplayValues(TreasureConfig.getInstance().getItemDropRate(lootTier, Rarity.TRAP))[0];
+            commonTreasure = calculateAbilityDisplayValues(TreasureConfig.getInstance().getItemDropRate(lootTier, Rarity.COMMON))[0];
+            uncommonTreasure = calculateAbilityDisplayValues(TreasureConfig.getInstance().getItemDropRate(lootTier, Rarity.UNCOMMON))[0];
+            rareTreasure = calculateAbilityDisplayValues(TreasureConfig.getInstance().getItemDropRate(lootTier, Rarity.RARE))[0];
+            epicTreasure = calculateAbilityDisplayValues(TreasureConfig.getInstance().getItemDropRate(lootTier, Rarity.EPIC))[0];
+            legendaryTreasure = calculateAbilityDisplayValues(TreasureConfig.getInstance().getItemDropRate(lootTier, Rarity.LEGENDARY))[0];
+            recordTreasure = calculateAbilityDisplayValues(TreasureConfig.getInstance().getItemDropRate(lootTier, Rarity.RECORD))[0];
 
             // Magic hunter drop rates
-            double totalEnchantChance = 0;
+            double commonEnchantment = TreasureConfig.getInstance().getEnchantmentDropRate(lootTier, Rarity.COMMON);
+            double uncommonEnchantment = TreasureConfig.getInstance().getEnchantmentDropRate(lootTier, Rarity.UNCOMMON);
+            double rareEnchantment = TreasureConfig.getInstance().getEnchantmentDropRate(lootTier, Rarity.RARE);
+            double epicEnchantment = TreasureConfig.getInstance().getEnchantmentDropRate(lootTier, Rarity.EPIC);
+            double legendaryEnchantment = TreasureConfig.getInstance().getEnchantmentDropRate(lootTier, Rarity.LEGENDARY);
 
-            for (Rarity rarity : Rarity.values()) {
-                if (rarity != Rarity.TRAP || rarity != Rarity.RECORD) {
-                    totalEnchantChance += TreasureConfig.getInstance().getEnchantmentDropRate(lootTier, rarity);
-                }
-            }
-
-            magicChance = percent.format(totalEnchantChance / 100.0);
+            magicChance = calculateAbilityDisplayValues(commonEnchantment + uncommonEnchantment + rareEnchantment + epicEnchantment + legendaryEnchantment)[0];
         }
 
         // SHAKE
         if (canShake) {
-            String[] shakeStrings = calculateAbilityDisplayValues(UserManager.getPlayer(player).getFishingManager().getShakeProbability(), isLucky);
+            String[] shakeStrings = calculateAbilityDisplayValues(UserManager.getPlayer(player).getFishingManager().getShakeProbability());
             shakeChance = shakeStrings[0];
             shakeChanceLucky = shakeStrings[1];
         }
 
         // FISHERMAN'S DIET
         if (canFishermansDiet) {
-            fishermansDietRank = calculateRank(skillValue, Fishing.fishermansDietMaxLevel, Fishing.fishermansDietRankLevel1);
+            fishermansDietRank = calculateRank(Fishing.fishermansDietMaxLevel, Fishing.fishermansDietRankLevel1);
         }
 
         // MASTER ANGLER
         if (canMasterAngler) {
             double rawBiteChance = 1.0 / (isStorming ? 300 : 500);
-            Location location = fishingManager.getHookLocation();
-
-            if (location == null) {
-                location = player.getLocation();
-            }
+            Location location = (mcMMOPlayer.getHookLocation() != null) ? mcMMOPlayer.getHookLocation() : player.getLocation();
 
             Biome biome = location.getBlock().getBiome();
 
@@ -108,12 +96,12 @@ public class FishingCommand extends SkillCommand {
                 rawBiteChance = rawBiteChance * AdvancedConfig.getInstance().getMasterAnglerBoatModifier();
             }
 
-            biteChance = calculateAbilityDisplayValues(rawBiteChance * 100.0, isLucky)[0];
+            biteChance = calculateAbilityDisplayValues(rawBiteChance * 100.0)[0];
         }
     }
 
     @Override
-    protected void permissionsCheck(Player player) {
+    protected void permissionsCheck() {
         canTreasureHunt = Permissions.fishingTreasureHunter(player);
         canMagicHunt = Permissions.magicHunter(player);
         canShake = Permissions.shake(player);
@@ -123,57 +111,63 @@ public class FishingCommand extends SkillCommand {
     }
 
     @Override
-    protected List<String> effectsDisplay() {
-        List<String> messages = new ArrayList<String>();
-
-        if (canTreasureHunt) {
-            messages.add(LocaleLoader.getString("Effects.Template", LocaleLoader.getString("Fishing.Effect.0"), LocaleLoader.getString("Fishing.Effect.1")));
-        }
-
-        if (canMagicHunt) {
-            messages.add(LocaleLoader.getString("Effects.Template", LocaleLoader.getString("Fishing.Effect.2"), LocaleLoader.getString("Fishing.Effect.3")));
-        }
-
-        if (canIceFish) {
-            messages.add(LocaleLoader.getString("Effects.Template", LocaleLoader.getString("Fishing.Effect.10"), LocaleLoader.getString("Fishing.Effect.11")));
-        }
-
-        if (canMasterAngler) {
-            messages.add(LocaleLoader.getString("Effects.Template", LocaleLoader.getString("Fishing.Effect.8"), LocaleLoader.getString("Fishing.Effect.9")));
-        }
-
-        if (canShake) {
-            messages.add(LocaleLoader.getString("Effects.Template", LocaleLoader.getString("Fishing.Effect.4"), LocaleLoader.getString("Fishing.Effect.5")));
-        }
-
-        if (canFishermansDiet) {
-            messages.add(LocaleLoader.getString("Effects.Template", LocaleLoader.getString("Fishing.Effect.6"), LocaleLoader.getString("Fishing.Effect.7")));
-        }
-
-        return messages;
+    protected boolean effectsHeaderPermissions() {
+        return canTreasureHunt || canMagicHunt || canShake || canMasterAngler || canFishermansDiet || canIceFish;
     }
 
     @Override
-    protected List<String> statsDisplay(Player player, float skillValue, boolean hasEndurance, boolean isLucky) {
-        List<String> messages = new ArrayList<String>();
+    protected void effectsDisplay() {
+        luckyEffectsDisplay();
 
         if (canTreasureHunt) {
-            messages.add(LocaleLoader.getString("Fishing.Ability.Rank", lootTier, Tier.EIGHT.toNumerical()));
-            messages.add(LocaleLoader.getString("Fishing.Ability.TH.DropRate", trapTreasure, commonTreasure, uncommonTreasure, rareTreasure, epicTreasure, legendaryTreasure, recordTreasure));
+            player.sendMessage(LocaleLoader.getString("Effects.Template", LocaleLoader.getString("Fishing.Effect.0"), LocaleLoader.getString("Fishing.Effect.1")));
         }
 
         if (canMagicHunt) {
-            messages.add(LocaleLoader.getString("Fishing.Ability.TH.MagicRate", magicChance));
+            player.sendMessage(LocaleLoader.getString("Effects.Template", LocaleLoader.getString("Fishing.Effect.2"), LocaleLoader.getString("Fishing.Effect.3")));
+        }
+
+        if (canIceFish) {
+            player.sendMessage(LocaleLoader.getString("Effects.Template", LocaleLoader.getString("Fishing.Effect.10"), LocaleLoader.getString("Fishing.Effect.11")));
+        }
+
+        if (canMasterAngler) {
+            player.sendMessage(LocaleLoader.getString("Effects.Template", LocaleLoader.getString("Fishing.Effect.8"), LocaleLoader.getString("Fishing.Effect.9")));
+        }
+
+        if (canShake) {
+            player.sendMessage(LocaleLoader.getString("Effects.Template", LocaleLoader.getString("Fishing.Effect.4"), LocaleLoader.getString("Fishing.Effect.5")));
+        }
+
+        if (canFishermansDiet) {
+            player.sendMessage(LocaleLoader.getString("Effects.Template", LocaleLoader.getString("Fishing.Effect.6"), LocaleLoader.getString("Fishing.Effect.7")));
+        }
+    }
+
+    @Override
+    protected boolean statsHeaderPermissions() {
+        return canTreasureHunt || canMagicHunt || canShake || canMasterAngler || canFishermansDiet || canIceFish;
+    }
+
+    @Override
+    protected void statsDisplay() {
+        if (canTreasureHunt) {
+            player.sendMessage(LocaleLoader.getString("Fishing.Ability.Rank", lootTier, Tier.EIGHT.toNumerical()));
+            player.sendMessage(LocaleLoader.getString("Fishing.Ability.TH.DropRate", trapTreasure, commonTreasure, uncommonTreasure, rareTreasure, epicTreasure, legendaryTreasure, recordTreasure));
+        }
+
+        if (canMagicHunt) {
+            player.sendMessage(LocaleLoader.getString("Fishing.Ability.TH.MagicRate", magicChance));
         }
 
         if (canIceFish) {
             int unlockLevel = AdvancedConfig.getInstance().getIceFishingUnlockLevel();
 
             if (skillValue < unlockLevel) {
-                messages.add(LocaleLoader.getString("Ability.Generic.Template.Lock", LocaleLoader.getString("Fishing.Ability.Locked.1", unlockLevel)));
+                player.sendMessage(LocaleLoader.getString("Ability.Generic.Template.Lock", LocaleLoader.getString("Fishing.Ability.Locked.1", unlockLevel)));
             }
             else {
-                messages.add(LocaleLoader.getString("Fishing.Ability.IceFishing"));
+                player.sendMessage(LocaleLoader.getString("Fishing.Ability.IceFishing"));
             }
         }
 
@@ -181,10 +175,10 @@ public class FishingCommand extends SkillCommand {
             int unlockLevel = AdvancedConfig.getInstance().getMasterAnglerUnlockLevel();
 
             if (skillValue < unlockLevel) {
-                messages.add(LocaleLoader.getString("Ability.Generic.Template.Lock", LocaleLoader.getString("Fishing.Ability.Locked.2", unlockLevel)));
+                player.sendMessage(LocaleLoader.getString("Ability.Generic.Template.Lock", LocaleLoader.getString("Fishing.Ability.Locked.2", unlockLevel)));
             }
             else {
-                messages.add(LocaleLoader.getString("Fishing.Ability.Chance", biteChance));
+                player.sendMessage(LocaleLoader.getString("Fishing.Ability.Chance", biteChance));
             }
         }
 
@@ -192,17 +186,15 @@ public class FishingCommand extends SkillCommand {
             int unlockLevel = AdvancedConfig.getInstance().getFishingTierLevel(Tier.ONE);
 
             if (skillValue < unlockLevel) {
-                messages.add(LocaleLoader.getString("Ability.Generic.Template.Lock", LocaleLoader.getString("Fishing.Ability.Locked.0", unlockLevel)));
+                player.sendMessage(LocaleLoader.getString("Ability.Generic.Template.Lock", LocaleLoader.getString("Fishing.Ability.Locked.0", unlockLevel)));
             }
             else {
-                messages.add(LocaleLoader.getString("Fishing.Ability.Shake", shakeChance) + (isLucky ? LocaleLoader.getString("Perks.Lucky.Bonus", shakeChanceLucky) : ""));
+                player.sendMessage(LocaleLoader.getString("Fishing.Ability.Shake", shakeChance) + (isLucky ? LocaleLoader.getString("Perks.Lucky.Bonus", shakeChanceLucky) : ""));
             }
         }
 
         if (canFishermansDiet) {
-            messages.add(LocaleLoader.getString("Fishing.Ability.FD", fishermansDietRank));
+            player.sendMessage(LocaleLoader.getString("Fishing.Ability.FD", fishermansDietRank));
         }
-
-        return messages;
     }
 }

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

@@ -1,10 +1,6 @@
 package com.gmail.nossr50.commands.skills;
 
-import java.util.ArrayList;
-import java.util.List;
-
 import org.bukkit.Material;
-import org.bukkit.entity.Player;
 
 import com.gmail.nossr50.datatypes.skills.SkillType;
 import com.gmail.nossr50.locale.LocaleLoader;
@@ -38,52 +34,52 @@ public class HerbalismCommand extends SkillCommand {
     }
 
     @Override
-    protected void dataCalculations(Player player, float skillValue, boolean isLucky) {
+    protected void dataCalculations() {
         // GREEN TERRA
         if (canGreenTerra) {
-            String[] greenTerraStrings = calculateLengthDisplayValues(player, skillValue);
+            String[] greenTerraStrings = calculateLengthDisplayValues();
             greenTerraLength = greenTerraStrings[0];
             greenTerraLengthEndurance = greenTerraStrings[1];
         }
 
         // FARMERS DIET
         if (canFarmersDiet) {
-            farmersDietRank = calculateRank(skillValue, Herbalism.farmersDietMaxLevel, Herbalism.farmersDietRankLevel1);
+            farmersDietRank = calculateRank(Herbalism.farmersDietMaxLevel, Herbalism.farmersDietRankLevel1);
         }
 
         // GREEN THUMB
         if (canGreenThumbBlocks || canGreenThumbPlants) {
-            greenThumbStage = calculateRank(skillValue, Herbalism.greenThumbStageMaxLevel, Herbalism.greenThumbStageChangeLevel);
+            greenThumbStage = calculateRank(Herbalism.greenThumbStageMaxLevel, Herbalism.greenThumbStageChangeLevel);
 
-            String[] greenThumbStrings = calculateAbilityDisplayValues(skillValue, Herbalism.greenThumbMaxLevel, Herbalism.greenThumbMaxChance, isLucky);
+            String[] greenThumbStrings = calculateAbilityDisplayValues(Herbalism.greenThumbMaxLevel, Herbalism.greenThumbMaxChance);
             greenThumbChance = greenThumbStrings[0];
             greenThumbChanceLucky = greenThumbStrings[1];
         }
 
         // DOUBLE DROPS
         if (canDoubleDrop) {
-            String[] doubleDropStrings = calculateAbilityDisplayValues(skillValue, Herbalism.doubleDropsMaxLevel, Herbalism.doubleDropsMaxChance, isLucky);
+            String[] doubleDropStrings = calculateAbilityDisplayValues(Herbalism.doubleDropsMaxLevel, Herbalism.doubleDropsMaxChance);
             doubleDropChance = doubleDropStrings[0];
             doubleDropChanceLucky = doubleDropStrings[1];
         }
 
         // HYLIAN LUCK
         if (hasHylianLuck) {
-            String[] hylianLuckStrings = calculateAbilityDisplayValues(skillValue, Herbalism.hylianLuckMaxLevel, Herbalism.hylianLuckMaxChance, isLucky);
+            String[] hylianLuckStrings = calculateAbilityDisplayValues(Herbalism.hylianLuckMaxLevel, Herbalism.hylianLuckMaxChance);
             hylianLuckChance = hylianLuckStrings[0];
             hylianLuckChanceLucky = hylianLuckStrings[1];
         }
 
         // SHROOM THUMB
         if (canShroomThumb) {
-            String[] shroomThumbStrings = calculateAbilityDisplayValues(skillValue, Herbalism.shroomThumbMaxLevel, Herbalism.shroomThumbMaxChance, isLucky);
+            String[] shroomThumbStrings = calculateAbilityDisplayValues(Herbalism.shroomThumbMaxLevel, Herbalism.shroomThumbMaxChance);
             shroomThumbChance = shroomThumbStrings[0];
             shroomThumbChanceLucky = shroomThumbStrings[1];
         }
     }
 
     @Override
-    protected void permissionsCheck(Player player) {
+    protected void permissionsCheck() {
         hasHylianLuck = Permissions.hylianLuck(player);
         canGreenTerra = Permissions.greenTerra(player);
         canGreenThumbPlants = Permissions.greenThumbPlant(player, Material.CROPS) || Permissions.greenThumbPlant(player, Material.CARROT) || Permissions.greenThumbPlant(player, Material.POTATO) || Permissions.greenThumbPlant(player, Material.NETHER_WARTS) || Permissions.greenThumbPlant(player, Material.COCOA);
@@ -94,72 +90,76 @@ public class HerbalismCommand extends SkillCommand {
     }
 
     @Override
-    protected List<String> effectsDisplay() {
-        List<String> messages = new ArrayList<String>();
-
-        if (canGreenTerra) {
-            messages.add(LocaleLoader.getString("Effects.Template", LocaleLoader.getString("Herbalism.Effect.0"), LocaleLoader.getString("Herbalism.Effect.1")));
-        }
-
-        if (canGreenThumbPlants) {
-            messages.add(LocaleLoader.getString("Effects.Template", LocaleLoader.getString("Herbalism.Effect.2"), LocaleLoader.getString("Herbalism.Effect.3")));
-        }
-
-        if (canGreenThumbBlocks) {
-            messages.add(LocaleLoader.getString("Effects.Template", LocaleLoader.getString("Herbalism.Effect.4"), LocaleLoader.getString("Herbalism.Effect.5")));
-        }
-
-        if (canFarmersDiet) {
-            messages.add(LocaleLoader.getString("Effects.Template", LocaleLoader.getString("Herbalism.Effect.6"), LocaleLoader.getString("Herbalism.Effect.7")));
-        }
-
-        if (hasHylianLuck) {
-            messages.add(LocaleLoader.getString("Effects.Template", LocaleLoader.getString("Herbalism.Effect.10"), LocaleLoader.getString("Herbalism.Effect.11")));
-        }
-
-        if (canShroomThumb) {
-            messages.add(LocaleLoader.getString("Effects.Template", LocaleLoader.getString("Herbalism.Effect.12"), LocaleLoader.getString("Herbalism.Effect.13")));
-        }
-
-        if (canDoubleDrop) {
-            messages.add(LocaleLoader.getString("Effects.Template", LocaleLoader.getString("Herbalism.Effect.8"), LocaleLoader.getString("Herbalism.Effect.9")));
-        }
-
-        return messages;
+    protected boolean effectsHeaderPermissions() {
+        return canGreenTerra || canDoubleDrop || canFarmersDiet || canGreenThumbBlocks || canGreenThumbPlants || canShroomThumb;
     }
 
     @Override
-    protected List<String> statsDisplay(Player player, float skillValue, boolean hasEndurance, boolean isLucky) {
-        List<String> messages = new ArrayList<String>();
+    protected void effectsDisplay() {
+        luckyEffectsDisplay();
 
         if (canGreenTerra) {
-            messages.add(LocaleLoader.getString("Herbalism.Ability.GTe.Length", greenTerraLength) + (hasEndurance ? LocaleLoader.getString("Perks.ActivationTime.Bonus", greenTerraLengthEndurance) : ""));
-        }
-
-        if (canGreenThumbBlocks || canGreenThumbPlants) {
-            messages.add(LocaleLoader.getString("Herbalism.Ability.GTh.Chance", greenThumbChance) + (isLucky ? LocaleLoader.getString("Perks.Lucky.Bonus", greenThumbChanceLucky) : ""));
+            player.sendMessage(LocaleLoader.getString("Effects.Template", LocaleLoader.getString("Herbalism.Effect.0"), LocaleLoader.getString("Herbalism.Effect.1")));
         }
 
         if (canGreenThumbPlants) {
-            messages.add(LocaleLoader.getString("Herbalism.Ability.GTh.Stage", greenThumbStage));
+            player.sendMessage(LocaleLoader.getString("Effects.Template", LocaleLoader.getString("Herbalism.Effect.2"), LocaleLoader.getString("Herbalism.Effect.3")));
+        }
+
+        if (canGreenThumbBlocks) {
+            player.sendMessage(LocaleLoader.getString("Effects.Template", LocaleLoader.getString("Herbalism.Effect.4"), LocaleLoader.getString("Herbalism.Effect.5")));
         }
 
         if (canFarmersDiet) {
-            messages.add(LocaleLoader.getString("Herbalism.Ability.FD", farmersDietRank));
+            player.sendMessage(LocaleLoader.getString("Effects.Template", LocaleLoader.getString("Herbalism.Effect.6"), LocaleLoader.getString("Herbalism.Effect.7")));
         }
 
         if (hasHylianLuck) {
-            messages.add(LocaleLoader.getString("Herbalism.Ability.HylianLuck", hylianLuckChance) + (isLucky ? LocaleLoader.getString("Perks.Lucky.Bonus", hylianLuckChanceLucky) : ""));
+            player.sendMessage(LocaleLoader.getString("Effects.Template", LocaleLoader.getString("Herbalism.Effect.10"), LocaleLoader.getString("Herbalism.Effect.11")));
         }
 
         if (canShroomThumb) {
-            messages.add(LocaleLoader.getString("Herbalism.Ability.ShroomThumb.Chance", shroomThumbChance) + (isLucky ? LocaleLoader.getString("Perks.Lucky.Bonus", shroomThumbChanceLucky) : ""));
+            player.sendMessage(LocaleLoader.getString("Effects.Template", LocaleLoader.getString("Herbalism.Effect.12"), LocaleLoader.getString("Herbalism.Effect.13")));
         }
 
         if (canDoubleDrop) {
-            messages.add(LocaleLoader.getString("Herbalism.Ability.DoubleDropChance", doubleDropChance) + (isLucky ? LocaleLoader.getString("Perks.Lucky.Bonus", doubleDropChanceLucky) : ""));
+            player.sendMessage(LocaleLoader.getString("Effects.Template", LocaleLoader.getString("Herbalism.Effect.8"), LocaleLoader.getString("Herbalism.Effect.9")));
+        }
+    }
+
+    @Override
+    protected boolean statsHeaderPermissions() {
+        return canGreenTerra || canDoubleDrop || canFarmersDiet || canGreenThumbBlocks || canGreenThumbPlants || canShroomThumb;
+    }
+
+    @Override
+    protected void statsDisplay() {
+        if (canGreenTerra) {
+            player.sendMessage(LocaleLoader.getString("Herbalism.Ability.GTe.Length", greenTerraLength) + (hasEndurance ? LocaleLoader.getString("Perks.ActivationTime.Bonus", greenTerraLengthEndurance) : ""));
         }
 
-        return messages;
+        if (canGreenThumbBlocks || canGreenThumbPlants) {
+            player.sendMessage(LocaleLoader.getString("Herbalism.Ability.GTh.Chance", greenThumbChance) + (isLucky ? LocaleLoader.getString("Perks.Lucky.Bonus", greenThumbChanceLucky) : ""));
+        }
+
+        if (canGreenThumbPlants) {
+            player.sendMessage(LocaleLoader.getString("Herbalism.Ability.GTh.Stage", greenThumbStage));
+        }
+
+        if (canFarmersDiet) {
+            player.sendMessage(LocaleLoader.getString("Herbalism.Ability.FD", farmersDietRank));
+        }
+
+        if (hasHylianLuck) {
+            player.sendMessage(LocaleLoader.getString("Herbalism.Ability.HylianLuck", hylianLuckChance) + (isLucky ? LocaleLoader.getString("Perks.Lucky.Bonus", hylianLuckChanceLucky) : ""));
+        }
+
+        if (canShroomThumb) {
+            player.sendMessage(LocaleLoader.getString("Herbalism.Ability.ShroomThumb.Chance", shroomThumbChance) + (isLucky ? LocaleLoader.getString("Perks.Lucky.Bonus", shroomThumbChanceLucky) : ""));
+        }
+
+        if (canDoubleDrop) {
+            player.sendMessage(LocaleLoader.getString("Herbalism.Ability.DoubleDropChance", doubleDropChance) + (isLucky ? LocaleLoader.getString("Perks.Lucky.Bonus", doubleDropChanceLucky) : ""));
+        }
     }
 }

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

@@ -1,10 +1,5 @@
 package com.gmail.nossr50.commands.skills;
 
-import java.util.ArrayList;
-import java.util.List;
-
-import org.bukkit.entity.Player;
-
 import com.gmail.nossr50.config.AdvancedConfig;
 import com.gmail.nossr50.datatypes.skills.SkillType;
 import com.gmail.nossr50.locale.LocaleLoader;
@@ -12,7 +7,6 @@ import com.gmail.nossr50.skills.mining.BlastMining.Tier;
 import com.gmail.nossr50.skills.mining.Mining;
 import com.gmail.nossr50.skills.mining.MiningManager;
 import com.gmail.nossr50.util.Permissions;
-import com.gmail.nossr50.util.player.UserManager;
 
 public class MiningCommand extends SkillCommand {
     private String doubleDropChance;
@@ -38,24 +32,24 @@ public class MiningCommand extends SkillCommand {
     }
 
     @Override
-    protected void dataCalculations(Player player, float skillValue, boolean isLucky) {
+    protected void dataCalculations() {
         // SUPER BREAKER
         if (canSuperBreaker) {
-            String[] superBreakerStrings = calculateLengthDisplayValues(player, skillValue);
+            String[] superBreakerStrings = calculateLengthDisplayValues();
             superBreakerLength = superBreakerStrings[0];
             superBreakerLengthEndurance = superBreakerStrings[1];
         }
 
         // DOUBLE DROPS
         if (canDoubleDrop) {
-            String[] doubleDropStrings = calculateAbilityDisplayValues(skillValue, Mining.doubleDropsMaxLevel, Mining.doubleDropsMaxChance, isLucky);
+            String[] doubleDropStrings = calculateAbilityDisplayValues(Mining.doubleDropsMaxLevel, Mining.doubleDropsMaxChance);
             doubleDropChance = doubleDropStrings[0];
             doubleDropChanceLucky = doubleDropStrings[1];
         }
 
         // BLAST MINING
         if (canBlast || canDemoExpert || canBiggerBombs) {
-            MiningManager miningManager = UserManager.getPlayer(player).getMiningManager();
+            MiningManager miningManager = mcMMOPlayer.getMiningManager();
 
             blastMiningRank = miningManager.getBlastMiningTier();
             bonusTNTDrops = miningManager.getDropMultiplier();
@@ -67,7 +61,7 @@ public class MiningCommand extends SkillCommand {
     }
 
     @Override
-    protected void permissionsCheck(Player player) {
+    protected void permissionsCheck() {
         canBiggerBombs = Permissions.biggerBombs(player);
         canBlast = Permissions.remoteDetonation(player);
         canDemoExpert = Permissions.demolitionsExpertise(player);
@@ -76,52 +70,58 @@ public class MiningCommand extends SkillCommand {
     }
 
     @Override
-    protected List<String> effectsDisplay() {
-        List<String> messages = new ArrayList<String>();
-
-        if (canSuperBreaker) {
-            messages.add(LocaleLoader.getString("Effects.Template", LocaleLoader.getString("Mining.Effect.0"), LocaleLoader.getString("Mining.Effect.1")));
-        }
-
-        if (canDoubleDrop) {
-            messages.add(LocaleLoader.getString("Effects.Template", LocaleLoader.getString("Mining.Effect.2"), LocaleLoader.getString("Mining.Effect.3")));
-        }
-
-        if (canBlast) {
-            messages.add(LocaleLoader.getString("Effects.Template", LocaleLoader.getString("Mining.Effect.4"), LocaleLoader.getString("Mining.Effect.5")));
-        }
-
-        if (canBiggerBombs) {
-            messages.add(LocaleLoader.getString("Effects.Template", LocaleLoader.getString("Mining.Effect.6"), LocaleLoader.getString("Mining.Effect.7")));
-        }
-
-        if (canDemoExpert) {
-            messages.add(LocaleLoader.getString("Effects.Template", LocaleLoader.getString("Mining.Effect.8"), LocaleLoader.getString("Mining.Effect.9")));
-        }
-
-        return messages;
+    protected boolean effectsHeaderPermissions() {
+        return canBiggerBombs || canBlast || canDemoExpert || canDoubleDrop || canSuperBreaker;
     }
 
     @Override
-    protected List<String> statsDisplay(Player player, float skillValue, boolean hasEndurance, boolean isLucky) {
-        List<String> messages = new ArrayList<String>();
+    protected void effectsDisplay() {
+        luckyEffectsDisplay();
+
+        if (canSuperBreaker) {
+            player.sendMessage(LocaleLoader.getString("Effects.Template", LocaleLoader.getString("Mining.Effect.0"), LocaleLoader.getString("Mining.Effect.1")));
+        }
 
         if (canDoubleDrop) {
-            messages.add(LocaleLoader.getString("Mining.Effect.DropChance", doubleDropChance) + (isLucky ? LocaleLoader.getString("Perks.Lucky.Bonus", doubleDropChanceLucky) : ""));
+            player.sendMessage(LocaleLoader.getString("Effects.Template", LocaleLoader.getString("Mining.Effect.2"), LocaleLoader.getString("Mining.Effect.3")));
+        }
+
+        if (canBlast) {
+            player.sendMessage(LocaleLoader.getString("Effects.Template", LocaleLoader.getString("Mining.Effect.4"), LocaleLoader.getString("Mining.Effect.5")));
+        }
+
+        if (canBiggerBombs) {
+            player.sendMessage(LocaleLoader.getString("Effects.Template", LocaleLoader.getString("Mining.Effect.6"), LocaleLoader.getString("Mining.Effect.7")));
+        }
+
+        if (canDemoExpert) {
+            player.sendMessage(LocaleLoader.getString("Effects.Template", LocaleLoader.getString("Mining.Effect.8"), LocaleLoader.getString("Mining.Effect.9")));
+        }
+    }
+
+    @Override
+    protected boolean statsHeaderPermissions() {
+        return canBiggerBombs || canBlast || canDemoExpert || canDoubleDrop || canSuperBreaker;
+    }
+
+    @Override
+    protected void statsDisplay() {
+        if (canDoubleDrop) {
+            player.sendMessage(LocaleLoader.getString("Mining.Effect.DropChance", doubleDropChance) + (isLucky ? LocaleLoader.getString("Perks.Lucky.Bonus", doubleDropChanceLucky) : ""));
         }
 
         if (canSuperBreaker) {
-            messages.add(LocaleLoader.getString("Mining.Ability.Length", superBreakerLength) + (hasEndurance ? LocaleLoader.getString("Perks.ActivationTime.Bonus", superBreakerLengthEndurance) : ""));
+            player.sendMessage(LocaleLoader.getString("Mining.Ability.Length", superBreakerLength) + (hasEndurance ? LocaleLoader.getString("Perks.ActivationTime.Bonus", superBreakerLengthEndurance) : ""));
         }
 
         if (canBlast) {
             int unlockLevel = AdvancedConfig.getInstance().getBlastMiningRankLevel(Tier.ONE);
 
             if (skillValue < unlockLevel) {
-                messages.add(LocaleLoader.getString("Ability.Generic.Template.Lock", LocaleLoader.getString("Mining.Ability.Locked.0", unlockLevel)));
+                player.sendMessage(LocaleLoader.getString("Ability.Generic.Template.Lock", LocaleLoader.getString("Mining.Ability.Locked.0", unlockLevel)));
             }
             else {
-                messages.add(LocaleLoader.getString("Mining.Blast.Rank", blastMiningRank, Tier.EIGHT.toNumerical(), LocaleLoader.getString("Mining.Blast.Effect", oreBonus, debrisReduction, bonusTNTDrops)));
+                player.sendMessage(LocaleLoader.getString("Mining.Blast.Rank", blastMiningRank, Tier.EIGHT.toNumerical(), LocaleLoader.getString("Mining.Blast.Effect", oreBonus, debrisReduction, bonusTNTDrops)));
             }
         }
 
@@ -129,10 +129,10 @@ public class MiningCommand extends SkillCommand {
             int unlockLevel = AdvancedConfig.getInstance().getBlastMiningRankLevel(Tier.TWO);
 
             if (skillValue < unlockLevel) {
-                messages.add(LocaleLoader.getString("Ability.Generic.Template.Lock", LocaleLoader.getString("Mining.Ability.Locked.1", unlockLevel)));
+                player.sendMessage(LocaleLoader.getString("Ability.Generic.Template.Lock", LocaleLoader.getString("Mining.Ability.Locked.1", unlockLevel)));
             }
             else {
-                messages.add(LocaleLoader.getString("Mining.Blast.Radius.Increase", blastRadiusIncrease));
+                player.sendMessage(LocaleLoader.getString("Mining.Blast.Radius.Increase", blastRadiusIncrease));
             }
         }
 
@@ -140,13 +140,11 @@ public class MiningCommand extends SkillCommand {
             int unlockLevel = AdvancedConfig.getInstance().getBlastMiningRankLevel(Tier.FOUR);
 
             if (skillValue < unlockLevel) {
-                messages.add(LocaleLoader.getString("Ability.Generic.Template.Lock", LocaleLoader.getString("Mining.Ability.Locked.2", unlockLevel)));
+                player.sendMessage(LocaleLoader.getString("Ability.Generic.Template.Lock", LocaleLoader.getString("Mining.Ability.Locked.2", unlockLevel)));
             }
             else {
-                messages.add(LocaleLoader.getString("Mining.Effect.Decrease", blastDamageDecrease));
+                player.sendMessage(LocaleLoader.getString("Mining.Effect.Decrease", blastDamageDecrease));
             }
         }
-
-        return messages;
     }
 }

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

@@ -1,10 +1,6 @@
 package com.gmail.nossr50.commands.skills;
 
-import java.util.ArrayList;
-import java.util.List;
-
 import org.bukkit.Material;
-import org.bukkit.entity.Player;
 
 import com.gmail.nossr50.mcMMO;
 import com.gmail.nossr50.datatypes.skills.SkillType;
@@ -15,7 +11,6 @@ import com.gmail.nossr50.skills.repair.Repair;
 import com.gmail.nossr50.skills.repair.RepairManager;
 import com.gmail.nossr50.skills.repair.repairables.Repairable;
 import com.gmail.nossr50.util.Permissions;
-import com.gmail.nossr50.util.player.UserManager;
 
 public class RepairCommand extends SkillCommand {
     private String repairMasteryBonus;
@@ -45,7 +40,7 @@ public class RepairCommand extends SkillCommand {
     }
 
     @Override
-    protected void dataCalculations(Player player, float skillValue, boolean isLucky) {
+    protected void dataCalculations() {
         // We're using pickaxes here, not the best but it works
         Repairable diamondRepairable = mcMMO.getRepairableManager().getRepairable(Material.DIAMOND_PICKAXE);
         Repairable goldRepairable = mcMMO.getRepairableManager().getRepairable(Material.GOLD_PICKAXE);
@@ -65,14 +60,14 @@ public class RepairCommand extends SkillCommand {
 
         // SUPER REPAIR
         if (canSuperRepair) {
-            String[] superRepairStrings = calculateAbilityDisplayValues(skillValue, Repair.superRepairMaxBonusLevel, Repair.superRepairMaxChance, isLucky);
+            String[] superRepairStrings = calculateAbilityDisplayValues(Repair.superRepairMaxBonusLevel, Repair.superRepairMaxChance);
             superRepairChance = superRepairStrings[0];
             superRepairChanceLucky = superRepairStrings[1];
         }
     }
 
     @Override
-    protected void permissionsCheck(Player player) {
+    protected void permissionsCheck() {
         canSuperRepair = Permissions.superRepair(player);
         canMasterRepair = Permissions.repairMastery(player);
         canArcaneForge = Permissions.arcaneForging(player);
@@ -88,76 +83,78 @@ public class RepairCommand extends SkillCommand {
     }
 
     @Override
-    protected List<String> effectsDisplay() {
-        List<String> messages = new ArrayList<String>();
+    protected boolean effectsHeaderPermissions() {
+        return canArcaneForge || canSalvage || canRepairDiamond || canRepairGold || canRepairIron || canMasterRepair || canRepairStone || canSuperRepair || canRepairString || canRepairWood || canRepairLeather;
+    }
 
-        if (canRepairLeather || canRepairString || canRepairWood || canRepairStone || canRepairIron || canRepairGold || canRepairDiamond) {
-            messages.add(LocaleLoader.getString("Effects.Template", LocaleLoader.getString("Repair.Effect.0"), LocaleLoader.getString("Repair.Effect.1")));
-        }
+    @Override
+    protected void effectsDisplay() {
+        luckyEffectsDisplay();
+
+        player.sendMessage(LocaleLoader.getString("Effects.Template", LocaleLoader.getString("Repair.Effect.0"), LocaleLoader.getString("Repair.Effect.1")));
 
         if (canMasterRepair) {
-            messages.add(LocaleLoader.getString("Effects.Template", LocaleLoader.getString("Repair.Effect.2"), LocaleLoader.getString("Repair.Effect.3")));
+            player.sendMessage(LocaleLoader.getString("Effects.Template", LocaleLoader.getString("Repair.Effect.2"), LocaleLoader.getString("Repair.Effect.3")));
         }
 
         if (canSuperRepair) {
-            messages.add(LocaleLoader.getString("Effects.Template", LocaleLoader.getString("Repair.Effect.4"), LocaleLoader.getString("Repair.Effect.5")));
+            player.sendMessage(LocaleLoader.getString("Effects.Template", LocaleLoader.getString("Repair.Effect.4"), LocaleLoader.getString("Repair.Effect.5")));
         }
 
         /* Repair Level Requirements */
 
         if (canRepairStone && stoneLevel > 0) {
-            messages.add(LocaleLoader.getString("Effects.Template", LocaleLoader.getString("Repair.Effect.14", stoneLevel), LocaleLoader.getString("Repair.Effect.15")));
+            player.sendMessage(LocaleLoader.getString("Effects.Template", LocaleLoader.getString("Repair.Effect.14", stoneLevel), LocaleLoader.getString("Repair.Effect.15")));
         }
 
         if (canRepairIron && ironLevel > 0) {
-            messages.add(LocaleLoader.getString("Effects.Template", LocaleLoader.getString("Repair.Effect.12", ironLevel), LocaleLoader.getString("Repair.Effect.13")));
+            player.sendMessage(LocaleLoader.getString("Effects.Template", LocaleLoader.getString("Repair.Effect.12", ironLevel), LocaleLoader.getString("Repair.Effect.13")));
         }
 
         if (canRepairGold && goldLevel > 0) {
-            messages.add(LocaleLoader.getString("Effects.Template", LocaleLoader.getString("Repair.Effect.10", goldLevel), LocaleLoader.getString("Repair.Effect.11")));
+            player.sendMessage(LocaleLoader.getString("Effects.Template", LocaleLoader.getString("Repair.Effect.10", goldLevel), LocaleLoader.getString("Repair.Effect.11")));
         }
 
         if (canRepairDiamond && diamondLevel > 0) {
-            messages.add(LocaleLoader.getString("Effects.Template", LocaleLoader.getString("Repair.Effect.6", diamondLevel), LocaleLoader.getString("Repair.Effect.7")));
+            player.sendMessage(LocaleLoader.getString("Effects.Template", LocaleLoader.getString("Repair.Effect.6", diamondLevel), LocaleLoader.getString("Repair.Effect.7")));
         }
 
         if (canSalvage && Repair.salvageUnlockLevel > 0) {
-            messages.add(LocaleLoader.getString("Effects.Template", LocaleLoader.getString("Repair.Effect.16", Repair.salvageUnlockLevel), LocaleLoader.getString("Repair.Effect.17")));
+            player.sendMessage(LocaleLoader.getString("Effects.Template", LocaleLoader.getString("Repair.Effect.16", Repair.salvageUnlockLevel), LocaleLoader.getString("Repair.Effect.17")));
         }
 
         if (canArcaneForge) {
-            messages.add(LocaleLoader.getString("Effects.Template", LocaleLoader.getString("Repair.Effect.8"), LocaleLoader.getString("Repair.Effect.9")));
+            player.sendMessage(LocaleLoader.getString("Effects.Template", LocaleLoader.getString("Repair.Effect.8"), LocaleLoader.getString("Repair.Effect.9")));
         }
-
-        return messages;
     }
 
     @Override
-    protected List<String> statsDisplay(Player player, float skillValue, boolean hasEndurance, boolean isLucky) {
-        List<String> messages = new ArrayList<String>();
+    protected boolean statsHeaderPermissions() {
+        return canArcaneForge || canMasterRepair || canSuperRepair;
+    }
 
+    @Override
+    protected void statsDisplay() {
         if (canMasterRepair) {
-            messages.add(LocaleLoader.getString("Repair.Skills.Mastery", repairMasteryBonus));
+            player.sendMessage(LocaleLoader.getString("Repair.Skills.Mastery", repairMasteryBonus));
         }
 
         if (canSuperRepair) {
-            messages.add(LocaleLoader.getString("Repair.Skills.Super.Chance", superRepairChance) + (isLucky ? LocaleLoader.getString("Perks.Lucky.Bonus", superRepairChanceLucky) : ""));
+            player.sendMessage(LocaleLoader.getString("Repair.Skills.Super.Chance", superRepairChance) + (isLucky ? LocaleLoader.getString("Perks.Lucky.Bonus", superRepairChanceLucky) : ""));
         }
 
         if (canArcaneForge) {
-            RepairManager repairManager = UserManager.getPlayer(player).getRepairManager();
+            RepairManager repairManager = mcMMOPlayer.getRepairManager();
 
-            messages.add(LocaleLoader.getString("Repair.Arcane.Rank", repairManager.getArcaneForgingRank(), Tier.EIGHT.toNumerical()));
+            player.sendMessage(LocaleLoader.getString("Repair.Arcane.Rank", repairManager.getArcaneForgingRank(), Tier.EIGHT.toNumerical()));
 
             if (ArcaneForging.arcaneForgingEnchantLoss) {
-                messages.add(LocaleLoader.getString("Repair.Arcane.Chance.Success", (arcaneBypass ? 100 : repairManager.getKeepEnchantChance())));
+                player.sendMessage(LocaleLoader.getString("Repair.Arcane.Chance.Success", (arcaneBypass ? 100 : repairManager.getKeepEnchantChance())));
             }
 
             if (ArcaneForging.arcaneForgingDowngrades) {
-                messages.add(LocaleLoader.getString("Repair.Arcane.Chance.Downgrade", (arcaneBypass ? 0 : repairManager.getDowngradeEnchantChance())));
+                player.sendMessage(LocaleLoader.getString("Repair.Arcane.Chance.Downgrade", (arcaneBypass ? 0 : repairManager.getDowngradeEnchantChance())));
             }
         }
-
-        return messages;
     }
 }

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

@@ -13,6 +13,7 @@ import org.bukkit.entity.Player;
 import com.gmail.nossr50.config.AdvancedConfig;
 import com.gmail.nossr50.config.Config;
 import com.gmail.nossr50.datatypes.player.McMMOPlayer;
+import com.gmail.nossr50.datatypes.player.PlayerProfile;
 import com.gmail.nossr50.datatypes.skills.SkillType;
 import com.gmail.nossr50.locale.LocaleLoader;
 import com.gmail.nossr50.skills.child.FamilyTree;
@@ -27,7 +28,15 @@ import com.google.common.collect.ImmutableList;
 
 public abstract class SkillCommand implements TabExecutor {
     protected SkillType skill;
-    private String skillName;
+    protected String skillName;
+
+    protected Player player;
+    protected PlayerProfile profile;
+    protected McMMOPlayer mcMMOPlayer;
+
+    protected float skillValue;
+    protected boolean isLucky;
+    protected boolean hasEndurance;
 
     protected DecimalFormat percent = new DecimalFormat("##0.00%");
     protected DecimalFormat decimal = new DecimalFormat("##0.00");
@@ -46,17 +55,19 @@ public abstract class SkillCommand implements TabExecutor {
             return true;
         }
 
+        player = (Player) sender;
+        mcMMOPlayer = UserManager.getPlayer(player);
+
         switch (args.length) {
             case 0:
-                Player player = (Player) sender;
-                McMMOPlayer mcMMOPlayer = UserManager.getPlayer(player);
+                profile = mcMMOPlayer.getProfile();
 
-                boolean isLucky = Permissions.lucky(player, skill);
-                boolean hasEndurance = (PerksUtils.handleActivationPerks(player, 0, 0) != 0);
-                float skillValue = mcMMOPlayer.getSkillLevel(skill);
+                skillValue = profile.getSkillLevel(skill);
+                isLucky = Permissions.lucky(sender, skill);
+                hasEndurance = (PerksUtils.handleActivationPerks(player, 0, 0) != 0);
 
-                permissionsCheck(player);
-                dataCalculations(player, skillValue, isLucky);
+                permissionsCheck();
+                dataCalculations();
 
                 if (Config.getInstance().getSkillUseBoard()) {
                     ScoreboardManager.enablePlayerSkillScoreboard(player, skill);
@@ -65,7 +76,7 @@ public abstract class SkillCommand implements TabExecutor {
                 if (!skill.isChildSkill()) {
                     player.sendMessage(LocaleLoader.getString("Skills.Header", skillName));
                     player.sendMessage(LocaleLoader.getString("Commands.XPGain", LocaleLoader.getString("Commands.XPGain." + StringUtils.getCapitalized(skill.toString()))));
-                    player.sendMessage(LocaleLoader.getString("Effects.Level", (int) skillValue, mcMMOPlayer.getSkillXpLevel(skill), mcMMOPlayer.getXpToLevel(skill)));
+                    player.sendMessage(LocaleLoader.getString("Effects.Level", (int) skillValue, profile.getSkillXpLevel(skill), profile.getXpToLevel(skill)));
                 }
                 else {
                     player.sendMessage(LocaleLoader.getString("Skills.Header", skillName + " " + LocaleLoader.getString("Skills.Child")));
@@ -76,35 +87,22 @@ public abstract class SkillCommand implements TabExecutor {
                     Set<SkillType> parents = FamilyTree.getParents(skill);
 
                     for (SkillType parent : parents) {
-                        player.sendMessage(parent.getName() + " - " + LocaleLoader.getString("Effects.Level", mcMMOPlayer.getSkillLevel(parent), mcMMOPlayer.getSkillXpLevel(parent), mcMMOPlayer.getXpToLevel(parent)));
+                        player.sendMessage(parent.getName() + " - " + LocaleLoader.getString("Effects.Level", profile.getSkillLevel(parent), profile.getSkillXpLevel(parent), profile.getXpToLevel(parent)));
                     }
                 }
 
-                List<String> effectMessages = effectsDisplay();
-
-                if (!effectMessages.isEmpty()) {
+                if (effectsHeaderPermissions()) {
                     player.sendMessage(LocaleLoader.getString("Skills.Header", LocaleLoader.getString("Effects.Effects")));
-
-                    if (isLucky) {
-                        String perkPrefix = LocaleLoader.getString("MOTD.PerksPrefix");
-                        player.sendMessage(perkPrefix + LocaleLoader.getString("Effects.Template", LocaleLoader.getString("Perks.Lucky.Name"), LocaleLoader.getString("Perks.Lucky.Desc", skillName)));
-                    }
-
-                    for (String message : effectMessages) {
-                        player.sendMessage(message);
-                    }
                 }
 
-                List<String> statsMessages = statsDisplay(player, skillValue, hasEndurance, isLucky);
+                effectsDisplay();
 
-                if (!statsMessages.isEmpty()) {
+                if (statsHeaderPermissions()) {
                     player.sendMessage(LocaleLoader.getString("Skills.Header", LocaleLoader.getString("Commands.Stats.Self")));
-
-                    for (String message : statsMessages) {
-                        player.sendMessage(message);
-                    }
                 }
 
+                statsDisplay();
+
                 player.sendMessage(LocaleLoader.getString("Guides.Available", skillName, skillName.toLowerCase()));
                 return true;
 
@@ -123,11 +121,11 @@ public abstract class SkillCommand implements TabExecutor {
         }
     }
 
-    protected int calculateRank(float skillValue, int maxLevel, int rankChangeLevel) {
+    protected int calculateRank(int maxLevel, int rankChangeLevel) {
         return Math.min((int) skillValue, maxLevel) / rankChangeLevel;
     }
 
-    protected String[] calculateAbilityDisplayValues(double chance, boolean isLucky) {
+    protected String[] calculateAbilityDisplayValues(double chance) {
         String[] displayValues = new String[2];
 
         displayValues[0] = percent.format(Math.min(chance, 100.0D) / 100.0D);
@@ -136,11 +134,11 @@ public abstract class SkillCommand implements TabExecutor {
         return displayValues;
     }
 
-    protected String[] calculateAbilityDisplayValues(float skillValue, int maxBonusLevel, double maxChance, boolean isLucky) {
-        return calculateAbilityDisplayValues((maxChance / maxBonusLevel) * Math.min(skillValue, maxBonusLevel), isLucky);
+    protected String[] calculateAbilityDisplayValues(int maxBonusLevel, double maxChance) {
+        return calculateAbilityDisplayValues((maxChance / maxBonusLevel) * Math.min(skillValue, maxBonusLevel));
     }
 
-    protected String[] calculateLengthDisplayValues(Player player, float skillValue) {
+    protected String[] calculateLengthDisplayValues() {
         int maxLength = skill.getAbility().getMaxLength();
         int length = 2 + (int) (skillValue / AdvancedConfig.getInstance().getAbilityLength());
         int enduranceLength = PerksUtils.handleActivationPerks(player, length, maxLength);
@@ -152,11 +150,22 @@ public abstract class SkillCommand implements TabExecutor {
         return new String[] { String.valueOf(length), String.valueOf(enduranceLength) };
     }
 
-    protected abstract void dataCalculations(Player player, float skillValue, boolean isLucky);
+    protected void luckyEffectsDisplay() {
+        if (isLucky) {
+            String perkPrefix = LocaleLoader.getString("MOTD.PerksPrefix");
+            player.sendMessage(perkPrefix + LocaleLoader.getString("Effects.Template", LocaleLoader.getString("Perks.Lucky.Name"), LocaleLoader.getString("Perks.Lucky.Desc", skillName)));
+        }
+    }
 
-    protected abstract void permissionsCheck(Player player);
+    protected abstract void dataCalculations();
 
-    protected abstract List<String> effectsDisplay();
+    protected abstract void permissionsCheck();
 
-    protected abstract List<String> statsDisplay(Player player, float skillValue, boolean hasEndurance, boolean isLucky);
+    protected abstract boolean effectsHeaderPermissions();
+
+    protected abstract void effectsDisplay();
+
+    protected abstract boolean statsHeaderPermissions();
+
+    protected abstract void statsDisplay();
 }

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

@@ -15,11 +15,13 @@ public class SkillGuideCommand implements CommandExecutor {
     private String header;
     private ArrayList<String> guide;
 
-    private String invalidPage = LocaleLoader.getString("Guides.Page.Invalid");
+    private String invalidPage;
 
-    public SkillGuideCommand(SkillType skill) {
-        header = LocaleLoader.getString("Guides.Header", skill.getName());
-        guide = getGuide(skill);
+    public SkillGuideCommand(SkillType skillType) {
+        header = LocaleLoader.getString("Guides.Header", skillType.getName());
+        guide = getGuide(skillType);
+
+        invalidPage = LocaleLoader.getString("Guides.Page.Invalid");
     }
 
     @Override
@@ -66,8 +68,8 @@ public class SkillGuideCommand implements CommandExecutor {
         }
     }
 
-    private ArrayList<String> grabPageContents(int page) {
-        int pageIndexStart = 8 * (page - 1); // Determine what string to start at
+    private ArrayList<String> grabPageContents(int pagenum) {
+        int pageIndexStart = 8 * (pagenum - 1); // Determine what string to start at
         ArrayList<String> allStrings = new ArrayList<String>();
 
         allStrings.add(header);
@@ -82,15 +84,15 @@ public class SkillGuideCommand implements CommandExecutor {
             }
         }
 
-        allStrings.add("Page " + page + " of " + getTotalPageNumber());
+        allStrings.add("Page " + pagenum + " of " + getTotalPageNumber());
         return allStrings;
     }
 
-    private ArrayList<String> getGuide(SkillType skill) {
+    private ArrayList<String> getGuide(SkillType skillType) {
         ArrayList<String> guide = new ArrayList<String>();
 
         for (int i = 0; i < 10; i++) {
-            String[] section = LocaleLoader.getString("Guides." + StringUtils.getCapitalized(skill.toString()) + ".Section." + i).split("\n");
+            String[] section = LocaleLoader.getString("Guides." + StringUtils.getCapitalized(skillType.toString()) + ".Section." + i).split("\n");
 
             if (section[0].startsWith("!")) {
                 break;

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

@@ -1,17 +1,11 @@
 package com.gmail.nossr50.commands.skills;
 
-import java.util.ArrayList;
-import java.util.List;
-
-import org.bukkit.entity.Player;
-
 import com.gmail.nossr50.config.AdvancedConfig;
 import com.gmail.nossr50.datatypes.skills.SkillType;
 import com.gmail.nossr50.locale.LocaleLoader;
 import com.gmail.nossr50.skills.smelting.Smelting;
 import com.gmail.nossr50.skills.smelting.Smelting.Tier;
 import com.gmail.nossr50.util.Permissions;
-import com.gmail.nossr50.util.player.UserManager;
 
 public class SmeltingCommand extends SkillCommand {
     private String burnTimeModifier;
@@ -30,7 +24,7 @@ public class SmeltingCommand extends SkillCommand {
     }
 
     @Override
-    protected void dataCalculations(Player player, float skillValue, boolean isLucky) {
+    protected void dataCalculations() {
         // FUEL EFFICIENCY
         if (canFuelEfficiency) {
             burnTimeModifier = decimal.format(1 + ((skillValue / Smelting.burnModifierMaxLevel) * Smelting.burnTimeMultiplier));
@@ -38,21 +32,21 @@ public class SmeltingCommand extends SkillCommand {
 
         // SECOND SMELT
         if (canSecondSmelt) {
-            String[] secondSmeltStrings = calculateAbilityDisplayValues(skillValue, Smelting.secondSmeltMaxLevel, Smelting.secondSmeltMaxChance, isLucky);
+            String[] secondSmeltStrings = calculateAbilityDisplayValues(Smelting.secondSmeltMaxLevel, Smelting.secondSmeltMaxChance);
             secondSmeltChance = secondSmeltStrings[0];
             secondSmeltChanceLucky = secondSmeltStrings[1];
         }
 
         // FLUX MINING
         if (canFluxMine) {
-            String[] fluxMiningStrings = calculateAbilityDisplayValues(Smelting.fluxMiningChance, isLucky);
+            String[] fluxMiningStrings = calculateAbilityDisplayValues(Smelting.fluxMiningChance);
             fluxMiningChance = fluxMiningStrings[0];
             fluxMiningChanceLucky = fluxMiningStrings[1];
         }
     }
 
     @Override
-    protected void permissionsCheck(Player player) {
+    protected void permissionsCheck() {
         canFuelEfficiency = Permissions.fuelEfficiency(player);
         canSecondSmelt = Permissions.doubleDrops(player, skill);
         canFluxMine = Permissions.fluxMining(player);
@@ -60,60 +54,64 @@ public class SmeltingCommand extends SkillCommand {
     }
 
     @Override
-    protected List<String> effectsDisplay() {
-        List<String> messages = new ArrayList<String>();
-
-        if (canFuelEfficiency) {
-            messages.add(LocaleLoader.getString("Effects.Template", LocaleLoader.getString("Smelting.Effect.0"), LocaleLoader.getString("Smelting.Effect.1")));
-        }
-
-        if (canSecondSmelt) {
-            messages.add(LocaleLoader.getString("Effects.Template", LocaleLoader.getString("Smelting.Effect.2"), LocaleLoader.getString("Smelting.Effect.3")));
-        }
-
-        if (canVanillaXPBoost) {
-            messages.add(LocaleLoader.getString("Effects.Template", LocaleLoader.getString("Smelting.Effect.4"), LocaleLoader.getString("Smelting.Effect.5")));
-        }
-
-        if (canFluxMine) {
-            messages.add(LocaleLoader.getString("Effects.Template", LocaleLoader.getString("Smelting.Effect.6"), LocaleLoader.getString("Smelting.Effect.7")));
-        }
-
-        return messages;
+    protected boolean effectsHeaderPermissions() {
+        return canFluxMine || canFuelEfficiency || canSecondSmelt || canVanillaXPBoost;
     }
 
     @Override
-    protected List<String> statsDisplay(Player player, float skillValue, boolean hasEndurance, boolean isLucky) {
-        List<String> messages = new ArrayList<String>();
+    protected void effectsDisplay() {
+        luckyEffectsDisplay();
 
         if (canFuelEfficiency) {
-            messages.add(LocaleLoader.getString("Smelting.Ability.FuelEfficiency", burnTimeModifier));
+            player.sendMessage(LocaleLoader.getString("Effects.Template", LocaleLoader.getString("Smelting.Effect.0"), LocaleLoader.getString("Smelting.Effect.1")));
         }
 
         if (canSecondSmelt) {
-            messages.add(LocaleLoader.getString("Smelting.Ability.SecondSmelt", secondSmeltChance) + (isLucky ? LocaleLoader.getString("Perks.Lucky.Bonus", secondSmeltChanceLucky) : ""));
+            player.sendMessage(LocaleLoader.getString("Effects.Template", LocaleLoader.getString("Smelting.Effect.2"), LocaleLoader.getString("Smelting.Effect.3")));
+        }
+
+        if (canVanillaXPBoost) {
+            player.sendMessage(LocaleLoader.getString("Effects.Template", LocaleLoader.getString("Smelting.Effect.4"), LocaleLoader.getString("Smelting.Effect.5")));
+        }
+
+        if (canFluxMine) {
+            player.sendMessage(LocaleLoader.getString("Effects.Template", LocaleLoader.getString("Smelting.Effect.6"), LocaleLoader.getString("Smelting.Effect.7")));
+        }
+    }
+
+    @Override
+    protected boolean statsHeaderPermissions() {
+        return canFluxMine || canFuelEfficiency || canSecondSmelt || canVanillaXPBoost;
+    }
+
+    @Override
+    protected void statsDisplay() {
+        if (canFuelEfficiency) {
+            player.sendMessage(LocaleLoader.getString("Smelting.Ability.FuelEfficiency", burnTimeModifier));
+        }
+
+        if (canSecondSmelt) {
+            player.sendMessage(LocaleLoader.getString("Smelting.Ability.SecondSmelt", secondSmeltChance) + (isLucky ? LocaleLoader.getString("Perks.Lucky.Bonus", secondSmeltChanceLucky) : ""));
         }
 
         if (canVanillaXPBoost) {
             int unlockLevel = AdvancedConfig.getInstance().getSmeltingRankLevel(Tier.ONE);
 
             if (skillValue < unlockLevel) {
-                messages.add(LocaleLoader.getString("Ability.Generic.Template.Lock", LocaleLoader.getString("Smelting.Ability.Locked.0", unlockLevel)));
+                player.sendMessage(LocaleLoader.getString("Ability.Generic.Template.Lock", LocaleLoader.getString("Smelting.Ability.Locked.0", unlockLevel)));
             }
             else {
-                messages.add(LocaleLoader.getString("Smelting.Ability.VanillaXPBoost", UserManager.getPlayer(player).getSmeltingManager().getVanillaXpMultiplier()));
+                player.sendMessage(LocaleLoader.getString("Smelting.Ability.VanillaXPBoost", mcMMOPlayer.getSmeltingManager().getVanillaXpMultiplier()));
             }
         }
 
         if (canFluxMine) {
             if (skillValue < Smelting.fluxMiningUnlockLevel) {
-                messages.add(LocaleLoader.getString("Ability.Generic.Template.Lock", LocaleLoader.getString("Smelting.Ability.Locked.1", Smelting.fluxMiningUnlockLevel)));
+                player.sendMessage(LocaleLoader.getString("Ability.Generic.Template.Lock", LocaleLoader.getString("Smelting.Ability.Locked.1", Smelting.fluxMiningUnlockLevel)));
             }
             else {
-                messages.add(LocaleLoader.getString("Smelting.Ability.FluxMining", fluxMiningChance) + (isLucky ? LocaleLoader.getString("Perks.Lucky.Bonus", fluxMiningChanceLucky) : ""));
+                player.sendMessage(LocaleLoader.getString("Smelting.Ability.FluxMining", fluxMiningChance) + (isLucky ? LocaleLoader.getString("Perks.Lucky.Bonus", fluxMiningChanceLucky) : ""));
             }
         }
-
-        return messages;
     }
 }

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

@@ -1,10 +1,5 @@
 package com.gmail.nossr50.commands.skills;
 
-import java.util.ArrayList;
-import java.util.List;
-
-import org.bukkit.entity.Player;
-
 import com.gmail.nossr50.datatypes.skills.SkillType;
 import com.gmail.nossr50.locale.LocaleLoader;
 import com.gmail.nossr50.skills.swords.Swords;
@@ -28,10 +23,10 @@ public class SwordsCommand extends SkillCommand {
     }
 
     @Override
-    protected void dataCalculations(Player player, float skillValue, boolean isLucky) {
+    protected void dataCalculations() {
         // SERRATED STRIKES
         if (canSerratedStrike) {
-            String[] serratedStrikesStrings = calculateLengthDisplayValues(player, skillValue);
+            String[] serratedStrikesStrings = calculateLengthDisplayValues();
             serratedStrikesLength = serratedStrikesStrings[0];
             serratedStrikesLengthEndurance = serratedStrikesStrings[1];
         }
@@ -40,64 +35,68 @@ public class SwordsCommand extends SkillCommand {
         if (canBleed) {
             bleedLength = (skillValue >= Swords.bleedMaxBonusLevel) ? Swords.bleedMaxTicks : Swords.bleedBaseTicks;
 
-            String[] bleedStrings = calculateAbilityDisplayValues(skillValue, Swords.bleedMaxBonusLevel, Swords.bleedMaxChance, isLucky);
+            String[] bleedStrings = calculateAbilityDisplayValues(Swords.bleedMaxBonusLevel, Swords.bleedMaxChance);
             bleedChance = bleedStrings[0];
             bleedChanceLucky = bleedStrings[1];
         }
 
         // COUNTER ATTACK
         if (canCounter) {
-            String[] counterAttackStrings = calculateAbilityDisplayValues(skillValue, Swords.counterAttackMaxBonusLevel, Swords.counterAttackMaxChance, isLucky);
+            String[] counterAttackStrings = calculateAbilityDisplayValues(Swords.counterAttackMaxBonusLevel, Swords.counterAttackMaxChance);
             counterAttackChance = counterAttackStrings[0];
             counterAttackChanceLucky = counterAttackStrings[1];
         }
     }
 
     @Override
-    protected void permissionsCheck(Player player) {
+    protected void permissionsCheck() {
         canBleed = Permissions.bleed(player);
         canCounter = Permissions.counterAttack(player);
         canSerratedStrike = Permissions.serratedStrikes(player);
     }
 
     @Override
-    protected List<String> effectsDisplay() {
-        List<String> messages = new ArrayList<String>();
-
-        if (canCounter) {
-            messages.add(LocaleLoader.getString("Effects.Template", LocaleLoader.getString("Swords.Effect.0"), LocaleLoader.getString("Swords.Effect.1", percent.format(1.0D / Swords.counterAttackModifier))));
-        }
-
-        if (canSerratedStrike) {
-            messages.add(LocaleLoader.getString("Effects.Template", LocaleLoader.getString("Swords.Effect.2"), LocaleLoader.getString("Swords.Effect.3", percent.format(1.0D / Swords.serratedStrikesModifier))));
-            messages.add(LocaleLoader.getString("Effects.Template", LocaleLoader.getString("Swords.Effect.4"), LocaleLoader.getString("Swords.Effect.5", Swords.serratedStrikesBleedTicks)));
-        }
-
-        if (canBleed) {
-            messages.add(LocaleLoader.getString("Effects.Template", LocaleLoader.getString("Swords.Effect.6"), LocaleLoader.getString("Swords.Effect.7")));
-        }
-
-        return messages;
+    protected boolean effectsHeaderPermissions() {
+        return canBleed || canCounter || canSerratedStrike;
     }
 
     @Override
-    protected List<String> statsDisplay(Player player, float skillValue, boolean hasEndurance, boolean isLucky) {
-        List<String> messages = new ArrayList<String>();
+    protected void effectsDisplay() {
+        luckyEffectsDisplay();
 
         if (canCounter) {
-            messages.add(LocaleLoader.getString("Swords.Combat.Counter.Chance", counterAttackChance) + (isLucky ? LocaleLoader.getString("Perks.Lucky.Bonus", counterAttackChanceLucky) : ""));
-        }
-
-        if (canBleed) {
-            messages.add(LocaleLoader.getString("Swords.Combat.Bleed.Length", bleedLength));
-            messages.add(LocaleLoader.getString("Swords.Combat.Bleed.Note"));
-            messages.add(LocaleLoader.getString("Swords.Combat.Bleed.Chance", bleedChance) + (isLucky ? LocaleLoader.getString("Perks.Lucky.Bonus", bleedChanceLucky) : ""));
+            player.sendMessage(LocaleLoader.getString("Effects.Template", LocaleLoader.getString("Swords.Effect.0"), LocaleLoader.getString("Swords.Effect.1", percent.format(1.0D / Swords.counterAttackModifier))));
         }
 
         if (canSerratedStrike) {
-            messages.add(LocaleLoader.getString("Swords.SS.Length", serratedStrikesLength) + (hasEndurance ? LocaleLoader.getString("Perks.ActivationTime.Bonus", serratedStrikesLengthEndurance) : ""));
+            player.sendMessage(LocaleLoader.getString("Effects.Template", LocaleLoader.getString("Swords.Effect.2"), LocaleLoader.getString("Swords.Effect.3", percent.format(1.0D / Swords.serratedStrikesModifier))));
+            player.sendMessage(LocaleLoader.getString("Effects.Template", LocaleLoader.getString("Swords.Effect.4"), LocaleLoader.getString("Swords.Effect.5", Swords.serratedStrikesBleedTicks)));
         }
 
-        return messages;
+        if (canBleed) {
+            player.sendMessage(LocaleLoader.getString("Effects.Template", LocaleLoader.getString("Swords.Effect.6"), LocaleLoader.getString("Swords.Effect.7")));
+        }
+    }
+
+    @Override
+    protected boolean statsHeaderPermissions() {
+        return canBleed || canCounter || canSerratedStrike;
+    }
+
+    @Override
+    protected void statsDisplay() {
+        if (canCounter) {
+            player.sendMessage(LocaleLoader.getString("Swords.Combat.Counter.Chance", counterAttackChance) + (isLucky ? LocaleLoader.getString("Perks.Lucky.Bonus", counterAttackChanceLucky) : ""));
+        }
+
+        if (canBleed) {
+            player.sendMessage(LocaleLoader.getString("Swords.Combat.Bleed.Length", bleedLength));
+            player.sendMessage(LocaleLoader.getString("Swords.Combat.Bleed.Note"));
+            player.sendMessage(LocaleLoader.getString("Swords.Combat.Bleed.Chance", bleedChance) + (isLucky ? LocaleLoader.getString("Perks.Lucky.Bonus", bleedChanceLucky) : ""));
+        }
+
+        if (canSerratedStrike) {
+            player.sendMessage(LocaleLoader.getString("Swords.SS.Length", serratedStrikesLength) + (hasEndurance ? LocaleLoader.getString("Perks.ActivationTime.Bonus", serratedStrikesLengthEndurance) : ""));
+        }
     }
 }

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

@@ -1,10 +1,6 @@
 package com.gmail.nossr50.commands.skills;
 
-import java.util.ArrayList;
-import java.util.List;
-
 import org.bukkit.entity.EntityType;
-import org.bukkit.entity.Player;
 
 import com.gmail.nossr50.config.Config;
 import com.gmail.nossr50.datatypes.skills.SkillType;
@@ -31,16 +27,16 @@ public class TamingCommand extends SkillCommand {
     }
 
     @Override
-    protected void dataCalculations(Player player, float skillValue, boolean isLucky) {
+    protected void dataCalculations() {
         if (canGore) {
-            String[] goreStrings = calculateAbilityDisplayValues(skillValue, Taming.goreMaxBonusLevel, Taming.goreMaxChance, isLucky);
+            String[] goreStrings = calculateAbilityDisplayValues(Taming.goreMaxBonusLevel, Taming.goreMaxChance);
             goreChance = goreStrings[0];
             goreChanceLucky = goreStrings[1];
         }
     }
 
     @Override
-    protected void permissionsCheck(Player player) {
+    protected void permissionsCheck() {
         canBeastLore = Permissions.beastLore(player);
         canCallWild = Permissions.callOfTheWild(player, EntityType.HORSE) || Permissions.callOfTheWild(player, EntityType.WOLF) || Permissions.callOfTheWild(player, EntityType.OCELOT);
         canEnvironmentallyAware = Permissions.environmentallyAware(player);
@@ -53,113 +49,117 @@ public class TamingCommand extends SkillCommand {
     }
 
     @Override
-    protected List<String> effectsDisplay() {
-        List<String> messages = new ArrayList<String>();
-
-        if (canBeastLore) {
-            messages.add(LocaleLoader.getString("Effects.Template", LocaleLoader.getString("Taming.Effect.0"), LocaleLoader.getString("Taming.Effect.1")));
-        }
-
-        if (canGore) {
-            messages.add(LocaleLoader.getString("Effects.Template", LocaleLoader.getString("Taming.Effect.2"), LocaleLoader.getString("Taming.Effect.3")));
-        }
-
-        if (canSharpenedClaws) {
-            messages.add(LocaleLoader.getString("Effects.Template", LocaleLoader.getString("Taming.Effect.4"), LocaleLoader.getString("Taming.Effect.5")));
-        }
-
-        if (canEnvironmentallyAware) {
-            messages.add(LocaleLoader.getString("Effects.Template", LocaleLoader.getString("Taming.Effect.6"), LocaleLoader.getString("Taming.Effect.7")));
-        }
-
-        if (canThickFur) {
-            messages.add(LocaleLoader.getString("Effects.Template", LocaleLoader.getString("Taming.Effect.8"), LocaleLoader.getString("Taming.Effect.9")));
-        }
-
-        if (canShockProof) {
-            messages.add(LocaleLoader.getString("Effects.Template", LocaleLoader.getString("Taming.Effect.10"), LocaleLoader.getString("Taming.Effect.11")));
-        }
-
-        if (canFastFood) {
-            messages.add(LocaleLoader.getString("Effects.Template", LocaleLoader.getString("Taming.Effect.16"), LocaleLoader.getString("Taming.Effect.17")));
-        }
-
-        if (canHolyHound) {
-            messages.add(LocaleLoader.getString("Effects.Template", LocaleLoader.getString("Taming.Effect.18"), LocaleLoader.getString("Taming.Effect.19")));
-        }
-
-        if (canCallWild) {
-            messages.add(LocaleLoader.getString("Effects.Template", LocaleLoader.getString("Taming.Effect.12"), LocaleLoader.getString("Taming.Effect.13")));
-            messages.add(LocaleLoader.getString("Taming.Effect.14", Config.getInstance().getTamingCOTWOcelotCost()));
-            messages.add(LocaleLoader.getString("Taming.Effect.15", Config.getInstance().getTamingCOTWWolfCost()));
-            messages.add(LocaleLoader.getString("Taming.Effect.20", Config.getInstance().getTamingCOTWHorseCost()));
-        }
-
-        return messages;
+    protected boolean effectsHeaderPermissions() {
+        return canBeastLore || canCallWild || canEnvironmentallyAware || canFastFood || canGore || canSharpenedClaws || canShockProof || canThickFur || canHolyHound;
     }
 
     @Override
-    protected List<String> statsDisplay(Player player, float skillValue, boolean hasEndurance, boolean isLucky) {
-        List<String> messages = new ArrayList<String>();
+    protected void effectsDisplay() {
+        luckyEffectsDisplay();
+
+        if (canBeastLore) {
+            player.sendMessage(LocaleLoader.getString("Effects.Template", LocaleLoader.getString("Taming.Effect.0"), LocaleLoader.getString("Taming.Effect.1")));
+        }
+
+        if (canGore) {
+            player.sendMessage(LocaleLoader.getString("Effects.Template", LocaleLoader.getString("Taming.Effect.2"), LocaleLoader.getString("Taming.Effect.3")));
+        }
+
+        if (canSharpenedClaws) {
+            player.sendMessage(LocaleLoader.getString("Effects.Template", LocaleLoader.getString("Taming.Effect.4"), LocaleLoader.getString("Taming.Effect.5")));
+        }
+
+        if (canEnvironmentallyAware) {
+            player.sendMessage(LocaleLoader.getString("Effects.Template", LocaleLoader.getString("Taming.Effect.6"), LocaleLoader.getString("Taming.Effect.7")));
+        }
+
+        if (canThickFur) {
+            player.sendMessage(LocaleLoader.getString("Effects.Template", LocaleLoader.getString("Taming.Effect.8"), LocaleLoader.getString("Taming.Effect.9")));
+        }
+
+        if (canShockProof) {
+            player.sendMessage(LocaleLoader.getString("Effects.Template", LocaleLoader.getString("Taming.Effect.10"), LocaleLoader.getString("Taming.Effect.11")));
+        }
 
+        if (canFastFood) {
+            player.sendMessage(LocaleLoader.getString("Effects.Template", LocaleLoader.getString("Taming.Effect.16"), LocaleLoader.getString("Taming.Effect.17")));
+        }
+
+        if (canHolyHound) {
+            player.sendMessage(LocaleLoader.getString("Effects.Template", LocaleLoader.getString("Taming.Effect.18"), LocaleLoader.getString("Taming.Effect.19")));
+        }
+
+        if (canCallWild) {
+            player.sendMessage(LocaleLoader.getString("Effects.Template", LocaleLoader.getString("Taming.Effect.12"), LocaleLoader.getString("Taming.Effect.13")));
+            player.sendMessage(LocaleLoader.getString("Taming.Effect.14", Config.getInstance().getTamingCOTWOcelotCost()));
+            player.sendMessage(LocaleLoader.getString("Taming.Effect.15", Config.getInstance().getTamingCOTWWolfCost()));
+            player.sendMessage(LocaleLoader.getString("Taming.Effect.20", Config.getInstance().getTamingCOTWHorseCost()));
+        }
+    }
+
+    @Override
+    protected boolean statsHeaderPermissions() {
+        return canEnvironmentallyAware || canFastFood || canGore || canSharpenedClaws || canShockProof || canThickFur || canHolyHound;
+    }
+
+    @Override
+    protected void statsDisplay() {
         if (canFastFood) {
             if (skillValue < Taming.fastFoodServiceUnlockLevel) {
-                messages.add(LocaleLoader.getString("Ability.Generic.Template.Lock", LocaleLoader.getString("Taming.Ability.Locked.4", Taming.fastFoodServiceUnlockLevel)));
+                player.sendMessage(LocaleLoader.getString("Ability.Generic.Template.Lock", LocaleLoader.getString("Taming.Ability.Locked.4", Taming.fastFoodServiceUnlockLevel)));
             }
             else {
-                messages.add(LocaleLoader.getString("Ability.Generic.Template", LocaleLoader.getString("Taming.Ability.Bonus.8"), LocaleLoader.getString("Taming.Ability.Bonus.9", percent.format(Taming.fastFoodServiceActivationChance / 100D))));
+                player.sendMessage(LocaleLoader.getString("Ability.Generic.Template", LocaleLoader.getString("Taming.Ability.Bonus.8"), LocaleLoader.getString("Taming.Ability.Bonus.9", percent.format(Taming.fastFoodServiceActivationChance / 100D))));
             }
         }
 
         if (canEnvironmentallyAware) {
             if (skillValue < Taming.environmentallyAwareUnlockLevel) {
-                messages.add(LocaleLoader.getString("Ability.Generic.Template.Lock", LocaleLoader.getString("Taming.Ability.Locked.0", Taming.environmentallyAwareUnlockLevel)));
+                player.sendMessage(LocaleLoader.getString("Ability.Generic.Template.Lock", LocaleLoader.getString("Taming.Ability.Locked.0", Taming.environmentallyAwareUnlockLevel)));
             }
             else {
-                messages.add(LocaleLoader.getString("Ability.Generic.Template", LocaleLoader.getString("Taming.Ability.Bonus.0"), LocaleLoader.getString("Taming.Ability.Bonus.1")));
+                player.sendMessage(LocaleLoader.getString("Ability.Generic.Template", LocaleLoader.getString("Taming.Ability.Bonus.0"), LocaleLoader.getString("Taming.Ability.Bonus.1")));
             }
         }
 
         if (canThickFur) {
             if (skillValue < Taming.thickFurUnlockLevel) {
-                messages.add(LocaleLoader.getString("Ability.Generic.Template.Lock", LocaleLoader.getString("Taming.Ability.Locked.1", Taming.thickFurUnlockLevel)));
+                player.sendMessage(LocaleLoader.getString("Ability.Generic.Template.Lock", LocaleLoader.getString("Taming.Ability.Locked.1", Taming.thickFurUnlockLevel)));
             }
             else {
-                messages.add(LocaleLoader.getString("Ability.Generic.Template", LocaleLoader.getString("Taming.Ability.Bonus.2"), LocaleLoader.getString("Taming.Ability.Bonus.3", Taming.thickFurModifier)));
+                player.sendMessage(LocaleLoader.getString("Ability.Generic.Template", LocaleLoader.getString("Taming.Ability.Bonus.2"), LocaleLoader.getString("Taming.Ability.Bonus.3", Taming.thickFurModifier)));
             }
         }
 
         if (canHolyHound) {
             if (skillValue < Taming.holyHoundUnlockLevel) {
-                messages.add(LocaleLoader.getString("Ability.Generic.Template.Lock", LocaleLoader.getString("Taming.Ability.Locked.5", Taming.holyHoundUnlockLevel)));
+                player.sendMessage(LocaleLoader.getString("Ability.Generic.Template.Lock", LocaleLoader.getString("Taming.Ability.Locked.5", Taming.holyHoundUnlockLevel)));
             }
             else {
-                messages.add(LocaleLoader.getString("Ability.Generic.Template", LocaleLoader.getString("Taming.Ability.Bonus.10"), LocaleLoader.getString("Taming.Ability.Bonus.11")));
+                player.sendMessage(LocaleLoader.getString("Ability.Generic.Template", LocaleLoader.getString("Taming.Ability.Bonus.10"), LocaleLoader.getString("Taming.Ability.Bonus.11")));
             }
         }
 
         if (canShockProof) {
             if (skillValue < Taming.shockProofUnlockLevel) {
-                messages.add(LocaleLoader.getString("Ability.Generic.Template.Lock", LocaleLoader.getString("Taming.Ability.Locked.2", Taming.shockProofUnlockLevel)));
+                player.sendMessage(LocaleLoader.getString("Ability.Generic.Template.Lock", LocaleLoader.getString("Taming.Ability.Locked.2", Taming.shockProofUnlockLevel)));
             }
             else {
-                messages.add(LocaleLoader.getString("Ability.Generic.Template", LocaleLoader.getString("Taming.Ability.Bonus.4"), LocaleLoader.getString("Taming.Ability.Bonus.5", Taming.shockProofModifier)));
+                player.sendMessage(LocaleLoader.getString("Ability.Generic.Template", LocaleLoader.getString("Taming.Ability.Bonus.4"), LocaleLoader.getString("Taming.Ability.Bonus.5", Taming.shockProofModifier)));
             }
         }
 
         if (canSharpenedClaws) {
             if (skillValue < Taming.sharpenedClawsUnlockLevel) {
-                messages.add(LocaleLoader.getString("Ability.Generic.Template.Lock", LocaleLoader.getString("Taming.Ability.Locked.3", Taming.sharpenedClawsUnlockLevel)));
+                player.sendMessage(LocaleLoader.getString("Ability.Generic.Template.Lock", LocaleLoader.getString("Taming.Ability.Locked.3", Taming.sharpenedClawsUnlockLevel)));
             }
             else {
-                messages.add(LocaleLoader.getString("Ability.Generic.Template", LocaleLoader.getString("Taming.Ability.Bonus.6"), LocaleLoader.getString("Taming.Ability.Bonus.7", Taming.sharpenedClawsBonusDamage)));
+                player.sendMessage(LocaleLoader.getString("Ability.Generic.Template", LocaleLoader.getString("Taming.Ability.Bonus.6"), LocaleLoader.getString("Taming.Ability.Bonus.7", Taming.sharpenedClawsBonusDamage)));
             }
         }
 
         if (canGore) {
-            messages.add(LocaleLoader.getString("Taming.Combat.Chance.Gore", goreChance) + (isLucky ? LocaleLoader.getString("Perks.Lucky.Bonus", goreChanceLucky) : ""));
+            player.sendMessage(LocaleLoader.getString("Taming.Combat.Chance.Gore", goreChance) + (isLucky ? LocaleLoader.getString("Perks.Lucky.Bonus", goreChanceLucky) : ""));
         }
-
-        return messages;
     }
 }

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

@@ -1,10 +1,5 @@
 package com.gmail.nossr50.commands.skills;
 
-import java.util.ArrayList;
-import java.util.List;
-
-import org.bukkit.entity.Player;
-
 import com.gmail.nossr50.datatypes.skills.SkillType;
 import com.gmail.nossr50.locale.LocaleLoader;
 import com.gmail.nossr50.skills.unarmed.Unarmed;
@@ -32,24 +27,24 @@ public class UnarmedCommand extends SkillCommand {
     }
 
     @Override
-    protected void dataCalculations(Player player, float skillValue, boolean isLucky) {
+    protected void dataCalculations() {
         // BERSERK
         if (canBerserk) {
-            String[] berserkStrings = calculateLengthDisplayValues(player, skillValue);
+            String[] berserkStrings = calculateLengthDisplayValues();
             berserkLength = berserkStrings[0];
             berserkLengthEndurance = berserkStrings[1];
         }
 
         // DISARM
         if (canDisarm) {
-            String[] disarmStrings = calculateAbilityDisplayValues(skillValue, Unarmed.disarmMaxBonusLevel, Unarmed.disarmMaxChance, isLucky);
+            String[] disarmStrings = calculateAbilityDisplayValues(Unarmed.disarmMaxBonusLevel, Unarmed.disarmMaxChance);
             disarmChance = disarmStrings[0];
             disarmChanceLucky = disarmStrings[1];
         }
 
         // DEFLECT
         if (canDeflect) {
-            String[] deflectStrings = calculateAbilityDisplayValues(skillValue, Unarmed.deflectMaxBonusLevel, Unarmed.deflectMaxChance, isLucky);
+            String[] deflectStrings = calculateAbilityDisplayValues(Unarmed.deflectMaxBonusLevel, Unarmed.deflectMaxChance);
             deflectChance = deflectStrings[0];
             deflectChanceLucky = deflectStrings[1];
         }
@@ -61,14 +56,14 @@ public class UnarmedCommand extends SkillCommand {
 
         // IRON GRIP
         if (canIronGrip) {
-            String[] ironGripStrings = calculateAbilityDisplayValues(skillValue, Unarmed.ironGripMaxBonusLevel, Unarmed.ironGripMaxChance, isLucky);
+            String[] ironGripStrings = calculateAbilityDisplayValues(Unarmed.ironGripMaxBonusLevel, Unarmed.ironGripMaxChance);
             ironGripChance = ironGripStrings[0];
             ironGripChanceLucky = ironGripStrings[1];
         }
     }
 
     @Override
-    protected void permissionsCheck(Player player) {
+    protected void permissionsCheck() {
         canBerserk = Permissions.berserk(player);
         canBonusDamage = Permissions.bonusDamage(player, skill);
         canDeflect = Permissions.arrowDeflect(player);
@@ -77,56 +72,60 @@ public class UnarmedCommand extends SkillCommand {
     }
 
     @Override
-    protected List<String> effectsDisplay() {
-        List<String> messages = new ArrayList<String>();
-
-        if (canBerserk) {
-            messages.add(LocaleLoader.getString("Effects.Template", LocaleLoader.getString("Unarmed.Effect.0"), LocaleLoader.getString("Unarmed.Effect.1")));
-        }
-
-        if (canDisarm) {
-            messages.add(LocaleLoader.getString("Effects.Template", LocaleLoader.getString("Unarmed.Effect.2"), LocaleLoader.getString("Unarmed.Effect.3")));
-        }
-
-        if (canBonusDamage) {
-            messages.add(LocaleLoader.getString("Effects.Template", LocaleLoader.getString("Unarmed.Effect.4"), LocaleLoader.getString("Unarmed.Effect.5")));
-        }
-
-        if (canDeflect) {
-            messages.add(LocaleLoader.getString("Effects.Template", LocaleLoader.getString("Unarmed.Effect.6"), LocaleLoader.getString("Unarmed.Effect.7")));
-        }
-
-        if (canIronGrip) {
-            messages.add(LocaleLoader.getString("Effects.Template", LocaleLoader.getString("Unarmed.Effect.8"), LocaleLoader.getString("Unarmed.Effect.9")));
-        }
-
-        return messages;
+    protected boolean effectsHeaderPermissions() {
+        return canBerserk || canBonusDamage || canDeflect || canDisarm || canIronGrip;
     }
 
     @Override
-    protected List<String> statsDisplay(Player player, float skillValue, boolean hasEndurance, boolean isLucky) {
-        List<String> messages = new ArrayList<String>();
+    protected void effectsDisplay() {
+        luckyEffectsDisplay();
 
-        if (canBonusDamage) {
-            messages.add(LocaleLoader.getString("Ability.Generic.Template", LocaleLoader.getString("Unarmed.Ability.Bonus.0"), LocaleLoader.getString("Unarmed.Ability.Bonus.1", ironArmBonus)));
-        }
-
-        if (canDeflect) {
-            messages.add(LocaleLoader.getString("Unarmed.Ability.Chance.ArrowDeflect", deflectChance) + (isLucky ? LocaleLoader.getString("Perks.Lucky.Bonus", deflectChanceLucky) : ""));
+        if (canBerserk) {
+            player.sendMessage(LocaleLoader.getString("Effects.Template", LocaleLoader.getString("Unarmed.Effect.0"), LocaleLoader.getString("Unarmed.Effect.1")));
         }
 
         if (canDisarm) {
-            messages.add(LocaleLoader.getString("Unarmed.Ability.Chance.Disarm", disarmChance) + (isLucky ? LocaleLoader.getString("Perks.Lucky.Bonus", disarmChanceLucky) : ""));
+            player.sendMessage(LocaleLoader.getString("Effects.Template", LocaleLoader.getString("Unarmed.Effect.2"), LocaleLoader.getString("Unarmed.Effect.3")));
+        }
+
+        if (canBonusDamage) {
+            player.sendMessage(LocaleLoader.getString("Effects.Template", LocaleLoader.getString("Unarmed.Effect.4"), LocaleLoader.getString("Unarmed.Effect.5")));
+        }
+
+        if (canDeflect) {
+            player.sendMessage(LocaleLoader.getString("Effects.Template", LocaleLoader.getString("Unarmed.Effect.6"), LocaleLoader.getString("Unarmed.Effect.7")));
         }
 
         if (canIronGrip) {
-            messages.add(LocaleLoader.getString("Unarmed.Ability.Chance.IronGrip", ironGripChance) + (isLucky ? LocaleLoader.getString("Perks.Lucky.Bonus", ironGripChanceLucky) : ""));
+            player.sendMessage(LocaleLoader.getString("Effects.Template", LocaleLoader.getString("Unarmed.Effect.8"), LocaleLoader.getString("Unarmed.Effect.9")));
+        }
+    }
+
+    @Override
+    protected boolean statsHeaderPermissions() {
+        return canBerserk || canBonusDamage || canDeflect || canDisarm || canIronGrip;
+    }
+
+    @Override
+    protected void statsDisplay() {
+        if (canBonusDamage) {
+            player.sendMessage(LocaleLoader.getString("Ability.Generic.Template", LocaleLoader.getString("Unarmed.Ability.Bonus.0"), LocaleLoader.getString("Unarmed.Ability.Bonus.1", ironArmBonus)));
+        }
+
+        if (canDeflect) {
+            player.sendMessage(LocaleLoader.getString("Unarmed.Ability.Chance.ArrowDeflect", deflectChance) + (isLucky ? LocaleLoader.getString("Perks.Lucky.Bonus", deflectChanceLucky) : ""));
+        }
+
+        if (canDisarm) {
+            player.sendMessage(LocaleLoader.getString("Unarmed.Ability.Chance.Disarm", disarmChance) + (isLucky ? LocaleLoader.getString("Perks.Lucky.Bonus", disarmChanceLucky) : ""));
+        }
+
+        if (canIronGrip) {
+            player.sendMessage(LocaleLoader.getString("Unarmed.Ability.Chance.IronGrip", ironGripChance) + (isLucky ? LocaleLoader.getString("Perks.Lucky.Bonus", ironGripChanceLucky) : ""));
         }
 
         if (canBerserk) {
-            messages.add(LocaleLoader.getString("Unarmed.Ability.Berserk.Length", berserkLength) + (hasEndurance ? LocaleLoader.getString("Perks.ActivationTime.Bonus", berserkLengthEndurance) : ""));
+            player.sendMessage(LocaleLoader.getString("Unarmed.Ability.Berserk.Length", berserkLength) + (hasEndurance ? LocaleLoader.getString("Perks.ActivationTime.Bonus", berserkLengthEndurance) : ""));
         }
-
-        return messages;
     }
 }

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

@@ -1,10 +1,5 @@
 package com.gmail.nossr50.commands.skills;
 
-import java.util.ArrayList;
-import java.util.List;
-
-import org.bukkit.entity.Player;
-
 import com.gmail.nossr50.config.AdvancedConfig;
 import com.gmail.nossr50.datatypes.skills.SkillType;
 import com.gmail.nossr50.locale.LocaleLoader;
@@ -26,71 +21,75 @@ public class WoodcuttingCommand extends SkillCommand {
     }
 
     @Override
-    protected void dataCalculations(Player player, float skillValue, boolean isLucky) {
+    protected void dataCalculations() {
         // TREE FELLER
         if (canTreeFell) {
-            String[] treeFellerStrings = calculateLengthDisplayValues(player, skillValue);
+            String[] treeFellerStrings = calculateLengthDisplayValues();
             treeFellerLength = treeFellerStrings[0];
             treeFellerLengthEndurance = treeFellerStrings[1];
         }
 
         // DOUBLE DROPS
         if (canDoubleDrop) {
-            String[] doubleDropStrings = calculateAbilityDisplayValues(skillValue, Woodcutting.doubleDropsMaxLevel, Woodcutting.doubleDropsMaxChance, isLucky);
+            String[] doubleDropStrings = calculateAbilityDisplayValues(Woodcutting.doubleDropsMaxLevel, Woodcutting.doubleDropsMaxChance);
             doubleDropChance = doubleDropStrings[0];
             doubleDropChanceLucky = doubleDropStrings[1];
         }
     }
 
     @Override
-    protected void permissionsCheck(Player player) {
+    protected void permissionsCheck() {
         canTreeFell = Permissions.treeFeller(player);
         canDoubleDrop = Permissions.doubleDrops(player, skill) && !skill.getDoubleDropsDisabled();
         canLeafBlow = Permissions.leafBlower(player);
     }
 
     @Override
-    protected List<String> effectsDisplay() {
-        List<String> messages = new ArrayList<String>();
-
-        if (canTreeFell) {
-            messages.add(LocaleLoader.getString("Effects.Template", LocaleLoader.getString("Woodcutting.Effect.0"), LocaleLoader.getString("Woodcutting.Effect.1")));
-        }
-
-        if (canLeafBlow) {
-            messages.add(LocaleLoader.getString("Effects.Template", LocaleLoader.getString("Woodcutting.Effect.2"), LocaleLoader.getString("Woodcutting.Effect.3")));
-        }
-
-        if (canDoubleDrop) {
-            messages.add(LocaleLoader.getString("Effects.Template", LocaleLoader.getString("Woodcutting.Effect.4"), LocaleLoader.getString("Woodcutting.Effect.5")));
-        }
-
-        return messages;
+    protected boolean effectsHeaderPermissions() {
+        return canDoubleDrop || canLeafBlow || canTreeFell;
     }
 
     @Override
-    protected List<String> statsDisplay(Player player, float skillValue, boolean hasEndurance, boolean isLucky) {
-        List<String> messages = new ArrayList<String>();
+    protected void effectsDisplay() {
+        luckyEffectsDisplay();
 
+        if (canTreeFell) {
+            player.sendMessage(LocaleLoader.getString("Effects.Template", LocaleLoader.getString("Woodcutting.Effect.0"), LocaleLoader.getString("Woodcutting.Effect.1")));
+        }
+
+        if (canLeafBlow) {
+            player.sendMessage(LocaleLoader.getString("Effects.Template", LocaleLoader.getString("Woodcutting.Effect.2"), LocaleLoader.getString("Woodcutting.Effect.3")));
+        }
+
+        if (canDoubleDrop) {
+            player.sendMessage(LocaleLoader.getString("Effects.Template", LocaleLoader.getString("Woodcutting.Effect.4"), LocaleLoader.getString("Woodcutting.Effect.5")));
+        }
+    }
+
+    @Override
+    protected boolean statsHeaderPermissions() {
+        return canDoubleDrop || canLeafBlow || canTreeFell;
+    }
+
+    @Override
+    protected void statsDisplay() {
         if (canLeafBlow) {
             int leafBlowerUnlockLevel = AdvancedConfig.getInstance().getLeafBlowUnlockLevel();
 
             if (skillValue < leafBlowerUnlockLevel) {
-                messages.add(LocaleLoader.getString("Ability.Generic.Template.Lock", LocaleLoader.getString("Woodcutting.Ability.Locked.0", leafBlowerUnlockLevel)));
+                player.sendMessage(LocaleLoader.getString("Ability.Generic.Template.Lock", LocaleLoader.getString("Woodcutting.Ability.Locked.0", leafBlowerUnlockLevel)));
             }
             else {
-                messages.add(LocaleLoader.getString("Ability.Generic.Template", LocaleLoader.getString("Woodcutting.Ability.0"), LocaleLoader.getString("Woodcutting.Ability.1")));
+                player.sendMessage(LocaleLoader.getString("Ability.Generic.Template", LocaleLoader.getString("Woodcutting.Ability.0"), LocaleLoader.getString("Woodcutting.Ability.1")));
             }
         }
 
         if (canDoubleDrop) {
-            messages.add(LocaleLoader.getString("Woodcutting.Ability.Chance.DDrop", doubleDropChance) + (isLucky ? LocaleLoader.getString("Perks.Lucky.Bonus", doubleDropChanceLucky) : ""));
+            player.sendMessage(LocaleLoader.getString("Woodcutting.Ability.Chance.DDrop", doubleDropChance) + (isLucky ? LocaleLoader.getString("Perks.Lucky.Bonus", doubleDropChanceLucky) : ""));
         }
 
         if (canTreeFell) {
-            messages.add(LocaleLoader.getString("Woodcutting.Ability.Length", treeFellerLength) + (hasEndurance ? LocaleLoader.getString("Perks.ActivationTime.Bonus", treeFellerLengthEndurance) : ""));
+            player.sendMessage(LocaleLoader.getString("Woodcutting.Ability.Length", treeFellerLength) + (hasEndurance ? LocaleLoader.getString("Perks.ActivationTime.Bonus", treeFellerLengthEndurance) : ""));
         }
-
-        return messages;
     }
 }

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

@@ -526,9 +526,6 @@ public class AdvancedConfig extends AutoUpdateConfigLoader {
             reason.add("Skills.Taming.SharpenedClaws.Bonus should be at least 1!");
         }
 
-        if (getMaxHorseJumpStrength() < 0 || getMaxHorseJumpStrength() > 2) {
-            reason.add("Skills.Taming.CallOfTheWild.MaxHorseJumpStrength should be between 0 and 2!");
-        }
 
         /* UNARMED */
         if (getDisarmChanceMax() < 1) {
@@ -767,8 +764,6 @@ public class AdvancedConfig extends AutoUpdateConfigLoader {
     public int getSharpenedClawsUnlock() { return config.getInt("Skills.Taming.SharpenedClaws.UnlockLevel", 750); }
     public double getSharpenedClawsBonus() { return config.getDouble("Skills.Taming.SharpenedClaws.Bonus", 2.0D); }
 
-    public double getMaxHorseJumpStrength() { return config.getDouble("Skills.Taming.CallOfTheWild.MaxHorseJumpStrength", 2.0D); }
-
     /* UNARMED */
     public double getDisarmChanceMax() { return config.getDouble("Skills.Unarmed.Disarm.ChanceMax", 33.0D); }
     public int getDisarmMaxBonusLevel() { return config.getInt("Skills.Unarmed.Disarm.MaxBonusLevel", 1000); }

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

@@ -205,6 +205,8 @@ public class Config extends AutoUpdateConfigLoader {
     public boolean getStatsTrackingEnabled() { return config.getBoolean("General.Stats_Tracking", true); }
     public boolean getUpdateCheckEnabled() { return config.getBoolean("General.Update_Check", true); }
     public boolean getPreferBeta() { return config.getBoolean("General.Prefer_Beta", false); }
+    public boolean getEventCallbackEnabled() { return config.getBoolean("General.Event_Callback", true); }
+    public boolean getBackupsEnabled() { return config.getBoolean("General.Generate_Backups", true); }
     public boolean getVerboseLoggingEnabled() { return config.getBoolean("General.Verbose_Logging", false); }
     public boolean getConfigOverwriteEnabled() { return config.getBoolean("General.Config_Update_Overwrite", true); }
 
@@ -217,8 +219,6 @@ public class Config extends AutoUpdateConfigLoader {
 
     public boolean getMatchOfflinePlayers() { return config.getBoolean("Commands.Generic.Match_OfflinePlayers", false); }
 
-    public boolean getLevelUpSoundsEnabled() { return config.getBoolean("General.LevelUp_Sounds", true); }
-
     /* Mob Healthbar */
     public MobHealthbarType getMobHealthbarDefault() {
         try {
@@ -266,12 +266,6 @@ public class Config extends AutoUpdateConfigLoader {
     public int getPurgeInterval() { return config.getInt("Database_Purging.Purge_Interval", -1); }
     public int getOldUsersCutoff() { return config.getInt("Database_Purging.Old_User_Cutoff", 6); }
 
-    /* Backups */
-    public boolean getBackupsEnabled() { return config.getBoolean("Backups.Enabled", true); }
-    public boolean getKeepLast24Hours() { return config.getBoolean("Backups.Keep.Last_24_Hours", true); }
-    public boolean getKeepDailyLastWeek() { return config.getBoolean("Backups.Keep.Daily_Last_Week", true); }
-    public boolean getKeepWeeklyPastMonth() { return config.getBoolean("Backups.Keep.Weekly_Past_Months", true); }
-
     /* mySQL */
     public boolean getUseMySQL() { return config.getBoolean("MySQL.Enabled", false); }
     public String getMySQLTablePrefix() { return config.getString("MySQL.Database.TablePrefix", "mcmmo_"); }
@@ -322,7 +316,6 @@ public class Config extends AutoUpdateConfigLoader {
     public int getChimaeraCooldown() { return config.getInt("Items.Chimaera_Wing.Cooldown", 240); }
     public int getChimaeraWarmup() { return config.getInt("Items.Chimaera_Wing.Warmup", 5); }
     public int getChimaeraRecentlyHurtCooldown() { return config.getInt("Items.Chimaera_Wing.RecentlyHurt_Cooldown", 60); }
-    public boolean getChimaeraSoundEnabled() { return config.getBoolean("Items.Chimaera_Wing.Sound_Enabled", true); }
 
     /* Particles */
     public boolean getAbilityActivationEffectEnabled() { return config.getBoolean("Particles.Ability_Activation", true); }
@@ -406,10 +399,8 @@ public class Config extends AutoUpdateConfigLoader {
 
     /* Repair */
     public boolean getRepairAnvilMessagesEnabled() { return config.getBoolean("Skills.Repair.Anvil_Messages", true); }
-    public boolean getRepairAnvilPlaceSoundsEnabled() { return config.getBoolean("Skills.Repair.Anvil_Placed_Sounds", true); }
-    public boolean getRepairAnvilUseSoundsEnabled() { return config.getBoolean("Skills.Repair.Anvil_Use_Sounds", true); }
     public Material getRepairAnvilMaterial() { return Material.matchMaterial(config.getString("Skills.Repair.Anvil_Material", "IRON_BLOCK")); }
-    public Material getSalvageAnvilMaterial() { return Material.matchMaterial(config.getString("Skills.Repair.Salvage_Anvil_Material", "GOLD_BLOCK")); }
+    public Material getSalvageAnvilMaterial() { return Material.matchMaterial(config.getString("Skills.Repair.Salvage_Anvil_ID", "GOLD_BLOCK")); }
     public boolean getSalvageTools() { return config.getBoolean("Skills.Repair.Salvage_tools", true); }
     public boolean getSalvageArmor() { return config.getBoolean("Skills.Repair.Salvage_armor", true); }
     public boolean getRepairConfirmRequired() { return config.getBoolean("Skills.Repair.Confirm_Required", true); }
@@ -429,7 +420,6 @@ public class Config extends AutoUpdateConfigLoader {
     public boolean getBirchDoubleDropsEnabled() { return config.getBoolean("Double_Drops.Woodcutting.Birch", true); }
     public boolean getSpruceDoubleDropsEnabled() { return config.getBoolean("Double_Drops.Woodcutting.Spruce", true); }
     public boolean getJungleDoubleDropsEnabled() { return config.getBoolean("Double_Drops.Woodcutting.Jungle", true); }
-    public boolean getTreeFellerSoundsEnabled() { return config.getBoolean("Skills.Woodcutting.Tree_Feller_Sounds", true); }
 
     /* AFK Leveling */
     public boolean getAcrobaticsPreventAFK() { return config.getBoolean("Skills.Acrobatics.Prevent_AFK_Leveling", true); }

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

@@ -111,7 +111,7 @@ public class CustomArmorConfig extends ConfigLoader {
                     durability = (short) config.getInt(armorType + "." + armorName + ".Durability", 70);
                 }
 
-                repairables.add(RepairableFactory.getRepairable(armorMaterial, repairMaterial, repairData, 0, repairQuantity, durability, RepairItemType.ARMOR, RepairMaterialType.OTHER, 1.0));
+                repairables.add(RepairableFactory.getRepairable(armorMaterial, repairMaterial, repairData, repairQuantity, 0, durability, RepairItemType.ARMOR, RepairMaterialType.OTHER, 1.0));
             }
 
             materialList.add(armorMaterial);

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

@@ -92,11 +92,9 @@ public class CustomBlockConfig extends ConfigLoader {
             }
 
             int xp = config.getInt(skillType + "." + blockName + ".XP_Gain");
-            int smeltingXp = 0;
 
             if (skillType.equals("Mining") && config.getBoolean(skillType + "." + blockName + ".Is_Ore")) {
                 customOres.add(blockMaterialData);
-                smeltingXp = config.getInt(skillType + "." + blockName + ".Smelting_XP_Gain", xp / 10);
             }
             else if (skillType.equals("Woodcutting")) {
                 if (config.getBoolean(skillType + "." + blockName + ".Is_Log")) {
@@ -108,7 +106,7 @@ public class CustomBlockConfig extends ConfigLoader {
                 }
             }
 
-            customBlockMap.put(blockMaterialData, new CustomBlock(xp, config.getBoolean(skillType + "." + blockName + ".Double_Drops_Enabled"), smeltingXp));
+            customBlockMap.put(blockMaterialData, new CustomBlock(xp, config.getBoolean(skillType + "." + blockName + ".Double_Drops_Enabled")));
         }
     }
 

src/main/java/com/gmail/nossr50/config/treasure/TreasureConfig.java

@@ -68,7 +68,6 @@ public class TreasureConfig extends ConfigLoader {
     private TreasureConfig() {
         super("treasures.yml");
         loadKeys();
-        validate();
     }
 
     public static TreasureConfig getInstance() {
@@ -79,43 +78,6 @@ public class TreasureConfig extends ConfigLoader {
         return instance;
     }
 
-    @Override
-    protected boolean validateKeys() {
-        // Validate all the settings!
-        List<String> reason = new ArrayList<String>();
-
-        for (String tier : config.getConfigurationSection("Enchantment_Drop_Rates").getKeys(false)) {
-            double totalEnchantDropRate = 0;
-            double totalItemDropRate = 0;
-
-            for (Rarity rarity : Rarity.values()) {
-                double enchantDropRate = config.getDouble("Enchantment_Drop_Rates." + tier + "." + rarity.toString());
-                double itemDropRate = config.getDouble("Item_Drop_Rates." + tier + "." + rarity.toString());
-
-                if ((enchantDropRate < 0.0 || enchantDropRate > 100.0) && rarity != Rarity.TRAP && rarity != Rarity.RECORD) {
-                    reason.add("The enchant drop rate for " + tier + " items that are " + rarity.toString() + "should be between 0.0 and 100.0!");
-                }
-
-                if (itemDropRate < 0.0 || itemDropRate > 100.0) {
-                    reason.add("The item drop rate for " + tier + " items that are " + rarity.toString() + "should be between 0.0 and 100.0!");
-                }
-
-                totalEnchantDropRate += enchantDropRate;
-                totalItemDropRate += itemDropRate;
-            }
-
-            if (totalEnchantDropRate < 0 || totalEnchantDropRate > 100.0) {
-                reason.add("The total enchant drop rate for " + tier + " should be between 0.0 and 100.0!");
-            }
-
-            if (totalItemDropRate < 0 || totalItemDropRate > 100.0) {
-                reason.add("The total item drop rate for " + tier + " should be between 0.0 and 100.0!");
-            }
-        }
-
-        return noErrorsInConfig(reason);
-    }
-
     @Override
     protected void loadKeys() {
         if (config.getConfigurationSection("Treasures") != null) {

src/main/java/com/gmail/nossr50/database/FlatfileDatabaseManager.java

@@ -251,17 +251,17 @@ public final class FlatfileDatabaseManager implements DatabaseManager {
                         writer.append(":");
                         writer.append(profile.getSkillLevel(SkillType.TAMING)).append(":");
                         writer.append(profile.getSkillXpLevel(SkillType.TAMING)).append(":");
-                        writer.append((int) profile.getAbilityDATS(AbilityType.BERSERK)).append(":");
-                        writer.append((int) profile.getAbilityDATS(AbilityType.GIGA_DRILL_BREAKER)).append(":");
-                        writer.append((int) profile.getAbilityDATS(AbilityType.TREE_FELLER)).append(":");
-                        writer.append((int) profile.getAbilityDATS(AbilityType.GREEN_TERRA)).append(":");
-                        writer.append((int) profile.getAbilityDATS(AbilityType.SERRATED_STRIKES)).append(":");
-                        writer.append((int) profile.getAbilityDATS(AbilityType.SKULL_SPLITTER)).append(":");
-                        writer.append((int) profile.getAbilityDATS(AbilityType.SUPER_BREAKER)).append(":");
+                        writer.append((int) profile.getSkillDATS(AbilityType.BERSERK)).append(":");
+                        writer.append((int) profile.getSkillDATS(AbilityType.GIGA_DRILL_BREAKER)).append(":");
+                        writer.append((int) profile.getSkillDATS(AbilityType.TREE_FELLER)).append(":");
+                        writer.append((int) profile.getSkillDATS(AbilityType.GREEN_TERRA)).append(":");
+                        writer.append((int) profile.getSkillDATS(AbilityType.SERRATED_STRIKES)).append(":");
+                        writer.append((int) profile.getSkillDATS(AbilityType.SKULL_SPLITTER)).append(":");
+                        writer.append((int) profile.getSkillDATS(AbilityType.SUPER_BREAKER)).append(":");
                         writer.append(":");
                         writer.append(profile.getSkillLevel(SkillType.FISHING)).append(":");
                         writer.append(profile.getSkillXpLevel(SkillType.FISHING)).append(":");
-                        writer.append((int) profile.getAbilityDATS(AbilityType.BLAST_MINING)).append(":");
+                        writer.append((int) profile.getSkillDATS(AbilityType.BLAST_MINING)).append(":");
                         writer.append(System.currentTimeMillis() / Misc.TIME_CONVERSION_FACTOR).append(":");
                         MobHealthbarType mobHealthbarType = profile.getMobHealthbarType();
                         writer.append(mobHealthbarType == null ? Config.getInstance().getMobHealthbarDefault().toString() : mobHealthbarType.toString()).append(":");

src/main/java/com/gmail/nossr50/database/SQLDatabaseManager.java

@@ -139,14 +139,14 @@ public final class SQLDatabaseManager implements DatabaseManager {
                     + ", herbalism = ?, excavation = ?, swords = ?"
                     + ", axes = ?, blast_mining = ? WHERE user_id = ?",
                 userId,
-                profile.getAbilityDATS(AbilityType.SUPER_BREAKER),
-                profile.getAbilityDATS(AbilityType.TREE_FELLER),
-                profile.getAbilityDATS(AbilityType.BERSERK),
-                profile.getAbilityDATS(AbilityType.GREEN_TERRA),
-                profile.getAbilityDATS(AbilityType.GIGA_DRILL_BREAKER),
-                profile.getAbilityDATS(AbilityType.SERRATED_STRIKES),
-                profile.getAbilityDATS(AbilityType.SKULL_SPLITTER),
-                profile.getAbilityDATS(AbilityType.BLAST_MINING));
+                profile.getSkillDATS(AbilityType.SUPER_BREAKER),
+                profile.getSkillDATS(AbilityType.TREE_FELLER),
+                profile.getSkillDATS(AbilityType.BERSERK),
+                profile.getSkillDATS(AbilityType.GREEN_TERRA),
+                profile.getSkillDATS(AbilityType.GIGA_DRILL_BREAKER),
+                profile.getSkillDATS(AbilityType.SERRATED_STRIKES),
+                profile.getSkillDATS(AbilityType.SKULL_SPLITTER),
+                profile.getSkillDATS(AbilityType.BLAST_MINING));
         success &= saveIntegers(
                 "UPDATE " + tablePrefix + "skills SET "
                     + " taming = ?, mining = ?, repair = ?, woodcutting = ?"

src/main/java/com/gmail/nossr50/datatypes/chat/ChatMode.java

@@ -1,5 +1,6 @@
 package com.gmail.nossr50.datatypes.chat;
 
+import com.gmail.nossr50.datatypes.player.McMMOPlayer;
 import com.gmail.nossr50.locale.LocaleLoader;
 
 public enum ChatMode {
@@ -14,6 +15,51 @@ public enum ChatMode {
         this.disabledMessage = disabledMessage;
     }
 
+    public boolean isEnabled(McMMOPlayer mcMMOPlayer) {
+        switch (this) {
+            case ADMIN:
+                return mcMMOPlayer.getAdminChatMode();
+
+            case PARTY:
+                return mcMMOPlayer.getPartyChatMode();
+
+            default:
+                return false;
+        }
+    }
+
+    public void disable(McMMOPlayer mcMMOPlayer) {
+        switch (this) {
+            case ADMIN:
+                mcMMOPlayer.setAdminChat(false);
+                return;
+
+            case PARTY:
+                mcMMOPlayer.setPartyChat(false);
+                return;
+
+            default:
+                return;
+        }
+    }
+
+    public void enable(McMMOPlayer mcMMOPlayer) {
+        switch (this) {
+            case ADMIN:
+                mcMMOPlayer.setAdminChat(true);
+                mcMMOPlayer.setPartyChat(false);
+                return;
+
+            case PARTY:
+                mcMMOPlayer.setPartyChat(true);
+                mcMMOPlayer.setAdminChat(false);
+                return;
+
+            default:
+                return;
+        }
+    }
+
     public String getEnabledMessage() {
         return enabledMessage;
     }

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

@@ -3,12 +3,10 @@ package com.gmail.nossr50.datatypes.mods;
 public class CustomBlock {
     private int xpGain;
     private boolean canDoubleDrop;
-    private int smeltingXpGain;
 
-    public CustomBlock(int xpGain, boolean canDoubleDrop, int smeltingXpGain) {
+    public CustomBlock(int xpGain, boolean canDoubleDrop) {
         this.xpGain = xpGain;
         this.canDoubleDrop = canDoubleDrop;
-        this.smeltingXpGain = smeltingXpGain;
     }
 
     public int getXpGain() {
@@ -18,8 +16,4 @@ public class CustomBlock {
     public boolean isDoubleDropEnabled() {
         return canDoubleDrop;
     }
-
-    public int getSmeltingXpGain() {
-        return smeltingXpGain;
-    }
 }

src/main/java/com/gmail/nossr50/datatypes/party/PartyTeleportRecord.java

@@ -1,68 +0,0 @@
-package com.gmail.nossr50.datatypes.party;
-
-import org.bukkit.entity.Player;
-
-import com.gmail.nossr50.config.Config;
-import com.gmail.nossr50.util.Misc;
-
-public class PartyTeleportRecord {
-    private Player  requestor;
-    private boolean enabled, confirmRequired;
-    private int     timeout, lastUse;
-
-    public PartyTeleportRecord() {
-        requestor = null;
-        enabled = true;
-        confirmRequired = Config.getInstance().getPTPCommandConfirmRequired();
-        timeout = 0;
-        lastUse = 0;
-    }
-
-    public boolean isEnabled() {
-        return enabled;
-    }
-
-    public void toggleEnabled() {
-        enabled = !enabled;
-    }
-
-    public Player getRequestor() {
-        return requestor;
-    }
-
-    public void setRequestor(Player requestor) {
-        this.requestor = requestor;
-    }
-
-    public boolean hasRequest() {
-        return (requestor != null);
-    }
-
-    public void removeRequest() {
-        requestor = null;
-    }
-
-    public boolean isConfirmRequired() {
-        return confirmRequired;
-    }
-
-    public void toggleConfirmRequired() {
-        confirmRequired = !confirmRequired;
-    }
-
-    public int getLastUse() {
-        return lastUse;
-    }
-
-    public void actualizeLastUse() {
-        lastUse = (int) (System.currentTimeMillis() / Misc.TIME_CONVERSION_FACTOR);
-    }
-
-    public int getTimeout() {
-        return timeout;
-    }
-
-    public void actualizeTimeout() {
-        timeout = (int) (System.currentTimeMillis() / Misc.TIME_CONVERSION_FACTOR);
-    }
-}

src/main/java/com/gmail/nossr50/datatypes/player/McMMOPlayer.java

@@ -6,6 +6,7 @@ import java.util.Set;
 
 import org.bukkit.GameMode;
 import org.bukkit.Location;
+import org.bukkit.Material;
 import org.bukkit.Server;
 import org.bukkit.Sound;
 import org.bukkit.entity.Player;
@@ -16,10 +17,8 @@ import com.gmail.nossr50.mcMMO;
 import com.gmail.nossr50.config.AdvancedConfig;
 import com.gmail.nossr50.config.Config;
 import com.gmail.nossr50.config.experience.ExperienceConfig;
-import com.gmail.nossr50.datatypes.chat.ChatMode;
 import com.gmail.nossr50.datatypes.mods.CustomTool;
 import com.gmail.nossr50.datatypes.party.Party;
-import com.gmail.nossr50.datatypes.party.PartyTeleportRecord;
 import com.gmail.nossr50.datatypes.skills.AbilityType;
 import com.gmail.nossr50.datatypes.skills.SkillType;
 import com.gmail.nossr50.datatypes.skills.ToolType;
@@ -37,6 +36,7 @@ import com.gmail.nossr50.skills.excavation.ExcavationManager;
 import com.gmail.nossr50.skills.fishing.FishingManager;
 import com.gmail.nossr50.skills.herbalism.HerbalismManager;
 import com.gmail.nossr50.skills.mining.MiningManager;
+import com.gmail.nossr50.skills.repair.Repair;
 import com.gmail.nossr50.skills.repair.RepairManager;
 import com.gmail.nossr50.skills.smelting.SmeltingManager;
 import com.gmail.nossr50.skills.swords.SwordsManager;
@@ -52,27 +52,42 @@ import com.gmail.nossr50.util.skills.ParticleEffectUtils;
 import com.gmail.nossr50.util.skills.PerksUtils;
 import com.gmail.nossr50.util.skills.SkillUtils;
 
-import org.apache.commons.lang.Validate;
-
 public class McMMOPlayer {
     private Player        player;
     private PlayerProfile profile;
 
+    /*
+     * Since SkillManager isn't a "polymorphic type" we may prefer to have one field for each of our
+     * class inheriting from SkillManager. This would also prevent the need for casting.
+     * However, by using the map and the loop in the constructor
+     * we make sure that all class inheriting from SkillManager are instanced.
+     * Which solution is better, I let you decide. - bm01
+     */
     private final Map<SkillType, SkillManager> skillManagers = new HashMap<SkillType, SkillManager>();
 
     private Party   party;
     private Party   invite;
     private int     itemShareModifier;
 
-    private PartyTeleportRecord ptpRecord;
+    private Player  ptpRequest;
+    private boolean ptpEnabled = true;
+    private boolean ptpConfirmRequired = Config.getInstance().getPTPCommandConfirmRequired();
+    private long    ptpTimeout;
+    private int     ptpLastUse;
 
     private boolean partyChatMode;
     private boolean adminChatMode;
     private boolean displaySkillNotifications = true;
 
     private boolean abilityUse = true;
+    private boolean placedRepairAnvil;
+    private int     lastRepairClick;
+    private boolean placedSalvageAnvil;
+    private int     lastSalvageClick;
     private boolean godMode;
 
+    private Location hookLocation;
+
     private final Map<AbilityType, Boolean> abilityMode     = new HashMap<AbilityType, Boolean>();
     private final Map<AbilityType, Boolean> abilityInformed = new HashMap<AbilityType, Boolean>();
 
@@ -94,7 +109,6 @@ public class McMMOPlayer {
         this.player = player;
         profile = mcMMO.getDatabaseManager().loadPlayerProfile(playerName, true);
         party = PartyManager.getPlayerParty(playerName);
-        ptpRecord = new PartyTeleportRecord();
 
         /*
          * I'm using this method because it makes code shorter and safer (we don't have to add all SkillTypes manually),
@@ -422,6 +436,68 @@ public class McMMOPlayer {
         databaseATS = System.currentTimeMillis();
     }
 
+    /*
+     * Repair Anvil Placement
+     */
+
+    public boolean getPlacedAnvil(Material anvilType) {
+        if (anvilType == Repair.repairAnvilMaterial) {
+            return placedRepairAnvil;
+        }
+
+        if (anvilType == Repair.salvageAnvilMaterial) {
+            return placedSalvageAnvil;
+        }
+
+        return true;
+    }
+
+    public void togglePlacedAnvil(Material anvilType) {
+        if (anvilType == Repair.repairAnvilMaterial) {
+            placedRepairAnvil = !placedRepairAnvil;
+        }
+
+        if (anvilType == Repair.salvageAnvilMaterial) {
+            placedSalvageAnvil = !placedSalvageAnvil;
+        }
+    }
+
+    /*
+     * Repair Anvil Usage
+     */
+
+    public int getLastAnvilUse(Material anvilType) {
+        if (anvilType == Repair.repairAnvilMaterial) {
+            return lastRepairClick;
+        }
+
+        if (anvilType == Repair.salvageAnvilMaterial) {
+            return lastSalvageClick;
+        }
+
+        return 0;
+    }
+
+    public void setLastAnvilUse(Material anvilType, int value) {
+        if (anvilType == Repair.repairAnvilMaterial) {
+            lastRepairClick = value;
+        }
+
+        if (anvilType == Repair.salvageAnvilMaterial) {
+            lastSalvageClick = value;
+        }
+    }
+
+    public void actualizeLastAnvilUse(Material anvilType) {
+        if (anvilType == Repair.repairAnvilMaterial) {
+            lastRepairClick = (int) (System.currentTimeMillis() / Misc.TIME_CONVERSION_FACTOR);
+        }
+
+        if (anvilType == Repair.salvageAnvilMaterial) {
+            lastSalvageClick = (int) (System.currentTimeMillis() / Misc.TIME_CONVERSION_FACTOR);
+        }
+    }
+
     /*
      * God Mode
      */
@@ -434,6 +510,18 @@ public class McMMOPlayer {
         godMode = !godMode;
     }
 
+    /*
+     * Fishing: Master Angler
+     */
+
+    public Location getHookLocation() {
+        return hookLocation;
+    }
+
+    public void setHookLocation(Location hookLocation) {
+        this.hookLocation = hookLocation;
+    }
+
     /*
      * Skill notifications
      */
@@ -456,7 +544,7 @@ public class McMMOPlayer {
 
         for (SkillType type : SkillType.NON_CHILD_SKILLS) {
             if (type.getPermissions(player)) {
-                powerLevel += getSkillLevel(type);
+                powerLevel += profile.getSkillLevel(type);
             }
         }
 
@@ -466,23 +554,20 @@ public class McMMOPlayer {
     /**
      * Begins an experience gain. The amount will be affected by skill modifiers, global rate, perks, and may be shared with the party
      *
-     * @param skill Skill being used
+     * @param skillType Skill being used
      * @param xp Experience amount to process
      */
-    public void beginXpGain(SkillType skill, float xp) {
-        Validate.isTrue(xp >= 0.0, "XP gained should be greater than or equal to zero.");
-
-        if (xp <= 0.0) {
+    public void beginXpGain(SkillType skillType, float xp) {
+        if (xp == 0) {
             return;
         }
 
-        if (skill.isChildSkill()) {
-            Set<SkillType> parentSkills = FamilyTree.getParents(skill);
-            float splitXp = xp / parentSkills.size();
+        if (skillType.isChildSkill()) {
+            Set<SkillType> parentSkills = FamilyTree.getParents(skillType);
 
             for (SkillType parentSkill : parentSkills) {
                 if (parentSkill.getPermissions(player)) {
-                    beginXpGain(parentSkill, splitXp);
+                    beginXpGain(parentSkill, xp / parentSkills.size());
                 }
             }
 
@@ -490,21 +575,23 @@ public class McMMOPlayer {
         }
 
         // Return if the experience has been shared
-        if (party != null && ShareHandler.handleXpShare(xp, this, skill)) {
+        if (party != null && ShareHandler.handleXpShare(xp, this, skillType)) {
             return;
         }
 
-        beginUnsharedXpGain(skill, xp);
+        beginUnsharedXpGain(skillType, xp);
     }
 
     /**
      * Begins an experience gain. The amount will be affected by skill modifiers, global rate and perks
      *
-     * @param skill Skill being used
+     * @param skillType Skill being used
      * @param xp Experience amount to process
      */
-    public void beginUnsharedXpGain(SkillType skill, float xp) {
-        applyXpGain(skill, modifyXpGain(skill, xp));
+    public void beginUnsharedXpGain(SkillType skillType, float xp) {
+        xp = modifyXpGain(skillType, xp);
+
+        applyXpGain(skillType, xp);
     }
 
     /**
@@ -528,7 +615,7 @@ public class McMMOPlayer {
             return;
         }
 
-        if (!EventUtils.handleXpChangeEvent(player, skillType, xp, true)) {
+        if (!EventUtils.handleXpGainEvent(player, skillType, xp)) {
             return;
         }
 
@@ -542,32 +629,31 @@ public class McMMOPlayer {
      * @param skillType The skill to check
      */
     private void checkXp(SkillType skillType) {
-        if (getSkillXpLevelRaw(skillType) < getXpToLevel(skillType)) {
-            return;
-        }
-
         int levelsGained = 0;
         float xpRemoved = 0;
 
-        while (getSkillXpLevelRaw(skillType) >= getXpToLevel(skillType)) {
-            if (hasReachedLevelCap(skillType)) {
-                setSkillXpLevel(skillType, 0);
-                break;
+        if (profile.getSkillXpLevelRaw(skillType) >= profile.getXpToLevel(skillType)) {
+            while (profile.getSkillXpLevelRaw(skillType) >= profile.getXpToLevel(skillType)) {
+                if ((skillType.getMaxLevel() >= profile.getSkillLevel(skillType) + 1) && (Config.getInstance().getPowerLevelCap() >= getPowerLevel() + 1)) {
+                    int xp = profile.getXpToLevel(skillType);
+                    xpRemoved += xp;
+
+                    profile.removeXp(skillType, xp);
+                    levelsGained++;
+                    profile.skillUp(skillType, 1);
+                }
+                else {
+                    profile.addLevels(skillType, 0); // This seems kinda pointless... why do we have this again?
+                }
             }
 
-            xpRemoved += profile.levelUp(skillType);
-            levelsGained++;
-        }
+            if (!EventUtils.handleLevelChangeEvent(player, skillType, levelsGained, xpRemoved, true)) {
+                return;
+            }
 
-        if (!EventUtils.handleLevelChangeEvent(player, skillType, levelsGained, xpRemoved, true)) {
-            return;
-        }
-
-        if (Config.getInstance().getLevelUpSoundsEnabled()) {
             player.playSound(player.getLocation(), Sound.LEVEL_UP, Misc.LEVELUP_VOLUME, Misc.LEVELUP_PITCH);
+            player.sendMessage(LocaleLoader.getString(StringUtils.getCapitalized(skillType.toString()) + ".Skillup", levelsGained, profile.getSkillLevel(skillType)));
         }
-
-        player.sendMessage(LocaleLoader.getString(StringUtils.getCapitalized(skillType.toString()) + ".Skillup", levelsGained, getSkillLevel(skillType)));
     }
 
     /*
@@ -622,8 +708,52 @@ public class McMMOPlayer {
         invite = null;
     }
 
-    public PartyTeleportRecord getPartyTeleportRecord() {
-        return ptpRecord;
+    public boolean getPtpEnabled() {
+        return ptpEnabled;
+    }
+
+    public void togglePtpUse() {
+        ptpEnabled = !ptpEnabled;
+    }
+
+    public Player getPtpRequest() {
+        return ptpRequest;
+    }
+
+    public void setPtpRequest(Player ptpRequest) {
+        this.ptpRequest = ptpRequest;
+    }
+
+    public boolean hasPtpRequest() {
+        return (ptpRequest != null);
+    }
+
+    public void removePtpRequest() {
+        ptpRequest = null;
+    }
+
+    public boolean getPtpConfirmRequired() {
+        return ptpConfirmRequired;
+    }
+
+    public void togglePtpConfirmRequired() {
+        ptpConfirmRequired = !ptpConfirmRequired;
+    }
+
+    public int getPtpLastUse() {
+        return ptpLastUse;
+    }
+
+    public void actualizePtpLastUse() {
+        ptpLastUse = (int) (System.currentTimeMillis() / Misc.TIME_CONVERSION_FACTOR);
+    }
+
+    public long getPtpTimeout() {
+        return ptpTimeout;
+    }
+
+    public void actualizePtpTimeout() {
+        ptpTimeout = (int) (System.currentTimeMillis() / Misc.TIME_CONVERSION_FACTOR);
     }
 
     public int getItemShareModifier() {
@@ -642,67 +772,28 @@ public class McMMOPlayer {
      * Chat modes
      */
 
-    public boolean isChatEnabled(ChatMode mode) {
-        switch (mode) {
-            case ADMIN:
-                return adminChatMode;
-
-            case PARTY:
-                return partyChatMode;
-
-            default:
-                return false;
-        }
+    public boolean getAdminChatMode() {
+        return adminChatMode;
     }
 
-    public void disableChat(ChatMode mode) {
-        switch (mode) {
-            case ADMIN:
-                adminChatMode = false;
-                return;
-
-            case PARTY:
-                partyChatMode = false;
-                return;
-
-            default:
-                return;
-        }
+    public void setAdminChat(boolean enabled) {
+        adminChatMode = enabled;
     }
 
-    public void enableChat(ChatMode mode) {
-        switch (mode) {
-            case ADMIN:
-                adminChatMode = true;
-                partyChatMode = false;
-                return;
-
-            case PARTY:
-                partyChatMode = true;
-                adminChatMode = false;
-                return;
-
-            default:
-                return;
-        }
-
+    public void toggleAdminChat() {
+        adminChatMode = !adminChatMode;
     }
 
-    public void toggleChat(ChatMode mode) {
-        switch (mode) {
-            case ADMIN:
-                adminChatMode = !adminChatMode;
-                partyChatMode = adminChatMode ? false : partyChatMode;
-                return;
+    public boolean getPartyChatMode() {
+        return partyChatMode;
+    }
 
-            case PARTY:
-                partyChatMode = !partyChatMode;
-                adminChatMode = partyChatMode ? false : adminChatMode;
-                return;
+    public void setPartyChat(boolean enabled) {
+        partyChatMode = enabled;
+    }
 
-            default:
-                return;
-        }
+    public void togglePartyChat() {
+        partyChatMode = !partyChatMode;
     }
 
     public boolean isUsingUnarmed() {
@@ -717,7 +808,7 @@ public class McMMOPlayer {
      * @return Modified experience
      */
     private float modifyXpGain(SkillType skillType, float xp) {
-        if (player.getGameMode() == GameMode.CREATIVE || (skillType.getMaxLevel() <= getSkillLevel(skillType)) || (Config.getInstance().getPowerLevelCap() <= getPowerLevel())) {
+        if (player.getGameMode() == GameMode.CREATIVE || (skillType.getMaxLevel() <= profile.getSkillLevel(skillType)) || (Config.getInstance().getPowerLevelCap() <= getPowerLevel())) {
             return 0;
         }
 
@@ -757,10 +848,6 @@ public class McMMOPlayer {
         ToolType tool = skill.getTool();
         AbilityType ability = skill.getAbility();
 
-        if (!getToolPreparationMode(tool) || !ability.getPermissions(player)) {
-            return;
-        }
-
         setToolPreparationMode(tool, false);
 
         if (getAbilityMode(ability)) {
@@ -781,11 +868,11 @@ public class McMMOPlayer {
             return;
         }
 
-        if (!EventUtils.handlePlayerAbilityActivateEvent(player, ability)) {
+        if (EventUtils.callPlayerAbilityActivateEvent(player, skill).isCancelled()) {
             return;
         }
 
-        int ticks = PerksUtils.handleActivationPerks(player, 2 + (getSkillLevel(skill) / AdvancedConfig.getInstance().getAbilityLength()), ability.getMaxLength());
+        int ticks = PerksUtils.handleActivationPerks(player, 2 + (profile.getSkillLevel(skill) / AdvancedConfig.getInstance().getAbilityLength()), ability.getMaxLength());
 
         // Notify people that ability has been activated
         ParticleEffectUtils.playAbilityEnabledEffect(player);
@@ -797,7 +884,7 @@ public class McMMOPlayer {
         SkillUtils.sendSkillMessage(player, ability.getAbilityPlayer(player));
 
         // Enable the ability
-        profile.setAbilityDATS(ability, System.currentTimeMillis() + (ticks * Misc.TIME_CONVERSION_FACTOR));
+        profile.setSkillDATS(ability, System.currentTimeMillis() + (ticks * Misc.TIME_CONVERSION_FACTOR));
         setAbilityMode(ability, true);
 
         if (ability == AbilityType.SUPER_BREAKER || ability == AbilityType.GIGA_DRILL_BREAKER) {
@@ -863,58 +950,7 @@ public class McMMOPlayer {
      * @return the number of seconds remaining before the cooldown expires
      */
     public int calculateTimeRemaining(AbilityType ability) {
-        long deactivatedTimestamp = profile.getAbilityDATS(ability) * Misc.TIME_CONVERSION_FACTOR;
+        long deactivatedTimestamp = profile.getSkillDATS(ability) * Misc.TIME_CONVERSION_FACTOR;
         return (int) (((deactivatedTimestamp + (PerksUtils.handleCooldownPerks(player, ability.getCooldown()) * Misc.TIME_CONVERSION_FACTOR)) - System.currentTimeMillis()) / Misc.TIME_CONVERSION_FACTOR);
     }
-
-    private boolean hasReachedLevelCap(SkillType skill) {
-        return (skill.getMaxLevel() < getSkillLevel(skill) + 1) || (Config.getInstance().getPowerLevelCap() < getPowerLevel() + 1);
-    }
-
-    /*
-     * These functions are wrapped from PlayerProfile so that we don't always have to store it alongside the McMMOPlayer object.
-     */
-    public int getSkillLevel(SkillType skill) {
-        return profile.getSkillLevel(skill);
-    }
-
-    public float getSkillXpLevelRaw(SkillType skill) {
-        return profile.getSkillXpLevelRaw(skill);
-    }
-
-    public int getSkillXpLevel(SkillType skill) {
-        return profile.getSkillXpLevel(skill);
-    }
-
-    public void setSkillXpLevel(SkillType skill, float xpLevel) {
-        profile.setSkillXpLevel(skill, xpLevel);
-    }
-
-    public int getXpToLevel(SkillType skill) {
-        return profile.getXpToLevel(skill);
-    }
-
-    public void removeXp(SkillType skill, int xp) {
-        profile.removeXp(skill, xp);
-    }
-
-    public void modifySkill(SkillType skill, int level) {
-        profile.modifySkill(skill, level);
-    }
-
-    public void addLevels(SkillType skill, int levels) {
-        profile.addLevels(skill, levels);
-    }
-
-    public void addXp(SkillType skill, float xp) {
-        profile.addXp(skill, xp);
-    }
-
-    public void setAbilityDATS(AbilityType ability, long DATS) {
-        profile.setAbilityDATS(ability, DATS);
-    }
-
-    public void resetCooldowns() {
-        profile.resetCooldowns();
-    }
 }

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

@@ -4,6 +4,8 @@ import java.util.HashMap;
 import java.util.Map;
 import java.util.Set;
 
+import org.bukkit.scoreboard.Scoreboard;
+
 import com.gmail.nossr50.mcMMO;
 import com.gmail.nossr50.config.Config;
 import com.gmail.nossr50.config.experience.ExperienceConfig;
@@ -21,19 +23,20 @@ public class PlayerProfile {
 
     /* HUDs */
     private MobHealthbarType mobHealthbarType;
+    private Scoreboard playerStatsScoreboard;
 
     /* Skill Data */
     private final Map<SkillType, Integer>   skills     = new HashMap<SkillType, Integer>();   // Skill & Level
     private final Map<SkillType, Float>     skillsXp   = new HashMap<SkillType, Float>();     // Skill & XP
-    private final Map<AbilityType, Integer> abilityDATS = new HashMap<AbilityType, Integer>(); // Ability & Cooldown
+    private final Map<AbilityType, Integer> skillsDATS = new HashMap<AbilityType, Integer>(); // Ability & Cooldown
 
     public PlayerProfile(String playerName) {
         this.playerName = playerName;
 
         mobHealthbarType = Config.getInstance().getMobHealthbarDefault();
 
-        for (AbilityType abilityType : AbilityType.NORMAL_ABILITIES) {
-            abilityDATS.put(abilityType, 0);
+        for (AbilityType abilityType : AbilityType.values()) {
+            skillsDATS.put(abilityType, 0);
         }
 
         for (SkillType skillType : SkillType.NON_CHILD_SKILLS) {
@@ -47,13 +50,17 @@ public class PlayerProfile {
         this.loaded = isLoaded;
     }
 
-    public PlayerProfile(String playerName, Map<SkillType, Integer> levelData, Map<SkillType, Float> xpData, Map<AbilityType, Integer> cooldownData, MobHealthbarType mobHealthbarType) {
-        this.playerName = playerName;
+    /**
+     * Calling this constructor is considered loading the profile.
+     */
+    public PlayerProfile(String playerName, Map<SkillType, Integer> argSkills, Map<SkillType, Float> argSkillsXp, Map<AbilityType, Integer> argSkillsDats, MobHealthbarType mobHealthbarType) {
+        this(playerName);
+
         this.mobHealthbarType = mobHealthbarType;
 
-        skills.putAll(levelData);
-        skillsXp.putAll(xpData);
-        abilityDATS.putAll(cooldownData);
+        this.skills.putAll(argSkills);
+        this.skillsXp.putAll(argSkillsXp);
+        this.skillsDATS.putAll(argSkillsDats);
 
         loaded = true;
     }
@@ -64,7 +71,6 @@ public class PlayerProfile {
         }
 
         changed = !mcMMO.getDatabaseManager().saveUser(this);
-
         if (changed) {
             mcMMO.p.getLogger().warning("PlayerProfile for " + playerName + " failed to save");
         }
@@ -90,40 +96,54 @@ public class PlayerProfile {
         this.mobHealthbarType = mobHealthbarType;
     }
 
+    /*
+     * Scoreboards
+     */
+
+    public Scoreboard getPlayerStatsScoreboard() {
+        return playerStatsScoreboard;
+    }
+
+    public void setPlayerStatsScoreboard(Scoreboard statsScoreboard) {
+        this.playerStatsScoreboard = statsScoreboard;
+    }
+
     /*
      * Cooldowns
      */
 
     /**
-     * Get the current deactivation timestamp of an ability.
+     * Get the current DATS of a skill.
      *
-     * @param ability The {@link AbilityType} to get the DATS for
-     * @return the deactivation timestamp for the ability
+     * @param abilityType Ability to get the DATS for
+     * @return the DATS for the ability
      */
-    public long getAbilityDATS(AbilityType ability) {
-        return abilityDATS.get(ability);
+    public long getSkillDATS(AbilityType abilityType) {
+        return skillsDATS.get(abilityType);
     }
 
     /**
-     * Set the current deactivation timestamp of an ability.
+     * Set the current DATS of a skill.
      *
-     * @param ability The {@link AbilityType} to set the DATS for
+     *  @param abilityType Ability to set the DATS for
      * @param DATS the DATS of the ability
      */
-    protected void setAbilityDATS(AbilityType ability, long DATS) {
+    public void setSkillDATS(AbilityType abilityType, long DATS) {
+        int wearsOff = (int) (DATS * .001D);
+
         changed = true;
 
-        abilityDATS.put(ability, (int) (DATS * .001D));
+        skillsDATS.put(abilityType, wearsOff);
     }
 
     /**
-     * Reset all ability cooldowns.
+     * Reset all skill cooldowns.
      */
-    protected void resetCooldowns() {
+    public void resetCooldowns() {
         changed = true;
 
-        for (AbilityType ability : abilityDATS.keySet()) {
-            abilityDATS.put(ability, 0);
+        for (AbilityType ability : skillsDATS.keySet()) {
+            skillsDATS.put(ability, 0);
         }
     }
 
@@ -131,102 +151,96 @@ public class PlayerProfile {
      * Xp Functions
      */
 
-    public int getSkillLevel(SkillType skill) {
-        return skill.isChildSkill() ? getChildSkillLevel(skill) : skills.get(skill);
+    public int getSkillLevel(SkillType skillType) {
+        return skillType.isChildSkill() ? getChildSkillLevel(skillType) : skills.get(skillType);
     }
 
-    public float getSkillXpLevelRaw(SkillType skill) {
-        return skillsXp.get(skill);
+    public float getSkillXpLevelRaw(SkillType skillType) {
+        return skillsXp.get(skillType);
     }
 
-    public int getSkillXpLevel(SkillType skill) {
-        return (int) Math.floor(getSkillXpLevelRaw(skill));
+    public int getSkillXpLevel(SkillType skillType) {
+        return (int) Math.floor(getSkillXpLevelRaw(skillType));
     }
 
-    public void setSkillXpLevel(SkillType skill, float xpLevel) {
-        if (skill.isChildSkill()) {
+    public void setSkillXpLevel(SkillType skillType, float newValue) {
+        if (skillType.isChildSkill()) {
             return;
         }
 
         changed = true;
 
-        skillsXp.put(skill, xpLevel);
+        skillsXp.put(skillType, newValue);
     }
 
-    protected float levelUp(SkillType skill) {
-        float xpRemoved = getXpToLevel(skill);
-
-        changed = true;
-
-        skills.put(skill, skills.get(skill) + 1);
-        skillsXp.put(skill, skillsXp.get(skill) - xpRemoved);
-
-        return xpRemoved;
+    public void skillUp(SkillType skillType, int newValue) {
+        skills.put(skillType, skills.get(skillType) + newValue);
     }
 
     /**
      * Remove Xp from a skill.
      *
-     * @param skill Type of skill to modify
+     * @param skillType Type of skill to modify
      * @param xp Amount of xp to remove
      */
-    public void removeXp(SkillType skill, int xp) {
-        if (skill.isChildSkill()) {
+    public void removeXp(SkillType skillType, int xp) {
+        if (skillType.isChildSkill()) {
             return;
         }
 
         changed = true;
 
-        skillsXp.put(skill, skillsXp.get(skill) - xp);
+        skillsXp.put(skillType, skillsXp.get(skillType) - xp);
     }
 
     /**
      * Modify a skill level.
      *
-     * @param skill Type of skill to modify
-     * @param level New level value for the skill
+     * @param skillType Type of skill to modify
+     * @param newValue New level value for the skill
      */
-    public void modifySkill(SkillType skill, int level) {
-        if (skill.isChildSkill()) {
+    public void modifySkill(SkillType skillType, int newValue) {
+        if (skillType.isChildSkill()) {
             return;
         }
 
         changed = true;
 
-        skills.put(skill, level);
-        skillsXp.put(skill, 0F);
+        skills.put(skillType, newValue);
+        skillsXp.put(skillType, 0F);
     }
 
     /**
      * Add levels to a skill.
      *
-     * @param skill Type of skill to add levels to
+     * @param skillType Type of skill to add levels to
      * @param levels Number of levels to add
      */
-    public void addLevels(SkillType skill, int levels) {
-        modifySkill(skill, skills.get(skill) + levels);
+    public void addLevels(SkillType skillType, int levels) {
+        if (skillType.isChildSkill()) {
+            return;
+        }
+
+        changed = true;
+
+        skills.put(skillType, skills.get(skillType) + levels);
+        skillsXp.put(skillType, 0F);
     }
 
     /**
      * Add Experience to a skill.
      *
-     * @param skill Type of skill to add experience to
-     * @param xp Number of experience to add
+     * @param skillType Type of skill to add experience to
+     * @param experience Number of experience to add
      */
-    public void addXp(SkillType skill, float xp) {
+    public void addExperience(SkillType skillType, int experience) {
+        if (skillType.isChildSkill()) {
+            return;
+        }
+
         changed = true;
 
-        if (skill.isChildSkill()) {
-            Set<SkillType> parentSkills = FamilyTree.getParents(skill);
-            float dividedXP = (xp / parentSkills.size());
-
-            for (SkillType parentSkill : parentSkills) {
-                skillsXp.put(parentSkill, skillsXp.get(parentSkill) + dividedXP);
-            }
-        }
-        else {
-            skillsXp.put(skill, skillsXp.get(skill) + xp);
-        }
+        skillsXp.put(skillType, skillsXp.get(skillType) + experience);
     }
 
     /**

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

@@ -13,7 +13,6 @@ import com.gmail.nossr50.util.BlockUtils;
 import com.gmail.nossr50.util.EventUtils;
 import com.gmail.nossr50.util.Permissions;
 import com.gmail.nossr50.util.StringUtils;
-
 import com.google.common.collect.ImmutableList;
 
 public enum AbilityType {

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

@@ -5,9 +5,7 @@ import java.util.Collections;
 import java.util.List;
 
 import org.bukkit.Color;
-import org.bukkit.entity.Entity;
 import org.bukkit.entity.Player;
-import org.bukkit.entity.Tameable;
 
 import com.gmail.nossr50.mcMMO;
 import com.gmail.nossr50.config.Config;
@@ -29,7 +27,6 @@ import com.gmail.nossr50.skills.unarmed.UnarmedManager;
 import com.gmail.nossr50.skills.woodcutting.WoodcuttingManager;
 import com.gmail.nossr50.util.Permissions;
 import com.gmail.nossr50.util.StringUtils;
-import com.gmail.nossr50.util.skills.ParticleEffectUtils;
 
 import com.google.common.collect.ImmutableList;
 
@@ -167,10 +164,7 @@ public enum SkillType {
             }
         }
 
-        if (!skillName.equalsIgnoreCase("all")) {
-            mcMMO.p.getLogger().warning("Invalid mcMMO skill (" + skillName + ")"); //TODO: Localize
-        }
-
+        mcMMO.p.getLogger().warning("[Debug] Invalid mcMMO skill (" + skillName + ")");
         return null;
     }
 
@@ -185,6 +179,10 @@ public enum SkillType {
         }
     }
 
+    public Color getRunescapeModeColor() {
+        return runescapeColor;
+    }
+
     public static SkillType byAbility(AbilityType ability) {
         for (SkillType type : values()) {
             if (type.getAbility() == ability) {
@@ -202,12 +200,4 @@ public enum SkillType {
     public boolean getPermissions(Player player) {
         return Permissions.skillEnabled(player, this);
     }
-
-    public void celebrateLevelUp(Player player) {
-        ParticleEffectUtils.fireworkParticleShower(player, runescapeColor);
-    }
-
-    public boolean shouldProcess(Entity target) {
-        return (target instanceof Player || (target instanceof Tameable && ((Tameable) target).isTamed())) ? getPVPEnabled() : getPVEEnabled();
-    }
 }

src/main/java/com/gmail/nossr50/events/abilities/McMMOPlayerAbilityEvent.java

@@ -1,62 +0,0 @@
-package com.gmail.nossr50.events.abilities;
-
-import org.bukkit.entity.Player;
-import org.bukkit.event.HandlerList;
-import org.bukkit.event.player.PlayerEvent;
-
-import com.gmail.nossr50.datatypes.skills.AbilityType;
-import com.gmail.nossr50.datatypes.skills.SkillType;
-
-public abstract class McMMOPlayerAbilityEvent extends PlayerEvent {
-    private SkillType skill;
-    private AbilityType ability;
-    private boolean useParticleEffects;
-
-    @Deprecated
-    protected McMMOPlayerAbilityEvent(Player player, SkillType skill) {
-        super(player);
-        ability = skill.getAbility();
-        useParticleEffects = true;
-    }
-
-    protected McMMOPlayerAbilityEvent(Player player, AbilityType ability) {
-        super(player);
-        this.ability = ability;
-        this.useParticleEffects = true;
-    }
-
-    protected McMMOPlayerAbilityEvent(Player player, AbilityType ability, boolean useParticleEffects) {
-        super(player);
-        this.ability = ability;
-        this.useParticleEffects = useParticleEffects;
-    }
-
-    @Deprecated
-    public SkillType getSkill() {
-        return skill;
-    }
-
-    public AbilityType getAbility() {
-        return ability;
-    }
-
-    public boolean useParticleEffects() {
-        return useParticleEffects;
-    }
-
-    public void shouldUseParticleEffects(boolean useParticleEffects) {
-        this.useParticleEffects = useParticleEffects;
-    }
-
-    /** Rest of file is required boilerplate for custom events **/
-    private static final HandlerList handlers = new HandlerList();
-
-    @Override
-    public HandlerList getHandlers() {
-        return handlers;
-    }
-
-    public static HandlerList getHandlerList() {
-        return handlers;
-    }
-}

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

@@ -19,7 +19,7 @@ public abstract class McMMOPlayerExperienceEvent extends PlayerEvent implements
     protected McMMOPlayerExperienceEvent(Player player, SkillType skill) {
         super(player);
         this.skill = skill;
-        this.skillLevel = UserManager.getPlayer(player).getSkillLevel(skill);
+        this.skillLevel = UserManager.getPlayer(player).getProfile().getSkillLevel(skill);
     }
 
     /**

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

@@ -1,9 +1,8 @@
-package com.gmail.nossr50.events.experience.levels;
+package com.gmail.nossr50.events.experience;
 
 import org.bukkit.entity.Player;
 
 import com.gmail.nossr50.datatypes.skills.SkillType;
-import com.gmail.nossr50.events.experience.McMMOPlayerExperienceEvent;
 
 /**
  * Called when a user levels change

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

@@ -1,4 +1,4 @@
-package com.gmail.nossr50.events.experience.levels;
+package com.gmail.nossr50.events.experience;
 
 import org.bukkit.entity.Player;
 

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

@@ -1,4 +1,4 @@
-package com.gmail.nossr50.events.experience.levels;
+package com.gmail.nossr50.events.experience;
 
 import org.bukkit.entity.Player;
 

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

@@ -1,4 +1,4 @@
-package com.gmail.nossr50.events.experience.xp;
+package com.gmail.nossr50.events.experience;
 
 import org.bukkit.entity.Player;
 
@@ -7,7 +7,7 @@ import com.gmail.nossr50.datatypes.skills.SkillType;
 /**
  * Called when a player gains XP in a skill
  */
-public class McMMOPlayerXpGainEvent extends McMMOPlayerXpChangeEvent {
+public class McMMOPlayerXpGainEvent extends McMMOPlayerExperienceEvent {
     private float xpGained;
 
     public McMMOPlayerXpGainEvent(Player player, SkillType skill, float xpGained) {
@@ -31,7 +31,7 @@ public class McMMOPlayerXpGainEvent extends McMMOPlayerXpChangeEvent {
     }
 
     /**
-     * @param xpGained float amount of experience gained in this event
+     * @param xpGained int amount of experience gained in this event
      */
     public void setRawXpGained(float xpGained) {
         this.xpGained = xpGained;

src/main/java/com/gmail/nossr50/events/experience/xp/McMMOPlayerXpChangeEvent.java

@@ -1,12 +0,0 @@
-package com.gmail.nossr50.events.experience.xp;
-
-import org.bukkit.entity.Player;
-
-import com.gmail.nossr50.datatypes.skills.SkillType;
-import com.gmail.nossr50.events.experience.McMMOPlayerExperienceEvent;
-
-public abstract class McMMOPlayerXpChangeEvent extends McMMOPlayerExperienceEvent {
-    public McMMOPlayerXpChangeEvent(Player player, SkillType skill) {
-        super(player, skill);
-    }
-}

src/main/java/com/gmail/nossr50/events/experience/xp/McMMOPlayerXpLossEvent.java

@@ -1,28 +0,0 @@
-package com.gmail.nossr50.events.experience.xp;
-
-import org.bukkit.entity.Player;
-
-import com.gmail.nossr50.datatypes.skills.SkillType;
-
-public class McMMOPlayerXpLossEvent extends McMMOPlayerXpChangeEvent {
-    private float xpLost;
-
-    public McMMOPlayerXpLossEvent(Player player, SkillType skill, float xpLost) {
-        super(player, skill);
-        this.xpLost = xpLost;
-    }
-
-    /**
-     * @return The amount of experience lost in this event
-     */
-    public float getRawXpLost() {
-        return xpLost;
-    }
-
-    /**
-     * @param xpLost amount of experience lost in this event
-     */
-    public void setRawXpLost(float xpLost) {
-        this.xpLost = xpLost;
-    }
-}

src/main/java/com/gmail/nossr50/events/skills/McMMOPlayerCombatEvent.java

@@ -1,40 +0,0 @@
-package com.gmail.nossr50.events.skills;
-
-import org.bukkit.entity.Entity;
-import org.bukkit.entity.Player;
-
-import com.gmail.nossr50.datatypes.skills.SkillType;
-import com.gmail.nossr50.events.fake.FakeEntityDamageByEntityEvent;
-import com.gmail.nossr50.util.player.UserManager;
-
-public abstract class McMMOPlayerCombatEvent extends FakeEntityDamageByEntityEvent {
-    private Player player;
-    private SkillType skill;
-    private int skillLevel;
-
-    protected McMMOPlayerCombatEvent(Player player, Entity damager, Entity damagee, DamageCause cause, double damage, SkillType skill) {
-        super(damager, damagee, cause, damage);
-        this.player = player;
-        this.skill = skill;
-        skillLevel = UserManager.getPlayer(player).getProfile().getSkillLevel(skill);
-    }
-
-    protected McMMOPlayerCombatEvent(Player player, Entity damagee, DamageCause cause, double damage, SkillType skill) {
-        super(player, damagee, cause, damage);
-        this.player = player;
-        this.skill = skill;
-        skillLevel = UserManager.getPlayer(player).getProfile().getSkillLevel(skill);
-    }
-
-    public Player getPlayer() {
-        return player;
-    }
-
-    public SkillType getSkill() {
-        return skill;
-    }
-
-    public int getSkillLevel() {
-        return skillLevel;
-    }
-}

src/main/java/com/gmail/nossr50/events/skills/McMMOPlayerSkillEvent.java

@@ -17,7 +17,7 @@ public abstract class McMMOPlayerSkillEvent extends PlayerEvent {
     protected McMMOPlayerSkillEvent(Player player, SkillType skill) {
         super(player);
         this.skill = skill;
-        this.skillLevel = UserManager.getPlayer(player).getSkillLevel(skill);
+        this.skillLevel = UserManager.getPlayer(player).getProfile().getSkillLevel(skill);
     }
 
     /**

src/main/java/com/gmail/nossr50/events/skills/McMMOPlayerTreasureEvent.java

@@ -1,44 +0,0 @@
-package com.gmail.nossr50.events.skills;
-
-import org.bukkit.entity.Player;
-import org.bukkit.event.Cancellable;
-import org.bukkit.inventory.ItemStack;
-
-import com.gmail.nossr50.datatypes.skills.SkillType;
-
-public abstract class McMMOPlayerTreasureEvent extends McMMOPlayerSkillEvent implements Cancellable {
-    private boolean cancelled;
-    private ItemStack treasure;
-    private int xpGained;
-
-    protected McMMOPlayerTreasureEvent(Player player, SkillType skill, ItemStack treasure, int xpGained) {
-        super(player, skill);
-        this.treasure = treasure;
-        this.xpGained = xpGained;
-        this.cancelled = false;
-    }
-
-    public ItemStack getTreasure() {
-        return treasure;
-    }
-
-    public void setTreasure(ItemStack item) {
-        this.treasure = item;
-    }
-
-    public int getXpGained() {
-        return xpGained;
-    }
-
-    public void setXpGained(int xpGained) {
-        this.xpGained = xpGained;
-    }
-
-    public boolean isCancelled() {
-        return cancelled;
-    }
-
-    public void setCancelled(boolean newValue) {
-        this.cancelled = newValue;
-    }
-}

src/main/java/com/gmail/nossr50/events/skills/abilities/McMMOPlayerAbilityActivateEvent.java

@@ -1,25 +1,18 @@
-package com.gmail.nossr50.events.abilities;
+package com.gmail.nossr50.events.skills.abilities;
 
 import org.bukkit.entity.Player;
 import org.bukkit.event.Cancellable;
 
-import com.gmail.nossr50.datatypes.skills.AbilityType;
 import com.gmail.nossr50.datatypes.skills.SkillType;
 
 public class McMMOPlayerAbilityActivateEvent extends McMMOPlayerAbilityEvent implements Cancellable {
     private boolean cancelled;
 
-    @Deprecated
     public McMMOPlayerAbilityActivateEvent(Player player, SkillType skill) {
         super(player, skill);
         cancelled = false;
     }
 
-    public McMMOPlayerAbilityActivateEvent(Player player, AbilityType ability) {
-        super(player, ability);
-        cancelled = false;
-    }
-
     public boolean isCancelled() {
         return cancelled;
     }

src/main/java/com/gmail/nossr50/events/skills/abilities/McMMOPlayerAbilityDeactivateEvent.java

@@ -1,17 +1,11 @@
-package com.gmail.nossr50.events.abilities;
+package com.gmail.nossr50.events.skills.abilities;
 
 import org.bukkit.entity.Player;
 
-import com.gmail.nossr50.datatypes.skills.AbilityType;
 import com.gmail.nossr50.datatypes.skills.SkillType;
 
 public class McMMOPlayerAbilityDeactivateEvent extends McMMOPlayerAbilityEvent {
-    @Deprecated
     public McMMOPlayerAbilityDeactivateEvent(Player player, SkillType skill) {
         super(player, skill);
     }
-
-    public McMMOPlayerAbilityDeactivateEvent(Player player, AbilityType ability) {
-        super(player, ability);
-    }
 }

src/main/java/com/gmail/nossr50/events/skills/abilities/McMMOPlayerAbilityEvent.java

@@ -0,0 +1,20 @@
+package com.gmail.nossr50.events.skills.abilities;
+
+import org.bukkit.entity.Player;
+
+import com.gmail.nossr50.datatypes.skills.AbilityType;
+import com.gmail.nossr50.datatypes.skills.SkillType;
+import com.gmail.nossr50.events.skills.McMMOPlayerSkillEvent;
+
+public class McMMOPlayerAbilityEvent extends McMMOPlayerSkillEvent {
+    private AbilityType ability;
+
+    protected McMMOPlayerAbilityEvent(Player player, SkillType skill) {
+        super(player, skill);
+        ability = skill.getAbility();
+    }
+
+    public AbilityType getAbility() {
+        return ability;
+    }
+}

src/main/java/com/gmail/nossr50/events/skills/acrobatics/McMMOPlayerAcrobaticsEvent.java

@@ -1,24 +0,0 @@
-package com.gmail.nossr50.events.skills.acrobatics;
-
-import org.bukkit.entity.Player;
-import org.bukkit.event.Cancellable;
-
-import com.gmail.nossr50.datatypes.skills.SkillType;
-import com.gmail.nossr50.events.skills.McMMOPlayerSkillEvent;
-
-public abstract class McMMOPlayerAcrobaticsEvent extends McMMOPlayerSkillEvent implements Cancellable {
-    private boolean cancelled;
-
-    protected McMMOPlayerAcrobaticsEvent(Player player) {
-        super(player, SkillType.ACROBATICS);
-        cancelled = false;
-    }
-
-    public boolean isCancelled() {
-        return cancelled;
-    }
-
-    public void setCancelled(boolean cancelled) {
-        this.cancelled = cancelled;
-    }
-}

src/main/java/com/gmail/nossr50/events/skills/acrobatics/McMMOPlayerDodgeEvent.java

@@ -1,30 +0,0 @@
-package com.gmail.nossr50.events.skills.acrobatics;
-
-import org.bukkit.entity.Player;
-
-public class McMMOPlayerDodgeEvent extends McMMOPlayerAcrobaticsEvent {
-    private double damageTaken;
-    private float xpGained;
-
-    public McMMOPlayerDodgeEvent(Player player, double damageTaken, float xpGained) {
-        super(player);
-        this.damageTaken = damageTaken;
-        this.xpGained = xpGained;
-    }
-
-    public double getDamageTaken() {
-        return damageTaken;
-    }
-
-    public void setDamageTaken(double damageTaken) {
-        this.damageTaken = damageTaken;
-    }
-
-    public float getXpGained() {
-        return xpGained;
-    }
-
-    public void setXpGained(float xpGained) {
-        this.xpGained = xpGained;
-    }
-}

src/main/java/com/gmail/nossr50/events/skills/acrobatics/McMMOPlayerRollEvent.java

@@ -1,36 +0,0 @@
-package com.gmail.nossr50.events.skills.acrobatics;
-
-import org.bukkit.entity.Player;
-
-public class McMMOPlayerRollEvent extends McMMOPlayerAcrobaticsEvent {
-    private double damageTaken;
-    private float xpGained;
-    private boolean graceful;
-
-    public McMMOPlayerRollEvent(Player player, double damageTaken, float xpGained, boolean graceful) {
-        super(player);
-        this.damageTaken = damageTaken;
-        this.xpGained = xpGained;
-        this.graceful = graceful;
-    }
-
-    public double getDamageTaken() {
-        return damageTaken;
-    }
-
-    public void setDamageTaken(double damageTaken) {
-        this.damageTaken = damageTaken;
-    }
-
-    public float getXpGained() {
-        return xpGained;
-    }
-
-    public void setXpGained(float xpGained) {
-        this.xpGained = xpGained;
-    }
-
-    public boolean isGraceful() {
-        return graceful;
-    }
-}

src/main/java/com/gmail/nossr50/events/skills/archery/McMMOPlayerArcheryCombatEvent.java

@@ -1,13 +0,0 @@
-package com.gmail.nossr50.events.skills.archery;
-
-import org.bukkit.entity.Entity;
-import org.bukkit.entity.Player;
-
-import com.gmail.nossr50.datatypes.skills.SkillType;
-import com.gmail.nossr50.events.skills.McMMOPlayerCombatEvent;
-
-public class McMMOPlayerArcheryCombatEvent extends McMMOPlayerCombatEvent {
-    public McMMOPlayerArcheryCombatEvent(Player player, Entity damager, Entity damagee, DamageCause cause, double damage) {
-        super(player, damager, damagee, cause, damage, SkillType.ARCHERY);
-    }
-}

src/main/java/com/gmail/nossr50/events/skills/archery/McMMOPlayerArcheryEvent.java

@@ -1,24 +0,0 @@
-package com.gmail.nossr50.events.skills.archery;
-
-import org.bukkit.entity.Player;
-import org.bukkit.event.Cancellable;
-
-import com.gmail.nossr50.datatypes.skills.SkillType;
-import com.gmail.nossr50.events.skills.McMMOPlayerSkillEvent;
-
-public abstract class McMMOPlayerArcheryEvent extends McMMOPlayerSkillEvent implements Cancellable {
-    private boolean cancelled;
-
-    protected McMMOPlayerArcheryEvent(Player player) {
-        super(player, SkillType.ARCHERY);
-        cancelled = false;
-    }
-
-    public boolean isCancelled() {
-        return cancelled;
-    }
-
-    public void setCancelled(boolean cancelled) {
-        this.cancelled = cancelled;
-    }
-}

src/main/java/com/gmail/nossr50/events/skills/archery/McMMOPlayerDazeEvent.java

@@ -1,12 +0,0 @@
-package com.gmail.nossr50.events.skills.archery;
-
-import org.bukkit.entity.Entity;
-import org.bukkit.entity.Player;
-
-import com.gmail.nossr50.skills.archery.Archery;
-
-public class McMMOPlayerDazeEvent extends McMMOPlayerArcheryCombatEvent {
-    public McMMOPlayerDazeEvent(Player player, Entity damager, Entity damagee) {
-        super(player, damager, damagee, DamageCause.PROJECTILE, Archery.dazeModifier);
-    }
-}

src/main/java/com/gmail/nossr50/events/skills/archery/McMMOPlayerSkillShotEvent.java

@@ -1,10 +0,0 @@
-package com.gmail.nossr50.events.skills.archery;
-
-import org.bukkit.entity.Entity;
-import org.bukkit.entity.Player;
-
-public class McMMOPlayerSkillShotEvent extends McMMOPlayerArcheryCombatEvent {
-    public McMMOPlayerSkillShotEvent(Player player, Entity damager, Entity damagee, double damage) {
-        super(player, damager, damagee, DamageCause.PROJECTILE, damage);
-    }
-}

src/main/java/com/gmail/nossr50/events/skills/axes/McMMOPlayerAxeCombatEvent.java

@@ -1,13 +0,0 @@
-package com.gmail.nossr50.events.skills.axes;
-
-import org.bukkit.entity.Entity;
-import org.bukkit.entity.Player;
-
-import com.gmail.nossr50.datatypes.skills.SkillType;
-import com.gmail.nossr50.events.skills.McMMOPlayerCombatEvent;
-
-public class McMMOPlayerAxeCombatEvent extends McMMOPlayerCombatEvent {
-    public McMMOPlayerAxeCombatEvent(Player player, Entity damagee, DamageCause cause, double damage) {
-        super(player, damagee, cause, damage, SkillType.AXES);
-    }
-}

src/main/java/com/gmail/nossr50/events/skills/axes/McMMOPlayerAxeEvent.java

@@ -1,24 +0,0 @@
-package com.gmail.nossr50.events.skills.axes;
-
-import org.bukkit.entity.Player;
-import org.bukkit.event.Cancellable;
-
-import com.gmail.nossr50.datatypes.skills.SkillType;
-import com.gmail.nossr50.events.skills.McMMOPlayerSkillEvent;
-
-public abstract class McMMOPlayerAxeEvent extends McMMOPlayerSkillEvent implements Cancellable {
-    private boolean cancelled;
-
-    protected McMMOPlayerAxeEvent(Player player) {
-        super(player, SkillType.AXES);
-        cancelled = false;
-    }
-
-    public boolean isCancelled() {
-        return cancelled;
-    }
-
-    public void setCancelled(boolean cancelled) {
-        this.cancelled = cancelled;
-    }
-}

src/main/java/com/gmail/nossr50/events/skills/axes/McMMOPlayerAxeMasteryEvent.java

@@ -1,12 +0,0 @@
-package com.gmail.nossr50.events.skills.axes;
-
-import org.bukkit.entity.Entity;
-import org.bukkit.entity.Player;
-
-public class McMMOPlayerAxeMasteryEvent extends McMMOPlayerAxeCombatEvent {
-    public McMMOPlayerAxeMasteryEvent(Player player, Entity damagee, double damage) {
-        super(player, damagee, DamageCause.ENTITY_ATTACK, damage);
-        // TODO Auto-generated constructor stub
-    }
-
-}

src/main/java/com/gmail/nossr50/events/skills/axes/McMMOPlayerCriticalHitEvent.java

@@ -1,10 +0,0 @@
-package com.gmail.nossr50.events.skills.axes;
-
-import org.bukkit.entity.Entity;
-import org.bukkit.entity.Player;
-
-public class McMMOPlayerCriticalHitEvent extends McMMOPlayerAxeCombatEvent {
-    public McMMOPlayerCriticalHitEvent(Player player, Entity damagee, double damage) {
-        super(player, damagee, DamageCause.ENTITY_ATTACK, damage);
-    }
-}

src/main/java/com/gmail/nossr50/events/skills/axes/McMMOPlayerGreaterImpactEvent.java

@@ -1,22 +0,0 @@
-package com.gmail.nossr50.events.skills.axes;
-
-import org.bukkit.entity.Entity;
-import org.bukkit.entity.Player;
-import org.bukkit.util.Vector;
-
-public class McMMOPlayerGreaterImpactEvent extends McMMOPlayerAxeCombatEvent {
-    private Vector knockbackVelocity;
-
-    public McMMOPlayerGreaterImpactEvent(Player player, Entity damagee, double damage, Vector knockbackVelocity) {
-        super(player, damagee, DamageCause.ENTITY_ATTACK, damage);
-        this.knockbackVelocity = knockbackVelocity;
-    }
-
-    public Vector getKnockbackVelocity() {
-        return knockbackVelocity;
-    }
-
-    public void setKnockbackVelocity(Vector knockbackVelocity) {
-        this.knockbackVelocity = knockbackVelocity;
-    }
-}

src/main/java/com/gmail/nossr50/events/skills/axes/McMMOPlayerImpactEvent.java

@@ -1,17 +0,0 @@
-package com.gmail.nossr50.events.skills.axes;
-
-import org.bukkit.entity.Player;
-import org.bukkit.inventory.ItemStack;
-
-public class McMMOPlayerImpactEvent extends McMMOPlayerAxeEvent {
-    private ItemStack armor;
-
-    public McMMOPlayerImpactEvent(Player player, ItemStack armor) {
-        super(player);
-        this.armor = armor;
-    }
-
-    public ItemStack getArmor() {
-        return armor;
-    }
-}

src/main/java/com/gmail/nossr50/events/skills/excavation/McMMOPlayerExcavationTreasureEvent.java

@@ -1,21 +0,0 @@
-package com.gmail.nossr50.events.skills.excavation;
-
-import org.bukkit.block.Block;
-import org.bukkit.entity.Player;
-import org.bukkit.inventory.ItemStack;
-
-import com.gmail.nossr50.datatypes.skills.SkillType;
-import com.gmail.nossr50.events.skills.McMMOPlayerTreasureEvent;
-
-public class McMMOPlayerExcavationTreasureEvent extends McMMOPlayerTreasureEvent {
-    private Block block;
-
-    public McMMOPlayerExcavationTreasureEvent(Player player, ItemStack treasure, int xpGained, Block block) {
-        super(player, SkillType.EXCAVATION, treasure, xpGained);
-        this.block = block;
-    }
-
-    public Block getBlock() {
-        return block;
-    }
-}

src/main/java/com/gmail/nossr50/events/skills/fishing/McMMOPlayerFishingCombatEvent.java

@@ -1,13 +0,0 @@
-package com.gmail.nossr50.events.skills.fishing;
-
-import org.bukkit.entity.Entity;
-import org.bukkit.entity.Player;
-
-import com.gmail.nossr50.datatypes.skills.SkillType;
-import com.gmail.nossr50.events.skills.McMMOPlayerCombatEvent;
-
-public abstract class McMMOPlayerFishingCombatEvent extends McMMOPlayerCombatEvent {
-    public McMMOPlayerFishingCombatEvent(Player player, Entity damager, Entity damagee, DamageCause cause, double damage) {
-        super(player, damager, damagee, cause, damage, SkillType.FISHING);
-    }
-}

src/main/java/com/gmail/nossr50/events/skills/fishing/McMMOPlayerFishingTreasureEvent.java

@@ -3,11 +3,29 @@ package com.gmail.nossr50.events.skills.fishing;
 import org.bukkit.entity.Player;
 import org.bukkit.inventory.ItemStack;
 
-import com.gmail.nossr50.datatypes.skills.SkillType;
-import com.gmail.nossr50.events.skills.McMMOPlayerTreasureEvent;
+public class McMMOPlayerFishingTreasureEvent extends McMMOPlayerFishingEvent {
+    private ItemStack treasure;
+    private int xp;
 
-public class McMMOPlayerFishingTreasureEvent extends McMMOPlayerTreasureEvent {
-    public McMMOPlayerFishingTreasureEvent(Player player, ItemStack treasure, int xpGained) {
-        super(player, SkillType.FISHING, treasure, xpGained);
+    public McMMOPlayerFishingTreasureEvent(Player player, ItemStack treasure, int xp) {
+        super(player);
+        this.treasure = treasure;
+        this.xp = xp;
+    }
+
+    public ItemStack getTreasure() {
+        return treasure;
+    }
+
+    public void setTreasure(ItemStack item) {
+        this.treasure = item;
+    }
+
+    public int getXp() {
+        return xp;
+    }
+
+    public void setXp(int xp) {
+        this.xp = xp;
     }
 }

src/main/java/com/gmail/nossr50/events/skills/fishing/McMMOPlayerShakeEvent.java

@@ -1,15 +1,13 @@
 package com.gmail.nossr50.events.skills.fishing;
 
-import org.bukkit.entity.Fish;
-import org.bukkit.entity.LivingEntity;
 import org.bukkit.entity.Player;
 import org.bukkit.inventory.ItemStack;
 
-public class McMMOPlayerShakeEvent extends McMMOPlayerFishingCombatEvent {
+public class McMMOPlayerShakeEvent extends McMMOPlayerFishingEvent {
     private ItemStack drop;
 
-    public McMMOPlayerShakeEvent(Player player, Fish hook, ItemStack drop, LivingEntity target, double damage) {
-        super(player, hook, target, DamageCause.PROJECTILE, damage);
+    public McMMOPlayerShakeEvent(Player player, ItemStack drop) {
+        super(player);
         this.drop = drop;
     }
 

src/main/java/com/gmail/nossr50/events/skills/herbalism/McMMOPlayerHerbalismEvent.java

@@ -1,12 +0,0 @@
-package com.gmail.nossr50.events.skills.herbalism;
-
-import org.bukkit.entity.Player;
-
-import com.gmail.nossr50.datatypes.skills.SkillType;
-import com.gmail.nossr50.events.skills.McMMOPlayerSkillEvent;
-
-public abstract class McMMOPlayerHerbalismEvent extends McMMOPlayerSkillEvent {
-    public McMMOPlayerHerbalismEvent(Player player) {
-        super(player, SkillType.HERBALISM);
-    }
-}

src/main/java/com/gmail/nossr50/events/skills/unarmed/McMMOPlayerDeflectEvent.java

@@ -1,9 +0,0 @@
-package com.gmail.nossr50.events.skills.unarmed;
-
-import org.bukkit.entity.Player;
-
-public class McMMOPlayerDeflectEvent extends McMMOPlayerUnarmedEvent {
-    public McMMOPlayerDeflectEvent(Player player) {
-        super(player);
-    }
-}