Reimplement Impact event

- Added custom events for Skill Shot and Daze.
- Archery metadata is now stored directly as a location, rather than a
string.
- Fixed bug where arrows weren't properly tracked.
- Use HashMap instead of ArrayList for entity tracking.

.gitattributes

@@ -0,0 +1,4 @@
+* text=auto
+
+*.png binary
+*.wav binary

.gitignore

@@ -1,42 +1,42 @@
-# Eclipse stuff
+# Eclipse stuff
-/.classpath
+/.classpath
-/.project
+/.project
-/.settings
+/.settings
-
+
-# netbeans
+# netbeans
-/nbproject
+/nbproject
-
+
-# we use maven!
+# we use maven!
-/build.xml
+/build.xml
-
+
-# maven
+# maven
-/target
+/target
-
+
-# vim
+# vim
-.*.sw[a-p]
+.*.sw[a-p]
-
+
-# various other potential build files
+# various other potential build files
-/build
+/build
-/bin
+/bin
-/dist
+/dist
-/manifest.mf
+/manifest.mf
-
+
-/world
+/world
-
+
-# Mac filesystem dust
+# Mac filesystem dust
-/.DS_Store
+*.DS_Store
-
+
-# intellij
+# intellij
-*.iml
+*.iml
-*.ipr
+*.ipr
-*.iws
+*.iws
-.idea/
+.idea/
-
+
-# Project Stuff
+# Project Stuff
-/src/main/resources/mcMMO
+/src/main/resources/mcMMO
-
+
-# Other Libraries
+# Other Libraries
-*.jar
+*.jar
-
+
-# Atlassian Stuff
+# Atlassian Stuff
-/atlassian-ide-plugin.xml
+/atlassian-ide-plugin.xml

README.creole

@@ -1,24 +0,0 @@
-== mcMMO
-**The RPG lovers mod**
-
-=== Brief Description
-mcMMO takes core Minecraft game mechanics and expands them to add an extensive RPG experience, the goal of the project has always been a quality RPG experience. Everything in mcMMO is carefully thought out and is constantly improving. mcMMO adds eleven skills to train in and level in, while also offering a high level of customization for server admins. There are countless features, including custom sounds, graphical elements, and more added when running mcMMO in conjunction with Spout. I carefully read feedback and evaluate the mechanics of mcMMO in every update to provide an ever-evolving experience.
-
-If you want an original RPG experience like no other mod out there, mcMMO is for you.
-
-=== About the Developer
-I've always wanted to make games and in the last year I decided to take a swing at developing Minecraft mods as a platform to teach myself programming, the biggest project I have made to date is mcMMO. I went from knowing nothing about Java to what I know now purely from modding Minecraft, and I plan to move onto game development in the not so distant future.
-
-I take design very seriously, I am not the kind of person who can be satisfied giving a project anything less than my all. As you will see reflected in the quality of the mods I make, I take great care in my work.
-
-Hearing that people enjoy mcMMO and seeing the daily youtube videos about my mod has become a joy, I really can't believe how popular my mod has gotten!
-
-=== Compiling
-
-Required Libraries:
-* Spout API
-
-Required to Run:
-* Bukkit
-
-http://dev.bukkit.org/server-mods/mcmmo for more up to date information.

README.md

@@ -0,0 +1,46 @@
+# mcMMO
+## The RPG lovers mod
+
+### Dev builds
+Our latest development builds are available ~~[here](http://ci.mcmmo.info)~~. Unfortunately, the mcMMO site is down; a temporary dev build location is hosted [here](http://ci.ecocitycraft.com/job/mcMMO/).
+
+### Brief Description
+The goal of mcMMO is to take core Minecraft game mechanics and expand them into add an extensive and quality RPG experience. Everything in mcMMO has been carefully thought out and is constantly being improved upon. Currently, mcMMO adds thirteen unique skills to train and level in. Each of these skills is highly customizable through our configuration files, allowing server admins to tweak mcMMO to best suit the needs of his or her server. Know that the mcMMO team is dedicated to providing an ever-evolving experience, and that we carefully read all feedback and bug reports in order to evaluate and balance the mechanics of mcMMO in every update.
+
+## About the Team
+
+mcMMO is currently developed by a team of individuals from all over the world.
+### Glorious Leader
+[![gmcferrin](http://www.gravatar.com/avatar/b64c52daf25d206b27650788b5813b7b.png)]
+(https://github.com/gmcferrin)
+
+### Developers
+[![bm01](http://www.gravatar.com/avatar/ec8146f5358177f12e9a252271bbc391.png)]
+(https://github.com/bm01)
+[![Glitchfinder](http://www.gravatar.com/avatar/5aa4cce22f72ae9c002ecec30f061d00.png)]
+(https://github.com/Glitchfinder)
+[![nossr50](http://www.gravatar.com/avatar/f2ee41eedfd645fb4a3a2c8f6cb1b18c.png)]
+(https://github.com/nossr50)
+[![NuclearW](http://www.gravatar.com/avatar/90926bdcf1c8a75918df5ea5fa801ce6.png)]
+(https://github.com/NuclearW)
+[![shatteredbeam](http://www.gravatar.com/avatar/cad3b5d7d39cf5387afb87f494389610.png)]
+(https://github.com/shatteredbeam)
+[![TfT_02](http://www.gravatar.com/avatar/b8914f9970e1f6ffd5281ce4770e20a7.png)]
+(https://github.com/TfT-02)
+[![t00thpick1](http://www.gravatar.com/avatar/ee23c7794a0c40120c3474287c7bce06.png)]
+(https://github.com/t00thpick1)
+[![riking](https://1.gravatar.com/avatar/aca9f37e569ac3a63929920035a91ba4.png)]
+(https://github.com/riking)
+
+## Compiling
+
+mcMMO uses Maven 3 to manage dependancies, packaging, and shading of necessary classes; Maven 3 is required to compile mcMMO.
+
+The typical command used to build mcMMO is: `mvn clean package install`
+
+Required Libraries:
+* JUnit
+* EMetrics
+* Bukkit
+
+http://dev.bukkit.org/server-mods/mcmmo for more up to date information.

extras/repair.chain.yml

@@ -0,0 +1,60 @@
+#
+#  Repair configuration
+#  Last updated on ${project.version}-b${BUILD_NUMBER}
+#
+# Any file named repair.*.yml in the mcmmmo folder will be loaded as a repair config
+# All repair configs have a main section titled "Repairables"
+# Afterwards, all sub-items are considered a Repairable to be loaded. The names of each subitem should be the exact material name.
+# The bare minimum of a Repairable is that it have a RepairMaterial and a MaximumDurability
+#
+# ItemType: This is the type of item to be repaired, this is only important to permissions.
+## Valid values are ARMOR, TOOL, and OTHER.
+## This defaults to OTHER.
+#
+# MaterialType: This is the type of the material of the item to be repaired, this is only important for permissions.
+## Valid values are STRING, LEATHER, WOOD, STONE, IRON, GOLD, DIAMOND, and OTHER
+## This defaults to OTHER.
+#
+# RepairMaterial: This is the material name of the item used to repair this repairable.
+## This is required to be set.
+#
+# RepairMaterialMetadata: This is the metadata of the item used to repair this repairable.
+## A value of -1 means to ignore all metadata when repairing.
+## This defaults to -1
+#
+# MaximumDurability: This is the maximum durability of the item.
+## This is required to be set.
+#
+# MinimumLevel: This is the minimum repair level needed to repair this item.
+## Valid values are => 0
+## This defaults to 0
+#
+# MinimumQuantity: This is the minimum number of items needed to repair this item ignoring all other repair bonuses.
+## This is typically the number of the repair material needed to create a new item, for example for a sword it is 2, for an axe it is 3
+## This defaults to 2
+#
+# XpMultiplier: This is the amount to multiply the xp bonus by.
+## This defaults to 1
+#
+#
+# The following is an example of a repair.*.yml config which adds the ability to repair Chainmail armor using fire.
+#
+#
+###
+Repairables:
+    #
+    # Chainmail repairables
+    ###
+    # Armor
+    CHAINMAIL_HELMET:
+        RepairMaterial: FIRE
+        XpMultiplier: 2
+    CHAINMAIL_CHESTPLATE:
+        RepairMaterial: FIRE
+        XpMultiplier: 2
+    CHAINMAIL_LEGGINGS:
+        RepairMaterial: FIRE
+        XpMultiplier: 2
+    CHAINMAIL_BOOTS:
+        RepairMaterial: FIRE
+        XpMultiplier: 2

pom.xml

@@ -1,135 +1,149 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <modelVersion>4.0.0</modelVersion>
+    <modelVersion>4.0.0</modelVersion>
-    <groupId>com.gmail.nossr50.mcMMO</groupId>
+    <groupId>com.gmail.nossr50.mcMMO</groupId>
-    <artifactId>mcMMO</artifactId>
+    <artifactId>mcMMO</artifactId>
-    <version>1.3.06-dev</version>
+    <version>1.4.08-dev1</version>
-    <name>mcMMO</name>
+    <name>mcMMO</name>
-    <url>https://github.com/mcMMO-Dev/mcMMO</url>
+    <url>https://github.com/mcMMO-Dev/mcMMO</url>
-    <issueManagement>
+    <issueManagement>
-        <url>http://issues.mcmmo.org</url>
+        <url>https://github.com/mcMMO-Dev/mcMMO/issues</url>
-        <system>JIRA</system>
+        <system>GitHub</system>
-    </issueManagement>
+    </issueManagement>
-    <build>
+    <build>
-        <finalName>mcMMO</finalName>
+        <finalName>mcMMO</finalName>
-        <sourceDirectory>${basedir}/src/main/java</sourceDirectory>
+        <sourceDirectory>${basedir}/src/main/java</sourceDirectory>
-        <resources>
+        <resources>
-            <resource>
+            <resource>
-                <targetPath>.</targetPath>
+                <targetPath>.</targetPath>
-                <filtering>true</filtering>
+                <filtering>true</filtering>
-                <directory>${basedir}/src/main/resources/</directory>
+                <directory>${basedir}/src/main/resources/</directory>
-                <includes>
+                <includes>
-                    <include>*.yml</include>
+                    <include>*.yml</include>
-                </includes>
+                    <include>.jenkins</include>
-            </resource>
+                </includes>
-            <resource>
+            </resource>
-                <targetPath>resources</targetPath>
+            <resource>
-                <filtering>false</filtering>
+                <targetPath>com/gmail/nossr50/locale</targetPath>
-                <directory>${basedir}/src/main/resources/xpbar/</directory>
+                <filtering>true</filtering>
-                <includes>
+                <directory>${basedir}/src/main/resources/locale/</directory>
-                    <include>xpbar*.png</include>
+                <includes>
-                </includes>
+                    <include>locale*.properties</include>
-            </resource>
+                </includes>
-            <resource>
+            </resource>
-                <targetPath>resources</targetPath>
+            <resource>
-                <filtering>false</filtering>
+                <targetPath>mods</targetPath>
-                <directory>${basedir}/src/main/resources/healthbar/</directory>
+                <filtering>true</filtering>
-                <includes>
+                <directory>${basedir}/src/main/resources/mods</directory>
-                    <include>health*.png</include>
+                <includes>
-                </includes>
+                    <include>*.yml</include>
-            </resource>
+                </includes>
-            <resource>
+            </resource>
-                <targetPath>resources</targetPath>
+        </resources>
-                <filtering>false</filtering>
+        <plugins>
-                <directory>${basedir}/src/main/resources/skillicon/</directory>
+            <plugin>
-                <includes>
+                <groupId>org.apache.maven.plugins</groupId>
-                    <include>*.png</include>
+                <artifactId>maven-compiler-plugin</artifactId>
-                </includes>
+                <version>2.3.2</version>
-            </resource>
+                <configuration>
-            <resource>
+                    <source>1.6</source>
-                <targetPath>resources</targetPath>
+                    <target>1.6</target>
-                <filtering>false</filtering>
+                    <excludes>
-                <directory>${basedir}/src/main/resources/sound/</directory>
+                    </excludes>
-                <includes>
+                </configuration>
-                    <include>*.wav</include>
+            </plugin>
-                </includes>
+            <plugin>
-            </resource>
+                <artifactId>maven-assembly-plugin</artifactId>
-            <resource>
+                <configuration>
-            	<targetPath>com/gmail/nossr50/locale</targetPath>
+                    <descriptors>
-            	<filtering>true</filtering>
+                        <descriptor>src/main/assembly/package.xml</descriptor>
-            	<directory>${basedir}/src/main/resources/locale/</directory>
+                    </descriptors>
-            	<includes>
+                </configuration>
-            		<include>locale*.properties</include>
+                <executions>
-            	</includes>
+                    <execution>
-            </resource>
+                        <id>build</id>
-        </resources>
+                        <phase>package</phase>
-        <plugins>
+                        <goals>
-            <plugin>
+                            <goal>single</goal>
-                <groupId>org.apache.maven.plugins</groupId>
+                        </goals>
-                <artifactId>maven-compiler-plugin</artifactId>
+                    </execution>
-                <version>2.3.2</version>
+                </executions>
-                <configuration>
+            </plugin>
-                    <source>1.6</source>
+            <plugin>
-                    <target>1.6</target>
+                <groupId>org.apache.maven.plugins</groupId>
-                    <excludes>
+                <artifactId>maven-shade-plugin</artifactId>
-                    </excludes>
+                <version>1.5</version>
-                </configuration>
+                <configuration>
-            </plugin>
+                    <artifactSet>
-            <plugin>
+                        <includes>
-                <artifactId>maven-assembly-plugin</artifactId>
+                            <include>com.turt2live.metrics:MetricsExtension</include>
-                <configuration>
+                        </includes>
-                    <descriptors>
+                    </artifactSet>
-                        <descriptor>src/main/assembly/package.xml</descriptor>
+                    <relocations>
-                    </descriptors>
+                        <relocation>
-                </configuration>
+                            <pattern>com.turt2live.metrics</pattern>
-                <executions>
+                            <shadedPattern>com.gmail.nossr50.metrics.mcstats</shadedPattern>
-                    <execution>
+                        </relocation>
-                        <id>build</id>
+                    </relocations>
-                        <phase>package</phase>
+                </configuration>
-                        <goals>
+                <executions>
-                            <goal>single</goal>
+                    <execution>
-                        </goals>
+                        <phase>package</phase>
-                    </execution>
+                        <goals>
-                </executions>
+                            <goal>shade</goal>
-            </plugin>
+                        </goals>
-        </plugins>
+                    </execution>
-    </build>
+                </executions>
-    <repositories>
+            </plugin>
-        <repository>
+        </plugins>
-            <snapshots>
+        <extensions>
-                <enabled>true</enabled>
+            <extension>
-                <updatePolicy>always</updatePolicy>
+                <groupId>org.apache.maven.wagon</groupId>
-                <checksumPolicy>fail</checksumPolicy>
+                <artifactId>wagon-file</artifactId>
-            </snapshots> 
+                <version>2.2</version>
-            <id>bukkit-repo</id>
+            </extension>
-            <url>http://repo.bukkit.org/content/groups/public/</url>
+        </extensions>
-        </repository>
+    </build>
-        <repository>
+    <repositories>
-            <snapshots>
+        <repository>
-                <enabled>true</enabled>
+            <id>bukkit-repo</id>
-                <updatePolicy>always</updatePolicy>
+            <url>http://repo.bukkit.org/content/groups/public/</url>
-                <checksumPolicy>fail</checksumPolicy>
+        </repository>
-            </snapshots> 
+        <repository>
-        	<id>spout-repo</id>
+            <id>Plugin MetricsExtension</id>
-        	<url>http://nexus.spout.org/content/groups/public/</url>
+            <url>http://repo.turt2live.com</url>
-        </repository>
+        </repository>
-    </repositories>
+    </repositories>
-    <dependencies>
+    <dependencies>
-        <dependency>
+        <dependency>
-            <groupId>org.bukkit</groupId>
+            <groupId>org.bukkit</groupId>
-            <artifactId>bukkit</artifactId>
+            <artifactId>bukkit</artifactId>
-            <version>LATEST</version>
+            <version>LATEST</version>
-            <type>jar</type>
+            <type>jar</type>
-            <scope>compile</scope>
+            <scope>compile</scope>
-        </dependency>
+        </dependency>
-        <dependency>
+        <dependency>
-            <groupId>org.getspout</groupId>
+            <groupId>junit</groupId>
-            <artifactId>spoutpluginapi</artifactId>
+            <artifactId>junit-dep</artifactId>
-            <version>dev-SNAPSHOT</version>
+            <version>4.10</version>
-            <type>jar</type>
+            <scope>test</scope>
-            <scope>compile</scope>
+        </dependency>
-        </dependency>
+        <dependency>
-    </dependencies>
+            <groupId>com.turt2live.metrics</groupId>
-    <properties>
+            <artifactId>MetricsExtension</artifactId>
-        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+            <version>0.0.5-SNAPSHOT</version>
-    </properties>
+        </dependency>
-</project>
+    </dependencies>
+    <distributionManagement>
+        <repository>
+            <id>mcmmo-repo</id>
+            <url>file:///var/lib/jenkins/repo</url>
+        </repository>
+    </distributionManagement>
+    <properties>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+    </properties>
+    <ciManagement>
+        <system>Jenkins</system>
+        <url>http://ci.ecocitycraft.com/job/mcMMO</url>
+    </ciManagement>
+</project>

src/main/assembly/package.xml

@@ -1,14 +1,14 @@
-<assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0 http://maven.apache.org/xsd/assembly-1.1.0.xsd">
+<assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0 http://maven.apache.org/xsd/assembly-1.1.0.xsd">
-	<id>bin</id>
+	<id>bin</id>
-	<includeBaseDirectory>false</includeBaseDirectory>
+	<includeBaseDirectory>false</includeBaseDirectory>
-	<formats>
+	<formats>
-		<format>zip</format>
+		<format>zip</format>
-	</formats>
+	</formats>
-	<files>
+	<files>
-		<file>
+		<file>
-			<source>${project.build.directory}/${artifactId}.jar</source>
+			<source>${project.build.directory}/${artifactId}.jar</source>
-			<outputDirectory>/</outputDirectory>
+			<outputDirectory>/</outputDirectory>
-			<destName>mcMMO.jar</destName>
+			<destName>mcMMO.jar</destName>
-		</file>
+		</file>
-	</files>
+	</files>
 </assembly>

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

@@ -0,0 +1,83 @@
+package com.gmail.nossr50.api;
+
+import org.bukkit.entity.Player;
+
+import com.gmail.nossr50.datatypes.player.McMMOPlayer;
+import com.gmail.nossr50.datatypes.skills.AbilityType;
+import com.gmail.nossr50.util.player.UserManager;
+
+public final class AbilityAPI {
+    private AbilityAPI() {}
+
+    public static boolean berserkEnabled(Player player) {
+        return UserManager.getPlayer(player).getAbilityMode(AbilityType.BERSERK);
+    }
+
+    public static boolean gigaDrillBreakerEnabled(Player player) {
+        return UserManager.getPlayer(player).getAbilityMode(AbilityType.GIGA_DRILL_BREAKER);
+    }
+
+    public static boolean greenTerraEnabled(Player player) {
+        return UserManager.getPlayer(player).getAbilityMode(AbilityType.GREEN_TERRA);
+    }
+
+    public static boolean serratedStrikesEnabled(Player player) {
+        return UserManager.getPlayer(player).getAbilityMode(AbilityType.SERRATED_STRIKES);
+    }
+
+    public static boolean skullSplitterEnabled(Player player) {
+        return UserManager.getPlayer(player).getAbilityMode(AbilityType.SKULL_SPLITTER);
+    }
+
+    public static boolean superBreakerEnabled(Player player) {
+        return UserManager.getPlayer(player).getAbilityMode(AbilityType.SUPER_BREAKER);
+    }
+
+    public static boolean treeFellerEnabled(Player player) {
+        return UserManager.getPlayer(player).getAbilityMode(AbilityType.TREE_FELLER);
+    }
+
+    public static boolean isAnyAbilityEnabled(Player player) {
+        McMMOPlayer mcMMOPlayer = UserManager.getPlayer(player);
+
+        for (AbilityType ability : AbilityType.values()) {
+            if (mcMMOPlayer.getAbilityMode(ability)) {
+                return true;
+            }
+        }
+
+        return false;
+    }
+
+    public static void resetCooldowns(Player player) {
+        UserManager.getPlayer(player).resetCooldowns();
+    }
+
+    public static void setBerserkCooldown(Player player, long cooldown) {
+        UserManager.getPlayer(player).setAbilityDATS(AbilityType.BERSERK, cooldown);
+    }
+
+    public static void setGigaDrillBreakerCooldown(Player player, long cooldown) {
+        UserManager.getPlayer(player).setAbilityDATS(AbilityType.GIGA_DRILL_BREAKER, cooldown);
+    }
+
+    public static void setGreenTerraCooldown(Player player, long cooldown) {
+        UserManager.getPlayer(player).setAbilityDATS(AbilityType.GREEN_TERRA, cooldown);
+    }
+
+    public static void setSerratedStrikesCooldown(Player player, long cooldown) {
+        UserManager.getPlayer(player).setAbilityDATS(AbilityType.SERRATED_STRIKES, cooldown);
+    }
+
+    public static void setSkullSplitterCooldown(Player player, long cooldown) {
+        UserManager.getPlayer(player).setAbilityDATS(AbilityType.SKULL_SPLITTER, cooldown);
+    }
+
+    public static void setSuperBreakerCooldown(Player player, long cooldown) {
+        UserManager.getPlayer(player).setAbilityDATS(AbilityType.SUPER_BREAKER, cooldown);
+    }
+
+    public static void setTreeFellerCooldown(Player player, long cooldown) {
+        UserManager.getPlayer(player).setAbilityDATS(AbilityType.TREE_FELLER, cooldown);
+    }
+}

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

@@ -1,43 +1,45 @@
 package com.gmail.nossr50.api;
 
-import org.bukkit.Bukkit;
-import org.bukkit.ChatColor;
 import org.bukkit.entity.Player;
+import org.bukkit.plugin.Plugin;
 
-import com.gmail.nossr50.events.chat.McMMOAdminChatEvent;
+import com.gmail.nossr50.chat.ChatManager;
-import com.gmail.nossr50.events.chat.McMMOPartyChatEvent;
+import com.gmail.nossr50.chat.ChatManagerFactory;
-import com.gmail.nossr50.util.Users;
+import com.gmail.nossr50.chat.PartyChatManager;
-import com.gmail.nossr50.util.mcPermissions;
+import com.gmail.nossr50.datatypes.chat.ChatMode;
+import com.gmail.nossr50.party.PartyManager;
+import com.gmail.nossr50.util.player.UserManager;
+
+public final class ChatAPI {
+    private ChatAPI() {}
 
-public class ChatAPI {
     /**
      * Send a message to all members of a party
      * </br>
      * This function is designed for API usage.
      *
+     * @param plugin The plugin sending the message
+     * @param sender The name of the sender
+     * @param displayName The display name of the sender
+     * @param party The name of the party to send to
+     * @param message The message to send
+     */
+    public static void sendPartyChat(Plugin plugin, String sender, String displayName, String party, String message) {
+        getPartyChatManager(plugin, party).handleChat(sender, displayName, message);
+    }
+
+    /**
+     * Send a message to all members of a party
+     * </br>
+     * This function is designed for API usage.
+     *
+     * @param plugin The plugin sending the message
      * @param sender The name of the sender to display in the chat
      * @param party The name of the party to send to
      * @param message The message to send
      */
-    public void sendPartyChat(String sender, String party, String message) {
+    public static void sendPartyChat(Plugin plugin, String sender, String party, String message) {
-        McMMOPartyChatEvent chatEvent = new McMMOPartyChatEvent(sender, party, message);
+        getPartyChatManager(plugin, party).handleChat(sender, message);
-        Bukkit.getPluginManager().callEvent(chatEvent);
-
-        if (chatEvent.isCancelled()) {
-            return;
-        }
-
-        String pPrefix = ChatColor.GREEN + "(" + ChatColor.WHITE + chatEvent.getSender() + ChatColor.GREEN + ") ";
-
-        Bukkit.getLogger().info("[P](" + chatEvent.getParty() + ")" + "<" + chatEvent.getSender() + "> " + chatEvent.getMessage());
-
-        for (Player player : Bukkit.getServer().getOnlinePlayers()) {
-            if (Users.getProfile(player).inParty()) {
-                if (Users.getProfile(player).getParty().equalsIgnoreCase(chatEvent.getParty())) {
-                    player.sendMessage(pPrefix + chatEvent.getMessage());
-                }
-            }
-        }
     }
 
     /**
@@ -45,24 +47,108 @@ public class ChatAPI {
      * </br>
      * This function is designed for API usage.
      *
+     * @param plugin The plugin sending the message
+     * @param sender The name of the sender
+     * @param displayName The display name of the sender
+     * @param message The message to send
+     */
+    public static void sendAdminChat(Plugin plugin, String sender, String displayName, String message) {
+        ChatManagerFactory.getChatManager(plugin, ChatMode.ADMIN).handleChat(sender, displayName, message);
+    }
+
+    /**
+     * Send a message to administrators
+     * </br>
+     * This function is designed for API usage.
+     *
+     * @param plugin The plugin sending the message
      * @param sender The name of the sender to display in the chat
      * @param message The message to send
      */
-    public void sendAdminChat(String sender, String message) {
+    public static void sendAdminChat(Plugin plugin, String sender, String message) {
-        McMMOAdminChatEvent chatEvent = new McMMOAdminChatEvent(sender, message);
+        ChatManagerFactory.getChatManager(plugin, ChatMode.ADMIN).handleChat(sender, message);
-        Bukkit.getPluginManager().callEvent(chatEvent);
+    }
 
-        if (chatEvent.isCancelled()) {
+    /**
-            return;
+     * 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 UserManager.getPlayer(player).isChatEnabled(ChatMode.PARTY);
+    }
 
-        String aPrefix = ChatColor.AQUA + "{" + ChatColor.WHITE + chatEvent.getSender() + ChatColor.AQUA + "} ";
+    /**
+     * 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 UserManager.getPlayer(playerName).isChatEnabled(ChatMode.PARTY);
+    }
 
-        Bukkit.getLogger().info("[A]<" + chatEvent.getSender() + "> " + chatEvent.getMessage());
+    /**
+     * 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 UserManager.getPlayer(player).isChatEnabled(ChatMode.ADMIN);
+    }
 
-        for (Player player : Bukkit.getServer().getOnlinePlayers()) {
+    /**
-            if (mcPermissions.getInstance().adminChat(player) || player.isOp())
+     * Check if a player is currently talking in admin chat.
-                player.sendMessage(aPrefix + chatEvent.getMessage());
+     *
-        }
+     * @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 UserManager.getPlayer(playerName).isChatEnabled(ChatMode.ADMIN);
+    }
+
+    /**
+     * Toggle the party chat mode of a player.
+     *
+     * @param player The player to toggle party chat on.
+     */
+    public static void togglePartyChat(Player player) {
+        UserManager.getPlayer(player).toggleChat(ChatMode.PARTY);
+    }
+
+    /**
+     * Toggle the party chat mode of a player.
+     *
+     * @param playerName The name of the player to toggle party chat on.
+     */
+    public static void togglePartyChat(String playerName) {
+        UserManager.getPlayer(playerName).toggleChat(ChatMode.PARTY);
+    }
+
+    /**
+     * Toggle the admin chat mode of a player.
+     *
+     * @param player The player to toggle admin chat on.
+     */
+    public static void toggleAdminChat(Player player) {
+        UserManager.getPlayer(player).toggleChat(ChatMode.ADMIN);
+    }
+
+    /**
+     * Toggle the admin chat mode of a player.
+     *
+     * @param playerName The name of the player to toggle party chat on.
+     */
+    public static void toggleAdminChat(String playerName) {
+        UserManager.getPlayer(playerName).toggleChat(ChatMode.ADMIN);
+    }
+
+    private static ChatManager getPartyChatManager(Plugin plugin, String party) {
+        ChatManager chatManager = ChatManagerFactory.getChatManager(plugin, ChatMode.PARTY);
+        ((PartyChatManager) chatManager).setParty(PartyManager.getParty(party));
+
+        return chatManager;
     }
 }

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

@@ -1,136 +1,618 @@
-package com.gmail.nossr50.api;
+package com.gmail.nossr50.api;
-
+
-import org.bukkit.entity.Player;
+import java.util.Set;
-
+
-import com.gmail.nossr50.datatypes.SkillType;
+import org.bukkit.entity.Player;
-import com.gmail.nossr50.util.Skills;
+
-import com.gmail.nossr50.util.Users;
+import com.gmail.nossr50.mcMMO;
-
+import com.gmail.nossr50.api.exceptions.InvalidPlayerException;
-public class ExperienceAPI {
+import com.gmail.nossr50.api.exceptions.InvalidSkillException;
-
+import com.gmail.nossr50.config.Config;
-    /**
+import com.gmail.nossr50.config.experience.ExperienceConfig;
-     * Check the XP of a player. This should be called after giving XP to process level-ups.
+import com.gmail.nossr50.datatypes.player.PlayerProfile;
-     *
+import com.gmail.nossr50.datatypes.skills.SkillType;
-     * @param player The player to check
+import com.gmail.nossr50.skills.child.FamilyTree;
-     * @param skillType The skill to check
+import com.gmail.nossr50.util.player.UserManager;
-     */
+
-    private void checkXP(Player player, SkillType skillType) {
+public final class ExperienceAPI {
-        if (skillType.equals(SkillType.ALL)) {
+    private ExperienceAPI() {}
-            Skills.XpCheckAll(player);
+
-        }
+    /**
-        else {
+     * Returns whether given string is a valid type of skill suitable for the
-            Skills.XpCheckSkill(skillType, player);
+     * other API calls in this class.
-        }
+     * </br>
-    }
+     * This function is designed for API usage.
-
+     *
-    /**
+     * @param skillType A string that may or may not be a skill
-     * Adds XP to the player, doesn't calculate for XP Rate or other modifiers.
+     * @return true if this is a valid mcMMO skill
-     * </br>
+     */
-     * This function is designed for API usage.
+    public static boolean isValidSkillType(String skillType) {
-     *
+        return SkillType.getSkill(skillType) != null;
-     * @param player The player to add XP to
+    }
-     * @param skillType The skill to add XP to
+
-     * @param XP The amount of XP to add
+    /**
-     */
+     * Returns whether the given skill type string is both valid and not a
-    public void addRawXP(Player player, SkillType skillType, int XP) {
+     * child skill. (Child skills have no XP of their own, and their level is
-        Users.getProfile(player).addXPOverride(skillType, XP);
+     * derived from the parent(s).)
-        checkXP(player, skillType);
+     * </br>
-    }
+     * This function is designed for API usage.
-
+     *
-    /**
+     * @param skillType the skill to check
-     * Adds XP to the player, calculates for XP Rate but not skill modifiers.
+     * @return true if this is a valid, non-child mcMMO skill
-     * </br>
+     */
-     * This function is designed for API usage.
+    public static boolean isNonChildSkill(String skillType) {
-     *
+        SkillType skill = SkillType.getSkill(skillType);
-     * @param player The player to add XP to
+
-     * @param skillType The skill to add XP to
+        if (skill == null) return false;
-     * @param XP The amount of XP to add
+
-     */
+        return !skill.isChildSkill();
-    public void addMultipliedXP(Player player, SkillType skillType, int XP) {
+    }
-        Users.getProfile(player).addXPOverrideBonus(skillType, XP);
+
-        checkXP(player, skillType);
+    @Deprecated
-    }
+    public static void addRawXP(Player player, String skillType, int XP) {
-
+        addRawXP(player, skillType, (float) XP);
-    /**
+    }
-     * Adds XP to the player, calculates for XP Rate and skill modifiers.
+
-     * </br>
+    /**
-     * This function is designed for API usage.
+     * Adds raw XP to the player.
-     *
+     * </br>
-     * @param player The player to add XP to
+     * This function is designed for API usage.
-     * @param skillType The skill to add XP to
+     *
-     * @param XP The amount of XP to add
+     * @param player The player to add XP to
-     */
+     * @param skillType The skill to add XP to
-    public void addXP(Player player, SkillType skillType, int XP) {
+     * @param XP The amount of XP to add
-        Users.getProfile(player).addXP(skillType, XP);
+     *
-        checkXP(player, skillType);
+     * @throws InvalidSkillException if the given skill is not valid
-    }
+     */
-
+    public static void addRawXP(Player player, String skillType, float XP) {
-    /**
+        UserManager.getPlayer(player).applyXpGain(getSkillType(skillType), XP);
-     * Get the amount of XP a player has in a specific skill.
+    }
-     * </br>
+
-     * This function is designed for API usage.
+    @Deprecated
-     *
+    public static void addRawXPOffline(String playerName, String skillType, int XP) {
-     * @param player The player to get XP for
+        addRawXPOffline(playerName, skillType, (float) XP);
-     * @param skillType The skill to get XP for
+    }
-     * @return the amount of XP in a given skill
+
-     */
+    /**
-    public int getXP(Player player, SkillType skillType) {
+     * Adds raw XP to an offline player.
-        return Users.getProfile(player).getSkillXpLevel(skillType);
+     * </br>
-    }
+     * This function is designed for API usage.
-
+     *
-    /**
+     * @param playerName The player to add XP to
-     * Get the amount of XP left before leveling up.
+     * @param skillType The skill to add XP to
-     * </br>
+     * @param XP The amount of XP to add
-     * This function is designed for API usage.
+     *
-     *
+     * @throws InvalidSkillException if the given skill is not valid
-     * @param player The player to get the XP amount for
+     * @throws InvalidPlayerException if the given player does not exist in the database
-     * @param skillType The skill to get the XP amount for
+     */
-     * @return the amount of XP left before leveling up a specifc skill
+    public static void addRawXPOffline(String playerName, String skillType, float XP) {
-     */
+        addOfflineXP(playerName, getSkillType(skillType), (int) Math.floor(XP));
-    public int getXPToNextLevel(Player player, SkillType skillType) {
+    }
-        return Users.getProfile(player).getXpToLevel(skillType);
+
-    }
+    /**
-
+     * Adds XP to the player, calculates for XP Rate only.
-    /**
+     * </br>
-     * Add levels to a skill.
+     * This function is designed for API usage.
-     * </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 player The player to add levels to
+     * @param XP The amount of XP to add
-     * @param skillType Type of skill to add levels to
+     *
-     * @param levels Number of levels to add
+     * @throws InvalidSkillException if the given skill is not valid
-     * @param notify True if this should fire a level up notification, false otherwise.
+     */
-     */
+    public static void addMultipliedXP(Player player, String skillType, int XP) {
-    public void addLevel(Player player, SkillType skillType, int levels, boolean notify) {
+        UserManager.getPlayer(player).applyXpGain(getSkillType(skillType), (int) (XP * ExperienceConfig.getInstance().getExperienceGainsGlobalMultiplier()));
-        Users.getProfile(player).addLevels(skillType, levels);
+    }
-
+
-        if (notify) {
+    /**
-            checkXP(player, skillType);
+     * Adds XP to an offline player, calculates for XP Rate only.
-        }
+     * </br>
-    }
+     * This function is designed for API usage.
-
+     *
-    /**
+     * @param playerName The player to add XP to
-     * Get the level a player has in a specific skill.
+     * @param skillType The skill to add XP to
-     * </br>
+     * @param XP The amount of XP to add
-     * This function is designed for API usage.
+     *
-     *
+     * @throws InvalidSkillException if the given skill is not valid
-     * @param player The player to get the level for
+     * @throws InvalidPlayerException if the given player does not exist in the database
-     * @param skillType The skill to get the level for
+     */
-     * @return the level of a given skill
+    public static void addMultipliedXPOffline(String playerName, String skillType, int XP) {
-     */
+        addOfflineXP(playerName, getSkillType(skillType), (int) (XP * ExperienceConfig.getInstance().getExperienceGainsGlobalMultiplier()));
-    public int getLevel(Player player, SkillType skillType) {
+    }
-        return Users.getProfile(player).getSkillLevel(skillType);
+
-    }
+    /**
-
+     * Adds XP to the player, calculates for XP Rate and skill modifier.
-    /**
+     * </br>
-     * Gets the power level of a player.
+     * This function is designed for API usage.
-     * </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 player The player to get the power level for
+     * @param XP The amount of XP to add
-     * @return the power level of the player
+     *
-     */
+     * @throws InvalidSkillException if the given skill is not valid
-    public int getPowerLevel(Player player) {
+     */
-        return Users.getProfile(player).getPowerLevel();
+    public static void addModifiedXP(Player player, String skillType, int XP) {
-    }
+        SkillType skill = getSkillType(skillType);
-}
+
+        UserManager.getPlayer(player).applyXpGain(skill, (int) (XP / skill.getXpModifier() * ExperienceConfig.getInstance().getExperienceGainsGlobalMultiplier()));
+    }
+
+    /**
+     * Adds XP to an offline player, calculates for XP Rate and skill modifier.
+     * </br>
+     * This function is designed for API usage.
+     *
+     * @param playerName The player to add XP to
+     * @param skillType The skill to add XP to
+     * @param XP The amount of XP to add
+     *
+     * @throws InvalidSkillException if the given skill is not valid
+     * @throws InvalidPlayerException if the given player does not exist in the database
+     */
+    public static void addModifiedXPOffline(String playerName, String skillType, int XP) {
+        SkillType skill = getSkillType(skillType);
+
+        addOfflineXP(playerName, skill, (int) (XP / skill.getXpModifier() * ExperienceConfig.getInstance().getExperienceGainsGlobalMultiplier()));
+    }
+
+    /**
+     * Adds XP to the player, calculates for XP Rate, skill modifiers, perks, child skills,
+     * and party sharing.
+     * </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
+     *
+     * @throws InvalidSkillException if the given skill is not valid
+     */
+    public static void addXP(Player player, String skillType, int XP) {
+        UserManager.getPlayer(player).beginXpGain(getSkillType(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
+     *
+     * @throws InvalidSkillException if the given skill is not valid
+     * @throws UnsupportedOperationException if the given skill is a child skill
+     */
+    public static int getXP(Player player, String skillType) {
+        return UserManager.getPlayer(player).getSkillXpLevel(getNonChildSkillType(skillType));
+    }
+
+    /**
+     * Get the amount of XP an offline player has in a specific skill.
+     * </br>
+     * This function is designed for API usage.
+     *
+     * @param playerName The player to get XP for
+     * @param skillType The skill to get XP for
+     * @return the amount of XP in a given skill
+     *
+     * @throws InvalidSkillException if the given skill is not valid
+     * @throws InvalidPlayerException if the given player does not exist in the database
+     * @throws UnsupportedOperationException if the given skill is a child skill
+     */
+    public static int getOfflineXP(String playerName, String skillType) {
+        return getOfflineProfile(playerName).getSkillXpLevel(getNonChildSkillType(skillType));
+    }
+
+    /**
+     * Get the raw 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
+     *
+     * @throws InvalidSkillException if the given skill is not valid
+     * @throws UnsupportedOperationException if the given skill is a child skill
+     */
+    public static float getXPRaw(Player player, String skillType) {
+        return UserManager.getPlayer(player).getSkillXpLevelRaw(getNonChildSkillType(skillType));
+    }
+
+    /**
+     * Get the raw amount of XP an offline player has in a specific skill.
+     * </br>
+     * This function is designed for API usage.
+     *
+     * @param playerName The player to get XP for
+     * @param skillType The skill to get XP for
+     * @return the amount of XP in a given skill
+     *
+     * @throws InvalidSkillException if the given skill is not valid
+     * @throws InvalidPlayerException if the given player does not exist in the database
+     * @throws UnsupportedOperationException if the given skill is a child skill
+     */
+    public static float getOfflineXPRaw(String playerName, String skillType) {
+        return getOfflineProfile(playerName).getSkillXpLevelRaw(getNonChildSkillType(skillType));
+    }
+
+    /**
+     * Get the total amount of XP needed to reach the next level.
+     * </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 total amount of XP needed to reach the next level
+     *
+     * @throws InvalidSkillException if the given skill is not valid
+     * @throws UnsupportedOperationException if the given skill is a child skill
+     */
+    public static int getXPToNextLevel(Player player, String skillType) {
+        return UserManager.getPlayer(player).getXpToLevel(getNonChildSkillType(skillType));
+    }
+
+    /**
+     * Get the total amount of XP an offline player needs to reach the next level.
+     * </br>
+     * This function is designed for API usage.
+     *
+     * @param playerName The player to get XP for
+     * @param skillType The skill to get XP for
+     * @return the total amount of XP needed to reach the next level
+     *
+     * @throws InvalidSkillException if the given skill is not valid
+     * @throws InvalidPlayerException if the given player does not exist in the database
+     * @throws UnsupportedOperationException if the given skill is a child skill
+     */
+    public static int getOfflineXPToNextLevel(String playerName, String skillType) {
+        return getOfflineProfile(playerName).getXpToLevel(getNonChildSkillType(skillType));
+    }
+
+    /**
+     * Get the amount of XP remaining until the next level.
+     * </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 remaining until the next level
+     *
+     * @throws InvalidSkillException if the given skill is not valid
+     * @throws UnsupportedOperationException if the given skill is a child skill
+     */
+    public static int getXPRemaining(Player player, String skillType) {
+        SkillType skill = getNonChildSkillType(skillType);
+
+        PlayerProfile profile = UserManager.getPlayer(player).getProfile();
+
+        return profile.getXpToLevel(skill) - profile.getSkillXpLevel(skill);
+    }
+
+    /**
+     * Get the amount of XP an offline player has left before leveling up.
+     * </br>
+     * This function is designed for API usage.
+     *
+     * @param playerName The player to get XP for
+     * @param skillType The skill to get XP for
+     * @return the amount of XP needed to reach the next level
+     *
+     * @throws InvalidSkillException if the given skill is not valid
+     * @throws InvalidPlayerException if the given player does not exist in the database
+     * @throws UnsupportedOperationException if the given skill is a child skill
+     */
+    public static int getOfflineXPRemaining(String playerName, String skillType) {
+        SkillType skill = getNonChildSkillType(skillType);
+
+        PlayerProfile profile = getOfflineProfile(playerName);
+
+        return profile.getXpToLevel(skill) - profile.getSkillXpLevel(skill);
+    }
+
+    /**
+     * 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
+     *
+     * @throws InvalidSkillException if the given skill is not valid
+     */
+    public static void addLevel(Player player, String skillType, int levels) {
+        UserManager.getPlayer(player).addLevels(getSkillType(skillType), levels);
+    }
+
+    /**
+     * Add levels to a skill for an offline player.
+     * </br>
+     * This function is designed for API usage.
+     *
+     * @param playerName The player to add levels to
+     * @param skillType Type of skill to add levels to
+     * @param levels Number of levels to add
+     *
+     * @throws InvalidSkillException if the given skill is not valid
+     * @throws InvalidPlayerException if the given player does not exist in the database
+     */
+    public static void addLevelOffline(String playerName, String skillType, int levels) {
+        PlayerProfile profile = getOfflineProfile(playerName);
+        SkillType skill = getSkillType(skillType);
+
+        if (skill.isChildSkill()) {
+            Set<SkillType> parentSkills = FamilyTree.getParents(skill);
+
+            for (SkillType parentSkill : parentSkills) {
+                profile.addLevels(parentSkill, (levels / parentSkills.size()));
+            }
+
+            profile.save();
+            return;
+        }
+
+        profile.addLevels(skill, levels);
+        profile.save();
+    }
+
+    /**
+     * 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
+     *
+     * @throws InvalidSkillException if the given skill is not valid
+     */
+    public static int getLevel(Player player, String skillType) {
+        return UserManager.getPlayer(player).getSkillLevel(getSkillType(skillType));
+    }
+
+    /**
+     * Get the level an offline player has in a specific skill.
+     * </br>
+     * This function is designed for API usage.
+     *
+     * @param playerName The player to get the level for
+     * @param skillType The skill to get the level for
+     * @return the level of a given skill
+     *
+     * @throws InvalidSkillException if the given skill is not valid
+     * @throws InvalidPlayerException if the given player does not exist in the database
+     */
+    public static int getLevelOffline(String playerName, String skillType) {
+        return getOfflineProfile(playerName).getSkillLevel(getSkillType(skillType));
+    }
+
+    /**
+     * Gets the power level of a player.
+     * </br>
+     * This function is designed for API usage.
+     *
+     * @param player The player to get the power level for
+     * @return the power level of the player
+     */
+    public static int getPowerLevel(Player player) {
+        return UserManager.getPlayer(player).getPowerLevel();
+    }
+
+    /**
+     * Gets the power level of an offline player.
+     * </br>
+     * This function is designed for API usage.
+     *
+     * @param playerName The player to get the power level for
+     * @return the power level of the player
+     *
+     * @throws InvalidPlayerException if the given player does not exist in the database
+     */
+    public static int getPowerLevelOffline(String playerName) {
+        int powerLevel = 0;
+        PlayerProfile profile = getOfflineProfile(playerName);
+
+        for (SkillType type : SkillType.NON_CHILD_SKILLS) {
+            powerLevel += profile.getSkillLevel(type);
+        }
+
+        return powerLevel;
+    }
+
+    /**
+     * Get the level cap of a specific skill.
+     * </br>
+     * This function is designed for API usage.
+     *
+     * @param skillType The skill to get the level cap for
+     * @return the level cap of a given skill
+     *
+     * @throws InvalidSkillException if the given skill is not valid
+     */
+    public static int getLevelCap(String skillType) {
+        return Config.getInstance().getLevelCap(getSkillType(skillType));
+    }
+
+    /**
+     * Get the power level cap.
+     * </br>
+     * This function is designed for API usage.
+     *
+     * @return the overall power level cap
+     */
+    public static int getPowerLevelCap() {
+        return Config.getInstance().getPowerLevelCap();
+    }
+
+    /**
+     * Get the position on the leaderboard of a player.
+     * </br>
+     * This function is designed for API usage.
+     *
+     * @param playerName The name of the player to check
+     * @param skillType The skill to check
+     *
+     * @throws InvalidSkillException if the given skill is not valid
+     * @throws InvalidPlayerException if the given player does not exist in the database
+     * @throws UnsupportedOperationException if the given skill is a child skill
+     *
+     * @return the position on the leaderboard
+     */
+    public static int getPlayerRankSkill(String playerName, String skillType) {
+        return mcMMO.getDatabaseManager().readRank(getOfflineProfile(playerName).getPlayerName()).get(getNonChildSkillType(skillType));
+    }
+
+
+    /**
+     * Get the position on the power level leaderboard of a player.
+     * </br>
+     * This function is designed for API usage.
+     *
+     * @param playerName The name of the player to check
+     *
+     * @throws InvalidPlayerException if the given player does not exist in the database
+     *
+     * @return the position on the power level leaderboard
+     */
+    public static int getPlayerRankOverall(String playerName) {
+        return mcMMO.getDatabaseManager().readRank(getOfflineProfile(playerName).getPlayerName()).get(null);
+    }
+
+    /**
+     * 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
+     *
+     * @throws InvalidSkillException if the given skill is not valid
+     */
+    public static void setLevel(Player player, String skillType, int skillLevel) {
+        UserManager.getPlayer(player).modifySkill(getSkillType(skillType), skillLevel);
+    }
+
+    /**
+     * Sets the level of an offline player in a specific skill type.
+     * </br>
+     * This function is designed for API usage.
+     *
+     * @param playerName 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
+     *
+     * @throws InvalidSkillException if the given skill is not valid
+     * @throws InvalidPlayerException if the given player does not exist in the database
+     */
+    public static void setLevelOffline(String playerName, String skillType, int skillLevel) {
+        getOfflineProfile(playerName).modifySkill(getSkillType(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
+     *
+     * @throws InvalidSkillException if the given skill is not valid
+     * @throws UnsupportedOperationException if the given skill is a child skill
+     */
+    public static void setXP(Player player, String skillType, int newValue) {
+        UserManager.getPlayer(player).setSkillXpLevel(getNonChildSkillType(skillType), newValue);
+    }
+
+    /**
+     * Sets the XP of an offline player in a specific skill type.
+     * </br>
+     * This function is designed for API usage.
+     *
+     * @param playerName 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
+     *
+     * @throws InvalidSkillException if the given skill is not valid
+     * @throws InvalidPlayerException if the given player does not exist in the database
+     * @throws UnsupportedOperationException if the given skill is a child skill
+     */
+    public static void setXPOffline(String playerName, String skillType, int newValue) {
+        getOfflineProfile(playerName).setSkillXpLevel(getNonChildSkillType(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
+     *
+     * @throws InvalidSkillException if the given skill is not valid
+     * @throws UnsupportedOperationException if the given skill is a child skill
+     */
+    public static void removeXP(Player player, String skillType, int xp) {
+        UserManager.getPlayer(player).removeXp(getNonChildSkillType(skillType), xp);
+    }
+
+    /**
+     * Removes XP from an offline player in a specific skill type.
+     * </br>
+     * This function is designed for API usage.
+     *
+     * @param playerName The player to change the XP of
+     * @param skillType The skill to change the XP for
+     * @param xp The amount of XP to remove
+     *
+     * @throws InvalidSkillException if the given skill is not valid
+     * @throws InvalidPlayerException if the given player does not exist in the database
+     * @throws UnsupportedOperationException if the given skill is a child skill
+     */
+    public static void removeXPOffline(String playerName, String skillType, int xp) {
+        getOfflineProfile(playerName).removeXp(getNonChildSkillType(skillType), xp);
+    }
+
+    // Utility methods follow.
+
+    private static void addOfflineXP(String playerName, SkillType skill, int XP) {
+        PlayerProfile profile = getOfflineProfile(playerName);
+
+        profile.addXp(skill, XP);
+        profile.save();
+    }
+
+    private static PlayerProfile getOfflineProfile(String playerName) {
+        PlayerProfile profile = mcMMO.getDatabaseManager().loadPlayerProfile(playerName, false);
+
+        if (!profile.isLoaded()) {
+            throw new InvalidPlayerException();
+        }
+
+        return profile;
+    }
+
+    private static SkillType getSkillType(String skillType) throws InvalidSkillException {
+        SkillType skill = SkillType.getSkill(skillType);
+
+        if (skill == null) {
+            throw new InvalidSkillException();
+        }
+
+        return skill;
+    }
+
+    private static SkillType getNonChildSkillType(String skillType) throws InvalidSkillException, UnsupportedOperationException {
+        SkillType skill = getSkillType(skillType);
+
+        if (skill.isChildSkill()) {
+            throw new UnsupportedOperationException("Child skills do not have XP");
+        }
+
+        return skill;
+    }
+}

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

@@ -1,125 +1,177 @@
-package com.gmail.nossr50.api;
+package com.gmail.nossr50.api;
-
+
-import java.io.BufferedReader;
+import java.util.ArrayList;
-import java.io.FileReader;
+import java.util.LinkedHashSet;
-import java.util.ArrayList;
+import java.util.List;
-
+
-import org.bukkit.Bukkit;
+import org.bukkit.OfflinePlayer;
-import org.bukkit.entity.Player;
+import org.bukkit.entity.Player;
-
+
-import com.gmail.nossr50.party.Party;
+import com.gmail.nossr50.mcMMO;
-import com.gmail.nossr50.util.Users;
+import com.gmail.nossr50.datatypes.party.Party;
-
+import com.gmail.nossr50.party.PartyManager;
-public class PartyAPI {
+import com.gmail.nossr50.util.player.UserManager;
-
+
-    /**
+public final class PartyAPI {
-     * Get the name of the party a player is in.
+    private PartyAPI() {}
-     * </br>
+
-     * This function is designed for API usage.
+    /**
-     *
+     * Get the name of the party a player is in.
-     * @param player The player to check the party name of
+     * </br>
-     * @return the name of the player's party
+     * This function is designed for API usage.
-     */
+     *
-    public String getPartyName(Player player) {
+     * @param player The player to check the party name of
-        return Users.getProfile(player).getParty();
+     * @return the name of the player's party, or null if not in a party
-    }
+     */
-
+    public static String getPartyName(Player player) {
-    /**
+        if (!inParty(player)) {
-     * Checks if a player is in a party.
+            return null;
-     * </br>
+        }
-     * This function is designed for API usage.
+
-     *
+        return UserManager.getPlayer(player).getParty().getName();
-     * @param player The player to check
+    }
-     * @return true if the player is in a party, false otherwise
+
-     */
+    /**
-    public boolean inParty(Player player) {
+     * Checks if a player is in a party.
-        return Users.getProfile(player).inParty();
+     * </br>
-    }
+     * This function is designed for API usage.
-
+     *
-    /**
+     * @param player The player to check
-     * Check if two players are in the same party.
+     * @return true if the player is in a party, false otherwise
-     * </br>
+     */
-     * This function is designed for API usage.
+    public static boolean inParty(Player player) {
-     *
+        return UserManager.getPlayer(player).inParty();
-     * @param playera The first player to check
+    }
-     * @param playerb The second player to check
+
-     * @return true if the two players are in the same party, false otherwise
+    /**
-     */
+     * Check if two players are in the same party.
-    public boolean inSameParty(Player playera, Player playerb) {
+     * </br>
-        return Party.getInstance().inSameParty(playera, playerb);
+     * This function is designed for API usage.
-    }
+     *
-
+     * @param playera The first player to check
-    /**
+     * @param playerb The second player to check
-     * Get a list of all current party names.
+     * @return true if the two players are in the same party, false otherwise
-     * </br>
+     */
-     * This function is designed for API usage.
+    public static boolean inSameParty(Player playera, Player playerb) {
-     *
+        return PartyManager.inSameParty(playera, playerb);
-     * @return the list of parties.
+    }
-     */
+
-    public ArrayList<String> getParties() {
+    /**
-        String location = "plugins/mcMMO/mcmmo.users";
+     * Get a list of all current parties.
-        ArrayList<String> parties = new ArrayList<String>();
+     * </br>
-
+     * This function is designed for API usage.
-        try {
+     *
-
+     * @return the list of parties.
-            //Open the users file
+     */
-            FileReader file = new FileReader(location);
+    public static List<Party> getParties() {
-            BufferedReader in = new BufferedReader(file);
+        return PartyManager.getParties();
-            String line = "";
+    }
-
+
-            while((line = in.readLine()) != null) {
+    /**
-                String[] character = line.split(":");
+     * Add a player to a party.
-                String theparty = null;
+     * </br>
-
+     * This function is designed for API usage.
-                //Party
+     *
-                if (character.length > 3) {
+     * @param player The player to add to the party
-                    theparty = character[3];
+     * @param partyName The party to add the player to
-                }
+     */
-
+    public static void addToParty(Player player, String partyName) {
-                if (!parties.contains(theparty)) {
+        Party party = PartyManager.getParty(partyName);
-                    parties.add(theparty);
+
-                }
+        if (party == null) {
-            }
+            party = new Party(player.getName(), partyName);
-            in.close();
+        }
-        }
+
-        catch (Exception e) {
+        PartyManager.addToParty(UserManager.getPlayer(player), party);
-            Bukkit.getLogger().severe("Exception while reading " + location + " (Are you sure you formatted it correctly?)" + e.toString());
+    }
-        }
+
-        return parties;
+    /**
-    }
+     * Remove a player from a party.
-
+     * </br>
-    /**
+     * This function is designed for API usage.
-     * Get a list of all players in this player's party.
+     *
-     * </br>
+     * @param player The player to remove
-     * This function is designed for API usage.
+     */
-     *
+    public static void removeFromParty(Player player) {
-     * @param player The player to check
+        PartyManager.removeFromParty(UserManager.getPlayer(player));
-     * @return all the players in the player's party
+    }
-     */
+
-    public ArrayList<Player> getPartyMembers(Player player) {
+    /**
-        return Party.getInstance().getPartyMembers(player);
+     * Get the leader of a party.
-    }
+     * </br>
-
+     * This function is designed for API usage.
-    /**
+     *
-     * Add a player to a party.
+     * @param partyName The party name
-     * </br>
+     * @return the leader of the party
-     * This function is designed for API usage.
+     */
-     *
+    public static String getPartyLeader(String partyName) {
-     * @param player The player to add to the party
+        return PartyManager.getPartyLeader(partyName);
-     * @param partyName The party to add the player to
+    }
-     */
+
-    public void addToParty(Player player, String partyName) {
+    /**
-        Party.getInstance().addToParty(player, Users.getProfile(player), partyName, false, null);
+     * Set the leader of a party.
-    }
+     * </br>
-
+     * This function is designed for API usage.
-    /**
+     *
-     * Remove a player from a party.
+     * @param partyName The name of the party to set the leader of
-     * </br>
+     * @param player The player to set as leader
-     * This function is designed for API usage.
+     */
-     *
+    public static void setPartyLeader(String partyName, String player) {
-     * @param player The player to remove
+        PartyManager.setPartyLeader(player, PartyManager.getParty(partyName));
-     */
+    }
-    public void removeFromParty(Player player) {
+
-        Party.getInstance().removeFromParty(player, Users.getProfile(player));
+    /**
-    }
+     * Get a list of all players in this player's party.
-}
+     * </br>
+     * This function is designed for API usage.
+     *
+     * @param player The player to check
+     * @return all the players in the player's party
+     */
+    @Deprecated
+    public static List<OfflinePlayer> getOnlineAndOfflineMembers(Player player) {
+        List<OfflinePlayer> members = new ArrayList<OfflinePlayer>();
+
+        for (String memberName : PartyManager.getAllMembers(player)) {
+            OfflinePlayer member = mcMMO.p.getServer().getOfflinePlayer(memberName);
+            members.add(member);
+        }
+        return members;
+    }
+
+    /**
+     * Get a list of all player names in this player's party.
+     * </br>
+     * This function is designed for API usage.
+     *
+     * @param player The player to check
+     * @return all the player names in the player's party
+     */
+    public static LinkedHashSet<String> getMembers(Player player) {
+        return PartyManager.getAllMembers(player);
+    }
+
+    /**
+     * Get a list of all online players in this party.
+     * </br>
+     * This function is designed for API usage.
+     *
+     * @param partyName The party to check
+     * @return all online players in this party
+     */
+    public static List<Player> getOnlineMembers(String partyName) {
+        return PartyManager.getOnlineMembers(partyName);
+    }
+
+    /**
+     * Get a list of all online players in this player's party.
+     * </br>
+     * This function is designed for API usage.
+     *
+     * @param player The player to check
+     * @return all online players in the player's party
+     */
+    public static List<Player> getOnlineMembers(Player player) {
+        return PartyManager.getOnlineMembers(player);
+    }
+}

src/main/java/com/gmail/nossr50/api/exceptions/InvalidPlayerException.java

@@ -0,0 +1,9 @@
+package com.gmail.nossr50.api.exceptions;
+
+public class InvalidPlayerException extends RuntimeException {
+    private static final long serialVersionUID = 907213002618581385L;
+
+    public InvalidPlayerException() {
+        super("That player does not exist in the database.");
+    }
+}

src/main/java/com/gmail/nossr50/api/exceptions/InvalidSkillException.java

@@ -0,0 +1,9 @@
+package com.gmail.nossr50.api.exceptions;
+
+public class InvalidSkillException extends RuntimeException {
+    private static final long serialVersionUID = 942705284195791157L;
+
+    public InvalidSkillException() {
+        super("That is not a valid skill.");
+    }
+}

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

@@ -0,0 +1,22 @@
+package com.gmail.nossr50.chat;
+
+import org.bukkit.plugin.Plugin;
+
+import com.gmail.nossr50.config.Config;
+import com.gmail.nossr50.events.chat.McMMOAdminChatEvent;
+
+public class AdminChatManager extends ChatManager {
+    protected AdminChatManager(Plugin plugin) {
+        super(plugin, Config.getInstance().getAdminDisplayNames(), Config.getInstance().getAdminChatPrefix());
+    }
+
+    @Override
+    public void handleChat(String senderName, String displayName, String message, boolean isAsync) {
+        handleChat(new McMMOAdminChatEvent(plugin, senderName, displayName, message, isAsync));
+    }
+
+    @Override
+    protected void sendMessage() {
+        plugin.getServer().broadcast(message, "mcmmo.chat.adminchat");
+    }
+}

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

@@ -0,0 +1,53 @@
+package com.gmail.nossr50.chat;
+
+import org.bukkit.entity.Player;
+import org.bukkit.plugin.Plugin;
+
+import com.gmail.nossr50.events.chat.McMMOChatEvent;
+import com.gmail.nossr50.locale.LocaleLoader;
+
+public abstract class ChatManager {
+    protected Plugin plugin;
+    protected boolean useDisplayNames;
+    protected String chatPrefix;
+
+    protected String senderName;
+    protected String displayName;
+    protected String message;
+
+    protected ChatManager(Plugin plugin, boolean useDisplayNames, String chatPrefix) {
+        this.plugin = plugin;
+        this.useDisplayNames = useDisplayNames;
+        this.chatPrefix = chatPrefix;
+    }
+
+    protected void handleChat(McMMOChatEvent event) {
+        plugin.getServer().getPluginManager().callEvent(event);
+
+        if (event.isCancelled()) {
+            return;
+        }
+
+        senderName = event.getSender();
+        displayName = useDisplayNames ? event.getDisplayName() : senderName;
+        message = LocaleLoader.formatString(chatPrefix, displayName) + " " + event.getMessage();
+
+        sendMessage();
+    }
+
+    public void handleChat(String senderName, String message) {
+        handleChat(senderName, senderName, message, false);
+    }
+
+    public void handleChat(Player player, String message, boolean isAsync) {
+        handleChat(player.getName(), player.getDisplayName(), message, isAsync);
+    }
+
+    public void handleChat(String senderName, String displayName, String message) {
+        handleChat(senderName, displayName, message, false);
+    }
+
+    public abstract void handleChat(String senderName, String displayName, String message, boolean isAsync);
+
+    protected abstract void sendMessage();
+}

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

@@ -0,0 +1,31 @@
+package com.gmail.nossr50.chat;
+
+import java.util.HashMap;
+
+import org.bukkit.plugin.Plugin;
+
+import com.gmail.nossr50.datatypes.chat.ChatMode;
+
+public class ChatManagerFactory {
+    private static final HashMap<Plugin, AdminChatManager> adminChatManagers = new HashMap<Plugin, AdminChatManager>();
+    private static final HashMap<Plugin, PartyChatManager> partyChatManagers = new HashMap<Plugin, PartyChatManager>();
+
+    public static ChatManager getChatManager(Plugin plugin, ChatMode mode) {
+        switch (mode) {
+            case ADMIN:
+                if (!adminChatManagers.containsKey(plugin)) {
+                    adminChatManagers.put(plugin, new AdminChatManager(plugin));
+                }
+
+                return adminChatManagers.get(plugin);
+            case PARTY:
+                if (!partyChatManagers.containsKey(plugin)) {
+                    partyChatManagers.put(plugin, new PartyChatManager(plugin));
+                }
+
+                return partyChatManagers.get(plugin);
+            default:
+                return null;
+        }
+    }
+}

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

@@ -0,0 +1,39 @@
+package com.gmail.nossr50.chat;
+
+import org.bukkit.ChatColor;
+import org.bukkit.entity.Player;
+import org.bukkit.plugin.Plugin;
+
+import com.gmail.nossr50.config.Config;
+import com.gmail.nossr50.datatypes.party.Party;
+import com.gmail.nossr50.events.chat.McMMOPartyChatEvent;
+
+public class PartyChatManager extends ChatManager {
+    private Party party;
+
+    protected PartyChatManager(Plugin plugin) {
+        super(plugin, Config.getInstance().getPartyDisplayNames(), Config.getInstance().getPartyChatPrefix());
+    }
+
+    public void setParty(Party party) {
+        this.party = party;
+    }
+
+    @Override
+    public void handleChat(String senderName, String displayName, String message, boolean isAsync) {
+        handleChat(new McMMOPartyChatEvent(plugin, senderName, displayName, party.getName(), message, isAsync));
+    }
+
+    @Override
+    protected void sendMessage() {
+        if (Config.getInstance().getPartyChatColorLeaderName() && senderName.equalsIgnoreCase(party.getLeader())) {
+            message = message.replaceFirst(displayName, ChatColor.GOLD + displayName + ChatColor.RESET);
+        }
+
+        for (Player member : party.getOnlineMembers()) {
+            member.sendMessage(message);
+        }
+
+        plugin.getLogger().info("[P]<" + party.getName() + ">" + message);
+    }
+}

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

@@ -1,147 +0,0 @@
-package com.gmail.nossr50.commands;
-
-import org.bukkit.command.CommandSender;
-import org.bukkit.entity.Player;
-
-import com.gmail.nossr50.datatypes.PlayerProfile;
-import com.gmail.nossr50.datatypes.SkillType;
-import com.gmail.nossr50.locale.mcLocale;
-import com.gmail.nossr50.util.Skills;
-import com.gmail.nossr50.util.Users;
-import com.gmail.nossr50.util.mcPermissions;
-
-public class CommandHelper {
-
-    /**
-     * Checks for command permissions.
-     *
-     * @param sender The command sender
-     * @param permission The permission to check
-     * @return true if the sender is a player without permissions, false otherwise
-     */
-    public static boolean noCommandPermissions(CommandSender sender, String permission) {
-        if (sender instanceof Player) {
-            Player player = (Player) sender;
-
-            if (player != null && !mcPermissions.getInstance().permission(player, permission)) {
-                player.sendMessage(mcLocale.getString("mcPlayerListener.NoPermission"));
-                return true;
-            }
-        }
-
-        return false;
-    }
-
-    public static boolean noConsoleUsage(CommandSender sender) {
-        if (!(sender instanceof Player)) {
-            sender.sendMessage(mcLocale.getString("Commands.NoConsole"));
-            return true;
-        }
-
-        return false;
-    }
-    
-    /**
-     * Print out details on Gathering skills. Only for online players.
-     *
-     * @param inspect The player to retrieve stats for
-     * @param display The sender to display stats to
-     * @param online true if the player to retrieve stats for is online, false otherwise
-     */
-    public static void printGatheringSkills(Player inspect, CommandSender display) {
-        if (Skills.hasGatheringSkills(inspect)) {
-            PlayerProfile PP = Users.getProfile(inspect);
-
-            display.sendMessage(mcLocale.getString("Stats.GatheringHeader"));
-
-            if (mcPermissions.getInstance().excavation(inspect)) {
-                display.sendMessage(mcLocale.getString("m.SkillStats", new Object[] { mcLocale.getString("mcPlayerListener.ExcavationSkill"), PP.getSkillLevel(SkillType.EXCAVATION), PP.getSkillXpLevel(SkillType.EXCAVATION), PP.getXpToLevel(SkillType.EXCAVATION) }));
-            }
-
-            if (mcPermissions.getInstance().fishing(inspect)) {
-                display.sendMessage(mcLocale.getString("m.SkillStats", new Object[] { mcLocale.getString("mcPlayerListener.FishingSkill"), PP.getSkillLevel(SkillType.FISHING), PP.getSkillXpLevel(SkillType.FISHING), PP.getXpToLevel(SkillType.FISHING) }));
-            }
-
-            if (mcPermissions.getInstance().herbalism(inspect)) {
-                display.sendMessage(mcLocale.getString("m.SkillStats", new Object[] { mcLocale.getString("mcPlayerListener.HerbalismSkill"), PP.getSkillLevel(SkillType.HERBALISM), PP.getSkillXpLevel(SkillType.HERBALISM), PP.getXpToLevel(SkillType.HERBALISM) }));
-            }
-
-            if (mcPermissions.getInstance().mining(inspect)) {
-                display.sendMessage(mcLocale.getString("m.SkillStats", new Object[] { mcLocale.getString("mcPlayerListener.MiningSkill"), PP.getSkillLevel(SkillType.MINING), PP.getSkillXpLevel(SkillType.MINING), PP.getXpToLevel(SkillType.MINING) }));
-            }
-
-            if (mcPermissions.getInstance().woodcutting(inspect)) {
-                display.sendMessage(mcLocale.getString("m.SkillStats", new Object[] { mcLocale.getString("mcPlayerListener.WoodcuttingSkill"), PP.getSkillLevel(SkillType.WOODCUTTING), PP.getSkillXpLevel(SkillType.WOODCUTTING), PP.getXpToLevel(SkillType.WOODCUTTING) }));
-            }
-        }
-    }
-
-    public static void printGatheringSkills(Player player) {
-        printGatheringSkills(player, player);
-    }
-
-    /**
-     * Print out details on Combat skills. Only for online players.
-     *
-     * @param inspect The player to retrieve stats for
-     * @param display The sender to display stats to
-     * @param online true if the player to retrieve stats for is online, false otherwise
-     */
-    public static void printCombatSkills(Player inspect, CommandSender display) {
-        if (Skills.hasCombatSkills(inspect)) {
-            PlayerProfile PP = Users.getProfile(inspect);
-
-            display.sendMessage(mcLocale.getString("Stats.CombatHeader"));
-
-            if (mcPermissions.getInstance().axes(inspect)) {
-                display.sendMessage(mcLocale.getString("m.SkillStats", new Object[] { mcLocale.getString("mcPlayerListener.AxesSkill"), PP.getSkillLevel(SkillType.AXES), PP.getSkillXpLevel(SkillType.AXES), PP.getXpToLevel(SkillType.AXES) }));
-            }
-
-            if (mcPermissions.getInstance().archery(inspect)) {
-                display.sendMessage(mcLocale.getString("m.SkillStats", new Object[] { mcLocale.getString("mcPlayerListener.ArcherySkill"), PP.getSkillLevel(SkillType.ARCHERY), PP.getSkillXpLevel(SkillType.ARCHERY), PP.getXpToLevel(SkillType.ARCHERY) }));
-            }
-
-            if (mcPermissions.getInstance().swords(inspect)) {
-                display.sendMessage(mcLocale.getString("m.SkillStats", new Object[] { mcLocale.getString("mcPlayerListener.SwordsSkill"), PP.getSkillLevel(SkillType.SWORDS), PP.getSkillXpLevel(SkillType.SWORDS), PP.getXpToLevel(SkillType.SWORDS) }));
-            }
-
-            if (mcPermissions.getInstance().taming(inspect)) {
-                display.sendMessage(mcLocale.getString("m.SkillStats", new Object[] { mcLocale.getString("mcPlayerListener.TamingSkill"), PP.getSkillLevel(SkillType.TAMING), PP.getSkillXpLevel(SkillType.TAMING), PP.getXpToLevel(SkillType.TAMING) }));
-            }
-
-            if (mcPermissions.getInstance().unarmed(inspect)) {
-                display.sendMessage(mcLocale.getString("m.SkillStats", new Object[] { mcLocale.getString("mcPlayerListener.UnarmedSkill"), PP.getSkillLevel(SkillType.UNARMED), PP.getSkillXpLevel(SkillType.UNARMED), PP.getXpToLevel(SkillType.UNARMED) }));
-            }
-        }
-    }
-
-    public static void printCombatSkills(Player player) {
-        printCombatSkills(player, player);
-    }
-
-    /**
-     * Print out details on Misc skills. Only for online players.
-     *
-     * @param inspect The player to retrieve stats for
-     * @param display The sender to display stats to
-     * @param online true if the player to retrieve stats for is online, false otherwise
-     */
-    public static void printMiscSkills(Player inspect, CommandSender display) {
-        if (Skills.hasMiscSkills(inspect)) {
-            PlayerProfile PP = Users.getProfile(inspect);
-            display.sendMessage(mcLocale.getString("Stats.MiscHeader"));
-
-            if (mcPermissions.getInstance().acrobatics(inspect)) {
-                display.sendMessage(mcLocale.getString("m.SkillStats", new Object[] { mcLocale.getString("mcPlayerListener.AcrobaticsSkill"), PP.getSkillLevel(SkillType.ACROBATICS), PP.getSkillXpLevel(SkillType.ACROBATICS), PP.getXpToLevel(SkillType.ACROBATICS) }));
-            }
-
-            if (mcPermissions.getInstance().repair(inspect)) {
-                display.sendMessage(mcLocale.getString("m.SkillStats", new Object[] { mcLocale.getString("mcPlayerListener.RepairSkill"), PP.getSkillLevel(SkillType.REPAIR), PP.getSkillXpLevel(SkillType.REPAIR), PP.getXpToLevel(SkillType.REPAIR) }));
-            }
-        }
-    }
-
-    public static void printMiscSkills(Player player) {
-        printMiscSkills(player, player);
-    }
-}

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

@@ -0,0 +1,68 @@
+package com.gmail.nossr50.commands;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Set;
+
+import org.bukkit.command.Command;
+import org.bukkit.command.CommandSender;
+import org.bukkit.command.TabExecutor;
+import org.bukkit.util.StringUtil;
+
+import com.gmail.nossr50.datatypes.player.McMMOPlayer;
+import com.gmail.nossr50.util.Misc;
+import com.gmail.nossr50.util.Permissions;
+import com.gmail.nossr50.util.commands.CommandUtils;
+import com.gmail.nossr50.util.player.UserManager;
+
+import com.google.common.collect.ImmutableList;
+
+public class KrakenCommand implements TabExecutor {
+    @Override
+    public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
+        switch (args.length) {
+            case 0:
+                if (CommandUtils.noConsoleUsage(sender)) {
+                    return true;
+                }
+
+                if (!Permissions.kraken(sender)) {
+                    sender.sendMessage(command.getPermissionMessage());
+                    return true;
+                }
+
+                UserManager.getPlayer(sender.getName()).getFishingManager().unleashTheKraken();
+                return true;
+
+            case 1:
+                if (!Permissions.krakenOthers(sender)) {
+                    sender.sendMessage(command.getPermissionMessage());
+                    return true;
+                }
+
+                String playerName = Misc.getMatchedPlayerName(args[0]);
+                McMMOPlayer mcMMOPlayer = UserManager.getPlayer(playerName);
+
+                if (!CommandUtils.checkPlayerExistence(sender, playerName, mcMMOPlayer)) {
+                    return true;
+                }
+
+                mcMMOPlayer.getFishingManager().unleashTheKraken();
+                return true;
+
+            default:
+                return false;
+        }
+    }
+
+    @Override
+    public List<String> onTabComplete(CommandSender sender, Command command, String alias, String[] args) {
+        switch (args.length) {
+            case 1:
+                Set<String> playerNames = UserManager.getPlayerNames();
+                return StringUtil.copyPartialMatches(args[0], playerNames, new ArrayList<String>(playerNames.size()));
+            default:
+                return ImmutableList.of();
+        }
+    }
+}

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

@@ -0,0 +1,30 @@
+package com.gmail.nossr50.commands;
+
+import org.bukkit.command.CommandSender;
+
+import com.gmail.nossr50.datatypes.player.McMMOPlayer;
+import com.gmail.nossr50.locale.LocaleLoader;
+import com.gmail.nossr50.util.Permissions;
+
+public class McabilityCommand extends ToggleCommand {
+    @Override
+    protected boolean hasOtherPermission(CommandSender sender) {
+        return Permissions.mcabilityOthers(sender);
+    }
+
+    @Override
+    protected boolean hasSelfPermission(CommandSender sender) {
+        return Permissions.mcability(sender);
+    }
+
+    @Override
+    protected void applyCommandAction(McMMOPlayer mcMMOPlayer) {
+        mcMMOPlayer.getPlayer().sendMessage(LocaleLoader.getString("Commands.Ability." + (mcMMOPlayer.getAbilityUse() ? "Off" : "On")));
+        mcMMOPlayer.toggleAbilityUse();
+    }
+
+    @Override
+    protected void sendSuccessMessage(CommandSender sender, String playerName) {
+        sender.sendMessage(LocaleLoader.getString("Commands.Ability.Toggle", playerName));
+    }
+}

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

@@ -0,0 +1,93 @@
+package com.gmail.nossr50.commands;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+
+import org.bukkit.command.Command;
+import org.bukkit.command.CommandExecutor;
+import org.bukkit.command.CommandSender;
+import org.bukkit.command.TabExecutor;
+import org.bukkit.util.StringUtil;
+
+import com.gmail.nossr50.mcMMO;
+import com.gmail.nossr50.commands.database.ConvertDatabaseCommand;
+import com.gmail.nossr50.commands.experience.ConvertExperienceCommand;
+import com.gmail.nossr50.database.DatabaseManagerFactory;
+import com.gmail.nossr50.datatypes.database.DatabaseType;
+import com.gmail.nossr50.datatypes.experience.FormulaType;
+
+import com.google.common.collect.ImmutableList;
+
+public class McconvertCommand implements TabExecutor {
+    private static final List<String> FORMULA_TYPES;
+    private static final List<String> DATABASE_TYPES;
+    private static final List<String> SUBCOMMANDS = ImmutableList.of("database", "experience");
+
+    private CommandExecutor databaseConvertCommand = new ConvertDatabaseCommand();
+    private CommandExecutor experienceConvertCommand = new ConvertExperienceCommand();
+
+    static {
+        ArrayList<String> formulaTypes = new ArrayList<String>();
+        ArrayList<String> databaseTypes = new ArrayList<String>();
+
+        for (FormulaType type : FormulaType.values()) {
+            formulaTypes.add(type.toString());
+        }
+
+        for (DatabaseType type : DatabaseType.values()) {
+            databaseTypes.add(type.toString());
+        }
+
+        // Custom stuff
+        databaseTypes.remove(DatabaseType.CUSTOM.toString());
+
+        if (mcMMO.getDatabaseManager().getDatabaseType() == DatabaseType.CUSTOM) {
+            databaseTypes.add(DatabaseManagerFactory.getCustomDatabaseManagerClass().getName());
+        }
+
+        Collections.sort(formulaTypes);
+        Collections.sort(databaseTypes);
+
+        FORMULA_TYPES = ImmutableList.copyOf(formulaTypes);
+        DATABASE_TYPES = ImmutableList.copyOf(databaseTypes);
+
+    }
+
+    @Override
+    public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
+        switch (args.length) {
+            case 2:
+                if (args[0].equalsIgnoreCase("database") || args[0].equalsIgnoreCase("db")) {
+                    return databaseConvertCommand.onCommand(sender, command, label, args);
+                }
+                else if (args[0].equalsIgnoreCase("experience") || args[0].equalsIgnoreCase("xp") || args[1].equalsIgnoreCase("exp")) {
+                    return experienceConvertCommand.onCommand(sender, command, label, args);
+                }
+
+                return false;
+            default:
+                return false;
+        }
+    }
+
+    @Override
+    public List<String> onTabComplete(CommandSender sender, Command command, String alias, String[] args) {
+        switch (args.length) {
+            case 1:
+                return StringUtil.copyPartialMatches(args[0], SUBCOMMANDS, new ArrayList<String>(SUBCOMMANDS.size()));
+            case 2:
+                if (args[0].equalsIgnoreCase("database") || args[0].equalsIgnoreCase("db")) {
+                    return StringUtil.copyPartialMatches(args[0], DATABASE_TYPES, new ArrayList<String>(DATABASE_TYPES.size()));
+                }
+
+                if (args[0].equalsIgnoreCase("experience") || args[0].equalsIgnoreCase("xp") || args[0].equalsIgnoreCase("exp")) {
+                    return StringUtil.copyPartialMatches(args[0], FORMULA_TYPES, new ArrayList<String>(FORMULA_TYPES.size()));
+                }
+
+                return ImmutableList.of();
+            default:
+                return ImmutableList.of();
+        }
+    }
+}

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

@@ -0,0 +1,30 @@
+package com.gmail.nossr50.commands;
+
+import org.bukkit.command.CommandSender;
+
+import com.gmail.nossr50.datatypes.player.McMMOPlayer;
+import com.gmail.nossr50.locale.LocaleLoader;
+import com.gmail.nossr50.util.Permissions;
+
+public class McgodCommand extends ToggleCommand {
+    @Override
+    protected boolean hasOtherPermission(CommandSender sender) {
+        return Permissions.mcgodOthers(sender);
+    }
+
+    @Override
+    protected boolean hasSelfPermission(CommandSender sender) {
+        return Permissions.mcgod(sender);
+    }
+
+    @Override
+    protected void applyCommandAction(McMMOPlayer mcMMOPlayer) {
+        mcMMOPlayer.getPlayer().sendMessage(LocaleLoader.getString("Commands.GodMode." + (mcMMOPlayer.getGodMode() ? "Disabled" : "Enabled")));
+        mcMMOPlayer.toggleGodMode();
+    }
+
+    @Override
+    protected void sendSuccessMessage(CommandSender sender, String playerName) {
+        sender.sendMessage(LocaleLoader.getString("Commands.GodMode.Toggle", playerName));
+    }
+}

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

@@ -0,0 +1,108 @@
+package com.gmail.nossr50.commands;
+
+import org.bukkit.ChatColor;
+import org.bukkit.command.Command;
+import org.bukkit.command.CommandExecutor;
+import org.bukkit.command.CommandSender;
+
+import com.gmail.nossr50.mcMMO;
+import com.gmail.nossr50.commands.party.PartySubcommandType;
+import com.gmail.nossr50.config.Config;
+import com.gmail.nossr50.locale.LocaleLoader;
+import com.gmail.nossr50.util.HolidayManager;
+import com.gmail.nossr50.util.Permissions;
+
+public class McmmoCommand implements CommandExecutor {
+    @Override
+    public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
+        switch (args.length) {
+            case 0:
+                if (!Permissions.mcmmoDescription(sender)) {
+                    sender.sendMessage(command.getPermissionMessage());
+                    return true;
+                }
+
+                String description = LocaleLoader.getString("mcMMO.Description");
+                String[] mcSplit = description.split(",");
+                sender.sendMessage(mcSplit);
+
+                if (Config.getInstance().getDonateMessageEnabled()) {
+                    sender.sendMessage(LocaleLoader.getString("MOTD.Donate"));
+                    sender.sendMessage(ChatColor.GOLD + " - " + ChatColor.GREEN + "gjmcferrin@gmail.com" + ChatColor.GOLD + " Paypal");
+                }
+
+                sender.sendMessage(LocaleLoader.getString("MOTD.Version", mcMMO.p.getDescription().getVersion()));
+                HolidayManager.anniversaryCheck(sender);
+                return true;
+
+            case 1:
+                if (args[0].equalsIgnoreCase("?") || args[0].equalsIgnoreCase("help") || args[0].equalsIgnoreCase("commands")) {
+                    if (!Permissions.mcmmoHelp(sender)) {
+                        sender.sendMessage(command.getPermissionMessage());
+                        return true;
+                    }
+
+                    sender.sendMessage(LocaleLoader.getString("Commands.mcc.Header"));
+                    displayPartyCommands(sender);
+                    displayOtherCommands(sender);
+
+                }
+                return true;
+
+            default:
+                return false;
+        }
+    }
+
+    private void displayPartyCommands(CommandSender sender) {
+        if (Permissions.party(sender)) {
+            sender.sendMessage(LocaleLoader.getString("Commands.Party.Commands"));
+            sender.sendMessage(" /party create <" + LocaleLoader.getString("Commands.Usage.PartyName") + "> " + LocaleLoader.getString("Commands.Party1"));
+            sender.sendMessage(" /party join <" + LocaleLoader.getString("Commands.Usage.Player") + "> " + LocaleLoader.getString("Commands.Party2"));
+            sender.sendMessage(" /party quit " + LocaleLoader.getString("Commands.Party.Quit"));
+
+            if (Permissions.partyChat(sender)) {
+                sender.sendMessage(" /party chat " + LocaleLoader.getString("Commands.Party.Toggle"));
+            }
+
+            sender.sendMessage(" /party invite <" + LocaleLoader.getString("Commands.Usage.Player") + "> " + LocaleLoader.getString("Commands.Party.Invite"));
+            sender.sendMessage(" /party accept " + LocaleLoader.getString("Commands.Party.Accept"));
+
+            if (Permissions.partySubcommand(sender, PartySubcommandType.TELEPORT)) {
+                sender.sendMessage(" /party teleport " + LocaleLoader.getString("Commands.Party.Teleport"));
+            }
+        }
+    }
+
+    private void displayOtherCommands(CommandSender sender) {
+        sender.sendMessage(LocaleLoader.getString("Commands.Other"));
+        sender.sendMessage(" /mcstats " + LocaleLoader.getString("Commands.Stats"));
+        sender.sendMessage(" /mctop " + LocaleLoader.getString("Commands.Leaderboards"));
+
+        if (Permissions.skillreset(sender)) {
+            sender.sendMessage(" /skillreset <skill|all> " + LocaleLoader.getString("Commands.Reset"));
+        }
+
+        if (Permissions.mcability(sender)) {
+            sender.sendMessage(" /mcability " + LocaleLoader.getString("Commands.ToggleAbility"));
+        }
+
+        if (Permissions.adminChat(sender)) {
+            sender.sendMessage(" /adminchat " + LocaleLoader.getString("Commands.AdminToggle"));
+        }
+
+        if (Permissions.inspect(sender)) {
+            sender.sendMessage(" /inspect " + LocaleLoader.getString("Commands.Inspect"));
+        }
+
+        if (Permissions.mmoedit(sender)) {
+            sender.sendMessage(" /mmoedit " + LocaleLoader.getString("Commands.mmoedit"));
+        }
+
+        if (Permissions.mcgod(sender)) {
+            sender.sendMessage(" /mcgod " + LocaleLoader.getString("Commands.mcgod"));
+        }
+
+        sender.sendMessage(" /<skill>" + LocaleLoader.getString("Commands.SkillInfo"));
+    }
+}

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

@@ -0,0 +1,36 @@
+package com.gmail.nossr50.commands;
+
+import java.util.List;
+
+import org.bukkit.command.Command;
+import org.bukkit.command.CommandSender;
+import org.bukkit.command.TabExecutor;
+import org.bukkit.entity.Player;
+
+import com.gmail.nossr50.datatypes.player.McMMOPlayer;
+import com.gmail.nossr50.locale.LocaleLoader;
+import com.gmail.nossr50.util.player.UserManager;
+
+import com.google.common.collect.ImmutableList;
+
+public class McnotifyCommand implements TabExecutor {
+    @Override
+    public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
+        switch (args.length) {
+            case 0:
+                McMMOPlayer mcMMOPlayer = UserManager.getPlayer((Player) sender);
+
+                sender.sendMessage(LocaleLoader.getString("Commands.Notifications." + (mcMMOPlayer.useChatNotifications() ? "Off" : "On")));
+                mcMMOPlayer.toggleChatNotifications();
+                return true;
+
+            default:
+                return false;
+        }
+    }
+
+    @Override
+    public List<String> onTabComplete(CommandSender sender, Command command, String alias, String[] args) {
+        return ImmutableList.of();
+    }
+}

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

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

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

@@ -0,0 +1,90 @@
+package com.gmail.nossr50.commands;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.bukkit.command.Command;
+import org.bukkit.command.CommandSender;
+import org.bukkit.command.TabExecutor;
+import org.bukkit.util.StringUtil;
+
+import com.gmail.nossr50.config.Config;
+import com.gmail.nossr50.locale.LocaleLoader;
+import com.gmail.nossr50.util.commands.CommandUtils;
+import com.gmail.nossr50.util.scoreboards.ScoreboardManager;
+
+import com.google.common.collect.ImmutableList;
+
+public class McscoreboardCommand implements TabExecutor {
+    private static final List<String> FIRST_ARGS = ImmutableList.of("keep", "time", "clear");
+
+    @Override
+    public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
+        if (CommandUtils.noConsoleUsage(sender)) {
+            return true;
+        }
+
+        switch (args.length) {
+            case 1:
+                if (args[0].equalsIgnoreCase("clear") || args[0].equalsIgnoreCase("reset")) {
+                    ScoreboardManager.clearBoard(sender.getName());
+                    sender.sendMessage(LocaleLoader.getString("Commands.Scoreboard.Clear"));
+                    return true;
+                }
+
+                if (args[0].equalsIgnoreCase("keep")) {
+                    if (!Config.getInstance().getAllowKeepBoard()) {
+                        sender.sendMessage(LocaleLoader.getString("Commands.Disabled"));
+                        return true;
+                    }
+
+                    if (!ScoreboardManager.isBoardShown(sender.getName())) {
+                        sender.sendMessage(LocaleLoader.getString("Commands.Scoreboard.NoBoard"));
+                        return true;
+                    }
+
+                    ScoreboardManager.keepBoard(sender.getName());
+                    sender.sendMessage(LocaleLoader.getString("Commands.Scoreboard.Keep"));
+                    return true;
+                }
+
+                return help(sender);
+
+            case 2:
+                if (args[0].equalsIgnoreCase("time") || args[0].equalsIgnoreCase("timer")) {
+                    if (CommandUtils.isInvalidInteger(sender, args[1])) {
+                        return true;
+                    }
+
+                    int time = Math.abs(Integer.parseInt(args[1]));
+
+                    ScoreboardManager.setRevertTimer(sender.getName(), time);
+                    sender.sendMessage(LocaleLoader.getString("Commands.Scoreboard.Timer", time));
+                    return true;
+                }
+
+                return help(sender);
+
+            default:
+                return help(sender);
+        }
+    }
+
+    @Override
+    public List<String> onTabComplete(CommandSender sender, Command command, String alias, String[] args) {
+        switch (args.length) {
+            case 1:
+                return StringUtil.copyPartialMatches(args[0], FIRST_ARGS, new ArrayList<String>(FIRST_ARGS.size()));
+            default:
+                return ImmutableList.of();
+        }
+    }
+
+    private boolean help(CommandSender sender) {
+        sender.sendMessage(LocaleLoader.getString("Commands.Scoreboard.Help.0"));
+        sender.sendMessage(LocaleLoader.getString("Commands.Scoreboard.Help.1"));
+        sender.sendMessage(LocaleLoader.getString("Commands.Scoreboard.Help.2"));
+        sender.sendMessage(LocaleLoader.getString("Commands.Scoreboard.Help.3"));
+        return true;
+    }
+}

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

@@ -0,0 +1,67 @@
+package com.gmail.nossr50.commands;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+
+import org.bukkit.command.Command;
+import org.bukkit.command.CommandSender;
+import org.bukkit.command.TabExecutor;
+import org.bukkit.entity.Player;
+import org.bukkit.util.StringUtil;
+
+import com.gmail.nossr50.datatypes.MobHealthbarType;
+import com.gmail.nossr50.locale.LocaleLoader;
+import com.gmail.nossr50.util.commands.CommandUtils;
+import com.gmail.nossr50.util.player.UserManager;
+
+import com.google.common.collect.ImmutableList;
+
+public class MobhealthCommand implements TabExecutor {
+    private static final List<String> MOB_HEALTHBAR_TYPES;
+
+    static {
+        ArrayList<String> types = new ArrayList<String>();
+
+        for (MobHealthbarType type : MobHealthbarType.values()) {
+            types.add(type.toString());
+        }
+
+        Collections.sort(types);
+        MOB_HEALTHBAR_TYPES = ImmutableList.copyOf(types);
+    }
+
+    @Override
+    public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
+        if (CommandUtils.noConsoleUsage(sender)) {
+            return true;
+        }
+
+        switch (args.length) {
+            case 1:
+                try {
+                    MobHealthbarType type = MobHealthbarType.valueOf(args[0].toUpperCase().trim());
+                    UserManager.getPlayer((Player) sender).getProfile().setMobHealthbarType(type);
+                    sender.sendMessage(LocaleLoader.getString("Commands.Healthbars.Changed." + type.name()));
+                    return true;
+                }
+                catch (IllegalArgumentException ex) {
+                    sender.sendMessage(LocaleLoader.getString("Commands.Healthbars.Invalid"));
+                    return true;
+                }
+
+            default:
+                return false;
+        }
+    }
+
+    @Override
+    public List<String> onTabComplete(CommandSender sender, Command command, String alias, String[] args) {
+        switch (args.length) {
+            case 1:
+                return StringUtil.copyPartialMatches(args[0], MOB_HEALTHBAR_TYPES, new ArrayList<String>(MOB_HEALTHBAR_TYPES.size()));
+            default:
+                return ImmutableList.of();
+        }
+    }
+}

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

@@ -0,0 +1,77 @@
+package com.gmail.nossr50.commands;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Set;
+
+import org.bukkit.command.Command;
+import org.bukkit.command.CommandSender;
+import org.bukkit.command.TabExecutor;
+import org.bukkit.util.StringUtil;
+
+import com.gmail.nossr50.datatypes.player.McMMOPlayer;
+import com.gmail.nossr50.util.Misc;
+import com.gmail.nossr50.util.commands.CommandUtils;
+import com.gmail.nossr50.util.player.UserManager;
+
+import com.google.common.collect.ImmutableList;
+
+public abstract class ToggleCommand implements TabExecutor {
+    @Override
+    public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
+        switch (args.length) {
+            case 0:
+                if (CommandUtils.noConsoleUsage(sender)) {
+                    return true;
+                }
+
+                if (!hasSelfPermission(sender)) {
+                    sender.sendMessage(command.getPermissionMessage());
+                    return true;
+                }
+
+                applyCommandAction(UserManager.getPlayer(sender.getName()));
+                return true;
+
+            case 1:
+                if (!hasOtherPermission(sender)) {
+                    sender.sendMessage(command.getPermissionMessage());
+                    return true;
+                }
+
+                String playerName = Misc.getMatchedPlayerName(args[0]);
+                McMMOPlayer mcMMOPlayer = UserManager.getPlayer(playerName);
+
+                if (!CommandUtils.checkPlayerExistence(sender, playerName, mcMMOPlayer)) {
+                    return true;
+                }
+
+                if (CommandUtils.isOffline(sender, mcMMOPlayer.getPlayer())) {
+                    return true;
+                }
+
+                applyCommandAction(mcMMOPlayer);
+                sendSuccessMessage(sender, playerName);
+                return true;
+
+            default:
+                return false;
+        }
+    }
+
+    @Override
+    public List<String> onTabComplete(CommandSender sender, Command command, String alias, String[] args) {
+        switch (args.length) {
+            case 1:
+                Set<String> playerNames = UserManager.getPlayerNames();
+                return StringUtil.copyPartialMatches(args[0], playerNames, new ArrayList<String>(playerNames.size()));
+            default:
+                return ImmutableList.of();
+        }
+    }
+
+    protected abstract boolean hasOtherPermission(CommandSender sender);
+    protected abstract boolean hasSelfPermission(CommandSender sender);
+    protected abstract void applyCommandAction(McMMOPlayer mcMMOPlayer);
+    protected abstract void sendSuccessMessage(CommandSender sender, String playerName);
+}

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

@@ -0,0 +1,97 @@
+package com.gmail.nossr50.commands;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.bukkit.command.Command;
+import org.bukkit.command.CommandSender;
+import org.bukkit.command.TabExecutor;
+import org.bukkit.util.StringUtil;
+
+import com.gmail.nossr50.mcMMO;
+import com.gmail.nossr50.config.experience.ExperienceConfig;
+import com.gmail.nossr50.locale.LocaleLoader;
+import com.gmail.nossr50.util.Permissions;
+import com.gmail.nossr50.util.StringUtils;
+import com.gmail.nossr50.util.commands.CommandUtils;
+
+import com.google.common.collect.ImmutableList;
+
+public class XprateCommand implements TabExecutor {
+    private final double ORIGINAL_XP_RATE = ExperienceConfig.getInstance().getExperienceGainsGlobalMultiplier();
+
+    @Override
+    public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
+        switch (args.length) {
+            case 1:
+                if (!args[0].equalsIgnoreCase("reset")) {
+                    return false;
+                }
+
+                if (!Permissions.xprateReset(sender)) {
+                    sender.sendMessage(command.getPermissionMessage());
+                    return true;
+                }
+
+                if (mcMMO.p.isXPEventEnabled()) {
+                    mcMMO.p.getServer().broadcastMessage(LocaleLoader.getString("Commands.xprate.over"));
+                    mcMMO.p.toggleXpEventEnabled();
+                }
+
+                ExperienceConfig.getInstance().setExperienceGainsGlobalMultiplier(ORIGINAL_XP_RATE);
+                return true;
+
+            case 2:
+                if (CommandUtils.isInvalidInteger(sender, args[0])) {
+                    return true;
+                }
+
+                if (!Permissions.xprateSet(sender)) {
+                    sender.sendMessage(command.getPermissionMessage());
+                    return true;
+                }
+
+                if (CommandUtils.shouldDisableToggle(args[1])) {
+                    mcMMO.p.setXPEventEnabled(false);
+                }
+                else if (CommandUtils.shouldEnableToggle(args[1])) {
+                    mcMMO.p.setXPEventEnabled(true);
+                }
+                else {
+                    return false;
+                }
+
+                int newXpRate = Integer.parseInt(args[0]);
+                ExperienceConfig.getInstance().setExperienceGainsGlobalMultiplier(newXpRate);
+
+                if (mcMMO.p.isXPEventEnabled()) {
+                    mcMMO.p.getServer().broadcastMessage(LocaleLoader.getString("Commands.xprate.started.0"));
+                    mcMMO.p.getServer().broadcastMessage(LocaleLoader.getString("Commands.xprate.started.1", newXpRate));
+                }
+                else {
+                    sender.sendMessage(LocaleLoader.getString("Commands.xprate.modified", newXpRate));
+                }
+
+                return true;
+
+            default:
+                return false;
+        }
+    }
+
+    @Override
+    public List<String> onTabComplete(CommandSender sender, Command command, String alias, String[] args) {
+        switch (args.length) {
+            case 1:
+                if (StringUtils.isInt(args[0])) {
+                    return ImmutableList.of();
+                }
+
+                return StringUtil.copyPartialMatches(args[0], CommandUtils.RESET_OPTIONS, new ArrayList<String>(CommandUtils.RESET_OPTIONS.size()));
+            case 2:
+                return StringUtil.copyPartialMatches(args[1], CommandUtils.TRUE_FALSE_OPTIONS, new ArrayList<String>(CommandUtils.TRUE_FALSE_OPTIONS.size()));
+            default:
+                return ImmutableList.of();
+        }
+    }
+}

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

@@ -0,0 +1,16 @@
+package com.gmail.nossr50.commands.chat;
+
+import org.bukkit.command.CommandSender;
+
+import com.gmail.nossr50.datatypes.chat.ChatMode;
+
+public class AdminChatCommand extends ChatCommand {
+    public AdminChatCommand() {
+        super(ChatMode.ADMIN);
+    }
+
+    @Override
+    protected void handleChatSending(CommandSender sender, String[] args) {
+        chatManager.handleChat(sender.getName(), getDisplayName(sender), buildChatMessage(args, 0));
+    }
+}

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

@@ -0,0 +1,127 @@
+package com.gmail.nossr50.commands.chat;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.bukkit.command.Command;
+import org.bukkit.command.CommandSender;
+import org.bukkit.command.TabExecutor;
+import org.bukkit.entity.Player;
+import org.bukkit.util.StringUtil;
+
+import com.gmail.nossr50.mcMMO;
+import com.gmail.nossr50.chat.ChatManager;
+import com.gmail.nossr50.chat.ChatManagerFactory;
+import com.gmail.nossr50.datatypes.chat.ChatMode;
+import com.gmail.nossr50.datatypes.player.McMMOPlayer;
+import com.gmail.nossr50.locale.LocaleLoader;
+import com.gmail.nossr50.util.commands.CommandUtils;
+import com.gmail.nossr50.util.player.UserManager;
+
+import com.google.common.collect.ImmutableList;
+
+public abstract class ChatCommand implements TabExecutor {
+    private ChatMode chatMode;
+    protected ChatManager chatManager;
+
+    public ChatCommand(ChatMode chatMode) {
+        this.chatMode = chatMode;
+        this.chatManager = ChatManagerFactory.getChatManager(mcMMO.p, chatMode);
+    }
+
+    @Override
+    public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
+        McMMOPlayer mcMMOPlayer;
+
+        switch (args.length) {
+            case 0:
+                if (CommandUtils.noConsoleUsage(sender)) {
+                    return true;
+                }
+
+                mcMMOPlayer = UserManager.getPlayer(sender.getName());
+
+                if (mcMMOPlayer.isChatEnabled(chatMode)) {
+                    disableChatMode(mcMMOPlayer, sender);
+                }
+                else {
+                    enableChatMode(mcMMOPlayer, sender);
+                }
+
+                return true;
+
+            case 1:
+                if (CommandUtils.shouldEnableToggle(args[0])) {
+                    if (CommandUtils.noConsoleUsage(sender)) {
+                        return true;
+                    }
+
+                    enableChatMode(UserManager.getPlayer(sender.getName()), sender);
+                    return true;
+                }
+
+                if (CommandUtils.shouldDisableToggle(args[0])) {
+                    if (CommandUtils.noConsoleUsage(sender)) {
+                        return true;
+                    }
+
+                    disableChatMode(UserManager.getPlayer(sender.getName()), sender);
+                    return true;
+                }
+
+                // Fallthrough
+
+            default:
+                handleChatSending(sender, args);
+                return true;
+        }
+    }
+
+    @Override
+    public List<String> onTabComplete(CommandSender sender, Command command, String alias, String[] args) {
+        switch (args.length) {
+            case 1:
+                return StringUtil.copyPartialMatches(args[0], CommandUtils.TRUE_FALSE_OPTIONS, new ArrayList<String>(CommandUtils.TRUE_FALSE_OPTIONS.size()));
+            default:
+                return ImmutableList.of();
+        }
+    }
+
+    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 String getDisplayName(CommandSender sender) {
+        return (sender instanceof Player) ? ((Player) sender).getDisplayName() : LocaleLoader.getString("Commands.Chat.Console");
+    }
+
+    protected abstract void handleChatSending(CommandSender sender, String[] args);
+
+    private void enableChatMode(McMMOPlayer mcMMOPlayer, CommandSender sender) {
+        if (chatMode == ChatMode.PARTY && mcMMOPlayer.getParty() == null) {
+            sender.sendMessage(LocaleLoader.getString("Commands.Party.None"));
+            return;
+        }
+
+        mcMMOPlayer.enableChat(chatMode);
+        sender.sendMessage(chatMode.getEnabledMessage());
+    }
+
+    private void disableChatMode(McMMOPlayer mcMMOPlayer, CommandSender sender) {
+        if (chatMode == ChatMode.PARTY && mcMMOPlayer.getParty() == null) {
+            sender.sendMessage(LocaleLoader.getString("Commands.Party.None"));
+            return;
+        }
+
+        mcMMOPlayer.disableChat(chatMode);
+        sender.sendMessage(chatMode.getDisabledMessage());
+    }
+}

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

@@ -0,0 +1,52 @@
+package com.gmail.nossr50.commands.chat;
+
+import org.bukkit.command.CommandSender;
+import org.bukkit.entity.Player;
+
+import com.gmail.nossr50.chat.PartyChatManager;
+import com.gmail.nossr50.datatypes.chat.ChatMode;
+import com.gmail.nossr50.datatypes.party.Party;
+import com.gmail.nossr50.locale.LocaleLoader;
+import com.gmail.nossr50.party.PartyManager;
+import com.gmail.nossr50.util.player.UserManager;
+
+public class PartyChatCommand extends ChatCommand {
+    public PartyChatCommand() {
+        super(ChatMode.PARTY);
+    }
+
+    @Override
+    protected void handleChatSending(CommandSender sender, String[] args) {
+        Party party;
+        String message;
+
+        if (sender instanceof Player) {
+            party = UserManager.getPlayer((Player) sender).getParty();
+
+            if (party == null) {
+                sender.sendMessage(LocaleLoader.getString("Commands.Party.None"));
+                return;
+            }
+
+            message = buildChatMessage(args, 0);
+        }
+        else {
+            if (args.length < 2) {
+                sender.sendMessage(LocaleLoader.getString("Party.Specify"));
+                return;
+            }
+
+            party = PartyManager.getParty(args[0]);
+
+            if (party == null) {
+                sender.sendMessage(LocaleLoader.getString("Party.InvalidName"));
+                return;
+            }
+
+            message = buildChatMessage(args, 1);
+        }
+
+        ((PartyChatManager) chatManager).setParty(party);
+        chatManager.handleChat(sender.getName(), getDisplayName(sender), message);
+    }
+}

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

@@ -0,0 +1,74 @@
+package com.gmail.nossr50.commands.database;
+
+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.database.DatabaseManager;
+import com.gmail.nossr50.database.DatabaseManagerFactory;
+import com.gmail.nossr50.datatypes.database.DatabaseType;
+import com.gmail.nossr50.datatypes.player.PlayerProfile;
+import com.gmail.nossr50.locale.LocaleLoader;
+import com.gmail.nossr50.runnables.database.DatabaseConversionTask;
+import com.gmail.nossr50.util.player.UserManager;
+
+public class ConvertDatabaseCommand implements CommandExecutor {
+    @Override
+    public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
+        switch (args.length) {
+            case 2:
+                DatabaseType previousType = DatabaseType.getDatabaseType(args[1]);
+                DatabaseType newType = mcMMO.getDatabaseManager().getDatabaseType();
+
+                if (previousType == newType || (newType == DatabaseType.CUSTOM && DatabaseManagerFactory.getCustomDatabaseManagerClass().getSimpleName().equalsIgnoreCase(args[1]))) {
+                    sender.sendMessage(LocaleLoader.getString("Commands.mcconvert.Database.Same", newType.toString()));
+                    return true;
+                }
+
+                DatabaseManager oldDatabase = DatabaseManagerFactory.createDatabaseManager(previousType);
+
+                if (previousType == DatabaseType.CUSTOM) {
+                    Class<?> clazz;
+
+                    try {
+                        clazz = Class.forName(args[1]);
+
+                        if (!DatabaseManager.class.isAssignableFrom(clazz)) {
+                            sender.sendMessage(LocaleLoader.getString("Commands.mcconvert.Database.InvalidType", args[1]));
+                            return true;
+                        }
+
+                        oldDatabase = DatabaseManagerFactory.createCustomDatabaseManager((Class<? extends DatabaseManager>) clazz);
+                    }
+                    catch (Throwable e) {
+                        e.printStackTrace();
+                        sender.sendMessage(LocaleLoader.getString("Commands.mcconvert.Database.InvalidType", args[1]));
+                        return true;
+                    }
+                }
+
+                sender.sendMessage(LocaleLoader.getString("Commands.mcconvert.Database.Start", previousType.toString(), newType.toString()));
+
+                UserManager.saveAll();
+                UserManager.clearAll();
+
+                for (Player player : mcMMO.p.getServer().getOnlinePlayers()) {
+                    PlayerProfile profile = oldDatabase.loadPlayerProfile(player.getName(), false);
+
+                    if (profile.isLoaded()) {
+                        mcMMO.getDatabaseManager().saveUser(profile);
+                    }
+
+                    UserManager.addUser(player);
+                }
+
+                new DatabaseConversionTask(oldDatabase, sender, previousType.toString(), newType.toString()).runTaskAsynchronously(mcMMO.p);
+                return true;
+
+            default:
+                return false;
+        }
+    }
+}

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

@@ -0,0 +1,38 @@
+package com.gmail.nossr50.commands.database;
+
+import java.util.List;
+
+import org.bukkit.command.Command;
+import org.bukkit.command.CommandSender;
+import org.bukkit.command.TabExecutor;
+
+import com.gmail.nossr50.mcMMO;
+import com.gmail.nossr50.config.Config;
+import com.gmail.nossr50.locale.LocaleLoader;
+
+import com.google.common.collect.ImmutableList;
+
+public class McpurgeCommand implements TabExecutor {
+    @Override
+    public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
+        switch (args.length) {
+            case 0:
+                mcMMO.getDatabaseManager().purgePowerlessUsers();
+
+                if (Config.getInstance().getOldUsersCutoff() != -1) {
+                    mcMMO.getDatabaseManager().purgeOldUsers();
+                }
+
+                sender.sendMessage(LocaleLoader.getString("Commands.mcpurge.Success"));
+                return true;
+
+            default:
+                return false;
+        }
+    }
+
+    @Override
+    public List<String> onTabComplete(CommandSender sender, Command command, String alias, String[] args) {
+        return ImmutableList.of();
+    }
+}

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

@@ -0,0 +1,55 @@
+package com.gmail.nossr50.commands.database;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Set;
+
+import org.bukkit.command.Command;
+import org.bukkit.command.CommandSender;
+import org.bukkit.command.TabExecutor;
+import org.bukkit.util.StringUtil;
+
+import com.gmail.nossr50.mcMMO;
+import com.gmail.nossr50.locale.LocaleLoader;
+import com.gmail.nossr50.util.Misc;
+import com.gmail.nossr50.util.commands.CommandUtils;
+import com.gmail.nossr50.util.player.UserManager;
+
+import com.google.common.collect.ImmutableList;
+
+public class McremoveCommand implements TabExecutor {
+    @Override
+    public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
+        switch (args.length) {
+            case 1:
+                String playerName = Misc.getMatchedPlayerName(args[0]);
+
+                if (UserManager.getPlayer(playerName, true) == null && CommandUtils.unloadedProfile(sender, mcMMO.getDatabaseManager().loadPlayerProfile(playerName, false))) {
+                    return true;
+                }
+
+                if (mcMMO.getDatabaseManager().removeUser(playerName)) {
+                    sender.sendMessage(LocaleLoader.getString("Commands.mcremove.Success", playerName));
+                }
+                else {
+                    sender.sendMessage(playerName + " could not be removed from the database."); // Pretty sure this should NEVER happen.
+                }
+
+                return true;
+
+            default:
+                return false;
+        }
+    }
+
+    @Override
+    public List<String> onTabComplete(CommandSender sender, Command command, String alias, String[] args) {
+        switch (args.length) {
+            case 1:
+                Set<String> playerNames = UserManager.getPlayerNames();
+                return StringUtil.copyPartialMatches(args[0], playerNames, new ArrayList<String>(playerNames.size()));
+            default:
+                return ImmutableList.of();
+        }
+    }
+}

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

@@ -0,0 +1,39 @@
+package com.gmail.nossr50.commands.database;
+
+import java.util.List;
+
+import org.bukkit.command.Command;
+import org.bukkit.command.CommandSender;
+import org.bukkit.command.TabExecutor;
+
+import com.gmail.nossr50.config.Config;
+import com.gmail.nossr50.database.DatabaseManagerFactory;
+import com.gmail.nossr50.locale.LocaleLoader;
+
+import com.google.common.collect.ImmutableList;
+
+public class MmoshowdbCommand implements TabExecutor {
+    @Override
+    public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
+        switch (args.length) {
+            case 0:
+                Class<?> clazz = DatabaseManagerFactory.getCustomDatabaseManagerClass();
+
+                if (clazz != null) {
+                    sender.sendMessage(LocaleLoader.getString("Commands.mmoshowdb", clazz.getName()));
+                    return true;
+                }
+
+                sender.sendMessage(LocaleLoader.getString("Commands.mmoshowdb", (Config.getInstance().getUseMySQL() ? "sql" : "flatfile")));
+                return true;
+
+            default:
+                return false;
+        }
+    }
+
+    @Override
+    public List<String> onTabComplete(CommandSender sender, Command command, String alias, String[] args) {
+        return ImmutableList.of();
+    }
+}

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

@@ -0,0 +1,45 @@
+package com.gmail.nossr50.commands.experience;
+
+import org.bukkit.command.CommandSender;
+import org.bukkit.entity.Player;
+
+import com.gmail.nossr50.datatypes.player.PlayerProfile;
+import com.gmail.nossr50.datatypes.skills.SkillType;
+import com.gmail.nossr50.locale.LocaleLoader;
+import com.gmail.nossr50.util.EventUtils;
+import com.gmail.nossr50.util.Permissions;
+
+public class AddlevelsCommand extends ExperienceCommand {
+    @Override
+    protected boolean permissionsCheckSelf(CommandSender sender) {
+        return Permissions.addlevels(sender);
+    }
+
+    @Override
+    protected boolean permissionsCheckOthers(CommandSender sender) {
+        return Permissions.addlevelsOthers(sender);
+    }
+
+    @Override
+    protected void handleCommand(Player player, PlayerProfile profile, SkillType skill, int value) {
+        float xpRemoved = profile.getSkillXpLevelRaw(skill);
+        profile.addLevels(skill, value);
+
+        if (player == null) {
+            profile.save();
+            return;
+        }
+
+        EventUtils.handleLevelChangeEvent(player, skill, value, xpRemoved, true);
+    }
+
+    @Override
+    protected void handlePlayerMessageAll(Player player, int value) {
+        player.sendMessage(LocaleLoader.getString("Commands.addlevels.AwardAll.1", value));
+    }
+
+    @Override
+    protected void handlePlayerMessageSkill(Player player, int value, SkillType skill) {
+        player.sendMessage(LocaleLoader.getString("Commands.addlevels.AwardSkill.1", value, skill.getName()));
+    }
+}

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

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

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

@@ -0,0 +1,49 @@
+package com.gmail.nossr50.commands.experience;
+
+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.datatypes.experience.FormulaType;
+import com.gmail.nossr50.locale.LocaleLoader;
+import com.gmail.nossr50.runnables.database.FormulaConversionTask;
+import com.gmail.nossr50.util.player.UserManager;
+
+public class ConvertExperienceCommand implements CommandExecutor {
+    @Override
+    public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
+        switch (args.length) {
+            case 2:
+                FormulaType previousType = mcMMO.getFormulaManager().getPreviousFormulaType();
+                FormulaType newType = FormulaType.getFormulaType(args[1].toUpperCase());
+
+                if (newType == FormulaType.UNKNOWN) {
+                    sender.sendMessage(LocaleLoader.getString("Commands.mcconvert.Experience.Invalid"));
+                    return true;
+                }
+
+                if (previousType == newType) {
+                    sender.sendMessage(LocaleLoader.getString("Commands.mcconvert.Experience.Same", newType.toString()));
+                    return true;
+                }
+
+                sender.sendMessage(LocaleLoader.getString("Commands.mcconvert.Experience.Start", previousType.toString(), newType.toString()));
+
+                UserManager.saveAll();
+                UserManager.clearAll();
+
+                new FormulaConversionTask(sender, newType).runTaskLater(mcMMO.p, 1);
+
+                for (Player player : mcMMO.p.getServer().getOnlinePlayers()) {
+                    UserManager.addUser(player);
+                }
+
+                return true;
+
+            default:
+                return false;
+        }
+    }
+}

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

@@ -0,0 +1,137 @@
+package com.gmail.nossr50.commands.experience;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Set;
+
+import org.bukkit.command.Command;
+import org.bukkit.command.CommandSender;
+import org.bukkit.command.TabExecutor;
+import org.bukkit.entity.Player;
+import org.bukkit.util.StringUtil;
+
+import com.gmail.nossr50.mcMMO;
+import com.gmail.nossr50.datatypes.player.McMMOPlayer;
+import com.gmail.nossr50.datatypes.player.PlayerProfile;
+import com.gmail.nossr50.datatypes.skills.SkillType;
+import com.gmail.nossr50.locale.LocaleLoader;
+import com.gmail.nossr50.util.Misc;
+import com.gmail.nossr50.util.commands.CommandUtils;
+import com.gmail.nossr50.util.player.UserManager;
+
+import com.google.common.collect.ImmutableList;
+
+public abstract class ExperienceCommand implements TabExecutor {
+    @Override
+    public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
+        switch (args.length) {
+            case 2:
+                if (CommandUtils.noConsoleUsage(sender)) {
+                    return true;
+                }
+
+                if (!permissionsCheckSelf(sender)) {
+                    sender.sendMessage(command.getPermissionMessage());
+                    return true;
+                }
+
+                if (!validateArguments(sender, args[0], args[1])) {
+                    return true;
+                }
+
+                editValues((Player) sender, UserManager.getPlayer(sender.getName()).getProfile(), SkillType.getSkill(args[0]), Integer.parseInt(args[1]));
+                return true;
+
+            case 3:
+                if (!permissionsCheckOthers(sender)) {
+                    sender.sendMessage(command.getPermissionMessage());
+                    return true;
+                }
+
+                if (!validateArguments(sender, args[1], args[2])) {
+                    return true;
+                }
+
+                SkillType skill = SkillType.getSkill(args[1]);
+                int value = Integer.parseInt(args[2]);
+
+                String playerName = Misc.getMatchedPlayerName(args[0]);
+                McMMOPlayer mcMMOPlayer = UserManager.getPlayer(playerName, true);
+
+                // If the mcMMOPlayer doesn't exist, create a temporary profile and check if it's present in the database. If it's not, abort the process.
+                if (mcMMOPlayer == null) {
+                    PlayerProfile profile = mcMMO.getDatabaseManager().loadPlayerProfile(playerName, false);
+
+                    if (CommandUtils.unloadedProfile(sender, profile)) {
+                        return true;
+                    }
+
+                    editValues(null, profile, skill, value);
+                }
+                else {
+                    editValues(mcMMOPlayer.getPlayer(), mcMMOPlayer.getProfile(), skill, value);
+                }
+
+                handleSenderMessage(sender, playerName, skill);
+                return true;
+
+            default:
+                return false;
+        }
+    }
+
+    @Override
+    public List<String> onTabComplete(CommandSender sender, Command command, String alias, String[] args) {
+        switch (args.length) {
+            case 1:
+                Set<String> playerNames = UserManager.getPlayerNames();
+                return StringUtil.copyPartialMatches(args[0], playerNames, new ArrayList<String>(playerNames.size()));
+            case 2:
+                return StringUtil.copyPartialMatches(args[1], SkillType.SKILL_NAMES, new ArrayList<String>(SkillType.SKILL_NAMES.size()));
+            default:
+                return ImmutableList.of();
+        }
+    }
+
+    protected abstract boolean permissionsCheckSelf(CommandSender sender);
+    protected abstract boolean permissionsCheckOthers(CommandSender sender);
+    protected abstract void handleCommand(Player player, PlayerProfile profile, SkillType skill, int value);
+    protected abstract void handlePlayerMessageAll(Player player, int value);
+    protected abstract void handlePlayerMessageSkill(Player player, int value, SkillType skill);
+
+    private boolean validateArguments(CommandSender sender, String skillName, String value) {
+        if (CommandUtils.isInvalidInteger(sender, value) || CommandUtils.isInvalidSkill(sender, skillName)) {
+            return false;
+        }
+
+        return true;
+    }
+
+    protected static void handleSenderMessage(CommandSender sender, String playerName, SkillType skill) {
+        if (skill == null) {
+            sender.sendMessage(LocaleLoader.getString("Commands.addlevels.AwardAll.2", playerName));
+        }
+        else {
+            sender.sendMessage(LocaleLoader.getString("Commands.addlevels.AwardSkill.2", skill.getName(), playerName));
+        }
+    }
+
+    protected void editValues(Player player, PlayerProfile profile, SkillType skill, int value) {
+        if (skill == null) {
+            for (SkillType skillType : SkillType.values()) {
+                handleCommand(player, profile, skillType, value);
+            }
+
+            if (player != null) {
+                handlePlayerMessageAll(player, value);
+            }
+        }
+        else {
+            handleCommand(player, profile, skill, value);
+
+            if (player != null) {
+                handlePlayerMessageSkill(player, value, skill);
+            }
+        }
+    }
+}

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

@@ -0,0 +1,51 @@
+package com.gmail.nossr50.commands.experience;
+
+import org.bukkit.command.CommandSender;
+import org.bukkit.entity.Player;
+
+import com.gmail.nossr50.datatypes.player.PlayerProfile;
+import com.gmail.nossr50.datatypes.skills.SkillType;
+import com.gmail.nossr50.locale.LocaleLoader;
+import com.gmail.nossr50.util.EventUtils;
+import com.gmail.nossr50.util.Permissions;
+
+public class MmoeditCommand extends ExperienceCommand {
+    @Override
+    protected boolean permissionsCheckSelf(CommandSender sender) {
+        return Permissions.mmoedit(sender);
+    }
+
+    @Override
+    protected boolean permissionsCheckOthers(CommandSender sender) {
+        return Permissions.mmoeditOthers(sender);
+    }
+
+    @Override
+    protected void handleCommand(Player player, PlayerProfile profile, SkillType skill, int value) {
+        int skillLevel = profile.getSkillLevel(skill);
+        float xpRemoved = profile.getSkillXpLevelRaw(skill);
+
+        profile.modifySkill(skill, value);
+
+        if (player == null) {
+            profile.save();
+            return;
+        }
+
+        if (value == skillLevel) {
+            return;
+        }
+
+        EventUtils.handleLevelChangeEvent(player, skill, value, xpRemoved, value > skillLevel);
+    }
+
+    @Override
+    protected void handlePlayerMessageAll(Player player, int value) {
+        player.sendMessage(LocaleLoader.getString("Commands.mmoedit.AllSkills.1", value));
+    }
+
+    @Override
+    protected void handlePlayerMessageSkill(Player player, int value, SkillType skill) {
+        player.sendMessage(LocaleLoader.getString("Commands.mmoedit.Modified.1", skill.getName(), value));
+    }
+}

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

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

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

@@ -1,108 +0,0 @@
-package com.gmail.nossr50.commands.general;
-
-import org.bukkit.ChatColor;
-import org.bukkit.OfflinePlayer;
-import org.bukkit.command.Command;
-import org.bukkit.command.CommandExecutor;
-import org.bukkit.command.CommandSender;
-import org.bukkit.entity.Player;
-
-import com.gmail.nossr50.mcMMO;
-import com.gmail.nossr50.commands.CommandHelper;
-import com.gmail.nossr50.datatypes.PlayerProfile;
-import com.gmail.nossr50.datatypes.SkillType;
-import com.gmail.nossr50.locale.mcLocale;
-import com.gmail.nossr50.util.Skills;
-import com.gmail.nossr50.util.Users;
-import com.gmail.nossr50.util.m;
-
-public class AddlevelsCommand implements CommandExecutor{
-    private final mcMMO plugin;
-
-    public AddlevelsCommand(mcMMO instance) {
-        this.plugin = instance;
-    }
-
-    @Override
-    public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
-        OfflinePlayer modifiedPlayer;
-        PlayerProfile PP;
-        int levels;
-        SkillType skill;
-        String skillName;
-        String usage = ChatColor.RED + "Proper usage is /addlevels [playername] <skill> <level>"; //TODO: Needs more locale.
-
-        if (CommandHelper.noCommandPermissions(sender, "mcmmo.tools.mmoedit")) {
-            return true;
-        }
-
-        switch (args.length) {
-        case 2:
-            if (sender instanceof Player) {
-                if (m.isInt(args[1]) && Skills.isSkill(args[0])) {
-                    modifiedPlayer = (Player) sender;
-                    levels = Integer.valueOf(args[1]);
-                    skill = Skills.getSkillType(args[0]);
-                    PP = Users.getProfile(modifiedPlayer);
-
-                    if (skill.equals(SkillType.ALL)) {
-                        skillName = "all skills";
-                    }
-                    else {
-                        skillName = m.getCapitalized(skill.toString());
-                    }
-
-                    PP.addLevels(skill, levels);
-                    sender.sendMessage(ChatColor.GREEN + "You were awarded " + levels + " levels in " + skillName + "!"); //TODO: Needs more locale.
-                }
-            }
-            else {
-                sender.sendMessage(usage);
-            }
-
-            return true;
-
-        case 3:
-            modifiedPlayer = plugin.getServer().getOfflinePlayer(args[0]);
-            String playerName = modifiedPlayer.getName();
-            PP = Users.getProfile(modifiedPlayer);
-
-            if (!PP.isLoaded()) {
-                sender.sendMessage(mcLocale.getString("Commands.DoesNotExist"));
-                return true;
-            }
-
-            if (m.isInt(args[2]) && Skills.isSkill(args[1])) {
-                levels = Integer.valueOf(args[2]);
-                skill = Skills.getSkillType(args[1]);
-                String message;
-
-                Users.getProfile(modifiedPlayer).addLevels(skill, levels);
-
-                if (skill.equals(SkillType.ALL)) {
-                    skillName = "all skills";
-                    message = ChatColor.RED + "All skills have been modified for " + playerName + "."; //TODO: Use locale
-                }
-                else {
-                    skillName = m.getCapitalized(skill.toString());
-                    message = ChatColor.RED + skillName + " has been modified for " + playerName + "."; //TODO: Use locale
-                }
-
-                sender.sendMessage(message);
-
-                if (modifiedPlayer.isOnline()) {
-                    ((Player) modifiedPlayer).sendMessage(ChatColor.GREEN + "You were awarded " + levels + " levels in " + skillName + "!"); //TODO: Needs more locale.
-                }
-            }
-            else {
-                sender.sendMessage(usage);
-            }
-
-            return true;
-
-        default:
-            sender.sendMessage(usage);
-            return true;
-        }
-    }
-}

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

@@ -1,110 +0,0 @@
-package com.gmail.nossr50.commands.general;
-
-import org.bukkit.ChatColor;
-import org.bukkit.command.Command;
-import org.bukkit.command.CommandExecutor;
-import org.bukkit.command.CommandSender;
-import org.bukkit.entity.Player;
-
-import com.gmail.nossr50.mcMMO;
-import com.gmail.nossr50.commands.CommandHelper;
-import com.gmail.nossr50.datatypes.SkillType;
-import com.gmail.nossr50.util.Skills;
-import com.gmail.nossr50.util.Users;
-import com.gmail.nossr50.util.m;
-
-//TODO: Any way we can make this work for offline use?
-public class AddxpCommand implements CommandExecutor {
-    private final mcMMO plugin;
-
-    public AddxpCommand(mcMMO instance) {
-        this.plugin = instance;
-    }
-
-    @Override
-    public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
-        Player modifiedPlayer;
-        int xp;
-        SkillType skill;
-        String skillName;
-        String usage = ChatColor.RED + "Proper usage is /addxp [player] <skill> <xp>"; //TODO: Needs more locale.
-
-        if (CommandHelper.noCommandPermissions(sender, "mcmmo.tools.mmoedit")) {
-            return true;
-        }
-
-        switch (args.length) {
-        case 2:
-            if (sender instanceof Player) {
-                if (m.isInt(args[1]) && Skills.isSkill(args[0])) {
-                    modifiedPlayer = (Player) sender;
-                    xp = Integer.valueOf(args[1]);
-                    skill = Skills.getSkillType(args[0]);
-
-                    Users.getProfile(modifiedPlayer).addXPOverride(skill, xp);
-
-                    if (skill.equals(SkillType.ALL)) {
-                        skillName = "all skills";
-                    }
-                    else {
-                        skillName = m.getCapitalized(skill.toString());
-                    }
-
-                    modifiedPlayer.sendMessage(ChatColor.GREEN + "You were awarded " + xp + " experience in " + skillName + "!"); //TODO: Needs more locale.
-
-                    if (skill.equals(SkillType.ALL)) {
-                        Skills.XpCheckAll(modifiedPlayer);
-                    }
-                    else {
-                        Skills.XpCheckSkill(skill, modifiedPlayer);
-                    }
-                }
-            }
-            else {
-                sender.sendMessage(usage);
-            }
-
-            return true;
-
-        case 3:
-            modifiedPlayer = plugin.getServer().getPlayer(args[0]);
-            String playerName = modifiedPlayer.getName();
-
-            if (modifiedPlayer != null && m.isInt(args[2]) && Skills.isSkill(args[1])) {
-                xp = Integer.valueOf(args[2]);
-                skill = Skills.getSkillType(args[1]);
-                String message;
-
-                Users.getProfile(modifiedPlayer).addXPOverride(skill, xp);
-
-                if (skill.equals(SkillType.ALL)) {
-                    skillName = "all skills";
-                    message = ChatColor.RED + "All skills have been modified for " + playerName + "."; //TODO: Use locale
-                }
-                else {
-                    skillName = m.getCapitalized(skill.toString());
-                    message = ChatColor.RED + skillName + " has been modified for " + playerName + "."; //TODO: Use locale
-                }
-
-                sender.sendMessage(message);
-                modifiedPlayer.sendMessage(ChatColor.GREEN + "You were awarded " + xp + " experience in " + skillName + "!"); //TODO: Needs more locale.
-
-                if (skill.equals(SkillType.ALL)) {
-                    Skills.XpCheckAll(modifiedPlayer);
-                }
-                else {
-                    Skills.XpCheckSkill(skill, modifiedPlayer);
-                }
-            }
-            else {
-                sender.sendMessage(usage);
-            }
-
-            return true;
-
-        default:
-            sender.sendMessage(usage);
-            return true;
-        }
-    }
-}

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

@@ -1,94 +0,0 @@
-package com.gmail.nossr50.commands.general;
-
-import org.bukkit.OfflinePlayer;
-import org.bukkit.command.Command;
-import org.bukkit.command.CommandExecutor;
-import org.bukkit.command.CommandSender;
-import org.bukkit.entity.Player;
-
-import com.gmail.nossr50.mcMMO;
-import com.gmail.nossr50.commands.CommandHelper;
-import com.gmail.nossr50.datatypes.PlayerProfile;
-import com.gmail.nossr50.datatypes.SkillType;
-import com.gmail.nossr50.locale.mcLocale;
-import com.gmail.nossr50.util.Users;
-import com.gmail.nossr50.util.m;
-
-public class InspectCommand implements CommandExecutor {
-    private final mcMMO plugin;
-
-    public InspectCommand(mcMMO instance) {
-        this.plugin = instance;
-    }
-
-    @Override
-    public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
-        OfflinePlayer target;
-        PlayerProfile PP;
-        String usage = "Proper usage is /inspect <player>"; //TODO: Needs more locale.
-
-        if (CommandHelper.noCommandPermissions(sender, "mcmmo.commands.inspect")) {
-            return true;
-        }
-
-        switch (args.length) {
-        case 1:
-            target = plugin.getServer().getOfflinePlayer(args[0]);
-            PP = Users.getProfile(target);
-
-            if (target.isOnline()) {
-                Player player = (Player) target;
-
-                if (sender instanceof Player && !sender.isOp() && !m.isNear(((Player) sender).getLocation(), player.getLocation(), 5.0)) {
-                    sender.sendMessage(mcLocale.getString("Inspect.TooFar"));
-                    return true;
-                }
-
-                sender.sendMessage(mcLocale.getString("Inspect.Stats", new Object[] { target.getName() }));
-                CommandHelper.printGatheringSkills(player, sender);
-                CommandHelper.printCombatSkills(player, sender);
-                CommandHelper.printMiscSkills(player, sender);
-                sender.sendMessage(mcLocale.getString("mcPlayerListener.PowerLevel", new Object[] { PP.getPowerLevel() }));
-
-                return true;
-            }
-            else {
-                if (sender instanceof Player && !sender.isOp()) {
-                    sender.sendMessage(mcLocale.getString("Inspect.Offline"));
-                    return true;
-                }
-
-                if (!PP.isLoaded()) {
-                    sender.sendMessage(mcLocale.getString("Commands.DoesNotExist"));
-                    return true;
-                }
-
-                sender.sendMessage(mcLocale.getString("Inspect.OfflineStats", new Object[] { args[0] }));
-
-                sender.sendMessage(mcLocale.getString("Stats.GatheringHeader"));
-                sender.sendMessage(mcLocale.getString("m.SkillStats", new Object[] { mcLocale.getString("mcPlayerListener.ExcavationSkill"), PP.getSkillLevel(SkillType.EXCAVATION), PP.getSkillXpLevel(SkillType.EXCAVATION), PP.getXpToLevel(SkillType.EXCAVATION) }));
-                sender.sendMessage(mcLocale.getString("m.SkillStats", new Object[] { mcLocale.getString("mcPlayerListener.FishingSkill"), PP.getSkillLevel(SkillType.FISHING), PP.getSkillXpLevel(SkillType.FISHING), PP.getXpToLevel(SkillType.FISHING) }));
-                sender.sendMessage(mcLocale.getString("m.SkillStats", new Object[] { mcLocale.getString("mcPlayerListener.HerbalismSkill"), PP.getSkillLevel(SkillType.HERBALISM), PP.getSkillXpLevel(SkillType.HERBALISM), PP.getXpToLevel(SkillType.HERBALISM) }));
-                sender.sendMessage(mcLocale.getString("m.SkillStats", new Object[] { mcLocale.getString("mcPlayerListener.MiningSkill"), PP.getSkillLevel(SkillType.MINING), PP.getSkillXpLevel(SkillType.MINING), PP.getXpToLevel(SkillType.MINING) }));
-                sender.sendMessage(mcLocale.getString("m.SkillStats", new Object[] { mcLocale.getString("mcPlayerListener.WoodcuttingSkill"), PP.getSkillLevel(SkillType.WOODCUTTING), PP.getSkillXpLevel(SkillType.WOODCUTTING), PP.getXpToLevel(SkillType.WOODCUTTING) }));
-
-                sender.sendMessage(mcLocale.getString("Stats.CombatHeader"));
-                sender.sendMessage(mcLocale.getString("m.SkillStats", new Object[] { mcLocale.getString("mcPlayerListener.AxesSkill"), PP.getSkillLevel(SkillType.AXES), PP.getSkillXpLevel(SkillType.AXES), PP.getXpToLevel(SkillType.AXES) }));
-                sender.sendMessage(mcLocale.getString("m.SkillStats", new Object[] { mcLocale.getString("mcPlayerListener.ArcherySkill"), PP.getSkillLevel(SkillType.ARCHERY), PP.getSkillXpLevel(SkillType.ARCHERY), PP.getXpToLevel(SkillType.ARCHERY) }));
-                sender.sendMessage(mcLocale.getString("m.SkillStats", new Object[] { mcLocale.getString("mcPlayerListener.SwordsSkill"), PP.getSkillLevel(SkillType.SWORDS), PP.getSkillXpLevel(SkillType.SWORDS), PP.getXpToLevel(SkillType.SWORDS) }));
-                sender.sendMessage(mcLocale.getString("m.SkillStats", new Object[] { mcLocale.getString("mcPlayerListener.TamingSkill"), PP.getSkillLevel(SkillType.TAMING), PP.getSkillXpLevel(SkillType.TAMING), PP.getXpToLevel(SkillType.TAMING) }));
-                sender.sendMessage(mcLocale.getString("m.SkillStats", new Object[] { mcLocale.getString("mcPlayerListener.UnarmedSkill"), PP.getSkillLevel(SkillType.UNARMED), PP.getSkillXpLevel(SkillType.UNARMED), PP.getXpToLevel(SkillType.UNARMED) }));
-
-                sender.sendMessage(mcLocale.getString("Stats.MiscHeader"));
-                sender.sendMessage(mcLocale.getString("m.SkillStats", new Object[] { mcLocale.getString("mcPlayerListener.AcrobaticsSkill"), PP.getSkillLevel(SkillType.ACROBATICS), PP.getSkillXpLevel(SkillType.ACROBATICS), PP.getXpToLevel(SkillType.ACROBATICS) }));
-                sender.sendMessage(mcLocale.getString("m.SkillStats", new Object[] { mcLocale.getString("mcPlayerListener.RepairSkill"), PP.getSkillLevel(SkillType.REPAIR), PP.getSkillXpLevel(SkillType.REPAIR), PP.getXpToLevel(SkillType.REPAIR) }));
-
-                return true;
-            }
-
-        default:
-            sender.sendMessage(usage);
-            return true;
-        }
-    }
-}

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

@@ -1,35 +0,0 @@
-package com.gmail.nossr50.commands.general;
-
-import org.bukkit.command.Command;
-import org.bukkit.command.CommandExecutor;
-import org.bukkit.command.CommandSender;
-import org.bukkit.entity.Player;
-
-import com.gmail.nossr50.commands.CommandHelper;
-import com.gmail.nossr50.datatypes.PlayerProfile;
-import com.gmail.nossr50.locale.mcLocale;
-import com.gmail.nossr50.util.Users;
-
-public class McstatsCommand implements CommandExecutor {
-
-    @Override
-    public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
-        if (CommandHelper.noConsoleUsage(sender)) {
-            return true;
-        }
-
-        Player player = (Player) sender;
-        PlayerProfile PP = Users.getProfile(player);
-
-        player.sendMessage(mcLocale.getString("mcPlayerListener.YourStats"));
-        player.sendMessage(mcLocale.getString("mcPlayerListener.NoSkillNote"));
-
-        CommandHelper.printGatheringSkills(player);
-        CommandHelper.printCombatSkills(player);
-        CommandHelper.printMiscSkills(player);
-
-        player.sendMessage(mcLocale.getString("mcPlayerListener.PowerLevel", new Object[] { PP.getPowerLevel() }));
-
-        return true;
-    }
-}

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

@@ -1,108 +0,0 @@
-package com.gmail.nossr50.commands.general;
-
-import org.bukkit.ChatColor;
-import org.bukkit.OfflinePlayer;
-import org.bukkit.command.Command;
-import org.bukkit.command.CommandExecutor;
-import org.bukkit.command.CommandSender;
-import org.bukkit.entity.Player;
-
-import com.gmail.nossr50.mcMMO;
-import com.gmail.nossr50.commands.CommandHelper;
-import com.gmail.nossr50.datatypes.PlayerProfile;
-import com.gmail.nossr50.datatypes.SkillType;
-import com.gmail.nossr50.locale.mcLocale;
-import com.gmail.nossr50.util.Skills;
-import com.gmail.nossr50.util.Users;
-import com.gmail.nossr50.util.m;
-
-public class MmoeditCommand implements CommandExecutor {
-    private final mcMMO plugin;
-
-    public MmoeditCommand(mcMMO instance) {
-        this.plugin = instance;
-    }
-
-    @Override
-    public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
-        OfflinePlayer modifiedPlayer;
-        PlayerProfile PP;
-        int newValue;
-        SkillType skill;
-        String skillName;
-        String usage = ChatColor.RED + "Proper usage is /mmoedit [player] <skill> <level>"; //TODO: Needs more locale.
-
-        if (CommandHelper.noCommandPermissions(sender, "mcmmo.tools.mmoedit")) {
-            return true;
-        }
-
-        switch (args.length) {
-        case 2:
-            if (sender instanceof Player) {
-                if (m.isInt(args[1]) && Skills.isSkill(args[0])) {
-                    modifiedPlayer = (Player) sender;
-                    newValue = Integer.valueOf(args[1]);
-                    skill = Skills.getSkillType(args[0]);
-                    PP = Users.getProfile(modifiedPlayer);
-
-                    if (skill.equals(SkillType.ALL)) {
-                        skillName = "all skills";
-                    }
-                    else {
-                        skillName = m.getCapitalized(skill.toString());
-                    }
-
-                    PP.modifySkill(skill, newValue);
-                    sender.sendMessage(ChatColor.GREEN + "Your level in " + skillName + " was set to " + newValue + "!"); //TODO: Needs more locale.
-                }
-            }
-            else {
-                sender.sendMessage(usage);
-            }
-
-            return true;
-
-        case 3:
-            modifiedPlayer = plugin.getServer().getOfflinePlayer(args[0]);
-            String playerName = modifiedPlayer.getName();
-            PP = Users.getProfile(modifiedPlayer);
-
-            if (!PP.isLoaded()) {
-                sender.sendMessage(mcLocale.getString("Commands.DoesNotExist"));
-                return true;
-            }
-
-            if (m.isInt(args[2]) && Skills.isSkill(args[1])) {
-                newValue = Integer.valueOf(args[2]);
-                skill = Skills.getSkillType(args[1]);
-                String message;
-
-                Users.getProfile(modifiedPlayer).modifySkill(skill, newValue);
-
-                if (skill.equals(SkillType.ALL)) {
-                    skillName = "all skills";
-                    message = ChatColor.RED + "All skills have been modified for " + playerName + "."; //TODO: Use locale
-                }
-                else {
-                    skillName = m.getCapitalized(skill.toString());
-                    message = ChatColor.RED + skillName + " has been modified for " + playerName + "."; //TODO: Use locale
-                }
-
-                sender.sendMessage(message);
-
-                if (modifiedPlayer.isOnline()) {
-                    ((Player) modifiedPlayer).sendMessage(ChatColor.GREEN + "Your level in " + skillName + " was set to " + newValue + "!"); //TODO: Needs more locale.
-                }
-            }
-            else {
-                sender.sendMessage(usage);
-            }
-
-            return true;
-
-        default:
-            sender.sendMessage(usage);
-            return true;
-        }
-    }
-}

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

@@ -1,46 +0,0 @@
-package com.gmail.nossr50.commands.general;
-
-import org.bukkit.Bukkit;
-import org.bukkit.ChatColor;
-import org.bukkit.command.Command;
-import org.bukkit.command.CommandExecutor;
-import org.bukkit.command.CommandSender;
-import org.bukkit.entity.Player;
-
-import com.gmail.nossr50.commands.CommandHelper;
-import com.gmail.nossr50.config.LoadProperties;
-import com.gmail.nossr50.runnables.SQLConversionTask;
-import com.gmail.nossr50.util.Users;
-
-public class MmoupdateCommand implements CommandExecutor {
-
-    @Override
-    public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
-        if (CommandHelper.noCommandPermissions(sender, "mcmmo.admin")) {
-            return true;
-        }
-
-        sender.sendMessage(ChatColor.GRAY + "Starting conversion..."); //TODO: Needs more locale.
-        Users.clearUsers();
-        convertToMySQL();
-
-        for (Player x : Bukkit.getServer().getOnlinePlayers()) {
-            Users.addUser(x);
-        }
-
-        sender.sendMessage(ChatColor.GREEN + "Conversion finished!"); //TODO: Needs more locale.
-
-        return true;
-    }
-
-    /**
-     * Convert FlatFile data to MySQL data.
-     */
-    private void convertToMySQL() {
-        if (!LoadProperties.useMySQL) {
-            return;
-        }
-
-        Bukkit.getScheduler().scheduleAsyncDelayedTask(Bukkit.getPluginManager().getPlugin("mcMMO"), new SQLConversionTask(), 1);
-    }
-}

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

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

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

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

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

@@ -0,0 +1,132 @@
+package com.gmail.nossr50.commands.hardcore;
+
+import java.text.DecimalFormat;
+import java.util.ArrayList;
+import java.util.List;
+
+import org.bukkit.command.Command;
+import org.bukkit.command.CommandSender;
+import org.bukkit.command.TabExecutor;
+import org.bukkit.util.StringUtil;
+
+import com.gmail.nossr50.datatypes.skills.SkillType;
+import com.gmail.nossr50.util.Permissions;
+import com.gmail.nossr50.util.StringUtils;
+import com.gmail.nossr50.util.commands.CommandUtils;
+
+import com.google.common.collect.ImmutableList;
+
+public abstract class HardcoreModeCommand implements TabExecutor {
+    protected final DecimalFormat percent = new DecimalFormat("##0.00%");
+
+    @Override
+    public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
+        switch (args.length) {
+            case 0:
+                if (!checkTogglePermissions(sender)) {
+                    sender.sendMessage(command.getPermissionMessage());
+                    return true;
+                }
+
+                if (checkEnabled(null)) {
+                    disable(null);
+                }
+                else {
+                    enable(null);
+                }
+
+                return true;
+
+            case 1:
+                if (CommandUtils.shouldEnableToggle(args[0])) {
+                    if (!Permissions.hardcoreToggle(sender)) {
+                        sender.sendMessage(command.getPermissionMessage());
+                        return true;
+                    }
+
+                    enable(null);
+                    return true;
+                }
+
+                if (CommandUtils.shouldDisableToggle(args[0])) {
+                    if (!Permissions.hardcoreToggle(sender)) {
+                        sender.sendMessage(command.getPermissionMessage());
+                        return true;
+                    }
+
+                    disable(null);
+                    return true;
+                }
+
+                if (CommandUtils.isInvalidDouble(sender, args[0])) {
+                    return true;
+                }
+
+                if (!Permissions.hardcoreModify(sender)) {
+                    sender.sendMessage(command.getPermissionMessage());
+                    return true;
+                }
+
+                modify(sender, Double.parseDouble(args[0]));
+                return true;
+
+
+            case 2:
+                if (CommandUtils.isInvalidSkill(sender, args[0])) {
+                    return true;
+                }
+
+                SkillType skill = SkillType.getSkill(args[0]);
+
+                if (!CommandUtils.isChildSkill(sender, skill)) {
+                    return true;
+                }
+
+                if (CommandUtils.shouldEnableToggle(args[1])) {
+                    if (!Permissions.hardcoreToggle(sender)) {
+                        sender.sendMessage(command.getPermissionMessage());
+                        return true;
+                    }
+
+                    enable(skill);
+                    return true;
+                }
+
+                if (CommandUtils.shouldDisableToggle(args[1])) {
+                    if (!Permissions.hardcoreToggle(sender)) {
+                        sender.sendMessage(command.getPermissionMessage());
+                        return true;
+                    }
+
+                    enable(skill);
+                    return true;
+                }
+
+                return true;
+
+            default:
+                return false;
+        }
+    }
+
+    @Override
+    public List<String> onTabComplete(CommandSender sender, Command command, String alias, String[] args) {
+        switch (args.length) {
+            case 1:
+                if (StringUtils.isDouble(args[0])) {
+                    return ImmutableList.of();
+                }
+
+                return StringUtil.copyPartialMatches(args[0], CommandUtils.TRUE_FALSE_OPTIONS, new ArrayList<String>(CommandUtils.TRUE_FALSE_OPTIONS.size()));
+            default:
+                return ImmutableList.of();
+        }
+    }
+
+    protected abstract boolean checkTogglePermissions(CommandSender sender);
+    protected abstract boolean checkModifyPermissions(CommandSender sender);
+    protected abstract boolean checkEnabled(SkillType skill);
+    protected abstract void enable(SkillType skill);
+    protected abstract void disable(SkillType skill);
+    protected abstract void modify(CommandSender sender, double newPercentage);
+}

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

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

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

@@ -1,38 +0,0 @@
-package com.gmail.nossr50.commands.mc;
-
-import org.bukkit.command.Command;
-import org.bukkit.command.CommandExecutor;
-import org.bukkit.command.CommandSender;
-import org.bukkit.entity.Player;
-
-import com.gmail.nossr50.commands.CommandHelper;
-import com.gmail.nossr50.datatypes.PlayerProfile;
-import com.gmail.nossr50.locale.mcLocale;
-import com.gmail.nossr50.util.Users;
-
-public class McabilityCommand implements CommandExecutor {
-
-    @Override
-    public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
-        if (CommandHelper.noConsoleUsage(sender)) {
-            return true;
-        }
-
-        if (CommandHelper.noCommandPermissions(sender, "mcmmo.admin")) {
-            return true;
-        }
-
-        PlayerProfile PP = Users.getProfile((Player) sender);
-
-        if (PP.getAbilityUse()) {
-            sender.sendMessage(mcLocale.getString("mcPlayerListener.AbilitiesOff"));
-        }
-        else {
-            sender.sendMessage(mcLocale.getString("mcPlayerListener.AbilitiesOn"));
-        }
-
-        PP.toggleAbilityUse();
-
-        return true;
-    }
-}

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

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

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

@@ -1,38 +0,0 @@
-package com.gmail.nossr50.commands.mc;
-
-import org.bukkit.command.Command;
-import org.bukkit.command.CommandExecutor;
-import org.bukkit.command.CommandSender;
-import org.bukkit.entity.Player;
-
-import com.gmail.nossr50.commands.CommandHelper;
-import com.gmail.nossr50.datatypes.PlayerProfile;
-import com.gmail.nossr50.locale.mcLocale;
-import com.gmail.nossr50.util.Users;
-
-public class McgodCommand implements CommandExecutor {
-
-    @Override
-    public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
-        if (CommandHelper.noConsoleUsage(sender)) {
-            return true;
-        }
-
-        if (CommandHelper.noCommandPermissions(sender, "mcmmo.tools.mcgod")) {
-            return true;
-        }
-
-        PlayerProfile PP = Users.getProfile((Player) sender);
-
-        if (PP.getGodMode()) {
-            sender.sendMessage(mcLocale.getString("mcPlayerListener.GodModeDisabled"));
-        }
-        else {
-            sender.sendMessage(mcLocale.getString("mcPlayerListener.GodModeEnabled"));
-        }
-
-        PP.toggleGodMode();
-
-        return true;
-    }
-}

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

@@ -1,37 +0,0 @@
-package com.gmail.nossr50.commands.mc;
-
-import org.bukkit.ChatColor;
-import org.bukkit.Material;
-import org.bukkit.command.Command;
-import org.bukkit.command.CommandExecutor;
-import org.bukkit.command.CommandSender;
-import org.getspout.spoutapi.player.SpoutPlayer;
-
-import com.gmail.nossr50.config.LoadProperties;
-import com.gmail.nossr50.locale.mcLocale;
-
-public class McmmoCommand implements CommandExecutor {
-
-    @Override
-    public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
-        String description = mcLocale.getString("mcMMO.Description", new Object[] { "mcc" });
-        String[] mcSplit = description.split(",");
-
-        for (String x : mcSplit) {
-            sender.sendMessage(x);
-        }
-
-        if (LoadProperties.donateMessage) {
-            if (LoadProperties.spoutEnabled && sender instanceof SpoutPlayer) {
-                SpoutPlayer sPlayer = (SpoutPlayer) sender;
-
-                sPlayer.sendNotification(ChatColor.YELLOW + "[mcMMO]" + ChatColor.GOLD + " Donate!", ChatColor.GREEN + "nossr50@gmail.com", Material.DIAMOND);
-            }
-
-            sender.sendMessage(ChatColor.DARK_AQUA + "Donation Info:");
-            sender.sendMessage(ChatColor.GOLD + " - " + ChatColor.GREEN + "nossr50@gmail.com" + ChatColor.GOLD + " Paypal");
-        }
-
-        return true;
-    }
-}

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

@@ -1,68 +0,0 @@
-package com.gmail.nossr50.commands.mc;
-
-import org.bukkit.ChatColor;
-import org.bukkit.command.Command;
-import org.bukkit.command.CommandExecutor;
-import org.bukkit.command.CommandSender;
-import org.bukkit.entity.Player;
-
-import com.gmail.nossr50.mcMMO;
-import com.gmail.nossr50.datatypes.AbilityType;
-import com.gmail.nossr50.datatypes.PlayerProfile;
-import com.gmail.nossr50.datatypes.ToolType;
-import com.gmail.nossr50.locale.mcLocale;
-import com.gmail.nossr50.util.Users;
-import com.gmail.nossr50.util.mcPermissions;
-
-public class McrefreshCommand implements CommandExecutor {
-	private final mcMMO plugin;
-
-	public McrefreshCommand(mcMMO instance) {
-		this.plugin = instance;
-	}
-
-	@Override
-	public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
-
-		if (!(sender instanceof Player)) {
-			sender.sendMessage("This command does not support console useage."); //TODO: Needs more locale.
-			return true;
-		}
-
-		Player player = (Player) sender;
-		PlayerProfile PP = Users.getProfile(player);
-
-		if (!mcPermissions.getInstance().mcrefresh(player)) {
-			player.sendMessage(ChatColor.YELLOW + "[mcMMO] " + ChatColor.DARK_RED + mcLocale.getString("mcPlayerListener.NoPermission"));
-			return true;
-		}
-		if (args.length >= 1 && (plugin.getServer().getPlayer(args[0]) != null)) {
-			player.sendMessage("You have refreshed " + args[0] + "'s cooldowns!"); //TODO: Needs more locale.
-			player = plugin.getServer().getPlayer(args[0]);
-		}
-
-		/*
-		 * PREP MODES
-		 */
-		PP = Users.getProfile(player);
-		PP.setRecentlyHurt((long) 0);
-		PP.setToolPreparationMode(ToolType.AXE, false);
-		PP.setToolPreparationMode(ToolType.FISTS, false);
-		PP.setToolPreparationMode(ToolType.HOE, false);
-		PP.setToolPreparationMode(ToolType.PICKAXE, false);
-		PP.setToolPreparationMode(ToolType.SWORD, false);
-
-		//RESET COOLDOWNS
-		PP.resetCooldowns();
-		PP.setAbilityMode(AbilityType.GREEN_TERRA, false);
-		PP.setAbilityMode(AbilityType.GIGA_DRILL_BREAKER, false);
-		PP.setAbilityMode(AbilityType.SERRATED_STRIKES, false);
-		PP.setAbilityMode(AbilityType.SUPER_BREAKER, false);
-		PP.setAbilityMode(AbilityType.TREE_FELLER, false);
-		PP.setAbilityMode(AbilityType.BERSERK, false);
-
-		player.sendMessage(mcLocale.getString("mcPlayerListener.AbilitiesRefreshed"));
-
-		return true;
-	}
-}

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

@@ -1,125 +0,0 @@
-package com.gmail.nossr50.commands.mc;
-
-import java.io.BufferedReader;
-import java.io.FileReader;
-import java.io.FileWriter;
-
-import org.bukkit.Bukkit;
-import org.bukkit.ChatColor;
-import org.bukkit.command.Command;
-import org.bukkit.command.CommandExecutor;
-import org.bukkit.command.CommandSender;
-import org.bukkit.entity.Player;
-
-import com.gmail.nossr50.mcMMO;
-import com.gmail.nossr50.config.LoadProperties;
-import com.gmail.nossr50.locale.mcLocale;
-import com.gmail.nossr50.util.Users;
-import com.gmail.nossr50.util.mcPermissions;
-
-public class McremoveCommand implements CommandExecutor {
-    String location = "plugins/mcMMO/FlatFileStuff/mcmmo.users";
-    
-    @Override
-    public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
-        Player player = null;
-        
-        if (sender instanceof Player) {
-            player = (Player) sender;
-        }
-
-        if (player != null && !mcPermissions.getInstance().mcremove(player)) {
-            player.sendMessage(ChatColor.YELLOW + "[mcMMO] " + ChatColor.DARK_RED + mcLocale.getString("mcPlayerListener.NoPermission"));
-            return true;
-        }
-        
-        if(args.length == 0)
-        {
-            sender.sendMessage("Correct usage is /mcremove [Player Name]"); //TODO: Needs more locale.
-            return true;
-        }
-        
-        String playerName = args[0]; //Player that we are going to remove
-        
-        //If the server is using MySQL
-        if(LoadProperties.useMySQL)
-        {
-            int userId = mcMMO.database.getInt("SELECT id FROM "+LoadProperties.MySQLtablePrefix+"users WHERE user = '" + playerName + "'");
-            
-            //Remove user from tables
-            mcMMO.database.write("DELETE FROM "
-                    +LoadProperties.MySQLdbName+"."
-                    +LoadProperties.MySQLtablePrefix+"users WHERE "
-                    +LoadProperties.MySQLtablePrefix+"users.id="+userId);
-            
-            mcMMO.database.write("DELETE FROM "
-                    +LoadProperties.MySQLdbName+"."
-                    +LoadProperties.MySQLtablePrefix+"cooldowns WHERE "
-                    +LoadProperties.MySQLtablePrefix+"cooldowns.user_id="+userId);
-            
-            mcMMO.database.write("DELETE FROM "
-                    +LoadProperties.MySQLdbName+"."
-                    +LoadProperties.MySQLtablePrefix+"huds WHERE "
-                    +LoadProperties.MySQLtablePrefix+"huds.user_id="+userId);
-            
-            mcMMO.database.write("DELETE FROM "
-                    +LoadProperties.MySQLdbName+"."
-                    +LoadProperties.MySQLtablePrefix+"skills WHERE "
-                    +LoadProperties.MySQLtablePrefix+"skills.user_id="+userId);
-            
-            mcMMO.database.write("DELETE FROM "
-            +LoadProperties.MySQLdbName+"."
-            +LoadProperties.MySQLtablePrefix+"experience WHERE "
-            +LoadProperties.MySQLtablePrefix+"experience.user_id="+userId);
-
-            sender.sendMessage("User "+playerName+" removed from MySQL DB!"); //TODO: Needs more locale.
-        } else {
-            if(removeFlatFileUser(playerName)) {
-                sender.sendMessage(ChatColor.GREEN+"[mcMMO] It worked! User was removed.");
-            } else {
-                sender.sendMessage(ChatColor.RED+"[mcMMO] Couldn't find the user, remember its case sensitive!");
-            }
-        }
-        
-        //Force PlayerProfile stuff to update
-        if(Bukkit.getServer().getPlayer(playerName) != null && Users.players.containsKey(playerName.toLowerCase()))
-        {
-            Users.players.remove(playerName.toLowerCase());
-            Users.addUser(Bukkit.getServer().getPlayer(playerName));
-        }
-        
-        sender.sendMessage("[mcMMO] mcremove operation completed."); //TODO: Needs more locale.
-        
-        return true;
-    }
-    
-    private boolean removeFlatFileUser(String playerName) {
-        boolean worked = false;
-        try {
-            FileReader file = new FileReader(location);
-            BufferedReader in = new BufferedReader(file);
-            StringBuilder writer = new StringBuilder();
-            String line = "";
-            while ((line = in.readLine()) != null) {
-                /* Write out the same file but when we get to the player we want to remove we skip his line */
-                if(!line.split(":")[0].equalsIgnoreCase(playerName))
-                {
-                    writer.append(line).append("\r\n");
-                } else {
-                    System.out.println("User found, removing...");
-                    worked = true;
-                    continue; //Skip the player
-                }
-            }
-            
-            in.close();
-            FileWriter out = new FileWriter(location); //Write out the new file
-            out.write(writer.toString());
-            out.close();
-            return worked;
-        } catch (Exception e) {
-            Bukkit.getLogger().severe("Exception while reading " + location + " (Are you sure you formatted it correctly?)" + e.toString());
-            return worked;
-        }
-    }
-}

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

@@ -1,186 +0,0 @@
-package com.gmail.nossr50.commands.mc;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-
-import org.bukkit.ChatColor;
-import org.bukkit.command.Command;
-import org.bukkit.command.CommandExecutor;
-import org.bukkit.command.CommandSender;
-import com.gmail.nossr50.mcMMO;
-import com.gmail.nossr50.config.LoadProperties;
-import com.gmail.nossr50.datatypes.SkillType;
-import com.gmail.nossr50.locale.mcLocale;
-import com.gmail.nossr50.util.Leaderboard;
-import com.gmail.nossr50.util.Skills;
-import com.gmail.nossr50.util.m;
-
-public class MctopCommand implements CommandExecutor {
-	@Override
-	public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
-
-		if (LoadProperties.useMySQL == false) {
-			/*
-			 * POWER LEVEL INFO RETRIEVAL
-			 */
-			if (args.length == 0) {
-				int p = 1;
-				String[] info = Leaderboard.retrieveInfo(SkillType.ALL.toString(), p);
-				sender.sendMessage(mcLocale.getString("mcPlayerListener.PowerLevelLeaderboard"));
-				int n = 1 * p; // Position
-				for (String x : info) {
-					if (x != null) {
-						String digit = String.valueOf(n);
-						if (n < 10)
-							digit = "0" + String.valueOf(n);
-						String[] splitx = x.split(":");
-						// Format: 1. Playername - skill value
-						sender.sendMessage(digit + ". " + ChatColor.GREEN + splitx[1] + " - " + ChatColor.WHITE + splitx[0]);
-						n++;
-					}
-				}
-			}
-			if (args.length >= 1 && m.isInt(args[0])) {
-				int p = 1;
-				// Grab page value if specified
-				if (args.length >= 1) {
-					if (m.isInt(args[0])) {
-						p = Integer.valueOf(args[0]);
-					}
-				}
-				int pt = p;
-				if (p > 1) {
-					pt -= 1;
-					pt += (pt * 10);
-					pt = 10;
-				}
-				String[] info = Leaderboard.retrieveInfo(SkillType.ALL.toString(), p);
-				sender.sendMessage(mcLocale.getString("mcPlayerListener.PowerLevelLeaderboard"));
-				int n = 1 * pt; // Position
-				for (String x : info) {
-					if (x != null) {
-						String digit = String.valueOf(n);
-						if (n < 10)
-							digit = "0" + String.valueOf(n);
-						String[] splitx = x.split(":");
-						// Format: 1. Playername - skill value
-						sender.sendMessage(digit + ". " + ChatColor.GREEN + splitx[1] + " - " + ChatColor.WHITE + splitx[0]);
-						n++;
-					}
-				}
-			}
-			/*
-			 * SKILL SPECIFIED INFO RETRIEVAL
-			 */
-			if (args.length >= 1 && Skills.isSkill(args[0])) {
-				int p = 1;
-				// Grab page value if specified
-				if (args.length >= 2) {
-					if (m.isInt(args[1])) {
-						p = Integer.valueOf(args[1]);
-					}
-				}
-				int pt = p;
-				if (p > 1) {
-					pt -= 1;
-					pt += (pt * 10);
-					pt = 10;
-				}
-				String firstLetter = args[0].substring(0, 1); // Get first letter
-				String remainder = args[0].substring(1); // Get remainder of word.
-				String capitalized = firstLetter.toUpperCase() + remainder.toLowerCase();
-
-				String[] info = Leaderboard.retrieveInfo(args[0].toUpperCase(), p);
-				sender.sendMessage(mcLocale.getString("mcPlayerListener.SkillLeaderboard", new Object[] { capitalized }));
-				int n = 1 * pt; // Position
-				for (String x : info) {
-					if (x != null) {
-						String digit = String.valueOf(n);
-						if (n < 10)
-							digit = "0" + String.valueOf(n);
-						String[] splitx = x.split(":");
-						// Format: 1. Playername - skill value
-						sender.sendMessage(digit + ". " + ChatColor.GREEN + splitx[1] + " - " + ChatColor.WHITE + splitx[0]);
-						n++;
-					}
-				}
-			}
-		} else {
-			/*
-			 * MYSQL LEADERBOARDS
-			 */
-			String powerlevel = "taming+mining+woodcutting+repair+unarmed+herbalism+excavation+archery+swords+axes+acrobatics+fishing";
-			if (args.length >= 1 && Skills.isSkill(args[0])) {
-				/*
-				 * Create a nice consistent capitalized leaderboard name
-				 */
-				String lowercase = args[0].toLowerCase(); // For the query
-				String firstLetter = args[0].substring(0, 1); // Get first letter
-				String remainder = args[0].substring(1); // Get remainder of word.
-				String capitalized = firstLetter.toUpperCase() + remainder.toLowerCase();
-
-				sender.sendMessage(mcLocale.getString("mcPlayerListener.SkillLeaderboard", new Object[] { capitalized }));
-				if (args.length >= 2 && m.isInt(args[1])) {
-					int n = 1; // For the page number
-					int n2 = Integer.valueOf(args[1]);
-					if (n2 > 1) {
-						// Figure out the 'page' here
-						n = 10;
-						n = n * (n2 - 1);
-					}
-					// If a page number is specified
-					HashMap<Integer, ArrayList<String>> userslist = mcMMO.database.read("SELECT " + lowercase + ", user_id FROM " + LoadProperties.MySQLtablePrefix + "skills WHERE " + lowercase + " > 0 ORDER BY `" + LoadProperties.MySQLtablePrefix + "skills`.`" + lowercase + "` DESC ");
-
-					for (int i = n; i <= n + 10; i++) {
-						if (i > userslist.size() || mcMMO.database.read("SELECT user FROM " + LoadProperties.MySQLtablePrefix + "users WHERE id = '" + Integer.valueOf(userslist.get(i).get(1)) + "'") == null)
-							break;
-						HashMap<Integer, ArrayList<String>> username = mcMMO.database.read("SELECT user FROM " + LoadProperties.MySQLtablePrefix + "users WHERE id = '" + Integer.valueOf(userslist.get(i).get(1)) + "'");
-						sender.sendMessage(String.valueOf(i) + ". " + ChatColor.GREEN + userslist.get(i).get(0) + " - " + ChatColor.WHITE + username.get(1).get(0));
-					}
-					return true;
-				}
-				// If no page number is specified
-				HashMap<Integer, ArrayList<String>> userslist = mcMMO.database.read("SELECT " + lowercase + ", user_id FROM " + LoadProperties.MySQLtablePrefix + "skills WHERE " + lowercase + " > 0 ORDER BY `" + LoadProperties.MySQLtablePrefix + "skills`.`" + lowercase + "` DESC ");
-				for (int i = 1; i <= 10; i++) { // i<=userslist.size()
-					if (i > userslist.size() || mcMMO.database.read("SELECT user FROM " + LoadProperties.MySQLtablePrefix + "users WHERE id = '" + Integer.valueOf(userslist.get(i).get(1)) + "'") == null)
-						break;
-					HashMap<Integer, ArrayList<String>> username = mcMMO.database.read("SELECT user FROM " + LoadProperties.MySQLtablePrefix + "users WHERE id = '" + Integer.valueOf(userslist.get(i).get(1)) + "'");
-					sender.sendMessage(String.valueOf(i) + ". " + ChatColor.GREEN + userslist.get(i).get(0) + " - " + ChatColor.WHITE + username.get(1).get(0));
-				}
-				return true;
-			}
-			if (args.length >= 0) {
-				sender.sendMessage(mcLocale.getString("mcPlayerListener.PowerLevelLeaderboard"));
-				if (args.length >= 1 && m.isInt(args[0])) {
-					int n = 1; // For the page number
-					int n2 = Integer.valueOf(args[0]);
-					if (n2 > 1) {
-						// Figure out the 'page' here
-						n = 10;
-						n = n * (n2 - 1);
-					}
-					// If a page number is specified
-					HashMap<Integer, ArrayList<String>> userslist = mcMMO.database.read("SELECT " + powerlevel + ", user_id FROM " + LoadProperties.MySQLtablePrefix + "skills WHERE " + powerlevel + " > 0 ORDER BY " + powerlevel + " DESC ");
-					for (int i = n; i <= n + 10; i++) {
-						if (i > userslist.size() || mcMMO.database.read("SELECT user FROM " + LoadProperties.MySQLtablePrefix + "users WHERE id = '" + Integer.valueOf(userslist.get(i).get(1)) + "'") == null)
-							break;
-						HashMap<Integer, ArrayList<String>> username = mcMMO.database.read("SELECT user FROM " + LoadProperties.MySQLtablePrefix + "users WHERE id = '" + Integer.valueOf(userslist.get(i).get(1)) + "'");
-						sender.sendMessage(String.valueOf(i) + ". " + ChatColor.GREEN + userslist.get(i).get(0) + " - " + ChatColor.WHITE + username.get(1).get(0));
-					}
-					return true;
-				}
-				HashMap<Integer, ArrayList<String>> userslist = mcMMO.database.read("SELECT " + powerlevel + ", user_id FROM " + LoadProperties.MySQLtablePrefix + "skills WHERE " + powerlevel + " > 0 ORDER BY " + powerlevel + " DESC ");
-				for (int i = 1; i <= 10; i++) {
-					if (i > userslist.size() || mcMMO.database.read("SELECT user FROM " + LoadProperties.MySQLtablePrefix + "users WHERE id = '" + Integer.valueOf(userslist.get(i).get(1)) + "'") == null)
-						break;
-					HashMap<Integer, ArrayList<String>> username = mcMMO.database.read("SELECT user FROM " + LoadProperties.MySQLtablePrefix + "users WHERE id = '" + Integer.valueOf(userslist.get(i).get(1)) + "'");
-					sender.sendMessage(String.valueOf(i) + ". " + ChatColor.GREEN + userslist.get(i).get(0) + " - " + ChatColor.WHITE + username.get(1).get(0));
-					// System.out.println(username.get(1).get(0));
-					// System.out.println("Mining : " + userslist.get(i).get(0) + ", User id : " + userslist.get(i).get(1));
-				}
-			}
-		}
-
-		return true;
-	}
-}

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

@@ -1,90 +0,0 @@
-package com.gmail.nossr50.commands.party;
-
-import org.bukkit.Bukkit;
-import org.bukkit.ChatColor;
-import org.bukkit.command.Command;
-import org.bukkit.command.CommandExecutor;
-import org.bukkit.command.CommandSender;
-import org.bukkit.entity.Player;
-
-import com.gmail.nossr50.datatypes.PlayerProfile;
-import com.gmail.nossr50.events.chat.McMMOAdminChatEvent;
-import com.gmail.nossr50.locale.mcLocale;
-import com.gmail.nossr50.util.Users;
-import com.gmail.nossr50.util.mcPermissions;
-
-public class ACommand implements CommandExecutor {
-
-	public ACommand() {}
-
-	@Override
-	public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
-
-		// Console message?
-		if (!(sender instanceof Player) && args.length >= 1) {
-			String aMessage = args[0];
-			for (int i = 1; i <= args.length - 1; i++) {
-				aMessage = aMessage + " " + args[i];
-			}
-
-			McMMOAdminChatEvent chatEvent = new McMMOAdminChatEvent("Console", aMessage);
-			Bukkit.getPluginManager().callEvent(chatEvent);
-
-			if(chatEvent.isCancelled()) return true;
-
-			aMessage = chatEvent.getMessage();
-
-			String aPrefix = ChatColor.AQUA + "{" + ChatColor.WHITE + "*Console*" + ChatColor.AQUA + "} ";
-
-			Bukkit.getLogger().info("[A]<*Console*> " + aMessage);
-
-			for (Player herp : Bukkit.getServer().getOnlinePlayers()) {
-				if (mcPermissions.getInstance().adminChat(herp) || herp.isOp())
-					herp.sendMessage(aPrefix + aMessage);
-			}
-			return true;
-		}
-
-		Player player = null;
-        if (sender instanceof Player) {
-            player = (Player) sender;
-        }
-
-		if (player != null && !mcPermissions.getInstance().adminChat(player) && !player.isOp()) {
-			player.sendMessage(ChatColor.YELLOW + "[mcMMO] " + ChatColor.DARK_RED + mcLocale.getString("mcPlayerListener.NoPermission"));
-			return true;
-		}
-
-		// Not a toggle, a message
-
-		if (args.length >= 1) {
-			String aMessage = args[0];
-			for (int i = 1; i <= args.length - 1; i++) {
-				aMessage = aMessage + " " + args[i];
-			}
-			
-            Users.getProfile(player).toggleAdminChat();
-            player.chat(aMessage);
-            Users.getProfile(player).toggleAdminChat();
-
-			return true;
-		}
-
-		if(player != null)
-		{
-			PlayerProfile PP = Users.getProfile(player);
-			
-			if (PP.getPartyChatMode())
-				PP.togglePartyChat();
-	
-			PP.toggleAdminChat();
-	
-			if (PP.getAdminChatMode()) {
-				player.sendMessage(mcLocale.getString("mcPlayerListener.AdminChatOn"));
-			} else {
-				player.sendMessage(mcLocale.getString("mcPlayerListener.AdminChatOff"));
-			}
-		}
-		return true;
-	}
-}

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

@@ -1,65 +0,0 @@
-package com.gmail.nossr50.commands.party;
-
-import org.bukkit.Bukkit;
-import org.bukkit.ChatColor;
-import org.bukkit.command.Command;
-import org.bukkit.command.CommandExecutor;
-import org.bukkit.command.CommandSender;
-import org.bukkit.entity.Player;
-
-import com.gmail.nossr50.datatypes.PlayerProfile;
-import com.gmail.nossr50.events.party.McMMOPartyChangeEvent;
-import com.gmail.nossr50.events.party.McMMOPartyChangeEvent.EventReason;
-import com.gmail.nossr50.locale.mcLocale;
-import com.gmail.nossr50.party.Party;
-import com.gmail.nossr50.util.Users;
-import com.gmail.nossr50.util.mcPermissions;
-
-public class AcceptCommand implements CommandExecutor {
-	@Override
-	public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
-
-		if (!(sender instanceof Player)) {
-			sender.sendMessage("This command does not support console useage."); //TODO: Needs more locale.
-			return true;
-		}
-
-		Player player = (Player) sender;
-		PlayerProfile PP = Users.getProfile(player);
-
-		if (!mcPermissions.getInstance().party(player)) {
-			player.sendMessage(ChatColor.YELLOW + "[mcMMO] " + ChatColor.DARK_RED + mcLocale.getString("mcPlayerListener.NoPermission"));
-			return true;
-		}
-
-		if (PP.hasPartyInvite()) {
-			Party Pinstance = Party.getInstance();
-
-			if (PP.inParty()) {
-                McMMOPartyChangeEvent event = new McMMOPartyChangeEvent(player, PP.getParty(), PP.getInvite(), EventReason.CHANGED_PARTIES);
-                Bukkit.getPluginManager().callEvent(event);
-
-                if (event.isCancelled()) {
-                    return true;
-                }
-
-				Pinstance.removeFromParty(player, PP);
-			}
-			else {
-                McMMOPartyChangeEvent event = new McMMOPartyChangeEvent(player, null, PP.getInvite(), EventReason.JOINED_PARTY);
-                Bukkit.getPluginManager().callEvent(event);
-
-                if (event.isCancelled()) {
-                    return true;
-                }
-			}
-            PP.acceptInvite();
-            Pinstance.addToParty(player, PP, PP.getParty(), true, null);
-
-		} else {
-			player.sendMessage(mcLocale.getString("mcPlayerListener.NoInvites"));
-		}
-
-		return true;
-	}
-}

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

@@ -1,66 +0,0 @@
-package com.gmail.nossr50.commands.party;
-
-import org.bukkit.ChatColor;
-import org.bukkit.command.Command;
-import org.bukkit.command.CommandExecutor;
-import org.bukkit.command.CommandSender;
-import org.bukkit.entity.Player;
-
-import com.gmail.nossr50.mcMMO;
-import com.gmail.nossr50.datatypes.PlayerProfile;
-import com.gmail.nossr50.locale.mcLocale;
-import com.gmail.nossr50.party.Party;
-import com.gmail.nossr50.util.Users;
-import com.gmail.nossr50.util.mcPermissions;
-
-public class InviteCommand implements CommandExecutor {
-	private final mcMMO plugin;
-
-	public InviteCommand(mcMMO instance) {
-		this.plugin = instance;
-	}
-
-	@Override
-	public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
-
-		if (!(sender instanceof Player)) {
-			sender.sendMessage("This command does not support console useage."); //TODO: Needs more locale.
-			return true;
-		}
-
-		Player player = (Player) sender;
-		PlayerProfile PP = Users.getProfile(player);
-
-		if (!mcPermissions.getInstance().party(player)) {
-			player.sendMessage(ChatColor.YELLOW + "[mcMMO] " + ChatColor.DARK_RED + mcLocale.getString("mcPlayerListener.NoPermission"));
-			return true;
-		}
-
-		Party Pinstance = Party.getInstance();
-
-		if (!PP.inParty()) {
-			player.sendMessage(mcLocale.getString("mcPlayerListener.NotInParty"));
-			return true;
-		}
-		if (args.length < 1) {
-			player.sendMessage(ChatColor.RED + "Usage is /invite <playername>"); //TODO: Needs more locale.
-			return true;
-		}
-		if (PP.inParty() && args.length >= 1 && (plugin.getServer().getPlayer(args[0]) != null)) {
-			if (Pinstance.canInvite(player, PP)) {
-				Player target = plugin.getServer().getPlayer(args[0]);
-				PlayerProfile PPt = Users.getProfile(target);
-				PPt.modifyInvite(PP.getParty());
-
-				player.sendMessage(mcLocale.getString("mcPlayerListener.InviteSuccess"));
-				target.sendMessage(mcLocale.getString("mcPlayerListener.ReceivedInvite1", new Object[] { PPt.getInvite(), player.getName() }));
-				target.sendMessage(mcLocale.getString("mcPlayerListener.ReceivedInvite2", new Object[] { "accept" }));
-			} else {
-				player.sendMessage(mcLocale.getString("Party.Locked"));
-				return true;
-			}
-		}
-
-		return true;
-	}
-}

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

@@ -1,93 +0,0 @@
-package com.gmail.nossr50.commands.party;
-
-import org.bukkit.Bukkit;
-import org.bukkit.ChatColor;
-import org.bukkit.command.Command;
-import org.bukkit.command.CommandExecutor;
-import org.bukkit.command.CommandSender;
-import org.bukkit.entity.Player;
-
-import com.gmail.nossr50.datatypes.PlayerProfile;
-import com.gmail.nossr50.events.chat.McMMOPartyChatEvent;
-import com.gmail.nossr50.locale.mcLocale;
-import com.gmail.nossr50.util.Users;
-import com.gmail.nossr50.util.mcPermissions;
-
-public class PCommand implements CommandExecutor {
-	public PCommand() {}
-
-	@Override
-	public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
-
-		// Console message?
-		if (!(sender instanceof Player)) {
-			if (args.length < 2)
-				return true;
-			String pMessage = args[1];
-			for (int i = 2; i <= args.length - 1; i++) {
-				pMessage = pMessage + " " + args[i];
-			}
-
-			McMMOPartyChatEvent chatEvent = new McMMOPartyChatEvent("Console", args[0], pMessage);
-			Bukkit.getPluginManager().callEvent(chatEvent);
-
-			if(chatEvent.isCancelled()) return true;
-
-			pMessage = chatEvent.getMessage();
-
-			String pPrefix = ChatColor.GREEN + "(" + ChatColor.WHITE + "*Console*" + ChatColor.GREEN + ") ";
-
-			Bukkit.getLogger().info("[P](" + args[0] + ")" + "<*Console*> " + pMessage);
-
-			for (Player herp : Bukkit.getServer().getOnlinePlayers()) {
-				if (Users.getProfile(herp).inParty()) {
-					if (Users.getProfile(herp).getParty().equalsIgnoreCase(args[0])) {
-						herp.sendMessage(pPrefix + pMessage);
-					}
-				}
-			}
-			return true;
-		}
-
-		Player player = (Player) sender;
-		PlayerProfile PP = Users.getProfile(player);
-
-		if (!mcPermissions.getInstance().party(player)) {
-			player.sendMessage(ChatColor.YELLOW + "[mcMMO] " + ChatColor.DARK_RED + mcLocale.getString("mcPlayerListener.NoPermission"));
-			return true;
-		}
-
-		// Not a toggle, a message
-
-		if (args.length >= 1) {
-			if(!PP.inParty()) {
-				player.sendMessage("You're not in a party."); //TODO: Use mcLocale
-				return true;
-			}
-			
-			String pMessage = args[0];
-			for (int i = 1; i <= args.length - 1; i++) {
-				pMessage = pMessage + " " + args[i];
-			}
-			
-			PP.togglePartyChat();
-			player.chat(pMessage);
-			PP.togglePartyChat();
-
-			return true;
-		}
-
-		if (PP.getAdminChatMode())
-			PP.toggleAdminChat();
-
-		PP.togglePartyChat();
-
-		if (PP.getPartyChatMode()) {
-			player.sendMessage(mcLocale.getString("mcPlayerListener.PartyChatOn"));
-		} else {
-			player.sendMessage(mcLocale.getString("mcPlayerListener.PartyChatOff"));
-		}
-
-		return true;
-	}
-}

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

@@ -0,0 +1,39 @@
+package com.gmail.nossr50.commands.party;
+
+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.player.McMMOPlayer;
+import com.gmail.nossr50.locale.LocaleLoader;
+import com.gmail.nossr50.party.PartyManager;
+import com.gmail.nossr50.util.player.UserManager;
+
+public class PartyAcceptCommand implements CommandExecutor {
+    @Override
+    public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
+        switch (args.length) {
+            case 1:
+                Player player = (Player) sender;
+                McMMOPlayer mcMMOPlayer = UserManager.getPlayer(player);
+
+                if (!mcMMOPlayer.hasPartyInvite()) {
+                    sender.sendMessage(LocaleLoader.getString("mcMMO.NoInvites"));
+                    return true;
+                }
+
+                // Changing parties
+                if (!PartyManager.changeOrJoinParty(mcMMOPlayer, mcMMOPlayer.getPartyInvite().getName())) {
+                    return true;
+                }
+
+                PartyManager.joinInvitedParty(mcMMOPlayer);
+                return true;
+
+            default:
+                sender.sendMessage(LocaleLoader.getString("Commands.Usage.1", "party", "accept"));
+                return true;
+        }
+    }
+}

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

@@ -0,0 +1,35 @@
+package com.gmail.nossr50.commands.party;
+
+import org.bukkit.command.Command;
+import org.bukkit.command.CommandExecutor;
+import org.bukkit.command.CommandSender;
+import org.bukkit.entity.Player;
+
+import com.gmail.nossr50.datatypes.party.Party;
+import com.gmail.nossr50.locale.LocaleLoader;
+import com.gmail.nossr50.party.PartyManager;
+import com.gmail.nossr50.util.Misc;
+import com.gmail.nossr50.util.player.UserManager;
+
+public class PartyChangeOwnerCommand implements CommandExecutor {
+    @Override
+    public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
+        switch (args.length) {
+            case 2:
+                Party playerParty = UserManager.getPlayer((Player) sender).getParty();
+                String targetName = Misc.getMatchedPlayerName(args[1]);
+
+                if (!playerParty.getMembers().contains(targetName)) {
+                    sender.sendMessage(LocaleLoader.getString("Party.NotInYourParty", targetName));
+                    return true;
+                }
+
+                PartyManager.setPartyLeader(targetName, playerParty);
+                return true;
+
+            default:
+                sender.sendMessage(LocaleLoader.getString("Commands.Usage.2", "party", "owner", "<" + LocaleLoader.getString("Commands.Usage.Player") + ">"));
+                return true;
+        }
+    }
+}

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

@@ -0,0 +1,49 @@
+package com.gmail.nossr50.commands.party;
+
+import org.bukkit.command.Command;
+import org.bukkit.command.CommandExecutor;
+import org.bukkit.command.CommandSender;
+import org.bukkit.entity.Player;
+
+import com.gmail.nossr50.datatypes.party.Party;
+import com.gmail.nossr50.locale.LocaleLoader;
+import com.gmail.nossr50.util.player.UserManager;
+
+public class PartyChangePasswordCommand implements CommandExecutor {
+    @Override
+    public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
+        Party party = UserManager.getPlayer((Player) sender).getParty();
+
+        switch (args.length) {
+            case 1:
+                unprotectParty(party, sender);
+                return true;
+
+            case 2:
+                if (args[1].equalsIgnoreCase("clear") || args[1].equalsIgnoreCase("reset")) {
+                    unprotectParty(party, sender);
+                    return true;
+                }
+
+                protectParty(party, sender, args[1]);
+                return true;
+
+            default:
+                sender.sendMessage(LocaleLoader.getString("Commands.Usage.2", "party", "password", "[clear|reset]"));
+                sender.sendMessage(LocaleLoader.getString("Commands.Usage.2", "party", "password", "<" + LocaleLoader.getString("Commands.Usage.Password") + ">"));
+                return true;
+        }
+    }
+
+    private void unprotectParty(Party party, CommandSender sender) {
+        party.setLocked(true);
+        party.setPassword(null);
+        sender.sendMessage(LocaleLoader.getString("Party.Password.Removed"));
+    }
+
+    private void protectParty(Party party, CommandSender sender, String password) {
+        party.setLocked(true);
+        party.setPassword(password);
+        sender.sendMessage(LocaleLoader.getString("Party.Password.Set", password));
+    }
+}

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

@@ -1,269 +1,232 @@
-package com.gmail.nossr50.commands.party;
+package com.gmail.nossr50.commands.party;
-
+
-import org.bukkit.Bukkit;
+import java.util.ArrayList;
-import org.bukkit.ChatColor;
+import java.util.Collections;
-import org.bukkit.command.Command;
+import java.util.List;
-import org.bukkit.command.CommandExecutor;
+import java.util.Set;
-import org.bukkit.command.CommandSender;
+
-import org.bukkit.entity.Player;
+import org.bukkit.command.Command;
-
+import org.bukkit.command.CommandExecutor;
-import com.gmail.nossr50.datatypes.PlayerProfile;
+import org.bukkit.command.CommandSender;
-import com.gmail.nossr50.events.party.McMMOPartyChangeEvent;
+import org.bukkit.command.TabExecutor;
-import com.gmail.nossr50.events.party.McMMOPartyChangeEvent.EventReason;
+import org.bukkit.entity.Player;
-import com.gmail.nossr50.locale.mcLocale;
+import org.bukkit.util.StringUtil;
-import com.gmail.nossr50.party.Party;
+
-import com.gmail.nossr50.util.Users;
+import com.gmail.nossr50.mcMMO;
-import com.gmail.nossr50.util.mcPermissions;
+import com.gmail.nossr50.commands.chat.PartyChatCommand;
-
+import com.gmail.nossr50.commands.party.teleport.PtpCommand;
-public class PartyCommand implements CommandExecutor {
+import com.gmail.nossr50.datatypes.player.McMMOPlayer;
-	@Override
+import com.gmail.nossr50.locale.LocaleLoader;
-	public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
+import com.gmail.nossr50.util.Permissions;
-
+import com.gmail.nossr50.util.commands.CommandUtils;
-		if (!(sender instanceof Player)) {
+import com.gmail.nossr50.util.player.UserManager;
-			sender.sendMessage("This command does not support console useage."); //TODO: Needs more locale.
+
-			return true;
+import com.google.common.collect.ImmutableList;
-		}
+
-
+public class PartyCommand implements TabExecutor {
-		Player player = (Player) sender;
+    private static final List<String> PARTY_SUBCOMMANDS;
-		PlayerProfile PP = Users.getProfile(player);
+    private static final List<String> EXPSHARE_COMPLETIONS = ImmutableList.of("none", "equal");
-
+    private static final List<String> ITEMSHARE_COMPLETIONS = ImmutableList.of("none", "equal", "random", "loot", "mining", "herbalism", "woodcutting", "misc");
-		if (!mcPermissions.getInstance().party(player)) {
+
-			player.sendMessage(ChatColor.YELLOW + "[mcMMO] " + ChatColor.DARK_RED + mcLocale.getString("mcPlayerListener.NoPermission"));
+    static {
-			return true;
+        ArrayList<String> subcommands = new ArrayList<String>();
-		}
+
-
+        for (PartySubcommandType subcommand : PartySubcommandType.values()) {
-		Party Pinstance = Party.getInstance();
+            subcommands.add(subcommand.toString());
-
+        }
-		if (PP.inParty() && (!Pinstance.isParty(PP.getParty()) || !Pinstance.isInParty(player, PP))) {
+
-			Pinstance.addToParty(player, PP, PP.getParty(), false, null);
+        Collections.sort(subcommands);
-		}
+        PARTY_SUBCOMMANDS = ImmutableList.copyOf(subcommands);
-
+    }
-		if (args.length == 0 && !PP.inParty()) {
+
-			player.sendMessage(mcLocale.getString("Party.Help1", new Object[] { "party "}));
+    private CommandExecutor partyJoinCommand           = new PartyJoinCommand();
-			player.sendMessage(mcLocale.getString("Party.Help2", new Object[] { "party "}));
+    private CommandExecutor partyAcceptCommand         = new PartyAcceptCommand();
-			player.sendMessage(mcLocale.getString("Party.Help3", new Object[] { "party " }));
+    private CommandExecutor partyCreateCommand         = new PartyCreateCommand();
-			return true;
+    private CommandExecutor partyQuitCommand           = new PartyQuitCommand();
-		} else if (args.length == 0 && PP.inParty()) {
+    private CommandExecutor partyExpShareCommand       = new PartyExpShareCommand();
-			String tempList = "";
+    private CommandExecutor partyItemShareCommand      = new PartyItemShareCommand();
-			int x = 0;
+    private CommandExecutor partyInviteCommand         = new PartyInviteCommand();
-			for (Player p : Bukkit.getServer().getOnlinePlayers()) {
+    private CommandExecutor partyKickCommand           = new PartyKickCommand();
-				if (PP.getParty().equals(Users.getProfile(p).getParty())) {
+    private CommandExecutor partyDisbandCommand        = new PartyDisbandCommand();
-					if (p != null && x + 1 >= Pinstance.partyCount(player)) {
+    private CommandExecutor partyChangeOwnerCommand    = new PartyChangeOwnerCommand();
-						if (Pinstance.isPartyLeader(p.getName(), PP.getParty())) {
+    private CommandExecutor partyLockCommand           = new PartyLockCommand();
-							tempList += ChatColor.GOLD + p.getName();
+    private CommandExecutor partyChangePasswordCommand = new PartyChangePasswordCommand();
-							x++;
+    private CommandExecutor partyRenameCommand         = new PartyRenameCommand();
-						} else {
+    private CommandExecutor partyInfoCommand           = new PartyInfoCommand();
-							tempList += ChatColor.WHITE + p.getName();
+    private CommandExecutor partyHelpCommand           = new PartyHelpCommand();
-							x++;
+    private CommandExecutor partyTeleportCommand       = mcMMO.p.getCommand("ptp").getExecutor();
-						}
+    private CommandExecutor partyChatCommand           = new PartyChatCommand();
-					}
+
-					if (p != null && x < Pinstance.partyCount(player)) {
+    @Override
-						if (Pinstance.isPartyLeader(p.getName(), PP.getParty())) {
+    public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
-							tempList += ChatColor.GOLD + p.getName() + ", ";
+        if (CommandUtils.noConsoleUsage(sender)) {
-							x++;
+            return true;
-						} else {
+        }
-							tempList += ChatColor.WHITE + p.getName() + ", ";
+
-							x++;
+        if (!Permissions.party(sender)) {
-						}
+            sender.sendMessage(command.getPermissionMessage());
-					}
+            return true;
-				}
+        }
-			}
+
-			player.sendMessage(mcLocale.getString("mcPlayerListener.YouAreInParty", new Object[] { PP.getParty() }));
+        Player player = (Player) sender;
-			player.sendMessage(mcLocale.getString("mcPlayerListener.PartyMembers") + " (" + tempList + ChatColor.GREEN + ")");
+        McMMOPlayer mcMMOPlayer = UserManager.getPlayer(player);
-			
+
-			//Master Apprentice Stuff
+        if (args.length < 1) {
-			//Show the player all their bonuses when they type /party
+            if (!mcMMOPlayer.inParty()) {
-			
+                sender.sendMessage(LocaleLoader.getString("Commands.Party.None"));
-			/*
+                return printUsage(player);
-			for(Player a : Party.getInstance().getPartyMembers(player))
+            }
-			{
+
-			    if(Party.getInstance().isPartyLeader(a.getName(), PP.getParty()) && !a.getName().equals(player.getName()))
+            return partyInfoCommand.onCommand(sender, command, label, args);
-			    {
+        }
-			        PlayerProfile LP = Users.getProfile(a);
+
-			        for(SkillType type : SkillType.values())
+        PartySubcommandType subcommand = PartySubcommandType.getSubcommand(args[0]);
-			        {
+
-			            //Skip this one
+        if (subcommand == null) {
-			            if(type == SkillType.ALL)
+            return printUsage(player);
-			                continue;
+        }
-			            
+
-			            if(LP.getSkillLevel(type) > PP.getSkillLevel(type))
+        // Can't use this for lock/unlock since they're handled by the same command
-			            {
+        if (subcommand != PartySubcommandType.LOCK && subcommand != PartySubcommandType.UNLOCK && !Permissions.partySubcommand(sender, subcommand)) {
-			                //Tell them what their skill bonus is for this skill
+            sender.sendMessage(command.getPermissionMessage());
-        			        int leaderLevel = LP.getSkillLevel(type); 
+            return true;
-        		            int difference = leaderLevel - PP.getSkillLevel(type);
+        }
-        		            
+
-        		            double bonusModifier = (difference*0.75D)/100D;
+        switch (subcommand) {
-        		            double trueBonus = bonusModifier * 100;
+            case JOIN:
-        		            player.sendMessage("You get "+trueBonus+"% more XP from "+type.toString());
+                return partyJoinCommand.onCommand(sender, command, label, args);
-        		            //double percent = (trueBonus/100)*100;
+            case ACCEPT:
-			            } else
+                return partyAcceptCommand.onCommand(sender, command, label, args);
-			            {
+            case CREATE:
-			                //Tell them they have no bonus.. or not
+                return partyCreateCommand.onCommand(sender, command, label, args);
-			            }
+            case HELP:
-			        }
+                return partyHelpCommand.onCommand(sender, command, label, args);
-			    } else if(Party.getInstance().isPartyLeader(a.getName(), PP.getParty()) && a.getName().equals(player.getName()))
+            default:
-			    {
+                break;
-			        //Tell them they are providing bonuses
+        }
-			    }
+
-			}
+        // Party member commands
-			*/
+        if (!mcMMOPlayer.inParty()) {
-            
+            sender.sendMessage(LocaleLoader.getString("Commands.Party.None"));
-			return true;
+            return printUsage(player);
-		} else if (args.length == 1) {
+        }
-			if (args[0].equals("q") && PP.inParty()) {
+
-
+        switch (subcommand) {
-                McMMOPartyChangeEvent event = new McMMOPartyChangeEvent(player, PP.getParty(), null, EventReason.LEFT_PARTY);
+            case INFO:
-                Bukkit.getPluginManager().callEvent(event);
+                return partyInfoCommand.onCommand(sender, command, label, args);
-
+            case QUIT:
-                if (event.isCancelled()) {
+                return partyQuitCommand.onCommand(sender, command, label, args);
-                    return true;
+            case INVITE:
-                }
+                return partyInviteCommand.onCommand(sender, command, label, args);
-
+            case TELEPORT:
-				Pinstance.removeFromParty(player, PP);
+                return partyTeleportCommand.onCommand(sender, command, label, extractArgs(args));
-				player.sendMessage(mcLocale.getString("mcPlayerListener.LeftParty"));
+            case CHAT:
-				return true;
+                return partyChatCommand.onCommand(sender, command, label, extractArgs(args));
-
+            default:
-			} else if (args[0].equalsIgnoreCase("?")) {
+                break;
-				player.sendMessage(mcLocale.getString("Party.Help4", new Object[] { "party " }));
+        }
-				player.sendMessage(mcLocale.getString("Party.Help2", new Object[] { "party " }));
+
-				player.sendMessage(mcLocale.getString("Party.Help5", new Object[] { "party " }));
+        // Party leader commands
-				player.sendMessage(mcLocale.getString("Party.Help6", new Object[] { "party " }));
+        if (!mcMMOPlayer.getParty().getLeader().equalsIgnoreCase(player.getName())) {
-				player.sendMessage(mcLocale.getString("Party.Help7", new Object[] { "party " }));
+            sender.sendMessage(LocaleLoader.getString("Party.NotOwner"));
-				player.sendMessage(mcLocale.getString("Party.Help8", new Object[] { "party " }));
+            return true;
-				player.sendMessage(mcLocale.getString("Party.Help9", new Object[] { "party " }));
+        }
-			} else if (args[0].equalsIgnoreCase("lock")) {
+
-				if (PP.inParty()) {
+        switch (subcommand) {
-					if (Pinstance.isPartyLeader(player.getName(), PP.getParty())) {
+            case EXPSHARE:
-						Pinstance.lockParty(PP.getParty());
+                return partyExpShareCommand.onCommand(sender, command, label, args);
-						player.sendMessage(mcLocale.getString("Party.Locked"));
+            case ITEMSHARE:
-					} else {
+                return partyItemShareCommand.onCommand(sender, command, label, args);
-						player.sendMessage(mcLocale.getString("Party.NotOwner"));
+            case KICK:
-					}
+                return partyKickCommand.onCommand(sender, command, label, args);
-				} else {
+            case DISBAND:
-					player.sendMessage(mcLocale.getString("Party.InvalidName"));
+                return partyDisbandCommand.onCommand(sender, command, label, args);
-				}
+            case OWNER:
-			} else if (args[0].equalsIgnoreCase("unlock")) {
+                return partyChangeOwnerCommand.onCommand(sender, command, label, args);
-				if (PP.inParty()) {
+            case LOCK:
-					if (Pinstance.isPartyLeader(player.getName(), PP.getParty())) {
+            case UNLOCK:
-						Pinstance.unlockParty(PP.getParty());
+                return partyLockCommand.onCommand(sender, command, label, args);
-						player.sendMessage(mcLocale.getString("Party.Unlocked"));
+            case PASSWORD:
-					} else {
+                return partyChangePasswordCommand.onCommand(sender, command, label, args);
-						player.sendMessage(mcLocale.getString("Party.NotOwner"));
+            case RENAME:
-					}
+                return partyRenameCommand.onCommand(sender, command, label, args);
-				} else {
+            default:
-					player.sendMessage(mcLocale.getString("Party.InvalidName"));
+                break;
-				}
+        }
-				// Party debugging command.
+
-				// } else if (args[0].equalsIgnoreCase("dump")) {
+        return true;
-				// Pinstance.dump(player);
+    }
-			} else {
+
-				if (PP.inParty()) {
+    @Override
-				    McMMOPartyChangeEvent event = new McMMOPartyChangeEvent(player, PP.getParty(), args[0], EventReason.CHANGED_PARTIES);
+    public List<String> onTabComplete(CommandSender sender, Command command, String alias, String[] args) {
-				    Bukkit.getPluginManager().callEvent(event);
+        switch (args.length) {
-
+            case 1:
-				    if (event.isCancelled()) {
+                return StringUtil.copyPartialMatches(args[0], PARTY_SUBCOMMANDS, new ArrayList<String>(PARTY_SUBCOMMANDS.size()));
-				        return true;
+            case 2:
-				    }
+                PartySubcommandType subcommand = PartySubcommandType.getSubcommand(args[0]);
-
+
-					Pinstance.removeFromParty(player, PP);
+                if (subcommand == null) {
-				}
+                    return ImmutableList.of();
-				else {
+                }
-                    McMMOPartyChangeEvent event = new McMMOPartyChangeEvent(player, null, args[0], EventReason.JOINED_PARTY);
+
-                    Bukkit.getPluginManager().callEvent(event);
+                switch (subcommand) {
-
+                    case JOIN:
-                    if (event.isCancelled()) {
+                    case INVITE:
-                        return true;
+                    case KICK:
-                    }
+                    case OWNER:
-				}
+                        Set<String> playerNames = UserManager.getPlayerNames();
-				Pinstance.addToParty(player, PP, args[0], false, null);
+                        return StringUtil.copyPartialMatches(args[1], playerNames, new ArrayList<String>(playerNames.size()));
-				return true;
+                    case EXPSHARE:
-			}
+                        return StringUtil.copyPartialMatches(args[1], EXPSHARE_COMPLETIONS, new ArrayList<String>(EXPSHARE_COMPLETIONS.size()));
-		} else if (args.length == 2 && PP.inParty()) {
+                    case ITEMSHARE:
-			if (args[0].equalsIgnoreCase("password")) {
+                        return StringUtil.copyPartialMatches(args[1], ITEMSHARE_COMPLETIONS, new ArrayList<String>(ITEMSHARE_COMPLETIONS.size()));
-				if (Pinstance.isPartyLeader(player.getName(), PP.getParty())) {
+                    case LOCK:
-					if (Pinstance.isPartyLocked(PP.getParty())) {
+                    case CHAT:
-						Pinstance.setPartyPassword(PP.getParty(), args[1]);
+                        return StringUtil.copyPartialMatches(args[1], CommandUtils.TRUE_FALSE_OPTIONS, new ArrayList<String>(CommandUtils.TRUE_FALSE_OPTIONS.size()));
-						player.sendMessage(mcLocale.getString("Party.PasswordSet", new Object[] { args[1] }));
+                    case PASSWORD:
-					} else {
+                        return StringUtil.copyPartialMatches(args[1], CommandUtils.RESET_OPTIONS, new ArrayList<String>(CommandUtils.RESET_OPTIONS.size()));
-						player.sendMessage(mcLocale.getString("Party.IsntLocked"));
+                    case TELEPORT:
-					}
+                        List<String> matches = StringUtil.copyPartialMatches(args[1], PtpCommand.TELEPORT_SUBCOMMANDS, new ArrayList<String>(PtpCommand.TELEPORT_SUBCOMMANDS.size()));
-				} else {
+
-					player.sendMessage(mcLocale.getString("Party.NotOwner"));
+                        if (matches.size() == 0) {
-				}
+                            playerNames = UserManager.getPlayerNames();
-			} else if (args[0].equalsIgnoreCase("kick")) {
+                            return StringUtil.copyPartialMatches(args[1], playerNames, new ArrayList<String>(playerNames.size()));
-				if (Pinstance.isPartyLeader(player.getName(), PP.getParty())) {
+                        }
-					if (Pinstance.isPartyLocked(PP.getParty())) {
+
-						Player tPlayer = null;
+                        return matches;
-						if (Bukkit.getServer().getPlayer(args[1]) != null)
+                    default:
-							tPlayer = Bukkit.getServer().getPlayer(args[1]);
+                        return ImmutableList.of();
-						if (tPlayer == null) {
+                }
-							player.sendMessage(mcLocale.getString("Party.CouldNotKick", new Object[] { args[1] }));
+            case 3:
-						}
+                if (PartySubcommandType.getSubcommand(args[0]) == PartySubcommandType.ITEMSHARE && isItemShareCategory(args[1])) {
-						if (!Pinstance.inSameParty(player, tPlayer)) {
+                    return StringUtil.copyPartialMatches(args[2], CommandUtils.TRUE_FALSE_OPTIONS, new ArrayList<String>(CommandUtils.TRUE_FALSE_OPTIONS.size()));
-							player.sendMessage(mcLocale.getString("Party.NotInYourParty", new Object[] { tPlayer.getName() }));
+                }
-						} else {
+
-							// Not an admin
+                return ImmutableList.of();
-							if (!mcPermissions.getInstance().admin(player)) {
+            default:
-								// Can't kick an admin
+                return ImmutableList.of();
-								if (mcPermissions.getInstance().admin(tPlayer)) {
+        }
-									player.sendMessage(mcLocale.getString("Party.CouldNotKick", new Object[] { tPlayer.getName() }));
+    }
-								}
+
-							}
+    private boolean printUsage(Player player) {
-							PlayerProfile tPP = Users.getProfile(tPlayer);
+        player.sendMessage(LocaleLoader.getString("Party.Help.0", "/party join"));
-
+        player.sendMessage(LocaleLoader.getString("Party.Help.1", "/party create"));
-			                McMMOPartyChangeEvent event = new McMMOPartyChangeEvent(player, tPP.getParty(), null, EventReason.KICKED_FROM_PARTY);
+        player.sendMessage(LocaleLoader.getString("Party.Help.2", "/party ?"));
-			                Bukkit.getPluginManager().callEvent(event);
+        return true;
-
+    }
-			                if (event.isCancelled()) {
+
-			                    return true;
+    private String[] extractArgs(String[] args) {
-			                }
+        String[] newArgs = new String[args.length - 1];
-
+
-							Pinstance.removeFromParty(tPlayer, tPP);
+        for (int i = 1; i < args.length; i++) {
-
+            newArgs[i - 1] = args[i];
-							tPlayer.sendMessage(mcLocale.getString("mcPlayerListener.LeftParty"));
+        }
-						}
+
-					} else {
+        return newArgs;
-						player.sendMessage(mcLocale.getString("Party.IsntLocked"));
+    }
-					}
+
-				} else {
+    private boolean isItemShareCategory(String category) {
-					player.sendMessage(mcLocale.getString("Party.NotOwner"));
+        return category.equalsIgnoreCase("loot") || category.equalsIgnoreCase("mining") || category.equalsIgnoreCase("herbalism") || category.equalsIgnoreCase("woodcutting") || category.equalsIgnoreCase("misc");
-				}
+    }
-			} else if (args[0].equalsIgnoreCase("owner")) {
+}
-				if (Pinstance.isPartyLeader(player.getName(), PP.getParty())) {
+
-					Player tPlayer = null;
-					if (Bukkit.getServer().getPlayer(args[1]) != null)
-						tPlayer = Bukkit.getServer().getPlayer(args[1]);
-					if (tPlayer == null) {
-						player.sendMessage(mcLocale.getString("Party.CouldNotSetOwner", new Object[] { args[1] }));
-					}
-					if (!Pinstance.inSameParty(player, tPlayer)) {
-						player.sendMessage(mcLocale.getString("Party.CouldNotSetOwner", new Object[] { tPlayer.getName() }));
-					} else {
-						Pinstance.setPartyLeader(PP.getParty(), tPlayer.getName());
-					}
-				} else {
-					player.sendMessage(mcLocale.getString("Party.NotOwner"));
-				}
-			} else {
-                McMMOPartyChangeEvent event = new McMMOPartyChangeEvent(player, PP.getParty(), args[0], EventReason.CHANGED_PARTIES);
-                Bukkit.getPluginManager().callEvent(event);
-
-                if (event.isCancelled()) {
-                    return true;
-                }
-				Pinstance.removeFromParty(player, PP);
-				Pinstance.addToParty(player, PP, args[0], false, args[1]);
-			}
-		} else if (args.length == 2 && !PP.inParty()) {
-            McMMOPartyChangeEvent event = new McMMOPartyChangeEvent(player, null, args[0], EventReason.JOINED_PARTY);
-            Bukkit.getPluginManager().callEvent(event);
-
-            if (event.isCancelled()) {
-                return true;
-            }
-			Pinstance.addToParty(player, PP, args[0], false, args[1]);
-		}
-
-		return true;
-	}
-}

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

@@ -0,0 +1,48 @@
+package com.gmail.nossr50.commands.party;
+
+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.player.McMMOPlayer;
+import com.gmail.nossr50.locale.LocaleLoader;
+import com.gmail.nossr50.party.PartyManager;
+import com.gmail.nossr50.util.player.UserManager;
+
+public class PartyCreateCommand implements CommandExecutor {
+    @Override
+    public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
+        switch (args.length) {
+            case 2:
+            case 3:
+                Player player = (Player) sender;
+                McMMOPlayer mcMMOPlayer = UserManager.getPlayer(player);
+
+                // Check to see if the party exists, and if it does cancel creating a new party
+                if (PartyManager.checkPartyExistence(player, args[1])) {
+                    return true;
+                }
+
+                // Changing parties
+                if (!PartyManager.changeOrJoinParty(mcMMOPlayer, args[1])) {
+                    return true;
+                }
+
+                PartyManager.createParty(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/commands/party/PartyDisbandCommand.java

@@ -0,0 +1,38 @@
+package com.gmail.nossr50.commands.party;
+
+import org.bukkit.command.Command;
+import org.bukkit.command.CommandExecutor;
+import org.bukkit.command.CommandSender;
+import org.bukkit.entity.Player;
+
+import com.gmail.nossr50.datatypes.party.Party;
+import com.gmail.nossr50.events.party.McMMOPartyChangeEvent.EventReason;
+import com.gmail.nossr50.locale.LocaleLoader;
+import com.gmail.nossr50.party.PartyManager;
+import com.gmail.nossr50.util.player.UserManager;
+
+public class PartyDisbandCommand implements CommandExecutor {
+    @Override
+    public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
+        switch (args.length) {
+            case 1:
+                Party playerParty = UserManager.getPlayer((Player) sender).getParty();
+                String partyName = playerParty.getName();
+
+                for (Player member : playerParty.getOnlineMembers()) {
+                    if (!PartyManager.handlePartyChangeEvent(member, partyName, null, EventReason.KICKED_FROM_PARTY)) {
+                        return true;
+                    }
+
+                    member.sendMessage(LocaleLoader.getString("Party.Disband"));
+                }
+
+                PartyManager.disbandParty(playerParty);
+                return true;
+
+            default:
+                sender.sendMessage(LocaleLoader.getString("Commands.Usage.1", "party", "disband"));
+                return true;
+        }
+    }
+}

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

@@ -0,0 +1,55 @@
+package com.gmail.nossr50.commands.party;
+
+import org.bukkit.command.Command;
+import org.bukkit.command.CommandExecutor;
+import org.bukkit.command.CommandSender;
+import org.bukkit.entity.Player;
+
+import com.gmail.nossr50.config.Config;
+import com.gmail.nossr50.datatypes.party.Party;
+import com.gmail.nossr50.datatypes.party.ShareMode;
+import com.gmail.nossr50.locale.LocaleLoader;
+import com.gmail.nossr50.util.StringUtils;
+import com.gmail.nossr50.util.commands.CommandUtils;
+import com.gmail.nossr50.util.player.UserManager;
+
+public class PartyExpShareCommand implements CommandExecutor {
+    @Override
+    public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
+        if (!Config.getInstance().getExpShareEnabled()) {
+            sender.sendMessage(LocaleLoader.getString("Party.ExpShare.Disabled"));
+            return true;
+        }
+
+        switch (args.length) {
+            case 2:
+                Party party = UserManager.getPlayer((Player) sender).getParty();
+
+                if (args[1].equalsIgnoreCase("none") || CommandUtils.shouldDisableToggle(args[1])) {
+                    handleChangingShareMode(party, ShareMode.NONE);
+                }
+                else if (args[1].equalsIgnoreCase("equal") || args[1].equalsIgnoreCase("even") || CommandUtils.shouldEnableToggle(args[1])) {
+                    handleChangingShareMode(party, ShareMode.EQUAL);
+                }
+                else {
+                    sender.sendMessage(LocaleLoader.getString("Commands.Usage.2", "party", "expshare", "<NONE | EQUAL>"));
+                }
+
+                return true;
+
+            default:
+                sender.sendMessage(LocaleLoader.getString("Commands.Usage.2", "party", "expshare", "<NONE | EQUAL>"));
+                return true;
+        }
+    }
+
+    private void handleChangingShareMode(Party party, ShareMode mode) {
+        party.setXpShareMode(mode);
+
+        String changeModeMessage = LocaleLoader.getString("Commands.Party.SetSharing", LocaleLoader.getString("Party.ShareType.Exp"), LocaleLoader.getString("Party.ShareMode." + StringUtils.getCapitalized(mode.toString())));
+
+        for (Player member : party.getOnlineMembers()) {
+            member.sendMessage(changeModeMessage);
+        }
+    }
+}

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

@@ -0,0 +1,31 @@
+package com.gmail.nossr50.commands.party;
+
+import org.bukkit.command.Command;
+import org.bukkit.command.CommandExecutor;
+import org.bukkit.command.CommandSender;
+
+import com.gmail.nossr50.locale.LocaleLoader;
+
+public class PartyHelpCommand implements CommandExecutor {
+
+    @Override
+    public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
+        switch (args.length) {
+            case 1:
+                sender.sendMessage(LocaleLoader.getString("Party.Help.3", "/party join", "/party quit"));
+                sender.sendMessage(LocaleLoader.getString("Party.Help.1", "/party create"));
+                sender.sendMessage(LocaleLoader.getString("Party.Help.4", "/party <lock|unlock>"));
+                sender.sendMessage(LocaleLoader.getString("Party.Help.5", "/party password"));
+                sender.sendMessage(LocaleLoader.getString("Party.Help.6", "/party kick"));
+                sender.sendMessage(LocaleLoader.getString("Party.Help.7", "/party leader"));
+                sender.sendMessage(LocaleLoader.getString("Party.Help.8", "/party disband"));
+                sender.sendMessage(LocaleLoader.getString("Party.Help.9", "/party itemshare"));
+                sender.sendMessage(LocaleLoader.getString("Party.Help.10", "/party expshare"));
+                return true;
+
+            default:
+                sender.sendMessage(LocaleLoader.getString("Commands.Usage.1", "party", "help"));
+                return true;
+        }
+    }
+}

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

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

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

@@ -0,0 +1,61 @@
+package com.gmail.nossr50.commands.party;
+
+import org.bukkit.command.Command;
+import org.bukkit.command.CommandExecutor;
+import org.bukkit.command.CommandSender;
+import org.bukkit.entity.Player;
+
+import com.gmail.nossr50.datatypes.party.Party;
+import com.gmail.nossr50.datatypes.player.McMMOPlayer;
+import com.gmail.nossr50.locale.LocaleLoader;
+import com.gmail.nossr50.party.PartyManager;
+import com.gmail.nossr50.util.Misc;
+import com.gmail.nossr50.util.commands.CommandUtils;
+import com.gmail.nossr50.util.player.UserManager;
+
+public class PartyInviteCommand implements CommandExecutor {
+    @Override
+    public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
+        switch (args.length) {
+            case 2:
+                String targetName = Misc.getMatchedPlayerName(args[1]);
+                McMMOPlayer mcMMOTarget = UserManager.getPlayer(targetName, true);
+
+                if (!CommandUtils.checkPlayerExistence(sender, targetName, mcMMOTarget)) {
+                    return false;
+                }
+
+                Player target = mcMMOTarget.getPlayer();
+                Player player = (Player) sender;
+                McMMOPlayer mcMMOPlayer = UserManager.getPlayer(player);
+                String playerName = player.getName();
+
+                if (player.equals(target)) {
+                    sender.sendMessage(LocaleLoader.getString("Party.Invite.Self"));
+                    return true;
+                }
+
+                if (PartyManager.inSameParty(player, target)) {
+                    sender.sendMessage(LocaleLoader.getString("Party.Player.InSameParty", targetName));
+                    return true;
+                }
+
+                if (!PartyManager.canInvite(mcMMOPlayer)) {
+                    player.sendMessage(LocaleLoader.getString("Party.Locked"));
+                    return true;
+                }
+
+                Party playerParty = mcMMOPlayer.getParty();
+                mcMMOTarget.setPartyInvite(playerParty);
+
+                sender.sendMessage(LocaleLoader.getString("Commands.Invite.Success"));
+                target.sendMessage(LocaleLoader.getString("Commands.Party.Invite.0", playerParty.getName(), playerName));
+                target.sendMessage(LocaleLoader.getString("Commands.Party.Invite.1"));
+                return true;
+
+            default:
+                sender.sendMessage(LocaleLoader.getString("Commands.Usage.2", "party", "invite", "<" + LocaleLoader.getString("Commands.Usage.Player") + ">"));
+                return true;
+        }
+    }
+}

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

@@ -0,0 +1,88 @@
+package com.gmail.nossr50.commands.party;
+
+import org.bukkit.command.Command;
+import org.bukkit.command.CommandExecutor;
+import org.bukkit.command.CommandSender;
+import org.bukkit.entity.Player;
+
+import com.gmail.nossr50.config.Config;
+import com.gmail.nossr50.datatypes.party.ItemShareType;
+import com.gmail.nossr50.datatypes.party.Party;
+import com.gmail.nossr50.datatypes.party.ShareMode;
+import com.gmail.nossr50.locale.LocaleLoader;
+import com.gmail.nossr50.util.StringUtils;
+import com.gmail.nossr50.util.commands.CommandUtils;
+import com.gmail.nossr50.util.player.UserManager;
+
+public class PartyItemShareCommand implements CommandExecutor {
+    @Override
+    public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
+        if (!Config.getInstance().getItemShareEnabled()) {
+            sender.sendMessage(LocaleLoader.getString("Party.ItemShare.Disabled"));
+            return true;
+        }
+
+        Party party = UserManager.getPlayer((Player) sender).getParty();
+
+        switch (args.length) {
+            case 2:
+                ShareMode mode = ShareMode.getShareMode(args[1].toUpperCase());
+
+                if (mode == null) {
+                    sender.sendMessage(LocaleLoader.getString("Commands.Usage.2", "party", "itemshare", "<NONE | EQUAL | RANDOM>"));
+                    return true;
+                }
+
+                handleChangingShareMode(party, mode);
+                return true;
+
+            case 3:
+                boolean toggle = false;
+
+                if (CommandUtils.shouldEnableToggle(args[2])) {
+                    toggle = true;
+                }
+                else if (CommandUtils.shouldDisableToggle(args[2])) {
+                    toggle = false;
+                }
+                else {
+                    sender.sendMessage(LocaleLoader.getString("Commands.Usage.2", "party", "itemshare", "<loot | mining | herbalism | woodcutting | misc> <true | false>"));
+                    return true;
+                }
+
+                try {
+                    handleToggleItemShareCategory(party, ItemShareType.valueOf(args[1].toUpperCase()), toggle);
+                }
+                catch (IllegalArgumentException ex) {
+                    sender.sendMessage(LocaleLoader.getString("Commands.Usage.2", "party", "itemshare", "<loot | mining | herbalism | woodcutting | misc> <true | false>"));
+                }
+
+                return true;
+
+            default:
+                sender.sendMessage(LocaleLoader.getString("Commands.Usage.2", "party", "itemshare", "<NONE | EQUAL | RANDOM>"));
+                sender.sendMessage(LocaleLoader.getString("Commands.Usage.2", "party", "itemshare", "<loot | mining | herbalism | woodcutting | misc> <true | false>"));
+                return true;
+        }
+    }
+
+    private void handleChangingShareMode(Party party, ShareMode mode) {
+        party.setItemShareMode(mode);
+
+        String changeModeMessage = LocaleLoader.getString("Commands.Party.SetSharing", LocaleLoader.getString("Party.ShareType.Item"), LocaleLoader.getString("Party.ShareMode." + StringUtils.getCapitalized(mode.toString())));
+
+        for (Player member : party.getOnlineMembers()) {
+            member.sendMessage(changeModeMessage);
+        }
+    }
+
+    private void handleToggleItemShareCategory(Party party, ItemShareType type, boolean toggle) {
+        party.setSharingDrops(type, toggle);
+
+        String toggleMessage = LocaleLoader.getString("Commands.Party.ToggleShareCategory", StringUtils.getCapitalized(type.toString()), toggle ? "enabled" : "disabled");
+
+        for (Player member : party.getOnlineMembers()) {
+            member.sendMessage(toggleMessage);
+        }
+    }
+}

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

@@ -0,0 +1,76 @@
+package com.gmail.nossr50.commands.party;
+
+import org.bukkit.command.Command;
+import org.bukkit.command.CommandExecutor;
+import org.bukkit.command.CommandSender;
+import org.bukkit.entity.Player;
+
+import com.gmail.nossr50.datatypes.party.Party;
+import com.gmail.nossr50.datatypes.player.McMMOPlayer;
+import com.gmail.nossr50.locale.LocaleLoader;
+import com.gmail.nossr50.party.PartyManager;
+import com.gmail.nossr50.util.Misc;
+import com.gmail.nossr50.util.commands.CommandUtils;
+import com.gmail.nossr50.util.player.UserManager;
+
+public class PartyJoinCommand implements CommandExecutor {
+    @Override
+    public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
+        switch (args.length) {
+            case 2:
+            case 3:
+                String targetName = Misc.getMatchedPlayerName(args[1]);
+                McMMOPlayer mcMMOTarget = UserManager.getPlayer(targetName);
+
+                if (!CommandUtils.checkPlayerExistence(sender, targetName, mcMMOTarget)) {
+                    return true;
+                }
+
+                Player target = mcMMOTarget.getPlayer();
+
+                if (!mcMMOTarget.inParty()) {
+                    sender.sendMessage(LocaleLoader.getString("Party.PlayerNotInParty", targetName));
+                    return true;
+                }
+
+                Player player = (Player) sender;
+                McMMOPlayer mcMMOPlayer = UserManager.getPlayer(player);
+                Party targetParty = mcMMOTarget.getParty();
+
+                if (player.equals(target) || (mcMMOPlayer.inParty() && mcMMOPlayer.getParty().equals(targetParty))) {
+                    sender.sendMessage(LocaleLoader.getString("Party.Join.Self"));
+                    return true;
+                }
+
+                String password = getPassword(args);
+
+                // Make sure party passwords match
+                if (!PartyManager.checkPartyPassword(player, targetParty, password)) {
+                    return true;
+                }
+
+                String partyName = targetParty.getName();
+
+                // Changing parties
+                if (!PartyManager.changeOrJoinParty(mcMMOPlayer, partyName)) {
+                    return true;
+                }
+
+                player.sendMessage(LocaleLoader.getString("Commands.Party.Join", partyName));
+                PartyManager.addToParty(mcMMOPlayer, targetParty);
+                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;
+    }
+}

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

@@ -0,0 +1,49 @@
+package com.gmail.nossr50.commands.party;
+
+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.datatypes.party.Party;
+import com.gmail.nossr50.events.party.McMMOPartyChangeEvent.EventReason;
+import com.gmail.nossr50.locale.LocaleLoader;
+import com.gmail.nossr50.party.PartyManager;
+import com.gmail.nossr50.util.player.UserManager;
+
+public class PartyKickCommand implements CommandExecutor {
+    @Override
+    public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
+        switch (args.length) {
+            case 2:
+                Party playerParty = UserManager.getPlayer((Player) sender).getParty();
+                OfflinePlayer target = mcMMO.p.getServer().getOfflinePlayer(args[1]);
+
+                if (!playerParty.getMembers().contains(target.getName())) {
+                    sender.sendMessage(LocaleLoader.getString("Party.NotInYourParty", target.getName()));
+                    return true;
+                }
+
+                if (target.isOnline()) {
+                    Player onlineTarget = target.getPlayer();
+                    String partyName = playerParty.getName();
+
+                    if (!PartyManager.handlePartyChangeEvent(onlineTarget, partyName, null, EventReason.KICKED_FROM_PARTY)) {
+                        return true;
+                    }
+
+                    PartyManager.processPartyLeaving(UserManager.getPlayer(onlineTarget));
+                    onlineTarget.sendMessage(LocaleLoader.getString("Commands.Party.Kick", partyName));
+                }
+
+                PartyManager.removeFromParty(target, playerParty);
+                return true;
+
+            default:
+                sender.sendMessage(LocaleLoader.getString("Commands.Usage.2", "party", "kick", "<" + LocaleLoader.getString("Commands.Usage.Player") + ">"));
+                return true;
+        }
+    }
+}

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

@@ -0,0 +1,73 @@
+package com.gmail.nossr50.commands.party;
+
+import org.bukkit.command.Command;
+import org.bukkit.command.CommandExecutor;
+import org.bukkit.command.CommandSender;
+import org.bukkit.entity.Player;
+
+import com.gmail.nossr50.datatypes.party.Party;
+import com.gmail.nossr50.locale.LocaleLoader;
+import com.gmail.nossr50.util.Permissions;
+import com.gmail.nossr50.util.commands.CommandUtils;
+import com.gmail.nossr50.util.player.UserManager;
+
+public class PartyLockCommand implements CommandExecutor {
+    @Override
+    public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
+        switch (args.length) {
+            case 1:
+                if (args[0].equalsIgnoreCase("lock")) {
+                    togglePartyLock(sender, true);
+                }
+                else if (args[0].equalsIgnoreCase("unlock")) {
+                    togglePartyLock(sender, false);
+                }
+
+                return true;
+
+            case 2:
+                if (!args[0].equalsIgnoreCase("lock")) {
+                    sendUsageStrings(sender);
+                    return true;
+                }
+
+                if (CommandUtils.shouldEnableToggle(args[1])) {
+                    togglePartyLock(sender, true);
+                }
+                else if (CommandUtils.shouldDisableToggle(args[1])) {
+                    togglePartyLock(sender, false);
+                }
+                else {
+                    sendUsageStrings(sender);
+                }
+
+                return true;
+
+            default:
+                sendUsageStrings(sender);
+                return true;
+        }
+    }
+
+    private void sendUsageStrings(CommandSender sender) {
+        sender.sendMessage(LocaleLoader.getString("Commands.Usage.2", "party", "lock", "[on|off]"));
+        sender.sendMessage(LocaleLoader.getString("Commands.Usage.1", "party", "unlock"));
+    }
+
+    private void togglePartyLock(CommandSender sender, boolean lock) {
+        Party party = UserManager.getPlayer((Player) sender).getParty();
+
+        if (!Permissions.partySubcommand(sender, lock ? PartySubcommandType.LOCK : PartySubcommandType.UNLOCK)) {
+            sender.sendMessage(LocaleLoader.getString("mcMMO.NoPermission"));
+            return;
+        }
+
+        if (lock ? party.isLocked() : !party.isLocked()) {
+            sender.sendMessage(LocaleLoader.getString("Party." + (lock ? "IsLocked" : "IsntLocked")));
+            return;
+        }
+
+        party.setLocked(lock);
+        sender.sendMessage(LocaleLoader.getString("Party." + (lock ? "Locked" : "Unlocked")));
+    }
+}

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

@@ -0,0 +1,37 @@
+package com.gmail.nossr50.commands.party;
+
+import org.bukkit.command.Command;
+import org.bukkit.command.CommandExecutor;
+import org.bukkit.command.CommandSender;
+import org.bukkit.entity.Player;
+
+import com.gmail.nossr50.datatypes.party.Party;
+import com.gmail.nossr50.datatypes.player.McMMOPlayer;
+import com.gmail.nossr50.events.party.McMMOPartyChangeEvent.EventReason;
+import com.gmail.nossr50.locale.LocaleLoader;
+import com.gmail.nossr50.party.PartyManager;
+import com.gmail.nossr50.util.player.UserManager;
+
+public class PartyQuitCommand implements CommandExecutor {
+    @Override
+    public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
+        switch (args.length) {
+            case 1:
+                Player player = (Player) sender;
+                McMMOPlayer mcMMOPlayer = UserManager.getPlayer(player);
+                Party playerParty = mcMMOPlayer.getParty();
+
+                if (!PartyManager.handlePartyChangeEvent(player, playerParty.getName(), null, EventReason.LEFT_PARTY)) {
+                    return true;
+                }
+
+                PartyManager.removeFromParty(mcMMOPlayer);
+                sender.sendMessage(LocaleLoader.getString("Commands.Party.Leave"));
+                return true;
+
+            default:
+                sender.sendMessage(LocaleLoader.getString("Commands.Usage.1", "party", "quit"));
+                return true;
+        }
+    }
+}

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

@@ -0,0 +1,61 @@
+package com.gmail.nossr50.commands.party;
+
+import org.bukkit.command.Command;
+import org.bukkit.command.CommandExecutor;
+import org.bukkit.command.CommandSender;
+import org.bukkit.entity.Player;
+
+import com.gmail.nossr50.datatypes.party.Party;
+import com.gmail.nossr50.datatypes.player.McMMOPlayer;
+import com.gmail.nossr50.events.party.McMMOPartyChangeEvent.EventReason;
+import com.gmail.nossr50.locale.LocaleLoader;
+import com.gmail.nossr50.party.PartyManager;
+import com.gmail.nossr50.util.player.UserManager;
+
+public class PartyRenameCommand implements CommandExecutor {
+    @Override
+    public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
+        switch (args.length) {
+            case 2:
+                McMMOPlayer mcMMOPlayer = UserManager.getPlayer((Player) sender);
+                Party playerParty = mcMMOPlayer.getParty();
+
+                String oldPartyName = playerParty.getName();
+                String newPartyName = args[1];
+
+                // This is to prevent party leaders from spamming other players with the rename message
+                if (oldPartyName.equalsIgnoreCase(newPartyName)) {
+                    sender.sendMessage(LocaleLoader.getString("Party.Rename.Same"));
+                    return true;
+                }
+
+                Player player = mcMMOPlayer.getPlayer();
+
+                // Check to see if the party exists, and if it does cancel renaming the party
+                if (PartyManager.checkPartyExistence(player, newPartyName)) {
+                    return true;
+                }
+
+                String leaderName = playerParty.getLeader();
+
+                for (Player member : playerParty.getOnlineMembers()) {
+                    if (!PartyManager.handlePartyChangeEvent(member, oldPartyName, newPartyName, EventReason.CHANGED_PARTIES)) {
+                        return true;
+                    }
+
+                    if (!member.getName().equalsIgnoreCase(leaderName)) {
+                        member.sendMessage(LocaleLoader.getString("Party.InformedOnNameChange", leaderName, newPartyName));
+                    }
+                }
+
+                playerParty.setName(newPartyName);
+
+                sender.sendMessage(LocaleLoader.getString("Commands.Party.Rename", newPartyName));
+                return true;
+
+            default:
+                sender.sendMessage(LocaleLoader.getString("Commands.Usage.2", "party", "rename", "<" + LocaleLoader.getString("Commands.Usage.PartyName") + ">"));
+                return true;
+        }
+    }
+}

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

@@ -0,0 +1,48 @@
+package com.gmail.nossr50.commands.party;
+
+public enum PartySubcommandType {
+    JOIN,
+    ACCEPT,
+    CREATE,
+    HELP,
+    INFO,
+    QUIT,
+    EXPSHARE,
+    ITEMSHARE,
+    INVITE,
+    KICK,
+    DISBAND,
+    OWNER,
+    LOCK,
+    UNLOCK,
+    PASSWORD,
+    RENAME,
+    TELEPORT,
+    CHAT;
+
+    public static PartySubcommandType getSubcommand(String commandName) {
+        for (PartySubcommandType command : values()) {
+            if (command.name().equalsIgnoreCase(commandName)) {
+                return command;
+            }
+        }
+
+        if (commandName.equalsIgnoreCase("?")) {
+            return HELP;
+        }
+        else if (commandName.equalsIgnoreCase("q") || commandName.equalsIgnoreCase("leave")) {
+            return QUIT;
+        }
+        else if (commandName.equalsIgnoreCase("leader")) {
+            return OWNER;
+        }
+        else if (commandName.equalsIgnoreCase("xpshare") || commandName.equalsIgnoreCase("shareexp") || commandName.equalsIgnoreCase("sharexp")) {
+            return EXPSHARE;
+        }
+        else if (commandName.equalsIgnoreCase("shareitem") || commandName.equalsIgnoreCase("shareitems")) {
+            return ITEMSHARE;
+        }
+
+        return null;
+    }
+}

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

@@ -1,88 +0,0 @@
-package com.gmail.nossr50.commands.party;
-
-import org.bukkit.Bukkit;
-import org.bukkit.ChatColor;
-import org.bukkit.command.Command;
-import org.bukkit.command.CommandExecutor;
-import org.bukkit.command.CommandSender;
-import org.bukkit.entity.Player;
-
-import com.gmail.nossr50.mcMMO;
-import com.gmail.nossr50.config.LoadProperties;
-import com.gmail.nossr50.datatypes.PlayerProfile;
-import com.gmail.nossr50.events.party.McMMOPartyTeleportEvent;
-import com.gmail.nossr50.locale.mcLocale;
-import com.gmail.nossr50.party.Party;
-import com.gmail.nossr50.util.Users;
-import com.gmail.nossr50.util.mcPermissions;
-
-public class PtpCommand implements CommandExecutor {
-	private final mcMMO plugin;
-
-	public PtpCommand(mcMMO instance) {
-		this.plugin = instance;
-	}
-
-	@Override
-	public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
-
-		if (!(sender instanceof Player)) {
-			sender.sendMessage("This command does not support console useage."); //TODO: Needs more locale.
-			return true;
-		}
-
-		Player player = (Player) sender;
-		PlayerProfile PP = Users.getProfile(player);
-
-		if (!mcPermissions.getInstance().partyTeleport(player)) {
-			player.sendMessage(ChatColor.YELLOW + "[mcMMO] " + ChatColor.DARK_RED + mcLocale.getString("mcPlayerListener.NoPermission"));
-			return true;
-		}
-		
-		if(!Party.getInstance().isParty(PP.getParty()))
-		{
-		    player.sendMessage(ChatColor.RED+"You are not in a party!"); //TODO: Needs more locale.
-		    return true;
-		}
-		
-		if(PP.getRecentlyHurt()+(LoadProperties.ptpCommandCooldown*1000) > System.currentTimeMillis())
-		{
-		    player.sendMessage(ChatColor.RED+"You've been hurt in the last " + LoadProperties.ptpCommandCooldown + " seconds and cannnot teleport."); //TODO: Needs more locale.
-		    return true;
-		}
-		
-		if (args.length < 1) {
-			player.sendMessage(ChatColor.RED + "Usage is /ptp <playername>"); //TODO: Needs more locale.
-			return true;
-		}
-		
-		if (plugin.getServer().getPlayer(args[0]) == null) {
-			player.sendMessage("That is not a valid player"); //TODO: Needs more locale.
-		}
-
-		if (plugin.getServer().getPlayer(args[0]) != null) {
-			Player target = plugin.getServer().getPlayer(args[0]);
-			PlayerProfile PPt = Users.getProfile(target);
-			
-			if (target.isDead()) {
-			    player.sendMessage(ChatColor.RED + "You can't teleport to dead players."); //TODO: Needs more locale.
-			    return true;
-			}
-			    
-			if (PP.getParty().equals(PPt.getParty())) {
-			    McMMOPartyTeleportEvent event = new McMMOPartyTeleportEvent(player, target, PP.getParty());
-			    Bukkit.getPluginManager().callEvent(event);
-
-			    if (!event.isCancelled()) {
-    				player.teleport(target);
-    				player.sendMessage(ChatColor.GREEN + "You have teleported to " + target.getName()); //TODO: Needs more locale.
-    				target.sendMessage(ChatColor.GREEN + player.getName() + " has teleported to you."); //TODO: Needs more locale.
-			    }
-			} else {
-			    player.sendMessage(ChatColor.RED + "That player is in a different party than you."); //TODO: Needs more locale.
-			}
-		}
-
-		return true;
-	}
-}

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

@@ -0,0 +1,32 @@
+package com.gmail.nossr50.commands.party.teleport;
+
+import org.bukkit.command.Command;
+import org.bukkit.command.CommandExecutor;
+import org.bukkit.command.CommandSender;
+
+import com.gmail.nossr50.datatypes.party.PartyTeleportRecord;
+import com.gmail.nossr50.locale.LocaleLoader;
+import com.gmail.nossr50.util.Permissions;
+import com.gmail.nossr50.util.player.UserManager;
+
+public class PtpAcceptAnyCommand implements CommandExecutor {
+    @Override
+    public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
+        if (!Permissions.partyTeleportAcceptAll(sender)) {
+            sender.sendMessage(command.getPermissionMessage());
+            return true;
+        }
+
+        PartyTeleportRecord ptpRecord = UserManager.getPlayer(sender.getName()).getPartyTeleportRecord();
+
+        if (ptpRecord.isConfirmRequired()) {
+            sender.sendMessage(LocaleLoader.getString("Commands.ptp.AcceptAny.Disabled"));
+        }
+        else {
+            sender.sendMessage(LocaleLoader.getString("Commands.ptp.AcceptAny.Enabled"));
+        }
+
+        ptpRecord.toggleConfirmRequired();
+        return true;
+    }
+}

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

@@ -0,0 +1,64 @@
+package com.gmail.nossr50.commands.party.teleport;
+
+import org.bukkit.World;
+import org.bukkit.command.Command;
+import org.bukkit.command.CommandExecutor;
+import org.bukkit.command.CommandSender;
+import org.bukkit.entity.Player;
+
+import com.gmail.nossr50.config.Config;
+import com.gmail.nossr50.datatypes.party.PartyTeleportRecord;
+import com.gmail.nossr50.locale.LocaleLoader;
+import com.gmail.nossr50.util.Misc;
+import com.gmail.nossr50.util.Permissions;
+import com.gmail.nossr50.util.player.UserManager;
+
+public class PtpAcceptCommand implements CommandExecutor {
+    @Override
+    public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
+        if (!Permissions.partyTeleportAccept(sender)) {
+            sender.sendMessage(command.getPermissionMessage());
+            return true;
+        }
+
+        Player player = (Player) sender;
+        PartyTeleportRecord ptpRecord = UserManager.getPlayer(player).getPartyTeleportRecord();
+
+        if (!ptpRecord.hasRequest()) {
+            player.sendMessage(LocaleLoader.getString("Commands.ptp.NoRequests"));
+            return true;
+        }
+
+        if ((ptpRecord.getTimeout() + Config.getInstance().getPTPCommandTimeout()) * Misc.TIME_CONVERSION_FACTOR < System.currentTimeMillis()) {
+            ptpRecord.removeRequest();
+            player.sendMessage(LocaleLoader.getString("Commands.ptp.RequestExpired"));
+            return true;
+        }
+
+        Player target = ptpRecord.getRequestor();
+        ptpRecord.removeRequest();
+
+        if (!PtpCommand.canTeleport(sender, player, target.getName())) {
+            return true;
+        }
+
+        if (Config.getInstance().getPTPCommandWorldPermissions()) {
+            World targetWorld = target.getWorld();
+            World playerWorld = player.getWorld();
+
+            if (!Permissions.partyTeleportAllWorlds(target)) {
+                if (!Permissions.partyTeleportWorld(target, targetWorld)) {
+                    target.sendMessage(LocaleLoader.getString("Commands.ptp.NoWorldPermissions", targetWorld.getName()));
+                    return true;
+                }
+                else if (targetWorld != playerWorld && !Permissions.partyTeleportWorld(target, playerWorld)) {
+                    target.sendMessage(LocaleLoader.getString("Commands.ptp.NoWorldPermissions", playerWorld.getName()));
+                    return true;
+                }
+            }
+        }
+
+        PtpCommand.handleTeleportWarmup(target, player);
+        return true;
+    }
+}

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

@@ -0,0 +1,186 @@
+package com.gmail.nossr50.commands.party.teleport;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Set;
+
+import org.bukkit.command.Command;
+import org.bukkit.command.CommandExecutor;
+import org.bukkit.command.CommandSender;
+import org.bukkit.command.TabExecutor;
+import org.bukkit.entity.Player;
+import org.bukkit.util.StringUtil;
+
+import com.gmail.nossr50.mcMMO;
+import com.gmail.nossr50.config.Config;
+import com.gmail.nossr50.datatypes.party.PartyTeleportRecord;
+import com.gmail.nossr50.datatypes.player.McMMOPlayer;
+import com.gmail.nossr50.locale.LocaleLoader;
+import com.gmail.nossr50.party.PartyManager;
+import com.gmail.nossr50.runnables.items.TeleportationWarmup;
+import com.gmail.nossr50.util.EventUtils;
+import com.gmail.nossr50.util.Misc;
+import com.gmail.nossr50.util.Permissions;
+import com.gmail.nossr50.util.commands.CommandUtils;
+import com.gmail.nossr50.util.player.UserManager;
+import com.gmail.nossr50.util.skills.SkillUtils;
+
+import com.google.common.collect.ImmutableList;
+
+public class PtpCommand implements TabExecutor {
+    public static final List<String> TELEPORT_SUBCOMMANDS = ImmutableList.of("toggle", "accept", "acceptany", "acceptall");
+
+    private CommandExecutor ptpToggleCommand = new PtpToggleCommand();
+    private CommandExecutor ptpAcceptAnyCommand = new PtpAcceptAnyCommand();
+    private CommandExecutor ptpAcceptCommand = new PtpAcceptCommand();
+
+    @Override
+    public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
+        if (CommandUtils.noConsoleUsage(sender)) {
+            return true;
+        }
+
+        switch (args.length) {
+            case 1:
+                if (args[0].equalsIgnoreCase("toggle")) {
+                    return ptpToggleCommand.onCommand(sender, command, label, args);
+                }
+
+                if (args[0].equalsIgnoreCase("acceptany") || args[0].equalsIgnoreCase("acceptall")) {
+                    return ptpAcceptAnyCommand.onCommand(sender, command, label, args);
+                }
+
+                Player player = (Player) sender;
+                McMMOPlayer mcMMOPlayer = UserManager.getPlayer(player);
+
+                long recentlyHurt = mcMMOPlayer.getRecentlyHurt();
+                int hurtCooldown = Config.getInstance().getPTPCommandRecentlyHurtCooldown();
+
+                if (hurtCooldown > 0) {
+                    int timeRemaining = SkillUtils.calculateTimeLeft(recentlyHurt * Misc.TIME_CONVERSION_FACTOR, hurtCooldown, player);
+
+                    if (timeRemaining > 0) {
+                        player.sendMessage(LocaleLoader.getString("Item.Injured.Wait", timeRemaining));
+                        return true;
+                    }
+                }
+
+                if (args[0].equalsIgnoreCase("accept")) {
+                    return ptpAcceptCommand.onCommand(sender, command, label, args);
+                }
+
+                if (!Permissions.partyTeleportSend(sender)) {
+                    sender.sendMessage(command.getPermissionMessage());
+                    return true;
+                }
+
+                int ptpCooldown = Config.getInstance().getPTPCommandCooldown();
+                long ptpLastUse = mcMMOPlayer.getPartyTeleportRecord().getLastUse();
+
+                if (ptpCooldown > 0) {
+                    int timeRemaining = SkillUtils.calculateTimeLeft(ptpLastUse * Misc.TIME_CONVERSION_FACTOR, ptpCooldown, player);
+
+                    if (timeRemaining > 0) {
+                        player.sendMessage(LocaleLoader.getString("Item.Generic.Wait", timeRemaining));
+                        return true;
+                    }
+                }
+
+                sendTeleportRequest(sender, player, Misc.getMatchedPlayerName(args[0]));
+                return true;
+
+            default:
+                return false;
+        }
+    }
+
+    @Override
+    public List<String> onTabComplete(CommandSender sender, Command command, String alias, String[] args) {
+        switch (args.length) {
+            case 1:
+                List<String> matches = StringUtil.copyPartialMatches(args[0], TELEPORT_SUBCOMMANDS, new ArrayList<String>(TELEPORT_SUBCOMMANDS.size()));
+
+                if (matches.size() == 0) {
+                    Set<String> playerNames = UserManager.getPlayerNames();
+                    return StringUtil.copyPartialMatches(args[0], playerNames, new ArrayList<String>(playerNames.size()));
+                }
+
+                return matches;
+            default:
+                return ImmutableList.of();
+        }
+    }
+
+    private void sendTeleportRequest(CommandSender sender, Player player, String targetName) {
+        if (!canTeleport(sender, player, targetName)) {
+            return;
+        }
+
+        McMMOPlayer mcMMOTarget = UserManager.getPlayer(targetName);
+        Player target = mcMMOTarget.getPlayer();
+
+        PartyTeleportRecord ptpRecord = mcMMOTarget.getPartyTeleportRecord();
+
+        if (!ptpRecord.isConfirmRequired()) {
+            handleTeleportWarmup(player, target);
+            return;
+        }
+
+        ptpRecord.setRequestor(player);
+        ptpRecord.actualizeTimeout();
+
+        player.sendMessage(LocaleLoader.getString("Commands.Invite.Success"));
+
+        target.sendMessage(LocaleLoader.getString("Commands.ptp.Request1", player.getName()));
+        target.sendMessage(LocaleLoader.getString("Commands.ptp.Request2", Config.getInstance().getPTPCommandTimeout()));
+    }
+
+    protected static boolean canTeleport(CommandSender sender, Player player, String targetName) {
+        McMMOPlayer mcMMOTarget = UserManager.getPlayer(targetName);
+
+        if (!CommandUtils.checkPlayerExistence(sender, targetName, mcMMOTarget)) {
+            return false;
+        }
+
+        Player target = mcMMOTarget.getPlayer();
+
+        if (player.equals(target)) {
+            player.sendMessage(LocaleLoader.getString("Party.Teleport.Self"));
+            return false;
+        }
+
+        if (!PartyManager.inSameParty(player, target)) {
+            player.sendMessage(LocaleLoader.getString("Party.NotInYourParty", targetName));
+            return false;
+        }
+
+        if (!mcMMOTarget.getPartyTeleportRecord().isEnabled()) {
+            player.sendMessage(LocaleLoader.getString("Party.Teleport.Disabled", targetName));
+            return false;
+        }
+
+        if (!target.isValid()) {
+            player.sendMessage(LocaleLoader.getString("Party.Teleport.Dead"));
+            return false;
+        }
+
+        return true;
+    }
+
+    protected static void handleTeleportWarmup(Player teleportingPlayer, Player targetPlayer) {
+        McMMOPlayer mcMMOPlayer = UserManager.getPlayer(teleportingPlayer);
+        McMMOPlayer mcMMOTarget = UserManager.getPlayer(targetPlayer);
+
+        long warmup = Config.getInstance().getPTPCommandWarmup();
+
+        mcMMOPlayer.actualizeTeleportCommenceLocation(teleportingPlayer);
+
+        if (warmup > 0) {
+            teleportingPlayer.sendMessage(LocaleLoader.getString("Teleport.Commencing", warmup));
+            new TeleportationWarmup(mcMMOPlayer, mcMMOTarget).runTaskLater(mcMMO.p, 20 * warmup);
+        }
+        else {
+            EventUtils.handlePartyTeleportEvent(teleportingPlayer, targetPlayer);
+        }
+    }
+}

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

@@ -0,0 +1,32 @@
+package com.gmail.nossr50.commands.party.teleport;
+
+import org.bukkit.command.Command;
+import org.bukkit.command.CommandExecutor;
+import org.bukkit.command.CommandSender;
+
+import com.gmail.nossr50.datatypes.party.PartyTeleportRecord;
+import com.gmail.nossr50.locale.LocaleLoader;
+import com.gmail.nossr50.util.Permissions;
+import com.gmail.nossr50.util.player.UserManager;
+
+public class PtpToggleCommand implements CommandExecutor {
+    @Override
+    public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
+        if (!Permissions.partyTeleportToggle(sender)) {
+            sender.sendMessage(command.getPermissionMessage());
+            return true;
+        }
+
+        PartyTeleportRecord ptpRecord = UserManager.getPlayer(sender.getName()).getPartyTeleportRecord();
+
+        if (ptpRecord.isEnabled()) {
+            sender.sendMessage(LocaleLoader.getString("Commands.ptp.Disabled"));
+        }
+        else {
+            sender.sendMessage(LocaleLoader.getString("Commands.ptp.Enabled"));
+        }
+
+        ptpRecord.toggleEnabled();
+        return true;
+    }
+}

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

@@ -0,0 +1,114 @@
+package com.gmail.nossr50.commands.player;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Set;
+
+import org.bukkit.command.Command;
+import org.bukkit.command.CommandSender;
+import org.bukkit.command.TabExecutor;
+import org.bukkit.entity.Player;
+import org.bukkit.util.StringUtil;
+
+import com.gmail.nossr50.mcMMO;
+import com.gmail.nossr50.config.Config;
+import com.gmail.nossr50.datatypes.player.McMMOPlayer;
+import com.gmail.nossr50.datatypes.player.PlayerProfile;
+import com.gmail.nossr50.datatypes.skills.SkillType;
+import com.gmail.nossr50.locale.LocaleLoader;
+import com.gmail.nossr50.util.Misc;
+import com.gmail.nossr50.util.Permissions;
+import com.gmail.nossr50.util.commands.CommandUtils;
+import com.gmail.nossr50.util.player.UserManager;
+import com.gmail.nossr50.util.scoreboards.ScoreboardManager;
+
+import com.google.common.collect.ImmutableList;
+
+public class InspectCommand implements TabExecutor {
+    @Override
+    public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
+        switch (args.length) {
+            case 1:
+                String playerName = Misc.getMatchedPlayerName(args[0]);
+                McMMOPlayer mcMMOPlayer = UserManager.getPlayer(playerName, true);
+
+                // If the mcMMOPlayer doesn't exist, create a temporary profile and check if it's present in the database. If it's not, abort the process.
+                if (mcMMOPlayer == null) {
+                    PlayerProfile profile = mcMMO.getDatabaseManager().loadPlayerProfile(playerName, false); // Temporary Profile
+
+                    if (CommandUtils.inspectOffline(sender, profile, Permissions.inspectOffline(sender))) {
+                        return true;
+                    }
+
+                    if (sender instanceof Player && Config.getInstance().getInspectUseBoard()) {
+                        ScoreboardManager.enablePlayerInspectScoreboard((Player) sender, profile);
+
+                        if (!Config.getInstance().getInspectUseChat()) {
+                            return true;
+                        }
+                    }
+
+                    sender.sendMessage(LocaleLoader.getString("Inspect.OfflineStats", playerName));
+
+                    sender.sendMessage(LocaleLoader.getString("Stats.Header.Gathering"));
+                    for (SkillType skill : SkillType.GATHERING_SKILLS) {
+                        sender.sendMessage(CommandUtils.displaySkill(profile, skill));
+                    }
+
+                    sender.sendMessage(LocaleLoader.getString("Stats.Header.Combat"));
+                    for (SkillType skill : SkillType.COMBAT_SKILLS) {
+                        sender.sendMessage(CommandUtils.displaySkill(profile, skill));
+                    }
+
+                    sender.sendMessage(LocaleLoader.getString("Stats.Header.Misc"));
+                    for (SkillType skill : SkillType.MISC_SKILLS) {
+                        sender.sendMessage(CommandUtils.displaySkill(profile, skill));
+                    }
+
+                }
+                else {
+                    Player target = mcMMOPlayer.getPlayer();
+
+                    if (CommandUtils.hidden(sender, target, Permissions.inspectHidden(sender))) {
+                        if (!Permissions.inspectOffline(sender)) {
+                            sender.sendMessage(LocaleLoader.getString("Inspect.Offline"));
+                            return true;
+                        }
+                    }
+                    else if (CommandUtils.tooFar(sender, target, Permissions.inspectFar(sender))) {
+                        return true;
+                    }
+
+                    if (sender instanceof Player && Config.getInstance().getInspectUseBoard()) {
+                        ScoreboardManager.enablePlayerInspectScoreboard((Player) sender, mcMMOPlayer.getProfile());
+
+                        if (!Config.getInstance().getInspectUseChat()) {
+                            return true;
+                        }
+                    }
+
+                    sender.sendMessage(LocaleLoader.getString("Inspect.Stats", target.getName()));
+                    CommandUtils.printGatheringSkills(target, sender);
+                    CommandUtils.printCombatSkills(target, sender);
+                    CommandUtils.printMiscSkills(target, sender);
+                    sender.sendMessage(LocaleLoader.getString("Commands.PowerLevel", mcMMOPlayer.getPowerLevel()));
+                }
+
+                return true;
+
+            default:
+                return false;
+        }
+    }
+
+    @Override
+    public List<String> onTabComplete(CommandSender sender, Command command, String alias, String[] args) {
+        switch (args.length) {
+            case 1:
+                Set<String> playerNames = UserManager.getPlayerNames();
+                return StringUtil.copyPartialMatches(args[0], playerNames, new ArrayList<String>(playerNames.size()));
+            default:
+                return ImmutableList.of();
+        }
+    }
+}

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

@@ -0,0 +1,70 @@
+package com.gmail.nossr50.commands.player;
+
+import java.util.List;
+
+import org.bukkit.command.Command;
+import org.bukkit.command.CommandSender;
+import org.bukkit.command.TabExecutor;
+import org.bukkit.entity.Player;
+
+import com.gmail.nossr50.config.Config;
+import com.gmail.nossr50.datatypes.player.McMMOPlayer;
+import com.gmail.nossr50.datatypes.skills.AbilityType;
+import com.gmail.nossr50.locale.LocaleLoader;
+import com.gmail.nossr50.util.commands.CommandUtils;
+import com.gmail.nossr50.util.player.UserManager;
+import com.gmail.nossr50.util.scoreboards.ScoreboardManager;
+
+import com.google.common.collect.ImmutableList;
+
+public class MccooldownCommand implements TabExecutor {
+    @Override
+    public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
+        if (CommandUtils.noConsoleUsage(sender)) {
+            return true;
+        }
+
+        switch (args.length) {
+            case 0:
+                Player player = (Player) sender;
+
+                if (Config.getInstance().getCooldownUseBoard()) {
+                    ScoreboardManager.enablePlayerCooldownScoreboard(player);
+
+                    if (!Config.getInstance().getCooldownUseChat()) {
+                        return true;
+                    }
+                }
+
+                McMMOPlayer mcMMOPlayer = UserManager.getPlayer(player);
+
+                player.sendMessage(LocaleLoader.getString("Commands.Cooldowns.Header"));
+                player.sendMessage(LocaleLoader.getString("mcMMO.NoSkillNote"));
+
+                for (AbilityType ability : AbilityType.NORMAL_ABILITIES) {
+                    if (!ability.getPermissions(player)) {
+                        continue;
+                    }
+
+                    int seconds = mcMMOPlayer.calculateTimeRemaining(ability);
+
+                    if (seconds <= 0) {
+                        player.sendMessage(LocaleLoader.getString("Commands.Cooldowns.Row.Y", ability.getName()));
+                    }
+                    else {
+                        player.sendMessage(LocaleLoader.getString("Commands.Cooldowns.Row.N", ability.getName(), seconds));
+                    }
+                }
+
+                return true;
+
+            default:
+                return false;
+        }
+    }
+
+    @Override
+    public List<String> onTabComplete(CommandSender sender, Command command, String alias, String[] args) {
+        return ImmutableList.of();
+    }
+}

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

@@ -0,0 +1,100 @@
+package com.gmail.nossr50.commands.player;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Set;
+
+import org.bukkit.command.Command;
+import org.bukkit.command.CommandSender;
+import org.bukkit.command.TabExecutor;
+import org.bukkit.entity.Player;
+import org.bukkit.util.StringUtil;
+
+import com.gmail.nossr50.mcMMO;
+import com.gmail.nossr50.config.Config;
+import com.gmail.nossr50.datatypes.player.McMMOPlayer;
+import com.gmail.nossr50.locale.LocaleLoader;
+import com.gmail.nossr50.runnables.commands.McrankCommandAsyncTask;
+import com.gmail.nossr50.util.Misc;
+import com.gmail.nossr50.util.Permissions;
+import com.gmail.nossr50.util.commands.CommandUtils;
+import com.gmail.nossr50.util.player.UserManager;
+
+import com.google.common.collect.ImmutableList;
+
+public class McrankCommand implements TabExecutor {
+    @Override
+    public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
+        switch (args.length) {
+            case 0:
+                if (CommandUtils.noConsoleUsage(sender)) {
+                    return true;
+                }
+
+                if (!Permissions.mcrank(sender)) {
+                    sender.sendMessage(command.getPermissionMessage());
+                    return true;
+                }
+
+                display(sender, sender.getName());
+
+                return true;
+
+            case 1:
+                if (!Permissions.mcrankOthers(sender)) {
+                    sender.sendMessage(command.getPermissionMessage());
+                    return true;
+                }
+
+                String playerName = Misc.getMatchedPlayerName(args[0]);
+                McMMOPlayer mcMMOPlayer = UserManager.getPlayer(playerName, true);
+
+                if (mcMMOPlayer != null) {
+                    Player player = mcMMOPlayer.getPlayer();
+                    playerName = player.getName();
+
+                    if (CommandUtils.tooFar(sender, player, Permissions.mcrankFar(sender))) {
+                        return true;
+                    }
+                }
+                else if (CommandUtils.inspectOffline(sender, mcMMO.getDatabaseManager().loadPlayerProfile(playerName, false), Permissions.mcrankOffline(sender))) {
+                    return true;
+                }
+
+                display(sender, playerName);
+                return true;
+
+            default:
+                return false;
+        }
+    }
+
+    @Override
+    public List<String> onTabComplete(CommandSender sender, Command command, String alias, String[] args) {
+        switch (args.length) {
+            case 1:
+                Set<String> playerNames = UserManager.getPlayerNames();
+                return StringUtil.copyPartialMatches(args[0], playerNames, new ArrayList<String>(playerNames.size()));
+            default:
+                return ImmutableList.of();
+        }
+    }
+
+    private void display(CommandSender sender, String playerName) {
+        if (sender instanceof Player) {
+            McMMOPlayer mcMMOPlayer = UserManager.getPlayer(sender.getName());
+
+            if (mcMMOPlayer.getDatabaseATS() + Misc.PLAYER_DATABASE_COOLDOWN_MILLIS > System.currentTimeMillis()) {
+                sender.sendMessage(LocaleLoader.getString("Commands.Database.Cooldown"));
+                return;
+            }
+
+            mcMMOPlayer.actualizeDatabaseATS();
+        }
+
+        boolean useBoard = (sender instanceof Player) && (Config.getInstance().getRankUseBoard());
+        boolean useChat = useBoard ? Config.getInstance().getRankUseChat() : true;
+
+        new McrankCommandAsyncTask(playerName, sender, useBoard, useChat).runTaskAsynchronously(mcMMO.p);
+    }
+}

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

@@ -0,0 +1,64 @@
+package com.gmail.nossr50.commands.player;
+
+import java.util.List;
+
+import org.bukkit.command.Command;
+import org.bukkit.command.CommandSender;
+import org.bukkit.command.TabExecutor;
+import org.bukkit.entity.Player;
+
+import com.gmail.nossr50.config.Config;
+import com.gmail.nossr50.locale.LocaleLoader;
+import com.gmail.nossr50.util.commands.CommandUtils;
+import com.gmail.nossr50.util.player.UserManager;
+import com.gmail.nossr50.util.scoreboards.ScoreboardManager;
+
+import com.google.common.collect.ImmutableList;
+
+public class McstatsCommand implements TabExecutor {
+    @Override
+    public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
+        if (CommandUtils.noConsoleUsage(sender)) {
+            return true;
+        }
+
+        switch (args.length) {
+            case 0:
+                Player player = (Player) sender;
+
+                if (Config.getInstance().getStatsUseBoard()) {
+                    ScoreboardManager.enablePlayerStatsScoreboard(player);
+
+                    if (!Config.getInstance().getStatsUseChat()) {
+                        return true;
+                    }
+                }
+
+                player.sendMessage(LocaleLoader.getString("Stats.Own.Stats"));
+                player.sendMessage(LocaleLoader.getString("mcMMO.NoSkillNote"));
+
+                CommandUtils.printGatheringSkills(player);
+                CommandUtils.printCombatSkills(player);
+                CommandUtils.printMiscSkills(player);
+
+                int powerLevelCap = Config.getInstance().getPowerLevelCap();
+
+                if (powerLevelCap != Integer.MAX_VALUE) {
+                    player.sendMessage(LocaleLoader.getString("Commands.PowerLevel.Capped", UserManager.getPlayer(player).getPowerLevel(), powerLevelCap));
+                }
+                else {
+                    player.sendMessage(LocaleLoader.getString("Commands.PowerLevel", UserManager.getPlayer(player).getPowerLevel()));
+                }
+
+                return true;
+
+            default:
+                return false;
+        }
+    }
+
+    @Override
+    public List<String> onTabComplete(CommandSender sender, Command command, String alias, String[] args) {
+        return ImmutableList.of();
+    }
+}

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

@@ -0,0 +1,120 @@
+package com.gmail.nossr50.commands.player;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.bukkit.command.Command;
+import org.bukkit.command.CommandSender;
+import org.bukkit.command.TabExecutor;
+import org.bukkit.entity.Player;
+import org.bukkit.util.StringUtil;
+
+import com.gmail.nossr50.mcMMO;
+import com.gmail.nossr50.config.Config;
+import com.gmail.nossr50.datatypes.player.McMMOPlayer;
+import com.gmail.nossr50.datatypes.skills.SkillType;
+import com.gmail.nossr50.locale.LocaleLoader;
+import com.gmail.nossr50.runnables.commands.MctopCommandAsyncTask;
+import com.gmail.nossr50.util.Misc;
+import com.gmail.nossr50.util.Permissions;
+import com.gmail.nossr50.util.StringUtils;
+import com.gmail.nossr50.util.commands.CommandUtils;
+import com.gmail.nossr50.util.player.UserManager;
+
+import com.google.common.collect.ImmutableList;
+
+public class MctopCommand implements TabExecutor {
+    @Override
+    public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
+        SkillType skill = null;
+
+        switch (args.length) {
+            case 0:
+                display(1, skill, sender, command);
+                return true;
+
+            case 1:
+                if (StringUtils.isInt(args[0])) {
+                    display(Math.abs(Integer.parseInt(args[0])), skill, sender, command);
+                    return true;
+                }
+
+                skill = extractSkill(sender, args[0]);
+
+                if (skill == null) {
+                    return true;
+                }
+
+                display(1, skill, sender, command);
+                return true;
+
+            case 2:
+                if (CommandUtils.isInvalidInteger(sender, args[1])) {
+                    return true;
+                }
+
+                skill = extractSkill(sender, args[0]);
+
+                if (skill == null) {
+                    return true;
+                }
+
+                display(Math.abs(Integer.parseInt(args[1])), skill, sender, command);
+                return true;
+
+            default:
+                return false;
+        }
+    }
+
+    @Override
+    public List<String> onTabComplete(CommandSender sender, Command command, String alias, String[] args) {
+        switch (args.length) {
+            case 1:
+                return StringUtil.copyPartialMatches(args[0], SkillType.SKILL_NAMES, new ArrayList<String>(SkillType.SKILL_NAMES.size()));
+            default:
+                return ImmutableList.of();
+        }
+    }
+
+    private void display(int page, SkillType skill, CommandSender sender, Command command) {
+        if (skill != null && !Permissions.mctop(sender, skill)) {
+            sender.sendMessage(command.getPermissionMessage());
+            return;
+        }
+
+        if (sender instanceof Player) {
+            McMMOPlayer mcMMOPlayer = UserManager.getPlayer(sender.getName());
+
+            if (mcMMOPlayer.getDatabaseATS() + Misc.PLAYER_DATABASE_COOLDOWN_MILLIS > System.currentTimeMillis()) {
+                sender.sendMessage(LocaleLoader.getString("Commands.Database.Cooldown"));
+                return;
+            }
+
+            mcMMOPlayer.actualizeDatabaseATS();
+        }
+
+        display(page, skill, sender);
+    }
+
+    private void display(int page, SkillType skill, CommandSender sender) {
+        boolean useBoard = (sender instanceof Player) && (Config.getInstance().getTopUseBoard());
+        boolean useChat = useBoard ? Config.getInstance().getTopUseChat() : true;
+
+        new MctopCommandAsyncTask(page, skill, sender, useBoard, useChat).runTaskAsynchronously(mcMMO.p);
+    }
+
+    private SkillType extractSkill(CommandSender sender, String skillName) {
+        if (CommandUtils.isInvalidSkill(sender, skillName)) {
+            return null;
+        }
+
+        SkillType skill = SkillType.getSkill(skillName);
+
+        if (CommandUtils.isChildSkill(sender, skill)) {
+            return null;
+        }
+
+        return skill;
+    }
+}

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

@@ -1,61 +1,97 @@
-package com.gmail.nossr50.commands.skills;
+package com.gmail.nossr50.commands.skills;
-
+
-import org.bukkit.command.Command;
+import java.util.ArrayList;
-import org.bukkit.command.CommandExecutor;
+import java.util.List;
-import org.bukkit.command.CommandSender;
+
-import org.bukkit.entity.Player;
+import org.bukkit.entity.Player;
-
+
-import com.gmail.nossr50.commands.CommandHelper;
+import com.gmail.nossr50.datatypes.skills.SkillType;
-import com.gmail.nossr50.datatypes.PlayerProfile;
+import com.gmail.nossr50.locale.LocaleLoader;
-import com.gmail.nossr50.datatypes.SkillType;
+import com.gmail.nossr50.skills.acrobatics.Acrobatics;
-import com.gmail.nossr50.locale.mcLocale;
+import com.gmail.nossr50.util.Permissions;
-import com.gmail.nossr50.util.Page;
+
-import com.gmail.nossr50.util.Users;
+public class AcrobaticsCommand extends SkillCommand {
-import com.gmail.nossr50.util.mcPermissions;
+    private String dodgeChance;
-
+    private String dodgeChanceLucky;
-public class AcrobaticsCommand implements CommandExecutor {
+    private String rollChance;
-	@Override
+    private String rollChanceLucky;
-	public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
+    private String gracefulRollChance;
-		if (!(sender instanceof Player))
+    private String gracefulRollChanceLucky;
-		{
+
-			sender.sendMessage("This command does not support console useage."); //TODO: Needs more locale.
+    private boolean canDodge;
-			return true;
+    private boolean canRoll;
-		}
+    private boolean canGracefulRoll;
-
+
-        if (CommandHelper.noCommandPermissions(sender, "mcmmo.skills.acrobatics")) {
+    public AcrobaticsCommand() {
-            return true;
+        super(SkillType.ACROBATICS);
-        }
+    }
-        
+
-		Player player = (Player) sender;
+    @Override
-		PlayerProfile PP = Users.getProfile(player);
+    protected void dataCalculations(Player player, float skillValue, boolean isLucky) {
-
+        // DODGE
-		String dodgepercentage;
+        if (canDodge) {
-		float skillvalue = (float) PP.getSkillLevel(SkillType.ACROBATICS);
+            String[] dodgeStrings = calculateAbilityDisplayValues(skillValue, Acrobatics.dodgeMaxBonusLevel, Acrobatics.dodgeMaxChance, isLucky);
-		String percentage = String.valueOf((skillvalue / 1000) * 100);
+            dodgeChance = dodgeStrings[0];
-		String gracepercentage = String.valueOf(((skillvalue / 1000) * 100) * 2);
+            dodgeChanceLucky = dodgeStrings[1];
-
+        }
-		if (PP.getSkillLevel(SkillType.ACROBATICS) <= 800)
+
-			dodgepercentage = String.valueOf((skillvalue / 4000 * 100));
+        // ROLL
-		else
+        if (canRoll) {
-			dodgepercentage = "20";
+            String[] rollStrings = calculateAbilityDisplayValues(skillValue, Acrobatics.rollMaxBonusLevel, Acrobatics.rollMaxChance, isLucky);
-
+            rollChance = rollStrings[0];
-		player.sendMessage(mcLocale.getString("m.SkillHeader", new Object[] { mcLocale.getString("m.SkillAcrobatics") }));
+            rollChanceLucky = rollStrings[1];
-		player.sendMessage(mcLocale.getString("m.XPGain", new Object[] { mcLocale.getString("m.XPGainAcrobatics") }));
+        }
-
+
-		if (mcPermissions.getInstance().acrobatics(player))
+        // GRACEFUL ROLL
-			player.sendMessage(mcLocale.getString("m.LVL", new Object[] { PP.getSkillLevel(SkillType.ACROBATICS), PP.getSkillXpLevel(SkillType.ACROBATICS), PP.getXpToLevel(SkillType.ACROBATICS) }));
+        if (canGracefulRoll) {
-
+            String[] gracefulRollStrings = calculateAbilityDisplayValues(skillValue, Acrobatics.gracefulRollMaxBonusLevel, Acrobatics.gracefulRollMaxChance, isLucky);
-		player.sendMessage(mcLocale.getString("m.SkillHeader", new Object[] { mcLocale.getString("m.Effects") }));
+            gracefulRollChance = gracefulRollStrings[0];
-		player.sendMessage(mcLocale.getString("m.EffectsTemplate", new Object[] { mcLocale.getString("m.EffectsAcrobatics1_0"), mcLocale.getString("m.EffectsAcrobatics1_1") }));
+            gracefulRollChanceLucky = gracefulRollStrings[1];
-		player.sendMessage(mcLocale.getString("m.EffectsTemplate", new Object[] { mcLocale.getString("m.EffectsAcrobatics2_0"), mcLocale.getString("m.EffectsAcrobatics2_1") }));
+        }
-		player.sendMessage(mcLocale.getString("m.EffectsTemplate", new Object[] { mcLocale.getString("m.EffectsAcrobatics3_0"), mcLocale.getString("m.EffectsAcrobatics3_1") }));
+    }
-		player.sendMessage(mcLocale.getString("m.SkillHeader", new Object[] { mcLocale.getString("m.YourStats") }));
+
-		player.sendMessage(mcLocale.getString("m.AcrobaticsRollChance", new Object[] { percentage }));
+    @Override
-		player.sendMessage(mcLocale.getString("m.AcrobaticsGracefulRollChance", new Object[] { gracepercentage }));
+    protected void permissionsCheck(Player player) {
-		player.sendMessage(mcLocale.getString("m.AcrobaticsDodgeChance", new Object[] { dodgepercentage }));
+        canDodge = Permissions.dodge(player);
-		
+        canRoll = Permissions.roll(player);
-		Page.grabGuidePageForSkill(SkillType.ACROBATICS, player, args);
+        canGracefulRoll = Permissions.gracefulRoll(player);
-		
+    }
-		return true;
+
-	}
+    @Override
-}
+    protected List<String> effectsDisplay() {
+        List<String> messages = new ArrayList<String>();
+
+        if (canRoll) {
+            messages.add(LocaleLoader.getString("Effects.Template", LocaleLoader.getString("Acrobatics.Effect.0"), LocaleLoader.getString("Acrobatics.Effect.1")));
+        }
+
+        if (canGracefulRoll) {
+            messages.add(LocaleLoader.getString("Effects.Template", LocaleLoader.getString("Acrobatics.Effect.2"), LocaleLoader.getString("Acrobatics.Effect.3")));
+        }
+
+        if (canDodge) {
+            messages.add(LocaleLoader.getString("Effects.Template", LocaleLoader.getString("Acrobatics.Effect.4"), LocaleLoader.getString("Acrobatics.Effect.5")));
+        }
+
+        return messages;
+    }
+
+    @Override
+    protected List<String> statsDisplay(Player player, float skillValue, boolean hasEndurance, boolean isLucky) {
+        List<String> messages = new ArrayList<String>();
+
+        if (canRoll) {
+            messages.add(LocaleLoader.getString("Acrobatics.Roll.Chance", rollChance) + (isLucky ? LocaleLoader.getString("Perks.Lucky.Bonus", rollChanceLucky) : ""));
+        }
+
+        if (canGracefulRoll) {
+            messages.add(LocaleLoader.getString("Acrobatics.Roll.GraceChance", gracefulRollChance) + (isLucky ? LocaleLoader.getString("Perks.Lucky.Bonus", gracefulRollChanceLucky) : ""));
+        }
+
+        if (canDodge) {
+            messages.add(LocaleLoader.getString("Acrobatics.DodgeChance", dodgeChance) + (isLucky ? LocaleLoader.getString("Perks.Lucky.Bonus", dodgeChanceLucky) : ""));
+        }
+
+        return messages;
+    }
+}

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

@@ -1,66 +1,95 @@
-package com.gmail.nossr50.commands.skills;
+package com.gmail.nossr50.commands.skills;
-
+
-import org.bukkit.command.Command;
+import java.util.ArrayList;
-import org.bukkit.command.CommandExecutor;
+import java.util.List;
-import org.bukkit.command.CommandSender;
+
-import org.bukkit.entity.Player;
+import org.bukkit.entity.Player;
-
+
-import com.gmail.nossr50.commands.CommandHelper;
+import com.gmail.nossr50.datatypes.skills.SkillType;
-import com.gmail.nossr50.datatypes.PlayerProfile;
+import com.gmail.nossr50.locale.LocaleLoader;
-import com.gmail.nossr50.datatypes.SkillType;
+import com.gmail.nossr50.skills.archery.Archery;
-import com.gmail.nossr50.locale.mcLocale;
+import com.gmail.nossr50.util.Permissions;
-import com.gmail.nossr50.util.Page;
+
-import com.gmail.nossr50.util.Users;
+public class ArcheryCommand extends SkillCommand {
-import com.gmail.nossr50.util.mcPermissions;
+    private String skillShotBonus;
-
+    private String dazeChance;
-public class ArcheryCommand implements CommandExecutor {
+    private String dazeChanceLucky;
-	@Override
+    private String retrieveChance;
-	public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
+    private String retrieveChanceLucky;
-		if (!(sender instanceof Player)) {
+
-			sender.sendMessage("This command does not support console useage."); //TODO: Needs more locale.
+    private boolean canSkillShot;
-			return true;
+    private boolean canDaze;
-		}
+    private boolean canRetrieve;
-
+
-        if (CommandHelper.noCommandPermissions(sender, "mcmmo.skills.archery")) {
+    public ArcheryCommand() {
-            return true;
+        super(SkillType.ARCHERY);
-        }
+    }
-		Player player = (Player) sender;
+
-		PlayerProfile PP = Users.getProfile(player);
+    @Override
-
+    protected void dataCalculations(Player player, float skillValue, boolean isLucky) {
-		float skillvalue = (float) PP.getSkillLevel(SkillType.ARCHERY);
+        // SKILL SHOT
-		String percentage = String.valueOf((skillvalue / 1000) * 100);
+        if (canSkillShot) {
-		
+            double bonus = (skillValue / Archery.skillShotIncreaseLevel) * Archery.skillShotIncreasePercentage;
-		double dmgBonusPercent = ((PP.getSkillLevel(SkillType.ARCHERY) / 50) * 0.1D);
+            skillShotBonus = percent.format(Math.min(bonus, Archery.skillShotMaxBonusPercentage));
-        
+        }
-        /* Cap maximum bonus at 200% */
+
-        if(dmgBonusPercent > 2)
+        // DAZE
-            dmgBonusPercent = 2;
+        if (canDaze) {
-        
+            String[] dazeStrings = calculateAbilityDisplayValues(skillValue, Archery.dazeMaxBonusLevel, Archery.dazeMaxBonus, isLucky);
-        dmgBonusPercent = dmgBonusPercent * 100; //Convert to percentage
+            dazeChance = dazeStrings[0];
-
+            dazeChanceLucky = dazeStrings[1];
-		String percentagedaze;
+        }
-		if (PP.getSkillLevel(SkillType.ARCHERY) < 1000)
+
-			percentagedaze = String.valueOf((skillvalue / 2000) * 100);
+        // RETRIEVE
-		else
+        if (canRetrieve) {
-			percentagedaze = "50";
+            String[] retrieveStrings = calculateAbilityDisplayValues(skillValue, Archery.retrieveMaxBonusLevel, Archery.retrieveMaxChance, isLucky);
-
+            retrieveChance = retrieveStrings[0];
-		player.sendMessage(mcLocale.getString("m.SkillHeader", new Object[] { mcLocale.getString("m.SkillArchery") }));
+            retrieveChanceLucky = retrieveStrings[1];
-		player.sendMessage(mcLocale.getString("m.XPGain", new Object[] { mcLocale.getString("m.XPGainArchery") }));
+        }
-
+    }
-		if (mcPermissions.getInstance().archery(player))
+
-			player.sendMessage(mcLocale.getString("m.LVL", new Object[] { PP.getSkillLevel(SkillType.ARCHERY), PP.getSkillXpLevel(SkillType.ARCHERY), PP.getXpToLevel(SkillType.ARCHERY) }));
+    @Override
-
+    protected void permissionsCheck(Player player) {
-		player.sendMessage(mcLocale.getString("m.SkillHeader", new Object[] { mcLocale.getString("m.Effects") }));
+        canSkillShot = Permissions.bonusDamage(player, skill);
-		player.sendMessage(mcLocale.getString("m.EffectsTemplate", new Object[] { mcLocale.getString("m.EffectsArchery1_0"), mcLocale.getString("m.EffectsArchery1_1") }));
+        canDaze = Permissions.daze(player);
-		player.sendMessage(mcLocale.getString("m.EffectsTemplate", new Object[] { mcLocale.getString("m.EffectsArchery2_0"), mcLocale.getString("m.EffectsArchery2_1") }));
+        canRetrieve = Permissions.arrowRetrieval(player);
-		player.sendMessage(mcLocale.getString("m.EffectsTemplate", new Object[] { mcLocale.getString("m.EffectsArchery4_0"), mcLocale.getString("m.EffectsArchery4_1") }));
+    }
-		player.sendMessage(mcLocale.getString("m.SkillHeader", new Object[] { mcLocale.getString("m.YourStats") }));
+
-		player.sendMessage(mcLocale.getString("m.ArcherySkillShot", new Object[] { dmgBonusPercent }));
+    @Override
-		player.sendMessage(mcLocale.getString("m.ArcheryDazeChance", new Object[] { percentagedaze }));
+    protected List<String> effectsDisplay() {
-		player.sendMessage(mcLocale.getString("m.ArcheryRetrieveChance", new Object[] { percentage }));
+        List<String> messages = new ArrayList<String>();
-		
+
-		Page.grabGuidePageForSkill(SkillType.ARCHERY, player, args);
+        if (canSkillShot) {
-
+            messages.add(LocaleLoader.getString("Effects.Template", LocaleLoader.getString("Archery.Effect.0"), LocaleLoader.getString("Archery.Effect.1")));
-		return true;
+        }
-	}
+
-}
+        if (canDaze) {
+            messages.add(LocaleLoader.getString("Effects.Template", LocaleLoader.getString("Archery.Effect.2"), LocaleLoader.getString("Archery.Effect.3", Archery.dazeModifier)));
+        }
+
+        if (canRetrieve) {
+            messages.add(LocaleLoader.getString("Effects.Template", LocaleLoader.getString("Archery.Effect.4"), LocaleLoader.getString("Archery.Effect.5")));
+        }
+
+        return messages;
+    }
+
+    @Override
+    protected List<String> statsDisplay(Player player, float skillValue, boolean hasEndurance, boolean isLucky) {
+        List<String> messages = new ArrayList<String>();
+
+        if (canSkillShot) {
+            messages.add(LocaleLoader.getString("Archery.Combat.SkillshotBonus", skillShotBonus));
+        }
+
+        if (canDaze) {
+            messages.add(LocaleLoader.getString("Archery.Combat.DazeChance", dazeChance) + (isLucky ? LocaleLoader.getString("Perks.Lucky.Bonus", dazeChanceLucky) : ""));
+        }
+
+        if (canRetrieve) {
+            messages.add(LocaleLoader.getString("Archery.Combat.RetrieveChance", retrieveChance) + (isLucky ? LocaleLoader.getString("Perks.Lucky.Bonus", retrieveChanceLucky) : ""));
+        }
+
+        return messages;
+    }
+}

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

@@ -1,72 +1,120 @@
-package com.gmail.nossr50.commands.skills;
+package com.gmail.nossr50.commands.skills;
-
+
-import org.bukkit.command.Command;
+import java.util.ArrayList;
-import org.bukkit.command.CommandExecutor;
+import java.util.List;
-import org.bukkit.command.CommandSender;
+
-import org.bukkit.entity.Player;
+import org.bukkit.entity.Player;
-
+
-import com.gmail.nossr50.commands.CommandHelper;
+import com.gmail.nossr50.datatypes.skills.SkillType;
-import com.gmail.nossr50.datatypes.PlayerProfile;
+import com.gmail.nossr50.locale.LocaleLoader;
-import com.gmail.nossr50.datatypes.SkillType;
+import com.gmail.nossr50.skills.axes.Axes;
-import com.gmail.nossr50.locale.mcLocale;
+import com.gmail.nossr50.util.Permissions;
-import com.gmail.nossr50.util.Users;
+
-import com.gmail.nossr50.util.mcPermissions;
+public class AxesCommand extends SkillCommand {
-
+    private String critChance;
-public class AxesCommand implements CommandExecutor {
+    private String critChanceLucky;
-	@Override
+    private double bonusDamage;
-	public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
+    private double impactDamage;
-		if (!(sender instanceof Player)) {
+    private String skullSplitterLength;
-			sender.sendMessage("This command does not support console useage."); //TODO: Needs more locale.
+    private String skullSplitterLengthEndurance;
-			return true;
+
-		}
+    private boolean canSkullSplitter;
-
+    private boolean canCritical;
-        if (CommandHelper.noCommandPermissions(sender, "mcmmo.skills.axes")) {
+    private boolean canBonusDamage;
-            return true;
+    private boolean canImpact;
-        }
+    private boolean canGreaterImpact;
-		Player player = (Player) sender;
+
-		PlayerProfile PP = Users.getProfile(player);
+    public AxesCommand() {
-
+        super(SkillType.AXES);
-		String percentage;
+    }
-
+
-		float skillvalue = (float) PP.getSkillLevel(SkillType.AXES);
+    @Override
-		if (PP.getSkillLevel(SkillType.AXES) < 750)
+    protected void dataCalculations(Player player, float skillValue, boolean isLucky) {
-			percentage = String.valueOf((skillvalue / 2000) * 100);
+        // IMPACT
-		else
+        if (canImpact) {
-			percentage = "37.5";
+            impactDamage = 1 + (skillValue / Axes.impactIncreaseLevel);
-		
+        }
-		int bonusDmg = Users.getProfile(player).getSkillLevel(SkillType.AXES)/50;
+
-		if(bonusDmg > 4)
+        // SKULL SPLITTER
-		    bonusDmg = 4;
+        if (canSkullSplitter) {
-
+            String[] skullSplitterStrings = calculateLengthDisplayValues(player, skillValue);
-		int ticks = 2;
+            skullSplitterLength = skullSplitterStrings[0];
-		short durDmg = 5;
+            skullSplitterLengthEndurance = skullSplitterStrings[1];
-		durDmg+=Users.getProfile(player).getSkillLevel(SkillType.AXES)/30;
+        }
-		int x = PP.getSkillLevel(SkillType.AXES);
+
-		while (x >= 50) {
+        // CRITICAL STRIKES
-			x -= 50;
+        if (canCritical) {
-			ticks++;
+            String[] criticalStrikeStrings = calculateAbilityDisplayValues(skillValue, Axes.criticalHitMaxBonusLevel, Axes.criticalHitMaxChance, isLucky);
-		}
+            critChance = criticalStrikeStrings[0];
-
+            critChanceLucky = criticalStrikeStrings[1];
-		player.sendMessage(mcLocale.getString("m.SkillHeader", new Object[] { mcLocale.getString("m.SkillAxes") }));
+        }
-		player.sendMessage(mcLocale.getString("m.XPGain", new Object[] { mcLocale.getString("m.XPGainAxes") }));
+
-
+        // AXE MASTERY
-		if (mcPermissions.getInstance().axes(player))
+        if (canBonusDamage) {
-			player.sendMessage(mcLocale.getString("m.LVL", new Object[] { PP.getSkillLevel(SkillType.AXES), PP.getSkillXpLevel(SkillType.AXES), PP.getXpToLevel(SkillType.AXES) }));
+            bonusDamage = Math.min(skillValue / (Axes.bonusDamageMaxBonusLevel / Axes.bonusDamageMaxBonus), Axes.bonusDamageMaxBonus);
-
+        }
-		player.sendMessage(mcLocale.getString("m.SkillHeader", new Object[] { mcLocale.getString("m.Effects") }));
+    }
-		player.sendMessage(mcLocale.getString("m.EffectsTemplate", new Object[] { mcLocale.getString("m.EffectsAxes1_0"), mcLocale.getString("m.EffectsAxes1_1") }));
+
-		player.sendMessage(mcLocale.getString("m.EffectsTemplate", new Object[] { mcLocale.getString("m.EffectsAxes2_0"), mcLocale.getString("m.EffectsAxes2_1") }));
+    @Override
-		player.sendMessage(mcLocale.getString("m.EffectsTemplate", new Object[] { mcLocale.getString("m.EffectsAxes3_0"), mcLocale.getString("m.EffectsAxes3_1") }));
+    protected void permissionsCheck(Player player) {
-		player.sendMessage(mcLocale.getString("m.EffectsTemplate", new Object[] { mcLocale.getString("m.EffectsAxes4_0"), mcLocale.getString("m.EffectsAxes4_1") }));
+        canSkullSplitter = Permissions.skullSplitter(player);
-        player.sendMessage(mcLocale.getString("m.EffectsTemplate", new Object[] { mcLocale.getString("m.EffectsAxes5_0"), mcLocale.getString("m.EffectsAxes5_1") }));
+        canCritical = Permissions.criticalStrikes(player);
-		player.sendMessage(mcLocale.getString("m.SkillHeader", new Object[] { mcLocale.getString("m.YourStats") }));
+        canBonusDamage = Permissions.bonusDamage(player, skill);
-		player.sendMessage(mcLocale.getString("m.AxesCritChance", new Object[] { percentage }));
+        canImpact = Permissions.armorImpact(player);
-		
+        canGreaterImpact = Permissions.greaterImpact(player);
-		player.sendMessage(mcLocale.getString("m.AbilityBonusTemplate", new Object[] { mcLocale.getString("m.AbilBonusAxes1_0"), mcLocale.getString("m.AbilBonusAxes1_1", new Object[] {bonusDmg}) }));
+    }
-        player.sendMessage(mcLocale.getString("m.AbilityBonusTemplate", new Object[] { mcLocale.getString("m.AbilBonusAxes2_0"), mcLocale.getString("m.AbilBonusAxes2_1", new Object[] {durDmg}) }));
+
-        player.sendMessage(mcLocale.getString("m.AbilityBonusTemplate", new Object[] { mcLocale.getString("m.AbilBonusAxes3_0"), mcLocale.getString("m.AbilBonusAxes3_1", new Object[] {2}) }));
+    @Override
-        player.sendMessage(mcLocale.getString("m.AxesSkullLength", new Object[] { ticks }));
+    protected List<String> effectsDisplay() {
-
+        List<String> messages = new ArrayList<String>();
-		return true;
+
-	}
+        if (canSkullSplitter) {
-}
+            messages.add(LocaleLoader.getString("Effects.Template", LocaleLoader.getString("Axes.Effect.0"), LocaleLoader.getString("Axes.Effect.1")));
+        }
+
+        if (canCritical) {
+            messages.add(LocaleLoader.getString("Effects.Template", LocaleLoader.getString("Axes.Effect.2"), LocaleLoader.getString("Axes.Effect.3")));
+        }
+
+        if (canBonusDamage) {
+            messages.add(LocaleLoader.getString("Effects.Template", LocaleLoader.getString("Axes.Effect.4"), LocaleLoader.getString("Axes.Effect.5")));
+        }
+
+        if (canImpact) {
+            messages.add(LocaleLoader.getString("Effects.Template", LocaleLoader.getString("Axes.Effect.6"), LocaleLoader.getString("Axes.Effect.7")));
+        }
+
+        if (canGreaterImpact) {
+            messages.add(LocaleLoader.getString("Effects.Template", LocaleLoader.getString("Axes.Effect.8"), LocaleLoader.getString("Axes.Effect.9")));
+        }
+
+        return messages;
+    }
+
+    @Override
+    protected List<String> statsDisplay(Player player, float skillValue, boolean hasEndurance, boolean isLucky) {
+        List<String> messages = new ArrayList<String>();
+
+        if (canBonusDamage) {
+            messages.add(LocaleLoader.getString("Ability.Generic.Template", LocaleLoader.getString("Axes.Ability.Bonus.0"), LocaleLoader.getString("Axes.Ability.Bonus.1", bonusDamage)));
+        }
+
+        if (canImpact) {
+            messages.add(LocaleLoader.getString("Ability.Generic.Template", LocaleLoader.getString("Axes.Ability.Bonus.2"), LocaleLoader.getString("Axes.Ability.Bonus.3", impactDamage)));
+        }
+
+        if (canGreaterImpact) {
+            messages.add(LocaleLoader.getString("Ability.Generic.Template", LocaleLoader.getString("Axes.Ability.Bonus.4"), LocaleLoader.getString("Axes.Ability.Bonus.5", Axes.greaterImpactBonusDamage)));
+        }
+
+        if (canCritical) {
+            messages.add(LocaleLoader.getString("Axes.Combat.CritChance", critChance) + (isLucky ? LocaleLoader.getString("Perks.Lucky.Bonus", critChanceLucky) : ""));
+        }
+
+        if (canSkullSplitter) {
+            messages.add(LocaleLoader.getString("Axes.Combat.SS.Length", skullSplitterLength) + (hasEndurance ? LocaleLoader.getString("Perks.ActivationTime.Bonus", skullSplitterLengthEndurance) : ""));
+        }
+
+        return messages;
+    }
+}

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

@@ -1,54 +1,64 @@
-package com.gmail.nossr50.commands.skills;
+package com.gmail.nossr50.commands.skills;
-
+
-import org.bukkit.command.Command;
+import java.util.ArrayList;
-import org.bukkit.command.CommandExecutor;
+import java.util.List;
-import org.bukkit.command.CommandSender;
+
-import org.bukkit.entity.Player;
+import org.bukkit.entity.Player;
-
+
-import com.gmail.nossr50.commands.CommandHelper;
+import com.gmail.nossr50.datatypes.skills.SkillType;
-import com.gmail.nossr50.datatypes.PlayerProfile;
+import com.gmail.nossr50.locale.LocaleLoader;
-import com.gmail.nossr50.datatypes.SkillType;
+import com.gmail.nossr50.util.Permissions;
-import com.gmail.nossr50.locale.mcLocale;
+
-import com.gmail.nossr50.util.Page;
+public class ExcavationCommand extends SkillCommand {
-import com.gmail.nossr50.util.Users;
+    private String gigaDrillBreakerLength;
-import com.gmail.nossr50.util.mcPermissions;
+    private String gigaDrillBreakerLengthEndurance;
-
+
-public class ExcavationCommand implements CommandExecutor {
+    private boolean canGigaDrill;
-	@Override
+    private boolean canTreasureHunt;
-	public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
+
-		if (!(sender instanceof Player)) {
+    public ExcavationCommand() {
-			sender.sendMessage("This command does not support console useage."); //TODO: Needs more locale.
+        super(SkillType.EXCAVATION);
-			return true;
+    }
-		}
+
-
+    @Override
-        if (CommandHelper.noCommandPermissions(sender, "mcmmo.skills.excavation")) {
+    protected void dataCalculations(Player player, float skillValue, boolean isLucky) {
-            return true;
+        // GIGA DRILL BREAKER
-        }
+        if (canGigaDrill) {
-		Player player = (Player) sender;
+            String gigaDrillStrings[] = calculateLengthDisplayValues(player, skillValue);
-		PlayerProfile PP = Users.getProfile(player);
+            gigaDrillBreakerLength = gigaDrillStrings[0];
-
+            gigaDrillBreakerLengthEndurance = gigaDrillStrings[1];
-		int ticks = 2;
+        }
-		int x = PP.getSkillLevel(SkillType.EXCAVATION);
+    }
-		while (x >= 50) {
+
-			x -= 50;
+    @Override
-			ticks++;
+    protected void permissionsCheck(Player player) {
-		}
+        canGigaDrill = Permissions.gigaDrillBreaker(player);
-
+        canTreasureHunt = Permissions.excavationTreasureHunter(player);
-		player.sendMessage("");
+    }
-		player.sendMessage(mcLocale.getString("m.SkillHeader", new Object[] { mcLocale.getString("m.SkillExcavation") }));
+
-		player.sendMessage(mcLocale.getString("m.XPGain", new Object[] { mcLocale.getString("m.XPGainExcavation") }));
+    @Override
-
+    protected List<String> effectsDisplay() {
-		if (mcPermissions.getInstance().excavation(player))
+        List<String> messages = new ArrayList<String>();
-			player.sendMessage(mcLocale.getString("m.LVL", new Object[] { PP.getSkillLevel(SkillType.EXCAVATION), PP.getSkillXpLevel(SkillType.EXCAVATION), PP.getXpToLevel(SkillType.EXCAVATION) }));
+
-
+        if (canGigaDrill) {
-		player.sendMessage(mcLocale.getString("m.SkillHeader", new Object[] { mcLocale.getString("m.Effects") }));
+            messages.add(LocaleLoader.getString("Effects.Template", LocaleLoader.getString("Excavation.Effect.0"), LocaleLoader.getString("Excavation.Effect.1")));
-		player.sendMessage(mcLocale.getString("m.EffectsTemplate", new Object[] { mcLocale.getString("m.EffectsExcavation1_0"), mcLocale.getString("m.EffectsExcavation1_1") }));
+        }
-		player.sendMessage(mcLocale.getString("m.EffectsTemplate", new Object[] { mcLocale.getString("m.EffectsExcavation2_0"), mcLocale.getString("m.EffectsExcavation2_1") }));
+
-		player.sendMessage(mcLocale.getString("m.SkillHeader", new Object[] { mcLocale.getString("m.YourStats") }));
+        if (canTreasureHunt) {
-		player.sendMessage(mcLocale.getString("m.ExcavationGigaDrillBreakerLength", new Object[] { ticks }));
+            messages.add(LocaleLoader.getString("Effects.Template", LocaleLoader.getString("Excavation.Effect.2"), LocaleLoader.getString("Excavation.Effect.3")));
-
+        }
-		Page.grabGuidePageForSkill(SkillType.EXCAVATION, player, args);
+
-		
+        return messages;
-		return true;
+    }
-	}
+
-}
+    @Override
+    protected List<String> statsDisplay(Player player, float skillValue, boolean hasEndurance, boolean isLucky) {
+        List<String> messages = new ArrayList<String>();
+
+        if (canGigaDrill) {
+            messages.add(LocaleLoader.getString("Excavation.Effect.Length", gigaDrillBreakerLength) + (hasEndurance ? LocaleLoader.getString("Perks.ActivationTime.Bonus", gigaDrillBreakerLengthEndurance) : ""));
+        }
+
+        return messages;
+    }
+}

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

@@ -1,55 +1,208 @@
-package com.gmail.nossr50.commands.skills;
+package com.gmail.nossr50.commands.skills;
-
+
-import org.bukkit.command.Command;
+import java.util.ArrayList;
-import org.bukkit.command.CommandExecutor;
+import java.util.List;
-import org.bukkit.command.CommandSender;
+
-import org.bukkit.entity.Player;
+import org.bukkit.Location;
-
+import org.bukkit.block.Biome;
-import com.gmail.nossr50.commands.CommandHelper;
+import org.bukkit.entity.EntityType;
-import com.gmail.nossr50.datatypes.PlayerProfile;
+import org.bukkit.entity.Player;
-import com.gmail.nossr50.datatypes.SkillType;
+
-import com.gmail.nossr50.locale.mcLocale;
+import com.gmail.nossr50.config.AdvancedConfig;
-import com.gmail.nossr50.skills.gathering.Fishing;
+import com.gmail.nossr50.config.treasure.TreasureConfig;
-import com.gmail.nossr50.util.Page;
+import com.gmail.nossr50.datatypes.skills.SkillType;
-import com.gmail.nossr50.util.Users;
+import com.gmail.nossr50.datatypes.treasure.Rarity;
-import com.gmail.nossr50.util.mcPermissions;
+import com.gmail.nossr50.locale.LocaleLoader;
-
+import com.gmail.nossr50.skills.fishing.Fishing;
-public class FishingCommand implements CommandExecutor {
+import com.gmail.nossr50.skills.fishing.Fishing.Tier;
-	@Override
+import com.gmail.nossr50.skills.fishing.FishingManager;
-	public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
+import com.gmail.nossr50.util.Permissions;
-		if (!(sender instanceof Player)) {
+import com.gmail.nossr50.util.player.UserManager;
-			sender.sendMessage("This command does not support console useage."); //TODO: Needs more locale.
+
-			return true;
+public class FishingCommand extends SkillCommand {
-		}
+    private int lootTier;
-
+    private String shakeChance;
-        if (CommandHelper.noCommandPermissions(sender, "mcmmo.skills.fishing")) {
+    private String shakeChanceLucky;
-            return true;
+    private int fishermansDietRank;
-        }
+    private String biteChance;
-
+
-		Player player = (Player) sender;
+    private String trapTreasure;
-		PlayerProfile PP = Users.getProfile(player);
+    private String commonTreasure;
-
+    private String uncommonTreasure;
-		player.sendMessage(mcLocale.getString("m.SkillHeader", new Object[] { mcLocale.getString("m.SkillFishing") }));
+    private String rareTreasure;
-		player.sendMessage(mcLocale.getString("m.XPGain", new Object[] { mcLocale.getString("m.XPGainFishing") }));
+    private String epicTreasure;
-
+    private String legendaryTreasure;
-		if (mcPermissions.getInstance().fishing(player))
+    private String recordTreasure;
-			player.sendMessage(mcLocale.getString("m.LVL", new Object[] { PP.getSkillLevel(SkillType.FISHING), PP.getSkillXpLevel(SkillType.FISHING), PP.getXpToLevel(SkillType.FISHING) }));
+
-
+    private String magicChance;
-		player.sendMessage(mcLocale.getString("m.SkillHeader", new Object[] { mcLocale.getString("m.Effects") }));
+
-		player.sendMessage(mcLocale.getString("m.EffectsTemplate", new Object[] { mcLocale.getString("m.EffectsFishing1_0"), mcLocale.getString("m.EffectsFishing1_1") }));
+    private boolean canTreasureHunt;
-		player.sendMessage(mcLocale.getString("m.EffectsTemplate", new Object[] { mcLocale.getString("m.EffectsFishing2_0"), mcLocale.getString("m.EffectsFishing2_1") }));
+    private boolean canMagicHunt;
-		player.sendMessage(mcLocale.getString("m.EffectsTemplate", new Object[] { mcLocale.getString("m.EffectsFishing3_0"), mcLocale.getString("m.EffectsFishing3_1") }));
+    private boolean canShake;
-		player.sendMessage(mcLocale.getString("m.SkillHeader", new Object[] { mcLocale.getString("m.YourStats") }));
+    private boolean canFishermansDiet;
-		player.sendMessage(mcLocale.getString("m.FishingRank", new Object[] { Fishing.getFishingLootTier(PP) }));
+    private boolean canMasterAngler;
-		player.sendMessage(mcLocale.getString("m.FishingMagicInfo"));
+    private boolean canIceFish;
-
+
-		if (PP.getSkillLevel(SkillType.FISHING) < 150)
+    public FishingCommand() {
-			player.sendMessage(mcLocale.getString("m.AbilityLockTemplate", new Object[] { mcLocale.getString("m.AbilLockFishing1") }));
+        super(SkillType.FISHING);
-		else
+    }
-			player.sendMessage(mcLocale.getString("m.ShakeInfo", new Object[] { Fishing.getFishingLootTier(PP) }));
+
-		
+    @Override
-		Page.grabGuidePageForSkill(SkillType.FISHING, player, args);
+    protected void dataCalculations(Player player, float skillValue, boolean isLucky) {
-
+        FishingManager fishingManager = UserManager.getPlayer(player).getFishingManager();
-		return true;
+        boolean isStorming = player.getWorld().hasStorm();
-	}
+
-}
+        // TREASURE HUNTER
+        if (canTreasureHunt) {
+            lootTier = fishingManager.getLootTier();
+
+            // Item drop rates
+            trapTreasure = percent.format(TreasureConfig.getInstance().getItemDropRate(lootTier, Rarity.TRAP) / 100.0);
+            commonTreasure = percent.format(TreasureConfig.getInstance().getItemDropRate(lootTier, Rarity.COMMON) / 100.0);
+            uncommonTreasure = percent.format(TreasureConfig.getInstance().getItemDropRate(lootTier, Rarity.UNCOMMON) / 100.0);
+            rareTreasure = percent.format(TreasureConfig.getInstance().getItemDropRate(lootTier, Rarity.RARE) / 100.0);
+            epicTreasure = percent.format(TreasureConfig.getInstance().getItemDropRate(lootTier, Rarity.EPIC) / 100.0);
+            legendaryTreasure = percent.format(TreasureConfig.getInstance().getItemDropRate(lootTier, Rarity.LEGENDARY) / 100.0);
+            recordTreasure = percent.format(TreasureConfig.getInstance().getItemDropRate(lootTier, Rarity.RECORD) / 100.0);
+
+            // Magic hunter drop rates
+            double totalEnchantChance = 0;
+
+            for (Rarity rarity : Rarity.values()) {
+                if (rarity != Rarity.TRAP || rarity != Rarity.RECORD) {
+                    totalEnchantChance += TreasureConfig.getInstance().getEnchantmentDropRate(lootTier, rarity);
+                }
+            }
+
+            magicChance = percent.format(totalEnchantChance / 100.0);
+        }
+
+        // SHAKE
+        if (canShake) {
+            String[] shakeStrings = calculateAbilityDisplayValues(UserManager.getPlayer(player).getFishingManager().getShakeProbability(), isLucky);
+            shakeChance = shakeStrings[0];
+            shakeChanceLucky = shakeStrings[1];
+        }
+
+        // FISHERMAN'S DIET
+        if (canFishermansDiet) {
+            fishermansDietRank = calculateRank(skillValue, Fishing.fishermansDietMaxLevel, Fishing.fishermansDietRankLevel1);
+        }
+
+        // MASTER ANGLER
+        if (canMasterAngler) {
+            double rawBiteChance = 1.0 / (isStorming ? 300 : 500);
+            Location location = fishingManager.getHookLocation();
+
+            if (location == null) {
+                location = player.getLocation();
+            }
+
+            Biome biome = location.getBlock().getBiome();
+
+            if (biome == Biome.RIVER || biome == Biome.OCEAN) {
+                rawBiteChance = rawBiteChance * AdvancedConfig.getInstance().getMasterAnglerBiomeModifier();
+            }
+
+            if (player.isInsideVehicle() && player.getVehicle().getType() == EntityType.BOAT) {
+                rawBiteChance = rawBiteChance * AdvancedConfig.getInstance().getMasterAnglerBoatModifier();
+            }
+
+            biteChance = calculateAbilityDisplayValues(rawBiteChance * 100.0, isLucky)[0];
+        }
+    }
+
+    @Override
+    protected void permissionsCheck(Player player) {
+        canTreasureHunt = Permissions.fishingTreasureHunter(player);
+        canMagicHunt = Permissions.magicHunter(player);
+        canShake = Permissions.shake(player);
+        canFishermansDiet = Permissions.fishermansDiet(player);
+        canMasterAngler = Permissions.masterAngler(player);
+        canIceFish = Permissions.iceFishing(player);
+    }
+
+    @Override
+    protected List<String> effectsDisplay() {
+        List<String> messages = new ArrayList<String>();
+
+        if (canTreasureHunt) {
+            messages.add(LocaleLoader.getString("Effects.Template", LocaleLoader.getString("Fishing.Effect.0"), LocaleLoader.getString("Fishing.Effect.1")));
+        }
+
+        if (canMagicHunt) {
+            messages.add(LocaleLoader.getString("Effects.Template", LocaleLoader.getString("Fishing.Effect.2"), LocaleLoader.getString("Fishing.Effect.3")));
+        }
+
+        if (canIceFish) {
+            messages.add(LocaleLoader.getString("Effects.Template", LocaleLoader.getString("Fishing.Effect.10"), LocaleLoader.getString("Fishing.Effect.11")));
+        }
+
+        if (canMasterAngler) {
+            messages.add(LocaleLoader.getString("Effects.Template", LocaleLoader.getString("Fishing.Effect.8"), LocaleLoader.getString("Fishing.Effect.9")));
+        }
+
+        if (canShake) {
+            messages.add(LocaleLoader.getString("Effects.Template", LocaleLoader.getString("Fishing.Effect.4"), LocaleLoader.getString("Fishing.Effect.5")));
+        }
+
+        if (canFishermansDiet) {
+            messages.add(LocaleLoader.getString("Effects.Template", LocaleLoader.getString("Fishing.Effect.6"), LocaleLoader.getString("Fishing.Effect.7")));
+        }
+
+        return messages;
+    }
+
+    @Override
+    protected List<String> statsDisplay(Player player, float skillValue, boolean hasEndurance, boolean isLucky) {
+        List<String> messages = new ArrayList<String>();
+
+        if (canTreasureHunt) {
+            messages.add(LocaleLoader.getString("Fishing.Ability.Rank", lootTier, Tier.EIGHT.toNumerical()));
+            messages.add(LocaleLoader.getString("Fishing.Ability.TH.DropRate", trapTreasure, commonTreasure, uncommonTreasure, rareTreasure, epicTreasure, legendaryTreasure, recordTreasure));
+        }
+
+        if (canMagicHunt) {
+            messages.add(LocaleLoader.getString("Fishing.Ability.TH.MagicRate", magicChance));
+        }
+
+        if (canIceFish) {
+            int unlockLevel = AdvancedConfig.getInstance().getIceFishingUnlockLevel();
+
+            if (skillValue < unlockLevel) {
+                messages.add(LocaleLoader.getString("Ability.Generic.Template.Lock", LocaleLoader.getString("Fishing.Ability.Locked.1", unlockLevel)));
+            }
+            else {
+                messages.add(LocaleLoader.getString("Fishing.Ability.IceFishing"));
+            }
+        }
+
+        if (canMasterAngler) {
+            int unlockLevel = AdvancedConfig.getInstance().getMasterAnglerUnlockLevel();
+
+            if (skillValue < unlockLevel) {
+                messages.add(LocaleLoader.getString("Ability.Generic.Template.Lock", LocaleLoader.getString("Fishing.Ability.Locked.2", unlockLevel)));
+            }
+            else {
+                messages.add(LocaleLoader.getString("Fishing.Ability.Chance", biteChance));
+            }
+        }
+
+        if (canShake) {
+            int unlockLevel = AdvancedConfig.getInstance().getFishingTierLevel(Tier.ONE);
+
+            if (skillValue < unlockLevel) {
+                messages.add(LocaleLoader.getString("Ability.Generic.Template.Lock", LocaleLoader.getString("Fishing.Ability.Locked.0", unlockLevel)));
+            }
+            else {
+                messages.add(LocaleLoader.getString("Fishing.Ability.Shake", shakeChance) + (isLucky ? LocaleLoader.getString("Perks.Lucky.Bonus", shakeChanceLucky) : ""));
+            }
+        }
+
+        if (canFishermansDiet) {
+            messages.add(LocaleLoader.getString("Fishing.Ability.FD", fishermansDietRank));
+        }
+
+        return messages;
+    }
+}

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

@@ -1,77 +1,165 @@
-package com.gmail.nossr50.commands.skills;
+package com.gmail.nossr50.commands.skills;
-
+
-import org.bukkit.command.Command;
+import java.util.ArrayList;
-import org.bukkit.command.CommandExecutor;
+import java.util.List;
-import org.bukkit.command.CommandSender;
+
-import org.bukkit.entity.Player;
+import org.bukkit.Material;
-
+import org.bukkit.entity.Player;
-import com.gmail.nossr50.commands.CommandHelper;
+
-import com.gmail.nossr50.datatypes.PlayerProfile;
+import com.gmail.nossr50.datatypes.skills.SkillType;
-import com.gmail.nossr50.datatypes.SkillType;
+import com.gmail.nossr50.locale.LocaleLoader;
-import com.gmail.nossr50.locale.mcLocale;
+import com.gmail.nossr50.skills.herbalism.Herbalism;
-import com.gmail.nossr50.util.Page;
+import com.gmail.nossr50.util.Permissions;
-import com.gmail.nossr50.util.Users;
+
-import com.gmail.nossr50.util.mcPermissions;
+public class HerbalismCommand extends SkillCommand {
-
+    private String greenTerraLength;
-public class HerbalismCommand implements CommandExecutor {
+    private String greenTerraLengthEndurance;
-	@Override
+    private String greenThumbChance;
-	public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
+    private String greenThumbChanceLucky;
-		if (!(sender instanceof Player)) {
+    private int greenThumbStage;
-			sender.sendMessage("This command does not support console useage."); //TODO: Needs more locale.
+    private int farmersDietRank;
-			return true;
+    private String doubleDropChance;
-		}
+    private String doubleDropChanceLucky;
-
+    private String hylianLuckChance;
-        if (CommandHelper.noCommandPermissions(sender, "mcmmo.skills.herbalism")) {
+    private String hylianLuckChanceLucky;
-            return true;
+    private String shroomThumbChance;
-        }
+    private String shroomThumbChanceLucky;
-        
+
-		Player player = (Player) sender;
+    private boolean hasHylianLuck;
-		PlayerProfile PP = Users.getProfile(player);
+    private boolean canGreenTerra;
-
+    private boolean canGreenThumbPlants;
-		int bonus = 0;
+    private boolean canGreenThumbBlocks;
-		if (PP.getSkillLevel(SkillType.HERBALISM) >= 200)
+    private boolean canFarmersDiet;
-			bonus++;
+    private boolean canDoubleDrop;
-		if (PP.getSkillLevel(SkillType.HERBALISM) >= 400)
+    private boolean canShroomThumb;
-			bonus++;
+
-		if (PP.getSkillLevel(SkillType.HERBALISM) >= 600)
+    public HerbalismCommand() {
-			bonus++;
+        super(SkillType.HERBALISM);
-		if (PP.getSkillLevel(SkillType.HERBALISM) >= 800)
+    }
-			bonus++;
+
-		if (PP.getSkillLevel(SkillType.HERBALISM) >= 1000)
+    @Override
-			bonus++;
+    protected void dataCalculations(Player player, float skillValue, boolean isLucky) {
-
+        // GREEN TERRA
-		int ticks = 2;
+        if (canGreenTerra) {
-		int x = PP.getSkillLevel(SkillType.HERBALISM);
+            String[] greenTerraStrings = calculateLengthDisplayValues(player, skillValue);
-		while (x >= 50) {
+            greenTerraLength = greenTerraStrings[0];
-			x -= 50;
+            greenTerraLengthEndurance = greenTerraStrings[1];
-			ticks++;
+        }
-		}
+
-
+        // FARMERS DIET
-		float skillvalue = (float) PP.getSkillLevel(SkillType.HERBALISM);
+        if (canFarmersDiet) {
-
+            farmersDietRank = calculateRank(skillValue, Herbalism.farmersDietMaxLevel, Herbalism.farmersDietRankLevel1);
-		String percentage = String.valueOf((skillvalue / 1000) * 100);
+        }
-		String gpercentage = String.valueOf((skillvalue / 1500) * 100);
+
-		player.sendMessage(mcLocale.getString("m.SkillHeader", new Object[] { mcLocale.getString("m.SkillHerbalism") }));
+        // GREEN THUMB
-		player.sendMessage(mcLocale.getString("m.XPGain", new Object[] { mcLocale.getString("m.XPGainHerbalism") }));
+        if (canGreenThumbBlocks || canGreenThumbPlants) {
-
+            greenThumbStage = calculateRank(skillValue, Herbalism.greenThumbStageMaxLevel, Herbalism.greenThumbStageChangeLevel);
-		if (mcPermissions.getInstance().herbalism(player))
+
-			player.sendMessage(mcLocale.getString("m.LVL", new Object[] { PP.getSkillLevel(SkillType.HERBALISM), PP.getSkillXpLevel(SkillType.HERBALISM), PP.getXpToLevel(SkillType.HERBALISM) }));
+            String[] greenThumbStrings = calculateAbilityDisplayValues(skillValue, Herbalism.greenThumbMaxLevel, Herbalism.greenThumbMaxChance, isLucky);
-
+            greenThumbChance = greenThumbStrings[0];
-		player.sendMessage(mcLocale.getString("m.SkillHeader", new Object[] { mcLocale.getString("m.Effects") }));
+            greenThumbChanceLucky = greenThumbStrings[1];
-		player.sendMessage(mcLocale.getString("m.EffectsTemplate", new Object[] { mcLocale.getString("m.EffectsHerbalism1_0"), mcLocale.getString("m.EffectsHerbalism1_1") }));
+        }
-		player.sendMessage(mcLocale.getString("m.EffectsTemplate", new Object[] { mcLocale.getString("m.EffectsHerbalism2_0"), mcLocale.getString("m.EffectsHerbalism2_1") }));
+
-		player.sendMessage(mcLocale.getString("m.EffectsTemplate", new Object[] { mcLocale.getString("m.EffectsHerbalism3_0"), mcLocale.getString("m.EffectsHerbalism3_1") }));
+        // DOUBLE DROPS
-		player.sendMessage(mcLocale.getString("m.EffectsTemplate", new Object[] { mcLocale.getString("m.EffectsHerbalism4_0"), mcLocale.getString("m.EffectsHerbalism4_1") }));
+        if (canDoubleDrop) {
-		player.sendMessage(mcLocale.getString("m.EffectsTemplate", new Object[] { mcLocale.getString("m.EffectsHerbalism5_0"), mcLocale.getString("m.EffectsHerbalism5_1") }));
+            String[] doubleDropStrings = calculateAbilityDisplayValues(skillValue, Herbalism.doubleDropsMaxLevel, Herbalism.doubleDropsMaxChance, isLucky);
-		player.sendMessage(mcLocale.getString("m.SkillHeader", new Object[] { mcLocale.getString("m.YourStats") }));
+            doubleDropChance = doubleDropStrings[0];
-		player.sendMessage(mcLocale.getString("m.HerbalismGreenTerraLength", new Object[] { ticks }));
+            doubleDropChanceLucky = doubleDropStrings[1];
-		player.sendMessage(mcLocale.getString("m.HerbalismGreenThumbChance", new Object[] { gpercentage }));
+        }
-		player.sendMessage(mcLocale.getString("m.HerbalismGreenThumbStage", new Object[] { bonus }));
+
-		player.sendMessage(mcLocale.getString("m.HerbalismFoodPlus", new Object[] { bonus } ));
+        // HYLIAN LUCK
-		player.sendMessage(mcLocale.getString("m.HerbalismDoubleDropChance", new Object[] { percentage }));
+        if (hasHylianLuck) {
-		
+            String[] hylianLuckStrings = calculateAbilityDisplayValues(skillValue, Herbalism.hylianLuckMaxLevel, Herbalism.hylianLuckMaxChance, isLucky);
-		Page.grabGuidePageForSkill(SkillType.HERBALISM, player, args);
+            hylianLuckChance = hylianLuckStrings[0];
-
+            hylianLuckChanceLucky = hylianLuckStrings[1];
-		return true;
+        }
-	}
+
-}
+        // SHROOM THUMB
+        if (canShroomThumb) {
+            String[] shroomThumbStrings = calculateAbilityDisplayValues(skillValue, Herbalism.shroomThumbMaxLevel, Herbalism.shroomThumbMaxChance, isLucky);
+            shroomThumbChance = shroomThumbStrings[0];
+            shroomThumbChanceLucky = shroomThumbStrings[1];
+        }
+    }
+
+    @Override
+    protected void permissionsCheck(Player player) {
+        hasHylianLuck = Permissions.hylianLuck(player);
+        canGreenTerra = Permissions.greenTerra(player);
+        canGreenThumbPlants = Permissions.greenThumbPlant(player, Material.CROPS) || Permissions.greenThumbPlant(player, Material.CARROT) || Permissions.greenThumbPlant(player, Material.POTATO) || Permissions.greenThumbPlant(player, Material.NETHER_WARTS) || Permissions.greenThumbPlant(player, Material.COCOA);
+        canGreenThumbBlocks = Permissions.greenThumbBlock(player, Material.DIRT) || Permissions.greenThumbBlock(player, Material.COBBLESTONE) || Permissions.greenThumbBlock(player, Material.COBBLE_WALL) || Permissions.greenThumbBlock(player, Material.SMOOTH_BRICK);
+        canFarmersDiet = Permissions.farmersDiet(player);
+        canDoubleDrop = Permissions.doubleDrops(player, skill) && !skill.getDoubleDropsDisabled();
+        canShroomThumb = Permissions.shroomThumb(player);
+    }
+
+    @Override
+    protected List<String> effectsDisplay() {
+        List<String> messages = new ArrayList<String>();
+
+        if (canGreenTerra) {
+            messages.add(LocaleLoader.getString("Effects.Template", LocaleLoader.getString("Herbalism.Effect.0"), LocaleLoader.getString("Herbalism.Effect.1")));
+        }
+
+        if (canGreenThumbPlants) {
+            messages.add(LocaleLoader.getString("Effects.Template", LocaleLoader.getString("Herbalism.Effect.2"), LocaleLoader.getString("Herbalism.Effect.3")));
+        }
+
+        if (canGreenThumbBlocks) {
+            messages.add(LocaleLoader.getString("Effects.Template", LocaleLoader.getString("Herbalism.Effect.4"), LocaleLoader.getString("Herbalism.Effect.5")));
+        }
+
+        if (canFarmersDiet) {
+            messages.add(LocaleLoader.getString("Effects.Template", LocaleLoader.getString("Herbalism.Effect.6"), LocaleLoader.getString("Herbalism.Effect.7")));
+        }
+
+        if (hasHylianLuck) {
+            messages.add(LocaleLoader.getString("Effects.Template", LocaleLoader.getString("Herbalism.Effect.10"), LocaleLoader.getString("Herbalism.Effect.11")));
+        }
+
+        if (canShroomThumb) {
+            messages.add(LocaleLoader.getString("Effects.Template", LocaleLoader.getString("Herbalism.Effect.12"), LocaleLoader.getString("Herbalism.Effect.13")));
+        }
+
+        if (canDoubleDrop) {
+            messages.add(LocaleLoader.getString("Effects.Template", LocaleLoader.getString("Herbalism.Effect.8"), LocaleLoader.getString("Herbalism.Effect.9")));
+        }
+
+        return messages;
+    }
+
+    @Override
+    protected List<String> statsDisplay(Player player, float skillValue, boolean hasEndurance, boolean isLucky) {
+        List<String> messages = new ArrayList<String>();
+
+        if (canGreenTerra) {
+            messages.add(LocaleLoader.getString("Herbalism.Ability.GTe.Length", greenTerraLength) + (hasEndurance ? LocaleLoader.getString("Perks.ActivationTime.Bonus", greenTerraLengthEndurance) : ""));
+        }
+
+        if (canGreenThumbBlocks || canGreenThumbPlants) {
+            messages.add(LocaleLoader.getString("Herbalism.Ability.GTh.Chance", greenThumbChance) + (isLucky ? LocaleLoader.getString("Perks.Lucky.Bonus", greenThumbChanceLucky) : ""));
+        }
+
+        if (canGreenThumbPlants) {
+            messages.add(LocaleLoader.getString("Herbalism.Ability.GTh.Stage", greenThumbStage));
+        }
+
+        if (canFarmersDiet) {
+            messages.add(LocaleLoader.getString("Herbalism.Ability.FD", farmersDietRank));
+        }
+
+        if (hasHylianLuck) {
+            messages.add(LocaleLoader.getString("Herbalism.Ability.HylianLuck", hylianLuckChance) + (isLucky ? LocaleLoader.getString("Perks.Lucky.Bonus", hylianLuckChanceLucky) : ""));
+        }
+
+        if (canShroomThumb) {
+            messages.add(LocaleLoader.getString("Herbalism.Ability.ShroomThumb.Chance", shroomThumbChance) + (isLucky ? LocaleLoader.getString("Perks.Lucky.Bonus", shroomThumbChanceLucky) : ""));
+        }
+
+        if (canDoubleDrop) {
+            messages.add(LocaleLoader.getString("Herbalism.Ability.DoubleDropChance", doubleDropChance) + (isLucky ? LocaleLoader.getString("Perks.Lucky.Bonus", doubleDropChanceLucky) : ""));
+        }
+
+        return messages;
+    }
+}

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

@@ -1,137 +1,152 @@
-package com.gmail.nossr50.commands.skills;
+package com.gmail.nossr50.commands.skills;
-
+
-import org.bukkit.command.Command;
+import java.util.ArrayList;
-import org.bukkit.command.CommandExecutor;
+import java.util.List;
-import org.bukkit.command.CommandSender;
+
-import org.bukkit.entity.Player;
+import org.bukkit.entity.Player;
-
+
-import com.gmail.nossr50.commands.CommandHelper;
+import com.gmail.nossr50.config.AdvancedConfig;
-import com.gmail.nossr50.datatypes.PlayerProfile;
+import com.gmail.nossr50.datatypes.skills.SkillType;
-import com.gmail.nossr50.datatypes.SkillType;
+import com.gmail.nossr50.locale.LocaleLoader;
-import com.gmail.nossr50.locale.mcLocale;
+import com.gmail.nossr50.skills.mining.BlastMining.Tier;
-import com.gmail.nossr50.util.Page;
+import com.gmail.nossr50.skills.mining.Mining;
-import com.gmail.nossr50.util.Users;
+import com.gmail.nossr50.skills.mining.MiningManager;
-import com.gmail.nossr50.util.mcPermissions;
+import com.gmail.nossr50.util.Permissions;
-
+import com.gmail.nossr50.util.player.UserManager;
-public class MiningCommand implements CommandExecutor {
+
-	@Override
+public class MiningCommand extends SkillCommand {
-	public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
+    private String doubleDropChance;
-		if (!(sender instanceof Player)) {
+    private String doubleDropChanceLucky;
-			sender.sendMessage("This command does not support console useage."); //TODO: Needs more locale.
+    private String superBreakerLength;
-			return true;
+    private String superBreakerLengthEndurance;
-		}
+
-
+    private int blastMiningRank;
-        if (CommandHelper.noCommandPermissions(sender, "mcmmo.skills.mining")) {
+    private int bonusTNTDrops;
-            return true;
+    private double blastRadiusIncrease;
-        }
+    private String oreBonus;
-        
+    private String debrisReduction;
-		Player player = (Player) sender;
+    private String blastDamageDecrease;
-		PlayerProfile PP = Users.getProfile(player);
+
-
+    private boolean canSuperBreaker;
-		float skillvalue = (float) PP.getSkillLevel(SkillType.MINING);
+    private boolean canDoubleDrop;
-		String percentage = String.valueOf((skillvalue / 1000) * 100);
+    private boolean canBlast;
-		int ticks = 2;
+    private boolean canBiggerBombs;
-		int x = PP.getSkillLevel(SkillType.MINING);
+    private boolean canDemoExpert;
-		while (x >= 50) {
+
-			x -= 50;
+    public MiningCommand() {
-			ticks++;
+        super(SkillType.MINING);
-		}
+    }
-		
+
-		int rank = 0;
+    @Override
-		int damage = 0;
+    protected void dataCalculations(Player player, float skillValue, boolean isLucky) {
-		int radius = 0;
+        // SUPER BREAKER
-		if(PP.getSkillLevel(SkillType.MINING) >= 125 && PP.getSkillLevel(SkillType.MINING) < 250)
+        if (canSuperBreaker) {
-			rank = 1;
+            String[] superBreakerStrings = calculateLengthDisplayValues(player, skillValue);
-		if(PP.getSkillLevel(SkillType.MINING) >= 250 && PP.getSkillLevel(SkillType.MINING) < 375){
+            superBreakerLength = superBreakerStrings[0];
-			rank = 2;
+            superBreakerLengthEndurance = superBreakerStrings[1];
-			radius = 1;
+        }
-		}
+
-		if(PP.getSkillLevel(SkillType.MINING) >= 375 && PP.getSkillLevel(SkillType.MINING) < 500){
+        // DOUBLE DROPS
-			rank = 3;
+        if (canDoubleDrop) {
-			radius = 1;
+            String[] doubleDropStrings = calculateAbilityDisplayValues(skillValue, Mining.doubleDropsMaxLevel, Mining.doubleDropsMaxChance, isLucky);
-		}
+            doubleDropChance = doubleDropStrings[0];
-		if(PP.getSkillLevel(SkillType.MINING) >= 500 && PP.getSkillLevel(SkillType.MINING) < 625){
+            doubleDropChanceLucky = doubleDropStrings[1];
-			rank = 4;
+        }
-			damage = 25;
+
-			radius = 2;
+        // BLAST MINING
-		}
+        if (canBlast || canDemoExpert || canBiggerBombs) {
-		if(PP.getSkillLevel(SkillType.MINING) >= 625 && PP.getSkillLevel(SkillType.MINING) < 750){
+            MiningManager miningManager = UserManager.getPlayer(player).getMiningManager();
-			rank = 5;
+
-			damage = 25;
+            blastMiningRank = miningManager.getBlastMiningTier();
-			radius = 2;
+            bonusTNTDrops = miningManager.getDropMultiplier();
-		}
+            oreBonus = percent.format(miningManager.getOreBonus() / 30.0D); // Base received in TNT is 30%
-		if(PP.getSkillLevel(SkillType.MINING) >= 750 && PP.getSkillLevel(SkillType.MINING) < 875){
+            debrisReduction = percent.format(miningManager.getDebrisReduction() / 30.0D); // Base received in TNT is 30%
-			rank = 6;
+            blastDamageDecrease = percent.format(miningManager.getBlastDamageModifier() / 100.0D);
-			damage = 50;
+            blastRadiusIncrease = miningManager.getBlastRadiusModifier();
-			radius = 3;
+        }
-		}
+    }
-		if(PP.getSkillLevel(SkillType.MINING) >= 875 && PP.getSkillLevel(SkillType.MINING) < 1000){
+
-			rank = 7;
+    @Override
-			damage = 50;
+    protected void permissionsCheck(Player player) {
-			radius = 3;
+        canBiggerBombs = Permissions.biggerBombs(player);
-		}
+        canBlast = Permissions.remoteDetonation(player);
-		if(PP.getSkillLevel(SkillType.MINING) >= 1000){
+        canDemoExpert = Permissions.demolitionsExpertise(player);
-			rank = 8;
+        canDoubleDrop = Permissions.doubleDrops(player, skill) && !skill.getDoubleDropsDisabled();
-			damage = 100;
+        canSuperBreaker = Permissions.superBreaker(player);
-			radius = 4;
+    }
-		}
+
-		
+    @Override
-		player.sendMessage(mcLocale.getString("m.SkillHeader", new Object[] { mcLocale.getString("m.SkillMining") }));
+    protected List<String> effectsDisplay() {
-		player.sendMessage(mcLocale.getString("m.XPGain", new Object[] { mcLocale.getString("m.XPGainMining") }));
+        List<String> messages = new ArrayList<String>();
-
+
-		if (mcPermissions.getInstance().mining(player))
+        if (canSuperBreaker) {
-			player.sendMessage(mcLocale.getString("m.LVL", new Object[] { PP.getSkillLevel(SkillType.MINING), PP.getSkillXpLevel(SkillType.MINING), PP.getXpToLevel(SkillType.MINING) }));
+            messages.add(LocaleLoader.getString("Effects.Template", LocaleLoader.getString("Mining.Effect.0"), LocaleLoader.getString("Mining.Effect.1")));
-
+        }
-		player.sendMessage(mcLocale.getString("m.SkillHeader", new Object[] { mcLocale.getString("m.Effects") }));
+
-		player.sendMessage(mcLocale.getString("m.EffectsTemplate", new Object[] { mcLocale.getString("m.EffectsMining1_0"), mcLocale.getString("m.EffectsMining1_1") }));
+        if (canDoubleDrop) {
-		player.sendMessage(mcLocale.getString("m.EffectsTemplate", new Object[] { mcLocale.getString("m.EffectsMining2_0"), mcLocale.getString("m.EffectsMining2_1") }));
+            messages.add(LocaleLoader.getString("Effects.Template", LocaleLoader.getString("Mining.Effect.2"), LocaleLoader.getString("Mining.Effect.3")));
-		player.sendMessage(mcLocale.getString("m.EffectsTemplate", new Object[] { mcLocale.getString("m.EffectsMining3_0"), mcLocale.getString("m.EffectsMining3_1") }));
+        }
-		player.sendMessage(mcLocale.getString("m.EffectsTemplate", new Object[] { mcLocale.getString("m.EffectsMining4_0"), mcLocale.getString("m.EffectsMining4_1") }));
+
-		player.sendMessage(mcLocale.getString("m.EffectsTemplate", new Object[] { mcLocale.getString("m.EffectsMining5_0"), mcLocale.getString("m.EffectsMining5_1") }));
+        if (canBlast) {
-		player.sendMessage(mcLocale.getString("m.SkillHeader", new Object[] { mcLocale.getString("m.YourStats") }));
+            messages.add(LocaleLoader.getString("Effects.Template", LocaleLoader.getString("Mining.Effect.4"), LocaleLoader.getString("Mining.Effect.5")));
-		player.sendMessage(mcLocale.getString("m.MiningDoubleDropChance", new Object[] { percentage }));
+        }
-		player.sendMessage(mcLocale.getString("m.MiningSuperBreakerLength", new Object[] { ticks }));
+
-		if (PP.getSkillLevel(SkillType.MINING) < 125)
+        if (canBiggerBombs) {
-			player.sendMessage(mcLocale.getString("m.AbilityLockTemplate", new Object[] { mcLocale.getString("m.AbilLockMining1") }));
+            messages.add(LocaleLoader.getString("Effects.Template", LocaleLoader.getString("Mining.Effect.6"), LocaleLoader.getString("Mining.Effect.7")));
-		else{
+        }
-			switch (rank){
+
-			case 1:
+        if (canDemoExpert) {
-				player.sendMessage(mcLocale.getString("m.MiningBlastMining", new Object[] { rank, mcLocale.getString("m.BlastMining1") }));
+            messages.add(LocaleLoader.getString("Effects.Template", LocaleLoader.getString("Mining.Effect.8"), LocaleLoader.getString("Mining.Effect.9")));
-				break;
+        }
-			case 2:
+
-				player.sendMessage(mcLocale.getString("m.MiningBlastMining", new Object[] { rank, mcLocale.getString("m.BlastMining2") }));
+        return messages;
-				break;
+    }
-			case 3:
+
-				player.sendMessage(mcLocale.getString("m.MiningBlastMining", new Object[] { rank, mcLocale.getString("m.BlastMining3") }));
+    @Override
-				break;
+    protected List<String> statsDisplay(Player player, float skillValue, boolean hasEndurance, boolean isLucky) {
-			case 4:
+        List<String> messages = new ArrayList<String>();
-				player.sendMessage(mcLocale.getString("m.MiningBlastMining", new Object[] { rank, mcLocale.getString("m.BlastMining4") }));
+
-				break;
+        if (canDoubleDrop) {
-			case 5:
+            messages.add(LocaleLoader.getString("Mining.Effect.DropChance", doubleDropChance) + (isLucky ? LocaleLoader.getString("Perks.Lucky.Bonus", doubleDropChanceLucky) : ""));
-				player.sendMessage(mcLocale.getString("m.MiningBlastMining", new Object[] { rank, mcLocale.getString("m.BlastMining5") }));
+        }
-				break;
+
-			case 6:
+        if (canSuperBreaker) {
-				player.sendMessage(mcLocale.getString("m.MiningBlastMining", new Object[] { rank, mcLocale.getString("m.BlastMining6") }));
+            messages.add(LocaleLoader.getString("Mining.Ability.Length", superBreakerLength) + (hasEndurance ? LocaleLoader.getString("Perks.ActivationTime.Bonus", superBreakerLengthEndurance) : ""));
-				break;
+        }
-			case 7:
+
-				player.sendMessage(mcLocale.getString("m.MiningBlastMining", new Object[] { rank, mcLocale.getString("m.BlastMining7") }));
+        if (canBlast) {
-				break;
+            int unlockLevel = AdvancedConfig.getInstance().getBlastMiningRankLevel(Tier.ONE);
-			case 8:
+
-				player.sendMessage(mcLocale.getString("m.MiningBlastMining", new Object[] { rank, mcLocale.getString("m.BlastMining8") }));
+            if (skillValue < unlockLevel) {
-				break;
+                messages.add(LocaleLoader.getString("Ability.Generic.Template.Lock", LocaleLoader.getString("Mining.Ability.Locked.0", unlockLevel)));
-			}
+            }
-		}
+            else {
-		if (PP.getSkillLevel(SkillType.MINING) < 250)
+                messages.add(LocaleLoader.getString("Mining.Blast.Rank", blastMiningRank, Tier.EIGHT.toNumerical(), LocaleLoader.getString("Mining.Blast.Effect", oreBonus, debrisReduction, bonusTNTDrops)));
-			player.sendMessage(mcLocale.getString("m.AbilityLockTemplate", new Object[] { mcLocale.getString("m.AbilLockMining2") }));
+            }
-		else
+        }
-			player.sendMessage(mcLocale.getString("m.MiningBiggerBombs", new Object[] { radius }));
+
-		if (PP.getSkillLevel(SkillType.MINING) < 500)
+        if (canBiggerBombs) {
-			player.sendMessage(mcLocale.getString("m.AbilityLockTemplate", new Object[] { mcLocale.getString("m.AbilLockMining3") }));
+            int unlockLevel = AdvancedConfig.getInstance().getBlastMiningRankLevel(Tier.TWO);
-		else
+
-			player.sendMessage(mcLocale.getString("m.MiningDemolitionsExpertDamageDecrease", new Object[] { damage }));
+            if (skillValue < unlockLevel) {
-		
+                messages.add(LocaleLoader.getString("Ability.Generic.Template.Lock", LocaleLoader.getString("Mining.Ability.Locked.1", unlockLevel)));
-		Page.grabGuidePageForSkill(SkillType.MINING, player, args);
+            }
-		
+            else {
-		return true;
+                messages.add(LocaleLoader.getString("Mining.Blast.Radius.Increase", blastRadiusIncrease));
-	}
+            }
-}
+        }
+
+        if (canDemoExpert) {
+            int unlockLevel = AdvancedConfig.getInstance().getBlastMiningRankLevel(Tier.FOUR);
+
+            if (skillValue < unlockLevel) {
+                messages.add(LocaleLoader.getString("Ability.Generic.Template.Lock", LocaleLoader.getString("Mining.Ability.Locked.2", unlockLevel)));
+            }
+            else {
+                messages.add(LocaleLoader.getString("Mining.Effect.Decrease", blastDamageDecrease));
+            }
+        }
+
+        return messages;
+    }
+}

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

@@ -1,58 +1,163 @@
-package com.gmail.nossr50.commands.skills;
+package com.gmail.nossr50.commands.skills;
-
+
-import org.bukkit.command.Command;
+import java.util.ArrayList;
-import org.bukkit.command.CommandExecutor;
+import java.util.List;
-import org.bukkit.command.CommandSender;
+
-import org.bukkit.entity.Player;
+import org.bukkit.Material;
-
+import org.bukkit.entity.Player;
-import com.gmail.nossr50.commands.CommandHelper;
+
-import com.gmail.nossr50.config.LoadProperties;
+import com.gmail.nossr50.mcMMO;
-import com.gmail.nossr50.datatypes.PlayerProfile;
+import com.gmail.nossr50.datatypes.skills.SkillType;
-import com.gmail.nossr50.datatypes.SkillType;
+import com.gmail.nossr50.locale.LocaleLoader;
-import com.gmail.nossr50.locale.mcLocale;
+import com.gmail.nossr50.skills.repair.ArcaneForging;
-import com.gmail.nossr50.skills.misc.Repair;
+import com.gmail.nossr50.skills.repair.ArcaneForging.Tier;
-import com.gmail.nossr50.util.Page;
+import com.gmail.nossr50.skills.repair.Repair;
-import com.gmail.nossr50.util.Users;
+import com.gmail.nossr50.skills.repair.RepairManager;
-import com.gmail.nossr50.util.mcPermissions;
+import com.gmail.nossr50.skills.repair.repairables.Repairable;
-
+import com.gmail.nossr50.util.Permissions;
-public class RepairCommand implements CommandExecutor {
+import com.gmail.nossr50.util.player.UserManager;
-	@Override
+
-	public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
+public class RepairCommand extends SkillCommand {
-		if (!(sender instanceof Player)) {
+    private String repairMasteryBonus;
-			sender.sendMessage("This command does not support console useage."); //TODO: Needs more locale.
+    private String superRepairChance;
-			return true;
+    private String superRepairChanceLucky;
-		}
+
-
+    private boolean canSuperRepair;
-        if (CommandHelper.noCommandPermissions(sender, "mcmmo.skills.repair")) {
+    private boolean canMasterRepair;
-            return true;
+    private boolean canArcaneForge;
-        }
+    private boolean canSalvage;
-		Player player = (Player) sender;
+    private boolean canRepairStone;
-		PlayerProfile PP = Users.getProfile(player);
+    private boolean canRepairIron;
-
+    private boolean canRepairGold;
-		float skillvalue = (float) PP.getSkillLevel(SkillType.REPAIR);
+    private boolean canRepairDiamond;
-		String percentage = String.valueOf((skillvalue / 1000) * 100);
+    private boolean canRepairString;
-		String repairmastery = String.valueOf((skillvalue / 500) * 100);
+    private boolean canRepairLeather;
-		player.sendMessage(mcLocale.getString("m.SkillHeader", new Object[] { mcLocale.getString("m.SkillRepair") }));
+    private boolean canRepairWood;
-		player.sendMessage(mcLocale.getString("m.XPGain", new Object[] { mcLocale.getString("m.XPGainRepair") }));
+    private boolean arcaneBypass;
-
+
-		if (mcPermissions.getInstance().repair(player))
+    private int diamondLevel;
-			player.sendMessage(mcLocale.getString("m.LVL", new Object[] { PP.getSkillLevel(SkillType.REPAIR), PP.getSkillXpLevel(SkillType.REPAIR), PP.getXpToLevel(SkillType.REPAIR) }));
+    private int goldLevel;
-
+    private int ironLevel;
-		player.sendMessage(mcLocale.getString("m.SkillHeader", new Object[] { mcLocale.getString("m.Effects") }));
+    private int stoneLevel;
-		player.sendMessage(mcLocale.getString("m.EffectsTemplate", new Object[] { mcLocale.getString("m.EffectsRepair1_0"), mcLocale.getString("m.EffectsRepair1_1") }));
+
-		player.sendMessage(mcLocale.getString("m.EffectsTemplate", new Object[] { mcLocale.getString("m.EffectsRepair2_0"), mcLocale.getString("m.EffectsRepair2_1") }));
+    public RepairCommand() {
-		player.sendMessage(mcLocale.getString("m.EffectsTemplate", new Object[] { mcLocale.getString("m.EffectsRepair3_0"), mcLocale.getString("m.EffectsRepair3_1") }));
+        super(SkillType.REPAIR);
-		player.sendMessage(mcLocale.getString("m.EffectsTemplate", new Object[] { mcLocale.getString("m.EffectsRepair4_0", new Object[] { LoadProperties.repairdiamondlevel }), mcLocale.getString("m.EffectsRepair4_1") }));
+    }
-		player.sendMessage(mcLocale.getString("m.EffectsTemplate", new Object[] { mcLocale.getString("m.EffectsRepair5_0"), mcLocale.getString("m.EffectsRepair5_1") }));
+
-		player.sendMessage(mcLocale.getString("m.SkillHeader", new Object[] { mcLocale.getString("m.YourStats") }));
+    @Override
-		player.sendMessage(mcLocale.getString("m.RepairRepairMastery", new Object[] { repairmastery }));
+    protected void dataCalculations(Player player, float skillValue, boolean isLucky) {
-		player.sendMessage(mcLocale.getString("m.RepairSuperRepairChance", new Object[] { percentage }));
+        // We're using pickaxes here, not the best but it works
-		player.sendMessage(mcLocale.getString("m.ArcaneForgingRank", new Object[] { Repair.getArcaneForgingRank(PP.getSkillLevel(SkillType.REPAIR)) }));
+        Repairable diamondRepairable = mcMMO.getRepairableManager().getRepairable(Material.DIAMOND_PICKAXE);
-		player.sendMessage(mcLocale.getString("m.ArcaneEnchantKeepChance", new Object[] { Repair.getEnchantChance(Repair.getArcaneForgingRank(PP.getSkillLevel(SkillType.REPAIR))) }));
+        Repairable goldRepairable = mcMMO.getRepairableManager().getRepairable(Material.GOLD_PICKAXE);
-		player.sendMessage(mcLocale.getString("m.ArcaneEnchantDowngradeChance", new Object[] { Repair.getDowngradeChance(Repair.getArcaneForgingRank(PP.getSkillLevel(SkillType.REPAIR))) }));
+        Repairable ironRepairable = mcMMO.getRepairableManager().getRepairable(Material.IRON_PICKAXE);
-		
+        Repairable stoneRepairable = mcMMO.getRepairableManager().getRepairable(Material.STONE_PICKAXE);
-		Page.grabGuidePageForSkill(SkillType.REPAIR, player, args);
+
-		
+        // TODO: This isn't really accurate - if they don't have pickaxes loaded it doesn't always mean the repair level is 0
-		return true;
+        diamondLevel = (diamondRepairable == null) ? 0 : diamondRepairable.getMinimumLevel();
-	}
+        goldLevel = (goldRepairable == null) ? 0 : goldRepairable.getMinimumLevel();
-}
+        ironLevel = (ironRepairable == null) ? 0 : ironRepairable.getMinimumLevel();
+        stoneLevel = (stoneRepairable == null) ? 0 : stoneRepairable.getMinimumLevel();
+
+        // REPAIR MASTERY
+        if (canMasterRepair) {
+            repairMasteryBonus = percent.format(Math.min(((Repair.repairMasteryMaxBonus / Repair.repairMasteryMaxBonusLevel) * skillValue), Repair.repairMasteryMaxBonus) / 100D);
+        }
+
+        // SUPER REPAIR
+        if (canSuperRepair) {
+            String[] superRepairStrings = calculateAbilityDisplayValues(skillValue, Repair.superRepairMaxBonusLevel, Repair.superRepairMaxChance, isLucky);
+            superRepairChance = superRepairStrings[0];
+            superRepairChanceLucky = superRepairStrings[1];
+        }
+    }
+
+    @Override
+    protected void permissionsCheck(Player player) {
+        canSuperRepair = Permissions.superRepair(player);
+        canMasterRepair = Permissions.repairMastery(player);
+        canArcaneForge = Permissions.arcaneForging(player);
+        canSalvage = Permissions.salvage(player);
+        canRepairDiamond = Permissions.repairDiamond(player);
+        canRepairGold = Permissions.repairGold(player);
+        canRepairIron = Permissions.repairIron(player);
+        canRepairStone = Permissions.repairStone(player);
+        canRepairString = Permissions.repairString(player);
+        canRepairLeather = Permissions.repairLeather(player);
+        canRepairWood = Permissions.repairWood(player);
+        arcaneBypass = Permissions.arcaneBypass(player);
+    }
+
+    @Override
+    protected List<String> effectsDisplay() {
+        List<String> messages = new ArrayList<String>();
+
+        if (canRepairLeather || canRepairString || canRepairWood || canRepairStone || canRepairIron || canRepairGold || canRepairDiamond) {
+            messages.add(LocaleLoader.getString("Effects.Template", LocaleLoader.getString("Repair.Effect.0"), LocaleLoader.getString("Repair.Effect.1")));
+        }
+
+        if (canMasterRepair) {
+            messages.add(LocaleLoader.getString("Effects.Template", LocaleLoader.getString("Repair.Effect.2"), LocaleLoader.getString("Repair.Effect.3")));
+        }
+
+        if (canSuperRepair) {
+            messages.add(LocaleLoader.getString("Effects.Template", LocaleLoader.getString("Repair.Effect.4"), LocaleLoader.getString("Repair.Effect.5")));
+        }
+
+        /* Repair Level Requirements */
+
+        if (canRepairStone && stoneLevel > 0) {
+            messages.add(LocaleLoader.getString("Effects.Template", LocaleLoader.getString("Repair.Effect.14", stoneLevel), LocaleLoader.getString("Repair.Effect.15")));
+        }
+
+        if (canRepairIron && ironLevel > 0) {
+            messages.add(LocaleLoader.getString("Effects.Template", LocaleLoader.getString("Repair.Effect.12", ironLevel), LocaleLoader.getString("Repair.Effect.13")));
+        }
+
+        if (canRepairGold && goldLevel > 0) {
+            messages.add(LocaleLoader.getString("Effects.Template", LocaleLoader.getString("Repair.Effect.10", goldLevel), LocaleLoader.getString("Repair.Effect.11")));
+        }
+
+        if (canRepairDiamond && diamondLevel > 0) {
+            messages.add(LocaleLoader.getString("Effects.Template", LocaleLoader.getString("Repair.Effect.6", diamondLevel), LocaleLoader.getString("Repair.Effect.7")));
+        }
+
+        if (canSalvage && Repair.salvageUnlockLevel > 0) {
+            messages.add(LocaleLoader.getString("Effects.Template", LocaleLoader.getString("Repair.Effect.16", Repair.salvageUnlockLevel), LocaleLoader.getString("Repair.Effect.17")));
+        }
+
+        if (canArcaneForge) {
+            messages.add(LocaleLoader.getString("Effects.Template", LocaleLoader.getString("Repair.Effect.8"), LocaleLoader.getString("Repair.Effect.9")));
+        }
+
+        return messages;
+    }
+
+    @Override
+    protected List<String> statsDisplay(Player player, float skillValue, boolean hasEndurance, boolean isLucky) {
+        List<String> messages = new ArrayList<String>();
+
+        if (canMasterRepair) {
+            messages.add(LocaleLoader.getString("Repair.Skills.Mastery", repairMasteryBonus));
+        }
+
+        if (canSuperRepair) {
+            messages.add(LocaleLoader.getString("Repair.Skills.Super.Chance", superRepairChance) + (isLucky ? LocaleLoader.getString("Perks.Lucky.Bonus", superRepairChanceLucky) : ""));
+        }
+
+        if (canArcaneForge) {
+            RepairManager repairManager = UserManager.getPlayer(player).getRepairManager();
+
+            messages.add(LocaleLoader.getString("Repair.Arcane.Rank", repairManager.getArcaneForgingRank(), Tier.EIGHT.toNumerical()));
+
+            if (ArcaneForging.arcaneForgingEnchantLoss) {
+                messages.add(LocaleLoader.getString("Repair.Arcane.Chance.Success", (arcaneBypass ? 100 : repairManager.getKeepEnchantChance())));
+            }
+
+            if (ArcaneForging.arcaneForgingDowngrades) {
+                messages.add(LocaleLoader.getString("Repair.Arcane.Chance.Downgrade", (arcaneBypass ? 0 : repairManager.getDowngradeEnchantChance())));
+            }
+        }
+
+        return messages;
+    }
+}

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

@@ -0,0 +1,162 @@
+package com.gmail.nossr50.commands.skills;
+
+import java.text.DecimalFormat;
+import java.util.List;
+import java.util.Set;
+
+import org.bukkit.command.Command;
+import org.bukkit.command.CommandExecutor;
+import org.bukkit.command.CommandSender;
+import org.bukkit.command.TabExecutor;
+import org.bukkit.entity.Player;
+
+import com.gmail.nossr50.config.AdvancedConfig;
+import com.gmail.nossr50.config.Config;
+import com.gmail.nossr50.datatypes.player.McMMOPlayer;
+import com.gmail.nossr50.datatypes.skills.SkillType;
+import com.gmail.nossr50.locale.LocaleLoader;
+import com.gmail.nossr50.skills.child.FamilyTree;
+import com.gmail.nossr50.util.Permissions;
+import com.gmail.nossr50.util.StringUtils;
+import com.gmail.nossr50.util.commands.CommandUtils;
+import com.gmail.nossr50.util.player.UserManager;
+import com.gmail.nossr50.util.scoreboards.ScoreboardManager;
+import com.gmail.nossr50.util.skills.PerksUtils;
+
+import com.google.common.collect.ImmutableList;
+
+public abstract class SkillCommand implements TabExecutor {
+    protected SkillType skill;
+    private String skillName;
+
+    protected DecimalFormat percent = new DecimalFormat("##0.00%");
+    protected DecimalFormat decimal = new DecimalFormat("##0.00");
+
+    private CommandExecutor skillGuideCommand;
+
+    public SkillCommand(SkillType skill) {
+        this.skill = skill;
+        skillName = skill.getName();
+        skillGuideCommand = new SkillGuideCommand(skill);
+    }
+
+    @Override
+    public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
+        if (CommandUtils.noConsoleUsage(sender)) {
+            return true;
+        }
+
+        switch (args.length) {
+            case 0:
+                Player player = (Player) sender;
+                McMMOPlayer mcMMOPlayer = UserManager.getPlayer(player);
+
+                boolean isLucky = Permissions.lucky(player, skill);
+                boolean hasEndurance = (PerksUtils.handleActivationPerks(player, 0, 0) != 0);
+                float skillValue = mcMMOPlayer.getSkillLevel(skill);
+
+                permissionsCheck(player);
+                dataCalculations(player, skillValue, isLucky);
+
+                if (Config.getInstance().getSkillUseBoard()) {
+                    ScoreboardManager.enablePlayerSkillScoreboard(player, skill);
+                }
+
+                if (!skill.isChildSkill()) {
+                    player.sendMessage(LocaleLoader.getString("Skills.Header", skillName));
+                    player.sendMessage(LocaleLoader.getString("Commands.XPGain", LocaleLoader.getString("Commands.XPGain." + StringUtils.getCapitalized(skill.toString()))));
+                    player.sendMessage(LocaleLoader.getString("Effects.Level", (int) skillValue, mcMMOPlayer.getSkillXpLevel(skill), mcMMOPlayer.getXpToLevel(skill)));
+                }
+                else {
+                    player.sendMessage(LocaleLoader.getString("Skills.Header", skillName + " " + LocaleLoader.getString("Skills.Child")));
+                    player.sendMessage(LocaleLoader.getString("Commands.XPGain", LocaleLoader.getString("Commands.XPGain.Child")));
+                    player.sendMessage(LocaleLoader.getString("Effects.Child", (int) skillValue));
+
+                    player.sendMessage(LocaleLoader.getString("Skills.Header", LocaleLoader.getString("Skills.Parents")));
+                    Set<SkillType> parents = FamilyTree.getParents(skill);
+
+                    for (SkillType parent : parents) {
+                        player.sendMessage(parent.getName() + " - " + LocaleLoader.getString("Effects.Level", mcMMOPlayer.getSkillLevel(parent), mcMMOPlayer.getSkillXpLevel(parent), mcMMOPlayer.getXpToLevel(parent)));
+                    }
+                }
+
+                List<String> effectMessages = effectsDisplay();
+
+                if (!effectMessages.isEmpty()) {
+                    player.sendMessage(LocaleLoader.getString("Skills.Header", LocaleLoader.getString("Effects.Effects")));
+
+                    if (isLucky) {
+                        String perkPrefix = LocaleLoader.getString("MOTD.PerksPrefix");
+                        player.sendMessage(perkPrefix + LocaleLoader.getString("Effects.Template", LocaleLoader.getString("Perks.Lucky.Name"), LocaleLoader.getString("Perks.Lucky.Desc", skillName)));
+                    }
+
+                    for (String message : effectMessages) {
+                        player.sendMessage(message);
+                    }
+                }
+
+                List<String> statsMessages = statsDisplay(player, skillValue, hasEndurance, isLucky);
+
+                if (!statsMessages.isEmpty()) {
+                    player.sendMessage(LocaleLoader.getString("Skills.Header", LocaleLoader.getString("Commands.Stats.Self")));
+
+                    for (String message : statsMessages) {
+                        player.sendMessage(message);
+                    }
+                }
+
+                player.sendMessage(LocaleLoader.getString("Guides.Available", skillName, skillName.toLowerCase()));
+                return true;
+
+            default:
+                return skillGuideCommand.onCommand(sender, command, label, args);
+        }
+    }
+
+    @Override
+    public List<String> onTabComplete(CommandSender sender, Command command, String alias, String[] args) {
+        switch (args.length) {
+            case 1:
+                return ImmutableList.of("?");
+            default:
+                return ImmutableList.of();
+        }
+    }
+
+    protected int calculateRank(float skillValue, int maxLevel, int rankChangeLevel) {
+        return Math.min((int) skillValue, maxLevel) / rankChangeLevel;
+    }
+
+    protected String[] calculateAbilityDisplayValues(double chance, boolean isLucky) {
+        String[] displayValues = new String[2];
+
+        displayValues[0] = percent.format(Math.min(chance, 100.0D) / 100.0D);
+        displayValues[1] = isLucky ? percent.format(Math.min(chance * 1.3333D, 100.0D) / 100.0D) : null;
+
+        return displayValues;
+    }
+
+    protected String[] calculateAbilityDisplayValues(float skillValue, int maxBonusLevel, double maxChance, boolean isLucky) {
+        return calculateAbilityDisplayValues((maxChance / maxBonusLevel) * Math.min(skillValue, maxBonusLevel), isLucky);
+    }
+
+    protected String[] calculateLengthDisplayValues(Player player, float skillValue) {
+        int maxLength = skill.getAbility().getMaxLength();
+        int length = 2 + (int) (skillValue / AdvancedConfig.getInstance().getAbilityLength());
+        int enduranceLength = PerksUtils.handleActivationPerks(player, length, maxLength);
+
+        if (maxLength != 0) {
+            length = Math.min(length, maxLength);
+        }
+
+        return new String[] { String.valueOf(length), String.valueOf(enduranceLength) };
+    }
+
+    protected abstract void dataCalculations(Player player, float skillValue, boolean isLucky);
+
+    protected abstract void permissionsCheck(Player player);
+
+    protected abstract List<String> effectsDisplay();
+
+    protected abstract List<String> statsDisplay(Player player, float skillValue, boolean hasEndurance, boolean isLucky);
+}