Did somebody say HOTFIX?

Player command to reset a skill level (for when cap is enabled)

Changelog.txt

@@ -7,6 +7,70 @@ Key:
   ! Change
   - Removal
 
+Version 1.3.11
+ = Fixed bug where mcMMO would ignore other block-protection plugins for various abilities
+ 
+Version 1.3.10
+ + Added 1.3.1 compatibility
+ + Added permission node for Iron Grip ability (mcmmo.ability.unarmed.irongrip)
+ + Added ability for custom blocks to drop a range of items.
+ + Added Ability API functions
+ + Added 50% & 150% XP boost perks
+ + Added "lucky" perk for donors
+ = Fixed /inspect not working on offline players
+ = Fixed custom blocks, tools and armors not loading properly
+ = Fixed duplication bug with sticky pistons
+ = Fixed "GenericLabel belonging to mcMMO..." message
+ = Fixed menu exit button not working
+ = Fixed Repair enchant downgrade not working
+ = Fixed NPE caused by Spout players after a /reload
+ = Fixed ConcurrentModificationException on world unload
+ = Fixed players never being removed from memory (memory leak)
+ = Fixed admin chat being seen by everyone
+ = Fixed issue with UTFDataFormatException occurring on occasion when trying to load Chunklets
+ = Fixed ArrayIndexOutOfBounds error caused when trying to use /xplock after logging in but before gaining XP
+ = Fixed custom tools not properly respecting the Ability_Enabled flag.
+ = Fixed "lower tool" messages still being displayed even when ability messages are disabled.
+ = Fixed custom blocks not dropping the proper item with Super Breaker when Silk Touch is used
+ = Fixed custom woodcutting blocks throwing errors.
+ = Fixed possible ClassCastException from catching something other than a mob when using the Shake Mob skill
+ ! Changed the format by which Chunklets are stored to be much smaller, and much faster to load
+ ! Optimized how player placed blocks are tracked
+
+Version 1.3.09
+ + Added compatibility with AntiCheat (Which I highly recommend to prevent cheating)
+ + Added several permission nodes to give individual users special perks (Double/Triple/Quadruple XP)
+ + Added reduced cooldown permission nodes as special perks (1/4, 1/3, 1/2 cooldown)
+ + Added increased activation time permissions nodes as special perks (+4, +8, and +12 seconds)
+ + Added API for plugins to add custom tools directly via Spout - repair / abilities do not work ATM
+ + Added offline party members to the list displayed by /party
+ + Added possibility to kick offline members from parties
+ = Fixed bug that would cause a NPE for players that had no parties
+ = Fixed Vampirism not notifying the correct amount of stolen levels
+ = Fixed bug with Acrobatics not saving you from deadly falls
+ = Fixed /mcremove being applied only after a reload
+ = Fixed Archery PVE disablement not working properly
+ = Fixed possible NPE when a projectile is shot by a dispenser or doesn't have any shooter
+ = Fixed issue with NoCheatPlus and Serrated Strikes / Skull Splitter (fight.noswing)
+ = Fixed tiny memory leak concerning Archery
+ = Fixed bug where you could receive Archery XP from Potions
+ = Fixed bug where Chunklets for the < 64 y coordinates would not be properly loaded
+ = Fixed exploit with block duplication via piston pushing
+ = Fixed bug with falling sand/gravel not being tracked
+ = Fixed bug with Tree Feller not working with custom axes
+ = Fixed bug with locale strings when trying to teleport to a non-existent player
+ = Fixed bug with Tree Feller changing durability before checking for axe splintering
+ = Fixed bug with Repair Mastery permission due to typo
+ = Fixed bug with repairing items that use metadata
+ = Fixed bug with Chunklets not being reloaded on /reload
+ = Fixed possible NPE when falling with no item in hand
+ ! API methods can now only be used in a static way
+ ! Arrows shot from a bow having the Infinity enchantment can no longer be retrieved
+ ! Arrows that aren't shot by an entity are now able to be dodged (currently only from dispensers)
+ ! Changed Spout settings to be in their own config file (spout.yml)
+ ! Changed file format for parties (parties.yml), previous files are no longer used
+ ! Changed mcMMO to inform on corrupt Chunklets and make new ones
+
 Version 1.3.08
  + Added more notifications about Vampirism and Hardcore mode on player death
  + Added information about Hardcore mode when joining a server running Hardcore mode

pom.xml

@@ -2,7 +2,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>com.gmail.nossr50.mcMMO</groupId>
     <artifactId>mcMMO</artifactId>
-    <version>1.3.08</version>
+    <version>1.3.11</version>
     <name>mcMMO</name>
     <url>https://github.com/mcMMO-Dev/mcMMO</url>
     <issueManagement>
@@ -128,6 +128,12 @@
             <type>jar</type>
             <scope>compile</scope>
         </dependency>
+		<dependency>
+			<groupId>junit</groupId>
+			<artifactId>junit-dep</artifactId>
+			<version>4.10</version>
+			<scope>test</scope>
+		</dependency>
     </dependencies>
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>

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

@@ -0,0 +1,47 @@
+package com.gmail.nossr50.api;
+
+import org.bukkit.entity.Player;
+
+import com.gmail.nossr50.datatypes.AbilityType;
+import com.gmail.nossr50.util.Users;
+
+public class AbilityAPI {
+
+    public static boolean berserkEnabled(Player player) {
+        return Users.getProfile(player).getAbilityMode(AbilityType.BERSERK);
+    }
+
+    public static boolean gigaDrillBreakerEnabled(Player player) {
+        return Users.getProfile(player).getAbilityMode(AbilityType.GIGA_DRILL_BREAKER);
+    }
+
+    public static boolean greenTerraEnabled(Player player) {
+        return Users.getProfile(player).getAbilityMode(AbilityType.GREEN_TERRA);
+    }
+
+    public static boolean serratedStrikesEnabled(Player player) {
+        return Users.getProfile(player).getAbilityMode(AbilityType.SERRATED_STRIKES);
+    }
+
+    public static boolean skullSplitterEnabled(Player player) {
+        return Users.getProfile(player).getAbilityMode(AbilityType.SKULL_SPLIITER);
+    }
+
+    public static boolean superBreakerEnabled(Player player) {
+        return Users.getProfile(player).getAbilityMode(AbilityType.SUPER_BREAKER);
+    }
+
+    public static boolean treeFellerEnabled(Player player) {
+        return Users.getProfile(player).getAbilityMode(AbilityType.TREE_FELLER);
+    }
+
+    public static boolean isAnyAbilityEnabled(Player player) {
+        for (AbilityType ability : AbilityType.values()) {
+            if (Users.getProfile(player).getAbilityMode(ability)) {
+                return true;
+            }
+        }
+
+        return false;
+    }
+}

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

@@ -9,7 +9,10 @@ import com.gmail.nossr50.events.chat.McMMOPartyChatEvent;
 import com.gmail.nossr50.util.Permissions;
 import com.gmail.nossr50.util.Users;
 
-public class ChatAPI {
+public final class ChatAPI {
+
+    private ChatAPI() {}
+
     /**
      * Send a message to all members of a party
      * </br>
@@ -19,7 +22,7 @@ public class ChatAPI {
      * @param party The name of the party to send to
      * @param message The message to send
      */
-    public void sendPartyChat(String sender, String party, String message) {
+    public static void sendPartyChat(String sender, String party, String message) {
         McMMOPartyChatEvent chatEvent = new McMMOPartyChatEvent(sender, party, message);
         mcMMO.p.getServer().getPluginManager().callEvent(chatEvent);
 
@@ -33,7 +36,7 @@ public class ChatAPI {
 
         for (Player player : mcMMO.p.getServer().getOnlinePlayers()) {
             if (Users.getProfile(player).inParty()) {
-                if (Users.getProfile(player).getParty().equalsIgnoreCase(chatEvent.getParty())) {
+                if (Users.getProfile(player).getParty().getName().equalsIgnoreCase(chatEvent.getParty())) {
                     player.sendMessage(pPrefix + chatEvent.getMessage());
                 }
             }
@@ -48,7 +51,7 @@ public class ChatAPI {
      * @param sender The name of the sender to display in the chat
      * @param message The message to send
      */
-    public void sendAdminChat(String sender, String message) {
+    public static void sendAdminChat(String sender, String message) {
         McMMOAdminChatEvent chatEvent = new McMMOAdminChatEvent(sender, message);
         mcMMO.p.getServer().getPluginManager().callEvent(chatEvent);
 

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

@@ -6,7 +6,9 @@ import com.gmail.nossr50.datatypes.SkillType;
 import com.gmail.nossr50.util.Skills;
 import com.gmail.nossr50.util.Users;
 
-public class ExperienceAPI {
+public final class ExperienceAPI {
+
+    private ExperienceAPI() {}
 
     /**
      * Check the XP of a player. This should be called after giving XP to process level-ups.
@@ -14,12 +16,12 @@ public class ExperienceAPI {
      * @param player The player to check
      * @param skillType The skill to check
      */
-    private void checkXP(Player player, SkillType skillType) {
+    private static void checkXP(Player player, SkillType skillType) {
         if (skillType.equals(SkillType.ALL)) {
-            Skills.XpCheckAll(player);
+            Skills.xpCheckAll(player, Users.getProfile(player));
         }
         else {
-            Skills.XpCheckSkill(skillType, player);
+            Skills.xpCheckSkill(skillType, player, Users.getProfile(player));
         }
     }
 
@@ -32,8 +34,8 @@ public class ExperienceAPI {
      * @param skillType The skill to add XP to
      * @param XP The amount of XP to add
      */
-    public void addRawXP(Player player, SkillType skillType, int XP) {
-        Users.getProfile(player).addXPOverride(skillType, XP);
+    public static void addRawXP(Player player, SkillType skillType, int XP) {
+        Users.getPlayer(player).addXPOverride(skillType, XP);
         checkXP(player, skillType);
     }
 
@@ -46,8 +48,8 @@ public class ExperienceAPI {
      * @param skillType The skill to add XP to
      * @param XP The amount of XP to add
      */
-    public void addMultipliedXP(Player player, SkillType skillType, int XP) {
-        Users.getProfile(player).addXPOverrideBonus(skillType, XP);
+    public static void addMultipliedXP(Player player, SkillType skillType, int XP) {
+        Users.getPlayer(player).addXPOverrideBonus(skillType, XP);
         checkXP(player, skillType);
     }
 
@@ -60,8 +62,8 @@ public class ExperienceAPI {
      * @param skillType The skill to add XP to
      * @param XP The amount of XP to add
      */
-    public void addXP(Player player, SkillType skillType, int XP) {
-        Users.getProfile(player).addXP(player, skillType, XP);
+    public static void addXP(Player player, SkillType skillType, int XP) {
+        Users.getPlayer(player).addXP(skillType, XP);
         checkXP(player, skillType);
     }
 
@@ -74,7 +76,7 @@ public class ExperienceAPI {
      * @param skillType The skill to get XP for
      * @return the amount of XP in a given skill
      */
-    public int getXP(Player player, SkillType skillType) {
+    public static int getXP(Player player, SkillType skillType) {
         return Users.getProfile(player).getSkillXpLevel(skillType);
     }
 
@@ -87,7 +89,7 @@ public class ExperienceAPI {
      * @param skillType The skill to get the XP amount for
      * @return the amount of XP left before leveling up a specifc skill
      */
-    public int getXPToNextLevel(Player player, SkillType skillType) {
+    public static int getXPToNextLevel(Player player, SkillType skillType) {
         return Users.getProfile(player).getXpToLevel(skillType);
     }
 
@@ -101,7 +103,7 @@ public class ExperienceAPI {
      * @param levels Number of levels to add
      * @param notify True if this should fire a level up notification, false otherwise.
      */
-    public void addLevel(Player player, SkillType skillType, int levels, boolean notify) {
+    public static void addLevel(Player player, SkillType skillType, int levels, boolean notify) {
         Users.getProfile(player).addLevels(skillType, levels);
 
         if (notify) {
@@ -118,7 +120,7 @@ public class ExperienceAPI {
      * @param skillType The skill to get the level for
      * @return the level of a given skill
      */
-    public int getLevel(Player player, SkillType skillType) {
+    public static int getLevel(Player player, SkillType skillType) {
         return Users.getProfile(player).getSkillLevel(skillType);
     }
 
@@ -130,7 +132,46 @@ public class ExperienceAPI {
      * @param player The player to get the power level for
      * @return the power level of the player
      */
-    public int getPowerLevel(Player player) {
-        return Users.getProfile(player).getPowerLevel();
+    public static int getPowerLevel(Player player) {
+        return Users.getPlayer(player).getPowerLevel();
+    }
+
+    /**
+     * Sets the level of a player in a specific skill type.
+     * </br>
+     * This function is designed for API usage.
+     *
+     * @param player The player to set the level of
+     * @param skillType The skill to set the level for
+     * @param skillLevel The value to set the level to
+     */
+    public static void setLevel(Player player, SkillType skillType, int skillLevel) {
+        Users.getProfile(player).modifySkill(skillType, skillLevel);
+    }
+
+    /**
+     * Sets the XP of a player in a specific skill type.
+     * </br>
+     * This function is designed for API usage.
+     *
+     * @param player The player to set the XP of
+     * @param skillType The skill to set the XP for
+     * @param newValue The value to set the XP to
+     */
+    public static void setXP(Player player, SkillType skillType, int newValue) {
+        Users.getProfile(player).setSkillXPLevel(skillType, newValue);
+    }
+
+    /**
+     * Removes XP from a player in a specific skill type.
+     * </br>
+     * This function is designed for API usage.
+     *
+     * @param player The player to change the XP of
+     * @param skillType The skill to change the XP for
+     * @param xp The amount of XP to remove
+     */
+    public static void removeXP(Player player, SkillType skillType, int xp) {
+        Users.getProfile(player).removeXP(skillType, xp);
     }
 }

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

@@ -1,13 +1,16 @@
 package com.gmail.nossr50.api;
 
-import java.util.ArrayList;
+import java.util.List;
 
 import org.bukkit.entity.Player;
 
 import com.gmail.nossr50.party.Party;
+import com.gmail.nossr50.party.PartyManager;
 import com.gmail.nossr50.util.Users;
 
-public class PartyAPI {
+public final class PartyAPI {
+
+    private PartyAPI() {}
 
     /**
      * Get the name of the party a player is in.
@@ -17,8 +20,8 @@ public class PartyAPI {
      * @param player The player to check the party name of
      * @return the name of the player's party
      */
-    public String getPartyName(Player player) {
-        return Users.getProfile(player).getParty();
+    public static String getPartyName(Player player) {
+        return Users.getProfile(player).getParty().getName();
     }
 
     /**
@@ -29,7 +32,7 @@ public class PartyAPI {
      * @param player The player to check
      * @return true if the player is in a party, false otherwise
      */
-    public boolean inParty(Player player) {
+    public static boolean inParty(Player player) {
         return Users.getProfile(player).inParty();
     }
 
@@ -42,19 +45,19 @@ public class PartyAPI {
      * @param playerb The second player to check
      * @return true if the two players are in the same party, false otherwise
      */
-    public boolean inSameParty(Player playera, Player playerb) {
-        return Party.getInstance().inSameParty(playera, playerb);
+    public static boolean inSameParty(Player playera, Player playerb) {
+        return PartyManager.getInstance().inSameParty(playera, playerb);
     }
 
     /**
-     * Get a list of all current party names.
+     * Get a list of all current parties.
      * </br>
      * This function is designed for API usage.
      *
      * @return the list of parties.
      */
-    public ArrayList<String> getParties() {
-        return Party.getInstance().getParties();
+    public static List<Party> getParties() {
+        return PartyManager.getInstance().getParties();
     }
 
     /**
@@ -65,8 +68,8 @@ public class PartyAPI {
      * @param player The player to add to the party
      * @param partyName The party to add the player to
      */
-    public void addToParty(Player player, String partyName) {
-        Party.getInstance().addToParty(player, Users.getProfile(player), partyName, false, null);
+    public static void addToParty(Player player, String partyName) {
+        PartyManager.getInstance().addToParty(player.getName(), Users.getProfile(player), PartyManager.getInstance().getParty(partyName)); //TODO this will throw a NPE if the party doesn't exist
     }
 
     /**
@@ -76,8 +79,8 @@ public class PartyAPI {
      *
      * @param player The player to remove
      */
-    public void removeFromParty(Player player) {
-        Party.getInstance().removeFromParty(player, Users.getProfile(player));
+    public static void removeFromParty(Player player) {
+        PartyManager.getInstance().removeFromParty(player.getName(), Users.getProfile(player).getParty());
     }
 
     /**
@@ -88,8 +91,8 @@ public class PartyAPI {
      * @param partyName The party name
      * @return the leader of the party
      */
-    public Player getPartyLeader(String partyName) {
-        return Party.getInstance().getPartyLeader(partyName);
+    public static String getPartyLeader(String partyName) {
+        return PartyManager.getInstance().getPartyLeader(partyName);
     }
 
     /**
@@ -100,8 +103,8 @@ public class PartyAPI {
      * @param partyName The name of the party to set the leader of
      * @param player The player to set as leader
      */
-    public void setPartyLeader(String partyName, String player) {
-        Party.getInstance().setPartyLeader(partyName, player);
+    public static void setPartyLeader(String partyName, String player) {
+        PartyManager.getInstance().setPartyLeader(player, PartyManager.getInstance().getParty(partyName));
     }
 
     /**
@@ -112,8 +115,8 @@ public class PartyAPI {
      * @param player The player to check
      * @return all the players in the player's party
      */
-    public ArrayList<Player> getAllMembers(Player player) {
-        return Party.getInstance().getAllMembers(player);
+    public static List<String> getAllMembers(Player player) {
+        return PartyManager.getInstance().getAllMembers(player);
     }
 
     /**
@@ -124,8 +127,8 @@ public class PartyAPI {
      * @param partyName The party to check
      * @return all online players in this party
      */
-    public ArrayList<Player> getOnlineMembers(String partyName) {
-        return Party.getInstance().getOnlineMembers(partyName);
+    public static List<Player> getOnlineMembers(String partyName) {
+        return PartyManager.getInstance().getOnlineMembers(partyName);
     }
 
     /**
@@ -136,7 +139,7 @@ public class PartyAPI {
      * @param player The player to check
      * @return all online players in the player's party
      */
-    public ArrayList<Player> getOnlineMembers(Player player) {
-        return Party.getInstance().getOnlineMembers(player);
+    public static List<Player> getOnlineMembers(Player player) {
+        return PartyManager.getInstance().getOnlineMembers(player);
     }
 }

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

@@ -0,0 +1,54 @@
+package com.gmail.nossr50.api;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.bukkit.inventory.ItemStack;
+
+import com.gmail.nossr50.datatypes.ToolType;
+
+public final class SpoutToolsAPI {
+
+    private SpoutToolsAPI() {}
+
+    public static final List<ItemStack> spoutSwords = new ArrayList<ItemStack>();
+    public static final List<ItemStack> spoutAxes = new ArrayList<ItemStack>();
+    public static final List<ItemStack> spoutPickaxes = new ArrayList<ItemStack>();
+    public static final List<ItemStack> spoutHoes = new ArrayList<ItemStack>();
+    public static final List<ItemStack> spoutShovels = new ArrayList<ItemStack>();
+
+    /**
+     * Add a custom Spout tool to mcMMO for XP gain & ability use.
+     * </br>
+     * This function is designed for API usage.
+     *
+     * @param spoutTool The tool to add
+     * @param type The type of tool to add
+     */
+    public static void addCustomTool(ItemStack spoutTool, ToolType type) {
+        switch (type) {
+        case AXE:
+            spoutAxes.add(spoutTool);
+            break;
+
+        case HOE:
+            spoutHoes.add(spoutTool);
+            break;
+
+        case PICKAXE:
+            spoutPickaxes.add(spoutTool);
+            break;
+
+        case SHOVEL:
+            spoutShovels.add(spoutTool);
+            break;
+
+        case SWORD:
+            spoutSwords.add(spoutTool);
+            break;
+
+        default:
+            break;
+        }
+    }
+}

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

@@ -23,7 +23,7 @@ public class CommandHelper {
         if (sender instanceof Player) {
             Player player = (Player) sender;
 
-            if (player != null && !Permissions.getInstance().permission(player, permission)) {
+            if (!Permissions.getInstance().permission(player, permission)) {
                 player.sendMessage(LocaleLoader.getString("mcMMO.NoPermission"));
                 return true;
             }
@@ -49,28 +49,28 @@ public class CommandHelper {
      */
     public static void printGatheringSkills(Player inspect, CommandSender display) {
         if (Skills.hasGatheringSkills(inspect)) {
-            PlayerProfile PP = Users.getProfile(inspect);
+            PlayerProfile profile = Users.getProfile(inspect);
 
             display.sendMessage(LocaleLoader.getString("Stats.Header.Gathering"));
 
             if (Permissions.getInstance().excavation(inspect)) {
-                display.sendMessage(LocaleLoader.getString("Skills.Stats", new Object[] { LocaleLoader.getString("Excavation.Listener"), PP.getSkillLevel(SkillType.EXCAVATION), PP.getSkillXpLevel(SkillType.EXCAVATION), PP.getXpToLevel(SkillType.EXCAVATION) }));
+                display.sendMessage(LocaleLoader.getString("Skills.Stats", new Object[] { LocaleLoader.getString("Excavation.Listener"), profile.getSkillLevel(SkillType.EXCAVATION), profile.getSkillXpLevel(SkillType.EXCAVATION), profile.getXpToLevel(SkillType.EXCAVATION) }));
             }
 
             if (Permissions.getInstance().fishing(inspect)) {
-                display.sendMessage(LocaleLoader.getString("Skills.Stats", new Object[] { LocaleLoader.getString("Fishing.Listener"), PP.getSkillLevel(SkillType.FISHING), PP.getSkillXpLevel(SkillType.FISHING), PP.getXpToLevel(SkillType.FISHING) }));
+                display.sendMessage(LocaleLoader.getString("Skills.Stats", new Object[] { LocaleLoader.getString("Fishing.Listener"), profile.getSkillLevel(SkillType.FISHING), profile.getSkillXpLevel(SkillType.FISHING), profile.getXpToLevel(SkillType.FISHING) }));
             }
 
             if (Permissions.getInstance().herbalism(inspect)) {
-                display.sendMessage(LocaleLoader.getString("Skills.Stats", new Object[] { LocaleLoader.getString("Herbalism.Listener"), PP.getSkillLevel(SkillType.HERBALISM), PP.getSkillXpLevel(SkillType.HERBALISM), PP.getXpToLevel(SkillType.HERBALISM) }));
+                display.sendMessage(LocaleLoader.getString("Skills.Stats", new Object[] { LocaleLoader.getString("Herbalism.Listener"), profile.getSkillLevel(SkillType.HERBALISM), profile.getSkillXpLevel(SkillType.HERBALISM), profile.getXpToLevel(SkillType.HERBALISM) }));
             }
 
             if (Permissions.getInstance().mining(inspect)) {
-                display.sendMessage(LocaleLoader.getString("Skills.Stats", new Object[] { LocaleLoader.getString("Mining.Listener"), PP.getSkillLevel(SkillType.MINING), PP.getSkillXpLevel(SkillType.MINING), PP.getXpToLevel(SkillType.MINING) }));
+                display.sendMessage(LocaleLoader.getString("Skills.Stats", new Object[] { LocaleLoader.getString("Mining.Listener"), profile.getSkillLevel(SkillType.MINING), profile.getSkillXpLevel(SkillType.MINING), profile.getXpToLevel(SkillType.MINING) }));
             }
 
             if (Permissions.getInstance().woodcutting(inspect)) {
-                display.sendMessage(LocaleLoader.getString("Skills.Stats", new Object[] { LocaleLoader.getString("Woodcutting.Listener"), PP.getSkillLevel(SkillType.WOODCUTTING), PP.getSkillXpLevel(SkillType.WOODCUTTING), PP.getXpToLevel(SkillType.WOODCUTTING) }));
+                display.sendMessage(LocaleLoader.getString("Skills.Stats", new Object[] { LocaleLoader.getString("Woodcutting.Listener"), profile.getSkillLevel(SkillType.WOODCUTTING), profile.getSkillXpLevel(SkillType.WOODCUTTING), profile.getXpToLevel(SkillType.WOODCUTTING) }));
             }
         }
     }
@@ -87,28 +87,28 @@ public class CommandHelper {
      */
     public static void printCombatSkills(Player inspect, CommandSender display) {
         if (Skills.hasCombatSkills(inspect)) {
-            PlayerProfile PP = Users.getProfile(inspect);
+            PlayerProfile profile = Users.getProfile(inspect);
 
             display.sendMessage(LocaleLoader.getString("Stats.Header.Combat"));
 
             if (Permissions.getInstance().axes(inspect)) {
-                display.sendMessage(LocaleLoader.getString("Skills.Stats", new Object[] { LocaleLoader.getString("Axes.Listener"), PP.getSkillLevel(SkillType.AXES), PP.getSkillXpLevel(SkillType.AXES), PP.getXpToLevel(SkillType.AXES) }));
+                display.sendMessage(LocaleLoader.getString("Skills.Stats", new Object[] { LocaleLoader.getString("Axes.Listener"), profile.getSkillLevel(SkillType.AXES), profile.getSkillXpLevel(SkillType.AXES), profile.getXpToLevel(SkillType.AXES) }));
             }
 
             if (Permissions.getInstance().archery(inspect)) {
-                display.sendMessage(LocaleLoader.getString("Skills.Stats", new Object[] { LocaleLoader.getString("Archery.Listener"), PP.getSkillLevel(SkillType.ARCHERY), PP.getSkillXpLevel(SkillType.ARCHERY), PP.getXpToLevel(SkillType.ARCHERY) }));
+                display.sendMessage(LocaleLoader.getString("Skills.Stats", new Object[] { LocaleLoader.getString("Archery.Listener"), profile.getSkillLevel(SkillType.ARCHERY), profile.getSkillXpLevel(SkillType.ARCHERY), profile.getXpToLevel(SkillType.ARCHERY) }));
             }
 
             if (Permissions.getInstance().swords(inspect)) {
-                display.sendMessage(LocaleLoader.getString("Skills.Stats", new Object[] { LocaleLoader.getString("Swords.Listener"), PP.getSkillLevel(SkillType.SWORDS), PP.getSkillXpLevel(SkillType.SWORDS), PP.getXpToLevel(SkillType.SWORDS) }));
+                display.sendMessage(LocaleLoader.getString("Skills.Stats", new Object[] { LocaleLoader.getString("Swords.Listener"), profile.getSkillLevel(SkillType.SWORDS), profile.getSkillXpLevel(SkillType.SWORDS), profile.getXpToLevel(SkillType.SWORDS) }));
             }
 
             if (Permissions.getInstance().taming(inspect)) {
-                display.sendMessage(LocaleLoader.getString("Skills.Stats", new Object[] { LocaleLoader.getString("Taming.Listener"), PP.getSkillLevel(SkillType.TAMING), PP.getSkillXpLevel(SkillType.TAMING), PP.getXpToLevel(SkillType.TAMING) }));
+                display.sendMessage(LocaleLoader.getString("Skills.Stats", new Object[] { LocaleLoader.getString("Taming.Listener"), profile.getSkillLevel(SkillType.TAMING), profile.getSkillXpLevel(SkillType.TAMING), profile.getXpToLevel(SkillType.TAMING) }));
             }
 
             if (Permissions.getInstance().unarmed(inspect)) {
-                display.sendMessage(LocaleLoader.getString("Skills.Stats", new Object[] { LocaleLoader.getString("Unarmed.Listener"), PP.getSkillLevel(SkillType.UNARMED), PP.getSkillXpLevel(SkillType.UNARMED), PP.getXpToLevel(SkillType.UNARMED) }));
+                display.sendMessage(LocaleLoader.getString("Skills.Stats", new Object[] { LocaleLoader.getString("Unarmed.Listener"), profile.getSkillLevel(SkillType.UNARMED), profile.getSkillXpLevel(SkillType.UNARMED), profile.getXpToLevel(SkillType.UNARMED) }));
             }
         }
     }
@@ -125,15 +125,15 @@ public class CommandHelper {
      */
     public static void printMiscSkills(Player inspect, CommandSender display) {
         if (Skills.hasMiscSkills(inspect)) {
-            PlayerProfile PP = Users.getProfile(inspect);
+            PlayerProfile profile = Users.getProfile(inspect);
             display.sendMessage(LocaleLoader.getString("Stats.Header.Misc"));
 
             if (Permissions.getInstance().acrobatics(inspect)) {
-                display.sendMessage(LocaleLoader.getString("Skills.Stats", new Object[] { LocaleLoader.getString("Acrobatics.Listener"), PP.getSkillLevel(SkillType.ACROBATICS), PP.getSkillXpLevel(SkillType.ACROBATICS), PP.getXpToLevel(SkillType.ACROBATICS) }));
+                display.sendMessage(LocaleLoader.getString("Skills.Stats", new Object[] { LocaleLoader.getString("Acrobatics.Listener"), profile.getSkillLevel(SkillType.ACROBATICS), profile.getSkillXpLevel(SkillType.ACROBATICS), profile.getXpToLevel(SkillType.ACROBATICS) }));
             }
 
             if (Permissions.getInstance().repair(inspect)) {
-                display.sendMessage(LocaleLoader.getString("Skills.Stats", new Object[] { LocaleLoader.getString("Repair.Listener"), PP.getSkillLevel(SkillType.REPAIR), PP.getSkillXpLevel(SkillType.REPAIR), PP.getXpToLevel(SkillType.REPAIR) }));
+                display.sendMessage(LocaleLoader.getString("Skills.Stats", new Object[] { LocaleLoader.getString("Repair.Listener"), profile.getSkillLevel(SkillType.REPAIR), profile.getSkillXpLevel(SkillType.REPAIR), profile.getXpToLevel(SkillType.REPAIR) }));
             }
         }
     }

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

@@ -0,0 +1,85 @@
+package com.gmail.nossr50.commands;
+
+import java.text.DecimalFormat;
+
+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.PlayerProfile;
+import com.gmail.nossr50.datatypes.SkillType;
+import com.gmail.nossr50.locale.LocaleLoader;
+import com.gmail.nossr50.util.Misc;
+import com.gmail.nossr50.util.Page;
+import com.gmail.nossr50.util.Permissions;
+import com.gmail.nossr50.util.Users;
+
+public abstract class SkillCommand implements CommandExecutor {
+    private SkillType skill;
+    private String skillString;
+    private String permission;
+
+    protected Player player;
+    protected PlayerProfile profile;
+    protected float skillValue;
+
+    protected DecimalFormat percent = new DecimalFormat("##0.00%");
+    protected Permissions permInstance = Permissions.getInstance();
+
+    public SkillCommand(SkillType skill) {
+        this.skill = skill;
+        this.skillString = Misc.getCapitalized(skill.toString());
+        this.permission = "mcmmo.skills." + skillString.toLowerCase();
+    }
+
+    @Override
+    public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
+        if (CommandHelper.noConsoleUsage(sender)) {
+            return true;
+        }
+
+        if (CommandHelper.noCommandPermissions(sender, permission)) {
+            return true;
+        }
+
+        player = (Player) sender;
+        profile = Users.getProfile(player);
+
+        skillValue = profile.getSkillLevel(skill);
+        dataCalculations();
+        permissionsCheck();
+
+        player.sendMessage(LocaleLoader.getString("Skills.Header", new Object[] { LocaleLoader.getString(skillString + ".SkillName") }));
+        player.sendMessage(LocaleLoader.getString("Commands.XPGain", new Object[] { LocaleLoader.getString("Commands.XPGain." + skillString) }));
+        player.sendMessage(LocaleLoader.getString("Effects.Level", new Object[] { profile.getSkillLevel(skill), profile.getSkillXpLevel(skill), profile.getXpToLevel(skill) }));
+
+        if (effectsHeaderPermissions()) {
+            player.sendMessage(LocaleLoader.getString("Skills.Header", new Object[] { LocaleLoader.getString("Effects.Effects") }));
+        }
+
+        effectsDisplay();
+
+        if (statsHeaderPermissions()) {
+            player.sendMessage(LocaleLoader.getString("Skills.Header", new Object[] { LocaleLoader.getString("Commands.Stats.Self") }));
+        }
+
+        statsDisplay();
+
+        Page.grabGuidePageForSkill(skill, player, args);
+
+        return true;
+    }
+
+    protected abstract void dataCalculations();
+
+    protected abstract void permissionsCheck();
+
+    protected abstract boolean effectsHeaderPermissions();
+
+    protected abstract void effectsDisplay();
+
+    protected abstract boolean statsHeaderPermissions();
+
+    protected abstract void statsDisplay();
+}

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

@@ -26,7 +26,7 @@ public class AddlevelsCommand implements CommandExecutor{
     @Override
     public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
         OfflinePlayer modifiedPlayer;
-        PlayerProfile PP;
+        PlayerProfile profile;
         int levels;
         SkillType skill;
         String skillName;
@@ -48,7 +48,7 @@ public class AddlevelsCommand implements CommandExecutor{
                     modifiedPlayer = (Player) sender;
                     levels = Integer.valueOf(args[1]);
                     skill = Skills.getSkillType(args[0]);
-                    PP = Users.getProfile(modifiedPlayer);
+                    profile = Users.getProfile(modifiedPlayer);
 
                     if (skill.equals(SkillType.ALL)) {
                         skillName = "all skills";
@@ -57,7 +57,7 @@ public class AddlevelsCommand implements CommandExecutor{
                         skillName = Misc.getCapitalized(skill.toString());
                     }
 
-                    PP.addLevels(skill, levels);
+                    profile.addLevels(skill, levels);
                     sender.sendMessage(ChatColor.GREEN + "You were awarded " + levels + " levels in " + skillName + "!"); //TODO: Needs more locale.
                 }
             }
@@ -70,9 +70,9 @@ public class AddlevelsCommand implements CommandExecutor{
         case 3:
             modifiedPlayer = plugin.getServer().getOfflinePlayer(args[0]);
             String playerName = modifiedPlayer.getName();
-            PP = Users.getProfile(modifiedPlayer);
+            profile = Users.getProfile(modifiedPlayer);
 
-            if (!PP.isLoaded()) {
+            if (!profile.isLoaded()) {
                 sender.sendMessage(LocaleLoader.getString("Commands.DoesNotExist"));
                 return true;
             }

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

@@ -8,6 +8,8 @@ import org.bukkit.entity.Player;
 
 import com.gmail.nossr50.mcMMO;
 import com.gmail.nossr50.commands.CommandHelper;
+import com.gmail.nossr50.datatypes.McMMOPlayer;
+import com.gmail.nossr50.datatypes.PlayerProfile;
 import com.gmail.nossr50.datatypes.SkillType;
 import com.gmail.nossr50.locale.LocaleLoader;
 import com.gmail.nossr50.util.Misc;
@@ -47,7 +49,9 @@ public class AddxpCommand implements CommandExecutor {
                     xp = Integer.valueOf(args[1]);
                     skill = Skills.getSkillType(args[0]);
 
-                    Users.getProfile(modifiedPlayer).addXPOverride(skill, xp);
+                    PlayerProfile profile = Users.getProfile(modifiedPlayer);
+                    McMMOPlayer mcMMOPlayer = Users.getPlayer(modifiedPlayer);
+                    mcMMOPlayer.addXPOverride(skill, xp);
 
                     if (skill.equals(SkillType.ALL)) {
                         skillName = "all skills";
@@ -59,10 +63,10 @@ public class AddxpCommand implements CommandExecutor {
                     modifiedPlayer.sendMessage(ChatColor.GREEN + "You were awarded " + xp + " experience in " + skillName + "!"); //TODO: Needs more locale.
 
                     if (skill.equals(SkillType.ALL)) {
-                        Skills.XpCheckAll(modifiedPlayer);
+                        Skills.xpCheckAll(modifiedPlayer, profile);
                     }
                     else {
-                        Skills.XpCheckSkill(skill, modifiedPlayer);
+                        Skills.xpCheckSkill(skill, modifiedPlayer, profile);
                     }
                 }
                 else {
@@ -78,8 +82,10 @@ public class AddxpCommand implements CommandExecutor {
         case 3:
             modifiedPlayer = plugin.getServer().getPlayer(args[0]);
             String playerName = modifiedPlayer.getName();
+            McMMOPlayer mcMMOPlayer = Users.getPlayer(modifiedPlayer);
+            PlayerProfile profile = Users.getProfile(modifiedPlayer);
 
-            if (!Users.getProfile(modifiedPlayer).isLoaded()) {
+            if (!profile.isLoaded()) {
                 sender.sendMessage(LocaleLoader.getString("Commands.DoesNotExist"));
                 return true;
             }
@@ -94,7 +100,7 @@ public class AddxpCommand implements CommandExecutor {
                 skill = Skills.getSkillType(args[1]);
                 String message;
 
-                Users.getProfile(modifiedPlayer).addXPOverride(skill, xp);
+                mcMMOPlayer.addXPOverride(skill, xp);
 
                 if (skill.equals(SkillType.ALL)) {
                     skillName = "all skills";
@@ -109,10 +115,10 @@ public class AddxpCommand implements CommandExecutor {
                 modifiedPlayer.sendMessage(ChatColor.GREEN + "You were awarded " + xp + " experience in " + skillName + "!"); //TODO: Needs more locale.
 
                 if (skill.equals(SkillType.ALL)) {
-                    Skills.XpCheckAll(modifiedPlayer);
+                    Skills.xpCheckAll(modifiedPlayer, profile);
                 }
                 else {
-                    Skills.XpCheckSkill(skill, modifiedPlayer);
+                    Skills.xpCheckSkill(skill, modifiedPlayer, profile);
                 }
             }
             else {

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

@@ -1,13 +1,12 @@
 package com.gmail.nossr50.commands.general;
 
-import org.bukkit.OfflinePlayer;
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandExecutor;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 
-import com.gmail.nossr50.mcMMO;
 import com.gmail.nossr50.commands.CommandHelper;
+import com.gmail.nossr50.datatypes.McMMOPlayer;
 import com.gmail.nossr50.datatypes.PlayerProfile;
 import com.gmail.nossr50.datatypes.SkillType;
 import com.gmail.nossr50.locale.LocaleLoader;
@@ -16,16 +15,8 @@ import com.gmail.nossr50.util.Permissions;
 import com.gmail.nossr50.util.Users;
 
 public class InspectCommand implements CommandExecutor {
-    private final mcMMO plugin;
-
-    public InspectCommand (mcMMO plugin) {
-        this.plugin = plugin;
-    }
-
     @Override
     public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
-        OfflinePlayer target;
-        PlayerProfile PP;
         String usage = "Proper usage is /inspect <player>"; //TODO: Needs more locale.
 
         if (CommandHelper.noCommandPermissions(sender, "mcmmo.commands.inspect")) {
@@ -34,22 +25,21 @@ public class InspectCommand implements CommandExecutor {
 
         switch (args.length) {
         case 1:
-            target = plugin.getServer().getOfflinePlayer(args[0]);
-            PP = Users.getProfile(target);
+            McMMOPlayer mcmmoPlayer = Users.getPlayer(args[0]);
 
-            if (target.isOnline()) {
-                Player player = (Player) target;
+            if (mcmmoPlayer != null) {
+                Player target = mcmmoPlayer.getPlayer();
 
-                if (sender instanceof Player && !sender.isOp() && !Misc.isNear(((Player) sender).getLocation(), player.getLocation(), 5.0) && !Permissions.getInstance().inspectDistanceBypass((Player) sender)) {
+                if (sender instanceof Player && !sender.isOp() && !Misc.isNear(((Player) sender).getLocation(), target.getLocation(), 5.0) && !Permissions.getInstance().inspectDistanceBypass((Player) sender)) {
                     sender.sendMessage(LocaleLoader.getString("Inspect.TooFar"));
                     return true;
                 }
 
                 sender.sendMessage(LocaleLoader.getString("Inspect.Stats", new Object[] { target.getName() }));
-                CommandHelper.printGatheringSkills(player, sender);
-                CommandHelper.printCombatSkills(player, sender);
-                CommandHelper.printMiscSkills(player, sender);
-                sender.sendMessage(LocaleLoader.getString("Commands.PowerLevel", new Object[] { PP.getPowerLevel() }));
+                CommandHelper.printGatheringSkills(target, sender);
+                CommandHelper.printCombatSkills(target, sender);
+                CommandHelper.printMiscSkills(target, sender);
+                sender.sendMessage(LocaleLoader.getString("Commands.PowerLevel", new Object[] { mcmmoPlayer.getPowerLevel() }));
 
                 return true;
             }
@@ -59,7 +49,9 @@ public class InspectCommand implements CommandExecutor {
                     return true;
                 }
 
-                if (!PP.isLoaded()) {
+                PlayerProfile profile = new PlayerProfile(args[0], false); //Temporary Profile
+
+                if (!profile.isLoaded()) {
                     sender.sendMessage(LocaleLoader.getString("Commands.DoesNotExist"));
                     return true;
                 }
@@ -67,22 +59,22 @@ public class InspectCommand implements CommandExecutor {
                 sender.sendMessage(LocaleLoader.getString("Inspect.OfflineStats", new Object[] { args[0] }));
 
                 sender.sendMessage(LocaleLoader.getString("Stats.Header.Gathering"));
-                sender.sendMessage(LocaleLoader.getString("Skills.Stats", new Object[] { LocaleLoader.getString("Excavation.Listener"), PP.getSkillLevel(SkillType.EXCAVATION), PP.getSkillXpLevel(SkillType.EXCAVATION), PP.getXpToLevel(SkillType.EXCAVATION) }));
-                sender.sendMessage(LocaleLoader.getString("Skills.Stats", new Object[] { LocaleLoader.getString("Fishing.Listener"), PP.getSkillLevel(SkillType.FISHING), PP.getSkillXpLevel(SkillType.FISHING), PP.getXpToLevel(SkillType.FISHING) }));
-                sender.sendMessage(LocaleLoader.getString("Skills.Stats", new Object[] { LocaleLoader.getString("Herbalism.Listener"), PP.getSkillLevel(SkillType.HERBALISM), PP.getSkillXpLevel(SkillType.HERBALISM), PP.getXpToLevel(SkillType.HERBALISM) }));
-                sender.sendMessage(LocaleLoader.getString("Skills.Stats", new Object[] { LocaleLoader.getString("Mining.Listener"), PP.getSkillLevel(SkillType.MINING), PP.getSkillXpLevel(SkillType.MINING), PP.getXpToLevel(SkillType.MINING) }));
-                sender.sendMessage(LocaleLoader.getString("Skills.Stats", new Object[] { LocaleLoader.getString("Woodcutting.Listener"), PP.getSkillLevel(SkillType.WOODCUTTING), PP.getSkillXpLevel(SkillType.WOODCUTTING), PP.getXpToLevel(SkillType.WOODCUTTING) }));
+                sender.sendMessage(LocaleLoader.getString("Skills.Stats", new Object[] { LocaleLoader.getString("Excavation.Listener"), profile.getSkillLevel(SkillType.EXCAVATION), profile.getSkillXpLevel(SkillType.EXCAVATION), profile.getXpToLevel(SkillType.EXCAVATION) }));
+                sender.sendMessage(LocaleLoader.getString("Skills.Stats", new Object[] { LocaleLoader.getString("Fishing.Listener"), profile.getSkillLevel(SkillType.FISHING), profile.getSkillXpLevel(SkillType.FISHING), profile.getXpToLevel(SkillType.FISHING) }));
+                sender.sendMessage(LocaleLoader.getString("Skills.Stats", new Object[] { LocaleLoader.getString("Herbalism.Listener"), profile.getSkillLevel(SkillType.HERBALISM), profile.getSkillXpLevel(SkillType.HERBALISM), profile.getXpToLevel(SkillType.HERBALISM) }));
+                sender.sendMessage(LocaleLoader.getString("Skills.Stats", new Object[] { LocaleLoader.getString("Mining.Listener"), profile.getSkillLevel(SkillType.MINING), profile.getSkillXpLevel(SkillType.MINING), profile.getXpToLevel(SkillType.MINING) }));
+                sender.sendMessage(LocaleLoader.getString("Skills.Stats", new Object[] { LocaleLoader.getString("Woodcutting.Listener"), profile.getSkillLevel(SkillType.WOODCUTTING), profile.getSkillXpLevel(SkillType.WOODCUTTING), profile.getXpToLevel(SkillType.WOODCUTTING) }));
 
                 sender.sendMessage(LocaleLoader.getString("Stats.Header.Combat"));
-                sender.sendMessage(LocaleLoader.getString("Skills.Stats", new Object[] { LocaleLoader.getString("Axes.Listener"), PP.getSkillLevel(SkillType.AXES), PP.getSkillXpLevel(SkillType.AXES), PP.getXpToLevel(SkillType.AXES) }));
-                sender.sendMessage(LocaleLoader.getString("Skills.Stats", new Object[] { LocaleLoader.getString("Archery.Listener"), PP.getSkillLevel(SkillType.ARCHERY), PP.getSkillXpLevel(SkillType.ARCHERY), PP.getXpToLevel(SkillType.ARCHERY) }));
-                sender.sendMessage(LocaleLoader.getString("Skills.Stats", new Object[] { LocaleLoader.getString("Swords.Listener"), PP.getSkillLevel(SkillType.SWORDS), PP.getSkillXpLevel(SkillType.SWORDS), PP.getXpToLevel(SkillType.SWORDS) }));
-                sender.sendMessage(LocaleLoader.getString("Skills.Stats", new Object[] { LocaleLoader.getString("Taming.Listener"), PP.getSkillLevel(SkillType.TAMING), PP.getSkillXpLevel(SkillType.TAMING), PP.getXpToLevel(SkillType.TAMING) }));
-                sender.sendMessage(LocaleLoader.getString("Skills.Stats", new Object[] { LocaleLoader.getString("Unarmed.Listener"), PP.getSkillLevel(SkillType.UNARMED), PP.getSkillXpLevel(SkillType.UNARMED), PP.getXpToLevel(SkillType.UNARMED) }));
+                sender.sendMessage(LocaleLoader.getString("Skills.Stats", new Object[] { LocaleLoader.getString("Axes.Listener"), profile.getSkillLevel(SkillType.AXES), profile.getSkillXpLevel(SkillType.AXES), profile.getXpToLevel(SkillType.AXES) }));
+                sender.sendMessage(LocaleLoader.getString("Skills.Stats", new Object[] { LocaleLoader.getString("Archery.Listener"), profile.getSkillLevel(SkillType.ARCHERY), profile.getSkillXpLevel(SkillType.ARCHERY), profile.getXpToLevel(SkillType.ARCHERY) }));
+                sender.sendMessage(LocaleLoader.getString("Skills.Stats", new Object[] { LocaleLoader.getString("Swords.Listener"), profile.getSkillLevel(SkillType.SWORDS), profile.getSkillXpLevel(SkillType.SWORDS), profile.getXpToLevel(SkillType.SWORDS) }));
+                sender.sendMessage(LocaleLoader.getString("Skills.Stats", new Object[] { LocaleLoader.getString("Taming.Listener"), profile.getSkillLevel(SkillType.TAMING), profile.getSkillXpLevel(SkillType.TAMING), profile.getXpToLevel(SkillType.TAMING) }));
+                sender.sendMessage(LocaleLoader.getString("Skills.Stats", new Object[] { LocaleLoader.getString("Unarmed.Listener"), profile.getSkillLevel(SkillType.UNARMED), profile.getSkillXpLevel(SkillType.UNARMED), profile.getXpToLevel(SkillType.UNARMED) }));
 
                 sender.sendMessage(LocaleLoader.getString("Stats.Header.Misc"));
-                sender.sendMessage(LocaleLoader.getString("Skills.Stats", new Object[] { LocaleLoader.getString("Acrobatics.Listener"), PP.getSkillLevel(SkillType.ACROBATICS), PP.getSkillXpLevel(SkillType.ACROBATICS), PP.getXpToLevel(SkillType.ACROBATICS) }));
-                sender.sendMessage(LocaleLoader.getString("Skills.Stats", new Object[] { LocaleLoader.getString("Repair.Listener"), PP.getSkillLevel(SkillType.REPAIR), PP.getSkillXpLevel(SkillType.REPAIR), PP.getXpToLevel(SkillType.REPAIR) }));
+                sender.sendMessage(LocaleLoader.getString("Skills.Stats", new Object[] { LocaleLoader.getString("Acrobatics.Listener"), profile.getSkillLevel(SkillType.ACROBATICS), profile.getSkillXpLevel(SkillType.ACROBATICS), profile.getXpToLevel(SkillType.ACROBATICS) }));
+                sender.sendMessage(LocaleLoader.getString("Skills.Stats", new Object[] { LocaleLoader.getString("Repair.Listener"), profile.getSkillLevel(SkillType.REPAIR), profile.getSkillXpLevel(SkillType.REPAIR), profile.getXpToLevel(SkillType.REPAIR) }));
 
                 return true;
             }

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

@@ -6,7 +6,7 @@ import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 
 import com.gmail.nossr50.commands.CommandHelper;
-import com.gmail.nossr50.datatypes.PlayerProfile;
+import com.gmail.nossr50.config.Config;
 import com.gmail.nossr50.locale.LocaleLoader;
 import com.gmail.nossr50.util.Users;
 
@@ -19,7 +19,6 @@ public class McstatsCommand implements CommandExecutor {
         }
 
         Player player = (Player) sender;
-        PlayerProfile PP = Users.getProfile(player);
 
         player.sendMessage(LocaleLoader.getString("Stats.Own.Stats"));
         player.sendMessage(LocaleLoader.getString("mcMMO.NoSkillNote"));
@@ -27,8 +26,13 @@ public class McstatsCommand implements CommandExecutor {
         CommandHelper.printGatheringSkills(player);
         CommandHelper.printCombatSkills(player);
         CommandHelper.printMiscSkills(player);
-
-        player.sendMessage(LocaleLoader.getString("Commands.PowerLevel", new Object[] { String.valueOf(PP.getPowerLevel()) }));
+
+        int powerLevelCap = Config.getInstance().getPowerLevelCap();
+        
+        if (powerLevelCap > 0)
+        	player.sendMessage(LocaleLoader.getString("Commands.PowerLevel.Capped", new Object[] { String.valueOf(Users.getPlayer(player).getPowerLevel()), String.valueOf(powerLevelCap) }));
+        else
+        	player.sendMessage(LocaleLoader.getString("Commands.PowerLevel", new Object[] { String.valueOf(Users.getPlayer(player).getPowerLevel()) }));        	
 
         return true;
     }

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

@@ -1,14 +1,13 @@
 package com.gmail.nossr50.commands.general;
 
 import org.bukkit.ChatColor;
-import org.bukkit.OfflinePlayer;
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandExecutor;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 
-import com.gmail.nossr50.mcMMO;
 import com.gmail.nossr50.commands.CommandHelper;
+import com.gmail.nossr50.datatypes.McMMOPlayer;
 import com.gmail.nossr50.datatypes.PlayerProfile;
 import com.gmail.nossr50.datatypes.SkillType;
 import com.gmail.nossr50.locale.LocaleLoader;
@@ -17,16 +16,9 @@ import com.gmail.nossr50.util.Skills;
 import com.gmail.nossr50.util.Users;
 
 public class MmoeditCommand implements CommandExecutor {
-    private final mcMMO plugin;
-
-    public MmoeditCommand (mcMMO plugin) {
-        this.plugin = plugin;
-    }
-
     @Override
     public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
-        OfflinePlayer modifiedPlayer;
-        PlayerProfile PP;
+        PlayerProfile profile;
         int newValue;
         SkillType skill;
         String skillName;
@@ -45,10 +37,10 @@ public class MmoeditCommand implements CommandExecutor {
                 }
 
                 if (Misc.isInt(args[1])) {
-                    modifiedPlayer = (Player) sender;
+                    Player player = (Player) sender;
                     newValue = Integer.valueOf(args[1]);
                     skill = Skills.getSkillType(args[0]);
-                    PP = Users.getProfile(modifiedPlayer);
+                    profile = Users.getProfile(player);
 
                     if (skill.equals(SkillType.ALL)) {
                         skillName = "all skills";
@@ -57,7 +49,7 @@ public class MmoeditCommand implements CommandExecutor {
                         skillName = Misc.getCapitalized(skill.toString());
                     }
 
-                    PP.modifySkill(skill, newValue);
+                    profile.modifySkill(skill, newValue);
                     sender.sendMessage(ChatColor.GREEN + "Your level in " + skillName + " was set to " + newValue + "!"); //TODO: Needs more locale.
                 }
                 else {
@@ -71,46 +63,46 @@ public class MmoeditCommand implements CommandExecutor {
             return true;
 
         case 3:
-            modifiedPlayer = plugin.getServer().getOfflinePlayer(args[0]);
-            String playerName = modifiedPlayer.getName();
-            PP = Users.getProfile(modifiedPlayer);
-
-            if (!PP.isLoaded()) {
-                sender.sendMessage(LocaleLoader.getString("Commands.DoesNotExist"));
+            if (!Misc.isInt(args[2])) {
+                sender.sendMessage(usage);
                 return true;
             }
 
-            if (!Skills.isSkill(args[1])) {
+            skill = Skills.getSkillType(args[1]);
+
+            if (skill == null) {
                 sender.sendMessage(LocaleLoader.getString("Commands.Skill.Invalid"));
                 return true;
             }
 
-            if (Misc.isInt(args[2])) {
-                newValue = Integer.valueOf(args[2]);
-                skill = Skills.getSkillType(args[1]);
-                String message;
-
-                Users.getProfile(modifiedPlayer).modifySkill(skill, newValue);
-
-                if (skill.equals(SkillType.ALL)) {
-                    skillName = "all skills";
-                    message = ChatColor.RED + "All skills have been modified for " + playerName + "."; //TODO: Use locale
-                }
-                else {
-                    skillName = Misc.getCapitalized(skill.toString());
-                    message = ChatColor.RED + skillName + " has been modified for " + playerName + "."; //TODO: Use locale
-                }
-
-                sender.sendMessage(message);
-
-                if (modifiedPlayer.isOnline()) {
-                    ((Player) modifiedPlayer).sendMessage(ChatColor.GREEN + "Your level in " + skillName + " was set to " + newValue + "!"); //TODO: Needs more locale.
-                }
+            if (skill.equals(SkillType.ALL)) {
+                skillName = "all skills";
             }
             else {
-                sender.sendMessage(usage);
+                skillName = Misc.getCapitalized(skill.toString());
             }
 
+            newValue = Integer.valueOf(args[2]);
+            McMMOPlayer mcmmoPlayer = Users.getPlayer(args[0]);
+
+            if (mcmmoPlayer != null) {
+                profile = mcmmoPlayer.getProfile();
+
+                profile.modifySkill(skill, newValue);
+                mcmmoPlayer.getPlayer().sendMessage(ChatColor.GREEN + "Your level in " + skillName + " was set to " + newValue + "!"); //TODO: Needs more locale.
+                sender.sendMessage(ChatColor.RED + skillName + " has been modified for " + args[0] + "."); //TODO: Use locale
+            }
+            else {
+                profile = new PlayerProfile(args[0], false); //Temporary Profile
+
+                if (!profile.isLoaded()) {
+                    sender.sendMessage(LocaleLoader.getString("Commands.DoesNotExist"));
+                    return true;
+                }
+
+                profile.modifySkill(skill, newValue);
+                profile.save();
+            }
             return true;
 
         default:

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

@@ -26,7 +26,7 @@ public class MmoupdateCommand implements CommandExecutor {
         }
 
         sender.sendMessage(ChatColor.GRAY + "Starting conversion..."); //TODO: Needs more locale.
-        Users.clearUsers();
+        Users.clearAll();
         convertToMySQL();
 
         for (Player x : plugin.getServer().getOnlinePlayers()) {

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

@@ -0,0 +1,59 @@
+package com.gmail.nossr50.commands.general;
+
+import org.bukkit.command.Command;
+import org.bukkit.command.CommandExecutor;
+import org.bukkit.command.CommandSender;
+import org.bukkit.entity.Player;
+
+import com.gmail.nossr50.commands.CommandHelper;
+import com.gmail.nossr50.datatypes.PlayerProfile;
+import com.gmail.nossr50.datatypes.SkillType;
+import com.gmail.nossr50.locale.LocaleLoader;
+import com.gmail.nossr50.util.Users;
+
+public class SkillResetCommand implements CommandExecutor {
+
+    @Override
+    public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
+        if (CommandHelper.noConsoleUsage(sender)) {
+            return true;
+        }
+        
+        //ensure they have the skillreset perm
+        if (CommandHelper.noCommandPermissions(sender, "mcmmo.skillreset")) {
+            return true;
+        }
+        
+        SkillType skillType = null; //simple initialization
+        
+        //make sure there's only one argument.  output at least some kind of error if not
+        if (args.length != 1 && args[0] != null) {
+        	sender.sendMessage(LocaleLoader.getString("Commands.Skill.Invalid"));
+            return true;
+        }
+        
+        
+        //parse the skilltype that they sent
+        try
+        {
+        	skillType = SkillType.valueOf(args[0].toUpperCase().trim());  //ucase needed to match enum since it's case sensitive. trim to be nice
+        }catch(IllegalArgumentException ex)
+    	{
+        	sender.sendMessage(LocaleLoader.getString("Commands.Skill.Invalid"));
+            return true;
+    	}
+        
+        //reset the values in the hash table and persist them
+        PlayerProfile profile = Users.getProfile((Player)sender);
+        profile.resetSkill(skillType);
+        profile.save();
+        
+        //display a success message to the user
+        if (skillType == SkillType.ALL)
+        	sender.sendMessage(LocaleLoader.getString("Commands.Reset.All"));
+        else
+        	sender.sendMessage(LocaleLoader.getString("Commands.Reset.Single", new Object[] { args[0] }));    
+        
+        return true;
+    }
+}

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

@@ -13,8 +13,8 @@ import com.gmail.nossr50.util.Misc;
 
 public class XprateCommand implements CommandExecutor {
     private final mcMMO plugin;
-    private static int oldrate = Config.getInstance().xpGainMultiplier;
-    public static boolean xpevent = false;
+    private static double oldRate = Config.getInstance().xpGainMultiplier;
+    private static boolean xpEvent = false;
 
     public XprateCommand (mcMMO plugin) {
         this.plugin = plugin;
@@ -33,16 +33,16 @@ public class XprateCommand implements CommandExecutor {
         switch (args.length) {
         case 1:
             if (args[0].equalsIgnoreCase("reset")) {
-                if (xpevent) {
+                if (xpEvent) {
                     for (Player x : plugin.getServer().getOnlinePlayers()) {
                         x.sendMessage(LocaleLoader.getString("Commands.xprate.over"));
                     }
 
-                    xpevent = !xpevent;
-                    Config.getInstance().xpGainMultiplier = oldrate;
+                    xpEvent = !xpEvent;
+                    Config.getInstance().xpGainMultiplier = oldRate;
                 }
                 else {
-                    Config.getInstance().xpGainMultiplier = oldrate;
+                    Config.getInstance().xpGainMultiplier = oldRate;
                 }
             }
             else if (Misc.isInt(args[0])) {
@@ -56,10 +56,10 @@ public class XprateCommand implements CommandExecutor {
 
         case 2:
             if (Misc.isInt(args[0])) {
-                oldrate = Config.getInstance().xpGainMultiplier;
+                oldRate = Config.getInstance().xpGainMultiplier;
 
                 if (args[1].equalsIgnoreCase("true") || args[1].equalsIgnoreCase("false")) {
-                    xpevent = Boolean.valueOf(args[1]);
+                    xpEvent = Boolean.valueOf(args[1]);
                 }
                 else {
                     sender.sendMessage(usage3);
@@ -67,7 +67,7 @@ public class XprateCommand implements CommandExecutor {
 
                 Config.getInstance().xpGainMultiplier = Misc.getInt(args[0]);
 
-                if (xpevent) {
+                if (xpEvent) {
                     for (Player x : plugin.getServer().getOnlinePlayers()) {
                         x.sendMessage(LocaleLoader.getString("Commands.xprate.started.0"));
                         x.sendMessage(LocaleLoader.getString("Commands.xprate.started.1", new Object[] {Config.getInstance().xpGainMultiplier}));
@@ -90,4 +90,8 @@ public class XprateCommand implements CommandExecutor {
             return true;
         }
     }
+
+    public static boolean isXpEventRunning() {
+        return xpEvent;
+    }
 }

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

@@ -22,16 +22,16 @@ public class McabilityCommand implements CommandExecutor {
             return true;
         }
 
-        PlayerProfile PP = Users.getProfile((Player) sender);
+        PlayerProfile profile = Users.getProfile((Player) sender);
 
-        if (PP.getAbilityUse()) {
+        if (profile.getAbilityUse()) {
             sender.sendMessage(LocaleLoader.getString("Commands.Ability.Off"));
         }
         else {
             sender.sendMessage(LocaleLoader.getString("Commands.Ability.On"));
         }
 
-        PP.toggleAbilityUse();
+        profile.toggleAbilityUse();
 
         return true;
     }

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

@@ -7,6 +7,7 @@ import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 
 import com.gmail.nossr50.commands.CommandHelper;
+import com.gmail.nossr50.config.Config;
 import com.gmail.nossr50.locale.LocaleLoader;
 import com.gmail.nossr50.util.Permissions;
 
@@ -44,6 +45,10 @@ public class MccCommand implements CommandExecutor {
         player.sendMessage("/mcstats " + LocaleLoader.getString("Commands.Stats"));
         player.sendMessage("/mctop " + LocaleLoader.getString("Commands.Leaderboards"));
 
+        if (Config.getInstance().getCommandSkillResetEnabled() && Permissions.getInstance().skillReset(player)) {
+            player.sendMessage("/skillreset <skill|all> " + LocaleLoader.getString("Commands.Reset"));
+        }
+        
         if (Permissions.getInstance().mcAbility(player)) {
             player.sendMessage("/mcability " + LocaleLoader.getString("Commands.ToggleAbility"));
         }

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

@@ -22,16 +22,16 @@ public class McgodCommand implements CommandExecutor {
             return true;
         }
 
-        PlayerProfile PP = Users.getProfile((Player) sender);
+        PlayerProfile profile = Users.getProfile((Player) sender);
 
-        if (PP.getGodMode()) {
+        if (profile.getGodMode()) {
             sender.sendMessage(LocaleLoader.getString("Commands.GodMode.Disabled"));
         }
         else {
             sender.sendMessage(LocaleLoader.getString("Commands.GodMode.Enabled"));
         }
 
-        PP.toggleGodMode();
+        profile.toggleGodMode();
 
         return true;
     }

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

@@ -7,11 +7,11 @@ import org.bukkit.command.CommandExecutor;
 import org.bukkit.command.CommandSender;
 import org.getspout.spoutapi.player.SpoutPlayer;
 
+import com.gmail.nossr50.mcMMO;
 import com.gmail.nossr50.config.Config;
 import com.gmail.nossr50.locale.LocaleLoader;
 
 public class McmmoCommand implements CommandExecutor {
-
     @Override
     public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
         String description = LocaleLoader.getString("mcMMO.Description");
@@ -19,10 +19,10 @@ public class McmmoCommand implements CommandExecutor {
         sender.sendMessage(mcSplit);
 
         if (Config.getInstance().getDonateMessageEnabled()) {
-            if (Config.getInstance().spoutEnabled && sender instanceof SpoutPlayer) {
-                SpoutPlayer sPlayer = (SpoutPlayer) sender;
+            if (mcMMO.spoutEnabled && sender instanceof SpoutPlayer) {
+                SpoutPlayer spoutPlayer = (SpoutPlayer) sender;
 
-                sPlayer.sendNotification(ChatColor.YELLOW + "[mcMMO]" + ChatColor.GOLD + " Donate!", ChatColor.GREEN + "mcmmodev@gmail.com", Material.DIAMOND);
+                spoutPlayer.sendNotification(ChatColor.YELLOW + "[mcMMO]" + ChatColor.GOLD + " Donate!", ChatColor.GREEN + "mcmmodev@gmail.com", Material.DIAMOND);
             }
 
             sender.sendMessage(ChatColor.DARK_AQUA + "Donation Info:");

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

@@ -23,7 +23,7 @@ public class McrefreshCommand implements CommandExecutor {
     @Override
     public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
         OfflinePlayer player;
-        PlayerProfile PP;
+        PlayerProfile profile;
         String usage = ChatColor.RED + "Proper usage is /mcrefresh [player]"; //TODO: Needs more locale
 
         if (CommandHelper.noCommandPermissions(sender, "mcmmo.tools.mcrefresh")) {
@@ -34,7 +34,7 @@ public class McrefreshCommand implements CommandExecutor {
         case 0:
             if (sender instanceof Player) {
                 player = (Player) sender;
-                PP = Users.getProfile(player);
+                profile = Users.getProfile(player);
             }
             else {
                 sender.sendMessage(usage);
@@ -44,10 +44,10 @@ public class McrefreshCommand implements CommandExecutor {
 
         case 1:
             player = plugin.getServer().getOfflinePlayer(args[0]);
-            PP = Users.getProfile(player);
+            profile = Users.getProfile(player);
             String playerName = player.getName();
 
-            if (!PP.isLoaded()) {
+            if (!profile.isLoaded()) {
                 sender.sendMessage(LocaleLoader.getString("Commands.DoesNotExist"));
                 return true;
             }
@@ -61,10 +61,10 @@ public class McrefreshCommand implements CommandExecutor {
             return true;
         }
 
-        PP.setRecentlyHurt((long) 0);
-        PP.resetCooldowns();
-        PP.resetToolPrepMode();
-        PP.resetAbilityMode();
+        profile.setRecentlyHurt(0);
+        profile.resetCooldowns();
+        profile.resetToolPrepMode();
+        profile.resetAbilityMode();
 
         if (player.isOnline()) {
             ((Player) player).sendMessage(LocaleLoader.getString("Ability.Generic.Refresh"));

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

@@ -3,6 +3,7 @@ package com.gmail.nossr50.commands.mc;
 import java.io.BufferedReader;
 import java.io.FileReader;
 import java.io.FileWriter;
+import java.io.IOException;
 
 import org.bukkit.ChatColor;
 import org.bukkit.command.Command;
@@ -13,7 +14,11 @@ import org.bukkit.entity.Player;
 import com.gmail.nossr50.mcMMO;
 import com.gmail.nossr50.commands.CommandHelper;
 import com.gmail.nossr50.config.Config;
+import com.gmail.nossr50.datatypes.McMMOPlayer;
+import com.gmail.nossr50.datatypes.SpoutHud;
 import com.gmail.nossr50.locale.LocaleLoader;
+import com.gmail.nossr50.spout.SpoutStuff;
+import com.gmail.nossr50.util.Database;
 import com.gmail.nossr50.util.Users;
 
 public class McremoveCommand implements CommandExecutor {
@@ -22,7 +27,7 @@ public class McremoveCommand implements CommandExecutor {
 
     public McremoveCommand (mcMMO plugin) {
         this.plugin = plugin;
-        this.location = plugin.usersFile;
+        this.location = mcMMO.getUsersFile();
     }
 
     @Override
@@ -40,7 +45,7 @@ public class McremoveCommand implements CommandExecutor {
         switch (args.length) {
         case 1:
             playerName = args[0];
-            success = ChatColor.GREEN + playerName + "was successfully removed from the database!"; //TODO: Locale
+            success = ChatColor.GREEN + playerName + " was successfully removed from the database!"; //TODO: Locale
             break;
 
         default:
@@ -50,31 +55,32 @@ public class McremoveCommand implements CommandExecutor {
 
         /* MySQL */
         if (Config.getInstance().getUseMySQL()) {
+            Database database = mcMMO.getPlayerDatabase();
             int userId = 0;
-            userId = mcMMO.database.getInt("SELECT id FROM " + tablePrefix + "users WHERE user = '" + playerName + "'");
+            userId = database.getInt("SELECT id FROM " + tablePrefix + "users WHERE user = '" + playerName + "'");
 
             if (userId > 0) {
-                mcMMO.database.write("DELETE FROM "
+                database.write("DELETE FROM "
                         + databaseName + "."
                         + tablePrefix + "users WHERE "
                         + tablePrefix + "users.id=" + userId);
 
-                mcMMO.database.write("DELETE FROM "
+                database.write("DELETE FROM "
                         + databaseName + "."
                         + tablePrefix + "cooldowns WHERE "
                         + tablePrefix + "cooldowns.user_id=" + userId);
 
-                mcMMO.database.write("DELETE FROM "
+                database.write("DELETE FROM "
                         + databaseName + "."
                         + tablePrefix + "huds WHERE "
                         + tablePrefix + "huds.user_id=" + userId);
 
-                mcMMO.database.write("DELETE FROM "
+                database.write("DELETE FROM "
                         + databaseName + "."
                         + tablePrefix + "skills WHERE "
                         + tablePrefix + "skills.user_id=" + userId);
 
-                mcMMO.database.write("DELETE FROM "
+                database.write("DELETE FROM "
                         + databaseName + "."
                         + tablePrefix + "experience WHERE "
                         + tablePrefix + "experience.user_id=" + userId);
@@ -96,11 +102,25 @@ public class McremoveCommand implements CommandExecutor {
         }
 
         //Force PlayerProfile stuff to update
-        Player player = plugin.getServer().getPlayer(playerName);
+        McMMOPlayer mcmmoPlayer = Users.getPlayer(playerName);
 
-        if (player != null && Users.players.containsKey(playerName.toLowerCase())) {
-            Users.removeUser(player);
-            Users.addUser(player);
+        if (mcmmoPlayer != null) {
+            Player player = mcmmoPlayer.getPlayer();
+            SpoutHud spoutHud = mcmmoPlayer.getProfile().getSpoutHud();
+
+            if (spoutHud != null) {
+                spoutHud.removeWidgets();
+            }
+
+            Users.remove(playerName);
+
+            if (player.isOnline()) {
+                Users.addUser(player);
+
+                if (mcMMO.spoutEnabled) {
+                    SpoutStuff.reloadSpoutPlayer(player);
+                }
+            }
         }
 
         return true;
@@ -109,9 +129,12 @@ public class McremoveCommand implements CommandExecutor {
     private boolean removeFlatFileUser(String playerName) {
         boolean worked = false;
 
+        BufferedReader in = null;
+        FileWriter out = null;
+
         try {
             FileReader file = new FileReader(location);
-            BufferedReader in = new BufferedReader(file);
+            in = new BufferedReader(file);
             StringBuilder writer = new StringBuilder();
             String line = "";
 
@@ -128,16 +151,32 @@ public class McremoveCommand implements CommandExecutor {
                 }
             }
 
-            in.close();
-            FileWriter out = new FileWriter(location); //Write out the new file
+            out = new FileWriter(location); //Write out the new file
             out.write(writer.toString());
-            out.close();
-
-            return worked;
         }
         catch (Exception e) {
             plugin.getLogger().severe("Exception while reading " + location + " (Are you sure you formatted it correctly?)" + e.toString());
-            return worked;
         }
+        finally {
+            if (in != null) {
+                try {
+                    in.close();
+                }
+                catch (IOException ex) {
+                    ex.printStackTrace();
+                }
+            }
+
+            if (out != null) {
+                try {
+                    out.close();
+                }
+                catch (IOException ex) {
+                    ex.printStackTrace();
+                }
+            }
+        }
+
+        return worked;
     }
 }

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

@@ -7,9 +7,11 @@ import org.bukkit.ChatColor;
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandExecutor;
 import org.bukkit.command.CommandSender;
+
 import com.gmail.nossr50.mcMMO;
 import com.gmail.nossr50.config.Config;
 import com.gmail.nossr50.locale.LocaleLoader;
+import com.gmail.nossr50.util.Database;
 import com.gmail.nossr50.util.Leaderboard;
 import com.gmail.nossr50.util.Misc;
 import com.gmail.nossr50.util.Skills;
@@ -19,7 +21,7 @@ public class MctopCommand implements CommandExecutor {
     @Override
     public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
         String usage = ChatColor.RED + "Proper usage is /mctop [skill] [page]"; //TODO: Needs more locale.
-        
+
         if (!Config.getInstance().getUseMySQL()) {
 
             switch (args.length) {
@@ -106,7 +108,7 @@ public class MctopCommand implements CommandExecutor {
     private void flatfileDisplay(int page, String skill, CommandSender sender) {
         String[] info = Leaderboard.retrieveInfo(skill, page);
 
-        if (skill == "ALL") {
+        if (skill.equals("ALL")) {
             sender.sendMessage(LocaleLoader.getString("Commands.PowerLevel.Leaderboard"));
         }
         else {
@@ -133,9 +135,11 @@ public class MctopCommand implements CommandExecutor {
 
     private void sqlDisplay(int page, String query, CommandSender sender) {
         String tablePrefix = Config.getInstance().getMySQLTablePrefix();
-        HashMap<Integer, ArrayList<String>> userslist = mcMMO.database.read("SELECT " + query + ", user_id FROM " + tablePrefix + "skills WHERE " + query + " > 0 ORDER BY " + query + " DESC ");
+        Database database = mcMMO.getPlayerDatabase();
 
-        if (query == "taming+mining+woodcutting+repair+unarmed+herbalism+excavation+archery+swords+axes+acrobatics+fishing") {
+        HashMap<Integer, ArrayList<String>> userslist = database.read("SELECT " + query + ", user_id FROM " + tablePrefix + "skills WHERE " + query + " > 0 ORDER BY " + query + " DESC ");
+
+        if (query.equals("taming+mining+woodcutting+repair+unarmed+herbalism+excavation+archery+swords+axes+acrobatics+fishing")) {
             sender.sendMessage(LocaleLoader.getString("Commands.PowerLevel.Leaderboard"));
         }
         else {
@@ -143,11 +147,11 @@ public class MctopCommand implements CommandExecutor {
         }
 
         for (int i = (page * 10) - 9; i <= (page * 10); i++) {
-            if (i > userslist.size() || mcMMO.database.read("SELECT user FROM " + tablePrefix + "users WHERE id = '" + Integer.valueOf(userslist.get(i).get(1)) + "'") == null) {
+            if (i > userslist.size() || database.read("SELECT user FROM " + tablePrefix + "users WHERE id = '" + Integer.valueOf(userslist.get(i).get(1)) + "'") == null) {
                 break;
             }
 
-            HashMap<Integer, ArrayList<String>> username = mcMMO.database.read("SELECT user FROM " + tablePrefix + "users WHERE id = '" + Integer.valueOf(userslist.get(i).get(1)) + "'");
+            HashMap<Integer, ArrayList<String>> username = database.read("SELECT user FROM " + tablePrefix + "users WHERE id = '" + Integer.valueOf(userslist.get(i).get(1)) + "'");
             sender.sendMessage(String.valueOf(i) + ". " + ChatColor.GREEN + userslist.get(i).get(0) + " - " + ChatColor.WHITE + username.get(1).get(0));
         }
     }

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

@@ -23,7 +23,7 @@ public class ACommand implements CommandExecutor {
 
     @Override
     public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
-        PlayerProfile PP;
+        PlayerProfile profile;
         String usage = ChatColor.RED + "Proper usage is /a <message>"; //TODO: Needs more locale.
 
         if (CommandHelper.noCommandPermissions(sender, "mcmmo.chat.adminchat")) {
@@ -33,15 +33,15 @@ public class ACommand implements CommandExecutor {
         switch (args.length) {
         case 0:
             if (sender instanceof Player) {
-                PP = Users.getProfile((Player) sender);
+                profile = Users.getProfile((Player) sender);
 
-                if (PP.getPartyChatMode()) {
-                    PP.togglePartyChat();
+                if (profile.getPartyChatMode()) {
+                    profile.togglePartyChat();
                 }
 
-                PP.toggleAdminChat();
+                profile.toggleAdminChat();
 
-                if (PP.getAdminChatMode()) {
+                if (profile.getAdminChatMode()) {
                     sender.sendMessage(LocaleLoader.getString("Commands.AdminChat.On"));
                 }
                 else {
@@ -55,23 +55,35 @@ public class ACommand implements CommandExecutor {
             return true;
 
         default:
-            String message = args[0];
+            StringBuffer buffer = new StringBuffer();
+            buffer.append(args[0]);
 
             for (int i = 1; i < args.length; i++) {
-                message = message + " " + args [i];
+                buffer.append(" ");
+                buffer.append(args[i]);
             }
 
+            String message = buffer.toString();
+
             if (sender instanceof Player) {
                 Player player = (Player) sender;
-                PP = Users.getProfile(player);
 
-                if (PP.getAdminChatMode()) {
-                    player.chat(message);
+                McMMOAdminChatEvent chatEvent = new McMMOAdminChatEvent(player.getName(), message);
+                plugin.getServer().getPluginManager().callEvent(chatEvent);
+
+                if (chatEvent.isCancelled()) {
+                    return true;
                 }
-                else {
-                    PP.toggleAdminChat();
-                    player.chat(message);
-                    PP.toggleAdminChat();
+
+                message = chatEvent.getMessage();
+                String prefix = ChatColor.AQUA + "{" + ChatColor.WHITE + player.getName() + ChatColor.AQUA + "} ";
+
+                plugin.getLogger().info("[A]<" + player.getName() + "> " + message);
+
+                for (Player otherPlayer : plugin.getServer().getOnlinePlayers()) {
+                    if (Permissions.getInstance().adminChat(otherPlayer) || otherPlayer.isOp()) {
+                        otherPlayer.sendMessage(prefix + message);
+                    }
                 }
             }
             else {

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

@@ -12,6 +12,7 @@ import com.gmail.nossr50.events.party.McMMOPartyChangeEvent;
 import com.gmail.nossr50.events.party.McMMOPartyChangeEvent.EventReason;
 import com.gmail.nossr50.locale.LocaleLoader;
 import com.gmail.nossr50.party.Party;
+import com.gmail.nossr50.party.PartyManager;
 import com.gmail.nossr50.util.Users;
 
 public class AcceptCommand implements CommandExecutor {
@@ -32,32 +33,33 @@ public class AcceptCommand implements CommandExecutor {
         }
 
         Player player = (Player) sender;
-        PlayerProfile PP = Users.getProfile(player);
+        PlayerProfile playerProfile = Users.getProfile(player);
 
-        if (PP.hasPartyInvite()) {
-            Party partyInstance = Party.getInstance();
+        if (playerProfile.hasPartyInvite()) {
+            PartyManager partyManagerInstance = PartyManager.getInstance();
+
+            if (playerProfile.inParty()) {
+                Party party = playerProfile.getParty();
+                McMMOPartyChangeEvent event = new McMMOPartyChangeEvent(player, party.getName(), playerProfile.getInvite().getName(), EventReason.CHANGED_PARTIES);
 
-            if (PP.inParty()) {
-                McMMOPartyChangeEvent event = new McMMOPartyChangeEvent(player, PP.getParty(), PP.getInvite(), EventReason.CHANGED_PARTIES);
                 plugin.getServer().getPluginManager().callEvent(event);
 
                 if (event.isCancelled()) {
                     return true;
                 }
 
-                partyInstance.removeFromParty(player, PP);
+                partyManagerInstance.removeFromParty(player.getName(), party);
             }
             else {
-                McMMOPartyChangeEvent event = new McMMOPartyChangeEvent(player, null, PP.getInvite(), EventReason.JOINED_PARTY);
+                McMMOPartyChangeEvent event = new McMMOPartyChangeEvent(player, null, playerProfile.getInvite().getName(), EventReason.JOINED_PARTY);
                 plugin.getServer().getPluginManager().callEvent(event);
 
                 if (event.isCancelled()) {
                     return true;
                 }
             }
-            PP.acceptInvite();
-            partyInstance.addToParty(player, PP, PP.getParty(), true, null);
 
+            partyManagerInstance.joinInvitedParty(player, playerProfile);
         }
         else {
             player.sendMessage(LocaleLoader.getString("mcMMO.NoInvites"));

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

@@ -11,6 +11,7 @@ import com.gmail.nossr50.commands.CommandHelper;
 import com.gmail.nossr50.datatypes.PlayerProfile;
 import com.gmail.nossr50.locale.LocaleLoader;
 import com.gmail.nossr50.party.Party;
+import com.gmail.nossr50.party.PartyManager;
 import com.gmail.nossr50.util.Users;
 
 //TODO: Make this work from console.
@@ -36,11 +37,9 @@ public class InviteCommand implements CommandExecutor {
         switch (args.length) {
         case 1:
             Player player = (Player) sender;
-            PlayerProfile PP = Users.getProfile(player);
+            PlayerProfile playerProfile = Users.getProfile(player);
 
-            Party partyInstance = Party.getInstance();
-
-            if (!PP.inParty()) {
+            if (!playerProfile.inParty()) {
                 player.sendMessage(LocaleLoader.getString("Commands.Party.None"));
                 return true;
             }
@@ -48,13 +47,12 @@ public class InviteCommand implements CommandExecutor {
             Player target = plugin.getServer().getPlayer(args[0]);
 
             if (target != null) {
-                if (partyInstance.canInvite(player, PP)) {
-                    PlayerProfile PPt = Users.getProfile(target);
-                    PPt.modifyInvite(PP.getParty());
-
+                if (PartyManager.getInstance().canInvite(player, playerProfile)) {
+                    Party party = playerProfile.getParty();
+                    
+                    Users.getProfile(target).setInvite(party);
                     player.sendMessage(LocaleLoader.getString("Commands.Invite.Success"));
-
-                    target.sendMessage(LocaleLoader.getString("Commands.Party.Invite.0", new Object[] { PPt.getInvite(), player.getName() }));
+                    target.sendMessage(LocaleLoader.getString("Commands.Party.Invite.0", new Object[] {party.getName(), player.getName()}));
                     target.sendMessage(LocaleLoader.getString("Commands.Party.Invite.1"));
                     return true;
                 }

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

@@ -12,6 +12,7 @@ import com.gmail.nossr50.datatypes.PlayerProfile;
 import com.gmail.nossr50.events.chat.McMMOPartyChatEvent;
 import com.gmail.nossr50.locale.LocaleLoader;
 import com.gmail.nossr50.party.Party;
+import com.gmail.nossr50.party.PartyManager;
 import com.gmail.nossr50.util.Users;
 
 public class PCommand implements CommandExecutor {
@@ -23,26 +24,25 @@ public class PCommand implements CommandExecutor {
 
     @Override
     public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
-        PlayerProfile PP;
+        PlayerProfile profile;
         String usage = ChatColor.RED + "Proper usage is /p <party-name> <message>"; //TODO: Needs more locale.
 
         if (CommandHelper.noCommandPermissions(sender, "mcmmo.commands.party")) {
             return true;
         }
 
-
         switch (args.length) {
         case 0:
             if (sender instanceof Player) {
-                PP = Users.getProfile((Player) sender);
+                profile = Users.getProfile((Player) sender);
 
-                if (PP.getAdminChatMode()) {
-                    PP.toggleAdminChat();
+                if (profile.getAdminChatMode()) {
+                    profile.toggleAdminChat();
                 }
 
-                PP.togglePartyChat();
+                profile.togglePartyChat();
 
-                if (PP.getPartyChatMode()) {
+                if (profile.getPartyChatMode()) {
                     sender.sendMessage(LocaleLoader.getString("Commands.Party.Chat.On"));
                 }
                 else {
@@ -58,26 +58,37 @@ public class PCommand implements CommandExecutor {
         default:
             if (sender instanceof Player) {
                 Player player = (Player) sender;
-                PP = Users.getProfile(player);
+                Party party = Users.getProfile(player).getParty();
 
-                if (!PP.inParty()) {
+                if (party == null) {
                     player.sendMessage(LocaleLoader.getString("Commands.Party.None"));
                     return true;
                 }
 
-                String message = args[0];
+                StringBuffer buffer = new StringBuffer();
+                buffer.append(args[0]);
 
                 for (int i = 1; i < args.length; i++) {
-                    message = message + " " + args [i];
+                    buffer.append(" ");
+                    buffer.append(args[i]);
                 }
 
-                if (PP.getPartyChatMode()) {
-                    player.chat(message);
+                String message = buffer.toString();
+
+                McMMOPartyChatEvent chatEvent = new McMMOPartyChatEvent(player.getName(), party.getName(), message);
+                plugin.getServer().getPluginManager().callEvent(chatEvent);
+
+                if (chatEvent.isCancelled()) {
+                    return true;
                 }
-                else {
-                    PP.togglePartyChat();
-                    player.chat(message);
-                    PP.togglePartyChat();
+
+                message = chatEvent.getMessage();
+                String prefix = ChatColor.GREEN + "(" + ChatColor.WHITE + player.getName() + ChatColor.GREEN + ") ";
+
+                plugin.getLogger().info("[P](" + party.getName() + ")" + "<" + player.getName() + "> " + message);
+
+                for (Player member : party.getOnlineMembers()) {
+                    member.sendMessage(prefix + message);
                 }
             }
             else {
@@ -86,17 +97,21 @@ public class PCommand implements CommandExecutor {
                     return true;
                 }
 
-                if (!Party.getInstance().isParty(args[0])) {
+                if (!PartyManager.getInstance().isParty(args[0])) {
                     sender.sendMessage(LocaleLoader.getString("Party.InvalidName"));
                     return true;
                 }
 
-                String message = args[1];
+                StringBuffer buffer = new StringBuffer();
+                buffer.append(args[1]);
 
                 for (int i = 2; i < args.length; i++) {
-                    message = message + " " + args [i];
+                    buffer.append(" ");
+                    buffer.append(args[i]);
                 }
 
+                String message = buffer.toString();
+
                 McMMOPartyChatEvent chatEvent = new McMMOPartyChatEvent("Console", args[0], message);
                 plugin.getServer().getPluginManager().callEvent(chatEvent);
 
@@ -109,8 +124,8 @@ public class PCommand implements CommandExecutor {
 
                 plugin.getLogger().info("[P](" + args[0] + ")" + "<*Console*> " + message);
 
-                for (Player player : Party.getInstance().getOnlineMembers(args[0])) {
-                    player.sendMessage(prefix + message);
+                for (Player member : PartyManager.getInstance().getOnlineMembers(args[0])) {
+                    member.sendMessage(prefix + message);
                 }
             }
 

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

@@ -1,6 +1,7 @@
 package com.gmail.nossr50.commands.party;
 
 import org.bukkit.ChatColor;
+import org.bukkit.Server;
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandExecutor;
 import org.bukkit.command.CommandSender;
@@ -13,6 +14,7 @@ import com.gmail.nossr50.events.party.McMMOPartyChangeEvent;
 import com.gmail.nossr50.events.party.McMMOPartyChangeEvent.EventReason;
 import com.gmail.nossr50.locale.LocaleLoader;
 import com.gmail.nossr50.party.Party;
+import com.gmail.nossr50.party.PartyManager;
 import com.gmail.nossr50.util.Users;
 
 public class PartyCommand implements CommandExecutor {
@@ -34,55 +36,54 @@ public class PartyCommand implements CommandExecutor {
 
         Player player = (Player) sender;
         String playerName = player.getName();
-        PlayerProfile PP = Users.getProfile(player);
+        PlayerProfile playerProfile = Users.getProfile(player);
 
-        Party partyInstance = Party.getInstance();
-        boolean inParty = PP.inParty();
-        String partyName = PP.getParty();
-        boolean isLeader = partyInstance.isPartyLeader(playerName, partyName);
-
-        if (PP.inParty() && (!partyInstance.isParty(PP.getParty()) || !partyInstance.isInParty(player, PP))) {
-            partyInstance.addToParty(player, PP, PP.getParty(), false, null);
-        }
+        PartyManager partyManagerInstance = PartyManager.getInstance();
+        Party party = playerProfile.getParty();
 
         switch (args.length) {
         case 0:
-            if (!inParty) {
+            if (party == null) {
                 player.sendMessage(LocaleLoader.getString("Party.Help.0"));
                 player.sendMessage(LocaleLoader.getString("Party.Help.1"));
                 player.sendMessage(LocaleLoader.getString("Party.Help.2"));
             }
             else {
-                String tempList = "";
+                Server server = plugin.getServer();
+                String leader = party.getLeader();
+                StringBuffer tempList = new StringBuffer();
 
-                for (Player p : partyInstance.getAllMembers(player)) {
-                    if (p.equals(partyInstance.getPartyLeader(partyName))) {
-                        tempList += ChatColor.GOLD;
+                for (String otherPlayerName : party.getMembers()) {
+                    if (leader.equals(otherPlayerName)) {
+                        tempList.append(ChatColor.GOLD);
+                    }
+                    else if (server.getPlayer(otherPlayerName) != null) {
+                        tempList.append(ChatColor.WHITE);
                     }
                     else {
-                        tempList += ChatColor.WHITE;
+                        tempList.append(ChatColor.GRAY);
                     }
 
-                    tempList += p.getName() + " ";
+                    tempList.append(otherPlayerName + " ");
                 }
 
-                player.sendMessage(LocaleLoader.getString("Commands.Party.InParty", new Object[] { partyName }));
-                player.sendMessage(LocaleLoader.getString("Commands.Party.Members", new Object[] { tempList }));
+                player.sendMessage(LocaleLoader.getString("Commands.Party.InParty", new Object[] {party.getName()}));
+                player.sendMessage(LocaleLoader.getString("Commands.Party.Members", new Object[] {tempList}));
             }
 
             return true;
 
         case 1:
             if (args[0].equalsIgnoreCase("q")) {
-                if (inParty) {
-                    McMMOPartyChangeEvent event = new McMMOPartyChangeEvent(player, partyName, null, EventReason.LEFT_PARTY);
+                if (party != null) {
+                    McMMOPartyChangeEvent event = new McMMOPartyChangeEvent(player, party.getName(), null, EventReason.LEFT_PARTY);
                     plugin.getServer().getPluginManager().callEvent(event);
 
                     if (event.isCancelled()) {
                         return true;
                     }
 
-                    partyInstance.removeFromParty(player, PP);
+                    partyManagerInstance.removeFromParty(playerName, party);
                     player.sendMessage(LocaleLoader.getString("Commands.Party.Leave"));
                 }
                 else {
@@ -98,13 +99,13 @@ public class PartyCommand implements CommandExecutor {
                 player.sendMessage(LocaleLoader.getString("Party.Help.7"));
             }
             else if (args[0].equalsIgnoreCase("lock")) {
-                if (inParty) {
-                    if (isLeader) {
-                        if (partyInstance.isPartyLocked(partyName)) {
+                if (party != null) {
+                    if (party.getLeader().equals(playerName)) {
+                        if (party.isLocked()) {
                             player.sendMessage(LocaleLoader.getString("Party.IsLocked"));
                         }
                         else {
-                            partyInstance.lockParty(partyName);
+                            party.setLocked(true);
                             player.sendMessage(LocaleLoader.getString("Party.Locked"));
                         }
                     }
@@ -117,13 +118,13 @@ public class PartyCommand implements CommandExecutor {
                 }
             }
             else if (args[0].equalsIgnoreCase("unlock")) {
-                if (inParty) {
-                    if (isLeader) {
-                        if (!partyInstance.isPartyLocked(partyName)) {
+                if (party != null) {
+                    if (party.getLeader().equals(playerName)) {
+                        if (!party.isLocked()) {
                             player.sendMessage(LocaleLoader.getString("Party.IsntLocked"));
                         }
                         else {
-                            partyInstance.unlockParty(partyName);
+                            party.setLocked(false);
                             player.sendMessage(LocaleLoader.getString("Party.Unlocked"));
                         }
                     }
@@ -136,15 +137,15 @@ public class PartyCommand implements CommandExecutor {
                 }
             }
             else {
-                if (inParty) {
-                    McMMOPartyChangeEvent event = new McMMOPartyChangeEvent(player, partyName, args[0], EventReason.CHANGED_PARTIES);
+                if (party != null) {
+                    McMMOPartyChangeEvent event = new McMMOPartyChangeEvent(player, party.getName(), args[0], EventReason.CHANGED_PARTIES);
                     plugin.getServer().getPluginManager().callEvent(event);
 
                     if (event.isCancelled()) {
                         return true;
                     }
 
-                    partyInstance.removeFromParty(player, PP);
+                    partyManagerInstance.removeFromParty(playerName, party);
                 }
                 else {
                     McMMOPartyChangeEvent event = new McMMOPartyChangeEvent(player, null, args[0], EventReason.JOINED_PARTY);
@@ -155,53 +156,40 @@ public class PartyCommand implements CommandExecutor {
                     }
                 }
 
-                partyInstance.addToParty(player, PP, args[0], false, null);
+                partyManagerInstance.joinParty(player, playerProfile, args[0], null);
             }
 
             return true;
 
         case 2:
-            if (PP.inParty()) {
+            if (playerProfile.inParty()) {
                 if (args[0].equalsIgnoreCase("password")) {
-                    if (isLeader) {
-                        if (!partyInstance.isPartyLocked(partyName)) {
-                            partyInstance.lockParty(partyName);
-                        }
-
-                        partyInstance.setPartyPassword(partyName, args[1]);
-                        player.sendMessage(LocaleLoader.getString("Party.PasswordSet", new Object[] { args[1] }));
+                    if (party.getLeader().equals(playerName)) {
+                        party.setLocked(true);
+                        party.setPassword(args[1]);
+                        player.sendMessage(LocaleLoader.getString("Party.PasswordSet", new Object[] {args[1]}));
                     }
                     else {
                         player.sendMessage(LocaleLoader.getString("Party.NotOwner"));
                     }
                 }
                 else if (args[0].equalsIgnoreCase("kick")) {
-                    if (isLeader) {
-                        Player target = plugin.getServer().getPlayer(args[1]);
-
-                        if (target == null) {
-                            player.sendMessage(LocaleLoader.getString("Party.Player.Invalid"));
+                    if (party.getLeader().equals(playerName)) {
+                        if (!party.getMembers().contains(args[1])) {
+                            player.sendMessage(LocaleLoader.getString("Party.NotInYourParty", new Object[] {args[1]}));
                             return true;
                         }
-
-                        PlayerProfile PPt = Users.getProfile(target);
-                        String targetName = target.getName();
-
-                        if (!partyInstance.inSameParty(player, (Player) target)) {
-                            player.sendMessage(LocaleLoader.getString("Party.NotInYourParty", new Object[] { targetName }));
-                            return true;
-                        }
-
                         else {
+                            String partyName = party.getName();
                             McMMOPartyChangeEvent event = new McMMOPartyChangeEvent(player, partyName, null, EventReason.KICKED_FROM_PARTY);
+
                             plugin.getServer().getPluginManager().callEvent(event);
 
                             if (event.isCancelled()) {
                                 return true;
                             }
 
-                            partyInstance.removeFromParty(target, PPt);
-                            target.sendMessage(LocaleLoader.getString("Commands.Party.Kick", new Object[] { partyName }));
+                            partyManagerInstance.removeFromParty(args[1], party);
                         }
                     }
                     else {
@@ -209,39 +197,26 @@ public class PartyCommand implements CommandExecutor {
                     }
                 }
                 else if (args[0].equalsIgnoreCase("owner")) {
-                    if (isLeader) {
-                        Player target = plugin.getServer().getPlayer(args[1]);
-
-                        if (target == null) {
-                            player.sendMessage(LocaleLoader.getString("Party.Player.Invalid"));
+                    if (party.getLeader().equals(playerName)) {
+                        if (!party.getMembers().contains(args[1])) {
+                            player.sendMessage(LocaleLoader.getString("Party.NotInYourParty", new Object[] {args[1]}));
                             return true;
                         }
-
-                        String targetName = target.getName();
-
-                        if (!partyInstance.inSameParty(player, (Player) target)) {
-                            player.sendMessage(LocaleLoader.getString("Party.NotInYourParty", new Object[] { targetName }));
-                            return true;
-                        }
-
                         else {
-                            partyInstance.setPartyLeader(partyName, targetName);
+                            partyManagerInstance.setPartyLeader(args[1], party);
                         }
                     }
-                    else {
-                        player.sendMessage(LocaleLoader.getString("Party.NotOwner"));
-                    }
                 }
                 else {
-                    McMMOPartyChangeEvent event = new McMMOPartyChangeEvent(player, partyName, args[0], EventReason.CHANGED_PARTIES);
+                    McMMOPartyChangeEvent event = new McMMOPartyChangeEvent(player, party.getName(), args[0], EventReason.CHANGED_PARTIES);
                     plugin.getServer().getPluginManager().callEvent(event);
 
                     if (event.isCancelled()) {
                         return true;
                     }
 
-                    partyInstance.removeFromParty(player, PP);
-                    partyInstance.addToParty(player, PP, args[0], false, args[1]);
+                    partyManagerInstance.removeFromParty(playerName, party);
+                    partyManagerInstance.joinParty(player, playerProfile, args[0], args[1]);
                 }
             }
             else {
@@ -252,7 +227,7 @@ public class PartyCommand implements CommandExecutor {
                     return true;
                 }
 
-                partyInstance.addToParty(player, PP, args[0], false, args[1]);
+                partyManagerInstance.joinParty(player, playerProfile, args[0], args[1]);
             }
 
             return true;

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

@@ -12,7 +12,7 @@ import com.gmail.nossr50.config.Config;
 import com.gmail.nossr50.datatypes.PlayerProfile;
 import com.gmail.nossr50.events.party.McMMOPartyTeleportEvent;
 import com.gmail.nossr50.locale.LocaleLoader;
-import com.gmail.nossr50.party.Party;
+import com.gmail.nossr50.party.PartyManager;
 import com.gmail.nossr50.util.Users;
 
 public class PtpCommand implements CommandExecutor {
@@ -37,14 +37,9 @@ public class PtpCommand implements CommandExecutor {
         switch (args.length) {
         case 1:
             Player player = (Player) sender;
-            PlayerProfile PP = Users.getProfile(player);
+            PlayerProfile profile = Users.getProfile(player);
 
-            if (!Party.getInstance().isInParty(player, PP)) {
-                player.sendMessage(LocaleLoader.getString("Commands.Party.None"));
-                return true;
-            }
-
-            if (PP.getRecentlyHurt() + (Config.getInstance().getPTPCommandCooldown() * 1000) > System.currentTimeMillis()) {
+            if (profile.getRecentlyHurt() + (Config.getInstance().getPTPCommandCooldown() * 1000) > System.currentTimeMillis()) {
                 player.sendMessage(LocaleLoader.getString("Party.Teleport.Hurt", new Object[] { Config.getInstance().getPTPCommandCooldown() }));
                 return true;
             }
@@ -57,7 +52,7 @@ public class PtpCommand implements CommandExecutor {
             }
 
             if (target == null) {
-                player.sendMessage(LocaleLoader.getString("Party.Teleport.Invalid"));
+                player.sendMessage(LocaleLoader.getString("Party.Player.Invalid"));
                 return true;
             }
 
@@ -66,8 +61,8 @@ public class PtpCommand implements CommandExecutor {
                 return true;
             }
 
-            if (Party.getInstance().inSameParty(player, target)) {
-                McMMOPartyTeleportEvent event = new McMMOPartyTeleportEvent(player, target, PP.getParty());
+            if (PartyManager.getInstance().inSameParty(player, target)) {
+                McMMOPartyTeleportEvent event = new McMMOPartyTeleportEvent(player, target, profile.getParty().getName());
                 plugin.getServer().getPluginManager().callEvent(event);
 
                 if (event.isCancelled()) {

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

@@ -1,22 +1,10 @@
 package com.gmail.nossr50.commands.skills;
 
-import java.text.DecimalFormat;
-
-import org.bukkit.command.Command;
-import org.bukkit.command.CommandExecutor;
-import org.bukkit.command.CommandSender;
-import org.bukkit.entity.Player;
-
-import com.gmail.nossr50.commands.CommandHelper;
-import com.gmail.nossr50.datatypes.PlayerProfile;
+import com.gmail.nossr50.commands.SkillCommand;
 import com.gmail.nossr50.datatypes.SkillType;
 import com.gmail.nossr50.locale.LocaleLoader;
-import com.gmail.nossr50.util.Page;
-import com.gmail.nossr50.util.Permissions;
-import com.gmail.nossr50.util.Users;
 
-public class AcrobaticsCommand implements CommandExecutor {
-    private float skillValue;
+public class AcrobaticsCommand extends SkillCommand {
     private String dodgeChance;
     private String rollChance;
     private String gracefulRollChance;
@@ -25,67 +13,12 @@ public class AcrobaticsCommand implements CommandExecutor {
     private boolean canRoll;
     private boolean canGracefulRoll;
 
-    @Override
-    public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
-        if (CommandHelper.noConsoleUsage(sender)) {
-            return true;
-        }
-
-        if (CommandHelper.noCommandPermissions(sender, "mcmmo.skills.acrobatics")) {
-            return true;
-        }
-
-        Player player = (Player) sender;
-        PlayerProfile PP = Users.getProfile(player);
-
-        skillValue = (float) PP.getSkillLevel(SkillType.ACROBATICS);
-        dataCalculations(skillValue);
-        permissionsCheck(player);
-
-        player.sendMessage(LocaleLoader.getString("Skills.Header", new Object[] { LocaleLoader.getString("Acrobatics.SkillName") }));
-        player.sendMessage(LocaleLoader.getString("Commands.XPGain", new Object[] { LocaleLoader.getString("Commands.XPGain.Acrobatics") }));
-        player.sendMessage(LocaleLoader.getString("Effects.Level", new Object[] { PP.getSkillLevel(SkillType.ACROBATICS), PP.getSkillXpLevel(SkillType.ACROBATICS), PP.getXpToLevel(SkillType.ACROBATICS) }));
-
-        if (canDodge || canGracefulRoll || canRoll) {
-            player.sendMessage(LocaleLoader.getString("Skills.Header", new Object[] { LocaleLoader.getString("Effects.Effects") }));
-        }
-
-        if (canRoll) {
-            player.sendMessage(LocaleLoader.getString("Effects.Template", new Object[] { LocaleLoader.getString("Acrobatics.Effect.0"), LocaleLoader.getString("Acrobatics.Effect.1") }));
-        }
-
-        if (canGracefulRoll) {
-            player.sendMessage(LocaleLoader.getString("Effects.Template", new Object[] { LocaleLoader.getString("Acrobatics.Effect.2"), LocaleLoader.getString("Acrobatics.Effect.3") }));
-        }
-
-        if (canDodge) {
-            player.sendMessage(LocaleLoader.getString("Effects.Template", new Object[] { LocaleLoader.getString("Acrobatics.Effect.4"), LocaleLoader.getString("Acrobatics.Effect.5") }));
-        }
-
-        if (canDodge || canGracefulRoll || canRoll) {
-            player.sendMessage(LocaleLoader.getString("Skills.Header", new Object[] { LocaleLoader.getString("Commands.Stats.Self") }));
-        }
-
-        if (canRoll) {
-            player.sendMessage(LocaleLoader.getString("Acrobatics.Roll.Chance", new Object[] { rollChance }));
-        }
-
-        if (canGracefulRoll) {
-            player.sendMessage(LocaleLoader.getString("Acrobatics.Roll.GraceChance", new Object[] { gracefulRollChance }));
-        }
-
-        if (canDodge) {
-            player.sendMessage(LocaleLoader.getString("Acrobatics.DodgeChance", new Object[] { dodgeChance }));
-        }
-
-        Page.grabGuidePageForSkill(SkillType.ACROBATICS, player, args);
-
-        return true;
+    public AcrobaticsCommand() {
+        super(SkillType.ACROBATICS);
     }
 
-    private void dataCalculations(float skillValue) {
-        DecimalFormat percent = new DecimalFormat("##0.00%");
-
+    @Override
+    protected void dataCalculations() {
         if (skillValue >= 1000) {
             dodgeChance = "20.00%";
             rollChance = "100.00%";
@@ -108,11 +41,50 @@ public class AcrobaticsCommand implements CommandExecutor {
         }
     }
 
-    private void permissionsCheck(Player player) {
-        Permissions permInstance = Permissions.getInstance();
-
+    @Override
+    protected void permissionsCheck() {
         canDodge = permInstance.dodge(player);
         canRoll = permInstance.roll(player);
         canGracefulRoll = permInstance.gracefulRoll(player);
     }
+
+    @Override
+    protected boolean effectsHeaderPermissions() {
+        return canDodge || canGracefulRoll || canRoll;
+    }
+
+    @Override
+    protected void effectsDisplay() {
+        if (canRoll) {
+            player.sendMessage(LocaleLoader.getString("Effects.Template", new Object[] { LocaleLoader.getString("Acrobatics.Effect.0"), LocaleLoader.getString("Acrobatics.Effect.1") }));
+        }
+
+        if (canGracefulRoll) {
+            player.sendMessage(LocaleLoader.getString("Effects.Template", new Object[] { LocaleLoader.getString("Acrobatics.Effect.2"), LocaleLoader.getString("Acrobatics.Effect.3") }));
+        }
+
+        if (canDodge) {
+            player.sendMessage(LocaleLoader.getString("Effects.Template", new Object[] { 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", new Object[] { rollChance }));
+        }
+
+        if (canGracefulRoll) {
+            player.sendMessage(LocaleLoader.getString("Acrobatics.Roll.GraceChance", new Object[] { gracefulRollChance }));
+        }
+
+        if (canDodge) {
+            player.sendMessage(LocaleLoader.getString("Acrobatics.DodgeChance", new Object[] { dodgeChance }));
+        }
+    }
 }

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

@@ -1,22 +1,10 @@
 package com.gmail.nossr50.commands.skills;
 
-import java.text.DecimalFormat;
-
-import org.bukkit.command.Command;
-import org.bukkit.command.CommandExecutor;
-import org.bukkit.command.CommandSender;
-import org.bukkit.entity.Player;
-
-import com.gmail.nossr50.commands.CommandHelper;
-import com.gmail.nossr50.datatypes.PlayerProfile;
+import com.gmail.nossr50.commands.SkillCommand;
 import com.gmail.nossr50.datatypes.SkillType;
 import com.gmail.nossr50.locale.LocaleLoader;
-import com.gmail.nossr50.util.Page;
-import com.gmail.nossr50.util.Permissions;
-import com.gmail.nossr50.util.Users;
 
-public class ArcheryCommand implements CommandExecutor {
-    private float skillValue;
+public class ArcheryCommand extends SkillCommand {
     private String skillShotBonus;
     private String dazeChance;
     private String retrieveChance;
@@ -25,67 +13,12 @@ public class ArcheryCommand implements CommandExecutor {
     private boolean canDaze;
     private boolean canRetrieve;
 
-    @Override
-    public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
-        if (CommandHelper.noConsoleUsage(sender)) {
-            return true;
-        }
-
-        if (CommandHelper.noCommandPermissions(sender, "mcmmo.skills.archery")) {
-            return true;
-        }
-
-        Player player = (Player) sender;
-        PlayerProfile PP = Users.getProfile(player);
-
-        skillValue = (float) PP.getSkillLevel(SkillType.ARCHERY);
-        dataCalculations(skillValue);
-        permissionsCheck(player);
-
-        player.sendMessage(LocaleLoader.getString("Skills.Header", new Object[] { LocaleLoader.getString("Archery.SkillName") }));
-        player.sendMessage(LocaleLoader.getString("Commands.XPGain", new Object[] { LocaleLoader.getString("Commands.XPGain.Archery") }));
-        player.sendMessage(LocaleLoader.getString("Effects.Level", new Object[] { PP.getSkillLevel(SkillType.ARCHERY), PP.getSkillXpLevel(SkillType.ARCHERY), PP.getXpToLevel(SkillType.ARCHERY) }));
-
-        if (canSkillShot || canDaze || canRetrieve) {
-            player.sendMessage(LocaleLoader.getString("Skills.Header", new Object[] { LocaleLoader.getString("Effects.Effects") }));
-        }
-
-        if (canSkillShot) {
-            player.sendMessage(LocaleLoader.getString("Effects.Template", new Object[] { LocaleLoader.getString("Archery.Effect.0"), LocaleLoader.getString("Archery.Effect.1") }));
-        }
-
-        if (canDaze) {
-            player.sendMessage(LocaleLoader.getString("Effects.Template", new Object[] { LocaleLoader.getString("Archery.Effect.2"), LocaleLoader.getString("Archery.Effect.3") }));
-        }
-
-        if (canRetrieve) {
-            player.sendMessage(LocaleLoader.getString("Effects.Template", new Object[] { LocaleLoader.getString("Archery.Effect.4"), LocaleLoader.getString("Archery.Effect.5") }));
-        }
-
-        if (canSkillShot || canDaze || canRetrieve) {
-            player.sendMessage(LocaleLoader.getString("Skills.Header", new Object[] { LocaleLoader.getString("Commands.Stats.Self") }));
-        }
-
-        if (canSkillShot) {
-            player.sendMessage(LocaleLoader.getString("Archery.Combat.SkillshotBonus", new Object[] { skillShotBonus }));
-        }
-
-        if (canDaze) {
-            player.sendMessage(LocaleLoader.getString("Archery.Combat.DazeChance", new Object[] { dazeChance }));
-        }
-
-        if (canRetrieve) {
-            player.sendMessage(LocaleLoader.getString("Archery.Combat.RetrieveChance", new Object[] { retrieveChance }));
-        }
-
-        Page.grabGuidePageForSkill(SkillType.ARCHERY, player, args);
-
-        return true;
+    public ArcheryCommand() {
+        super(SkillType.ARCHERY);
     }
 
-    private void dataCalculations(float skillValue) {
-        DecimalFormat percent = new DecimalFormat("##0.00%");
-
+    @Override
+    protected void dataCalculations() {
         if (skillValue >= 1000) {
             skillShotBonus = "200.00%";
             dazeChance = "50.00%";
@@ -98,11 +31,50 @@ public class ArcheryCommand implements CommandExecutor {
         }
     }
 
-    private void permissionsCheck(Player player) {
-        Permissions permInstance = Permissions.getInstance();
-
+    @Override
+    protected void permissionsCheck() {
         canSkillShot = permInstance.archeryBonus(player);
         canDaze = permInstance.daze(player);
         canRetrieve = permInstance.trackArrows(player);
     }
+
+    @Override
+    protected boolean effectsHeaderPermissions() {
+        return canSkillShot || canDaze || canRetrieve;
+    }
+
+    @Override
+    protected void effectsDisplay() {
+        if (canSkillShot) {
+            player.sendMessage(LocaleLoader.getString("Effects.Template", new Object[] { LocaleLoader.getString("Archery.Effect.0"), LocaleLoader.getString("Archery.Effect.1") }));
+        }
+
+        if (canDaze) {
+            player.sendMessage(LocaleLoader.getString("Effects.Template", new Object[] { LocaleLoader.getString("Archery.Effect.2"), LocaleLoader.getString("Archery.Effect.3") }));
+        }
+
+        if (canRetrieve) {
+            player.sendMessage(LocaleLoader.getString("Effects.Template", new Object[] { 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", new Object[] { skillShotBonus }));
+        }
+
+        if (canDaze) {
+            player.sendMessage(LocaleLoader.getString("Archery.Combat.DazeChance", new Object[] { dazeChance }));
+        }
+
+        if (canRetrieve) {
+            player.sendMessage(LocaleLoader.getString("Archery.Combat.RetrieveChance", new Object[] { retrieveChance }));
+        }
+    }
 }

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

@@ -1,21 +1,10 @@
 package com.gmail.nossr50.commands.skills;
 
-import java.text.DecimalFormat;
-
-import org.bukkit.command.Command;
-import org.bukkit.command.CommandExecutor;
-import org.bukkit.command.CommandSender;
-import org.bukkit.entity.Player;
-
-import com.gmail.nossr50.commands.CommandHelper;
-import com.gmail.nossr50.datatypes.PlayerProfile;
+import com.gmail.nossr50.commands.SkillCommand;
 import com.gmail.nossr50.datatypes.SkillType;
 import com.gmail.nossr50.locale.LocaleLoader;
-import com.gmail.nossr50.util.Permissions;
-import com.gmail.nossr50.util.Users;
 
-public class AxesCommand implements CommandExecutor {
-    private float skillValue;
+public class AxesCommand extends SkillCommand {
     private String critChance;
     private String bonusDamage;
     private String impactDamage;
@@ -28,31 +17,46 @@ public class AxesCommand implements CommandExecutor {
     private boolean canImpact;
     private boolean canGreaterImpact;
 
+    public AxesCommand() {
+        super(SkillType.AXES);
+    }
+
     @Override
-    public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
-        if (CommandHelper.noConsoleUsage(sender)) {
-            return true;
+    protected void dataCalculations() {
+        impactDamage = String.valueOf(5 + ((int) skillValue / 30));
+        skullSplitterLength = String.valueOf(2 + ((int) skillValue / 50));
+        greaterImpactDamage = "2";
+
+        if (skillValue >= 750) {
+            critChance = "37.50";
+            bonusDamage = "4";
         }
-
-        if (CommandHelper.noCommandPermissions(sender, "mcmmo.skills.axes")) {
-            return true;
+        else if (skillValue >= 200) {
+            critChance = percent.format(skillValue / 2000);
+            bonusDamage = "4";
         }
-
-        Player player = (Player) sender;
-        PlayerProfile PP = Users.getProfile(player);
-
-        skillValue = (float) PP.getSkillLevel(SkillType.AXES);
-        dataCalculations(skillValue);
-        permissionsCheck(player);
-
-        player.sendMessage(LocaleLoader.getString("Skills.Header", new Object[] { LocaleLoader.getString("Axes.SkillName") }));
-        player.sendMessage(LocaleLoader.getString("Commands.XPGain", new Object[] { LocaleLoader.getString("Commands.XPGain.Axes") }));
-        player.sendMessage(LocaleLoader.getString("Effects.Level", new Object[] { PP.getSkillLevel(SkillType.AXES), PP.getSkillXpLevel(SkillType.AXES), PP.getXpToLevel(SkillType.AXES) }));
-
-        if (canSkullSplitter || canCritical || canBonusDamage || canImpact || canGreaterImpact) {
-            player.sendMessage(LocaleLoader.getString("Skills.Header", new Object[] { LocaleLoader.getString("Effects.Effects") }));
+        else {
+            critChance = percent.format(skillValue / 2000);
+            bonusDamage = String.valueOf((int) skillValue / 50);
         }
+    }
 
+    @Override
+    protected void permissionsCheck() {
+        canSkullSplitter = permInstance.skullSplitter(player);
+        canCritical = permInstance.criticalHit(player);
+        canBonusDamage = permInstance.axeBonus(player);
+        canImpact = permInstance.impact(player);
+        canGreaterImpact = permInstance.greaterImpact(player);
+    }
+
+    @Override
+    protected boolean effectsHeaderPermissions() {
+        return canSkullSplitter || canCritical || canBonusDamage || canImpact || canGreaterImpact;
+    }
+
+    @Override
+    protected void effectsDisplay() {
         if (canSkullSplitter) {
             player.sendMessage(LocaleLoader.getString("Effects.Template", new Object[] { LocaleLoader.getString("Axes.Effect.0"), LocaleLoader.getString("Axes.Effect.1") }));
         }
@@ -72,11 +76,15 @@ public class AxesCommand implements CommandExecutor {
         if (canGreaterImpact) {
             player.sendMessage(LocaleLoader.getString("Effects.Template", new Object[] { LocaleLoader.getString("Axes.Effect.8"), LocaleLoader.getString("Axes.Effect.9") }));
         }
+    }
 
-        if (canSkullSplitter || canCritical || canBonusDamage || canImpact || canGreaterImpact) {
-            player.sendMessage(LocaleLoader.getString("Skills.Header", new Object[] { LocaleLoader.getString("Commands.Stats.Self") }));
-        }
+    @Override
+    protected boolean statsHeaderPermissions() {
+        return canSkullSplitter || canCritical || canBonusDamage || canImpact || canGreaterImpact;
+    }
 
+    @Override
+    protected void statsDisplay() {
         if (canBonusDamage) {
             player.sendMessage(LocaleLoader.getString("Ability.Generic.Template", new Object[] { LocaleLoader.getString("Axes.Ability.Bonus.0"), LocaleLoader.getString("Axes.Ability.Bonus.1", new Object[] {bonusDamage}) }));
         }
@@ -96,38 +104,5 @@ public class AxesCommand implements CommandExecutor {
         if (canSkullSplitter) {
             player.sendMessage(LocaleLoader.getString("Axes.Combat.SS.Length", new Object[] { skullSplitterLength }));
         }
-
-        return true;
-    }
-
-    private void dataCalculations(float skillValue) {
-        DecimalFormat percent = new DecimalFormat("##0.00%");
-
-        impactDamage = String.valueOf(5 + ((int) skillValue / 30));
-        skullSplitterLength = String.valueOf(2 + ((int) skillValue / 50));
-        greaterImpactDamage = "2";
-
-        if (skillValue >= 750) {
-            critChance = "37.50";
-            bonusDamage = "4";
-        }
-        else if (skillValue >= 200) {
-            critChance = percent.format(skillValue / 2000);
-            bonusDamage = "4";
-        }
-        else {
-            critChance = percent.format(skillValue / 2000);
-            bonusDamage = String.valueOf((int) skillValue / 50);
-        }
-    }
-
-    private void permissionsCheck(Player player) {
-        Permissions permInstance = Permissions.getInstance();
-
-        canSkullSplitter = permInstance.skullSplitter(player);
-        canCritical = permInstance.criticalHit(player);
-        canBonusDamage = permInstance.axeBonus(player);
-        canImpact = permInstance.impact(player);
-        canGreaterImpact = permInstance.greaterImpact(player);
     }
 }

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

@@ -1,50 +1,37 @@
 package com.gmail.nossr50.commands.skills;
 
-import org.bukkit.command.Command;
-import org.bukkit.command.CommandExecutor;
-import org.bukkit.command.CommandSender;
-import org.bukkit.entity.Player;
-
-import com.gmail.nossr50.commands.CommandHelper;
-import com.gmail.nossr50.datatypes.PlayerProfile;
+import com.gmail.nossr50.commands.SkillCommand;
 import com.gmail.nossr50.datatypes.SkillType;
 import com.gmail.nossr50.locale.LocaleLoader;
-import com.gmail.nossr50.util.Page;
-import com.gmail.nossr50.util.Permissions;
-import com.gmail.nossr50.util.Users;
 
-public class ExcavationCommand implements CommandExecutor {
-    private float skillValue;
+public class ExcavationCommand extends SkillCommand {
     private String gigaDrillBreakerLength;
 
     private boolean canGigaDrill;
     private boolean canTreasureHunt;
 
+    public ExcavationCommand() {
+        super(SkillType.EXCAVATION);
+    }
+
     @Override
-    public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
-        if (CommandHelper.noConsoleUsage(sender)) {
-            return true;
-        }
+    protected void dataCalculations() {
+        gigaDrillBreakerLength = String.valueOf(2 + ((int) skillValue / 50));
+    }
 
-        if (CommandHelper.noCommandPermissions(sender, "mcmmo.skills.excavation")) {
-            return true;
-        }
+    @Override
+    protected void permissionsCheck() {
+        canGigaDrill = permInstance.gigaDrillBreaker(player);
+        canTreasureHunt = permInstance.excavationTreasures(player);
+    }
 
-        Player player = (Player) sender;
-        PlayerProfile PP = Users.getProfile(player);
-
-        skillValue = (float) PP.getSkillLevel(SkillType.EXCAVATION);
-        dataCalculations(skillValue);
-        permissionsCheck(player);
-
-        player.sendMessage(LocaleLoader.getString("Skills.Header", new Object[] { LocaleLoader.getString("Excavation.SkillName") }));
-        player.sendMessage(LocaleLoader.getString("Commands.XPGain", new Object[] { LocaleLoader.getString("Commands.XPGain.Excavation") }));
-        player.sendMessage(LocaleLoader.getString("Effects.Level", new Object[] { PP.getSkillLevel(SkillType.EXCAVATION), PP.getSkillXpLevel(SkillType.EXCAVATION), PP.getXpToLevel(SkillType.EXCAVATION) }));
-
-        if (canGigaDrill || canTreasureHunt) {
-            player.sendMessage(LocaleLoader.getString("Skills.Header", new Object[] { LocaleLoader.getString("Effects.Effects") }));
-        }
+    @Override
+    protected boolean effectsHeaderPermissions() {
+        return canGigaDrill || canTreasureHunt;
+    }
 
+    @Override
+    protected void effectsDisplay() {
         if (canGigaDrill) {
             player.sendMessage(LocaleLoader.getString("Effects.Template", new Object[] { LocaleLoader.getString("Excavation.Effect.0"), LocaleLoader.getString("Excavation.Effect.1") }));
         }
@@ -52,25 +39,17 @@ public class ExcavationCommand implements CommandExecutor {
         if (canTreasureHunt) {
             player.sendMessage(LocaleLoader.getString("Effects.Template", new Object[] { 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("Skills.Header", new Object[] { LocaleLoader.getString("Commands.Stats.Self") }));
             player.sendMessage(LocaleLoader.getString("Excavation.Effect.Length", new Object[] { gigaDrillBreakerLength }));
         }
-
-        Page.grabGuidePageForSkill(SkillType.EXCAVATION, player, args);
-
-        return true;
-    }
-
-    private void dataCalculations(float skillValue) {
-        gigaDrillBreakerLength = String.valueOf(2 + ((int) skillValue / 50));
-    }
-
-    private void permissionsCheck(Player player) {
-        Permissions permInstance = Permissions.getInstance();
-
-        canGigaDrill = permInstance.gigaDrillBreaker(player);
-        canTreasureHunt = permInstance.excavationTreasures(player);
     }
 }

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

@@ -1,22 +1,11 @@
 package com.gmail.nossr50.commands.skills;
 
-import java.text.DecimalFormat;
-
-import org.bukkit.command.Command;
-import org.bukkit.command.CommandExecutor;
-import org.bukkit.command.CommandSender;
-import org.bukkit.entity.Player;
-
-import com.gmail.nossr50.commands.CommandHelper;
-import com.gmail.nossr50.datatypes.PlayerProfile;
+import com.gmail.nossr50.commands.SkillCommand;
 import com.gmail.nossr50.datatypes.SkillType;
 import com.gmail.nossr50.locale.LocaleLoader;
 import com.gmail.nossr50.skills.gathering.Fishing;
-import com.gmail.nossr50.util.Page;
-import com.gmail.nossr50.util.Permissions;
-import com.gmail.nossr50.util.Users;
 
-public class FishingCommand implements CommandExecutor {
+public class FishingCommand extends SkillCommand {
     private int lootTier;
     private String magicChance;
 
@@ -24,31 +13,30 @@ public class FishingCommand implements CommandExecutor {
     private boolean canMagicHunt;
     private boolean canShake;
 
+    public FishingCommand() {
+        super(SkillType.FISHING);
+    }
+
     @Override
-    public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
-        if (CommandHelper.noConsoleUsage(sender)) {
-            return true;
-        }
+    protected void dataCalculations() {
+        lootTier = Fishing.getFishingLootTier(profile);
+        magicChance = percent.format((float) lootTier / 15);
+    }
 
-        if (CommandHelper.noCommandPermissions(sender, "mcmmo.skills.fishing")) {
-            return true;
-        }
+    @Override
+    protected void permissionsCheck() {
+        canTreasureHunt = permInstance.fishingTreasures(player);
+        canMagicHunt = permInstance.fishingMagic(player);
+        canShake = permInstance.shakeMob(player);
+    }
 
-        Player player = (Player) sender;
-        PlayerProfile PP = Users.getProfile(player);
-
-        lootTier = Fishing.getFishingLootTier(PP);
-        dataCalculations(lootTier);
-        permissionsCheck(player);
-
-        player.sendMessage(LocaleLoader.getString("Skills.Header", new Object[] { LocaleLoader.getString("Fishing.SkillName") }));
-        player.sendMessage(LocaleLoader.getString("Commands.XPGain", new Object[] { LocaleLoader.getString("Commands.XPGain.Fishing") }));
-        player.sendMessage(LocaleLoader.getString("Effects.Level", new Object[] { PP.getSkillLevel(SkillType.FISHING), PP.getSkillXpLevel(SkillType.FISHING), PP.getXpToLevel(SkillType.FISHING) }));
-
-        if (canTreasureHunt || canMagicHunt || canShake) {
-            player.sendMessage(LocaleLoader.getString("Skills.Header", new Object[] { LocaleLoader.getString("Effects.Effects") }));
-        }
+    @Override
+    protected boolean effectsHeaderPermissions() {
+        return canTreasureHunt || canMagicHunt || canShake;
+    }
 
+    @Override
+    protected void effectsDisplay() {
         if (canTreasureHunt) {
             player.sendMessage(LocaleLoader.getString("Effects.Template", new Object[] { LocaleLoader.getString("Fishing.Effect.0"), LocaleLoader.getString("Fishing.Effect.1") }));
         }
@@ -60,11 +48,15 @@ public class FishingCommand implements CommandExecutor {
         if (canShake) {
             player.sendMessage(LocaleLoader.getString("Effects.Template", new Object[] { LocaleLoader.getString("Fishing.Effect.4"), LocaleLoader.getString("Fishing.Effect.5") }));
         }
+    }
 
-        if (canTreasureHunt || canMagicHunt || canShake) {
-            player.sendMessage(LocaleLoader.getString("Skills.Header", new Object[] { LocaleLoader.getString("Commands.Stats.Self") }));
-        }
+    @Override
+    protected boolean statsHeaderPermissions() {
+        return canTreasureHunt || canMagicHunt || canShake;
+    }
 
+    @Override
+    protected void statsDisplay() {
         if (canTreasureHunt) {
             player.sendMessage(LocaleLoader.getString("Fishing.Ability.Rank", new Object[] { lootTier }));
         }
@@ -75,30 +67,12 @@ public class FishingCommand implements CommandExecutor {
 
         if (canShake) {
             //TODO: Do we really need to display this twice? Not like there are any associated stats.
-            if (PP.getSkillLevel(SkillType.FISHING) < 150) {
+            if (skillValue < 150) {
                 player.sendMessage(LocaleLoader.getString("Ability.Generic.Template.Lock", new Object[] { LocaleLoader.getString("Fishing.Ability.Locked.0") }));
             }
             else {
                 player.sendMessage(LocaleLoader.getString("Fishing.Ability.Shake"));
             }
         }
-
-        Page.grabGuidePageForSkill(SkillType.FISHING, player, args);
-
-        return true;
-    }
-
-    private void dataCalculations(int lootTier) {
-        DecimalFormat percent = new DecimalFormat("##0.00%");
-
-        magicChance = percent.format((float) lootTier / 15);
-    }
-
-    private void permissionsCheck(Player player) {
-        Permissions permInstance = Permissions.getInstance();
-
-        canTreasureHunt = permInstance.fishingTreasures(player);
-        canMagicHunt = permInstance.fishingMagic(player);
-        canShake = permInstance.shakeMob(player);
     }
 }

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

@@ -1,23 +1,11 @@
 package com.gmail.nossr50.commands.skills;
 
-import java.text.DecimalFormat;
-
-import org.bukkit.command.Command;
-import org.bukkit.command.CommandExecutor;
-import org.bukkit.command.CommandSender;
-import org.bukkit.entity.Player;
-
-import com.gmail.nossr50.commands.CommandHelper;
+import com.gmail.nossr50.commands.SkillCommand;
 import com.gmail.nossr50.config.Config;
-import com.gmail.nossr50.datatypes.PlayerProfile;
 import com.gmail.nossr50.datatypes.SkillType;
 import com.gmail.nossr50.locale.LocaleLoader;
-import com.gmail.nossr50.util.Page;
-import com.gmail.nossr50.util.Permissions;
-import com.gmail.nossr50.util.Users;
 
-public class HerbalismCommand implements CommandExecutor {
-    private float skillValue;
+public class HerbalismCommand extends SkillCommand {
     private String greenTerraLength;
     private String greenThumbChance;
     private String greenThumbStage;
@@ -31,83 +19,12 @@ public class HerbalismCommand implements CommandExecutor {
     private boolean canDoubleDrop;
     private boolean doubleDropsDisabled;
 
-    @Override
-    public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
-        if (CommandHelper.noConsoleUsage(sender)) {
-            return true;
-        }
-
-        if (CommandHelper.noCommandPermissions(sender, "mcmmo.skills.herbalism")) {
-            return true;
-        }
-
-        Player player = (Player) sender;
-        PlayerProfile PP = Users.getProfile(player);
-
-        skillValue = (float) PP.getSkillLevel(SkillType.HERBALISM);
-        dataCalculations(skillValue);
-        permissionsCheck(player);
-
-        player.sendMessage(LocaleLoader.getString("Skills.Header", new Object[] { LocaleLoader.getString("Herbalism.SkillName") }));
-        player.sendMessage(LocaleLoader.getString("Commands.XPGain", new Object[] { LocaleLoader.getString("Commands.XPGain.Herbalism") }));
-        player.sendMessage(LocaleLoader.getString("Effects.Level", new Object[] { PP.getSkillLevel(SkillType.HERBALISM), PP.getSkillXpLevel(SkillType.HERBALISM), PP.getXpToLevel(SkillType.HERBALISM) }));
-
-        if (canGreenTerra || (canDoubleDrop && !doubleDropsDisabled )|| canFarmersDiet || canGreenThumbBlocks || canGreenThumbWheat) {
-            player.sendMessage(LocaleLoader.getString("Skills.Header", new Object[] { LocaleLoader.getString("Effects.Effects") }));
-        }
-
-        if (canGreenTerra) {
-            player.sendMessage(LocaleLoader.getString("Effects.Template", new Object[] { LocaleLoader.getString("Herbalism.Effect.0"), LocaleLoader.getString("Herbalism.Effect.1") }));
-        }
-
-        if (canGreenThumbWheat) {
-            player.sendMessage(LocaleLoader.getString("Effects.Template", new Object[] { LocaleLoader.getString("Herbalism.Effect.2"), LocaleLoader.getString("Herbalism.Effect.3") }));
-        }
-
-        if (canGreenThumbBlocks) {
-            player.sendMessage(LocaleLoader.getString("Effects.Template", new Object[] { LocaleLoader.getString("Herbalism.Effect.4"), LocaleLoader.getString("Herbalism.Effect.5") }));
-        }
-
-        if (canFarmersDiet) {
-            player.sendMessage(LocaleLoader.getString("Effects.Template", new Object[] { LocaleLoader.getString("Herbalism.Effect.6"), LocaleLoader.getString("Herbalism.Effect.7") }));
-        }
-
-        if (canDoubleDrop && !doubleDropsDisabled) {
-            player.sendMessage(LocaleLoader.getString("Effects.Template", new Object[] { LocaleLoader.getString("Herbalism.Effect.8"), LocaleLoader.getString("Herbalism.Effect.9") }));
-        }
-
-        if (canGreenTerra || (canDoubleDrop && !doubleDropsDisabled ) || canFarmersDiet || canGreenThumbBlocks || canGreenThumbWheat) {
-            player.sendMessage(LocaleLoader.getString("Skills.Header", new Object[] { LocaleLoader.getString("Commands.Stats.Self") }));
-        }
-
-        if (canGreenTerra) {
-            player.sendMessage(LocaleLoader.getString("Herbalism.Ability.GTe.Length", new Object[] { greenTerraLength }));
-        }
-
-        if (canGreenThumbBlocks || canGreenThumbWheat) {
-            player.sendMessage(LocaleLoader.getString("Herbalism.Ability.GTh.Chance", new Object[] { greenThumbChance }));
-        }
-
-        if (canGreenThumbWheat) {
-            player.sendMessage(LocaleLoader.getString("Herbalism.Ability.GTh.Stage", new Object[] { greenThumbStage }));
-        }
-
-        if (canFarmersDiet) {
-            player.sendMessage(LocaleLoader.getString("Herbalism.Ability.FD", new Object[] { farmersDietRank } ));
-        }
-
-        if (canDoubleDrop && !doubleDropsDisabled) {
-            player.sendMessage(LocaleLoader.getString("Herbalism.Ability.DoubleDropChance", new Object[] { doubleDropChance }));
-        }
-
-        Page.grabGuidePageForSkill(SkillType.HERBALISM, player, args);
-
-        return true;
+    public HerbalismCommand() {
+        super(SkillType.HERBALISM);
     }
 
-    private void dataCalculations(float skillValue) {
-        DecimalFormat percent = new DecimalFormat("##0.00%");
-
+    @Override
+    protected void dataCalculations() {
         greenTerraLength = String.valueOf(2 + ((int) skillValue / 50));
 
         if (skillValue >= 1500) {
@@ -154,8 +71,8 @@ public class HerbalismCommand implements CommandExecutor {
         }
     }
 
-    private void permissionsCheck(Player player) {
-        Permissions permInstance = Permissions.getInstance();
+    @Override
+    protected void permissionsCheck() {
         Config configInstance = Config.getInstance();
 
         canGreenTerra = permInstance.greenTerra(player);
@@ -165,4 +82,60 @@ public class HerbalismCommand implements CommandExecutor {
         canDoubleDrop = permInstance.herbalismDoubleDrops(player);
         doubleDropsDisabled = configInstance.herbalismDoubleDropsDisabled();
     }
+
+    @Override
+    protected boolean effectsHeaderPermissions() {
+        return canGreenTerra || (canDoubleDrop && !doubleDropsDisabled) || canFarmersDiet || canGreenThumbBlocks || canGreenThumbWheat;
+    }
+
+    @Override
+    protected void effectsDisplay() {
+        if (canGreenTerra) {
+            player.sendMessage(LocaleLoader.getString("Effects.Template", new Object[] { LocaleLoader.getString("Herbalism.Effect.0"), LocaleLoader.getString("Herbalism.Effect.1") }));
+        }
+
+        if (canGreenThumbWheat) {
+            player.sendMessage(LocaleLoader.getString("Effects.Template", new Object[] { LocaleLoader.getString("Herbalism.Effect.2"), LocaleLoader.getString("Herbalism.Effect.3") }));
+        }
+
+        if (canGreenThumbBlocks) {
+            player.sendMessage(LocaleLoader.getString("Effects.Template", new Object[] { LocaleLoader.getString("Herbalism.Effect.4"), LocaleLoader.getString("Herbalism.Effect.5") }));
+        }
+
+        if (canFarmersDiet) {
+            player.sendMessage(LocaleLoader.getString("Effects.Template", new Object[] { LocaleLoader.getString("Herbalism.Effect.6"), LocaleLoader.getString("Herbalism.Effect.7") }));
+        }
+
+        if (canDoubleDrop && !doubleDropsDisabled) {
+            player.sendMessage(LocaleLoader.getString("Effects.Template", new Object[] { LocaleLoader.getString("Herbalism.Effect.8"), LocaleLoader.getString("Herbalism.Effect.9") }));
+        }
+    }
+
+    @Override
+    protected boolean statsHeaderPermissions() {
+        return canGreenTerra || (canDoubleDrop && !doubleDropsDisabled) || canFarmersDiet || canGreenThumbBlocks || canGreenThumbWheat;
+    }
+
+    @Override
+    protected void statsDisplay() {
+        if (canGreenTerra) {
+            player.sendMessage(LocaleLoader.getString("Herbalism.Ability.GTe.Length", new Object[] { greenTerraLength }));
+        }
+
+        if (canGreenThumbBlocks || canGreenThumbWheat) {
+            player.sendMessage(LocaleLoader.getString("Herbalism.Ability.GTh.Chance", new Object[] { greenThumbChance }));
+        }
+
+        if (canGreenThumbWheat) {
+            player.sendMessage(LocaleLoader.getString("Herbalism.Ability.GTh.Stage", new Object[] { greenThumbStage }));
+        }
+
+        if (canFarmersDiet) {
+            player.sendMessage(LocaleLoader.getString("Herbalism.Ability.FD", new Object[] { farmersDietRank } ));
+        }
+
+        if (canDoubleDrop && !doubleDropsDisabled) {
+            player.sendMessage(LocaleLoader.getString("Herbalism.Ability.DoubleDropChance", new Object[] { doubleDropChance }));
+        }
+    }
 }

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

@@ -1,24 +1,12 @@
 package com.gmail.nossr50.commands.skills;
 
-import java.text.DecimalFormat;
-
-import org.bukkit.command.Command;
-import org.bukkit.command.CommandExecutor;
-import org.bukkit.command.CommandSender;
-import org.bukkit.entity.Player;
-
-import com.gmail.nossr50.commands.CommandHelper;
+import com.gmail.nossr50.commands.SkillCommand;
 import com.gmail.nossr50.config.Config;
-import com.gmail.nossr50.datatypes.PlayerProfile;
 import com.gmail.nossr50.datatypes.SkillType;
 import com.gmail.nossr50.locale.LocaleLoader;
 import com.gmail.nossr50.util.Misc;
-import com.gmail.nossr50.util.Page;
-import com.gmail.nossr50.util.Permissions;
-import com.gmail.nossr50.util.Users;
 
-public class MiningCommand implements CommandExecutor {
-    private float skillValue;
+public class MiningCommand extends SkillCommand {
     private String doubleDropChance;
     private String superBreakerLength;
     private String blastMiningRank;
@@ -32,98 +20,12 @@ public class MiningCommand implements CommandExecutor {
     private boolean canDemoExpert;
     private boolean doubleDropsDisabled;
 
-    @Override
-    public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
-        if (CommandHelper.noConsoleUsage(sender)) {
-            return true;
-        }
-
-        if (CommandHelper.noCommandPermissions(sender, "mcmmo.skills.mining")) {
-            return true;
-        }
-
-        Player player = (Player) sender;
-        PlayerProfile PP = Users.getProfile(player);
-
-        skillValue = (float) PP.getSkillLevel(SkillType.MINING);
-        dataCalculations(skillValue);
-        permissionsCheck(player);
-
-        player.sendMessage(LocaleLoader.getString("Skills.Header", new Object[] { LocaleLoader.getString("Mining.SkillName") }));
-        player.sendMessage(LocaleLoader.getString("Commands.XPGain", new Object[] { LocaleLoader.getString("Commands.XPGain.Mining") }));
-        player.sendMessage(LocaleLoader.getString("Effects.Level", new Object[] { PP.getSkillLevel(SkillType.MINING), PP.getSkillXpLevel(SkillType.MINING), PP.getXpToLevel(SkillType.MINING) }));
-
-        if (canBiggerBombs || canBlast || canDemoExpert || (canDoubleDrop && !doubleDropsDisabled ) || canSuperBreaker) {
-            player.sendMessage(LocaleLoader.getString("Skills.Header", new Object[] { LocaleLoader.getString("Effects.Effects") }));
-        }
-
-        if (canSuperBreaker) {
-            player.sendMessage(LocaleLoader.getString("Effects.Template", new Object[] { LocaleLoader.getString("Mining.Effect.0"), LocaleLoader.getString("Mining.Effect.1") }));
-        }
-
-        if (canDoubleDrop && !doubleDropsDisabled) {
-            player.sendMessage(LocaleLoader.getString("Effects.Template", new Object[] { LocaleLoader.getString("Mining.Effect.2"), LocaleLoader.getString("Mining.Effect.3") }));
-        }
-
-        if (canBlast) {
-            player.sendMessage(LocaleLoader.getString("Effects.Template", new Object[] { LocaleLoader.getString("Mining.Effect.4"), LocaleLoader.getString("Mining.Effect.5") }));
-        }
-
-        if (canBiggerBombs) {
-            player.sendMessage(LocaleLoader.getString("Effects.Template", new Object[] { LocaleLoader.getString("Mining.Effect.6"), LocaleLoader.getString("Mining.Effect.7") }));
-        }
-
-        if (canDemoExpert) {
-            player.sendMessage(LocaleLoader.getString("Effects.Template", new Object[] { LocaleLoader.getString("Mining.Effect.8"), LocaleLoader.getString("Mining.Effect.9") }));
-        }
-
-        if (canBiggerBombs || canBlast || canDemoExpert || (canDoubleDrop && !doubleDropsDisabled ) || canSuperBreaker) {
-            player.sendMessage(LocaleLoader.getString("Skills.Header", new Object[] { LocaleLoader.getString("Commands.Stats.Self") }));
-        }
-
-        if (canDoubleDrop && !doubleDropsDisabled) {
-            player.sendMessage(LocaleLoader.getString("Mining.Effect.DropChance", new Object[] { doubleDropChance }));
-        }
-
-        if (canSuperBreaker) {
-            player.sendMessage(LocaleLoader.getString("Mining.Ability.Length", new Object[] { superBreakerLength }));
-        }
-
-        if (canBlast) {
-            if (PP.getSkillLevel(SkillType.MINING) < 125) {
-                player.sendMessage(LocaleLoader.getString("Ability.Generic.Template.Lock", new Object[] { LocaleLoader.getString("Mining.Ability.Locked.0") }));
-            }
-            else {
-                player.sendMessage(LocaleLoader.getString("Mining.Blast.Rank", new Object[] { blastMiningRank, LocaleLoader.getString("Mining.Blast.Effect." + (Misc.getInt(blastMiningRank) - 1)) }));
-            }
-        }
-
-        if (canBiggerBombs) {
-            if (PP.getSkillLevel(SkillType.MINING) < 250) {
-                player.sendMessage(LocaleLoader.getString("Ability.Generic.Template.Lock", new Object[] { LocaleLoader.getString("Mining.Ability.Locked.1") }));
-            }
-            else {
-                player.sendMessage(LocaleLoader.getString("Mining.Blast.Radius.Increase", new Object[] { blastRadiusIncrease }));
-            }
-        }
-
-        if (canDemoExpert) {
-            if (PP.getSkillLevel(SkillType.MINING) < 500) {
-                player.sendMessage(LocaleLoader.getString("Ability.Generic.Template.Lock", new Object[] { LocaleLoader.getString("Mining.Ability.Locked.2") }));
-            }
-            else {
-                player.sendMessage(LocaleLoader.getString("Mining.Effect.Decrease", new Object[] { blastDamageDecrease }));
-            }
-        }
-
-        Page.grabGuidePageForSkill(SkillType.MINING, player, args);
-
-        return true;
+    public MiningCommand() {
+        super(SkillType.MINING);
     }
 
-    private void dataCalculations(float skillValue) {
-        DecimalFormat percent = new DecimalFormat("##0.00%");
-
+    @Override
+    protected void dataCalculations() {
         superBreakerLength = String.valueOf(2 + ((int) skillValue / 50));
 
         if (skillValue >= 1000) {
@@ -182,8 +84,8 @@ public class MiningCommand implements CommandExecutor {
         }
     }
 
-    private void permissionsCheck(Player player) {
-        Permissions permInstance = Permissions.getInstance();
+    @Override
+    protected void permissionsCheck() {
         Config configInstance = Config.getInstance();
 
         canBiggerBombs = permInstance.biggerBombs(player);
@@ -193,4 +95,75 @@ public class MiningCommand implements CommandExecutor {
         canSuperBreaker = permInstance.superBreaker(player);
         doubleDropsDisabled = configInstance.miningDoubleDropsDisabled();
     }
+
+    @Override
+    protected boolean effectsHeaderPermissions() {
+        return canBiggerBombs || canBlast || canDemoExpert || (canDoubleDrop && !doubleDropsDisabled) || canSuperBreaker;
+    }
+
+    @Override
+    protected void effectsDisplay() {
+        if (canSuperBreaker) {
+            player.sendMessage(LocaleLoader.getString("Effects.Template", new Object[] { LocaleLoader.getString("Mining.Effect.0"), LocaleLoader.getString("Mining.Effect.1") }));
+        }
+
+        if (canDoubleDrop && !doubleDropsDisabled) {
+            player.sendMessage(LocaleLoader.getString("Effects.Template", new Object[] { LocaleLoader.getString("Mining.Effect.2"), LocaleLoader.getString("Mining.Effect.3") }));
+        }
+
+        if (canBlast) {
+            player.sendMessage(LocaleLoader.getString("Effects.Template", new Object[] { LocaleLoader.getString("Mining.Effect.4"), LocaleLoader.getString("Mining.Effect.5") }));
+        }
+
+        if (canBiggerBombs) {
+            player.sendMessage(LocaleLoader.getString("Effects.Template", new Object[] { LocaleLoader.getString("Mining.Effect.6"), LocaleLoader.getString("Mining.Effect.7") }));
+        }
+
+        if (canDemoExpert) {
+            player.sendMessage(LocaleLoader.getString("Effects.Template", new Object[] { LocaleLoader.getString("Mining.Effect.8"), LocaleLoader.getString("Mining.Effect.9") }));
+        }
+    }
+
+    @Override
+    protected boolean statsHeaderPermissions() {
+        return canBiggerBombs || canBlast || canDemoExpert || (canDoubleDrop && !doubleDropsDisabled) || canSuperBreaker;
+    }
+
+    @Override
+    protected void statsDisplay() {
+        if (canDoubleDrop && !doubleDropsDisabled) {
+            player.sendMessage(LocaleLoader.getString("Mining.Effect.DropChance", new Object[] { doubleDropChance }));
+        }
+
+        if (canSuperBreaker) {
+            player.sendMessage(LocaleLoader.getString("Mining.Ability.Length", new Object[] { superBreakerLength }));
+        }
+
+        if (canBlast) {
+            if (skillValue < 125) {
+                player.sendMessage(LocaleLoader.getString("Ability.Generic.Template.Lock", new Object[] { LocaleLoader.getString("Mining.Ability.Locked.0") }));
+            }
+            else {
+                player.sendMessage(LocaleLoader.getString("Mining.Blast.Rank", new Object[] { blastMiningRank, LocaleLoader.getString("Mining.Blast.Effect." + (Misc.getInt(blastMiningRank) - 1)) }));
+            }
+        }
+
+        if (canBiggerBombs) {
+            if (skillValue < 250) {
+                player.sendMessage(LocaleLoader.getString("Ability.Generic.Template.Lock", new Object[] { LocaleLoader.getString("Mining.Ability.Locked.1") }));
+            }
+            else {
+                player.sendMessage(LocaleLoader.getString("Mining.Blast.Radius.Increase", new Object[] { blastRadiusIncrease }));
+            }
+        }
+
+        if (canDemoExpert) {
+            if (skillValue < 500) {
+                player.sendMessage(LocaleLoader.getString("Ability.Generic.Template.Lock", new Object[] { LocaleLoader.getString("Mining.Ability.Locked.2") }));
+            }
+            else {
+                player.sendMessage(LocaleLoader.getString("Mining.Effect.Decrease", new Object[] { blastDamageDecrease }));
+            }
+        }
+    }
 }

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

@@ -1,26 +1,15 @@
 package com.gmail.nossr50.commands.skills;
 
-import java.text.DecimalFormat;
-
-import org.bukkit.command.Command;
-import org.bukkit.command.CommandExecutor;
-import org.bukkit.command.CommandSender;
-import org.bukkit.entity.Player;
-
 import com.gmail.nossr50.mcMMO;
-import com.gmail.nossr50.commands.CommandHelper;
+import com.gmail.nossr50.commands.SkillCommand;
 import com.gmail.nossr50.config.Config;
-import com.gmail.nossr50.datatypes.PlayerProfile;
 import com.gmail.nossr50.datatypes.SkillType;
 import com.gmail.nossr50.locale.LocaleLoader;
 import com.gmail.nossr50.skills.repair.Repair;
 import com.gmail.nossr50.skills.repair.Repairable;
-import com.gmail.nossr50.util.Page;
-import com.gmail.nossr50.util.Permissions;
-import com.gmail.nossr50.util.Users;
 
-public class RepairCommand implements CommandExecutor {
-    private float skillValue;
+public class RepairCommand extends SkillCommand {
+    private int arcaneForgingRank;
     private String repairMasteryBonus;
     private String superRepairChance;
 
@@ -40,33 +29,56 @@ public class RepairCommand implements CommandExecutor {
     private int ironLevel;
     private int stoneLevel;
 
+    public RepairCommand() {
+        super(SkillType.REPAIR);
+    }
+
     @Override
-    public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
-        if (CommandHelper.noConsoleUsage(sender)) {
-            return true;
+    protected void dataCalculations() {
+        // We're using pickaxes here, not the best but it works
+        Repairable diamondRepairable = mcMMO.repairManager.getRepairable(278);
+        Repairable goldRepairable = mcMMO.repairManager.getRepairable(285);
+        Repairable ironRepairable = mcMMO.repairManager.getRepairable(257);
+        Repairable stoneRepairable = mcMMO.repairManager.getRepairable(274);
+
+        diamondLevel = (diamondRepairable == null) ? 0 : diamondRepairable.getMinimumLevel();
+        goldLevel = (goldRepairable == null) ? 0 : goldRepairable.getMinimumLevel();
+        ironLevel = (ironRepairable == null) ? 0 : ironRepairable.getMinimumLevel();
+        stoneLevel = (stoneRepairable == null) ? 0 : stoneRepairable.getMinimumLevel();
+
+        repairMasteryBonus = percent.format(skillValue / 500);
+
+        if (skillValue >= 1000) {
+            superRepairChance = "100.00%";
+        }
+        else {
+            superRepairChance = percent.format(skillValue / 1000);
         }
 
-        if (CommandHelper.noCommandPermissions(sender, "mcmmo.skills.repair")) {
-            return true;
-        }
+        arcaneForgingRank = Repair.getArcaneForgingRank(profile);
+    }
 
-        Player player = (Player) sender;
-        PlayerProfile PP = Users.getProfile(player);
+    @Override
+    protected void permissionsCheck() {
+        canSuperRepair = permInstance.repairBonus(player);
+        canMasterRepair = permInstance.repairMastery(player);
+        canArcaneForge = permInstance.arcaneForging(player);
+        canRepairDiamond = permInstance.diamondRepair(player);
+        canRepairGold = permInstance.goldRepair(player);
+        canRepairIron = permInstance.ironRepair(player);
+        canRepairStone = permInstance.stoneRepair(player);
+        canRepairString = permInstance.stringRepair(player);
+        canRepairLeather = permInstance.leatherRepair(player);
+        canRepairWood = permInstance.woodRepair(player);
+    }
 
-        skillValue = (float) PP.getSkillLevel(SkillType.REPAIR);
-        dataCalculations(skillValue);
-        permissionsCheck(player);
-
-        int arcaneForgingRank = Repair.getArcaneForgingRank(PP);
-
-        player.sendMessage(LocaleLoader.getString("Skills.Header", new Object[] { LocaleLoader.getString("Repair.SkillName") }));
-        player.sendMessage(LocaleLoader.getString("Commands.XPGain", new Object[] { LocaleLoader.getString("Commands.XPGain.Repair") }));
-        player.sendMessage(LocaleLoader.getString("Effects.Level", new Object[] { PP.getSkillLevel(SkillType.REPAIR), PP.getSkillXpLevel(SkillType.REPAIR), PP.getXpToLevel(SkillType.REPAIR) }));
-
-        if (canArcaneForge || canRepairDiamond || canRepairGold || canRepairIron || canMasterRepair || canRepairStone || canSuperRepair || canRepairString || canRepairWood || canRepairLeather) {
-            player.sendMessage(LocaleLoader.getString("Skills.Header", new Object[] { LocaleLoader.getString("Effects.Effects") }));
-        }
+    @Override
+    protected boolean effectsHeaderPermissions() {
+        return canArcaneForge || canRepairDiamond || canRepairGold || canRepairIron || canMasterRepair || canRepairStone || canSuperRepair || canRepairString || canRepairWood || canRepairLeather;
+    }
 
+    @Override
+    protected void effectsDisplay() {
         player.sendMessage(LocaleLoader.getString("Effects.Template", new Object[] { LocaleLoader.getString("Repair.Effect.0"), LocaleLoader.getString("Repair.Effect.1") }));
 
         if (canMasterRepair) {
@@ -98,12 +110,16 @@ public class RepairCommand implements CommandExecutor {
         if (canArcaneForge) {
             player.sendMessage(LocaleLoader.getString("Effects.Template", new Object[] { LocaleLoader.getString("Repair.Effect.8"), LocaleLoader.getString("Repair.Effect.9") }));
         }
+    }
 
-        if (canArcaneForge || canMasterRepair || canSuperRepair) {
-            player.sendMessage(LocaleLoader.getString("Skills.Header", new Object[] { LocaleLoader.getString("Commands.Stats.Self") }));
-        }
+    @Override
+    protected boolean statsHeaderPermissions() {
+        return canArcaneForge || canMasterRepair || canSuperRepair;
+    }
 
-        if (canMasterRepair) {
+    @Override
+    protected void statsDisplay() {
+        if (canMasterRepair) {
             player.sendMessage(LocaleLoader.getString("Repair.Skills.Mastery", new Object[] { repairMasteryBonus }));
         }
 
@@ -122,48 +138,5 @@ public class RepairCommand implements CommandExecutor {
                 player.sendMessage(LocaleLoader.getString("Repair.Arcane.Chance.Downgrade", new Object[] { Repair.getDowngradeChance(arcaneForgingRank) }));
             }
         }
-
-        Page.grabGuidePageForSkill(SkillType.REPAIR, player, args);
-
-        return true;
-    }
-
-    private void dataCalculations(float skillValue) {
-        DecimalFormat percent = new DecimalFormat("##0.00%");
-
-        // We're using pickaxes here, not the best but works
-        Repairable diamondRepairable = mcMMO.repairManager.getRepairable(278);
-        Repairable goldRepairable = mcMMO.repairManager.getRepairable(285);
-        Repairable ironRepairable = mcMMO.repairManager.getRepairable(257);
-        Repairable stoneRepairable = mcMMO.repairManager.getRepairable(274);
-
-        diamondLevel = (diamondRepairable == null) ? 0 : diamondRepairable.getMinimumLevel();
-        goldLevel = (goldRepairable == null) ? 0 : goldRepairable.getMinimumLevel();
-        ironLevel = (ironRepairable == null) ? 0 : ironRepairable.getMinimumLevel();
-        stoneLevel = (stoneRepairable == null) ? 0 : stoneRepairable.getMinimumLevel();
-
-        repairMasteryBonus = percent.format(skillValue / 500);
-
-        if (skillValue >= 1000) {
-            superRepairChance = "100.00%";
-        }
-        else {
-            superRepairChance = percent.format(skillValue / 1000);
-        }
-    }
-
-    private void permissionsCheck(Player player) {
-        Permissions permInstance = Permissions.getInstance();
-
-        canSuperRepair = permInstance.repairBonus(player);
-        canMasterRepair = permInstance.repairMastery(player);
-        canArcaneForge = permInstance.arcaneForging(player);
-        canRepairDiamond = permInstance.diamondRepair(player);
-        canRepairGold = permInstance.goldRepair(player);
-        canRepairIron = permInstance.ironRepair(player);
-        canRepairStone = permInstance.stoneRepair(player);
-        canRepairString = permInstance.stringRepair(player);
-        canRepairLeather = permInstance.leatherRepair(player);
-        canRepairWood = permInstance.woodRepair(player);
     }
 }

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

@@ -1,22 +1,10 @@
 package com.gmail.nossr50.commands.skills;
 
-import java.text.DecimalFormat;
-
-import org.bukkit.command.Command;
-import org.bukkit.command.CommandExecutor;
-import org.bukkit.command.CommandSender;
-import org.bukkit.entity.Player;
-
-import com.gmail.nossr50.commands.CommandHelper;
-import com.gmail.nossr50.datatypes.PlayerProfile;
+import com.gmail.nossr50.commands.SkillCommand;
 import com.gmail.nossr50.datatypes.SkillType;
 import com.gmail.nossr50.locale.LocaleLoader;
-import com.gmail.nossr50.util.Page;
-import com.gmail.nossr50.util.Permissions;
-import com.gmail.nossr50.util.Users;
 
-public class SwordsCommand implements CommandExecutor {
-    private float skillValue;
+public class SwordsCommand extends SkillCommand {
     private String counterAttackChance;
     private String bleedLength;
     private String bleedChance;
@@ -26,70 +14,12 @@ public class SwordsCommand implements CommandExecutor {
     private boolean canSerratedStrike;
     private boolean canBleed;
 
-    @Override
-    public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
-        if (CommandHelper.noConsoleUsage(sender)) {
-            return true;
-        }
-
-        if (CommandHelper.noCommandPermissions(sender, "mcmmo.skills.swords")) {
-            return true;
-        }
-
-        Player player = (Player) sender;
-        PlayerProfile PP = Users.getProfile(player);
-
-        skillValue = (float) PP.getSkillLevel(SkillType.SWORDS);
-        dataCalculations(skillValue);
-        permissionsCheck(player);
-
-        player.sendMessage(LocaleLoader.getString("Skills.Header", new Object[] { LocaleLoader.getString("Swords.SkillName") }));
-        player.sendMessage(LocaleLoader.getString("Commands.XPGain", new Object[] { LocaleLoader.getString("Commands.XPGain.Swords") }));
-        player.sendMessage(LocaleLoader.getString("Effects.Level", new Object[] { PP.getSkillLevel(SkillType.SWORDS), PP.getSkillXpLevel(SkillType.SWORDS), PP.getXpToLevel(SkillType.SWORDS) }));
-
-        if (canBleed || canCounter || canSerratedStrike) {
-            player.sendMessage(LocaleLoader.getString("Skills.Header", new Object[] { LocaleLoader.getString("Effects.Effects") }));
-        }
-
-        if (canCounter) {
-            player.sendMessage(LocaleLoader.getString("Effects.Template", new Object[] { LocaleLoader.getString("Swords.Effect.0"), LocaleLoader.getString("Swords.Effect.1") }));
-        }
-
-        if (canSerratedStrike) {
-            player.sendMessage(LocaleLoader.getString("Effects.Template", new Object[] { LocaleLoader.getString("Swords.Effect.2"), LocaleLoader.getString("Swords.Effect.3") }));
-            player.sendMessage(LocaleLoader.getString("Effects.Template", new Object[] { LocaleLoader.getString("Swords.Effect.4"), LocaleLoader.getString("Swords.Effect.5") }));
-        }
-
-        if (canBleed) {
-            player.sendMessage(LocaleLoader.getString("Effects.Template", new Object[] { LocaleLoader.getString("Swords.Effect.6"), LocaleLoader.getString("Swords.Effect.7") }));
-        }
-
-        if (canBleed || canCounter || canSerratedStrike) {
-            player.sendMessage(LocaleLoader.getString("Skills.Header", new Object[] { LocaleLoader.getString("Commands.Stats.Self") }));
-        }
-
-        if (canCounter) {
-            player.sendMessage(LocaleLoader.getString("Swords.Combat.Counter.Chance", new Object[] { counterAttackChance }));
-        }
-
-        if (canBleed) {
-            player.sendMessage(LocaleLoader.getString("Swords.Combat.Bleed.Length", new Object[] { bleedLength }));
-            player.sendMessage(LocaleLoader.getString("Swords.Combat.Bleed.Note"));
-            player.sendMessage(LocaleLoader.getString("Swords.Combat.Bleed.Chance", new Object[] { bleedChance }));
-        }
-
-        if (canSerratedStrike) {
-            player.sendMessage(LocaleLoader.getString("Swords.SS.Length", new Object[] { serratedStrikesLength }));
-        }
-
-        Page.grabGuidePageForSkill(SkillType.SWORDS, player, args);
-
-        return true;
+    public SwordsCommand() {
+        super(SkillType.SWORDS);
     }
 
-    private void dataCalculations(float skillValue) {
-        DecimalFormat percent = new DecimalFormat("##0.00%");
-
+    @Override
+    protected void dataCalculations() {
         serratedStrikesLength = String.valueOf(2 + ((int) skillValue / 50));
 
         if (skillValue >= 750) {
@@ -109,11 +39,53 @@ public class SwordsCommand implements CommandExecutor {
         }
     }
 
-    private void permissionsCheck(Player player) {
-        Permissions permInstance = Permissions.getInstance();
-
+    @Override
+    protected void permissionsCheck() {
         canBleed = permInstance.swordsBleed(player);
         canCounter = permInstance.counterAttack(player);
         canSerratedStrike = permInstance.serratedStrikes(player);
     }
+
+    @Override
+    protected boolean effectsHeaderPermissions() {
+        return canBleed || canCounter || canSerratedStrike;
+    }
+
+    @Override
+    protected void effectsDisplay() {
+        if (canCounter) {
+            player.sendMessage(LocaleLoader.getString("Effects.Template", new Object[] { LocaleLoader.getString("Swords.Effect.0"), LocaleLoader.getString("Swords.Effect.1") }));
+        }
+
+        if (canSerratedStrike) {
+            player.sendMessage(LocaleLoader.getString("Effects.Template", new Object[] { LocaleLoader.getString("Swords.Effect.2"), LocaleLoader.getString("Swords.Effect.3") }));
+            player.sendMessage(LocaleLoader.getString("Effects.Template", new Object[] { LocaleLoader.getString("Swords.Effect.4"), LocaleLoader.getString("Swords.Effect.5") }));
+        }
+
+        if (canBleed) {
+            player.sendMessage(LocaleLoader.getString("Effects.Template", new Object[] { 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", new Object[] { counterAttackChance }));
+        }
+
+        if (canBleed) {
+            player.sendMessage(LocaleLoader.getString("Swords.Combat.Bleed.Length", new Object[] { bleedLength }));
+            player.sendMessage(LocaleLoader.getString("Swords.Combat.Bleed.Note"));
+            player.sendMessage(LocaleLoader.getString("Swords.Combat.Bleed.Chance", new Object[] { bleedChance }));
+        }
+
+        if (canSerratedStrike) {
+            player.sendMessage(LocaleLoader.getString("Swords.SS.Length", new Object[] { serratedStrikesLength }));
+        }
+    }
 }

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

@@ -1,23 +1,11 @@
 package com.gmail.nossr50.commands.skills;
 
-import java.text.DecimalFormat;
-
-import org.bukkit.command.Command;
-import org.bukkit.command.CommandExecutor;
-import org.bukkit.command.CommandSender;
-import org.bukkit.entity.Player;
-
-import com.gmail.nossr50.commands.CommandHelper;
+import com.gmail.nossr50.commands.SkillCommand;
 import com.gmail.nossr50.config.Config;
-import com.gmail.nossr50.datatypes.PlayerProfile;
 import com.gmail.nossr50.datatypes.SkillType;
 import com.gmail.nossr50.locale.LocaleLoader;
-import com.gmail.nossr50.util.Page;
-import com.gmail.nossr50.util.Permissions;
-import com.gmail.nossr50.util.Users;
 
-public class TamingCommand implements CommandExecutor {
-    private float skillValue;
+public class TamingCommand extends SkillCommand {
     private String goreChance;
 
     private boolean canBeastLore;
@@ -29,30 +17,39 @@ public class TamingCommand implements CommandExecutor {
     private boolean canCallWild;
     private boolean canFastFood;
 
+    public TamingCommand() {
+        super(SkillType.TAMING);
+    }
+
     @Override
-    public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
-        if (CommandHelper.noConsoleUsage(sender)) {
-            return true;
+    protected void dataCalculations() {
+        if (skillValue >= 1000) {
+            goreChance = "100.00%";
         }
+        else {
+            goreChance = percent.format(skillValue / 1000);
+        }    }
 
-        if (CommandHelper.noCommandPermissions(sender, "mcmmo.skills.taming")) {
-            return true;
-        }
+    @Override
+    protected void permissionsCheck() {
+        canBeastLore = permInstance.beastLore(player);
+        canCallWild = permInstance.callOfTheWild(player);
+        canEnvironmentallyAware = permInstance.environmentallyAware(player);
+        canFastFood = permInstance.fastFoodService(player);
+        canGore = permInstance.gore(player);
+        canSharpenedClaws = permInstance.sharpenedClaws(player);
+        canShockProof = permInstance.shockProof(player);
+        canThickFur = permInstance.thickFur(player);
+    }
 
-        Player player = (Player) sender;
-        PlayerProfile PP = Users.getProfile(player);
+    @Override
+    protected boolean effectsHeaderPermissions() {
+        return canBeastLore || canCallWild || canEnvironmentallyAware || canFastFood || canGore || canSharpenedClaws || canShockProof || canThickFur;
+    }
 
-        skillValue = (float) PP.getSkillLevel(SkillType.TAMING);
-        dataCalculations(skillValue);
-        permissionsCheck(player);
-
-        player.sendMessage(LocaleLoader.getString("Skills.Header", new Object[] { LocaleLoader.getString("Taming.SkillName") }));
-        player.sendMessage(LocaleLoader.getString("Commands.XPGain", new Object[] { LocaleLoader.getString("Commands.XPGain.Taming") }));
-        player.sendMessage(LocaleLoader.getString("Effects.Level", new Object[] { PP.getSkillLevel(SkillType.TAMING), PP.getSkillXpLevel(SkillType.TAMING), PP.getXpToLevel(SkillType.TAMING) }));
-
-        if (canBeastLore || canCallWild || canEnvironmentallyAware || canFastFood || canGore || canSharpenedClaws || canShockProof || canThickFur) {
-            player.sendMessage(LocaleLoader.getString("Skills.Header", new Object[] { LocaleLoader.getString("Effects.Effects") }));
-        }
+    @Override
+    protected void effectsDisplay() {
+        Config configInstance = Config.getInstance();
 
         if (canBeastLore) {
             player.sendMessage(LocaleLoader.getString("Effects.Template", new Object[] { LocaleLoader.getString("Taming.Effect.0"), LocaleLoader.getString("Taming.Effect.1") }));
@@ -84,16 +81,20 @@ public class TamingCommand implements CommandExecutor {
 
         if (canCallWild) {
             player.sendMessage(LocaleLoader.getString("Effects.Template", new Object[] { LocaleLoader.getString("Taming.Effect.12"), LocaleLoader.getString("Taming.Effect.13") }));
-            player.sendMessage(LocaleLoader.getString("Taming.Effect.14", new Object[] { Config.getInstance().getTamingCOTWOcelotCost() }));
-            player.sendMessage(LocaleLoader.getString("Taming.Effect.15", new Object[] { Config.getInstance().getTamingCOTWWolfCost() }));
+            player.sendMessage(LocaleLoader.getString("Taming.Effect.14", new Object[] { configInstance.getTamingCOTWOcelotCost() }));
+            player.sendMessage(LocaleLoader.getString("Taming.Effect.15", new Object[] { configInstance.getTamingCOTWWolfCost() }));
         }
+    }
 
-        if (canEnvironmentallyAware || canFastFood || canGore || canSharpenedClaws || canShockProof || canThickFur) {
-            player.sendMessage(LocaleLoader.getString("Skills.Header", new Object[] { LocaleLoader.getString("Commands.Stats.Self") }));
-        }
+    @Override
+    protected boolean statsHeaderPermissions() {
+        return canEnvironmentallyAware || canFastFood || canGore || canSharpenedClaws || canShockProof || canThickFur;
+    }
 
+    @Override
+    protected void statsDisplay() {
         if (canFastFood) {
-            if (PP.getSkillLevel(SkillType.TAMING) < 50) {
+            if (skillValue < 50) {
                 player.sendMessage(LocaleLoader.getString("Ability.Generic.Template.Lock", new Object[] { LocaleLoader.getString("Taming.Ability.Locked.4") }));
             }
             else {
@@ -102,7 +103,7 @@ public class TamingCommand implements CommandExecutor {
         }
 
         if (canEnvironmentallyAware) {
-            if (PP.getSkillLevel(SkillType.TAMING) < 100) {
+            if (skillValue < 100) {
                 player.sendMessage(LocaleLoader.getString("Ability.Generic.Template.Lock", new Object[] { LocaleLoader.getString("Taming.Ability.Locked.0") }));
             }
             else {
@@ -111,7 +112,7 @@ public class TamingCommand implements CommandExecutor {
         }
 
         if (canThickFur) {
-            if (PP.getSkillLevel(SkillType.TAMING) < 250) {
+            if (skillValue < 250) {
                 player.sendMessage(LocaleLoader.getString("Ability.Generic.Template.Lock", new Object[] { LocaleLoader.getString("Taming.Ability.Locked.1") }));
             }
             else {
@@ -120,7 +121,7 @@ public class TamingCommand implements CommandExecutor {
         }
 
         if (canShockProof) {
-            if (PP.getSkillLevel(SkillType.TAMING) < 500) {
+            if (skillValue < 500) {
                 player.sendMessage(LocaleLoader.getString("Ability.Generic.Template.Lock", new Object[] { LocaleLoader.getString("Taming.Ability.Locked.2") }));
             }
             else {
@@ -129,7 +130,7 @@ public class TamingCommand implements CommandExecutor {
         }
 
         if (canSharpenedClaws) {
-            if (PP.getSkillLevel(SkillType.TAMING) < 750) {
+            if (skillValue < 750) {
                 player.sendMessage(LocaleLoader.getString("Ability.Generic.Template.Lock", new Object[] { LocaleLoader.getString("Taming.Ability.Locked.3") }));
             }
             else {
@@ -140,33 +141,5 @@ public class TamingCommand implements CommandExecutor {
         if (canGore) {
             player.sendMessage(LocaleLoader.getString("Taming.Combat.Chance.Gore", new Object[] { goreChance }));
         }
-
-        Page.grabGuidePageForSkill(SkillType.TAMING, player, args);
-
-        return true;
-    }
-
-    private void dataCalculations(float skillValue) {
-        DecimalFormat percent = new DecimalFormat("##0.00%");
-
-        if (skillValue >= 1000) {
-            goreChance = "100.00%";
-        }
-        else {
-            goreChance = percent.format(skillValue / 1000);
-        }
-    }
-
-    private void permissionsCheck(Player player) {
-        Permissions permInstance = Permissions.getInstance();
-
-        canBeastLore = permInstance.beastLore(player);
-        canCallWild = permInstance.callOfTheWild(player);
-        canEnvironmentallyAware = permInstance.environmentallyAware(player);
-        canFastFood = permInstance.fastFoodService(player);
-        canGore = permInstance.gore(player);
-        canSharpenedClaws = permInstance.sharpenedClaws(player);
-        canShockProof = permInstance.shockProof(player);
-        canThickFur = permInstance.thickFur(player);
     }
 }

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

@@ -1,22 +1,10 @@
 package com.gmail.nossr50.commands.skills;
 
-import java.text.DecimalFormat;
-
-import org.bukkit.command.Command;
-import org.bukkit.command.CommandExecutor;
-import org.bukkit.command.CommandSender;
-import org.bukkit.entity.Player;
-
-import com.gmail.nossr50.commands.CommandHelper;
-import com.gmail.nossr50.datatypes.PlayerProfile;
+import com.gmail.nossr50.commands.SkillCommand;
 import com.gmail.nossr50.datatypes.SkillType;
 import com.gmail.nossr50.locale.LocaleLoader;
-import com.gmail.nossr50.util.Page;
-import com.gmail.nossr50.util.Permissions;
-import com.gmail.nossr50.util.Users;
 
-public class UnarmedCommand implements CommandExecutor {
-    private float skillValue;
+public class UnarmedCommand extends SkillCommand {
     private String berserkLength;
     private String deflectChance;
     private String disarmChance;
@@ -27,75 +15,12 @@ public class UnarmedCommand implements CommandExecutor {
     private boolean canBonusDamage;
     private boolean canDeflect;
 
-    @Override
-    public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
-        if (CommandHelper.noConsoleUsage(sender)) {
-            return true;
-        }
-
-        if (CommandHelper.noCommandPermissions(sender, "mcmmo.skills.unarmed")) {
-            return true;
-        }
-
-        Player player = (Player) sender;
-        PlayerProfile PP = Users.getProfile(player);
-
-        skillValue = (float) PP.getSkillLevel(SkillType.UNARMED);
-        dataCalculations(skillValue);
-        permissionsCheck(player);
-
-        player.sendMessage(LocaleLoader.getString("Skills.Header", new Object[] { LocaleLoader.getString("Unarmed.SkillName") }));
-        player.sendMessage(LocaleLoader.getString("Commands.XPGain", new Object[] { LocaleLoader.getString("Commands.XPGain.Unarmed") }));
-        player.sendMessage(LocaleLoader.getString("Effects.Level", new Object[] { PP.getSkillLevel(SkillType.UNARMED), PP.getSkillXpLevel(SkillType.UNARMED), PP.getXpToLevel(SkillType.UNARMED) }));
-
-        if (canBerserk || canBonusDamage || canDeflect || canDisarm) {
-            player.sendMessage(LocaleLoader.getString("Skills.Header", new Object[] { LocaleLoader.getString("Effects.Effects") }));
-        }
-
-        if (canBerserk) {
-            player.sendMessage(LocaleLoader.getString("Effects.Template", new Object[] { LocaleLoader.getString("Unarmed.Effect.0"), LocaleLoader.getString("Unarmed.Effect.1") }));
-        }
-
-        if (canDisarm) {
-            player.sendMessage(LocaleLoader.getString("Effects.Template", new Object[] { LocaleLoader.getString("Unarmed.Effect.2"), LocaleLoader.getString("Unarmed.Effect.3") }));
-        }
-
-        if (canBonusDamage) {
-            player.sendMessage(LocaleLoader.getString("Effects.Template", new Object[] { LocaleLoader.getString("Unarmed.Effect.4"), LocaleLoader.getString("Unarmed.Effect.5") }));
-        }
-
-        if (canDeflect) {
-            player.sendMessage(LocaleLoader.getString("Effects.Template", new Object[] { LocaleLoader.getString("Unarmed.Effect.6"), LocaleLoader.getString("Unarmed.Effect.7") }));
-        }
-
-        if (canBerserk || canBonusDamage || canDeflect || canDisarm) {
-            player.sendMessage(LocaleLoader.getString("Skills.Header", new Object[] { LocaleLoader.getString("Commands.Stats.Self") }));
-        }
-
-        if (canBonusDamage) {
-            player.sendMessage(LocaleLoader.getString("Ability.Generic.Template", new Object[] { LocaleLoader.getString("Unarmed.Ability.Bonus.0"), LocaleLoader.getString("Unarmed.Ability.Bonus.1", new Object[] {ironArmBonus}) }));
-        }
-
-        if (canDeflect) {
-            player.sendMessage(LocaleLoader.getString("Unarmed.Ability.Chance.ArrowDeflect", new Object[] { deflectChance }));
-        }
-
-        if (canDisarm) {
-            player.sendMessage(LocaleLoader.getString("Unarmed.Ability.Chance.Disarm", new Object[] { disarmChance }));
-        }
-
-        if (canBerserk) {
-            player.sendMessage(LocaleLoader.getString("Unarmed.Ability.Berserk.Length", new Object[] { berserkLength }));
-        }
-
-        Page.grabGuidePageForSkill(SkillType.UNARMED, player, args);
-
-        return true;
+    public UnarmedCommand() {
+        super(SkillType.UNARMED);
     }
 
-    private void dataCalculations(float skillValue) {
-        DecimalFormat percent = new DecimalFormat("##0.00%");
-
+    @Override
+    protected void dataCalculations() {
         berserkLength = String.valueOf(2 + ((int) skillValue / 50));
 
         if (skillValue >= 1000) {
@@ -112,15 +37,61 @@ public class UnarmedCommand implements CommandExecutor {
             disarmChance = percent.format(skillValue / 3000);
             deflectChance = percent.format(skillValue / 2000);
             ironArmBonus = String.valueOf(3 + ((int) skillValue / 50));
-        }
-    }
-
-    private void permissionsCheck(Player player) {
-        Permissions permInstance = Permissions.getInstance();
+        }    }
 
+    @Override
+    protected void permissionsCheck() {
         canBerserk = permInstance.berserk(player);
         canBonusDamage = permInstance.unarmedBonus(player);
         canDeflect = permInstance.deflect(player);
         canDisarm = permInstance.disarm(player);
     }
+
+    @Override
+    protected boolean effectsHeaderPermissions() {
+        return canBerserk || canBonusDamage || canDeflect || canDisarm;
+    }
+
+    @Override
+    protected void effectsDisplay() {
+        if (canBerserk) {
+            player.sendMessage(LocaleLoader.getString("Effects.Template", new Object[] { LocaleLoader.getString("Unarmed.Effect.0"), LocaleLoader.getString("Unarmed.Effect.1") }));
+        }
+
+        if (canDisarm) {
+            player.sendMessage(LocaleLoader.getString("Effects.Template", new Object[] { LocaleLoader.getString("Unarmed.Effect.2"), LocaleLoader.getString("Unarmed.Effect.3") }));
+        }
+
+        if (canBonusDamage) {
+            player.sendMessage(LocaleLoader.getString("Effects.Template", new Object[] { LocaleLoader.getString("Unarmed.Effect.4"), LocaleLoader.getString("Unarmed.Effect.5") }));
+        }
+
+        if (canDeflect) {
+            player.sendMessage(LocaleLoader.getString("Effects.Template", new Object[] { LocaleLoader.getString("Unarmed.Effect.6"), LocaleLoader.getString("Unarmed.Effect.7") }));
+        }
+    }
+
+    @Override
+    protected boolean statsHeaderPermissions() {
+        return canBerserk || canBonusDamage || canDeflect || canDisarm;
+    }
+
+    @Override
+    protected void statsDisplay() {
+        if (canBonusDamage) {
+            player.sendMessage(LocaleLoader.getString("Ability.Generic.Template", new Object[] { LocaleLoader.getString("Unarmed.Ability.Bonus.0"), LocaleLoader.getString("Unarmed.Ability.Bonus.1", new Object[] {ironArmBonus}) }));
+        }
+
+        if (canDeflect) {
+            player.sendMessage(LocaleLoader.getString("Unarmed.Ability.Chance.ArrowDeflect", new Object[] { deflectChance }));
+        }
+
+        if (canDisarm) {
+            player.sendMessage(LocaleLoader.getString("Unarmed.Ability.Chance.Disarm", new Object[] { disarmChance }));
+        }
+
+        if (canBerserk) {
+            player.sendMessage(LocaleLoader.getString("Unarmed.Ability.Berserk.Length", new Object[] { berserkLength }));
+        }
+    }
 }

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

@@ -1,23 +1,11 @@
 package com.gmail.nossr50.commands.skills;
 
-import java.text.DecimalFormat;
-
-import org.bukkit.command.Command;
-import org.bukkit.command.CommandExecutor;
-import org.bukkit.command.CommandSender;
-import org.bukkit.entity.Player;
-
-import com.gmail.nossr50.commands.CommandHelper;
+import com.gmail.nossr50.commands.SkillCommand;
 import com.gmail.nossr50.config.Config;
-import com.gmail.nossr50.datatypes.PlayerProfile;
 import com.gmail.nossr50.datatypes.SkillType;
 import com.gmail.nossr50.locale.LocaleLoader;
-import com.gmail.nossr50.util.Page;
-import com.gmail.nossr50.util.Permissions;
-import com.gmail.nossr50.util.Users;
 
-public class WoodcuttingCommand implements CommandExecutor {
-    private float skillValue;
+public class WoodcuttingCommand extends SkillCommand {
     private String treeFellerLength;
     private String doubleDropChance;
 
@@ -26,31 +14,39 @@ public class WoodcuttingCommand implements CommandExecutor {
     private boolean canDoubleDrop;
     private boolean doubleDropsDisabled;
 
+    public WoodcuttingCommand() {
+        super(SkillType.WOODCUTTING);
+    }
+
     @Override
-    public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
-        if (CommandHelper.noConsoleUsage(sender)) {
-            return true;
+    protected void dataCalculations() {
+        treeFellerLength = String.valueOf(2 + ((int) skillValue / 50));
+
+        if (skillValue >= 1000) {
+            doubleDropChance = "100.00%";
         }
-
-        if (CommandHelper.noCommandPermissions(sender, "mcmmo.skills.woodcutting")) {
-            return true;
+        else {
+            doubleDropChance = percent.format(skillValue / 1000);
         }
+    }
 
-        Player player = (Player) sender;
-        PlayerProfile PP = Users.getProfile(player);
+    @Override
+    protected void permissionsCheck() {
+        Config configInstance = Config.getInstance();
 
-        skillValue = (float) PP.getSkillLevel(SkillType.UNARMED);
-        dataCalculations(skillValue);
-        permissionsCheck(player);
+        canTreeFell = permInstance.treeFeller(player);
+        canDoubleDrop = permInstance.woodcuttingDoubleDrops(player);
+        canLeafBlow = permInstance.leafBlower(player);
+        doubleDropsDisabled = configInstance.woodcuttingDoubleDropsDisabled();
+    }
 
-        player.sendMessage(LocaleLoader.getString("Skills.Header", new Object[] { LocaleLoader.getString("Woodcutting.SkillName") }));
-        player.sendMessage(LocaleLoader.getString("Commands.XPGain", new Object[] { LocaleLoader.getString("Commands.XPGain.WoodCutting") }));
-        player.sendMessage(LocaleLoader.getString("Effects.Level", new Object[] { PP.getSkillLevel(SkillType.WOODCUTTING), PP.getSkillXpLevel(SkillType.WOODCUTTING), PP.getXpToLevel(SkillType.WOODCUTTING) }));
-
-        if ((canDoubleDrop && !doubleDropsDisabled ) || canLeafBlow || canTreeFell) {
-            player.sendMessage(LocaleLoader.getString("Skills.Header", new Object[] { LocaleLoader.getString("Effects.Effects") }));
-        }
+    @Override
+    protected boolean effectsHeaderPermissions() {
+        return (canDoubleDrop && !doubleDropsDisabled) || canLeafBlow || canTreeFell;
+    }
 
+    @Override
+    protected void effectsDisplay() {
         if (canTreeFell) {
             player.sendMessage(LocaleLoader.getString("Effects.Template", new Object[] { LocaleLoader.getString("Woodcutting.Effect.0"), LocaleLoader.getString("Woodcutting.Effect.1") }));
         }
@@ -62,14 +58,18 @@ public class WoodcuttingCommand implements CommandExecutor {
         if (canDoubleDrop && !doubleDropsDisabled) {
             player.sendMessage(LocaleLoader.getString("Effects.Template", new Object[] { LocaleLoader.getString("Woodcutting.Effect.4"), LocaleLoader.getString("Woodcutting.Effect.5") }));
         }
+    }
 
-        if ((canDoubleDrop && !doubleDropsDisabled ) || canLeafBlow || canTreeFell) {
-            player.sendMessage(LocaleLoader.getString("Skills.Header", new Object[] { LocaleLoader.getString("Commands.Stats.Self") }));
-        }
+    @Override
+    protected boolean statsHeaderPermissions() {
+        return (canDoubleDrop && !doubleDropsDisabled) || canLeafBlow || canTreeFell;
+    }
 
+    @Override
+    protected void statsDisplay() {
         //TODO: Remove? Basically duplicates the above.
         if (canLeafBlow) {
-            if (PP.getSkillLevel(SkillType.WOODCUTTING) < 100) {
+            if (skillValue < 100) {
                 player.sendMessage(LocaleLoader.getString("Ability.Generic.Template.Lock", new Object[] { LocaleLoader.getString("Woodcutting.Ability.Locked.0") }));
             }
             else {
@@ -84,32 +84,5 @@ public class WoodcuttingCommand implements CommandExecutor {
         if (canTreeFell) {
             player.sendMessage(LocaleLoader.getString("Woodcutting.Ability.Length", new Object[] { treeFellerLength }));
         }
-
-        Page.grabGuidePageForSkill(SkillType.WOODCUTTING, player, args);
-
-        return true;
-    }
-
-    private void dataCalculations(float skillValue) {
-        DecimalFormat percent = new DecimalFormat("##0.00%");
-
-        treeFellerLength = String.valueOf(2 + ((int) skillValue / 50));
-
-        if (skillValue >= 1000) {
-            doubleDropChance = "100.00%";
-        }
-        else {
-            doubleDropChance = percent.format(skillValue / 1000);
-        }
-    }
-
-    private void permissionsCheck(Player player) {
-        Permissions permInstance = Permissions.getInstance();
-        Config configInstance = Config.getInstance();
-
-        canTreeFell = permInstance.treeFeller(player);
-        canDoubleDrop = permInstance.woodcuttingDoubleDrops(player);
-        canLeafBlow = permInstance.leafBlower(player);
-        doubleDropsDisabled = configInstance.woodcuttingDoubleDropsDisabled();
     }
 }

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

@@ -8,21 +8,14 @@ import org.bukkit.entity.Player;
 
 import com.gmail.nossr50.mcMMO;
 import com.gmail.nossr50.commands.CommandHelper;
-import com.gmail.nossr50.config.Config;
-import com.gmail.nossr50.datatypes.HUDType;
-import com.gmail.nossr50.datatypes.HUDmmo;
+import com.gmail.nossr50.config.SpoutConfig;
+import com.gmail.nossr50.datatypes.HudType;
+import com.gmail.nossr50.datatypes.SpoutHud;
 import com.gmail.nossr50.datatypes.PlayerProfile;
 import com.gmail.nossr50.locale.LocaleLoader;
-import com.gmail.nossr50.spout.SpoutStuff;
 import com.gmail.nossr50.util.Users;
 
 public class MchudCommand implements CommandExecutor {
-    private final mcMMO plugin;
-
-    public MchudCommand (mcMMO plugin) {
-        this.plugin = plugin;
-    }
-
     @Override
     public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
         String usage = ChatColor.RED + "Proper usage is /mchud <hud-type>"; //TODO: Locale
@@ -32,45 +25,37 @@ public class MchudCommand implements CommandExecutor {
             return true;
         }
 
-        if (!Config.getInstance().spoutEnabled || !Config.getInstance().getSpoutXPBarEnabled()) {
+        if (!mcMMO.spoutEnabled || !SpoutConfig.getInstance().getXPBarEnabled()) {
+            sender.sendMessage(LocaleLoader.getString("Commands.Disabled"));
+            return true;
+        }
+
+        Player player = (Player) sender;
+        PlayerProfile playerProfile = Users.getProfile(player);
+        SpoutHud spoutHud = playerProfile.getSpoutHud();
+
+        if (spoutHud == null) {
             sender.sendMessage(LocaleLoader.getString("Commands.Disabled"));
             return true;
         }
 
         switch (args.length) {
         case 1:
-            Player player = (Player) sender;
-            PlayerProfile PP = Users.getProfile(player);
-            HUDType hud;
+            for (HudType hudType : HudType.values()) {
+                if (hudType.toString().equalsIgnoreCase(args[0])) {
+                    playerProfile.setHudType(hudType);
+                    spoutHud.initializeXpBar();
+                    spoutHud.updateXpBar();
 
-            if (args[0].equalsIgnoreCase("disabled")) {
-                hud = HUDType.DISABLED;
-            }
-            else if (args[0].equalsIgnoreCase("standard")) {
-                hud = HUDType.STANDARD;
-            }
-            else if (args[0].equalsIgnoreCase("small")) {
-                hud = HUDType.SMALL;
-            }
-            else if (args[0].equalsIgnoreCase("retro")) {
-                hud = HUDType.RETRO;
-            }
-            else {
-                player.sendMessage(invalid);
-                return true;
-            }
-
-            if (SpoutStuff.playerHUDs.containsKey(player)) {
-                SpoutStuff.playerHUDs.get(player).resetHUD();
-                SpoutStuff.playerHUDs.remove(player);
-                PP.setHUDType(hud);
-                SpoutStuff.playerHUDs.put(player, new HUDmmo(player, plugin));
+                    return true;
+                }
             }
 
+            player.sendMessage(invalid);
             return true;
 
         default:
-            sender.sendMessage(usage);
+            player.sendMessage(usage);
             return true;
         }
     }

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

@@ -6,12 +6,14 @@ import org.bukkit.command.CommandExecutor;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 
+import com.gmail.nossr50.mcMMO;
 import com.gmail.nossr50.commands.CommandHelper;
 import com.gmail.nossr50.config.Config;
+import com.gmail.nossr50.config.SpoutConfig;
 import com.gmail.nossr50.datatypes.PlayerProfile;
 import com.gmail.nossr50.datatypes.SkillType;
+import com.gmail.nossr50.datatypes.SpoutHud;
 import com.gmail.nossr50.locale.LocaleLoader;
-import com.gmail.nossr50.spout.SpoutStuff;
 import com.gmail.nossr50.util.Misc;
 import com.gmail.nossr50.util.Permissions;
 import com.gmail.nossr50.util.Skills;
@@ -26,51 +28,60 @@ public class XplockCommand implements CommandExecutor {
             return true;
         }
 
-        if (!Config.getInstance().spoutEnabled || !Config.getInstance().getSpoutXPBarEnabled() || !Config.getInstance().getCommandXPLockEnabled()) {
+        if (!mcMMO.spoutEnabled || !SpoutConfig.getInstance().getXPBarEnabled() || !Config.getInstance().getCommandXPLockEnabled()) {
             sender.sendMessage(LocaleLoader.getString("Commands.Disabled"));
             return true;
         }
 
         Player player = (Player) sender;
-        PlayerProfile PP = Users.getProfile(player);
+        PlayerProfile playerProfile = Users.getProfile(player);
+        SpoutHud spoutHud = playerProfile.getSpoutHud();
+
+        if (spoutHud == null) {
+            sender.sendMessage(LocaleLoader.getString("Commands.Disabled"));
+            return true;
+        }
 
         switch (args.length) {
         case 0:
-            if (PP.getXpBarLocked()) {
-                PP.toggleXpBarLocked();
+            if (spoutHud.getXpBarLocked()) {
+                spoutHud.toggleXpBarLocked();
                 player.sendMessage(LocaleLoader.getString("Commands.xplock.unlocked"));
                 return true;
             }
 
-            SkillType lastGained = PP.getLastGained();
+            SkillType lastGained = spoutHud.getLastGained();
 
             if (lastGained != null) {
-                PP.toggleXpBarLocked();
-                PP.setSkillLock(lastGained);
+                spoutHud.toggleXpBarLocked();
+                spoutHud.setSkillLock(lastGained);
                 player.sendMessage(LocaleLoader.getString("Commands.xplock.locked", new Object[] { Misc.getCapitalized(lastGained.toString()) }));
-                return true;
             }
+            else {
+                player.sendMessage(usage);
+            }
+
+            return true;
 
         case 1:
             if (Skills.isSkill(args[0])) {
                 if (Permissions.getInstance().permission(player, "mcmmo.skills." + args[0].toLowerCase())) {
-                    PP.setXpBarLocked(true);
-                    PP.setSkillLock(Skills.getSkillType(args[0]));
-                    SpoutStuff.updateXpBar(player);
+                    spoutHud.setXpBarLocked(true);
+                    spoutHud.setSkillLock(Skills.getSkillType(args[0]));
+                    spoutHud.updateXpBar();
 
                     player.sendMessage(LocaleLoader.getString("Commands.xplock.locked", new Object[] { Misc.getCapitalized(args[0]) }));
-                    return true;
                 }
                 else {
                     player.sendMessage(LocaleLoader.getString("mcMMO.NoPermission"));
-                    return true;
                 }
             }
             else {
                 player.sendMessage(LocaleLoader.getString("Commands.Skill.Invalid"));
-                return true;
             }
 
+            return true;
+
         default:
             player.sendMessage(usage);
             return true;

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

@@ -5,22 +5,27 @@ import java.util.Set;
 
 import org.bukkit.configuration.ConfigurationSection;
 
-import com.gmail.nossr50.mcMMO;
-import com.gmail.nossr50.datatypes.HUDType;
-
 public class Config extends ConfigLoader {
-    public int xpGainMultiplier = 1;
     private static Config instance;
+    public double xpGainMultiplier = 1;
+
+    private Config() {
+        super("config.yml");
+        xpGainMultiplier = getExperienceGainsGlobalMultiplier();
+        loadKeys();
+    }
 
     public static Config getInstance() {
         if (instance == null) {
-            instance = new Config(mcMMO.p);
-            instance.load();
+            instance = new Config();
         }
 
         return instance;
     }
 
+    @Override
+    protected void loadKeys() {}
+
     /*
      * GENERAL SETTINGS
      */
@@ -72,6 +77,7 @@ public class Config extends ConfigLoader {
     public boolean getCommandMCCEnabled() { return config.getBoolean("Commands.mcc.Enabled", true); }
     public boolean getCommandMCGodEnabled() { return config.getBoolean("Commands.mcgod.Enabled", true); }
     public boolean getCommandMCStatsEnabled() { return config.getBoolean("Commands.mcstats.Enabled", true); }
+    public boolean getCommandSkillResetEnabled() { return config.getBoolean("Commands.skillreset.Enabled", true); }
     public boolean getCommandMmoeditEnabled() { return config.getBoolean("Commands.mmoedit.Enabled", true); }
     public boolean getCommandMCRemoveEnabled() { return config.getBoolean("Commands.mcremove.Enable", true); }
     public boolean getCommandPTPEnabled() { return config.getBoolean("Commands.ptp.Enabled", true); }
@@ -196,7 +202,7 @@ public class Config extends ConfigLoader {
     }
 
     /* Mining */
-    public int getMiningXPGoldOre() { return config.getInt("Experience.Mining.Gold", 250); } 
+    public int getMiningXPGoldOre() { return config.getInt("Experience.Mining.Gold", 250); }
     public int getMiningXPDiamondOre() { return config.getInt("Experience.Mining.Diamond", 750); }
     public int getMiningXPIronOre() { return config.getInt("Experience.Mining.Iron", 250); }
     public int getMiningXPRedstoneOre() { return config.getInt("Experience.Mining.Redstone", 150); }
@@ -337,11 +343,10 @@ public class Config extends ConfigLoader {
     /* General Settings */
     public boolean getExperienceGainsMobspawnersEnabled() { return config.getBoolean("Experience.Gains.Mobspawners.Enabled", false); }
     public boolean getExperienceGainsPlayerVersusPlayerEnabled() { return config.getBoolean("Experience.PVP.Rewards", true); }
-    public int getExperienceGainsGlobalMultiplier() { return config.getInt("Experience.Gains.Multiplier.Global", 1); }
+    public double getExperienceGainsGlobalMultiplier() { return config.getDouble("Experience.Gains.Multiplier.Global", 1.0); }
 
     /* Combat XP Multipliers */
     public double getPlayerVersusPlayerXP() { return config.getDouble("Experience.Gains.Multiplier.PVP", 1.0); }
-    
     public double getAnimalsXP() { return config.getDouble("Experience.Combat.Multiplier.Animals", 1.0); }
     public double getCreeperXP() { return config.getDouble("Experience.Combat.Multiplier.Creeper", 4.0); }
     public double getSkeletonXP() { return config.getDouble("Experience.Combat.Multiplier.Skeleton", 2.0); }
@@ -372,104 +377,4 @@ public class Config extends ConfigLoader {
     public double getFormulaMultiplierAxes() { return config.getDouble("Experience.Formula.Multiplier.Axes", 1.0); }
     public double getFormulaMultiplierAcrobatics() { return config.getDouble("Experience.Formula.Multiplier.Acrobatics", 1.0); }
     public double getFormulaMultiplierFishing() { return config.getDouble("Experience.Formula.Multiplier.Fishing", 1.0); }
-
-    /*
-     * SPOUT SETTINGS
-     */
-
-    public boolean spoutEnabled;
-    public boolean getShowPowerLevelForSpout() { return config.getBoolean("Spout.HUD.Show_Power_Level", true); }
-
-    /* Spout XP Bar */
-    public boolean getSpoutXPBarEnabled() { return config.getBoolean("Spout.XP.Bar.Enabled", true); }
-    public boolean getSpoutXPBarIconEnabled() { return config.getBoolean("Spout.XP.Icon.Enabled", true); }
-    public int getSpoutXPBarXPosition() { return config.getInt("Spout.XP.Bar.X_POS", 95); }
-    public int getSpoutXPBarYPosition() { return config.getInt("Spout.XP.Bar.Y_POS", 6); }
-    public int getSpoutXPIconXPosition() { return config.getInt("Spout.XP.Icon.X_POS", 78); }
-    public int getSpoutXPIconYPosition() { return config.getInt("Spout.XP.Icon.Y_POS", 2); }
-
-    /* Spout HUD Colors */
-    public double getSpoutRetroHUDXPBorderRed() { return config.getDouble("Spout.HUD.Retro.Colors.Border.RED", 0.0); }
-    public double getSpoutRetroHUDXPBorderGreen() { return config.getDouble("Spout.HUD.Retro.Colors.Border.GREEN", 0.0); }
-    public double getSpoutRetroHUDXPBorderBlue() { return config.getDouble("Spout.HUD.Retro.Colors.Border.BLUE", 0.0); }
-    public double getSpoutRetroHUDXPBackgroundRed() { return config.getDouble("Spout.HUD.Retro.Colors.Background.RED", 0.75); }
-    public double getSpoutRetroHUDXPBackgroundGreen() { return config.getDouble("Spout.HUD.Retro.Colors.Background.GREEN", 0.75); }
-    public double getSpoutRetroHUDXPBackgroundBlue() { return config.getDouble("Spout.HUD.Retro.Colors.Background.BLUE", 0.75); }
-    
-    public double getSpoutRetroHUDAcrobaticsRed() { return config.getDouble("Spout.HUD.Retro.Colors.Acrobatics.RED", 0.3); }
-    public double getSpoutRetroHUDAcrobaticsGreen() { return config.getDouble("Spout.HUD.Retro.Colors.Acrobatics.GREEN", 0.3); }
-    public double getSpoutRetroHUDAcrobaticsBlue() { return config.getDouble("Spout.HUD.Retro.Colors.Acrobatics.BLUE", 0.75); }
-    public double getSpoutRetroHUDArcheryRed() { return config.getDouble("Spout.HUD.Retro.Colors.Archery.RED", 0.3); }
-    public double getSpoutRetroHUDArcheryGreen() { return config.getDouble("Spout.HUD.Retro.Colors.Archery.GREEN", 0.3); }
-    public double getSpoutRetroHUDArcheryBlue() { return config.getDouble("Spout.HUD.Retro.Colors.Archery.BLUE", 0.75); }
-    public double getSpoutRetroHUDAxesRed() { return config.getDouble("Spout.HUD.Retro.Colors.Axes.RED", 0.3); }
-    public double getSpoutRetroHUDAxesGreen() { return config.getDouble("Spout.HUD.Retro.Colors.Axes.GREEN", 0.3); }
-    public double getSpoutRetroHUDAxesBlue() { return config.getDouble("Spout.HUD.Retro.Colors.Axes.BLUE", 0.75); }
-    public double getSpoutRetroHUDExcavationRed() { return config.getDouble("Spout.HUD.Retro.Colors.Excavation.RED", 0.3); }
-    public double getSpoutRetroHUDExcavationGreen() { return config.getDouble("Spout.HUD.Retro.Colors.Excavation.GREEN", 0.3); }
-    public double getSpoutRetroHUDExcavationBlue() { return config.getDouble("Spout.HUD.Retro.Colors.Excavation.BLUE", 0.75); }
-    public double getSpoutRetroHUDHerbalismRed() { return config.getDouble("Spout.HUD.Retro.Colors.Herbalism.RED", 0.3); }
-    public double getSpoutRetroHUDHerbalismGreen() { return config.getDouble("Spout.HUD.Retro.Colors.Herbalism.GREEN", 0.3); }
-    public double getSpoutRetroHUDHerbalismBlue() { return config.getDouble("Spout.HUD.Retro.Colors.Herbalism.BLUE", 0.75); }
-    public double getSpoutRetroHUDMiningRed() { return config.getDouble("Spout.HUD.Retro.Colors.Mining.RED", 0.3); }
-    public double getSpoutRetroHUDMiningGreen() { return config.getDouble("Spout.HUD.Retro.Colors.Mining.GREEN", 0.3); }
-    public double getSpoutRetroHUDMiningBlue() { return config.getDouble("Spout.HUD.Retro.Colors.Mining.BLUE", 0.75); }
-    public double getSpoutRetroHUDRepairRed() { return config.getDouble("Spout.HUD.Retro.Colors.Repair.RED", 0.3); }
-    public double getSpoutRetroHUDRepairGreen() { return config.getDouble("Spout.HUD.Retro.Colors.Repair.GREEN", 0.3); }
-    public double getSpoutRetroHUDRepairBlue() { return config.getDouble("Spout.HUD.Retro.Colors.Repair.BLUE", 0.75); }
-    public double getSpoutRetroHUDSwordsRed() { return config.getDouble("Spout.HUD.Retro.Colors.Swords.RED", 0.3); }
-    public double getSpoutRetroHUDSwordsGreen() { return config.getDouble("Spout.HUD.Retro.Colors.Swords.GREEN", 0.3); }
-    public double getSpoutRetroHUDSwordsBlue() { return config.getDouble("Spout.HUD.Retro.Colors.Swords.BLUE", 0.75); }
-    public double getSpoutRetroHUDTamingRed() { return config.getDouble("Spout.HUD.Retro.Colors.Taming.RED", 0.3); }
-    public double getSpoutRetroHUDTamingGreen() { return config.getDouble("Spout.HUD.Retro.Colors.Taming.GREEN", 0.3); }
-    public double getSpoutRetroHUDTamingBlue() { return config.getDouble("Spout.HUD.Retro.Colors.Taming.BLUE", 0.75); }
-    public double getSpoutRetroHUDUnarmedRed() { return config.getDouble("Spout.HUD.Retro.Colors.Unarmed.RED", 0.3); }
-    public double getSpoutRetroHUDUnarmedGreen() { return config.getDouble("Spout.HUD.Retro.Colors.Unarmed.GREEN", 0.3); }
-    public double getSpoutRetroHUDUnarmedBlue() { return config.getDouble("Spout.HUD.Retro.Colors.Unarmed.BLUE", 0.75); }
-    public double getSpoutRetroHUDWoodcuttingRed() { return config.getDouble("Spout.HUD.Retro.Colors.Woodcutting.RED", 0.3); }
-    public double getSpoutRetroHUDWoodcuttingGreen() { return config.getDouble("Spout.HUD.Retro.Colors.Woodcutting.GREEN", 0.3); }
-    public double getSpoutRetroHUDWoodcuttingBlue() { return config.getDouble("Spout.HUD.Retro.Colors.Woodcutting.BLUE", 0.75); }
-    public double getSpoutRetroHUDFishingRed() { return config.getDouble("Spout.HUD.Retro.Colors.Fishing.RED", 0.3); }
-    public double getSpoutRetroHUDFishingGreen() { return config.getDouble("Spout.HUD.Retro.Colors.Fishing.GREEN", 0.3); }
-    public double getSpoutRetroHUDFishingBlue() { return config.getDouble("Spout.HUD.Retro.Colors.Fishing.BLUE", 0.75); }
-
-    /*
-     * CONFIG LOADING
-     */
-
-    public HUDType defaulthud;
-
-    private Config(mcMMO plugin) {
-        super(plugin, "config.yml");
-        config = plugin.getConfig();
-        xpGainMultiplier = getExperienceGainsGlobalMultiplier();
-    }
-
-    @Override
-    protected void load() {
-        if (!configFile.exists()) {
-            dataFolder.mkdir();
-            plugin.saveDefaultConfig();
-        }
-
-        addDefaults();
-        loadKeys();
-    }
-
-    @Override
-    protected void loadKeys() {
-        plugin.getLogger().info("Loading mcMMO config.yml File...");
-
-        // Setup default HUD
-        String temp = config.getString("Spout.HUD.Default", "STANDARD");
-        
-        for (HUDType x : HUDType.values()) {
-            if (x.toString().toLowerCase().equalsIgnoreCase(temp.toString().toLowerCase())) {
-                defaulthud = x;
-            }
-        }
-
-        if(defaulthud == null)
-            defaulthud = HUDType.STANDARD;
-    }
 }

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

@@ -1,54 +1,79 @@
 package com.gmail.nossr50.config;
 
 import java.io.File;
-import java.io.IOException;
+import java.io.FileOutputStream;
+import java.io.InputStream;
+import java.io.OutputStream;
 
 import org.bukkit.configuration.file.FileConfiguration;
+import org.bukkit.configuration.file.YamlConfiguration;
 
 import com.gmail.nossr50.mcMMO;
 
 public abstract class ConfigLoader {
-
+    protected static final mcMMO plugin = mcMMO.p;
+    protected String fileName;
     protected File configFile;
-    protected File dataFolder;
-    protected final mcMMO plugin;
     protected FileConfiguration config;
 
-    public ConfigLoader(mcMMO plugin, String fileName){
-        this.plugin = plugin;
-        dataFolder = plugin.getDataFolder();
-        configFile = new File(dataFolder, File.separator + fileName);
+    public ConfigLoader(String relativePath, String fileName){
+        this.fileName = fileName;
+        configFile = new File(plugin.getDataFolder(), relativePath + File.separator + fileName);
+        loadFile();
     }
 
-    /**
-     * Load this config file.
-     */
-    protected abstract void load();
+    public ConfigLoader(String fileName){
+        this.fileName = fileName;
+        configFile = new File(plugin.getDataFolder(), fileName);
+        loadFile();
+    }
 
-    /**
-     * Save this config file.
-     */
-    private void saveConfig() {
-        try {
-            config.save(configFile);
+    protected void loadFile() {
+        if (!configFile.exists()) {
+            plugin.getLogger().info("Creating mcMMO " + fileName + " File...");
+            createFile();
         }
-        catch (IOException e) {
-            e.printStackTrace();
+        else {
+            plugin.getLogger().info("Loading mcMMO " + fileName + " File...");
         }
+
+        config = YamlConfiguration.loadConfiguration(configFile);
     }
 
-    /**
-     * Add the defaults to this config file.
-     */
-    protected void addDefaults() {
-        // Load from included config.yml
-        config.options().copyDefaults(true);
-        saveConfig();
-    }
-
-    /**
-     * Load the keys from this config file.
-     */
     protected abstract void loadKeys();
 
+    protected void createFile() {
+        if (configFile.exists()) {
+            return;
+        }
+
+        configFile.getParentFile().mkdirs();
+
+        InputStream inputStream = plugin.getResource(fileName);
+
+        if (inputStream != null) {
+            try {
+                copyStreamToFile(inputStream, configFile);
+            } catch (Exception e) {
+                e.printStackTrace();
+            }
+        }
+        else {
+            plugin.getLogger().severe("Missing ressource file: '" + fileName + "' please notify the plugin authors");
+        }
+    }
+
+    private static void copyStreamToFile(InputStream inputStream, File file) throws Exception {
+        OutputStream outputStream = new FileOutputStream(file);
+
+        int read = 0;
+        byte[] bytes = new byte[1024];
+
+        while ((read = inputStream.read(bytes)) != -1) {
+            outputStream.write(bytes, 0, read);
+        }
+
+        inputStream.close();
+        outputStream.close();
+    }
 }

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

@@ -4,38 +4,30 @@ import org.bukkit.configuration.file.YamlConfiguration;
 
 import com.gmail.nossr50.mcMMO;
 
-public class HiddenConfig extends ConfigLoader {
-    private static String fileName;
+public class HiddenConfig {
     private static HiddenConfig instance;
+    private static String fileName;
     private static YamlConfiguration config;
-
     private static boolean chunkletsEnabled;
 
-    public HiddenConfig(mcMMO plugin, String fileName) {
-        super(plugin, fileName);
+    public HiddenConfig(String fileName) {
         HiddenConfig.fileName = fileName;
+        load();
     }
 
-
     public static HiddenConfig getInstance() {
         if (instance == null) {
-            instance = new HiddenConfig(mcMMO.p, "hidden.yml");
-            instance.load();
+            instance = new HiddenConfig("hidden.yml");
         }
 
         return instance;
     }
 
-    @Override
-    protected void load() {
-        if(plugin.isInJar(fileName)) loadKeys();
-    }
-
-    @Override
-    protected void loadKeys() {
-        config = YamlConfiguration.loadConfiguration(plugin.getResource(fileName));
-
-        chunkletsEnabled = config.getBoolean("Options.Chunklets", true);
+    public void load() {
+        if (mcMMO.p.getResource(fileName) != null) {
+            config = YamlConfiguration.loadConfiguration(mcMMO.p.getResource(fileName));
+            chunkletsEnabled = config.getBoolean("Options.Chunklets", true);
+        }
     }
 
     public boolean getChunkletsEnabled() {

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

@@ -0,0 +1,94 @@
+package com.gmail.nossr50.config;
+
+import com.gmail.nossr50.datatypes.HudType;
+
+public class SpoutConfig extends ConfigLoader {
+    private static SpoutConfig instance;
+    public HudType defaultHudType;
+
+    private SpoutConfig() {
+        super("spout.yml");
+        loadKeys();
+    }
+
+    public static SpoutConfig getInstance() {
+        if (instance == null) {
+            instance = new SpoutConfig();
+        }
+
+        return instance;
+    }
+
+    @Override
+    protected void loadKeys() {
+        // Setup default HUD
+        String temp = config.getString("Spout.HUD.Default", "STANDARD");
+
+        for (HudType hudType : HudType.values()) {
+            if (hudType.toString().equalsIgnoreCase(temp.toString())) {
+                defaultHudType = hudType;
+                break;
+            }
+        }
+
+        if (defaultHudType == null) {
+            defaultHudType = HudType.STANDARD;
+        }
+    }
+
+    public boolean getShowPowerLevel() { return config.getBoolean("HUD.Show_Power_Level", true); }
+    public String getMenuKey() { return config.getString("Menu.Key", "KEY_M"); }
+
+    /* XP Bar */
+    public boolean getXPBarEnabled() { return config.getBoolean("XP.Bar.Enabled", true); }
+    public boolean getXPBarIconEnabled() { return config.getBoolean("XP.Icon.Enabled", true); }
+    public int getXPBarXPosition() { return config.getInt("XP.Bar.X_POS", 95); }
+    public int getXPBarYPosition() { return config.getInt("XP.Bar.Y_POS", 6); }
+    public int getXPIconXPosition() { return config.getInt("XP.Icon.X_POS", 78); }
+    public int getXPIconYPosition() { return config.getInt("XP.Icon.Y_POS", 2); }
+
+    /* HUD Colors */
+    public double getRetroHUDXPBorderRed() { return config.getDouble("HUD.Retro.Colors.Border.RED", 0.0); }
+    public double getRetroHUDXPBorderGreen() { return config.getDouble("HUD.Retro.Colors.Border.GREEN", 0.0); }
+    public double getRetroHUDXPBorderBlue() { return config.getDouble("HUD.Retro.Colors.Border.BLUE", 0.0); }
+    public double getRetroHUDXPBackgroundRed() { return config.getDouble("HUD.Retro.Colors.Background.RED", 0.75); }
+    public double getRetroHUDXPBackgroundGreen() { return config.getDouble("HUD.Retro.Colors.Background.GREEN", 0.75); }
+    public double getRetroHUDXPBackgroundBlue() { return config.getDouble("HUD.Retro.Colors.Background.BLUE", 0.75); }
+
+    public double getRetroHUDAcrobaticsRed() { return config.getDouble("HUD.Retro.Colors.Acrobatics.RED", 0.3); }
+    public double getRetroHUDAcrobaticsGreen() { return config.getDouble("HUD.Retro.Colors.Acrobatics.GREEN", 0.3); }
+    public double getRetroHUDAcrobaticsBlue() { return config.getDouble("HUD.Retro.Colors.Acrobatics.BLUE", 0.75); }
+    public double getRetroHUDArcheryRed() { return config.getDouble("HUD.Retro.Colors.Archery.RED", 0.3); }
+    public double getRetroHUDArcheryGreen() { return config.getDouble("HUD.Retro.Colors.Archery.GREEN", 0.3); }
+    public double getRetroHUDArcheryBlue() { return config.getDouble("HUD.Retro.Colors.Archery.BLUE", 0.75); }
+    public double getRetroHUDAxesRed() { return config.getDouble("HUD.Retro.Colors.Axes.RED", 0.3); }
+    public double getRetroHUDAxesGreen() { return config.getDouble("HUD.Retro.Colors.Axes.GREEN", 0.3); }
+    public double getRetroHUDAxesBlue() { return config.getDouble("HUD.Retro.Colors.Axes.BLUE", 0.75); }
+    public double getRetroHUDExcavationRed() { return config.getDouble("HUD.Retro.Colors.Excavation.RED", 0.3); }
+    public double getRetroHUDExcavationGreen() { return config.getDouble("HUD.Retro.Colors.Excavation.GREEN", 0.3); }
+    public double getRetroHUDExcavationBlue() { return config.getDouble("HUD.Retro.Colors.Excavation.BLUE", 0.75); }
+    public double getRetroHUDHerbalismRed() { return config.getDouble("HUD.Retro.Colors.Herbalism.RED", 0.3); }
+    public double getRetroHUDHerbalismGreen() { return config.getDouble("HUD.Retro.Colors.Herbalism.GREEN", 0.3); }
+    public double getRetroHUDHerbalismBlue() { return config.getDouble("HUD.Retro.Colors.Herbalism.BLUE", 0.75); }
+    public double getRetroHUDMiningRed() { return config.getDouble("HUD.Retro.Colors.Mining.RED", 0.3); }
+    public double getRetroHUDMiningGreen() { return config.getDouble("HUD.Retro.Colors.Mining.GREEN", 0.3); }
+    public double getRetroHUDMiningBlue() { return config.getDouble("HUD.Retro.Colors.Mining.BLUE", 0.75); }
+    public double getRetroHUDRepairRed() { return config.getDouble("HUD.Retro.Colors.Repair.RED", 0.3); }
+    public double getRetroHUDRepairGreen() { return config.getDouble("HUD.Retro.Colors.Repair.GREEN", 0.3); }
+    public double getRetroHUDRepairBlue() { return config.getDouble("HUD.Retro.Colors.Repair.BLUE", 0.75); }
+    public double getRetroHUDSwordsRed() { return config.getDouble("HUD.Retro.Colors.Swords.RED", 0.3); }
+    public double getRetroHUDSwordsGreen() { return config.getDouble("HUD.Retro.Colors.Swords.GREEN", 0.3); }
+    public double getRetroHUDSwordsBlue() { return config.getDouble("HUD.Retro.Colors.Swords.BLUE", 0.75); }
+    public double getRetroHUDTamingRed() { return config.getDouble("HUD.Retro.Colors.Taming.RED", 0.3); }
+    public double getRetroHUDTamingGreen() { return config.getDouble("HUD.Retro.Colors.Taming.GREEN", 0.3); }
+    public double getRetroHUDTamingBlue() { return config.getDouble("HUD.Retro.Colors.Taming.BLUE", 0.75); }
+    public double getRetroHUDUnarmedRed() { return config.getDouble("HUD.Retro.Colors.Unarmed.RED", 0.3); }
+    public double getRetroHUDUnarmedGreen() { return config.getDouble("HUD.Retro.Colors.Unarmed.GREEN", 0.3); }
+    public double getRetroHUDUnarmedBlue() { return config.getDouble("HUD.Retro.Colors.Unarmed.BLUE", 0.75); }
+    public double getRetroHUDWoodcuttingRed() { return config.getDouble("HUD.Retro.Colors.Woodcutting.RED", 0.3); }
+    public double getRetroHUDWoodcuttingGreen() { return config.getDouble("HUD.Retro.Colors.Woodcutting.GREEN", 0.3); }
+    public double getRetroHUDWoodcuttingBlue() { return config.getDouble("HUD.Retro.Colors.Woodcutting.BLUE", 0.75); }
+    public double getRetroHUDFishingRed() { return config.getDouble("HUD.Retro.Colors.Fishing.RED", 0.3); }
+    public double getRetroHUDFishingGreen() { return config.getDouble("HUD.Retro.Colors.Fishing.GREEN", 0.3); }
+    public double getRetroHUDFishingBlue() { return config.getDouble("HUD.Retro.Colors.Fishing.BLUE", 0.75); }
+}

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

@@ -5,29 +5,19 @@ import java.util.HashMap;
 import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
+import java.util.Map.Entry;
 import java.util.Set;
 
 import org.bukkit.Material;
 import org.bukkit.configuration.ConfigurationSection;
 import org.bukkit.inventory.ItemStack;
 
-import com.gmail.nossr50.mcMMO;
 import com.gmail.nossr50.datatypes.treasure.ExcavationTreasure;
 import com.gmail.nossr50.datatypes.treasure.FishingTreasure;
 import com.gmail.nossr50.datatypes.treasure.Treasure;
 
 public class TreasuresConfig extends ConfigLoader{
     private static TreasuresConfig instance;
-
-    public static TreasuresConfig getInstance() {
-        if (instance == null) {
-            instance = new TreasuresConfig(mcMMO.p);
-            instance.load();
-        }
-
-        return instance;
-    }
-
     public List<ExcavationTreasure> excavationFromDirt = new ArrayList<ExcavationTreasure>();
     public List<ExcavationTreasure> excavationFromGrass = new ArrayList<ExcavationTreasure>();
     public List<ExcavationTreasure> excavationFromSand = new ArrayList<ExcavationTreasure>();
@@ -41,26 +31,21 @@ public class TreasuresConfig extends ConfigLoader{
     public List<FishingTreasure> fishingRewardsTier4 = new ArrayList<FishingTreasure>();
     public List<FishingTreasure> fishingRewardsTier5 = new ArrayList<FishingTreasure>();
 
-    private TreasuresConfig(mcMMO plugin) {
-        super(plugin, "treasures.yml");
-        config = plugin.getTreasuresConfig();
+    private TreasuresConfig() {
+        super("treasures.yml");
+        loadKeys();
     }
 
-    @Override
-    protected void load() {
-        if (!configFile.exists()) {
-            dataFolder.mkdir();
-            plugin.saveTreasuresConfig();
+    public static TreasuresConfig getInstance() {
+        if (instance == null) {
+            instance = new TreasuresConfig();
         }
 
-        addDefaults();
-        loadKeys();
+        return instance;
     }
 
     @Override
     protected void loadKeys() {
-        plugin.getLogger().info("Loading mcMMO treasures.yml File...");
-
         Map<String, Treasure> treasures = new HashMap<String, Treasure>();
         ConfigurationSection treasureSection = config.getConfigurationSection("Treasures");
         Set<String> treasureConfigSet = treasureSection.getKeys(false);
@@ -205,11 +190,13 @@ public class TreasuresConfig extends ConfigLoader{
 
         List<String> excavationTreasures = config.getStringList("Excavation.Treasure");
         List<String> fishingTreasures = config.getStringList("Fishing.Treasure");
-        Iterator<String> treasureIterator = treasures.keySet().iterator();
+//        Iterator<String> treasureIterator = treasures.keySet().iterator();
+        Iterator<Entry<String,Treasure>> treasureIterator = treasures.entrySet().iterator();
 
         while (treasureIterator.hasNext()) {
-            String treasureKey = treasureIterator.next();
-            Treasure treasure = treasures.get(treasureKey);
+            Entry<String,Treasure> nextEntry = treasureIterator.next();
+            String treasureKey = nextEntry.getKey();
+            Treasure treasure = nextEntry.getValue();
 
             if (treasure instanceof FishingTreasure) {
                 if (!fishingTreasures.contains(treasureKey)) {

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

@@ -8,52 +8,37 @@ import java.util.Set;
 
 import org.bukkit.configuration.ConfigurationSection;
 
-import com.gmail.nossr50.mcMMO;
+import com.gmail.nossr50.config.ConfigLoader;
 import com.gmail.nossr50.datatypes.mods.CustomItem;
 import com.gmail.nossr50.skills.repair.Repairable;
 import com.gmail.nossr50.skills.repair.RepairableFactory;
 
-public class CustomArmorConfig extends ModConfigLoader{
+public class CustomArmorConfig extends ConfigLoader{
     private static CustomArmorConfig instance;
+    private List<Repairable> repairables;
+    public List<Integer> customBootIDs = new ArrayList<Integer>();
+    public List<Integer> customChestplateIDs = new ArrayList<Integer>();
+    public List<Integer> customHelmetIDs = new ArrayList<Integer>();
+    public List<Integer> customLeggingIDs = new ArrayList<Integer>();
+    public List<Integer> customIDs = new ArrayList<Integer>();
+    public List<CustomItem> customArmorList = new ArrayList<CustomItem>();
+    public HashMap<Integer, CustomItem> customArmor = new HashMap<Integer, CustomItem>();
+
+    public CustomArmorConfig() {
+        super("ModConfigs", "armor.yml");
+        loadKeys();
+    }
 
     public static CustomArmorConfig getInstance() {
         if (instance == null) {
-            instance = new CustomArmorConfig(mcMMO.p);
+            instance = new CustomArmorConfig();
         }
 
         return instance;
     }
 
-    private List<Repairable> repairables;
-
-    public List<Integer> customBootIDs = new ArrayList<Integer>();
-    public List<Integer> customChestplateIDs = new ArrayList<Integer>();
-    public List<Integer> customHelmetIDs = new ArrayList<Integer>();
-    public List<Integer> customLeggingIDs = new ArrayList<Integer>();
-
-    public List<Integer> customIDs = new ArrayList<Integer>();
-    public List<CustomItem> customArmorList = new ArrayList<CustomItem>();
-    public HashMap<Integer, CustomItem> customArmor = new HashMap<Integer, CustomItem>();
-
-    public CustomArmorConfig(mcMMO plugin) {
-        super(plugin, "armor.yml");
-        config = plugin.getArmorConfig();
-    }
-
-    @Override
-    public void load() {
-        if (!configFile.exists()) {
-            dataFolder.mkdir();
-            plugin.saveArmorConfig();
-        }
-
-        addDefaults();
-        loadKeys();
-    }
-
     @Override
     protected void loadKeys() {
-        plugin.getLogger().info("Loading mcMMO armor.yml File...");
         repairables = new ArrayList<Repairable>();
 
         loadArmor("Boots", customBootIDs);
@@ -93,7 +78,7 @@ public class CustomArmorConfig extends ModConfigLoader{
                 repairables.add(RepairableFactory.getRepairable(id, repairID, repairData, repairQuantity, durability));
             }
 
-            armor = new CustomItem(id);
+            armor = new CustomItem(id, durability);
 
             idList.add(id);
             customIDs.add(id);

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

@@ -8,56 +8,42 @@ import java.util.Set;
 import org.bukkit.configuration.ConfigurationSection;
 import org.bukkit.inventory.ItemStack;
 
-import com.gmail.nossr50.mcMMO;
+import com.gmail.nossr50.config.ConfigLoader;
 import com.gmail.nossr50.datatypes.mods.CustomBlock;
 
-public class CustomBlocksConfig extends ModConfigLoader{
+public class CustomBlocksConfig extends ConfigLoader {
     private static CustomBlocksConfig instance;
+    public List<ItemStack> customExcavationBlocks = new ArrayList<ItemStack>();
+    public List<ItemStack> customHerbalismBlocks = new ArrayList<ItemStack>();
+    public List<ItemStack> customMiningBlocks = new ArrayList<ItemStack>();
+    public List<ItemStack> customWoodcuttingBlocks = new ArrayList<ItemStack>();
+    public List<ItemStack> customOres = new ArrayList<ItemStack>();
+    public List<ItemStack> customLogs = new ArrayList<ItemStack>();
+    public List<ItemStack> customLeaves = new ArrayList<ItemStack>();
+    public List<ItemStack> customAbilityBlocks = new ArrayList<ItemStack>();
+    public List<ItemStack> customItems = new ArrayList<ItemStack>();
+    public List<CustomBlock> customBlocks = new ArrayList<CustomBlock>();
+
+    public CustomBlocksConfig() {
+        super("ModConfigs", "blocks.yml");
+        loadKeys();
+    }
 
     public static CustomBlocksConfig getInstance() {
         if (instance == null) {
-            instance = new CustomBlocksConfig(mcMMO.p);
+            instance = new CustomBlocksConfig();
         }
 
         return instance;
     }
 
-    public List<ItemStack> customExcavationBlocks = new ArrayList<ItemStack>();
-    public List<ItemStack> customHerbalismBlocks = new ArrayList<ItemStack>();
-    public List<ItemStack> customMiningBlocks = new ArrayList<ItemStack>();
-    public List<ItemStack> customWoodcuttingBlocks = new ArrayList<ItemStack>();
-
-    public List<ItemStack> customOres = new ArrayList<ItemStack>();
-    public List<ItemStack> customLogs = new ArrayList<ItemStack>();
-    public List<ItemStack> customLeaves = new ArrayList<ItemStack>();
-
-    public List<ItemStack> customItems = new ArrayList<ItemStack>();
-    public List<CustomBlock> customBlocks = new ArrayList<CustomBlock>();
-
-    public CustomBlocksConfig(mcMMO plugin) {
-        super(plugin, "blocks.yml");
-        config = plugin.getBlocksConfig();
-    }
-
-    @Override
-    public void load() {
-        if (!configFile.exists()) {
-            dataFolder.mkdir();
-            plugin.saveBlocksConfig();
-        }
-
-        addDefaults();
-        loadKeys();
-    }
-
     @Override
     protected void loadKeys() {
-        plugin.getLogger().info("Loading mcMMO blocks.yml File...");
-
         loadBlocks("Excavation", customExcavationBlocks);
         loadBlocks("Herbalism", customHerbalismBlocks);
         loadBlocks("Mining", customMiningBlocks);
         loadBlocks("Woodcutting", customWoodcuttingBlocks);
+        loadBlocks("Ability_Blocks", customAbilityBlocks);
     }
 
     private void loadBlocks(String skillType, List<ItemStack> blockList) {
@@ -75,30 +61,37 @@ public class CustomBlocksConfig extends ModConfigLoader{
             boolean dropItem = config.getBoolean(skillType + "." + blockName + ".Drop_Item", false);
             int dropID = config.getInt(skillType + "." + blockName + ".Drop_Item_ID", 0);
             byte dropData = (byte) config.getInt(skillType + "." + blockName + ".Drop_Item_Data_Value", 0);
-            int dropAmount = config.getInt(skillType + "." + blockName + ".Drop_Item_Amount", 1);
+            int minimumDropAmount = config.getInt(skillType + "." + blockName + ".Min_Drop_Item_Amount", 1);
+            int maxiumDropAmount = config.getInt(skillType + "." + blockName + ".Max_Drop_Item_Amount", 1);
+
+            CustomBlock block;
+            ItemStack itemDrop;
+            ItemStack blockItem;
 
             if (id == 0) {
                 plugin.getLogger().warning("Missing ID. This block will be skipped.");
                 continue;
             }
 
+            if (skillType.equals("Ability_Blocks")) {
+                blockItem = new ItemStack(id, 1, (short) 0, data);
+                blockList.add(blockItem);
+                continue;
+            }
+
             if (dropItem && dropID == 0) {
                 plugin.getLogger().warning("Incomplete item drop information. This block will drop itself.");
                 dropItem = false;
             }
 
-            CustomBlock block;
-            ItemStack itemDrop;
-            ItemStack blockItem;
-
             if (dropItem) {
-                itemDrop = new ItemStack(dropID, dropAmount, (short) 0, dropData);
+                itemDrop = new ItemStack(dropID, 1, (short) 0, dropData);
             }
             else {
-                itemDrop = new ItemStack(id, dropAmount, (short) 0, data);
+                itemDrop = new ItemStack(id, 1, (short) 0, data);
             }
 
-            block = new CustomBlock(itemDrop, tier, xp, data, id);
+            block = new CustomBlock(minimumDropAmount, maxiumDropAmount, itemDrop, tier, xp, data, id);
             blockItem = new ItemStack(id, 1, (short) 0, data);
 
             if (skillType.equals("Mining") && config.getBoolean(skillType + "." + blockName + ".Is_Ore")) {

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

@@ -8,54 +8,39 @@ import java.util.Set;
 
 import org.bukkit.configuration.ConfigurationSection;
 
-import com.gmail.nossr50.mcMMO;
+import com.gmail.nossr50.config.ConfigLoader;
 import com.gmail.nossr50.datatypes.mods.CustomTool;
 import com.gmail.nossr50.skills.repair.Repairable;
 import com.gmail.nossr50.skills.repair.RepairableFactory;
 
-public class CustomToolsConfig extends ModConfigLoader {
+public class CustomToolsConfig extends ConfigLoader {
     private static CustomToolsConfig instance;
-
-    public static CustomToolsConfig getInstance() {
-        if (instance == null) {
-            instance = new CustomToolsConfig(mcMMO.p);
-        }
-
-        return instance;
-    }
-
     private List<Repairable> repairables;
-
     public List<Integer> customAxeIDs = new ArrayList<Integer>();
     public List<Integer> customBowIDs = new ArrayList<Integer>();
     public List<Integer> customHoeIDs = new ArrayList<Integer>();
     public List<Integer> customPickaxeIDs = new ArrayList<Integer>();
     public List<Integer> customShovelIDs = new ArrayList<Integer>();
     public List<Integer> customSwordIDs = new ArrayList<Integer>();
-
     public List<Integer> customIDs = new ArrayList<Integer>();
     public List<CustomTool> customToolList = new ArrayList<CustomTool>();
     public HashMap<Integer, CustomTool> customTools = new HashMap<Integer, CustomTool>();
 
-    private CustomToolsConfig(mcMMO plugin) {
-        super(plugin, "tools.yml");
-        config = plugin.getToolsConfig();
+    private CustomToolsConfig() {
+        super("ModConfigs", "tools.yml");
+        loadKeys();
     }
 
-    @Override
-    public void load() {
-        if (!configFile.exists()) {
-            dataFolder.mkdir();
-            plugin.saveToolsConfig();
+    public static CustomToolsConfig getInstance() {
+        if (instance == null) {
+            instance = new CustomToolsConfig();
         }
 
-        addDefaults();
-        loadKeys();
+        return instance;
     }
 
     @Override
     protected void loadKeys() {
-        plugin.getLogger().info("Loading mcMMO tools.yml File...");
         repairables = new ArrayList<Repairable>();
 
         loadTool("Axes", customAxeIDs);
@@ -100,7 +85,7 @@ public class CustomToolsConfig extends ModConfigLoader {
                 repairables.add(RepairableFactory.getRepairable(id, repairID, repairData, repairQuantity, durability));
             }
 
-            tool = new CustomTool(tier, abilityEnabled, multiplier, id);
+            tool = new CustomTool(tier, abilityEnabled, multiplier, durability, id);
 
             idList.add(id);
             customIDs.add(id);

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

@@ -1,13 +0,0 @@
-package com.gmail.nossr50.config.mods;
-
-import java.io.File;
-
-import com.gmail.nossr50.mcMMO;
-import com.gmail.nossr50.config.ConfigLoader;
-
-public abstract class ModConfigLoader extends ConfigLoader{
-
-    public ModConfigLoader(mcMMO plugin, String fileName) {
-        super(plugin, "ModConfigs" + File.separator + fileName);
-    }
-}

src/main/java/com/gmail/nossr50/config/repair/RepairConfig.java

@@ -1,30 +1,22 @@
-package com.gmail.nossr50.config;
+package com.gmail.nossr50.config.repair;
 
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Set;
 
 import org.bukkit.configuration.ConfigurationSection;
-import org.bukkit.configuration.file.YamlConfiguration;
 
-import com.gmail.nossr50.mcMMO;
+import com.gmail.nossr50.config.ConfigLoader;
 import com.gmail.nossr50.skills.repair.RepairItemType;
 import com.gmail.nossr50.skills.repair.RepairMaterialType;
 import com.gmail.nossr50.skills.repair.Repairable;
 import com.gmail.nossr50.skills.repair.RepairableFactory;
 
 public class RepairConfig extends ConfigLoader {
-    private final String fileName;
     private List<Repairable> repairables;
 
-    public RepairConfig(mcMMO plugin, String fileName) {
-        super(plugin, fileName);
-        this.fileName = fileName;
-        this.config = YamlConfiguration.loadConfiguration(this.configFile);
-    }
-
-    @Override
-    protected void load() {
+    public RepairConfig(String fileName) {
+        super(fileName);
         loadKeys();
     }
 
@@ -34,19 +26,20 @@ public class RepairConfig extends ConfigLoader {
 
         ConfigurationSection section = config.getConfigurationSection("Repairables");
         Set<String> keys = section.getKeys(false);
-        for(String key : keys) {
+
+        for (String key : keys) {
             // Validate all the things!
             List<String> reason = new ArrayList<String>();
 
-            if(!config.contains("Repairables." + key + ".ItemId")) {
+            if (!config.contains("Repairables." + key + ".ItemId")) {
                 reason.add(key + " is missing ItemId");
             }
 
-            if(!config.contains("Repairables." + key + ".RepairMaterialId")) {
+            if (!config.contains("Repairables." + key + ".RepairMaterialId")) {
                 reason.add(key + " is missing RepairMaterialId");
             }
 
-            if(!config.contains("Repairables." + key + ".MaximumDurability")) {
+            if (!config.contains("Repairables." + key + ".MaximumDurability")) {
                 reason.add(key + " is missing MaximumDurability");
             }
 
@@ -65,27 +58,29 @@ public class RepairConfig extends ConfigLoader {
             String repairItemTypeString = config.getString("Repairables." + key + ".ItemType", "OTHER");
             String repairMaterialTypeString = config.getString("Repairables." + key + ".MaterialType", "OTHER");
 
-            if(minimumLevel < 0) {
+            if (minimumLevel < 0) {
                 reason.add(key + " has an invalid MinimumLevel of " + minimumLevel);
             }
 
-            if(minimumQuantity < 0) {
+            if (minimumQuantity < 0) {
                 reason.add(key + " has an invalid MinimumQuantity of " + minimumQuantity);
             }
 
             try {
                 repairItemType = RepairItemType.valueOf(repairItemTypeString);
-            } catch (IllegalArgumentException ex) {
+            }
+            catch (IllegalArgumentException ex) {
                 reason.add(key + " has an invalid ItemType of " + repairItemTypeString);
             }
 
             try {
                 repairMaterialType = RepairMaterialType.valueOf(repairMaterialTypeString);
-            } catch (IllegalArgumentException ex) {
+            }
+            catch (IllegalArgumentException ex) {
                 reason.add(key + " has an invalid MaterialType of " + repairMaterialTypeString);
             }
 
-            if(noErrorsInRepairable(reason)) {
+            if (noErrorsInRepairable(reason)) {
                 Repairable repairable = RepairableFactory.getRepairable(itemId, repairMaterialId, (byte) repairMetadata, minimumLevel, minimumQuantity, (short) maximumDurability, repairItemType, repairMaterialType, xpMultiplier);
                 repairables.add(repairable);
             }
@@ -93,7 +88,10 @@ public class RepairConfig extends ConfigLoader {
     }
 
     protected List<Repairable> getLoadedRepairables() {
-        if(repairables == null) return new ArrayList<Repairable>();
+        if (repairables == null) {
+            return new ArrayList<Repairable>();
+        }
+
         return repairables;
     }
 

src/main/java/com/gmail/nossr50/config/repair/RepairConfigManager.java

@@ -1,4 +1,4 @@
-package com.gmail.nossr50.config;
+package com.gmail.nossr50.config.repair;
 
 import java.io.File;
 import java.util.ArrayList;
@@ -16,32 +16,37 @@ public class RepairConfigManager {
 
         Pattern pattern = Pattern.compile("repair\\.(?:.+)\\.yml");
         File dataFolder = plugin.getDataFolder();
-
         File vanilla = new File(dataFolder, "repair.vanilla.yml");
-        if(!vanilla.exists()) {
+
+        if (!vanilla.exists()) {
             plugin.saveResource("repair.vanilla.yml", false);
         }
 
-        for(String location : dataFolder.list()) {
-            if(!pattern.matcher(location).matches()) continue;
+        for (String fileName : dataFolder.list()) {
+            if (!pattern.matcher(fileName).matches()) {
+                continue;
+            }
 
-            plugin.getLogger().info("Loading " + location + " repair config file...");
+            File file = new File(dataFolder, fileName);
 
-            File file = new File(dataFolder, location);
-            if(file.isDirectory()) continue;
-
-            RepairConfig rConfig = new RepairConfig(plugin, location);
-            rConfig.load();
+            if (file.isDirectory()) {
+                continue;
+            }
 
+            RepairConfig rConfig = new RepairConfig(fileName);
             List<Repairable> rConfigRepairables = rConfig.getLoadedRepairables();
-            if(rConfigRepairables != null) {
+
+            if (rConfigRepairables != null) {
                 repairables.addAll(rConfigRepairables);
             }
         }
     }
 
     public List<Repairable> getLoadedRepairables() {
-        if(repairables == null) return new ArrayList<Repairable>();
+        if (repairables == null) {
+            return new ArrayList<Repairable>();
+        }
+
         return repairables;
     }
 }

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

@@ -1,8 +0,0 @@
-package com.gmail.nossr50.datatypes;
-
-public enum HUDType {
-    DISABLED,
-    STANDARD,
-    SMALL,
-    RETRO;
-}

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

@@ -1,413 +0,0 @@
-package com.gmail.nossr50.datatypes;
-
-import org.bukkit.entity.Player;
-import org.getspout.spoutapi.SpoutManager;
-import org.getspout.spoutapi.gui.Color;
-import org.getspout.spoutapi.gui.GenericGradient;
-import org.getspout.spoutapi.gui.GenericTexture;
-import org.getspout.spoutapi.gui.RenderPriority;
-import org.getspout.spoutapi.gui.Widget;
-import org.getspout.spoutapi.player.SpoutPlayer;
-
-import com.gmail.nossr50.mcMMO;
-import com.gmail.nossr50.config.Config;
-import com.gmail.nossr50.spout.SpoutStuff;
-import com.gmail.nossr50.util.Misc;
-import com.gmail.nossr50.util.Users;
-
-public class HUDmmo {
-    private int center_x = 427 / 2;
-
-    private String playerName;
-    private final mcMMO plugin;
-
-    private Widget xpbar = null;
-    private GenericGradient xpfill = null;
-    private GenericGradient xpbg = null;
-    private GenericGradient xpicon_bg = null;
-    private GenericGradient xpicon_border = null;
-    private GenericTexture xpicon = null;
-
-    public HUDmmo(Player player, mcMMO plugin) {
-        this.playerName = player.getName();
-        this.plugin = plugin;
-        initializeHUD(player);
-    }
-
-    /**
-     * Initialize the HUD.
-     *
-     * @param player Player whose HUD to initialize
-     */
-    public void initializeHUD(Player player) {
-        HUDType type = Users.getProfile(player).getHUDType();
-        SpoutPlayer sPlayer = SpoutManager.getPlayer(player);
-
-        switch (type) {
-            case RETRO:
-                initializeXpBarDisplayRetro(sPlayer);
-                break;
-
-            case STANDARD:
-                initializeXpBarDisplayStandard(sPlayer);
-                break;
-
-            case SMALL:
-                initializeXpBarDisplaySmall(sPlayer);
-                break;
-
-            case DISABLED:
-                break;
-
-            default:
-                break;
-        }
-    }
-
-    /**
-     * Update the XP bar.
-     *
-     * @param type Type of XP bar
-     * @param player Player whose XP bar to update
-     */
-    public void updateXpBarDisplay(HUDType type, Player player) {
-        PlayerProfile PP = Users.getProfile(player);
-
-        switch (type) {
-        case RETRO:
-            updateXpBarRetro(player, PP);
-            break;
-
-        case STANDARD:
-            updateXpBarStandard(player, PP);
-            break;
-
-        case SMALL:
-            updateXpBarStandard(player, PP);
-            break;
-
-        case DISABLED:
-            break;
-
-        default:
-            break;
-        }
-    }
-
-    /**
-     * Reset a player's HUD.
-     */
-    public void resetHUD() {
-        SpoutPlayer sPlayer = SpoutStuff.getSpoutPlayer(playerName);
-
-        if (sPlayer != null) {
-            sPlayer.getMainScreen().removeWidgets(plugin);
-
-            //Reset the objects
-            xpbar = null;
-            xpfill = null;
-            xpbg = null;
-            xpicon = null;
-
-            sPlayer.getMainScreen().setDirty(true);
-        }
-    }
-
-    /**
-     * Initialize Retro XP bar.
-     *
-     * @param sPlayer Player to initialize XP bar for
-     */
-    private void initializeXpBarDisplayRetro(SpoutPlayer sPlayer) {
-        Color border = new Color((float) Config.getInstance().getSpoutRetroHUDXPBorderRed(), (float) Config.getInstance().getSpoutRetroHUDXPBorderGreen(), (float) Config.getInstance().getSpoutRetroHUDXPBorderBlue(), 1f);
-        Color green = new Color(0f, 1f, 0f, 1f);
-        Color background = new Color((float) Config.getInstance().getSpoutRetroHUDXPBackgroundRed(), (float) Config.getInstance().getSpoutRetroHUDXPBackgroundGreen(), (float) Config.getInstance().getSpoutRetroHUDXPBackgroundBlue(), 1f);
-        Color darkbg = new Color(0.2f, 0.2f, 0.2f, 1f);
-
-        xpicon = new GenericTexture();
-        xpbar = new GenericGradient();
-        xpfill = new GenericGradient();
-        xpbg = new GenericGradient();
-
-        xpicon_bg = new GenericGradient();
-        xpicon_border = new GenericGradient();
-
-        xpicon_bg.setBottomColor(darkbg);
-        xpicon_bg.setTopColor(darkbg);
-        xpicon_bg.setWidth(4);
-        xpicon_bg.setHeight(4);
-        xpicon_bg.setPriority(RenderPriority.High);
-        xpicon_bg.setX(142);
-        xpicon_bg.setY(10);
-        xpicon_bg.setDirty(true);
-
-        xpicon_border.setBottomColor(border);
-        xpicon_border.setTopColor(border);
-        xpicon_border.setWidth(6);
-        xpicon_border.setHeight(6);
-        xpicon_border.setPriority(RenderPriority.Highest);
-        xpicon_border.setX(141);
-        xpicon_border.setY(9);
-        xpicon_border.setDirty(true);
-
-        xpicon.setWidth(6);
-        xpicon.setHeight(6);
-        xpicon.setX(141);
-        xpicon.setY(9);
-        xpicon.setPriority(RenderPriority.Normal);
-        xpicon.setDirty(true);
-        xpicon.setUrl("Icon_r.png");
-
-        xpbar.setWidth(128);
-        xpbar.setHeight(4);
-        xpbar.setX(149);
-        xpbar.setY(10);
-        ((GenericGradient) xpbar).setBottomColor(border);
-        ((GenericGradient) xpbar).setTopColor(border);
-        xpbar.setPriority(RenderPriority.Highest);
-        xpbar.setDirty(true);
-
-        xpfill.setWidth(0);
-        xpfill.setHeight(2);
-        xpfill.setX(150);
-        xpfill.setY(11);
-        xpfill.setBottomColor(green);
-        xpfill.setTopColor(green);
-        xpfill.setPriority(RenderPriority.Lowest);
-        xpfill.setDirty(true);
-
-        xpbg.setWidth(126);
-        xpbg.setHeight(2);
-        xpbg.setX(150);
-        xpbg.setY(11);
-        xpbg.setBottomColor(background);
-        xpbg.setTopColor(background);
-        xpbg.setPriority(RenderPriority.Low);
-        xpbg.setDirty(true);
-
-        if (Config.getInstance().getSpoutXPBarEnabled()) {
-            sPlayer.getMainScreen().attachWidget(plugin, xpbar);
-            sPlayer.getMainScreen().attachWidget(plugin, xpfill);
-            sPlayer.getMainScreen().attachWidget(plugin, xpbg);
-
-            if (Config.getInstance().getSpoutXPBarIconEnabled()) {
-                sPlayer.getMainScreen().attachWidget(plugin, xpicon);
-                sPlayer.getMainScreen().attachWidget(plugin, xpicon_bg);
-                sPlayer.getMainScreen().attachWidget(plugin, xpicon_border);
-            }
-        }
-
-        sPlayer.getMainScreen().setDirty(true);
-    }
-
-    /**
-     * Initialize Standard XP bar.
-     *
-     * @param sPlayer Player to initialize XP bar for
-     */
-    public void initializeXpBarDisplayStandard(SpoutPlayer sPlayer) {
-        if (Config.getInstance().getSpoutXPBarEnabled()) {
-            xpbar = new GenericTexture();
-
-            ((GenericTexture) xpbar).setUrl("xpbar_inc000.png");
-
-            xpbar.setX(Config.getInstance().getSpoutXPBarXPosition());
-            xpbar.setY(Config.getInstance().getSpoutXPBarYPosition());
-            xpbar.setHeight(8);
-            xpbar.setWidth(256);
-
-            sPlayer.getMainScreen().attachWidget(plugin, xpbar);
-
-            if (Config.getInstance().getSpoutXPBarIconEnabled()) {
-                xpicon = new GenericTexture();
-
-                xpicon.setUrl("Icon.png");
-                xpicon.setHeight(16);
-                xpicon.setWidth(32);
-                xpicon.setX(Config.getInstance().getSpoutXPIconXPosition());
-                xpicon.setY(Config.getInstance().getSpoutXPIconYPosition());
-                xpicon.setDirty(true);
-
-                sPlayer.getMainScreen().attachWidget(plugin, xpicon);
-            }
-        }
-
-        sPlayer.getMainScreen().setDirty(true);
-    }
-
-    /**
-     * Initialize Small XP bar.
-     *
-     * @param sPlayer Player to initialize XP bar for
-     */
-    private void initializeXpBarDisplaySmall(SpoutPlayer sPlayer) {
-        if (Config.getInstance().getSpoutXPBarEnabled()) {
-            xpbar = new GenericTexture();
-
-            ((GenericTexture)xpbar).setUrl("xpbar_inc000.png");
-            xpbar.setX(center_x - 64);
-            xpbar.setY(Config.getInstance().getSpoutXPBarYPosition());
-            xpbar.setHeight(4);
-            xpbar.setWidth(128);
-
-            sPlayer.getMainScreen().attachWidget(plugin, xpbar);
-
-            if (Config.getInstance().getSpoutXPBarIconEnabled()) {
-                xpicon = new GenericTexture();
-
-                xpicon.setUrl("Icon.png");
-                xpicon.setHeight(8);
-                xpicon.setWidth(16);
-                xpicon.setX(center_x - (8 + 64));
-                xpicon.setY(Config.getInstance().getSpoutXPIconYPosition() + 2);
-                xpicon.setDirty(true);
-
-                sPlayer.getMainScreen().attachWidget(plugin, xpicon);
-            }
-        }
-
-        sPlayer.getMainScreen().setDirty(true);
-    }
-
-    /**
-     * Update XP bar for Standard & Small styles.
-     *
-     * @param player Player whose XP bar to update
-     * @param PP Profile of the given player
-     */
-    private void updateXpBarStandard(Player player, PlayerProfile PP) {
-        if (!Config.getInstance().getSpoutXPBarEnabled()) {
-            return;
-        }
-
-        SkillType theType = getType(PP);
-
-        if (theType == null) { //Can this ever actually BE null? (Yes, it's null when the player has just logged in. It's not null when they gain XP in anything)
-            return;
-        }
-
-        ((GenericTexture) xpicon).setUrl(Misc.getCapitalized(theType.toString()) + ".png");
-        xpicon.setDirty(true);
-
-        ((GenericTexture) xpbar).setUrl(getUrlBar(getXpInc(PP.getSkillXpLevel(theType), PP.getXpToLevel(theType), HUDType.STANDARD)));
-        xpbar.setDirty(true);
-
-        SpoutManager.getPlayer(player).getMainScreen().setDirty(true);
-    }
-
-    /**
-     * Update XP bar for Retro styles.
-     *
-     * @param player Player whose XP bar to update
-     * @param PP Profile of the given player
-     */
-    private void updateXpBarRetro(Player player, PlayerProfile PP) {
-        if (!Config.getInstance().getSpoutXPBarEnabled()) {
-            return;
-        }
-
-        SkillType theType = getType(PP);
-
-        if (theType == null) { //Can this ever actually BE null? (Yes, it's null when the player has just logged in. It's not null when they gain XP in anything)
-            return;
-        }
-
-        Color color = getRetroColor(theType);
-
-        xpicon.setUrl(Misc.getCapitalized(theType.toString()) + "_r.png");
-
-        xpfill.setBottomColor(color);
-        xpfill.setTopColor(color);
-        xpfill.setWidth(getXpInc(PP.getSkillXpLevel(theType), PP.getXpToLevel(theType), HUDType.RETRO));
-        xpfill.setDirty(true);
-
-        SpoutManager.getPlayer(player).getMainScreen().setDirty(true);
-    }
-
-    private static Color getRetroColor(SkillType type) {
-        switch (type) {
-            case ACROBATICS:
-                return new Color((float) Config.getInstance().getSpoutRetroHUDAcrobaticsRed(), (float) Config.getInstance().getSpoutRetroHUDAcrobaticsGreen(), (float) Config.getInstance().getSpoutRetroHUDAcrobaticsBlue(), 1f);
-
-            case ARCHERY:
-                return new Color((float) Config.getInstance().getSpoutRetroHUDArcheryRed(), (float) Config.getInstance().getSpoutRetroHUDArcheryGreen(), (float) Config.getInstance().getSpoutRetroHUDArcheryBlue(), 1f);
-
-            case AXES:
-                return new Color((float) Config.getInstance().getSpoutRetroHUDAxesRed(), (float) Config.getInstance().getSpoutRetroHUDAxesGreen(), (float) Config.getInstance().getSpoutRetroHUDAxesBlue(), 1f);
-
-            case EXCAVATION:
-                return new Color((float) Config.getInstance().getSpoutRetroHUDExcavationRed(), (float) Config.getInstance().getSpoutRetroHUDExcavationGreen(), (float) Config.getInstance().getSpoutRetroHUDExcavationBlue(), 1f);
-
-            case HERBALISM:
-                return new Color((float) Config.getInstance().getSpoutRetroHUDHerbalismRed(), (float) Config.getInstance().getSpoutRetroHUDHerbalismGreen(), (float) Config.getInstance().getSpoutRetroHUDHerbalismBlue(), 1f);
-
-            case MINING:
-                return new Color((float) Config.getInstance().getSpoutRetroHUDMiningRed(), (float) Config.getInstance().getSpoutRetroHUDMiningGreen(), (float) Config.getInstance().getSpoutRetroHUDMiningBlue(), 1f);
-
-            case REPAIR:
-                return new Color((float) Config.getInstance().getSpoutRetroHUDRepairRed(), (float) Config.getInstance().getSpoutRetroHUDRepairGreen(), (float) Config.getInstance().getSpoutRetroHUDRepairBlue(), 1f);
-
-            case SWORDS:
-                return new Color((float) Config.getInstance().getSpoutRetroHUDSwordsRed(), (float) Config.getInstance().getSpoutRetroHUDSwordsGreen(), (float) Config.getInstance().getSpoutRetroHUDSwordsBlue(), 1f);
-
-            case TAMING:
-                return new Color((float) Config.getInstance().getSpoutRetroHUDTamingRed(), (float) Config.getInstance().getSpoutRetroHUDTamingGreen(), (float) Config.getInstance().getSpoutRetroHUDTamingBlue(), 1f);
-
-            case UNARMED:
-                return new Color((float) Config.getInstance().getSpoutRetroHUDUnarmedRed(), (float) Config.getInstance().getSpoutRetroHUDUnarmedGreen(), (float) Config.getInstance().getSpoutRetroHUDUnarmedBlue(), 1f);
-
-            case WOODCUTTING:
-                return new Color((float) Config.getInstance().getSpoutRetroHUDWoodcuttingRed(), (float) Config.getInstance().getSpoutRetroHUDWoodcuttingGreen(), (float) Config.getInstance().getSpoutRetroHUDWoodcuttingBlue(), 1f);
-
-            case FISHING:
-                return new Color((float) Config.getInstance().getSpoutRetroHUDFishingRed(), (float) Config.getInstance().getSpoutRetroHUDFishingGreen(), (float) Config.getInstance().getSpoutRetroHUDFishingBlue(), 1f);
-
-            default:
-                return new Color(0.3f, 0.3f, 0.75f, 1f);
-        }
-    }
-
-    private static String getUrlBar(Integer number) {
-        char[] num = number.toString().toCharArray();
-
-        switch (num.length) {
-        case 1:
-            return "xpbar_inc00" + number + ".png";
-
-        case 2:
-            return "xpbar_inc0" + number + ".png";
-
-        default:
-            return "xpbar_inc" + number + ".png";
-        }
-    }
-
-    private static Integer getXpInc(int skillxp, int xptolevel, HUDType hud) {
-        double percentage = (double) skillxp / xptolevel;
-        double inc;
-
-        switch (hud) {
-        case RETRO:
-            inc = 0.0079365079365079;
-            break;
-
-        case STANDARD:
-            inc = 0.0039370078740157;
-            break;
-
-        default:
-            return 1;
-        }
-
-        return (int) (percentage / inc);
-    }
-
-    private static SkillType getType(PlayerProfile PP) {
-        if (PP.getXpBarLocked()) {
-            return PP.getSkillLock();
-        }
-        else {
-            return PP.getLastGained();
-        }
-    }
-}

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

@@ -0,0 +1,12 @@
+package com.gmail.nossr50.datatypes;
+
+public enum HudType {
+    DISABLED,
+    STANDARD,
+    SMALL,
+    RETRO;
+
+    public HudType getNext() {
+        return values()[(ordinal() + 1) % values().length];
+    }
+}

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

@@ -0,0 +1,235 @@
+package com.gmail.nossr50.datatypes;
+
+import org.bukkit.GameMode;
+import org.bukkit.entity.Player;
+import org.bukkit.inventory.ItemStack;
+
+import com.gmail.nossr50.mcMMO;
+import com.gmail.nossr50.config.Config;
+import com.gmail.nossr50.datatypes.mods.CustomTool;
+import com.gmail.nossr50.events.experience.McMMOPlayerXpGainEvent;
+import com.gmail.nossr50.party.Party;
+import com.gmail.nossr50.party.PartyManager;
+import com.gmail.nossr50.util.Misc;
+import com.gmail.nossr50.util.ModChecks;
+import com.gmail.nossr50.util.Users;
+
+public class McMMOPlayer {
+    private Player player;
+    private PlayerProfile profile;
+
+    private Party party;
+    private Party invite;
+
+    public McMMOPlayer (Player player) {
+        String playerName = player.getName();
+        this.player = player;
+        this.profile = new PlayerProfile(playerName, true);
+        this.party = PartyManager.getInstance().getPlayerParty(playerName);
+    }
+
+    /**
+     * Gets the power level of this player.
+     *
+     * @return the power level of the player
+     */
+    public int getPowerLevel() {
+        int powerLevel = 0;
+
+        for (SkillType type : SkillType.values()) {
+            if (type.getPermissions(player)) {
+                powerLevel += profile.getSkillLevel(type);
+            }
+        }
+
+        return powerLevel;
+    }
+
+    /**
+     * Calculate the party XP modifier.
+     *
+     * @param skillType Type of skill to check
+     * @return the party bonus multiplier
+     */
+    private double calculatePartyXPModifier(SkillType skillType) {
+        double bonusModifier = 0.0;
+
+        for (Player member : party.getOnlineMembers()) {
+            if (party.getLeader().equals(member.getName())) {
+                if (Misc.isNear(player.getLocation(), member.getLocation(), 25.0)) {
+                    PlayerProfile partyLeader = Users.getProfile(member);
+                    int leaderSkill = partyLeader.getSkillLevel(skillType);
+                    int playerSkill = profile.getSkillLevel(skillType);
+
+                    if (leaderSkill >= playerSkill) {
+                        int difference = leaderSkill - playerSkill;
+                        bonusModifier = (difference * 0.75) / 100.0;
+                    }
+                }
+            }
+        }
+
+        return bonusModifier;
+    }
+
+    /**
+     * Adds XP to the player, doesn't calculate for XP Rate
+     *
+     * @param skillType The skill to add XP to
+     * @param newValue The amount of XP to add
+     */
+    public void addXPOverride(SkillType skillType, int xp) {
+        if (skillType.equals(SkillType.ALL)) {
+            for (SkillType type : SkillType.values()) {
+                if (type.equals(SkillType.ALL)) {
+                    continue;
+                }
+
+                mcMMO.p.getServer().getPluginManager().callEvent(new McMMOPlayerXpGainEvent(player, type, xp));
+                profile.setSkillXPLevel(type, profile.getSkillXpLevel(type) + xp);
+            }
+        }
+        else {
+            mcMMO.p.getServer().getPluginManager().callEvent(new McMMOPlayerXpGainEvent(player, skillType, xp));
+            profile.setSkillXPLevel(skillType, profile.getSkillXpLevel(skillType) + xp);
+
+            SpoutHud spoutHud = profile.getSpoutHud();
+
+            if (spoutHud != null) {
+                spoutHud.setLastGained(skillType);
+            }
+        }
+    }
+
+    /**
+     * Adds XP to the player, this ignores skill modifiers.
+     *
+     * @param skillType The skill to add XP to
+     * @param newValue The amount of XP to add
+     */
+    public void addXPOverrideBonus(SkillType skillType, int xp) {
+        int modifiedXp = (int)Math.floor(xp * Config.getInstance().xpGainMultiplier);
+        addXPOverride(skillType, modifiedXp);
+    }
+
+    /**
+     * Adds XP to the player, this is affected by skill modifiers and XP Rate and Permissions
+     *
+     * @param skillType The skill to add XP to
+     * @param newvalue The amount of XP to add
+     */
+    public void addXP(SkillType skillType, int newValue) {
+        if (player.getGameMode().equals(GameMode.CREATIVE)) {
+            return;
+        }
+
+        double bonusModifier = 0;
+
+        if (inParty()) {
+            bonusModifier = calculatePartyXPModifier(skillType);
+        }
+
+        int xp = (int)Math.floor((newValue / skillType.getXpModifier()) * Config.getInstance().xpGainMultiplier);
+
+        if (bonusModifier > 0) {
+            if (bonusModifier >= 2) {
+                bonusModifier = 2;
+            }
+
+            double trueBonus = bonusModifier * xp;
+            xp += trueBonus;
+        }
+
+        if (Config.getInstance().getToolModsEnabled()) {
+            ItemStack item = player.getItemInHand();
+            CustomTool tool = ModChecks.getToolFromItemStack(item);
+
+            if (tool != null) {
+                xp = (int) (xp * tool.getXpMultiplier());
+            }
+        }
+
+        if (player.hasPermission("mcmmo.perks.xp.quadruple")) {
+            xp = xp * 4;
+        }
+        else if (player.hasPermission("mcmmo.perks.xp.triple")) {
+            xp = xp * 3;
+        }
+        else if (player.hasPermission("mcmmo.perks.xp.150percentboost")) {
+            xp = (int) (xp * 2.5);
+        }
+        else if (player.hasPermission("mcmmo.perks.xp.double")) {
+            xp = xp * 2;
+        }
+        else if (player.hasPermission("mcmmo.perks.xp.50percentboost")) {
+            xp = (int) (xp * 1.5);
+        }
+
+        mcMMO.p.getServer().getPluginManager().callEvent(new McMMOPlayerXpGainEvent(player, skillType, xp));
+        profile.setSkillXPLevel(skillType, profile.getSkillXpLevel(skillType) + xp);
+
+        SpoutHud spoutHud = profile.getSpoutHud();
+
+        if (spoutHud != null) {
+            spoutHud.setLastGained(skillType);
+        }
+    }
+
+    // Players & Profiles
+
+    public Player getPlayer() {
+        return player;
+    }
+
+    public void setPlayer(Player player) {
+        this.player = player;
+    }
+
+    public PlayerProfile getProfile() {
+        return profile;
+    }
+
+    // Party Stuff
+
+    public void setInvite(Party invite) {
+        this.invite = invite;
+    }
+
+    public Party getInvite() {
+        return invite;
+    }
+
+    public boolean hasPartyInvite() {
+        if (invite != null) {
+            return true;
+        }
+        else {
+            return false;
+        }
+    }
+
+    public void setParty(Party party) {
+        this.party = party;
+    }
+
+    public Party getParty() {
+        return party;
+    }
+
+    public boolean inParty() {
+        if (party != null) {
+            return true;
+        }
+        else {
+            return false;
+        }
+    }
+
+    public void removeParty() {
+        party = null;
+    }
+
+    public void removeInvite() {
+        invite = null;
+    }
+}

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

@@ -0,0 +1,102 @@
+package com.gmail.nossr50.datatypes;
+
+import org.bukkit.entity.Player;
+import org.getspout.spoutapi.SpoutManager;
+
+import com.gmail.nossr50.mcMMO;
+import com.gmail.nossr50.config.SpoutConfig;
+import com.gmail.nossr50.datatypes.popups.Menu;
+import com.gmail.nossr50.datatypes.popups.XpBar;
+
+public class SpoutHud {
+    private Player player;
+    private PlayerProfile profile;
+
+    private SkillType lastGained;
+    private SkillType skillLock;
+    private boolean xpBarLocked;
+
+    private Menu menu;
+    private XpBar xpBar;
+
+    public SpoutHud(McMMOPlayer mcMMOPlayer) {
+        this.player = mcMMOPlayer.getPlayer();
+        this.profile = mcMMOPlayer.getProfile();
+
+        initializeXpBar();
+    }
+
+    /**
+     * Initialize the HUD.
+     */
+    public void initializeXpBar() {
+        if (SpoutConfig.getInstance().getXPBarEnabled()) {
+            if (xpBar != null) {
+                xpBar.removeWidgets();
+            }
+
+            xpBar = new XpBar(SpoutManager.getPlayer(player), profile.getHudType());
+        }
+    }
+
+    /**
+     * Update the XP bar.
+     */
+    public void updateXpBar() {
+        SkillType skillType = xpBarLocked ? skillLock : lastGained;
+
+        if (skillType == null) {
+            return;
+        }
+
+        xpBar.update(skillType, profile);
+    }
+
+    public boolean isMenuOpened() {
+        return (menu != null) ? true : false;
+    }
+
+    public void openMenu() {
+        menu = new Menu(SpoutManager.getPlayer(player), profile);
+    }
+
+    public void onMenuClose() {
+        menu = null;
+    }
+
+    public void removeWidgets() {
+        if (menu != null) {
+            menu.close();
+        }
+
+        SpoutManager.getPlayer(player).getMainScreen().removeWidgets(mcMMO.p);
+    }
+
+    public SkillType getLastGained() {
+        return lastGained;
+    }
+
+    public void setLastGained(SkillType type) {
+        this.lastGained = type;
+    }
+
+    public boolean getXpBarLocked() {
+        return xpBarLocked;
+    }
+
+    public void setXpBarLocked(boolean locked) {
+        this.xpBarLocked = locked;
+    }
+
+    public void toggleXpBarLocked() {
+        xpBarLocked = !xpBarLocked;
+    }
+
+    public SkillType getSkillLock() {
+        return skillLock;
+    }
+
+    public void setSkillLock(SkillType type) {
+        this.skillLock = type;
+    }
+}

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

@@ -2,8 +2,6 @@ package com.gmail.nossr50.datatypes;
 
 import java.util.ArrayList;
 
-import com.gmail.nossr50.datatypes.PlayerStat;
-
 public class Tree {
 
     private TreeNode root = null;

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

@@ -2,8 +2,6 @@ package com.gmail.nossr50.datatypes;
 
 import java.util.ArrayList;
 
-import com.gmail.nossr50.datatypes.PlayerStat;
-
 public class TreeNode {
     TreeNode left = null;
     TreeNode right = null;

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

@@ -1,13 +0,0 @@
-package com.gmail.nossr50.datatypes.buttons;
-
-import org.getspout.spoutapi.gui.GenericButton;
-
-public class ButtonEscape extends GenericButton {
-
-    public ButtonEscape() {
-        this.setText("EXIT");
-        this.setWidth(60);
-        this.setHeight(20);
-        this.setDirty(true);
-    }
-}

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

@@ -1,14 +0,0 @@
-package com.gmail.nossr50.datatypes.buttons;
-
-import com.gmail.nossr50.datatypes.PlayerProfile;
-
-public class ButtonHUDStyle extends ButtonToggle {
-
-    public ButtonHUDStyle(PlayerProfile PP) {
-        super("HUD Type: ", PP.getHUDType().toString(), "Change your HUD style!"); //TODO: Needs more locale
-    }
-
-    public void updateText(PlayerProfile PP) {
-        super.updateText("HUD Type: ", PP.getHUDType().toString()); //TODO: Needs more locale
-    }
-}

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

@@ -1,14 +0,0 @@
-package com.gmail.nossr50.datatypes.buttons;
-
-import com.gmail.nossr50.datatypes.PlayerProfile;
-
-public class ButtonPartyToggle extends ButtonToggle {
-
-    public ButtonPartyToggle(PlayerProfile PP) {
-        super("Party HUD: ", ((Boolean) PP.getPartyHUD()).toString(), "Toggle the Party HUD!"); //TODO: Needs more locale
-    }
-
-    public void updateText(PlayerProfile PP) {
-        super.updateText("Party HUD: ", ((Boolean) PP.getPartyHUD()).toString()); //TODO: Needs more locale
-    }
-}

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

@@ -1,19 +0,0 @@
-package com.gmail.nossr50.datatypes.buttons;
-
-import org.getspout.spoutapi.gui.GenericButton;
-
-public class ButtonToggle extends GenericButton{
-
-    public ButtonToggle(String text1, String text2, String tooltip) {
-        this.setText(text1 + text2);
-        this.setTooltip(tooltip);
-        this.setWidth(120);
-        this.setHeight(20);
-        this.setDirty(true);
-    }
-
-    public void updateText(String text1, String text2) {
-        this.setText(text1 + text2);
-        this.setDirty(true);
-    }
-}

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

@@ -0,0 +1,24 @@
+package com.gmail.nossr50.datatypes.buttons;
+
+import org.getspout.spoutapi.gui.GenericButton;
+
+public class McmmoButton extends GenericButton {
+    private Slot slot;
+
+    public McmmoButton(String text, String toolTip) {
+        this.setText(text);
+        this.setTooltip(toolTip);
+    }
+    
+    public void connect(Slot slot) {
+        this.slot = slot;
+    }
+
+    public void activate() {
+        slot.activate();
+    }
+
+    public interface Slot {
+        public void activate();
+    }
+}

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

@@ -8,13 +8,17 @@ public class CustomBlock {
     private int xpGain;
     private int tier;
     private ItemStack itemDrop;
+    private int minimumDropAmount;
+    private int maximumDropAmount;
 
-    public CustomBlock(ItemStack itemDrop, int tier, int xpGain, byte dataValue, int itemID) {
+    public CustomBlock(int minimumDropAmount, int maximumDropAmount, ItemStack itemDrop, int tier, int xpGain, byte dataValue, int itemID) {
         this.itemID = itemID;
         this.dataValue = dataValue;
         this.xpGain = xpGain;
         this.tier = tier;
         this.itemDrop = itemDrop;
+        this.minimumDropAmount = minimumDropAmount;
+        this.maximumDropAmount = maximumDropAmount;
     }
 
     public int getItemID() {
@@ -56,4 +60,20 @@ public class CustomBlock {
     public void setItemDrop(ItemStack itemDrop) {
         this.itemDrop = itemDrop;
     }
+
+    public int getMinimumDropAmount() {
+        return minimumDropAmount;
+    }
+
+    public void setMinimumDropAmount(int minimumDropAmount) {
+        this.minimumDropAmount = minimumDropAmount;
+    }
+
+    public int getMaximumDropAmount() {
+        return maximumDropAmount;
+    }
+
+    public void setMaximumDropAmount(int maximumDropAmount) {
+        this.maximumDropAmount = maximumDropAmount;
+    }
 }

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

@@ -2,9 +2,11 @@ package com.gmail.nossr50.datatypes.mods;
 
 public class CustomItem {
     protected int itemID;
+    protected short durability;
 
-    public CustomItem(int itemID) {
+    public CustomItem(int itemID, short durability) {
         this.itemID = itemID;
+        this.durability = durability;
     }
 
     public int getItemID() {
@@ -14,4 +16,12 @@ public class CustomItem {
     public void setItemID(int itemID) {
         this.itemID = itemID;
     }
+
+    public short getDurability() {
+        return durability;
+    }
+
+    public void setDurability(short durability) {
+        this.durability = durability;
+    }
 }

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

@@ -5,8 +5,8 @@ public class CustomTool extends CustomItem {
     private boolean abilityEnabled;
     private int tier;
 
-    public CustomTool(int tier, boolean abilityEnabled, double xpMultiplier, int itemID) {
-        super(itemID);
+    public CustomTool(int tier, boolean abilityEnabled, double xpMultiplier, short durability, int itemID) {
+        super(itemID, durability);
         this.xpMultiplier = xpMultiplier;
         this.abilityEnabled = abilityEnabled;
         this.tier = tier;

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

@@ -0,0 +1,79 @@
+package com.gmail.nossr50.datatypes.popups;
+
+import org.bukkit.ChatColor;
+import org.getspout.spoutapi.gui.GenericLabel;
+import org.getspout.spoutapi.gui.GenericPopup;
+import org.getspout.spoutapi.gui.InGameHUD;
+import org.getspout.spoutapi.player.SpoutPlayer;
+
+import com.gmail.nossr50.mcMMO;
+import com.gmail.nossr50.datatypes.HudType;
+import com.gmail.nossr50.datatypes.PlayerProfile;
+import com.gmail.nossr50.datatypes.SpoutHud;
+import com.gmail.nossr50.datatypes.buttons.McmmoButton;
+import com.gmail.nossr50.datatypes.buttons.McmmoButton.Slot;
+
+public class Menu extends GenericPopup {
+    private McmmoButton hudButton;
+    private McmmoButton escapeButton;
+    private GenericLabel titleLabel = new GenericLabel();
+    private GenericLabel escapeLabel = new GenericLabel();
+    private static int centerX = 427 / 2;
+    private static int centerY = 240 / 2;
+
+    public Menu(final SpoutPlayer spoutPlayer, final PlayerProfile playerProfile) {
+        //240, 427 are the bottom right
+        titleLabel.setText(ChatColor.GOLD + "~mcMMO Menu~"); //TODO: Needs more locale
+        titleLabel.setWidth(100);
+        titleLabel.setHeight(100);
+        titleLabel.setX(centerX - 35);
+        titleLabel.setY((centerY / 2) - 20);
+
+        escapeLabel.setText(ChatColor.GRAY + "Press ESCAPE to exit!"); //TODO: Needs more locale
+        escapeLabel.setWidth(100);
+        escapeLabel.setHeight(100);
+        escapeLabel.setX(titleLabel.getX() - 15);
+        escapeLabel.setY(titleLabel.getY() + 10);
+
+        hudButton = new McmmoButton("HUD Type: " + playerProfile.getHudType().toString(), "Change your HUD style!");
+        hudButton.setWidth(120);
+        hudButton.setHeight(20);
+        hudButton.setX(centerX - (hudButton.getWidth() / 2));
+        hudButton.setY(centerY / 2);
+        hudButton.connect(new Slot() {
+            @Override
+            public void activate() {
+                HudType nextHudType = playerProfile.getHudType().getNext();
+                SpoutHud spoutHud = playerProfile.getSpoutHud();
+
+                playerProfile.setHudType(nextHudType);
+                spoutHud.initializeXpBar();
+                spoutHud.updateXpBar();
+                hudButton.setText("HUD Type: " + nextHudType.toString());
+                hudButton.setDirty(true);
+            }
+        });
+
+        escapeButton = new McmmoButton("EXIT", null);
+        escapeButton.setWidth(60);
+        escapeButton.setHeight(20);
+        escapeButton.setX(centerX - (escapeButton.getWidth() / 2));
+        escapeButton.setY((centerY / 2) + (escapeButton.getHeight() * 2) + 5);
+        escapeButton.connect(new Slot() {
+            @Override
+            public void activate() {
+                spoutPlayer.getMainScreen().closePopup();
+            }
+        });
+
+        attachWidget(mcMMO.p, hudButton);
+        attachWidget(mcMMO.p, titleLabel);
+        attachWidget(mcMMO.p, escapeLabel);
+        attachWidget(mcMMO.p, escapeButton);
+
+        InGameHUD inGameHud = spoutPlayer.getMainScreen();
+
+        inGameHud.attachPopupScreen(this);
+        inGameHud.setDirty(true);
+    }
+}

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

@@ -1,57 +0,0 @@
-package com.gmail.nossr50.datatypes.popups;
-
-import org.bukkit.ChatColor;
-import org.bukkit.entity.Player;
-import org.getspout.spoutapi.gui.GenericLabel;
-import org.getspout.spoutapi.gui.GenericPopup;
-import com.gmail.nossr50.mcMMO;
-import com.gmail.nossr50.datatypes.PlayerProfile;
-import com.gmail.nossr50.datatypes.buttons.ButtonEscape;
-import com.gmail.nossr50.datatypes.buttons.ButtonHUDStyle;
-
-public class PopupMMO extends GenericPopup {
-
-    private ButtonHUDStyle HUDButton = null;
-    private ButtonEscape EscapeButton = null;
-    private GenericLabel mcMMO_label = new GenericLabel();
-    private GenericLabel tip_escape = new GenericLabel();
-    private int center_x = 427 / 2;
-    private int center_y = 240 / 2;
-
-    public PopupMMO(Player player, PlayerProfile PP, mcMMO plugin) {
-
-        //240, 427 are the bottom right
-        mcMMO_label.setText(ChatColor.GOLD + "~mcMMO Menu~"); //TODO: Needs more locale
-        mcMMO_label.setX(center_x - 35);
-        mcMMO_label.setY((center_y / 2) - 20);
-        mcMMO_label.setDirty(true);
-
-        tip_escape.setText(ChatColor.GRAY + "Press ESCAPE to exit!"); //TODO: Needs more locale
-        tip_escape.setX(mcMMO_label.getX() - 15);
-        tip_escape.setY(mcMMO_label.getY() + 10);
-        tip_escape.setDirty(true);
-
-        HUDButton = new ButtonHUDStyle(PP);
-        HUDButton.setX(center_x - (HUDButton.getWidth() / 2));
-        HUDButton.setY(center_y / 2);
-        HUDButton.setDirty(true);
-
-        EscapeButton = new ButtonEscape();
-        EscapeButton.setX(center_x - (EscapeButton.getWidth() / 2));
-        EscapeButton.setY((center_y / 2) + (HUDButton.getHeight() * 2) + 5);
-        EscapeButton.setDirty(true);
-
-        this.attachWidget(plugin, HUDButton);
-        this.attachWidget(plugin, mcMMO_label);
-        this.attachWidget(plugin, tip_escape);
-        this.attachWidget(plugin, EscapeButton);
-
-        this.setDirty(true);
-    }
-
-    public void updateButtons(PlayerProfile PP) {
-        HUDButton.updateText(PP);
-        //PartyButton.updateText(PP);
-        this.setDirty(true);
-    }
-}

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

@@ -0,0 +1,320 @@
+package com.gmail.nossr50.datatypes.popups;
+
+import org.getspout.spoutapi.gui.Color;
+import org.getspout.spoutapi.gui.GenericGradient;
+import org.getspout.spoutapi.gui.GenericTexture;
+import org.getspout.spoutapi.gui.InGameHUD;
+import org.getspout.spoutapi.gui.RenderPriority;
+import org.getspout.spoutapi.gui.Widget;
+import org.getspout.spoutapi.player.SpoutPlayer;
+
+import com.gmail.nossr50.mcMMO;
+import com.gmail.nossr50.config.SpoutConfig;
+import com.gmail.nossr50.datatypes.HudType;
+import com.gmail.nossr50.datatypes.PlayerProfile;
+import com.gmail.nossr50.datatypes.SkillType;
+import com.gmail.nossr50.util.Misc;
+
+public class XpBar {
+    private SpoutPlayer spoutPlayer;
+
+    private Widget xpBar;
+    private GenericGradient xpFill;
+    private GenericGradient xpBackground;
+    private GenericGradient xpIconBackground;
+    private GenericGradient xpIconBorder;
+    private GenericTexture xpIcon;
+
+    public XpBar(SpoutPlayer spoutPlayer, HudType hudType) {
+        this.spoutPlayer = spoutPlayer;
+
+        switch (hudType) {
+        case RETRO:
+            initializeXpBarRetro();
+            break;
+            
+        case STANDARD:
+            initializeXpBarStandard();
+            break;
+
+        case SMALL:
+            initializeXpBarSmall();
+            break;
+
+        case DISABLED:
+            break;
+        }
+        
+        spoutPlayer.getMainScreen().setDirty(true);
+    }
+
+    /**
+     * Initialize Retro XP bar.
+     */
+    private void initializeXpBarRetro() {
+        Color border = new Color((float) SpoutConfig.getInstance().getRetroHUDXPBorderRed(), (float) SpoutConfig.getInstance().getRetroHUDXPBorderGreen(), (float) SpoutConfig.getInstance().getRetroHUDXPBorderBlue(), 1f);
+        Color green = new Color(0f, 1f, 0f, 1f);
+        Color background = new Color((float) SpoutConfig.getInstance().getRetroHUDXPBackgroundRed(), (float) SpoutConfig.getInstance().getRetroHUDXPBackgroundGreen(), (float) SpoutConfig.getInstance().getRetroHUDXPBackgroundBlue(), 1f);
+
+        xpBar = new GenericGradient();
+        xpFill = new GenericGradient();
+        xpBackground = new GenericGradient();
+
+        xpBar.setWidth(128);
+        xpBar.setHeight(4);
+        xpBar.setX(149);
+        xpBar.setY(10);
+        ((GenericGradient) xpBar).setBottomColor(border);
+        ((GenericGradient) xpBar).setTopColor(border);
+        xpBar.setPriority(RenderPriority.Highest);
+        spoutPlayer.getMainScreen().attachWidget(mcMMO.p, xpBar);
+
+        xpFill.setWidth(0);
+        xpFill.setHeight(2);
+        xpFill.setX(150);
+        xpFill.setY(11);
+        xpFill.setBottomColor(green);
+        xpFill.setTopColor(green);
+        xpFill.setPriority(RenderPriority.Lowest);
+        spoutPlayer.getMainScreen().attachWidget(mcMMO.p, xpFill);
+        
+        xpBackground.setWidth(126);
+        xpBackground.setHeight(2);
+        xpBackground.setX(150);
+        xpBackground.setY(11);
+        xpBackground.setBottomColor(background);
+        xpBackground.setTopColor(background);
+        xpBackground.setPriority(RenderPriority.Low);
+        spoutPlayer.getMainScreen().attachWidget(mcMMO.p, xpBackground);
+
+        if (SpoutConfig.getInstance().getXPBarIconEnabled()) {
+            Color darkbg = new Color(0.2f, 0.2f, 0.2f, 1f);
+
+            xpIconBackground = new GenericGradient();
+            xpIconBorder = new GenericGradient();
+            xpIcon = new GenericTexture();
+
+            xpIconBackground.setBottomColor(darkbg);
+            xpIconBackground.setTopColor(darkbg);
+            xpIconBackground.setWidth(4);
+            xpIconBackground.setHeight(4);
+            xpIconBackground.setPriority(RenderPriority.High);
+            xpIconBackground.setX(142);
+            xpIconBackground.setY(10);
+            spoutPlayer.getMainScreen().attachWidget(mcMMO.p, xpIconBackground);
+
+            xpIconBorder.setBottomColor(border);
+            xpIconBorder.setTopColor(border);
+            xpIconBorder.setWidth(6);
+            xpIconBorder.setHeight(6);
+            xpIconBorder.setPriority(RenderPriority.Highest);
+            xpIconBorder.setX(141);
+            xpIconBorder.setY(9);
+            spoutPlayer.getMainScreen().attachWidget(mcMMO.p, xpIconBorder);
+
+            xpIcon.setWidth(6);
+            xpIcon.setHeight(6);
+            xpIcon.setX(141);
+            xpIcon.setY(9);
+            xpIcon.setPriority(RenderPriority.Normal);
+            xpIcon.setUrl("Icon_r.png");
+            spoutPlayer.getMainScreen().attachWidget(mcMMO.p, xpIcon);
+        }
+    }
+
+    /**
+     * Initialize Standard XP bar.
+     */
+    private void initializeXpBarStandard() {
+        xpBar = new GenericTexture();
+
+        ((GenericTexture) xpBar).setUrl("xpbar_inc000.png");
+        xpBar.setX(SpoutConfig.getInstance().getXPBarXPosition());
+        xpBar.setY(SpoutConfig.getInstance().getXPBarYPosition());
+        xpBar.setHeight(8);
+        xpBar.setWidth(256);
+        xpBar.setPriority(RenderPriority.Lowest);
+        spoutPlayer.getMainScreen().attachWidget(mcMMO.p, xpBar);
+
+        if (SpoutConfig.getInstance().getXPBarIconEnabled()) {
+            xpIcon = new GenericTexture();
+
+            xpIcon.setUrl("Icon.png");
+            xpIcon.setHeight(16);
+            xpIcon.setWidth(32);
+            xpIcon.setX(SpoutConfig.getInstance().getXPIconXPosition());
+            xpIcon.setY(SpoutConfig.getInstance().getXPIconYPosition());
+            xpIcon.setPriority(RenderPriority.High);
+            spoutPlayer.getMainScreen().attachWidget(mcMMO.p, xpIcon);
+        }
+    }
+
+    /**
+     * Initialize Small XP bar.
+     */
+    private void initializeXpBarSmall() {
+        xpBar = new GenericTexture();
+
+        ((GenericTexture)xpBar).setUrl("xpbar_inc000.png");
+        xpBar.setX(427 / 2 - 64);
+        xpBar.setY(SpoutConfig.getInstance().getXPBarYPosition());
+        xpBar.setHeight(4);
+        xpBar.setWidth(128);
+        xpBar.setPriority(RenderPriority.Lowest);
+        spoutPlayer.getMainScreen().attachWidget(mcMMO.p, xpBar);
+
+        if (SpoutConfig.getInstance().getXPBarIconEnabled()) {
+            xpIcon = new GenericTexture();
+
+            xpIcon.setUrl("Icon.png");
+            xpIcon.setHeight(8);
+            xpIcon.setWidth(16);
+            xpIcon.setX(427 / 2 - (8 + 64));
+            xpIcon.setY(SpoutConfig.getInstance().getXPIconYPosition() + 2);
+            xpIcon.setPriority(RenderPriority.High);
+            spoutPlayer.getMainScreen().attachWidget(mcMMO.p, xpIcon);
+        }
+    }
+
+    /**
+     * Update the XP bar.
+     * 
+     * @param skillType
+     * @param playerProfile
+     */
+    public void update(SkillType skillType, PlayerProfile playerProfile) {
+        switch (playerProfile.getHudType()) {
+        case RETRO:
+            updateXpBarRetro(skillType, playerProfile);
+            break;
+
+        case STANDARD:
+        case SMALL:
+            updateXpBarStandard(skillType, playerProfile);
+            break;
+
+        case DISABLED:
+            break;
+        }
+    }
+
+    /**
+     * Update XP bar for Standard & Small styles.
+     *
+     * @param skillType
+     * @param playerProfile
+     */
+    private void updateXpBarStandard(SkillType skillType, PlayerProfile playerProfile) {
+        xpIcon.setUrl(Misc.getCapitalized(skillType.toString()) + ".png");
+
+        ((GenericTexture) xpBar).setUrl(getUrlBar(getXpInc(playerProfile.getSkillXpLevel(skillType), playerProfile.getXpToLevel(skillType), HudType.STANDARD)));
+
+        spoutPlayer.getMainScreen().setDirty(true);
+    }
+
+    /**
+     * Update XP bar for Retro styles.
+     *
+     * @param skillType
+     */
+    private void updateXpBarRetro(SkillType skillType, PlayerProfile playerProfile) {
+        Color color = getRetroColor(skillType);
+
+        xpIcon.setUrl(Misc.getCapitalized(skillType.toString()) + "_r.png");
+
+        xpFill.setBottomColor(color);
+        xpFill.setTopColor(color);
+        xpFill.setWidth(getXpInc(playerProfile.getSkillXpLevel(skillType), playerProfile.getXpToLevel(skillType), HudType.RETRO));
+
+        spoutPlayer.getMainScreen().setDirty(true);
+    }
+
+    private static Color getRetroColor(SkillType type) {
+        switch (type) {
+            case ACROBATICS:
+                return new Color((float) SpoutConfig.getInstance().getRetroHUDAcrobaticsRed(), (float) SpoutConfig.getInstance().getRetroHUDAcrobaticsGreen(), (float) SpoutConfig.getInstance().getRetroHUDAcrobaticsBlue(), 1f);
+
+            case ARCHERY:
+                return new Color((float) SpoutConfig.getInstance().getRetroHUDArcheryRed(), (float) SpoutConfig.getInstance().getRetroHUDArcheryGreen(), (float) SpoutConfig.getInstance().getRetroHUDArcheryBlue(), 1f);
+
+            case AXES:
+                return new Color((float) SpoutConfig.getInstance().getRetroHUDAxesRed(), (float) SpoutConfig.getInstance().getRetroHUDAxesGreen(), (float) SpoutConfig.getInstance().getRetroHUDAxesBlue(), 1f);
+
+            case EXCAVATION:
+                return new Color((float) SpoutConfig.getInstance().getRetroHUDExcavationRed(), (float) SpoutConfig.getInstance().getRetroHUDExcavationGreen(), (float) SpoutConfig.getInstance().getRetroHUDExcavationBlue(), 1f);
+
+            case HERBALISM:
+                return new Color((float) SpoutConfig.getInstance().getRetroHUDHerbalismRed(), (float) SpoutConfig.getInstance().getRetroHUDHerbalismGreen(), (float) SpoutConfig.getInstance().getRetroHUDHerbalismBlue(), 1f);
+
+            case MINING:
+                return new Color((float) SpoutConfig.getInstance().getRetroHUDMiningRed(), (float) SpoutConfig.getInstance().getRetroHUDMiningGreen(), (float) SpoutConfig.getInstance().getRetroHUDMiningBlue(), 1f);
+
+            case REPAIR:
+                return new Color((float) SpoutConfig.getInstance().getRetroHUDRepairRed(), (float) SpoutConfig.getInstance().getRetroHUDRepairGreen(), (float) SpoutConfig.getInstance().getRetroHUDRepairBlue(), 1f);
+
+            case SWORDS:
+                return new Color((float) SpoutConfig.getInstance().getRetroHUDSwordsRed(), (float) SpoutConfig.getInstance().getRetroHUDSwordsGreen(), (float) SpoutConfig.getInstance().getRetroHUDSwordsBlue(), 1f);
+
+            case TAMING:
+                return new Color((float) SpoutConfig.getInstance().getRetroHUDTamingRed(), (float) SpoutConfig.getInstance().getRetroHUDTamingGreen(), (float) SpoutConfig.getInstance().getRetroHUDTamingBlue(), 1f);
+
+            case UNARMED:
+                return new Color((float) SpoutConfig.getInstance().getRetroHUDUnarmedRed(), (float) SpoutConfig.getInstance().getRetroHUDUnarmedGreen(), (float) SpoutConfig.getInstance().getRetroHUDUnarmedBlue(), 1f);
+
+            case WOODCUTTING:
+                return new Color((float) SpoutConfig.getInstance().getRetroHUDWoodcuttingRed(), (float) SpoutConfig.getInstance().getRetroHUDWoodcuttingGreen(), (float) SpoutConfig.getInstance().getRetroHUDWoodcuttingBlue(), 1f);
+
+            case FISHING:
+                return new Color((float) SpoutConfig.getInstance().getRetroHUDFishingRed(), (float) SpoutConfig.getInstance().getRetroHUDFishingGreen(), (float) SpoutConfig.getInstance().getRetroHUDFishingBlue(), 1f);
+
+            default:
+                return new Color(0.3f, 0.3f, 0.75f, 1f);
+        }
+    }
+
+    private static String getUrlBar(Integer number) {
+        char[] num = number.toString().toCharArray();
+
+        switch (num.length) {
+        case 1:
+            return "xpbar_inc00" + number + ".png";
+
+        case 2:
+            return "xpbar_inc0" + number + ".png";
+
+        default:
+            return "xpbar_inc" + number + ".png";
+        }
+    }
+
+    private static Integer getXpInc(int skillXp, int xpToLevel, HudType hudType) {
+        double percentage = (double) skillXp / xpToLevel;
+        double inc;
+
+        switch (hudType) {
+        case RETRO:
+            inc = 0.0079365079365079;
+            break;
+
+        case STANDARD:
+            inc = 0.0039370078740157;
+            break;
+
+        default:
+            return 1;
+        }
+
+        return (int) (percentage / inc);
+    }
+
+    public void removeWidgets() {
+        InGameHUD inGameHud = spoutPlayer.getMainScreen();
+
+        if (xpBar != null) inGameHud.removeWidget(xpBar);
+        if (xpFill != null) inGameHud.removeWidget(xpFill);
+        if (xpBackground != null) inGameHud.removeWidget(xpBackground);
+        if (xpIconBackground != null) inGameHud.removeWidget(xpIconBackground);
+        if (xpIconBorder != null) inGameHud.removeWidget(xpIconBorder);
+        if (xpIcon != null) inGameHud.removeWidget(xpIcon);
+    }
+}

src/main/java/com/gmail/nossr50/events/fake/FakeBlockBreakEvent.java

@@ -12,4 +12,4 @@ public class FakeBlockBreakEvent extends BlockBreakEvent {
     public FakeBlockBreakEvent(Block theBlock, Player player) {
         super(theBlock, player);
     }
-}
+}

src/main/java/com/gmail/nossr50/events/fake/FakeBlockDamageEvent.java

@@ -0,0 +1,16 @@
+package com.gmail.nossr50.events.fake;
+
+import org.bukkit.block.Block;
+import org.bukkit.entity.Player;
+import org.bukkit.event.block.BlockDamageEvent;
+import org.bukkit.inventory.ItemStack;
+
+/**
+ * Called when mcMMO damages a block due to a special ability.
+ */
+public class FakeBlockDamageEvent extends BlockDamageEvent {
+
+    public FakeBlockDamageEvent(Player player, Block block, ItemStack itemInHand, boolean instaBreak) {
+        super(player, block, itemInHand, instaBreak);
+    }
+}

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

@@ -58,10 +58,11 @@ public class McMMOItemSpawnEvent extends Event implements Cancellable {
     public void setCancelled(boolean cancelled) {
         this.cancelled = cancelled;
     }
-    
+
     /** Rest of file is required boilerplate for custom events **/
     private static final HandlerList handlers = new HandlerList();
 
+    @Override
     public HandlerList getHandlers() {
         return handlers;
     }

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

@@ -2,12 +2,33 @@ package com.gmail.nossr50.listeners;
 
 import java.util.List;
 
+import org.bukkit.Material;
+import org.bukkit.block.Block;
+import org.bukkit.block.BlockFace;
+import org.bukkit.entity.Player;
+import org.bukkit.event.EventHandler;
+import org.bukkit.event.EventPriority;
+import org.bukkit.event.Listener;
+import org.bukkit.event.block.BlockBreakEvent;
+import org.bukkit.event.block.BlockDamageEvent;
+import org.bukkit.event.block.BlockPhysicsEvent;
+import org.bukkit.event.block.BlockPistonExtendEvent;
+import org.bukkit.event.block.BlockPistonRetractEvent;
+import org.bukkit.event.block.BlockPlaceEvent;
+import org.bukkit.inventory.ItemStack;
+import org.bukkit.metadata.FixedMetadataValue;
+import org.getspout.spoutapi.sound.SoundEffect;
+
 import com.gmail.nossr50.mcMMO;
 import com.gmail.nossr50.config.Config;
 import com.gmail.nossr50.datatypes.AbilityType;
 import com.gmail.nossr50.datatypes.PlayerProfile;
 import com.gmail.nossr50.datatypes.SkillType;
 import com.gmail.nossr50.datatypes.ToolType;
+import com.gmail.nossr50.events.fake.FakeBlockBreakEvent;
+import com.gmail.nossr50.events.fake.FakeBlockDamageEvent;
+import com.gmail.nossr50.events.fake.FakePlayerAnimationEvent;
+import com.gmail.nossr50.runnables.StickyPistonTracker;
 import com.gmail.nossr50.skills.gathering.Excavation;
 import com.gmail.nossr50.skills.gathering.Herbalism;
 import com.gmail.nossr50.skills.gathering.Mining;
@@ -20,24 +41,6 @@ import com.gmail.nossr50.util.ModChecks;
 import com.gmail.nossr50.util.Permissions;
 import com.gmail.nossr50.util.Skills;
 import com.gmail.nossr50.util.Users;
-import com.gmail.nossr50.events.fake.FakeBlockBreakEvent;
-import com.gmail.nossr50.events.fake.FakePlayerAnimationEvent;
-
-import org.bukkit.Material;
-import org.bukkit.block.Block;
-import org.bukkit.block.BlockFace;
-import org.bukkit.entity.Player;
-import org.bukkit.event.EventHandler;
-import org.bukkit.event.EventPriority;
-import org.bukkit.event.Listener;
-import org.bukkit.event.block.BlockBreakEvent;
-import org.bukkit.event.block.BlockDamageEvent;
-import org.bukkit.event.block.BlockPistonExtendEvent;
-import org.bukkit.event.block.BlockPistonRetractEvent;
-import org.bukkit.event.block.BlockPlaceEvent;
-import org.bukkit.inventory.ItemStack;
-
-import org.getspout.spoutapi.sound.SoundEffect;
 
 public class BlockListener implements Listener {
     private final mcMMO plugin;
@@ -58,15 +61,34 @@ public class BlockListener implements Listener {
 
         for (Block b : blocks) {
             if (mcMMO.placeStore.isTrue(b)) {
-                mcMMO.placeStore.setTrue(b.getRelative(direction));
+                b.getRelative(direction).setMetadata("pistonTrack", new FixedMetadataValue(plugin, true));
                 mcMMO.placeStore.setFalse(b);
             }
         }
 
         for (Block b : blocks) {
-            if (mcMMO.placeStore.isTrue(b.getRelative(direction))) {
+            if (b.getRelative(direction).hasMetadata("pistonTrack")) {
                 mcMMO.placeStore.setTrue(b.getRelative(direction));
-                mcMMO.placeStore.setFalse(b);
+                b.getRelative(direction).removeMetadata("pistonTrack", plugin);
+            }
+        }
+    }
+
+    /**
+     * Monitor BlockPhysics events.
+     *
+     * @param event The event to monitor
+     */
+    @EventHandler(priority = EventPriority.MONITOR)
+    public void onBlockPhysics(BlockPhysicsEvent event) {
+        //TODO: Figure out how to REMOVE metadata from the location the sand/gravel fell from.
+        Material type = event.getChangedType();
+
+        if (type == Material.GRAVEL || type == Material.SAND) {
+            Block fallenBlock = event.getBlock().getRelative(BlockFace.UP);
+
+            if (fallenBlock.getType() == type) {
+                mcMMO.placeStore.setTrue(fallenBlock);
             }
         }
     }
@@ -78,11 +100,9 @@ public class BlockListener implements Listener {
      */
     @EventHandler(priority = EventPriority.MONITOR)
     public void onBlockPistonRetract(BlockPistonRetractEvent event) {
-        Block block = event.getRetractLocation().getBlock();
-
-        if (event.isSticky() && mcMMO.placeStore.isTrue(block)) {
-            mcMMO.placeStore.setFalse(block);
-            mcMMO.placeStore.setTrue(event.getBlock().getRelative(event.getDirection()));
+        if (event.isSticky()) {
+            //Needed only because under some circumstances Minecraft doesn't move the block
+            plugin.getServer().getScheduler().scheduleSyncDelayedTask(plugin, new StickyPistonTracker(event), 0);
         }
     }
 
@@ -98,10 +118,10 @@ public class BlockListener implements Listener {
         Block block = event.getBlock();
         Player player = event.getPlayer();
         int id = block.getTypeId();
-        Material mat = block.getType();
+        Material type = block.getType();
 
         /* Code to prevent issues with placed falling Sand/Gravel not being tracked */
-        if (mat.equals(Material.SAND) || mat.equals(Material.GRAVEL)) {
+        if (type.equals(Material.SAND) || type.equals(Material.GRAVEL)) {
             for (int y = -1;  y + block.getY() >= 0; y--) {
                 if (block.getRelative(0, y, 0).getType().equals(Material.AIR)) {
                     continue;
@@ -116,7 +136,9 @@ public class BlockListener implements Listener {
 
         /* Check if the blocks placed should be monitored so they do not give out XP in the future */
         if (BlockChecks.shouldBeWatched(block)) {
-            mcMMO.placeStore.setTrue(block);
+            if (!((type == Material.SAND || type == Material.GRAVEL) && block.getRelative(BlockFace.DOWN).getType() == Material.AIR)) { //Don't wanna track sand that's gonna fall.
+                mcMMO.placeStore.setTrue(block);
+            }
         }
 
         if (id == configInstance.getRepairAnvilId() && configInstance.getRepairAnvilMessagesEnabled()) {
@@ -131,27 +153,32 @@ public class BlockListener implements Listener {
      */
     @EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true)
     public void onBlockBreak(BlockBreakEvent event) {
+        if (event instanceof FakeBlockBreakEvent) {
+            return;
+        }
+
         Player player = event.getPlayer();
-        PlayerProfile PP = Users.getProfile(player);
+        PlayerProfile profile = Users.getProfile(player);
+
+        if (profile == null) {
+            return;
+        }
+
         Block block = event.getBlock();
         ItemStack inHand = player.getItemInHand();
 
         Config configInstance = Config.getInstance();
         Permissions permInstance = Permissions.getInstance();
 
-        if (event instanceof FakeBlockBreakEvent) {
-            return;
-        }
-
         /* HERBALISM */
         if (BlockChecks.canBeGreenTerra(block)) {
             /* Green Terra */
-            if (PP.getToolPreparationMode(ToolType.HOE) && permInstance.greenTerra(player)) {
+            if (profile.getToolPreparationMode(ToolType.HOE) && permInstance.greenTerra(player)) {
                 Skills.abilityCheck(player, SkillType.HERBALISM);
             }
 
             /* Triple drops */
-            if (PP.getAbilityMode(AbilityType.GREEN_TERRA)) {
+            if (profile.getAbilityMode(AbilityType.GREEN_TERRA)) {
                 Herbalism.herbalismProcCheck(block, player, event, plugin);
             }
 
@@ -183,15 +210,8 @@ public class BlockListener implements Listener {
                 WoodCutting.woodcuttingBlockCheck(player, block);
             }
 
-            if (PP.getAbilityMode(AbilityType.TREE_FELLER) && permInstance.treeFeller(player) && ItemChecks.isAxe(inHand)) {
-                if (ModChecks.isCustomTool(inHand)) {
-                    if (ModChecks.getToolFromItemStack(inHand).isAbilityEnabled()) {
-                        WoodCutting.treeFeller(event);
-                    }
-                }
-                else {
-                    WoodCutting.treeFeller(event);
-                }
+            if (profile.getAbilityMode(AbilityType.TREE_FELLER) && permInstance.treeFeller(player) && ItemChecks.isAxe(inHand)) {
+                WoodCutting.treeFeller(event);
             }
         }
 
@@ -208,9 +228,29 @@ public class BlockListener implements Listener {
         }
 
         //Remove metadata when broken
-        if (mcMMO.placeStore.isTrue(block) && BlockChecks.shouldBeWatched(block)) {
+        if (BlockChecks.shouldBeWatched(block)) {
             mcMMO.placeStore.setFalse(block);
         }
+
+        //Remove metadata from fallen sand/gravel
+        Material aboveType = block.getRelative(BlockFace.UP).getType();
+
+        if (aboveType == Material.SAND || aboveType == Material.GRAVEL) {
+            for (int y = 1; block.getY() + y <= block.getWorld().getMaxHeight(); y++) {
+                Block relative = block.getRelative(0, y, 0);
+                Material relativeType = relative.getType();
+
+                if ((relativeType == Material.SAND || relativeType == Material.GRAVEL) && mcMMO.placeStore.isTrue(relative)) {
+                    mcMMO.placeStore.setFalse(relative);
+                }
+                else if (!BlockChecks.shouldBeWatched(relative) && mcMMO.placeStore.isTrue(relative)){
+                    mcMMO.placeStore.setFalse(relative);
+                }
+                else {
+                    break;
+                }
+            }
+        }
     }
 
     /**
@@ -220,10 +260,20 @@ public class BlockListener implements Listener {
      */
     @EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true)
     public void onBlockDamage(BlockDamageEvent event) {
+
+        if (event instanceof FakeBlockDamageEvent) {
+            return;
+        }
+
         final int LEAF_BLOWER_LEVEL = 100;
 
         Player player = event.getPlayer();
-        PlayerProfile PP = Users.getProfile(player);
+        PlayerProfile profile = Users.getProfile(player);
+
+        if (profile == null) {
+            return;
+        }
+
         ItemStack inHand = player.getItemInHand();
         Block block = event.getBlock();
         Material material = block.getType();
@@ -235,54 +285,39 @@ public class BlockListener implements Listener {
          * ABILITY PREPARATION CHECKS
          */
         if (BlockChecks.abilityBlockCheck(block)) {
-            if (PP.getToolPreparationMode(ToolType.HOE) && (BlockChecks.canBeGreenTerra(block) || BlockChecks.makeMossy(block))) {
+            if (profile.getToolPreparationMode(ToolType.HOE) && (BlockChecks.canBeGreenTerra(block) || BlockChecks.makeMossy(block))) {
                 Skills.abilityCheck(player, SkillType.HERBALISM);
             }
-            else if (PP.getToolPreparationMode(ToolType.AXE) && BlockChecks.isLog(block) && permInstance.treeFeller(player)) {  //TODO: Why are we checking the permissions here?
+            else if (profile.getToolPreparationMode(ToolType.AXE) && BlockChecks.isLog(block) && permInstance.treeFeller(player)) {  //TODO: Why are we checking the permissions here?
                 Skills.abilityCheck(player, SkillType.WOODCUTTING);
             }
-            else if (PP.getToolPreparationMode(ToolType.PICKAXE) && BlockChecks.canBeSuperBroken(block)) {
+            else if (profile.getToolPreparationMode(ToolType.PICKAXE) && BlockChecks.canBeSuperBroken(block)) {
                 Skills.abilityCheck(player, SkillType.MINING);
             }
-            else if (PP.getToolPreparationMode(ToolType.SHOVEL) && BlockChecks.canBeGigaDrillBroken(block)) {
+            else if (profile.getToolPreparationMode(ToolType.SHOVEL) && BlockChecks.canBeGigaDrillBroken(block)) {
                 Skills.abilityCheck(player, SkillType.EXCAVATION);
             }
-            else if (PP.getToolPreparationMode(ToolType.FISTS) && (BlockChecks.canBeGigaDrillBroken(block) || material.equals(Material.SNOW))) {
+            else if (profile.getToolPreparationMode(ToolType.FISTS) && (BlockChecks.canBeGigaDrillBroken(block) || material.equals(Material.SNOW))) {
                 Skills.abilityCheck(player, SkillType.UNARMED);
             }
         }
 
         /* TREE FELLER SOUNDS */
-        if (configInstance.spoutEnabled && BlockChecks.isLog(block) && PP.getAbilityMode(AbilityType.TREE_FELLER)) {
+        if (mcMMO.spoutEnabled && BlockChecks.isLog(block) && profile.getAbilityMode(AbilityType.TREE_FELLER)) {
             SpoutSounds.playSoundForPlayer(SoundEffect.FIZZ, player, block.getLocation());
         }
 
         /*
          * ABILITY TRIGGER CHECKS
          */
-        if (PP.getAbilityMode(AbilityType.GREEN_TERRA) && permInstance.greenTerra(player) && BlockChecks.makeMossy(block)) {
-            if (ModChecks.isCustomTool(inHand)) {
-                if (ModChecks.getToolFromItemStack(inHand).isAbilityEnabled()) {
-                    Herbalism.greenTerra(player, block);
-                }
-            }
-            else {
-                Herbalism.greenTerra(player, block);
-            }
+        if (profile.getAbilityMode(AbilityType.GREEN_TERRA) && permInstance.greenTerra(player) && BlockChecks.makeMossy(block)) {
+            Herbalism.greenTerra(player, block);
         }
-        else if (PP.getAbilityMode(AbilityType.GIGA_DRILL_BREAKER) && Skills.triggerCheck(player, block, AbilityType.GIGA_DRILL_BREAKER)) {
+        else if (profile.getAbilityMode(AbilityType.GIGA_DRILL_BREAKER) && Skills.triggerCheck(player, block, AbilityType.GIGA_DRILL_BREAKER)) {
             if (configInstance.getExcavationRequiresTool()) {
                 if (ItemChecks.isShovel(inHand)) {
-                    if (ModChecks.isCustomTool(inHand)) {
-                        if (ModChecks.getToolFromItemStack(inHand).isAbilityEnabled()) {
-                            event.setInstaBreak(true);
-                            Excavation.gigaDrillBreaker(player, block);
-                        }
-                    }
-                    else {
-                        event.setInstaBreak(true);
-                        Excavation.gigaDrillBreaker(player, block);
-                    }
+                    event.setInstaBreak(true);
+                    Excavation.gigaDrillBreaker(player, block);
                 }
             }
             else {
@@ -290,7 +325,7 @@ public class BlockListener implements Listener {
                 Excavation.gigaDrillBreaker(player, block);
             }
         }
-        else if (PP.getAbilityMode(AbilityType.BERSERK) && Skills.triggerCheck(player, block, AbilityType.BERSERK)) {
+        else if (profile.getAbilityMode(AbilityType.BERSERK) && Skills.triggerCheck(player, block, AbilityType.BERSERK)) {
             if (inHand.getType().equals(Material.AIR)) {
                 FakePlayerAnimationEvent armswing = new FakePlayerAnimationEvent(player);
                 plugin.getServer().getPluginManager().callEvent(armswing);
@@ -298,23 +333,15 @@ public class BlockListener implements Listener {
                 event.setInstaBreak(true);
             }
 
-            if (configInstance.spoutEnabled) {
+            if (mcMMO.spoutEnabled) {
                 SpoutSounds.playSoundForPlayer(SoundEffect.POP, player, block.getLocation());
             }
         }
-        else if (PP.getAbilityMode(AbilityType.SUPER_BREAKER) && Skills.triggerCheck(player, block, AbilityType.SUPER_BREAKER)) {
+        else if (profile.getAbilityMode(AbilityType.SUPER_BREAKER) && Skills.triggerCheck(player, block, AbilityType.SUPER_BREAKER)) {
             if (configInstance.getMiningRequiresTool()) {
                 if (ItemChecks.isPickaxe(inHand)) {
-                    if (ModChecks.isCustomTool(inHand)) {
-                        if (ModChecks.getToolFromItemStack(inHand).isAbilityEnabled()) {
-                            event.setInstaBreak(true);
-                            Mining.superBreakerBlockCheck(player, block);
-                        }
-                    }
-                    else {
-                        event.setInstaBreak(true);
-                        Mining.superBreakerBlockCheck(player, block);
-                    }
+                    event.setInstaBreak(true);
+                    Mining.superBreakerBlockCheck(player, block);
                 }
             }
             else {
@@ -322,7 +349,7 @@ public class BlockListener implements Listener {
                 Mining.superBreakerBlockCheck(player, block);
             }
         }
-        else if (PP.getSkillLevel(SkillType.WOODCUTTING) >= LEAF_BLOWER_LEVEL && (material.equals(Material.LEAVES) || (configInstance.getBlockModsEnabled() && ModChecks.isCustomLeafBlock(block)))) {
+        else if (profile.getSkillLevel(SkillType.WOODCUTTING) >= LEAF_BLOWER_LEVEL && (material.equals(Material.LEAVES) || (configInstance.getBlockModsEnabled() && ModChecks.isCustomLeafBlock(block)))) {
             if (Skills.triggerCheck(player, block, AbilityType.LEAF_BLOWER)) {
                 if (configInstance.getWoodcuttingRequiresTool()) {
                     if (ItemChecks.isAxe(inHand)) {

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

@@ -9,6 +9,7 @@ import org.bukkit.entity.Player;
 import org.bukkit.entity.Projectile;
 import org.bukkit.entity.TNTPrimed;
 import org.bukkit.entity.Tameable;
+import org.bukkit.entity.Wolf;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.EventPriority;
 import org.bukkit.event.Listener;
@@ -30,12 +31,12 @@ import com.gmail.nossr50.datatypes.PlayerProfile;
 import com.gmail.nossr50.datatypes.SkillType;
 import com.gmail.nossr50.events.fake.FakeEntityDamageByEntityEvent;
 import com.gmail.nossr50.events.fake.FakeEntityDamageEvent;
-import com.gmail.nossr50.party.Party;
+import com.gmail.nossr50.party.PartyManager;
 import com.gmail.nossr50.runnables.BleedTimer;
-import com.gmail.nossr50.skills.combat.Archery;
-import com.gmail.nossr50.skills.combat.Taming;
+import com.gmail.nossr50.skills.acrobatics.AcrobaticsManager;
+import com.gmail.nossr50.skills.archery.Archery;
 import com.gmail.nossr50.skills.gathering.BlastMining;
-import com.gmail.nossr50.skills.misc.Acrobatics;
+import com.gmail.nossr50.skills.taming.TamingManager;
 import com.gmail.nossr50.util.Combat;
 import com.gmail.nossr50.util.Misc;
 import com.gmail.nossr50.util.Permissions;
@@ -61,6 +62,7 @@ public class EntityListener implements Listener {
         }
 
         Entity attacker = event.getDamager();
+        Entity defender = event.getEntity();
 
         if (attacker instanceof Projectile) {
             attacker = ((Projectile) attacker).getShooter();
@@ -68,26 +70,32 @@ public class EntityListener implements Listener {
         else if (attacker instanceof Tameable) {
             AnimalTamer animalTamer = ((Tameable) attacker).getOwner();
 
-            if (animalTamer instanceof Player) {
-                attacker = (Player) animalTamer;
+            if (animalTamer instanceof Entity) {
+                attacker = (Entity) animalTamer;
             }
         }
 
-        Entity defender = event.getEntity();
+        if (defender instanceof Player) {
+            Player defendingPlayer = (Player) defender;
 
-        if (attacker instanceof Player && defender instanceof Player) {
-            if (Party.getInstance().inSameParty((Player)defender, (Player)attacker)) {
-                event.setCancelled(true);
+            if (!defendingPlayer.isOnline()) {
                 return;
             }
+
+            if (attacker instanceof Player) {
+                if (PartyManager.getInstance().inSameParty(defendingPlayer, (Player) attacker)) {
+                    event.setCancelled(true);
+                    return;
+                }
+            }
         }
 
         /* Check for invincibility */
         if (defender instanceof LivingEntity) {
-            LivingEntity livingDefender = (LivingEntity)defender;
+            LivingEntity livingDefender = (LivingEntity) defender;
 
             if (!Misc.isInvincible(livingDefender, event)) {
-                Combat.combatChecks(event, plugin);
+                Combat.combatChecks(event);
             }
         }
     }
@@ -115,30 +123,42 @@ public class EntityListener implements Listener {
         if (lEntity instanceof Player) {
             /* Check for invincibility */
             Player player = (Player) entity;
-            PlayerProfile PP = Users.getProfile(player);
 
-            if (PP.getGodMode()) {
+            if (!player.isOnline()) {
+                return;
+            }
+
+            PlayerProfile profile = Users.getProfile(player);
+
+            if (profile == null) {
+                return;
+            }
+
+            if (profile.getGodMode()) {
                 event.setCancelled(true);
                 return;
             }
 
             if (!Misc.isInvincible(player, event)) {
-                if (cause == DamageCause.FALL && Permissions.getInstance().acrobatics(player) && !player.isInsideVehicle() && !player.getItemInHand().getType().equals(Material.ENDER_PEARL)) {
-                    Acrobatics.acrobaticsCheck(player, event);
+                if (cause == DamageCause.FALL && !player.isInsideVehicle() && !(player.getItemInHand().getType() == Material.ENDER_PEARL)) {
+                    AcrobaticsManager acroManager = new AcrobaticsManager(player);
+                    acroManager.rollCheck(event);
                 }
                 else if (cause == DamageCause.BLOCK_EXPLOSION && Permissions.getInstance().demolitionsExpertise(player)) {
                     BlastMining.demolitionsExpertise(player, event);
                 }
 
                 if (event.getDamage() >= 1) {
-                    PP.setRecentlyHurt(System.currentTimeMillis());
+                    profile.actualizeRecentlyHurt();
                 }
             }
         } else if (lEntity instanceof Tameable) {
             Tameable pet = (Tameable) lEntity;
+            AnimalTamer owner = pet.getOwner();
 
-            if ((!Misc.isInvincible(lEntity, event)) && pet.isTamed() && (pet.getOwner() instanceof Player)) {
-                Taming.preventDamage(event);
+            if ((!Misc.isInvincible(lEntity, event)) && pet.isTamed() && (owner instanceof Player) && pet instanceof Wolf) {
+                TamingManager tamingManager = new TamingManager((Player) owner);
+                tamingManager.preventDamage(event);
             }
         }
     }
@@ -183,8 +203,8 @@ public class EntityListener implements Listener {
         if (entity instanceof TNTPrimed) {
             int id = entity.getEntityId();
 
-            if (plugin.tntTracker.containsKey(id)) {
-                Player player = plugin.tntTracker.get(id);
+            if (plugin.tntIsTracked(id)) {
+                Player player = plugin.getTNTPlayer(id);
 
                 if (Permissions.getInstance().biggerBombs(player)) {
                     BlastMining.biggerBombs(player, event);
@@ -205,10 +225,10 @@ public class EntityListener implements Listener {
         if (event.getEntity() instanceof TNTPrimed) {
             int id = entity.getEntityId();
 
-            if (plugin.tntTracker.containsKey(id)) {
-                Player player = plugin.tntTracker.get(id);
+            if (plugin.tntIsTracked(id)) {
+                Player player = plugin.getTNTPlayer(id);
                 BlastMining.dropProcessing(player, event);
-                plugin.tntTracker.remove(id);
+                plugin.removeFromTNTTracker(id);
             }
         }
     }
@@ -222,7 +242,7 @@ public class EntityListener implements Listener {
     public void onFoodLevelChange(FoodLevelChangeEvent event) {
         if (event.getEntity() instanceof Player) {
             Player player = (Player) event.getEntity();
-            PlayerProfile PP = Users.getProfile(player);
+            PlayerProfile profile = Users.getProfile(player);
             int currentFoodLevel = player.getFoodLevel();
             int newFoodLevel = event.getFoodLevel();
 
@@ -239,7 +259,7 @@ public class EntityListener implements Listener {
 
             if (newFoodLevel > currentFoodLevel) {
                 Material food = player.getItemInHand().getType();
-                int herbLevel = PP.getSkillLevel(SkillType.HERBALISM);
+                int herbLevel = profile.getSkillLevel(SkillType.HERBALISM);
                 int foodChange = newFoodLevel - currentFoodLevel;
                 int rankChange = 0;
 
@@ -296,7 +316,7 @@ public class EntityListener implements Listener {
         Player player = (Player) event.getOwner();
 
         if (Permissions.getInstance().taming(player) && !event.getEntity().hasMetadata("mcmmoSummoned")) {
-            PlayerProfile PP = Users.getProfile(player);
+            PlayerProfile profile = Users.getProfile(player);
             EntityType type = event.getEntityType();
             int xp = 0;
 
@@ -313,8 +333,7 @@ public class EntityListener implements Listener {
                 break;
             }
 
-            PP.addXP(player, SkillType.TAMING, xp);
-            Skills.XpCheckSkill(SkillType.TAMING, player);
+            Skills.xpProcessing(player, profile, SkillType.TAMING, xp);
         }
     }
 }

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

@@ -2,6 +2,7 @@ package com.gmail.nossr50.listeners;
 
 import org.bukkit.entity.Player;
 import org.bukkit.event.EventHandler;
+import org.bukkit.event.EventPriority;
 import org.bukkit.event.Listener;
 import org.bukkit.event.entity.PlayerDeathEvent;
 
@@ -10,17 +11,21 @@ import com.gmail.nossr50.util.Hardcore;
 import com.gmail.nossr50.util.Permissions;
 
 public class HardcoreListener implements Listener {
-    
-    @EventHandler()
-    public void PlayerDeathEvent(PlayerDeathEvent event) {
+
+    /**
+     * Monitor PlayerDeath events.
+     *
+     * @param event The event to monitor
+     */
+    @EventHandler(priority = EventPriority.MONITOR)
+    public void onPlayerDeath(PlayerDeathEvent event) {
         Player player = event.getEntity(); //Note this returns a Player object for this subevent
-        
-        if(!Permissions.getInstance().hardcoremodeBypass(player)) {
-            if(player.getKiller() instanceof Player) {
-                if(Config.getInstance().getHardcoreVampirismEnabled()) {
-                    Hardcore.invokeVampirism(((Player)player.getKiller()), player);
-                }
+
+        if (!Permissions.getInstance().hardcoremodeBypass(player)) {
+            if (Config.getInstance().getHardcoreVampirismEnabled()) {
+                Hardcore.invokeVampirism(player.getKiller(), player);
             }
+
             Hardcore.invokeStatPenalty(player);
         }
     }

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

@@ -1,19 +1,16 @@
 package com.gmail.nossr50.listeners;
 
-import java.util.HashSet;
-import java.util.Set;
-
 import org.bukkit.ChatColor;
 import org.bukkit.Material;
 import org.bukkit.block.Block;
-import org.bukkit.entity.EntityType;
+import org.bukkit.entity.LivingEntity;
 import org.bukkit.entity.Player;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.EventPriority;
 import org.bukkit.event.Listener;
 import org.bukkit.event.block.Action;
+import org.bukkit.event.player.AsyncPlayerChatEvent;
 import org.bukkit.event.player.PlayerChangedWorldEvent;
-import org.bukkit.event.player.PlayerChatEvent;
 import org.bukkit.event.player.PlayerCommandPreprocessEvent;
 import org.bukkit.event.player.PlayerFishEvent;
 import org.bukkit.event.player.PlayerFishEvent.State;
@@ -22,14 +19,12 @@ import org.bukkit.event.player.PlayerJoinEvent;
 import org.bukkit.event.player.PlayerLoginEvent;
 import org.bukkit.event.player.PlayerPickupItemEvent;
 import org.bukkit.event.player.PlayerQuitEvent;
+import org.bukkit.event.player.PlayerRespawnEvent;
 import org.bukkit.inventory.ItemStack;
 
 import com.gmail.nossr50.mcMMO;
 import com.gmail.nossr50.commands.general.XprateCommand;
 import com.gmail.nossr50.config.Config;
-import com.gmail.nossr50.runnables.BleedTimer;
-import com.gmail.nossr50.runnables.RemoveProfileFromMemoryTask;
-import com.gmail.nossr50.spout.SpoutStuff;
 import com.gmail.nossr50.datatypes.AbilityType;
 import com.gmail.nossr50.datatypes.PlayerProfile;
 import com.gmail.nossr50.datatypes.SkillType;
@@ -37,10 +32,11 @@ import com.gmail.nossr50.events.chat.McMMOAdminChatEvent;
 import com.gmail.nossr50.events.chat.McMMOPartyChatEvent;
 import com.gmail.nossr50.locale.LocaleLoader;
 import com.gmail.nossr50.party.Party;
-import com.gmail.nossr50.skills.combat.Taming;
+import com.gmail.nossr50.runnables.BleedTimer;
 import com.gmail.nossr50.skills.gathering.BlastMining;
 import com.gmail.nossr50.skills.gathering.Fishing;
 import com.gmail.nossr50.skills.gathering.Herbalism;
+import com.gmail.nossr50.skills.taming.TamingManager;
 import com.gmail.nossr50.util.BlockChecks;
 import com.gmail.nossr50.util.Item;
 import com.gmail.nossr50.util.Permissions;
@@ -62,18 +58,22 @@ public class PlayerListener implements Listener {
     @EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true)
     public void onPlayerWorldChangeEvent(PlayerChangedWorldEvent event) {
         Player player = event.getPlayer();
-        PlayerProfile PP = Users.getProfile(player);
+        PlayerProfile profile = Users.getProfile(player);
 
-        if (PP.getGodMode()) {
+        if (profile == null) {
+            return;
+        }
+
+        if (profile.getGodMode()) {
             if (!Permissions.getInstance().mcgod(player)) {
-                PP.toggleGodMode();
+                profile.toggleGodMode();
                 player.sendMessage(LocaleLoader.getString("Commands.GodMode.Forbidden"));
             }
         }
 
-        if (PP.inParty()) {
+        if (profile.inParty()) {
             if (!Permissions.getInstance().party(player)) {
-                PP.removeParty();
+                profile.removeParty();
                 player.sendMessage(LocaleLoader.getString("Party.Forbidden"));
             }
         }
@@ -97,6 +97,10 @@ public class PlayerListener implements Listener {
                 break;
 
             case CAUGHT_ENTITY:
+                if (!(event.getCaught() instanceof LivingEntity)) {
+                    return;
+                }
+
                 if (Users.getProfile(player).getSkillLevel(SkillType.FISHING) >= 150 && Permissions.getInstance().shakeMob(player)) {
                     Fishing.shakeMob(event);
                 }
@@ -115,7 +119,13 @@ public class PlayerListener implements Listener {
      */
     @EventHandler(ignoreCancelled = true)
     public void onPlayerPickupItem(PlayerPickupItemEvent event) {
-        if (Users.getProfile(event.getPlayer()).getAbilityMode(AbilityType.BERSERK)) {
+        PlayerProfile profile = Users.getProfile(event.getPlayer());
+
+        if (profile == null) {
+            return;
+        }
+
+        if (profile.getAbilityMode(AbilityType.BERSERK)) {
              event.setCancelled(true);
         }
     }
@@ -127,7 +137,7 @@ public class PlayerListener implements Listener {
      */
     @EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true)
     public void onPlayerLogin(PlayerLoginEvent event) {
-        Users.addUser(event.getPlayer());
+        Users.addUser(event.getPlayer()).getProfile().actualizeRespawnATS();
     }
 
     /**
@@ -141,16 +151,8 @@ public class PlayerListener implements Listener {
 
         /* GARBAGE COLLECTION */
 
-        //Remove Spout Stuff
-        if (Config.getInstance().spoutEnabled && SpoutStuff.playerHUDs.containsKey(player)) {
-            SpoutStuff.playerHUDs.remove(player);
-        }
-
         //Bleed it out
         BleedTimer.bleedOut(player);
-
-        //Schedule PlayerProfile removal 2 minutes after quitting
-        plugin.getServer().getScheduler().scheduleSyncDelayedTask(plugin, new RemoveProfileFromMemoryTask(player.getName()), 2400);
     }
 
     /**
@@ -161,33 +163,53 @@ public class PlayerListener implements Listener {
     @EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true)
     public void onPlayerJoin(PlayerJoinEvent event) {
         Player player = event.getPlayer();
-        
+
+        //TODO: Locale ALL the things.
         if (Config.getInstance().getMOTDEnabled() && Permissions.getInstance().motd(player)) {
-            String prefix = ChatColor.GOLD+"[mcMMO] ";
-            
-            player.sendMessage(prefix+ChatColor.YELLOW+"Running version " + ChatColor.DARK_AQUA + plugin.getDescription().getVersion()); //TODO: Locale
-            
-            if(Config.getInstance().getHardcoreEnabled()) {
-                if(Config.getInstance().getHardcoreVampirismEnabled()) {
-                    player.sendMessage(prefix+ChatColor.DARK_RED+"Hardcore & Vampirism enabled.");
-                    player.sendMessage(prefix+ChatColor.DARK_AQUA+"Skill Death Penalty: "+ChatColor.DARK_RED+Config.getInstance().getHardcoreDeathStatPenaltyPercentage()+"% "+ChatColor.DARK_AQUA+"Vampirism Stat Leech: "+ChatColor.DARK_RED+Config.getInstance().getHardcoreVampirismStatLeechPercentage()+"%");
-                } else {
-                    player.sendMessage(prefix+ChatColor.DARK_RED+"Hardcore enabled.");
-                    player.sendMessage(prefix+ChatColor.DARK_AQUA+"Skill Death Penalty: "+ChatColor.DARK_RED+Config.getInstance().getHardcoreDeathStatPenaltyPercentage()+"%");
+            String prefix = ChatColor.GOLD + "[mcMMO] ";
+            String perkPrefix = ChatColor.RED + "[mcMMO Perks] ";
+
+            player.sendMessage(prefix + ChatColor.YELLOW + "Running version " + ChatColor.DARK_AQUA + plugin.getDescription().getVersion()); //TODO: Locale
+
+            if (Config.getInstance().getHardcoreEnabled()) {
+                if (Config.getInstance().getHardcoreVampirismEnabled()) {
+                    player.sendMessage(prefix + ChatColor.DARK_RED + "Hardcore & Vampirism enabled.");
+                    player.sendMessage(prefix + ChatColor.DARK_AQUA + "Skill Death Penalty: " + ChatColor.DARK_RED + Config.getInstance().getHardcoreDeathStatPenaltyPercentage() + "% " + ChatColor.DARK_AQUA + "Vampirism Stat Leech: " + ChatColor.DARK_RED + Config.getInstance().getHardcoreVampirismStatLeechPercentage() + "%");
                 }
+                else {
+                    player.sendMessage(prefix + ChatColor.DARK_RED + "Hardcore enabled.");
+                    player.sendMessage(prefix + ChatColor.DARK_AQUA + "Skill Death Penalty: " + ChatColor.DARK_RED + Config.getInstance().getHardcoreDeathStatPenaltyPercentage() + "%");
+                }
+            }   
+
+            if (player.hasPermission("mcmmo.perks.xp.quadruple")) {
+                player.sendMessage(perkPrefix + ChatColor.DARK_AQUA + "Quadruple XP - Receive 4x XP.");
             }
-            
-            player.sendMessage(ChatColor.GOLD+"[mcMMO] "+ChatColor.GREEN+ "http://www.mcmmo.info" + ChatColor.YELLOW + " - mcMMO Website & Forums"); //TODO: Locale
+            else if (player.hasPermission("mcmmo.perks.xp.triple")) {
+                player.sendMessage(perkPrefix + ChatColor.DARK_AQUA + "Triple XP - Receive 3x XP.");
+            }
+            else if (player.hasPermission("mcmmo.perks.xp.double")) {
+                player.sendMessage(perkPrefix + ChatColor.DARK_AQUA + "Double XP - Receive 2x XP.");
+            }
+
+            player.sendMessage(ChatColor.GOLD+"[mcMMO] " + ChatColor.GREEN + "http://www.mcmmo.info" + ChatColor.YELLOW + " - mcMMO Website & Forums"); //TODO: Locale
             //player.sendMessage(LocaleLoader.getString("mcMMO.MOTD", new Object[] {plugin.getDescription().getVersion()}));
             //player.sendMessage(LocaleLoader.getString("mcMMO.Website"));
         }
 
         //THIS IS VERY BAD WAY TO DO THINGS, NEED BETTER WAY
-        if (XprateCommand.xpevent) {
+        if (XprateCommand.isXpEventRunning()) {
             player.sendMessage(LocaleLoader.getString("XPRate.Event", new Object[] {Config.getInstance().xpGainMultiplier}));
         }
-        
-        
+    }
+
+    @EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true)
+    public void onPlayerRespawn(PlayerRespawnEvent event) {
+        PlayerProfile profile = Users.getProfile(event.getPlayer());
+
+        if (profile != null) {
+            profile.actualizeRespawnATS();
+        }
     }
 
     /**
@@ -281,12 +303,16 @@ public class PlayerListener implements Listener {
         case LEFT_CLICK_BLOCK:
 
             /* CALL OF THE WILD CHECKS */
-            if (player.isSneaking() && Permissions.getInstance().taming(player)) {
-                if (inHand.getType().equals(Material.RAW_FISH)) {
-                    Taming.animalSummon(EntityType.OCELOT, player, plugin);
+            if (player.isSneaking()) {
+                Material type = inHand.getType();
+
+                if (type == Material.RAW_FISH) {
+                    TamingManager tamingManager = new TamingManager(player);
+                    tamingManager.summonOcelot();
                 }
-                else if (inHand.getType().equals(Material.BONE)) {
-                    Taming.animalSummon(EntityType.WOLF, player, plugin);
+                else if (type == Material.BONE) {
+                    TamingManager tamingManager = new TamingManager(player);
+                    tamingManager.summonWolf();
                 }
             }
 
@@ -303,58 +329,61 @@ public class PlayerListener implements Listener {
      * @param event The event to watch
      */
     @EventHandler(priority = EventPriority.HIGH, ignoreCancelled = true)
-    public void onPlayerChat(PlayerChatEvent event) {
+    public void onPlayerChat(AsyncPlayerChatEvent event) {
         Player player = event.getPlayer();
-        PlayerProfile PP = Users.getProfile(player);
+        PlayerProfile profile = Users.getProfile(player);
 
-        if (PP.getPartyChatMode()) {
-            if (!PP.inParty()) {
+        if (profile == null) {
+            return;
+        }
+
+        if (profile.getPartyChatMode()) {
+            Party party = profile.getParty();
+
+            if (party == null) {
                 player.sendMessage("You're not in a party, type /p to leave party chat mode."); //TODO: Use mcLocale
                 return;
             }
 
-            McMMOPartyChatEvent chatEvent = new McMMOPartyChatEvent(player.getName(), PP.getParty(), event.getMessage());
+            String partyName = party.getName();
+            String playerName = player.getName();
+            McMMOPartyChatEvent chatEvent = new McMMOPartyChatEvent(playerName, partyName, event.getMessage());
             plugin.getServer().getPluginManager().callEvent(chatEvent);
 
             if (chatEvent.isCancelled()) {
                 return;
             }
 
-            event.setMessage(chatEvent.getMessage());
+            String prefix = ChatColor.GREEN + "(" + ChatColor.WHITE + playerName + ChatColor.GREEN + ") ";
 
-            Set<Player> intendedRecipients = new HashSet<Player>();
+            plugin.getLogger().info("[P](" + partyName + ")" + "<" + playerName + "> " + chatEvent.getMessage());
 
-            for (Player x : Party.getInstance().getOnlineMembers(player)) {
-                intendedRecipients.add(x);
+            for (Player member : party.getOnlineMembers()) {
+                member.sendMessage(prefix + chatEvent.getMessage());
             }
 
-            ChatColor bracketColor = ChatColor.GREEN;
-
-            event.setFormat(bracketColor + "(" + ChatColor.WHITE + "%1$s" + bracketColor + ") %2$s");
-            event.getRecipients().retainAll(intendedRecipients);
+            event.setCancelled(true);
         }
-        else if (PP.getAdminChatMode()) {
-            McMMOAdminChatEvent chatEvent = new McMMOAdminChatEvent(player.getName(), event.getMessage());
+        else if (profile.getAdminChatMode()) {
+            String playerName = player.getName();
+            McMMOAdminChatEvent chatEvent = new McMMOAdminChatEvent(playerName, event.getMessage());
             plugin.getServer().getPluginManager().callEvent(chatEvent);
 
             if (chatEvent.isCancelled()) {
                 return;
             }
 
-            event.setMessage(chatEvent.getMessage());
+            String prefix = ChatColor.AQUA + "{" + ChatColor.WHITE + playerName + ChatColor.AQUA + "} ";
 
-            Set<Player> intendedRecipients = new HashSet<Player>();
+            plugin.getLogger().info("[A]<" + playerName + "> " + chatEvent.getMessage());
 
-            for (Player x : plugin.getServer().getOnlinePlayers()) {
-                if (x.isOp() || Permissions.getInstance().adminChat(x)) {
-                    intendedRecipients.add(x);
+            for (Player otherPlayer : plugin.getServer().getOnlinePlayers()) {
+                if (Permissions.getInstance().adminChat(otherPlayer) || otherPlayer.isOp()) {
+                    otherPlayer.sendMessage(prefix + chatEvent.getMessage());
                 }
             }
 
-            ChatColor bracketColor = ChatColor.AQUA;
-
-            event.setFormat(bracketColor + "{" + ChatColor.WHITE + "%1$s" + bracketColor + "} %2$s");
-            event.getRecipients().retainAll(intendedRecipients);
+            event.setCancelled(true);
         }
     }
 
@@ -369,13 +398,13 @@ public class PlayerListener implements Listener {
         String command = message.substring(1).split(" ")[0];
         String lowerCaseCommand = command.toLowerCase();
 
-        if (plugin.aliasMap.containsKey(lowerCaseCommand)) {
+        if (plugin.commandIsAliased(lowerCaseCommand)) {
             //We should find a better way to avoid string replacement where the alias is equals to the command
-            if (command.equals(plugin.aliasMap.get(lowerCaseCommand))) {
+            if (command.equals(plugin.getCommandAlias(lowerCaseCommand))) {
                 return;
             }
 
-            event.setMessage(message.replace(command, plugin.aliasMap.get(lowerCaseCommand)));
+            event.setMessage(message.replace(command, plugin.getCommandAlias(lowerCaseCommand)));
         }
     }
 }

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

@@ -1,48 +0,0 @@
-package com.gmail.nossr50.listeners;
-
-import org.bukkit.event.EventHandler;
-import org.bukkit.event.Listener;
-import org.getspout.spoutapi.event.input.KeyPressedEvent;
-import org.getspout.spoutapi.gui.ScreenType;
-import org.getspout.spoutapi.player.SpoutPlayer;
-
-import com.gmail.nossr50.mcMMO;
-import com.gmail.nossr50.datatypes.popups.PopupMMO;
-import com.gmail.nossr50.spout.SpoutStuff;
-import com.gmail.nossr50.util.Users;
-
-public class SpoutInputListener implements Listener {
-    private mcMMO plugin;
-
-    public SpoutInputListener(mcMMO plugin) {
-        this.plugin = plugin;
-    }
-
-    /**
-     * Monitor Spout KeyPressed events.
-     *
-     * @param event The event to watch
-     */
-    @EventHandler
-    public void onKeyPressedEvent(KeyPressedEvent event) {
-        SpoutPlayer sPlayer = event.getPlayer();
-
-        if (!sPlayer.isSpoutCraftEnabled() || sPlayer.getMainScreen().getActivePopup() != null || event.getScreenType() != ScreenType.GAME_SCREEN) {
-            return;
-        }
-
-        if (event.getKey() == SpoutStuff.keypress) {
-            if (!SpoutStuff.playerScreens.containsKey(sPlayer)) {
-                PopupMMO mmoPop = new PopupMMO(sPlayer, Users.getProfile(sPlayer), plugin);
-
-                SpoutStuff.playerScreens.put(sPlayer, mmoPop);
-                sPlayer.getMainScreen().attachPopupScreen(SpoutStuff.playerScreens.get(sPlayer));
-                sPlayer.getMainScreen().setDirty(true);
-            }
-            else {
-                sPlayer.getMainScreen().attachPopupScreen(SpoutStuff.playerScreens.get(sPlayer));
-                sPlayer.getMainScreen().setDirty(true);
-            }
-        }
-    }
-}

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

@@ -3,24 +3,24 @@ package com.gmail.nossr50.listeners;
 import org.bukkit.ChatColor;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.Listener;
+import org.getspout.spoutapi.event.input.KeyPressedEvent;
+import org.getspout.spoutapi.event.screen.ButtonClickEvent;
+import org.getspout.spoutapi.event.screen.ScreenCloseEvent;
 import org.getspout.spoutapi.event.spout.SpoutCraftEnableEvent;
+import org.getspout.spoutapi.gui.Button;
+import org.getspout.spoutapi.gui.ScreenType;
 import org.getspout.spoutapi.player.SpoutPlayer;
 
-import com.gmail.nossr50.mcMMO;
-import com.gmail.nossr50.config.Config;
-import com.gmail.nossr50.datatypes.HUDmmo;
+import com.gmail.nossr50.config.SpoutConfig;
+import com.gmail.nossr50.datatypes.McMMOPlayer;
+import com.gmail.nossr50.datatypes.SpoutHud;
 import com.gmail.nossr50.datatypes.PlayerProfile;
+import com.gmail.nossr50.datatypes.buttons.McmmoButton;
+import com.gmail.nossr50.datatypes.popups.Menu;
 import com.gmail.nossr50.spout.SpoutStuff;
 import com.gmail.nossr50.util.Users;
 
 public class SpoutListener implements Listener {
-    //Why do we have this here? We never use it...
-    mcMMO plugin = null;
-
-    public SpoutListener(mcMMO pluginx) {
-        plugin = pluginx;
-    }
-
     /**
      * Monitor SpoutCraftEnable events.
      *
@@ -28,19 +28,66 @@ public class SpoutListener implements Listener {
      */
     @EventHandler
     public void onSpoutCraftEnable(SpoutCraftEnableEvent event) {
-        SpoutPlayer sPlayer = event.getPlayer();
-        PlayerProfile PPs = Users.getProfile(sPlayer);
+        SpoutPlayer spoutPlayer = event.getPlayer();
+        McMMOPlayer mcMMOPlayer = Users.getPlayer(spoutPlayer);
+        PlayerProfile profile = mcMMOPlayer.getProfile();
 
         //TODO: Add custom titles based on skills
-        if (Config.getInstance().getShowPowerLevelForSpout()) {
-            sPlayer.setTitle(sPlayer.getName()+ "\n" + ChatColor.YELLOW + "P" + ChatColor.GOLD + "lvl"
-        + ChatColor.WHITE+"." + ChatColor.GREEN + String.valueOf(PPs.getPowerLevel()));
+        if (SpoutConfig.getInstance().getShowPowerLevel()) {
+            spoutPlayer.setTitle(spoutPlayer.getName() + "\n" + ChatColor.YELLOW + "P" + ChatColor.GOLD + "lvl" + ChatColor.WHITE+"." + ChatColor.GREEN + String.valueOf(mcMMOPlayer.getPowerLevel()));
         }
 
-        if (sPlayer.isSpoutCraftEnabled()) {
-            SpoutStuff.playerHUDs.put(sPlayer, new HUDmmo(sPlayer, plugin)); //Setup Party HUD stuff
-            
-            PPs.toggleSpoutEnabled();
+        profile.setSpoutHud(new SpoutHud(mcMMOPlayer)); //Setup Party HUD stuff
+    }
+
+    /**
+     * Monitor Spout ButtonClick events.
+     *
+     * @param event The event to watch
+     */
+    @EventHandler
+    public void onButtonClick(ButtonClickEvent event) {
+        Button button = event.getButton();
+
+        if (button instanceof McmmoButton) {
+            ((McmmoButton) button).activate();
         }
     }
-}
+
+    /**
+     * Monitor Spout ScreenClose events.
+     *
+     * @param event The event to watch
+     */
+    @EventHandler
+    public void onScreenClose(ScreenCloseEvent event) {
+        if (event.getScreen() instanceof Menu) {
+            SpoutPlayer spoutPlayer = event.getPlayer();
+
+            Users.getProfile(spoutPlayer).getSpoutHud().onMenuClose();
+            spoutPlayer.getMainScreen().setDirty(true);
+        }
+    }
+
+    /**
+     * Monitor Spout KeyPressed events.
+     *
+     * @param event The event to watch
+     */
+    @EventHandler
+    public void onKeyPressedEvent(KeyPressedEvent event) {
+        SpoutPlayer spoutPlayer = event.getPlayer();
+
+        if (spoutPlayer.getMainScreen().getActivePopup() != null || event.getScreenType() != ScreenType.GAME_SCREEN) {
+            return;
+        }
+
+        if (event.getKey() == SpoutStuff.keypress) {
+            SpoutHud spoutHud = Users.getProfile(spoutPlayer).getSpoutHud();
+
+            if (!spoutHud.isMenuOpened()) {
+                spoutHud.openMenu();
+            }
+        }
+    }
+}

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

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

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

@@ -4,7 +4,6 @@ import java.io.File;
 
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.Listener;
-import org.bukkit.event.world.ChunkLoadEvent;
 import org.bukkit.event.world.ChunkUnloadEvent;
 import org.bukkit.event.world.WorldLoadEvent;
 import org.bukkit.event.world.WorldSaveEvent;
@@ -31,13 +30,8 @@ public class WorldListener implements Listener {
         mcMMO.placeStore.saveWorld(event.getWorld());
     }
 
-    @EventHandler
-    public void onChunkLoad(ChunkLoadEvent event) {
-        mcMMO.placeStore.chunkLoaded(event.getChunk().getX(), event.getChunk().getZ(), event.getChunk().getWorld());
-    }
-
     @EventHandler
     public void onChunkUnload(ChunkUnloadEvent event) {
-        mcMMO.placeStore.chunkUnloaded(event.getChunk().getX(), event.getChunk().getZ(), event.getChunk().getWorld());
+        mcMMO.placeStore.chunkUnloaded(event.getChunk().getX(), event.getChunk().getZ(), event.getWorld());
     }
 }

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

@@ -1,19 +1,75 @@
 package com.gmail.nossr50;
 
-import com.gmail.nossr50.datatypes.PlayerProfile;
-import com.gmail.nossr50.commands.skills.*;
-import com.gmail.nossr50.commands.spout.*;
-import com.gmail.nossr50.commands.mc.*;
-import com.gmail.nossr50.commands.party.*;
-import com.gmail.nossr50.commands.general.*;
+import java.io.File;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+
+import net.shatteredlands.shatt.backup.ZipLibrary;
+
+import org.bukkit.OfflinePlayer;
+import org.bukkit.entity.Player;
+import org.bukkit.plugin.PluginDescriptionFile;
+import org.bukkit.plugin.PluginManager;
+import org.bukkit.plugin.java.JavaPlugin;
+import org.bukkit.scheduler.BukkitScheduler;
+
+import com.gmail.nossr50.commands.general.AddlevelsCommand;
+import com.gmail.nossr50.commands.general.AddxpCommand;
+import com.gmail.nossr50.commands.general.InspectCommand;
+import com.gmail.nossr50.commands.general.McstatsCommand;
+import com.gmail.nossr50.commands.general.MmoeditCommand;
+import com.gmail.nossr50.commands.general.MmoupdateCommand;
+import com.gmail.nossr50.commands.general.SkillResetCommand;
+import com.gmail.nossr50.commands.general.XprateCommand;
+import com.gmail.nossr50.commands.mc.McabilityCommand;
+import com.gmail.nossr50.commands.mc.MccCommand;
+import com.gmail.nossr50.commands.mc.McgodCommand;
+import com.gmail.nossr50.commands.mc.McmmoCommand;
+import com.gmail.nossr50.commands.mc.McrefreshCommand;
+import com.gmail.nossr50.commands.mc.McremoveCommand;
+import com.gmail.nossr50.commands.mc.MctopCommand;
+import com.gmail.nossr50.commands.party.ACommand;
+import com.gmail.nossr50.commands.party.AcceptCommand;
+import com.gmail.nossr50.commands.party.InviteCommand;
+import com.gmail.nossr50.commands.party.PCommand;
+import com.gmail.nossr50.commands.party.PartyCommand;
+import com.gmail.nossr50.commands.party.PtpCommand;
+import com.gmail.nossr50.commands.skills.AcrobaticsCommand;
+import com.gmail.nossr50.commands.skills.ArcheryCommand;
+import com.gmail.nossr50.commands.skills.AxesCommand;
+import com.gmail.nossr50.commands.skills.ExcavationCommand;
+import com.gmail.nossr50.commands.skills.FishingCommand;
+import com.gmail.nossr50.commands.skills.HerbalismCommand;
+import com.gmail.nossr50.commands.skills.MiningCommand;
+import com.gmail.nossr50.commands.skills.RepairCommand;
+import com.gmail.nossr50.commands.skills.SwordsCommand;
+import com.gmail.nossr50.commands.skills.TamingCommand;
+import com.gmail.nossr50.commands.skills.UnarmedCommand;
+import com.gmail.nossr50.commands.skills.WoodcuttingCommand;
+import com.gmail.nossr50.commands.spout.MchudCommand;
+import com.gmail.nossr50.commands.spout.XplockCommand;
 import com.gmail.nossr50.config.Config;
 import com.gmail.nossr50.config.HiddenConfig;
-import com.gmail.nossr50.config.RepairConfigManager;
 import com.gmail.nossr50.config.TreasuresConfig;
-import com.gmail.nossr50.config.mods.CustomBlocksConfig;
 import com.gmail.nossr50.config.mods.CustomArmorConfig;
+import com.gmail.nossr50.config.mods.CustomBlocksConfig;
 import com.gmail.nossr50.config.mods.CustomToolsConfig;
-import com.gmail.nossr50.runnables.*;
+import com.gmail.nossr50.config.repair.RepairConfigManager;
+import com.gmail.nossr50.datatypes.PlayerProfile;
+import com.gmail.nossr50.listeners.BlockListener;
+import com.gmail.nossr50.listeners.EntityListener;
+import com.gmail.nossr50.listeners.HardcoreListener;
+import com.gmail.nossr50.listeners.PlayerListener;
+import com.gmail.nossr50.listeners.WorldListener;
+import com.gmail.nossr50.locale.LocaleLoader;
+import com.gmail.nossr50.party.PartyManager;
+import com.gmail.nossr50.runnables.BleedTimer;
+import com.gmail.nossr50.runnables.ChunkletUnloader;
+import com.gmail.nossr50.runnables.SaveTimer;
+import com.gmail.nossr50.runnables.SkillMonitor;
+import com.gmail.nossr50.runnables.SpoutStart;
 import com.gmail.nossr50.skills.repair.RepairManager;
 import com.gmail.nossr50.skills.repair.RepairManagerFactory;
 import com.gmail.nossr50.skills.repair.Repairable;
@@ -24,30 +80,6 @@ import com.gmail.nossr50.util.Metrics.Graph;
 import com.gmail.nossr50.util.Users;
 import com.gmail.nossr50.util.blockmeta.ChunkletManager;
 import com.gmail.nossr50.util.blockmeta.ChunkletManagerFactory;
-import com.gmail.nossr50.listeners.BlockListener;
-import com.gmail.nossr50.listeners.EntityListener;
-import com.gmail.nossr50.listeners.HardcoreListener;
-import com.gmail.nossr50.listeners.PlayerListener;
-import com.gmail.nossr50.listeners.WorldListener;
-import com.gmail.nossr50.locale.LocaleLoader;
-
-import net.shatteredlands.shatt.backup.ZipLibrary;
-
-import java.io.File;
-import java.io.IOException;
-import java.io.InputStream;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-
-import org.bukkit.OfflinePlayer;
-import org.bukkit.plugin.PluginDescriptionFile;
-import org.bukkit.plugin.java.JavaPlugin;
-import org.bukkit.plugin.PluginManager;
-import org.bukkit.scheduler.BukkitScheduler;
-import org.bukkit.configuration.file.FileConfiguration;
-import org.bukkit.configuration.file.YamlConfiguration;
-import org.bukkit.entity.Player;
 
 public class mcMMO extends JavaPlugin {
 
@@ -57,25 +89,32 @@ public class mcMMO extends JavaPlugin {
     private final WorldListener worldListener = new WorldListener();
     private final HardcoreListener hardcoreListener = new HardcoreListener();
 
-    public HashMap<String, String> aliasMap = new HashMap<String, String>(); //Alias - Command
-    public HashMap<Integer, Player> tntTracker = new HashMap<Integer, Player>();
+    private HashMap<String, String> aliasMap = new HashMap<String, String>(); //Alias - Command
+    private HashMap<Integer, String> tntTracker = new HashMap<Integer, String>();
 
-    public static File versionFile;
-    public static Database database;
+    private static Database database;
     public static mcMMO p;
 
     public static ChunkletManager placeStore;
     public static RepairManager repairManager;
 
     /* Jar Stuff */
-    public File mcmmo;
+    public static File mcmmo;
 
     //File Paths
-    public String mainDirectory, flatFileDirectory, usersFile, leaderboardDirectory, modDirectory;
+    private static String mainDirectory;
+    private static String flatFileDirectory;
+    private static String usersFile;
+    private static String leaderboardDirectory;
+    private static String modDirectory;
+
+    //Spout Check
+    public static boolean spoutEnabled;
 
     /**
      * Things to be run when the plugin is enabled.
      */
+    @Override
     public void onEnable() {
         p = this;
         setupFilePaths();
@@ -88,17 +127,15 @@ public class mcMMO extends JavaPlugin {
         List<Repairable> repairables = new ArrayList<Repairable>();
 
         if (configInstance.getToolModsEnabled()) {
-            CustomToolsConfig.getInstance().load();
             repairables.addAll(CustomToolsConfig.getInstance().getLoadedRepairables());
         }
 
         if (configInstance.getArmorModsEnabled()) {
-            CustomArmorConfig.getInstance().load();
             repairables.addAll(CustomArmorConfig.getInstance().getLoadedRepairables());
         }
 
         if (configInstance.getBlockModsEnabled()) {
-            CustomBlocksConfig.getInstance().load();
+            CustomBlocksConfig.getInstance();
         }
 
         //Load repair configs, make manager, and register them at this time
@@ -111,16 +148,16 @@ public class mcMMO extends JavaPlugin {
             Users.loadUsers();
         }
 
-        PluginManager pm = getServer().getPluginManager();
+        PluginManager pluginManager = getServer().getPluginManager();
 
         //Register events
-        pm.registerEvents(playerListener, this);
-        pm.registerEvents(blockListener, this);
-        pm.registerEvents(entityListener, this);
-        pm.registerEvents(worldListener, this);
+        pluginManager.registerEvents(playerListener, this);
+        pluginManager.registerEvents(blockListener, this);
+        pluginManager.registerEvents(entityListener, this);
+        pluginManager.registerEvents(worldListener, this);
 
         if (configInstance.getHardcoreEnabled()) {
-            pm.registerEvents(hardcoreListener, this);
+            pluginManager.registerEvents(hardcoreListener, this);
         }
 
         PluginDescriptionFile pdfFile = getDescription();
@@ -144,12 +181,14 @@ public class mcMMO extends JavaPlugin {
 
         //Schedule Spout Activation 1 second after start-up
         scheduler.scheduleSyncDelayedTask(this, new SpoutStart(this), 20);
-        //Periodic save timer (Saves every 10 minutes)
+        //Periodic save timer (Saves every 10 minutes by default)
         scheduler.scheduleSyncRepeatingTask(this, new SaveTimer(this), 0, configInstance.getSaveInterval() * 1200);
         //Regen & Cooldown timer (Runs every second)
         scheduler.scheduleSyncRepeatingTask(this, new SkillMonitor(this), 0, 20);
         //Bleed timer (Runs every two seconds)
         scheduler.scheduleSyncRepeatingTask(this, new BleedTimer(), 0, 40);
+        //Chunklet unloader (Runs every 20 seconds by default)
+        scheduler.scheduleSyncRepeatingTask(this, new ChunkletUnloader(), 0, ChunkletUnloader.RUN_INTERVAL * 20);
 
         registerCommands();
 
@@ -159,14 +198,15 @@ public class mcMMO extends JavaPlugin {
 
                 Graph graph = metrics.createGraph("Percentage of servers using timings");
 
-                if(pm.useTimings()) {
+                if (pluginManager.useTimings()) {
                     graph.addPlotter(new Metrics.Plotter("Enabled") {
                         @Override
                         public int getValue() {
                             return 1;
                         }
                     });
-                } else {
+                }
+                else {
                     graph.addPlotter(new Metrics.Plotter("Disabled") {
                         @Override
                         public int getValue() {
@@ -198,18 +238,6 @@ public class mcMMO extends JavaPlugin {
         modDirectory = mainDirectory + "ModConfigs" + File.separator;
     }
 
-    /**
-     * Get profile of the player.
-     * </br>
-     * This function is designed for API usage.
-     *
-     * @param player Player whose profile to get
-     * @return the PlayerProfile object
-     */
-    public PlayerProfile getPlayerProfile(Player player) {
-        return Users.getProfile(player);
-    }
-
     /**
      * Get profile of the player by name.
      * </br>
@@ -218,38 +246,45 @@ public class mcMMO extends JavaPlugin {
      * @param playerName Name of player whose profile to get
      * @return the PlayerProfile object
      */
-    public PlayerProfile getPlayerProfileByName(String playerName) {
-        return Users.getProfileByName(playerName);
+    public PlayerProfile getPlayerProfile(String playerName) {
+        return Users.getProfile(playerName);
     }
 
     /**
-     * Get profile of the offline player.
+     * Get profile of the player.
      * </br>
      * This function is designed for API usage.
      *
-     * @param player Offline player whose profile to get
+     * @param player player whose profile to get
      * @return the PlayerProfile object
      */
-    public PlayerProfile getOfflinePlayerProfile(OfflinePlayer player) {
+    public PlayerProfile getPlayerProfile(OfflinePlayer player) {
+        return Users.getProfile(player);
+    }
+
+    /**
+     * Get profile of the player.
+     * </br>
+     * This function is designed for API usage.
+     *
+     * @param player player whose profile to get
+     * @return the PlayerProfile object
+     */
+    @Deprecated
+    public PlayerProfile getPlayerProfile(Player player) {
         return Users.getProfile(player);
     }
 
     /**
      * Things to be run when the plugin is disabled.
      */
+    @Override
     public void onDisable() {
-        //Make sure to save player information if the server shuts down
-        for (PlayerProfile x : Users.getProfiles().values()) {
-            x.save();
-        }
-
+        Users.saveAll(); //Make sure to save player information if the server shuts down
+        PartyManager.getInstance().saveParties();
         getServer().getScheduler().cancelTasks(this); //This removes our tasks
-
-        //Save our metadata
-        placeStore.saveAll();
-
-        //Cleanup empty metadata stores
-        placeStore.cleanUp();
+        placeStore.saveAll(); //Save our metadata
+        placeStore.cleanUp(); //Cleanup empty metadata stores
 
         //Remove other tasks BEFORE starting the Backup, or we just cancel it straight away.
         try {
@@ -331,6 +366,10 @@ public class mcMMO extends JavaPlugin {
             getCommand("mcstats").setExecutor(new McstatsCommand());
         }
 
+        if (configInstance.getCommandSkillResetEnabled()) {
+            getCommand("skillreset").setExecutor(new SkillResetCommand());
+        }
+
         //Party commands
         if (configInstance.getCommandAcceptEnabled()) {
             getCommand("accept").setExecutor(new AcceptCommand(this));
@@ -366,11 +405,11 @@ public class mcMMO extends JavaPlugin {
         }
 
         if (configInstance.getCommandMmoeditEnabled()) {
-            getCommand("mmoedit").setExecutor(new MmoeditCommand(this));
+            getCommand("mmoedit").setExecutor(new MmoeditCommand());
         }
 
         if (configInstance.getCommandInspectEnabled()) {
-            getCommand("inspect").setExecutor(new InspectCommand(this));
+            getCommand("inspect").setExecutor(new InspectCommand());
         }
 
         if (configInstance.getCommandXPRateEnabled()) {
@@ -384,223 +423,90 @@ public class mcMMO extends JavaPlugin {
             getCommand("xplock").setExecutor(new XplockCommand());
         }
 
-        getCommand("mchud").setExecutor(new MchudCommand(this));
-    }
-
-    /*
-     * Boilerplate Custom Config Stuff (Treasures)
-     */
-
-    private FileConfiguration treasuresConfig = null;
-    private File treasuresConfigFile = null;
-
-    /**
-     * Reload the Treasures.yml file.
-     */
-    public void reloadTreasuresConfig() {
-        if (treasuresConfigFile == null) {
-            treasuresConfigFile = new File(getDataFolder(), "treasures.yml");
-        }
-
-        treasuresConfig = YamlConfiguration.loadConfiguration(treasuresConfigFile);
-
-        if (isInJar("treasures.yml")) {
-            InputStream defConfigStream = getResource("treasures.yml");
-            YamlConfiguration defConfig = YamlConfiguration.loadConfiguration(defConfigStream);
-            treasuresConfig.setDefaults(defConfig);
-        }
+        getCommand("mchud").setExecutor(new MchudCommand());
     }
 
     /**
-     * Get the Treasures config information.
+     * Checks to see if the alias map contains the given key.
      *
-     * @return the configuration object for treasures.yml
+     * @param command The command to check
+     * @return true if the command is in the map, false otherwise
      */
-    public FileConfiguration getTreasuresConfig() {
-        if (treasuresConfig == null) {
-            reloadTreasuresConfig();
-        }
-
-        return treasuresConfig;
+    public boolean commandIsAliased(String command) {
+        return aliasMap.containsKey(command);
     }
 
     /**
-     * Save the Treasures config informtion.
-     */
-    public void saveTreasuresConfig() {
-        if (treasuresConfig == null || treasuresConfigFile == null) {
-            return;
-        }
-
-        try {
-            treasuresConfig.save(treasuresConfigFile);
-        }
-        catch (IOException ex) {
-            getLogger().severe("Could not save config to " + treasuresConfigFile + ex.toString());
-        }
-    }
-
-    /*
-     * Boilerplate Custom Config Stuff (Tools)
-     */
-
-    private FileConfiguration toolsConfig = null;
-    private File toolsConfigFile = null;
-
-    /**
-     * Reload the Tools.yml file.
-     */
-    public void reloadToolsConfig() {
-        if (toolsConfigFile == null) {
-            toolsConfigFile = new File(modDirectory, "tools.yml");
-        }
-
-        toolsConfig = YamlConfiguration.loadConfiguration(toolsConfigFile);
-
-        if (isInJar("tools.yml")) {
-            InputStream defConfigStream = getResource("tools.yml");
-            YamlConfiguration defConfig = YamlConfiguration.loadConfiguration(defConfigStream);
-            toolsConfig.setDefaults(defConfig);
-        }
-    }
-
-    /**
-     * Get the Tools config information.
+     * Get the alias of a given command.
      *
-     * @return the configuration object for tools.yml
+     * @param command The command to retrieve the alias of
+     * @return the alias of the command
      */
-    public FileConfiguration getToolsConfig() {
-        if (toolsConfig == null) {
-            reloadToolsConfig();
-        }
-
-        return toolsConfig;
+    public String getCommandAlias(String command) {
+        return aliasMap.get(command);
     }
 
     /**
-     * Save the Tools config informtion.
-     */
-    public void saveToolsConfig() {
-        if (toolsConfig == null || toolsConfigFile == null) {
-            return;
-        }
-
-        try {
-            toolsConfig.save(toolsConfigFile);
-        }
-        catch (IOException ex) {
-            getLogger().severe("Could not save config to " + toolsConfigFile + ex.toString());
-        }
-    }
-
-    /*
-     * Boilerplate Custom Config Stuff (Armor)
-     */
-
-    private FileConfiguration armorConfig = null;
-    private File armorConfigFile = null;
-
-    /**
-     * Reload the Armor.yml file.
-     */
-    public void reloadArmorConfig() {
-        if (armorConfigFile == null) {
-            armorConfigFile = new File(modDirectory, "armor.yml");
-        }
-
-        armorConfig = YamlConfiguration.loadConfiguration(armorConfigFile);
-
-        if (isInJar("armor.yml")) {
-            InputStream defConfigStream = getResource("armor.yml");
-            YamlConfiguration defConfig = YamlConfiguration.loadConfiguration(defConfigStream);
-            armorConfig.setDefaults(defConfig);
-        }
-    }
-
-    /**
-     * Get the Armor config information.
+     * Add a set of values to the TNT tracker.
      *
-     * @return the configuration object for armor.yml
+     * @param tntID The EntityID of the TNT
+     * @param playerName The name of the detonating player
      */
-    public FileConfiguration getArmorConfig() {
-        if (armorConfig == null) {
-            reloadArmorConfig();
-        }
-
-        return armorConfig;
+    public void addToTNTTracker(int tntID, String playerName) {
+        tntTracker.put(tntID, playerName);
     }
 
     /**
-     * Save the Armor config informtion.
-     */
-    public void saveArmorConfig() {
-        if (armorConfig == null || armorConfigFile == null) {
-            return;
-        }
-
-        try {
-            armorConfig.save(armorConfigFile);
-        }
-        catch (IOException ex) {
-            getLogger().severe("Could not save config to " + armorConfigFile + ex.toString());
-        }
-    }
-
-    /*
-     * Boilerplate Custom Config Stuff (Blocks)
-     */
-
-    private FileConfiguration blocksConfig = null;
-    private File blocksConfigFile = null;
-
-    /**
-     * Reload the Blocks.yml file.
-     */
-    public void reloadBlocksConfig() {
-        if (blocksConfigFile == null) {
-            blocksConfigFile = new File(modDirectory, "blocks.yml");
-        }
-
-        blocksConfig = YamlConfiguration.loadConfiguration(blocksConfigFile);
-
-        if (isInJar("blocks.yml")) {
-            InputStream defConfigStream = getResource("blocks.yml");
-            YamlConfiguration defConfig = YamlConfiguration.loadConfiguration(defConfigStream);
-            blocksConfig.setDefaults(defConfig);
-        }
-    }
-
-    /**
-     * Get the Blocks config information.
+     * Check to see if a given TNT Entity is tracked.
      *
-     * @return the configuration object for blocks.yml
+     * @param tntID The EntityID of the TNT
+     * @return true if the TNT is being tracked, false otherwise
      */
-    public FileConfiguration getBlocksConfig() {
-        if (blocksConfig == null) {
-            reloadBlocksConfig();
-        }
-
-        return blocksConfig;
+    public boolean tntIsTracked(int tntID) {
+        return tntTracker.containsKey(tntID);
     }
 
     /**
-     * Save the Blocks config informtion.
+     * Get the player who detonated the TNT.
+     *
+     * @param tntID The EntityID of the TNT
+     * @return the Player who detonated it
      */
-    public void saveBlocksConfig() {
-        if (blocksConfig == null || blocksConfigFile == null) {
-            return;
-        }
-
-        try {
-            blocksConfig.save(blocksConfigFile);
-        }
-        catch (IOException ex) {
-            getLogger().severe("Could not save config to " + blocksConfigFile + ex.toString());
-        }
+    public Player getTNTPlayer(int tntID) {
+        return getServer().getPlayer(tntTracker.get(tntID));
     }
 
-    public boolean isInJar(String resource) {
-        InputStream iStream = getResource(resource);
-        return iStream != null;
+    /**
+     * Remove TNT from the tracker after it explodes.
+     *
+     * @param tntID The EntityID of the TNT
+     */
+    public void removeFromTNTTracker(int tntID) {
+        tntTracker.remove(tntID);
+    }
+
+    public static String getMainDirectory() {
+        return mainDirectory;
+    }
+
+    public static String getFlatFileDirectory() {
+        return flatFileDirectory;
+    }
+
+    public static String getUsersFile() {
+        return usersFile;
+    }
+
+    public static String getLeaderboardDirectory() {
+        return leaderboardDirectory;
+    }
+
+    public static String getModDirectory() {
+        return modDirectory;
+    }
+
+    public static Database getPlayerDatabase() {
+        return database;
     }
 }
+

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

@@ -1,650 +1,65 @@
 package com.gmail.nossr50.party;
 
-import java.io.BufferedReader;
-import java.io.EOFException;
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileNotFoundException;
-import java.io.FileOutputStream;
-import java.io.FileReader;
-import java.io.IOException;
-import java.io.ObjectInputStream;
-import java.io.ObjectOutputStream;
 import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.Map;
+import java.util.List;
 
 import org.bukkit.entity.Player;
 
 import com.gmail.nossr50.mcMMO;
-import com.gmail.nossr50.datatypes.PlayerProfile;
-import com.gmail.nossr50.locale.LocaleLoader;
-import com.gmail.nossr50.util.Users;
 
 public class Party {
-    public static String pluginPath;
-    public static String partyPlayersFile;
-    public static String partyLocksFile;
-    public static String partyPasswordsFile;
+    private List<String> members = new ArrayList<String>();
+    private String leader;
+    private String name;
+    private String password;
+    private boolean locked;
 
-    HashMap<String, HashMap<String, Boolean>> partyPlayers = new HashMap<String, HashMap<String, Boolean>>();
-    HashMap<String, Boolean> partyLocks = new HashMap<String, Boolean>();
-    HashMap<String, String> partyPasswords = new HashMap<String, String>();
-
-    private static mcMMO plugin;
-    private static volatile Party instance;
-
-    private Party() {
-        plugin = mcMMO.p;
-        pluginPath = plugin.getDataFolder().getPath();
-        partyPlayersFile = pluginPath + File.separator + "FlatFileStuff" + File.separator + "partyPlayers";
-        partyLocksFile = pluginPath + File.separator + "FlatFileStuff" + File.separator + "partyLocks";
-        partyPasswordsFile = pluginPath + File.separator + "FlatFileStuff" + File.separator + "partyPasswords";
-        new File(pluginPath + File.separator + "FlatFileStuff").mkdir();
-        loadParties();
+    public List<String> getMembers() {
+        return members;
     }
 
-    public static Party getInstance() {
-        if (instance == null) {
-            instance = new Party();
-        }
-        return instance;
-    }
+    public List<Player> getOnlineMembers() {
+        Player[] onlinePlayers = mcMMO.p.getServer().getOnlinePlayers();
+        List<Player> onlineMembers = new ArrayList<Player>();
 
-    /**
-     * Check if two players are in the same party.
-     *
-     * @param playera The first player
-     * @param playerb The second player
-     * @return true if they are in the same party, false otherwise
-     */
-    public boolean inSameParty(Player playera, Player playerb){
-        PlayerProfile PPa = Users.getProfile(playera);
-        PlayerProfile PPb = Users.getProfile(playerb);
-
-        if ((PPa.inParty() && PPb.inParty()) && (PPa.getParty().equals(PPb.getParty()))) {
-            return true;
-        }
-        else {
-            return false;
-        }
-    }
-
-    /**
-     * Get the number of players in this player's party.
-     *
-     * @param player The player to check
-     * @param players A list of players to 
-     * @return the number of players in this player's party
-     */
-    public int partyCount(Player player) {
-        if (player != null) {
-            return getAllMembers(player).size();
-        }
-        else {
-            return 0;
-        }
-    }
-
-    private void informPartyMembers(Player player) {
-        String playerName = player.getName();
-
-        if (player != null) {
-            for (Player p : getOnlineMembers(player)) {
-                if (p.getName() != playerName) {
-                    p.sendMessage(LocaleLoader.getString("Party.InformedOnJoin", new Object[] {playerName}));
-                }
-            }
-        }
-    }
-
-    /**
-     * Get a list of all online players in this player's party.
-     *
-     * @param player The player to check
-     * @return all online players in the player's party
-     */
-    public ArrayList<Player> getOnlineMembers(Player player) {
-        ArrayList<Player> players = new ArrayList<Player>();
-
-        if (player != null) {
-            for (Player p : plugin.getServer().getOnlinePlayers()) {
-                if (inSameParty(player, p)) {
-                    players.add(p);
-                }
+        for (Player onlinePlayer : onlinePlayers) {
+            if (members.contains(onlinePlayer.getName())) {
+                onlineMembers.add(onlinePlayer);
             }
         }
 
-        return players;
+        return onlineMembers;
     }
 
-    /**
-     * Get a list of all online players in this party.
-     *
-     * @param partyName The party to check
-     * @return all online players in this party
-     */
-    public ArrayList<Player> getOnlineMembers(String partyName) {
-        ArrayList<Player> players = new ArrayList<Player>();
-
-        for (Player p : plugin.getServer().getOnlinePlayers()) {
-            PlayerProfile PP = Users.getProfile(p);
-
-            if (PP.inParty()) {
-                if (PP.getParty().equalsIgnoreCase(partyName)) {
-                    players.add(p);
-                }
-            }
-        }
-
-        return players;
-    }
-
-    /**
-     * Get a list of all players in this player's party.
-     *
-     * @param player The player to check
-     * @return all the players in the player's party
-     */
-    public ArrayList<Player> getAllMembers(Player player) {
-        ArrayList<Player> players = new ArrayList<Player>();
-        HashMap<String, PlayerProfile> profiles = Users.getProfiles();
-
-        if (player != null) {
-            for (String name : profiles.keySet()) {
-                Player otherPlayer = profiles.get(name).getPlayer();
-
-                if (otherPlayer != null && inSameParty(otherPlayer, player)) {
-                    players.add(otherPlayer);
-                }
-            }
-        }
-
-        return players;
-    }
-
-
-    /**
-     * Get a list of all current party names.
-     *
-     * @return the list of parties.
-     */
-    public ArrayList<String> getParties() {
-        String location = plugin.usersFile;
-        ArrayList<String> parties = new ArrayList<String>();
-
-        try {
-            FileReader file = new FileReader(location);
-            BufferedReader in = new BufferedReader(file);
-            String line = "";
-
-            while ((line = in.readLine()) != null) {
-                String[] character = line.split(":");
-                String theparty = null;
-
-                //Party
-                if (character.length > 3) {
-                    theparty = character[3];
-                }
-
-                if (!parties.contains(theparty)) {
-                    parties.add(theparty);
-                }
-            }
-            in.close();
-        }
-        catch (Exception e) {
-            plugin.getLogger().severe("Exception while reading " + location + " (Are you sure you formatted it correctly?)" + e.toString());
-        }
-        return parties;
-    }
-
-    /**
-     * Notify party members when the party owner changes.
-     *
-     * @param newOwnerName The name of the new party owner
-     */
-    private void informPartyMembersOwnerChange(String newOwnerName) {
-        Player newOwner = plugin.getServer().getPlayer(newOwnerName);
-
-        if (newOwner != null) {
-            for (Player p : getOnlineMembers(newOwner)) {
-                if (p.getName() != newOwnerName) {
-                    p.sendMessage(newOwnerName + " is the new party owner."); //TODO: Needs more locale
-                }
-            }
-        }
-    }
-
-    /**
-     * Notify party members when the a party member quits.
-     *
-     * @param player The player that quit
-     */
-    private void informPartyMembersQuit(Player player) {
-        String playerName = player.getName();
-
-        if (player != null) {
-            for (Player p : getOnlineMembers(player)) {
-                if (p.getName() != playerName) {
-                    p.sendMessage(LocaleLoader.getString("Party.InformedOnQuit", new Object[] {playerName}));
-                }
-            }
-        }
-    }
-
-    /**
-     * Remove a player from a party.
-     *
-     * @param player The player to remove
-     * @param PP The profile of the player to remove
-     */
-    public void removeFromParty(Player player, PlayerProfile PP) {
-        String party = PP.getParty();
-        String playerName = player.getName();
-
-        //Stop NPE... hopefully
-        if (!isParty(party) || !isInParty(player, PP)) {
-            addToParty(player, PP, party, false, null);
-        }
-
-        informPartyMembersQuit(player);
-
-        if (isPartyLeader(playerName, party)) {
-            if (isPartyLocked(party)) {
-                unlockParty(party);
-            }
-        }
-
-        partyPlayers.get(party).remove(playerName);
-
-        if (isPartyEmpty(party)) {
-            deleteParty(party);
-        }
-
-        PP.removeParty();
-        savePartyFile(partyPlayersFile, partyPlayers);
-    }
-
-    /**
-     * Add a player to a party.
-     *
-     * @param player The player to add to the party
-     * @param PP The profile of the player to add to the party
-     * @param newParty The party to add the player to
-     * @param invite true if the player was invited to this party, false otherwise
-     * @param password the password for this party, null if there was no password
-     */
-    public void addToParty(Player player, PlayerProfile PP, String newParty, Boolean invite, String password) {
-        String playerName = player.getName();
-
-        //Fix for FFS
-        newParty = newParty.replace(":", ".");
-
-        //Don't care about passwords on invites
-        if (!invite) {
-
-            //Don't care about passwords if it isn't locked
-            if (isPartyLocked(newParty)) {
-                if (isPartyPasswordProtected(newParty)) {
-                    if (password == null) {
-                        player.sendMessage("This party requires a password. Use /party <party> <password> to join it."); //TODO: Needs more locale.
-                        return;
-                    }
-                    else if(!password.equalsIgnoreCase(getPartyPassword(newParty))) {
-                        player.sendMessage("Party password incorrect."); //TODO: Needs more locale.
-                        return;
-                    }
-                }
-                else {
-                    player.sendMessage("Party is locked."); //TODO: Needs more locale.
-                    return;
-                }
-            }
-        }
-        else {
-            PP.acceptInvite();
-        }
-
-        //New party?
-        if (!isParty(newParty)) {
-            putNestedEntry(partyPlayers, newParty, playerName, true);
-
-            //Get default locking behavior from config?
-            partyLocks.put(newParty, false);
-            partyPasswords.put(newParty, null);
-            saveParties();
-        }
-        else {
-            putNestedEntry(partyPlayers, newParty, playerName, false);
-            savePartyFile(partyPlayersFile, partyPlayers);
-        }
-
-        PP.setParty(newParty);
-        informPartyMembers(player);
-
-        if (!invite) {
-            player.sendMessage(LocaleLoader.getString("Commands.Party.Join", new Object[]{ newParty }));
-        }
-        else {
-            player.sendMessage(LocaleLoader.getString("Commands.Invite.Accepted", new Object[]{ PP.getParty() }));
-        }
-    }
-
-    private static <U,V,W> W putNestedEntry(HashMap<U, HashMap<V, W>> nest, U nestKey, V nestedKey, W nestedValue) {
-        HashMap<V,W> nested = nest.get(nestKey);
-
-        if (nested == null) {
-            nested = new HashMap<V,W>();
-            nest.put(nestKey, nested);
-        }
-
-        return nested.put(nestedKey, nestedValue);
-    }
-
-    /**
-     * Lock a party.
-     *
-     * @param partyName The party to lock
-     */
-    public void lockParty(String partyName) {
-        partyLocks.put(partyName, true);
-        savePartyFile(partyLocksFile, partyLocks);
-    }
-
-    /**
-     * Unlock a party.
-     *
-     * @param partyName The party to unlock
-     */
-    public void unlockParty(String partyName) {
-        partyLocks.put(partyName, false);
-        savePartyFile(partyLocksFile, partyLocks);
-    }
-
-    /**
-     * Delete a party.
-     *
-     * @param partyName The party to delete
-     */
-    private void deleteParty(String partyName) {
-        partyPlayers.remove(partyName);
-        partyLocks.remove(partyName);
-        partyPasswords.remove(partyName);
-        saveParties();
-    }
-
-    /**
-     * Set the password for a party.
-     *
-     * @param partyName The party name
-     * @param password The new party password
-     */
-    public void setPartyPassword(String partyName, String password) {
-        if (password.equalsIgnoreCase("\"\"")) { //What's with that password string?
-            password = null;
-        }
-
-        partyPasswords.put(partyName, password);
-        savePartyFile(partyPasswordsFile, partyPasswords);
-    }
-
-    /**
-     * Get the leader of a party.
-     *
-     * @param partyName The party name
-     * @return the leader of the party
-     */
-    public Player getPartyLeader(String partyName) {
-        Player leader = null;
-
-        for (String name : partyPlayers.get(partyName).keySet()) {
-            if (partyPlayers.get(partyName).get(name)) {
-                leader = plugin.getServer().getPlayer(name);
-                break;
-            }
-        }
-
+    public String getLeader() {
         return leader;
     }
 
-    /**
-     * Set the leader of a party.
-     *
-     * @param partyName The party name
-     * @param playerName The name of the player to set as leader
-     */
-    public void setPartyLeader(String partyName, String playerName) {
-        for (String name : partyPlayers.get(partyName).keySet()) {
-            if (name.equalsIgnoreCase(playerName)) {
-                partyPlayers.get(partyName).put(playerName, true);
-                informPartyMembersOwnerChange(playerName);
-                plugin.getServer().getPlayer(playerName).sendMessage("You are now the party owner."); //TODO: Needs more locale.
-                continue;
-            }
-
-            if (partyPlayers.get(partyName).get(name)) {
-                plugin.getServer().getPlayer(name).sendMessage("You are no longer party owner."); //TODO: Needs more locale.
-                partyPlayers.get(partyName).put(name, false);
-            }
-        }
+    public String getName() {
+        return name;
     }
 
-    /**
-     * Get the password of a party.
-     *
-     * @param partyName The party name
-     * @return The password of this party
-     */
-    public String getPartyPassword(String partyName) {
-        return partyPasswords.get(partyName);
+    public String getPassword() {
+        return password;
     }
 
-    /**
-     * Check if a player can invite others to their party.
-     *
-     * @param player The player to check
-     * @param PP The profile of the given player
-     * @return true if the player can invite, false otherwise
-     */
-    public boolean canInvite(Player player, PlayerProfile PP) {
-        String party = PP.getParty();
-
-        if (isPartyLocked(party) && !isPartyLeader(player.getName(), party)) {
-            return false;
-        }
-        else {
-            return true;
-        }
+    public boolean isLocked() {
+        return locked;
     }
 
-    /**
-     * Check if a string is a valid party name.
-     *
-     * @param partyName The party name to check
-     * @return true if this is a valid party, false otherwise
-     */
-    public boolean isParty(String partyName) {
-        return partyPlayers.containsKey(partyName);
+    public void setName(String name) {
+        this.name = name;
     }
 
-    /**
-     * Check if a party is empty.
-     *
-     * @param partyName The party to check
-     * @return true if this party is empty, false otherwise
-     */
-    public boolean isPartyEmpty(String partyName) {
-        return partyPlayers.get(partyName).isEmpty();
+    public void setLeader(String leader) {
+        this.leader = leader;
     }
 
-    /**
-     * Check if a player is the party leader.
-     *
-     * @param playerName The player name to check
-     * @param partyName The party name to check
-     * @return true if the player is the party leader, false otherwise
-     */
-    public boolean isPartyLeader(String playerName, String partyName) {
-        HashMap<String, Boolean> partyMembers = partyPlayers.get(partyName);
-
-        if (partyMembers != null) {
-            Boolean isLeader = partyMembers.get(playerName);
-
-            if (isLeader == null) {
-                return false;
-            }
-            else {
-                return isLeader;
-            }
-        }
-        else {
-            return false;
-        }
+    public void setPassword(String password) {
+        this.password = password;
     }
 
-    /**
-     * Check if this party is locked.
-     *
-     * @param partyName The party to check
-     * @return true if this party is locked, false otherwise
-     */
-    public boolean isPartyLocked(String partyName) {
-        Boolean isLocked = partyLocks.get(partyName);
-
-        if (isLocked ==  null) {
-            return false;
-        }
-        else {
-            return isLocked;
-        }
-    }
-
-    /**
-     * Check if this party is password protected.
-     *
-     * @param partyName The party to check
-     * @return true if this party is password protected, false otherwise
-     */
-    public boolean isPartyPasswordProtected(String partyName) {
-        String password = partyPasswords.get(partyName);
-
-        if (password == null) {
-            return false;
-        }
-        else {
-            return true;
-        }
-    }
-
-    /**
-     * Check if a player is in the party reflected by their profile.
-     *
-     * @param player The player to check
-     * @param PP The profile of the player
-     * @return true if this player is in the right party, false otherwise
-     */
-    public boolean isInParty(Player player, PlayerProfile PP) {
-        Map<String, Boolean> party = partyPlayers.get(PP.getParty());
-
-        if (party != null && party.containsKey(player.getName())) {
-            return true;
-        }
-        else {
-            return false;
-        }
-    }
-
-    /**
-     * Load all party related files.
-     */
-    @SuppressWarnings("unchecked")
-    public void loadParties() {
-        if (new File(partyPlayersFile).exists()) {
-            try {
-                ObjectInputStream obj = new ObjectInputStream(new FileInputStream(partyPlayersFile));
-                partyPlayers = (HashMap<String, HashMap<String, Boolean>>) obj.readObject();
-            }
-            catch (FileNotFoundException e) {
-                e.printStackTrace();
-            }
-            catch (EOFException e) {
-                plugin.getLogger().info("partyPlayersFile empty.");
-            }
-            catch (IOException e) {
-                e.printStackTrace();
-            }
-            catch (ClassNotFoundException e) {
-                e.printStackTrace();
-            }
-        }
-
-        if (new File(partyLocksFile).exists()) {
-            try {
-                ObjectInputStream obj = new ObjectInputStream(new FileInputStream(partyLocksFile));
-                partyLocks = (HashMap<String, Boolean>) obj.readObject();
-            }
-            catch (FileNotFoundException e) {
-                e.printStackTrace();
-            }
-            catch (EOFException e) {
-                plugin.getLogger().info("partyLocksFile empty.");
-            }
-            catch (IOException e) {
-                e.printStackTrace();
-            }
-            catch (ClassNotFoundException e) {
-                e.printStackTrace();
-            }
-        }
-
-        if (new File(partyPasswordsFile).exists()) {
-            try {
-                ObjectInputStream obj = new ObjectInputStream(new FileInputStream(partyPasswordsFile));
-                this.partyPasswords = (HashMap<String, String>) obj.readObject();
-            }
-            catch (FileNotFoundException e) {
-                e.printStackTrace();
-            }
-            catch (EOFException e) {
-                plugin.getLogger().info("partyPasswordsFile empty.");
-            }
-            catch (IOException e) {
-                e.printStackTrace();
-            }
-            catch (ClassNotFoundException e) {
-                e.printStackTrace();
-            }
-        }
-    }
-
-    /**
-     * Save all party-related files.
-     */
-    private void saveParties() {
-        savePartyFile(partyPlayersFile, partyPlayers);
-        savePartyFile(partyLocksFile, partyLocks);
-        savePartyFile(partyPasswordsFile, partyPasswords);
-    }
-
-    /**
-     * Save a party-related file.
-     *
-     * @param fileName The filename to save as
-     * @param partyData The Hashmap with the party data
-     */
-    private void savePartyFile(String fileName, Object partyData) {
-        try {
-            new File(fileName).createNewFile();
-            ObjectOutputStream obj = new ObjectOutputStream(new FileOutputStream(fileName));
-            obj.writeObject(partyData);
-            obj.close();
-        }
-        catch (FileNotFoundException e) {
-            e.printStackTrace();
-        }
-        catch (IOException e) {
-            e.printStackTrace();
-        }
+    public void setLocked(boolean locked) {
+        this.locked = locked;
     }
 }

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

@@ -0,0 +1,430 @@
+package com.gmail.nossr50.party;
+
+import java.io.File;
+import java.util.ArrayList;
+import java.util.List;
+
+import org.bukkit.configuration.file.YamlConfiguration;
+import org.bukkit.entity.Player;
+
+import com.gmail.nossr50.mcMMO;
+import com.gmail.nossr50.datatypes.PlayerProfile;
+import com.gmail.nossr50.locale.LocaleLoader;
+import com.gmail.nossr50.util.Users;
+
+public class PartyManager {
+    private static String partiesFilePath;
+    private static List<Party> parties = new ArrayList<Party>();
+    private static mcMMO plugin;
+    private static PartyManager instance;
+
+    private PartyManager() {
+        plugin = mcMMO.p;
+        partiesFilePath = plugin.getDataFolder().getPath() + File.separator + "FlatFileStuff" + File.separator + "parties.yml";
+
+        loadParties();
+    }
+
+    public static PartyManager getInstance() {
+        if (instance == null) {
+            instance = new PartyManager();
+        }
+
+        return instance;
+    }
+
+    /**
+     * Check if two players are in the same party.
+     *
+     * @param firstPlayer The first player
+     * @param secondPlayer The second player
+     * @return true if they are in the same party, false otherwise
+     */
+    public boolean inSameParty(Player firstPlayer, Player secondPlayer) {
+        PlayerProfile firstProfile = Users.getProfile(firstPlayer);
+        PlayerProfile secondProfile = Users.getProfile(secondPlayer);
+
+        if (firstProfile == null || secondProfile == null) {
+            return false;
+        }
+
+        Party firstParty = firstProfile.getParty();
+        Party secondParty = secondProfile.getParty();
+
+        if (firstParty == null || secondParty == null || firstParty != secondParty) {
+            return false;
+        }
+
+        return true;
+    }
+
+    /**
+     * Notify party members when a player joins
+     * 
+     * @param playerName The name of the player that joins
+     * @param party The concerned party
+     */
+    private void informPartyMembersJoin(String playerName, Party party) {
+        for (Player member : party.getOnlineMembers()) {
+            if (member.getName().equals(playerName)) {
+                member.sendMessage(LocaleLoader.getString("Party.InformedOnJoin", new Object[] {playerName}));
+            }
+        }
+    }
+
+    /**
+     * Notify party members when a party member quits.
+     *
+     * @param playerName The name of the player that quits
+     * @param party The concerned party
+     */
+    private void informPartyMembersQuit(String playerName, Party party) {
+        for (Player member : party.getOnlineMembers()) {
+            if (member.getName().equals(playerName)) {
+                member.sendMessage(LocaleLoader.getString("Party.InformedOnQuit", new Object[] {playerName}));
+            }
+        }
+    }
+
+    /**
+     * Get a list of all players in this player's party.
+     *
+     * @param player The player to check
+     * @return all the players in the player's party
+     */
+    public List<String> getAllMembers(Player player) {
+        Party party = Users.getProfile(player).getParty();
+
+        if (party == null) {
+            return null;
+        }
+
+        return party.getMembers();
+    }
+
+    /**
+     * Get a list of all online players in this party.
+     *
+     * @param partyName The party to check
+     * @return all online players in this party
+     */
+    public List<Player> getOnlineMembers(String partyName) {
+        Party party = getParty(partyName);
+
+        if (party == null) {
+            return null;
+        }
+
+        return party.getOnlineMembers();
+    }
+
+    /**
+     * Get a list of all online players in this party.
+     *
+     * @param player The player to check
+     * @return all online players in this party
+     */
+    public List<Player> getOnlineMembers(Player player) {
+        return getOnlineMembers(player.getName());
+    }
+
+    /**
+     * Retrieve a party by its name
+     * 
+     * @param partyName The party name
+     * @return the existing party, null otherwise
+     */
+    public Party getParty(String partyName) {
+        for (Party party : parties) {
+            if (party.getName().equals(partyName)) {
+                return party;
+            }
+        }
+
+        return null;
+    }
+
+    /**
+     * Retrieve a party by a member name
+     * 
+     * @param playerName The member name
+     * @return the existing party, null otherwise
+     */
+    public Party getPlayerParty(String playerName) {
+        for (Party party : parties) {
+            if (party.getMembers().contains(playerName)) {
+                return party;
+            }
+        }
+
+        return null;
+    }
+
+    /**
+     * Get a list of all current parties.
+     *
+     * @return the list of parties.
+     */
+    public List<Party> getParties() {
+        return parties;
+    }
+
+    /**
+     * Remove a player from a party.
+     *
+     * @param playerName The name of the player to remove
+     * @param party The party
+     */
+    public void removeFromParty(String playerName, Party party) {
+        List<String> members = party.getMembers();
+
+        members.remove(playerName);
+
+        if (members.isEmpty()) {
+            parties.remove(party);
+        }
+        else {
+            if (party.getLeader().equals(playerName)) {
+                party.setLocked(false);
+            }
+
+            informPartyMembersQuit(playerName, party);
+        }
+
+        PlayerProfile playerProfile = Users.getProfile(playerName);
+
+        if (playerProfile != null) {
+            playerProfile.removeParty();
+        }
+    }
+
+    /**
+     * Add a player to a party.
+     *
+     * @param player The player to add to the party
+     * @param playerProfile The profile of the player to add to the party
+     * @param partyName The party to add the player to
+     * @param password the password for this party, null if there was no password
+     */
+    public void joinParty(Player player, PlayerProfile playerProfile, String partyName, String password) {
+        partyName = partyName.replace(".", "");
+        Party party = getParty(partyName);
+        String playerName = player.getName();
+
+        if (party == null) {
+            party = new Party();
+
+            party.setName(partyName);
+            party.setLeader(playerName);
+
+            if (password != null) {
+                party.setPassword(password);
+                party.setLocked(true);
+            }
+
+            parties.add(party);
+        }
+        else if (!checkJoinability(player, playerProfile, party, password)) {
+            return;
+        }
+
+        player.sendMessage(LocaleLoader.getString("Commands.Party.Join", new Object[]{party.getName()}));
+        addToParty(player.getName(), playerProfile, party);
+    }
+
+    /**
+     * Check if a player can join a party
+     *
+     * @param player The player trying to join a party
+     * @param playerProfile The profile of the player
+     * @param party The party
+     * @param password The password provided by the player
+     * @return true if the player can join the party
+     */
+    private boolean checkJoinability(Player player, PlayerProfile playerProfile, Party party, String password) {
+        //Don't care about passwords if it isn't locked
+        if (party.isLocked()) {
+            String partyPassword = party.getPassword();
+
+            if (partyPassword != null) {
+                if (password == null) {
+                    player.sendMessage("This party requires a password. Use /party <party> <password> to join it."); //TODO: Needs more locale.
+                    return false;
+                }
+                else if (!password.equals(partyPassword)) {
+                    player.sendMessage("Party password incorrect."); //TODO: Needs more locale.
+                    return false;
+                }
+            }
+            else {
+                player.sendMessage("Party is locked."); //TODO: Needs more locale.
+                return false;
+            }
+        }
+
+        return true;
+    }
+
+    /**
+     * Accept a party invitation
+     * 
+     * @param player The player to add to the party
+     * @param playerProfile The profile of the player
+     */
+    public void joinInvitedParty(Player player, PlayerProfile playerProfile) {
+        Party invite = playerProfile.getInvite();
+
+        if (!parties.contains(invite)) {
+            parties.add(invite);
+        }
+
+        player.sendMessage(LocaleLoader.getString("Commands.Invite.Accepted", new Object[]{invite.getName()}));
+        playerProfile.removeInvite();
+        addToParty(player.getName(), playerProfile, invite);
+    }
+
+    /**
+     * Add a player to a party
+     * 
+     * @param playerName The name of the player to add to a party
+     * @param playerProfile The profile of the player
+     * @param party The party
+     */
+    public void addToParty(String playerName, PlayerProfile playerProfile, Party party) {
+        informPartyMembersJoin(playerName, party);
+        playerProfile.setParty(party);
+        party.getMembers().add(playerName);
+    }
+
+    /**
+     * Get the leader of a party.
+     *
+     * @param partyName The party name
+     * @return the leader of the party
+     */
+    public String getPartyLeader(String partyName) {
+        Party party = getParty(partyName);
+
+        if (party == null) {
+            return null;
+        }
+
+        return party.getLeader();
+    }
+
+    /**
+     * Set the leader of a party.
+     *
+     * @param playerName The name of the player to set as leader
+     * @param party The party
+     */
+    public void setPartyLeader(String playerName, Party party) {
+        String leaderName = party.getLeader();
+
+        for (Player member : party.getOnlineMembers()) {
+            if (member.getName().equals(playerName)) {
+                member.sendMessage("You are now the party owner."); //TODO: Needs more locale.
+            }
+            else if (member.equals(leaderName)) {
+                member.sendMessage("You are no longer party owner."); //TODO: Needs more locale.
+            }
+            else {
+                member.sendMessage(playerName + " is the new party owner."); //TODO: Needs more Locale.
+            }
+        }
+
+        party.setLeader(playerName);
+    }
+
+    /**
+     * Check if a player can invite others to their party.
+     *
+     * @param player The player to check
+     * @param playerProfile The profile of the given player
+     * @return true if the player can invite
+     */
+    public boolean canInvite(Player player, PlayerProfile playerProfile) {
+        Party party = playerProfile.getParty();
+
+        if (party == null || (party.isLocked() && !party.getLeader().equals(player.getName()))) {
+            return false;
+        }
+
+        return true;
+    }
+
+    /**
+     * Check if a string is a valid party name.
+     *
+     * @param partyName The party name to check
+     * @return true if this is a valid party, false otherwise
+     */
+    public boolean isParty(String partyName) {
+        for (Party party : parties) {
+            if (party.getName().equals(partyName)) {
+                return true;
+            }
+        }
+
+        return false;
+    }
+
+    /**
+     * Load party file.
+     */
+    private void loadParties() {
+        File file = new File(partiesFilePath);
+        
+        if (!file.exists()) {
+            return;
+        }
+
+        YamlConfiguration partiesFile = new YamlConfiguration();
+
+        try {
+            partiesFile.load(file);
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+
+        for (String partyName : partiesFile.getConfigurationSection("").getKeys(false)) {
+            Party party = new Party();
+
+            party.setName(partyName);
+            party.setLeader(partiesFile.getString(partyName + ".Leader"));
+            party.setPassword(partiesFile.getString(partyName + ".Password"));
+            party.setLocked(partiesFile.getBoolean(partyName + ".Locked"));
+            party.getMembers().addAll(partiesFile.getStringList(partyName + ".Members"));
+
+            parties.add(party);
+        }
+    }
+
+    /**
+     * Save party file.
+     */
+    public void saveParties() {
+        File file = new File(partiesFilePath);
+
+        if (file.exists()) {
+            file.delete();
+        }
+
+        YamlConfiguration partiesFile = new YamlConfiguration();
+
+        for (Party party : parties) {
+            String partyName = party.getName();
+
+            partiesFile.set(partyName + ".Leader", party.getLeader());
+            partiesFile.set(partyName + ".Password", party.getPassword());
+            partiesFile.set(partyName + ".Locked", party.isLocked());
+            partiesFile.set(partyName + ".Members", party.getMembers());
+
+            try {
+                partiesFile.save(new File(partiesFilePath));
+            } catch (Exception e) {
+                e.printStackTrace();
+            }
+        }
+    }
+}

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

@@ -34,7 +34,7 @@ public class BleedTimer implements Runnable {
         for (Entry<LivingEntity, Integer> entry : bleedList.entrySet()) {
             LivingEntity entity = entry.getKey();
 
-            if (entry.getValue() <= 0 || entity.isDead() || entity == null) {
+            if (entry.getValue() <= 0 || entity.isDead()) {
                 remove(entity);
                 break;
             }
@@ -84,7 +84,7 @@ public class BleedTimer implements Runnable {
 
     /**
      * Instantly Bleed out a LivingEntity
-     * 
+     *
      * @param entity LivingEntity to bleed out
      */
     public static void bleedOut(LivingEntity entity) {
@@ -96,7 +96,7 @@ public class BleedTimer implements Runnable {
 
     /**
      * Remove a LivingEntity from the bleedList if it is in it
-     * 
+     *
      * @param entity LivingEntity to remove
      */
     public static void remove(LivingEntity entity) {
@@ -168,7 +168,7 @@ public class BleedTimer implements Runnable {
 
     /**
      * Check to see if a LivingEntity is in the bleedList
-     * 
+     *
      * @param entity LivingEntity to check if in the bleedList
      * @return true if in the list, false if not
      */

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

@@ -0,0 +1,58 @@
+package com.gmail.nossr50.runnables;
+
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.Map;
+import java.util.Map.Entry;
+
+import org.bukkit.Chunk;
+import org.bukkit.World;
+
+import com.gmail.nossr50.mcMMO;
+
+public class ChunkletUnloader implements Runnable {
+    private static Map<Chunk, Integer> unloadedChunks = new HashMap<Chunk, Integer>();
+    private static int minimumInactiveTime = 60; //Should be a multiple of RUN_INTERVAL for best performance
+    public static final int RUN_INTERVAL = 20;
+
+    public static void addToList(Chunk chunk) {
+        //Unfortunately we can't use Map.contains() because Chunks are always new objects
+        //This method isn't efficient enough for me
+        for (Chunk otherChunk : unloadedChunks.keySet()) {
+            if (chunk.getX() == otherChunk.getX() && chunk.getZ() == otherChunk.getZ()) {
+                return;
+            }
+        }
+
+        unloadedChunks.put(chunk, 0);
+    }
+
+    public static void addToList(int cx, int cz, World world) {
+        addToList(world.getChunkAt(cx, cz));
+    }
+
+    @Override
+    public void run() {
+        for (Iterator<Entry<Chunk, Integer>> it = unloadedChunks.entrySet().iterator() ; it.hasNext() ; ) {
+            Entry<Chunk, Integer> entry = it.next();
+            Chunk chunk = entry.getKey();
+
+            if (!chunk.isLoaded()) {
+                int inactiveTime = entry.getValue() + RUN_INTERVAL;
+
+                //Chunklets are unloaded only if their chunk has been unloaded for minimumInactiveTime
+                if (inactiveTime >= minimumInactiveTime) {
+                    mcMMO.placeStore.unloadChunk(chunk.getX(), chunk.getZ(), chunk.getWorld());
+                    it.remove();
+                    continue;
+                }
+
+                unloadedChunks.put(entry.getKey(), inactiveTime);
+            }
+            else {
+                //Just remove the entry if the chunk has been reloaded.
+                it.remove();
+            }
+        }
+    }
+}

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

@@ -9,15 +9,15 @@ import com.gmail.nossr50.util.Skills;
 
 public class GainXp implements Runnable {
     private Player player = null;
-    private PlayerProfile PP = null;
+    private PlayerProfile profile = null;
     private double baseXp = 0;
     private SkillType skillType = null;
     private LivingEntity target = null;
     private int baseHealth = 0;
 
-    public GainXp(Player player, PlayerProfile PP, SkillType skillType, double baseXp, LivingEntity target) {
+    public GainXp(Player player, PlayerProfile profile, SkillType skillType, double baseXp, LivingEntity target) {
         this.player = player;
-        this.PP = PP;
+        this.profile = profile;
         this.skillType = skillType;
         this.baseXp = baseXp;
         this.target = target;
@@ -27,7 +27,7 @@ public class GainXp implements Runnable {
     @Override
     public void run() {
         int health = target.getHealth();
-        int damage =  baseHealth - health;
+        int damage = baseHealth - health;
 
         //May avoid negative xp, we don't know what other plugins do with the entity health
         if (damage <= 0) {
@@ -39,7 +39,6 @@ public class GainXp implements Runnable {
             damage += health;
         }
 
-        PP.addXP(player, skillType, (int) (damage * baseXp));
-        Skills.XpCheckSkill(skillType, player);
+        Skills.xpProcessing(player, profile, skillType, (int) (damage * baseXp));
     }
 }

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

@@ -10,11 +10,11 @@ import com.gmail.nossr50.datatypes.SkillType;
 
 public class GreenThumbTimer implements Runnable {
     private Block block;
-    private PlayerProfile PP;
+    private PlayerProfile profile;
 
-    public GreenThumbTimer(Block block, PlayerProfile PP) {
+    public GreenThumbTimer(Block block, PlayerProfile profile) {
         this.block = block;
-        this.PP = PP;
+        this.profile = profile;
     }
 
     @Override
@@ -22,14 +22,14 @@ public class GreenThumbTimer implements Runnable {
         block.setType(Material.CROPS);
 
         //This replants the wheat at a certain stage in development based on Herbalism Skill
-        if (!PP.getAbilityMode(AbilityType.GREEN_TERRA)) {
-            if (PP.getSkillLevel(SkillType.HERBALISM) >= 600) {
+        if (!profile.getAbilityMode(AbilityType.GREEN_TERRA)) {
+            if (profile.getSkillLevel(SkillType.HERBALISM) >= 600) {
                 block.setData(CropState.MEDIUM.getData());
             }
-            else if (PP.getSkillLevel(SkillType.HERBALISM) >= 400) {
+            else if (profile.getSkillLevel(SkillType.HERBALISM) >= 400) {
                 block.setData(CropState.SMALL.getData());
             }
-            else if (PP.getSkillLevel(SkillType.HERBALISM) >= 200) {
+            else if (profile.getSkillLevel(SkillType.HERBALISM) >= 200) {
                 block.setData(CropState.VERY_SMALL.getData());
             }
             else {

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

@@ -1,20 +1,24 @@
 package com.gmail.nossr50.runnables;
 
-import org.bukkit.entity.Player;
-
+import com.gmail.nossr50.datatypes.McMMOPlayer;
+import com.gmail.nossr50.datatypes.PlayerProfile;
 import com.gmail.nossr50.util.Users;
 
 public class ProfileSaveTask implements Runnable {
-    Player player = null;
+    private McMMOPlayer mcMMOPlayer;
+    private PlayerProfile playerProfile;
 
-    public ProfileSaveTask(Player player) {
-        this.player = player;
+    public ProfileSaveTask(McMMOPlayer mcMMOPlayer) {
+        this.mcMMOPlayer = mcMMOPlayer;
+        this.playerProfile = mcMMOPlayer.getProfile();
     }
 
     @Override
     public void run() {
-        if (player != null) {
-            Users.getProfileByName(player.getName()).save();
+        playerProfile.save();
+
+        if (!mcMMOPlayer.getPlayer().isOnline()) {
+            Users.remove(playerProfile.getPlayerName());
         }
     }
 }

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

@@ -1,20 +0,0 @@
-package com.gmail.nossr50.runnables;
-
-import com.gmail.nossr50.util.Users;
-
-public class RemoveProfileFromMemoryTask implements Runnable {
-    private String playerName = null;
-
-    public RemoveProfileFromMemoryTask(String playerName) {
-        this.playerName = playerName;
-    }
-
-    @Override
-    public void run() {
-        //Check if the profile still exists (stuff like MySQL reconnection removes profiles)
-        if (Users.players.containsKey(playerName.toLowerCase())) {
-            Users.getProfileByName(playerName.toLowerCase()).save(); //We save here so players don't quit/reconnect to cause lag
-            Users.removeUserByName(playerName.toLowerCase());
-        }
-    }
-}

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

@@ -5,6 +5,7 @@ import java.io.FileReader;
 
 import com.gmail.nossr50.mcMMO;
 import com.gmail.nossr50.config.Config;
+import com.gmail.nossr50.util.Database;
 import com.gmail.nossr50.util.Misc;
 
 public class SQLConversionTask implements Runnable {
@@ -17,7 +18,8 @@ public class SQLConversionTask implements Runnable {
 
     @Override
     public void run() {
-        String location = plugin.usersFile;
+        Database database = mcMMO.getPlayerDatabase();
+        String location = mcMMO.getUsersFile();
 
         try {
             FileReader file = new FileReader(location);
@@ -164,7 +166,7 @@ public class SQLConversionTask implements Runnable {
                 }
 
                 //Check to see if the user is in the DB
-                id = mcMMO.database.getInt("SELECT id FROM "
+                id = database.getInt("SELECT id FROM "
                         + tablePrefix
                         + "users WHERE user = '" + playerName + "'");
 
@@ -172,11 +174,11 @@ public class SQLConversionTask implements Runnable {
                     theCount++;
 
                     //Update the skill values
-                    mcMMO.database.write("UPDATE "
+                    database.write("UPDATE "
                             + tablePrefix
                             + "users SET lastlogin = " + 0
                             + " WHERE id = " + id);
-                    mcMMO.database.write("UPDATE "
+                    database.write("UPDATE "
                             + tablePrefix
                             + "skills SET "
                             + "  taming = taming+" + Misc.getInt(taming)
@@ -192,7 +194,7 @@ public class SQLConversionTask implements Runnable {
                             + ", acrobatics = acrobatics+" + Misc.getInt(acrobatics)
                             + ", fishing = fishing+" + Misc.getInt(fishing)
                             + " WHERE user_id = " + id);
-                    mcMMO.database.write("UPDATE "
+                    database.write("UPDATE "
                             + tablePrefix
                             + "experience SET "
                             + "  taming = " + Misc.getInt(tamingXP)
@@ -213,32 +215,32 @@ public class SQLConversionTask implements Runnable {
                     theCount++;
 
                     //Create the user in the DB
-                    mcMMO.database.write("INSERT INTO "
+                    database.write("INSERT INTO "
                             + tablePrefix
                             + "users (user, lastlogin) VALUES ('"
                             + playerName + "',"
                             + System.currentTimeMillis() / 1000 + ")");
-                    id = mcMMO.database.getInt("SELECT id FROM "
+                    id = database.getInt("SELECT id FROM "
                                     + tablePrefix
                                     + "users WHERE user = '"
                                     + playerName + "'");
-                    mcMMO.database.write("INSERT INTO "
+                    database.write("INSERT INTO "
                             + tablePrefix
                             + "skills (user_id) VALUES (" + id + ")");
-                    mcMMO.database.write("INSERT INTO "
+                    database.write("INSERT INTO "
                             + tablePrefix
                             + "experience (user_id) VALUES (" + id
                             + ")");
                     //Update the skill values
-                    mcMMO.database.write("UPDATE "
+                    database.write("UPDATE "
                             + tablePrefix
                             + "users SET lastlogin = " + 0
                             + " WHERE id = " + id);
-                    mcMMO.database.write("UPDATE "
+                    database.write("UPDATE "
                             + tablePrefix
                             + "users SET party = '" + party
                             + "' WHERE id = " + id);
-                    mcMMO.database.write("UPDATE "
+                    database.write("UPDATE "
                             + tablePrefix
                             + "skills SET "
                             + "  taming = taming+" + Misc.getInt(taming)
@@ -254,7 +256,7 @@ public class SQLConversionTask implements Runnable {
                             + ", acrobatics = acrobatics+" + Misc.getInt(acrobatics)
                             + ", fishing = fishing+" + Misc.getInt(fishing)
                             + " WHERE user_id = " + id);
-                    mcMMO.database.write("UPDATE "
+                    database.write("UPDATE "
                             + tablePrefix
                             + "experience SET "
                             + "  taming = " + Misc.getInt(tamingXP)

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

@@ -3,7 +3,6 @@ package com.gmail.nossr50.runnables;
 import org.bukkit.entity.Player;
 
 import com.gmail.nossr50.mcMMO;
-import com.gmail.nossr50.datatypes.PlayerProfile;
 import com.gmail.nossr50.util.Database;
 import com.gmail.nossr50.util.Users;
 
@@ -19,13 +18,11 @@ public class SQLReconnect implements Runnable {
         if (!Database.isConnected()) {
             Database.connect();
             if (Database.isConnected()) {
-                for (PlayerProfile x : Users.players.values()) {
-                    x.save(); //Save all profiles
-                }
+                Users.saveAll(); //Save all profiles
+                Users.clearAll(); //Clear the profiles
 
-                Users.players.clear(); //Clear the profiles
-                for (Player x : plugin.getServer().getOnlinePlayers()) {
-                    Users.addUser(x); //Add in new profiles, forcing them to 'load' again from MySQL
+                for (Player player : plugin.getServer().getOnlinePlayers()) {
+                    Users.addUser(player); //Add in new profiles, forcing them to 'load' again from MySQL
                 }
             }
         }

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

@@ -1,8 +1,11 @@
 package com.gmail.nossr50.runnables;
 
-import org.bukkit.entity.Player;
+import org.bukkit.scheduler.BukkitScheduler;
 
 import com.gmail.nossr50.mcMMO;
+import com.gmail.nossr50.datatypes.McMMOPlayer;
+import com.gmail.nossr50.party.PartyManager;
+import com.gmail.nossr50.util.Users;
 
 public class SaveTimer implements Runnable {
     private final mcMMO plugin;
@@ -15,10 +18,13 @@ public class SaveTimer implements Runnable {
     public void run() {
         //All player data will be saved periodically through this
         int count = 1;
+        BukkitScheduler bukkitScheduler = plugin.getServer().getScheduler();
 
-        for (Player player : plugin.getServer().getOnlinePlayers()) {
-            plugin.getServer().getScheduler().scheduleSyncDelayedTask(plugin, new ProfileSaveTask(player), count);
+        for (McMMOPlayer mcMMOPlayer : Users.getPlayers().values()) {
+            bukkitScheduler.scheduleSyncDelayedTask(plugin, new ProfileSaveTask(mcMMOPlayer), count);
             count++;
         }
+
+        PartyManager.getInstance().saveParties();
     }
 }

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

@@ -22,14 +22,14 @@ public class SkillMonitor implements Runnable {
 
         for (Player player : plugin.getServer().getOnlinePlayers()) {
 
-            PlayerProfile PP = Users.getProfile(player);
+            PlayerProfile profile = Users.getProfile(player);
 
             /*
              * MONITOR SKILLS
              */
             for (SkillType skill : SkillType.values()) {
                 if (skill.getTool() != null && skill.getAbility() != null) {
-                    Skills.monitorSkill(player, PP, curTime, skill);
+                    Skills.monitorSkill(player, profile, curTime, skill);
                 }
             }
 
@@ -38,7 +38,7 @@ public class SkillMonitor implements Runnable {
              */
             for (AbilityType ability : AbilityType.values()) {
                 if (ability.getCooldown() > 0 ) {
-                    Skills.watchCooldown(player, PP, curTime, ability);
+                    Skills.watchCooldown(player, profile, ability);
                 }
             }
         }

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

@@ -4,7 +4,7 @@ import org.getspout.spoutapi.SpoutManager;
 import org.getspout.spoutapi.player.FileManager;
 
 import com.gmail.nossr50.mcMMO;
-import com.gmail.nossr50.config.Config;
+import com.gmail.nossr50.config.SpoutConfig;
 import com.gmail.nossr50.spout.SpoutStuff;
 
 public class SpoutStart implements Runnable{
@@ -17,20 +17,24 @@ public class SpoutStart implements Runnable{
     @Override
     public void run() {
         if (plugin.getServer().getPluginManager().getPlugin("Spout") != null) {
-            Config.getInstance().spoutEnabled = true;
+            mcMMO.spoutEnabled = true;
         }
         else {
-            Config.getInstance().spoutEnabled = false;
+            mcMMO.spoutEnabled = false;
         }
 
         //Spout Stuff
-        if (Config.getInstance().spoutEnabled) {
+        if (mcMMO.spoutEnabled) {
+            SpoutConfig.getInstance();
             SpoutStuff.setupSpoutConfigs();
             SpoutStuff.registerCustomEvent();
             SpoutStuff.extractFiles(); //Extract source materials
 
             FileManager FM = SpoutManager.getFileManager();
             FM.addToPreLoginCache(plugin, SpoutStuff.getFiles());
+
+            //Handle spout players after a /reload
+            SpoutStuff.reloadSpoutPlayers();
         }
     }
 }

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

@@ -0,0 +1,27 @@
+package com.gmail.nossr50.runnables;
+
+import org.bukkit.Material;
+import org.bukkit.block.Block;
+import org.bukkit.event.block.BlockPistonRetractEvent;
+
+import com.gmail.nossr50.mcMMO;
+
+public class StickyPistonTracker implements Runnable {
+    BlockPistonRetractEvent event;
+
+    public StickyPistonTracker(BlockPistonRetractEvent event) {
+        this.event = event;
+    }
+
+    @Override
+    public void run() {
+        Block originalBlock = event.getRetractLocation().getBlock();
+
+        if (originalBlock.getType() == Material.AIR && mcMMO.placeStore.isTrue(originalBlock)) {
+            Block newBlock = originalBlock.getRelative(event.getDirection().getOppositeFace());
+
+            mcMMO.placeStore.setFalse(originalBlock);
+            mcMMO.placeStore.setTrue(newBlock);
+        }
+    }
+}