Weekly beta release.

usage is handled internally due to the number of subcommands.

Changelog.txt

@@ -16,12 +16,21 @@ Version 1.4.00-dev
  + Added '/party disband' command, kicks out all members and deletes the party
  + Added '/ptp toggle' command, to disable party teleportation.
  + Added '/ptp accept' and '/ptp acceptall' commands
+ + Added an automatic party kick when a party member has been offline for 7 days (default)
+ + Added a permission to allow friendly fire in parties, both attacker and defender must have it for friendly fire to occur
  + Added timeout on party teleport requests
  + Added XP bonus for Archery based on distance from shooter to target
  + Added ability to config Hylian Luck drops through treasures.yml
- + Added party XP sharing
+ + Added party XP sharing, when more party members are near the share bonus increases.
  + Added vanilla XP boost for Fishing - includes permissions, config options, etc
- = Fixed /addlevels not working properly on offline players
+ + Added particle effect for bleeding
+ + Added methods to check if a player is in party or admin chat to the ChatAPI
+ + Added /mcpurge functionality for Flatfile users
+ + Added basic support for Mo' Creatures (and other entity mods) - specify mob info in entities.yml
+ + Added Shears, Buckets, Fishing Rods, Flint & Steel, Carrot Sticks, and Bows to the list of items that can be Salvaged
+ + Added the "wait" music disc to the default fishing treasures
+ + Added "Chinese (Taiwan)" localization files (zh_TW)
+ = Fixed multiple commands not working properly on offline players
  = Fixed /mmoedit not giving feedback when modifying another players stats
  = Fixed the guide usage string showing up every time /skillname was called
  = Fixed Spout not being able to precache our resources properly, and therefore making our XP bars fail
@@ -32,6 +41,7 @@ Version 1.4.00-dev
  = Fixed bug where all skill guide headers appeared as "Skillname Guide Guide"
  = Fixed bug where Impact was applied incorrectly due to an inverted method call
  = Fixed bug where Impact improperly determined the defender's armor
+ = Fixed a bug which made it impossible to join other players' parties
  = Fixed ArrayIndexOutOfBoundsException resulting from being unranked in a skill when using FlatFile
  = Fixed Woodcutting accidentally using Mining double drop values.
  = Fixed Hylian Luck not removing the block-placed flag from flowers.
@@ -44,6 +54,7 @@ Version 1.4.00-dev
  = Fixed a bug where party join messages weren't displayed
  = Fixed a bug where Disarm and Deflect had wrong values
  = Fixed Magic Hunter (Fishing ability) favoring certain enchants
+ ! Changed /p and /a to use /partychat and /adminchat as the default command name. The use of /p, /pc, /a, and /ac is still supported.
  ! We're now using Bukkit sounds instead of Spout sounds.
  ! It is now possible to use a negative number for Max_Level in treasures.yml to not use a maximum level, changed default file accordingly
  ! A Fishing catch will now always contains a fish even if a treasure is found
@@ -57,9 +68,12 @@ Version 1.4.00-dev
  ! Changed Excavation to have individual XP values for each block type, rather than a base XP value.
  ! Changed the way party teleportation works. When using /ptp, the target player needs to confirm the teleport before it takes place. (Configurable)
  ! Changed BeastLore: Now also displays offline player names
+ ! Changed backup task to include ALL config files
+ ! Deprecated most functions in ExperienceAPI, replaced them with identical versions that use a String for the SkillName rather than the SkillType enum values
  - Removed Party "master/apprentice" system. Replaced with the new party XP share feature.
  - Removed unused "healthbar" files from the resources
  - Removed config options for disabling commands from the config.yml. This should instead be done through permissions.
+ - Removed Chimaera Wing
 
 Version 1.3.14
  + Added new Hylian Luck skill to Herbalism.

pom.xml

@@ -2,7 +2,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>com.gmail.nossr50.mcMMO</groupId>
     <artifactId>mcMMO</artifactId>
-    <version>1.4.00-beta1</version>
+    <version>1.4.00-beta2</version>
     <name>mcMMO</name>
     <url>https://github.com/mcMMO-Dev/mcMMO</url>
     <issueManagement>
@@ -19,6 +19,7 @@
                 <directory>${basedir}/src/main/resources/</directory>
                 <includes>
                     <include>*.yml</include>
+                    <include>.jenkins</include>
                 </includes>
             </resource>
             <resource>
@@ -91,6 +92,32 @@
                     </execution>
                 </executions>
             </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-shade-plugin</artifactId>
+                <version>1.5</version>
+                <configuration>
+                    <artifactSet>
+                        <includes>
+                            <include>org.mcstats.bukkit:metrics</include>
+                        </includes>
+                    </artifactSet>
+                    <relocations>
+                        <relocation>
+                            <pattern>org.mcstats</pattern>
+                            <shadedPattern>com.gmail.nossr50.util.mcstats</shadedPattern>
+                        </relocation>
+                    </relocations>
+                </configuration>
+                <executions>
+                    <execution>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>shade</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
         </plugins>
         <extensions>
             <extension>
@@ -106,7 +133,7 @@
                 <enabled>true</enabled>
                 <updatePolicy>always</updatePolicy>
                 <checksumPolicy>fail</checksumPolicy>
-            </snapshots> 
+            </snapshots>
             <id>bukkit-repo</id>
             <url>http://repo.bukkit.org/content/groups/public/</url>
         </repository>
@@ -115,10 +142,19 @@
                 <enabled>true</enabled>
                 <updatePolicy>always</updatePolicy>
                 <checksumPolicy>fail</checksumPolicy>
-            </snapshots> 
+            </snapshots>
             <id>spout-repo</id>
             <url>http://nexus.spout.org/content/groups/public/</url>
         </repository>
+        <repository>
+            <snapshots>
+                <enabled>true</enabled>
+                <updatePolicy>always</updatePolicy>
+                <checksumPolicy>fail</checksumPolicy>
+            </snapshots>
+            <id>Plugin Metrics</id>
+            <url>http://repo.mcstats.org/content/repositories/public</url>
+        </repository>
     </repositories>
     <dependencies>
         <dependency>
@@ -141,6 +177,12 @@
             <version>4.10</version>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>org.mcstats.bukkit</groupId>
+            <artifactId>metrics</artifactId>
+            <version>R6</version>
+            <scope>compile</scope>
+        </dependency>
     </dependencies>
     <distributionManagement>
         <repository>

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

@@ -2,6 +2,7 @@ package com.gmail.nossr50.api;
 
 import org.bukkit.entity.Player;
 
+import com.gmail.nossr50.datatypes.PlayerProfile;
 import com.gmail.nossr50.skills.utilities.AbilityType;
 import com.gmail.nossr50.util.Users;
 
@@ -9,36 +10,38 @@ public final class AbilityAPI {
     private AbilityAPI() {}
 
     public static boolean berserkEnabled(Player player) {
-        return Users.getProfile(player).getAbilityMode(AbilityType.BERSERK);
+        return Users.getPlayer(player).getProfile().getAbilityMode(AbilityType.BERSERK);
     }
 
     public static boolean gigaDrillBreakerEnabled(Player player) {
-        return Users.getProfile(player).getAbilityMode(AbilityType.GIGA_DRILL_BREAKER);
+        return Users.getPlayer(player).getProfile().getAbilityMode(AbilityType.GIGA_DRILL_BREAKER);
     }
 
     public static boolean greenTerraEnabled(Player player) {
-        return Users.getProfile(player).getAbilityMode(AbilityType.GREEN_TERRA);
+        return Users.getPlayer(player).getProfile().getAbilityMode(AbilityType.GREEN_TERRA);
     }
 
     public static boolean serratedStrikesEnabled(Player player) {
-        return Users.getProfile(player).getAbilityMode(AbilityType.SERRATED_STRIKES);
+        return Users.getPlayer(player).getProfile().getAbilityMode(AbilityType.SERRATED_STRIKES);
     }
 
     public static boolean skullSplitterEnabled(Player player) {
-        return Users.getProfile(player).getAbilityMode(AbilityType.SKULL_SPLIITER);
+        return Users.getPlayer(player).getProfile().getAbilityMode(AbilityType.SKULL_SPLIITER);
     }
 
     public static boolean superBreakerEnabled(Player player) {
-        return Users.getProfile(player).getAbilityMode(AbilityType.SUPER_BREAKER);
+        return Users.getPlayer(player).getProfile().getAbilityMode(AbilityType.SUPER_BREAKER);
     }
 
     public static boolean treeFellerEnabled(Player player) {
-        return Users.getProfile(player).getAbilityMode(AbilityType.TREE_FELLER);
+        return Users.getPlayer(player).getProfile().getAbilityMode(AbilityType.TREE_FELLER);
     }
 
     public static boolean isAnyAbilityEnabled(Player player) {
+        PlayerProfile profile = Users.getPlayer(player).getProfile();
+
         for (AbilityType ability : AbilityType.values()) {
-            if (Users.getProfile(player).getAbilityMode(ability)) {
+            if (profile.getAbilityMode(ability)) {
                 return true;
             }
         }

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

@@ -1,9 +1,11 @@
 package com.gmail.nossr50.api;
 
+import org.bukkit.entity.Player;
 import org.bukkit.plugin.Plugin;
 
 import com.gmail.nossr50.chat.ChatManager;
 import com.gmail.nossr50.party.PartyManager;
+import com.gmail.nossr50.util.Users;
 
 public final class ChatAPI {
     private ChatAPI() {}
@@ -94,4 +96,44 @@ public final class ChatAPI {
     public static void sendAdminChat(String sender, String message) {
         sendAdminChat(null, sender, sender, message);
     }
+
+    /**
+     * Check if a player is currently talking in party chat.
+     *
+     * @param player The player to check
+     * @return true if the player is using party chat, false otherwise
+     */
+    public static boolean isUsingPartyChat(Player player) {
+        return Users.getPlayer(player).getPartyChatMode();
+    }
+
+    /**
+     * Check if a player is currently talking in party chat.
+     *
+     * @param playerName The name of the player to check
+     * @return true if the player is using party chat, false otherwise
+     */
+    public static boolean isUsingPartyChat(String playerName) {
+        return Users.getPlayer(playerName).getPartyChatMode();
+    }
+
+    /**
+     * Check if a player is currently talking in admin chat.
+     *
+     * @param player The player to check
+     * @return true if the player is using admin chat, false otherwise
+     */
+    public static boolean isUsingAdminChat(Player player) {
+        return Users.getPlayer(player).getAdminChatMode();
+    }
+
+    /**
+     * Check if a player is currently talking in admin chat.
+     *
+     * @param playerName The name of the player to check
+     * @return true if the player is using admin chat, false otherwise
+     */
+    public static boolean isUsingAdminChat(String playerName) {
+        return Users.getPlayer(playerName).getAdminChatMode();
+    }
 }

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

@@ -2,6 +2,7 @@ package com.gmail.nossr50.api;
 
 import org.bukkit.entity.Player;
 
+import com.gmail.nossr50.config.Config;
 import com.gmail.nossr50.skills.utilities.SkillTools;
 import com.gmail.nossr50.skills.utilities.SkillType;
 import com.gmail.nossr50.util.Users;
@@ -14,32 +15,30 @@ public final class ExperienceAPI {
      *
      * @param player The player to check
      * @param skillType The skill to check
+     * @deprecated Calling this function is no longer needed and should be avoided
      */
+    @Deprecated
     private static void checkXP(Player player, SkillType skillType) {
-        if (skillType.equals(SkillType.ALL)) {
-            SkillTools.xpCheckAll(player, Users.getProfile(player));
-        }
-        else {
-            SkillTools.xpCheckSkill(skillType, player, Users.getProfile(player));
-        }
+        SkillTools.xpCheckSkill(skillType, player, Users.getProfile(player));
     }
 
     /**
-     * Adds XP to the player, doesn't calculate for XP Rate or other modifiers.
+     * Adds raw XP to the player.
      * </br>
      * This function is designed for API usage.
      *
      * @param player The player to add XP to
      * @param skillType The skill to add XP to
      * @param XP The amount of XP to add
+     * @deprecated Use {@link #addRawXP(Player, String, int)} instead
      */
+   @Deprecated
     public static void addRawXP(Player player, SkillType skillType, int XP) {
-        Users.getPlayer(player).addXpOverride(skillType, XP);
-        checkXP(player, skillType);
+        Users.getPlayer(player).applyXpGain(skillType, XP);
     }
 
     /**
-     * Adds XP to the player, calculates for XP Rate but not skill modifiers.
+     * Adds raw XP to the player.
      * </br>
      * This function is designed for API usage.
      *
@@ -47,13 +46,27 @@ public final class ExperienceAPI {
      * @param skillType The skill to add XP to
      * @param XP The amount of XP to add
      */
+    public static void addRawXP(Player player, String skillType, int XP) {
+        Users.getPlayer(player).applyXpGain(SkillType.getSkill(skillType), XP);
+    }
+
+    /**
+     * Adds XP to the player, calculates for XP Rate only.
+     * </br>
+     * This function is designed for API usage.
+     *
+     * @param player The player to add XP to
+     * @param skillType The skill to add XP to
+     * @param XP The amount of XP to add
+     * @deprecated Use {@link #addMultipliedXP(Player, String, int)} instead
+     */
+    @Deprecated
     public static void addMultipliedXP(Player player, SkillType skillType, int XP) {
-        Users.getPlayer(player).addXpOverrideBonus(skillType, XP);
-        checkXP(player, skillType);
+        Users.getPlayer(player).applyXpGain(skillType, (int) (XP * Config.getInstance().getExperienceGainsGlobalMultiplier()));
     }
 
     /**
-     * Adds XP to the player, calculates for XP Rate and skill modifiers.
+     * Adds XP to the player, calculates for XP Rate only.
      * </br>
      * This function is designed for API usage.
      *
@@ -61,9 +74,51 @@ public final class ExperienceAPI {
      * @param skillType The skill to add XP to
      * @param XP The amount of XP to add
      */
+    public static void addMultipliedXP(Player player, String skillType, int XP) {
+        Users.getPlayer(player).applyXpGain(SkillType.getSkill(skillType), (int) (XP * Config.getInstance().getExperienceGainsGlobalMultiplier()));
+    }
+
+    /**
+     * Adds XP to the player, calculates for XP Rate, skill modifiers and perks. May be shared with the party.
+     * </br>
+     * This function is designed for API usage.
+     *
+     * @param player The player to add XP to
+     * @param skillType The skill to add XP to
+     * @param XP The amount of XP to add
+     * @deprecated Use {@link #addXP(Player, String, int)} instead
+     */
+    @Deprecated
     public static void addXP(Player player, SkillType skillType, int XP) {
-        Users.getPlayer(player).addXp(skillType, XP);
-        checkXP(player, skillType);
+        Users.getPlayer(player).beginXpGain(skillType, XP);
+    }
+
+    /**
+     * Adds XP to the player, calculates for XP Rate, skill modifiers and perks. May be shared with the party.
+     * </br>
+     * This function is designed for API usage.
+     *
+     * @param player The player to add XP to
+     * @param skillType The skill to add XP to
+     * @param XP The amount of XP to add
+     */
+    public static void addXP(Player player, String skillType, int XP) {
+        Users.getPlayer(player).beginXpGain(SkillType.getSkill(skillType), XP);
+    }
+
+    /**
+     * Get the amount of XP a player has in a specific skill.
+     * </br>
+     * This function is designed for API usage.
+     *
+     * @param player The player to get XP for
+     * @param skillType The skill to get XP for
+     * @return the amount of XP in a given skill
+     * @deprecated Use {@link #getXP(Player, String)} instead
+     */
+    @Deprecated
+    public static int getXP(Player player, SkillType skillType) {
+        return Users.getPlayer(player).getProfile().getSkillXpLevel(skillType);
     }
 
     /**
@@ -75,8 +130,23 @@ public final class ExperienceAPI {
      * @param skillType The skill to get XP for
      * @return the amount of XP in a given skill
      */
-    public static int getXP(Player player, SkillType skillType) {
-        return Users.getProfile(player).getSkillXpLevel(skillType);
+    public static int getXP(Player player, String skillType) {
+        return Users.getPlayer(player).getProfile().getSkillXpLevel(SkillType.getSkill(skillType));
+    }
+
+    /**
+     * Get the amount of XP left before leveling up.
+     * </br>
+     * This function is designed for API usage.
+     *
+     * @param player The player to get the XP amount for
+     * @param skillType The skill to get the XP amount for
+     * @return the amount of XP left before leveling up a specifc skill
+     * @deprecated Use {@link #getXPToNextLevel(Player, String)} instead
+     */
+    @Deprecated
+    public static int getXPToNextLevel(Player player, SkillType skillType) {
+        return Users.getPlayer(player).getProfile().getXpToLevel(skillType);
     }
 
     /**
@@ -88,8 +158,8 @@ public final 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 static int getXPToNextLevel(Player player, SkillType skillType) {
-        return Users.getProfile(player).getXpToLevel(skillType);
+    public static int getXPToNextLevel(Player player, String skillType) {
+        return Users.getPlayer(player).getProfile().getXpToLevel(SkillType.getSkill(skillType));
     }
 
     /**
@@ -100,7 +170,8 @@ public final class ExperienceAPI {
      * @param player The player to add levels to
      * @param skillType Type of skill to add levels to
      * @param levels Number of levels to add
-     * @param notify True if this should fire a level up notification, false otherwise.
+     * @param notify Unused argument
+     * @deprecated Use addLevel(Player, SKillType, int) instead
      */
     public static void addLevel(Player player, SkillType skillType, int levels, boolean notify) {
         Users.getProfile(player).addLevels(skillType, levels);
@@ -110,6 +181,49 @@ public final class ExperienceAPI {
         }
     }
 
+    /**
+     * Add levels to a skill.
+     * </br>
+     * This function is designed for API usage.
+     *
+     * @param player The player to add levels to
+     * @param skillType Type of skill to add levels to
+     * @param levels Number of levels to add
+     * @deprecated Use {@link #addLevel(Player, String, int)} instead
+     */
+    @Deprecated
+    public static void addLevel(Player player, SkillType skillType, int levels) {
+        Users.getPlayer(player).getProfile().addLevels(skillType, levels);
+    }
+
+    /**
+     * Add levels to a skill.
+     * </br>
+     * This function is designed for API usage.
+     *
+     * @param player The player to add levels to
+     * @param skillType Type of skill to add levels to
+     * @param levels Number of levels to add
+     */
+    public static void addLevel(Player player, String skillType, int levels) {
+        Users.getPlayer(player).getProfile().addLevels(SkillType.getSkill(skillType), levels);
+    }
+
+    /**
+     * Get the level a player has in a specific skill.
+     * </br>
+     * This function is designed for API usage.
+     *
+     * @param player The player to get the level for
+     * @param skillType The skill to get the level for
+     * @return the level of a given skill
+     * @deprecated Use {@link #getLevel(Player, String)} instead
+     */
+    @Deprecated
+    public static int getLevel(Player player, SkillType skillType) {
+        return Users.getPlayer(player).getProfile().getSkillLevel(skillType);
+    }
+
     /**
      * Get the level a player has in a specific skill.
      * </br>
@@ -119,8 +233,8 @@ public final class ExperienceAPI {
      * @param skillType The skill to get the level for
      * @return the level of a given skill
      */
-    public static int getLevel(Player player, SkillType skillType) {
-        return Users.getProfile(player).getSkillLevel(skillType);
+    public static int getLevel(Player player, String skillType) {
+        return Users.getPlayer(player).getProfile().getSkillLevel(SkillType.getSkill(skillType));
     }
 
     /**
@@ -143,9 +257,39 @@ public final class ExperienceAPI {
      * @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
+     * @deprecated Use {@link #setLevel(Player, String, int)} instead
      */
+    @Deprecated
     public static void setLevel(Player player, SkillType skillType, int skillLevel) {
-        Users.getProfile(player).modifySkill(skillType, skillLevel);
+        Users.getPlayer(player).getProfile().modifySkill(skillType, skillLevel);
+    }
+
+    /**
+     * 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, String skillType, int skillLevel) {
+        Users.getPlayer(player).getProfile().modifySkill(SkillType.getSkill(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
+     * @deprecated Use {@link #setXP(Player, String, int)} instead
+     */
+    @Deprecated
+    public static void setXP(Player player, SkillType skillType, int newValue) {
+        Users.getPlayer(player).getProfile().setSkillXpLevel(skillType, newValue);
     }
 
     /**
@@ -157,8 +301,23 @@ public final class ExperienceAPI {
      * @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);
+    public static void setXP(Player player, String skillType, int newValue) {
+        Users.getPlayer(player).getProfile().setSkillXpLevel(SkillType.getSkill(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
+     * @deprecated Use {@link #removeXP(Player, String, int)} instead
+     */
+    @Deprecated
+    public static void removeXP(Player player, SkillType skillType, int xp) {
+        Users.getPlayer(player).getProfile().removeXp(skillType, xp);
     }
 
     /**
@@ -170,7 +329,7 @@ public final class ExperienceAPI {
      * @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);
+    public static void removeXP(Player player, String skillType, int xp) {
+        Users.getPlayer(player).getProfile().removeXp(SkillType.getSkill(skillType), xp);
     }
 }

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

@@ -20,7 +20,7 @@ public final class PartyAPI {
      * @return the name of the player's party
      */
     public static String getPartyName(Player player) {
-        return Users.getProfile(player).getParty().getName();
+        return Users.getPlayer(player).getParty().getName();
     }
 
     /**
@@ -32,7 +32,7 @@ public final class PartyAPI {
      * @return true if the player is in a party, false otherwise
      */
     public static boolean inParty(Player player) {
-        return Users.getProfile(player).inParty();
+        return Users.getPlayer(player).inParty();
     }
 
     /**
@@ -77,7 +77,7 @@ public final class PartyAPI {
             party.setLeader(playerName);
         }
 
-        PartyManager.addToParty(playerName, Users.getProfile(player), party);
+        PartyManager.addToParty(playerName, Users.getPlayer(player), party);
     }
 
     /**
@@ -88,7 +88,7 @@ public final class PartyAPI {
      * @param player The player to remove
      */
     public static void removeFromParty(Player player) {
-        PartyManager.removeFromParty(player.getName(), Users.getProfile(player).getParty());
+        PartyManager.removeFromParty(player.getName(), Users.getPlayer(player).getParty());
     }
 
     /**

src/main/java/com/gmail/nossr50/chat/ChatManager.java

@@ -32,7 +32,7 @@ public final class ChatManager {
 
         for (Player otherPlayer : mcMMO.p.getServer().getOnlinePlayers()) {
             if (Permissions.adminChat(otherPlayer) || otherPlayer.isOp()) {
-                otherPlayer.sendMessage(LocaleLoader.getString("Commands.AdminChat.Prefix", new Object[] {displayName}) + adminMessage);
+                otherPlayer.sendMessage(LocaleLoader.getString("Commands.AdminChat.Prefix", displayName) + adminMessage);
             }
         }
 
@@ -40,6 +40,10 @@ public final class ChatManager {
         mcMMO.p.getLogger().info("[A]<" + displayName + "> " + adminMessage);
     }
 
+    public static void handleAdminChat(Plugin plugin, String senderName, String message) {
+        handleAdminChat(plugin, senderName, senderName, message);
+    }
+
     public static void handlePartyChat(Plugin plugin, Party party, String playerName, String displayName, String message) {
         String partyName = party.getName();
 
@@ -58,10 +62,14 @@ public final class ChatManager {
         String partyMessage = chatEvent.getMessage();
 
         for (Player member : party.getOnlineMembers()) {
-            member.sendMessage(LocaleLoader.getString("Commands.Party.Chat.Prefix", new Object[] {displayName}) + partyMessage);
+            member.sendMessage(LocaleLoader.getString("Commands.Party.Chat.Prefix", displayName) + partyMessage);
         }
 
         displayName = ChatColor.stripColor(displayName);
         mcMMO.p.getLogger().info("[P](" + partyName + ")" + "<" + displayName + "> " + partyMessage);
     }
-}
+
+    public static void handlePartyChat(Plugin plugin, Party party, String senderName, String message) {
+        handlePartyChat(plugin, party, senderName, senderName, message);
+    }
+}

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

@@ -0,0 +1,70 @@
+package com.gmail.nossr50.chat;
+
+import com.gmail.nossr50.datatypes.McMMOPlayer;
+import com.gmail.nossr50.locale.LocaleLoader;
+
+public enum ChatMode {
+    ADMIN(LocaleLoader.getString("Commands.AdminChat.On"), LocaleLoader.getString("Commands.AdminChat.Off")),
+    PARTY(LocaleLoader.getString("Commands.Party.Chat.On"), LocaleLoader.getString("Commands.Party.Chat.Off"));
+
+    private String enabledMessage;
+    private String disabledMessage;
+
+    private ChatMode (String enabledMessage, String disabledMessage) {
+        this.enabledMessage = enabledMessage;
+        this.disabledMessage = disabledMessage;
+    }
+
+    public boolean isEnabled(McMMOPlayer mcMMOPlayer) {
+        switch (this) {
+        case ADMIN:
+            return mcMMOPlayer.getAdminChatMode();
+
+        case PARTY:
+            return mcMMOPlayer.getPartyChatMode();
+
+        default:
+            return false;
+        }
+    }
+
+    public void disable(McMMOPlayer mcMMOPlayer) {
+        switch (this) {
+        case ADMIN:
+            mcMMOPlayer.setAdminChat(false);
+            return;
+
+        case PARTY:
+            mcMMOPlayer.setPartyChat(false);
+            return;
+
+        default:
+            return;
+        }
+    }
+
+    public void enable(McMMOPlayer mcMMOPlayer) {
+        switch (this) {
+        case ADMIN:
+            mcMMOPlayer.setAdminChat(true);
+            mcMMOPlayer.setPartyChat(false);
+            return;
+
+        case PARTY:
+            mcMMOPlayer.setPartyChat(true);
+            mcMMOPlayer.setAdminChat(false);
+            return;
+
+        default:
+            return;
+        }
+    }
+
+    public String getEnabledMessage() {
+        return enabledMessage;
+    }
+
+    public String getDisabledMessage() {
+        return disabledMessage;
+    }
+}

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

@@ -1,73 +0,0 @@
-package com.gmail.nossr50.chat.commands;
-
-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.chat.ChatManager;
-import com.gmail.nossr50.commands.CommandHelper;
-import com.gmail.nossr50.datatypes.PlayerProfile;
-import com.gmail.nossr50.locale.LocaleLoader;
-import com.gmail.nossr50.util.Permissions;
-import com.gmail.nossr50.util.Users;
-
-public class ACommand implements CommandExecutor {
-    @Override
-    public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
-        PlayerProfile profile;
-        String usage = LocaleLoader.getString("Commands.Usage.1", new Object[] {"a", "<" + LocaleLoader.getString("Commands.Usage.Message") + ">"});
-
-        if (CommandHelper.noCommandPermissions(sender, "mcmmo.chat.adminchat")) {
-            return true;
-        }
-
-        switch (args.length) {
-        case 0:
-            if (sender instanceof Player) {
-                profile = Users.getProfile((Player) sender);
-
-                if (profile.getPartyChatMode()) {
-                    profile.togglePartyChat();
-                }
-
-                profile.toggleAdminChat();
-
-                if (profile.getAdminChatMode()) {
-                    sender.sendMessage(LocaleLoader.getString("Commands.AdminChat.On"));
-                }
-                else {
-                    sender.sendMessage(LocaleLoader.getString("Commands.AdminChat.Off"));
-                }
-            }
-            else {
-                sender.sendMessage(usage);
-            }
-
-            return true;
-
-        default:
-            StringBuilder builder = new StringBuilder();
-            builder.append(args[0]);
-
-            for (int i = 1; i < args.length; i++) {
-                builder.append(" ");
-                builder.append(args[i]);
-            }
-
-            String message = builder.toString();
-
-            if (sender instanceof Player) {
-                Player player = (Player) sender;
-                ChatManager.handleAdminChat(mcMMO.p, player.getName(), player.getDisplayName(), message);
-            }
-            else {
-                String ssender = LocaleLoader.getString("Commands.Chat.Console");
-                ChatManager.handleAdminChat(mcMMO.p, ssender, ssender, message);
-            }
-
-            return true;
-        }
-    }
-}

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

@@ -0,0 +1,28 @@
+package com.gmail.nossr50.chat.commands;
+
+import org.bukkit.command.CommandSender;
+import org.bukkit.entity.Player;
+
+import com.gmail.nossr50.mcMMO;
+import com.gmail.nossr50.chat.ChatManager;
+import com.gmail.nossr50.chat.ChatMode;
+import com.gmail.nossr50.locale.LocaleLoader;
+
+public class AdminChatCommand extends ChatCommand {
+    public AdminChatCommand() {
+        super(ChatMode.ADMIN);
+    }
+
+    @Override
+    protected void handleChatSending(CommandSender sender, String[] args) {
+        String message = buildChatMessage(args, 0);
+
+        if (sender instanceof Player) {
+            Player player = (Player) sender;
+            ChatManager.handleAdminChat(mcMMO.p, player.getName(), player.getDisplayName(), message);
+        }
+        else {
+            ChatManager.handleAdminChat(mcMMO.p, LocaleLoader.getString("Commands.Chat.Console"), message);
+        }
+    }
+}

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

@@ -0,0 +1,85 @@
+package com.gmail.nossr50.chat.commands;
+
+import org.bukkit.command.Command;
+import org.bukkit.command.CommandExecutor;
+import org.bukkit.command.CommandSender;
+import org.bukkit.entity.Player;
+
+import com.gmail.nossr50.chat.ChatMode;
+import com.gmail.nossr50.datatypes.McMMOPlayer;
+import com.gmail.nossr50.util.Users;
+
+public abstract class ChatCommand implements CommandExecutor {
+    protected McMMOPlayer mcMMOPlayer;
+    protected ChatMode chatMode;
+
+    public ChatCommand (ChatMode chatMode) {
+        this.chatMode = chatMode;
+    }
+
+    @Override
+    public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
+        switch (args.length) {
+        case 0:
+            if (!(sender instanceof Player)) {
+                return false;
+            }
+
+            mcMMOPlayer = Users.getPlayer((Player) sender);
+
+            if (chatMode.isEnabled(mcMMOPlayer)) {
+                disableChatMode(sender);
+                return true;
+            }
+
+            enableChatMode(sender);
+            return true;
+
+        default:
+            if (args.length == 1) {
+                if (!(sender instanceof Player)) {
+                    return false;
+                }
+
+                mcMMOPlayer = Users.getPlayer((Player) sender);
+
+                if (args[0].equalsIgnoreCase("on")) {
+                    enableChatMode(sender);
+                    return true;
+                }
+
+                if (args[0].equalsIgnoreCase("off")) {
+                    disableChatMode(sender);
+                    return true;
+                }
+            }
+
+            handleChatSending(sender, args);
+            return true;
+        }
+    }
+
+    private void enableChatMode(CommandSender sender) {
+        chatMode.enable(mcMMOPlayer);
+        sender.sendMessage(chatMode.getEnabledMessage());
+    }
+
+    private void disableChatMode(CommandSender sender) {
+        chatMode.disable(mcMMOPlayer);
+        sender.sendMessage(chatMode.getDisabledMessage());
+    }
+
+    protected String buildChatMessage(String[] args, int index) {
+        StringBuilder builder = new StringBuilder();
+        builder.append(args[index]);
+
+        for (int i = index + 1; i < args.length; i++) {
+            builder.append(" ");
+            builder.append(args[i]);
+        }
+
+        return builder.toString();
+    }
+
+    protected abstract void handleChatSending(CommandSender sender, String[] args);
+}

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

@@ -1,108 +0,0 @@
-package com.gmail.nossr50.chat.commands;
-
-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.chat.ChatManager;
-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;
-
-public class PCommand implements CommandExecutor {
-    private final mcMMO plugin;
-
-    public PCommand (mcMMO plugin) {
-        this.plugin = plugin;
-    }
-
-    @Override
-    public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
-        PlayerProfile profile;
-        String usage = LocaleLoader.getString("Commands.Usage.2", new Object[] {"p", "<" + LocaleLoader.getString("Commands.Usage.PartyName") + ">", "<" + LocaleLoader.getString("Commands.Usage.Message") + ">"});
-
-        if (CommandHelper.noCommandPermissions(sender, "mcmmo.commands.party")) {
-            return true;
-        }
-
-        switch (args.length) {
-        case 0:
-            if (sender instanceof Player) {
-                profile = Users.getProfile((Player) sender);
-
-                if (profile.getAdminChatMode()) {
-                    profile.toggleAdminChat();
-                }
-
-                profile.togglePartyChat();
-
-                if (profile.getPartyChatMode()) {
-                    sender.sendMessage(LocaleLoader.getString("Commands.Party.Chat.On"));
-                }
-                else {
-                    sender.sendMessage(LocaleLoader.getString("Commands.Party.Chat.Off"));
-                }
-            }
-            else {
-                sender.sendMessage(usage);
-            }
-
-            return true;
-
-        default:
-            if (sender instanceof Player) {
-                Player player = (Player) sender;
-                Party party = Users.getProfile(player).getParty();
-
-                if (party == null) {
-                    player.sendMessage(LocaleLoader.getString("Commands.Party.None"));
-                    return true;
-                }
-
-                StringBuilder builder = new StringBuilder();
-                builder.append(args[0]);
-
-                for (int i = 1; i < args.length; i++) {
-                    builder.append(" ");
-                    builder.append(args[i]);
-                }
-
-                String message = builder.toString();
-                ChatManager.handlePartyChat(plugin, party, player.getName(), player.getDisplayName(), message);
-            }
-            else {
-                if (args.length < 2) {
-                    sender.sendMessage(usage);
-                    return true;
-                }
-
-                Party party = PartyManager.getParty(args[0]);
-
-                if (party == null) {
-                    sender.sendMessage(LocaleLoader.getString("Party.InvalidName"));
-                    return true;
-                }
-
-                StringBuilder builder = new StringBuilder();
-                builder.append(args[1]);
-
-                for (int i = 2; i < args.length; i++) {
-                    builder.append(" ");
-                    builder.append(args[i]);
-                }
-
-                String ssender = LocaleLoader.getString("Commands.Chat.Console");
-                String message = builder.toString();
-
-                ChatManager.handlePartyChat(plugin, party, ssender, ssender, message);
-            }
-
-            return true;
-        }
-    }
-}

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

@@ -0,0 +1,48 @@
+package com.gmail.nossr50.chat.commands;
+
+import org.bukkit.command.CommandSender;
+import org.bukkit.entity.Player;
+
+import com.gmail.nossr50.mcMMO;
+import com.gmail.nossr50.chat.ChatManager;
+import com.gmail.nossr50.chat.ChatMode;
+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 PartyChatCommand extends ChatCommand {
+    public PartyChatCommand() {
+        super(ChatMode.PARTY);
+    }
+
+    @Override
+    protected void handleChatSending(CommandSender sender, String[] args) {
+        if (sender instanceof Player) {
+            Player player = (Player) sender;
+            Party party = Users.getPlayer(player).getParty();
+
+            if (party == null) {
+                sender.sendMessage(LocaleLoader.getString("Commands.Party.None"));
+                return;
+            }
+
+            ChatManager.handlePartyChat(mcMMO.p, party, player.getName(), player.getDisplayName(), buildChatMessage(args, 0));
+        }
+        else {
+            if (args.length < 2) {
+                sender.sendMessage(LocaleLoader.getString("Party.Specify"));
+                return;
+            }
+
+            Party party = PartyManager.getParty(args[0]);
+
+            if (party == null) {
+                sender.sendMessage(LocaleLoader.getString("Party.InvalidName"));
+                return;
+            }
+
+            ChatManager.handlePartyChat(mcMMO.p, party, LocaleLoader.getString("Commands.Chat.Console"), buildChatMessage(args, 1));
+        }
+    }
+}

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

@@ -62,23 +62,23 @@ public final class CommandHelper {
             display.sendMessage(LocaleLoader.getString("Stats.Header.Gathering"));
 
             if (Permissions.excavation(inspect)) {
-                display.sendMessage(LocaleLoader.getString("Skills.Stats", new Object[] { LocaleLoader.getString("Excavation.Listener"), profile.getSkillLevel(SkillType.EXCAVATION), profile.getSkillXpLevel(SkillType.EXCAVATION), profile.getXpToLevel(SkillType.EXCAVATION) }));
+                display.sendMessage(LocaleLoader.getString("Skills.Stats", LocaleLoader.getString("Excavation.Listener"), profile.getSkillLevel(SkillType.EXCAVATION), profile.getSkillXpLevel(SkillType.EXCAVATION), profile.getXpToLevel(SkillType.EXCAVATION)));
             }
 
             if (Permissions.fishing(inspect)) {
-                display.sendMessage(LocaleLoader.getString("Skills.Stats", new Object[] { LocaleLoader.getString("Fishing.Listener"), profile.getSkillLevel(SkillType.FISHING), profile.getSkillXpLevel(SkillType.FISHING), profile.getXpToLevel(SkillType.FISHING) }));
+                display.sendMessage(LocaleLoader.getString("Skills.Stats", LocaleLoader.getString("Fishing.Listener"), profile.getSkillLevel(SkillType.FISHING), profile.getSkillXpLevel(SkillType.FISHING), profile.getXpToLevel(SkillType.FISHING)));
             }
 
             if (Permissions.herbalism(inspect)) {
-                display.sendMessage(LocaleLoader.getString("Skills.Stats", new Object[] { LocaleLoader.getString("Herbalism.Listener"), profile.getSkillLevel(SkillType.HERBALISM), profile.getSkillXpLevel(SkillType.HERBALISM), profile.getXpToLevel(SkillType.HERBALISM) }));
+                display.sendMessage(LocaleLoader.getString("Skills.Stats", LocaleLoader.getString("Herbalism.Listener"), profile.getSkillLevel(SkillType.HERBALISM), profile.getSkillXpLevel(SkillType.HERBALISM), profile.getXpToLevel(SkillType.HERBALISM)));
             }
 
             if (Permissions.mining(inspect)) {
-                display.sendMessage(LocaleLoader.getString("Skills.Stats", new Object[] { LocaleLoader.getString("Mining.Listener"), profile.getSkillLevel(SkillType.MINING), profile.getSkillXpLevel(SkillType.MINING), profile.getXpToLevel(SkillType.MINING) }));
+                display.sendMessage(LocaleLoader.getString("Skills.Stats", LocaleLoader.getString("Mining.Listener"), profile.getSkillLevel(SkillType.MINING), profile.getSkillXpLevel(SkillType.MINING), profile.getXpToLevel(SkillType.MINING)));
             }
 
             if (Permissions.woodcutting(inspect)) {
-                display.sendMessage(LocaleLoader.getString("Skills.Stats", new Object[] { LocaleLoader.getString("Woodcutting.Listener"), profile.getSkillLevel(SkillType.WOODCUTTING), profile.getSkillXpLevel(SkillType.WOODCUTTING), profile.getXpToLevel(SkillType.WOODCUTTING) }));
+                display.sendMessage(LocaleLoader.getString("Skills.Stats", LocaleLoader.getString("Woodcutting.Listener"), profile.getSkillLevel(SkillType.WOODCUTTING), profile.getSkillXpLevel(SkillType.WOODCUTTING), profile.getXpToLevel(SkillType.WOODCUTTING)));
             }
         }
     }
@@ -99,23 +99,23 @@ public final class CommandHelper {
             display.sendMessage(LocaleLoader.getString("Stats.Header.Combat"));
 
             if (Permissions.axes(inspect)) {
-                display.sendMessage(LocaleLoader.getString("Skills.Stats", new Object[] { LocaleLoader.getString("Axes.Listener"), profile.getSkillLevel(SkillType.AXES), profile.getSkillXpLevel(SkillType.AXES), profile.getXpToLevel(SkillType.AXES) }));
+                display.sendMessage(LocaleLoader.getString("Skills.Stats", LocaleLoader.getString("Axes.Listener"), profile.getSkillLevel(SkillType.AXES), profile.getSkillXpLevel(SkillType.AXES), profile.getXpToLevel(SkillType.AXES)));
             }
 
             if (Permissions.archery(inspect)) {
-                display.sendMessage(LocaleLoader.getString("Skills.Stats", new Object[] { LocaleLoader.getString("Archery.Listener"), profile.getSkillLevel(SkillType.ARCHERY), profile.getSkillXpLevel(SkillType.ARCHERY), profile.getXpToLevel(SkillType.ARCHERY) }));
+                display.sendMessage(LocaleLoader.getString("Skills.Stats", LocaleLoader.getString("Archery.Listener"), profile.getSkillLevel(SkillType.ARCHERY), profile.getSkillXpLevel(SkillType.ARCHERY), profile.getXpToLevel(SkillType.ARCHERY)));
             }
 
             if (Permissions.swords(inspect)) {
-                display.sendMessage(LocaleLoader.getString("Skills.Stats", new Object[] { LocaleLoader.getString("Swords.Listener"), profile.getSkillLevel(SkillType.SWORDS), profile.getSkillXpLevel(SkillType.SWORDS), profile.getXpToLevel(SkillType.SWORDS) }));
+                display.sendMessage(LocaleLoader.getString("Skills.Stats", LocaleLoader.getString("Swords.Listener"), profile.getSkillLevel(SkillType.SWORDS), profile.getSkillXpLevel(SkillType.SWORDS), profile.getXpToLevel(SkillType.SWORDS)));
             }
 
             if (Permissions.taming(inspect)) {
-                display.sendMessage(LocaleLoader.getString("Skills.Stats", new Object[] { LocaleLoader.getString("Taming.Listener"), profile.getSkillLevel(SkillType.TAMING), profile.getSkillXpLevel(SkillType.TAMING), profile.getXpToLevel(SkillType.TAMING) }));
+                display.sendMessage(LocaleLoader.getString("Skills.Stats", LocaleLoader.getString("Taming.Listener"), profile.getSkillLevel(SkillType.TAMING), profile.getSkillXpLevel(SkillType.TAMING), profile.getXpToLevel(SkillType.TAMING)));
             }
 
             if (Permissions.unarmed(inspect)) {
-                display.sendMessage(LocaleLoader.getString("Skills.Stats", new Object[] { LocaleLoader.getString("Unarmed.Listener"), profile.getSkillLevel(SkillType.UNARMED), profile.getSkillXpLevel(SkillType.UNARMED), profile.getXpToLevel(SkillType.UNARMED) }));
+                display.sendMessage(LocaleLoader.getString("Skills.Stats", LocaleLoader.getString("Unarmed.Listener"), profile.getSkillLevel(SkillType.UNARMED), profile.getSkillXpLevel(SkillType.UNARMED), profile.getXpToLevel(SkillType.UNARMED)));
             }
         }
     }
@@ -136,11 +136,11 @@ public final class CommandHelper {
             display.sendMessage(LocaleLoader.getString("Stats.Header.Misc"));
 
             if (Permissions.acrobatics(inspect)) {
-                display.sendMessage(LocaleLoader.getString("Skills.Stats", new Object[] { LocaleLoader.getString("Acrobatics.Listener"), profile.getSkillLevel(SkillType.ACROBATICS), profile.getSkillXpLevel(SkillType.ACROBATICS), profile.getXpToLevel(SkillType.ACROBATICS) }));
+                display.sendMessage(LocaleLoader.getString("Skills.Stats", LocaleLoader.getString("Acrobatics.Listener"), profile.getSkillLevel(SkillType.ACROBATICS), profile.getSkillXpLevel(SkillType.ACROBATICS), profile.getXpToLevel(SkillType.ACROBATICS)));
             }
 
             if (Permissions.repair(inspect)) {
-                display.sendMessage(LocaleLoader.getString("Skills.Stats", new Object[] { LocaleLoader.getString("Repair.Listener"), profile.getSkillLevel(SkillType.REPAIR), profile.getSkillXpLevel(SkillType.REPAIR), profile.getXpToLevel(SkillType.REPAIR) }));
+                display.sendMessage(LocaleLoader.getString("Skills.Stats", LocaleLoader.getString("Repair.Listener"), profile.getSkillLevel(SkillType.REPAIR), profile.getSkillXpLevel(SkillType.REPAIR), profile.getXpToLevel(SkillType.REPAIR)));
             }
         }
     }

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

@@ -6,8 +6,27 @@ import java.util.List;
 import org.bukkit.command.PluginCommand;
 
 import com.gmail.nossr50.mcMMO;
+import com.gmail.nossr50.chat.commands.AdminChatCommand;
+import com.gmail.nossr50.chat.commands.PartyChatCommand;
 import com.gmail.nossr50.commands.admin.AddlevelsCommand;
+import com.gmail.nossr50.commands.admin.AddxpCommand;
+import com.gmail.nossr50.commands.admin.McgodCommand;
+import com.gmail.nossr50.commands.admin.McrefreshCommand;
+import com.gmail.nossr50.commands.admin.MmoeditCommand;
+import com.gmail.nossr50.commands.admin.SkillresetCommand;
+import com.gmail.nossr50.commands.admin.XprateCommand;
+import com.gmail.nossr50.commands.player.InspectCommand;
+import com.gmail.nossr50.commands.player.McabilityCommand;
+import com.gmail.nossr50.commands.player.McmmoCommand;
+import com.gmail.nossr50.commands.player.McrankCommand;
+import com.gmail.nossr50.commands.player.McstatsCommand;
+import com.gmail.nossr50.commands.player.MctopCommand;
+import com.gmail.nossr50.config.Config;
+import com.gmail.nossr50.database.commands.McpurgeCommand;
+import com.gmail.nossr50.database.commands.McremoveCommand;
+import com.gmail.nossr50.database.commands.MmoupdateCommand;
 import com.gmail.nossr50.locale.LocaleLoader;
+import com.gmail.nossr50.party.commands.PartyCommand;
 import com.gmail.nossr50.skills.acrobatics.AcrobaticsCommand;
 import com.gmail.nossr50.skills.archery.ArcheryCommand;
 import com.gmail.nossr50.skills.axes.AxesCommand;
@@ -22,93 +41,83 @@ import com.gmail.nossr50.skills.taming.TamingCommand;
 import com.gmail.nossr50.skills.unarmed.UnarmedCommand;
 import com.gmail.nossr50.skills.utilities.SkillType;
 import com.gmail.nossr50.skills.woodcutting.WoodcuttingCommand;
+import com.gmail.nossr50.spout.commands.MchudCommand;
+import com.gmail.nossr50.spout.commands.XplockCommand;
 import com.gmail.nossr50.util.Misc;
 
 public final class CommandRegistrationHelper {
     private CommandRegistrationHelper() {};
-
     private static String permissionsMessage = LocaleLoader.getString("mcMMO.NoPermission");
 
     public static void registerSkillCommands() {
         for (SkillType skill : SkillType.values()) {
-            if (skill != SkillType.ALL) {
-                String commandName = skill.toString().toLowerCase();
-                String localizedName = LocaleLoader.getString(Misc.getCapitalized(commandName) + ".SkillName").toLowerCase();
+            String commandName = skill.toString().toLowerCase();
+            String localizedName = LocaleLoader.getString(Misc.getCapitalized(commandName) + ".SkillName").toLowerCase();
 
-                List<String> aliasList = new ArrayList<String>();
-                aliasList.add(localizedName);
+            PluginCommand command;
 
-                PluginCommand command;
+            command = mcMMO.p.getCommand(commandName);
+            command.setDescription(LocaleLoader.getString("Commands.Description.Skill", Misc.getCapitalized(localizedName)));
+            command.setPermission("mcmmo.commands." + commandName);
+            command.setPermissionMessage(permissionsMessage);
+            command.setUsage(LocaleLoader.getString("Commands.Usage.0", localizedName));
+            command.setUsage(command.getUsage() + "\n" + LocaleLoader.getString("Commands.Usage.2", localizedName, "?", "[" + LocaleLoader.getString("Commands.Usage.Page") + "]"));
 
-                // Make us play nice with Essentials
-                if (skill == SkillType.REPAIR && mcMMO.p.getServer().getPluginManager().isPluginEnabled("Essentials")) {
-                    command = mcMMO.p.getCommand("mcrepair");
-                }
-                else {
-                    command = mcMMO.p.getCommand(commandName);
-                }
+            switch (skill) {
+            case ACROBATICS:
+                command.setExecutor(new AcrobaticsCommand());
+                break;
 
-                command.setAliases(aliasList);
-                command.setDescription(LocaleLoader.getString("Commands.Description.Skill", new Object[] { Misc.getCapitalized(localizedName) }));
-                command.setPermission("mcmmo.skills." + commandName);
-                command.setPermissionMessage(permissionsMessage);
+            case ARCHERY:
+                command.setExecutor(new ArcheryCommand());
+                break;
 
-                switch (skill) {
-                case ACROBATICS:
-                    command.setExecutor(new AcrobaticsCommand());
-                    break;
+            case AXES:
+                command.setExecutor(new AxesCommand());
+                break;
 
-                case ARCHERY:
-                    command.setExecutor(new ArcheryCommand());
-                    break;
+            case EXCAVATION:
+                command.setExecutor(new ExcavationCommand());
+                break;
 
-                case AXES:
-                    command.setExecutor(new AxesCommand());
-                    break;
+            case FISHING:
+                command.setExecutor(new FishingCommand());
+                break;
 
-                case EXCAVATION:
-                    command.setExecutor(new ExcavationCommand());
-                    break;
+            case HERBALISM:
+                command.setExecutor(new HerbalismCommand());
+                break;
 
-                case FISHING:
-                    command.setExecutor(new FishingCommand());
-                    break;
+            case MINING:
+                command.setExecutor(new MiningCommand());
+                break;
 
-                case HERBALISM:
-                    command.setExecutor(new HerbalismCommand());
-                    break;
+            case REPAIR:
+                command.setExecutor(new RepairCommand());
+                break;
 
-                case MINING:
-                    command.setExecutor(new MiningCommand());
-                    break;
+            case SMELTING:
+                command.setExecutor(new SmeltingCommand());
+                break;
 
-                case REPAIR:
-                    command.setExecutor(new RepairCommand());
-                    break;
+            case SWORDS:
+                command.setExecutor(new SwordsCommand());
+                break;
 
-                case SMELTING:
-                    command.setExecutor(new SmeltingCommand());
-                    break;
+            case TAMING:
+                command.setExecutor(new TamingCommand());
+                break;
 
-                case SWORDS:
-                    command.setExecutor(new SwordsCommand());
-                    break;
+            case UNARMED:
+                command.setExecutor(new UnarmedCommand());
+                break;
 
-                case TAMING:
-                    command.setExecutor(new TamingCommand());
-                    break;
+            case WOODCUTTING:
+                command.setExecutor(new WoodcuttingCommand());
+                break;
 
-                case UNARMED:
-                    command.setExecutor(new UnarmedCommand());
-                    break;
-
-                case WOODCUTTING:
-                    command.setExecutor(new WoodcuttingCommand());
-                    break;
-
-                default:
-                    break;
-                }
+            default:
+                break;
             }
         }
     }
@@ -116,9 +125,203 @@ public final class CommandRegistrationHelper {
     public static void registerAddlevelsCommand() {
         PluginCommand command = mcMMO.p.getCommand("addlevels");
         command.setDescription(LocaleLoader.getString("Commands.Description.addlevels"));
-        command.setPermission("mcmmo.commands.addlevels");
+        command.setPermission("mcmmo.commands.addlevels;mcmmo.commands.addlevels.others");
         command.setPermissionMessage(permissionsMessage);
-        command.setUsage(LocaleLoader.getString("Commands.Usage.3", new Object[] {"addlevels", "[" + LocaleLoader.getString("Commands.Usage.Player") + "]", "<" + LocaleLoader.getString("Commands.Usage.Skill") + ">", "<" + LocaleLoader.getString("Commands.Usage.Level") + ">" }));
+        command.setUsage(LocaleLoader.getString("Commands.Usage.3", "addlevels", "[" + LocaleLoader.getString("Commands.Usage.Player") + "]", "<" + LocaleLoader.getString("Commands.Usage.Skill") + ">", "<" + LocaleLoader.getString("Commands.Usage.Level") + ">"));
         command.setExecutor(new AddlevelsCommand());
     }
+
+    public static void registerAddxpCommand() {
+        PluginCommand command = mcMMO.p.getCommand("addxp");
+        command.setDescription(LocaleLoader.getString("Commands.Description.addxp"));
+        command.setPermission("mcmmo.commands.addxp;mcmmo.commands.addxp.others");
+        command.setPermissionMessage(permissionsMessage);
+        command.setUsage(LocaleLoader.getString("Commands.Usage.3", "addxp", "[" + LocaleLoader.getString("Commands.Usage.Player") + "]", "<" + LocaleLoader.getString("Commands.Usage.Skill") + ">", "<" + LocaleLoader.getString("Commands.Usage.XP") + ">"));
+        command.setExecutor(new AddxpCommand());
+    }
+
+    public static void registerMcgodCommand() {
+        PluginCommand command = mcMMO.p.getCommand("mcgod");
+        command.setDescription(LocaleLoader.getString("Commands.Description.mcgod"));
+        command.setPermission("mcmmo.commands.mcgod;mcmmo.commands.mcgod.others");
+        command.setPermissionMessage(permissionsMessage);
+        command.setUsage(LocaleLoader.getString("Commands.Usage.1", "mcgod", "[" + LocaleLoader.getString("Commands.Usage.Player") + "]"));
+        command.setExecutor(new McgodCommand());
+    }
+
+    public static void registerMcrefreshCommand() {
+        PluginCommand command = mcMMO.p.getCommand("mcrefresh");
+        command.setDescription(LocaleLoader.getString("Commands.Description.mcrefresh"));
+        command.setPermission("mcmmo.commands.mcrefresh;mcmmo.commands.mcrefresh.others");
+        command.setPermissionMessage(permissionsMessage);
+        command.setUsage(LocaleLoader.getString("Commands.Usage.1", "mcrefresh", "[" + LocaleLoader.getString("Commands.Usage.Player") + "]"));
+        command.setExecutor(new McrefreshCommand());
+    }
+
+    public static void registerMmoeditCommand() {
+        PluginCommand command = mcMMO.p.getCommand("mmoedit");
+        command.setDescription(LocaleLoader.getString("Commands.Description.mmoedit"));
+        command.setPermission("mcmmo.commands.mmoedit;mcmmo.commands.mmoedit.others");
+        command.setPermissionMessage(permissionsMessage);
+        command.setUsage(LocaleLoader.getString("Commands.Usage.3", "mmoedit", "[" + LocaleLoader.getString("Commands.Usage.Player") + "]", "<" + LocaleLoader.getString("Commands.Usage.Skill") + ">", "<" + LocaleLoader.getString("Commands.Usage.Level") + ">"));
+        command.setExecutor(new MmoeditCommand());
+    }
+
+    public static void registerSkillresetCommand() {
+        PluginCommand command = mcMMO.p.getCommand("skillreset");
+        command.setDescription(LocaleLoader.getString("Commands.Description.skillreset"));
+        command.setPermission("mcmmo.commands.skillreset;mcmmo.commands.skillreset.others"); // Only need the main ones, not the individual skill ones
+        command.setPermissionMessage(permissionsMessage);
+        command.setUsage(LocaleLoader.getString("Commands.Usage.2", "skillreset", "[" + LocaleLoader.getString("Commands.Usage.Player") + "]", "<" + LocaleLoader.getString("Commands.Usage.Skill") + ">"));
+        command.setExecutor(new SkillresetCommand());
+    }
+
+    public static void registerXprateCommand() {
+        List<String> aliasList = new ArrayList<String>();
+        aliasList.add("mcxprate");
+
+        PluginCommand command = mcMMO.p.getCommand("xprate");
+        command.setDescription(LocaleLoader.getString("Commands.Description.xprate"));
+        command.setPermission("mcmmo.commands.xprate;mcmmo.commands.xprate.reset;mcmmo.commands.xprate.set");
+        command.setPermissionMessage(permissionsMessage);
+        command.setUsage(LocaleLoader.getString("Commands.Usage.2", "xprate", "<" + LocaleLoader.getString("Commands.Usage.Rate") + ">", "<true|false>"));
+        command.setUsage(command.getUsage() + "\n" + LocaleLoader.getString("Commands.Usage.1", "xprate", "reset"));
+        command.setAliases(aliasList);
+        command.setExecutor(new XprateCommand());
+    }
+
+    public static void registerInspectCommand() {
+        PluginCommand command = mcMMO.p.getCommand("inspect");
+        command.setDescription(LocaleLoader.getString("Commands.Description.inspect"));
+        command.setPermission("mcmmo.commands.inspect;mcmmo.commands.inspect.far;mcmmo.commands.inspect.offline");
+        command.setPermissionMessage(permissionsMessage);
+        command.setUsage(LocaleLoader.getString("Commands.Usage.1", "inspect", "<" + LocaleLoader.getString("Commands.Usage.Player") + ">"));
+        command.setExecutor(new InspectCommand());
+    }
+
+    public static void registerMcabilityCommand() {
+        PluginCommand command = mcMMO.p.getCommand("mcability");
+        command.setDescription(LocaleLoader.getString("Commands.Description.mcability"));
+        command.setPermission("mcmmo.commands.mcability;mcmmo.commands.mcability.others");
+        command.setPermissionMessage(permissionsMessage);
+        command.setUsage(LocaleLoader.getString("Commands.Usage.1", "mcability", "[" + LocaleLoader.getString("Commands.Usage.Player") + "]"));
+        command.setExecutor(new McabilityCommand());
+    }
+
+    public static void registerMcmmoCommand() {
+        PluginCommand command = mcMMO.p.getCommand("mcmmo");
+        command.setDescription(LocaleLoader.getString("Commands.Description.mcmmo"));
+        command.setPermission("mcmmo.commands.mcmmo");
+        command.setPermissionMessage(permissionsMessage);
+        command.setUsage(LocaleLoader.getString("Commands.Usage.0", "mcmmo"));
+        command.setUsage(command.getUsage() + "\n" + LocaleLoader.getString("Commands.Usage.1", "mcmmo", "?"));
+        command.setExecutor(new McmmoCommand());
+    }
+
+    public static void registerMcrankCommand() {
+        PluginCommand command = mcMMO.p.getCommand("mcrank");
+        command.setDescription(LocaleLoader.getString("Commands.Description.mcrank"));
+        command.setPermission("mcmmo.commands.mcrank;mcmmo.commands.mcrank.others;mcmmo.commands.mcrank.others.far;mcmmo.commands.mcrank.others.offline");
+        command.setPermissionMessage(permissionsMessage);
+        command.setUsage(LocaleLoader.getString("Commands.Usage.1", "mcrank", "[" + LocaleLoader.getString("Commands.Usage.Player") + "]"));
+        command.setExecutor(new McrankCommand());
+    }
+
+    public static void registerMcstatsCommand() {
+        PluginCommand command = mcMMO.p.getCommand("mcstats");
+        command.setDescription(LocaleLoader.getString("Commands.Description.mcstats"));
+        command.setPermission("mcmmo.commands.mcstats");
+        command.setPermissionMessage(permissionsMessage);
+        command.setUsage(LocaleLoader.getString("Commands.Usage.0", "mcstats"));
+        command.setExecutor(new McstatsCommand());
+    }
+
+    public static void registerMctopCommand() {
+        PluginCommand command = mcMMO.p.getCommand("mctop");
+        command.setDescription(LocaleLoader.getString("Commands.Description.mctop"));
+        command.setPermission("mcmmo.commands.mctop"); // Only need the main one, not the individual skill ones
+        command.setPermissionMessage(permissionsMessage);
+        command.setUsage(LocaleLoader.getString("Commands.Usage.2", "mctop", "[" + LocaleLoader.getString("Commands.Usage.Skill") + "]", "[" + LocaleLoader.getString("Commands.Usage.Page") + "]"));
+        command.setExecutor(new MctopCommand());
+    }
+
+    public static void registerMcpurgeCommand() {
+        PluginCommand command = mcMMO.p.getCommand("mcpurge");
+        command.setDescription(LocaleLoader.getString("Commands.Description.mcpurge", Config.getInstance().getOldUsersCutoff()));
+        command.setPermission("mcmmo.commands.mcpurge");
+        command.setPermissionMessage(permissionsMessage);
+        command.setUsage(LocaleLoader.getString("Commands.Usage.0", "mcpurge"));
+        command.setExecutor(new McpurgeCommand());
+    }
+
+    public static void registerMcremoveCommand() {
+        PluginCommand command = mcMMO.p.getCommand("mcremove");
+        command.setDescription(LocaleLoader.getString("Commands.Description.mcremove"));
+        command.setPermission("mcmmo.commands.mcremove");
+        command.setPermissionMessage(permissionsMessage);
+        command.setUsage(LocaleLoader.getString("Commands.Usage.1", "mcremove", "<" + LocaleLoader.getString("Commands.Usage.Player") + ">"));
+        command.setExecutor(new McremoveCommand());
+    }
+
+    public static void registerMmoupdateCommand() {
+        PluginCommand command = mcMMO.p.getCommand("mmoupdate");
+        command.setDescription(LocaleLoader.getString("Commands.Description.mmoupdate"));
+        command.setPermission("mcmmo.commands.mmoupdate");
+        command.setPermissionMessage(permissionsMessage);
+        command.setUsage(LocaleLoader.getString("Commands.Usage.0", "mmoupdate"));
+        command.setExecutor(new MmoupdateCommand());
+    }
+
+    public static void registerAdminChatCommand() {
+        PluginCommand command = mcMMO.p.getCommand("adminchat");
+        command.setDescription(LocaleLoader.getString("Commands.Description.adminchat"));
+        command.setPermission("mcmmo.chat.adminchat");
+        command.setPermissionMessage(permissionsMessage);
+        command.setUsage(LocaleLoader.getString("Commands.Usage.0", "adminchat"));
+        command.setUsage(command.getUsage() + "\n" + LocaleLoader.getString("Commands.Usage.1", "adminchat", "<on|off>"));
+        command.setUsage(command.getUsage() + "\n" + LocaleLoader.getString("Commands.Usage.1", "adminchat", "<" + LocaleLoader.getString("Commands.Usage.Message") + ">"));
+        command.setExecutor(new AdminChatCommand());
+    }
+
+    public static void registerPartyChatCommand() {
+        PluginCommand command = mcMMO.p.getCommand("partychat");
+        command.setDescription(LocaleLoader.getString("Commands.Description.partychat"));
+        command.setPermission("mcmmo.chat.partychat;mcmmo.commands.party");
+        command.setPermissionMessage(permissionsMessage);
+        command.setUsage(LocaleLoader.getString("Commands.Usage.0", "partychat"));
+        command.setUsage(command.getUsage() + "\n" + LocaleLoader.getString("Commands.Usage.1", "partychat", "<on|off>"));
+        command.setUsage(command.getUsage() + "\n" + LocaleLoader.getString("Commands.Usage.1", "partychat", "<" + LocaleLoader.getString("Commands.Usage.Message") + ">"));
+        command.setExecutor(new PartyChatCommand());
+    }
+
+    public static void registerMchudCommand() {
+        PluginCommand command = mcMMO.p.getCommand("mchud");
+        command.setDescription(LocaleLoader.getString("Commands.Description.mchud"));
+        command.setPermission("mcmmo.commands.mchud");
+        command.setPermissionMessage(permissionsMessage);
+        command.setUsage(LocaleLoader.getString("Commands.Usage.1", "mchud", "<DISABLED | STANDARD | SMALL | RETRO>"));
+        command.setExecutor(new MchudCommand());
+    }
+
+    public static void registerXplockCommand() {
+        PluginCommand command = mcMMO.p.getCommand("xplock");
+        command.setDescription(LocaleLoader.getString("Commands.Description.xplock"));
+        command.setPermission("mcmmo.commands.xplock");
+        command.setPermissionMessage(permissionsMessage);
+        command.setUsage(LocaleLoader.getString("Commands.Usage.0", "xplock"));
+        command.setUsage(command.getUsage() + "\n" + LocaleLoader.getString("Commands.Usage.1", "xplock", "<on|off>"));
+        command.setUsage(command.getUsage() + "\n" + LocaleLoader.getString("Commands.Usage.1", "xplock", "<" + LocaleLoader.getString("Commands.Usage.Skill") + ">"));
+        command.setExecutor(new XplockCommand());
+    }
+
+    public static void registerPartyCommand() {
+        PluginCommand command = mcMMO.p.getCommand("party");
+        command.setDescription(LocaleLoader.getString("Commands.Description.party"));
+        command.setPermission("mcmmo.commands.party;mcmmo.commands.party.accept;mcmmo.commands.party.create;mcmmo.commands.party.disband;" +
+                              "mcmmo.commands.party.expshare;mcmmo.commands.party.invite;mcmmo.commands.party.itemshare;mcmmo.commands.party.join;" +
+                              "mcmmo.commands.party.kick;mcmmo.commands.party.lock;mcmmo.commands.party.owner;mcmmo.commands.party.password;" +
+                              "mcmmo.commands.party.quit;mcmmo.commands.party.rename;mcmmo.commands.party.unlock");
+        command.setPermissionMessage(permissionsMessage);
+        command.setExecutor(new PartyCommand());
+    }
 }

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

@@ -19,43 +19,66 @@ public class AddlevelsCommand implements CommandExecutor{
     public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
         PlayerProfile profile;
         int levels;
-        SkillType skill;
+        boolean allSkills = false;
 
         switch (args.length) {
         case 2:
-            if (sender instanceof Player) {
-                if (!SkillTools.isSkill(args[0])) {
-                    sender.sendMessage(LocaleLoader.getString("Commands.Skill.Invalid"));
-                    return true;
-                }
+            if (!Permissions.hasPermission(sender, "mcmmo.commands.addlevels")) {
+                sender.sendMessage(command.getPermissionMessage());
+                return true;
+            }
 
-                if (Misc.isInt(args[1])) {
-                    levels = Integer.valueOf(args[1]);
-                    skill = SkillTools.getSkillType(args[0]);
-                    profile = Users.getPlayer((Player) sender).getProfile();
+            if (!(sender instanceof Player)) {
+                return false;
+            }
 
-                    if (skill.equals(SkillType.ALL)) {
-                        sender.sendMessage(LocaleLoader.getString("Commands.addlevels.AwardAll.1", new Object[] {levels}));
-                    }
-                    else {
-                        sender.sendMessage(LocaleLoader.getString("Commands.addlevels.AwardSkill.1", new Object[] {levels, Misc.getCapitalized(skill.toString())}));
+            if (args[0].equalsIgnoreCase("all")) {
+                allSkills = true;
+            }
+            else if (!SkillTools.isSkill(args[0])) {
+                sender.sendMessage(LocaleLoader.getString("Commands.Skill.Invalid"));
+                return true;
+            }
+
+            if (!Misc.isInt(args[1])) {
+                return false;
+            }
+
+            levels = Integer.valueOf(args[1]);
+            profile = Users.getPlayer((Player) sender).getProfile();
+
+            if (allSkills) {
+                for (SkillType skillType : SkillType.values()) {
+                    if (skillType.isChildSkill()) {
+                        continue;
                     }
 
-                    profile.addLevels(skill, levels);
-                    return true;
+                    profile.addLevels(skillType, levels);
                 }
             }
             else {
-                return false;
+                profile.addLevels(SkillType.getSkill(args[0]), levels);
             }
 
+            if (allSkills) {
+                sender.sendMessage(LocaleLoader.getString("Commands.addlevels.AwardAll.1", levels));
+            }
+            else {
+                sender.sendMessage(LocaleLoader.getString("Commands.addlevels.AwardSkill.1", levels, Misc.getCapitalized(args[0])));
+            }
+
+            return true;
+
         case 3:
             if (!Permissions.hasPermission(sender, "mcmmo.commands.addlevels.others")) {
                 sender.sendMessage(command.getPermissionMessage());
                 return true;
             }
 
-            if (!SkillTools.isSkill(args[1])) {
+            if (args[1].equalsIgnoreCase("all")) {
+                allSkills = true;
+            }
+            else if (!SkillTools.isSkill(args[1])) {
                 sender.sendMessage(LocaleLoader.getString("Commands.Skill.Invalid"));
                 return true;
             }
@@ -66,7 +89,6 @@ public class AddlevelsCommand implements CommandExecutor{
 
             McMMOPlayer mcMMOPlayer = Users.getPlayer(args[0]);
             levels = Integer.valueOf(args[2]);
-            skill = SkillTools.getSkillType(args[1]);
 
             // If the mcMMOPlayer doesn't exist, create a temporary profile and check if it's present in the database. If it's not, abort the process.
             if (mcMMOPlayer == null) {
@@ -77,31 +99,46 @@ public class AddlevelsCommand implements CommandExecutor{
                     return true;
                 }
 
-                profile.addLevels(skill, levels);
+                if (allSkills) {
+                    for (SkillType skillType : SkillType.values()) {
+                        if (skillType.isChildSkill()) {
+                            continue;
+                        }
+
+                        profile.addLevels(skillType, levels);
+                    }
+                }
+                else {
+                    profile.addLevels(SkillType.getSkill(args[1]), levels);
+                }
+
                 profile.save(); // Since this is a temporary profile, we save it here.
             }
             else {
                 profile = mcMMOPlayer.getProfile();
-                Player player = mcMMOPlayer.getPlayer();
 
-                profile.addLevels(skill, levels);
+                if (allSkills) {
+                    for (SkillType skillType : SkillType.values()) {
+                        if (skillType.isChildSkill()) {
+                            continue;
+                        }
 
-                // Check if the player is online before we try to send them a message.
-                if (player.isOnline()) {
-                    if (skill.equals(SkillType.ALL)) {
-                        player.sendMessage(LocaleLoader.getString("Commands.addlevels.AwardAll.1", new Object[] {levels}));
-                    }
-                    else {
-                        player.sendMessage(LocaleLoader.getString("Commands.addlevels.AwardSkill.1", new Object[] {levels, Misc.getCapitalized(skill.toString())}));
+                        profile.addLevels(skillType, levels);
                     }
+
+                    mcMMOPlayer.getPlayer().sendMessage(LocaleLoader.getString("Commands.addlevels.AwardAll.1", levels));
+                }
+                else {
+                    profile.addLevels(SkillType.getSkill(args[1]), levels);
+                    mcMMOPlayer.getPlayer().sendMessage(LocaleLoader.getString("Commands.addlevels.AwardSkill.1", levels, Misc.getCapitalized(args[1])));
                 }
             }
 
-            if (skill.equals(SkillType.ALL)) {
-                sender.sendMessage(LocaleLoader.getString("Commands.addlevels.AwardAll.2", new Object[] {args[0]}));
+            if (allSkills) {
+                sender.sendMessage(LocaleLoader.getString("Commands.addlevels.AwardAll.2", args[0]));
             }
             else {
-                sender.sendMessage(LocaleLoader.getString("Commands.addlevels.AwardSkill.2", new Object[] {Misc.getCapitalized(skill.toString()), args[0]}));
+                sender.sendMessage(LocaleLoader.getString("Commands.addlevels.AwardSkill.2", Misc.getCapitalized(args[1]), args[0]));
             }
 
             return true;

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

@@ -5,8 +5,6 @@ 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.locale.LocaleLoader;
@@ -16,112 +14,134 @@ import com.gmail.nossr50.util.Misc;
 import com.gmail.nossr50.util.Permissions;
 import com.gmail.nossr50.util.Users;
 
-//TODO: Any way we can make this work for offline use?
 public class AddxpCommand implements CommandExecutor {
     @Override
     public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
-        Player modifiedPlayer;
         int xp;
-        SkillType skill;
-        String usage = LocaleLoader.getString("Commands.Usage.3", new Object[] {"addxp", "[" + LocaleLoader.getString("Commands.Usage.Player") + "]", "<" + LocaleLoader.getString("Commands.Usage.Skill") + ">", "<" + LocaleLoader.getString("Commands.Usage.XP") + ">" });
+        McMMOPlayer mcMMOPlayer;
+        PlayerProfile profile;
+        boolean allSkills = false;
 
         switch (args.length) {
         case 2:
-            if (CommandHelper.noCommandPermissions(sender, "mcmmo.commands.addxp")) {
+            if (!Permissions.hasPermission(sender, "mcmmo.commands.addxp")) {
+                sender.sendMessage(command.getPermissionMessage());
                 return true;
             }
 
-            if (sender instanceof Player) {
-                if (!SkillTools.isSkill(args[1])) {
-                    sender.sendMessage(LocaleLoader.getString("Commands.Skill.Invalid"));
-                    return true;
+            if (!(sender instanceof Player)) {
+                return false;
+            }
+
+            if (args[0].equalsIgnoreCase("all")) {
+                allSkills = true;
+            }
+            else if (!SkillTools.isSkill(args[0])) {
+                sender.sendMessage(LocaleLoader.getString("Commands.Skill.Invalid"));
+                return true;
+            }
+
+            if (!Misc.isInt(args[1])) {
+                return false;
+            }
+
+            xp = Integer.valueOf(args[1]);
+            mcMMOPlayer = Users.getPlayer((Player) sender);
+            profile = mcMMOPlayer.getProfile();
+
+            if (allSkills) {
+                for (SkillType skillType : SkillType.values()) {
+                    if (skillType.isChildSkill()) {
+                        continue;
+                    }
+
+                    mcMMOPlayer.applyXpGain(skillType, xp);
                 }
 
-                if (Misc.isInt(args[1])) {
-                    modifiedPlayer = (Player) sender;
-                    xp = Integer.valueOf(args[1]);
-                    skill = SkillTools.getSkillType(args[0]);
-
-                    PlayerProfile profile = Users.getProfile(modifiedPlayer);
-                    McMMOPlayer mcMMOPlayer = Users.getPlayer(modifiedPlayer);
-                    mcMMOPlayer.addXpOverride(skill, xp);
-
-                    if (skill.equals(SkillType.ALL)) {
-                        modifiedPlayer.sendMessage(LocaleLoader.getString("Commands.addxp.AwardAll", new Object[] {xp}));
-                    }
-                    else {
-                        modifiedPlayer.sendMessage(LocaleLoader.getString("Commands.addxp.AwardSkill", new Object[] {xp, Misc.getCapitalized(skill.toString())}));
-                    }
-
-                    if (skill.equals(SkillType.ALL)) {
-                        SkillTools.xpCheckAll(modifiedPlayer, profile);
-                    }
-                    else {
-                        SkillTools.xpCheckSkill(skill, modifiedPlayer, profile);
-                    }
-                }
-                else {
-                    sender.sendMessage(usage);
-                }
+                sender.sendMessage(LocaleLoader.getString("Commands.addxp.AwardAll", xp));
             }
             else {
-                sender.sendMessage(usage);
+                mcMMOPlayer.applyXpGain(SkillType.getSkill(args[0]), xp);
+                sender.sendMessage(LocaleLoader.getString("Commands.addxp.AwardSkill", xp, Misc.getCapitalized(args[0])));
             }
 
             return true;
 
         case 3:
-            if (CommandHelper.noCommandPermissions(sender, "mcmmo.commands.addxp.others")) {
+            if (!Permissions.hasPermission(sender, "mcmmo.commands.addxp.others")) {
+                sender.sendMessage(command.getPermissionMessage());
                 return true;
             }
 
-            modifiedPlayer = mcMMO.p.getServer().getPlayer(args[0]);
-            String playerName = modifiedPlayer.getName();
-            McMMOPlayer mcMMOPlayer = Users.getPlayer(modifiedPlayer);
-            PlayerProfile profile = Users.getProfile(modifiedPlayer);
-
-            // TODO: Not sure if we actually need a null check here
-            if (profile == null || !profile.isLoaded()) {
-                sender.sendMessage(LocaleLoader.getString("Commands.DoesNotExist"));
-                return true;
+            if (args[1].equalsIgnoreCase("all")) {
+                allSkills = true;
             }
-
-            if (!SkillTools.isSkill(args[1])) {
+            else if (!SkillTools.isSkill(args[1])) {
                 sender.sendMessage(LocaleLoader.getString("Commands.Skill.Invalid"));
                 return true;
             }
 
-            if (Misc.isInt(args[2])) {
-                xp = Integer.valueOf(args[2]);
-                skill = SkillTools.getSkillType(args[1]);
+            if (!Misc.isInt(args[2])) {
+                return false;
+            }
 
-                mcMMOPlayer.addXpOverride(skill, xp);
+            mcMMOPlayer = Users.getPlayer(args[0]);
+            xp = Integer.valueOf(args[2]);
 
-                if (skill.equals(SkillType.ALL)) {
-                    sender.sendMessage(LocaleLoader.getString("Commands.addlevels.AwardAll.2", new Object[] {playerName}));
+            // If the mcMMOPlayer doesn't exist, create a temporary profile and check if it's present in the database. If it's not, abort the process.
+            if (mcMMOPlayer == null) {
+                profile = new PlayerProfile(args[0], false);
+
+                if (!profile.isLoaded()) {
+                    sender.sendMessage(LocaleLoader.getString("Commands.DoesNotExist"));
+                    return true;
+                }
+
+                // TODO: Currently the offline player doesn't level up automatically
+                if (allSkills) {
+                    for (SkillType skillType : SkillType.values()) {
+                        if (skillType.isChildSkill()) {
+                            continue;
+                        }
+
+                        profile.setSkillXpLevel(skillType, xp);
+                    }
                 }
                 else {
-                    sender.sendMessage(LocaleLoader.getString("Commands.addlevels.AwardSkill.2", new Object[] {Misc.getCapitalized(skill.toString()), playerName}));
+                    profile.setSkillXpLevel(SkillType.getSkill(args[1]), xp);
                 }
 
-                if (skill.equals(SkillType.ALL)) {
-                    modifiedPlayer.sendMessage(LocaleLoader.getString("Commands.addxp.AwardAll", new Object[] {xp}));
-                    SkillTools.xpCheckAll(modifiedPlayer, profile);
-                }
-                else {
-                    modifiedPlayer.sendMessage(LocaleLoader.getString("Commands.addxp.AwardSkill", new Object[] {xp, Misc.getCapitalized(skill.toString())}));
-                    SkillTools.xpCheckSkill(skill, modifiedPlayer, profile);
-                }
+                profile.save(); // Since this is a temporary profile, we save it here.
             }
             else {
-                sender.sendMessage(usage);
+                if (allSkills) {
+                    for (SkillType skillType : SkillType.values()) {
+                        if (skillType.isChildSkill()) {
+                            continue;
+                        }
+
+                        mcMMOPlayer.applyXpGain(skillType, xp);
+                    }
+
+                    mcMMOPlayer.getPlayer().sendMessage(LocaleLoader.getString("Commands.addxp.AwardAll", xp));
+                }
+                else {
+                    mcMMOPlayer.applyXpGain(SkillType.getSkill(args[1]), xp);
+                    mcMMOPlayer.getPlayer().sendMessage(LocaleLoader.getString("Commands.addxp.AwardSkill", xp, Misc.getCapitalized(args[1])));
+                }
+            }
+
+            if (allSkills) {
+                sender.sendMessage(LocaleLoader.getString("Commands.addlevels.AwardAll.2", args[0]));
+            }
+            else {
+                sender.sendMessage(LocaleLoader.getString("Commands.addlevels.AwardSkill.2", Misc.getCapitalized(args[1]), args[0]));
             }
 
             return true;
 
         default:
-            sender.sendMessage(usage);
-            return true;
+            return false;
         }
     }
 }

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

@@ -6,7 +6,6 @@ import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 
 import com.gmail.nossr50.datatypes.McMMOPlayer;
-import com.gmail.nossr50.commands.CommandHelper;
 import com.gmail.nossr50.datatypes.PlayerProfile;
 import com.gmail.nossr50.locale.LocaleLoader;
 import com.gmail.nossr50.util.Permissions;
@@ -19,15 +18,16 @@ public class McgodCommand implements CommandExecutor {
 
         switch (args.length) {
         case 0:
-            if (CommandHelper.noConsoleUsage(sender)) {
+            if (!Permissions.hasPermission(sender, "mcmmo.commands.mcgod")) {
+                sender.sendMessage(command.getPermissionMessage());
                 return true;
             }
 
-            if (!Permissions.mcgodCommand(sender)) {
-                return true;
+            if (!(sender instanceof Player)) {
+                return false;
             }
 
-            profile = Users.getProfile((Player) sender);
+            profile = Users.getPlayer((Player) sender).getProfile();
 
             if (profile == null) {
                 sender.sendMessage(LocaleLoader.getString("Commands.DoesNotExist"));
@@ -43,15 +43,15 @@ public class McgodCommand implements CommandExecutor {
 
             profile.toggleGodMode();
             return true;
+
         case 1:
             if (!Permissions.hasPermission(sender, "mcmmo.commands.mcgod.others")) {
                 sender.sendMessage(command.getPermissionMessage());
                 return true;
             }
+
             McMMOPlayer mcMMOPlayer = Users.getPlayer(args[0]);
 
-            // If the mcMMOPlayer doesn't exist, create a temporary profile and
-            // check if it's present in the database. If it's not, abort the process.
             if (mcMMOPlayer == null) {
                 profile = new PlayerProfile(args[0], false);
 
@@ -59,24 +59,29 @@ public class McgodCommand implements CommandExecutor {
                     sender.sendMessage(LocaleLoader.getString("Commands.DoesNotExist"));
                     return true;
                 }
+
+                sender.sendMessage(LocaleLoader.getString("Commands.Offline"));
+                return true;
+            }
+
+            profile = mcMMOPlayer.getProfile();
+            Player player = mcMMOPlayer.getPlayer();
+
+            if (!player.isOnline()) {
+                sender.sendMessage(LocaleLoader.getString("Commands.Offline"));
+                return true;
+            }
+
+            if (profile.getGodMode()) {
+                player.sendMessage(LocaleLoader.getString("Commands.GodMode.Disabled"));
             }
             else {
-                profile = mcMMOPlayer.getProfile();
-                Player player = mcMMOPlayer.getPlayer();
-
-                // Check if the player is online before we try to send them a message.
-                if (player.isOnline()) {
-                    if (profile.getGodMode()) {
-                        player.sendMessage(LocaleLoader.getString("Commands.GodMode.Disabled"));
-                    }
-                    else {
-                        player.sendMessage(LocaleLoader.getString("Commands.GodMode.Enabled"));
-                    }
-                }
+                player.sendMessage(LocaleLoader.getString("Commands.GodMode.Enabled"));
             }
 
             profile.toggleGodMode();
             return true;
+
         default:
             return false;
         }

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

@@ -1,73 +1,80 @@
 package com.gmail.nossr50.commands.admin;
 
-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.locale.LocaleLoader;
+import com.gmail.nossr50.util.Permissions;
 import com.gmail.nossr50.util.Users;
 
 public class McrefreshCommand implements CommandExecutor {
     @Override
     public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
-        OfflinePlayer player;
         PlayerProfile profile;
-        String usage = LocaleLoader.getString("Commands.Usage.1", new Object[] {"mcrefresh", "[" + LocaleLoader.getString("Commands.Usage.Player") + "]"});
-
-        if (CommandHelper.noCommandPermissions(sender, "mcmmo.tools.mcrefresh")) {
-            return true;
-        }
 
         switch (args.length) {
         case 0:
-            if (sender instanceof Player) {
-                player = (Player) sender;
-                profile = Users.getProfile(player);
-            }
-            else {
-                sender.sendMessage(usage);
+            if (!Permissions.hasPermission(sender, "mcmmo.commands.mcrefresh")) {
+                sender.sendMessage(command.getPermissionMessage());
                 return true;
             }
-            break;
+
+            if (!(sender instanceof Player)) {
+                return false;
+            }
+
+            profile = Users.getPlayer(sender.getName()).getProfile();
+
+            profile.setRecentlyHurt(0);
+            profile.resetCooldowns();
+            profile.resetToolPrepMode();
+            profile.resetAbilityMode();
+
+            sender.sendMessage(LocaleLoader.getString("Ability.Generic.Refresh"));
+            return true;
 
         case 1:
-            player = mcMMO.p.getServer().getOfflinePlayer(args[0]);
-            profile = Users.getProfile(player);
-            String playerName = player.getName();
-
-            if (profile == null) {
-                sender.sendMessage(LocaleLoader.getString("Commands.DoesNotExist"));
+            if (!Permissions.hasPermission(sender, "mcmmo.commands.mcrefresh.others")) {
+                sender.sendMessage(command.getPermissionMessage());
                 return true;
             }
 
-            if (!profile.isLoaded()) {
-                sender.sendMessage(LocaleLoader.getString("Commands.DoesNotExist"));
+            McMMOPlayer mcMMOPlayer = Users.getPlayer(args[0]);
+
+            if (mcMMOPlayer == null) {
+                profile = new PlayerProfile(args[0], false);
+
+                if (!profile.isLoaded()) {
+                    sender.sendMessage(LocaleLoader.getString("Commands.DoesNotExist"));
+                    return true;
+                }
+
+                sender.sendMessage(LocaleLoader.getString("Commands.Offline"));
+                return true;
+            }
+            profile = mcMMOPlayer.getProfile();
+            Player player = mcMMOPlayer.getPlayer();
+
+            if (!player.isOnline()) {
+                sender.sendMessage(LocaleLoader.getString("Commands.Offline"));
                 return true;
             }
 
-            sender.sendMessage(LocaleLoader.getString("Commands.mcrefresh.Success", new Object[] {playerName}));
+            profile.setRecentlyHurt(0);
+            profile.resetCooldowns();
+            profile.resetToolPrepMode();
+            profile.resetAbilityMode();
 
-            break;
+            player.sendMessage(LocaleLoader.getString("Ability.Generic.Refresh"));
+            sender.sendMessage(LocaleLoader.getString("Commands.mcrefresh.Success", args[0]));
+            return true;
 
         default:
-            sender.sendMessage(usage);
-            return true;
+            return false;
         }
-
-        profile.setRecentlyHurt(0);
-        profile.resetCooldowns();
-        profile.resetToolPrepMode();
-        profile.resetAbilityMode();
-
-        if (player.isOnline()) {
-            ((Player) player).sendMessage(LocaleLoader.getString("Ability.Generic.Refresh"));
-        }
-
-        return true;
     }
 }

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

@@ -5,7 +5,6 @@ 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.McMMOPlayer;
 import com.gmail.nossr50.datatypes.PlayerProfile;
 import com.gmail.nossr50.locale.LocaleLoader;
@@ -20,110 +19,128 @@ public class MmoeditCommand implements CommandExecutor {
     public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
         PlayerProfile profile;
         int newValue;
-        SkillType skill;
-        String skillName;
-        String usage = LocaleLoader.getString("Commands.Usage.3", new Object[] {"mmoedit", "[" + LocaleLoader.getString("Commands.Usage.Player") + "]", "<" + LocaleLoader.getString("Commands.Usage.Skill") + ">", "<" + LocaleLoader.getString("Commands.Usage.Level") + ">" });
+        boolean allSkills = false;
 
         switch (args.length) {
         case 2:
-            if (CommandHelper.noCommandPermissions(sender, "mcmmo.commands.mmoedit")) {
+            if (!Permissions.hasPermission(sender, "mcmmo.commands.mmoedit")) {
+                sender.sendMessage(command.getPermissionMessage());
                 return true;
             }
 
-            if (sender instanceof Player) {
-                if (!SkillTools.isSkill(args[0])) {
-                    sender.sendMessage(LocaleLoader.getString("Commands.Skill.Invalid"));
-                    return true;
-                }
+            if (!(sender instanceof Player)) {
+                return false;
+            }
 
-                if (Misc.isInt(args[1])) {
-                    Player player = (Player) sender;
-                    newValue = Integer.valueOf(args[1]);
-                    skill = SkillTools.getSkillType(args[0]);
-                    profile = Users.getProfile(player);
+            if (args[0].equalsIgnoreCase("all")) {
+                allSkills = true;
+            }
+            else if (!SkillTools.isSkill(args[0])) {
+                sender.sendMessage(LocaleLoader.getString("Commands.Skill.Invalid"));
+                return true;
+            }
 
-                    if (skill.equals(SkillType.ALL)) {
-                        sender.sendMessage(LocaleLoader.getString("Commands.mmoedit.AllSkills.1", new Object[] { newValue }));
-                    }
-                    else {
-                        sender.sendMessage(LocaleLoader.getString("Commands.mmoedit.Modified.1", new Object[] { Misc.getCapitalized(skill.toString()), newValue }));
+            if (!Misc.isInt(args[1])) {
+                return false;
+            }
+
+            newValue = Integer.valueOf(args[1]);
+            profile = Users.getPlayer((Player) sender).getProfile();
+
+            if (allSkills) {
+                for (SkillType skillType : SkillType.values()) {
+                    if (skillType.isChildSkill()) {
+                        continue;
                     }
 
-                    profile.modifySkill(skill, newValue);
-                }
-                else {
-                    sender.sendMessage(usage);
+                    profile.modifySkill(skillType, newValue);
                 }
+
+                sender.sendMessage(LocaleLoader.getString("Commands.mmoedit.AllSkills.1", newValue));
             }
             else {
-                sender.sendMessage(usage);
+                profile.modifySkill(SkillType.getSkill(args[0]), newValue);
+                sender.sendMessage(LocaleLoader.getString("Commands.mmoedit.Modified.1", Misc.getCapitalized(args[0]), newValue));
             }
 
             return true;
 
         case 3:
-            if (CommandHelper.noCommandPermissions(sender, "mcmmo.commands.mmoedit.others")) {
+            if (!Permissions.hasPermission(sender, "mcmmo.commands.mmoedit.others")) {
+                sender.sendMessage(command.getPermissionMessage());
                 return true;
             }
 
-            if (!Misc.isInt(args[2])) {
-                sender.sendMessage(usage);
-                return true;
+            if (args[1].equalsIgnoreCase("all")) {
+                allSkills = true;
             }
-
-            skill = SkillTools.getSkillType(args[1]);
-
-            if (skill == null) {
+            else if (!SkillTools.isSkill(args[1])) {
                 sender.sendMessage(LocaleLoader.getString("Commands.Skill.Invalid"));
                 return true;
             }
 
-            newValue = Integer.valueOf(args[2]);
-            McMMOPlayer mcmmoPlayer = Users.getPlayer(args[0]);
-
-            if (mcmmoPlayer != null) {
-                profile = mcmmoPlayer.getProfile();
-
-                if (profile == null) {
-                    sender.sendMessage(LocaleLoader.getString("Commands.DoesNotExist"));
-                    return true;
-                }
-
-                profile.modifySkill(skill, newValue);
-                if (skill == SkillType.ALL) {
-                    mcmmoPlayer.getPlayer().sendMessage(LocaleLoader.getString("Commands.mmoedit.AllSkills.1", new Object[] { newValue }));
-                    sender.sendMessage(LocaleLoader.getString("Commands.addlevels.AwardAll.2", new Object[] { args[0] }));
-                }
-                else {
-                    skillName = Misc.getCapitalized(skill.toString());
-
-                    mcmmoPlayer.getPlayer().sendMessage(LocaleLoader.getString("Commands.mmoedit.Modified.1", new Object[] { skillName, newValue }));
-                    sender.sendMessage(LocaleLoader.getString("Commands.mmoedit.Modified.2", new Object[] { skillName, args[0] }));
-                }
+            if (!Misc.isInt(args[2])) {
+                return false;
             }
-            else {
-                profile = new PlayerProfile(args[0], false); //Temporary Profile
+
+            newValue = Integer.valueOf(args[2]);
+            McMMOPlayer mcMMOPlayer = Users.getPlayer(args[0]);
+
+            // If the mcMMOPlayer doesn't exist, create a temporary profile and check if it's present in the database. If it's not, abort the process.
+            if (mcMMOPlayer == null) {
+                profile = new PlayerProfile(args[0], false);
 
                 if (!profile.isLoaded()) {
                     sender.sendMessage(LocaleLoader.getString("Commands.DoesNotExist"));
                     return true;
                 }
 
-                profile.modifySkill(skill, newValue);
-                profile.save();
+                if (allSkills) {
+                    for (SkillType skillType : SkillType.values()) {
+                        if (skillType.isChildSkill()) {
+                            continue;
+                        }
 
-                if (skill == SkillType.ALL) {
-                    sender.sendMessage(LocaleLoader.getString("Commands.addlevels.AwardAll.2", new Object[] { args[0] }));
+                        profile.modifySkill(skillType, newValue);
+                    }
                 }
                 else {
-                    sender.sendMessage(LocaleLoader.getString("Commands.mmoedit.Modified.2", new Object[] { Misc.getCapitalized(skill.toString()), args[0] }));
+                    profile.modifySkill(SkillType.getSkill(args[1]), newValue);
+                }
+
+                profile.save(); // Since this is a temporary profile, we save it here.
+            }
+            else {
+                profile = mcMMOPlayer.getProfile();
+
+                if (allSkills) {
+                    for (SkillType skillType : SkillType.values()) {
+                        if (skillType.isChildSkill()) {
+                            continue;
+                        }
+
+                        profile.modifySkill(skillType, newValue);
+                    }
+
+                    mcMMOPlayer.getPlayer().sendMessage(LocaleLoader.getString("Commands.mmoedit.AllSkills.1", newValue));
+                }
+                else {
+                    profile.modifySkill(SkillType.getSkill(args[1]), newValue);
+                    mcMMOPlayer.getPlayer().sendMessage(LocaleLoader.getString("Commands.mmoedit.Modified.1",  Misc.getCapitalized(args[1]), newValue));
                 }
             }
+
+            if (allSkills) {
+                sender.sendMessage(LocaleLoader.getString("Commands.addlevels.AwardAll.2", args[0]));
+            }
+            else {
+                sender.sendMessage(LocaleLoader.getString("Commands.mmoedit.Modified.2", Misc.getCapitalized(args[1]), args[0]));
+            }
+
             return true;
 
         default:
-            sender.sendMessage(usage);
-            return true;
+            return false;
         }
     }
 }

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

@@ -1,97 +0,0 @@
-package com.gmail.nossr50.commands.admin;
-
-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.PlayerProfile;
-import com.gmail.nossr50.locale.LocaleLoader;
-import com.gmail.nossr50.skills.utilities.SkillTools;
-import com.gmail.nossr50.skills.utilities.SkillType;
-import com.gmail.nossr50.util.Misc;
-import com.gmail.nossr50.util.Users;
-
-public class SkillResetCommand implements CommandExecutor {
-    @Override
-    public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
-        OfflinePlayer modifiedPlayer;
-        PlayerProfile profile;
-        SkillType skill;
-        String usage = LocaleLoader.getString("Commands.Usage.3", new Object[] {"skillreset", "[" + LocaleLoader.getString("Commands.Usage.Player") + "]", "<" + LocaleLoader.getString("Commands.Usage.Skill") + ">"});
-
-        switch (args.length) {
-        case 1:
-            if (sender instanceof Player) {
-                if (!SkillTools.isSkill(args[0])) {
-                    sender.sendMessage(LocaleLoader.getString("Commands.Skill.Invalid"));
-                    return true;
-                }
-
-                skill = SkillTools.getSkillType(args[0]);
-
-                if (CommandHelper.noCommandPermissions((Player) sender, "mcmmo.commands.skillreset." + skill.toString().toLowerCase())) {
-                    return true;
-                }
-
-                modifiedPlayer = (Player) sender;
-                profile = Users.getProfile(modifiedPlayer);
-                profile.modifySkill(skill, 0);
-
-                if (skill == SkillType.ALL) {
-                    sender.sendMessage(LocaleLoader.getString("Commands.Reset.All"));
-                }
-                else {
-                    sender.sendMessage(LocaleLoader.getString("Commands.Reset.Single", new Object[] { Misc.getCapitalized(skill.toString()) }));
-                }
-            }
-            else {
-                sender.sendMessage(usage);
-            }
-
-            return true;
-
-        case 2:
-            modifiedPlayer = mcMMO.p.getServer().getOfflinePlayer(args[0]);
-            profile = Users.getProfile(modifiedPlayer);
-
-            // TODO:Not sure if we actually need a null check here
-            if (profile == null || !profile.isLoaded()) {
-                sender.sendMessage(LocaleLoader.getString("Commands.DoesNotExist"));
-                return true;
-            }
-
-            if (!SkillTools.isSkill(args[1])) {
-                sender.sendMessage(LocaleLoader.getString("Commands.Skill.Invalid"));
-                return true;
-            }
-
-            skill = SkillTools.getSkillType(args[1]);
-
-            if (CommandHelper.noCommandPermissions(sender, "mcmmo.commands.skillreset.others." + skill.toString().toLowerCase())) {
-                return true;
-            }
-
-            profile.modifySkill(skill, 0);
-
-            if (modifiedPlayer.isOnline()) {
-                if (skill == SkillType.ALL) {
-                    ((Player)modifiedPlayer).sendMessage(LocaleLoader.getString("Commands.Reset.All"));
-                }
-                else {
-                    ((Player)modifiedPlayer).sendMessage(LocaleLoader.getString("Commands.Reset.Single", new Object[] { Misc.getCapitalized(skill.toString()) }));
-                }
-            }
-
-            sender.sendMessage(LocaleLoader.getString("Commands.mmoedit.Modified.2", new Object[] { Misc.getCapitalized(skill.toString()), args[0] }));
-            return true;
-
-        default:
-            sender.sendMessage(usage);
-            return true;
-        }
-    }
-}

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

@@ -0,0 +1,173 @@
+package com.gmail.nossr50.commands.admin;
+
+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.McMMOPlayer;
+import com.gmail.nossr50.datatypes.PlayerProfile;
+import com.gmail.nossr50.locale.LocaleLoader;
+import com.gmail.nossr50.skills.utilities.SkillTools;
+import com.gmail.nossr50.skills.utilities.SkillType;
+import com.gmail.nossr50.util.Misc;
+import com.gmail.nossr50.util.Permissions;
+import com.gmail.nossr50.util.Users;
+
+public class SkillresetCommand implements CommandExecutor {
+    @Override
+    public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
+        PlayerProfile profile;
+        boolean allSkills = false;
+
+        switch (args.length) {
+        case 1:
+            if (!Permissions.hasPermission(sender, "mcmmo.commands.skillreset")) {
+                sender.sendMessage(command.getPermissionMessage());
+                return true;
+            }
+
+            if (!(sender instanceof Player)) {
+                return false;
+            }
+
+            if (args[0].equalsIgnoreCase("all")) {
+                allSkills = true;
+            }
+            else if (!SkillTools.isSkill(args[0])) {
+                sender.sendMessage(LocaleLoader.getString("Commands.Skill.Invalid"));
+                return true;
+            }
+
+            if (allSkills) {
+                for (SkillType skillType : SkillType.values()) {
+                    if (skillType.isChildSkill()) {
+                        continue;
+                    }
+
+                    if (!Permissions.hasPermission(sender, "mcmmo.commands.skillreset." + args[0].toLowerCase())) {
+                        sender.sendMessage(command.getPermissionMessage());
+                        return true;
+                    }
+                }
+            }
+            else {
+                if (!Permissions.hasPermission(sender, "mcmmo.commands.skillreset." + args[0].toLowerCase())) {
+                    sender.sendMessage(command.getPermissionMessage());
+                    return true;
+                }
+            }
+
+            profile = Users.getPlayer((Player) sender).getProfile();
+
+            if (allSkills) {
+                for (SkillType skillType : SkillType.values()) {
+                    if (skillType.isChildSkill()) {
+                        continue;
+                    }
+
+                    profile.modifySkill(skillType, 0);
+                }
+
+                sender.sendMessage(LocaleLoader.getString("Commands.Reset.All"));
+            }
+            else {
+                profile.modifySkill(SkillType.getSkill(args[0]), 0);
+                sender.sendMessage(LocaleLoader.getString("Commands.Reset.Single", Misc.getCapitalized(args[0])));
+            }
+
+            return true;
+
+        case 2:
+            if (!Permissions.hasPermission(sender, "mcmmo.commands.skillreset.others")) {
+                sender.sendMessage(command.getPermissionMessage());
+                return true;
+            }
+
+            if (args[1].equalsIgnoreCase("all")) {
+                allSkills = true;
+            }
+            else if (!SkillTools.isSkill(args[1])) {
+                sender.sendMessage(LocaleLoader.getString("Commands.Skill.Invalid"));
+                return true;
+            }
+
+            if (allSkills) {
+                for (SkillType skillType : SkillType.values()) {
+                    if (skillType.isChildSkill()) {
+                        continue;
+                    }
+
+                    if (!Permissions.hasPermission(sender, "mcmmo.commands.skillreset.others." + args[1].toLowerCase())) {
+                        sender.sendMessage(command.getPermissionMessage());
+                        return true;
+                    }
+                }
+            }
+            else {
+                if (!Permissions.hasPermission(sender, "mcmmo.commands.skillreset.others." + args[1].toLowerCase())) {
+                    sender.sendMessage(command.getPermissionMessage());
+                    return true;
+                }
+            }
+
+            McMMOPlayer mcMMOPlayer = Users.getPlayer(args[0]);
+
+            // If the mcMMOPlayer doesn't exist, create a temporary profile and check if it's present in the database. If it's not, abort the process.
+            if (mcMMOPlayer == null) {
+                profile = new PlayerProfile(args[0], false);
+
+                if (!profile.isLoaded()) {
+                    sender.sendMessage(LocaleLoader.getString("Commands.DoesNotExist"));
+                    return true;
+                }
+
+                if (allSkills) {
+                    for (SkillType skillType : SkillType.values()) {
+                        if (skillType.isChildSkill()) {
+                            continue;
+                        }
+
+                        profile.modifySkill(skillType, 0);
+                    }
+                }
+                else {
+                    profile.modifySkill(SkillType.getSkill(args[1]), 0);
+                }
+
+                profile.save(); // Since this is a temporary profile, we save it here.
+            }
+            else {
+                profile = mcMMOPlayer.getProfile();
+
+                if (allSkills) {
+                    for (SkillType skillType : SkillType.values()) {
+                        if (skillType.isChildSkill()) {
+                            continue;
+                        }
+
+                        profile.modifySkill(skillType, 0);
+                    }
+
+                    mcMMOPlayer.getPlayer().sendMessage(LocaleLoader.getString("Commands.Reset.All"));
+                }
+                else {
+                    profile.modifySkill(SkillType.getSkill(args[1]), 0);
+                    mcMMOPlayer.getPlayer().sendMessage(LocaleLoader.getString("Commands.Reset.Single", Misc.getCapitalized(args[1])));
+                }
+            }
+
+            if (allSkills) {
+                sender.sendMessage(LocaleLoader.getString("Commands.addlevels.AwardAll.2", args[0]));
+            }
+            else {
+                sender.sendMessage(LocaleLoader.getString("Commands.mmoedit.Modified.2", Misc.getCapitalized(args[1]), args[0]));
+            }
+
+            return true;
+
+        default:
+            return false;
+        }
+    }
+}

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

@@ -6,90 +6,70 @@ 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.locale.LocaleLoader;
 import com.gmail.nossr50.util.Misc;
+import com.gmail.nossr50.util.Permissions;
 
 public class XprateCommand implements CommandExecutor {
     private static double originalRate = Config.getInstance().getExperienceGainsGlobalMultiplier();
 
     @Override
     public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
-        String usage1 = LocaleLoader.getString("Commands.xprate.proper.0");
-        String usage2 = LocaleLoader.getString("Commands.xprate.proper.1");
-        String usage3 = LocaleLoader.getString("Commands.xprate.proper.2");
-
-        if (CommandHelper.noCommandPermissions(sender, "mcmmo.commands.xprate")) {
-            return true;
-        }
-
-        boolean xpEventEnabled = mcMMO.p.isXPEventEnabled();
-
         switch (args.length) {
         case 1:
-            if (args[0].equalsIgnoreCase("reset")) {
-                if (CommandHelper.noCommandPermissions(sender, "mcmmo.commands.xprate.reset")) {
-                    return true;
-                }
-
-                if (xpEventEnabled) {
-                    for (Player x : mcMMO.p.getServer().getOnlinePlayers()) {
-                        x.sendMessage(LocaleLoader.getString("Commands.xprate.over"));
-                    }
-
-                    mcMMO.p.setXPEventEnabled(!xpEventEnabled);
-                    Config.getInstance().setExperienceGainsGlobalMultiplier(originalRate);
-                }
-                else {
-                    Config.getInstance().setExperienceGainsGlobalMultiplier(originalRate);
-                }
-            }
-            else if (Misc.isInt(args[0])) {
-                sender.sendMessage(usage3);
-            }
-            else {
-                sender.sendMessage(usage2);
+            if (!args[0].equalsIgnoreCase("reset")) {
+                return false;
             }
 
+            if (!Permissions.hasPermission(sender, "mcmmo.commands.xprate.reset")) {
+                sender.sendMessage(command.getPermissionMessage());
+                return true;
+            }
+
+            if (mcMMO.p.isXPEventEnabled()) {
+                for (Player player : mcMMO.p.getServer().getOnlinePlayers()) {
+                    player.sendMessage(LocaleLoader.getString("Commands.xprate.over"));
+                }
+
+                mcMMO.p.toggleXpEventEnabled();
+            }
+
+            Config.getInstance().setExperienceGainsGlobalMultiplier(originalRate);
             return true;
 
         case 2:
-            if (Misc.isInt(args[0])) {
-                if (CommandHelper.noCommandPermissions(sender, "mcmmo.commands.xprate.set")) {
-                    return true;
-                }
-                if (args[1].equalsIgnoreCase("true") || args[1].equalsIgnoreCase("false")) {
-                    mcMMO.p.setXPEventEnabled(Boolean.valueOf(args[1]));
-                }
-                else {
-                    sender.sendMessage(usage3);
-                }
+            if (!Misc.isInt(args[0])) {
+                return false;
+            }
 
-                int newRate = Misc.getInt(args[0]);
-                Config.getInstance().setExperienceGainsGlobalMultiplier(newRate);
+            if (!Permissions.hasPermission(sender, "mcmmo.commands.xprate.set")) {
+                sender.sendMessage(command.getPermissionMessage());
+                return true;
+            }
 
-                if (xpEventEnabled) {
-                    for (Player x : mcMMO.p.getServer().getOnlinePlayers()) {
-                        x.sendMessage(LocaleLoader.getString("Commands.xprate.started.0"));
-                        x.sendMessage(LocaleLoader.getString("Commands.xprate.started.1", new Object[] {newRate}));
-                    }
-                }
-                else {
-                    sender.sendMessage(LocaleLoader.getString("Commands.xprate.modified", new Object[] {newRate}));
+            if (!args[1].equalsIgnoreCase("true") && !args[1].equalsIgnoreCase("false")) {
+                return false;
+            }
+
+            mcMMO.p.setXPEventEnabled(Boolean.valueOf(args[1]));
+            int newXpRate = Misc.getInt(args[0]);
+            Config.getInstance().setExperienceGainsGlobalMultiplier(newXpRate);
+
+            if (mcMMO.p.isXPEventEnabled()) {
+                for (Player player : mcMMO.p.getServer().getOnlinePlayers()) {
+                    player.sendMessage(LocaleLoader.getString("Commands.xprate.started.0"));
+                    player.sendMessage(LocaleLoader.getString("Commands.xprate.started.1", newXpRate));
                 }
             }
             else {
-                sender.sendMessage(usage1);
-                sender.sendMessage(usage2);
+                sender.sendMessage(LocaleLoader.getString("Commands.xprate.modified", newXpRate));
             }
 
             return true;
 
         default:
-            sender.sendMessage(usage1);
-            sender.sendMessage(usage2);
-            return true;
+            return false;
         }
     }
 }

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

@@ -17,72 +17,75 @@ import com.gmail.nossr50.util.Users;
 public class InspectCommand implements CommandExecutor {
     @Override
     public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
-        String usage = LocaleLoader.getString("Commands.Usage.1", new Object[] {"inspect", "<" + LocaleLoader.getString("Commands.Usage.Player") + ">"});
-
-        if (CommandHelper.noCommandPermissions(sender, "mcmmo.commands.inspect")) {
-            return true;
-        }
+        PlayerProfile profile;
 
         switch (args.length) {
         case 1:
-            McMMOPlayer mcmmoPlayer = Users.getPlayer(args[0]);
+            if (!Permissions.hasPermission(sender, "mcmmo.commands.inspect")) {
+                sender.sendMessage(command.getPermissionMessage());
+                return true;
+            }
 
-            if (mcmmoPlayer != null) {
-                Player target = mcmmoPlayer.getPlayer();
+            McMMOPlayer mcMMOPlayer = Users.getPlayer(args[0]);
 
-                if (sender instanceof Player && !Misc.isNear(((Player) sender).getLocation(), target.getLocation(), 5.0) && !Permissions.inspectFar((Player) sender)) {
-                    sender.sendMessage(LocaleLoader.getString("Inspect.TooFar"));
+            // If the mcMMOPlayer doesn't exist, create a temporary profile and check if it's present in the database. If it's not, abort the process.
+            if (mcMMOPlayer == null) {
+                profile = new PlayerProfile(args[0], false); //Temporary Profile
+
+                if (!profile.isLoaded()) {
+                    sender.sendMessage(LocaleLoader.getString("Commands.DoesNotExist"));
                     return true;
                 }
 
-                PlayerProfile profile = mcmmoPlayer.getProfile();
+                if (sender instanceof Player && !Permissions.inspectOffline((Player) sender)) {
+                    sender.sendMessage(LocaleLoader.getString("Inspect.Offline"));
+                    return true;
+                }
 
-                sender.sendMessage(LocaleLoader.getString("Inspect.Stats", new Object[] { target.getName() }));
+                sender.sendMessage(LocaleLoader.getString("Inspect.OfflineStats", args[0]));
+
+                sender.sendMessage(LocaleLoader.getString("Stats.Header.Gathering"));
+                sender.sendMessage(LocaleLoader.getString("Skills.Stats", LocaleLoader.getString("Excavation.Listener"), profile.getSkillLevel(SkillType.EXCAVATION), profile.getSkillXpLevel(SkillType.EXCAVATION), profile.getXpToLevel(SkillType.EXCAVATION)));
+                sender.sendMessage(LocaleLoader.getString("Skills.Stats", LocaleLoader.getString("Fishing.Listener"), profile.getSkillLevel(SkillType.FISHING), profile.getSkillXpLevel(SkillType.FISHING), profile.getXpToLevel(SkillType.FISHING)));
+                sender.sendMessage(LocaleLoader.getString("Skills.Stats", LocaleLoader.getString("Herbalism.Listener"), profile.getSkillLevel(SkillType.HERBALISM), profile.getSkillXpLevel(SkillType.HERBALISM), profile.getXpToLevel(SkillType.HERBALISM)));
+                sender.sendMessage(LocaleLoader.getString("Skills.Stats", LocaleLoader.getString("Mining.Listener"), profile.getSkillLevel(SkillType.MINING), profile.getSkillXpLevel(SkillType.MINING), profile.getXpToLevel(SkillType.MINING)));
+                sender.sendMessage(LocaleLoader.getString("Skills.Stats", 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", LocaleLoader.getString("Axes.Listener"), profile.getSkillLevel(SkillType.AXES), profile.getSkillXpLevel(SkillType.AXES), profile.getXpToLevel(SkillType.AXES)));
+                sender.sendMessage(LocaleLoader.getString("Skills.Stats", LocaleLoader.getString("Archery.Listener"), profile.getSkillLevel(SkillType.ARCHERY), profile.getSkillXpLevel(SkillType.ARCHERY), profile.getXpToLevel(SkillType.ARCHERY)));
+                sender.sendMessage(LocaleLoader.getString("Skills.Stats", LocaleLoader.getString("Swords.Listener"), profile.getSkillLevel(SkillType.SWORDS), profile.getSkillXpLevel(SkillType.SWORDS), profile.getXpToLevel(SkillType.SWORDS)));
+                sender.sendMessage(LocaleLoader.getString("Skills.Stats", LocaleLoader.getString("Taming.Listener"), profile.getSkillLevel(SkillType.TAMING), profile.getSkillXpLevel(SkillType.TAMING), profile.getXpToLevel(SkillType.TAMING)));
+                sender.sendMessage(LocaleLoader.getString("Skills.Stats", 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", LocaleLoader.getString("Acrobatics.Listener"), profile.getSkillLevel(SkillType.ACROBATICS), profile.getSkillXpLevel(SkillType.ACROBATICS), profile.getXpToLevel(SkillType.ACROBATICS)));
+                sender.sendMessage(LocaleLoader.getString("Skills.Stats", LocaleLoader.getString("Repair.Listener"), profile.getSkillLevel(SkillType.REPAIR), profile.getSkillXpLevel(SkillType.REPAIR), profile.getXpToLevel(SkillType.REPAIR)));
+            }
+            else {
+                Player target = mcMMOPlayer.getPlayer();
+
+                if (sender instanceof Player) {
+                    Player inspector = (Player) sender;
+
+                    if (!Misc.isNear(inspector.getLocation(), target.getLocation(), 5.0) && !Permissions.inspectFar(inspector)) {
+                        sender.sendMessage(LocaleLoader.getString("Inspect.TooFar"));
+                        return true;
+                    }
+                }
+                profile = mcMMOPlayer.getProfile();
+
+                sender.sendMessage(LocaleLoader.getString("Inspect.Stats", target.getName()));
                 CommandHelper.printGatheringSkills(target, profile, sender);
                 CommandHelper.printCombatSkills(target, profile, sender);
                 CommandHelper.printMiscSkills(target, profile, sender);
-                sender.sendMessage(LocaleLoader.getString("Commands.PowerLevel", new Object[] { mcmmoPlayer.getPowerLevel() }));
-
-                return true;
+                sender.sendMessage(LocaleLoader.getString("Commands.PowerLevel", mcMMOPlayer.getPowerLevel()));
             }
 
-            if (sender instanceof Player && !Permissions.inspectOffline((Player) sender)) {
-                sender.sendMessage(LocaleLoader.getString("Inspect.Offline"));
-                return true;
-            }
-
-            PlayerProfile profile = new PlayerProfile(args[0], false); //Temporary Profile
-
-            if (!profile.isLoaded()) {
-                sender.sendMessage(LocaleLoader.getString("Commands.DoesNotExist"));
-                return true;
-            }
-
-            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"), 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"), 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"), 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;
 
         default:
-            sender.sendMessage(usage);
-            return true;
+            return false;
         }
     }
 }

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

@@ -1,30 +1,29 @@
 package com.gmail.nossr50.commands.player;
 
-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.locale.LocaleLoader;
+import com.gmail.nossr50.util.Permissions;
 import com.gmail.nossr50.util.Users;
 
 public class McabilityCommand implements CommandExecutor {
     @Override
     public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
         PlayerProfile profile;
-        String usage = LocaleLoader.getString("Commands.Usage.1", new Object[] {"mcability", "<" + LocaleLoader.getString("Commands.Usage.Player") + ">"});
 
         switch (args.length) {
         case 0:
-            if (CommandHelper.noCommandPermissions(sender, "mcmmo.commands.mcability")) {
+            if (!Permissions.hasPermission(sender, "mcmmo.commands.mcability")) {
+                sender.sendMessage(command.getPermissionMessage());
                 return true;
             }
 
-            profile = Users.getProfile((Player) sender);
+            profile = Users.getPlayer((Player) sender).getProfile();
 
             if (profile.getAbilityUse()) {
                 sender.sendMessage(LocaleLoader.getString("Commands.Ability.Off"));
@@ -37,32 +36,45 @@ public class McabilityCommand implements CommandExecutor {
             return true;
 
         case 1:
-            if (CommandHelper.noCommandPermissions(sender, "mcmmo.commands.mcability.others")) {
+            if (!Permissions.hasPermission(sender, "mcmmo.commands.mcability.others")) {
+                sender.sendMessage(command.getPermissionMessage());
                 return true;
             }
 
-            OfflinePlayer modifiedPlayer = mcMMO.p.getServer().getOfflinePlayer(args[0]);
-            profile = Users.getProfile(modifiedPlayer);
+            McMMOPlayer mcMMOPlayer = Users.getPlayer(args[0]);
 
-            // TODO:Not sure if we actually need a null check here
-            if (profile == null || !profile.isLoaded()) {
-                sender.sendMessage(LocaleLoader.getString("Commands.DoesNotExist"));
+            if (mcMMOPlayer == null) {
+                profile = new PlayerProfile(args[0], false);
+
+                if (!profile.isLoaded()) {
+                    sender.sendMessage(LocaleLoader.getString("Commands.DoesNotExist"));
+                    return true;
+                }
+
+                sender.sendMessage(LocaleLoader.getString("Commands.Offline"));
+                return true;
+            }
+
+            Player player = mcMMOPlayer.getPlayer();
+            profile = mcMMOPlayer.getProfile();
+
+            if (!player.isOnline()) {
+                sender.sendMessage(LocaleLoader.getString("Commands.Offline"));
                 return true;
             }
 
             if (profile.getAbilityUse()) {
-                ((Player) modifiedPlayer).sendMessage(LocaleLoader.getString("Commands.Ability.Off"));
+                player.sendMessage(LocaleLoader.getString("Commands.Ability.Off"));
             }
             else {
-                ((Player) modifiedPlayer).sendMessage(LocaleLoader.getString("Commands.Ability.On"));
+                player.sendMessage(LocaleLoader.getString("Commands.Ability.On"));
             }
 
             profile.toggleAbilityUse();
             return true;
 
         default:
-            sender.sendMessage(usage);
-            return true;
+            return false;
         }
     }
 }

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

@@ -17,6 +17,10 @@ public class MccCommand implements CommandExecutor {
             return true;
         }
 
+        if (!Permissions.hasPermission(sender, "mcmmo.commands.mcc")) {
+            return true;
+        }
+
         Player player = (Player) sender;
 
         player.sendMessage(LocaleLoader.getString("Commands.mcc.Header"));

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

@@ -15,23 +15,28 @@ import com.gmail.nossr50.util.Anniversary;
 public class McmmoCommand implements CommandExecutor {
     @Override
     public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
-        String description = LocaleLoader.getString("mcMMO.Description");
-        String[] mcSplit = description.split(",");
-        sender.sendMessage(mcSplit);
 
-        if (Config.getInstance().getDonateMessageEnabled()) {
-            if (mcMMO.spoutEnabled && sender instanceof SpoutPlayer) {
-                SpoutPlayer spoutPlayer = (SpoutPlayer) sender;
+        if (args.length == 0 || (args.length == 1 && args[0].equals("?"))) {
+            String description = LocaleLoader.getString("mcMMO.Description");
+            String[] mcSplit = description.split(",");
+            sender.sendMessage(mcSplit);
 
-                spoutPlayer.sendNotification(LocaleLoader.getString("Spout.Donate"), ChatColor.GREEN + "gjmcferrin@gmail.com", Material.DIAMOND);
+            if (Config.getInstance().getDonateMessageEnabled()) {
+                if (mcMMO.spoutEnabled && sender instanceof SpoutPlayer) {
+                    SpoutPlayer spoutPlayer = (SpoutPlayer) sender;
+                    spoutPlayer.sendNotification(LocaleLoader.getString("Spout.Donate"), ChatColor.GREEN + "gjmcferrin@gmail.com", Material.DIAMOND);
+                }
+
+                sender.sendMessage(LocaleLoader.getString("MOTD.Donate"));
+                sender.sendMessage(ChatColor.GOLD + " - " + ChatColor.GREEN + "gjmcferrin@gmail.com" + ChatColor.GOLD + " Paypal");
             }
 
-            sender.sendMessage(LocaleLoader.getString("MOTD.Donate"));
-            sender.sendMessage(ChatColor.GOLD + " - " + ChatColor.GREEN + "gjmcferrin@gmail.com" + ChatColor.GOLD + " Paypal");
-        }
-        sender.sendMessage(LocaleLoader.getString("MOTD.Version", new Object[] {mcMMO.p.getDescription().getVersion()}));
+            sender.sendMessage(LocaleLoader.getString("MOTD.Version", mcMMO.p.getDescription().getVersion()));
 
-        Anniversary.anniversaryCheck(sender);
-        return true;
+            Anniversary.anniversaryCheck(sender);
+            return true;
+        }
+
+        return false;
     }
 }

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

@@ -6,85 +6,119 @@ 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.mcMMO;
 import com.gmail.nossr50.config.Config;
+import com.gmail.nossr50.database.Leaderboard;
+import com.gmail.nossr50.datatypes.McMMOPlayer;
+import com.gmail.nossr50.datatypes.PlayerProfile;
 import com.gmail.nossr50.locale.LocaleLoader;
 import com.gmail.nossr50.runnables.McRankAsync;
 import com.gmail.nossr50.skills.utilities.SkillTools;
 import com.gmail.nossr50.skills.utilities.SkillType;
-import com.gmail.nossr50.util.Leaderboard;
+import com.gmail.nossr50.util.Misc;
+import com.gmail.nossr50.util.Permissions;
+import com.gmail.nossr50.util.Users;
 
 public class McrankCommand implements CommandExecutor {
     @Override
     public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
-        //TODO: Better input handling, add usage string
-
-        if (!Config.getInstance().getUseMySQL()) {
-            Leaderboard.updateLeaderboards(); //Make sure the information is up to date
-        }
-
-        if (CommandHelper.noConsoleUsage(sender)) {
-            return true;
-        }
-
-        Player player = (Player) sender;
-        String playerName;
         switch (args.length) {
         case 0:
-            playerName = player.getName();
-            break;
+            if (!Permissions.hasPermission(sender, "mcmmo.commands.mcrank")) {
+                sender.sendMessage(command.getPermissionMessage());
+                return true;
+            }
+
+            if (!(sender instanceof Player)) {
+                return false;
+            }
+
+            if (Config.getInstance().getUseMySQL()) {
+                sqlDisplay(sender, sender.getName());
+            }
+            else {
+                Leaderboard.updateLeaderboards(); // Make sure the information is up to date
+                flatfileDisplay(sender, sender.getName());
+            }
+
+            return true;
 
         case 1:
-            playerName = args[0];
-            break;
+            if (!Permissions.hasPermission(sender, "mcmmo.commands.mcrank.others")) {
+                sender.sendMessage(command.getPermissionMessage());
+                return true;
+            }
+
+            McMMOPlayer mcMMOPlayer = Users.getPlayer(args[0]);
+
+            if (mcMMOPlayer == null) {
+                PlayerProfile profile = new PlayerProfile(args[0], false); //Temporary Profile
+
+                if (!profile.isLoaded()) {
+                    sender.sendMessage(LocaleLoader.getString("Commands.DoesNotExist"));
+                    return true;
+                }
+
+                if (sender instanceof Player && !!Permissions.hasPermission(sender, "mcmmo.commands.mcrank.others.offline")) {
+                    sender.sendMessage(LocaleLoader.getString("Inspect.Offline"));
+                    return true;
+                }
+            }
+            else {
+                Player target = mcMMOPlayer.getPlayer();
+
+                if (sender instanceof Player && !Misc.isNear(((Player) sender).getLocation(), target.getLocation(), 5.0) && !Permissions.hasPermission(sender, "mcmmo.commands.mcrank.others.far")) {
+                    sender.sendMessage(LocaleLoader.getString("Inspect.TooFar"));
+                    return true;
+                }
+            }
+
+            if (Config.getInstance().getUseMySQL()) {
+                sqlDisplay(sender, args[0]);
+            }
+            else {
+                Leaderboard.updateLeaderboards(); // Make sure the information is up to date
+                flatfileDisplay(sender, args[0]);
+            }
+
+            return true;
 
         default:
             return false;
         }
-
-        if (Config.getInstance().getUseMySQL()) {
-            sqlDisplay(sender, playerName);
-        }
-        else {
-            flatfileDisplay(sender, playerName);
-        }
-
-        return true;
     }
 
-    public void flatfileDisplay(CommandSender sender, String playerName) {
+    private void flatfileDisplay(CommandSender sender, String playerName) {
         sender.sendMessage(LocaleLoader.getString("Commands.mcrank.Heading"));
-        sender.sendMessage(LocaleLoader.getString("Commands.mcrank.Player", new Object[] {playerName}));
+        sender.sendMessage(LocaleLoader.getString("Commands.mcrank.Player", playerName));
+
         for (SkillType skillType : SkillType.values()) {
             int[] rankInts = Leaderboard.getPlayerRank(playerName, skillType);
+
             if (skillType.isChildSkill()) {
                 continue;
             }
 
-            if (skillType.equals(SkillType.ALL)) {
-                continue; // We want the overall ranking to be at the bottom
-            }
-
             if (rankInts[1] == 0) {
-                sender.sendMessage(LocaleLoader.getString("Commands.mcrank.Skill", new Object[] {SkillTools.localizeSkillName(skillType), LocaleLoader.getString("Commands.mcrank.Unranked")} )); //Don't bother showing ranking for players without skills
+                sender.sendMessage(LocaleLoader.getString("Commands.mcrank.Skill", SkillTools.localizeSkillName(skillType), LocaleLoader.getString("Commands.mcrank.Unranked"))); // Don't bother showing ranking for players without skills
             }
             else {
-                sender.sendMessage(LocaleLoader.getString("Commands.mcrank.Skill", new Object[] {SkillTools.localizeSkillName(skillType), String.valueOf(rankInts[0])} ));
+                sender.sendMessage(LocaleLoader.getString("Commands.mcrank.Skill", SkillTools.localizeSkillName(skillType), String.valueOf(rankInts[0])));
             }
         }
 
-        //Show the powerlevel ranking
-        int[] rankInts = Leaderboard.getPlayerRank(playerName, SkillType.ALL);
+        // Show the powerlevel ranking
+        int[] rankInts = Leaderboard.getPlayerRank(playerName);
 
         if (rankInts[1] == 0) {
-            sender.sendMessage(LocaleLoader.getString("Commands.mcrank.Overalll", new Object[] {LocaleLoader.getString("Commands.mcrank.Unranked")} )); //Don't bother showing ranking for players without skills
+            sender.sendMessage(LocaleLoader.getString("Commands.mcrank.Overalll", LocaleLoader.getString("Commands.mcrank.Unranked"))); // Don't bother showing ranking for players without skills
         }
         else {
-            sender.sendMessage(LocaleLoader.getString("Commands.mcrank.Overall", new Object[] {String.valueOf(rankInts[0])} ));
+            sender.sendMessage(LocaleLoader.getString("Commands.mcrank.Overall", String.valueOf(rankInts[0])));
         }
     }
 
     private void sqlDisplay(CommandSender sender, String playerName) {
-        Bukkit.getScheduler().runTaskAsynchronously(Bukkit.getPluginManager().getPlugin("mcMMO"), new McRankAsync(playerName, sender));
+        Bukkit.getScheduler().runTaskAsynchronously(mcMMO.p, new McRankAsync(playerName, sender));
     }
 }

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

@@ -7,6 +7,7 @@ import org.bukkit.entity.Player;
 
 import com.gmail.nossr50.commands.CommandHelper;
 import com.gmail.nossr50.config.Config;
+import com.gmail.nossr50.datatypes.McMMOPlayer;
 import com.gmail.nossr50.datatypes.PlayerProfile;
 import com.gmail.nossr50.locale.LocaleLoader;
 import com.gmail.nossr50.util.Users;
@@ -18,29 +19,32 @@ public class McstatsCommand implements CommandExecutor {
             return true;
         }
 
-        if (CommandHelper.noCommandPermissions(sender, "mcmmo.commands.mcstats")) {
+        switch (args.length) {
+        case 0:
+            Player player = (Player) sender;
+            McMMOPlayer mcMMOPlayer = Users.getPlayer(player);
+            PlayerProfile profile = mcMMOPlayer.getProfile();
+
+            player.sendMessage(LocaleLoader.getString("Stats.Own.Stats"));
+            player.sendMessage(LocaleLoader.getString("mcMMO.NoSkillNote"));
+
+            CommandHelper.printGatheringSkills(player, profile);
+            CommandHelper.printCombatSkills(player, profile);
+            CommandHelper.printMiscSkills(player, profile);
+
+            int powerLevelCap = Config.getInstance().getPowerLevelCap();
+
+            if (powerLevelCap != Integer.MAX_VALUE) {
+                player.sendMessage(LocaleLoader.getString("Commands.PowerLevel.Capped", String.valueOf(mcMMOPlayer.getPowerLevel()), String.valueOf(powerLevelCap)));
+            }
+            else {
+                player.sendMessage(LocaleLoader.getString("Commands.PowerLevel", String.valueOf(mcMMOPlayer.getPowerLevel())));
+            }
+
             return true;
+
+        default:
+            return false;
         }
-
-        Player player = (Player) sender;
-        PlayerProfile profile = Users.getPlayer(player).getProfile();
-
-        player.sendMessage(LocaleLoader.getString("Stats.Own.Stats"));
-        player.sendMessage(LocaleLoader.getString("mcMMO.NoSkillNote"));
-
-        CommandHelper.printGatheringSkills(player, profile);
-        CommandHelper.printCombatSkills(player, profile);
-        CommandHelper.printMiscSkills(player, profile);
-
-        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/player/MctopCommand.java

@@ -8,82 +8,33 @@ import org.bukkit.command.Command;
 import org.bukkit.command.CommandExecutor;
 import org.bukkit.command.CommandSender;
 
+import com.gmail.nossr50.commands.CommandHelper;
 import com.gmail.nossr50.config.Config;
 import com.gmail.nossr50.database.Database;
+import com.gmail.nossr50.database.Leaderboard;
 import com.gmail.nossr50.locale.LocaleLoader;
 import com.gmail.nossr50.skills.utilities.SkillTools;
-import com.gmail.nossr50.skills.utilities.SkillType;
-import com.gmail.nossr50.util.Leaderboard;
 import com.gmail.nossr50.util.Misc;
 
 public class MctopCommand implements CommandExecutor {
     @Override
     public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
-        String usage = LocaleLoader.getString("Commands.Usage.2", new Object[] {"mctop", "[" + LocaleLoader.getString("Commands.Usage.Skill") + "]", "[" + LocaleLoader.getString("Commands.Usage.Page") + "]"});
-
-        if (!Config.getInstance().getUseMySQL()) {
-
-            switch (args.length) {
-            case 0:
-                flatfileDisplay(1, "ALL", sender);
-                return true;
-
-            case 1:
-                if (Misc.isInt(args[0])) {
-                    flatfileDisplay(Integer.valueOf(args[0]), "ALL", sender);
-                }
-                else if (SkillTools.isSkill(args[0])) {
-                    flatfileDisplay(1, args[0].toUpperCase(), sender);
-                }
-                else if (SkillTools.isLocalizedSkill(args[0])) {
-                    flatfileDisplay(1, SkillTools.translateLocalizedSkill(args[0]).toUpperCase(), sender);
-                }
-                else {
-                    sender.sendMessage(LocaleLoader.getString("Commands.Skill.Invalid"));
-                }
-
-                return true;
-
-            case 2:
-                if (Misc.isInt(args[1])) {
-                    if (SkillTools.isSkill(args[0])) {
-                        flatfileDisplay(Integer.valueOf(args[1]), args[0].toUpperCase(), sender);
-                    }
-                    else if (SkillTools.isLocalizedSkill(args[0])) {
-                        flatfileDisplay(Integer.valueOf(args[1]), SkillTools.translateLocalizedSkill(args[0]).toUpperCase(), sender);
-                    }
-                    else {
-                        sender.sendMessage(LocaleLoader.getString("Commands.Skill.Invalid"));
-                    }
-                }
-                else {
-                    sender.sendMessage(usage);
-                }
-
-                return true;
-
-            default:
-                sender.sendMessage(usage);
-                return true;
-            }
-        }
-
-        String powerlevel = "taming+mining+woodcutting+repair+unarmed+herbalism+excavation+archery+swords+axes+acrobatics+fishing";
+        boolean useMySQL = Config.getInstance().getUseMySQL();
 
         switch (args.length) {
         case 0:
-            sqlDisplay(1, powerlevel, sender);
+            display(1, "ALL", sender, useMySQL);
             return true;
 
         case 1:
             if (Misc.isInt(args[0])) {
-                sqlDisplay(Integer.valueOf(args[0]), powerlevel, sender);
+                display(Integer.valueOf(args[0]), "ALL", sender, useMySQL);
             }
             else if (SkillTools.isSkill(args[0])) {
-                sqlDisplay(1, args[0].toLowerCase(), sender);
+                display(1, args[0], sender, useMySQL);
             }
             else if (SkillTools.isLocalizedSkill(args[0])) {
-                sqlDisplay(1, SkillTools.translateLocalizedSkill(args[0]).toLowerCase(), sender);
+                display(1, SkillTools.translateLocalizedSkill(args[0]), sender, useMySQL);
             }
             else {
                 sender.sendMessage(LocaleLoader.getString("Commands.Skill.Invalid"));
@@ -92,39 +43,55 @@ public class MctopCommand implements CommandExecutor {
             return true;
 
         case 2:
-            if (Misc.isInt(args[1])) {
-                if (SkillTools.isSkill(args[0])) {
-                    sqlDisplay(Integer.valueOf(args[1]), args[0].toLowerCase(), sender);
-                }
-                else if (SkillTools.isLocalizedSkill(args[0])) {
-                    sqlDisplay(Integer.valueOf(args[1]), SkillTools.translateLocalizedSkill(args[0]).toLowerCase(), sender);
-                }
-                else {
-                    sender.sendMessage(LocaleLoader.getString("Commands.Skill.Invalid"));
-                }
+            if (!Misc.isInt(args[1])) {
+                return false;
+            }
+
+            if (SkillTools.isSkill(args[0])) {
+                display(Integer.valueOf(args[1]), args[0], sender, useMySQL);
+            }
+            else if (SkillTools.isLocalizedSkill(args[0])) {
+                display(Integer.valueOf(args[1]), SkillTools.translateLocalizedSkill(args[0]), sender, useMySQL);
             }
             else {
-                sender.sendMessage(usage);
+                sender.sendMessage(LocaleLoader.getString("Commands.Skill.Invalid"));
             }
 
             return true;
 
         default:
-            sender.sendMessage(usage);
-            return true;
+            return false;
+        }
+    }
+
+    private void display(int page, String skill, CommandSender sender, boolean sql) {
+        if (sql) {
+            if (skill.equalsIgnoreCase("all")) {
+                sqlDisplay(page, "taming+mining+woodcutting+repair+unarmed+herbalism+excavation+archery+swords+axes+acrobatics+fishing", sender);
+            }
+            else {
+                sqlDisplay(page, skill, sender);
+            }
+        }
+        else {
+            flatfileDisplay(page, skill, sender);
         }
     }
 
     private void flatfileDisplay(int page, String skill, CommandSender sender) {
-        Leaderboard.updateLeaderboards(); //Make sure we have the latest information
-        SkillType skillType = SkillType.getSkill(skill);
-        String[] info = Leaderboard.retrieveInfo(skillType, page);
+        if (!skill.equalsIgnoreCase("all") && CommandHelper.noCommandPermissions(sender, "mcmmo.commands.mctop." + skill.toLowerCase())) {
+            return;
+        }
 
-        if (skill.equalsIgnoreCase("ALL")) {
+        Leaderboard.updateLeaderboards(); //Make sure we have the latest information
+
+        String[] info = Leaderboard.retrieveInfo(skill, page);
+
+        if (skill.equalsIgnoreCase("all")) {
             sender.sendMessage(LocaleLoader.getString("Commands.PowerLevel.Leaderboard"));
         }
         else {
-            sender.sendMessage(LocaleLoader.getString("Commands.Skill.Leaderboard", new Object[] { Misc.getCapitalized(skill) }));
+            sender.sendMessage(LocaleLoader.getString("Commands.Skill.Leaderboard", Misc.getCapitalized(skill)));
         }
 
         int n = (page * 10) - 9; // Position
@@ -148,6 +115,11 @@ public class MctopCommand implements CommandExecutor {
     }
 
     private void sqlDisplay(int page, String query, CommandSender sender) {
+        if (!query.equalsIgnoreCase("taming+mining+woodcutting+repair+unarmed+herbalism+excavation+archery+swords+axes+acrobatics+fishing")) {
+            if (CommandHelper.noCommandPermissions(sender, "mcmmo.commands.mctop." + query.toLowerCase())) {
+                return;
+            }
+        }
         String tablePrefix = Config.getInstance().getMySQLTablePrefix();
         HashMap<Integer, ArrayList<String>> userslist = Database.read("SELECT " + query + ", user, NOW() FROM " + tablePrefix + "users JOIN " + tablePrefix + "skills ON (user_id = id) WHERE " + query + " > 0 ORDER BY " + query + " DESC, user LIMIT "+((page * 10) - 10)+",10");
 
@@ -155,13 +127,16 @@ public class MctopCommand implements CommandExecutor {
             sender.sendMessage(LocaleLoader.getString("Commands.PowerLevel.Leaderboard"));
         }
         else {
-            sender.sendMessage(LocaleLoader.getString("Commands.Skill.Leaderboard", new Object[] { Misc.getCapitalized(query) }));
+            sender.sendMessage(LocaleLoader.getString("Commands.Skill.Leaderboard", Misc.getCapitalized(query)));
         }
+
         int place = (page * 10) - 9;
         for (int i = 1; i <= 10; i++) {
-            if(userslist.get(i) == null) {
+            if (userslist.get(i) == null) {
                 break;
             }
+
+         // Format: 1. Playername - skill value
             sender.sendMessage(String.valueOf(place) + ". " + ChatColor.GREEN + userslist.get(i).get(1) + " - " + ChatColor.WHITE + userslist.get(i).get(0));
             place++;
         }

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

@@ -4,6 +4,8 @@ import java.util.Set;
 
 import org.bukkit.configuration.ConfigurationSection;
 
+import com.gmail.nossr50.mcMMO;
+
 public class Config extends ConfigLoader {
     private static Config instance;
 
@@ -76,16 +78,23 @@ public class Config extends ConfigLoader {
     public boolean getToolModsEnabled() { return config.getBoolean("Mods.Tool_Mods_Enabled", false); }
     public boolean getArmorModsEnabled() { return config.getBoolean("Mods.Tool_Mods_Enabled", false); }
     public boolean getBlockModsEnabled() { return config.getBoolean("Mods.Block_Mods_Enabled", false); }
+    public boolean getEntityModsEnabled() { return config.getBoolean("Mods.Entity_Mods_Enabled", false); }
+
+    /* PARTY SETTINGS */
+    public int getAutoPartyKickInterval() { return config.getInt("Party.AutoKick_Interval", 12); }
+    public int getAutoPartyKickTime() { return config.getInt("Party.Old_Party_Member_Cutoff", 7); }
+    public boolean getExpShareEnabled() { return config.getBoolean("Party.Sharing.ExpShare_enabled", true); }
+    public double getPartyShareBonusBase() { return config.getDouble("Party.Sharing.ExpShare_bonus_base", 1.1); }
+    public double getPartyShareBonusIncrease() { return config.getDouble("Party.Sharing.ExpShare_bonus_increase", 0.05); }
+    public double getPartyShareBonusCap() { return config.getDouble("Party.Sharing.ExpShare_bonus_cap", 1.5); }
+    public boolean getItemShareEnabled() { return config.getBoolean("Party.Sharing.ItemShare_enabled", true); }
+    public double getPartyShareRange() { return config.getDouble("Party.Sharing.Range", 75.0); }
 
     /* Party Teleport Settings */
     public int getPTPCommandCooldown() { return config.getInt("Commands.ptp.Cooldown", 30); }
     public int getPTPCommandTimeout() { return config.getInt("Commands.ptp.Request_Timeout", 300); }
     public boolean getPTPCommandConfirmRequired() { return config.getBoolean("Commands.ptp.Confirm_Required", true); }
-
-    /* Items */
-    public int getChimaeraCost() { return config.getInt("Items.Chimaera_Wing.Feather_Cost", 10); }
-    public int getChimaeraItemId() { return config.getInt("Items.Chimaera_Wing.Item_ID", 288); }
-    public boolean getChimaeraEnabled() { return config.getBoolean("Items.Chimaera_Wing.Enabled", true); }
+    public boolean getPTPCommandWorldPermissions() { return config.getBoolean("Commands.ptp.World_Based_Permissions", false); }
 
     /*
      * ABILITY SETTINGS
@@ -359,7 +368,7 @@ public class Config extends ConfigLoader {
     public double getSlimeXP() { return config.getDouble("Experience.Combat.Multiplier.Slime", 2.0); }
     public double getZombieXP() { return config.getDouble("Experience.Combat.Multiplier.Zombie", 2.0); }
     public double getPigZombieXP() { return config.getDouble("Experience.Combat.Multiplier.Pig_Zombie", 3.0); }
-    public double getEndermanXP() { return config.getDouble("Experience.Combat.Multiplier.Enderman", 2.0); }
+    public double getEndermanXP() { return config.getDouble("Experience.Combat.Multiplier.Enderman", 1.0); }
     public double getCaveSpiderXP() { return config.getDouble("Experience.Combat.Multiplier.Cave_Spider", 3.0); }
     public double getSilverfishXP() { return config.getDouble("Experience.Combat.Multiplier.Silverfish", 3.0); }
     public double getBlazeXP() { return config.getDouble("Experience.Combat.Multiplier.Blaze", 3.0); }
@@ -388,6 +397,12 @@ public class Config extends ConfigLoader {
 
     private boolean doubleDropsDisabled(String skillName) {
         ConfigurationSection section = config.getConfigurationSection("Double_Drops." + skillName);
+
+        if (section == null) {
+            mcMMO.p.getLogger().warning("The configuration files are outdated!"); //TODO Locale and more descriptive message!
+            return false;
+        }
+
         Set<String> keys = section.getKeys(false);
 
         boolean disabled = true;
@@ -406,10 +421,4 @@ public class Config extends ConfigLoader {
         int cap = config.getInt(configString, 0);
         return ((cap <= 0) ? Integer.MAX_VALUE : cap);
     }
-    
-    /* Party Settings */
-    public boolean getExpShareEnabled() { return config.getBoolean("Party.Sharing.ExpShare_enabled", true); }
-    public double getPartyShareBonus() { return config.getDouble("Party.Sharing.ExpShare_bonus", 1.1); }
-    public boolean getItemShareEnabled() { return config.getBoolean("Party.Sharing.ItemShare_enabled", true); }
-    public double getPartyShareRange() { return config.getDouble("Party.Sharing.Range", 75.0); }
 }

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

@@ -59,7 +59,7 @@ public abstract class ConfigLoader {
             }
         }
         else {
-            plugin.getLogger().severe("Missing ressource file: '" + fileName + "' please notify the plugin authors");
+            plugin.getLogger().severe("Missing resource file: '" + fileName + "' please notify the plugin authors");
         }
     }
 

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

@@ -473,44 +473,66 @@ public final class Database {
     public static Map<String, Integer> readSQLRank(String playerName) {
         ResultSet resultSet;
         Map<String, Integer> skills = new HashMap<String, Integer>();
+
         if (checkConnected()) {
             try {
                 for (SkillType skillType: SkillType.values()) {
-                    if (skillType.isChildSkill()) continue;
-                    String sql;
-                    if (skillType != SkillType.ALL) {
-                        sql = "SELECT COUNT(*) AS rank FROM " + tablePrefix + "users JOIN " + tablePrefix + "skills ON user_id = id WHERE " + skillType.name().toLowerCase() + " > 0 AND " + skillType.name().toLowerCase() + " > (SELECT " + skillType.name().toLowerCase() + " FROM " + tablePrefix + "users JOIN " + tablePrefix + "skills ON user_id = id WHERE user = '" + playerName + "')";
-                    }
-                    else {
-                        sql = "SELECT COUNT(*) AS rank FROM " + tablePrefix + "users JOIN " + tablePrefix + "skills ON user_id = id WHERE taming+mining+woodcutting+repair+unarmed+herbalism+excavation+archery+swords+axes+acrobatics+fishing > 0 AND taming+mining+woodcutting+repair+unarmed+herbalism+excavation+archery+swords+axes+acrobatics+fishing > (SELECT taming+mining+woodcutting+repair+unarmed+herbalism+excavation+archery+swords+axes+acrobatics+fishing FROM " + tablePrefix + "users JOIN " + tablePrefix + "skills ON user_id = id WHERE user = '" + playerName + "')";
+                    if (skillType.isChildSkill()) {
+                        continue;
                     }
+
+                    String sql = "SELECT COUNT(*) AS rank FROM " + tablePrefix + "users JOIN " + tablePrefix + "skills ON user_id = id WHERE " + skillType.name().toLowerCase() + " > 0 AND " + skillType.name().toLowerCase() + " > (SELECT " + skillType.name().toLowerCase() + " FROM " + tablePrefix + "users JOIN " + tablePrefix + "skills ON user_id = id WHERE user = '" + playerName + "')";
+
                     PreparedStatement statement = connection.prepareStatement(sql);
                     resultSet = statement.executeQuery();
+
                     resultSet.next();
+
                     int rank = resultSet.getInt("rank");
-                    if (skillType != SkillType.ALL) {
-                        sql = "SELECT user, " + skillType.name().toLowerCase() + " FROM " + tablePrefix + "users JOIN " + tablePrefix + "skills ON user_id = id WHERE " + skillType.name().toLowerCase() + " > 0 AND " + skillType.name().toLowerCase() + " = (SELECT " + skillType.name().toLowerCase() + " FROM " + tablePrefix + "users JOIN " + tablePrefix + "skills ON user_id = id WHERE user = '" + playerName + "') ORDER BY user";
-                    }
-                    else {
-                        sql = "SELECT user, taming+mining+woodcutting+repair+unarmed+herbalism+excavation+archery+swords+axes+acrobatics+fishing FROM " + tablePrefix + "users JOIN " + tablePrefix + "skills ON user_id = id WHERE taming+mining+woodcutting+repair+unarmed+herbalism+excavation+archery+swords+axes+acrobatics+fishing > 0 AND taming+mining+woodcutting+repair+unarmed+herbalism+excavation+archery+swords+axes+acrobatics+fishing = (SELECT taming+mining+woodcutting+repair+unarmed+herbalism+excavation+archery+swords+axes+acrobatics+fishing FROM " + tablePrefix + "users JOIN " + tablePrefix + "skills ON user_id = id WHERE user = '" + playerName + "') ORDER BY user";
-                    }
+
+                    sql = "SELECT user, " + skillType.name().toLowerCase() + " FROM " + tablePrefix + "users JOIN " + tablePrefix + "skills ON user_id = id WHERE " + skillType.name().toLowerCase() + " > 0 AND " + skillType.name().toLowerCase() + " = (SELECT " + skillType.name().toLowerCase() + " FROM " + tablePrefix + "users JOIN " + tablePrefix + "skills ON user_id = id WHERE user = '" + playerName + "') ORDER BY user";
+
                     statement = connection.prepareStatement(sql);
                     resultSet = statement.executeQuery();
+
                     while (resultSet.next()) {
                         if (resultSet.getString("user").equalsIgnoreCase(playerName)) {
                             skills.put(skillType.name(), rank + resultSet.getRow());
                             break;
                         }
                     }
+
                     statement.close();
                 }
 
+                String sql = "SELECT COUNT(*) AS rank FROM " + tablePrefix + "users JOIN " + tablePrefix + "skills ON user_id = id WHERE taming+mining+woodcutting+repair+unarmed+herbalism+excavation+archery+swords+axes+acrobatics+fishing > 0 AND taming+mining+woodcutting+repair+unarmed+herbalism+excavation+archery+swords+axes+acrobatics+fishing > (SELECT taming+mining+woodcutting+repair+unarmed+herbalism+excavation+archery+swords+axes+acrobatics+fishing FROM " + tablePrefix + "users JOIN " + tablePrefix + "skills ON user_id = id WHERE user = '" + playerName + "')";
 
+                PreparedStatement statement = connection.prepareStatement(sql);
+                resultSet = statement.executeQuery();
+
+                resultSet.next();
+
+                int rank = resultSet.getInt("rank");
+
+                sql = "SELECT user, taming+mining+woodcutting+repair+unarmed+herbalism+excavation+archery+swords+axes+acrobatics+fishing FROM " + tablePrefix + "users JOIN " + tablePrefix + "skills ON user_id = id WHERE taming+mining+woodcutting+repair+unarmed+herbalism+excavation+archery+swords+axes+acrobatics+fishing > 0 AND taming+mining+woodcutting+repair+unarmed+herbalism+excavation+archery+swords+axes+acrobatics+fishing = (SELECT taming+mining+woodcutting+repair+unarmed+herbalism+excavation+archery+swords+axes+acrobatics+fishing FROM " + tablePrefix + "users JOIN " + tablePrefix + "skills ON user_id = id WHERE user = '" + playerName + "') ORDER BY user";
+
+                statement = connection.prepareStatement(sql);
+                resultSet = statement.executeQuery();
+
+                while (resultSet.next()) {
+                    if (resultSet.getString("user").equalsIgnoreCase(playerName)) {
+                        skills.put("ALL", rank + resultSet.getRow());
+                        break;
+                    }
+                }
+
+                statement.close();
             }
             catch (SQLException ex) {
                 printErrors(ex);
             }
         }
+
         return skills;
     }
 

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

@@ -1,19 +1,25 @@
-package com.gmail.nossr50.util;
+package com.gmail.nossr50.database;
 
 import java.io.BufferedReader;
 import java.io.FileReader;
+import java.io.FileWriter;
+import java.io.IOException;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.Comparator;
 import java.util.HashMap;
 import java.util.List;
 
+import org.bukkit.Bukkit;
+
 import com.gmail.nossr50.mcMMO;
-import com.gmail.nossr50.datatypes.PlayerStat;
+import com.gmail.nossr50.config.Config;
 import com.gmail.nossr50.skills.utilities.SkillType;
+import com.gmail.nossr50.util.Misc;
 
 public final class Leaderboard {
     private static HashMap<SkillType, List<PlayerStat>> playerStatHash = new HashMap<SkillType, List<PlayerStat>>();
+    private static List<PlayerStat> powerLevels = new ArrayList<PlayerStat>();
     private static long lastUpdate = 0;
 
     private Leaderboard() {}
@@ -29,7 +35,7 @@ public final class Leaderboard {
         lastUpdate = System.currentTimeMillis(); //Log when the last update was run
 
         //Initialize lists
-        List<PlayerStat> mining, woodcutting, herbalism, excavation, acrobatics, repair, swords, axes, archery, unarmed, taming, fishing, powerlevel;
+        List<PlayerStat> mining, woodcutting, herbalism, excavation, acrobatics, repair, swords, axes, archery, unarmed, taming, fishing;
 
         mining = new ArrayList<PlayerStat>();
         woodcutting = new ArrayList<PlayerStat>();
@@ -43,7 +49,7 @@ public final class Leaderboard {
         unarmed = new ArrayList<PlayerStat>();
         taming = new ArrayList<PlayerStat>();
         fishing = new ArrayList<PlayerStat>();
-        powerlevel = new ArrayList<PlayerStat>();
+        powerLevels = new ArrayList<PlayerStat>();
 
         //Read from the FlatFile database and fill our arrays with information
         try {
@@ -125,7 +131,7 @@ public final class Leaderboard {
                     powerLevel += Integer.valueOf(character[34]);
                 }
 
-                powerlevel.add(new PlayerStat(p, powerLevel));
+                powerLevels.add(new PlayerStat(p, powerLevel));
             }
             in.close();
         }
@@ -146,7 +152,7 @@ public final class Leaderboard {
         Collections.sort(acrobatics, c);
         Collections.sort(taming, c);
         Collections.sort(fishing, c);
-        Collections.sort(powerlevel, c);
+        Collections.sort(powerLevels, c);
 
         playerStatHash.put(SkillType.MINING, mining);
         playerStatHash.put(SkillType.WOODCUTTING, woodcutting);
@@ -160,7 +166,6 @@ public final class Leaderboard {
         playerStatHash.put(SkillType.ACROBATICS, acrobatics);
         playerStatHash.put(SkillType.TAMING, taming);
         playerStatHash.put(SkillType.FISHING, fishing);
-        playerStatHash.put(SkillType.ALL, powerlevel);
     }
 
     /**
@@ -170,43 +175,64 @@ public final class Leaderboard {
      * @param pageNumber Which page in the leaderboards to retrieve
      * @return the requested leaderboard information
      */
-    public static String[] retrieveInfo(SkillType skillType, int pageNumber) {
+    public static String[] retrieveInfo(String skillType, int pageNumber) {
         String[] info = new String[10];
+        List<PlayerStat> statsList;
 
-        List<PlayerStat> statsList = playerStatHash.get(skillType);
+        if (skillType.equalsIgnoreCase("all")) {
+            statsList = powerLevels;
+        }
+        else {
+            statsList = playerStatHash.get(SkillType.getSkill(skillType));
+        }
 
-        if(statsList != null) {
-            int destination;
+        int destination;
 
-            //How many lines to skip through
-            if (pageNumber == 1) {
-                destination = 0;
-            }
-            else {
-                destination = (pageNumber * 10) - 9;
+        // How many lines to skip through
+        if (pageNumber == 1) {
+            destination = 0;
+        }
+        else {
+            destination = (pageNumber * 10) - 9;
+        }
+
+        int currentPos = 0;
+
+        for (PlayerStat ps : statsList) {
+            if (currentPos == 10) {
+                break;
             }
 
-            int currentPos = 0;
-
-            for(PlayerStat ps : statsList) {
-                if(currentPos == 10)
-                    break;
-                if(destination > 1) {
-                    destination--;
-                    continue;
-                }
-
-                info[currentPos] = ps.name+":"+ps.statVal;
-                currentPos++;
+            if (destination > 1) {
+                destination--;
+                continue;
             }
 
-        } else {
-            info[0] = "DummyPlayer:0"; //Coming up with a better solution soon...
+            info[currentPos] = ps.name + ":" + ps.statVal;
+            currentPos++;
         }
 
         return info;
     }
 
+    public static int[] getPlayerRank(String playerName) {
+        int currentPos = 1;
+
+        if (powerLevels != null) {
+            for (PlayerStat stat : powerLevels) {
+                if (stat.name.equalsIgnoreCase(playerName)) {
+                    return new int[] {currentPos, stat.statVal};
+                }
+
+                currentPos++;
+                continue;
+            }
+            return new int[] {0, 0};
+        }
+
+        return new int[] {0, 0};
+    }
+
     public static int[] getPlayerRank(String playerName, SkillType skillType) {
         int currentPos = 1;
         List<PlayerStat> statsList = playerStatHash.get(skillType);
@@ -232,4 +258,144 @@ public final class Leaderboard {
             return (o2.statVal - o1.statVal);
         }
     }
+
+    public static boolean removeFlatFileUser(String playerName) {
+        boolean worked = false;
+
+        BufferedReader in = null;
+        FileWriter out = null;
+        String usersFilePath = mcMMO.getUsersFilePath();
+
+        try {
+            FileReader file = new FileReader(usersFilePath);
+            in = new BufferedReader(file);
+            StringBuilder writer = new StringBuilder();
+            String line = "";
+
+            while ((line = in.readLine()) != null) {
+
+                /* Write out the same file but when we get to the player we want to remove, we skip his line. */
+                if (!line.split(":")[0].equalsIgnoreCase(playerName)) {
+                    writer.append(line).append("\r\n");
+                }
+                else {
+                    System.out.println("User found, removing...");
+                    worked = true;
+                    continue; //Skip the player
+                }
+            }
+
+            out = new FileWriter(usersFilePath); //Write out the new file
+            out.write(writer.toString());
+        }
+        catch (Exception e) {
+            mcMMO.p.getLogger().severe("Exception while reading " + usersFilePath + " (Are you sure you formatted it correctly?)" + e.toString());
+        }
+        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;
+    }
+
+    
+    public static void purgePowerlessFlatfile() {
+        mcMMO.p.getLogger().info("Purging powerless users...");
+
+        int purgedUsers = 0;
+        for (PlayerStat stat : powerLevels) {
+            if (stat.statVal == 0 && removeFlatFileUser(stat.name) && !Bukkit.getOfflinePlayer(stat.name).isOnline()) {
+                purgedUsers++;
+            }
+        }
+
+        mcMMO.p.getLogger().info("Purged " + purgedUsers + " users from the database.");
+    }
+
+    public static void purgeOldFlatfile() {
+        mcMMO.p.getLogger().info("Purging old users...");
+        int purgedUsers = removeOldFlatfileUsers();
+        mcMMO.p.getLogger().info("Purged " + purgedUsers + " users from the database.");
+    }
+
+    private static int removeOldFlatfileUsers() {
+        int removedPlayers = 0;
+        long currentTime = System.currentTimeMillis();
+        long purgeTime = 2630000000L * Config.getInstance().getOldUsersCutoff();
+
+        BufferedReader in = null;
+        FileWriter out = null;
+        String usersFilePath = mcMMO.getUsersFilePath();
+
+        try {
+            FileReader file = new FileReader(usersFilePath);
+            in = new BufferedReader(file);
+            StringBuilder writer = new StringBuilder();
+            String line = "";
+
+            while ((line = in.readLine()) != null) {
+
+                /* Write out the same file but when we get to the player we want to remove, we skip his line. */
+                String[] splitLine = line.split(":");
+
+                if (splitLine.length > 37) {
+                    if (currentTime - (Misc.getLong(line.split(":")[37]) * 1000) <= purgeTime) {
+                        writer.append(line).append("\r\n");
+                    }
+                    else {
+                        System.out.println("User found, removing...");
+                        removedPlayers++;
+                        continue; //Skip the player
+                    }
+                }
+                else {
+                    writer.append(line).append("\r\n");
+                }
+            }
+
+            out = new FileWriter(usersFilePath); //Write out the new file
+            out.write(writer.toString());
+        }
+        catch (Exception e) {
+            mcMMO.p.getLogger().severe("Exception while reading " + usersFilePath + " (Are you sure you formatted it correctly?)" + e.toString());
+        }
+        finally {
+            if (in != null) {
+                try {
+                    in.close();
+                }
+                catch (IOException ex) {
+                    ex.printStackTrace();
+                }
+            }
+
+            if (out != null) {
+                try {
+                    out.close();
+                }
+                catch (IOException ex) {
+                    ex.printStackTrace();
+                }
+            }
+        }
+
+        return removedPlayers;
+    }
+
 }

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

@@ -1,4 +1,4 @@
-package com.gmail.nossr50.datatypes;
+package com.gmail.nossr50.database;
 
 public class PlayerStat {
     public String name;

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

@@ -4,30 +4,36 @@ import org.bukkit.command.Command;
 import org.bukkit.command.CommandExecutor;
 import org.bukkit.command.CommandSender;
 
-import com.gmail.nossr50.commands.CommandHelper;
 import com.gmail.nossr50.config.Config;
 import com.gmail.nossr50.database.Database;
+import com.gmail.nossr50.database.Leaderboard;
 import com.gmail.nossr50.locale.LocaleLoader;
 
 public class McpurgeCommand implements CommandExecutor{
     @Override
     public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
-        if (CommandHelper.noCommandPermissions(sender, "mcmmo.tools.mcremove")) {
-            return true;
-        }
+        switch (args.length) {
+        case 0:
+            if (Config.getInstance().getUseMySQL()) {
+                Database.purgePowerlessSQL();
 
-        if (Config.getInstance().getUseMySQL()) {
-            Database.purgePowerlessSQL();
-
-            if (Config.getInstance().getOldUsersCutoff() != -1) {
-                Database.purgeOldSQL();
+                if (Config.getInstance().getOldUsersCutoff() != -1) {
+                    Database.purgeOldSQL();
+                }
             }
-        }
-        else {
-            //TODO: Make this work for Flatfile data.
-        }
+            else {
+                Leaderboard.purgePowerlessFlatfile();
 
-        sender.sendMessage(LocaleLoader.getString("Commands.mcpurge.Success"));
-        return true;
+                if (Config.getInstance().getOldUsersCutoff() != -1) {
+                    Leaderboard.purgeOldFlatfile();
+                }
+            }
+
+            sender.sendMessage(LocaleLoader.getString("Commands.mcpurge.Success"));
+            return true;
+
+        default:
+            return false;
+        }
     }
 }

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

@@ -1,121 +1,45 @@
 package com.gmail.nossr50.database.commands;
 
-import java.io.BufferedReader;
-import java.io.FileReader;
-import java.io.FileWriter;
-import java.io.IOException;
-
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandExecutor;
 import org.bukkit.command.CommandSender;
 
-import com.gmail.nossr50.mcMMO;
-import com.gmail.nossr50.commands.CommandHelper;
 import com.gmail.nossr50.config.Config;
 import com.gmail.nossr50.database.Database;
+import com.gmail.nossr50.database.Leaderboard;
 import com.gmail.nossr50.locale.LocaleLoader;
 
 public class McremoveCommand implements CommandExecutor {
     @Override
     public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
-        String playerName;
-        String tablePrefix = Config.getInstance().getMySQLTablePrefix();
-        //String databaseName = Config.getInstance().getMySQLDatabaseName();
-        String usage = LocaleLoader.getString("Commands.Usage.1", new Object[] {"mcremove", "<" + LocaleLoader.getString("Commands.Usage.Player") + ">"});
-        String success;
-
-        if (CommandHelper.noCommandPermissions(sender, "mcmmo.tools.mcremove")) {
-            return true;
-        }
-
         switch (args.length) {
         case 1:
-            playerName = args[0];
-            success = LocaleLoader.getString("Commands.mcremove.Success", new Object[] {playerName});
-            break;
+            /* MySQL */
+            if (Config.getInstance().getUseMySQL()) {
+                String tablePrefix = Config.getInstance().getMySQLTablePrefix();
 
-        default:
-            sender.sendMessage(usage);
-            return true;
-        }
-
-        /* MySQL */
-        if (Config.getInstance().getUseMySQL()) {
-            int affected = 0;
-            affected = Database.update("DELETE FROM " + tablePrefix + "users WHERE " + tablePrefix + "users.user = '" + playerName + "'");
-
-            if (affected > 0) {
-                sender.sendMessage(success);
-            } else {
-                sender.sendMessage(LocaleLoader.getString("Commands.DoesNotExist"));
-            }
-        }
-        else {
-            if (removeFlatFileUser(playerName)) {
-                sender.sendMessage(success);
-            }
-            else {
-                sender.sendMessage(LocaleLoader.getString("Commands.DoesNotExist"));
-            }
-        }
-
-        Database.profileCleanup(playerName);
-
-        return true;
-    }
-
-    private boolean removeFlatFileUser(String playerName) {
-        boolean worked = false;
-
-        BufferedReader in = null;
-        FileWriter out = null;
-        String usersFilePath = mcMMO.getUsersFilePath();
-
-        try {
-            FileReader file = new FileReader(usersFilePath);
-            in = new BufferedReader(file);
-            StringBuilder writer = new StringBuilder();
-            String line = "";
-
-            while ((line = in.readLine()) != null) {
-
-                /* Write out the same file but when we get to the player we want to remove, we skip his line. */
-                if (!line.split(":")[0].equalsIgnoreCase(playerName)) {
-                    writer.append(line).append("\r\n");
+                if (Database.update("DELETE FROM " + tablePrefix + "users WHERE " + tablePrefix + "users.user = '" + args[0] + "'") != 0) {
+                    Database.profileCleanup(args[0]);
+                    sender.sendMessage(LocaleLoader.getString("Commands.mcremove.Success", args[0]));
                 }
                 else {
-                    System.out.println("User found, removing...");
-                    worked = true;
-                    continue; //Skip the player
+                    sender.sendMessage(LocaleLoader.getString("Commands.DoesNotExist"));
+                }
+            }
+            else {
+                if (Leaderboard.removeFlatFileUser(args[0])) {
+                    Database.profileCleanup(args[0]);
+                    sender.sendMessage(LocaleLoader.getString("Commands.mcremove.Success", args[0]));
+                }
+                else {
+                    sender.sendMessage(LocaleLoader.getString("Commands.DoesNotExist"));
                 }
             }
 
-            out = new FileWriter(usersFilePath); //Write out the new file
-            out.write(writer.toString());
-        }
-        catch (Exception e) {
-            mcMMO.p.getLogger().severe("Exception while reading " + usersFilePath + " (Are you sure you formatted it correctly?)" + e.toString());
-        }
-        finally {
-            if (in != null) {
-                try {
-                    in.close();
-                }
-                catch (IOException ex) {
-                    ex.printStackTrace();
-                }
-            }
+            return true;
 
-            if (out != null) {
-                try {
-                    out.close();
-                }
-                catch (IOException ex) {
-                    ex.printStackTrace();
-                }
-            }
+        default:
+            return false;
         }
-
-        return worked;
     }
 }

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

@@ -6,7 +6,6 @@ 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.database.runnables.SQLConversionTask;
 import com.gmail.nossr50.locale.LocaleLoader;
@@ -15,21 +14,22 @@ import com.gmail.nossr50.util.Users;
 public class MmoupdateCommand implements CommandExecutor {
     @Override
     public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
-        if (CommandHelper.noCommandPermissions(sender, "mcmmo.commands.mmoupdate")) {
+        switch (args.length) {
+        case 0:
+            sender.sendMessage(LocaleLoader.getString("Commands.mmoupdate.Start"));
+            Users.clearAll();
+            convertToMySQL();
+
+            for (Player player : mcMMO.p.getServer().getOnlinePlayers()) {
+                Users.addUser(player);
+            }
+
+            sender.sendMessage(LocaleLoader.getString("Commands.mmoupdate.Finish"));
             return true;
+
+        default:
+            return false;
         }
-
-        sender.sendMessage(LocaleLoader.getString("Commands.mmoupdate.Start"));
-        Users.clearAll();
-        convertToMySQL();
-
-        for (Player x : mcMMO.p.getServer().getOnlinePlayers()) {
-            Users.addUser(x);
-        }
-
-        sender.sendMessage(LocaleLoader.getString("Commands.mmoupdate.Finish"));
-
-        return true;
     }
 
     /**

src/main/java/com/gmail/nossr50/database/runnables/UserPurgeTask.java

@@ -2,6 +2,7 @@ package com.gmail.nossr50.database.runnables;
 
 import com.gmail.nossr50.config.Config;
 import com.gmail.nossr50.database.Database;
+import com.gmail.nossr50.database.Leaderboard;
 
 public class UserPurgeTask implements Runnable {
     @Override
@@ -14,7 +15,11 @@ public class UserPurgeTask implements Runnable {
             }
         }
         else {
-            //TODO: Make this work for Flatfile data.
+            Leaderboard.purgePowerlessFlatfile();
+
+            if (Config.getInstance().getOldUsersCutoff() != -1) {
+                Leaderboard.purgeOldFlatfile();
+            }
         }
     }
 }

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

@@ -23,6 +23,12 @@ public class McMMOPlayer {
     private PlayerProfile profile;
     private Party party;
     private Party invite;
+    private Player ptpRequest;
+    private boolean ptpEnabled = true;
+    private boolean ptpConfirmRequired = Config.getInstance().getPTPCommandConfirmRequired();
+    private long ptpTimeout;
+    private boolean partyChatMode;
+    private boolean adminChatMode;
 
     public McMMOPlayer (Player player) {
         String playerName = player.getName();
@@ -53,65 +59,69 @@ public class McMMOPlayer {
     }
 
     /**
-     * Adds Xp to the player, doesn't calculate for Xp Rate
+     * Begins an experience gain. The amount will be affected by skill modifiers, global rate, perks, and may be shared with the party
      *
-     * @param skillType The skill to add Xp to
-     * @param xp The amount of Xp to add
+     * @param skillType Skill being used
+     * @param xp Experience amount to process
      */
-    public void addXpOverride(SkillType skillType, int xp) {
-        if (skillType.equals(SkillType.ALL)) {
-            for (SkillType type : SkillType.values()) {
-                if (type.equals(SkillType.ALL) || type.isChildSkill()) {
-                    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 xp The amount of Xp to add
-     */
-    public void addXpOverrideBonus(SkillType skillType, int xp) {
-        int modifiedXp = (int) Math.floor(xp * Config.getInstance().getExperienceGainsGlobalMultiplier());
-        addXpOverride(skillType, modifiedXp);
-    }
-
-    /**
-     * Adds experience to the player, this is affected by skill modifiers, rate and permissions
-     *
-     * @param skillType The skill to add Xp to
-     * @param xp The amount of Xp to add
-     */
-    public void addXp(SkillType skillType, int xp) {
-        if (player.getGameMode() == GameMode.CREATIVE) {
+    public void beginXpGain(SkillType skillType, int xp) {
+        // Return if the experience has been shared
+        if (party != null && ShareHandler.handleXpShare(xp, this, skillType)) {
             return;
         }
 
-        if (party != null && !ShareHandler.isRunning()) {
-            // Return if the Xp has been shared
-            if (ShareHandler.handleEqualXpShare(xp, this, skillType)) {
-                return;
-            }
+        beginUnsharedXpGain(skillType, xp);
+    }
+
+    /**
+     * Begins an experience gain. The amount will be affected by skill modifiers, global rate and perks
+     *
+     * @param skillType Skill being used
+     * @param xp Experience amount to process
+     */
+    public void beginUnsharedXpGain(SkillType skillType, int xp) {
+        xp = modifyXpGain(skillType, xp);
+
+        if (xp == 0) {
+            return;
+        }
+
+        applyXpGain(skillType, xp);
+    }
+
+    /**
+     * Applies an experience gain
+     *
+     * @param skillType Skill being used
+     * @param xp Experience amount to add
+     */
+    public void applyXpGain(SkillType skillType, int xp) {
+        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);
+        }
+
+        SkillTools.xpCheckSkill(skillType, player, profile);
+    }
+
+    /**
+     * Modifies an experience gain using skill modifiers, global rate and perks
+     *
+     * @param skillType Skill being used
+     * @param xp Experience amount to process
+     * @return Modified experience
+     */
+    private int modifyXpGain(SkillType skillType, int xp) {
+        if (player.getGameMode() == GameMode.CREATIVE) {
+            return 0;
         }
 
         if ((skillType.getMaxLevel() < profile.getSkillLevel(skillType) + 1) || (Misc.getPowerLevelCap() < getPowerLevel() + 1)) {
-            return;
+            return 0;
         }
 
         xp = (int) (xp / skillType.getXpModifier() * Config.getInstance().getExperienceGainsGlobalMultiplier());
@@ -121,11 +131,11 @@ public class McMMOPlayer {
             CustomTool tool = ModChecks.getToolFromItemStack(item);
 
             if (tool != null) {
-                xp = (int) (xp * tool.getXpMultiplier());
+                xp *= tool.getXpMultiplier();
             }
         }
 
-        // TODO: find a better way to do this, if possible
+        // TODO: Too many permission checks here, is there no way to avoid that? 
         if (Permissions.xpQuadruple(player)) {
             xp *= 4;
         }
@@ -142,16 +152,7 @@ public class McMMOPlayer {
             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);
-        }
-
-        SkillTools.xpCheckSkill(skillType, player, profile);
+        return xp;
     }
 
     // Players & Profiles
@@ -170,11 +171,11 @@ public class McMMOPlayer {
 
     // Party Stuff
 
-    public void setInvite(Party invite) {
+    public void setPartyInvite(Party invite) {
         this.invite = invite;
     }
 
-    public Party getInvite() {
+    public Party getPartyInvite() {
         return invite;
     }
 
@@ -206,7 +207,71 @@ public class McMMOPlayer {
         party = null;
     }
 
-    public void removeInvite() {
+    public void removePartyInvite() {
         invite = null;
     }
+    
+    public boolean getPtpEnabled() {
+        return ptpEnabled;
+    }
+
+    public void togglePtpUse() {
+        ptpEnabled = !ptpEnabled;
+    }
+
+    public Player getPtpRequest() {
+        return ptpRequest;
+    }
+
+    public void setPtpRequest(Player ptpRequest) {
+        this.ptpRequest = ptpRequest;
+    }
+
+    public boolean hasPtpRequest() {
+        return (ptpRequest != null) ? true : false;
+    }
+
+    public void removePtpRequest() {
+        ptpRequest = null;
+    }
+
+    public boolean getPtpConfirmRequired() {
+        return ptpConfirmRequired;
+    }
+
+    public void togglePtpConfirmRequired() {
+        ptpConfirmRequired = !ptpConfirmRequired;
+    }
+
+    public long getPtpTimeout() {
+        return ptpTimeout;
+    }
+
+    public void actualizePtpTimeout() {
+        ptpTimeout = (int) (System.currentTimeMillis() / Misc.TIME_CONVERSION_FACTOR);
+    }
+
+    public boolean getAdminChatMode() {
+        return adminChatMode;
+    }
+
+    public void setAdminChat(boolean enabled) {
+        adminChatMode = enabled;
+    }
+
+    public void toggleAdminChat() {
+        adminChatMode = !adminChatMode;
+    }
+
+    public boolean getPartyChatMode() {
+        return partyChatMode;
+    }
+
+    public void setPartyChat(boolean enabled) {
+        partyChatMode = enabled;
+    }
+
+    public void togglePartyChat() {
+        partyChatMode = !partyChatMode;
+    }
 }

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

@@ -7,13 +7,9 @@ import java.io.FileWriter;
 import java.util.ArrayList;
 import java.util.HashMap;
 
-import org.bukkit.entity.Player;
-
 import com.gmail.nossr50.mcMMO;
 import com.gmail.nossr50.config.Config;
 import com.gmail.nossr50.database.Database;
-import com.gmail.nossr50.party.Party;
-import com.gmail.nossr50.party.PartyManager;
 import com.gmail.nossr50.skills.utilities.AbilityType;
 import com.gmail.nossr50.skills.utilities.SkillType;
 import com.gmail.nossr50.skills.utilities.ToolType;
@@ -23,25 +19,16 @@ import com.gmail.nossr50.spout.huds.SpoutHud;
 import com.gmail.nossr50.util.Misc;
 
 public class PlayerProfile {
-
     private String playerName;
 
     // HUD
     private SpoutHud spoutHud;
     private HudType hudType;
 
-    // Party Stuff
-    private Party party;
-    private Party invite;
-    private Player ptpRequest;
-    private boolean ptpEnabled = true;
-    private boolean ptpConfirmRequired = Config.getInstance().getPTPCommandConfirmRequired();
-
     // Toggles
     private boolean loaded;
     private boolean placedAnvil;
     private boolean placedSalvageAnvil;
-    private boolean partyChatMode, adminChatMode;
     private boolean godMode;
     private boolean greenTerraMode, treeFellerMode, superBreakerMode, gigaDrillBreakerMode, serratedStrikesMode, skullSplitterMode, berserkMode;
     private boolean greenTerraInformed = true, berserkInformed = true, skullSplitterInformed = true, gigaDrillBreakerInformed = true,
@@ -53,8 +40,6 @@ public class PlayerProfile {
     // Timestamps
     private long recentlyHurt;
     private int respawnATS;
-    private long lastSave = 0L;
-    private long ptpTimeout;
 
     // mySQL STUFF
     private int userId;
@@ -68,7 +53,6 @@ public class PlayerProfile {
 
     public PlayerProfile(String playerName, boolean addNew) {
         this.playerName = playerName;
-        party = PartyManager.getPlayerParty(playerName);
 
         if (mcMMO.spoutEnabled) {
             hudType = SpoutConfig.getInstance().defaultHudType;
@@ -82,7 +66,7 @@ public class PlayerProfile {
         }
 
         for (SkillType skillType : SkillType.values()) {
-            if (skillType != SkillType.ALL && !skillType.isChildSkill()) {
+            if (!skillType.isChildSkill()) {
                 skills.put(skillType, 0);
                 skillsXp.put(skillType, 0);
             }
@@ -307,13 +291,7 @@ public class PlayerProfile {
     }
 
     public void save() {
-        save(true);
-    }
-
-    public void save(boolean override) {
         Long timestamp = System.currentTimeMillis();
-        if (timestamp < (lastSave + ((long) Config.getInstance().getSaveInterval() * 60000)) && !override)
-            return;
 
         // If we are using mysql save to database
         if (Config.getInstance().getUseMySQL()) {
@@ -417,6 +395,7 @@ public class PlayerProfile {
                         writer.append(skills.get(SkillType.FISHING)).append(":");
                         writer.append(skillsXp.get(SkillType.FISHING)).append(":");
                         writer.append(String.valueOf(skillsDATS.get(AbilityType.BLAST_MINING))).append(":");
+                        writer.append(String.valueOf(System.currentTimeMillis() / Misc.TIME_CONVERSION_FACTOR)).append(":");
                         writer.append("\r\n");
                     }
                 }
@@ -431,7 +410,6 @@ public class PlayerProfile {
                 e.printStackTrace();
             }
         }
-        lastSave = timestamp;
     }
 
     public void addPlayer() {
@@ -478,6 +456,7 @@ public class PlayerProfile {
             out.append("0:"); // Fishing
             out.append("0:"); // FishingXp
             out.append("0:"); // Blast Mining
+            out.append(String.valueOf(System.currentTimeMillis() / Misc.TIME_CONVERSION_FACTOR)).append(":"); //LastLogin
 
             // Add more in the same format as the line above
 
@@ -554,26 +533,6 @@ public class PlayerProfile {
         this.hudType = hudType;
     }
 
-    /*
-     * Chat Stuff
-     */
-
-    public boolean getAdminChatMode() {
-        return adminChatMode;
-    }
-
-    public void toggleAdminChat() {
-        adminChatMode = !adminChatMode;
-    }
-
-    public boolean getPartyChatMode() {
-        return partyChatMode;
-    }
-
-    public void togglePartyChat() {
-        partyChatMode = !partyChatMode;
-    }
-
     /*
      * Tools
      */
@@ -944,108 +903,12 @@ public class PlayerProfile {
 
     public void setSkillXpLevel(SkillType skillType, int newValue) {
         skillsXp.put(skillType, newValue);
-        save(false);
     }
 
     public void skillUp(SkillType skillType, int newValue) {
         skills.put(skillType, skills.get(skillType) + newValue);
-        save(false);
     }
 
-    //    /**
-    //     * 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 newValue) {
-    //        if (skillType.equals(SkillType.ALL)) {
-    //            for (SkillType x : SkillType.values()) {
-    //                if (x.equals(SkillType.ALL)) {
-    //                    continue;
-    //                }
-    //
-    //                mcMMO.p.getServer().getPluginManager().callEvent(new McMMOPlayerXpGainEvent(player, x, newValue));
-    //                skillsXp.put(x, skillsXp.get(x) + newValue);
-    //            }
-    //        }
-    //        else {
-    //            mcMMO.p.getServer().getPluginManager().callEvent(new McMMOPlayerXpGainEvent(player, skillType, newValue));
-    //            skillsXp.put(skillType, skillsXp.get(skillType) + newValue);
-    //            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 newValue) {
-    //        int xp = newValue * Config.getInstance().xpGainMultiplier;
-    //        addXpOverride(skillType, xp);
-    //    }
-
-    //    /**
-    //     * 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 = partyModifier(skillType);
-    //        }
-    //
-    //        int xp = (int) (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());
-    //            }
-    //        }
-    //
-    //        //TODO: Can we make this so we do perks by doing "mcmmo.perks.xp.[multiplier]" ?
-    //        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));
-    //        skillsXp.put(skillType, skillsXp.get(skillType) + xp);
-    //        spoutHud.setLastGained(skillType);
-    //    }
-
     /**
      * Remove Xp from a skill.
      *
@@ -1057,19 +920,7 @@ public class PlayerProfile {
             return;
         }
 
-        if (skillType.equals(SkillType.ALL)) {
-            for (SkillType skill : SkillType.values()) {
-                if (skill.equals(SkillType.ALL)) {
-                    continue;
-                }
-
-                skillsXp.put(skill, skillsXp.get(skill) - xp);
-            }
-        }
-        else {
-            skillsXp.put(skillType, skillsXp.get(skillType) - xp);
-        }
-        save(false);
+        skillsXp.put(skillType, skillsXp.get(skillType) - xp);
     }
 
     /**
@@ -1083,21 +934,8 @@ public class PlayerProfile {
             return;
         }
 
-        if (skillType.equals(SkillType.ALL)) {
-            for (SkillType skill : SkillType.values()) {
-                if (skill.equals(SkillType.ALL)) {
-                    continue;
-                }
-
-                skills.put(skill, newValue);
-                skillsXp.put(skill, 0);
-            }
-        }
-        else {
-            skills.put(skillType, newValue);
-            skillsXp.put(skillType, 0);
-        }
-        save(false);
+        skills.put(skillType, newValue);
+        skillsXp.put(skillType, 0);
     }
 
     /**
@@ -1111,21 +949,8 @@ public class PlayerProfile {
             return;
         }
 
-        if (skillType == SkillType.ALL) {
-            for (SkillType skill : SkillType.values()) {
-                if (skill == SkillType.ALL || skill.isChildSkill()) {
-                    continue;
-                }
-
-                skills.put(skill, skills.get(skill) + levels);
-                skillsXp.put(skill, 0);
-            }
-        }
-        else {
-            skills.put(skillType, skills.get(skillType) + levels);
-            skillsXp.put(skillType, 0);
-        }
-        save(false);
+        skills.put(skillType, skills.get(skillType) + levels);
+        skillsXp.put(skillType, 0);
     }
 
     /**
@@ -1137,142 +962,4 @@ public class PlayerProfile {
     public int getXpToLevel(SkillType skillType) {
         return 1020 + (skills.get(skillType) *  Config.getInstance().getFormulaMultiplierCurve());
     }
-
-    //    /**
-    //     * Gets the power level of a player.
-    //     *
-    //     * @return the power level of the player
-    //     */
-    //    public int getPowerLevel() {
-    //        int powerLevel = 0;
-    //
-    //        for (SkillType type : SkillType.values()) {
-    //            if (type.getPermissions(player)) {
-    //                powerLevel += getSkillLevel(type);
-    //            }
-    //        }
-    //
-    //        return powerLevel;
-    //    }
-
-    //    /**
-    //     * Calculate the party Xp modifier.
-    //     *
-    //     * @param skillType Type of skill to check
-    //     * @return the party bonus multiplier
-    //     */
-    //    private double partyModifier(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 = getSkillLevel(skillType);
-    //
-    //                    if (leaderSkill >= playerSkill) {
-    //                        int difference = leaderSkill - playerSkill;
-    //                        bonusModifier = (difference * 0.75) / 100.0;
-    //                    }
-    //                }
-    //            }
-    //        }
-    //
-    //        return bonusModifier;
-    //    }
-
-    /*
-     * Party Stuff
-     */
-
-    public void setInvite(Party invite) {
-        this.invite = invite;
-    }
-
-    public Party getInvite() {
-        return invite;
-    }
-
-    public boolean hasPartyInvite() {
-        if (invite != null) {
-            return true;
-        }
-
-        return false;
-    }
-
-    public void setParty(Party party) {
-        this.party = party;
-        save(false);
-    }
-
-    public Party getParty() {
-        return party;
-    }
-
-    public boolean inParty() {
-        if (party != null) {
-            return true;
-        }
-
-        return false;
-    }
-
-    public void removeParty() {
-        party = null;
-        save(false);
-    }
-
-    public void removeInvite() {
-        invite = null;
-    }
-
-    /*
-     * Party Teleportation
-     */
-
-    public boolean getPtpEnabled() {
-        return ptpEnabled;
-    }
-
-    public void togglePtpUse() {
-        ptpEnabled = !ptpEnabled;
-    }
-
-    public void setPtpRequest(Player ptpRequest) {
-        this.ptpRequest = ptpRequest;
-    }
-
-    public Player getPtpRequest() {
-        return ptpRequest;
-    }
-
-    public boolean hasPtpRequest() {
-        if (ptpRequest != null) {
-            return true;
-        }
-
-        return false;
-    }
-
-    public void removePtpRequest() {
-        ptpRequest = null;
-    }
-
-    public boolean getPtpConfirmRequired() {
-        return ptpConfirmRequired;
-    }
-
-    public void togglePtpConfirmRequired() {
-        ptpConfirmRequired = !ptpConfirmRequired;
-    }
-
-    public long getPtpTimeout() {
-        return ptpTimeout;
-    }
-
-    public void actualizePtpTimeout() {
-        ptpTimeout = (int) (System.currentTimeMillis() / Misc.TIME_CONVERSION_FACTOR);
-    }
 }

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

@@ -138,13 +138,13 @@ public class BlockListener implements Listener {
         }
 
         Player player = event.getPlayer();
-        McMMOPlayer mcMMOPlayer = Users.getPlayer(player);
-        PlayerProfile profile = mcMMOPlayer.getProfile();
 
-        if (Misc.isNPCPlayer(player, mcMMOPlayer.getProfile())) {
+        if (Misc.isNPCPlayer(player)) {
             return;
         }
 
+        McMMOPlayer mcMMOPlayer = Users.getPlayer(player);
+        PlayerProfile profile = mcMMOPlayer.getProfile();
         Block block = event.getBlock();
         ItemStack heldItem = player.getItemInHand();
 
@@ -258,12 +258,12 @@ public class BlockListener implements Listener {
         }
 
         Player player = event.getPlayer();
-        PlayerProfile profile = Users.getProfile(player);
 
-        if (Misc.isNPCPlayer(player, profile)) {
+        if (Misc.isNPCPlayer(player)) {
             return;
         }
 
+        PlayerProfile profile = Users.getPlayer(player).getProfile();
         Block block = event.getBlock();
 
         /*
@@ -286,7 +286,7 @@ public class BlockListener implements Listener {
             else if (profile.getToolPreparationMode(ToolType.SHOVEL) && ItemChecks.isShovel(heldItem) && BlockChecks.canBeGigaDrillBroken(block) && Permissions.gigaDrillBreaker(player)) {
                 SkillTools.abilityCheck(player, SkillType.EXCAVATION);
             }
-            else if (profile.getToolPreparationMode(ToolType.FISTS) && heldItem.getType() == Material.AIR && (BlockChecks.canBeGigaDrillBroken(block) || block.getType().equals(Material.SNOW)) && Permissions.berserk(player)) {
+            else if (profile.getToolPreparationMode(ToolType.FISTS) && heldItem.getType() == Material.AIR && (BlockChecks.canBeGigaDrillBroken(block) || block.getType() == Material.SNOW) && Permissions.berserk(player)) {
                 SkillTools.abilityCheck(player, SkillType.UNARMED);
             }
         }
@@ -313,13 +313,13 @@ public class BlockListener implements Listener {
         }
 
         Player player = event.getPlayer();
-        McMMOPlayer mcMMOPlayer = Users.getPlayer(player);
-        PlayerProfile profile = mcMMOPlayer.getProfile();
 
-        if (Misc.isNPCPlayer(player, profile)) {
+        if (Misc.isNPCPlayer(player)) {
             return;
         }
 
+        McMMOPlayer mcMMOPlayer = Users.getPlayer(player);
+        PlayerProfile profile = mcMMOPlayer.getProfile();
         ItemStack heldItem = player.getItemInHand();
         Block block = event.getBlock();
 
@@ -344,7 +344,7 @@ public class BlockListener implements Listener {
             }
         }
         else if (profile.getAbilityMode(AbilityType.BERSERK) && SkillTools.triggerCheck(player, block, AbilityType.BERSERK)) {
-            if (heldItem.getType().equals(Material.AIR)) {
+            if (heldItem.getType() == Material.AIR) {
                 FakePlayerAnimationEvent armswing = new FakePlayerAnimationEvent(player);
                 plugin.getServer().getPluginManager().callEvent(armswing);
 
@@ -375,7 +375,7 @@ public class BlockListener implements Listener {
                         Woodcutting.beginLeafBlower(player, block);
                     }
                 }
-                else if (!heldItem.getType().equals(Material.SHEARS)) {
+                else if (!(heldItem.getType() == Material.SHEARS)) {
                     event.setInstaBreak(true);
                     Woodcutting.beginLeafBlower(player, block);
                 }

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

@@ -23,6 +23,7 @@ import org.bukkit.event.entity.EntityDamageEvent.DamageCause;
 import org.bukkit.event.entity.EntityDeathEvent;
 import org.bukkit.event.entity.EntityExplodeEvent;
 import org.bukkit.event.entity.EntityTameEvent;
+import org.bukkit.event.entity.EntityTargetEvent;
 import org.bukkit.event.entity.ExplosionPrimeEvent;
 import org.bukkit.event.entity.FoodLevelChangeEvent;
 
@@ -112,8 +113,10 @@ public class EntityListener implements Listener {
             }
 
             if (attacker instanceof Player && PartyManager.inSameParty(defendingPlayer, (Player) attacker)) {
-                event.setCancelled(true);
-                return;
+                if (!(Permissions.friendlyFire((Player) attacker) && Permissions.friendlyFire(defendingPlayer))) {
+                    event.setCancelled(true);
+                    return;
+                }
             }
         }
 
@@ -150,17 +153,13 @@ public class EntityListener implements Listener {
         if (livingEntity instanceof Player) {
             Player player = (Player) entity;
 
-            if (!player.isOnline()) {
+            if (!player.isOnline() || Misc.isNPCPlayer(player)) {
                 return;
             }
 
             McMMOPlayer mcMMOPlayer = Users.getPlayer(player);
             PlayerProfile profile = mcMMOPlayer.getProfile();
 
-            if (Misc.isNPCPlayer(player, profile)) {
-                return;
-            }
-
             /* Check for invincibility */
             if (profile.getGodMode()) {
                 event.setCancelled(true);
@@ -225,7 +224,7 @@ public class EntityListener implements Listener {
 
         SpawnReason reason = event.getSpawnReason();
 
-        if (reason.equals(SpawnReason.SPAWNER) || reason.equals(SpawnReason.SPAWNER_EGG)) {
+        if (reason == SpawnReason.SPAWNER || reason == SpawnReason.SPAWNER_EGG) {
             mcMMO.placeStore.addSpawnedMob(event.getEntity());
         }
     }
@@ -287,9 +286,8 @@ public class EntityListener implements Listener {
 
         if (entity instanceof Player) {
             Player player = (Player) entity;
-            PlayerProfile profile = Users.getProfile(player);
 
-            if (Misc.isNPCPlayer(player, profile)) {
+            if (Misc.isNPCPlayer(player)) {
                 return;
             }
 
@@ -352,4 +350,22 @@ public class EntityListener implements Listener {
         TamingManager tamingManager = new TamingManager(Users.getPlayer(player));
         tamingManager.awardTamingXP(event);
     }
+
+    @EventHandler (ignoreCancelled = true)
+    public void onEntityTarget(EntityTargetEvent event) {
+        if (event.getEntity() instanceof Tameable && event.getTarget() instanceof Player) {
+            Player player = (Player) event.getTarget();
+            Tameable tameable = (Tameable) event.getEntity();
+
+            if (Misc.isFriendlyPet(player, tameable)) {
+                // isFriendlyPet ensures that the Tameable is: Tamed, owned by a player, and the owner is in the same party
+                // So we can make some assumptions here, about our casting and our check
+                Player owner = (Player) tameable.getOwner();
+                if (!(Permissions.friendlyFire(player) && Permissions.friendlyFire(owner))) {
+                    event.setCancelled(true);
+                    return;
+                }
+            }
+        }
+    }
 }

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

@@ -119,9 +119,9 @@ public class InventoryListener implements Listener{
             ItemStack result = inventory.getResult();
     
             if (plugin.furnaceIsTracked(furnaceBlock) && result != null && ItemChecks.isSmelted(result)) {
-                McMMOPlayer mcMMOPlayer = Users.getPlayer(plugin.getFurnacePlayer(furnaceBlock));
+                McMMOPlayer mcMMOPlayer = Users.getPlayer(event.getPlayer());
 
-                if (event.getPlayer().equals(mcMMOPlayer.getPlayer())) {
+                if (mcMMOPlayer.getPlayer().equals(plugin.getFurnacePlayer(furnaceBlock))) {
                     SmeltingManager smeltingManager = new SmeltingManager(mcMMOPlayer);
                     smeltingManager.vanillaXPBoost(event);
                 }

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

@@ -2,6 +2,7 @@ package com.gmail.nossr50.listeners;
 
 import org.bukkit.Material;
 import org.bukkit.block.Block;
+import org.bukkit.entity.Entity;
 import org.bukkit.entity.LivingEntity;
 import org.bukkit.entity.Player;
 import org.bukkit.event.EventHandler;
@@ -9,10 +10,10 @@ import org.bukkit.event.EventPriority;
 import org.bukkit.event.Listener;
 import org.bukkit.event.player.AsyncPlayerChatEvent;
 import org.bukkit.event.player.PlayerChangedWorldEvent;
+import org.bukkit.event.player.PlayerCommandPreprocessEvent;
 import org.bukkit.event.player.PlayerFishEvent;
 import org.bukkit.event.player.PlayerInteractEvent;
 import org.bukkit.event.player.PlayerJoinEvent;
-import org.bukkit.event.player.PlayerLoginEvent;
 import org.bukkit.event.player.PlayerQuitEvent;
 import org.bukkit.event.player.PlayerRespawnEvent;
 import org.bukkit.inventory.ItemStack;
@@ -21,6 +22,7 @@ import com.gmail.nossr50.mcMMO;
 import com.gmail.nossr50.chat.ChatManager;
 import com.gmail.nossr50.config.AdvancedConfig;
 import com.gmail.nossr50.config.Config;
+import com.gmail.nossr50.datatypes.McMMOPlayer;
 import com.gmail.nossr50.datatypes.PlayerProfile;
 import com.gmail.nossr50.locale.LocaleLoader;
 import com.gmail.nossr50.party.Party;
@@ -35,7 +37,6 @@ import com.gmail.nossr50.skills.taming.TamingManager;
 import com.gmail.nossr50.skills.utilities.SkillTools;
 import com.gmail.nossr50.skills.utilities.SkillType;
 import com.gmail.nossr50.util.BlockChecks;
-import com.gmail.nossr50.util.ChimaeraWing;
 import com.gmail.nossr50.util.Motd;
 import com.gmail.nossr50.util.Misc;
 import com.gmail.nossr50.util.Permissions;
@@ -56,19 +57,21 @@ public class PlayerListener implements Listener {
     @EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true)
     public void onPlayerWorldChangeEvent(PlayerChangedWorldEvent event) {
         Player player = event.getPlayer();
-        PlayerProfile profile = Users.getProfile(player);
 
-        if (Misc.isNPCPlayer(player, profile)) {
+        if (Misc.isNPCPlayer(player)) {
             return;
         }
 
+        McMMOPlayer mcMMOPlayer = Users.getPlayer(player);
+        PlayerProfile profile = mcMMOPlayer.getProfile();
+
         if (profile.getGodMode() && !Permissions.mcgod(player)) {
             profile.toggleGodMode();
             player.sendMessage(LocaleLoader.getString("Commands.GodMode.Forbidden"));
         }
 
-        if (profile.inParty() && !Permissions.party(player)) {
-            profile.removeParty();
+        if (mcMMOPlayer.inParty() && !Permissions.party(player)) {
+            mcMMOPlayer.removeParty();
             player.sendMessage(LocaleLoader.getString("Party.Forbidden"));
         }
     }
@@ -86,17 +89,19 @@ public class PlayerListener implements Listener {
             return;
         }
 
-        int skillLevel = Users.getProfile(player).getSkillLevel(SkillType.FISHING);
+        McMMOPlayer mcMMOPlayer = Users.getPlayer(player);
+        int skillLevel = mcMMOPlayer.getProfile().getSkillLevel(SkillType.FISHING);
 
         switch (event.getState()) {
         case CAUGHT_FISH:
-            Fishing.beginFishing(Users.getPlayer(player), skillLevel, event);
+            Fishing.beginFishing(mcMMOPlayer, skillLevel, event);
             break;
 
         case CAUGHT_ENTITY:
-            if (skillLevel >= AdvancedConfig.getInstance().getShakeUnlockLevel() && Permissions.shakeMob(player)) {
-                //TODO: Unsafe cast?
-                Fishing.beginShakeMob(player, (LivingEntity) event.getCaught(), skillLevel);
+            Entity entity = event.getCaught();
+
+            if (entity instanceof LivingEntity && skillLevel >= AdvancedConfig.getInstance().getShakeUnlockLevel() && Permissions.shakeMob(player)) {
+                Fishing.beginShakeMob(player, (LivingEntity) entity, skillLevel);
             }
 
             break;
@@ -105,23 +110,6 @@ public class PlayerListener implements Listener {
         }
     }
 
-    /**
-     * Monitor PlayerLogin events.
-     *
-     * @param event The event to watch
-     */
-    @EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true)
-    public void onPlayerLogin(PlayerLoginEvent event) {
-        Player player = event.getPlayer();
-
-        /* We can't use the other check here because a profile hasn't been created yet.*/
-        if (player == null || player.hasMetadata("NPC")) {
-            return;
-        }
-
-        Users.addUser(player).getProfile().actualizeRespawnATS();
-    }
-
     /**
      * Monitor PlayerQuit events.
      *
@@ -148,16 +136,19 @@ public class PlayerListener implements Listener {
     public void onPlayerJoin(PlayerJoinEvent event) {
         Player player = event.getPlayer();
 
-        if (Misc.isNPCPlayer(player)) {
+        /* We can't use the other check here because a profile hasn't been created yet.*/
+        if (player == null || player.hasMetadata("NPC")) {
             return;
         }
 
+        Users.addUser(player).getProfile().actualizeRespawnATS();
+
         if (Config.getInstance().getMOTDEnabled() && Permissions.motd(player)) {
             Motd.displayAll(player);
         }
 
         if (plugin.isXPEventEnabled()) {
-            player.sendMessage(LocaleLoader.getString("XPRate.Event", new Object[] {Config.getInstance().getExperienceGainsGlobalMultiplier()}));
+            player.sendMessage(LocaleLoader.getString("XPRate.Event", Config.getInstance().getExperienceGainsGlobalMultiplier()));
         }
     }
 
@@ -168,13 +159,12 @@ public class PlayerListener implements Listener {
     @EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true)
     public void onPlayerRespawn(PlayerRespawnEvent event) {
         Player player = event.getPlayer();
-        PlayerProfile profile = Users.getProfile(player);
 
-        if (Misc.isNPCPlayer(player, profile)) {
+        if (Misc.isNPCPlayer(player)) {
             return;
         }
 
-        profile.actualizeRespawnATS();
+        Users.getPlayer(player).getProfile().actualizeRespawnATS();
     }
 
     /**
@@ -264,8 +254,6 @@ public class PlayerListener implements Listener {
                     SkillTools.activationCheck(player, SkillType.UNARMED);
                     SkillTools.activationCheck(player, SkillType.WOODCUTTING);
                 }
-
-                ChimaeraWing.activationCheck(player);
             }
 
             /* GREEN THUMB CHECK */
@@ -288,9 +276,6 @@ public class PlayerListener implements Listener {
                 SkillTools.activationCheck(player, SkillType.WOODCUTTING);
             }
 
-            /* ITEM CHECKS */
-            ChimaeraWing.activationCheck(player);
-
             break;
 
         case LEFT_CLICK_AIR:
@@ -325,14 +310,15 @@ public class PlayerListener implements Listener {
     @EventHandler(priority = EventPriority.HIGH, ignoreCancelled = true)
     public void onPlayerChat(AsyncPlayerChatEvent event) {
         Player player = event.getPlayer();
-        PlayerProfile profile = Users.getProfile(player);
 
-        if (Misc.isNPCPlayer(player, profile)) {
+        if (Misc.isNPCPlayer(player)) {
             return;
         }
 
-        if (profile.getPartyChatMode()) {
-            Party party = profile.getParty();
+        McMMOPlayer mcMMOPlayer = Users.getPlayer(player);
+
+        if (mcMMOPlayer.getPartyChatMode()) {
+            Party party = mcMMOPlayer.getParty();
 
             if (party == null) {
                 player.sendMessage(LocaleLoader.getString("Commands.Party.None"));
@@ -342,9 +328,37 @@ public class PlayerListener implements Listener {
             ChatManager.handlePartyChat(plugin, party, player.getName(), player.getDisplayName(), event.getMessage());
             event.setCancelled(true);
         }
-        else if (profile.getAdminChatMode()) {
+        else if (mcMMOPlayer.getAdminChatMode()) {
             ChatManager.handleAdminChat(plugin, player.getName(), player.getDisplayName(), event.getMessage());
             event.setCancelled(true);
         }
     }
+
+    /**
+     * Handle "ugly" aliasing /skillname commands, since setAliases doesn't work.
+     *
+     * @param event The event to watch
+     */
+    @EventHandler(priority = EventPriority.LOWEST)
+    public void onPlayerCommandPreprocess(PlayerCommandPreprocessEvent event) {
+        if (!Config.getInstance().getLocale().equalsIgnoreCase("en_US")) {
+            String message = event.getMessage();
+            String command = message.substring(1).split(" ")[0];
+            String lowerCaseCommand = command.toLowerCase();
+
+            for (SkillType skill : SkillType.values()) {
+                String commandName = skill.toString().toLowerCase();
+                String localizedName = LocaleLoader.getString(Misc.getCapitalized(commandName) + ".SkillName").toLowerCase();
+
+                if (lowerCaseCommand.equals(localizedName)) {
+                    break;
+                }
+
+                if (lowerCaseCommand.equals(commandName)) {
+                    event.setMessage(message.replace(command, localizedName));
+                    break;
+                }
+            }
+        }
+    }
 }

src/main/java/com/gmail/nossr50/locale/LocaleLoader.java

@@ -10,13 +10,13 @@ import org.bukkit.ChatColor;
 import com.gmail.nossr50.config.Config;
 
 public final class LocaleLoader {
-    private static final String BUNDLE_NAME = "com.gmail.nossr50.locale.locale";
-    private static ResourceBundle RESOURCE_BUNDLE = null;
+    private static final String BUNDLE_ROOT = "com.gmail.nossr50.locale.locale";
+    private static ResourceBundle bundle = null;
 
     private LocaleLoader() {};
 
     public static String getString(String key) {
-        return getString(key, null);
+        return getString(key, (Object[]) null);
     }
 
     /**
@@ -26,24 +26,13 @@ public final class LocaleLoader {
      * @param messageArguments Any arguments to be added to the string
      * @return The properly formatted locale string
      */
-    public static String getString(String key, Object[] messageArguments) {
+    public static String getString(String key, Object ... messageArguments) {
+        if (bundle == null) {
+            initialize();
+        }
+
         try {
-            if (RESOURCE_BUNDLE == null) {
-                Locale.setDefault(new Locale("en", "US"));
-                Locale locale = null;
-                String[] myLocale = Config.getInstance().getLocale().split("[-_ ]");
-
-                if (myLocale.length == 1) {
-                    locale = new Locale(myLocale[0]);
-                }
-                else if (myLocale.length >= 2) {
-                    locale = new Locale(myLocale[0], myLocale[1]);
-                }
-
-                RESOURCE_BUNDLE = ResourceBundle.getBundle(BUNDLE_NAME, locale);
-            }
-
-            String output = RESOURCE_BUNDLE.getString(key);
+            String output = bundle.getString(key);
 
             if (messageArguments != null) {
                 MessageFormat formatter = new MessageFormat("");
@@ -60,6 +49,30 @@ public final class LocaleLoader {
         }
     }
 
+    public static Locale getCurrentLocale() {
+        if (bundle == null) {
+            initialize();
+        }
+        return bundle.getLocale();
+    }
+
+    private static void initialize() {
+        if (bundle == null) {
+            Locale.setDefault(new Locale("en", "US"));
+            Locale locale = null;
+            String[] myLocale = Config.getInstance().getLocale().split("[-_ ]");
+
+            if (myLocale.length == 1) {
+                locale = new Locale(myLocale[0]);
+            }
+            else if (myLocale.length >= 2) {
+                locale = new Locale(myLocale[0], myLocale[1]);
+            }
+
+            bundle = ResourceBundle.getBundle(BUNDLE_ROOT, locale);
+        }
+    }
+
     private static String addColors(String input) {
         input = input.replaceAll("\\Q[[BLACK]]\\E", ChatColor.BLACK.toString());
         input = input.replaceAll("\\Q[[DARK_BLUE]]\\E", ChatColor.DARK_BLUE.toString());

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

@@ -1,47 +1,35 @@
 package com.gmail.nossr50;
 
+import java.io.BufferedReader;
 import java.io.File;
 import java.io.IOException;
+import java.io.InputStreamReader;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
+import java.util.Locale;
 
 import net.shatteredlands.shatt.backup.ZipLibrary;
 
 import org.bukkit.OfflinePlayer;
 import org.bukkit.block.Block;
 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 org.mcstats.Metrics;
+import org.mcstats.Metrics.Graph;
 
 import com.gmail.nossr50.util.blockmeta.chunkmeta.ChunkManager;
 import com.gmail.nossr50.util.blockmeta.chunkmeta.ChunkManagerFactory;
-import com.gmail.nossr50.chat.commands.ACommand;
-import com.gmail.nossr50.chat.commands.PCommand;
 import com.gmail.nossr50.commands.CommandRegistrationHelper;
-import com.gmail.nossr50.commands.admin.AddxpCommand;
-import com.gmail.nossr50.commands.admin.McgodCommand;
-import com.gmail.nossr50.commands.admin.McrefreshCommand;
-import com.gmail.nossr50.commands.admin.MmoeditCommand;
-import com.gmail.nossr50.commands.admin.SkillResetCommand;
-import com.gmail.nossr50.commands.admin.XprateCommand;
-import com.gmail.nossr50.commands.player.InspectCommand;
-import com.gmail.nossr50.commands.player.McabilityCommand;
 import com.gmail.nossr50.commands.player.MccCommand;
-import com.gmail.nossr50.commands.player.McmmoCommand;
-import com.gmail.nossr50.commands.player.McrankCommand;
-import com.gmail.nossr50.commands.player.McstatsCommand;
-import com.gmail.nossr50.commands.player.MctopCommand;
 import com.gmail.nossr50.config.AdvancedConfig;
 import com.gmail.nossr50.config.Config;
 import com.gmail.nossr50.config.HiddenConfig;
 import com.gmail.nossr50.config.TreasuresConfig;
 import com.gmail.nossr50.database.Database;
-import com.gmail.nossr50.database.commands.McpurgeCommand;
-import com.gmail.nossr50.database.commands.McremoveCommand;
-import com.gmail.nossr50.database.commands.MmoupdateCommand;
+import com.gmail.nossr50.database.Leaderboard;
 import com.gmail.nossr50.database.runnables.UserPurgeTask;
 import com.gmail.nossr50.datatypes.PlayerProfile;
 import com.gmail.nossr50.listeners.BlockListener;
@@ -50,11 +38,12 @@ import com.gmail.nossr50.listeners.HardcoreListener;
 import com.gmail.nossr50.listeners.InventoryListener;
 import com.gmail.nossr50.listeners.PlayerListener;
 import com.gmail.nossr50.listeners.WorldListener;
+import com.gmail.nossr50.locale.LocaleLoader;
 import com.gmail.nossr50.mods.config.CustomArmorConfig;
 import com.gmail.nossr50.mods.config.CustomBlocksConfig;
+import com.gmail.nossr50.mods.config.CustomEntityConfig;
 import com.gmail.nossr50.mods.config.CustomToolsConfig;
 import com.gmail.nossr50.party.PartyManager;
-import com.gmail.nossr50.party.commands.PartyCommand;
 import com.gmail.nossr50.party.commands.PtpCommand;
 import com.gmail.nossr50.runnables.MobStoreCleaner;
 import com.gmail.nossr50.runnables.SaveTimer;
@@ -63,15 +52,10 @@ import com.gmail.nossr50.skills.repair.RepairManagerFactory;
 import com.gmail.nossr50.skills.repair.Repairable;
 import com.gmail.nossr50.skills.repair.config.RepairConfigManager;
 import com.gmail.nossr50.skills.runnables.BleedTimer;
+import com.gmail.nossr50.skills.runnables.PartyAutoKick;
 import com.gmail.nossr50.skills.runnables.SkillMonitor;
 import com.gmail.nossr50.spout.SpoutConfig;
 import com.gmail.nossr50.spout.SpoutTools;
-import com.gmail.nossr50.spout.commands.MchudCommand;
-import com.gmail.nossr50.spout.commands.XplockCommand;
-import com.gmail.nossr50.util.Anniversary;
-import com.gmail.nossr50.util.Leaderboard;
-import com.gmail.nossr50.util.Metrics;
-import com.gmail.nossr50.util.Metrics.Graph;
 import com.gmail.nossr50.util.Users;
 
 public class mcMMO extends JavaPlugin {
@@ -92,7 +76,7 @@ public class mcMMO extends JavaPlugin {
 
     // Jar Stuff
     public static File mcmmo;
-
+
     // File Paths
     private static String mainDirectory;
     private static String flatFileDirectory;
@@ -112,71 +96,17 @@ public class mcMMO extends JavaPlugin {
     public void onEnable() {
         p = this;
         setupFilePaths();
+        setupSpout();
+        loadConfigFiles();
 
-        // Check for Spout
-        if (getServer().getPluginManager().isPluginEnabled("Spout")) {
-            spoutEnabled = true;
-
-            SpoutConfig.getInstance();
-            SpoutTools.setupSpoutConfigs();
-            SpoutTools.registerCustomEvent();
-            SpoutTools.preCacheFiles();
-            SpoutTools.reloadSpoutPlayers(); // Handle spout players after a /reload
-        }
-
-        // Force the loading of config files
-        Config configInstance = Config.getInstance();
-        TreasuresConfig.getInstance();
-        HiddenConfig.getInstance();
-        AdvancedConfig.getInstance();
-        PartyManager.loadParties();
-
-        List<Repairable> repairables = new ArrayList<Repairable>();
-
-        if (configInstance.getToolModsEnabled()) {
-            repairables.addAll(CustomToolsConfig.getInstance().getLoadedRepairables());
-        }
-
-        if (configInstance.getArmorModsEnabled()) {
-            repairables.addAll(CustomArmorConfig.getInstance().getLoadedRepairables());
-        }
-
-        if (configInstance.getBlockModsEnabled()) {
-            CustomBlocksConfig.getInstance();
-        }
-
-        // Load repair configs, make manager, and register them at this time
-        RepairConfigManager rManager = new RepairConfigManager(this);
-        repairables.addAll(rManager.getLoadedRepairables());
-        repairManager = RepairManagerFactory.getRepairManager(repairables.size());
-        repairManager.registerRepairables(repairables);
-
-        // Check if Repair Anvil and Salvage Anvil have different itemID's
-        if (configInstance.getSalvageAnvilId() == configInstance.getRepairAnvilId()) {
-            getLogger().warning("Can't use the same itemID for Repair/Salvage Anvils!");
-        }
-
-        if (!configInstance.getUseMySQL()) {
+        if (!Config.getInstance().getUseMySQL()) {
             Users.loadUsers();
         }
 
-        PluginManager pluginManager = getServer().getPluginManager();
-
-        // Register events
-        pluginManager.registerEvents(playerListener, this);
-        pluginManager.registerEvents(blockListener, this);
-        pluginManager.registerEvents(entityListener, this);
-        pluginManager.registerEvents(inventoryListener, this);
-        pluginManager.registerEvents(worldListener, this);
-
-        if (configInstance.getHardcoreEnabled()) {
-            pluginManager.registerEvents(hardcoreListener, this);
-        }
-
-        PluginDescriptionFile pdfFile = getDescription();
+        registerEvents();
 
         // Setup the leader boards
-        if (configInstance.getUseMySQL()) {
+        if (Config.getInstance().getUseMySQL()) {
             // TODO: Why do we have to check for a connection that hasn't be made yet? 
             Database.checkConnected();
             Database.createStructure();
@@ -189,68 +119,21 @@ public class mcMMO extends JavaPlugin {
             Users.addUser(player); // In case of reload add all users back into PlayerProfile
         }
 
-        getLogger().info("Version " + pdfFile.getVersion() + " is enabled!");
-
-        BukkitScheduler scheduler = getServer().getScheduler();
-
-        // Periodic save timer (Saves every 10 minutes by default)
-        scheduler.scheduleSyncRepeatingTask(this, new SaveTimer(), 0, configInstance.getSaveInterval() * 1200);
-        // Regen & Cooldown timer (Runs every second)
-        scheduler.scheduleSyncRepeatingTask(this, new SkillMonitor(), 0, 20);
-        // Bleed timer (Runs every two seconds)
-        scheduler.scheduleSyncRepeatingTask(this, new BleedTimer(), 0, 40);
-
-        // Old & Powerless User remover
-        int purgeInterval = Config.getInstance().getPurgeInterval();
-
-        if (purgeInterval == 0) {
-            scheduler.scheduleSyncDelayedTask(this, new UserPurgeTask(), 40); // Start 2 seconds after startup.
-        }
-        else if (purgeInterval > 0) {
-            scheduler.scheduleSyncRepeatingTask(this, new UserPurgeTask(), 0, purgeInterval * 60L * 60L * 20L);
-        }
+        getLogger().info("Version " + getDescription().getVersion() + " is enabled!");
 
+        scheduleTasks();
         registerCommands();
-
-        if (configInstance.getStatsTrackingEnabled()) {
-            try {
-                Metrics metrics = new Metrics(this);
-                Graph graph = metrics.createGraph("Percentage of servers using timings");
-
-                if (pluginManager.useTimings()) {
-                    graph.addPlotter(new Metrics.Plotter("Enabled") {
-                        @Override
-                        public int getValue() {
-                            return 1;
-                        }
-                    });
-                }
-                else {
-                    graph.addPlotter(new Metrics.Plotter("Disabled") {
-                        @Override
-                        public int getValue() {
-                            return 1;
-                        }
-                    });
-                }
-
-                metrics.start();
-            }
-            catch (IOException e) {
-                System.out.println("Failed to submit stats.");
-            }
-        }
+        setupMetrics();
 
         placeStore = ChunkManagerFactory.getChunkManager(); // Get our ChunkletManager
 
         new MobStoreCleaner(); // Automatically starts and stores itself
-        Anniversary.createAnniversaryFile(); // Create Anniversary files
     }
 
     /**
      * Setup the various storage file paths
      */
-    public void setupFilePaths() {
+    private void setupFilePaths() {
         mcmmo = getFile();
         mainDirectory = getDataFolder().getPath() + File.separator;
         flatFileDirectory = mainDirectory + "FlatFileStuff" + File.separator;
@@ -267,7 +150,7 @@ public class mcMMO extends JavaPlugin {
      * @return the PlayerProfile object
      */
     public PlayerProfile getPlayerProfile(String playerName) {
-        return Users.getProfile(playerName);
+        return Users.getPlayer(playerName).getProfile();
     }
 
     /**
@@ -279,7 +162,7 @@ public class mcMMO extends JavaPlugin {
      * @return the PlayerProfile object
      */
     public PlayerProfile getPlayerProfile(OfflinePlayer player) {
-        return Users.getProfile(player);
+        return Users.getPlayer(player.getName()).getProfile();
     }
 
     /**
@@ -314,49 +197,292 @@ public class mcMMO extends JavaPlugin {
             getLogger().severe(e.toString());
         }
 
-        Anniversary.saveAnniversaryFiles();
         getLogger().info("Was disabled."); //How informative!
     }
 
+    private void loadConfigFiles() {
+        // Force the loading of config files
+        Config configInstance = Config.getInstance();
+        TreasuresConfig.getInstance();
+        HiddenConfig.getInstance();
+        AdvancedConfig.getInstance();
+        PartyManager.loadParties();
+
+        List<Repairable> repairables = new ArrayList<Repairable>();
+
+        if (configInstance.getToolModsEnabled()) {
+            repairables.addAll(CustomToolsConfig.getInstance().getLoadedRepairables());
+        }
+
+        if (configInstance.getArmorModsEnabled()) {
+            repairables.addAll(CustomArmorConfig.getInstance().getLoadedRepairables());
+        }
+
+        if (configInstance.getBlockModsEnabled()) {
+            CustomBlocksConfig.getInstance();
+        }
+
+        if (configInstance.getEntityModsEnabled()) {
+            CustomEntityConfig.getInstance();
+        }
+
+        // Load repair configs, make manager, and register them at this time
+        RepairConfigManager rManager = new RepairConfigManager(this);
+        repairables.addAll(rManager.getLoadedRepairables());
+        repairManager = RepairManagerFactory.getRepairManager(repairables.size());
+        repairManager.registerRepairables(repairables);
+
+        // Check if Repair Anvil and Salvage Anvil have different itemID's
+        if (configInstance.getSalvageAnvilId() == configInstance.getRepairAnvilId()) {
+            getLogger().warning("Can't use the same itemID for Repair/Salvage Anvils!");
+        }
+    }
+
+    private void setupSpout() {
+        // Check for Spout
+        if (getServer().getPluginManager().isPluginEnabled("Spout")) {
+            spoutEnabled = true;
+
+            SpoutConfig.getInstance();
+            SpoutTools.setupSpoutConfigs();
+            SpoutTools.registerCustomEvent();
+            SpoutTools.preCacheFiles();
+            SpoutTools.reloadSpoutPlayers(); // Handle spout players after a /reload
+        }
+    }
+
+    private void registerEvents() {
+        PluginManager pluginManager = getServer().getPluginManager();
+
+        // Register events
+        pluginManager.registerEvents(playerListener, this);
+        pluginManager.registerEvents(blockListener, this);
+        pluginManager.registerEvents(entityListener, this);
+        pluginManager.registerEvents(inventoryListener, this);
+        pluginManager.registerEvents(worldListener, this);
+
+        if (Config.getInstance().getHardcoreEnabled()) {
+            pluginManager.registerEvents(hardcoreListener, this);
+        }
+    }
+
     /**
      * Register the commands.
      */
     private void registerCommands() {
         CommandRegistrationHelper.registerSkillCommands();
-        Config configInstance = Config.getInstance();
 
         // mc* commands
-        getCommand("mcpurge").setExecutor(new McpurgeCommand());
-        getCommand("mcremove").setExecutor(new McremoveCommand());
-        getCommand("mcability").setExecutor(new McabilityCommand());
+        CommandRegistrationHelper.registerMcpurgeCommand();
+        CommandRegistrationHelper.registerMcremoveCommand();
+        CommandRegistrationHelper.registerMcabilityCommand();
         getCommand("mcc").setExecutor(new MccCommand());
-        getCommand("mcgod").setExecutor(new McgodCommand());
-        getCommand("mcmmo").setExecutor(new McmmoCommand());
-        getCommand("mcrefresh").setExecutor(new McrefreshCommand());
-        getCommand("mctop").setExecutor(new MctopCommand());
-        getCommand("mcrank").setExecutor(new McrankCommand());
-        getCommand("mcstats").setExecutor(new McstatsCommand());
+        CommandRegistrationHelper.registerMcgodCommand();
+        CommandRegistrationHelper.registerMcmmoCommand();
+        CommandRegistrationHelper.registerMcrefreshCommand();
+        CommandRegistrationHelper.registerMctopCommand();
+        CommandRegistrationHelper.registerMcrankCommand();
+        CommandRegistrationHelper.registerMcstatsCommand();
 
         // Party commands
-        getCommand("a").setExecutor(new ACommand());
-        getCommand("party").setExecutor(new PartyCommand());
-        getCommand("p").setExecutor(new PCommand(this));
+        CommandRegistrationHelper.registerAdminChatCommand();
+        CommandRegistrationHelper.registerPartyCommand();
+        CommandRegistrationHelper.registerPartyChatCommand();
         getCommand("ptp").setExecutor(new PtpCommand(this));
 
         // Other commands
-        getCommand("addxp").setExecutor(new AddxpCommand());
+        CommandRegistrationHelper.registerAddxpCommand();
         CommandRegistrationHelper.registerAddlevelsCommand();
-        getCommand("mmoedit").setExecutor(new MmoeditCommand());
-        getCommand("inspect").setExecutor(new InspectCommand());
-        getCommand("xprate").setExecutor(new XprateCommand());
-        getCommand("mmoupdate").setExecutor(new MmoupdateCommand());
-        getCommand("skillreset").setExecutor(new SkillResetCommand());
+        CommandRegistrationHelper.registerMmoeditCommand();
+        CommandRegistrationHelper.registerInspectCommand();
+        CommandRegistrationHelper.registerXprateCommand();
+        CommandRegistrationHelper.registerMmoupdateCommand();
+        CommandRegistrationHelper.registerSkillresetCommand();
 
         // Spout commands
-        getCommand("xplock").setExecutor(new XplockCommand());
-        getCommand("mchud").setExecutor(new MchudCommand());
+        CommandRegistrationHelper.registerXplockCommand();
+        CommandRegistrationHelper.registerMchudCommand();
     }
 
+    private void scheduleTasks() {
+        BukkitScheduler scheduler = getServer().getScheduler();
+
+        // Periodic save timer (Saves every 10 minutes by default)
+        scheduler.scheduleSyncRepeatingTask(this, new SaveTimer(), 0, Config.getInstance().getSaveInterval() * 1200L);
+        // Regen & Cooldown timer (Runs every second)
+        scheduler.scheduleSyncRepeatingTask(this, new SkillMonitor(), 0, 20);
+        // Bleed timer (Runs every two seconds)
+        scheduler.scheduleSyncRepeatingTask(this, new BleedTimer(), 0, 40);
+
+        // Old & Powerless User remover
+        int purgeInterval = Config.getInstance().getPurgeInterval();
+
+        if (purgeInterval == 0) {
+            scheduler.scheduleSyncDelayedTask(this, new UserPurgeTask(), 40); // Start 2 seconds after startup.
+        }
+        else if (purgeInterval > 0) {
+            scheduler.scheduleSyncRepeatingTask(this, new UserPurgeTask(), 0, purgeInterval * 60L * 60L * 20L);
+        }
+
+        // Automatically remove old members from parties
+        long kickInterval = Config.getInstance().getAutoPartyKickInterval();
+
+        if (kickInterval == 0) {
+            scheduler.scheduleSyncDelayedTask(this, new PartyAutoKick(), 40); // Start 2 seconds after startup.
+        }
+        else if (kickInterval > 0) {
+            scheduler.scheduleSyncRepeatingTask(this, new PartyAutoKick(), 0, kickInterval * 60L * 60L * 20L);
+        }
+    }
+
+    private void setupMetrics() {
+        if (Config.getInstance().getStatsTrackingEnabled()) {
+            try {
+                Metrics metrics = new Metrics(this);
+
+                // Timings Graph
+                Graph timingsGraph = metrics.createGraph("Percentage of servers using timings");
+
+                if (getServer().getPluginManager().useTimings()) {
+                    timingsGraph.addPlotter(new Metrics.Plotter("Enabled") {
+                        @Override
+                        public int getValue() {
+                            return 1;
+                        }
+                    });
+                }
+                else {
+                    timingsGraph.addPlotter(new Metrics.Plotter("Disabled") {
+                        @Override
+                        public int getValue() {
+                            return 1;
+                        }
+                    });
+                }
+
+                // Donut Version Graph
+                Graph versionDonutGraph = metrics.createGraph("Donut Version");
+
+                boolean haveVersionInformation = false;
+                boolean isOfficialBuild = false;
+                String officialKey = "e14cfacdd442a953343ebd8529138680";
+
+                String version = getDescription().getVersion();
+
+                InputStreamReader isr = new InputStreamReader(getResource(".jenkins"));
+                BufferedReader br = new BufferedReader(isr);
+                char[] key = new char[32];
+                br.read(key);
+                if (officialKey.equals(String.valueOf(key))) {
+                    isOfficialBuild = true;
+                }
+
+                if (version.contains("-")) {
+                    String majorVersion = version.substring(0, version.indexOf("-"));
+                    String subVersion = "";
+                    if (isOfficialBuild) {
+                        int startIndex = version.indexOf("-");
+                        if (version.substring(startIndex + 1).contains("-")) {
+                            subVersion = version.substring(startIndex, version.indexOf("-", startIndex + 1));
+                        } else {
+                            subVersion = "-release";
+                        }
+                    } else {
+                        subVersion = "-custom";
+                    }
+
+                    version = majorVersion + "~=~" + subVersion;
+                    haveVersionInformation = true;
+                } else {
+                    haveVersionInformation = false;
+                }
+
+                if (haveVersionInformation) {
+                    versionDonutGraph.addPlotter(new Metrics.Plotter(version) {
+                        @Override
+                        public int getValue() {
+                            return 1;
+                        }
+                    });
+                }
+
+                // Official v Custom build Graph
+                Graph officialGraph = metrics.createGraph("Built by official ci");
+
+                if (isOfficialBuild) {
+                    officialGraph.addPlotter(new Metrics.Plotter("Yes") {
+                        @Override
+                        public int getValue() {
+                            return 1;
+                        }
+                    });
+                }
+                else {
+                    officialGraph.addPlotter(new Metrics.Plotter("No") {
+                        @Override
+                        public int getValue() {
+                            return 1;
+                        }
+                    });
+                }
+
+                // Chunkmeta enabled Graph
+                Graph chunkmetaGraph = metrics.createGraph("Uses Chunkmeta");
+
+                if (HiddenConfig.getInstance().getChunkletsEnabled()) {
+                    chunkmetaGraph.addPlotter(new Metrics.Plotter("Yes") {
+                        @Override
+                        public int getValue() {
+                            return 1;
+                        }
+                    });
+                }
+                else {
+                    chunkmetaGraph.addPlotter(new Metrics.Plotter("No") {
+                        @Override
+                        public int getValue() {
+                            return 1;
+                        }
+                    });
+                }
+
+                // Storage method Graph
+                Graph storageGraph = metrics.createGraph("Storage method");
+
+                if (Config.getInstance().getUseMySQL()) {
+                    storageGraph.addPlotter(new Metrics.Plotter("SQL") {
+                        @Override
+                        public int getValue() {
+                            return 1;
+                        }
+                    });
+                }
+                else {
+                    storageGraph.addPlotter(new Metrics.Plotter("Flatfile") {
+                        @Override
+                        public int getValue() {
+                            return 1;
+                        }
+                    });
+                }
+
+                // Locale Graph
+                Graph localeGraph = metrics.createGraph("Locale");
+
+                localeGraph.addPlotter(new Metrics.Plotter(LocaleLoader.getCurrentLocale().getDisplayLanguage(Locale.US)) {
+                    @Override
+                    public int getValue() {
+                        return 1;
+                    }
+                });
+
+                metrics.start();
+            }
+            catch (IOException e) {
+                System.out.println("Failed to submit stats.");
+            }
+        }
+    }
     /**
      * Add a set of values to the TNT tracker.
      *
@@ -435,5 +561,8 @@ public class mcMMO extends JavaPlugin {
     public void setXPEventEnabled(boolean enabled) {
         this.xpEventEnabled = enabled;
     }
-}
 
+    public void toggleXpEventEnabled() {
+        xpEventEnabled = !xpEventEnabled;
+    }
+}

src/main/java/com/gmail/nossr50/mods/ModChecks.java

@@ -1,14 +1,17 @@
 package com.gmail.nossr50.mods;
 
 import org.bukkit.block.Block;
+import org.bukkit.entity.Entity;
 import org.bukkit.inventory.ItemStack;
 import org.bukkit.material.MaterialData;
 
 import com.gmail.nossr50.config.Config;
 import com.gmail.nossr50.mods.config.CustomArmorConfig;
 import com.gmail.nossr50.mods.config.CustomBlocksConfig;
+import com.gmail.nossr50.mods.config.CustomEntityConfig;
 import com.gmail.nossr50.mods.config.CustomToolsConfig;
 import com.gmail.nossr50.mods.datatypes.CustomBlock;
+import com.gmail.nossr50.mods.datatypes.CustomEntity;
 import com.gmail.nossr50.mods.datatypes.CustomItem;
 import com.gmail.nossr50.mods.datatypes.CustomTool;
 
@@ -17,6 +20,7 @@ public final class ModChecks {
     private static boolean customToolsEnabled = configInstance.getToolModsEnabled();
     private static boolean customArmorEnabled = configInstance.getArmorModsEnabled();
     private static boolean customBlocksEnabled = configInstance.getBlockModsEnabled();
+    private static boolean customEntitiesEnabled = configInstance.getEntityModsEnabled();
 
     private ModChecks() {}
 
@@ -62,6 +66,19 @@ public final class ModChecks {
         return null;
     }
 
+    public static CustomEntity getCustomEntity(Entity entity) {
+        if (!CustomEntityConfig.getInstance().customEntityIds.contains(entity.getEntityId()) && !CustomEntityConfig.getInstance().customEntityTypes.contains(entity.getType())) {
+            return null;
+        }
+
+        for (CustomEntity customEntity : CustomEntityConfig.getInstance().customEntities) {
+            if ((customEntity.getEntityID() == entity.getEntityId()) && (customEntity.getEntityType() == entity.getType())) {
+                return customEntity;
+            }
+        }
+
+        return null;
+    }
     /**
      * Check if a custom block is a custom block.
      *
@@ -169,4 +186,12 @@ public final class ModChecks {
 
         return false;
     }
+
+    public static boolean isCustomEntity(Entity entity) {
+        if (customEntitiesEnabled && CustomEntityConfig.getInstance().customEntityIds.contains(entity.getEntityId())) {
+            return true;
+        }
+
+        return false;
+    }
 }

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

@@ -0,0 +1,82 @@
+package com.gmail.nossr50.mods.config;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Set;
+
+import org.bukkit.configuration.ConfigurationSection;
+import org.bukkit.entity.EntityType;
+import org.bukkit.inventory.ItemStack;
+
+import com.gmail.nossr50.config.ConfigLoader;
+import com.gmail.nossr50.mods.datatypes.CustomEntity;
+
+public class CustomEntityConfig extends ConfigLoader {
+    private static CustomEntityConfig instance;
+    public List<Integer> customEntityIds = new ArrayList<Integer>();
+    public List<Integer> customHostileEntityIds = new ArrayList<Integer>();
+    public List<Integer> customNeutralEntityIds = new ArrayList<Integer>();
+    public List<Integer> customPassiveEntityIds = new ArrayList<Integer>();
+    public List<EntityType> customEntityTypes = new ArrayList<EntityType>();
+    public List<CustomEntity> customEntities = new ArrayList<CustomEntity>();
+
+    public CustomEntityConfig() {
+        super("ModConfigs", "entities.yml");
+        loadKeys();
+    }
+
+    public static CustomEntityConfig getInstance() {
+        if (instance == null) {
+            instance = new CustomEntityConfig();
+        }
+
+        return instance;
+    }
+
+    @Override
+    protected void loadKeys() {
+        loadMobs("Hostile", customHostileEntityIds);
+        loadMobs("Neutral", customNeutralEntityIds);
+        loadMobs("Passive", customPassiveEntityIds);
+    }
+
+    private void loadMobs(String entityType, List<Integer> entityIdList) {
+        ConfigurationSection entitySection = config.getConfigurationSection(entityType);
+
+        if (entitySection == null) {
+            return;
+        }
+
+        Set<String> entityConfigSet = entitySection.getKeys(false);
+
+        for (String entityName : entityConfigSet) {
+            int id = config.getInt(entityType + "." + entityName + ".ID", 0);
+            EntityType type = EntityType.fromId(id);
+            double xpMultiplier = config.getDouble(entityType + "." + entityName + ".XP_Multiplier", 1.0D);
+            boolean canBeTamed = config.getBoolean(entityType + "." + entityName + ".Tameable", false);
+            int tamingXp = config.getInt(entityType + "." + entityName + ".Tameable.Taming_XP", 0);
+            boolean canBeSummoned = config.getBoolean(entityType + "." + entityName + ".Tameable.CanBeSummoned", false);
+            int callOfTheWildId = config.getInt(entityType + "." + entityName + ".Tameable.COTW_Material_ID", 0);
+            int callOfTheWildData = config.getInt(entityType + "." + entityName + ".Tameable.COTW_Material_Data", 0);
+            int callOfTheWildAmount = config.getInt(entityType + "." + entityName + ".Tameable.COTW_Material_Amount", 0);
+
+            CustomEntity entity;
+
+            if (id == 0) {
+                plugin.getLogger().warning("Missing ID. This block will be skipped.");
+                continue;
+            }
+
+            if (canBeSummoned && (callOfTheWildId == 0 || callOfTheWildAmount == 0)) {
+                plugin.getLogger().warning("Incomplete Call of the Wild information. This enitity will not be able to be summoned by Call of the Wild.");
+                canBeSummoned = false;
+            }
+
+            entity = new CustomEntity(id, type, xpMultiplier, canBeTamed, tamingXp, canBeSummoned, new ItemStack(callOfTheWildId, callOfTheWildData), callOfTheWildAmount);
+
+            entityIdList.add(id);
+            customEntityTypes.add(type);
+            customEntities.add(entity);
+        }
+    }
+}

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

@@ -0,0 +1,94 @@
+package com.gmail.nossr50.mods.datatypes;
+
+import org.bukkit.entity.EntityType;
+import org.bukkit.inventory.ItemStack;
+
+public class CustomEntity {
+    private int entityID;
+    private EntityType entityType;
+    private double xpMultiplier;
+
+    private boolean canBeTamed;
+    private int tamingXP;
+
+    private boolean canBeSummoned;
+    private ItemStack callOfTheWildItem;
+    private int callOfTheWildAmount;
+
+    public CustomEntity(int entityID, EntityType entityType, double xpMultiplier, boolean canBeTamed, int tamingXP, boolean canBeSummoned, ItemStack callOfTheWildItem, int callOfTheWildAmount) {
+        this.entityID = entityID;
+        this.entityType = entityType;
+        this.xpMultiplier = xpMultiplier;
+
+        this.canBeTamed = canBeTamed;
+        this.tamingXP = tamingXP;
+
+        this.canBeSummoned = canBeSummoned;
+        this.callOfTheWildItem = callOfTheWildItem;
+        this.callOfTheWildAmount = callOfTheWildAmount;
+    }
+
+    public int getEntityID() {
+        return entityID;
+    }
+
+    public void setEntityID(int entityID) {
+        this.entityID = entityID;
+    }
+
+    public EntityType getEntityType() {
+        return entityType;
+    }
+
+    public void setEntityType(EntityType entityType) {
+        this.entityType = entityType;
+    }
+
+    public double getXpMultiplier() {
+        return xpMultiplier;
+    }
+
+    public void setXpMultiplier(double xpMultiplier) {
+        this.xpMultiplier = xpMultiplier;
+    }
+
+    public boolean isCanBeTamed() {
+        return canBeTamed;
+    }
+
+    public void setCanBeTamed(boolean canBeTamed) {
+        this.canBeTamed = canBeTamed;
+    }
+
+    public int getTamingXP() {
+        return tamingXP;
+    }
+
+    public void setTamingXP(int tamingXP) {
+        this.tamingXP = tamingXP;
+    }
+
+    public boolean isCanBeSummoned() {
+        return canBeSummoned;
+    }
+
+    public void setCanBeSummoned(boolean canBeSummoned) {
+        this.canBeSummoned = canBeSummoned;
+    }
+
+    public ItemStack getCallOfTheWildItem() {
+        return callOfTheWildItem;
+    }
+
+    public void setCallOfTheWildItem(ItemStack callOfTheWildItem) {
+        this.callOfTheWildItem = callOfTheWildItem;
+    }
+
+    public int getCallOfTheWildAmount() {
+        return callOfTheWildAmount;
+    }
+
+    public void setCallOfTheWildAmount(int callOfTheWildAmount) {
+        this.callOfTheWildAmount = callOfTheWildAmount;
+    }
+}

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

@@ -8,7 +8,9 @@ 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.datatypes.McMMOPlayer;
+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.util.Misc;
 import com.gmail.nossr50.util.Users;
@@ -27,15 +29,15 @@ public final class PartyManager {
      * @return true if they are in the same party, false otherwise
      */
     public static boolean inSameParty(Player firstPlayer, Player secondPlayer) {
-        PlayerProfile firstProfile = Users.getProfile(firstPlayer);
-        PlayerProfile secondProfile = Users.getProfile(secondPlayer);
+        McMMOPlayer firstMcMMOPlayer = Users.getPlayer(firstPlayer);
+        McMMOPlayer secondMcMMOPlayer = Users.getPlayer(secondPlayer);
 
-        if (firstProfile == null || secondProfile == null) {
+        if (firstMcMMOPlayer == null || secondMcMMOPlayer == null) {
             return false;
         }
 
-        Party firstParty = firstProfile.getParty();
-        Party secondParty = secondProfile.getParty();
+        Party firstParty = firstMcMMOPlayer.getParty();
+        Party secondParty = secondMcMMOPlayer.getParty();
 
         if (firstParty == null || secondParty == null || firstParty != secondParty) {
             return false;
@@ -72,7 +74,7 @@ public final class PartyManager {
     private static 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}));
+                member.sendMessage(LocaleLoader.getString("Party.InformedOnJoin", playerName));
             }
         }
     }
@@ -86,7 +88,7 @@ public final class PartyManager {
     private static 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}));
+                member.sendMessage(LocaleLoader.getString("Party.InformedOnQuit", playerName));
             }
         }
     }
@@ -98,7 +100,7 @@ public final class PartyManager {
      * @return all the players in the player's party
      */
     public static List<String> getAllMembers(Player player) {
-        Party party = Users.getProfile(player).getParty();
+        Party party = Users.getPlayer(player).getParty();
 
         if (party == null) {
             return null;
@@ -197,10 +199,10 @@ public final class PartyManager {
             informPartyMembersQuit(playerName, party);
         }
 
-        PlayerProfile playerProfile = Users.getProfile(playerName);
-
-        if (playerProfile != null) {
-            playerProfile.removeParty();
+        McMMOPlayer mcMMOPlayer = Users.getPlayer(playerName);
+ 
+        if (mcMMOPlayer != null) {
+            mcMMOPlayer.removeParty();
         }
     }
 
@@ -213,10 +215,11 @@ public final class PartyManager {
         List<String> members = party.getMembers();
 
         for (String member : party.getMembers()) {
-            PlayerProfile playerProfile = Users.getProfile(member);
 
-            if (playerProfile != null) {
-                playerProfile.removeParty();
+            McMMOPlayer mcMMOPlayer = Users.getPlayer(member);
+
+            if (mcMMOPlayer != null) {
+                mcMMOPlayer.removeParty();
             }
         }
 
@@ -230,11 +233,11 @@ public final class PartyManager {
      * Create a new party
      *
      * @param player The player to add to the party
-     * @param playerProfile The profile of the player to add to the party
+     * @param mcMMOPlayer 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
+     * @param password The password for this party, null if there was no password
      */
-    public static void createParty(Player player, PlayerProfile playerProfile, String partyName, String password) {
+    public static void createParty(Player player, McMMOPlayer mcMMOPlayer, String partyName, String password) {
         partyName = partyName.replace(".", "");
         Party party = getParty(partyName);
         String playerName = player.getName();
@@ -250,7 +253,7 @@ public final class PartyManager {
             if (password != null) {
                 party.setPassword(password);
                 party.setLocked(true);
-                player.sendMessage(LocaleLoader.getString("Party.Password.Set", new Object[] {password}));
+                player.sendMessage(LocaleLoader.getString("Party.Password.Set", password));
             }
             parties.add(party);
         }
@@ -259,19 +262,19 @@ public final class PartyManager {
             return;
         }
 
-        player.sendMessage(LocaleLoader.getString("Commands.Party.Create", new Object[] {party.getName()}));
-        addToParty(player.getName(), playerProfile, party);
+        player.sendMessage(LocaleLoader.getString("Commands.Party.Create", party.getName()));
+        addToParty(player.getName(), mcMMOPlayer, party);
     }
 
     /**
      * 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 mcMMOPlayer 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 static void joinParty(Player player, PlayerProfile playerProfile, String partyName, String password) {
+    public static void joinParty(Player player, McMMOPlayer mcMMOPlayer, String partyName, String password) {
         partyName = partyName.replace(".", "");
         Party party = getParty(partyName);
         String playerName = player.getName();
@@ -289,12 +292,12 @@ public final class PartyManager {
 
             parties.add(party);
         }
-        else if (!checkJoinability(player, party, password)) {
+        else if (!checkPartyPassword(player, party, password)) {
             return;
         }
 
-        player.sendMessage(LocaleLoader.getString("Commands.Party.Join", new Object[]{party.getName()}));
-        addToParty(player.getName(), playerProfile, party);
+        player.sendMessage(LocaleLoader.getString("Commands.Party.Join", party.getName()));
+        addToParty(player.getName(), mcMMOPlayer, party);
     }
 
     /**
@@ -305,7 +308,7 @@ public final class PartyManager {
      * @param password The password provided by the player
      * @return true if the player can join the party
      */
-    public static boolean checkJoinability(Player player, Party party, String password) {
+    public static boolean checkPartyPassword(Player player, Party party, String password) {
         //Don't care about passwords if it isn't locked
         if (party.isLocked()) {
             String partyPassword = party.getPassword();
@@ -313,7 +316,6 @@ public final class PartyManager {
             if (partyPassword != null) {
                 if (password == null) {
                     player.sendMessage(LocaleLoader.getString("Party.Password.None"));
-                    player.sendMessage(LocaleLoader.getString("Commands.Usage.3", new Object[] {"party", "join", "<" + LocaleLoader.getString("Commands.Usage.Player") + ">", "<" + LocaleLoader.getString("Commands.Usage.Password") + ">"}));
                     return false;
                 }
                 else if (!password.equals(partyPassword)) {
@@ -333,31 +335,31 @@ public final class PartyManager {
     /**
      * Accept a party invitation
      * 
-     * @param player The player to add to the party
-     * @param playerProfile The profile of the player
+     * @param Player The plaer to add to the party
+     * @param mcMMOPlayer The player to add to the party
      */
-    public static void joinInvitedParty(Player player, PlayerProfile playerProfile) {
-        Party invite = playerProfile.getInvite();
+    public static void joinInvitedParty(Player player, McMMOPlayer mcMMOPlayer) {
+        Party invite = mcMMOPlayer.getPartyInvite();
 
         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);
+        player.sendMessage(LocaleLoader.getString("Commands.Invite.Accepted", invite.getName()));
+        mcMMOPlayer.removePartyInvite();
+        addToParty(player.getName(), mcMMOPlayer, 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 mcMMOPlayer The player to add to the party
      * @param party The party
      */
-    public static void addToParty(String playerName, PlayerProfile playerProfile, Party party) {
+    public static void addToParty(String playerName, McMMOPlayer mcMMOPlayer, Party party) {
         informPartyMembersJoin(playerName, party);
-        playerProfile.setParty(party);
+        mcMMOPlayer.setParty(party);
         party.getMembers().add(playerName);
     }
 
@@ -394,7 +396,7 @@ public final class PartyManager {
                 member.sendMessage(LocaleLoader.getString("Party.Owner.NotLeader"));
             }
             else {
-                member.sendMessage(LocaleLoader.getString("Party.Owner.New", new Object[] {playerName}));
+                member.sendMessage(LocaleLoader.getString("Party.Owner.New", playerName));
             }
         }
 
@@ -402,14 +404,14 @@ public final class PartyManager {
     }
 
     /**
-     * Check if a player can invite others to their party.
+     * Check if a player can invite others to his party.
      *
      * @param player The player to check
-     * @param playerProfile The profile of the given player
+     * @param mcMMOPlayer The player to check
      * @return true if the player can invite
      */
-    public static boolean canInvite(Player player, PlayerProfile playerProfile) {
-        Party party = playerProfile.getParty();
+    public static boolean canInvite(Player player, McMMOPlayer mcMMOPlayer) {
+        Party party = mcMMOPlayer.getParty();
 
         if (party == null || (party.isLocked() && !party.getLeader().equals(player.getName()))) {
             return false;
@@ -494,4 +496,20 @@ public final class PartyManager {
             }
         }
     }
+
+    /**
+     * Handle party change event.
+     *
+     * @param player The player changing parties
+     * @param oldPartyName The name of the old party
+     * @param newPartyName The name of the new party
+     * @param reason The reason for changing parties
+     * @return true if the change event was successful, false otherwise
+     */
+    public static boolean handlePartyChangeEvent(Player player, String oldPartyName, String newPartyName, EventReason reason) {
+        McMMOPartyChangeEvent event = new McMMOPartyChangeEvent(player, oldPartyName, newPartyName, reason);
+        mcMMO.p.getServer().getPluginManager().callEvent(event);
+
+        return !event.isCancelled();
+    }
 }

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

@@ -27,8 +27,6 @@ public final class ShareHandler {
         }
     };
 
-    private static boolean running; // Used to prevent permanent sharing, McMMOPlayer.addXp() uses it
-
     private ShareHandler() {}
 
     /**
@@ -39,35 +37,37 @@ public final class ShareHandler {
      * @param skillType Skill being used
      * @return True is the xp has been shared
      */
-    public static boolean handleEqualXpShare(int xp, McMMOPlayer mcMMOPlayer, SkillType skillType) {
-        running = true;
+    public static boolean handleXpShare(int xp, McMMOPlayer mcMMOPlayer, SkillType skillType) {
         Party party = mcMMOPlayer.getParty();
 
-        if (party.getXpShareMode() == XpShareMode.EQUAL) {
+        switch (party.getXpShareMode()) {
+        case EQUAL:
             Player player = mcMMOPlayer.getPlayer();
             List<Player> nearMembers = PartyManager.getNearMembers(player, party, Config.getInstance().getPartyShareRange());
 
             if (nearMembers.isEmpty()) {
-                running = false;
                 return false;
             }
 
             double partySize = nearMembers.size() + 1;
-            double splitXp = xp / partySize * Config.getInstance().getPartyShareBonus();
+            double shareBonus = Config.getInstance().getPartyShareBonusBase() + partySize * Config.getInstance().getPartyShareBonusIncrease();
+            if (shareBonus > Config.getInstance().getPartyShareBonusCap()) {
+                shareBonus = Config.getInstance().getPartyShareBonusCap();
+            }
+            double splitXp = xp / partySize * shareBonus;
             int roundedXp = (int) Math.ceil(splitXp);
 
             for (Player member : nearMembers) {
-                Users.getPlayer(member).addXp(skillType, roundedXp);
+                Users.getPlayer(member).beginUnsharedXpGain(skillType, roundedXp);
             }
 
-            mcMMOPlayer.addXp(skillType, roundedXp);
+            mcMMOPlayer.beginUnsharedXpGain(skillType, roundedXp);
+
+            return true;
+        case NONE:
+        default:
+            return false;
         }
-
-        running = false;
-        return true;
     }
+}
 
-    public static boolean isRunning() {
-        return running;
-    }
-}

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

@@ -0,0 +1,60 @@
+package com.gmail.nossr50.party.commands;
+
+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.McMMOPlayer;
+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.Permissions;
+import com.gmail.nossr50.util.Users;
+
+public class PartyAcceptCommand implements CommandExecutor {
+    private McMMOPlayer mcMMOPlayer;
+    private Player player;
+    private Party playerParty;
+
+    @Override
+    public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
+        if (!Permissions.hasPermission(sender, "mcmmo.commands.party.accept")) {
+            sender.sendMessage(command.getPermissionMessage());
+            return true;
+        }
+
+        switch (args.length) {
+        case 1:
+            player = (Player) sender;
+            mcMMOPlayer = Users.getPlayer(player);
+
+            if (!mcMMOPlayer.hasPartyInvite()) {
+                sender.sendMessage(LocaleLoader.getString("mcMMO.NoInvites"));
+                return true;
+            }
+
+            // Changing parties
+            if (mcMMOPlayer.inParty()) {
+                playerParty = mcMMOPlayer.getParty();
+
+                if (!PartyManager.handlePartyChangeEvent(player, playerParty.getName(), mcMMOPlayer.getPartyInvite().getName(), EventReason.CHANGED_PARTIES)) {
+                    return true;
+                }
+
+                PartyManager.removeFromParty(player.getName(), playerParty);
+            }
+            else if (!PartyManager.handlePartyChangeEvent(player, null, mcMMOPlayer.getPartyInvite().getName(), EventReason.JOINED_PARTY)) {
+                return true;
+            }
+
+            PartyManager.joinInvitedParty(player, mcMMOPlayer);
+            return true;
+
+        default:
+            sender.sendMessage(LocaleLoader.getString("Commands.Usage.1", "party", "accept"));
+            return true;
+        }
+    }
+}

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

@@ -10,7 +10,7 @@ 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.PlayerProfile;
+import com.gmail.nossr50.datatypes.McMMOPlayer;
 import com.gmail.nossr50.events.party.McMMOPartyChangeEvent;
 import com.gmail.nossr50.events.party.McMMOPartyChangeEvent.EventReason;
 import com.gmail.nossr50.locale.LocaleLoader;
@@ -20,8 +20,12 @@ import com.gmail.nossr50.party.ShareHandler;
 import com.gmail.nossr50.util.Users;
 
 public class PartyCommand implements CommandExecutor {
+    private McMMOPlayer mcMMOPlayer;
     private Player player;
-    private PlayerProfile playerProfile;
+
+    private CommandExecutor partyJoinCommand = new PartyJoinCommand();
+    private CommandExecutor partyAcceptCommand = new PartyAcceptCommand();
+    private CommandExecutor partyCreateCommand = new PartyCreateCommand();
 
     @Override
     public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
@@ -33,27 +37,27 @@ public class PartyCommand implements CommandExecutor {
             return true;
         }
 
-        this.player = (Player) sender;
-        this.playerProfile = Users.getProfile(player);
+        player = (Player) sender;
+        mcMMOPlayer = Users.getPlayer(player);
 
         if (args.length < 1 || args[0].equalsIgnoreCase("info")) {
             return party();
         }
 
         if (args[0].equalsIgnoreCase("join")) {
-            return join(args);
+            return partyJoinCommand.onCommand(sender, command, label, args);
         }
         else if (args[0].equalsIgnoreCase("accept")) {
-            return accept();
+            return partyAcceptCommand.onCommand(sender, command, label, args);
         }
         else if (args[0].equalsIgnoreCase("create")) {
-            return create(args);
+            return partyCreateCommand.onCommand(sender, command, label, args);
         }
         else if (args[0].equalsIgnoreCase("?") || args[0].equalsIgnoreCase("help")) {
             return printHelp();
         }
 
-        if (playerProfile.inParty()) {
+        if (mcMMOPlayer.inParty()) {
             if (args[0].equalsIgnoreCase("quit") || args[0].equalsIgnoreCase("q") || args[0].equalsIgnoreCase("leave")) {
                 return quit();
             }
@@ -67,7 +71,7 @@ public class PartyCommand implements CommandExecutor {
                 return invite(args);
             }
             else if (args[0].equalsIgnoreCase("kick")) {
-                return kick(args[1]);
+                return kick(args);
             }
             else if (args[0].equalsIgnoreCase("disband")) {
                 return disband();
@@ -104,8 +108,8 @@ public class PartyCommand implements CommandExecutor {
     }
 
     private boolean party() {
-        if (playerProfile.inParty()) {
-            Party party = playerProfile.getParty();
+        if (mcMMOPlayer.inParty()) {
+            Party party = mcMMOPlayer.getParty();
 
             Server server = mcMMO.p.getServer();
             String leader = party.getLeader();
@@ -138,17 +142,17 @@ public class PartyCommand implements CommandExecutor {
             }
 
             player.sendMessage(LocaleLoader.getString("Commands.Party.Header"));
-            player.sendMessage(LocaleLoader.getString("Commands.Party.Status", new Object[] {party.getName(), status}));
+            player.sendMessage(LocaleLoader.getString("Commands.Party.Status", party.getName(), status));
 
             boolean xpShareEnabled = Config.getInstance().getExpShareEnabled();
             boolean itemShareEnabled = Config.getInstance().getItemShareEnabled();
 
             if (xpShareEnabled) {
-                ExpShare = LocaleLoader.getString("Commands.Party.ExpShare", new Object[] { party.getXpShareMode().toString() });
+                ExpShare = LocaleLoader.getString("Commands.Party.ExpShare", party.getXpShareMode().toString());
             }
 
             if (itemShareEnabled) {
-                ItemShare = LocaleLoader.getString("Commands.Party.ItemShare", new Object[] { itemShareMode });
+                ItemShare = LocaleLoader.getString("Commands.Party.ItemShare", itemShareMode);
             }
 
             if (xpShareEnabled && itemShareEnabled) {
@@ -160,8 +164,8 @@ public class PartyCommand implements CommandExecutor {
             }
 
             player.sendMessage(LocaleLoader.getString("Commands.Party.Members.Header"));
-            player.sendMessage(LocaleLoader.getString("Commands.Party.MembersNear", new Object[] { membersNear, membersOnline }));
-            player.sendMessage(LocaleLoader.getString("Commands.Party.Members", new Object[] {tempList}));
+            player.sendMessage(LocaleLoader.getString("Commands.Party.MembersNear", membersNear, membersOnline));
+            player.sendMessage(LocaleLoader.getString("Commands.Party.Members", tempList));
         }
         else {
             return printUsage();
@@ -169,175 +173,13 @@ public class PartyCommand implements CommandExecutor {
         return true;
     }
 
-    private boolean join(String[] args) {
-        if (CommandHelper.noCommandPermissions(player, "mcmmo.commands.party.join")) {
-            return true;
-        }
-
-        String playerName = player.getName();
-        Party party = playerProfile.getParty();
-
-        if (args.length < 2) {
-            player.sendMessage(LocaleLoader.getString("Party.Help.0"));
-            return true;
-        }
-
-        Player target = mcMMO.p.getServer().getPlayer(args[1]);
-
-        if (target == null) {
-            player.sendMessage(LocaleLoader.getString("Party.NotOnline", new Object[] {args[1]}));
-            return false;
-        }
-
-        if (!Users.getProfile(target).inParty()) {
-            player.sendMessage(LocaleLoader.getString("Party.PlayerNotInParty", new Object[] {args[1]}));
-            return false;
-        }
-
-        if (player.equals(target)) {
-            player.sendMessage(LocaleLoader.getString("Party.Join.Self"));
-            return true;
-        }
-
-        if (party != null && party.equals(Users.getProfile(target).getParty())) {
-            player.sendMessage(LocaleLoader.getString("Party.Join.Self"));
-            return true;
-        }
-
-        String password = null;
-        
-        if (args.length > 2) {
-            password = args[2];
-        }
-
-        String partyTarget = PartyManager.getPlayerParty(target.getName()).getName();
-        Party newParty = PartyManager.getParty(args[0]);
-
-        // Check to see if the party exists, and if it does, can the player join it?
-        if (newParty != null && !PartyManager.checkJoinability(player, newParty, null)) {
-            return true; // End before any event is fired.
-        }
-
-        if (party != null) {
-            McMMOPartyChangeEvent event = new McMMOPartyChangeEvent(player, party.getName(), partyTarget, EventReason.CHANGED_PARTIES);
-            mcMMO.p.getServer().getPluginManager().callEvent(event);
-
-            if (event.isCancelled()) {
-                return true;
-            }
-
-            PartyManager.removeFromParty(playerName, party);
-        }
-        else {
-            McMMOPartyChangeEvent event = new McMMOPartyChangeEvent(player, null, partyTarget, EventReason.JOINED_PARTY);
-            mcMMO.p.getServer().getPluginManager().callEvent(event);
-
-            if (event.isCancelled()) {
-                return true;
-            }
-        }
-
-        PartyManager.joinParty(player, playerProfile, partyTarget, password);
-        return true;
-    }
-
-    private boolean accept() {
-        if (CommandHelper.noCommandPermissions(player, "mcmmo.commands.party.accept")) {
-            return true;
-        }
-
-        if (playerProfile.hasPartyInvite()) {
-            if (playerProfile.inParty()) {
-                Party party = playerProfile.getParty();
-                McMMOPartyChangeEvent event = new McMMOPartyChangeEvent(player, party.getName(), playerProfile.getInvite().getName(), EventReason.CHANGED_PARTIES);
-
-                mcMMO.p.getServer().getPluginManager().callEvent(event);
-
-                if (event.isCancelled()) {
-                    return true;
-                }
-
-                PartyManager.removeFromParty(player.getName(), party);
-            }
-            else {
-                McMMOPartyChangeEvent event = new McMMOPartyChangeEvent(player, null, playerProfile.getInvite().getName(), EventReason.JOINED_PARTY);
-                mcMMO.p.getServer().getPluginManager().callEvent(event);
-
-                if (event.isCancelled()) {
-                    return true;
-                }
-            }
-
-            PartyManager.joinInvitedParty(player, playerProfile);
-        }
-        else {
-            player.sendMessage(LocaleLoader.getString("mcMMO.NoInvites"));
-        }
-
-        return true;
-    }
-
-    private boolean create(String[] args) {
-        if (CommandHelper.noCommandPermissions(player, "mcmmo.commands.party.create")) {
-            return true;
-        }
-
-        String playerName = player.getName();
-        Party party = playerProfile.getParty();
-
-        if (args.length < 2) {
-            player.sendMessage(LocaleLoader.getString("Party.Help.1"));
-            return true;
-        }
-
-        String partyname = args[1];
-        String password = null;
-
-        if (args.length > 2) {
-            password = args[2];
-        }
-
-        Party newParty = PartyManager.getParty(partyname);
-        // Check to see if the party exists, and if it does cancel creating a new party
-        if (newParty != null) {
-            player.sendMessage(LocaleLoader.getString("Commands.Party.AlreadyExists", new Object[] {partyname}));
-            return true;
-        }
-
-        if (playerProfile.inParty()) {
-            String oldPartyName = party.getName();
-            McMMOPartyChangeEvent event = new McMMOPartyChangeEvent(player, oldPartyName, partyname, EventReason.CHANGED_PARTIES);
-            mcMMO.p.getServer().getPluginManager().callEvent(event);
-
-            if (event.isCancelled()) {
-                return true;
-            }
-
-            PartyManager.removeFromParty(playerName, party);
-            PartyManager.createParty(player, playerProfile, partyname, password);
-        }
-        else {
-            McMMOPartyChangeEvent event = new McMMOPartyChangeEvent(player, null, partyname, EventReason.JOINED_PARTY);
-            mcMMO.p.getServer().getPluginManager().callEvent(event);
-
-            if (event.isCancelled()) {
-                return true;
-            }
-
-            PartyManager.createParty(player, playerProfile, partyname, password);
-            return true;
-        }
-
-        return true;
-    }
-
     private boolean quit() {
         if (CommandHelper.noCommandPermissions(player, "mcmmo.commands.party.quit")) {
             return true;
         }
 
         String playerName = player.getName();
-        Party party = playerProfile.getParty();
+        Party party = mcMMOPlayer.getParty();
 
         if (party != null) {
             McMMOPartyChangeEvent event = new McMMOPartyChangeEvent(player, party.getName(), null, EventReason.LEFT_PARTY);
@@ -361,29 +203,33 @@ public class PartyCommand implements CommandExecutor {
             return true;
         }
 
-        String playerName = player.getName();
-        PlayerProfile playerProfile = Users.getProfile(player);
-        Party party = playerProfile.getParty();
-
         if (args.length < 2) {
-            player.sendMessage(LocaleLoader.getString("Commands.Usage.2", new Object[] {"party", "expshare", "[sharemode]"}));
+            player.sendMessage(LocaleLoader.getString("Commands.Usage.2", "party", "expshare", "[NONE / EQUAL]"));
             return true;
         }
 
+        String playerName = player.getName();
+        Party party = mcMMOPlayer.getParty();
+
         if (party.getLeader().equals(playerName)) {
             if (args[1].equalsIgnoreCase("none") || args[1].equalsIgnoreCase("false")) {
                 party.setXpShareMode(ShareHandler.XpShareMode.NONE);
 
                 for (Player onlineMembers : party.getOnlineMembers()) {
-                    onlineMembers.sendMessage(LocaleLoader.getString("Commands.Party.SetSharing", new Object[] {LocaleLoader.getString("Party.ShareType.Exp"), LocaleLoader.getString("Party.ShareMode.NoShare")}));
+                    onlineMembers.sendMessage(LocaleLoader.getString("Commands.Party.SetSharing", LocaleLoader.getString("Party.ShareType.Exp"), LocaleLoader.getString("Party.ShareMode.NoShare")));
                 }
-            } else if (args[1].equalsIgnoreCase("equal") || args[1].equalsIgnoreCase("even")) {
+            }
+            else if (args[1].equalsIgnoreCase("equal") || args[1].equalsIgnoreCase("even")) {
                 party.setXpShareMode(ShareHandler.XpShareMode.EQUAL);
 
                 for (Player onlineMembers : party.getOnlineMembers()) {
-                    onlineMembers.sendMessage(LocaleLoader.getString("Commands.Party.SetSharing", new Object[] {LocaleLoader.getString("Party.ShareType.Exp"), LocaleLoader.getString("Party.ShareMode.Equal")}));
+                    onlineMembers.sendMessage(LocaleLoader.getString("Commands.Party.SetSharing", LocaleLoader.getString("Party.ShareType.Exp"), LocaleLoader.getString("Party.ShareMode.Equal")));
                 }
             }
+            else {
+                player.sendMessage(LocaleLoader.getString("Commands.Usage.2", "party", "expshare", "[NONE / EQUAL]"));
+                return true;
+            }
         }
 
         return true;
@@ -411,7 +257,7 @@ public class PartyCommand implements CommandExecutor {
 
         switch (args.length) {
         case 2:
-            if (!playerProfile.inParty()) {
+            if (!mcMMOPlayer.inParty()) {
                 player.sendMessage(LocaleLoader.getString("Commands.Party.None"));
                 return true;
             }
@@ -420,15 +266,16 @@ public class PartyCommand implements CommandExecutor {
 
             if (target != null) {
                 if (PartyManager.inSameParty(player, target)) {
-                    player.sendMessage(LocaleLoader.getString("Party.Player.InSameParty"));
+                    player.sendMessage(LocaleLoader.getString("Party.Player.InSameParty", target.getName()));
                     return true;
                 }
-                if (PartyManager.canInvite(player, playerProfile)) {
-                    Party party = playerProfile.getParty();
 
-                    Users.getProfile(target).setInvite(party);
+                if (PartyManager.canInvite(player, mcMMOPlayer)) {
+                    Party party = mcMMOPlayer.getParty();
+
+                    Users.getPlayer(target).setPartyInvite(party);
                     player.sendMessage(LocaleLoader.getString("Commands.Invite.Success"));
-                    target.sendMessage(LocaleLoader.getString("Commands.Party.Invite.0", new Object[] {party.getName(), player.getName()}));
+                    target.sendMessage(LocaleLoader.getString("Commands.Party.Invite.0", party.getName(), player.getName()));
                     target.sendMessage(LocaleLoader.getString("Commands.Party.Invite.1"));
                     return true;
                 }
@@ -441,7 +288,7 @@ public class PartyCommand implements CommandExecutor {
             return true;
 
         default:
-            player.sendMessage(LocaleLoader.getString("Commands.Usage.2", new Object[] {"party", "invite", "<" + LocaleLoader.getString("Commands.Usage.Player") + ">"}));
+            player.sendMessage(LocaleLoader.getString("Commands.Usage.2", "party", "invite", "<" + LocaleLoader.getString("Commands.Usage.Player") + ">"));
             return true;
         }
     }
@@ -449,42 +296,49 @@ public class PartyCommand implements CommandExecutor {
     /**
      * Kick a party member
      */
-    private boolean kick(String targetName) {
+    private boolean kick(String[] args) {
         if (CommandHelper.noCommandPermissions(player, "mcmmo.commands.party.kick")) {
             return true;
         }
 
-        String playerName = player.getName();
-        Party party = playerProfile.getParty();
+        switch (args.length) {
+        case 2:
+            String playerName = player.getName();
+            Party party = mcMMOPlayer.getParty();
 
-        if (party.getLeader().equals(playerName)) {
-            if (!party.getMembers().contains(targetName)) {
-                player.sendMessage(LocaleLoader.getString("Party.NotInYourParty", new Object[] {targetName}));
-                return true;
-            }
-
-            Player target = mcMMO.p.getServer().getOfflinePlayer(targetName).getPlayer();
-
-            if (target != null) {
-                String partyName = party.getName();
-                McMMOPartyChangeEvent event = new McMMOPartyChangeEvent(target, partyName, null, EventReason.KICKED_FROM_PARTY);
-
-                mcMMO.p.getServer().getPluginManager().callEvent(event);
-
-                if (event.isCancelled()) {
+            if (party.getLeader().equals(playerName)) {
+                if (!party.getMembers().contains(args[1])) {
+                    player.sendMessage(LocaleLoader.getString("Party.NotInYourParty", args[1]));
                     return true;
                 }
 
-                target.sendMessage(LocaleLoader.getString("Commands.Party.Kick", new Object[] {partyName}));
+                Player target = mcMMO.p.getServer().getOfflinePlayer(args[1]).getPlayer();
+
+                if (target != null) {
+                    String partyName = party.getName();
+                    McMMOPartyChangeEvent event = new McMMOPartyChangeEvent(target, partyName, null, EventReason.KICKED_FROM_PARTY);
+
+                    mcMMO.p.getServer().getPluginManager().callEvent(event);
+
+                    if (event.isCancelled()) {
+                        return true;
+                    }
+
+                    target.sendMessage(LocaleLoader.getString("Commands.Party.Kick", partyName));
+                }
+
+                PartyManager.removeFromParty(args[1], party);
+            }
+            else {
+                player.sendMessage(LocaleLoader.getString("Party.NotOwner"));
             }
 
-            PartyManager.removeFromParty(targetName, party);
-        }
-        else {
-            player.sendMessage(LocaleLoader.getString("Party.NotOwner"));
-        }
+            return true;
 
-        return true;
+        default:
+            player.sendMessage(LocaleLoader.getString("Commands.Usage.2", "party", "kick", "<" + LocaleLoader.getString("Commands.Usage.Player") + ">"));
+            return true;
+        }
     }
 
     /**
@@ -496,7 +350,7 @@ public class PartyCommand implements CommandExecutor {
         }
 
         String playerName = player.getName();
-        Party party = playerProfile.getParty();
+        Party party = mcMMOPlayer.getParty();
 
         if (party.getLeader().equals(playerName)) {
             for (Player onlineMembers : party.getOnlineMembers()) {
@@ -528,16 +382,16 @@ public class PartyCommand implements CommandExecutor {
         }
 
         String playerName = player.getName();
-        Party party = playerProfile.getParty();
+        Party party = mcMMOPlayer.getParty();
 
         if (args.length < 2) {
-            player.sendMessage(LocaleLoader.getString("Commands.Usage.2", new Object[] {"party", "owner", "[" + LocaleLoader.getString("Commands.Usage.Player") + "]"}));
+            player.sendMessage(LocaleLoader.getString("Commands.Usage.2", "party", "owner", "[" + LocaleLoader.getString("Commands.Usage.Player") + "]"));
             return true;
         }
 
         if (party.getLeader().equals(playerName)) {
             if (!party.getMembers().contains(args[1])) {
-                player.sendMessage(LocaleLoader.getString("Party.NotInYourParty", new Object[] {args[1]}));
+                player.sendMessage(LocaleLoader.getString("Party.NotInYourParty", args[1]));
                 return true;
             }
 
@@ -556,26 +410,25 @@ public class PartyCommand implements CommandExecutor {
         }
 
         String playerName = player.getName();
-        Party party = playerProfile.getParty();
+        Party party = mcMMOPlayer.getParty();
 
-        if (party != null) {
-            if (party.getLeader().equals(playerName)) {
-                if (party.isLocked()) {
-                    player.sendMessage(LocaleLoader.getString("Party.IsLocked"));
-                }
-                else {
-                    party.setLocked(true);
-                    player.sendMessage(LocaleLoader.getString("Party.Locked"));
-                }
-            }
-            else {
-                player.sendMessage(LocaleLoader.getString("Party.NotOwner"));
-            }
+        if (party == null) {
+            player.sendMessage("Commands.Party.None");
+            return true;
+        }
+
+        if (!party.getLeader().equals(playerName)) {
+            player.sendMessage(LocaleLoader.getString("Party.NotOwner"));
+            return true;
+        }
+
+        if (party.isLocked()) {
+            player.sendMessage(LocaleLoader.getString("Party.IsLocked"));
         }
         else {
-            player.sendMessage("Commands.Party.None");
+            party.setLocked(true);
+            player.sendMessage(LocaleLoader.getString("Party.Locked"));
         }
-
         return true;
     }
 
@@ -588,26 +441,25 @@ public class PartyCommand implements CommandExecutor {
         }
 
         String playerName = player.getName();
-        Party party = playerProfile.getParty();
+        Party party = mcMMOPlayer.getParty();
 
-        if (party != null) {
-            if (party.getLeader().equals(playerName)) {
-                if (!party.isLocked()) {
-                    player.sendMessage(LocaleLoader.getString("Party.IsntLocked"));
-                }
-                else {
-                    party.setLocked(false);
-                    player.sendMessage(LocaleLoader.getString("Party.Unlocked"));
-                }
-            }
-            else {
-                player.sendMessage(LocaleLoader.getString("Party.NotOwner"));
-            }
+        if (party == null) {
+            player.sendMessage("Commands.Party.None");
+            return true;
+        }
+
+        if (!party.getLeader().equals(playerName)) {
+            player.sendMessage(LocaleLoader.getString("Party.NotOwner"));
+            return true;
+        }
+
+        if (!party.isLocked()) {
+            player.sendMessage(LocaleLoader.getString("Party.IsntLocked"));
         }
         else {
-            player.sendMessage("Commands.Party.None");
+            party.setLocked(false);
+            player.sendMessage(LocaleLoader.getString("Party.Unlocked"));
         }
-
         return true;
     }
 
@@ -617,7 +469,7 @@ public class PartyCommand implements CommandExecutor {
         }
 
         String playerName = player.getName();
-        Party party = playerProfile.getParty();
+        Party party = mcMMOPlayer.getParty();
 
         if (!party.getLeader().equals(playerName)) {
             player.sendMessage(LocaleLoader.getString("Party.NotOwner"));
@@ -633,7 +485,7 @@ public class PartyCommand implements CommandExecutor {
 
         party.setLocked(true);
         party.setPassword(args[1]);
-        player.sendMessage(LocaleLoader.getString("Party.Password.Set", new Object[] {args[1]}));
+        player.sendMessage(LocaleLoader.getString("Party.Password.Set", args[1]));
 
         return true;
     }
@@ -647,12 +499,12 @@ public class PartyCommand implements CommandExecutor {
         }
 
         String playerName = player.getName();
-        Party party = playerProfile.getParty();
+        Party party = mcMMOPlayer.getParty();
         String leader = party.getLeader();
 
         if (party.getLeader().equals(playerName)) {
             if (args.length < 2) {
-                player.sendMessage(LocaleLoader.getString("Commands.Usage.2", new Object[] {"party", "rename", "<" + LocaleLoader.getString("Commands.Usage.PartyName") + ">"}));
+                player.sendMessage(LocaleLoader.getString("Commands.Usage.2", "party", "rename", "<" + LocaleLoader.getString("Commands.Usage.PartyName") + ">"));
                 return true;
             }
 
@@ -664,7 +516,7 @@ public class PartyCommand implements CommandExecutor {
 
                 // Check to see if the party exists, and if it does cancel renaming the party
                 if (newParty != null) {
-                    player.sendMessage(LocaleLoader.getString("Commands.Party.AlreadyExists", new Object[] {newPartyName}));
+                    player.sendMessage(LocaleLoader.getString("Commands.Party.AlreadyExists", newPartyName));
                     return true;
                 }
 
@@ -677,14 +529,14 @@ public class PartyCommand implements CommandExecutor {
                     }
 
                     if (!onlineMembers.getName().equals(leader)) {
-                        onlineMembers.sendMessage(LocaleLoader.getString("Party.InformedOnNameChange", new Object[] {leader, newPartyName}));
+                        onlineMembers.sendMessage(LocaleLoader.getString("Party.InformedOnNameChange", leader, newPartyName));
                     }
                 }
 
                 party.setName(newPartyName);
             }
 
-            player.sendMessage(LocaleLoader.getString("Commands.Party.Rename", new Object[] {newPartyName}));
+            player.sendMessage(LocaleLoader.getString("Commands.Party.Rename", newPartyName));
         }
         else {
             player.sendMessage(LocaleLoader.getString("Party.NotOwner"));

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

@@ -0,0 +1,71 @@
+package com.gmail.nossr50.party.commands;
+
+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.McMMOPlayer;
+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.Permissions;
+import com.gmail.nossr50.util.Users;
+
+public class PartyCreateCommand implements CommandExecutor {
+    private McMMOPlayer mcMMOPlayer;
+    private Player player;
+    private Party playerParty;
+
+    @Override
+    public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
+        if (!Permissions.hasPermission(sender, "mcmmo.commands.party.create")) {
+            sender.sendMessage(command.getPermissionMessage());
+            return true;
+        }
+
+        switch (args.length) {
+        case 2:
+        case 3:
+            Party newParty = PartyManager.getParty(args[1]);
+
+            // Check to see if the party exists, and if it does cancel creating a new party
+            if (newParty != null) {
+                player.sendMessage(LocaleLoader.getString("Commands.Party.AlreadyExists", args[1]));
+                return true;
+            }
+
+            player = (Player) sender;
+            mcMMOPlayer = Users.getPlayer(player);
+
+            // Changing parties
+            if (mcMMOPlayer.inParty()) {
+                playerParty = mcMMOPlayer.getParty();
+                if (!PartyManager.handlePartyChangeEvent(player, playerParty.getName(), args[1], EventReason.CHANGED_PARTIES)) {
+                    return true;
+                }
+
+                PartyManager.removeFromParty(player.getName(), playerParty);
+            }
+            else if (!PartyManager.handlePartyChangeEvent(player, null, args[1], EventReason.JOINED_PARTY)) {
+                return true;
+            }
+
+            PartyManager.createParty(player, mcMMOPlayer, args[1], getPassword(args));
+            return true;
+
+        default:
+            sender.sendMessage(LocaleLoader.getString("Commands.Usage.3", "party", "create", "<" + LocaleLoader.getString("Commands.Usage.PartyName") + ">", "[" + LocaleLoader.getString("Commands.Usage.Password") + "]"));
+            return true;
+        }
+    }
+
+    private String getPassword(String[] args) {
+        if (args.length == 3) {
+            return args[2];
+        }
+
+        return null;
+    }
+}

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

@@ -0,0 +1,113 @@
+package com.gmail.nossr50.party.commands;
+
+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.McMMOPlayer;
+import com.gmail.nossr50.datatypes.PlayerProfile;
+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.Permissions;
+import com.gmail.nossr50.util.Users;
+
+public class PartyJoinCommand implements CommandExecutor {
+    private McMMOPlayer mcMMOTarget;
+    private Player target;
+    private Party targetParty;
+
+    private McMMOPlayer mcMMOPlayer;
+    private Player player;
+    private Party playerParty;
+
+    @Override
+    public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
+        if (!Permissions.hasPermission(sender, "mcmmo.commands.party.join")) {
+            sender.sendMessage(command.getPermissionMessage());
+            return true;
+        }
+
+        switch (args.length) {
+        case 2:
+        case 3:
+            // Verify target exists and is in a different party than the player
+            if (!canJoinParty(sender, args[1])) {
+                return true;
+            }
+
+            String password = getPassword(args);
+
+            // Make sure party passwords match
+            if (!PartyManager.checkPartyPassword(player, targetParty, password)) {
+                return true;
+            }
+
+            // Changing parties
+            if (mcMMOPlayer.inParty()) {
+                if (!PartyManager.handlePartyChangeEvent(player, playerParty.getName(), targetParty.getName(), EventReason.CHANGED_PARTIES)) {
+                    return true;
+                }
+
+                PartyManager.removeFromParty(player.getName(), playerParty);
+            }
+            else if (!PartyManager.handlePartyChangeEvent(player, null, targetParty.getName(), EventReason.JOINED_PARTY)) {
+                return true;
+            }
+
+            PartyManager.joinParty(player, mcMMOPlayer, targetParty.getName(), password);
+            return true;
+
+        default:
+            sender.sendMessage(LocaleLoader.getString("Commands.Usage.3", "party", "join", "<" + LocaleLoader.getString("Commands.Usage.Player") + ">", "[" + LocaleLoader.getString("Commands.Usage.Password") + "]"));
+            return true;
+        }
+    }
+
+    private String getPassword(String[] args) {
+        if (args.length == 3) {
+            return args[2];
+        }
+
+        return null;
+    }
+
+    private boolean canJoinParty(CommandSender sender, String targetName) {
+        mcMMOTarget = Users.getPlayer(targetName);
+
+        if (mcMMOTarget == null) {
+            PlayerProfile playerProfile = new PlayerProfile(targetName, false);
+
+            if (!playerProfile.isLoaded()) {
+                sender.sendMessage(LocaleLoader.getString("Commands.DoesNotExist"));
+                return false;
+            }
+        }
+
+        target = mcMMOTarget.getPlayer();
+
+        if (!target.isOnline()) {
+            sender.sendMessage(LocaleLoader.getString("Party.NotOnline", targetName));
+            return false;
+        }
+
+        if (!mcMMOTarget.inParty()) {
+            sender.sendMessage(LocaleLoader.getString("Party.PlayerNotInParty", targetName));
+            return false;
+        }
+
+        player = (Player) sender;
+        mcMMOPlayer = Users.getPlayer(player);
+        playerParty = mcMMOPlayer.getParty();
+        targetParty = mcMMOTarget.getParty();
+
+        if (player.equals(target) || (mcMMOPlayer.inParty() && playerParty.equals(targetParty))) {
+            sender.sendMessage(LocaleLoader.getString("Party.Join.Self"));
+            return false;
+        }
+
+        return true;
+    }
+}

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

@@ -8,17 +8,19 @@ 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.PlayerProfile;
 import com.gmail.nossr50.events.party.McMMOPartyTeleportEvent;
 import com.gmail.nossr50.locale.LocaleLoader;
 import com.gmail.nossr50.party.PartyManager;
 import com.gmail.nossr50.util.Misc;
+import com.gmail.nossr50.util.Permissions;
 import com.gmail.nossr50.util.Users;
 
 public class PtpCommand implements CommandExecutor {
     private final mcMMO plugin;
     private Player player;
-    private PlayerProfile playerProfile;
+    private McMMOPlayer mcMMOPlayer;
 
     public PtpCommand(mcMMO instance) {
         this.plugin = instance;
@@ -26,7 +28,7 @@ public class PtpCommand implements CommandExecutor {
 
     @Override
     public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
-        String usage = LocaleLoader.getString("Commands.Usage.1", new Object[] { "ptp", "<" + LocaleLoader.getString("Commands.Usage.Player") + ">" });
+        String usage = LocaleLoader.getString("Commands.Usage.1", "ptp", "<" + LocaleLoader.getString("Commands.Usage.Player") + ">");
 
         if (CommandHelper.noConsoleUsage(sender)) {
             return true;
@@ -38,8 +40,9 @@ public class PtpCommand implements CommandExecutor {
 
         switch (args.length) {
         case 1:
-            this.player = (Player) sender;
-            this.playerProfile = Users.getProfile(player);
+            player = (Player) sender;
+            mcMMOPlayer = Users.getPlayer(player);
+            PlayerProfile playerProfile = mcMMOPlayer.getProfile();
 
             if (args[0].equalsIgnoreCase("toggle")) {
                 return togglePartyTeleportation();
@@ -51,7 +54,7 @@ public class PtpCommand implements CommandExecutor {
             int ptpCooldown = Config.getInstance().getPTPCommandCooldown();
 
             if (playerProfile.getRecentlyHurt() + (ptpCooldown * Misc.TIME_CONVERSION_FACTOR) > System.currentTimeMillis()) {
-                player.sendMessage(LocaleLoader.getString("Party.Teleport.Hurt", new Object[] { ptpCooldown }));
+                player.sendMessage(LocaleLoader.getString("Party.Teleport.Hurt", ptpCooldown));
                 return true;
             }
 
@@ -86,15 +89,15 @@ public class PtpCommand implements CommandExecutor {
         }
 
         if (PartyManager.inSameParty(player, target)) {
-            PlayerProfile targetProfile = Users.getProfile(target);
+            McMMOPlayer targetMcMMOPlayer = Users.getPlayer(target);
 
-            if (!targetProfile.getPtpEnabled()) {
-                player.sendMessage(LocaleLoader.getString("Party.Teleport.Disabled", new Object[] { target.getName() }));
+            if (!targetMcMMOPlayer.getPtpEnabled()) {
+                player.sendMessage(LocaleLoader.getString("Party.Teleport.Disabled", target.getName()));
                 return true;
             }
 
-            if (!Users.getProfile(target).getPtpConfirmRequired()) {
-                McMMOPartyTeleportEvent event = new McMMOPartyTeleportEvent(player, target, playerProfile.getParty().getName());
+            if (!targetMcMMOPlayer.getPtpConfirmRequired()) {
+                McMMOPartyTeleportEvent event = new McMMOPartyTeleportEvent(player, target, mcMMOPlayer.getParty().getName());
                 plugin.getServer().getPluginManager().callEvent(event);
 
                 if (event.isCancelled()) {
@@ -102,40 +105,44 @@ public class PtpCommand implements CommandExecutor {
                 }
 
                 player.teleport(target);
-                player.sendMessage(LocaleLoader.getString("Party.Teleport.Player", new Object[] { player.getName() }));
-                target.sendMessage(LocaleLoader.getString("Party.Teleport.Target", new Object[] { target.getName() }));
-                playerProfile.setRecentlyHurt(System.currentTimeMillis());
+                player.sendMessage(LocaleLoader.getString("Party.Teleport.Player", player.getName()));
+                target.sendMessage(LocaleLoader.getString("Party.Teleport.Target", target.getName()));
+                mcMMOPlayer.getProfile().setRecentlyHurt(System.currentTimeMillis());
             } else {
-                targetProfile.setPtpRequest(player);
-                targetProfile.actualizePtpTimeout();
+                targetMcMMOPlayer.setPtpRequest(player);
+                targetMcMMOPlayer.actualizePtpTimeout();
                 player.sendMessage(LocaleLoader.getString("Commands.Invite.Success"));
 
                 int ptpRequestExpire = Config.getInstance().getPTPCommandTimeout();
-                target.sendMessage(LocaleLoader.getString("Commands.ptp.Request1", new Object[] { player.getName() }));
-                target.sendMessage(LocaleLoader.getString("Commands.ptp.Request2", new Object[] { ptpRequestExpire }));
+                target.sendMessage(LocaleLoader.getString("Commands.ptp.Request1", player.getName()));
+                target.sendMessage(LocaleLoader.getString("Commands.ptp.Request2", ptpRequestExpire));
             }
         }
         else {
-            player.sendMessage(LocaleLoader.getString("Party.NotInYourParty", new Object[] { target.getName() }));
+            player.sendMessage(LocaleLoader.getString("Party.NotInYourParty", target.getName()));
         }
         return true;
     }
 
     private boolean acceptTeleportRequest() {
-        if (!playerProfile.hasPtpRequest()) {
+        if (!mcMMOPlayer.hasPtpRequest()) {
             player.sendMessage(LocaleLoader.getString("Commands.ptp.NoRequests"));
             return true;
         }
 
+        if (CommandHelper.noCommandPermissions(player, "mcmmo.commands.ptp.accept")) {
+            return true;
+        }
+
         int ptpRequestExpire = Config.getInstance().getPTPCommandTimeout();
 
-        if ((playerProfile.getPtpTimeout() + ptpRequestExpire) * Misc.TIME_CONVERSION_FACTOR < System.currentTimeMillis()) {
-            playerProfile.removePtpRequest();
+        if ((mcMMOPlayer.getPtpTimeout() + ptpRequestExpire) * Misc.TIME_CONVERSION_FACTOR < System.currentTimeMillis()) {
+            mcMMOPlayer.removePtpRequest();
             player.sendMessage(LocaleLoader.getString("Commands.ptp.RequestExpired"));
             return true;
         }
 
-        Player target = playerProfile.getPtpRequest();
+        Player target = mcMMOPlayer.getPtpRequest();
 
         if (target == null) {
             player.sendMessage(LocaleLoader.getString("Party.Player.Invalid"));
@@ -147,7 +154,20 @@ public class PtpCommand implements CommandExecutor {
             return true;
         }
 
-        McMMOPartyTeleportEvent event = new McMMOPartyTeleportEvent(player, target, playerProfile.getParty().getName());
+        if(Config.getInstance().getPTPCommandWorldPermissions()) {
+            String perm = "mcmmo.commands.ptp.world.";
+
+            if(!Permissions.hasDynamicPermission(target, perm + "all", "op")) {
+                if(!Permissions.hasDynamicPermission(target, perm + target.getWorld().getName(), "op")) {
+                    return true;
+                }
+                else if(target.getWorld() != player.getWorld() && !Permissions.hasDynamicPermission(target, perm + player.getWorld().getName(), "op")) {
+                    return true;
+                }
+            }
+        }
+
+        McMMOPartyTeleportEvent event = new McMMOPartyTeleportEvent(target, player, mcMMOPlayer.getParty().getName());
         plugin.getServer().getPluginManager().callEvent(event);
 
         if (event.isCancelled()) {
@@ -155,33 +175,41 @@ public class PtpCommand implements CommandExecutor {
         }
 
         target.teleport(player);
-        target.sendMessage(LocaleLoader.getString("Party.Teleport.Player", new Object[] { player.getName() }));
-        player.sendMessage(LocaleLoader.getString("Party.Teleport.Target", new Object[] { target.getName() }));
-        playerProfile.setRecentlyHurt(System.currentTimeMillis());
+        target.sendMessage(LocaleLoader.getString("Party.Teleport.Player", player.getName()));
+        player.sendMessage(LocaleLoader.getString("Party.Teleport.Target", target.getName()));
+        mcMMOPlayer.getProfile().setRecentlyHurt(System.currentTimeMillis());
         return true;
     }
 
     private boolean acceptAnyTeleportRequest() {
-        if (playerProfile.getPtpConfirmRequired()) {
+        if (CommandHelper.noCommandPermissions(player, "mcmmo.commands.ptp.acceptall")) {
+            return true;
+        }
+
+        if (mcMMOPlayer.getPtpConfirmRequired()) {
             player.sendMessage(LocaleLoader.getString("Commands.ptp.AcceptAny.Disabled"));
         }
         else {
             player.sendMessage(LocaleLoader.getString("Commands.ptp.AcceptAny.Enabled"));
         }
 
-        playerProfile.togglePtpConfirmRequired();
+        mcMMOPlayer.togglePtpConfirmRequired();
         return true;
     }
 
     private boolean togglePartyTeleportation() {
-        if (playerProfile.getPtpEnabled()) {
+        if (CommandHelper.noCommandPermissions(player, "mcmmo.commands.ptp.toggle")) {
+            return true;
+        }
+
+        if (mcMMOPlayer.getPtpEnabled()) {
             player.sendMessage(LocaleLoader.getString("Commands.ptp.Disabled"));
         }
         else {
             player.sendMessage(LocaleLoader.getString("Commands.ptp.Enabled"));
         }
 
-        playerProfile.togglePtpUse();
+        mcMMOPlayer.togglePtpUse();
         return true;
     }
 }

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

@@ -5,6 +5,7 @@ import java.util.Map;
 import org.bukkit.Bukkit;
 import org.bukkit.command.CommandSender;
 
+import com.gmail.nossr50.mcMMO;
 import com.gmail.nossr50.database.Database;
 import com.gmail.nossr50.locale.LocaleLoader;
 import com.gmail.nossr50.skills.utilities.SkillTools;
@@ -22,33 +23,31 @@ public class McRankAsync implements Runnable {
     @Override
     public void run() {
         final Map<String, Integer> skills = Database.readSQLRank(playerName);
-        Bukkit.getScheduler().scheduleSyncDelayedTask(Bukkit.getPluginManager().getPlugin("mcMMO"), new Runnable() {
+
+        Bukkit.getScheduler().scheduleSyncDelayedTask(mcMMO.p, new Runnable() {
             @Override
             public void run() {
                 sender.sendMessage(LocaleLoader.getString("Commands.mcrank.Heading"));
-                sender.sendMessage(LocaleLoader.getString("Commands.mcrank.Player", new Object[] {playerName}));
+                sender.sendMessage(LocaleLoader.getString("Commands.mcrank.Player", playerName));
 
                 for (SkillType skillType : SkillType.values()) {
                     if (skillType.isChildSkill()) {
                         continue;
                     }
 
-                    if (skillType.equals(SkillType.ALL))
-                        continue; // We want the overall ranking to be at the bottom
-
                     if (skills.get(skillType.name()) == null) {
-                        sender.sendMessage(LocaleLoader.getString("Commands.mcrank.Skill", new Object[] {SkillTools.localizeSkillName(skillType), LocaleLoader.getString("Commands.mcrank.Unranked")} ));
+                        sender.sendMessage(LocaleLoader.getString("Commands.mcrank.Skill", SkillTools.localizeSkillName(skillType), LocaleLoader.getString("Commands.mcrank.Unranked")));
                     }
                     else {
-                        sender.sendMessage(LocaleLoader.getString("Commands.mcrank.Skill", new Object[] {SkillTools.localizeSkillName(skillType), skills.get(skillType.name())} ));
+                        sender.sendMessage(LocaleLoader.getString("Commands.mcrank.Skill", SkillTools.localizeSkillName(skillType), skills.get(skillType.name())));
                     }
                 }
 
                 if (skills.get("ALL") == null) {
-                    sender.sendMessage(LocaleLoader.getString("Commands.mcrank.Overall", new Object[] {LocaleLoader.getString("Commands.mcrank.Unranked")} ));
+                    sender.sendMessage(LocaleLoader.getString("Commands.mcrank.Overall", LocaleLoader.getString("Commands.mcrank.Unranked")));
                 }
                 else {
-                    sender.sendMessage(LocaleLoader.getString("Commands.mcrank.Overall", new Object[] {skills.get("ALL")} ));
+                    sender.sendMessage(LocaleLoader.getString("Commands.mcrank.Overall", skills.get("ALL")));
                 }
             }
 

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

@@ -41,7 +41,7 @@ public abstract class SkillCommand implements CommandExecutor {
         }
 
         player = (Player) sender;
-        profile = Users.getProfile(player);
+        profile = Users.getPlayer(player).getProfile();
 
         if (profile == null) {
             sender.sendMessage(LocaleLoader.getString("Commands.DoesNotExist"));
@@ -55,28 +55,26 @@ public abstract class SkillCommand implements CommandExecutor {
         dataCalculations();
         permissionsCheck();
 
-        player.sendMessage(LocaleLoader.getString("Skills.Header", new Object[] { LocaleLoader.getString(skillString + ".SkillName") }));
+        player.sendMessage(LocaleLoader.getString("Skills.Header", LocaleLoader.getString(skillString + ".SkillName")));
 
         if (!skill.isChildSkill()) {
-            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) }));
+            player.sendMessage(LocaleLoader.getString("Commands.XPGain", LocaleLoader.getString("Commands.XPGain." + skillString)));
+            player.sendMessage(LocaleLoader.getString("Effects.Level", profile.getSkillLevel(skill), profile.getSkillXpLevel(skill), profile.getXpToLevel(skill)));
         }
 
         if (effectsHeaderPermissions()) {
-            player.sendMessage(LocaleLoader.getString("Skills.Header", new Object[] { LocaleLoader.getString("Effects.Effects") }));
+            player.sendMessage(LocaleLoader.getString("Skills.Header", LocaleLoader.getString("Effects.Effects")));
         }
 
         effectsDisplay();
 
         if (statsHeaderPermissions()) {
-            player.sendMessage(LocaleLoader.getString("Skills.Header", new Object[] { LocaleLoader.getString("Commands.Stats.Self") }));
+            player.sendMessage(LocaleLoader.getString("Skills.Header", LocaleLoader.getString("Commands.Stats.Self")));
         }
 
         statsDisplay();
 
-        SkillGuide.grabGuidePageForSkill(skill, player, args);
-
-        return true;
+        return SkillGuide.grabGuidePageForSkill(skill, player, args);
     }
 
     protected String calculateRank(int maxLevel, int rankChangeLevel) {
@@ -155,7 +153,7 @@ public abstract class SkillCommand implements CommandExecutor {
     protected void luckyEffectsDisplay() {
         if (isLucky) {
             String perkPrefix = LocaleLoader.getString("MOTD.PerksPrefix");
-            player.sendMessage(perkPrefix + LocaleLoader.getString("Effects.Template", new Object[] { LocaleLoader.getString("Perks.lucky.name"), LocaleLoader.getString("Perks.lucky.desc", new Object[] { SkillTools.localizeSkillName(skill) }) }));
+            player.sendMessage(perkPrefix + LocaleLoader.getString("Effects.Template", LocaleLoader.getString("Perks.lucky.name"), LocaleLoader.getString("Perks.lucky.desc", SkillTools.localizeSkillName(skill))));
         }
     }
 

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

@@ -33,7 +33,7 @@ public final class SkillGuide {
         ArrayList<String> allStrings = new ArrayList<String>();
         String split[] = LocaleLoader.getString(address).split("\n");
 
-        allStrings.add(LocaleLoader.getString("Guides.Header", new Object[] {header} ));
+        allStrings.add(LocaleLoader.getString("Guides.Header", header));
 
         //Add targeted strings
         while (allStrings.size() < 9) {
@@ -55,44 +55,55 @@ public final class SkillGuide {
         }
     }
 
-    public static void grabGuidePageForSkill(SkillType skilltype, Player player, String[] args) {
+    public static boolean grabGuidePageForSkill(SkillType skilltype, Player player, String[] args) {
         String skillName = skilltype.toString();
         String capitalized = Misc.getCapitalized(skillName);
         String localized = SkillTools.localizeSkillName(skilltype);
-        player.sendMessage(LocaleLoader.getString("Guides.Available", new Object[] {localized, localized.toLowerCase()} ));
+        player.sendMessage(LocaleLoader.getString("Guides.Available", localized, localized.toLowerCase()));
 
-        if (args.length >= 1 && args[0].equals("?")) {
-            String address = "Guides." + capitalized;
+        String address = "Guides." + capitalized;
+
+        switch (args.length) {
+        case 0:
+            // We have to specify this, otherwise we get the usage string every time we call /skillname...
+            return true;
+
+        case 1:
+            if (!args[0].equals("?")) {
+                return false;
+            }
+
+            SkillGuide.clearChat(player);
+
+            for (String target : SkillGuide.grabPageContents(localized, address, 1)) {
+                player.sendMessage(target);
+            }
+
+            return true;
+
+        case 2:
             int totalPages = SkillGuide.getTotalPageNumber(address);
 
-            if (args.length == 1) {
-                SkillGuide.clearChat(player);
-
-                for (String target : SkillGuide.grabPageContents(localized, address, 1)) {
-                    player.sendMessage(target);
-                }
+            if (!Misc.isInt(args[1])) {
+                player.sendMessage(LocaleLoader.getString("Guides.Page.Invalid"));
+                return true;
             }
-            else {
-                if (!Misc.isInt(args[1])) {
-                    player.sendMessage(LocaleLoader.getString("Guides.Page.Invalid"));
-                }
 
-                if (Misc.getInt(args[1]) <= totalPages) {
-                    SkillGuide.clearChat(player);
-
-                    for (String target : SkillGuide.grabPageContents(localized, address, Misc.getInt(args[1]))) {
-                        player.sendMessage(target);
-                    }
-                }
-                else {
-                    player.sendMessage(LocaleLoader.getString("Guides.Page.OutOfRange", new Object[] {totalPages} ));
-                }
+            if (Misc.getInt(args[1]) > totalPages) {
+                player.sendMessage(LocaleLoader.getString("Guides.Page.OutOfRange", totalPages));
+                return true;
             }
-        }
 
-        // We have to specify this, else we get the usage string every time we call /skillname...
-        else if (args.length != 0) {
-            player.sendMessage(LocaleLoader.getString("Guides.Usage", new Object[] {localized.toLowerCase()} ));
+            SkillGuide.clearChat(player);
+
+            for (String target : SkillGuide.grabPageContents(localized, address, Misc.getInt(args[1]))) {
+                player.sendMessage(target);
+            }
+
+            return true;
+
+        default:
+            return false;
         }
     }
 }

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

@@ -56,15 +56,15 @@ public class AcrobaticsCommand extends SkillCommand {
         luckyEffectsDisplay();
 
         if (canRoll) {
-            player.sendMessage(LocaleLoader.getString("Effects.Template", new Object[] { LocaleLoader.getString("Acrobatics.Effect.0"), LocaleLoader.getString("Acrobatics.Effect.1") }));
+            player.sendMessage(LocaleLoader.getString("Effects.Template", 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") }));
+            player.sendMessage(LocaleLoader.getString("Effects.Template", 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") }));
+            player.sendMessage(LocaleLoader.getString("Effects.Template", LocaleLoader.getString("Acrobatics.Effect.4"), LocaleLoader.getString("Acrobatics.Effect.5")));
         }
     }
 

src/main/java/com/gmail/nossr50/skills/acrobatics/DodgeEventHandler.java

@@ -46,7 +46,7 @@ public class DodgeEventHandler extends AcrobaticsEventHandler {
         McMMOPlayer mcMMOPlayer = manager.getMcMMOPlayer();
 
         if (System.currentTimeMillis() >= mcMMOPlayer.getProfile().getRespawnATS() + Misc.PLAYER_RESPAWN_COOLDOWN_SECONDS) {
-            manager.getMcMMOPlayer().addXp(SkillType.ACROBATICS, xp);
+            manager.getMcMMOPlayer().beginXpGain(SkillType.ACROBATICS, xp);
         }
     }
 }

src/main/java/com/gmail/nossr50/skills/acrobatics/RollEventHandler.java

@@ -69,7 +69,7 @@ public class RollEventHandler extends AcrobaticsEventHandler {
 
     @Override
     protected void processXpGain(int xp) {
-        manager.getMcMMOPlayer().addXp(SkillType.ACROBATICS, xp);
+        manager.getMcMMOPlayer().beginXpGain(SkillType.ACROBATICS, xp);
     }
 
     /**

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

@@ -60,15 +60,15 @@ public class ArcheryCommand extends SkillCommand {
         luckyEffectsDisplay();
 
         if (canSkillShot) {
-            player.sendMessage(LocaleLoader.getString("Effects.Template", new Object[] { LocaleLoader.getString("Archery.Effect.0"), LocaleLoader.getString("Archery.Effect.1") }));
+            player.sendMessage(LocaleLoader.getString("Effects.Template", 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", new Object[] {Archery.dazeModifier}) }));
+            player.sendMessage(LocaleLoader.getString("Effects.Template", LocaleLoader.getString("Archery.Effect.2"), LocaleLoader.getString("Archery.Effect.3", Archery.dazeModifier)));
         }
 
         if (canRetrieve) {
-            player.sendMessage(LocaleLoader.getString("Effects.Template", new Object[] { LocaleLoader.getString("Archery.Effect.4"), LocaleLoader.getString("Archery.Effect.5") }));
+            player.sendMessage(LocaleLoader.getString("Effects.Template", LocaleLoader.getString("Archery.Effect.4"), LocaleLoader.getString("Archery.Effect.5")));
         }
     }
 
@@ -80,24 +80,24 @@ public class ArcheryCommand extends SkillCommand {
     @Override
     protected void statsDisplay() {
         if (canSkillShot) {
-            player.sendMessage(LocaleLoader.getString("Archery.Combat.SkillshotBonus", new Object[] { skillShotBonus }));
+            player.sendMessage(LocaleLoader.getString("Archery.Combat.SkillshotBonus", skillShotBonus));
         }
 
         if (canDaze) {
             if (isLucky) {
-                player.sendMessage(LocaleLoader.getString("Archery.Combat.DazeChance", new Object[] { dazeChance }) + LocaleLoader.getString("Perks.lucky.bonus", new Object[] { dazeChanceLucky }));
+                player.sendMessage(LocaleLoader.getString("Archery.Combat.DazeChance", dazeChance) + LocaleLoader.getString("Perks.lucky.bonus", dazeChanceLucky));
             }
             else {
-                player.sendMessage(LocaleLoader.getString("Archery.Combat.DazeChance", new Object[] { dazeChance }));
+                player.sendMessage(LocaleLoader.getString("Archery.Combat.DazeChance", dazeChance));
             }
         }
 
         if (canRetrieve) {
             if (isLucky) {
-                player.sendMessage(LocaleLoader.getString("Archery.Combat.RetrieveChance", new Object[] { retrieveChance }) + LocaleLoader.getString("Perks.lucky.bonus", new Object[] { retrieveChanceLucky }));
+                player.sendMessage(LocaleLoader.getString("Archery.Combat.RetrieveChance", retrieveChance) + LocaleLoader.getString("Perks.lucky.bonus", retrieveChanceLucky));
             }
             else {
-                player.sendMessage(LocaleLoader.getString("Archery.Combat.RetrieveChance", new Object[] { retrieveChance }));
+                player.sendMessage(LocaleLoader.getString("Archery.Combat.RetrieveChance", retrieveChance));
             }
         }
     }

src/main/java/com/gmail/nossr50/skills/archery/ArcheryManager.java

@@ -18,12 +18,23 @@ public class ArcheryManager extends SkillManager {
 
     public void distanceXpBonus(LivingEntity target) {
         Player player = mcMMOPlayer.getPlayer();
-        Location shooterLocation = player.getEyeLocation();
+        Location shooterLocation = player.getLocation();
         Location targetLocation = target.getLocation();
+
+        if (!shooterLocation.getWorld().equals(targetLocation.getWorld())) {
+            return;
+        }
+
         double squaredDistance = shooterLocation.distanceSquared(targetLocation);
 
+        // Cap distance at 100^2 to prevent teleport exploit.
+        // TODO: Better way to handle this would be great...
+        if (squaredDistance > 10000) {
+            squaredDistance = 10000;
+        }
+
         int bonusXp = (int) (squaredDistance * Archery.distanceXpModifer);
-        mcMMOPlayer.addXp(SkillType.ARCHERY, bonusXp);
+        mcMMOPlayer.beginXpGain(SkillType.ARCHERY, bonusXp);
     }
 
     /**

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

@@ -68,23 +68,23 @@ public class AxesCommand extends SkillCommand {
         luckyEffectsDisplay();
 
         if (canSkullSplitter) {
-            player.sendMessage(LocaleLoader.getString("Effects.Template", new Object[] { LocaleLoader.getString("Axes.Effect.0"), LocaleLoader.getString("Axes.Effect.1") }));
+            player.sendMessage(LocaleLoader.getString("Effects.Template", LocaleLoader.getString("Axes.Effect.0"), LocaleLoader.getString("Axes.Effect.1")));
         }
 
         if (canCritical) {
-            player.sendMessage(LocaleLoader.getString("Effects.Template", new Object[] { LocaleLoader.getString("Axes.Effect.2"), LocaleLoader.getString("Axes.Effect.3") }));
+            player.sendMessage(LocaleLoader.getString("Effects.Template", LocaleLoader.getString("Axes.Effect.2"), LocaleLoader.getString("Axes.Effect.3")));
         }
 
         if (canBonusDamage) {
-            player.sendMessage(LocaleLoader.getString("Effects.Template", new Object[] { LocaleLoader.getString("Axes.Effect.4"), LocaleLoader.getString("Axes.Effect.5") }));
+            player.sendMessage(LocaleLoader.getString("Effects.Template", LocaleLoader.getString("Axes.Effect.4"), LocaleLoader.getString("Axes.Effect.5")));
         }
 
         if (canImpact) {
-            player.sendMessage(LocaleLoader.getString("Effects.Template", new Object[] { LocaleLoader.getString("Axes.Effect.6"), LocaleLoader.getString("Axes.Effect.7") }));
+            player.sendMessage(LocaleLoader.getString("Effects.Template", LocaleLoader.getString("Axes.Effect.6"), LocaleLoader.getString("Axes.Effect.7")));
         }
 
         if (canGreaterImpact) {
-            player.sendMessage(LocaleLoader.getString("Effects.Template", new Object[] { LocaleLoader.getString("Axes.Effect.8"), LocaleLoader.getString("Axes.Effect.9") }));
+            player.sendMessage(LocaleLoader.getString("Effects.Template", LocaleLoader.getString("Axes.Effect.8"), LocaleLoader.getString("Axes.Effect.9")));
         }
     }
 
@@ -96,32 +96,32 @@ public class AxesCommand extends SkillCommand {
     @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}) }));
+            player.sendMessage(LocaleLoader.getString("Ability.Generic.Template", LocaleLoader.getString("Axes.Ability.Bonus.0"), LocaleLoader.getString("Axes.Ability.Bonus.1", bonusDamage)));
         }
 
         if (canImpact) {
-            player.sendMessage(LocaleLoader.getString("Ability.Generic.Template", new Object[] { LocaleLoader.getString("Axes.Ability.Bonus.2"), LocaleLoader.getString("Axes.Ability.Bonus.3", new Object[] {impactDamage}) }));
+            player.sendMessage(LocaleLoader.getString("Ability.Generic.Template", LocaleLoader.getString("Axes.Ability.Bonus.2"), LocaleLoader.getString("Axes.Ability.Bonus.3", impactDamage)));
         }
 
         if (canGreaterImpact) {
-            player.sendMessage(LocaleLoader.getString("Ability.Generic.Template", new Object[] { LocaleLoader.getString("Axes.Ability.Bonus.4"), LocaleLoader.getString("Axes.Ability.Bonus.5", new Object[] {greaterImpactDamage}) }));
+            player.sendMessage(LocaleLoader.getString("Ability.Generic.Template", LocaleLoader.getString("Axes.Ability.Bonus.4"), LocaleLoader.getString("Axes.Ability.Bonus.5", greaterImpactDamage)));
         }
 
         if (canCritical) {
             if (isLucky) {
-                player.sendMessage(LocaleLoader.getString("Axes.Combat.CritChance", new Object[] { critChance }) + LocaleLoader.getString("Perks.lucky.bonus", new Object[] { critChanceLucky }));
+                player.sendMessage(LocaleLoader.getString("Axes.Combat.CritChance", critChance) + LocaleLoader.getString("Perks.lucky.bonus", critChanceLucky));
             }
             else {
-                player.sendMessage(LocaleLoader.getString("Axes.Combat.CritChance", new Object[] { critChance }));
+                player.sendMessage(LocaleLoader.getString("Axes.Combat.CritChance", critChance));
             }
         }
 
         if (canSkullSplitter) {
             if (hasEndurance) {
-                player.sendMessage(LocaleLoader.getString("Axes.Combat.SS.Length", new Object[] { skullSplitterLength }) + LocaleLoader.getString("Perks.activationtime.bonus", new Object[] { skullSplitterLengthEndurance }));
+                player.sendMessage(LocaleLoader.getString("Axes.Combat.SS.Length", skullSplitterLength) + LocaleLoader.getString("Perks.activationtime.bonus", skullSplitterLengthEndurance));
             }
             else {
-                player.sendMessage(LocaleLoader.getString("Axes.Combat.SS.Length", new Object[] { skullSplitterLength }));
+                player.sendMessage(LocaleLoader.getString("Axes.Combat.SS.Length", skullSplitterLength));
             }
         }
     }

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

@@ -119,7 +119,7 @@ public class Excavation {
             }
         }
 
-        mcMMOPlayer.addXp(SkillType.EXCAVATION, xp);
+        mcMMOPlayer.beginXpGain(SkillType.EXCAVATION, xp);
     }
 
     /**

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

@@ -40,11 +40,11 @@ public class ExcavationCommand extends SkillCommand {
         luckyEffectsDisplay();
 
         if (canGigaDrill) {
-            player.sendMessage(LocaleLoader.getString("Effects.Template", new Object[] { LocaleLoader.getString("Excavation.Effect.0"), LocaleLoader.getString("Excavation.Effect.1") }));
+            player.sendMessage(LocaleLoader.getString("Effects.Template", LocaleLoader.getString("Excavation.Effect.0"), LocaleLoader.getString("Excavation.Effect.1")));
         }
 
         if (canTreasureHunt) {
-            player.sendMessage(LocaleLoader.getString("Effects.Template", new Object[] { LocaleLoader.getString("Excavation.Effect.2"), LocaleLoader.getString("Excavation.Effect.3") }));
+            player.sendMessage(LocaleLoader.getString("Effects.Template", LocaleLoader.getString("Excavation.Effect.2"), LocaleLoader.getString("Excavation.Effect.3")));
         }
     }
 
@@ -57,10 +57,10 @@ public class ExcavationCommand extends SkillCommand {
     protected void statsDisplay() {
         if (canGigaDrill) {
             if (hasEndurance) {
-                player.sendMessage(LocaleLoader.getString("Excavation.Effect.Length", new Object[] { gigaDrillBreakerLength }) + LocaleLoader.getString("Perks.activationtime.bonus", new Object[] { gigaDrillBreakerLengthEndurance }));
+                player.sendMessage(LocaleLoader.getString("Excavation.Effect.Length", gigaDrillBreakerLength) + LocaleLoader.getString("Perks.activationtime.bonus", gigaDrillBreakerLengthEndurance));
             }
             else {
-                player.sendMessage(LocaleLoader.getString("Excavation.Effect.Length", new Object[] { gigaDrillBreakerLength }));
+                player.sendMessage(LocaleLoader.getString("Excavation.Effect.Length", gigaDrillBreakerLength));
             }
         }
     }

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

@@ -128,7 +128,7 @@ public final class Fishing {
             caught.setItemStack(treasureDrop);
         }
 
-        mcMMOPlayer.addXp(SkillType.FISHING, Config.getInstance().getFishingBaseXP() + treasureXp);
+        mcMMOPlayer.beginXpGain(SkillType.FISHING, Config.getInstance().getFishingBaseXP() + treasureXp);
         event.setExpToDrop(event.getExpToDrop() * getVanillaXpMultiplier(skillLevel));
     }
 

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

@@ -67,19 +67,19 @@ public class FishingCommand extends SkillCommand {
         luckyEffectsDisplay();
 
         if (canTreasureHunt) {
-            player.sendMessage(LocaleLoader.getString("Effects.Template", new Object[] { LocaleLoader.getString("Fishing.Effect.0"), LocaleLoader.getString("Fishing.Effect.1") }));
+            player.sendMessage(LocaleLoader.getString("Effects.Template", LocaleLoader.getString("Fishing.Effect.0"), LocaleLoader.getString("Fishing.Effect.1")));
         }
 
         if (canMagicHunt) {
-            player.sendMessage(LocaleLoader.getString("Effects.Template", new Object[] { LocaleLoader.getString("Fishing.Effect.2"), LocaleLoader.getString("Fishing.Effect.3") }));
+            player.sendMessage(LocaleLoader.getString("Effects.Template", LocaleLoader.getString("Fishing.Effect.2"), LocaleLoader.getString("Fishing.Effect.3")));
         }
 
         if (canShake) {
-            player.sendMessage(LocaleLoader.getString("Effects.Template", new Object[] { LocaleLoader.getString("Fishing.Effect.4"), LocaleLoader.getString("Fishing.Effect.5") }));
+            player.sendMessage(LocaleLoader.getString("Effects.Template", LocaleLoader.getString("Fishing.Effect.4"), LocaleLoader.getString("Fishing.Effect.5")));
         }
 
         if (canFishermansDiet) {
-            player.sendMessage(LocaleLoader.getString("Effects.Template", new Object[] { LocaleLoader.getString("Fishing.Effect.6"), LocaleLoader.getString("Fishing.Effect.7") }));
+            player.sendMessage(LocaleLoader.getString("Effects.Template", LocaleLoader.getString("Fishing.Effect.6"), LocaleLoader.getString("Fishing.Effect.7")));
         }
     }
 
@@ -91,34 +91,34 @@ public class FishingCommand extends SkillCommand {
     @Override
     protected void statsDisplay() {
         if (canTreasureHunt) {
-            player.sendMessage(LocaleLoader.getString("Fishing.Ability.Rank", new Object[] { lootTier }));
+            player.sendMessage(LocaleLoader.getString("Fishing.Ability.Rank", lootTier));
         }
 
         if (canMagicHunt) {
             if (isLucky) {
-                player.sendMessage(LocaleLoader.getString("Fishing.Enchant.Chance", new Object[] { magicChance}) + chanceRaining +  LocaleLoader.getString("Perks.lucky.bonus", new Object[] { magicChanceLucky }));
+                player.sendMessage(LocaleLoader.getString("Fishing.Enchant.Chance", magicChance) + chanceRaining +  LocaleLoader.getString("Perks.lucky.bonus", magicChanceLucky));
             }
             else {
-                player.sendMessage(LocaleLoader.getString("Fishing.Enchant.Chance", new Object[] { magicChance}) + chanceRaining);
+                player.sendMessage(LocaleLoader.getString("Fishing.Enchant.Chance", magicChance) + chanceRaining);
             }
         }
 
         if (canShake) {
             if (skillValue < AdvancedConfig.getInstance().getShakeUnlockLevel()) {
-                player.sendMessage(LocaleLoader.getString("Ability.Generic.Template.Lock", new Object[] { LocaleLoader.getString("Fishing.Ability.Locked.0", new Object[] { AdvancedConfig.getInstance().getShakeUnlockLevel() }) }));
+                player.sendMessage(LocaleLoader.getString("Ability.Generic.Template.Lock", LocaleLoader.getString("Fishing.Ability.Locked.0", AdvancedConfig.getInstance().getShakeUnlockLevel())));
             }
             else {
                 if (isLucky) {
-                    player.sendMessage(LocaleLoader.getString("Fishing.Ability.Shake", new Object[] { shakeChance }) + LocaleLoader.getString("Perks.lucky.bonus", new Object[] { shakeChanceLucky }));
+                    player.sendMessage(LocaleLoader.getString("Fishing.Ability.Shake", shakeChance) + LocaleLoader.getString("Perks.lucky.bonus", shakeChanceLucky));
                 }
                 else {
-                    player.sendMessage(LocaleLoader.getString("Fishing.Ability.Shake", new Object[] { shakeChance }));
+                    player.sendMessage(LocaleLoader.getString("Fishing.Ability.Shake", shakeChance));
                 }
             }
         }
 
         if (canFishermansDiet) {
-            player.sendMessage(LocaleLoader.getString("Fishing.Ability.FD", new Object[] { fishermansDietRank }));
+            player.sendMessage(LocaleLoader.getString("Fishing.Ability.FD", fishermansDietRank));
         }
     }
 }

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

@@ -130,7 +130,7 @@ public class Herbalism {
 
         for (int y = 0;  y <= 2; y++) {
             Block relativeBlock = block.getRelative(BlockFace.UP, y);
-            if (relativeBlock.getType().equals(blockType) && !mcMMO.placeStore.isTrue(relativeBlock)) {
+            if (relativeBlock.getType() == blockType && !mcMMO.placeStore.isTrue(relativeBlock)) {
                 dropAmount++;
             }
         }
@@ -153,7 +153,7 @@ public class Herbalism {
             return;
         }
 
-        PlayerProfile profile = Users.getProfile(player);
+        PlayerProfile profile = mcMMOPlayer.getProfile();
         int herbLevel = profile.getSkillLevel(SkillType.HERBALISM);
         Material blockType = block.getType();
 
@@ -196,7 +196,7 @@ public class Herbalism {
             if (chance > Misc.getRandom().nextInt(activationChance)) {
                 Location location = block.getLocation();
 
-                if (herbalismBlock != null && herbalismBlock.canDoubleDrop()) {
+                if (dropItem != null && herbalismBlock != null && herbalismBlock.canDoubleDrop()) {
                     Misc.dropItems(location, dropItem, dropAmount);
                 }
                 else if (customBlock != null){
@@ -212,7 +212,7 @@ public class Herbalism {
             }
         }
 
-        mcMMOPlayer.addXp(SkillType.HERBALISM, xp);
+        mcMMOPlayer.beginXpGain(SkillType.HERBALISM, xp);
     }
 
     /**
@@ -224,7 +224,7 @@ public class Herbalism {
      * @param plugin mcMMO plugin instance
      */
     private static void greenThumbWheat(Block block, Player player, BlockBreakEvent event, mcMMO plugin) {
-        PlayerProfile profile = Users.getProfile(player);
+        PlayerProfile profile = Users.getPlayer(player).getProfile();
         int herbLevel = profile.getSkillLevel(SkillType.HERBALISM);
         PlayerInventory inventory = player.getInventory();
         boolean hasSeeds = false;
@@ -320,7 +320,7 @@ public class Herbalism {
      * @param block The block being used in the ability
      */
     public static void greenThumbBlocks(ItemStack is, Player player, Block block) {
-        PlayerProfile profile = Users.getProfile(player);
+        PlayerProfile profile = Users.getPlayer(player).getProfile();
         int skillLevel = profile.getSkillLevel(SkillType.HERBALISM);
         int seeds = is.getAmount();
 
@@ -340,7 +340,7 @@ public class Herbalism {
     }
 
     public static void hylianLuck(Block block, Player player, BlockBreakEvent event) {
-        int skillLevel = Users.getProfile(player).getSkillLevel(SkillType.HERBALISM);
+        int skillLevel = Users.getPlayer(player).getProfile().getSkillLevel(SkillType.HERBALISM);
 
         double chance = (hylianLuckMaxChance / hylianLuckMaxLevel) * Misc.skillCheck(skillLevel, hylianLuckMaxLevel);
         int activationChance = Misc.calculateActivationChance(Permissions.luckyHerbalism(player));
@@ -373,13 +373,13 @@ public class Herbalism {
                 return;
             }
 
-            int dropNumber = Misc.getRandom().nextInt(treasures.size());
-            ItemStack item = treasures.get(dropNumber + 1).getDrop();
-            Location location = block.getLocation();
+            if (treasures.isEmpty()) {
+                return;
+            }
 
             event.setCancelled(true);
             event.getBlock().setType(Material.AIR);
-            Misc.dropItem(location, item);
+            Misc.dropItem(block.getLocation(), treasures.get(Misc.getRandom().nextInt(treasures.size())).getDrop());
             player.sendMessage(LocaleLoader.getString("Herbalism.HylianLuck"));
         }
     }

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

@@ -78,27 +78,27 @@ public class HerbalismCommand extends SkillCommand {
         luckyEffectsDisplay();
 
         if (canGreenTerra) {
-            player.sendMessage(LocaleLoader.getString("Effects.Template", new Object[] { LocaleLoader.getString("Herbalism.Effect.0"), LocaleLoader.getString("Herbalism.Effect.1") }));
+            player.sendMessage(LocaleLoader.getString("Effects.Template", 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") }));
+            player.sendMessage(LocaleLoader.getString("Effects.Template", 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") }));
+            player.sendMessage(LocaleLoader.getString("Effects.Template", 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") }));
+            player.sendMessage(LocaleLoader.getString("Effects.Template", LocaleLoader.getString("Herbalism.Effect.6"), LocaleLoader.getString("Herbalism.Effect.7")));
         }
 
         if (hasHylianLuck) {
-            player.sendMessage(LocaleLoader.getString("Effects.Template", new Object[] { LocaleLoader.getString("Herbalism.Effect.10"), LocaleLoader.getString("Herbalism.Effect.11") }));
+            player.sendMessage(LocaleLoader.getString("Effects.Template", LocaleLoader.getString("Herbalism.Effect.10"), LocaleLoader.getString("Herbalism.Effect.11")));
         }
 
         if (canDoubleDrop && !doubleDropsDisabled) {
-            player.sendMessage(LocaleLoader.getString("Effects.Template", new Object[] { LocaleLoader.getString("Herbalism.Effect.8"), LocaleLoader.getString("Herbalism.Effect.9") }));
+            player.sendMessage(LocaleLoader.getString("Effects.Template", LocaleLoader.getString("Herbalism.Effect.8"), LocaleLoader.getString("Herbalism.Effect.9")));
         }
     }
 
@@ -111,44 +111,44 @@ public class HerbalismCommand extends SkillCommand {
     protected void statsDisplay() {
         if (canGreenTerra) {
             if (hasEndurance) {
-                player.sendMessage(LocaleLoader.getString("Herbalism.Ability.GTe.Length", new Object[] { greenTerraLength }) + LocaleLoader.getString("Perks.activationtime.bonus", new Object[] { greenTerraLengthEndurance }));
+                player.sendMessage(LocaleLoader.getString("Herbalism.Ability.GTe.Length", greenTerraLength) + LocaleLoader.getString("Perks.activationtime.bonus", greenTerraLengthEndurance));
             }
             else {
-                player.sendMessage(LocaleLoader.getString("Herbalism.Ability.GTe.Length", new Object[] { greenTerraLength }));
+                player.sendMessage(LocaleLoader.getString("Herbalism.Ability.GTe.Length", greenTerraLength));
             }
         }
 
         if (canGreenThumbBlocks || canGreenThumbWheat) {
             if (isLucky) {
-                player.sendMessage(LocaleLoader.getString("Herbalism.Ability.GTh.Chance", new Object[] { greenThumbChance }) + LocaleLoader.getString("Perks.lucky.bonus", new Object[] { greenThumbChanceLucky }));
+                player.sendMessage(LocaleLoader.getString("Herbalism.Ability.GTh.Chance", greenThumbChance) + LocaleLoader.getString("Perks.lucky.bonus", greenThumbChanceLucky));
             }
             else {
-                player.sendMessage(LocaleLoader.getString("Herbalism.Ability.GTh.Chance", new Object[] { greenThumbChance }));
+                player.sendMessage(LocaleLoader.getString("Herbalism.Ability.GTh.Chance", greenThumbChance));
             }
         }
 
         if (canGreenThumbWheat) {
-            player.sendMessage(LocaleLoader.getString("Herbalism.Ability.GTh.Stage", new Object[] { greenThumbStage }));
+            player.sendMessage(LocaleLoader.getString("Herbalism.Ability.GTh.Stage", greenThumbStage));
         }
 
         if (canFarmersDiet) {
-            player.sendMessage(LocaleLoader.getString("Herbalism.Ability.FD", new Object[] { farmersDietRank } ));
+            player.sendMessage(LocaleLoader.getString("Herbalism.Ability.FD", farmersDietRank));
         }
 
         if (hasHylianLuck) {
             if (isLucky) {
-                player.sendMessage(LocaleLoader.getString("Herbalism.Ability.HylianLuck", new Object[] { hylianLuckChance }) + LocaleLoader.getString("Perks.lucky.bonus", new Object[] { hylianLuckChanceLucky }));
+                player.sendMessage(LocaleLoader.getString("Herbalism.Ability.HylianLuck", hylianLuckChance) + LocaleLoader.getString("Perks.lucky.bonus", hylianLuckChanceLucky));
             }
             else {
-                player.sendMessage(LocaleLoader.getString("Herbalism.Ability.HylianLuck", new Object[] { hylianLuckChance }));
+                player.sendMessage(LocaleLoader.getString("Herbalism.Ability.HylianLuck", hylianLuckChance));
             }
         }
         if (canDoubleDrop && !doubleDropsDisabled) {
             if (isLucky) {
-                player.sendMessage(LocaleLoader.getString("Herbalism.Ability.DoubleDropChance", new Object[] { doubleDropChance }) + LocaleLoader.getString("Perks.lucky.bonus", new Object[] { doubleDropChanceLucky }));
+                player.sendMessage(LocaleLoader.getString("Herbalism.Ability.DoubleDropChance", doubleDropChance) + LocaleLoader.getString("Perks.lucky.bonus", doubleDropChanceLucky));
             }
             else {
-                player.sendMessage(LocaleLoader.getString("Herbalism.Ability.DoubleDropChance", new Object[] { doubleDropChance }));
+                player.sendMessage(LocaleLoader.getString("Herbalism.Ability.DoubleDropChance", doubleDropChance));
             }
         }
     }

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

@@ -104,7 +104,7 @@ public class Mining {
             break;
         }
 
-        mcMMOPlayer.addXp(SkillType.MINING, xp);
+        mcMMOPlayer.beginXpGain(SkillType.MINING, xp);
     }
 
     /**

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

@@ -106,23 +106,23 @@ public class MiningCommand extends SkillCommand {
         luckyEffectsDisplay();
 
         if (canSuperBreaker) {
-            player.sendMessage(LocaleLoader.getString("Effects.Template", new Object[] { LocaleLoader.getString("Mining.Effect.0"), LocaleLoader.getString("Mining.Effect.1") }));
+            player.sendMessage(LocaleLoader.getString("Effects.Template", 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") }));
+            player.sendMessage(LocaleLoader.getString("Effects.Template", 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") }));
+            player.sendMessage(LocaleLoader.getString("Effects.Template", 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") }));
+            player.sendMessage(LocaleLoader.getString("Effects.Template", 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") }));
+            player.sendMessage(LocaleLoader.getString("Effects.Template", LocaleLoader.getString("Mining.Effect.8"), LocaleLoader.getString("Mining.Effect.9")));
         }
     }
 
@@ -135,46 +135,46 @@ public class MiningCommand extends SkillCommand {
     protected void statsDisplay() {
         if (canDoubleDrop && !doubleDropsDisabled) {
             if (isLucky) {
-                player.sendMessage(LocaleLoader.getString("Mining.Effect.DropChance", new Object[] { doubleDropChance }) + LocaleLoader.getString("Perks.lucky.bonus", new Object[] { doubleDropChanceLucky }));
+                player.sendMessage(LocaleLoader.getString("Mining.Effect.DropChance", doubleDropChance) + LocaleLoader.getString("Perks.lucky.bonus", doubleDropChanceLucky));
             }
             else {
-                player.sendMessage(LocaleLoader.getString("Mining.Effect.DropChance", new Object[] { doubleDropChance }));
+                player.sendMessage(LocaleLoader.getString("Mining.Effect.DropChance", doubleDropChance));
             }
         }
 
         if (canSuperBreaker) {
             if (hasEndurance) {
-                player.sendMessage(LocaleLoader.getString("Mining.Ability.Length", new Object[] { superBreakerLength }) + LocaleLoader.getString("Perks.activationtime.bonus", new Object[] { superBreakerLengthEndurance }));
+                player.sendMessage(LocaleLoader.getString("Mining.Ability.Length", superBreakerLength) + LocaleLoader.getString("Perks.activationtime.bonus", superBreakerLengthEndurance));
             }
             else {
-                player.sendMessage(LocaleLoader.getString("Mining.Ability.Length", new Object[] { superBreakerLength }));
+                player.sendMessage(LocaleLoader.getString("Mining.Ability.Length", superBreakerLength));
             }
         }
 
         if (canBlast) {
             if (skillValue < BlastMining.rank1) {
-                player.sendMessage(LocaleLoader.getString("Ability.Generic.Template.Lock", new Object[] { LocaleLoader.getString("Mining.Ability.Locked.0", new Object[] { BlastMining.rank1 })  }));
+                player.sendMessage(LocaleLoader.getString("Ability.Generic.Template.Lock", LocaleLoader.getString("Mining.Ability.Locked.0", BlastMining.rank1)));
             }
             else {
-                player.sendMessage(LocaleLoader.getString("Mining.Blast.Rank", new Object[] { blastMiningRank, LocaleLoader.getString("Mining.Blast.Effect." + (Misc.getInt(blastMiningRank) - 1)) }));
+                player.sendMessage(LocaleLoader.getString("Mining.Blast.Rank", blastMiningRank, LocaleLoader.getString("Mining.Blast.Effect." + (Misc.getInt(blastMiningRank) - 1))));
             }
         }
 
         if (canBiggerBombs) {
             if (skillValue < BlastMining.rank2) {
-                player.sendMessage(LocaleLoader.getString("Ability.Generic.Template.Lock", new Object[] { LocaleLoader.getString("Mining.Ability.Locked.1", new Object[] { BlastMining.rank2 }) }));
+                player.sendMessage(LocaleLoader.getString("Ability.Generic.Template.Lock", LocaleLoader.getString("Mining.Ability.Locked.1", BlastMining.rank2)));
             }
             else {
-                player.sendMessage(LocaleLoader.getString("Mining.Blast.Radius.Increase", new Object[] { blastRadiusIncrease }));
+                player.sendMessage(LocaleLoader.getString("Mining.Blast.Radius.Increase", blastRadiusIncrease));
             }
         }
 
         if (canDemoExpert) {
             if (skillValue < BlastMining.rank4) {
-                player.sendMessage(LocaleLoader.getString("Ability.Generic.Template.Lock", new Object[] { LocaleLoader.getString("Mining.Ability.Locked.2", new Object[] { BlastMining.rank4 }) }));
+                player.sendMessage(LocaleLoader.getString("Ability.Generic.Template.Lock", LocaleLoader.getString("Mining.Ability.Locked.2", BlastMining.rank4)));
             }
             else {
-                player.sendMessage(LocaleLoader.getString("Mining.Effect.Decrease", new Object[] { blastDamageDecrease }));
+                player.sendMessage(LocaleLoader.getString("Mining.Effect.Decrease", blastDamageDecrease));
             }
         }
     }

src/main/java/com/gmail/nossr50/skills/mining/RemoteDetonationEventHandler.java

@@ -44,7 +44,7 @@ public class RemoteDetonationEventHandler {
         PlayerProfile profile = mcMMOPlayer.getProfile();
 
         if (!SkillTools.cooldownOver(profile.getSkillDATS(AbilityType.BLAST_MINING) * Misc.TIME_CONVERSION_FACTOR, AbilityType.BLAST_MINING.getCooldown(), player)) {
-            player.sendMessage(LocaleLoader.getString("Skills.TooTired", new Object[] { SkillTools.calculateTimeLeft(profile.getSkillDATS(AbilityType.BLAST_MINING) * Misc.TIME_CONVERSION_FACTOR, AbilityType.BLAST_MINING.getCooldown(), player) }));
+            player.sendMessage(LocaleLoader.getString("Skills.TooTired", SkillTools.calculateTimeLeft(profile.getSkillDATS(AbilityType.BLAST_MINING) * Misc.TIME_CONVERSION_FACTOR, AbilityType.BLAST_MINING.getCooldown(), player)));
 
             return false;
         }

src/main/java/com/gmail/nossr50/skills/mining/SuperBreakerEventHandler.java

@@ -106,7 +106,7 @@ public class SuperBreakerEventHandler {
     private void calculateDurabilityLoss() {
         this.durabilityLoss = Misc.toolDurabilityLoss;
 
-        if (blockType.equals(Material.OBSIDIAN)) {
+        if (blockType == Material.OBSIDIAN) {
             durabilityLoss = durabilityLoss * 5;
         }
     }

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

@@ -48,7 +48,7 @@ public class Repair {
         Player player = mcMMOPlayer.getPlayer();
 
         player.playSound(player.getLocation(), Sound.ANVIL_USE, Misc.ANVIL_USE_VOLUME, Misc.ANVIL_USE_PITCH);
-        mcMMOPlayer.addXp(SkillType.REPAIR, dif * 10);
+        mcMMOPlayer.beginXpGain(SkillType.REPAIR, dif * 10);
     }
 
     /**
@@ -94,7 +94,7 @@ public class Repair {
             return;
         }
 
-        int rank = getArcaneForgingRank(Users.getProfile(player));
+        int rank = getArcaneForgingRank(Users.getPlayer(player).getProfile());
 
         if (rank == 0 || !Permissions.arcaneForging(player)) {
             for (Enchantment x : enchants.keySet()) {
@@ -231,7 +231,7 @@ public class Repair {
      * @return true if bonus granted, false otherwise
      */
     public static boolean checkPlayerProcRepair(Player player) {
-        int skillLevel = Users.getProfile(player).getSkillLevel(SkillType.REPAIR);
+        int skillLevel = Users.getPlayer(player).getProfile().getSkillLevel(SkillType.REPAIR);
 
         int chance = (int) ((SUPER_REPAIR_CHANCE_MAX / SUPER_REPAIR_MAX_BONUS_LEVEL) * skillLevel);
         if (skillLevel >= SUPER_REPAIR_MAX_BONUS_LEVEL) chance = (int) SUPER_REPAIR_CHANCE_MAX;
@@ -252,7 +252,7 @@ public class Repair {
      * @param anvilID The item ID of the anvil block
      */
     public static void placedAnvilCheck(Player player, int anvilID) {
-        PlayerProfile profile = Users.getProfile(player);
+        PlayerProfile profile = Users.getPlayer(player).getProfile();
 
         if (!profile.getPlacedAnvil()) {
             if (mcMMO.spoutEnabled) {

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

@@ -92,40 +92,40 @@ public class RepairCommand extends SkillCommand {
     protected void effectsDisplay() {
         luckyEffectsDisplay();
 
-        player.sendMessage(LocaleLoader.getString("Effects.Template", new Object[] { LocaleLoader.getString("Repair.Effect.0"), LocaleLoader.getString("Repair.Effect.1") }));
+        player.sendMessage(LocaleLoader.getString("Effects.Template", LocaleLoader.getString("Repair.Effect.0"), LocaleLoader.getString("Repair.Effect.1")));
 
         if (canMasterRepair) {
-            player.sendMessage(LocaleLoader.getString("Effects.Template", new Object[] { LocaleLoader.getString("Repair.Effect.2"), LocaleLoader.getString("Repair.Effect.3") }));
+            player.sendMessage(LocaleLoader.getString("Effects.Template", LocaleLoader.getString("Repair.Effect.2"), LocaleLoader.getString("Repair.Effect.3")));
         }
 
         if (canSuperRepair) {
-            player.sendMessage(LocaleLoader.getString("Effects.Template", new Object[] { LocaleLoader.getString("Repair.Effect.4"), LocaleLoader.getString("Repair.Effect.5") }));
+            player.sendMessage(LocaleLoader.getString("Effects.Template", LocaleLoader.getString("Repair.Effect.4"), LocaleLoader.getString("Repair.Effect.5")));
         }
 
         /* Repair Level Requirements */
 
         if (canRepairStone && stoneLevel > 0) {
-            player.sendMessage(LocaleLoader.getString("Effects.Template", new Object[] { LocaleLoader.getString("Repair.Effect.14", new Object[] { stoneLevel }), LocaleLoader.getString("Repair.Effect.15") }));
+            player.sendMessage(LocaleLoader.getString("Effects.Template", LocaleLoader.getString("Repair.Effect.14", stoneLevel), LocaleLoader.getString("Repair.Effect.15")));
         }
 
         if (canRepairIron && ironLevel > 0) {
-            player.sendMessage(LocaleLoader.getString("Effects.Template", new Object[] { LocaleLoader.getString("Repair.Effect.12", new Object[] { ironLevel }), LocaleLoader.getString("Repair.Effect.13") }));
+            player.sendMessage(LocaleLoader.getString("Effects.Template", LocaleLoader.getString("Repair.Effect.12", ironLevel), LocaleLoader.getString("Repair.Effect.13")));
         }
 
         if (canRepairGold && goldLevel > 0) {
-            player.sendMessage(LocaleLoader.getString("Effects.Template", new Object[] { LocaleLoader.getString("Repair.Effect.10", new Object[] { goldLevel }), LocaleLoader.getString("Repair.Effect.11") }));
+            player.sendMessage(LocaleLoader.getString("Effects.Template", LocaleLoader.getString("Repair.Effect.10", goldLevel), LocaleLoader.getString("Repair.Effect.11")));
         }
 
         if (canRepairDiamond && diamondLevel > 0) {
-            player.sendMessage(LocaleLoader.getString("Effects.Template", new Object[] { LocaleLoader.getString("Repair.Effect.6", new Object[] { diamondLevel }), LocaleLoader.getString("Repair.Effect.7") }));
+            player.sendMessage(LocaleLoader.getString("Effects.Template", LocaleLoader.getString("Repair.Effect.6", diamondLevel), LocaleLoader.getString("Repair.Effect.7")));
         }
 
         if (canSalvage && Salvage.salvageUnlockLevel > 0) {
-            player.sendMessage(LocaleLoader.getString("Effects.Template", new Object[] { LocaleLoader.getString("Repair.Effect.16", new Object[] { Salvage.salvageUnlockLevel }), LocaleLoader.getString("Repair.Effect.17") }));
+            player.sendMessage(LocaleLoader.getString("Effects.Template", LocaleLoader.getString("Repair.Effect.16", Salvage.salvageUnlockLevel), LocaleLoader.getString("Repair.Effect.17")));
         }
 
         if (canArcaneForge) {
-            player.sendMessage(LocaleLoader.getString("Effects.Template", new Object[] { LocaleLoader.getString("Repair.Effect.8"), LocaleLoader.getString("Repair.Effect.9") }));
+            player.sendMessage(LocaleLoader.getString("Effects.Template", LocaleLoader.getString("Repair.Effect.8"), LocaleLoader.getString("Repair.Effect.9")));
         }
     }
 
@@ -137,27 +137,27 @@ public class RepairCommand extends SkillCommand {
     @Override
     protected void statsDisplay() {
         if (canMasterRepair) {
-            player.sendMessage(LocaleLoader.getString("Repair.Skills.Mastery", new Object[] { repairMasteryBonus }));
+            player.sendMessage(LocaleLoader.getString("Repair.Skills.Mastery", repairMasteryBonus));
         }
 
         if (canSuperRepair) {
             if (isLucky) {
-                player.sendMessage(LocaleLoader.getString("Repair.Skills.Super.Chance", new Object[] { superRepairChance }) + LocaleLoader.getString("Perks.lucky.bonus", new Object[] { superRepairChanceLucky }));
+                player.sendMessage(LocaleLoader.getString("Repair.Skills.Super.Chance", superRepairChance) + LocaleLoader.getString("Perks.lucky.bonus", superRepairChanceLucky));
             }
             else {
-                player.sendMessage(LocaleLoader.getString("Repair.Skills.Super.Chance", new Object[] { superRepairChance }));
+                player.sendMessage(LocaleLoader.getString("Repair.Skills.Super.Chance", superRepairChance));
             }
         }
 
         if (canArcaneForge) {
-            player.sendMessage(LocaleLoader.getString("Repair.Arcane.Rank", new Object[] { arcaneForgingRank }));
+            player.sendMessage(LocaleLoader.getString("Repair.Arcane.Rank", arcaneForgingRank));
 
             if (Repair.arcaneForgingEnchantLoss) {
-                player.sendMessage(LocaleLoader.getString("Repair.Arcane.Chance.Success", new Object[] { (arcaneBypass ? 100 : Repair.getEnchantChance(arcaneForgingRank)) }));
+                player.sendMessage(LocaleLoader.getString("Repair.Arcane.Chance.Success", (arcaneBypass ? 100 : Repair.getEnchantChance(arcaneForgingRank))));
             }
 
             if (Repair.arcaneForgingDowngrades) {
-                player.sendMessage(LocaleLoader.getString("Repair.Arcane.Chance.Downgrade", new Object[] { (arcaneBypass ? 0 : Repair.getDowngradeChance(arcaneForgingRank)) }));
+                player.sendMessage(LocaleLoader.getString("Repair.Arcane.Chance.Downgrade", (arcaneBypass ? 0 : Repair.getDowngradeChance(arcaneForgingRank))));
             }
         }
     }

src/main/java/com/gmail/nossr50/skills/repair/Salvage.java

@@ -23,38 +23,36 @@ public class Salvage {
     public static int salvageUnlockLevel = Config.getInstance().getSalvageUnlockLevel();
     public static int anvilID = Config.getInstance().getSalvageAnvilId();
 
-    public static void handleSalvage(final Player player, final Location location, final ItemStack inHand) {
+    public static void handleSalvage(final Player player, final Location location, final ItemStack item) {
         if (!configInstance.getSalvageEnabled()) {
             return;
         }
 
         if (player.getGameMode() == GameMode.SURVIVAL) {
-            final PlayerProfile profile = Users.getProfile(player);
-            final int skillLevel = profile.getSkillLevel(SkillType.REPAIR);
+            final int skillLevel = Users.getPlayer(player).getProfile().getSkillLevel(SkillType.REPAIR);
             final int unlockLevel = configInstance.getSalvageUnlockLevel();
 
-            if (skillLevel >= unlockLevel) {
-                final float currentdura = inHand.getDurability();
+            if (skillLevel < unlockLevel) {
+                player.sendMessage(LocaleLoader.getString("Repair.Skills.AdeptSalvage"));
+                return;
+            }
 
-                if (currentdura == 0) {
-                    final int salvagedAmount = getSalvagedAmount(inHand);
-                    final int itemID = getSalvagedItemID(inHand);
+            final float currentDurability = item.getDurability();
 
-                    player.setItemInHand(new ItemStack(Material.AIR));
-                    location.setY(location.getY() + 1);
-                    Misc.dropItem(location, new ItemStack(itemID, salvagedAmount));
+            if (currentDurability == 0) {
+                player.setItemInHand(new ItemStack(Material.AIR));
+                location.setY(location.getY() + 1);
 
-                    player.playSound(player.getLocation(), Sound.ANVIL_USE, Misc.ANVIL_USE_VOLUME, Misc.ANVIL_USE_PITCH);
-                    player.sendMessage(LocaleLoader.getString("Repair.Skills.SalvageSuccess"));
-                }
-                else {
-                    player.sendMessage(LocaleLoader.getString("Repair.Skills.NotFullDurability"));
-                }
+                Misc.dropItems(location, new ItemStack(getSalvagedItem(item)), getSalvagedAmount(item));
+
+                player.playSound(player.getLocation(), Sound.ANVIL_USE, Misc.ANVIL_USE_VOLUME, Misc.ANVIL_USE_PITCH);
+                player.sendMessage(LocaleLoader.getString("Repair.Skills.SalvageSuccess"));
             }
             else {
-                player.sendMessage(LocaleLoader.getString("Repair.Skills.AdeptSalvage"));
+                player.sendMessage(LocaleLoader.getString("Repair.Skills.NotFullDurability"));
             }
         }
+        
     }
 
     /**
@@ -64,7 +62,7 @@ public class Salvage {
      * @param anvilID The item ID of the anvil block
      */
     public static void placedAnvilCheck(final Player player, final int anvilID) {
-        final PlayerProfile profile = Users.getProfile(player);
+        final PlayerProfile profile = Users.getPlayer(player).getProfile();
 
         if (!profile.getPlacedSalvageAnvil()) {
             if (mcMMO.spoutEnabled) {
@@ -73,7 +71,8 @@ public class Salvage {
                 if (spoutPlayer.isSpoutCraftEnabled()) {
                     spoutPlayer.sendNotification("[mcMMO] Anvil Placed", "Right click to salvage!", Material.getMaterial(anvilID));
                 }
-            } else {
+            }
+            else {
                 player.sendMessage(LocaleLoader.getString("Repair.Listener.Anvil2"));
             }
 
@@ -82,27 +81,58 @@ public class Salvage {
         }
     }
 
-    public static int getSalvagedItemID(final ItemStack inHand) {
-        int salvagedItem = 0;
-        if (ItemChecks.isDiamondTool(inHand) || ItemChecks.isDiamondArmor(inHand)) salvagedItem = 264;
-        else if (ItemChecks.isGoldTool(inHand) || ItemChecks.isGoldArmor(inHand)) salvagedItem = 266;
-        else if (ItemChecks.isIronTool(inHand) || ItemChecks.isIronArmor(inHand)) salvagedItem = 265;
-        else if (ItemChecks.isStoneTool(inHand)) salvagedItem = 4;
-        else if (ItemChecks.isWoodTool(inHand)) salvagedItem = 5;
-        else if ( ItemChecks.isLeatherArmor(inHand)) salvagedItem = 334;
-        return salvagedItem;
+    private static Material getSalvagedItem(final ItemStack inHand) {
+        if (ItemChecks.isDiamondTool(inHand) || ItemChecks.isDiamondArmor(inHand)) {
+            return Material.DIAMOND;
+        }
+        else if (ItemChecks.isGoldTool(inHand) || ItemChecks.isGoldArmor(inHand)) {
+            return Material.GOLD_INGOT;
+        }
+        else if (ItemChecks.isIronTool(inHand) || ItemChecks.isIronArmor(inHand)) {
+            return Material.IRON_INGOT;
+        }
+        else if (ItemChecks.isStoneTool(inHand)) {
+            return Material.COBBLESTONE;
+        }
+        else if (ItemChecks.isWoodTool(inHand)) {
+            return Material.WOOD;
+        }
+        else if (ItemChecks.isLeatherArmor(inHand)) {
+            return Material.LEATHER;
+        }
+        else if (ItemChecks.isStringTool(inHand)) {
+            return Material.STRING;
+        }
+        else {
+            return null;
+        }
     }
 
-    public static int getSalvagedAmount(final ItemStack inHand) {
-        int salvagedAmount = 0;
-        if (ItemChecks.isPickaxe(inHand) || ItemChecks.isAxe(inHand)) salvagedAmount = 3;
-        else if (ItemChecks.isShovel(inHand)) salvagedAmount = 1;
-        else if (ItemChecks.isSword(inHand) || ItemChecks.isHoe(inHand)) salvagedAmount = 2;
-        else if (ItemChecks.isHelmet(inHand)) salvagedAmount = 5;
-        else if (ItemChecks.isChestplate(inHand)) salvagedAmount = 8;
-        else if (ItemChecks.isPants(inHand)) salvagedAmount = 7;
-        else if (ItemChecks.isBoots(inHand)) salvagedAmount = 4;
-        return salvagedAmount;
+    private static int getSalvagedAmount(final ItemStack inHand) {
+        if (ItemChecks.isPickaxe(inHand) || ItemChecks.isAxe(inHand) || inHand.getType() == Material.BOW || inHand.getType() == Material.BUCKET) {
+            return 3;
+        }
+        else if (ItemChecks.isShovel(inHand) || inHand.getType() == Material.FLINT_AND_STEEL) {
+            return 1;
+        }
+        else if (ItemChecks.isSword(inHand) || ItemChecks.isHoe(inHand) || inHand.getType() == Material.CARROT_STICK || inHand.getType() == Material.FISHING_ROD || inHand.getType() == Material.SHEARS) {
+            return 2;
+        }
+        else if (ItemChecks.isHelmet(inHand)) {
+            return 5;
+        }
+        else if (ItemChecks.isChestplate(inHand)) {
+            return 8;
+        }
+        else if (ItemChecks.isPants(inHand)) {
+            return 7;
+        }
+        else if (ItemChecks.isBoots(inHand)) {
+            return 4;
+        }
+        else {
+            return 0;
+        }
     }
     /**
      * Checks if the item is salvageable.
@@ -111,7 +141,7 @@ public class Salvage {
      * @return true if the item is salvageable, false otherwise
      */
     public static boolean isSalvageable(final ItemStack is) {
-        if (configInstance.getSalvageTools() && ItemChecks.isTool(is)) {
+        if (configInstance.getSalvageTools() && (ItemChecks.isTool(is) || ItemChecks.isStringTool(is) || is.getType() == Material.BUCKET)) {
             return true;
         }
         if (configInstance.getSalvageArmor() && ItemChecks.isArmor(is)) {

src/main/java/com/gmail/nossr50/skills/repair/SimpleRepairManager.java

@@ -76,7 +76,7 @@ public class SimpleRepairManager implements RepairManager {
 
         // Level check
         if (skillLevel < repairable.getMinimumLevel()) {
-            player.sendMessage(LocaleLoader.getString("Repair.Skills.Adept", new Object[] { String.valueOf(repairable.getMinimumLevel()), Misc.prettyItemString(item.getTypeId()) } ));
+            player.sendMessage(LocaleLoader.getString("Repair.Skills.Adept", String.valueOf(repairable.getMinimumLevel()), Misc.prettyItemString(item.getTypeId())));
             return;
         }
 
@@ -84,7 +84,7 @@ public class SimpleRepairManager implements RepairManager {
 
         // Check if they have the proper material to repair with
         if (!inventory.contains(repairable.getRepairMaterialId())) {
-            String message = LocaleLoader.getString("Skills.NeedMore", new Object[] { Misc.prettyItemString(repairable.getRepairMaterialId()) });
+            String message = LocaleLoader.getString("Skills.NeedMore", Misc.prettyItemString(repairable.getRepairMaterialId()));
             if (repairable.getRepairMaterialMetadata() != (byte) -1) {
                 // TODO: Do something nicer than append the metadata as a :# ?
                 if (findInInventory(inventory, repairable.getRepairMaterialId(), repairable.getRepairMaterialMetadata()) == -1) {

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

@@ -6,6 +6,8 @@ import java.util.List;
 import java.util.Map;
 import java.util.Map.Entry;
 
+import org.bukkit.Effect;
+import org.bukkit.Material;
 import org.bukkit.entity.LivingEntity;
 import org.bukkit.entity.Player;
 
@@ -48,6 +50,7 @@ public class BleedTimer implements Runnable {
                 //Never kill with Bleeding
                 if (player.getHealth() - 1 > 0) {
                     CombatTools.dealDamage(player, 1);
+                    player.getWorld().playEffect(player.getEyeLocation(), Effect.STEP_SOUND, Material.REDSTONE_WIRE);
                 }
 
                 entry.setValue(entry.getValue() - 1);
@@ -60,6 +63,7 @@ public class BleedTimer implements Runnable {
             else {
                 CombatTools.dealDamage(entity, 2);
                 entry.setValue(entry.getValue() - 1);
+                entity.getWorld().playEffect(entity.getEyeLocation(), Effect.STEP_SOUND, Material.REDSTONE_WIRE);
             }
         }
 

src/main/java/com/gmail/nossr50/skills/runnables/CombatXpGiver.java

@@ -35,6 +35,6 @@ public class CombatXpGiver implements Runnable {
             damage += health;
         }
 
-        mcMMOPlayer.addXp(skillType, (int) (damage * baseXp));
+        mcMMOPlayer.beginXpGain(skillType, (int) (damage * baseXp));
     }
 }

src/main/java/com/gmail/nossr50/skills/runnables/PartyAutoKick.java

@@ -0,0 +1,34 @@
+package com.gmail.nossr50.skills.runnables;
+
+import java.util.ArrayList;
+
+import com.gmail.nossr50.mcMMO;
+import com.gmail.nossr50.config.Config;
+import com.gmail.nossr50.party.Party;
+import com.gmail.nossr50.party.PartyManager;
+
+public class PartyAutoKick implements Runnable {
+
+    @Override
+    public void run() {
+        updatePartyMembers();
+    }
+
+    private void updatePartyMembers() {
+        long currentTime = System.currentTimeMillis();
+        long kickTime = 24L * 60L * 60L * 1000L * Config.getInstance().getAutoPartyKickTime();
+
+        ArrayList<Party> parties = new ArrayList<Party>(PartyManager.getParties());
+
+        for (Party party : parties) {
+            ArrayList<String> members = new ArrayList<String>(party.getMembers());
+            for (String member : members) {
+                long lastPlayed = mcMMO.p.getServer().getOfflinePlayer(member).getLastPlayed();
+
+                if (currentTime - lastPlayed > kickTime) {
+                    PartyManager.removeFromParty(member, party);
+                }
+            }
+        }
+    }
+}

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

@@ -15,7 +15,7 @@ public class SkillMonitor implements Runnable {
         long curTime = System.currentTimeMillis();
 
         for (Player player : mcMMO.p.getServer().getOnlinePlayers()) {
-            PlayerProfile profile = Users.getProfile(player);
+            PlayerProfile profile = Users.getPlayer(player).getProfile();
 
             /*
              * MONITOR SKILLS

src/main/java/com/gmail/nossr50/skills/smelting/SmeltResourceEventHandler.java

@@ -68,11 +68,11 @@ public class SmeltResourceEventHandler {
         Player player = mcMMOPlayer.getPlayer();
 
         if (Permissions.mining(player)) {
-            mcMMOPlayer.addXp(SkillType.MINING, xp / 2);
+            mcMMOPlayer.beginXpGain(SkillType.MINING, xp / 2);
         }
 
         if (Permissions.repair(player)) {
-            mcMMOPlayer.addXp(SkillType.REPAIR, xp / 2);
+            mcMMOPlayer.beginXpGain(SkillType.REPAIR, xp / 2);
         }
     }
 

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

@@ -73,19 +73,19 @@ public class SmeltingCommand extends SkillCommand {
         luckyEffectsDisplay();
 
         if (canFuelEfficiency) {
-            player.sendMessage(LocaleLoader.getString("Effects.Template", new Object[] { LocaleLoader.getString("Smelting.Effect.0"), LocaleLoader.getString("Smelting.Effect.1") }));
+            player.sendMessage(LocaleLoader.getString("Effects.Template", LocaleLoader.getString("Smelting.Effect.0"), LocaleLoader.getString("Smelting.Effect.1")));
         }
 
         if (canSecondSmelt) {
-            player.sendMessage(LocaleLoader.getString("Effects.Template", new Object[] { LocaleLoader.getString("Smelting.Effect.2"), LocaleLoader.getString("Smelting.Effect.3") }));
+            player.sendMessage(LocaleLoader.getString("Effects.Template", LocaleLoader.getString("Smelting.Effect.2"), LocaleLoader.getString("Smelting.Effect.3")));
         }
 
         if (canVanillaXPBoost) {
-            player.sendMessage(LocaleLoader.getString("Effects.Template", new Object[] { LocaleLoader.getString("Smelting.Effect.4"), LocaleLoader.getString("Smelting.Effect.5") }));
+            player.sendMessage(LocaleLoader.getString("Effects.Template", LocaleLoader.getString("Smelting.Effect.4"), LocaleLoader.getString("Smelting.Effect.5")));
         }
 
         if (canFluxMine) {
-            player.sendMessage(LocaleLoader.getString("Effects.Template", new Object[] { LocaleLoader.getString("Smelting.Effect.6"), LocaleLoader.getString("Smelting.Effect.7") }));
+            player.sendMessage(LocaleLoader.getString("Effects.Template", LocaleLoader.getString("Smelting.Effect.6"), LocaleLoader.getString("Smelting.Effect.7")));
         }
     }
 
@@ -97,36 +97,36 @@ public class SmeltingCommand extends SkillCommand {
     @Override
     protected void statsDisplay() {
         if (canFuelEfficiency) {
-            player.sendMessage(LocaleLoader.getString("Smelting.Ability.FuelEfficiency", new Object[] { burnTimeModifier }));
+            player.sendMessage(LocaleLoader.getString("Smelting.Ability.FuelEfficiency", burnTimeModifier));
         }
 
         if (canSecondSmelt) {
             if (isLucky) {
-                player.sendMessage(LocaleLoader.getString("Smelting.Ability.SecondSmelt", new Object[] { secondSmeltChance }) + LocaleLoader.getString("Perks.lucky.bonus", new Object[] { secondSmeltChanceLucky }));
+                player.sendMessage(LocaleLoader.getString("Smelting.Ability.SecondSmelt", secondSmeltChance) + LocaleLoader.getString("Perks.lucky.bonus", secondSmeltChanceLucky));
             }
             else {
-                player.sendMessage(LocaleLoader.getString("Smelting.Ability.SecondSmelt", new Object[] { secondSmeltChance }));
+                player.sendMessage(LocaleLoader.getString("Smelting.Ability.SecondSmelt", secondSmeltChance));
             }
         }
 
         if (canVanillaXPBoost) {
             if (skillValue < Smelting.vanillaXPBoostRank1Level) {
-                player.sendMessage(LocaleLoader.getString("Ability.Generic.Template.Lock", new Object[] { LocaleLoader.getString("Smelting.Ability.Locked.0", new Object[] { Smelting.vanillaXPBoostRank1Level } ) }));
+                player.sendMessage(LocaleLoader.getString("Ability.Generic.Template.Lock", LocaleLoader.getString("Smelting.Ability.Locked.0", Smelting.vanillaXPBoostRank1Level)));
             }
             else {
-                player.sendMessage(LocaleLoader.getString("Smelting.Ability.VanillaXPBoost", new Object[] { vanillaXPModifier }));
+                player.sendMessage(LocaleLoader.getString("Smelting.Ability.VanillaXPBoost", vanillaXPModifier));
             }
         }
 
         if (canFluxMine) {
             if (skillValue < Smelting.fluxMiningUnlockLevel) {
-                player.sendMessage(LocaleLoader.getString("Ability.Generic.Template.Lock", new Object[] { LocaleLoader.getString("Smelting.Ability.Locked.1", new Object[] { Smelting.fluxMiningUnlockLevel } ) }));
+                player.sendMessage(LocaleLoader.getString("Ability.Generic.Template.Lock", LocaleLoader.getString("Smelting.Ability.Locked.1", Smelting.fluxMiningUnlockLevel)));
             }
             else if (isLucky) {
-                player.sendMessage(LocaleLoader.getString("Smelting.Ability.FluxMining", new Object[] { fluxMiningChance }) + LocaleLoader.getString("Perks.lucky.bonus", new Object[] { fluxMiningChanceLucky }));
+                player.sendMessage(LocaleLoader.getString("Smelting.Ability.FluxMining", fluxMiningChance) + LocaleLoader.getString("Perks.lucky.bonus", fluxMiningChanceLucky));
             }
             else {
-                player.sendMessage(LocaleLoader.getString("Smelting.Ability.FluxMining", new Object[] { fluxMiningChance }));
+                player.sendMessage(LocaleLoader.getString("Smelting.Ability.FluxMining", fluxMiningChance));
             }
         }
     }

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

@@ -64,16 +64,16 @@ public class SwordsCommand extends SkillCommand {
         luckyEffectsDisplay();
 
         if (canCounter) {
-            player.sendMessage(LocaleLoader.getString("Effects.Template", new Object[] { LocaleLoader.getString("Swords.Effect.0"), LocaleLoader.getString("Swords.Effect.1", new Object[] {percent.format(1.0D / Swords.counterAttackModifier)} ) }));
+            player.sendMessage(LocaleLoader.getString("Effects.Template", LocaleLoader.getString("Swords.Effect.0"), LocaleLoader.getString("Swords.Effect.1", percent.format(1.0D / Swords.counterAttackModifier))));
         }
 
         if (canSerratedStrike) {
-            player.sendMessage(LocaleLoader.getString("Effects.Template", new Object[] { LocaleLoader.getString("Swords.Effect.2"), LocaleLoader.getString("Swords.Effect.3", new Object[] {percent.format(1.0D / Swords.serratedStrikesModifier)}) }));
-            player.sendMessage(LocaleLoader.getString("Effects.Template", new Object[] { LocaleLoader.getString("Swords.Effect.4"), LocaleLoader.getString("Swords.Effect.5", new Object[] {Swords.serratedStrikesBleedTicks}) }));
+            player.sendMessage(LocaleLoader.getString("Effects.Template", LocaleLoader.getString("Swords.Effect.2"), LocaleLoader.getString("Swords.Effect.3", percent.format(1.0D / Swords.serratedStrikesModifier))));
+            player.sendMessage(LocaleLoader.getString("Effects.Template", LocaleLoader.getString("Swords.Effect.4"), LocaleLoader.getString("Swords.Effect.5", Swords.serratedStrikesBleedTicks)));
         }
 
         if (canBleed) {
-            player.sendMessage(LocaleLoader.getString("Effects.Template", new Object[] { LocaleLoader.getString("Swords.Effect.6"), LocaleLoader.getString("Swords.Effect.7") }));
+            player.sendMessage(LocaleLoader.getString("Effects.Template", LocaleLoader.getString("Swords.Effect.6"), LocaleLoader.getString("Swords.Effect.7")));
         }
     }
 
@@ -86,31 +86,31 @@ public class SwordsCommand extends SkillCommand {
     protected void statsDisplay() {
         if (canCounter) {
             if (isLucky) {
-                player.sendMessage(LocaleLoader.getString("Swords.Combat.Counter.Chance", new Object[] { counterAttackChance }) + LocaleLoader.getString("Perks.lucky.bonus", new Object[] { counterAttackChanceLucky }));
+                player.sendMessage(LocaleLoader.getString("Swords.Combat.Counter.Chance", counterAttackChance) + LocaleLoader.getString("Perks.lucky.bonus", counterAttackChanceLucky));
             }
             else {
-                player.sendMessage(LocaleLoader.getString("Swords.Combat.Counter.Chance", new Object[] { counterAttackChance }));
+                player.sendMessage(LocaleLoader.getString("Swords.Combat.Counter.Chance", counterAttackChance));
             }
         }
 
         if (canBleed) {
-            player.sendMessage(LocaleLoader.getString("Swords.Combat.Bleed.Length", new Object[] { bleedLength }));
+            player.sendMessage(LocaleLoader.getString("Swords.Combat.Bleed.Length", bleedLength));
             player.sendMessage(LocaleLoader.getString("Swords.Combat.Bleed.Note"));
 
             if (isLucky) {
-                player.sendMessage(LocaleLoader.getString("Swords.Combat.Bleed.Chance", new Object[] { bleedChance }) + LocaleLoader.getString("Perks.lucky.bonus", new Object[] { bleedChanceLucky }));
+                player.sendMessage(LocaleLoader.getString("Swords.Combat.Bleed.Chance", bleedChance) + LocaleLoader.getString("Perks.lucky.bonus", bleedChanceLucky));
             }
             else {
-                player.sendMessage(LocaleLoader.getString("Swords.Combat.Bleed.Chance", new Object[] { bleedChance }));
+                player.sendMessage(LocaleLoader.getString("Swords.Combat.Bleed.Chance", bleedChance));
             }
         }
 
         if (canSerratedStrike) {
             if (hasEndurance) {
-                player.sendMessage(LocaleLoader.getString("Swords.SS.Length", new Object[] { serratedStrikesLength }) + LocaleLoader.getString("Perks.activationtime.bonus", new Object[] { serratedStrikesLengthEndurance }));
+                player.sendMessage(LocaleLoader.getString("Swords.SS.Length", serratedStrikesLength) + LocaleLoader.getString("Perks.activationtime.bonus", serratedStrikesLengthEndurance));
             }
             else {
-                player.sendMessage(LocaleLoader.getString("Swords.SS.Length", new Object[] { serratedStrikesLength }));
+                player.sendMessage(LocaleLoader.getString("Swords.SS.Length", serratedStrikesLength));
             }
         }
     }

src/main/java/com/gmail/nossr50/skills/taming/BeastLoreEventHandler.java

@@ -26,10 +26,10 @@ public class BeastLoreEventHandler {
         String message = LocaleLoader.getString("Combat.BeastLore") + " ";
 
         if (beast.isTamed()) {
-            message = message.concat(LocaleLoader.getString("Combat.BeastLoreOwner", new Object[] { getOwnerName() }) + " ");
+            message = message.concat(LocaleLoader.getString("Combat.BeastLoreOwner", getOwnerName()) + " ");
         }
 
-        message = message.concat(LocaleLoader.getString("Combat.BeastLoreHealth", new Object[] { livingEntity.getHealth(), livingEntity.getMaxHealth() }));
+        message = message.concat(LocaleLoader.getString("Combat.BeastLoreHealth", livingEntity.getHealth(), livingEntity.getMaxHealth()));
         player.sendMessage(message);
     }
 

src/main/java/com/gmail/nossr50/skills/taming/CallOfTheWildEventHandler.java

@@ -30,7 +30,7 @@ public class CallOfTheWildEventHandler {
         if (player == null)
             return;
 
-        player.sendMessage(LocaleLoader.getString("Skills.NeedMore", new Object[] { Misc.prettyItemString(inHand.getTypeId()) }));
+        player.sendMessage(LocaleLoader.getString("Skills.NeedMore", Misc.prettyItemString(inHand.getTypeId())));
     }
 
     protected boolean nearbyEntityExists() {

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

@@ -52,37 +52,37 @@ public class TamingCommand extends SkillCommand {
         luckyEffectsDisplay();
 
         if (canBeastLore) {
-            player.sendMessage(LocaleLoader.getString("Effects.Template", new Object[] { LocaleLoader.getString("Taming.Effect.0"), LocaleLoader.getString("Taming.Effect.1") }));
+            player.sendMessage(LocaleLoader.getString("Effects.Template", LocaleLoader.getString("Taming.Effect.0"), LocaleLoader.getString("Taming.Effect.1")));
         }
 
         if (canGore) {
-            player.sendMessage(LocaleLoader.getString("Effects.Template", new Object[] { LocaleLoader.getString("Taming.Effect.2"), LocaleLoader.getString("Taming.Effect.3") }));
+            player.sendMessage(LocaleLoader.getString("Effects.Template", LocaleLoader.getString("Taming.Effect.2"), LocaleLoader.getString("Taming.Effect.3")));
         }
 
         if (canSharpenedClaws) {
-            player.sendMessage(LocaleLoader.getString("Effects.Template", new Object[] { LocaleLoader.getString("Taming.Effect.4"), LocaleLoader.getString("Taming.Effect.5") }));
+            player.sendMessage(LocaleLoader.getString("Effects.Template", LocaleLoader.getString("Taming.Effect.4"), LocaleLoader.getString("Taming.Effect.5")));
         }
 
         if (canEnvironmentallyAware) {
-            player.sendMessage(LocaleLoader.getString("Effects.Template", new Object[] { LocaleLoader.getString("Taming.Effect.6"), LocaleLoader.getString("Taming.Effect.7") }));
+            player.sendMessage(LocaleLoader.getString("Effects.Template", LocaleLoader.getString("Taming.Effect.6"), LocaleLoader.getString("Taming.Effect.7")));
         }
 
         if (canThickFur) {
-            player.sendMessage(LocaleLoader.getString("Effects.Template", new Object[] { LocaleLoader.getString("Taming.Effect.8"), LocaleLoader.getString("Taming.Effect.9") }));
+            player.sendMessage(LocaleLoader.getString("Effects.Template", LocaleLoader.getString("Taming.Effect.8"), LocaleLoader.getString("Taming.Effect.9")));
         }
 
         if (canShockProof) {
-            player.sendMessage(LocaleLoader.getString("Effects.Template", new Object[] { LocaleLoader.getString("Taming.Effect.10"), LocaleLoader.getString("Taming.Effect.11") }));
+            player.sendMessage(LocaleLoader.getString("Effects.Template", LocaleLoader.getString("Taming.Effect.10"), LocaleLoader.getString("Taming.Effect.11")));
         }
 
         if (canFastFood) {
-            player.sendMessage(LocaleLoader.getString("Effects.Template", new Object[] { LocaleLoader.getString("Taming.Effect.16"), LocaleLoader.getString("Taming.Effect.17") }));
+            player.sendMessage(LocaleLoader.getString("Effects.Template", LocaleLoader.getString("Taming.Effect.16"), LocaleLoader.getString("Taming.Effect.17")));
         }
 
         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("Effects.Template", LocaleLoader.getString("Taming.Effect.12"), LocaleLoader.getString("Taming.Effect.13")));
+            player.sendMessage(LocaleLoader.getString("Taming.Effect.14", Config.getInstance().getTamingCOTWOcelotCost()));
+            player.sendMessage(LocaleLoader.getString("Taming.Effect.15", Config.getInstance().getTamingCOTWWolfCost()));
         }
     }
 
@@ -95,55 +95,55 @@ public class TamingCommand extends SkillCommand {
     protected void statsDisplay() {
         if (canFastFood) {
             if (skillValue < Taming.fastFoodServiceUnlockLevel) {
-                player.sendMessage(LocaleLoader.getString("Ability.Generic.Template.Lock", new Object[] { LocaleLoader.getString("Taming.Ability.Locked.4", new Object[] { Taming.fastFoodServiceUnlockLevel } ) }));
+                player.sendMessage(LocaleLoader.getString("Ability.Generic.Template.Lock", LocaleLoader.getString("Taming.Ability.Locked.4", Taming.fastFoodServiceUnlockLevel)));
             }
             else {
-                player.sendMessage(LocaleLoader.getString("Ability.Generic.Template", new Object[] { LocaleLoader.getString("Taming.Ability.Bonus.8"), LocaleLoader.getString("Taming.Ability.Bonus.9", new Object[] { percent.format(Taming.fastFoodServiceActivationChance) } ) }));
+                player.sendMessage(LocaleLoader.getString("Ability.Generic.Template", LocaleLoader.getString("Taming.Ability.Bonus.8"), LocaleLoader.getString("Taming.Ability.Bonus.9", percent.format(Taming.fastFoodServiceActivationChance))));
             }
         }
 
         if (canEnvironmentallyAware) {
             if (skillValue < Taming.environmentallyAwareUnlockLevel) {
-                player.sendMessage(LocaleLoader.getString("Ability.Generic.Template.Lock", new Object[] { LocaleLoader.getString("Taming.Ability.Locked.0", new Object[] { Taming.environmentallyAwareUnlockLevel } ) }));
+                player.sendMessage(LocaleLoader.getString("Ability.Generic.Template.Lock", LocaleLoader.getString("Taming.Ability.Locked.0", Taming.environmentallyAwareUnlockLevel)));
             }
             else {
-                player.sendMessage(LocaleLoader.getString("Ability.Generic.Template", new Object[] { LocaleLoader.getString("Taming.Ability.Bonus.0"), LocaleLoader.getString("Taming.Ability.Bonus.1") }));
+                player.sendMessage(LocaleLoader.getString("Ability.Generic.Template", LocaleLoader.getString("Taming.Ability.Bonus.0"), LocaleLoader.getString("Taming.Ability.Bonus.1")));
             }
         }
 
         if (canThickFur) {
             if (skillValue < Taming.thickFurUnlockLevel) {
-                player.sendMessage(LocaleLoader.getString("Ability.Generic.Template.Lock", new Object[] { LocaleLoader.getString("Taming.Ability.Locked.1", new Object[] { Taming.thickFurUnlockLevel } ) }));
+                player.sendMessage(LocaleLoader.getString("Ability.Generic.Template.Lock", LocaleLoader.getString("Taming.Ability.Locked.1", Taming.thickFurUnlockLevel)));
             }
             else {
-                player.sendMessage(LocaleLoader.getString("Ability.Generic.Template", new Object[] { LocaleLoader.getString("Taming.Ability.Bonus.2"), LocaleLoader.getString("Taming.Ability.Bonus.3", new Object[] { Taming.thickFurModifier }) }));
+                player.sendMessage(LocaleLoader.getString("Ability.Generic.Template", LocaleLoader.getString("Taming.Ability.Bonus.2"), LocaleLoader.getString("Taming.Ability.Bonus.3", Taming.thickFurModifier)));
             }
         }
 
         if (canShockProof) {
             if (skillValue < Taming.shockProofUnlockLevel) {
-                player.sendMessage(LocaleLoader.getString("Ability.Generic.Template.Lock", new Object[] { LocaleLoader.getString("Taming.Ability.Locked.2", new Object[] { Taming.shockProofUnlockLevel } ) }));
+                player.sendMessage(LocaleLoader.getString("Ability.Generic.Template.Lock", LocaleLoader.getString("Taming.Ability.Locked.2", Taming.shockProofUnlockLevel)));
             }
             else {
-                player.sendMessage(LocaleLoader.getString("Ability.Generic.Template", new Object[] { LocaleLoader.getString("Taming.Ability.Bonus.4"), LocaleLoader.getString("Taming.Ability.Bonus.5", new Object[] { Taming.shockProofModifier }) }));
+                player.sendMessage(LocaleLoader.getString("Ability.Generic.Template", LocaleLoader.getString("Taming.Ability.Bonus.4"), LocaleLoader.getString("Taming.Ability.Bonus.5", Taming.shockProofModifier)));
             }
         }
 
         if (canSharpenedClaws) {
             if (skillValue < Taming.sharpenedClawsUnlockLevel) {
-                player.sendMessage(LocaleLoader.getString("Ability.Generic.Template.Lock", new Object[] { LocaleLoader.getString("Taming.Ability.Locked.3", new Object[] { Taming.sharpenedClawsUnlockLevel } ) }));
+                player.sendMessage(LocaleLoader.getString("Ability.Generic.Template.Lock", LocaleLoader.getString("Taming.Ability.Locked.3", Taming.sharpenedClawsUnlockLevel)));
             }
             else {
-                player.sendMessage(LocaleLoader.getString("Ability.Generic.Template", new Object[] { LocaleLoader.getString("Taming.Ability.Bonus.6"), LocaleLoader.getString("Taming.Ability.Bonus.7", new Object[] { Taming.sharpenedClawsBonusDamage }) }));
+                player.sendMessage(LocaleLoader.getString("Ability.Generic.Template", LocaleLoader.getString("Taming.Ability.Bonus.6"), LocaleLoader.getString("Taming.Ability.Bonus.7", Taming.sharpenedClawsBonusDamage)));
             }
         }
 
         if (canGore) {
             if (isLucky) {
-                player.sendMessage(LocaleLoader.getString("Taming.Combat.Chance.Gore", new Object[] { goreChance }) + LocaleLoader.getString("Perks.lucky.bonus", new Object[] { goreChanceLucky }));
+                player.sendMessage(LocaleLoader.getString("Taming.Combat.Chance.Gore", goreChance) + LocaleLoader.getString("Perks.lucky.bonus", goreChanceLucky));
             }
             else {
-                player.sendMessage(LocaleLoader.getString("Taming.Combat.Chance.Gore", new Object[] { goreChance }));
+                player.sendMessage(LocaleLoader.getString("Taming.Combat.Chance.Gore", goreChance));
             }
         }
     }

src/main/java/com/gmail/nossr50/skills/taming/TamingManager.java

@@ -33,11 +33,11 @@ public class TamingManager extends SkillManager {
 
         switch (event.getEntityType()) {
         case WOLF:
-            mcMMOPlayer.addXp(SkillType.TAMING, Taming.wolfXp);
+            mcMMOPlayer.beginXpGain(SkillType.TAMING, Taming.wolfXp);
             break;
 
         case OCELOT:
-            mcMMOPlayer.addXp(SkillType.TAMING, Taming.ocelotXp);
+            mcMMOPlayer.beginXpGain(SkillType.TAMING, Taming.ocelotXp);
             break;
 
         default:

src/main/java/com/gmail/nossr50/skills/unarmed/IronGripEventHandler.java

@@ -20,7 +20,7 @@ public class IronGripEventHandler {
     }
 
     protected void calculateSkillModifier() {
-        this.skillModifier = Misc.skillCheck(Users.getProfile(defender).getSkillLevel(SkillType.UNARMED), Unarmed.ironGripMaxBonusLevel);
+        this.skillModifier = Misc.skillCheck(Users.getPlayer(defender).getProfile().getSkillLevel(SkillType.UNARMED), Unarmed.ironGripMaxBonusLevel);
     }
 
     protected void sendAbilityMessages() {

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

@@ -76,23 +76,23 @@ public class UnarmedCommand extends SkillCommand {
         luckyEffectsDisplay();
 
         if (canBerserk) {
-            player.sendMessage(LocaleLoader.getString("Effects.Template", new Object[] { LocaleLoader.getString("Unarmed.Effect.0"), LocaleLoader.getString("Unarmed.Effect.1") }));
+            player.sendMessage(LocaleLoader.getString("Effects.Template", 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") }));
+            player.sendMessage(LocaleLoader.getString("Effects.Template", 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") }));
+            player.sendMessage(LocaleLoader.getString("Effects.Template", 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") }));
+            player.sendMessage(LocaleLoader.getString("Effects.Template", LocaleLoader.getString("Unarmed.Effect.6"), LocaleLoader.getString("Unarmed.Effect.7")));
         }
 
         if (canIronGrip) {
-            player.sendMessage(LocaleLoader.getString("Effects.Template", new Object[] { LocaleLoader.getString("Unarmed.Effect.8"), LocaleLoader.getString("Unarmed.Effect.9") }));
+            player.sendMessage(LocaleLoader.getString("Effects.Template", LocaleLoader.getString("Unarmed.Effect.8"), LocaleLoader.getString("Unarmed.Effect.9")));
         }
     }
 
@@ -104,42 +104,42 @@ public class UnarmedCommand extends SkillCommand {
     @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}) }));
+            player.sendMessage(LocaleLoader.getString("Ability.Generic.Template", LocaleLoader.getString("Unarmed.Ability.Bonus.0"), LocaleLoader.getString("Unarmed.Ability.Bonus.1", ironArmBonus)));
         }
 
         if (canDeflect) {
             if (isLucky) {
-                player.sendMessage(LocaleLoader.getString("Unarmed.Ability.Chance.ArrowDeflect", new Object[] { deflectChance }) + LocaleLoader.getString("Perks.lucky.bonus", new Object[] { deflectChanceLucky }));
+                player.sendMessage(LocaleLoader.getString("Unarmed.Ability.Chance.ArrowDeflect", deflectChance) + LocaleLoader.getString("Perks.lucky.bonus", deflectChanceLucky));
             }
             else {
-                player.sendMessage(LocaleLoader.getString("Unarmed.Ability.Chance.ArrowDeflect", new Object[] { deflectChance }));
+                player.sendMessage(LocaleLoader.getString("Unarmed.Ability.Chance.ArrowDeflect", deflectChance));
             }
         }
 
         if (canDisarm) {
             if (isLucky) {
-                player.sendMessage(LocaleLoader.getString("Unarmed.Ability.Chance.Disarm", new Object[] { disarmChance }) + LocaleLoader.getString("Perks.lucky.bonus", new Object[] { disarmChanceLucky }));
+                player.sendMessage(LocaleLoader.getString("Unarmed.Ability.Chance.Disarm", disarmChance) + LocaleLoader.getString("Perks.lucky.bonus", disarmChanceLucky));
             }
             else {
-                player.sendMessage(LocaleLoader.getString("Unarmed.Ability.Chance.Disarm", new Object[] { disarmChance }));
+                player.sendMessage(LocaleLoader.getString("Unarmed.Ability.Chance.Disarm", disarmChance));
             }
         }
 
         if (canIronGrip) {
             if (isLucky) {
-                player.sendMessage(LocaleLoader.getString("Unarmed.Ability.Chance.IronGrip", new Object[] { ironGripChance }) + LocaleLoader.getString("Perks.lucky.bonus", new Object[] { ironGripChanceLucky }));
+                player.sendMessage(LocaleLoader.getString("Unarmed.Ability.Chance.IronGrip", ironGripChance) + LocaleLoader.getString("Perks.lucky.bonus", ironGripChanceLucky));
             }
             else {
-                player.sendMessage(LocaleLoader.getString("Unarmed.Ability.Chance.IronGrip", new Object[] { ironGripChance }));
+                player.sendMessage(LocaleLoader.getString("Unarmed.Ability.Chance.IronGrip", ironGripChance));
             }
         }
 
         if (canBerserk) {
             if (hasEndurance) {
-                player.sendMessage(LocaleLoader.getString("Unarmed.Ability.Berserk.Length", new Object[] { berserkLength }) + LocaleLoader.getString("Perks.activationtime.bonus", new Object[] { berserkLengthEndurance }));
+                player.sendMessage(LocaleLoader.getString("Unarmed.Ability.Berserk.Length", berserkLength) + LocaleLoader.getString("Perks.activationtime.bonus", berserkLengthEndurance));
             }
             else {
-                player.sendMessage(LocaleLoader.getString("Unarmed.Ability.Berserk.Length", new Object[] { berserkLength }));
+                player.sendMessage(LocaleLoader.getString("Unarmed.Ability.Berserk.Length", berserkLength));
             }
         }
     }

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

@@ -122,11 +122,11 @@ public enum AbilityType {
     }
 
     public String getAbilityPlayer(Player player) {
-        return LocaleLoader.getString(this.abilityPlayer, new Object[] {player.getName()});
+        return LocaleLoader.getString(this.abilityPlayer, player.getName());
     }
 
     public String getAbilityPlayerOff(Player player) {
-        return LocaleLoader.getString(this.abilityPlayerOff, new Object[] {player.getName()});
+        return LocaleLoader.getString(this.abilityPlayerOff, player.getName());
     }
 
     public String getAbilityRefresh() {

src/main/java/com/gmail/nossr50/skills/utilities/CombatTools.java

@@ -26,6 +26,7 @@ import com.gmail.nossr50.datatypes.PlayerProfile;
 import com.gmail.nossr50.events.fake.FakeEntityDamageByEntityEvent;
 import com.gmail.nossr50.events.fake.FakeEntityDamageEvent;
 import com.gmail.nossr50.locale.LocaleLoader;
+import com.gmail.nossr50.mods.ModChecks;
 import com.gmail.nossr50.party.PartyManager;
 import com.gmail.nossr50.skills.acrobatics.Acrobatics;
 import com.gmail.nossr50.skills.acrobatics.AcrobaticsManager;
@@ -271,11 +272,6 @@ public final class CombatTools {
                     AcrobaticsManager acrobaticsManager = new AcrobaticsManager(Users.getPlayer(player));
                     acrobaticsManager.dodgeCheck(event);
                 }
-
-                if (Unarmed.pvpEnabled && heldItem.getType() == Material.AIR && Permissions.deflect(player)) {
-                    UnarmedManager unarmedManager = new UnarmedManager(Users.getPlayer(player));
-                    unarmedManager.deflectCheck(event);
-                }
             }
             else {
                 if (Swords.pveEnabled && damager instanceof LivingEntity && ItemChecks.isSword(heldItem) && Permissions.counterAttack(player)) {
@@ -308,8 +304,16 @@ public final class CombatTools {
             ArcheryManager archeryManager = new ArcheryManager(mcMMOPlayer);
             archeryManager.skillShot(event);
 
-            if (target instanceof Player && Permissions.daze(shooter)) {
-                archeryManager.dazeCheck((Player) target, event);
+            if (target instanceof Player) {
+                if (Unarmed.pvpEnabled && ((Player) target).getItemInHand().getType() == Material.AIR && Permissions.deflect((Player) target)) {
+                    UnarmedManager unarmedManager = new UnarmedManager(Users.getPlayer((Player) target));
+                    unarmedManager.deflectCheck(event);
+                }
+
+
+                if (Permissions.daze(shooter)) {
+                    archeryManager.dazeCheck((Player) target, event);
+                }
             }
 
             if (!(shooter.getItemInHand().containsEnchantment(Enchantment.ARROW_INFINITE)) && Permissions.trackArrows(shooter)) {
@@ -450,13 +454,18 @@ public final class CombatTools {
 
             Player defender = (Player) target;
 
-            if (System.currentTimeMillis() >= Users.getProfile(defender).getRespawnATS() + 5) {
+            if (System.currentTimeMillis() >= Users.getPlayer(defender).getProfile().getRespawnATS() + 5) {
                 baseXP = 20 * configInstance.getPlayerVersusPlayerXP();
             }
         }
         else if (!mcMMO.placeStore.isSpawnedMob(target)) {
             if (target instanceof Animals && !mcMMO.placeStore.isSpawnedPet(target)) {
-                baseXP = configInstance.getAnimalsXP();
+                if (ModChecks.isCustomEntity(target)) {
+                    baseXP = ModChecks.getCustomEntity(target).getXpMultiplier();
+                }
+                else {
+                    baseXP = configInstance.getAnimalsXP();
+                }
             }
             else {
                 EntityType type = target.getType();
@@ -542,7 +551,16 @@ public final class CombatTools {
                     baseXP = configInstance.getZombieXP();
                     break;
 
+                // Temporary workaround for custom entities
+                case UNKNOWN:
+                    baseXP = 1.0;
+                    break;
+
                 default:
+                    if (ModChecks.isCustomEntity(target)) {
+                        baseXP = ModChecks.getCustomEntity(target).getXpMultiplier();
+                    }
+
                     break;
                 }
             }
@@ -566,7 +584,11 @@ public final class CombatTools {
         if (entity instanceof Player) {
             Player defender = (Player) entity;
 
-            if (!defender.getWorld().getPVP() || defender == player || PartyManager.inSameParty(player, defender) || Users.getProfile(defender).getGodMode()) {
+            if (!defender.getWorld().getPVP() || defender == player || Users.getPlayer(defender).getProfile().getGodMode()) {
+                return false;
+            }
+
+            if (PartyManager.inSameParty(player, defender) && !(Permissions.friendlyFire(player) && Permissions.friendlyFire(defender))) {
                 return false;
             }
 
@@ -580,7 +602,12 @@ public final class CombatTools {
         }
         else if (entity instanceof Tameable) {
             if (Misc.isFriendlyPet(player, (Tameable) entity)) {
-                return false;
+                // isFriendlyPet ensures that the Tameable is: Tamed, owned by a player, and the owner is in the same party
+                // So we can make some assumptions here, about our casting and our check
+                Player owner = (Player) ((Tameable) entity).getOwner();
+                if (!(Permissions.friendlyFire(player) && Permissions.friendlyFire(owner))) {
+                    return false;
+                }
             }
         }
 

src/main/java/com/gmail/nossr50/skills/utilities/SkillTools.java

@@ -27,7 +27,8 @@ public class SkillTools {
     public static boolean abilitiesEnabled = Config.getInstance().getAbilitiesEnabled();
 
     public static void handleFoodSkills(Player player, SkillType skill, FoodLevelChangeEvent event, int baseLevel, int maxLevel, int rankChange) {
-        int skillLevel = Users.getProfile(player).getSkillLevel(skill);
+        int skillLevel = Users.getPlayer(player).getProfile().getSkillLevel(skill);
+
         int currentFoodLevel = player.getFoodLevel();
         int newFoodLevel = event.getFoodLevel();
         int foodChange = newFoodLevel - currentFoodLevel;
@@ -38,14 +39,7 @@ public class SkillTools {
             }
         }
 
-        /* Make sure we don't go over the max value */
-        newFoodLevel = currentFoodLevel + foodChange;
-        if (newFoodLevel > 20) {
-            event.setFoodLevel(20);
-        }
-        else {
-            event.setFoodLevel(newFoodLevel);
-        }
+        event.setFoodLevel(currentFoodLevel + foodChange);
     }
 
     /**
@@ -130,7 +124,7 @@ public class SkillTools {
             return;
         }
 
-        PlayerProfile profile = Users.getProfile(player);
+        PlayerProfile profile = Users.getPlayer(player).getProfile();
         AbilityType ability = skill.getAbility();
         ToolType tool = skill.getTool();
         ItemStack inHand = player.getItemInHand();
@@ -160,7 +154,7 @@ public class SkillTools {
         if (ability.getPermissions(player) && tool.inHand(inHand) && !profile.getToolPreparationMode(tool)) {
             if (skill != SkillType.WOODCUTTING && skill != SkillType.AXES) {
                 if (!profile.getAbilityMode(ability) && !cooldownOver(profile.getSkillDATS(ability) * Misc.TIME_CONVERSION_FACTOR, ability.getCooldown(), player)) {
-                    player.sendMessage(LocaleLoader.getString("Skills.TooTired", new Object[] { calculateTimeLeft(profile.getSkillDATS(ability) * Misc.TIME_CONVERSION_FACTOR, ability.getCooldown(), player) }));
+                    player.sendMessage(LocaleLoader.getString("Skills.TooTired", calculateTimeLeft(profile.getSkillDATS(ability) * Misc.TIME_CONVERSION_FACTOR, ability.getCooldown(), player)));
                     return;
                 }
             }
@@ -252,20 +246,20 @@ public class SkillTools {
 
                     /* Update custom titles */
                     if (SpoutConfig.getInstance().getShowPowerLevel()) {
-                        spoutPlayer.setTitle(LocaleLoader.getString("Spout.Title", new Object[] {spoutPlayer.getName(), Users.getPlayer(player).getPowerLevel()} ));
+                        spoutPlayer.setTitle(LocaleLoader.getString("Spout.Title", spoutPlayer.getName(), Users.getPlayer(player).getPowerLevel()));
                     }
                 }
                 else {
-                    player.sendMessage(LocaleLoader.getString(capitalized + ".Skillup", new Object[] {String.valueOf(skillups), profile.getSkillLevel(skillType)}));
+                    player.sendMessage(LocaleLoader.getString(capitalized + ".Skillup", String.valueOf(skillups), profile.getSkillLevel(skillType)));
                 }
             }
             else {
-                player.sendMessage(LocaleLoader.getString(capitalized + ".Skillup", new Object[] {String.valueOf(skillups), profile.getSkillLevel(skillType)}));
+                player.sendMessage(LocaleLoader.getString(capitalized + ".Skillup", String.valueOf(skillups), profile.getSkillLevel(skillType)));
             }
         }
 
         if (mcMMO.spoutEnabled) {
-            SpoutPlayer spoutPlayer = (SpoutPlayer) player;
+            SpoutPlayer spoutPlayer = SpoutManager.getPlayer(player);
 
             if (spoutPlayer != null && spoutPlayer.isSpoutCraftEnabled()) {
                 if (SpoutConfig.getInstance().getXPBarEnabled()) {
@@ -275,39 +269,6 @@ public class SkillTools {
         }
     }
 
-    /**
-     * Check XP of all skills.
-     *
-     * @param player The player to check XP for.
-     * @param profile The profile of the player whose skill to check
-     */
-    public static void xpCheckAll(Player player, PlayerProfile profile) {
-        for (SkillType skillType : SkillType.values()) {
-            //Don't want to do anything with this one
-            if (skillType == SkillType.ALL || skillType.isChildSkill()) {
-                continue;
-            }
-
-            xpCheckSkill(skillType, player, profile);
-        }
-    }
-
-    /**
-     * Get the skill represented by the given string
-     *
-     * @param skillName The name of the skill
-     * @return the SkillType if it exists, null otherwise
-     */
-    public static SkillType getSkillType(String skillName) {
-        for (SkillType x : SkillType.values()) {
-            if (x.toString().equalsIgnoreCase(skillName)) {
-                return x;
-            }
-        }
-
-        return null;
-    }
-
     /**
      * Checks if the given string represents a valid skill
      *
@@ -315,7 +276,7 @@ public class SkillTools {
      * @return true if this is a valid skill, false otherwise
      */
     public static boolean isSkill(String skillName) {
-        if (getSkillType(skillName) != null) {
+        if (SkillType.getSkill(skillName) != null) {
             return true;
         }
 
@@ -421,7 +382,7 @@ public class SkillTools {
      * @param type The skill the ability is based on
      */
     public static void abilityCheck(Player player, SkillType type) {
-        PlayerProfile profile = Users.getProfile(player);
+        PlayerProfile profile = Users.getPlayer(player).getProfile();
         ToolType tool = type.getTool();
         AbilityType ability = type.getAbility();
 
@@ -432,7 +393,7 @@ public class SkillTools {
          */
         if (type == SkillType.WOODCUTTING || type == SkillType.AXES) {
             if (!profile.getAbilityMode(ability) && !cooldownOver(profile.getSkillDATS(ability) * Misc.TIME_CONVERSION_FACTOR, ability.getCooldown(), player)) {
-                player.sendMessage(LocaleLoader.getString("Skills.TooTired", new Object[] { calculateTimeLeft(profile.getSkillDATS(ability) * Misc.TIME_CONVERSION_FACTOR, ability.getCooldown(), player) }));
+                player.sendMessage(LocaleLoader.getString("Skills.TooTired", calculateTimeLeft(profile.getSkillDATS(ability) * Misc.TIME_CONVERSION_FACTOR, ability.getCooldown(), player)));
                 return;
             }
         }

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

@@ -8,7 +8,6 @@ import com.gmail.nossr50.util.Users;
 
 public enum SkillType {
     ACROBATICS(Config.getInstance().getLevelCapAcrobatics(), Config.getInstance().getFormulaMultiplierAcrobatics()),
-    ALL, //This one is just for convenience
     ARCHERY(Config.getInstance().getLevelCapArchery(), Config.getInstance().getFormulaMultiplierArchery()),
     AXES(AbilityType.SKULL_SPLIITER, Config.getInstance().getLevelCapAxes(), ToolType.AXE, Config.getInstance().getFormulaMultiplierAxes()),
     EXCAVATION(AbilityType.GIGA_DRILL_BREAKER, Config.getInstance().getLevelCapExcavation(), ToolType.SHOVEL, Config.getInstance().getFormulaMultiplierExcavation()),
@@ -120,11 +119,7 @@ public enum SkillType {
     }
 
     public static SkillType getSkill(String skillName) {
-        if (skillName.equalsIgnoreCase("powerlevel") || skillName.equalsIgnoreCase("all")) {
-            return SkillType.ALL;
-        }
-
-        for (SkillType type : SkillType.values()) {
+        for (SkillType type : values()) {
             if (type.name().equalsIgnoreCase(skillName)) {
                 return type;
             }
@@ -141,7 +136,8 @@ public enum SkillType {
      * @return the player's skill level
      */
     public int getSkillLevel(Player player) {
-        return Users.getProfile(player).getSkillLevel(this);
+        // TODO: Child skills aren't handled here
+        return Users.getPlayer(player).getProfile().getSkillLevel(this);
     }
 
     // TODO: This is a little "hacky", we probably need to add something to distinguish child skills in the enum, or to use another enum for them

src/main/java/com/gmail/nossr50/skills/utilities/ToolType.java

@@ -42,7 +42,7 @@ public enum ToolType {
             return ItemChecks.isAxe(is);
 
         case FISTS:
-            return is.getType().equals(Material.AIR);
+            return is.getType() == Material.AIR;
 
         case HOE:
             return ItemChecks.isHoe(is);

src/main/java/com/gmail/nossr50/skills/woodcutting/TreeFeller.java

@@ -220,6 +220,6 @@ public final class TreeFeller {
             block.setType(Material.AIR);
         }
 
-        mcMMOPlayer.addXp(SkillType.WOODCUTTING, xp);
+        mcMMOPlayer.beginXpGain(SkillType.WOODCUTTING, xp);
     }
 }

src/main/java/com/gmail/nossr50/skills/woodcutting/Woodcutting.java

@@ -80,7 +80,7 @@ public final class Woodcutting {
             checkForDoubleDrop(mcMMOPlayer, block);
         }
 
-        mcMMOPlayer.addXp(SkillType.WOODCUTTING, xp);
+        mcMMOPlayer.beginXpGain(SkillType.WOODCUTTING, xp);
     }
 
     /**
@@ -131,7 +131,7 @@ public final class Woodcutting {
         Player player = mcMMOPlayer.getPlayer();
         double configDoubleDropChance = ADVANCED_CONFIG.getWoodcuttingDoubleDropChance();
         int configDoubleDropMaxLevel = ADVANCED_CONFIG.getWoodcuttingDoubleDropMaxLevel();
-        int probability = (int) ((configDoubleDropChance / configDoubleDropMaxLevel) * Users.getProfile(player).getSkillLevel(SkillType.WOODCUTTING));
+        int probability = (int) ((configDoubleDropChance / configDoubleDropMaxLevel) * Users.getPlayer(player).getProfile().getSkillLevel(SkillType.WOODCUTTING));
         int activationChance = Misc.calculateActivationChance(Permissions.luckyWoodcutting(player));
 
         if (probability > configDoubleDropChance) {