Here too

worlds.

Fixes #815

.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,27 +0,0 @@
-== mcMMO
-**The RPG lovers mod**
-
-=== Forums
-http://forums.mcmmo.info Talk with developers and the community about mcMMO here
-
-=== 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,47 @@
+# mcMMO
+## The RPG lovers mod
+
+### Dev builds
+Our latest development builds are available [here](http://ci.mcmmo.info).
+
+### 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 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/??.png)]
+(https://github.com/t00thpick1)
+
+## 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:
+* Spout API
+* JUnit
+* Metrics
+* Bukkit
+
+http://dev.bukkit.org/server-mods/mcmmo for more up to date information.

pom.xml

@@ -1,148 +1,182 @@
-<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.12</version>
+    <version>1.4.03-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>resources</targetPath>
-                <directory>${basedir}/src/main/resources/xpbar/</directory>
+                <filtering>false</filtering>
-                <includes>
+                <directory>${basedir}/src/main/resources/xpbar/</directory>
-                    <include>xpbar*.png</include>
+                <includes>
-                </includes>
+                    <include>xpbar*.png</include>
-            </resource>
+                </includes>
-            <resource>
+            </resource>
-                <targetPath>resources</targetPath>
+            <resource>
-                <filtering>false</filtering>
+                <targetPath>resources</targetPath>
-                <directory>${basedir}/src/main/resources/healthbar/</directory>
+                <filtering>false</filtering>
-                <includes>
+                <directory>${basedir}/src/main/resources/healthbar/</directory>
-                    <include>health*.png</include>
+                <includes>
-                </includes>
+                    <include>health*.png</include>
-            </resource>
+                </includes>
-            <resource>
+            </resource>
-                <targetPath>resources</targetPath>
+            <resource>
-                <filtering>false</filtering>
+                <targetPath>resources</targetPath>
-                <directory>${basedir}/src/main/resources/skillicon/</directory>
+                <filtering>false</filtering>
-                <includes>
+                <directory>${basedir}/src/main/resources/skillicon/</directory>
-                    <include>*.png</include>
+                <includes>
-                </includes>
+                    <include>*.png</include>
-            </resource>
+                </includes>
-            <resource>
+            </resource>
-                <targetPath>resources</targetPath>
+            <resource>
-                <filtering>false</filtering>
+                <targetPath>resources</targetPath>
-                <directory>${basedir}/src/main/resources/sound/</directory>
+                <filtering>false</filtering>
-                <includes>
+                <directory>${basedir}/src/main/resources/sound/</directory>
-                    <include>*.wav</include>
+                <includes>
-                </includes>
+                    <include>*.wav</include>
-            </resource>
+                </includes>
-            <resource>
+            </resource>
-            	<targetPath>com/gmail/nossr50/locale</targetPath>
+            <resource>
-            	<filtering>true</filtering>
+                <targetPath>com/gmail/nossr50/locale</targetPath>
-            	<directory>${basedir}/src/main/resources/locale/</directory>
+                <filtering>true</filtering>
-            	<includes>
+                <directory>${basedir}/src/main/resources/locale/</directory>
-            		<include>locale*.properties</include>
+                <includes>
-            	</includes>
+                    <include>locale*.properties</include>
-            </resource>
+                </includes>
-        </resources>
+            </resource>
-        <plugins>
+        </resources>
-            <plugin>
+        <plugins>
-                <groupId>org.apache.maven.plugins</groupId>
+            <plugin>
-                <artifactId>maven-compiler-plugin</artifactId>
+                <groupId>org.apache.maven.plugins</groupId>
-                <version>2.3.2</version>
+                <artifactId>maven-compiler-plugin</artifactId>
-                <configuration>
+                <version>2.3.2</version>
-                    <source>1.6</source>
+                <configuration>
-                    <target>1.6</target>
+                    <source>1.6</source>
-                    <excludes>
+                    <target>1.6</target>
-                    </excludes>
+                    <excludes>
-                </configuration>
+                    </excludes>
-            </plugin>
+                </configuration>
-            <plugin>
+            </plugin>
-                <artifactId>maven-assembly-plugin</artifactId>
+            <plugin>
-                <configuration>
+                <artifactId>maven-assembly-plugin</artifactId>
-                    <descriptors>
+                <configuration>
-                        <descriptor>src/main/assembly/package.xml</descriptor>
+                    <descriptors>
-                    </descriptors>
+                        <descriptor>src/main/assembly/package.xml</descriptor>
-                </configuration>
+                    </descriptors>
-                <executions>
+                </configuration>
-                    <execution>
+                <executions>
-                        <id>build</id>
+                    <execution>
-                        <phase>package</phase>
+                        <id>build</id>
-                        <goals>
+                        <phase>package</phase>
-                            <goal>single</goal>
+                        <goals>
-                        </goals>
+                            <goal>single</goal>
-                    </execution>
+                        </goals>
-                </executions>
+                    </execution>
-            </plugin>
+                </executions>
-        </plugins>
+            </plugin>
-    </build>
+            <plugin>
-    <repositories>
+                <groupId>org.apache.maven.plugins</groupId>
-        <repository>
+                <artifactId>maven-shade-plugin</artifactId>
-            <snapshots>
+                <version>1.5</version>
-                <enabled>true</enabled>
+                <configuration>
-                <updatePolicy>always</updatePolicy>
+                    <artifactSet>
-                <checksumPolicy>fail</checksumPolicy>
+                        <includes>
-            </snapshots> 
+                            <include>com.turt2live.metrics:MetricsExtension</include>
-            <id>bukkit-repo</id>
+                        </includes>
-            <url>http://repo.bukkit.org/content/groups/public/</url>
+                    </artifactSet>
-        </repository>
+                    <relocations>
-        <repository>
+                        <relocation>
-            <snapshots>
+                            <pattern>com.turt2live.metrics</pattern>
-                <enabled>true</enabled>
+                            <shadedPattern>com.gmail.nossr50.metrics.mcstats</shadedPattern>
-                <updatePolicy>always</updatePolicy>
+                        </relocation>
-                <checksumPolicy>fail</checksumPolicy>
+                    </relocations>
-            </snapshots> 
+                </configuration>
-        	<id>spout-repo</id>
+                <executions>
-        	<url>http://nexus.spout.org/content/groups/public/</url>
+                    <execution>
-        </repository>
+                        <phase>package</phase>
-    </repositories>
+                        <goals>
-    <dependencies>
+                            <goal>shade</goal>
-        <dependency>
+                        </goals>
-            <groupId>org.bukkit</groupId>
+                    </execution>
-            <artifactId>bukkit</artifactId>
+                </executions>
-            <version>LATEST</version>
+            </plugin>
-            <type>jar</type>
+        </plugins>
-            <scope>compile</scope>
+        <extensions>
-        </dependency>
+            <extension>
-        <dependency>
+                <groupId>org.apache.maven.wagon</groupId>
-            <groupId>org.bukkit</groupId>
+                <artifactId>wagon-file</artifactId>
-            <artifactId>craftbukkit</artifactId>
+                <version>2.2</version>
-            <version>LATEST</version>
+            </extension>
-            <type>jar</type>
+        </extensions>
-            <scope>compile</scope>
+    </build>
-        </dependency>
+    <repositories>
-        <dependency>
+        <repository>
-            <groupId>org.getspout</groupId>
+            <id>bukkit-repo</id>
-            <artifactId>spoutpluginapi</artifactId>
+            <url>http://repo.bukkit.org/content/groups/public/</url>
-            <version>dev-SNAPSHOT</version>
+        </repository>
-            <type>jar</type>
+        <repository>
-            <scope>compile</scope>
+            <id>spout-repo</id>
-        </dependency>
+            <url>http://nexus.spout.org/content/groups/public/</url>
-		<dependency>
+        </repository>
-			<groupId>junit</groupId>
+        <repository>
-			<artifactId>junit-dep</artifactId>
+            <id>Plugin MetricsExtension</id>
-			<version>4.10</version>
+            <url>http://repo.turt2live.com</url>
-			<scope>test</scope>
+        </repository>
-		</dependency>
+    </repositories>
-    </dependencies>
+    <dependencies>
-    <properties>
+        <dependency>
-        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+            <groupId>org.bukkit</groupId>
-    </properties>
+            <artifactId>bukkit</artifactId>
-</project>
+            <version>LATEST</version>
+            <type>jar</type>
+            <scope>compile</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.getspout</groupId>
+            <artifactId>spoutplugin</artifactId>
+            <version>LATEST</version>
+            <type>jar</type>
+            <scope>compile</scope>
+        </dependency>
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit-dep</artifactId>
+            <version>4.10</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>com.turt2live.metrics</groupId>
+            <artifactId>MetricsExtension</artifactId>
+            <version>0.0.2-SNAPSHOT</version>
+            <type>jar</type>
+            <scope>compile</scope>
+        </dependency>
+    </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>
+</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

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

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

@@ -1,16 +1,13 @@
 package com.gmail.nossr50.api;
 
-import org.bukkit.ChatColor;
 import org.bukkit.entity.Player;
+import org.bukkit.plugin.Plugin;
 
-import com.gmail.nossr50.mcMMO;
+import com.gmail.nossr50.chat.ChatManager;
-import com.gmail.nossr50.events.chat.McMMOAdminChatEvent;
+import com.gmail.nossr50.party.PartyManager;
-import com.gmail.nossr50.events.chat.McMMOPartyChatEvent;
+import com.gmail.nossr50.util.player.UserManager;
-import com.gmail.nossr50.util.Permissions;
-import com.gmail.nossr50.util.Users;
 
 public final class ChatAPI {
-
     private ChatAPI() {}
 
     /**
@@ -18,29 +15,44 @@ public final 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 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) {
+        ChatManager.handlePartyChat(plugin, PartyManager.getParty(party), 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 static void sendPartyChat(Plugin plugin, String sender, String party, String message) {
+        ChatManager.handlePartyChat(plugin, PartyManager.getParty(party), sender, sender, message);
+    }
+
+    /**
+     * Send a message to all members of a party
+     * </br>
+     * This function is designed for API usage.
+     *
+     * @deprecated Replaced by sendPartyChat(Plugin, String, String, String)
+     *
+     * @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
+     */
+    @Deprecated
     public static void sendPartyChat(String sender, String party, String message) {
-        McMMOPartyChatEvent chatEvent = new McMMOPartyChatEvent(sender, party, message);
+        sendPartyChat(null, party, sender, sender, message);
-        mcMMO.p.getServer().getPluginManager().callEvent(chatEvent);
-
-        if (chatEvent.isCancelled()) {
-            return;
-        }
-
-        String pPrefix = ChatColor.GREEN + "(" + ChatColor.WHITE + chatEvent.getSender() + ChatColor.GREEN + ") ";
-
-        mcMMO.p.getLogger().info("[P](" + chatEvent.getParty() + ")" + "<" + chatEvent.getSender() + "> " + chatEvent.getMessage());
-
-        for (Player player : mcMMO.p.getServer().getOnlinePlayers()) {
-            if (Users.getProfile(player).inParty()) {
-                if (Users.getProfile(player).getParty().getName().equalsIgnoreCase(chatEvent.getParty())) {
-                    player.sendMessage(pPrefix + chatEvent.getMessage());
-                }
-            }
-        }
     }
 
     /**
@@ -48,24 +60,80 @@ public final 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) {
+        ChatManager.handleAdminChat(plugin, 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 static void sendAdminChat(Plugin plugin, String sender, String message) {
+        ChatManager.handleAdminChat(plugin, sender, sender, message);
+    }
+
+    /**
+     * Send a message to administrators
+     * </br>
+     * This function is designed for API usage.
+     *
+     * @deprecated Replaced by sendAdminChat(Plugin, String, String)
+     *
+     * @param sender The name of the sender to display in the chat
+     * @param message The message to send
+     */
+    @Deprecated
     public static void sendAdminChat(String sender, String message) {
-        McMMOAdminChatEvent chatEvent = new McMMOAdminChatEvent(sender, message);
+        sendAdminChat(null, sender, sender, message);
-        mcMMO.p.getServer().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).getPartyChatMode();
+    }
 
-        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).getPartyChatMode();
+    }
 
-        mcMMO.p.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).getAdminChatMode();
+    }
 
-        for (Player player : mcMMO.p.getServer().getOnlinePlayers()) {
+    /**
-            if (Permissions.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).getAdminChatMode();
     }
 }

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

@@ -1,177 +1,358 @@
-package com.gmail.nossr50.api;
+package com.gmail.nossr50.api;
-
+
-import org.bukkit.entity.Player;
+import org.bukkit.entity.Player;
-
+
-import com.gmail.nossr50.datatypes.SkillType;
+import com.gmail.nossr50.config.Config;
-import com.gmail.nossr50.util.Skills;
+import com.gmail.nossr50.datatypes.skills.SkillType;
-import com.gmail.nossr50.util.Users;
+import com.gmail.nossr50.util.player.UserManager;
-
+import com.gmail.nossr50.util.skills.SkillUtils;
-public final class ExperienceAPI {
+
-
+public final class ExperienceAPI {
-    private ExperienceAPI() {}
+    private ExperienceAPI() {}
-
+
-    /**
+    /**
-     * Check the XP of a player. This should be called after giving XP to process level-ups.
+     * Adds raw XP to the player.
-     *
+     * </br>
-     * @param player The player to check
+     * This function is designed for API usage.
-     * @param skillType The skill to check
+     *
-     */
+     * @param player The player to add XP to
-    private static void checkXP(Player player, SkillType skillType) {
+     * @param skillType The skill to add XP to
-        if (skillType.equals(SkillType.ALL)) {
+     * @param XP The amount of XP to add
-            Skills.xpCheckAll(player, Users.getProfile(player));
+     * @deprecated Use {@link #addRawXP(Player, String, int)} instead
-        }
+     */
-        else {
+    @Deprecated
-            Skills.xpCheckSkill(skillType, player, Users.getProfile(player));
+    public static void addRawXP(Player player, SkillType skillType, int XP) {
-        }
+        UserManager.getPlayer(player).applyXpGain(skillType, XP);
-    }
+    }
-
+
-    /**
+    /**
-     * Adds XP to the player, doesn't calculate for XP Rate or other modifiers.
+     * Adds raw XP to the player.
-     * </br>
+     * </br>
-     * This function is designed for API usage.
+     * This function is designed for API usage.
-     *
+     *
-     * @param player The player to add XP to
+     * @param player The player to add XP to
-     * @param skillType The skill to add XP to
+     * @param skillType The skill to add XP to
-     * @param XP The amount of XP to add
+     * @param XP The amount of XP to add
-     */
+     */
-    public static void addRawXP(Player player, SkillType skillType, int XP) {
+    public static void addRawXP(Player player, String skillType, int XP) {
-        Users.getPlayer(player).addXPOverride(skillType, XP);
+        UserManager.getPlayer(player).applyXpGain(SkillType.getSkill(skillType), XP);
-        checkXP(player, skillType);
+    }
-    }
+
-
+    /**
-    /**
+     * Adds XP to the player, calculates for XP Rate only.
-     * Adds XP to the player, calculates for XP Rate but not skill modifiers.
+     * </br>
-     * </br>
+     * This function is designed for API usage.
-     * This function is designed for API usage.
+     *
-     *
+     * @param player The player to add XP to
-     * @param player The player to add XP to
+     * @param skillType The skill to add XP to
-     * @param skillType The skill to add XP to
+     * @param XP The amount of XP to add
-     * @param XP The amount of XP to add
+     * @deprecated Use {@link #addMultipliedXP(Player, String, int)} instead
-     */
+     */
-    public static void addMultipliedXP(Player player, SkillType skillType, int XP) {
+    @Deprecated
-        Users.getPlayer(player).addXPOverrideBonus(skillType, XP);
+    public static void addMultipliedXP(Player player, SkillType skillType, int XP) {
-        checkXP(player, skillType);
+        UserManager.getPlayer(player).applyXpGain(skillType, (int) (XP * Config.getInstance().getExperienceGainsGlobalMultiplier()));
-    }
+    }
-
+
-    /**
+    /**
-     * Adds XP to the player, calculates for XP Rate and skill modifiers.
+     * Adds XP to the player, calculates for XP Rate only.
-     * </br>
+     * </br>
-     * This function is designed for API usage.
+     * This function is designed for API usage.
-     *
+     *
-     * @param player The player to add XP to
+     * @param player The player to add XP to
-     * @param skillType The skill to add XP to
+     * @param skillType The skill to add XP to
-     * @param XP The amount of XP to add
+     * @param XP The amount of XP to add
-     */
+     */
-    public static void addXP(Player player, SkillType skillType, int XP) {
+    public static void addMultipliedXP(Player player, String skillType, int XP) {
-        Users.getPlayer(player).addXP(skillType, XP);
+        UserManager.getPlayer(player).applyXpGain(SkillType.getSkill(skillType), (int) (XP * Config.getInstance().getExperienceGainsGlobalMultiplier()));
-        checkXP(player, skillType);
+    }
-    }
+
-
+    /**
-    /**
+     * Adds XP to the player, calculates for XP Rate, skill modifiers and perks. May be shared with the party.
-     * Get the amount of XP a player has in a specific skill.
+     * </br>
-     * </br>
+     * This function is designed for API usage.
-     * This function is designed for API usage.
+     *
-     *
+     * @param player The player to add XP to
-     * @param player The player to get XP for
+     * @param skillType The skill to add XP to
-     * @param skillType The skill to get XP for
+     * @param XP The amount of XP to add
-     * @return the amount of XP in a given skill
+     * @deprecated Use {@link #addXP(Player, String, int)} instead
-     */
+     */
-    public static int getXP(Player player, SkillType skillType) {
+    @Deprecated
-        return Users.getProfile(player).getSkillXpLevel(skillType);
+    public static void addXP(Player player, SkillType skillType, int XP) {
-    }
+        UserManager.getPlayer(player).beginXpGain(skillType, XP);
-
+    }
-    /**
+
-     * Get the amount of XP left before leveling up.
+    /**
-     * </br>
+     * Adds XP to the player, calculates for XP Rate, skill modifiers and perks. May be shared with the party.
-     * This function is designed for API usage.
+     * </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
+     * @param player The player to add XP to
-     * @return the amount of XP left before leveling up a specifc skill
+     * @param skillType The skill to add XP to
-     */
+     * @param XP The amount of XP to add
-    public static int getXPToNextLevel(Player player, SkillType skillType) {
+     */
-        return Users.getProfile(player).getXpToLevel(skillType);
+    public static void addXP(Player player, String skillType, int XP) {
-    }
+        UserManager.getPlayer(player).beginXpGain(SkillType.getSkill(skillType), XP);
-
+    }
-    /**
+
-     * Add levels to a skill.
+    /**
-     * </br>
+     * Get the amount of XP a player has in a specific skill.
-     * This function is designed for API usage.
+     * </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 player The player to get XP for
-     * @param levels Number of levels to add
+     * @param skillType The skill to get XP for
-     * @param notify True if this should fire a level up notification, false otherwise.
+     * @return the amount of XP in a given skill
-     */
+     * @deprecated Use {@link #getXP(Player, String)} instead
-    public static void addLevel(Player player, SkillType skillType, int levels, boolean notify) {
+     */
-        Users.getProfile(player).addLevels(skillType, levels);
+    @Deprecated
-
+    public static int getXP(Player player, SkillType skillType) {
-        if (notify) {
+        return UserManager.getPlayer(player).getProfile().getSkillXpLevel(skillType);
-            checkXP(player, skillType);
+    }
-        }
+
-    }
+    /**
-
+     * Get the amount of XP a player has in a specific skill.
-    /**
+     * </br>
-     * Get the level a player has in a specific skill.
+     * This function is designed for API usage.
-     * </br>
+     *
-     * This function is designed for API usage.
+     * @param player The player to get XP for
-     *
+     * @param skillType The skill to get XP for
-     * @param player The player to get the level for
+     * @return the amount of XP in a given skill
-     * @param skillType The skill to get the level for
+     */
-     * @return the level of a given skill
+    public static int getXP(Player player, String skillType) {
-     */
+        return UserManager.getPlayer(player).getProfile().getSkillXpLevel(SkillType.getSkill(skillType));
-    public static int getLevel(Player player, SkillType skillType) {
+    }
-        return Users.getProfile(player).getSkillLevel(skillType);
+
-    }
+    /**
-
+     * Get the amount of XP left before leveling up.
-    /**
+     * </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 get the XP amount for
-     *
+     * @param skillType The skill to get the XP amount for
-     * @param player The player to get the power level for
+     * @return the amount of XP left before leveling up a specifc skill
-     * @return the power level of the player
+     * @deprecated Use {@link #getXPToNextLevel(Player, String)} instead
-     */
+     */
-    public static int getPowerLevel(Player player) {
+    @Deprecated
-        return Users.getPlayer(player).getPowerLevel();
+    public static int getXPToNextLevel(Player player, SkillType skillType) {
-    }
+        return UserManager.getPlayer(player).getProfile().getXpToLevel(skillType);
-
+    }
-    /**
+
-     * Sets the level of a player in a specific skill type.
+    /**
-     * </br>
+     * Get the amount of XP left before leveling up.
-     * This function is designed for API usage.
+     * </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 player The player to get the XP amount for
-     * @param skillLevel The value to set the level to
+     * @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 setLevel(Player player, SkillType skillType, int skillLevel) {
+     */
-        Users.getProfile(player).modifySkill(skillType, skillLevel);
+    public static int getXPToNextLevel(Player player, String skillType) {
-    }
+        return UserManager.getPlayer(player).getProfile().getXpToLevel(SkillType.getSkill(skillType));
-
+    }
-    /**
+
-     * Sets the XP of a player in a specific skill type.
+    /**
-     * </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 set the XP of
+     *
-     * @param skillType The skill to set the XP for
+     * @param player The player to add levels to
-     * @param newValue The value to set the XP to
+     * @param skillType Type of skill to add levels to
-     */
+     * @param levels Number of levels to add
-    public static void setXP(Player player, SkillType skillType, int newValue) {
+     * @param notify Unused argument
-        Users.getProfile(player).setSkillXPLevel(skillType, newValue);
+     * @deprecated Use addLevel(Player, SKillType, int) instead
-    }
+     */
-
+    public static void addLevel(Player player, SkillType skillType, int levels, boolean notify) {
-    /**
+        UserManager.getProfile(player).addLevels(skillType, levels);
-     * Removes XP from a player in a specific skill type.
+
-     * </br>
+        if (notify) {
-     * This function is designed for API usage.
+            checkXP(player, skillType);
-     *
+        }
-     * @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
+    /**
-     */
+     * Add levels to a skill.
-    public static void removeXP(Player player, SkillType skillType, int xp) {
+     * </br>
-        Users.getProfile(player).removeXP(skillType, xp);
+     * This function is designed for API usage.
-    }
+     *
-}
+     * @param player The player to add levels to
+     * @param skillType Type of skill to add levels to
+     * @param levels Number of levels to add
+     * @deprecated Use {@link #addLevel(Player, String, int)} instead
+     */
+    @Deprecated
+    public static void addLevel(Player player, SkillType skillType, int levels) {
+        UserManager.getPlayer(player).getProfile().addLevels(skillType, levels);
+    }
+
+    /**
+     * Add levels to a skill.
+     * </br>
+     * This function is designed for API usage.
+     *
+     * @param player The player to add levels to
+     * @param skillType Type of skill to add levels to
+     * @param levels Number of levels to add
+     */
+    public static void addLevel(Player player, String skillType, int levels) {
+        UserManager.getPlayer(player).getProfile().addLevels(SkillType.getSkill(skillType), levels);
+    }
+
+    /**
+     * Get the level a player has in a specific skill.
+     * </br>
+     * This function is designed for API usage.
+     *
+     * @param player The player to get the level for
+     * @param skillType The skill to get the level for
+     * @return the level of a given skill
+     * @deprecated Use {@link #getLevel(Player, String)} instead
+     */
+    @Deprecated
+    public static int getLevel(Player player, SkillType skillType) {
+        return UserManager.getPlayer(player).getProfile().getSkillLevel(skillType);
+    }
+
+    /**
+     * 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
+     */
+    public static int getLevel(Player player, String skillType) {
+        return UserManager.getPlayer(player).getProfile().getSkillLevel(SkillType.getSkill(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();
+    }
+
+    /**
+     * 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
+     */
+    public static int getLevelCap(String skillType) {
+        return Config.getInstance().getLevelCap(SkillType.getSkill(skillType));
+    }
+
+    /**
+     * Get the power level cap.
+     * </br>
+     * This function is designed for API usage.
+     *
+     * @return the power level cap of a given skill
+     */
+    public static int getPowerLevelCap() {
+        return Config.getInstance().getPowerLevelCap();
+    }
+
+    /**
+     * 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
+     * @deprecated Use {@link #setLevel(Player, String, int)} instead
+     */
+    @Deprecated
+    public static void setLevel(Player player, SkillType skillType, int skillLevel) {
+        UserManager.getPlayer(player).getProfile().modifySkill(skillType, skillLevel);
+    }
+
+    /**
+     * Sets the level of a player in a specific skill type.
+     * </br>
+     * This function is designed for API usage.
+     *
+     * @param player The player to set the level of
+     * @param skillType The skill to set the level for
+     * @param skillLevel The value to set the level to
+     */
+    public static void setLevel(Player player, String skillType, int skillLevel) {
+        UserManager.getPlayer(player).getProfile().modifySkill(SkillType.getSkill(skillType), skillLevel);
+    }
+
+    /**
+     * Sets the XP of a player in a specific skill type.
+     * </br>
+     * This function is designed for API usage.
+     *
+     * @param player The player to set the XP of
+     * @param skillType The skill to set the XP for
+     * @param newValue The value to set the XP to
+     * @deprecated Use {@link #setXP(Player, String, int)} instead
+     */
+    @Deprecated
+    public static void setXP(Player player, SkillType skillType, int newValue) {
+        UserManager.getPlayer(player).getProfile().setSkillXpLevel(skillType, newValue);
+    }
+
+    /**
+     * Sets the XP of a player in a specific skill type.
+     * </br>
+     * This function is designed for API usage.
+     *
+     * @param player The player to set the XP of
+     * @param skillType The skill to set the XP for
+     * @param newValue The value to set the XP to
+     */
+    public static void setXP(Player player, String skillType, int newValue) {
+        UserManager.getPlayer(player).getProfile().setSkillXpLevel(SkillType.getSkill(skillType), newValue);
+    }
+
+    /**
+     * Removes XP from a player in a specific skill type.
+     * </br>
+     * This function is designed for API usage.
+     *
+     * @param player The player to change the XP of
+     * @param skillType The skill to change the XP for
+     * @param xp The amount of XP to remove
+     * @deprecated Use {@link #removeXP(Player, String, int)} instead
+     */
+    @Deprecated
+    public static void removeXP(Player player, SkillType skillType, int xp) {
+        UserManager.getPlayer(player).getProfile().removeXp(skillType, xp);
+    }
+
+    /**
+     * Removes XP from a player in a specific skill type.
+     * </br>
+     * This function is designed for API usage.
+     *
+     * @param player The player to change the XP of
+     * @param skillType The skill to change the XP for
+     * @param xp The amount of XP to remove
+     */
+    public static void removeXP(Player player, String skillType, int xp) {
+        UserManager.getPlayer(player).getProfile().removeXp(SkillType.getSkill(skillType), xp);
+    }
+
+    /**
+     * Check the XP of a player. This should be called after giving XP to process level-ups.
+     *
+     * @param player The player to check
+     * @param skillType The skill to check
+     * @deprecated Calling this function is no longer needed and should be avoided
+     */
+    @Deprecated
+    private static void checkXP(Player player, SkillType skillType) {
+        SkillUtils.xpCheckSkill(skillType, player, UserManager.getProfile(player));
+    }
+}

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

@@ -1,145 +1,174 @@
-package com.gmail.nossr50.api;
+package com.gmail.nossr50.api;
-
+
-import java.util.List;
+import java.util.ArrayList;
-
+import java.util.List;
-import org.bukkit.entity.Player;
+
-
+import org.bukkit.OfflinePlayer;
-import com.gmail.nossr50.party.Party;
+import org.bukkit.entity.Player;
-import com.gmail.nossr50.party.PartyManager;
+
-import com.gmail.nossr50.util.Users;
+import com.gmail.nossr50.datatypes.party.Party;
-
+import com.gmail.nossr50.party.PartyManager;
-public final class PartyAPI {
+import com.gmail.nossr50.util.player.UserManager;
-
+
-    private PartyAPI() {}
+public final class PartyAPI {
-
+    private PartyAPI() {}
-    /**
+
-     * Get the name of the party a player is in.
+    /**
-     * </br>
+     * Get the name of the party a player is in.
-     * This function is designed for API usage.
+     * </br>
-     *
+     * This function is designed for API usage.
-     * @param player The player to check the party name of
+     *
-     * @return the name of the player's party
+     * @param player The player to check the party name of
-     */
+     * @return the name of the player's party
-    public static String getPartyName(Player player) {
+     */
-        return Users.getProfile(player).getParty().getName();
+    public static String getPartyName(Player player) {
-    }
+        return UserManager.getPlayer(player).getParty().getName();
-
+    }
-    /**
+
-     * Checks if a player is in a party.
+    /**
-     * </br>
+     * Checks if a player is in a party.
-     * This function is designed for API usage.
+     * </br>
-     *
+     * This function is designed for API usage.
-     * @param player The player to check
+     *
-     * @return true if the player is in a party, false otherwise
+     * @param player The player to check
-     */
+     * @return true if the player is in a party, false otherwise
-    public static boolean inParty(Player player) {
+     */
-        return Users.getProfile(player).inParty();
+    public static boolean inParty(Player player) {
-    }
+        return UserManager.getPlayer(player).inParty();
-
+    }
-    /**
+
-     * Check if two players are in the same party.
+    /**
-     * </br>
+     * Check if two players are in the same party.
-     * This function is designed for API usage.
+     * </br>
-     *
+     * This function is designed for API usage.
-     * @param playera The first player to check
+     *
-     * @param playerb The second player to check
+     * @param playera The first player to check
-     * @return true if the two players are in the same party, false otherwise
+     * @param playerb The second player to check
-     */
+     * @return true if the two players are in the same party, false otherwise
-    public static boolean inSameParty(Player playera, Player playerb) {
+     */
-        return PartyManager.getInstance().inSameParty(playera, playerb);
+    public static boolean inSameParty(Player playera, Player playerb) {
-    }
+        return PartyManager.inSameParty(playera, playerb);
-
+    }
-    /**
+
-     * Get a list of all current parties.
+    /**
-     * </br>
+     * Get a list of all current parties.
-     * This function is designed for API usage.
+     * </br>
-     *
+     * This function is designed for API usage.
-     * @return the list of parties.
+     *
-     */
+     * @return the list of parties.
-    public static List<Party> getParties() {
+     */
-        return PartyManager.getInstance().getParties();
+    public static List<Party> getParties() {
-    }
+        return PartyManager.getParties();
-
+    }
-    /**
+
-     * Add a player to a party.
+    /**
-     * </br>
+     * Add a player to a party.
-     * This function is designed for API usage.
+     * </br>
-     *
+     * This function is designed for API usage.
-     * @param player The player to add to the party
+     *
-     * @param partyName The party to add the player to
+     * @param player The player to add to the party
-     */
+     * @param partyName The party to add the player to
-    public static void addToParty(Player player, String partyName) {
+     */
-        PartyManager.getInstance().addToParty(player.getName(), Users.getProfile(player), PartyManager.getInstance().getParty(partyName)); //TODO this will throw a NPE if the party doesn't exist
+    public static void addToParty(Player player, String partyName) {
-    }
+        Party party = PartyManager.getParty(partyName);
-
+
-    /**
+        if (party == null) {
-     * Remove a player from a party.
+            party = new Party();
-     * </br>
+            party.setName(partyName);
-     * This function is designed for API usage.
+            party.setLeader(player.getName());
-     *
+        }
-     * @param player The player to remove
+
-     */
+        PartyManager.addToParty(player, UserManager.getPlayer(player), party);
-    public static void removeFromParty(Player player) {
+    }
-        PartyManager.getInstance().removeFromParty(player.getName(), Users.getProfile(player).getParty());
+
-    }
+    /**
-
+     * Remove a player from a party.
-    /**
+     * </br>
-     * Get the leader of a party.
+     * This function is designed for API usage.
-     * </br>
+     *
-     * This function is designed for API usage.
+     * @param player The player to remove
-     *
+     */
-     * @param partyName The party name
+    public static void removeFromParty(Player player) {
-     * @return the leader of the party
+        PartyManager.removeFromParty(player, UserManager.getPlayer(player).getParty());
-     */
+    }
-    public static String getPartyLeader(String partyName) {
+
-        return PartyManager.getInstance().getPartyLeader(partyName);
+    /**
-    }
+     * Get the leader of a party.
-
+     * </br>
-    /**
+     * This function is designed for API usage.
-     * Set the leader of a party.
+     *
-     * </br>
+     * @param partyName The party name
-     * This function is designed for API usage.
+     * @return the leader of the party
-     *
+     */
-     * @param partyName The name of the party to set the leader of
+    public static String getPartyLeader(String partyName) {
-     * @param player The player to set as leader
+        return PartyManager.getPartyLeader(partyName);
-     */
+    }
-    public static void setPartyLeader(String partyName, String player) {
+
-        PartyManager.getInstance().setPartyLeader(player, PartyManager.getInstance().getParty(partyName));
+    /**
-    }
+     * Set the leader of a party.
-
+     * </br>
-    /**
+     * This function is designed for API usage.
-     * Get a list of all players in this player's party.
+     *
-     * </br>
+     * @param partyName The name of the party to set the leader of
-     * This function is designed for API usage.
+     * @param player The player to set as leader
-     *
+     */
-     * @param player The player to check
+    public static void setPartyLeader(String partyName, String player) {
-     * @return all the players in the player's party
+        PartyManager.setPartyLeader(player, PartyManager.getParty(partyName));
-     */
+    }
-    public static List<String> getAllMembers(Player player) {
+
-        return PartyManager.getInstance().getAllMembers(player);
+    /**
-    }
+     * Get a list of all players in this player's party.
-
+     * </br>
-    /**
+     * This function is designed for API usage.
-     * Get a list of all online players in this party.
+     *
-     * </br>
+     * @param player The player to check
-     * This function is designed for API usage.
+     * @return all the players in the player's party
-     *
+     * @deprecated
-     * @param partyName The party to check
+     */
-     * @return all online players in this party
+    @Deprecated
-     */
+    public static List<String> getAllMembers(Player player) {
-    public static List<Player> getOnlineMembers(String partyName) {
+        List<String> memberNames = new ArrayList<String>();
-        return PartyManager.getInstance().getOnlineMembers(partyName);
+
-    }
+        for (OfflinePlayer member : PartyManager.getAllMembers(player)) {
-
+            memberNames.add(member.getName());
-    /**
+        }
-     * Get a list of all online players in this player's party.
+
-     * </br>
+        return memberNames;
-     * This function is designed for API usage.
+    }
-     *
+
-     * @param player The player to check
+    /**
-     * @return all online players in the player's party
+     * Get a list of all players in this player's party.
-     */
+     * </br>
-    public static List<Player> getOnlineMembers(Player player) {
+     * This function is designed for API usage.
-        return PartyManager.getInstance().getOnlineMembers(player);
+     *
-    }
+     * @param player The player to check
-}
+     * @return all the players in the player's party
+     */
+    public static List<OfflinePlayer> getOnlineAndOfflineMembers(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/SpoutHudAPI.java

@@ -0,0 +1,29 @@
+package com.gmail.nossr50.api;
+
+import org.bukkit.entity.Player;
+
+import com.gmail.nossr50.config.spout.SpoutConfig;
+import com.gmail.nossr50.datatypes.spout.huds.HudType;
+import com.gmail.nossr50.util.player.UserManager;
+
+public class SpoutHudAPI {
+    private SpoutHudAPI() {}
+
+    /**
+     * Disable the mcMMO XP bar for a player.
+     * </br>
+     * This function is designed for API usage.
+     */
+    public static void disableXpBar(Player player) {
+        UserManager.getPlayer(player).getProfile().setHudType(HudType.DISABLED);
+    }
+
+    /**
+     * Disable the mcMMO XP bar for the server.
+     * </br>
+     * This function is designed for API usage.
+     */
+    public static void disableXpBar() {
+        SpoutConfig.getInstance().setXPBarEnabled(false);
+    }
+}

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

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

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

@@ -0,0 +1,78 @@
+package com.gmail.nossr50.chat;
+
+import org.bukkit.ChatColor;
+import org.bukkit.entity.Player;
+import org.bukkit.plugin.Plugin;
+
+import com.gmail.nossr50.mcMMO;
+import com.gmail.nossr50.config.Config;
+import com.gmail.nossr50.datatypes.party.Party;
+import com.gmail.nossr50.events.chat.McMMOAdminChatEvent;
+import com.gmail.nossr50.events.chat.McMMOPartyChatEvent;
+import com.gmail.nossr50.locale.LocaleLoader;
+
+public final class ChatManager {
+    public ChatManager () {}
+
+    public static void handleAdminChat(Plugin plugin, String playerName, String displayName, String message, boolean isAsync) {
+        McMMOAdminChatEvent chatEvent = new McMMOAdminChatEvent(plugin, playerName, displayName, message, isAsync);
+        mcMMO.p.getServer().getPluginManager().callEvent(chatEvent);
+
+        if (chatEvent.isCancelled()) {
+            return;
+        }
+
+        if (Config.getInstance().getAdminDisplayNames()) {
+            displayName = chatEvent.getDisplayName();
+        }
+        else {
+            displayName = chatEvent.getSender();
+        }
+
+        String adminMessage = chatEvent.getMessage();
+
+        mcMMO.p.getServer().broadcast(LocaleLoader.getString("Commands.AdminChat.Prefix", displayName) + adminMessage, "mcmmo.chat.adminchat");
+    }
+
+    public static void handleAdminChat(Plugin plugin, String senderName, String message) {
+        handleAdminChat(plugin, senderName, senderName, message);
+    }
+
+    public static void handleAdminChat(Plugin plugin, String playerName, String displayName, String message) {
+        handleAdminChat(plugin, playerName, displayName, message, false);
+    }
+
+    public static void handlePartyChat(Plugin plugin, Party party, String playerName, String displayName, String message, boolean isAsync) {
+        String partyName = party.getName();
+
+        McMMOPartyChatEvent chatEvent = new McMMOPartyChatEvent(plugin, playerName, displayName, partyName, message, isAsync);
+        mcMMO.p.getServer().getPluginManager().callEvent(chatEvent);
+
+        if (chatEvent.isCancelled()) {
+            return;
+        }
+
+        if (Config.getInstance().getPartyDisplayNames()) {
+            displayName = chatEvent.getDisplayName();
+        }
+        else {
+            displayName = chatEvent.getSender();
+        }
+
+        String partyMessage = chatEvent.getMessage();
+
+        for (Player member : party.getOnlineMembers()) {
+            member.sendMessage(LocaleLoader.getString("Commands.Party.Chat.Prefix", displayName) + partyMessage);
+        }
+
+        mcMMO.p.getLogger().info("[P](" + partyName + ")" + "<" + ChatColor.stripColor(displayName) + "> " + partyMessage);
+    }
+
+    public static void handlePartyChat(Plugin plugin, Party party, String senderName, String message) {
+        handlePartyChat(plugin, party, senderName, senderName, message);
+    }
+
+    public static void handlePartyChat(Plugin plugin, Party party, String playerName, String displayName, String message) {
+        handlePartyChat(plugin, party, playerName, displayName, message, false);
+    }
+}

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

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

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

@@ -1,160 +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.LocaleLoader;
-import com.gmail.nossr50.util.Permissions;
-import com.gmail.nossr50.util.Skills;
-import com.gmail.nossr50.util.Users;
-
-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 (!Permissions.getInstance().permission(player, permission)) {
-                player.sendMessage(LocaleLoader.getString("mcMMO.NoPermission"));
-                return true;
-            }
-        }
-
-        return false;
-    }
-
-    public static boolean noConsoleUsage(CommandSender sender) {
-        if (!(sender instanceof Player)) {
-            sender.sendMessage(LocaleLoader.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
-     */
-    public static void printGatheringSkills(Player inspect, CommandSender display) {
-        if (Skills.hasGatheringSkills(inspect)) {
-            PlayerProfile profile = Users.getProfile(inspect);
-
-            if (profile == null) {
-                display.sendMessage(LocaleLoader.getString("Commands.DoesNotExist"));
-                return;
-            }
-
-            display.sendMessage(LocaleLoader.getString("Stats.Header.Gathering"));
-
-            if (Permissions.getInstance().excavation(inspect)) {
-                display.sendMessage(LocaleLoader.getString("Skills.Stats", new Object[] { LocaleLoader.getString("Excavation.Listener"), profile.getSkillLevel(SkillType.EXCAVATION), profile.getSkillXpLevel(SkillType.EXCAVATION), profile.getXpToLevel(SkillType.EXCAVATION) }));
-            }
-
-            if (Permissions.getInstance().fishing(inspect)) {
-                display.sendMessage(LocaleLoader.getString("Skills.Stats", new Object[] { LocaleLoader.getString("Fishing.Listener"), profile.getSkillLevel(SkillType.FISHING), profile.getSkillXpLevel(SkillType.FISHING), profile.getXpToLevel(SkillType.FISHING) }));
-            }
-
-            if (Permissions.getInstance().herbalism(inspect)) {
-                display.sendMessage(LocaleLoader.getString("Skills.Stats", new Object[] { LocaleLoader.getString("Herbalism.Listener"), profile.getSkillLevel(SkillType.HERBALISM), profile.getSkillXpLevel(SkillType.HERBALISM), profile.getXpToLevel(SkillType.HERBALISM) }));
-            }
-
-            if (Permissions.getInstance().mining(inspect)) {
-                display.sendMessage(LocaleLoader.getString("Skills.Stats", new Object[] { LocaleLoader.getString("Mining.Listener"), profile.getSkillLevel(SkillType.MINING), profile.getSkillXpLevel(SkillType.MINING), profile.getXpToLevel(SkillType.MINING) }));
-            }
-
-            if (Permissions.getInstance().woodcutting(inspect)) {
-                display.sendMessage(LocaleLoader.getString("Skills.Stats", new Object[] { LocaleLoader.getString("Woodcutting.Listener"), profile.getSkillLevel(SkillType.WOODCUTTING), profile.getSkillXpLevel(SkillType.WOODCUTTING), profile.getXpToLevel(SkillType.WOODCUTTING) }));
-            }
-        }
-    }
-
-    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
-     */
-    public static void printCombatSkills(Player inspect, CommandSender display) {
-        if (Skills.hasCombatSkills(inspect)) {
-            PlayerProfile profile = Users.getProfile(inspect);
-
-            if (profile == null) {
-                display.sendMessage(LocaleLoader.getString("Commands.DoesNotExist"));
-                return;
-            }
-
-            display.sendMessage(LocaleLoader.getString("Stats.Header.Combat"));
-
-            if (Permissions.getInstance().axes(inspect)) {
-                display.sendMessage(LocaleLoader.getString("Skills.Stats", new Object[] { LocaleLoader.getString("Axes.Listener"), profile.getSkillLevel(SkillType.AXES), profile.getSkillXpLevel(SkillType.AXES), profile.getXpToLevel(SkillType.AXES) }));
-            }
-
-            if (Permissions.getInstance().archery(inspect)) {
-                display.sendMessage(LocaleLoader.getString("Skills.Stats", new Object[] { LocaleLoader.getString("Archery.Listener"), profile.getSkillLevel(SkillType.ARCHERY), profile.getSkillXpLevel(SkillType.ARCHERY), profile.getXpToLevel(SkillType.ARCHERY) }));
-            }
-
-            if (Permissions.getInstance().swords(inspect)) {
-                display.sendMessage(LocaleLoader.getString("Skills.Stats", new Object[] { LocaleLoader.getString("Swords.Listener"), profile.getSkillLevel(SkillType.SWORDS), profile.getSkillXpLevel(SkillType.SWORDS), profile.getXpToLevel(SkillType.SWORDS) }));
-            }
-
-            if (Permissions.getInstance().taming(inspect)) {
-                display.sendMessage(LocaleLoader.getString("Skills.Stats", new Object[] { LocaleLoader.getString("Taming.Listener"), profile.getSkillLevel(SkillType.TAMING), profile.getSkillXpLevel(SkillType.TAMING), profile.getXpToLevel(SkillType.TAMING) }));
-            }
-
-            if (Permissions.getInstance().unarmed(inspect)) {
-                display.sendMessage(LocaleLoader.getString("Skills.Stats", new Object[] { LocaleLoader.getString("Unarmed.Listener"), profile.getSkillLevel(SkillType.UNARMED), profile.getSkillXpLevel(SkillType.UNARMED), profile.getXpToLevel(SkillType.UNARMED) }));
-            }
-        }
-    }
-
-    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
-     */
-    public static void printMiscSkills(Player inspect, CommandSender display) {
-        if (Skills.hasMiscSkills(inspect)) {
-            PlayerProfile profile = Users.getProfile(inspect);
-
-            if (profile == null) {
-                display.sendMessage(LocaleLoader.getString("Commands.DoesNotExist"));
-                return;
-            }
-
-            display.sendMessage(LocaleLoader.getString("Stats.Header.Misc"));
-
-            if (Permissions.getInstance().acrobatics(inspect)) {
-                display.sendMessage(LocaleLoader.getString("Skills.Stats", new Object[] { LocaleLoader.getString("Acrobatics.Listener"), profile.getSkillLevel(SkillType.ACROBATICS), profile.getSkillXpLevel(SkillType.ACROBATICS), profile.getXpToLevel(SkillType.ACROBATICS) }));
-            }
-
-            if (Permissions.getInstance().repair(inspect)) {
-                display.sendMessage(LocaleLoader.getString("Skills.Stats", new Object[] { LocaleLoader.getString("Repair.Listener"), profile.getSkillLevel(SkillType.REPAIR), profile.getSkillXpLevel(SkillType.REPAIR), profile.getXpToLevel(SkillType.REPAIR) }));
-            }
-        }
-    }
-
-    public static void printMiscSkills(Player player) {
-        printMiscSkills(player, player);
-    }
-}

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

@@ -0,0 +1,79 @@
+package com.gmail.nossr50.commands;
+
+import org.bukkit.command.Command;
+import org.bukkit.command.CommandExecutor;
+import org.bukkit.command.CommandSender;
+import org.bukkit.entity.Player;
+
+import com.gmail.nossr50.datatypes.player.McMMOPlayer;
+import com.gmail.nossr50.datatypes.player.PlayerProfile;
+import com.gmail.nossr50.locale.LocaleLoader;
+import com.gmail.nossr50.util.Permissions;
+import com.gmail.nossr50.util.player.UserManager;
+
+public class McabilityCommand implements CommandExecutor {
+    @Override
+    public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
+        McMMOPlayer mcMMOPlayer;
+
+        switch (args.length) {
+            case 0:
+                if (!Permissions.mcability(sender)) {
+                    sender.sendMessage(command.getPermissionMessage());
+                    return true;
+                }
+
+                mcMMOPlayer = UserManager.getPlayer((Player) sender);
+
+                if (mcMMOPlayer.getAbilityUse()) {
+                    sender.sendMessage(LocaleLoader.getString("Commands.Ability.Off"));
+                }
+                else {
+                    sender.sendMessage(LocaleLoader.getString("Commands.Ability.On"));
+                }
+
+                mcMMOPlayer.toggleAbilityUse();
+                return true;
+
+            case 1:
+                if (!Permissions.mcabilityOthers(sender)) {
+                    sender.sendMessage(command.getPermissionMessage());
+                    return true;
+                }
+
+                mcMMOPlayer = UserManager.getPlayer(args[0]);
+
+                if (mcMMOPlayer == null) {
+                    PlayerProfile playerProfile = new PlayerProfile(args[0], false);
+
+                    if (!playerProfile.isLoaded()) {
+                        sender.sendMessage(LocaleLoader.getString("Commands.DoesNotExist"));
+                        return true;
+                    }
+
+                    sender.sendMessage(LocaleLoader.getString("Commands.Offline"));
+                    return true;
+                }
+
+                Player player = mcMMOPlayer.getPlayer();
+
+                if (!player.isOnline()) {
+                    sender.sendMessage(LocaleLoader.getString("Commands.Offline"));
+                    return true;
+                }
+
+                if (mcMMOPlayer.getAbilityUse()) {
+                    player.sendMessage(LocaleLoader.getString("Commands.Ability.Off"));
+                }
+                else {
+                    player.sendMessage(LocaleLoader.getString("Commands.Ability.On"));
+                }
+
+                mcMMOPlayer.toggleAbilityUse();
+                return true;
+
+            default:
+                return false;
+        }
+    }
+}

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

@@ -0,0 +1,88 @@
+package com.gmail.nossr50.commands;
+
+import org.bukkit.command.Command;
+import org.bukkit.command.CommandExecutor;
+import org.bukkit.command.CommandSender;
+import org.bukkit.entity.Player;
+
+import com.gmail.nossr50.datatypes.player.McMMOPlayer;
+import com.gmail.nossr50.datatypes.player.PlayerProfile;
+import com.gmail.nossr50.locale.LocaleLoader;
+import com.gmail.nossr50.util.Permissions;
+import com.gmail.nossr50.util.player.UserManager;
+
+public class McgodCommand implements CommandExecutor {
+    @Override
+    public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
+        McMMOPlayer mcMMOPlayer;
+
+        switch (args.length) {
+            case 0:
+                if (!Permissions.mcgod(sender)) {
+                    sender.sendMessage(command.getPermissionMessage());
+                    return true;
+                }
+
+                if (!(sender instanceof Player)) {
+                    return false;
+                }
+
+                mcMMOPlayer = UserManager.getPlayer((Player) sender);
+
+                if (mcMMOPlayer == null) {
+                    sender.sendMessage(LocaleLoader.getString("Commands.DoesNotExist"));
+                    return true;
+                }
+
+                if (mcMMOPlayer.getGodMode()) {
+                    sender.sendMessage(LocaleLoader.getString("Commands.GodMode.Disabled"));
+                }
+                else {
+                    sender.sendMessage(LocaleLoader.getString("Commands.GodMode.Enabled"));
+                }
+
+                mcMMOPlayer.toggleGodMode();
+                return true;
+
+            case 1:
+                if (!Permissions.mcgodOthers(sender)) {
+                    sender.sendMessage(command.getPermissionMessage());
+                    return true;
+                }
+
+                mcMMOPlayer = UserManager.getPlayer(args[0]);
+
+                if (mcMMOPlayer == null) {
+                    PlayerProfile playerProfile = new PlayerProfile(args[0], false);
+
+                    if (!playerProfile.isLoaded()) {
+                        sender.sendMessage(LocaleLoader.getString("Commands.DoesNotExist"));
+                        return true;
+                    }
+
+                    sender.sendMessage(LocaleLoader.getString("Commands.Offline"));
+                    return true;
+                }
+
+                Player player = mcMMOPlayer.getPlayer();
+
+                if (!player.isOnline()) {
+                    sender.sendMessage(LocaleLoader.getString("Commands.Offline"));
+                    return true;
+                }
+
+                if (mcMMOPlayer.getGodMode()) {
+                    player.sendMessage(LocaleLoader.getString("Commands.GodMode.Disabled"));
+                }
+                else {
+                    player.sendMessage(LocaleLoader.getString("Commands.GodMode.Enabled"));
+                }
+
+                mcMMOPlayer.toggleGodMode();
+                return true;
+
+            default:
+                return false;
+        }
+    }
+}

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

@@ -0,0 +1,113 @@
+package com.gmail.nossr50.commands;
+
+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.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.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()) {
+                    if (mcMMO.spoutEnabled && sender instanceof SpoutPlayer) {
+                        SpoutPlayer spoutPlayer = (SpoutPlayer) sender;
+                        spoutPlayer.sendNotification(LocaleLoader.getString("Spout.Donate"), ChatColor.GREEN + "gjmcferrin@gmail.com", Material.DIAMOND);
+                    }
+
+                    sender.sendMessage(LocaleLoader.getString("MOTD.Donate"));
+                    sender.sendMessage(ChatColor.GOLD + " - " + ChatColor.GREEN + "gjmcferrin@gmail.com" + ChatColor.GOLD + " Paypal");
+                }
+
+                sender.sendMessage(LocaleLoader.getString("MOTD.Version", mcMMO.p.getDescription().getVersion()));
+                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(LocaleLoader.getString("Commands.SkillInfo"));
+    }
+}

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

@@ -0,0 +1,33 @@
+package com.gmail.nossr50.commands;
+
+import org.bukkit.command.Command;
+import org.bukkit.command.CommandExecutor;
+import org.bukkit.command.CommandSender;
+import org.bukkit.entity.Player;
+
+import com.gmail.nossr50.datatypes.player.McMMOPlayer;
+import com.gmail.nossr50.locale.LocaleLoader;
+import com.gmail.nossr50.util.player.UserManager;
+
+public class McnotifyCommand implements CommandExecutor {
+    @Override
+    public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
+        switch (args.length) {
+            case 0:
+                McMMOPlayer mcMMOPlayer = UserManager.getPlayer((Player) sender);
+
+                if (mcMMOPlayer.useChatNotifications()) {
+                    sender.sendMessage(LocaleLoader.getString("Commands.Notifications.Off"));
+                }
+                else {
+                    sender.sendMessage(LocaleLoader.getString("Commands.Notifications.On"));
+                }
+
+                mcMMOPlayer.toggleChatNotifications();
+                return true;
+
+            default:
+                return false;
+        }
+    }
+}

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

@@ -0,0 +1,80 @@
+package com.gmail.nossr50.commands;
+
+import org.bukkit.command.Command;
+import org.bukkit.command.CommandExecutor;
+import org.bukkit.command.CommandSender;
+import org.bukkit.entity.Player;
+
+import com.gmail.nossr50.datatypes.player.McMMOPlayer;
+import com.gmail.nossr50.datatypes.player.PlayerProfile;
+import com.gmail.nossr50.locale.LocaleLoader;
+import com.gmail.nossr50.util.Permissions;
+import com.gmail.nossr50.util.player.UserManager;
+
+public class McrefreshCommand implements CommandExecutor {
+    @Override
+    public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
+        McMMOPlayer mcMMOPlayer;
+
+        switch (args.length) {
+            case 0:
+                if (!Permissions.mcrefresh(sender)) {
+                    sender.sendMessage(command.getPermissionMessage());
+                    return true;
+                }
+
+                if (!(sender instanceof Player)) {
+                    return false;
+                }
+
+                mcMMOPlayer = UserManager.getPlayer(sender.getName());
+
+                mcMMOPlayer.setRecentlyHurt(0);
+                mcMMOPlayer.getProfile().resetCooldowns();
+                mcMMOPlayer.resetToolPrepMode();
+                mcMMOPlayer.resetAbilityMode();
+
+                sender.sendMessage(LocaleLoader.getString("Ability.Generic.Refresh"));
+                return true;
+
+            case 1:
+                if (!Permissions.mcrefreshOthers(sender)) {
+                    sender.sendMessage(command.getPermissionMessage());
+                    return true;
+                }
+
+                mcMMOPlayer = UserManager.getPlayer(args[0]);
+
+                if (mcMMOPlayer == null) {
+                    PlayerProfile playerProfile = new PlayerProfile(args[0], false);
+
+                    if (!playerProfile.isLoaded()) {
+                        sender.sendMessage(LocaleLoader.getString("Commands.DoesNotExist"));
+                        return true;
+                    }
+
+                    sender.sendMessage(LocaleLoader.getString("Commands.Offline"));
+                    return true;
+                }
+
+                Player player = mcMMOPlayer.getPlayer();
+
+                if (!player.isOnline()) {
+                    sender.sendMessage(LocaleLoader.getString("Commands.Offline"));
+                    return true;
+                }
+
+                mcMMOPlayer.setRecentlyHurt(0);
+                mcMMOPlayer.getProfile().resetCooldowns();
+                mcMMOPlayer.resetToolPrepMode();
+                mcMMOPlayer.resetAbilityMode();
+
+                player.sendMessage(LocaleLoader.getString("Ability.Generic.Refresh"));
+                sender.sendMessage(LocaleLoader.getString("Commands.mcrefresh.Success", args[0]));
+                return true;
+
+            default:
+                return false;
+        }
+    }
+}

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

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

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

@@ -0,0 +1,69 @@
+package com.gmail.nossr50.commands;
+
+import org.bukkit.command.Command;
+import org.bukkit.command.CommandExecutor;
+import org.bukkit.command.CommandSender;
+
+import com.gmail.nossr50.mcMMO;
+import com.gmail.nossr50.config.Config;
+import com.gmail.nossr50.locale.LocaleLoader;
+import com.gmail.nossr50.util.Permissions;
+import com.gmail.nossr50.util.StringUtils;
+
+public class XprateCommand implements CommandExecutor {
+    private static double originalRate = Config.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();
+                }
+
+                Config.getInstance().setExperienceGainsGlobalMultiplier(originalRate);
+                return true;
+
+            case 2:
+                if (!StringUtils.isInt(args[0])) {
+                    return false;
+                }
+
+                if (!Permissions.xprateSet(sender)) {
+                    sender.sendMessage(command.getPermissionMessage());
+                    return true;
+                }
+
+                if (!args[1].equalsIgnoreCase("true") && !args[1].equalsIgnoreCase("false")) {
+                    return false;
+                }
+
+                mcMMO.p.setXPEventEnabled(Boolean.valueOf(args[1]));
+                int newXpRate = Integer.parseInt(args[0]);
+                Config.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;
+        }
+    }
+}

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

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

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

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

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

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

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

@@ -0,0 +1,45 @@
+package com.gmail.nossr50.commands.database;
+
+import org.bukkit.command.Command;
+import org.bukkit.command.CommandExecutor;
+import org.bukkit.command.CommandSender;
+
+import com.gmail.nossr50.config.Config;
+import com.gmail.nossr50.database.DatabaseManager;
+import com.gmail.nossr50.database.LeaderboardManager;
+import com.gmail.nossr50.locale.LocaleLoader;
+import com.gmail.nossr50.util.Permissions;
+
+public class McpurgeCommand implements CommandExecutor {
+    @Override
+    public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
+        if (!Permissions.mcpurge(sender)) {
+            sender.sendMessage(command.getPermissionMessage());
+            return true;
+        }
+
+        switch (args.length) {
+            case 0:
+                if (Config.getInstance().getUseMySQL()) {
+                    DatabaseManager.purgePowerlessSQL();
+
+                    if (Config.getInstance().getOldUsersCutoff() != -1) {
+                        DatabaseManager.purgeOldSQL();
+                    }
+                }
+                else {
+                    LeaderboardManager.purgePowerlessFlatfile();
+
+                    if (Config.getInstance().getOldUsersCutoff() != -1) {
+                        LeaderboardManager.purgeOldFlatfile();
+                    }
+                }
+
+                sender.sendMessage(LocaleLoader.getString("Commands.mcpurge.Success"));
+                return true;
+
+            default:
+                return false;
+        }
+    }
+}

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

@@ -0,0 +1,51 @@
+package com.gmail.nossr50.commands.database;
+
+import org.bukkit.command.Command;
+import org.bukkit.command.CommandExecutor;
+import org.bukkit.command.CommandSender;
+
+import com.gmail.nossr50.config.Config;
+import com.gmail.nossr50.database.DatabaseManager;
+import com.gmail.nossr50.database.LeaderboardManager;
+import com.gmail.nossr50.locale.LocaleLoader;
+import com.gmail.nossr50.util.Permissions;
+
+public class McremoveCommand implements CommandExecutor {
+    @Override
+    public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
+        if (!Permissions.mcremove(sender)) {
+            sender.sendMessage(command.getPermissionMessage());
+            return true;
+        }
+
+        switch (args.length) {
+            case 1:
+                /* MySQL */
+                if (Config.getInstance().getUseMySQL()) {
+                    String tablePrefix = Config.getInstance().getMySQLTablePrefix();
+
+                    if (DatabaseManager.update("DELETE FROM " + tablePrefix + "users WHERE " + tablePrefix + "users.user = '" + args[0] + "'") != 0) {
+                        DatabaseManager.profileCleanup(args[0]);
+                        sender.sendMessage(LocaleLoader.getString("Commands.mcremove.Success", args[0]));
+                    }
+                    else {
+                        sender.sendMessage(LocaleLoader.getString("Commands.DoesNotExist"));
+                    }
+                }
+                else {
+                    if (LeaderboardManager.removeFlatFileUser(args[0])) {
+                        DatabaseManager.profileCleanup(args[0]);
+                        sender.sendMessage(LocaleLoader.getString("Commands.mcremove.Success", args[0]));
+                    }
+                    else {
+                        sender.sendMessage(LocaleLoader.getString("Commands.DoesNotExist"));
+                    }
+                }
+
+                return true;
+
+            default:
+                return false;
+        }
+    }
+}

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

@@ -0,0 +1,51 @@
+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.config.Config;
+import com.gmail.nossr50.locale.LocaleLoader;
+import com.gmail.nossr50.runnables.database.SQLConversionTask;
+import com.gmail.nossr50.util.Permissions;
+import com.gmail.nossr50.util.player.UserManager;
+
+public class MmoupdateCommand implements CommandExecutor {
+    @Override
+    public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
+        if (!Permissions.mmoupdate(sender)) {
+            sender.sendMessage(command.getPermissionMessage());
+            return true;
+        }
+
+        switch (args.length) {
+            case 0:
+                sender.sendMessage(LocaleLoader.getString("Commands.mmoupdate.Start"));
+                UserManager.clearAll();
+                convertToMySQL();
+
+                for (Player player : mcMMO.p.getServer().getOnlinePlayers()) {
+                    UserManager.addUser(player);
+                }
+
+                sender.sendMessage(LocaleLoader.getString("Commands.mmoupdate.Finish"));
+                return true;
+
+            default:
+                return false;
+        }
+    }
+
+    /**
+     * Convert FlatFile data to MySQL data.
+     */
+    private void convertToMySQL() {
+        if (!Config.getInstance().getUseMySQL()) {
+            return;
+        }
+
+        mcMMO.p.getServer().getScheduler().runTaskLaterAsynchronously(mcMMO.p, new SQLConversionTask(), 1);
+    }
+}

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

@@ -0,0 +1,154 @@
+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.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.Permissions;
+import com.gmail.nossr50.util.StringUtils;
+import com.gmail.nossr50.util.player.UserManager;
+import com.gmail.nossr50.util.skills.SkillUtils;
+
+public class AddlevelsCommand implements CommandExecutor {
+    @Override
+    public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
+        PlayerProfile profile;
+        int levels;
+        boolean allSkills = false;
+        SkillType skill = null;
+
+        switch (args.length) {
+            case 2:
+                if (!Permissions.addlevels(sender)) {
+                    sender.sendMessage(command.getPermissionMessage());
+                    return true;
+                }
+
+                if (!(sender instanceof Player)) {
+                    return false;
+                }
+
+                if (args[0].equalsIgnoreCase("all")) {
+                    allSkills = true;
+                }
+                else if (!SkillUtils.isSkill(args[0])) {
+                    sender.sendMessage(LocaleLoader.getString("Commands.Skill.Invalid"));
+                    return true;
+                }
+
+                if (!StringUtils.isInt(args[1])) {
+                    return false;
+                }
+
+                levels = Integer.parseInt(args[1]);
+                profile = UserManager.getPlayer((Player) sender).getProfile();
+
+                if (allSkills) {
+                    for (SkillType skillType : SkillType.values()) {
+                        if (skillType.isChildSkill()) {
+                            continue;
+                        }
+
+                        profile.addLevels(skillType, levels);
+                    }
+                }
+                else {
+                    skill = SkillType.getSkill(args[0]);
+                    profile.addLevels(skill, levels);
+                }
+
+                if (allSkills) {
+                    sender.sendMessage(LocaleLoader.getString("Commands.addlevels.AwardAll.1", levels));
+                }
+                else {
+                    sender.sendMessage(LocaleLoader.getString("Commands.addlevels.AwardSkill.1", levels, SkillUtils.getSkillName(skill)));
+                }
+
+                return true;
+
+            case 3:
+                if (!Permissions.addlevelsOthers(sender)) {
+                    sender.sendMessage(command.getPermissionMessage());
+                    return true;
+                }
+
+                if (args[1].equalsIgnoreCase("all")) {
+                    allSkills = true;
+                }
+                else if (!SkillUtils.isSkill(args[1])) {
+                    sender.sendMessage(LocaleLoader.getString("Commands.Skill.Invalid"));
+                    return true;
+                }
+
+                if (!StringUtils.isInt(args[2])) {
+                    return false;
+                }
+
+                McMMOPlayer mcMMOPlayer = UserManager.getPlayer(args[0]);
+                levels = Integer.parseInt(args[2]);
+
+                // If the mcMMOPlayer doesn't exist, create a temporary profile and check if it's present in the database. If it's not, abort the process.
+                if (mcMMOPlayer == null) {
+                    profile = new PlayerProfile(args[0], false);
+
+                    if (!profile.isLoaded()) {
+                        sender.sendMessage(LocaleLoader.getString("Commands.DoesNotExist"));
+                        return true;
+                    }
+
+                    if (allSkills) {
+                        for (SkillType skillType : SkillType.values()) {
+                            if (skillType.isChildSkill()) {
+                                continue;
+                            }
+
+                            profile.addLevels(skillType, levels);
+                        }
+                    }
+                    else {
+                        skill = SkillType.getSkill(args[1]);
+                        profile.addLevels(skill, levels);
+                    }
+
+                    profile.save(); // Since this is a temporary profile, we save it here.
+                }
+                else {
+                    profile = mcMMOPlayer.getProfile();
+
+                    if (allSkills) {
+                        for (SkillType skillType : SkillType.values()) {
+                            if (skillType.isChildSkill()) {
+                                continue;
+                            }
+
+                            profile.addLevels(skillType, levels);
+                        }
+
+                        mcMMOPlayer.getPlayer().sendMessage(LocaleLoader.getString("Commands.addlevels.AwardAll.1", levels));
+                    }
+                    else {
+                        skill = SkillType.getSkill(args[1]);
+                        profile.addLevels(skill, levels);
+                        mcMMOPlayer.getPlayer().sendMessage(LocaleLoader.getString("Commands.addlevels.AwardSkill.1", levels, SkillUtils.getSkillName(skill)));
+                    }
+                }
+
+                if (allSkills) {
+                    sender.sendMessage(LocaleLoader.getString("Commands.addlevels.AwardAll.2", args[0]));
+                }
+                else {
+                    sender.sendMessage(LocaleLoader.getString("Commands.addlevels.AwardSkill.2", SkillUtils.getSkillName(skill), args[0]));
+                }
+
+                return true;
+
+            default:
+                return false;
+        }
+    }
+}

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

@@ -0,0 +1,152 @@
+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.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.Permissions;
+import com.gmail.nossr50.util.StringUtils;
+import com.gmail.nossr50.util.player.UserManager;
+import com.gmail.nossr50.util.skills.SkillUtils;
+
+public class AddxpCommand implements CommandExecutor {
+    @Override
+    public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
+        int xp;
+        McMMOPlayer mcMMOPlayer;
+        PlayerProfile profile;
+        boolean allSkills = false;
+        SkillType skill = null;
+
+        switch (args.length) {
+            case 2:
+                if (!Permissions.addxp(sender)) {
+                    sender.sendMessage(command.getPermissionMessage());
+                    return true;
+                }
+
+                if (!(sender instanceof Player)) {
+                    return false;
+                }
+
+                if (args[0].equalsIgnoreCase("all")) {
+                    allSkills = true;
+                }
+                else if (!SkillUtils.isSkill(args[0])) {
+                    sender.sendMessage(LocaleLoader.getString("Commands.Skill.Invalid"));
+                    return true;
+                }
+
+                if (!StringUtils.isInt(args[1])) {
+                    return false;
+                }
+
+                xp = Integer.parseInt(args[1]);
+                mcMMOPlayer = UserManager.getPlayer((Player) sender);
+                profile = mcMMOPlayer.getProfile();
+
+                if (allSkills) {
+                    for (SkillType skillType : SkillType.values()) {
+                        if (skillType.isChildSkill()) {
+                            continue;
+                        }
+
+                        mcMMOPlayer.applyXpGain(skillType, xp);
+                    }
+
+                    sender.sendMessage(LocaleLoader.getString("Commands.addxp.AwardAll", xp));
+                }
+                else {
+                    skill = SkillType.getSkill(args[0]);
+
+                    mcMMOPlayer.applyXpGain(skill, xp);
+                    sender.sendMessage(LocaleLoader.getString("Commands.addxp.AwardSkill", xp, SkillUtils.getSkillName(skill)));
+                }
+
+                return true;
+
+            case 3:
+                if (!Permissions.addxpOthers(sender)) {
+                    sender.sendMessage(command.getPermissionMessage());
+                    return true;
+                }
+
+                if (args[1].equalsIgnoreCase("all")) {
+                    allSkills = true;
+                }
+                else if (!SkillUtils.isSkill(args[1])) {
+                    sender.sendMessage(LocaleLoader.getString("Commands.Skill.Invalid"));
+                    return true;
+                }
+
+                if (!StringUtils.isInt(args[2])) {
+                    return false;
+                }
+
+                mcMMOPlayer = UserManager.getPlayer(args[0]);
+                xp = Integer.parseInt(args[2]);
+
+                // If the mcMMOPlayer doesn't exist, create a temporary profile and check if it's present in the database. If it's not, abort the process.
+                if (mcMMOPlayer == null) {
+                    profile = new PlayerProfile(args[0], false);
+
+                    if (!profile.isLoaded()) {
+                        sender.sendMessage(LocaleLoader.getString("Commands.DoesNotExist"));
+                        return true;
+                    }
+
+                    // TODO: Currently the offline player doesn't level up automatically
+                    if (allSkills) {
+                        for (SkillType skillType : SkillType.values()) {
+                            if (skillType.isChildSkill()) {
+                                continue;
+                            }
+
+                            profile.setSkillXpLevel(skillType, xp);
+                        }
+                    }
+                    else {
+                        skill = SkillType.getSkill(args[1]);
+                        profile.setSkillXpLevel(skill, xp);
+                    }
+
+                    profile.save(); // Since this is a temporary profile, we save it here.
+                }
+                else {
+                    if (allSkills) {
+                        for (SkillType skillType : SkillType.values()) {
+                            if (skillType.isChildSkill()) {
+                                continue;
+                            }
+
+                            mcMMOPlayer.applyXpGain(skillType, xp);
+                        }
+
+                        mcMMOPlayer.getPlayer().sendMessage(LocaleLoader.getString("Commands.addxp.AwardAll", xp));
+                    }
+                    else {
+                        skill = SkillType.getSkill(args[1]);
+                        mcMMOPlayer.applyXpGain(skill, xp);
+                        mcMMOPlayer.getPlayer().sendMessage(LocaleLoader.getString("Commands.addxp.AwardSkill", xp, SkillUtils.getSkillName(skill)));
+                    }
+                }
+
+                if (allSkills) {
+                    sender.sendMessage(LocaleLoader.getString("Commands.addlevels.AwardAll.2", args[0]));
+                }
+                else {
+                    sender.sendMessage(LocaleLoader.getString("Commands.addlevels.AwardSkill.2", SkillUtils.getSkillName(skill), args[0]));
+                }
+
+                return true;
+
+            default:
+                return false;
+        }
+    }
+}

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

@@ -0,0 +1,150 @@
+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.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.Permissions;
+import com.gmail.nossr50.util.StringUtils;
+import com.gmail.nossr50.util.player.UserManager;
+import com.gmail.nossr50.util.skills.SkillUtils;
+
+public class MmoeditCommand implements CommandExecutor {
+    @Override
+    public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
+        PlayerProfile profile;
+        int newValue;
+        boolean allSkills = false;
+        SkillType skill = null;
+
+        switch (args.length) {
+            case 2:
+                if (!Permissions.mmoedit(sender)) {
+                    sender.sendMessage(command.getPermissionMessage());
+                    return true;
+                }
+
+                if (!(sender instanceof Player)) {
+                    return false;
+                }
+
+                if (args[0].equalsIgnoreCase("all")) {
+                    allSkills = true;
+                }
+                else if (!SkillUtils.isSkill(args[0])) {
+                    sender.sendMessage(LocaleLoader.getString("Commands.Skill.Invalid"));
+                    return true;
+                }
+
+                if (!StringUtils.isInt(args[1])) {
+                    return false;
+                }
+
+                newValue = Integer.parseInt(args[1]);
+                profile = UserManager.getPlayer((Player) sender).getProfile();
+
+                if (allSkills) {
+                    for (SkillType skillType : SkillType.values()) {
+                        if (skillType.isChildSkill()) {
+                            continue;
+                        }
+
+                        profile.modifySkill(skillType, newValue);
+                    }
+
+                    sender.sendMessage(LocaleLoader.getString("Commands.mmoedit.AllSkills.1", newValue));
+                }
+                else {
+                    skill = SkillType.getSkill(args[0]);
+                    profile.modifySkill(skill, newValue);
+                    sender.sendMessage(LocaleLoader.getString("Commands.mmoedit.Modified.1", SkillUtils.getSkillName(skill), newValue));
+                }
+
+                return true;
+
+            case 3:
+                if (!Permissions.mmoeditOthers(sender)) {
+                    sender.sendMessage(command.getPermissionMessage());
+                    return true;
+                }
+
+                if (args[1].equalsIgnoreCase("all")) {
+                    allSkills = true;
+                }
+                else if (!SkillUtils.isSkill(args[1])) {
+                    sender.sendMessage(LocaleLoader.getString("Commands.Skill.Invalid"));
+                    return true;
+                }
+
+                if (!StringUtils.isInt(args[2])) {
+                    return false;
+                }
+
+                newValue = Integer.parseInt(args[2]);
+                McMMOPlayer mcMMOPlayer = UserManager.getPlayer(args[0]);
+
+                // If the mcMMOPlayer doesn't exist, create a temporary profile and check if it's present in the database. If it's not, abort the process.
+                if (mcMMOPlayer == null) {
+                    profile = new PlayerProfile(args[0], false);
+
+                    if (!profile.isLoaded()) {
+                        sender.sendMessage(LocaleLoader.getString("Commands.DoesNotExist"));
+                        return true;
+                    }
+
+                    if (allSkills) {
+                        for (SkillType skillType : SkillType.values()) {
+                            if (skillType.isChildSkill()) {
+                                continue;
+                            }
+
+                            profile.modifySkill(skillType, newValue);
+                        }
+                    }
+                    else {
+                        skill = SkillType.getSkill(args[1]);
+                        profile.modifySkill(skill, newValue);
+                    }
+
+                    profile.save(); // Since this is a temporary profile, we save it here.
+                }
+                else {
+                    profile = mcMMOPlayer.getProfile();
+
+                    if (allSkills) {
+                        for (SkillType skillType : SkillType.values()) {
+                            if (skillType.isChildSkill()) {
+                                continue;
+                            }
+
+                            profile.modifySkill(skillType, newValue);
+                        }
+
+                        mcMMOPlayer.getPlayer().sendMessage(LocaleLoader.getString("Commands.mmoedit.AllSkills.1", newValue));
+                    }
+                    else {
+                        skill = SkillType.getSkill(args[1]);
+                        profile.modifySkill(skill, newValue);
+                        mcMMOPlayer.getPlayer().sendMessage(LocaleLoader.getString("Commands.mmoedit.Modified.1", SkillUtils.getSkillName(skill), newValue));
+                    }
+                }
+
+                if (allSkills) {
+                    sender.sendMessage(LocaleLoader.getString("Commands.addlevels.AwardAll.2", args[0]));
+                }
+                else {
+                    sender.sendMessage(LocaleLoader.getString("Commands.mmoedit.Modified.2", SkillUtils.getSkillName(skill), args[0]));
+                }
+
+                return true;
+
+            default:
+                return false;
+        }
+    }
+}

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

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

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

@@ -1,123 +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.LocaleLoader;
-import com.gmail.nossr50.util.Misc;
-import com.gmail.nossr50.util.Skills;
-import com.gmail.nossr50.util.Users;
-
-public class AddlevelsCommand implements CommandExecutor{
-    private final mcMMO plugin;
-
-    public AddlevelsCommand (mcMMO plugin) {
-        this.plugin = plugin;
-    }
-
-    @Override
-    public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
-        OfflinePlayer modifiedPlayer;
-        PlayerProfile profile;
-        int levels;
-        SkillType skill;
-        String skillName;
-        String usage = ChatColor.RED + "Proper usage is /addlevels [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 (!Skills.isSkill(args[0])) {
-                    sender.sendMessage(LocaleLoader.getString("Commands.Skill.Invalid"));
-                    return true;
-                }
-
-                if (Misc.isInt(args[1])) {
-                    modifiedPlayer = (Player) sender;
-                    levels = Integer.valueOf(args[1]);
-                    skill = Skills.getSkillType(args[0]);
-                    profile = Users.getProfile(modifiedPlayer);
-
-                    if (skill.equals(SkillType.ALL)) {
-                        skillName = "all skills";
-                    }
-                    else {
-                        skillName = Misc.getCapitalized(skill.toString());
-                    }
-
-                    profile.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();
-            profile = Users.getProfile(modifiedPlayer);
-
-            if (profile == null) {
-                sender.sendMessage(LocaleLoader.getString("Commands.DoesNotExist"));
-                return true;
-            }
-
-            if (!profile.isLoaded()) {
-                sender.sendMessage(LocaleLoader.getString("Commands.DoesNotExist"));
-                return true;
-            }
-
-            if (!Skills.isSkill(args[1])) {
-                sender.sendMessage(LocaleLoader.getString("Commands.Skill.Invalid"));
-                return true;
-            }
-
-            if (Misc.isInt(args[2])) {
-                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 = Misc.getCapitalized(skill.toString());
-                    message = ChatColor.RED + skillName + " has been modified for " + playerName + "."; //TODO: Use locale
-                }
-
-                sender.sendMessage(message);
-
-                if (modifiedPlayer.isOnline()) {
-                    ((Player) modifiedPlayer).sendMessage(ChatColor.GREEN + "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,140 +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.McMMOPlayer;
-import com.gmail.nossr50.datatypes.PlayerProfile;
-import com.gmail.nossr50.datatypes.SkillType;
-import com.gmail.nossr50.locale.LocaleLoader;
-import com.gmail.nossr50.util.Misc;
-import com.gmail.nossr50.util.Skills;
-import com.gmail.nossr50.util.Users;
-
-//TODO: Any way we can make this work for offline use?
-public class AddxpCommand implements CommandExecutor {
-    private final mcMMO plugin;
-
-    public AddxpCommand (mcMMO plugin) {
-        this.plugin = plugin;
-    }
-
-    @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 [playername] <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 (!Skills.isSkill(args[1])) {
-                    sender.sendMessage(LocaleLoader.getString("Commands.Skill.Invalid"));
-                    return true;
-                }
-
-                if (Misc.isInt(args[1])) {
-                    modifiedPlayer = (Player) sender;
-                    xp = Integer.valueOf(args[1]);
-                    skill = Skills.getSkillType(args[0]);
-
-                    PlayerProfile profile = Users.getProfile(modifiedPlayer);
-                    McMMOPlayer mcMMOPlayer = Users.getPlayer(modifiedPlayer);
-                    mcMMOPlayer.addXPOverride(skill, xp);
-
-                    if (skill.equals(SkillType.ALL)) {
-                        skillName = "all skills";
-                    }
-                    else {
-                        skillName = Misc.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, profile);
-                    }
-                    else {
-                        Skills.xpCheckSkill(skill, modifiedPlayer, profile);
-                    }
-                }
-                else {
-                    sender.sendMessage(usage);
-                }
-            }
-            else {
-                sender.sendMessage(usage);
-            }
-
-            return true;
-
-        case 3:
-            modifiedPlayer = plugin.getServer().getPlayer(args[0]);
-            String playerName = modifiedPlayer.getName();
-            McMMOPlayer mcMMOPlayer = Users.getPlayer(modifiedPlayer);
-            PlayerProfile profile = Users.getProfile(modifiedPlayer);
-	    
-            if (profile == null) {
-                sender.sendMessage(LocaleLoader.getString("Commands.DoesNotExist"));
-                return true;
-            }
-
-            if (!profile.isLoaded()) {
-                sender.sendMessage(LocaleLoader.getString("Commands.DoesNotExist"));
-                return true;
-            }
-
-            if (!Skills.isSkill(args[1])) {
-                sender.sendMessage(LocaleLoader.getString("Commands.Skill.Invalid"));
-                return true;
-            }
-
-            if (Misc.isInt(args[2])) {
-                xp = Integer.valueOf(args[2]);
-                skill = Skills.getSkillType(args[1]);
-                String message;
-
-                mcMMOPlayer.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 = Misc.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, profile);
-                }
-                else {
-                    Skills.xpCheckSkill(skill, modifiedPlayer, profile);
-                }
-            }
-            else {
-                sender.sendMessage(usage);
-            }
-
-            return true;
-
-        default:
-            sender.sendMessage(usage);
-            return true;
-        }
-    }
-}

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

@@ -1,92 +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.McMMOPlayer;
-import com.gmail.nossr50.datatypes.PlayerProfile;
-import com.gmail.nossr50.datatypes.SkillType;
-import com.gmail.nossr50.locale.LocaleLoader;
-import com.gmail.nossr50.util.Misc;
-import com.gmail.nossr50.util.Permissions;
-import com.gmail.nossr50.util.Users;
-
-public class InspectCommand implements CommandExecutor {
-    @Override
-    public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
-        String usage = "Proper usage is /inspect <player>"; //TODO: Needs more locale.
-
-        if (CommandHelper.noCommandPermissions(sender, "mcmmo.commands.inspect")) {
-            return true;
-        }
-
-        switch (args.length) {
-        case 1:
-            McMMOPlayer mcmmoPlayer = Users.getPlayer(args[0]);
-
-            if (mcmmoPlayer != null) {
-                Player target = mcmmoPlayer.getPlayer();
-
-                if (sender instanceof Player && !sender.isOp() && !Misc.isNear(((Player) sender).getLocation(), target.getLocation(), 5.0) && !Permissions.getInstance().inspectDistanceBypass((Player) sender)) {
-                    sender.sendMessage(LocaleLoader.getString("Inspect.TooFar"));
-                    return true;
-                }
-
-                sender.sendMessage(LocaleLoader.getString("Inspect.Stats", new Object[] { target.getName() }));
-                CommandHelper.printGatheringSkills(target, sender);
-                CommandHelper.printCombatSkills(target, sender);
-                CommandHelper.printMiscSkills(target, sender);
-                sender.sendMessage(LocaleLoader.getString("Commands.PowerLevel", new Object[] { mcmmoPlayer.getPowerLevel() }));
-
-                return true;
-            }
-            else {
-                if (sender instanceof Player && !sender.isOp() && !Permissions.getInstance().inspectOfflineBypass((Player) sender)) {
-                    sender.sendMessage(LocaleLoader.getString("Inspect.Offline"));
-                    return true;
-                }
-
-                PlayerProfile profile = new PlayerProfile(args[0], false); //Temporary Profile
-
-                if (profile == null) {
-                    sender.sendMessage(LocaleLoader.getString("Commands.DoesNotExist"));
-                    return true;
-                }
-
-                if (!profile.isLoaded()) {
-                    sender.sendMessage(LocaleLoader.getString("Commands.DoesNotExist"));
-                    return true;
-                }
-
-                sender.sendMessage(LocaleLoader.getString("Inspect.OfflineStats", new Object[] { args[0] }));
-
-                sender.sendMessage(LocaleLoader.getString("Stats.Header.Gathering"));
-                sender.sendMessage(LocaleLoader.getString("Skills.Stats", new Object[] { LocaleLoader.getString("Excavation.Listener"), profile.getSkillLevel(SkillType.EXCAVATION), profile.getSkillXpLevel(SkillType.EXCAVATION), profile.getXpToLevel(SkillType.EXCAVATION) }));
-                sender.sendMessage(LocaleLoader.getString("Skills.Stats", new Object[] { LocaleLoader.getString("Fishing.Listener"), profile.getSkillLevel(SkillType.FISHING), profile.getSkillXpLevel(SkillType.FISHING), profile.getXpToLevel(SkillType.FISHING) }));
-                sender.sendMessage(LocaleLoader.getString("Skills.Stats", new Object[] { LocaleLoader.getString("Herbalism.Listener"), profile.getSkillLevel(SkillType.HERBALISM), profile.getSkillXpLevel(SkillType.HERBALISM), profile.getXpToLevel(SkillType.HERBALISM) }));
-                sender.sendMessage(LocaleLoader.getString("Skills.Stats", new Object[] { LocaleLoader.getString("Mining.Listener"), profile.getSkillLevel(SkillType.MINING), profile.getSkillXpLevel(SkillType.MINING), profile.getXpToLevel(SkillType.MINING) }));
-                sender.sendMessage(LocaleLoader.getString("Skills.Stats", new Object[] { LocaleLoader.getString("Woodcutting.Listener"), profile.getSkillLevel(SkillType.WOODCUTTING), profile.getSkillXpLevel(SkillType.WOODCUTTING), profile.getXpToLevel(SkillType.WOODCUTTING) }));
-
-                sender.sendMessage(LocaleLoader.getString("Stats.Header.Combat"));
-                sender.sendMessage(LocaleLoader.getString("Skills.Stats", new Object[] { LocaleLoader.getString("Axes.Listener"), profile.getSkillLevel(SkillType.AXES), profile.getSkillXpLevel(SkillType.AXES), profile.getXpToLevel(SkillType.AXES) }));
-                sender.sendMessage(LocaleLoader.getString("Skills.Stats", new Object[] { LocaleLoader.getString("Archery.Listener"), profile.getSkillLevel(SkillType.ARCHERY), profile.getSkillXpLevel(SkillType.ARCHERY), profile.getXpToLevel(SkillType.ARCHERY) }));
-                sender.sendMessage(LocaleLoader.getString("Skills.Stats", new Object[] { LocaleLoader.getString("Swords.Listener"), profile.getSkillLevel(SkillType.SWORDS), profile.getSkillXpLevel(SkillType.SWORDS), profile.getXpToLevel(SkillType.SWORDS) }));
-                sender.sendMessage(LocaleLoader.getString("Skills.Stats", new Object[] { LocaleLoader.getString("Taming.Listener"), profile.getSkillLevel(SkillType.TAMING), profile.getSkillXpLevel(SkillType.TAMING), profile.getXpToLevel(SkillType.TAMING) }));
-                sender.sendMessage(LocaleLoader.getString("Skills.Stats", new Object[] { LocaleLoader.getString("Unarmed.Listener"), profile.getSkillLevel(SkillType.UNARMED), profile.getSkillXpLevel(SkillType.UNARMED), profile.getXpToLevel(SkillType.UNARMED) }));
-
-                sender.sendMessage(LocaleLoader.getString("Stats.Header.Misc"));
-                sender.sendMessage(LocaleLoader.getString("Skills.Stats", new Object[] { LocaleLoader.getString("Acrobatics.Listener"), profile.getSkillLevel(SkillType.ACROBATICS), profile.getSkillXpLevel(SkillType.ACROBATICS), profile.getXpToLevel(SkillType.ACROBATICS) }));
-                sender.sendMessage(LocaleLoader.getString("Skills.Stats", new Object[] { LocaleLoader.getString("Repair.Listener"), profile.getSkillLevel(SkillType.REPAIR), profile.getSkillXpLevel(SkillType.REPAIR), profile.getXpToLevel(SkillType.REPAIR) }));
-
-                return true;
-            }
-
-        default:
-            sender.sendMessage(usage);
-            return true;
-        }
-    }
-}

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

@@ -1,39 +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.config.Config;
-import com.gmail.nossr50.locale.LocaleLoader;
-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;
-
-        player.sendMessage(LocaleLoader.getString("Stats.Own.Stats"));
-        player.sendMessage(LocaleLoader.getString("mcMMO.NoSkillNote"));
-
-        CommandHelper.printGatheringSkills(player);
-        CommandHelper.printCombatSkills(player);
-        CommandHelper.printMiscSkills(player);
-
-        int powerLevelCap = Config.getInstance().getPowerLevelCap();
-        
-        if (powerLevelCap > 0)
-        	player.sendMessage(LocaleLoader.getString("Commands.PowerLevel.Capped", new Object[] { String.valueOf(Users.getPlayer(player).getPowerLevel()), String.valueOf(powerLevelCap) }));
-        else
-        	player.sendMessage(LocaleLoader.getString("Commands.PowerLevel", new Object[] { String.valueOf(Users.getPlayer(player).getPowerLevel()) }));        	
-
-        return true;
-    }
-}

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

@@ -1,123 +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.commands.CommandHelper;
-import com.gmail.nossr50.datatypes.McMMOPlayer;
-import com.gmail.nossr50.datatypes.PlayerProfile;
-import com.gmail.nossr50.datatypes.SkillType;
-import com.gmail.nossr50.locale.LocaleLoader;
-import com.gmail.nossr50.util.Misc;
-import com.gmail.nossr50.util.Skills;
-import com.gmail.nossr50.util.Users;
-
-public class MmoeditCommand implements CommandExecutor {
-    @Override
-    public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
-        PlayerProfile profile;
-        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 (!Skills.isSkill(args[0])) {
-                    sender.sendMessage(LocaleLoader.getString("Commands.Skill.Invalid"));
-                    return true;
-                }
-
-                if (Misc.isInt(args[1])) {
-                    Player player = (Player) sender;
-                    newValue = Integer.valueOf(args[1]);
-                    skill = Skills.getSkillType(args[0]);
-                    profile = Users.getProfile(player);
-
-                    if (skill.equals(SkillType.ALL)) {
-                        skillName = "all skills";
-                    }
-                    else {
-                        skillName = Misc.getCapitalized(skill.toString());
-                    }
-
-                    profile.modifySkill(skill, newValue);
-                    sender.sendMessage(ChatColor.GREEN + "Your level in " + skillName + " was set to " + newValue + "!"); //TODO: Needs more locale.
-                }
-                else {
-                    sender.sendMessage(usage);
-                }
-            }
-            else {
-                sender.sendMessage(usage);
-            }
-
-            return true;
-
-        case 3:
-            if (!Misc.isInt(args[2])) {
-                sender.sendMessage(usage);
-                return true;
-            }
-
-            skill = Skills.getSkillType(args[1]);
-
-            if (skill == null) {
-                sender.sendMessage(LocaleLoader.getString("Commands.Skill.Invalid"));
-                return true;
-            }
-
-            if (skill.equals(SkillType.ALL)) {
-                skillName = "all skills";
-            }
-            else {
-                skillName = Misc.getCapitalized(skill.toString());
-            }
-
-            newValue = Integer.valueOf(args[2]);
-            McMMOPlayer mcmmoPlayer = Users.getPlayer(args[0]);
-
-            if (mcmmoPlayer != null) {
-                profile = mcmmoPlayer.getProfile();
-
-                if (profile == null) {
-                    sender.sendMessage(LocaleLoader.getString("Commands.DoesNotExist"));
-                    return true;
-                }
-
-                profile.modifySkill(skill, newValue);
-                mcmmoPlayer.getPlayer().sendMessage(ChatColor.GREEN + "Your level in " + skillName + " was set to " + newValue + "!"); //TODO: Needs more locale.
-                sender.sendMessage(ChatColor.RED + skillName + " has been modified for " + args[0] + "."); //TODO: Use locale
-            }
-            else {
-                profile = new PlayerProfile(args[0], false); //Temporary Profile
-
-                if (profile == null) {
-                    sender.sendMessage(LocaleLoader.getString("Commands.DoesNotExist"));
-                    return true;
-                }
-
-                if (!profile.isLoaded()) {
-                    sender.sendMessage(LocaleLoader.getString("Commands.DoesNotExist"));
-                    return true;
-                }
-
-                profile.modifySkill(skill, newValue);
-                profile.save();
-            }
-            return true;
-
-        default:
-            sender.sendMessage(usage);
-            return true;
-        }
-    }
-}

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

@@ -1,51 +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.config.Config;
-import com.gmail.nossr50.runnables.SQLConversionTask;
-import com.gmail.nossr50.util.Users;
-
-public class MmoupdateCommand implements CommandExecutor {
-    private final mcMMO plugin;
-
-    public MmoupdateCommand (mcMMO plugin) {
-        this.plugin = plugin;
-    }
-
-    @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.clearAll();
-        convertToMySQL();
-
-        for (Player x : plugin.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 (!Config.getInstance().getUseMySQL()) {
-            return;
-        }
-
-        plugin.getServer().getScheduler().scheduleAsyncDelayedTask(plugin, new SQLConversionTask(plugin), 1);
-    }
-}

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

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

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

@@ -1,97 +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.mcMMO;
-import com.gmail.nossr50.commands.CommandHelper;
-import com.gmail.nossr50.config.Config;
-import com.gmail.nossr50.locale.LocaleLoader;
-import com.gmail.nossr50.util.Misc;
-
-public class XprateCommand implements CommandExecutor {
-    private final mcMMO plugin;
-    private static double oldRate = Config.getInstance().xpGainMultiplier;
-    private static boolean xpEvent = false;
-
-    public XprateCommand (mcMMO plugin) {
-        this.plugin = plugin;
-    }
-
-    @Override
-    public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
-        String usage1 = LocaleLoader.getString("Commands.xprate.proper.0");
-        String usage2 = LocaleLoader.getString("Commands.xprate.proper.1");
-        String usage3 = LocaleLoader.getString("Commands.xprate.proper.2");
-
-        if (CommandHelper.noCommandPermissions(sender, "mcmmo.admin")) {
-            return true;
-        }
-
-        switch (args.length) {
-        case 1:
-            if (args[0].equalsIgnoreCase("reset")) {
-                if (xpEvent) {
-                    for (Player x : plugin.getServer().getOnlinePlayers()) {
-                        x.sendMessage(LocaleLoader.getString("Commands.xprate.over"));
-                    }
-
-                    xpEvent = !xpEvent;
-                    Config.getInstance().xpGainMultiplier = oldRate;
-                }
-                else {
-                    Config.getInstance().xpGainMultiplier = oldRate;
-                }
-            }
-            else if (Misc.isInt(args[0])) {
-                sender.sendMessage(usage3);
-            }
-            else {
-                sender.sendMessage(usage2);
-            }
-
-            return true;
-
-        case 2:
-            if (Misc.isInt(args[0])) {
-                oldRate = Config.getInstance().xpGainMultiplier;
-
-                if (args[1].equalsIgnoreCase("true") || args[1].equalsIgnoreCase("false")) {
-                    xpEvent = Boolean.valueOf(args[1]);
-                }
-                else {
-                    sender.sendMessage(usage3);
-                }
-
-                Config.getInstance().xpGainMultiplier = Misc.getInt(args[0]);
-
-                if (xpEvent) {
-                    for (Player x : plugin.getServer().getOnlinePlayers()) {
-                        x.sendMessage(LocaleLoader.getString("Commands.xprate.started.0"));
-                        x.sendMessage(LocaleLoader.getString("Commands.xprate.started.1", new Object[] {Config.getInstance().xpGainMultiplier}));
-                    }
-                }
-                else {
-                    sender.sendMessage("The XP RATE was modified to " + Config.getInstance().xpGainMultiplier); //TODO: Locale
-                }
-            }
-            else {
-                sender.sendMessage(usage1);
-                sender.sendMessage(usage2);
-            }
-
-            return true;
-
-        default:
-            sender.sendMessage(usage1);
-            sender.sendMessage(usage2);
-            return true;
-        }
-    }
-
-    public static boolean isXpEventRunning() {
-        return xpEvent;
-    }
-}

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

@@ -0,0 +1,85 @@
+package com.gmail.nossr50.commands.hardcore;
+
+import java.text.DecimalFormat;
+
+import org.bukkit.command.Command;
+import org.bukkit.command.CommandExecutor;
+import org.bukkit.command.CommandSender;
+
+import com.gmail.nossr50.mcMMO;
+import com.gmail.nossr50.config.Config;
+import com.gmail.nossr50.locale.LocaleLoader;
+import com.gmail.nossr50.util.Permissions;
+import com.gmail.nossr50.util.StringUtils;
+
+public class HardcoreCommand implements CommandExecutor {
+    @Override
+    public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
+        switch (args.length) {
+            case 0:
+                if (!Permissions.hardcoreToggle(sender)) {
+                    sender.sendMessage(command.getPermissionMessage());
+                    return true;
+                }
+
+                if (Config.getInstance().getHardcoreEnabled()) {
+                    disableHardcore();
+                }
+                else {
+                    enableHardcore();
+                }
+
+                return true;
+
+            case 1:
+                if (args[0].equalsIgnoreCase("on") || args[0].equalsIgnoreCase("true") || args[0].equalsIgnoreCase("enabled")) {
+                    if (!Permissions.hardcoreToggle(sender)) {
+                        sender.sendMessage(command.getPermissionMessage());
+                        return true;
+                    }
+
+                    enableHardcore();
+                    return true;
+                }
+
+                if (args[0].equalsIgnoreCase("off") || args[0].equalsIgnoreCase("false") || args[0].equalsIgnoreCase("disabled")) {
+                    if (!Permissions.hardcoreToggle(sender)) {
+                        sender.sendMessage(command.getPermissionMessage());
+                        return true;
+                    }
+
+                    disableHardcore();
+                    return true;
+                }
+
+                if (!StringUtils.isDouble(args[0])) {
+                    return false;
+                }
+
+                if (!Permissions.hardcoreModify(sender)) {
+                    sender.sendMessage(command.getPermissionMessage());
+                    return true;
+                }
+
+                DecimalFormat percent = new DecimalFormat("##0.00%");
+                double newPercent = Double.parseDouble(args[0]);
+
+                Config.getInstance().setHardcoreDeathStatPenaltyPercentage(newPercent);
+                sender.sendMessage(LocaleLoader.getString("Hardcore.PercentageChanged", percent.format(newPercent / 100D)));
+                return true;
+
+            default:
+                return false;
+        }
+    }
+
+    private void disableHardcore() {
+        Config.getInstance().setHardcoreEnabled(false);
+        mcMMO.p.getServer().broadcastMessage(LocaleLoader.getString("Hardcore.Disabled"));
+    }
+
+    private void enableHardcore() {
+        Config.getInstance().setHardcoreEnabled(true);
+        mcMMO.p.getServer().broadcastMessage(LocaleLoader.getString("Hardcore.Enabled"));
+    }
+}

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

@@ -0,0 +1,90 @@
+package com.gmail.nossr50.commands.hardcore;
+
+import java.text.DecimalFormat;
+
+import org.bukkit.command.Command;
+import org.bukkit.command.CommandExecutor;
+import org.bukkit.command.CommandSender;
+
+import com.gmail.nossr50.mcMMO;
+import com.gmail.nossr50.config.Config;
+import com.gmail.nossr50.locale.LocaleLoader;
+import com.gmail.nossr50.util.Permissions;
+import com.gmail.nossr50.util.StringUtils;
+
+public class VampirismCommand implements CommandExecutor {
+    @Override
+    public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
+        if (!Config.getInstance().getHardcoreEnabled()) {
+            sender.sendMessage(LocaleLoader.getString("Hardcore.Disabled"));
+            return true;
+        }
+
+        switch (args.length) {
+            case 0:
+                if (!Permissions.vampirismToggle(sender)) {
+                    sender.sendMessage(command.getPermissionMessage());
+                    return true;
+                }
+
+                if (Config.getInstance().getHardcoreVampirismEnabled()) {
+                    disableVampirism();
+                }
+                else {
+                    enableVampirism();
+                }
+
+                return true;
+
+            case 1:
+                if (args[0].equalsIgnoreCase("on") || args[0].equalsIgnoreCase("true") || args[0].equalsIgnoreCase("enabled")) {
+                    if (!Permissions.vampirismToggle(sender)) {
+                        sender.sendMessage(command.getPermissionMessage());
+                        return true;
+                    }
+
+                    enableVampirism();
+                    return true;
+                }
+
+                if (args[0].equalsIgnoreCase("off") || args[0].equalsIgnoreCase("false") || args[0].equalsIgnoreCase("disabled")) {
+                    if (!Permissions.vampirismToggle(sender)) {
+                        sender.sendMessage(command.getPermissionMessage());
+                        return true;
+                    }
+
+                    disableVampirism();
+                    return true;
+                }
+
+                if (!StringUtils.isDouble(args[0])) {
+                    return false;
+                }
+
+                if (!Permissions.vampirismModify(sender)) {
+                    sender.sendMessage(command.getPermissionMessage());
+                    return true;
+                }
+
+                DecimalFormat percent = new DecimalFormat("##0.00%");
+                double newPercent = Double.parseDouble(args[0]);
+
+                Config.getInstance().setHardcoreVampirismStatLeechPercentage(newPercent);
+                sender.sendMessage(LocaleLoader.getString("Vampirism.PercentageChanged", percent.format(newPercent / 100D)));
+                return true;
+
+            default:
+                return false;
+        }
+    }
+
+    private void disableVampirism() {
+        Config.getInstance().setHardcoreVampirismEnabled(false);
+        mcMMO.p.getServer().broadcastMessage(LocaleLoader.getString("Vampirism.Disabled"));
+    }
+
+    private void enableVampirism() {
+        Config.getInstance().setHardcoreVampirismEnabled(true);
+        mcMMO.p.getServer().broadcastMessage(LocaleLoader.getString("Vampirism.Enabled"));
+    }
+}

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

@@ -1,43 +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.LocaleLoader;
-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.commands.ability")) {
-            return true;
-        }
-
-        PlayerProfile profile = Users.getProfile((Player) sender);
-
-        if (profile == null) {
-            sender.sendMessage(LocaleLoader.getString("Commands.DoesNotExist"));
-            return true;
-        }
-
-        if (profile.getAbilityUse()) {
-            sender.sendMessage(LocaleLoader.getString("Commands.Ability.Off"));
-        }
-        else {
-            sender.sendMessage(LocaleLoader.getString("Commands.Ability.On"));
-        }
-
-        profile.toggleAbilityUse();
-
-        return true;
-    }
-}

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

@@ -1,77 +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.config.Config;
-import com.gmail.nossr50.locale.LocaleLoader;
-import com.gmail.nossr50.util.Permissions;
-
-//TODO: Rework this whole thing. It's ugly. Also is missing all the admin & spout commands.
-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 (Permissions.getInstance().party(player)) {
-            player.sendMessage(LocaleLoader.getString("Commands.Party.Commands"));
-            player.sendMessage("/party " + LocaleLoader.getString("Commands.Party"));
-            player.sendMessage("/party q " + LocaleLoader.getString("Commands.Party.Quit"));
-
-            if (Permissions.getInstance().partyChat(player)) {
-                player.sendMessage("/p " + LocaleLoader.getString("Commands.Party.Toggle"));
-            }
-
-            player.sendMessage("/invite " + LocaleLoader.getString("Commands.Party.Invite"));
-            player.sendMessage("/accept " + LocaleLoader.getString("Commands.Party.Accept"));
-
-            if (Permissions.getInstance().partyTeleport(player)) {
-                player.sendMessage("/ptp " + LocaleLoader.getString("Commands.Party.Teleport"));
-            }
-        }
-
-        player.sendMessage(LocaleLoader.getString("Commands.Other"));
-        player.sendMessage("/mcstats " + LocaleLoader.getString("Commands.Stats"));
-        player.sendMessage("/mctop " + LocaleLoader.getString("Commands.Leaderboards"));
-
-        if (Config.getInstance().getCommandSkillResetEnabled() && Permissions.getInstance().skillReset(player)) {
-            player.sendMessage("/skillreset <skill|all> " + LocaleLoader.getString("Commands.Reset"));
-        }
-        
-        if (Permissions.getInstance().mcAbility(player)) {
-            player.sendMessage("/mcability " + LocaleLoader.getString("Commands.ToggleAbility"));
-        }
-
-        if (Permissions.getInstance().adminChat(player)) {
-            player.sendMessage("/a " + LocaleLoader.getString("Commands.AdminToggle"));
-        }
-
-        if (Permissions.getInstance().inspect(player)) {
-            player.sendMessage("/inspect " + LocaleLoader.getString("Commands.Inspect"));
-        }
-
-        if (Permissions.getInstance().mmoedit(player)) {
-            player.sendMessage("/mmoedit " + LocaleLoader.getString("Commands.mmoedit"));
-        }
-
-        if (Permissions.getInstance().mcgod(player)) {
-            player.sendMessage("/mcgod " + LocaleLoader.getString("Commands.mcgod"));
-        }
-
-        player.sendMessage(LocaleLoader.getString("Commands.SkillInfo"));
-        player.sendMessage("/mcmmo " + LocaleLoader.getString("Commands.ModDescription"));
-
-        return true;
-    }
-}

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

@@ -1,43 +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.LocaleLoader;
-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 profile = Users.getProfile((Player) sender);
-
-        if (profile == null) {
-            sender.sendMessage(LocaleLoader.getString("Commands.DoesNotExist"));
-            return true;
-        }
-
-        if (profile.getGodMode()) {
-            sender.sendMessage(LocaleLoader.getString("Commands.GodMode.Disabled"));
-        }
-        else {
-            sender.sendMessage(LocaleLoader.getString("Commands.GodMode.Enabled"));
-        }
-
-        profile.toggleGodMode();
-
-        return true;
-    }
-}

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

@@ -1,34 +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.mcMMO;
-import com.gmail.nossr50.config.Config;
-import com.gmail.nossr50.locale.LocaleLoader;
-
-public class McmmoCommand implements CommandExecutor {
-    @Override
-    public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
-        String description = LocaleLoader.getString("mcMMO.Description");
-        String[] mcSplit = description.split(",");
-        sender.sendMessage(mcSplit);
-
-        if (Config.getInstance().getDonateMessageEnabled()) {
-            if (mcMMO.spoutEnabled && sender instanceof SpoutPlayer) {
-                SpoutPlayer spoutPlayer = (SpoutPlayer) sender;
-
-                spoutPlayer.sendNotification(ChatColor.YELLOW + "[mcMMO]" + ChatColor.GOLD + " Donate!", ChatColor.GREEN + "mcmmodev@gmail.com", Material.DIAMOND);
-            }
-
-            sender.sendMessage(ChatColor.DARK_AQUA + "Donation Info:");
-            sender.sendMessage(ChatColor.GOLD + " - " + ChatColor.GREEN + "mcmmodev@gmail.com" + ChatColor.GOLD + " Paypal");
-        }
-
-        return true;
-    }
-}

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

@@ -1,80 +0,0 @@
-package com.gmail.nossr50.commands.mc;
-
-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.locale.LocaleLoader;
-import com.gmail.nossr50.util.Users;
-
-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) {
-        OfflinePlayer player;
-        PlayerProfile profile;
-        String usage = ChatColor.RED + "Proper usage is /mcrefresh [player]"; //TODO: Needs more locale
-
-        if (CommandHelper.noCommandPermissions(sender, "mcmmo.tools.mcrefresh")) {
-            return true;
-        }
-
-        switch (args.length) {
-        case 0:
-            if (sender instanceof Player) {
-                player = (Player) sender;
-                profile = Users.getProfile(player);
-            }
-            else {
-                sender.sendMessage(usage);
-                return true;
-            }
-            break;
-
-        case 1:
-            player = plugin.getServer().getOfflinePlayer(args[0]);
-            profile = Users.getProfile(player);
-            String playerName = player.getName();
-
-            if (profile == null) {
-                sender.sendMessage(LocaleLoader.getString("Commands.DoesNotExist"));
-                return true;
-            }
-
-            if (!profile.isLoaded()) {
-                sender.sendMessage(LocaleLoader.getString("Commands.DoesNotExist"));
-                return true;
-            }
-
-            sender.sendMessage("You have refreshed " + playerName + "'s cooldowns!"); //TODO: Use locale
-
-            break;
-
-        default:
-            sender.sendMessage(usage);
-            return true;
-        }
-
-        profile.setRecentlyHurt(0);
-        profile.resetCooldowns();
-        profile.resetToolPrepMode();
-        profile.resetAbilityMode();
-
-        if (player.isOnline()) {
-            ((Player) player).sendMessage(LocaleLoader.getString("Ability.Generic.Refresh"));
-        }
-
-        return true;
-    }
-}

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

@@ -1,182 +0,0 @@
-package com.gmail.nossr50.commands.mc;
-
-import java.io.BufferedReader;
-import java.io.FileReader;
-import java.io.FileWriter;
-import java.io.IOException;
-
-import org.bukkit.ChatColor;
-import org.bukkit.command.Command;
-import org.bukkit.command.CommandExecutor;
-import org.bukkit.command.CommandSender;
-import org.bukkit.entity.Player;
-
-import com.gmail.nossr50.mcMMO;
-import com.gmail.nossr50.commands.CommandHelper;
-import com.gmail.nossr50.config.Config;
-import com.gmail.nossr50.datatypes.McMMOPlayer;
-import com.gmail.nossr50.datatypes.SpoutHud;
-import com.gmail.nossr50.locale.LocaleLoader;
-import com.gmail.nossr50.spout.SpoutStuff;
-import com.gmail.nossr50.util.Database;
-import com.gmail.nossr50.util.Users;
-
-public class McremoveCommand implements CommandExecutor {
-    private final String location;
-    private final mcMMO plugin;
-
-    public McremoveCommand (mcMMO plugin) {
-        this.plugin = plugin;
-        this.location = mcMMO.getUsersFile();
-    }
-
-    @Override
-    public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
-        String playerName;
-        String tablePrefix = Config.getInstance().getMySQLTablePrefix();
-        String databaseName = Config.getInstance().getMySQLDatabaseName();
-        String usage = ChatColor.RED + "Proper usage is /mcremove <player>"; //TODO: Needs more locale.
-        String success;
-
-        if (CommandHelper.noCommandPermissions(sender, "mcmmo.tools.mcremove")) {
-            return true;
-        }
-
-        switch (args.length) {
-        case 1:
-            playerName = args[0];
-            success = ChatColor.GREEN + playerName + " was successfully removed from the database!"; //TODO: Locale
-            break;
-
-        default:
-            sender.sendMessage(usage);
-            return true;
-        }
-
-        /* MySQL */
-        if (Config.getInstance().getUseMySQL()) {
-            Database database = mcMMO.getPlayerDatabase();
-            int userId = 0;
-            userId = database.getInt("SELECT id FROM " + tablePrefix + "users WHERE user = '" + playerName + "'");
-
-            if (userId > 0) {
-                database.write("DELETE FROM "
-                        + databaseName + "."
-                        + tablePrefix + "users WHERE "
-                        + tablePrefix + "users.id=" + userId);
-
-                database.write("DELETE FROM "
-                        + databaseName + "."
-                        + tablePrefix + "cooldowns WHERE "
-                        + tablePrefix + "cooldowns.user_id=" + userId);
-
-                database.write("DELETE FROM "
-                        + databaseName + "."
-                        + tablePrefix + "huds WHERE "
-                        + tablePrefix + "huds.user_id=" + userId);
-
-                database.write("DELETE FROM "
-                        + databaseName + "."
-                        + tablePrefix + "skills WHERE "
-                        + tablePrefix + "skills.user_id=" + userId);
-
-                database.write("DELETE FROM "
-                        + databaseName + "."
-                        + tablePrefix + "experience WHERE "
-                        + tablePrefix + "experience.user_id=" + userId);
-
-                sender.sendMessage(success);
-
-            }
-            else {
-                sender.sendMessage(LocaleLoader.getString("Commands.DoesNotExist"));
-            }
-        }
-        else {
-            if (removeFlatFileUser(playerName)) {
-                sender.sendMessage(success);
-            }
-            else {
-                sender.sendMessage(LocaleLoader.getString("Commands.DoesNotExist"));
-            }
-        }
-
-        //Force PlayerProfile stuff to update
-        McMMOPlayer mcmmoPlayer = Users.getPlayer(playerName);
-
-        if (mcmmoPlayer != null) {
-            Player player = mcmmoPlayer.getPlayer();
-            SpoutHud spoutHud = mcmmoPlayer.getProfile().getSpoutHud();
-
-            if (spoutHud != null) {
-                spoutHud.removeWidgets();
-            }
-
-            Users.remove(playerName);
-
-            if (player.isOnline()) {
-                Users.addUser(player);
-
-                if (mcMMO.spoutEnabled) {
-                    SpoutStuff.reloadSpoutPlayer(player);
-                }
-            }
-        }
-
-        return true;
-    }
-
-    private boolean removeFlatFileUser(String playerName) {
-        boolean worked = false;
-
-        BufferedReader in = null;
-        FileWriter out = null;
-
-        try {
-            FileReader file = new FileReader(location);
-            in = new BufferedReader(file);
-            StringBuilder writer = new StringBuilder();
-            String line = "";
-
-            while ((line = in.readLine()) != null) {
-
-                /* Write out the same file but when we get to the player we want to remove, we skip his line. */
-                if (!line.split(":")[0].equalsIgnoreCase(playerName)) {
-                    writer.append(line).append("\r\n");
-                }
-                else {
-                    System.out.println("User found, removing...");
-                    worked = true;
-                    continue; //Skip the player
-                }
-            }
-
-            out = new FileWriter(location); //Write out the new file
-            out.write(writer.toString());
-        }
-        catch (Exception e) {
-            plugin.getLogger().severe("Exception while reading " + location + " (Are you sure you formatted it correctly?)" + e.toString());
-        }
-        finally {
-            if (in != null) {
-                try {
-                    in.close();
-                }
-                catch (IOException ex) {
-                    ex.printStackTrace();
-                }
-            }
-
-            if (out != null) {
-                try {
-                    out.close();
-                }
-                catch (IOException ex) {
-                    ex.printStackTrace();
-                }
-            }
-        }
-
-        return worked;
-    }
-}

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

@@ -1,158 +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.Config;
-import com.gmail.nossr50.locale.LocaleLoader;
-import com.gmail.nossr50.util.Database;
-import com.gmail.nossr50.util.Leaderboard;
-import com.gmail.nossr50.util.Misc;
-import com.gmail.nossr50.util.Skills;
-
-public class MctopCommand implements CommandExecutor {
-
-    @Override
-    public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
-        String usage = ChatColor.RED + "Proper usage is /mctop [skill] [page]"; //TODO: Needs more locale.
-
-        if (!Config.getInstance().getUseMySQL()) {
-
-            switch (args.length) {
-            case 0:
-                flatfileDisplay(1, "ALL", sender);
-                return true;
-
-            case 1:
-                if (Misc.isInt(args[0])) {
-                    flatfileDisplay(Integer.valueOf(args[0]), "ALL", sender);
-                }
-                else if (Skills.isSkill(args[0])) {
-                    flatfileDisplay(1, args[0].toUpperCase(), sender);
-                }
-                else {
-                    sender.sendMessage(LocaleLoader.getString("Commands.Skill.Invalid"));
-                }
-
-                return true;
-
-            case 2:
-                if (!Skills.isSkill(args[0])) {
-                    sender.sendMessage(LocaleLoader.getString("Commands.Skill.Invalid"));
-                    return true;
-                }
-
-                if (Misc.isInt(args[1])) {
-                    flatfileDisplay(Integer.valueOf(args[1]), args[0].toUpperCase(), sender);
-                }
-                else {
-                    sender.sendMessage(usage);
-                }
-
-                return true;
-
-            default:
-                sender.sendMessage(usage);
-                return true;
-            }
-        }
-        else {
-            String powerlevel = "taming+mining+woodcutting+repair+unarmed+herbalism+excavation+archery+swords+axes+acrobatics+fishing";
-
-            switch (args.length) {
-            case 0:
-                sqlDisplay(1, powerlevel, sender);
-                return true;
-
-            case 1:
-                if (Misc.isInt(args[0])) {
-                    sqlDisplay(Integer.valueOf(args[0]), powerlevel, sender);
-                }
-                else if (Skills.isSkill(args[0])) {
-                    sqlDisplay(1, args[0].toLowerCase(), sender);
-                }
-                else {
-                    sender.sendMessage(LocaleLoader.getString("Commands.Skill.Invalid"));
-                }
-
-                return true;
-
-            case 2:
-                if (!Skills.isSkill(args[0])) {
-                    sender.sendMessage(LocaleLoader.getString("Commands.Skill.Invalid"));
-                    return true;
-                }
-
-                if (Misc.isInt(args[1])) {
-                    sqlDisplay(Integer.valueOf(args[1]), args[0].toLowerCase(), sender);
-                }
-                else {
-                    sender.sendMessage(usage);
-                }
-
-                return true;
-
-            default:
-                sender.sendMessage(usage);
-                return true;
-            }
-        }
-    }
-
-    private void flatfileDisplay(int page, String skill, CommandSender sender) {
-        String[] info = Leaderboard.retrieveInfo(skill, page);
-
-        if (skill.equals("ALL")) {
-            sender.sendMessage(LocaleLoader.getString("Commands.PowerLevel.Leaderboard"));
-        }
-        else {
-            sender.sendMessage(LocaleLoader.getString("Commands.Skill.Leaderboard", new Object[] { Misc.getCapitalized(skill) }));
-        }
-
-        int n = (page * 10) - 9; // Position
-        for (String x : info) {
-            if (x != null) {
-                String digit = String.valueOf(n);
-
-                if (n < 10) {
-                    digit = "0" + digit;
-                }
-
-                String[] splitx = x.split(":");
-
-                // Format: 1. Playername - skill value
-                sender.sendMessage(digit + ". " + ChatColor.GREEN + splitx[1] + " - " + ChatColor.WHITE + splitx[0]);
-                n++;
-            }
-        }
-    }
-
-    private void sqlDisplay(int page, String query, CommandSender sender) {
-        String tablePrefix = Config.getInstance().getMySQLTablePrefix();
-        Database database = mcMMO.getPlayerDatabase();
-
-        HashMap<Integer, ArrayList<String>> userslist = database.read("SELECT " + query + ", user_id FROM " + tablePrefix + "skills WHERE " + query + " > 0 ORDER BY " + query + " DESC ");
-
-        if (query.equals("taming+mining+woodcutting+repair+unarmed+herbalism+excavation+archery+swords+axes+acrobatics+fishing")) {
-            sender.sendMessage(LocaleLoader.getString("Commands.PowerLevel.Leaderboard"));
-        }
-        else {
-            sender.sendMessage(LocaleLoader.getString("Commands.Skill.Leaderboard", new Object[] { Misc.getCapitalized(query) }));
-        }
-
-        for (int i = (page * 10) - 9; i <= (page * 10); i++) {
-            if (i > userslist.size() || database.read("SELECT user FROM " + tablePrefix + "users WHERE id = '" + Integer.valueOf(userslist.get(i).get(1)) + "'") == null) {
-                break;
-            }
-
-            HashMap<Integer, ArrayList<String>> username = database.read("SELECT user FROM " + tablePrefix + "users WHERE id = '" + Integer.valueOf(userslist.get(i).get(1)) + "'");
-            sender.sendMessage(String.valueOf(i) + ". " + ChatColor.GREEN + userslist.get(i).get(0) + " - " + ChatColor.WHITE + username.get(1).get(0));
-        }
-    }
-}

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

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

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

@@ -1,70 +0,0 @@
-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.mcMMO;
-import com.gmail.nossr50.commands.CommandHelper;
-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.LocaleLoader;
-import com.gmail.nossr50.party.Party;
-import com.gmail.nossr50.party.PartyManager;
-import com.gmail.nossr50.util.Users;
-
-public class AcceptCommand implements CommandExecutor {
-    private final mcMMO plugin;
-
-    public AcceptCommand (mcMMO plugin) {
-        this.plugin = plugin;
-    }
-
-    @Override
-    public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
-        if (CommandHelper.noConsoleUsage(sender)) {
-            return true;
-        }
-
-        if (CommandHelper.noCommandPermissions(sender, "mcmmo.commands.party")) {
-            return true;
-        }
-
-        Player player = (Player) sender;
-        PlayerProfile playerProfile = Users.getProfile(player);
-
-        if (playerProfile.hasPartyInvite()) {
-            PartyManager partyManagerInstance = PartyManager.getInstance();
-
-            if (playerProfile.inParty()) {
-                Party party = playerProfile.getParty();
-                McMMOPartyChangeEvent event = new McMMOPartyChangeEvent(player, party.getName(), playerProfile.getInvite().getName(), EventReason.CHANGED_PARTIES);
-
-                plugin.getServer().getPluginManager().callEvent(event);
-
-                if (event.isCancelled()) {
-                    return true;
-                }
-
-                partyManagerInstance.removeFromParty(player.getName(), party);
-            }
-            else {
-                McMMOPartyChangeEvent event = new McMMOPartyChangeEvent(player, null, playerProfile.getInvite().getName(), EventReason.JOINED_PARTY);
-                plugin.getServer().getPluginManager().callEvent(event);
-
-                if (event.isCancelled()) {
-                    return true;
-                }
-            }
-
-            partyManagerInstance.joinInvitedParty(player, playerProfile);
-        }
-        else {
-            player.sendMessage(LocaleLoader.getString("mcMMO.NoInvites"));
-        }
-
-        return true;
-    }
-}

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

@@ -1,74 +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.commands.CommandHelper;
-import com.gmail.nossr50.datatypes.PlayerProfile;
-import com.gmail.nossr50.locale.LocaleLoader;
-import com.gmail.nossr50.party.Party;
-import com.gmail.nossr50.party.PartyManager;
-import com.gmail.nossr50.util.Users;
-
-//TODO: Make this work from console.
-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) {
-        String usage = ChatColor.RED + "Proper usage is /invite <player>"; //TODO: Needs more locale.
-
-        if (CommandHelper.noConsoleUsage(sender)) {
-            return true;
-        }
-
-        if (CommandHelper.noCommandPermissions(sender, "mcmmo.commands.party")) {
-            return true;
-        }
-
-        switch (args.length) {
-        case 1:
-            Player player = (Player) sender;
-            PlayerProfile playerProfile = Users.getProfile(player);
-
-            if (!playerProfile.inParty()) {
-                player.sendMessage(LocaleLoader.getString("Commands.Party.None"));
-                return true;
-            }
-
-            Player target = plugin.getServer().getPlayer(args[0]);
-
-            if (target != null) {
-                if (PartyManager.getInstance().canInvite(player, playerProfile)) {
-                    Party party = playerProfile.getParty();
-                    
-                    Users.getProfile(target).setInvite(party);
-                    player.sendMessage(LocaleLoader.getString("Commands.Invite.Success"));
-                    target.sendMessage(LocaleLoader.getString("Commands.Party.Invite.0", new Object[] {party.getName(), player.getName()}));
-                    target.sendMessage(LocaleLoader.getString("Commands.Party.Invite.1"));
-                    return true;
-                }
-                else {
-                    player.sendMessage(LocaleLoader.getString("Party.Locked"));
-                    return true;
-                }
-            }
-            else {
-                player.sendMessage(LocaleLoader.getString("Party.Player.Invalid"));
-                return true;
-            }
-
-        default:
-            sender.sendMessage(usage);
-            return true;
-        }
-    }
-}

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

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

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

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

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

@@ -0,0 +1,34 @@
+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.mcMMO;
+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 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();
+
+                if (!playerParty.getMembers().contains(mcMMO.p.getServer().getOfflinePlayer(args[1]))) {
+                    sender.sendMessage(LocaleLoader.getString("Party.NotInYourParty", args[1]));
+                    return true;
+                }
+
+                PartyManager.setPartyLeader(args[1], 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 playerParty = UserManager.getPlayer((Player) sender).getParty();
+
+        switch (args.length) {
+            case 1:
+                unprotectParty(sender, playerParty);
+                return true;
+
+            case 2:
+                if (args[1].equalsIgnoreCase("clear") || args[1].equalsIgnoreCase("reset")) {
+                    unprotectParty(sender, playerParty);
+                    return true;
+                }
+
+                protectParty(sender, playerParty, 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(CommandSender sender, Party playerParty) {
+        playerParty.setLocked(true);
+        playerParty.setPassword(null);
+        sender.sendMessage(LocaleLoader.getString("Party.Password.Removed"));
+    }
+
+    private void protectParty(CommandSender sender, Party playerParty, String password) {
+        playerParty.setLocked(true);
+        playerParty.setPassword(password);
+        sender.sendMessage(LocaleLoader.getString("Party.Password.Set", password));
+    }
+}

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

@@ -1,242 +1,154 @@
-package com.gmail.nossr50.commands.party;
+package com.gmail.nossr50.commands.party;
-
+
-import org.bukkit.ChatColor;
+import org.bukkit.command.Command;
-import org.bukkit.Server;
+import org.bukkit.command.CommandExecutor;
-import org.bukkit.command.Command;
+import org.bukkit.command.CommandSender;
-import org.bukkit.command.CommandExecutor;
+import org.bukkit.entity.Player;
-import org.bukkit.command.CommandSender;
+
-import org.bukkit.entity.Player;
+import com.gmail.nossr50.commands.chat.PartyChatCommand;
-
+import com.gmail.nossr50.datatypes.player.McMMOPlayer;
-import com.gmail.nossr50.mcMMO;
+import com.gmail.nossr50.locale.LocaleLoader;
-import com.gmail.nossr50.commands.CommandHelper;
+import com.gmail.nossr50.util.Permissions;
-import com.gmail.nossr50.datatypes.PlayerProfile;
+import com.gmail.nossr50.util.commands.CommandUtils;
-import com.gmail.nossr50.events.party.McMMOPartyChangeEvent;
+import com.gmail.nossr50.util.player.UserManager;
-import com.gmail.nossr50.events.party.McMMOPartyChangeEvent.EventReason;
+
-import com.gmail.nossr50.locale.LocaleLoader;
+public class PartyCommand implements CommandExecutor {
-import com.gmail.nossr50.party.Party;
+    private McMMOPlayer mcMMOPlayer;
-import com.gmail.nossr50.party.PartyManager;
+    private Player player;
-import com.gmail.nossr50.util.Users;
+
-
+    private CommandExecutor partyJoinCommand           = new PartyJoinCommand();
-public class PartyCommand implements CommandExecutor {
+    private CommandExecutor partyAcceptCommand         = new PartyAcceptCommand();
-    private final mcMMO plugin;
+    private CommandExecutor partyCreateCommand         = new PartyCreateCommand();
-
+    private CommandExecutor partyQuitCommand           = new PartyQuitCommand();
-    public PartyCommand (mcMMO plugin) {
+    private CommandExecutor partyExpShareCommand       = new PartyExpShareCommand();
-        this.plugin = plugin;
+    private CommandExecutor partyItemShareCommand      = new PartyItemShareCommand();
-    }
+    private CommandExecutor partyInviteCommand         = new PartyInviteCommand();
-
+    private CommandExecutor partyKickCommand           = new PartyKickCommand();
-    @Override
+    private CommandExecutor partyDisbandCommand        = new PartyDisbandCommand();
-    public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
+    private CommandExecutor partyChangeOwnerCommand    = new PartyChangeOwnerCommand();
-        if (CommandHelper.noConsoleUsage(sender)) {
+    private CommandExecutor partyLockCommand           = new PartyLockCommand();
-            return true;
+    private CommandExecutor partyChangePasswordCommand = new PartyChangePasswordCommand();
-        }
+    private CommandExecutor partyRenameCommand         = new PartyRenameCommand();
-
+    private CommandExecutor partyInfoCommand           = new PartyInfoCommand();
-        if (CommandHelper.noCommandPermissions(sender, "mcmmo.commands.party")) {
+    private CommandExecutor partyHelpCommand           = new PartyHelpCommand();
-            return true;
+    private CommandExecutor partyTeleportCommand       = new PtpCommand();
-        }
+    private CommandExecutor partyChatCommand           = new PartyChatCommand();
-
+
-        Player player = (Player) sender;
+    @Override
-        String playerName = player.getName();
+    public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
-        PlayerProfile playerProfile = Users.getProfile(player);
+        if (CommandUtils.noConsoleUsage(sender)) {
-
+            return true;
-        PartyManager partyManagerInstance = PartyManager.getInstance();
+        }
-        Party party = playerProfile.getParty();
+
-
+        if (!Permissions.party(sender)) {
-        switch (args.length) {
+            sender.sendMessage(command.getPermissionMessage());
-        case 0:
+            return true;
-            if (party == null) {
+        }
-                player.sendMessage(LocaleLoader.getString("Party.Help.0"));
+
-                player.sendMessage(LocaleLoader.getString("Party.Help.1"));
+        player = (Player) sender;
-                player.sendMessage(LocaleLoader.getString("Party.Help.2"));
+        mcMMOPlayer = UserManager.getPlayer(player);
-            }
+
-            else {
+        if (args.length < 1) {
-                Server server = plugin.getServer();
+            if (!mcMMOPlayer.inParty()) {
-                String leader = party.getLeader();
+                sender.sendMessage(LocaleLoader.getString("Commands.Party.None"));
-                StringBuffer tempList = new StringBuffer();
+                return printUsage();
-
+            }
-                for (String otherPlayerName : party.getMembers()) {
+
-                    if (leader.equals(otherPlayerName)) {
+            return partyInfoCommand.onCommand(sender, command, label, args);
-                        tempList.append(ChatColor.GOLD);
+        }
-                    }
+
-                    else if (server.getPlayer(otherPlayerName) != null) {
+        PartySubcommandType subcommand = PartySubcommandType.getSubcommand(args[0]);
-                        tempList.append(ChatColor.WHITE);
+
-                    }
+        if (subcommand == null) {
-                    else {
+            return printUsage();
-                        tempList.append(ChatColor.GRAY);
+        }
-                    }
+
-
+        // Can't use this for lock/unlock since they're handled by the same command
-                    tempList.append(otherPlayerName + " ");
+        if (subcommand != PartySubcommandType.LOCK && subcommand != PartySubcommandType.UNLOCK && !Permissions.partySubcommand(sender, subcommand)) {
-                }
+            sender.sendMessage(command.getPermissionMessage());
-
+            return true;
-                player.sendMessage(LocaleLoader.getString("Commands.Party.InParty", new Object[] {party.getName()}));
+        }
-                player.sendMessage(LocaleLoader.getString("Commands.Party.Members", new Object[] {tempList}));
+
-            }
+        switch (subcommand) {
-
+            case JOIN:
-            return true;
+                return partyJoinCommand.onCommand(sender, command, label, args);
-
+            case ACCEPT:
-        case 1:
+                return partyAcceptCommand.onCommand(sender, command, label, args);
-            if (args[0].equalsIgnoreCase("q")) {
+            case CREATE:
-                if (party != null) {
+                return partyCreateCommand.onCommand(sender, command, label, args);
-                    McMMOPartyChangeEvent event = new McMMOPartyChangeEvent(player, party.getName(), null, EventReason.LEFT_PARTY);
+            case HELP:
-                    plugin.getServer().getPluginManager().callEvent(event);
+                return partyHelpCommand.onCommand(sender, command, label, args);
-
+            default:
-                    if (event.isCancelled()) {
+                break;
-                        return true;
+        }
-                    }
+
-
+        // Party member commands
-                    partyManagerInstance.removeFromParty(playerName, party);
+        if (!mcMMOPlayer.inParty()) {
-                    player.sendMessage(LocaleLoader.getString("Commands.Party.Leave"));
+            sender.sendMessage(LocaleLoader.getString("Commands.Party.None"));
-                }
+            return printUsage();
-                else {
+        }
-                    player.sendMessage("Commands.Party.None");
+
-                }
+        switch (subcommand) {
-            }
+            case INFO:
-            else if (args[0].equals("?")) {
+                return partyInfoCommand.onCommand(sender, command, label, args);
-                player.sendMessage(LocaleLoader.getString("Party.Help.3"));
+            case QUIT:
-                player.sendMessage(LocaleLoader.getString("Party.Help.1"));
+                return partyQuitCommand.onCommand(sender, command, label, args);
-                player.sendMessage(LocaleLoader.getString("Party.Help.4"));
+            case INVITE:
-                player.sendMessage(LocaleLoader.getString("Party.Help.5"));
+                return partyInviteCommand.onCommand(sender, command, label, args);
-                player.sendMessage(LocaleLoader.getString("Party.Help.6"));
+            case TELEPORT:
-                player.sendMessage(LocaleLoader.getString("Party.Help.7"));
+                return partyTeleportCommand.onCommand(sender, command, label, extractArgs(args));
-            }
+            case CHAT:
-            else if (args[0].equalsIgnoreCase("lock")) {
+                return partyChatCommand.onCommand(sender, command, label, extractArgs(args));
-                if (party != null) {
+            default:
-                    if (party.getLeader().equals(playerName)) {
+                break;
-                        if (party.isLocked()) {
+        }
-                            player.sendMessage(LocaleLoader.getString("Party.IsLocked"));
+
-                        }
+        // Party leader commands
-                        else {
+        if (!mcMMOPlayer.getParty().getLeader().equalsIgnoreCase(player.getName())) {
-                            party.setLocked(true);
+            sender.sendMessage(LocaleLoader.getString("Party.NotOwner"));
-                            player.sendMessage(LocaleLoader.getString("Party.Locked"));
+            return true;
-                        }
+        }
-                    }
+
-                    else {
+        switch (subcommand) {
-                        player.sendMessage(LocaleLoader.getString("Party.NotOwner"));
+            case EXPSHARE:
-                    }
+                return partyExpShareCommand.onCommand(sender, command, label, args);
-                }
+            case ITEMSHARE:
-                else {
+                return partyItemShareCommand.onCommand(sender, command, label, args);
-                    player.sendMessage("Commands.Party.None");
+            case KICK:
-                }
+                return partyKickCommand.onCommand(sender, command, label, args);
-            }
+            case DISBAND:
-            else if (args[0].equalsIgnoreCase("unlock")) {
+                return partyDisbandCommand.onCommand(sender, command, label, args);
-                if (party != null) {
+            case OWNER:
-                    if (party.getLeader().equals(playerName)) {
+                return partyChangeOwnerCommand.onCommand(sender, command, label, args);
-                        if (!party.isLocked()) {
+            case LOCK:
-                            player.sendMessage(LocaleLoader.getString("Party.IsntLocked"));
+                // Fallthrough
-                        }
+            case UNLOCK:
-                        else {
+                return partyLockCommand.onCommand(sender, command, label, args);
-                            party.setLocked(false);
+            case PASSWORD:
-                            player.sendMessage(LocaleLoader.getString("Party.Unlocked"));
+                return partyChangePasswordCommand.onCommand(sender, command, label, args);
-                        }
+            case RENAME:
-                    }
+                return partyRenameCommand.onCommand(sender, command, label, args);
-                    else {
+            default:
-                        player.sendMessage(LocaleLoader.getString("Party.NotOwner"));
+                break;
-                    }
+        }
-                }
+
-                else {
+        return true;
-                    player.sendMessage("Commands.Party.None");
+    }
-                }
+
-            }
+    private boolean printUsage() {
-            else {
+        player.sendMessage(LocaleLoader.getString("Party.Help.0", "/party join"));
-                if (party != null) {
+        player.sendMessage(LocaleLoader.getString("Party.Help.1", "/party create"));
-                    McMMOPartyChangeEvent event = new McMMOPartyChangeEvent(player, party.getName(), args[0], EventReason.CHANGED_PARTIES);
+        player.sendMessage(LocaleLoader.getString("Party.Help.2", "/party ?"));
-                    plugin.getServer().getPluginManager().callEvent(event);
+        return true;
-
+    }
-                    if (event.isCancelled()) {
+
-                        return true;
+    private String[] extractArgs(String[] args) {
-                    }
+        String[] newArgs = new String[args.length - 1];
-
+
-                    partyManagerInstance.removeFromParty(playerName, party);
+        for (int i = 1; i < args.length; i++) {
-                }
+            newArgs[i - 1] = args[i];
-                else {
+        }
-                    McMMOPartyChangeEvent event = new McMMOPartyChangeEvent(player, null, args[0], EventReason.JOINED_PARTY);
+
-                    plugin.getServer().getPluginManager().callEvent(event);
+        return newArgs;
-
+    }
-                    if (event.isCancelled()) {
+}
-                        return true;
-                    }
-                }
-
-                partyManagerInstance.joinParty(player, playerProfile, args[0], null);
-            }
-
-            return true;
-
-        case 2:
-            if (playerProfile.inParty()) {
-                if (args[0].equalsIgnoreCase("password")) {
-                    if (party.getLeader().equals(playerName)) {
-                        party.setLocked(true);
-                        party.setPassword(args[1]);
-                        player.sendMessage(LocaleLoader.getString("Party.PasswordSet", new Object[] {args[1]}));
-                    }
-                    else {
-                        player.sendMessage(LocaleLoader.getString("Party.NotOwner"));
-                    }
-                }
-                else if (args[0].equalsIgnoreCase("kick")) {
-                    if (party.getLeader().equals(playerName)) {
-                        if (!party.getMembers().contains(args[1])) {
-                            player.sendMessage(LocaleLoader.getString("Party.NotInYourParty", new Object[] {args[1]}));
-                            return true;
-                        }
-                        else {
-                            String partyName = party.getName();
-                            McMMOPartyChangeEvent event = new McMMOPartyChangeEvent(player, partyName, null, EventReason.KICKED_FROM_PARTY);
-
-                            plugin.getServer().getPluginManager().callEvent(event);
-
-                            if (event.isCancelled()) {
-                                return true;
-                            }
-
-                            partyManagerInstance.removeFromParty(args[1], party);
-                        }
-                    }
-                    else {
-                        player.sendMessage(LocaleLoader.getString("Party.NotOwner"));
-                    }
-                }
-                else if (args[0].equalsIgnoreCase("owner")) {
-                    if (party.getLeader().equals(playerName)) {
-                        if (!party.getMembers().contains(args[1])) {
-                            player.sendMessage(LocaleLoader.getString("Party.NotInYourParty", new Object[] {args[1]}));
-                            return true;
-                        }
-                        else {
-                            partyManagerInstance.setPartyLeader(args[1], party);
-                        }
-                    }
-                }
-                else {
-                    McMMOPartyChangeEvent event = new McMMOPartyChangeEvent(player, party.getName(), args[0], EventReason.CHANGED_PARTIES);
-                    plugin.getServer().getPluginManager().callEvent(event);
-
-                    if (event.isCancelled()) {
-                        return true;
-                    }
-
-                    partyManagerInstance.removeFromParty(playerName, party);
-                    partyManagerInstance.joinParty(player, playerProfile, args[0], args[1]);
-                }
-            }
-            else {
-                McMMOPartyChangeEvent event = new McMMOPartyChangeEvent(player, null, args[0], EventReason.JOINED_PARTY);
-                plugin.getServer().getPluginManager().callEvent(event);
-
-                if (event.isCancelled()) {
-                    return true;
-                }
-
-                partyManagerInstance.joinParty(player, playerProfile, args[0], args[1]);
-            }
-
-            return true;
-
-        default:
-            player.sendMessage(LocaleLoader.getString("Party.Help.0"));
-            player.sendMessage(LocaleLoader.getString("Party.Help.1"));
-            player.sendMessage(LocaleLoader.getString("Party.Help.2"));
-            return true;
-        }
-    }
-}

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

@@ -0,0 +1,56 @@
+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.player.UserManager;
+
+public class PartyCreateCommand implements CommandExecutor {
+    private McMMOPlayer mcMMOPlayer;
+    private Player player;
+
+    @Override
+    public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
+        switch (args.length) {
+            case 2:
+                // Fallthrough
+            case 3:
+                Party newParty = PartyManager.getParty(args[1]);
+
+                // Check to see if the party exists, and if it does cancel creating a new party
+                if (newParty != null) {
+                    sender.sendMessage(LocaleLoader.getString("Commands.Party.AlreadyExists", args[1]));
+                    return true;
+                }
+
+                player = (Player) sender;
+                mcMMOPlayer = UserManager.getPlayer(player);
+
+                // Changing parties
+                if (!PartyManager.changeOrJoinParty(mcMMOPlayer, player, mcMMOPlayer.getParty(), args[1])) {
+                    return true;
+                }
+
+                PartyManager.createParty(player, mcMMOPlayer, args[1], getPassword(args));
+                return true;
+
+            default:
+                sender.sendMessage(LocaleLoader.getString("Commands.Usage.3", "party", "create", "<" + LocaleLoader.getString("Commands.Usage.PartyName") + ">", "[" + LocaleLoader.getString("Commands.Usage.Password") + "]"));
+                return true;
+        }
+    }
+
+    private String getPassword(String[] args) {
+        if (args.length == 3) {
+            return args[2];
+        }
+
+        return null;
+    }
+}

src/main/java/com/gmail/nossr50/commands/party/PartyDisbandCommand.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.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();
+
+                for (Player member : playerParty.getOnlineMembers()) {
+                    if (!PartyManager.handlePartyChangeEvent(member, playerParty.getName(), 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.locale.LocaleLoader;
+import com.gmail.nossr50.party.ShareHandler;
+import com.gmail.nossr50.party.ShareHandler.ShareMode;
+import com.gmail.nossr50.util.StringUtils;
+import com.gmail.nossr50.util.player.UserManager;
+
+public class PartyExpShareCommand implements CommandExecutor {
+    private Party playerParty;
+
+    @Override
+    public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
+        if (!Config.getInstance().getExpShareEnabled()) {
+            sender.sendMessage(LocaleLoader.getString("Party.ExpShare.Disabled"));
+            return true;
+        }
+
+        switch (args.length) {
+            case 2:
+                playerParty = UserManager.getPlayer((Player) sender).getParty();
+
+                if (args[1].equalsIgnoreCase("none") || args[1].equalsIgnoreCase("off") || args[1].equalsIgnoreCase("false")) {
+                    handleChangingShareMode(ShareMode.NONE);
+                }
+                else if (args[1].equalsIgnoreCase("equal") || args[1].equalsIgnoreCase("even") || args[1].equalsIgnoreCase("on") || args[1].equalsIgnoreCase("true")) {
+                    handleChangingShareMode(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(ShareHandler.ShareMode mode) {
+        playerParty.setXpShareMode(mode);
+
+        for (Player member : playerParty.getOnlineMembers()) {
+            member.sendMessage(LocaleLoader.getString("Commands.Party.SetSharing", LocaleLoader.getString("Party.ShareType.Exp"), LocaleLoader.getString("Party.ShareMode." + StringUtils.getCapitalized(mode.toString()))));
+        }
+    }
+}

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

@@ -0,0 +1,30 @@
+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"));
+                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,102 @@
+package com.gmail.nossr50.commands.party;
+
+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.config.Config;
+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.party.ShareHandler;
+import com.gmail.nossr50.util.player.UserManager;
+
+public class PartyInfoCommand implements CommandExecutor {
+    private Player player;
+    private Party playerParty;
+
+    @Override
+    public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
+        player = (Player) sender;
+        McMMOPlayer mcMMOPlayer = UserManager.getPlayer(player);
+        playerParty = mcMMOPlayer.getParty();
+
+        displayPartyHeader();
+        displayShareModeInfo();
+        displayMemberInfo();
+        return true;
+    }
+
+    private String createMembersList() {
+        StringBuilder memberList = new StringBuilder();
+
+        for (OfflinePlayer member : playerParty.getMembers()) {
+            if (playerParty.getLeader().equalsIgnoreCase(member.getName())) {
+                memberList.append(ChatColor.GOLD).append(member.getName()).append(" ");
+            }
+            else if (member.isOnline()) {
+                memberList.append(ChatColor.WHITE).append(member.getName()).append(" ");
+            }
+            else {
+                memberList.append(ChatColor.GRAY).append(member.getName()).append(" ");
+            }
+        }
+
+        return memberList.toString();
+    }
+
+    private void displayShareModeInfo() {
+        boolean xpShareEnabled = Config.getInstance().getExpShareEnabled();
+        boolean itemShareEnabled = Config.getInstance().getItemShareEnabled();
+        boolean itemSharingActive = playerParty.getItemShareMode() != ShareHandler.ShareMode.NONE;
+
+        if (!xpShareEnabled && !itemShareEnabled) {
+            return;
+        }
+
+        String expShareInfo = "";
+        String itemShareInfo = "";
+        String separator = "";
+
+        if (xpShareEnabled) {
+            expShareInfo = LocaleLoader.getString("Commands.Party.ExpShare", playerParty.getXpShareMode().toString());
+        }
+
+        if (itemShareEnabled) {
+            itemShareInfo = LocaleLoader.getString("Commands.Party.ItemShare", playerParty.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", playerParty.getItemShareCategories()));
+        }
+    }
+
+    private void displayPartyHeader() {
+        player.sendMessage(LocaleLoader.getString("Commands.Party.Header"));
+
+        if (playerParty.isLocked()) {
+            player.sendMessage(LocaleLoader.getString("Commands.Party.Status", playerParty.getName(), LocaleLoader.getString("Party.Status.Locked")));
+        }
+        else {
+            player.sendMessage(LocaleLoader.getString("Commands.Party.Status", playerParty.getName(), LocaleLoader.getString("Party.Status.Unlocked")));
+        }
+    }
+
+    private void displayMemberInfo() {
+        int membersNear = PartyManager.getNearMembers(player, playerParty, Config.getInstance().getPartyShareRange()).size();
+        int membersOnline = playerParty.getOnlineMembers().size() - 1;
+
+        player.sendMessage(LocaleLoader.getString("Commands.Party.Members.Header"));
+        player.sendMessage(LocaleLoader.getString("Commands.Party.MembersNear", membersNear, membersOnline));
+        player.sendMessage(LocaleLoader.getString("Commands.Party.Members", createMembersList()));
+    }
+}

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

@@ -0,0 +1,72 @@
+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.mcMMO;
+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.player.UserManager;
+
+public class PartyInviteCommand implements CommandExecutor {
+    private McMMOPlayer mcMMOTarget;
+    private Player target;
+
+    private McMMOPlayer mcMMOPlayer;
+    private Player player;
+    private Party playerParty;
+
+    @Override
+    public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
+        switch (args.length) {
+            case 2:
+                if (!mcMMO.p.getServer().getOfflinePlayer(args[1]).isOnline()) {
+                    sender.sendMessage(LocaleLoader.getString("Party.NotOnline", args[1]));
+                    return true;
+                }
+
+                mcMMOTarget = UserManager.getPlayer(args[1]);
+
+                if (mcMMOTarget == null) {
+                    sender.sendMessage(LocaleLoader.getString("Party.Player.Invalid"));
+                    return true;
+                }
+
+                target = mcMMOTarget.getPlayer();
+                mcMMOPlayer = UserManager.getPlayer((Player) sender);
+                player = mcMMOPlayer.getPlayer();
+
+                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", target.getName()));
+                    return true;
+                }
+
+                playerParty = mcMMOPlayer.getParty();
+
+                if (!PartyManager.canInvite(player, playerParty)) {
+                    player.sendMessage(LocaleLoader.getString("Party.Locked"));
+                    return true;
+                }
+
+                mcMMOTarget.setPartyInvite(playerParty);
+
+                sender.sendMessage(LocaleLoader.getString("Commands.Invite.Success"));
+                target.sendMessage(LocaleLoader.getString("Commands.Party.Invite.0", playerParty.getName(), player.getName()));
+                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,101 @@
+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.locale.LocaleLoader;
+import com.gmail.nossr50.party.ShareHandler;
+import com.gmail.nossr50.party.ShareHandler.ShareMode;
+import com.gmail.nossr50.util.StringUtils;
+import com.gmail.nossr50.util.player.UserManager;
+
+public class PartyItemShareCommand implements CommandExecutor {
+    private Party playerParty;
+
+    @Override
+    public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
+        if (!Config.getInstance().getItemShareEnabled()) {
+            sender.sendMessage(LocaleLoader.getString("Party.ItemShare.Disabled"));
+            return true;
+        }
+
+        switch (args.length) {
+            case 2:
+                playerParty = UserManager.getPlayer((Player) sender).getParty();
+
+                if (args[1].equalsIgnoreCase("none") || args[1].equalsIgnoreCase("off") || args[1].equalsIgnoreCase("false")) {
+                    handleChangingShareMode(ShareMode.NONE);
+                }
+                else if (args[1].equalsIgnoreCase("equal") || args[1].equalsIgnoreCase("even")) {
+                    handleChangingShareMode(ShareMode.EQUAL);
+                }
+                else if (args[1].equalsIgnoreCase("random")) {
+                    handleChangingShareMode(ShareMode.RANDOM);
+                }
+                else {
+                    sender.sendMessage(LocaleLoader.getString("Commands.Usage.2", "party", "itemshare", "<NONE | EQUAL | RANDOM>"));
+                }
+
+                return true;
+
+            case 3:
+                playerParty = UserManager.getPlayer((Player) sender).getParty();
+                boolean toggle = false;
+
+                if (args[2].equalsIgnoreCase("true") || args[2].equalsIgnoreCase("on") || args[2].equalsIgnoreCase("enabled")) {
+                    toggle = true;
+                }
+                else if (args[2].equalsIgnoreCase("false") || args[2].equalsIgnoreCase("off") || args[2].equalsIgnoreCase("disabled")) {
+                    toggle = false;
+                }
+
+                if (args[1].equalsIgnoreCase("loot")) {
+                    playerParty.setSharingLootDrops(toggle);
+                }
+                else if (args[1].equalsIgnoreCase("mining")) {
+                    playerParty.setSharingMiningDrops(toggle);
+                }
+                else if (args[1].equalsIgnoreCase("herbalism")) {
+                    playerParty.setSharingHerbalismDrops(toggle);
+                }
+                else if (args[1].equalsIgnoreCase("woodcutting")) {
+                    playerParty.setSharingWoodcuttingDrops(toggle);
+                }
+                else {
+                    sender.sendMessage(LocaleLoader.getString("Commands.Usage.2", "party", "itemshare", "<loot | mining | herbalism | woodcutting> <true | false>"));
+                }
+
+                notifyToggleItemShareCategory(args, toggle);
+                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> <true | false>"));
+                return true;
+        }
+    }
+
+    private void handleChangingShareMode(ShareHandler.ShareMode mode) {
+        playerParty.setItemShareMode(mode);
+
+        for (Player member : playerParty.getOnlineMembers()) {
+            member.sendMessage(LocaleLoader.getString("Commands.Party.SetSharing", LocaleLoader.getString("Party.ShareType.Item"), LocaleLoader.getString("Party.ShareMode." + StringUtils.getCapitalized(mode.toString()))));
+        }
+    }
+
+    private void notifyToggleItemShareCategory(String[] args, boolean toggle) {
+        String state = "disabled";
+
+        if (toggle) {
+            state = "enabled";
+        }
+
+        for (Player member : playerParty.getOnlineMembers()) {
+            member.sendMessage(LocaleLoader.getString("Commands.Party.ToggleShareCategory", StringUtils.getCapitalized(args[1]), state));
+        }
+    }
+}

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

@@ -0,0 +1,96 @@
+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.mcMMO;
+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.player.UserManager;
+
+public class PartyJoinCommand implements CommandExecutor {
+    private McMMOPlayer mcMMOTarget;
+    private Player target;
+    private Party targetParty;
+
+    private McMMOPlayer mcMMOPlayer;
+    private Player player;
+    private Party playerParty;
+
+    @Override
+    public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
+        switch (args.length) {
+            case 2:
+                // Fallthrough
+            case 3:
+                // Verify target exists and is in a different party than the player
+                if (!canJoinParty(sender, args[1])) {
+                    return true;
+                }
+
+                String password = getPassword(args);
+
+                // Make sure party passwords match
+                if (!PartyManager.checkPartyPassword(player, targetParty, password)) {
+                    return true;
+                }
+
+                // Changing parties
+                if (!PartyManager.changeOrJoinParty(mcMMOPlayer, player, playerParty, targetParty.getName())) {
+                    return true;
+                }
+
+                PartyManager.joinParty(player, mcMMOPlayer, targetParty, password);
+                return true;
+
+            default:
+                sender.sendMessage(LocaleLoader.getString("Commands.Usage.3", "party", "join", "<" + LocaleLoader.getString("Commands.Usage.Player") + ">", "[" + LocaleLoader.getString("Commands.Usage.Password") + "]"));
+                return true;
+        }
+    }
+
+    private String getPassword(String[] args) {
+        if (args.length == 3) {
+            return args[2];
+        }
+
+        return null;
+    }
+
+    private boolean canJoinParty(CommandSender sender, String targetName) {
+        if (!mcMMO.p.getServer().getOfflinePlayer(targetName).isOnline()) {
+            sender.sendMessage(LocaleLoader.getString("Party.NotOnline", targetName));
+            return false;
+        }
+
+        mcMMOTarget = UserManager.getPlayer(targetName);
+
+        if (mcMMOTarget == null) {
+            sender.sendMessage(LocaleLoader.getString("Party.Player.Invalid"));
+            return false;
+        }
+
+        target = mcMMOTarget.getPlayer();
+
+        if (!mcMMOTarget.inParty()) {
+            sender.sendMessage(LocaleLoader.getString("Party.PlayerNotInParty", targetName));
+            return false;
+        }
+
+        player = (Player) sender;
+        mcMMOPlayer = UserManager.getPlayer(player);
+        playerParty = mcMMOPlayer.getParty();
+        targetParty = mcMMOTarget.getParty();
+
+        if (player.equals(target) || (mcMMOPlayer.inParty() && playerParty.equals(targetParty))) {
+            sender.sendMessage(LocaleLoader.getString("Party.Join.Self"));
+            return false;
+        }
+
+        return true;
+    }
+}

src/main/java/com/gmail/nossr50/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)) {
+                    sender.sendMessage(LocaleLoader.getString("Party.NotInYourParty", args[1]));
+                    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;
+                    }
+
+                    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,97 @@
+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.player.UserManager;
+
+public class PartyLockCommand implements CommandExecutor {
+    private Party playerParty;
+
+    @Override
+    public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
+        playerParty = UserManager.getPlayer((Player) sender).getParty();
+
+        switch (args.length) {
+            case 1:
+                if (args[0].equalsIgnoreCase("lock")) {
+                    lockParty(sender, command);
+                }
+                else if (args[0].equalsIgnoreCase("unlock")) {
+                    unlockParty(sender, command);
+                }
+
+                return true;
+
+            case 2:
+                if (!args[0].equalsIgnoreCase("lock")) {
+                    sendUsageStrings(sender);
+                    return true;
+                }
+
+                if (args[1].equalsIgnoreCase("on") || args[1].equalsIgnoreCase("true")) {
+                    lockParty(sender, command);
+                }
+                else if (args[1].equalsIgnoreCase("off") || args[1].equalsIgnoreCase("false")) {
+                    unlockParty(sender, command);
+                }
+                else {
+                    sendUsageStrings(sender);
+                }
+
+                return true;
+
+            default:
+                sendUsageStrings(sender);
+                return true;
+        }
+    }
+
+    /**
+     * Handle locking a party.
+     */
+    private void lockParty(CommandSender sender, Command command) {
+        if (!Permissions.partySubcommand(sender, PartySubcommandType.LOCK)) {
+            sender.sendMessage(command.getPermissionMessage());
+            return;
+        }
+
+        if (playerParty.isLocked()) {
+            sender.sendMessage(LocaleLoader.getString("Party.IsLocked"));
+            return;
+        }
+
+        playerParty.setLocked(true);
+        sender.sendMessage(LocaleLoader.getString("Party.Locked"));
+    }
+
+    /**
+     * Handle unlocking a party.
+     *
+     * @return true if party is successfully unlocked, false otherwise.
+     */
+    private void unlockParty(CommandSender sender, Command command) {
+        if (!Permissions.partySubcommand(sender, PartySubcommandType.UNLOCK)) {
+            sender.sendMessage(command.getPermissionMessage());
+            return;
+        }
+
+        if (!playerParty.isLocked()) {
+            sender.sendMessage(LocaleLoader.getString("Party.IsntLocked"));
+            return;
+        }
+
+        playerParty.setLocked(false);
+        sender.sendMessage(LocaleLoader.getString("Party.Unlocked"));
+    }
+
+    private void sendUsageStrings(CommandSender sender) {
+        sender.sendMessage(LocaleLoader.getString("Commands.Usage.2", "party", "lock", "[on|off]"));
+        sender.sendMessage(LocaleLoader.getString("Commands.Usage.1", "party", "unlock"));
+    }
+}

src/main/java/com/gmail/nossr50/commands/party/PartyQuitCommand.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 PartyQuitCommand implements CommandExecutor {
+    private Player player;
+    private Party playerParty;
+
+    @Override
+    public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
+        switch (args.length) {
+            case 1:
+                player = (Player) sender;
+                playerParty = UserManager.getPlayer(player).getParty();
+
+                if (!PartyManager.handlePartyChangeEvent(player, playerParty.getName(), null, EventReason.LEFT_PARTY)) {
+                    return true;
+                }
+
+                PartyManager.removeFromParty(player, playerParty);
+                sender.sendMessage(LocaleLoader.getString("Commands.Party.Leave"));
+                return true;
+
+            default:
+                sender.sendMessage(LocaleLoader.getString("Commands.Usage.1", "party", "[quit|q|leave]"));
+                return true;
+        }
+    }
+}

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

@@ -0,0 +1,58 @@
+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 PartyRenameCommand implements CommandExecutor {
+    @Override
+    public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
+        Party playerParty = UserManager.getPlayer((Player) sender).getParty();
+        String leaderName = playerParty.getLeader();
+
+        switch (args.length) {
+            case 2:
+                String newPartyName = args[1];
+
+                // This is to prevent party leaders from spamming other players with the rename message
+                if (playerParty.getName().equalsIgnoreCase(newPartyName)) {
+                    sender.sendMessage(LocaleLoader.getString("Party.Rename.Same"));
+                    return true;
+                }
+
+                Party newParty = PartyManager.getParty(newPartyName);
+
+                // Check to see if the party exists, and if it does cancel renaming the party
+                if (newParty != null) {
+                    sender.sendMessage(LocaleLoader.getString("Commands.Party.AlreadyExists", newPartyName));
+                    return true;
+                }
+
+                for (Player member : playerParty.getOnlineMembers()) {
+                    if (!PartyManager.handlePartyChangeEvent(member, playerParty.getName(), 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,89 +1,218 @@
-package com.gmail.nossr50.commands.party;
+package com.gmail.nossr50.commands.party;
-
+
-import org.bukkit.ChatColor;
+import org.bukkit.World;
-import org.bukkit.command.Command;
+import org.bukkit.command.Command;
-import org.bukkit.command.CommandExecutor;
+import org.bukkit.command.CommandExecutor;
-import org.bukkit.command.CommandSender;
+import org.bukkit.command.CommandSender;
-import org.bukkit.entity.Player;
+import org.bukkit.entity.Player;
-
+
-import com.gmail.nossr50.mcMMO;
+import com.gmail.nossr50.mcMMO;
-import com.gmail.nossr50.commands.CommandHelper;
+import com.gmail.nossr50.config.Config;
-import com.gmail.nossr50.config.Config;
+import com.gmail.nossr50.datatypes.player.McMMOPlayer;
-import com.gmail.nossr50.datatypes.PlayerProfile;
+import com.gmail.nossr50.events.party.McMMOPartyTeleportEvent;
-import com.gmail.nossr50.events.party.McMMOPartyTeleportEvent;
+import com.gmail.nossr50.locale.LocaleLoader;
-import com.gmail.nossr50.locale.LocaleLoader;
+import com.gmail.nossr50.party.PartyManager;
-import com.gmail.nossr50.party.PartyManager;
+import com.gmail.nossr50.util.Misc;
-import com.gmail.nossr50.util.Users;
+import com.gmail.nossr50.util.Permissions;
-
+import com.gmail.nossr50.util.commands.CommandUtils;
-public class PtpCommand implements CommandExecutor {
+import com.gmail.nossr50.util.player.UserManager;
-    private final mcMMO plugin;
+
-
+public class PtpCommand implements CommandExecutor {
-    public PtpCommand(mcMMO instance) {
+    private Player player;
-        this.plugin = instance;
+    private McMMOPlayer mcMMOPlayer;
-    }
+
-
+    private Player target;
-    @Override
+    private McMMOPlayer mcMMOTarget;
-    public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
+
-        String usage = ChatColor.RED + "Proper usage is /ptp <player>"; //TODO: Needs more locale.
+    @Override
-
+    public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
-        if (CommandHelper.noConsoleUsage(sender)) {
+        if (CommandUtils.noConsoleUsage(sender)) {
-            return true;
+            return true;
-        }
+        }
-
+
-        if (CommandHelper.noCommandPermissions(sender, "mcmmo.commands.ptp")) {
+        switch (args.length) {
-            return true;
+            case 1:
-        }
+                player = (Player) sender;
-
+                mcMMOPlayer = UserManager.getPlayer(player);
-        switch (args.length) {
+
-        case 1:
+                if (args[0].equalsIgnoreCase("toggle")) {
-            Player player = (Player) sender;
+                    if (!Permissions.partyTeleportToggle(sender)) {
-            PlayerProfile profile = Users.getProfile(player);
+                        sender.sendMessage(command.getPermissionMessage());
-
+                        return true;
-            if (profile.getRecentlyHurt() + (Config.getInstance().getPTPCommandCooldown() * 1000) > System.currentTimeMillis()) {
+                    }
-                player.sendMessage(LocaleLoader.getString("Party.Teleport.Hurt", new Object[] { Config.getInstance().getPTPCommandCooldown() }));
+
-                return true;
+                    return togglePartyTeleportation();
-            }
+                }
-
+
-            Player target = plugin.getServer().getPlayer(args[0]);
+                if (args[0].equalsIgnoreCase("acceptany") || args[0].equalsIgnoreCase("acceptall")) {
-
+                    if (!Permissions.partyTeleportAcceptAll(sender)) {
-            if (player.equals(target)) {
+                        sender.sendMessage(command.getPermissionMessage());
-                player.sendMessage("You can't teleport to yourself!"); //TODO: Use locale
+                        return true;
-                return true;
+                    }
-            }
+
-
+                    return acceptAnyTeleportRequest();
-            if (target == null) {
+                }
-                player.sendMessage(LocaleLoader.getString("Party.Player.Invalid"));
+
-                return true;
+                int ptpCooldown = Config.getInstance().getPTPCommandCooldown();
-            }
+                long recentlyHurt = UserManager.getPlayer(player).getRecentlyHurt();
-
+
-            if (target.isDead()) {
+                if ((recentlyHurt * Misc.TIME_CONVERSION_FACTOR + ptpCooldown * Misc.TIME_CONVERSION_FACTOR) > System.currentTimeMillis()) {
-                player.sendMessage(LocaleLoader.getString("Party.Teleport.Dead"));
+                    player.sendMessage(LocaleLoader.getString("Party.Teleport.Hurt", ptpCooldown));
-                return true;
+                    return true;
-            }
+                }
-
+
-            if (PartyManager.getInstance().inSameParty(player, target)) {
+                if (args[0].equalsIgnoreCase("accept")) {
-                McMMOPartyTeleportEvent event = new McMMOPartyTeleportEvent(player, target, profile.getParty().getName());
+                    if (!Permissions.partyTeleportAccept(sender)) {
-                plugin.getServer().getPluginManager().callEvent(event);
+                        sender.sendMessage(command.getPermissionMessage());
-
+                        return true;
-                if (event.isCancelled()) {
+                    }
-                    return true;
+
-                }
+                    return acceptTeleportRequest();
-
+                }
-                player.teleport(target);
+
-                player.sendMessage(LocaleLoader.getString("Party.Teleport.Player", new Object[] { target.getName() }));
+                return sendTeleportRequest(args[0]);
-                target.sendMessage(LocaleLoader.getString("Party.Teleport.Target", new Object[] { player.getName() }));
+
-                profile.setRecentlyHurt(System.currentTimeMillis());
+            default:
-            }
+                return false;
-            else {
+        }
-                player.sendMessage(LocaleLoader.getString("Party.NotInYourParty", new Object[] { target.getName() }));
+    }
-                return true;
+
-            }
+    private boolean sendTeleportRequest(String targetName) {
-
+        if (!canTeleport(targetName)) {
-            return true;
+            return true;
-
+        }
-        default:
+
-            sender.sendMessage(usage);
+        if (!mcMMOTarget.getPtpConfirmRequired()) {
-            return true;
+            return handlePartyTeleportEvent(player, target);
-        }
+        }
-   }
+
+        mcMMOTarget.setPtpRequest(player);
+        mcMMOTarget.actualizePtpTimeout();
+        player.sendMessage(LocaleLoader.getString("Commands.Invite.Success"));
+
+        int ptpRequestExpire = Config.getInstance().getPTPCommandTimeout();
+
+        target.sendMessage(LocaleLoader.getString("Commands.ptp.Request1", player.getName()));
+        target.sendMessage(LocaleLoader.getString("Commands.ptp.Request2", ptpRequestExpire));
+        return true;
+    }
+
+    private boolean acceptTeleportRequest() {
+        if (!mcMMOPlayer.hasPtpRequest()) {
+            player.sendMessage(LocaleLoader.getString("Commands.ptp.NoRequests"));
+            return true;
+        }
+
+        int ptpRequestExpire = Config.getInstance().getPTPCommandTimeout();
+
+        if ((mcMMOPlayer.getPtpTimeout() + ptpRequestExpire) * Misc.TIME_CONVERSION_FACTOR < System.currentTimeMillis()) {
+            mcMMOPlayer.removePtpRequest();
+            player.sendMessage(LocaleLoader.getString("Commands.ptp.RequestExpired"));
+            return true;
+        }
+
+        target = mcMMOPlayer.getPtpRequest();
+        mcMMOPlayer.removePtpRequest();
+
+        if (!canTeleport(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;
+                }
+            }
+        }
+
+        return handlePartyTeleportEvent(target, player);
+    }
+
+    private boolean acceptAnyTeleportRequest() {
+        if (mcMMOPlayer.getPtpConfirmRequired()) {
+            player.sendMessage(LocaleLoader.getString("Commands.ptp.AcceptAny.Disabled"));
+        }
+        else {
+            player.sendMessage(LocaleLoader.getString("Commands.ptp.AcceptAny.Enabled"));
+        }
+
+        mcMMOPlayer.togglePtpConfirmRequired();
+        return true;
+    }
+
+    private boolean togglePartyTeleportation() {
+        if (mcMMOPlayer.getPtpEnabled()) {
+            player.sendMessage(LocaleLoader.getString("Commands.ptp.Disabled"));
+        }
+        else {
+            player.sendMessage(LocaleLoader.getString("Commands.ptp.Enabled"));
+        }
+
+        mcMMOPlayer.togglePtpUse();
+        return true;
+    }
+
+    private boolean canTeleport(String targetName) {
+        if (!mcMMO.p.getServer().getOfflinePlayer(targetName).isOnline()) {
+            player.sendMessage(LocaleLoader.getString("Party.NotOnline", targetName));
+            return false;
+        }
+
+        mcMMOTarget = UserManager.getPlayer(targetName);
+
+        if (mcMMOTarget == null) {
+            player.sendMessage(LocaleLoader.getString("Party.Player.Invalid"));
+            return false;
+        }
+
+        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.getPtpEnabled()) {
+            player.sendMessage(LocaleLoader.getString("Party.Teleport.Disabled", target.getName()));
+            return false;
+        }
+
+        if (target.isDead()) {
+            player.sendMessage(LocaleLoader.getString("Party.Teleport.Dead"));
+            return false;
+        }
+
+        return true;
+    }
+
+    private boolean handlePartyTeleportEvent(Player player, Player target) {
+        McMMOPlayer mcMMOPlayer = UserManager.getPlayer(player);
+        McMMOPartyTeleportEvent event = new McMMOPartyTeleportEvent(player, target, mcMMOPlayer.getParty().getName());
+
+        mcMMO.p.getServer().getPluginManager().callEvent(event);
+
+        if (event.isCancelled()) {
+            return true;
+        }
+
+        player.teleport(target);
+        player.sendMessage(LocaleLoader.getString("Party.Teleport.Player", target.getName()));
+        target.sendMessage(LocaleLoader.getString("Party.Teleport.Target", player.getName()));
+        mcMMOPlayer.actualizeRecentlyHurt();
+        return true;
+    }
 }

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

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

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

@@ -0,0 +1,139 @@
+package com.gmail.nossr50.commands.player;
+
+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.database.LeaderboardManager;
+import com.gmail.nossr50.database.queuemanager.McRankAsync;
+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.player.UserManager;
+import com.gmail.nossr50.util.skills.SkillUtils;
+
+public class McrankCommand implements CommandExecutor {
+    @Override
+    public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
+        switch (args.length) {
+            case 0:
+                if (!Permissions.mcrank(sender)) {
+                    sender.sendMessage(command.getPermissionMessage());
+                    return true;
+                }
+
+                if (!(sender instanceof Player)) {
+                    return false;
+                }
+
+                if (Config.getInstance().getUseMySQL()) {
+                    sqlDisplay(sender, sender.getName());
+                }
+                else {
+                    LeaderboardManager.updateLeaderboards(); // Make sure the information is up to date
+                    flatfileDisplay(sender, sender.getName());
+                }
+
+                return true;
+
+            case 1:
+                if (!Permissions.mcrankOthers(sender)) {
+                    sender.sendMessage(command.getPermissionMessage());
+                    return true;
+                }
+
+                McMMOPlayer mcMMOPlayer = UserManager.getPlayer(args[0]);
+
+                if (mcMMOPlayer == null) {
+                    PlayerProfile profile = new PlayerProfile(args[0], false); // Temporary Profile
+
+                    if (!profile.isLoaded()) {
+                        sender.sendMessage(LocaleLoader.getString("Commands.DoesNotExist"));
+                        return true;
+                    }
+
+                    if (sender instanceof Player && !Permissions.mcrankOffline(sender)) {
+                        sender.sendMessage(LocaleLoader.getString("Inspect.Offline"));
+                        return true;
+                    }
+                }
+                else {
+                    Player target = mcMMOPlayer.getPlayer();
+
+                    if (sender instanceof Player && !Misc.isNear(((Player) sender).getLocation(), target.getLocation(), 5.0) && !Permissions.mcrankFar(sender)) {
+                        sender.sendMessage(LocaleLoader.getString("Inspect.TooFar"));
+                        return true;
+                    }
+                }
+
+                if (Config.getInstance().getUseMySQL()) {
+                    sqlDisplay(sender, args[0]);
+                }
+                else {
+                    LeaderboardManager.updateLeaderboards(); // Make sure the information is up to date
+                    flatfileDisplay(sender, args[0]);
+                }
+
+                return true;
+
+            default:
+                return false;
+        }
+    }
+
+    private void flatfileDisplay(CommandSender sender, String playerName) {
+        sender.sendMessage(LocaleLoader.getString("Commands.mcrank.Heading"));
+        sender.sendMessage(LocaleLoader.getString("Commands.mcrank.Player", playerName));
+
+        for (SkillType skillType : SkillType.values()) {
+            int[] rankInts = LeaderboardManager.getPlayerRank(playerName, skillType);
+
+            if (skillType.isChildSkill()) {
+                continue;
+            }
+
+            if ((sender instanceof Player) && !Permissions.skillEnabled((Player) sender, skillType)) {
+                continue;
+            }
+
+            if (rankInts[1] == 0) {
+                sender.sendMessage(LocaleLoader.getString("Commands.mcrank.Skill", SkillUtils.getSkillName(skillType), LocaleLoader.getString("Commands.mcrank.Unranked"))); // Don't bother showing ranking for players without skills
+            }
+            else {
+                sender.sendMessage(LocaleLoader.getString("Commands.mcrank.Skill", SkillUtils.getSkillName(skillType), rankInts[0]));
+            }
+        }
+
+        // Show the powerlevel ranking
+        int[] rankInts = LeaderboardManager.getPlayerRank(playerName);
+
+        if (rankInts[1] == 0) {
+            sender.sendMessage(LocaleLoader.getString("Commands.mcrank.Overall", LocaleLoader.getString("Commands.mcrank.Unranked"))); // Don't bother showing ranking for players without skills
+        }
+        else {
+            sender.sendMessage(LocaleLoader.getString("Commands.mcrank.Overall", rankInts[0]));
+        }
+    }
+
+    private void sqlDisplay(CommandSender sender, String playerName) {
+        // TODO: Localize messages
+        if (mcMMO.queueManager.contains(sender.getName())) {
+            sender.sendMessage(ChatColor.RED + "Please wait for your previous command to process");
+            return;
+        }
+
+        if (!mcMMO.queueManager.queue(new McRankAsync(playerName, sender))) {
+            sender.sendMessage(ChatColor.RED + "Unable to add to queue");
+            return;
+        }
+
+        sender.sendMessage(ChatColor.YELLOW + "Calculating mcMMO rankings...");
+    }
+}

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

@@ -0,0 +1,50 @@
+package com.gmail.nossr50.commands.player;
+
+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.player.McMMOPlayer;
+import com.gmail.nossr50.datatypes.player.PlayerProfile;
+import com.gmail.nossr50.locale.LocaleLoader;
+import com.gmail.nossr50.util.commands.CommandUtils;
+import com.gmail.nossr50.util.player.UserManager;
+
+public class McstatsCommand implements CommandExecutor {
+    @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);
+                PlayerProfile profile = mcMMOPlayer.getProfile();
+
+                player.sendMessage(LocaleLoader.getString("Stats.Own.Stats"));
+                player.sendMessage(LocaleLoader.getString("mcMMO.NoSkillNote"));
+
+                CommandUtils.printGatheringSkills(player, profile);
+                CommandUtils.printCombatSkills(player, profile);
+                CommandUtils.printMiscSkills(player, profile);
+
+                int powerLevelCap = Config.getInstance().getPowerLevelCap();
+
+                if (powerLevelCap != Integer.MAX_VALUE) {
+                    player.sendMessage(LocaleLoader.getString("Commands.PowerLevel.Capped", mcMMOPlayer.getPowerLevel(), powerLevelCap));
+                }
+                else {
+                    player.sendMessage(LocaleLoader.getString("Commands.PowerLevel", mcMMOPlayer.getPowerLevel()));
+                }
+
+                return true;
+
+            default:
+                return false;
+        }
+    }
+}

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

@@ -0,0 +1,139 @@
+package com.gmail.nossr50.commands.player;
+
+import org.bukkit.ChatColor;
+import org.bukkit.command.Command;
+import org.bukkit.command.CommandExecutor;
+import org.bukkit.command.CommandSender;
+
+import com.gmail.nossr50.mcMMO;
+import com.gmail.nossr50.config.Config;
+import com.gmail.nossr50.database.LeaderboardManager;
+import com.gmail.nossr50.database.queuemanager.McTopAsync;
+import com.gmail.nossr50.datatypes.skills.SkillType;
+import com.gmail.nossr50.locale.LocaleLoader;
+import com.gmail.nossr50.util.Permissions;
+import com.gmail.nossr50.util.StringUtils;
+import com.gmail.nossr50.util.skills.SkillUtils;
+
+public class MctopCommand implements CommandExecutor {
+    @Override
+    public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
+        boolean useMySQL = Config.getInstance().getUseMySQL();
+
+        switch (args.length) {
+            case 0:
+                display(1, "ALL", sender, useMySQL, command);
+                return true;
+
+            case 1:
+                if (StringUtils.isInt(args[0])) {
+                    display(Integer.parseInt(args[0]), "ALL", sender, useMySQL, command);
+                }
+                else if (SkillUtils.isSkill(args[0])) {
+                    SkillType skill = SkillType.getSkill(args[0]);
+
+                    if (skill.isChildSkill()) {
+                        sender.sendMessage("Child skills are not yet supported by this command."); // TODO: Localize this
+                        return true;
+                    }
+
+                    display(1, skill.toString(), sender, useMySQL, command);
+                }
+                else {
+                    sender.sendMessage(LocaleLoader.getString("Commands.Skill.Invalid"));
+                }
+
+                return true;
+
+            case 2:
+                if (!StringUtils.isInt(args[1])) {
+                    return false;
+                }
+
+                if (SkillUtils.isSkill(args[0])) {
+                    SkillType skill = SkillType.getSkill(args[0]);
+
+                    if (skill.isChildSkill()) {
+                        sender.sendMessage("Child skills are not yet supported by this command."); // TODO: Localize this
+                        return true;
+                    }
+
+                    display(Integer.parseInt(args[1]), skill.toString(), sender, useMySQL, command);
+                }
+                else {
+                    sender.sendMessage(LocaleLoader.getString("Commands.Skill.Invalid"));
+                }
+
+                return true;
+
+            default:
+                return false;
+        }
+    }
+
+    private void display(int page, String skill, CommandSender sender, boolean sql, Command command) {
+        if (!skill.equalsIgnoreCase("all") && !Permissions.mctop(sender, SkillType.getSkill(skill))) {
+            sender.sendMessage(command.getPermissionMessage());
+            return;
+        }
+
+        if (sql) {
+            if (skill.equalsIgnoreCase("all")) {
+                sqlDisplay(page, "taming+mining+woodcutting+repair+unarmed+herbalism+excavation+archery+swords+axes+acrobatics+fishing", sender);
+            }
+            else {
+                sqlDisplay(page, skill, sender);
+            }
+        }
+        else {
+            flatfileDisplay(page, skill, sender, command);
+        }
+    }
+
+    private void flatfileDisplay(int page, String skill, CommandSender sender, Command command) {
+        LeaderboardManager.updateLeaderboards(); // Make sure we have the latest information
+
+        String[] info = LeaderboardManager.retrieveInfo(skill, page);
+
+        if (skill.equalsIgnoreCase("all")) {
+            sender.sendMessage(LocaleLoader.getString("Commands.PowerLevel.Leaderboard"));
+        }
+        else {
+            sender.sendMessage(LocaleLoader.getString("Commands.Skill.Leaderboard", StringUtils.getCapitalized(skill)));
+        }
+
+        int n = (page * 10) - 9; // Position
+        for (String x : info) {
+            if (x != null) {
+                String digit = String.valueOf(n);
+
+                if (n < 10) {
+                    digit = "0" + digit;
+                }
+
+                String[] splitx = x.split(":");
+
+                // Format: 1. Playername - skill value
+                sender.sendMessage(digit + ". " + ChatColor.GREEN + splitx[1] + " - " + ChatColor.WHITE + splitx[0]);
+                n++;
+            }
+        }
+
+        sender.sendMessage(LocaleLoader.getString("Commands.mctop.Tip"));
+    }
+
+    private void sqlDisplay(int page, String query, CommandSender sender) {
+        // TODO: Localize messages
+        if (mcMMO.queueManager.contains(sender.getName())) {
+            sender.sendMessage(ChatColor.RED + "Please wait for your previous command to process");
+            return;
+        }
+
+        if (!mcMMO.queueManager.queue(new McTopAsync(page, query, sender))) {
+            sender.sendMessage(ChatColor.RED + "Unable to add to queue");
+            return;
+        }
+
+        sender.sendMessage(ChatColor.YELLOW + "Calculating mcMMO leaderboards...");
+    }
+}

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

@@ -1,90 +1,105 @@
-package com.gmail.nossr50.commands.skills;
+package com.gmail.nossr50.commands.skills;
-
+
-import com.gmail.nossr50.commands.SkillCommand;
+import com.gmail.nossr50.datatypes.skills.SkillType;
-import com.gmail.nossr50.datatypes.SkillType;
+import com.gmail.nossr50.locale.LocaleLoader;
-import com.gmail.nossr50.locale.LocaleLoader;
+import com.gmail.nossr50.skills.acrobatics.Acrobatics;
-
+import com.gmail.nossr50.util.Permissions;
-public class AcrobaticsCommand extends SkillCommand {
+
-    private String dodgeChance;
+public class AcrobaticsCommand extends SkillCommand {
-    private String rollChance;
+    private String dodgeChance;
-    private String gracefulRollChance;
+    private String dodgeChanceLucky;
-
+    private String rollChance;
-    private boolean canDodge;
+    private String rollChanceLucky;
-    private boolean canRoll;
+    private String gracefulRollChance;
-    private boolean canGracefulRoll;
+    private String gracefulRollChanceLucky;
-
+
-    public AcrobaticsCommand() {
+    private boolean canDodge;
-        super(SkillType.ACROBATICS);
+    private boolean canRoll;
-    }
+    private boolean canGracefulRoll;
-
+
-    @Override
+    public AcrobaticsCommand() {
-    protected void dataCalculations() {
+        super(SkillType.ACROBATICS);
-        if (skillValue >= 1000) {
+    }
-            dodgeChance = "20.00%";
+
-            rollChance = "100.00%";
+    @Override
-            gracefulRollChance = "100.00%";
+    protected void dataCalculations() {
-        }
+        // DODGE
-        else if (skillValue >= 800) {
+        String[] dodgeStrings = calculateAbilityDisplayValues(Acrobatics.dodgeMaxBonusLevel, Acrobatics.dodgeMaxChance);
-            dodgeChance = "20.00%";
+        dodgeChance = dodgeStrings[0];
-            rollChance = percent.format(skillValue / 1000);
+        dodgeChanceLucky = dodgeStrings[1];
-            gracefulRollChance = "100.00%";
+
-        }
+        // ROLL
-        else if (skillValue >= 500) {
+        String[] rollStrings = calculateAbilityDisplayValues(Acrobatics.rollMaxBonusLevel, Acrobatics.rollMaxChance);
-            dodgeChance = percent.format(skillValue / 4000);
+        rollChance = rollStrings[0];
-            rollChance = percent.format(skillValue / 1000);
+        rollChanceLucky = rollStrings[1];
-            gracefulRollChance = "100.00%";
+
-        }
+        // GRACEFUL ROLL
-        else {
+        String[] gracefulRollStrings = calculateAbilityDisplayValues(Acrobatics.gracefulRollMaxBonusLevel, Acrobatics.gracefulRollMaxChance);
-            dodgeChance = percent.format(skillValue / 4000);
+        gracefulRollChance = gracefulRollStrings[0];
-            rollChance = percent.format(skillValue / 1000);
+        gracefulRollChanceLucky = gracefulRollStrings[1];
-            gracefulRollChance = percent.format(skillValue / 500);
+    }
-        }
+
-    }
+    @Override
-
+    protected void permissionsCheck() {
-    @Override
+        canDodge = Permissions.dodge(player);
-    protected void permissionsCheck() {
+        canRoll = Permissions.roll(player);
-        canDodge = permInstance.dodge(player);
+        canGracefulRoll = Permissions.gracefulRoll(player);
-        canRoll = permInstance.roll(player);
+    }
-        canGracefulRoll = permInstance.gracefulRoll(player);
+
-    }
+    @Override
-
+    protected boolean effectsHeaderPermissions() {
-    @Override
+        return canDodge || canGracefulRoll || canRoll;
-    protected boolean effectsHeaderPermissions() {
+    }
-        return canDodge || canGracefulRoll || canRoll;
+
-    }
+    @Override
-
+    protected void effectsDisplay() {
-    @Override
+        luckyEffectsDisplay();
-    protected void effectsDisplay() {
+
-        if (canRoll) {
+        if (canRoll) {
-            player.sendMessage(LocaleLoader.getString("Effects.Template", new Object[] { LocaleLoader.getString("Acrobatics.Effect.0"), LocaleLoader.getString("Acrobatics.Effect.1") }));
+            player.sendMessage(LocaleLoader.getString("Effects.Template", LocaleLoader.getString("Acrobatics.Effect.0"), LocaleLoader.getString("Acrobatics.Effect.1")));
-        }
+        }
-
+
-        if (canGracefulRoll) {
+        if (canGracefulRoll) {
-            player.sendMessage(LocaleLoader.getString("Effects.Template", new Object[] { LocaleLoader.getString("Acrobatics.Effect.2"), LocaleLoader.getString("Acrobatics.Effect.3") }));
+            player.sendMessage(LocaleLoader.getString("Effects.Template", LocaleLoader.getString("Acrobatics.Effect.2"), LocaleLoader.getString("Acrobatics.Effect.3")));
-        }
+        }
-
+
-        if (canDodge) {
+        if (canDodge) {
-            player.sendMessage(LocaleLoader.getString("Effects.Template", new Object[] { LocaleLoader.getString("Acrobatics.Effect.4"), LocaleLoader.getString("Acrobatics.Effect.5") }));
+            player.sendMessage(LocaleLoader.getString("Effects.Template", LocaleLoader.getString("Acrobatics.Effect.4"), LocaleLoader.getString("Acrobatics.Effect.5")));
-        }
+        }
-    }
+    }
-
+
-    @Override
+    @Override
-    protected boolean statsHeaderPermissions() {
+    protected boolean statsHeaderPermissions() {
-        return canDodge || canGracefulRoll || canRoll;
+        return canDodge || canGracefulRoll || canRoll;
-    }
+    }
-
+
-    @Override
+    @Override
-    protected void statsDisplay() {
+    protected void statsDisplay() {
-        if (canRoll) {
+        if (canRoll) {
-            player.sendMessage(LocaleLoader.getString("Acrobatics.Roll.Chance", new Object[] { rollChance }));
+            if (isLucky) {
-        }
+                player.sendMessage(LocaleLoader.getString("Acrobatics.Roll.Chance", new Object[] { rollChance }) + LocaleLoader.getString("Perks.lucky.bonus", new Object[] { rollChanceLucky }));
-
+            }
-        if (canGracefulRoll) {
+            else {
-            player.sendMessage(LocaleLoader.getString("Acrobatics.Roll.GraceChance", new Object[] { gracefulRollChance }));
+                player.sendMessage(LocaleLoader.getString("Acrobatics.Roll.Chance", new Object[] { rollChance }));
-        }
+            }
-
+        }
-        if (canDodge) {
+
-            player.sendMessage(LocaleLoader.getString("Acrobatics.DodgeChance", new Object[] { dodgeChance }));
+        if (canGracefulRoll) {
-        }
+            if (isLucky) {
-    }
+                player.sendMessage(LocaleLoader.getString("Acrobatics.Roll.GraceChance", new Object[] { gracefulRollChance }) + LocaleLoader.getString("Perks.lucky.bonus", new Object[] { gracefulRollChanceLucky }));
-}
+            }
+            else {
+                player.sendMessage(LocaleLoader.getString("Acrobatics.Roll.GraceChance", new Object[] { gracefulRollChance }));
+            }
+        }
+
+        if (canDodge) {
+            if (isLucky) {
+                player.sendMessage(LocaleLoader.getString("Acrobatics.DodgeChance", new Object[] { dodgeChance }) + LocaleLoader.getString("Perks.lucky.bonus", new Object[] { dodgeChanceLucky }));
+            }
+            else {
+                player.sendMessage(LocaleLoader.getString("Acrobatics.DodgeChance", new Object[] { dodgeChance }));
+            }
+        }
+    }
+}

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

@@ -1,80 +1,104 @@
-package com.gmail.nossr50.commands.skills;
+package com.gmail.nossr50.commands.skills;
-
+
-import com.gmail.nossr50.commands.SkillCommand;
+import com.gmail.nossr50.datatypes.skills.SkillType;
-import com.gmail.nossr50.datatypes.SkillType;
+import com.gmail.nossr50.locale.LocaleLoader;
-import com.gmail.nossr50.locale.LocaleLoader;
+import com.gmail.nossr50.skills.archery.Archery;
-
+import com.gmail.nossr50.util.Permissions;
-public class ArcheryCommand extends SkillCommand {
+
-    private String skillShotBonus;
+public class ArcheryCommand extends SkillCommand {
-    private String dazeChance;
+    private String skillShotBonus;
-    private String retrieveChance;
+    private String dazeChance;
-
+    private String dazeChanceLucky;
-    private boolean canSkillShot;
+    private String retrieveChance;
-    private boolean canDaze;
+    private String retrieveChanceLucky;
-    private boolean canRetrieve;
+
-
+    private boolean canSkillShot;
-    public ArcheryCommand() {
+    private boolean canDaze;
-        super(SkillType.ARCHERY);
+    private boolean canRetrieve;
-    }
+
-
+    public ArcheryCommand() {
-    @Override
+        super(SkillType.ARCHERY);
-    protected void dataCalculations() {
+    }
-        if (skillValue >= 1000) {
+
-            skillShotBonus = "200.00%";
+    @Override
-            dazeChance = "50.00%";
+    protected void dataCalculations() {
-            retrieveChance = "100.00%";
+        // SKILL SHOT
-        }
+        double bonus = (skillValue / Archery.skillShotIncreaseLevel) * Archery.skillShotIncreasePercentage;
-        else {
+
-            skillShotBonus = percent.format(((int) skillValue / 50) * 0.1D); //TODO: Not sure if this is the best way to calculate this or not...
+        if (bonus > Archery.skillShotMaxBonusPercentage) {
-            dazeChance = percent.format(skillValue / 2000);
+            skillShotBonus = percent.format(Archery.skillShotMaxBonusPercentage);
-            retrieveChance = percent.format(skillValue / 1000);
+        }
-        }
+        else {
-    }
+            skillShotBonus = percent.format(bonus);
-
+        }
-    @Override
+
-    protected void permissionsCheck() {
+        // DAZE
-        canSkillShot = permInstance.archeryBonus(player);
+        String[] dazeStrings = calculateAbilityDisplayValues(Archery.dazeMaxBonusLevel, Archery.dazeMaxBonus);
-        canDaze = permInstance.daze(player);
+        dazeChance = dazeStrings[0];
-        canRetrieve = permInstance.trackArrows(player);
+        dazeChanceLucky = dazeStrings[1];
-    }
+
-
+        // RETRIEVE
-    @Override
+        String[] retrieveStrings = calculateAbilityDisplayValues(Archery.retrieveMaxBonusLevel, Archery.retrieveMaxChance);
-    protected boolean effectsHeaderPermissions() {
+        retrieveChance = retrieveStrings[0];
-        return canSkillShot || canDaze || canRetrieve;
+        retrieveChanceLucky = retrieveStrings[1];
-    }
+    }
-
+
-    @Override
+    @Override
-    protected void effectsDisplay() {
+    protected void permissionsCheck() {
-        if (canSkillShot) {
+        canSkillShot = Permissions.bonusDamage(player, skill);
-            player.sendMessage(LocaleLoader.getString("Effects.Template", new Object[] { LocaleLoader.getString("Archery.Effect.0"), LocaleLoader.getString("Archery.Effect.1") }));
+        canDaze = Permissions.daze(player);
-        }
+        canRetrieve = Permissions.arrowRetrieval(player);
-
+    }
-        if (canDaze) {
+
-            player.sendMessage(LocaleLoader.getString("Effects.Template", new Object[] { LocaleLoader.getString("Archery.Effect.2"), LocaleLoader.getString("Archery.Effect.3") }));
+    @Override
-        }
+    protected boolean effectsHeaderPermissions() {
-
+        return canSkillShot || canDaze || canRetrieve;
-        if (canRetrieve) {
+    }
-            player.sendMessage(LocaleLoader.getString("Effects.Template", new Object[] { LocaleLoader.getString("Archery.Effect.4"), LocaleLoader.getString("Archery.Effect.5") }));
+
-        }
+    @Override
-    }
+    protected void effectsDisplay() {
-
+        luckyEffectsDisplay();
-    @Override
+
-    protected boolean statsHeaderPermissions() {
+        if (canSkillShot) {
-        return canSkillShot || canDaze || canRetrieve;
+            player.sendMessage(LocaleLoader.getString("Effects.Template", LocaleLoader.getString("Archery.Effect.0"), LocaleLoader.getString("Archery.Effect.1")));
-    }
+        }
-
+
-    @Override
+        if (canDaze) {
-    protected void statsDisplay() {
+            player.sendMessage(LocaleLoader.getString("Effects.Template", LocaleLoader.getString("Archery.Effect.2"), LocaleLoader.getString("Archery.Effect.3", Archery.dazeModifier)));
-        if (canSkillShot) {
+        }
-            player.sendMessage(LocaleLoader.getString("Archery.Combat.SkillshotBonus", new Object[] { skillShotBonus }));
+
-        }
+        if (canRetrieve) {
-
+            player.sendMessage(LocaleLoader.getString("Effects.Template", LocaleLoader.getString("Archery.Effect.4"), LocaleLoader.getString("Archery.Effect.5")));
-        if (canDaze) {
+        }
-            player.sendMessage(LocaleLoader.getString("Archery.Combat.DazeChance", new Object[] { dazeChance }));
+    }
-        }
+
-
+    @Override
-        if (canRetrieve) {
+    protected boolean statsHeaderPermissions() {
-            player.sendMessage(LocaleLoader.getString("Archery.Combat.RetrieveChance", new Object[] { retrieveChance }));
+        return canSkillShot || canDaze || canRetrieve;
-        }
+    }
-    }
+
-}
+    @Override
+    protected void statsDisplay() {
+        if (canSkillShot) {
+            player.sendMessage(LocaleLoader.getString("Archery.Combat.SkillshotBonus", skillShotBonus));
+        }
+
+        if (canDaze) {
+            if (isLucky) {
+                player.sendMessage(LocaleLoader.getString("Archery.Combat.DazeChance", dazeChance) + LocaleLoader.getString("Perks.lucky.bonus", dazeChanceLucky));
+            }
+            else {
+                player.sendMessage(LocaleLoader.getString("Archery.Combat.DazeChance", dazeChance));
+            }
+        }
+
+        if (canRetrieve) {
+            if (isLucky) {
+                player.sendMessage(LocaleLoader.getString("Archery.Combat.RetrieveChance", retrieveChance) + LocaleLoader.getString("Perks.lucky.bonus", retrieveChanceLucky));
+            }
+            else {
+                player.sendMessage(LocaleLoader.getString("Archery.Combat.RetrieveChance", retrieveChance));
+            }
+        }
+    }
+}

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

@@ -1,108 +1,128 @@
-package com.gmail.nossr50.commands.skills;
+package com.gmail.nossr50.commands.skills;
-
+
-import com.gmail.nossr50.commands.SkillCommand;
+import com.gmail.nossr50.datatypes.skills.SkillType;
-import com.gmail.nossr50.datatypes.SkillType;
+import com.gmail.nossr50.locale.LocaleLoader;
-import com.gmail.nossr50.locale.LocaleLoader;
+import com.gmail.nossr50.skills.axes.Axes;
-
+import com.gmail.nossr50.util.Permissions;
-public class AxesCommand extends SkillCommand {
+
-    private String critChance;
+public class AxesCommand extends SkillCommand {
-    private String bonusDamage;
+    private String critChance;
-    private String impactDamage;
+    private String critChanceLucky;
-    private String greaterImpactDamage;
+    private String bonusDamage;
-    private String skullSplitterLength;
+    private String impactDamage;
-
+    private String greaterImpactDamage;
-    private boolean canSkullSplitter;
+    private String skullSplitterLength;
-    private boolean canCritical;
+    private String skullSplitterLengthEndurance;
-    private boolean canBonusDamage;
+
-    private boolean canImpact;
+    private boolean canSkullSplitter;
-    private boolean canGreaterImpact;
+    private boolean canCritical;
-
+    private boolean canBonusDamage;
-    public AxesCommand() {
+    private boolean canImpact;
-        super(SkillType.AXES);
+    private boolean canGreaterImpact;
-    }
+
-
+    public AxesCommand() {
-    @Override
+        super(SkillType.AXES);
-    protected void dataCalculations() {
+    }
-        impactDamage = String.valueOf(1 + ((int) skillValue / 50));
+
-        skullSplitterLength = String.valueOf(2 + ((int) skillValue / 50));
+    @Override
-        greaterImpactDamage = "2";
+    protected void dataCalculations() {
-
+        // IMPACT
-        if (skillValue >= 750) {
+        impactDamage = String.valueOf(1 + (skillValue / Axes.impactIncreaseLevel));
-            critChance = "37.50";
+        greaterImpactDamage = String.valueOf(Axes.greaterImpactBonusDamage);
-            bonusDamage = "4";
+
-        }
+        // SKULL SPLITTER
-        else if (skillValue >= 200) {
+        String[] skullSplitterStrings = calculateLengthDisplayValues();
-            critChance = percent.format(skillValue / 2000);
+        skullSplitterLength = skullSplitterStrings[0];
-            bonusDamage = "4";
+        skullSplitterLengthEndurance = skullSplitterStrings[1];
-        }
+
-        else {
+        // CRITICAL STRIKES
-            critChance = percent.format(skillValue / 2000);
+        String[] criticalStrikeStrings = calculateAbilityDisplayValues(Axes.criticalHitMaxBonusLevel, Axes.criticalHitMaxChance);
-            bonusDamage = String.valueOf((int) skillValue / 50);
+        critChance = criticalStrikeStrings[0];
-        }
+        critChanceLucky = criticalStrikeStrings[1];
-    }
+
-
+        // AXE MASTERY
-    @Override
+        if (skillValue >= Axes.bonusDamageMaxBonusLevel) {
-    protected void permissionsCheck() {
+            bonusDamage = String.valueOf(Axes.bonusDamageMaxBonus);
-        canSkullSplitter = permInstance.skullSplitter(player);
+        }
-        canCritical = permInstance.criticalHit(player);
+        else {
-        canBonusDamage = permInstance.axeBonus(player);
+            bonusDamage = String.valueOf(skillValue / (Axes.bonusDamageMaxBonusLevel / Axes.bonusDamageMaxBonus));
-        canImpact = permInstance.impact(player);
+        }
-        canGreaterImpact = permInstance.greaterImpact(player);
+    }
-    }
+
-
+    @Override
-    @Override
+    protected void permissionsCheck() {
-    protected boolean effectsHeaderPermissions() {
+        canSkullSplitter = Permissions.skullSplitter(player);
-        return canSkullSplitter || canCritical || canBonusDamage || canImpact || canGreaterImpact;
+        canCritical = Permissions.criticalStrikes(player);
-    }
+        canBonusDamage = Permissions.bonusDamage(player, skill);
-
+        canImpact = Permissions.armorImpact(player);
-    @Override
+        canGreaterImpact = Permissions.greaterImpact(player);
-    protected void effectsDisplay() {
+    }
-        if (canSkullSplitter) {
+
-            player.sendMessage(LocaleLoader.getString("Effects.Template", new Object[] { LocaleLoader.getString("Axes.Effect.0"), LocaleLoader.getString("Axes.Effect.1") }));
+    @Override
-        }
+    protected boolean effectsHeaderPermissions() {
-
+        return canSkullSplitter || canCritical || canBonusDamage || canImpact || canGreaterImpact;
-        if (canCritical) {
+    }
-            player.sendMessage(LocaleLoader.getString("Effects.Template", new Object[] { LocaleLoader.getString("Axes.Effect.2"), LocaleLoader.getString("Axes.Effect.3") }));
+
-        }
+    @Override
-
+    protected void effectsDisplay() {
-        if (canBonusDamage) {
+        luckyEffectsDisplay();
-            player.sendMessage(LocaleLoader.getString("Effects.Template", new Object[] { LocaleLoader.getString("Axes.Effect.4"), LocaleLoader.getString("Axes.Effect.5") }));
+
-        }
+        if (canSkullSplitter) {
-
+            player.sendMessage(LocaleLoader.getString("Effects.Template", LocaleLoader.getString("Axes.Effect.0"), LocaleLoader.getString("Axes.Effect.1")));
-        if (canImpact) {
+        }
-            player.sendMessage(LocaleLoader.getString("Effects.Template", new Object[] { LocaleLoader.getString("Axes.Effect.6"), LocaleLoader.getString("Axes.Effect.7") }));
+
-        }
+        if (canCritical) {
-
+            player.sendMessage(LocaleLoader.getString("Effects.Template", LocaleLoader.getString("Axes.Effect.2"), LocaleLoader.getString("Axes.Effect.3")));
-        if (canGreaterImpact) {
+        }
-            player.sendMessage(LocaleLoader.getString("Effects.Template", new Object[] { LocaleLoader.getString("Axes.Effect.8"), LocaleLoader.getString("Axes.Effect.9") }));
+
-        }
+        if (canBonusDamage) {
-    }
+            player.sendMessage(LocaleLoader.getString("Effects.Template", LocaleLoader.getString("Axes.Effect.4"), LocaleLoader.getString("Axes.Effect.5")));
-
+        }
-    @Override
+
-    protected boolean statsHeaderPermissions() {
+        if (canImpact) {
-        return canSkullSplitter || canCritical || canBonusDamage || canImpact || canGreaterImpact;
+            player.sendMessage(LocaleLoader.getString("Effects.Template", LocaleLoader.getString("Axes.Effect.6"), LocaleLoader.getString("Axes.Effect.7")));
-    }
+        }
-
+
-    @Override
+        if (canGreaterImpact) {
-    protected void statsDisplay() {
+            player.sendMessage(LocaleLoader.getString("Effects.Template", LocaleLoader.getString("Axes.Effect.8"), LocaleLoader.getString("Axes.Effect.9")));
-        if (canBonusDamage) {
+        }
-            player.sendMessage(LocaleLoader.getString("Ability.Generic.Template", new Object[] { LocaleLoader.getString("Axes.Ability.Bonus.0"), LocaleLoader.getString("Axes.Ability.Bonus.1", new Object[] {bonusDamage}) }));
+    }
-        }
+
-
+    @Override
-        if (canImpact) {
+    protected boolean statsHeaderPermissions() {
-            player.sendMessage(LocaleLoader.getString("Ability.Generic.Template", new Object[] { LocaleLoader.getString("Axes.Ability.Bonus.2"), LocaleLoader.getString("Axes.Ability.Bonus.3", new Object[] {impactDamage}) }));
+        return canSkullSplitter || canCritical || canBonusDamage || canImpact || canGreaterImpact;
-        }
+    }
-
+
-        if (canGreaterImpact) {
+    @Override
-            player.sendMessage(LocaleLoader.getString("Ability.Generic.Template", new Object[] { LocaleLoader.getString("Axes.Ability.Bonus.4"), LocaleLoader.getString("Axes.Ability.Bonus.5", new Object[] {greaterImpactDamage}) }));
+    protected void statsDisplay() {
-        }
+        if (canBonusDamage) {
-
+            player.sendMessage(LocaleLoader.getString("Ability.Generic.Template", LocaleLoader.getString("Axes.Ability.Bonus.0"), LocaleLoader.getString("Axes.Ability.Bonus.1", bonusDamage)));
-        if (canCritical) {
+        }
-            player.sendMessage(LocaleLoader.getString("Axes.Combat.CritChance", new Object[] { critChance }));
+
-        }
+        if (canImpact) {
-
+            player.sendMessage(LocaleLoader.getString("Ability.Generic.Template", LocaleLoader.getString("Axes.Ability.Bonus.2"), LocaleLoader.getString("Axes.Ability.Bonus.3", impactDamage)));
-        if (canSkullSplitter) {
+        }
-            player.sendMessage(LocaleLoader.getString("Axes.Combat.SS.Length", new Object[] { skullSplitterLength }));
+
-        }
+        if (canGreaterImpact) {
-    }
+            player.sendMessage(LocaleLoader.getString("Ability.Generic.Template", LocaleLoader.getString("Axes.Ability.Bonus.4"), LocaleLoader.getString("Axes.Ability.Bonus.5", greaterImpactDamage)));
-}
+        }
+
+        if (canCritical) {
+            if (isLucky) {
+                player.sendMessage(LocaleLoader.getString("Axes.Combat.CritChance", critChance) + LocaleLoader.getString("Perks.lucky.bonus", critChanceLucky));
+            }
+            else {
+                player.sendMessage(LocaleLoader.getString("Axes.Combat.CritChance", critChance));
+            }
+        }
+
+        if (canSkullSplitter) {
+            if (hasEndurance) {
+                player.sendMessage(LocaleLoader.getString("Axes.Combat.SS.Length", skullSplitterLength) + LocaleLoader.getString("Perks.activationtime.bonus", skullSplitterLengthEndurance));
+            }
+            else {
+                player.sendMessage(LocaleLoader.getString("Axes.Combat.SS.Length", skullSplitterLength));
+            }
+        }
+    }
+}

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

@@ -1,55 +1,66 @@
-package com.gmail.nossr50.commands.skills;
+package com.gmail.nossr50.commands.skills;
-
+
-import com.gmail.nossr50.commands.SkillCommand;
+import com.gmail.nossr50.datatypes.skills.SkillType;
-import com.gmail.nossr50.datatypes.SkillType;
+import com.gmail.nossr50.locale.LocaleLoader;
-import com.gmail.nossr50.locale.LocaleLoader;
+import com.gmail.nossr50.util.Permissions;
-
+
-public class ExcavationCommand extends SkillCommand {
+public class ExcavationCommand extends SkillCommand {
-    private String gigaDrillBreakerLength;
+    private String gigaDrillBreakerLength;
-
+    private String gigaDrillBreakerLengthEndurance;
-    private boolean canGigaDrill;
+
-    private boolean canTreasureHunt;
+    private boolean canGigaDrill;
-
+    private boolean canTreasureHunt;
-    public ExcavationCommand() {
+
-        super(SkillType.EXCAVATION);
+    public ExcavationCommand() {
-    }
+        super(SkillType.EXCAVATION);
-
+    }
-    @Override
+
-    protected void dataCalculations() {
+    @Override
-        gigaDrillBreakerLength = String.valueOf(2 + ((int) skillValue / 50));
+    protected void dataCalculations() {
-    }
+        // GIGA DRILL BREAKER
-
+        String gigaDrillStrings[] = calculateLengthDisplayValues();
-    @Override
+        gigaDrillBreakerLength = gigaDrillStrings[0];
-    protected void permissionsCheck() {
+        gigaDrillBreakerLengthEndurance = gigaDrillStrings[1];
-        canGigaDrill = permInstance.gigaDrillBreaker(player);
+    }
-        canTreasureHunt = permInstance.excavationTreasures(player);
+
-    }
+    @Override
-
+    protected void permissionsCheck() {
-    @Override
+        canGigaDrill = Permissions.gigaDrillBreaker(player);
-    protected boolean effectsHeaderPermissions() {
+        canTreasureHunt = Permissions.excavationTreasureHunter(player);
-        return canGigaDrill || canTreasureHunt;
+    }
-    }
+
-
+    @Override
-    @Override
+    protected boolean effectsHeaderPermissions() {
-    protected void effectsDisplay() {
+        return canGigaDrill || canTreasureHunt;
-        if (canGigaDrill) {
+    }
-            player.sendMessage(LocaleLoader.getString("Effects.Template", new Object[] { LocaleLoader.getString("Excavation.Effect.0"), LocaleLoader.getString("Excavation.Effect.1") }));
+
-        }
+    @Override
-
+    protected void effectsDisplay() {
-        if (canTreasureHunt) {
+        luckyEffectsDisplay();
-            player.sendMessage(LocaleLoader.getString("Effects.Template", new Object[] { LocaleLoader.getString("Excavation.Effect.2"), LocaleLoader.getString("Excavation.Effect.3") }));
+
-        }
+        if (canGigaDrill) {
-    }
+            player.sendMessage(LocaleLoader.getString("Effects.Template", LocaleLoader.getString("Excavation.Effect.0"), LocaleLoader.getString("Excavation.Effect.1")));
-
+        }
-    @Override
+
-    protected boolean statsHeaderPermissions() {
+        if (canTreasureHunt) {
-        return canGigaDrill;
+            player.sendMessage(LocaleLoader.getString("Effects.Template", LocaleLoader.getString("Excavation.Effect.2"), LocaleLoader.getString("Excavation.Effect.3")));
-    }
+        }
-
+    }
-    @Override
+
-    protected void statsDisplay() {
+    @Override
-        if (canGigaDrill) {
+    protected boolean statsHeaderPermissions() {
-            player.sendMessage(LocaleLoader.getString("Excavation.Effect.Length", new Object[] { gigaDrillBreakerLength }));
+        return canGigaDrill;
-        }
+    }
-    }
+
-}
+    @Override
+    protected void statsDisplay() {
+        if (canGigaDrill) {
+            if (hasEndurance) {
+                player.sendMessage(LocaleLoader.getString("Excavation.Effect.Length", gigaDrillBreakerLength) + LocaleLoader.getString("Perks.activationtime.bonus", gigaDrillBreakerLengthEndurance));
+            }
+            else {
+                player.sendMessage(LocaleLoader.getString("Excavation.Effect.Length", gigaDrillBreakerLength));
+            }
+        }
+    }
+}

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

@@ -1,84 +1,125 @@
-package com.gmail.nossr50.commands.skills;
+package com.gmail.nossr50.commands.skills;
-
+
-import com.gmail.nossr50.commands.SkillCommand;
+import com.gmail.nossr50.config.AdvancedConfig;
-import com.gmail.nossr50.config.Config;
+import com.gmail.nossr50.datatypes.skills.SkillType;
-import com.gmail.nossr50.datatypes.SkillType;
+import com.gmail.nossr50.locale.LocaleLoader;
-import com.gmail.nossr50.locale.LocaleLoader;
+import com.gmail.nossr50.skills.fishing.Fishing;
-import com.gmail.nossr50.skills.gathering.Fishing;
+import com.gmail.nossr50.util.Permissions;
-
+import com.gmail.nossr50.util.player.UserManager;
-public class FishingCommand extends SkillCommand {
+
-    private int lootTier;
+public class FishingCommand extends SkillCommand {
-    private String magicChance;
+    private int lootTier;
-    private String shakeChance;
+    private String magicChance;
-
+    private String magicChanceLucky;
-    private boolean canTreasureHunt;
+    private String chanceRaining = "";
-    private boolean canMagicHunt;
+    private String shakeChance;
-    private boolean canShake;
+    private String shakeChanceLucky;
-
+    private String fishermansDietRank;
-    public FishingCommand() {
+
-        super(SkillType.FISHING);
+    private boolean canTreasureHunt;
-    }
+    private boolean canMagicHunt;
-
+    private boolean canShake;
-    @Override
+    private boolean canFishermansDiet;
-    protected void dataCalculations() {
+
-        lootTier = Fishing.getFishingLootTier(profile);
+    public FishingCommand() {
-        magicChance = percent.format((float) lootTier / 15);
+        super(SkillType.FISHING);
-        int dropChance = Fishing.getShakeChance(lootTier);
+    }
-        if (player.hasPermission("mcmmo.perks.lucky.fishing")) {
+
-            dropChance = (int) (dropChance * 1.25);
+    @Override
-        }
+    protected void dataCalculations() {
-        shakeChance = String.valueOf(dropChance);
+        lootTier = UserManager.getPlayer(player).getFishingManager().getLootTier();
-    }
+
-
+        // TREASURE HUNTER
-    @Override
+        double enchantChance = lootTier * AdvancedConfig.getInstance().getFishingMagicMultiplier();
-    protected void permissionsCheck() {
+
-        canTreasureHunt = permInstance.fishingTreasures(player);
+        if (player.getWorld().hasStorm()) {
-        canMagicHunt = permInstance.fishingMagic(player);
+            chanceRaining = LocaleLoader.getString("Fishing.Chance.Raining");
-        canShake = permInstance.shakeMob(player);
+            enchantChance = enchantChance * 1.1D;
-    }
+        }
-
+
-    @Override
+        String[] treasureHunterStrings = calculateAbilityDisplayValues(enchantChance);
-    protected boolean effectsHeaderPermissions() {
+        magicChance = treasureHunterStrings[0];
-        return canTreasureHunt || canMagicHunt || canShake;
+        magicChanceLucky = treasureHunterStrings[1];
-    }
+
-
+        // SHAKE
-    @Override
+        String[] shakeStrings = calculateAbilityDisplayValues(UserManager.getPlayer(player).getFishingManager().getShakeProbability());
-    protected void effectsDisplay() {
+        shakeChance = shakeStrings[0];
-        if (canTreasureHunt) {
+        shakeChanceLucky = shakeStrings[1];
-            player.sendMessage(LocaleLoader.getString("Effects.Template", new Object[] { LocaleLoader.getString("Fishing.Effect.0"), LocaleLoader.getString("Fishing.Effect.1") }));
+
-        }
+        // FISHERMAN'S DIET
-
+        fishermansDietRank = calculateRank(Fishing.fishermansDietMaxLevel, Fishing.fishermansDietRankLevel1);
-        if (canMagicHunt) {
+    }
-            player.sendMessage(LocaleLoader.getString("Effects.Template", new Object[] { LocaleLoader.getString("Fishing.Effect.2"), LocaleLoader.getString("Fishing.Effect.3") }));
+
-        }
+    @Override
-
+    protected void permissionsCheck() {
-        if (canShake) {
+        canTreasureHunt = Permissions.fishingTreasureHunter(player);
-            player.sendMessage(LocaleLoader.getString("Effects.Template", new Object[] { LocaleLoader.getString("Fishing.Effect.4"), LocaleLoader.getString("Fishing.Effect.5") }));
+        canMagicHunt = Permissions.magicHunter(player);
-        }
+        canShake = Permissions.shake(player);
-    }
+        canFishermansDiet = Permissions.fishermansDiet(player);
-
+    }
-    @Override
+
-    protected boolean statsHeaderPermissions() {
+    @Override
-        return canTreasureHunt || canMagicHunt || canShake;
+    protected boolean effectsHeaderPermissions() {
-    }
+        return canTreasureHunt || canMagicHunt || canShake;
-
+    }
-    @Override
+
-    protected void statsDisplay() {
+    @Override
-        if (canTreasureHunt) {
+    protected void effectsDisplay() {
-            player.sendMessage(LocaleLoader.getString("Fishing.Ability.Rank", new Object[] { lootTier }));
+        luckyEffectsDisplay();
-        }
+
-
+        if (canTreasureHunt) {
-        if (canMagicHunt) {
+            player.sendMessage(LocaleLoader.getString("Effects.Template", LocaleLoader.getString("Fishing.Effect.0"), LocaleLoader.getString("Fishing.Effect.1")));
-            player.sendMessage(LocaleLoader.getString("Fishing.Enchant.Chance", new Object[] { magicChance }));
+        }
-        }
+
-
+        if (canMagicHunt) {
-        if (canShake) {
+            player.sendMessage(LocaleLoader.getString("Effects.Template", LocaleLoader.getString("Fishing.Effect.2"), LocaleLoader.getString("Fishing.Effect.3")));
-            if (skillValue < 150) {
+        }
-                player.sendMessage(LocaleLoader.getString("Ability.Generic.Template.Lock", new Object[] { LocaleLoader.getString("Fishing.Ability.Locked.0") }));
+
-            }
+        if (canShake) {
-            else {
+            player.sendMessage(LocaleLoader.getString("Effects.Template", LocaleLoader.getString("Fishing.Effect.4"), LocaleLoader.getString("Fishing.Effect.5")));
-                player.sendMessage(LocaleLoader.getString("Fishing.Ability.Shake", new Object[] { shakeChance }));
+        }
-            }
+
-        }
+        if (canFishermansDiet) {
-    }
+            player.sendMessage(LocaleLoader.getString("Effects.Template", LocaleLoader.getString("Fishing.Effect.6"), LocaleLoader.getString("Fishing.Effect.7")));
-}
+        }
+    }
+
+    @Override
+    protected boolean statsHeaderPermissions() {
+        return canTreasureHunt || canMagicHunt || canShake;
+    }
+
+    @Override
+    protected void statsDisplay() {
+        if (canTreasureHunt) {
+            player.sendMessage(LocaleLoader.getString("Fishing.Ability.Rank", lootTier));
+        }
+
+        if (canMagicHunt) {
+            if (isLucky) {
+                player.sendMessage(LocaleLoader.getString("Fishing.Enchant.Chance", magicChance) + chanceRaining + LocaleLoader.getString("Perks.lucky.bonus", magicChanceLucky));
+            }
+            else {
+                player.sendMessage(LocaleLoader.getString("Fishing.Enchant.Chance", magicChance) + chanceRaining);
+            }
+        }
+
+        if (canShake) {
+            if (skillValue < AdvancedConfig.getInstance().getShakeUnlockLevel()) {
+                player.sendMessage(LocaleLoader.getString("Ability.Generic.Template.Lock", LocaleLoader.getString("Fishing.Ability.Locked.0", AdvancedConfig.getInstance().getShakeUnlockLevel())));
+            }
+            else {
+                if (isLucky) {
+                    player.sendMessage(LocaleLoader.getString("Fishing.Ability.Shake", shakeChance) + LocaleLoader.getString("Perks.lucky.bonus", shakeChanceLucky));
+                }
+                else {
+                    player.sendMessage(LocaleLoader.getString("Fishing.Ability.Shake", shakeChance));
+                }
+            }
+        }
+
+        if (canFishermansDiet) {
+            player.sendMessage(LocaleLoader.getString("Fishing.Ability.FD", fishermansDietRank));
+        }
+    }
+}

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

@@ -1,141 +1,180 @@
-package com.gmail.nossr50.commands.skills;
+package com.gmail.nossr50.commands.skills;
-
+
-import com.gmail.nossr50.commands.SkillCommand;
+import org.bukkit.Material;
-import com.gmail.nossr50.config.Config;
+
-import com.gmail.nossr50.datatypes.SkillType;
+import com.gmail.nossr50.datatypes.skills.SkillType;
-import com.gmail.nossr50.locale.LocaleLoader;
+import com.gmail.nossr50.locale.LocaleLoader;
-
+import com.gmail.nossr50.skills.herbalism.Herbalism;
-public class HerbalismCommand extends SkillCommand {
+import com.gmail.nossr50.util.Permissions;
-    private String greenTerraLength;
+
-    private String greenThumbChance;
+public class HerbalismCommand extends SkillCommand {
-    private String greenThumbStage;
+    private String greenTerraLength;
-    private String farmersDietRank;
+    private String greenTerraLengthEndurance;
-    private String doubleDropChance;
+    private String greenThumbChance;
-
+    private String greenThumbChanceLucky;
-    private boolean canGreenTerra;
+    private String greenThumbStage;
-    private boolean canGreenThumbWheat;
+    private String farmersDietRank;
-    private boolean canGreenThumbBlocks;
+    private String doubleDropChance;
-    private boolean canFarmersDiet;
+    private String doubleDropChanceLucky;
-    private boolean canDoubleDrop;
+    private String hylianLuckChance;
-    private boolean doubleDropsDisabled;
+    private String hylianLuckChanceLucky;
-
+    private String shroomThumbChance;
-    public HerbalismCommand() {
+    private String shroomThumbChanceLucky;
-        super(SkillType.HERBALISM);
+
-    }
+    private boolean hasHylianLuck;
-
+    private boolean canGreenTerra;
-    @Override
+    private boolean canGreenThumbWheat;
-    protected void dataCalculations() {
+    private boolean canGreenThumbBlocks;
-        greenTerraLength = String.valueOf(2 + ((int) skillValue / 50));
+    private boolean canFarmersDiet;
-
+    private boolean canDoubleDrop;
-        if (skillValue >= 1500) {
+    private boolean canShroomThumb;
-            greenThumbChance = "100.00%";
+    private boolean doubleDropsDisabled;
-            greenThumbStage = "4";
+
-            farmersDietRank = "5";
+    public HerbalismCommand() {
-            doubleDropChance = "100.00%";
+        super(SkillType.HERBALISM);
-        }
+    }
-        else if (skillValue >= 1000) {
+
-            greenThumbChance = percent.format(skillValue / 1500);
+    @Override
-            greenThumbStage = "4";
+    protected void dataCalculations() {
-            farmersDietRank = "5";
+        // GREEN TERRA
-            doubleDropChance = "100.00%";
+        String[] greenTerraStrings = calculateLengthDisplayValues();
-        }
+        greenTerraLength = greenTerraStrings[0];
-        else if (skillValue >= 800) {
+        greenTerraLengthEndurance = greenTerraStrings[1];
-            greenThumbChance = percent.format(skillValue / 1500);
+
-            greenThumbStage = "4";
+        // FARMERS DIET
-            farmersDietRank = "4";
+        farmersDietRank = calculateRank(Herbalism.farmersDietMaxLevel, Herbalism.farmersDietRankLevel1);
-            doubleDropChance = percent.format(skillValue / 1000);
+
-        }
+        // GREEN THUMB
-        else if (skillValue >= 600) {
+        greenThumbStage = calculateRank(Herbalism.greenThumbStageMaxLevel, Herbalism.greenThumbStageChangeLevel);
-            greenThumbChance = percent.format(skillValue / 1500);
+
-            greenThumbStage = "4";
+        String[] greenThumbStrings = calculateAbilityDisplayValues(Herbalism.greenThumbMaxLevel, Herbalism.greenThumbMaxChance);
-            farmersDietRank = "3";
+        greenThumbChance = greenThumbStrings[0];
-            doubleDropChance = percent.format(skillValue / 1000);
+        greenThumbChanceLucky = greenThumbStrings[1];
-        }
+
-        else if (skillValue >= 400) {
+        // DOUBLE DROPS
-            greenThumbChance = percent.format(skillValue / 1500);
+        String[] doubleDropStrings = calculateAbilityDisplayValues(Herbalism.doubleDropsMaxLevel, Herbalism.doubleDropsMaxChance);
-            greenThumbStage = "3";
+        doubleDropChance = doubleDropStrings[0];
-            farmersDietRank = "2";
+        doubleDropChanceLucky = doubleDropStrings[1];
-            doubleDropChance = percent.format(skillValue / 1000);
+
-        }
+        // HYLIAN LUCK
-        else if (skillValue >= 200) {
+        String[] hylianLuckStrings = calculateAbilityDisplayValues(Herbalism.hylianLuckMaxLevel, Herbalism.hylianLuckMaxChance);
-            greenThumbChance = percent.format(skillValue / 1500);
+        hylianLuckChance = hylianLuckStrings[0];
-            greenThumbStage = "2";
+        hylianLuckChanceLucky = hylianLuckStrings[1];
-            farmersDietRank = "1";
+
-            doubleDropChance = percent.format(skillValue / 1000);
+        // SHROOM THUMB
-        }
+        String[] shroomThumbStrings = calculateAbilityDisplayValues(Herbalism.shroomThumbMaxLevel, Herbalism.shroomThumbMaxChance);
-        else {
+        shroomThumbChance = shroomThumbStrings[0];
-            greenThumbChance = percent.format(skillValue / 1500);
+        shroomThumbChanceLucky = shroomThumbStrings[1];
-            greenThumbStage = "1";
+    }
-            farmersDietRank = "1";
+
-            doubleDropChance = percent.format(skillValue / 1000);
+    @Override
-        }
+    protected void permissionsCheck() {
-    }
+        hasHylianLuck = Permissions.hylianLuck(player);
-
+        canGreenTerra = Permissions.greenTerra(player);
-    @Override
+        canGreenThumbWheat = Permissions.greenThumbPlant(player, Material.CROPS); // TODO: This isn't really accurate - they could have perms for other crops but not wheat.
-    protected void permissionsCheck() {
+        canGreenThumbBlocks = (Permissions.greenThumbBlock(player, Material.DIRT) || Permissions.greenThumbBlock(player, Material.COBBLESTONE) || Permissions.greenThumbBlock(player, Material.COBBLE_WALL) || Permissions.greenThumbBlock(player, Material.SMOOTH_BRICK));
-        Config configInstance = Config.getInstance();
+        canFarmersDiet = Permissions.farmersDiet(player);
-
+        canDoubleDrop = Permissions.doubleDrops(player, skill);
-        canGreenTerra = permInstance.greenTerra(player);
+        doubleDropsDisabled = skill.getDoubleDropsDisabled();
-        canGreenThumbWheat = permInstance.greenThumbWheat(player);
+        canShroomThumb = Permissions.shroomThumb(player);
-        canGreenThumbBlocks = permInstance.greenThumbBlocks(player);
+    }
-        canFarmersDiet = permInstance.farmersDiet(player);
+
-        canDoubleDrop = permInstance.herbalismDoubleDrops(player);
+    @Override
-        doubleDropsDisabled = configInstance.herbalismDoubleDropsDisabled();
+    protected boolean effectsHeaderPermissions() {
-    }
+        return canGreenTerra || (canDoubleDrop && !doubleDropsDisabled) || canFarmersDiet || canGreenThumbBlocks || canGreenThumbWheat || canShroomThumb;
-
+    }
-    @Override
+
-    protected boolean effectsHeaderPermissions() {
+    @Override
-        return canGreenTerra || (canDoubleDrop && !doubleDropsDisabled) || canFarmersDiet || canGreenThumbBlocks || canGreenThumbWheat;
+    protected void effectsDisplay() {
-    }
+        luckyEffectsDisplay();
-
+
-    @Override
+        if (canGreenTerra) {
-    protected void effectsDisplay() {
+            player.sendMessage(LocaleLoader.getString("Effects.Template", LocaleLoader.getString("Herbalism.Effect.0"), LocaleLoader.getString("Herbalism.Effect.1")));
-        if (canGreenTerra) {
+        }
-            player.sendMessage(LocaleLoader.getString("Effects.Template", new Object[] { LocaleLoader.getString("Herbalism.Effect.0"), LocaleLoader.getString("Herbalism.Effect.1") }));
+
-        }
+        if (canGreenThumbWheat) {
-
+            player.sendMessage(LocaleLoader.getString("Effects.Template", LocaleLoader.getString("Herbalism.Effect.2"), LocaleLoader.getString("Herbalism.Effect.3")));
-        if (canGreenThumbWheat) {
+        }
-            player.sendMessage(LocaleLoader.getString("Effects.Template", new Object[] { LocaleLoader.getString("Herbalism.Effect.2"), LocaleLoader.getString("Herbalism.Effect.3") }));
+
-        }
+        if (canGreenThumbBlocks) {
-
+            player.sendMessage(LocaleLoader.getString("Effects.Template", LocaleLoader.getString("Herbalism.Effect.4"), LocaleLoader.getString("Herbalism.Effect.5")));
-        if (canGreenThumbBlocks) {
+        }
-            player.sendMessage(LocaleLoader.getString("Effects.Template", new Object[] { LocaleLoader.getString("Herbalism.Effect.4"), LocaleLoader.getString("Herbalism.Effect.5") }));
+
-        }
+        if (canFarmersDiet) {
-
+            player.sendMessage(LocaleLoader.getString("Effects.Template", LocaleLoader.getString("Herbalism.Effect.6"), LocaleLoader.getString("Herbalism.Effect.7")));
-        if (canFarmersDiet) {
+        }
-            player.sendMessage(LocaleLoader.getString("Effects.Template", new Object[] { LocaleLoader.getString("Herbalism.Effect.6"), LocaleLoader.getString("Herbalism.Effect.7") }));
+
-        }
+        if (hasHylianLuck) {
-
+            player.sendMessage(LocaleLoader.getString("Effects.Template", LocaleLoader.getString("Herbalism.Effect.10"), LocaleLoader.getString("Herbalism.Effect.11")));
-        if (canDoubleDrop && !doubleDropsDisabled) {
+        }
-            player.sendMessage(LocaleLoader.getString("Effects.Template", new Object[] { LocaleLoader.getString("Herbalism.Effect.8"), LocaleLoader.getString("Herbalism.Effect.9") }));
+
-        }
+        if (canShroomThumb) {
-    }
+            player.sendMessage(LocaleLoader.getString("Effects.Template", LocaleLoader.getString("Herbalism.Effect.12"), LocaleLoader.getString("Herbalism.Effect.13")));
-
+        }
-    @Override
+
-    protected boolean statsHeaderPermissions() {
+        if (canDoubleDrop && !doubleDropsDisabled) {
-        return canGreenTerra || (canDoubleDrop && !doubleDropsDisabled) || canFarmersDiet || canGreenThumbBlocks || canGreenThumbWheat;
+            player.sendMessage(LocaleLoader.getString("Effects.Template", LocaleLoader.getString("Herbalism.Effect.8"), LocaleLoader.getString("Herbalism.Effect.9")));
-    }
+        }
-
+    }
-    @Override
+
-    protected void statsDisplay() {
+    @Override
-        if (canGreenTerra) {
+    protected boolean statsHeaderPermissions() {
-            player.sendMessage(LocaleLoader.getString("Herbalism.Ability.GTe.Length", new Object[] { greenTerraLength }));
+        return canGreenTerra || (canDoubleDrop && !doubleDropsDisabled) || canFarmersDiet || canGreenThumbBlocks || canGreenThumbWheat || canShroomThumb;
-        }
+    }
-
+
-        if (canGreenThumbBlocks || canGreenThumbWheat) {
+    @Override
-            player.sendMessage(LocaleLoader.getString("Herbalism.Ability.GTh.Chance", new Object[] { greenThumbChance }));
+    protected void statsDisplay() {
-        }
+        if (canGreenTerra) {
-
+            if (hasEndurance) {
-        if (canGreenThumbWheat) {
+                player.sendMessage(LocaleLoader.getString("Herbalism.Ability.GTe.Length", greenTerraLength) + LocaleLoader.getString("Perks.activationtime.bonus", greenTerraLengthEndurance));
-            player.sendMessage(LocaleLoader.getString("Herbalism.Ability.GTh.Stage", new Object[] { greenThumbStage }));
+            }
-        }
+            else {
-
+                player.sendMessage(LocaleLoader.getString("Herbalism.Ability.GTe.Length", greenTerraLength));
-        if (canFarmersDiet) {
+            }
-            player.sendMessage(LocaleLoader.getString("Herbalism.Ability.FD", new Object[] { farmersDietRank } ));
+        }
-        }
+
-
+        if (canGreenThumbBlocks || canGreenThumbWheat) {
-        if (canDoubleDrop && !doubleDropsDisabled) {
+            if (isLucky) {
-            player.sendMessage(LocaleLoader.getString("Herbalism.Ability.DoubleDropChance", new Object[] { doubleDropChance }));
+                player.sendMessage(LocaleLoader.getString("Herbalism.Ability.GTh.Chance", greenThumbChance) + LocaleLoader.getString("Perks.lucky.bonus", greenThumbChanceLucky));
-        }
+            }
-    }
+            else {
-}
+                player.sendMessage(LocaleLoader.getString("Herbalism.Ability.GTh.Chance", greenThumbChance));
+            }
+        }
+
+        if (canGreenThumbWheat) {
+            player.sendMessage(LocaleLoader.getString("Herbalism.Ability.GTh.Stage", greenThumbStage));
+        }
+
+        if (canFarmersDiet) {
+            player.sendMessage(LocaleLoader.getString("Herbalism.Ability.FD", farmersDietRank));
+        }
+
+        if (hasHylianLuck) {
+            if (isLucky) {
+                player.sendMessage(LocaleLoader.getString("Herbalism.Ability.HylianLuck", hylianLuckChance) + LocaleLoader.getString("Perks.lucky.bonus", hylianLuckChanceLucky));
+            }
+            else {
+                player.sendMessage(LocaleLoader.getString("Herbalism.Ability.HylianLuck", hylianLuckChance));
+            }
+        }
+
+        if (canShroomThumb) {
+            if (isLucky) {
+                player.sendMessage(LocaleLoader.getString("Herbalism.Ability.ShroomThumb.Chance", shroomThumbChance) + LocaleLoader.getString("Perks.lucky.bonus", shroomThumbChanceLucky));
+            }
+            else {
+                player.sendMessage(LocaleLoader.getString("Herbalism.Ability.ShroomThumb.Chance", shroomThumbChance));
+            }
+        }
+
+        if (canDoubleDrop && !doubleDropsDisabled) {
+            if (isLucky) {
+                player.sendMessage(LocaleLoader.getString("Herbalism.Ability.DoubleDropChance", doubleDropChance) + LocaleLoader.getString("Perks.lucky.bonus", doubleDropChanceLucky));
+            }
+            else {
+                player.sendMessage(LocaleLoader.getString("Herbalism.Ability.DoubleDropChance", doubleDropChance));
+            }
+        }
+    }
+}

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

@@ -1,169 +1,149 @@
-package com.gmail.nossr50.commands.skills;
+package com.gmail.nossr50.commands.skills;
-
+
-import com.gmail.nossr50.commands.SkillCommand;
+import com.gmail.nossr50.config.AdvancedConfig;
-import com.gmail.nossr50.config.Config;
+import com.gmail.nossr50.datatypes.skills.SkillType;
-import com.gmail.nossr50.datatypes.SkillType;
+import com.gmail.nossr50.locale.LocaleLoader;
-import com.gmail.nossr50.locale.LocaleLoader;
+import com.gmail.nossr50.skills.mining.Mining;
-import com.gmail.nossr50.util.Misc;
+import com.gmail.nossr50.skills.mining.MiningManager;
-
+import com.gmail.nossr50.util.Permissions;
-public class MiningCommand extends SkillCommand {
+import com.gmail.nossr50.util.player.UserManager;
-    private String doubleDropChance;
+
-    private String superBreakerLength;
+public class MiningCommand extends SkillCommand {
-    private String blastMiningRank;
+    private String doubleDropChance;
-    private String blastRadiusIncrease;
+    private String doubleDropChanceLucky;
-    private String blastDamageDecrease;
+    private String superBreakerLength;
-
+    private String superBreakerLengthEndurance;
-    private boolean canSuperBreaker;
+
-    private boolean canDoubleDrop;
+    private int blastMiningRank;
-    private boolean canBlast;
+    private int bonusTNTDrops;
-    private boolean canBiggerBombs;
+    private double blastRadiusIncrease;
-    private boolean canDemoExpert;
+    private String oreBonus;
-    private boolean doubleDropsDisabled;
+    private String debrisReduction;
-
+    private String blastDamageDecrease;
-    public MiningCommand() {
+
-        super(SkillType.MINING);
+    private boolean canSuperBreaker;
-    }
+    private boolean canDoubleDrop;
-
+    private boolean canBlast;
-    @Override
+    private boolean canBiggerBombs;
-    protected void dataCalculations() {
+    private boolean canDemoExpert;
-        superBreakerLength = String.valueOf(2 + ((int) skillValue / 50));
+    private boolean doubleDropsDisabled;
-
+
-        if (skillValue >= 1000) {
+    public MiningCommand() {
-            blastMiningRank = "8";
+        super(SkillType.MINING);
-            blastDamageDecrease = "100.00%";
+    }
-            blastRadiusIncrease = "4";
+
-            doubleDropChance = "100.00%";
+    @Override
-        }
+    protected void dataCalculations() {
-        else if (skillValue >= 875) {
+        // SUPER BREAKER
-            blastMiningRank = "7";
+        String[] superBreakerStrings = calculateLengthDisplayValues();
-            blastDamageDecrease = "50.00%";
+        superBreakerLength = superBreakerStrings[0];
-            blastRadiusIncrease = "3";
+        superBreakerLengthEndurance = superBreakerStrings[1];
-            doubleDropChance = percent.format(skillValue / 1000);
+
-        }
+        // DOUBLE DROPS
-        else if (skillValue >= 750) {
+        String[] doubleDropStrings = calculateAbilityDisplayValues(Mining.doubleDropsMaxLevel, Mining.doubleDropsMaxChance);
-            blastMiningRank = "6";
+        doubleDropChance = doubleDropStrings[0];
-            blastDamageDecrease = "50.00%";
+        doubleDropChanceLucky = doubleDropStrings[1];
-            blastRadiusIncrease = "3";
+
-            doubleDropChance = percent.format(skillValue / 1000);
+        // BLAST MINING
-        }
+        MiningManager miningManager = UserManager.getPlayer(player).getMiningManager();
-        else if (skillValue >= 625) {
+        blastMiningRank = miningManager.getBlastMiningTier();
-            blastMiningRank = "5";
+        bonusTNTDrops = miningManager.getDropMultiplier();
-            blastDamageDecrease = "25.00%";
+        oreBonus = percent.format(miningManager.getOreBonus() / 30.0D); // Base received in TNT is 30%
-            blastRadiusIncrease = "2";
+        debrisReduction = percent.format(miningManager.getDebrisReduction() / 30.0D); // Base received in TNT is 30%
-            doubleDropChance = percent.format(skillValue / 1000);
+        blastDamageDecrease = percent.format(miningManager.getBlastDamageModifier() / 100.0D);
-        }
+        blastRadiusIncrease = miningManager.getBlastRadiusModifier();
-        else if (skillValue >= 500) {
+    }
-            blastMiningRank = "4";
+
-            blastDamageDecrease = "25.00%";
+    @Override
-            blastRadiusIncrease = "2";
+    protected void permissionsCheck() {
-            doubleDropChance = percent.format(skillValue / 1000);
+        canBiggerBombs = Permissions.biggerBombs(player);
-        }
+        canBlast = Permissions.remoteDetonation(player);
-        else if (skillValue >= 375) {
+        canDemoExpert = Permissions.demolitionsExpertise(player);
-            blastMiningRank = "3";
+        canDoubleDrop = Permissions.doubleDrops(player, skill);
-            blastDamageDecrease = "0.00%";
+        canSuperBreaker = Permissions.superBreaker(player);
-            blastRadiusIncrease = "1";
+        doubleDropsDisabled = skill.getDoubleDropsDisabled();
-            doubleDropChance = percent.format(skillValue / 1000);
+    }
-        }
+
-        else if (skillValue >= 250) {
+    @Override
-            blastMiningRank = "2";
+    protected boolean effectsHeaderPermissions() {
-            blastDamageDecrease = "0.00%";
+        return canBiggerBombs || canBlast || canDemoExpert || (canDoubleDrop && !doubleDropsDisabled) || canSuperBreaker;
-            blastRadiusIncrease = "1";
+    }
-            doubleDropChance = percent.format(skillValue / 1000);
+
-        }
+    @Override
-        else if (skillValue >= 125) {
+    protected void effectsDisplay() {
-            blastMiningRank = "1";
+        luckyEffectsDisplay();
-            blastDamageDecrease = "0.00%";
+
-            blastRadiusIncrease = "0";
+        if (canSuperBreaker) {
-            doubleDropChance = percent.format(skillValue / 1000);
+            player.sendMessage(LocaleLoader.getString("Effects.Template", LocaleLoader.getString("Mining.Effect.0"), LocaleLoader.getString("Mining.Effect.1")));
-        }
+        }
-        else {
+
-            blastMiningRank = "0";
+        if (canDoubleDrop && !doubleDropsDisabled) {
-            blastDamageDecrease = "0.00%";
+            player.sendMessage(LocaleLoader.getString("Effects.Template", LocaleLoader.getString("Mining.Effect.2"), LocaleLoader.getString("Mining.Effect.3")));
-            blastRadiusIncrease = "0";
+        }
-            doubleDropChance = percent.format(skillValue / 1000);
+
-        }
+        if (canBlast) {
-    }
+            player.sendMessage(LocaleLoader.getString("Effects.Template", LocaleLoader.getString("Mining.Effect.4"), LocaleLoader.getString("Mining.Effect.5")));
-
+        }
-    @Override
+
-    protected void permissionsCheck() {
+        if (canBiggerBombs) {
-        Config configInstance = Config.getInstance();
+            player.sendMessage(LocaleLoader.getString("Effects.Template", LocaleLoader.getString("Mining.Effect.6"), LocaleLoader.getString("Mining.Effect.7")));
-
+        }
-        canBiggerBombs = permInstance.biggerBombs(player);
+
-        canBlast = permInstance.blastMining(player);
+        if (canDemoExpert) {
-        canDemoExpert = permInstance.demolitionsExpertise(player);
+            player.sendMessage(LocaleLoader.getString("Effects.Template", LocaleLoader.getString("Mining.Effect.8"), LocaleLoader.getString("Mining.Effect.9")));
-        canDoubleDrop = permInstance.miningDoubleDrops(player);
+        }
-        canSuperBreaker = permInstance.superBreaker(player);
+    }
-        doubleDropsDisabled = configInstance.miningDoubleDropsDisabled();
+
-    }
+    @Override
-
+    protected boolean statsHeaderPermissions() {
-    @Override
+        return canBiggerBombs || canBlast || canDemoExpert || (canDoubleDrop && !doubleDropsDisabled) || canSuperBreaker;
-    protected boolean effectsHeaderPermissions() {
+    }
-        return canBiggerBombs || canBlast || canDemoExpert || (canDoubleDrop && !doubleDropsDisabled) || canSuperBreaker;
+
-    }
+    @Override
-
+    protected void statsDisplay() {
-    @Override
+        if (canDoubleDrop && !doubleDropsDisabled) {
-    protected void effectsDisplay() {
+            if (isLucky) {
-        if (canSuperBreaker) {
+                player.sendMessage(LocaleLoader.getString("Mining.Effect.DropChance", doubleDropChance) + LocaleLoader.getString("Perks.lucky.bonus", doubleDropChanceLucky));
-            player.sendMessage(LocaleLoader.getString("Effects.Template", new Object[] { LocaleLoader.getString("Mining.Effect.0"), LocaleLoader.getString("Mining.Effect.1") }));
+            }
-        }
+            else {
-
+                player.sendMessage(LocaleLoader.getString("Mining.Effect.DropChance", doubleDropChance));
-        if (canDoubleDrop && !doubleDropsDisabled) {
+            }
-            player.sendMessage(LocaleLoader.getString("Effects.Template", new Object[] { LocaleLoader.getString("Mining.Effect.2"), LocaleLoader.getString("Mining.Effect.3") }));
+        }
-        }
+
-
+        if (canSuperBreaker) {
-        if (canBlast) {
+            if (hasEndurance) {
-            player.sendMessage(LocaleLoader.getString("Effects.Template", new Object[] { LocaleLoader.getString("Mining.Effect.4"), LocaleLoader.getString("Mining.Effect.5") }));
+                player.sendMessage(LocaleLoader.getString("Mining.Ability.Length", superBreakerLength) + LocaleLoader.getString("Perks.activationtime.bonus", superBreakerLengthEndurance));
-        }
+            }
-
+            else {
-        if (canBiggerBombs) {
+                player.sendMessage(LocaleLoader.getString("Mining.Ability.Length", superBreakerLength));
-            player.sendMessage(LocaleLoader.getString("Effects.Template", new Object[] { LocaleLoader.getString("Mining.Effect.6"), LocaleLoader.getString("Mining.Effect.7") }));
+            }
-        }
+        }
-
+
-        if (canDemoExpert) {
+        if (canBlast) {
-            player.sendMessage(LocaleLoader.getString("Effects.Template", new Object[] { LocaleLoader.getString("Mining.Effect.8"), LocaleLoader.getString("Mining.Effect.9") }));
+            if (skillValue < AdvancedConfig.getInstance().getBlastMiningRank1()) {
-        }
+                player.sendMessage(LocaleLoader.getString("Ability.Generic.Template.Lock", LocaleLoader.getString("Mining.Ability.Locked.0", AdvancedConfig.getInstance().getBlastMiningRank1())));
-    }
+            }
-
+            else {
-    @Override
+                player.sendMessage(LocaleLoader.getString("Mining.Blast.Rank", blastMiningRank, LocaleLoader.getString("Mining.Blast.Effect", oreBonus, debrisReduction, bonusTNTDrops)));
-    protected boolean statsHeaderPermissions() {
+            }
-        return canBiggerBombs || canBlast || canDemoExpert || (canDoubleDrop && !doubleDropsDisabled) || canSuperBreaker;
+        }
-    }
+
-
+        if (canBiggerBombs) {
-    @Override
+            if (skillValue < AdvancedConfig.getInstance().getBlastMiningRank2()) {
-    protected void statsDisplay() {
+                player.sendMessage(LocaleLoader.getString("Ability.Generic.Template.Lock", LocaleLoader.getString("Mining.Ability.Locked.1", AdvancedConfig.getInstance().getBlastMiningRank2())));
-        if (canDoubleDrop && !doubleDropsDisabled) {
+            }
-            player.sendMessage(LocaleLoader.getString("Mining.Effect.DropChance", new Object[] { doubleDropChance }));
+            else {
-        }
+                player.sendMessage(LocaleLoader.getString("Mining.Blast.Radius.Increase", blastRadiusIncrease));
-
+            }
-        if (canSuperBreaker) {
+        }
-            player.sendMessage(LocaleLoader.getString("Mining.Ability.Length", new Object[] { superBreakerLength }));
+
-        }
+        if (canDemoExpert) {
-
+            if (skillValue < AdvancedConfig.getInstance().getBlastMiningRank4()) {
-        if (canBlast) {
+                player.sendMessage(LocaleLoader.getString("Ability.Generic.Template.Lock", LocaleLoader.getString("Mining.Ability.Locked.2", AdvancedConfig.getInstance().getBlastMiningRank4())));
-            if (skillValue < 125) {
+            }
-                player.sendMessage(LocaleLoader.getString("Ability.Generic.Template.Lock", new Object[] { LocaleLoader.getString("Mining.Ability.Locked.0") }));
+            else {
-            }
+                player.sendMessage(LocaleLoader.getString("Mining.Effect.Decrease", blastDamageDecrease));
-            else {
+            }
-                player.sendMessage(LocaleLoader.getString("Mining.Blast.Rank", new Object[] { blastMiningRank, LocaleLoader.getString("Mining.Blast.Effect." + (Misc.getInt(blastMiningRank) - 1)) }));
+        }
-            }
+    }
-        }
+}
-
-        if (canBiggerBombs) {
-            if (skillValue < 250) {
-                player.sendMessage(LocaleLoader.getString("Ability.Generic.Template.Lock", new Object[] { LocaleLoader.getString("Mining.Ability.Locked.1") }));
-            }
-            else {
-                player.sendMessage(LocaleLoader.getString("Mining.Blast.Radius.Increase", new Object[] { blastRadiusIncrease }));
-            }
-        }
-
-        if (canDemoExpert) {
-            if (skillValue < 500) {
-                player.sendMessage(LocaleLoader.getString("Ability.Generic.Template.Lock", new Object[] { LocaleLoader.getString("Mining.Ability.Locked.2") }));
-            }
-            else {
-                player.sendMessage(LocaleLoader.getString("Mining.Effect.Decrease", new Object[] { blastDamageDecrease }));
-            }
-        }
-    }
-}

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

@@ -1,142 +1,166 @@
-package com.gmail.nossr50.commands.skills;
+package com.gmail.nossr50.commands.skills;
-
+
-import com.gmail.nossr50.mcMMO;
+import org.bukkit.Material;
-import com.gmail.nossr50.commands.SkillCommand;
+
-import com.gmail.nossr50.config.Config;
+import com.gmail.nossr50.mcMMO;
-import com.gmail.nossr50.datatypes.SkillType;
+import com.gmail.nossr50.datatypes.skills.SkillType;
-import com.gmail.nossr50.locale.LocaleLoader;
+import com.gmail.nossr50.locale.LocaleLoader;
-import com.gmail.nossr50.skills.repair.Repair;
+import com.gmail.nossr50.skills.repair.Repair;
-import com.gmail.nossr50.skills.repair.Repairable;
+import com.gmail.nossr50.skills.repair.Repairable;
-
+import com.gmail.nossr50.util.Permissions;
-public class RepairCommand extends SkillCommand {
+import com.gmail.nossr50.util.player.UserManager;
-    private int arcaneForgingRank;
+
-    private String repairMasteryBonus;
+public class RepairCommand extends SkillCommand {
-    private String superRepairChance;
+    private int arcaneForgingRank;
-
+    private String repairMasteryBonus;
-    private boolean canSuperRepair;
+    private String superRepairChance;
-    private boolean canMasterRepair;
+    private String superRepairChanceLucky;
-    private boolean canArcaneForge;
+
-    private boolean canRepairStone;
+    private boolean canSuperRepair;
-    private boolean canRepairIron;
+    private boolean canMasterRepair;
-    private boolean canRepairGold;
+    private boolean canArcaneForge;
-    private boolean canRepairDiamond;
+    private boolean canSalvage;
-    private boolean canRepairString;
+    private boolean canRepairStone;
-    private boolean canRepairLeather;
+    private boolean canRepairIron;
-    private boolean canRepairWood;
+    private boolean canRepairGold;
-
+    private boolean canRepairDiamond;
-    private int diamondLevel;
+    private boolean canRepairString;
-    private int goldLevel;
+    private boolean canRepairLeather;
-    private int ironLevel;
+    private boolean canRepairWood;
-    private int stoneLevel;
+    private boolean arcaneBypass;
-
+
-    public RepairCommand() {
+    private int diamondLevel;
-        super(SkillType.REPAIR);
+    private int goldLevel;
-    }
+    private int ironLevel;
-
+    private int stoneLevel;
-    @Override
+
-    protected void dataCalculations() {
+    public RepairCommand() {
-        // We're using pickaxes here, not the best but it works
+        super(SkillType.REPAIR);
-        Repairable diamondRepairable = mcMMO.repairManager.getRepairable(278);
+    }
-        Repairable goldRepairable = mcMMO.repairManager.getRepairable(285);
+
-        Repairable ironRepairable = mcMMO.repairManager.getRepairable(257);
+    @Override
-        Repairable stoneRepairable = mcMMO.repairManager.getRepairable(274);
+    protected void dataCalculations() {
-
+        // We're using pickaxes here, not the best but it works
-        diamondLevel = (diamondRepairable == null) ? 0 : diamondRepairable.getMinimumLevel();
+        Repairable diamondRepairable = mcMMO.repairableManager.getRepairable(Material.DIAMOND_PICKAXE.getId());
-        goldLevel = (goldRepairable == null) ? 0 : goldRepairable.getMinimumLevel();
+        Repairable goldRepairable = mcMMO.repairableManager.getRepairable(Material.GOLD_PICKAXE.getId());
-        ironLevel = (ironRepairable == null) ? 0 : ironRepairable.getMinimumLevel();
+        Repairable ironRepairable = mcMMO.repairableManager.getRepairable(Material.IRON_PICKAXE.getId());
-        stoneLevel = (stoneRepairable == null) ? 0 : stoneRepairable.getMinimumLevel();
+        Repairable stoneRepairable = mcMMO.repairableManager.getRepairable(Material.STONE_PICKAXE.getId());
-
+
-        repairMasteryBonus = percent.format(skillValue / 500);
+        // TODO: This isn't really accurate - if they don't have pickaxes loaded it doesn't always mean the repair level is 0
-
+        diamondLevel = (diamondRepairable == null) ? 0 : diamondRepairable.getMinimumLevel();
-        if (skillValue >= 1000) {
+        goldLevel = (goldRepairable == null) ? 0 : goldRepairable.getMinimumLevel();
-            superRepairChance = "100.00%";
+        ironLevel = (ironRepairable == null) ? 0 : ironRepairable.getMinimumLevel();
-        }
+        stoneLevel = (stoneRepairable == null) ? 0 : stoneRepairable.getMinimumLevel();
-        else {
+
-            superRepairChance = percent.format(skillValue / 1000);
+        // REPAIR MASTERY
-        }
+        if (skillValue >= Repair.repairMasteryMaxBonusLevel) {
-
+            repairMasteryBonus = percent.format(Repair.repairMasteryMaxBonus / 100D);
-        arcaneForgingRank = Repair.getArcaneForgingRank(profile);
+        }
-    }
+        else {
-
+            repairMasteryBonus = percent.format(((Repair.repairMasteryMaxBonus / Repair.repairMasteryMaxBonusLevel) * skillValue) / 100D);
-    @Override
+        }
-    protected void permissionsCheck() {
+
-        canSuperRepair = permInstance.repairBonus(player);
+        // SUPER REPAIR
-        canMasterRepair = permInstance.repairMastery(player);
+        String[] superRepairStrings = calculateAbilityDisplayValues(Repair.superRepairMaxBonusLevel, Repair.superRepairMaxChance);
-        canArcaneForge = permInstance.arcaneForging(player);
+        superRepairChance = superRepairStrings[0];
-        canRepairDiamond = permInstance.diamondRepair(player);
+        superRepairChanceLucky = superRepairStrings[1];
-        canRepairGold = permInstance.goldRepair(player);
+
-        canRepairIron = permInstance.ironRepair(player);
+        // ARCANE FORGING
-        canRepairStone = permInstance.stoneRepair(player);
+        arcaneForgingRank = UserManager.getPlayer(player).getRepairManager().getArcaneForgingRank();
-        canRepairString = permInstance.stringRepair(player);
+    }
-        canRepairLeather = permInstance.leatherRepair(player);
+
-        canRepairWood = permInstance.woodRepair(player);
+    @Override
-    }
+    protected void permissionsCheck() {
-
+        canSuperRepair = Permissions.superRepair(player);
-    @Override
+        canMasterRepair = Permissions.repairMastery(player);
-    protected boolean effectsHeaderPermissions() {
+        canArcaneForge = Permissions.arcaneForging(player);
-        return canArcaneForge || canRepairDiamond || canRepairGold || canRepairIron || canMasterRepair || canRepairStone || canSuperRepair || canRepairString || canRepairWood || canRepairLeather;
+        canSalvage = Permissions.salvage(player);
-    }
+        canRepairDiamond = Permissions.repairDiamond(player);
-
+        canRepairGold = Permissions.repairGold(player);
-    @Override
+        canRepairIron = Permissions.repairIron(player);
-    protected void effectsDisplay() {
+        canRepairStone = Permissions.repairStone(player);
-        player.sendMessage(LocaleLoader.getString("Effects.Template", new Object[] { LocaleLoader.getString("Repair.Effect.0"), LocaleLoader.getString("Repair.Effect.1") }));
+        canRepairString = Permissions.repairString(player);
-
+        canRepairLeather = Permissions.repairLeather(player);
-        if (canMasterRepair) {
+        canRepairWood = Permissions.repairWood(player);
-            player.sendMessage(LocaleLoader.getString("Effects.Template", new Object[] { LocaleLoader.getString("Repair.Effect.2"), LocaleLoader.getString("Repair.Effect.3") }));
+        arcaneBypass = Permissions.arcaneBypass(player);
-        }
+    }
-
+
-        if (canSuperRepair) {
+    @Override
-            player.sendMessage(LocaleLoader.getString("Effects.Template", new Object[] { LocaleLoader.getString("Repair.Effect.4"), LocaleLoader.getString("Repair.Effect.5") }));
+    protected boolean effectsHeaderPermissions() {
-        }
+        return canArcaneForge || canSalvage || canRepairDiamond || canRepairGold || canRepairIron || canMasterRepair || canRepairStone || canSuperRepair || canRepairString || canRepairWood || canRepairLeather;
-
+    }
-        /* Repair Level Requirements */
+
-
+    @Override
-        if (canRepairStone && stoneLevel > 0) {
+    protected void effectsDisplay() {
-            player.sendMessage(LocaleLoader.getString("Effects.Template", new Object[] { LocaleLoader.getString("Repair.Effect.14", new Object[] { stoneLevel }), LocaleLoader.getString("Repair.Effect.15") }));
+        luckyEffectsDisplay();
-        }
+
-
+        player.sendMessage(LocaleLoader.getString("Effects.Template", LocaleLoader.getString("Repair.Effect.0"), LocaleLoader.getString("Repair.Effect.1")));
-        if (canRepairIron && ironLevel > 0) {
+
-            player.sendMessage(LocaleLoader.getString("Effects.Template", new Object[] { LocaleLoader.getString("Repair.Effect.12", new Object[] { ironLevel }), LocaleLoader.getString("Repair.Effect.13") }));
+        if (canMasterRepair) {
-        }
+            player.sendMessage(LocaleLoader.getString("Effects.Template", LocaleLoader.getString("Repair.Effect.2"), LocaleLoader.getString("Repair.Effect.3")));
-
+        }
-        if (canRepairGold && goldLevel > 0) {
+
-            player.sendMessage(LocaleLoader.getString("Effects.Template", new Object[] { LocaleLoader.getString("Repair.Effect.10", new Object[] { goldLevel }), LocaleLoader.getString("Repair.Effect.11") }));
+        if (canSuperRepair) {
-        }
+            player.sendMessage(LocaleLoader.getString("Effects.Template", LocaleLoader.getString("Repair.Effect.4"), LocaleLoader.getString("Repair.Effect.5")));
-
+        }
-        if (canRepairDiamond && diamondLevel > 0) {
+
-            player.sendMessage(LocaleLoader.getString("Effects.Template", new Object[] { LocaleLoader.getString("Repair.Effect.6", new Object[] { diamondLevel }), LocaleLoader.getString("Repair.Effect.7") }));
+        /* Repair Level Requirements */
-        }
+
-
+        if (canRepairStone && stoneLevel > 0) {
-        if (canArcaneForge) {
+            player.sendMessage(LocaleLoader.getString("Effects.Template", LocaleLoader.getString("Repair.Effect.14", stoneLevel), LocaleLoader.getString("Repair.Effect.15")));
-            player.sendMessage(LocaleLoader.getString("Effects.Template", new Object[] { LocaleLoader.getString("Repair.Effect.8"), LocaleLoader.getString("Repair.Effect.9") }));
+        }
-        }
+
-    }
+        if (canRepairIron && ironLevel > 0) {
-
+            player.sendMessage(LocaleLoader.getString("Effects.Template", LocaleLoader.getString("Repair.Effect.12", ironLevel), LocaleLoader.getString("Repair.Effect.13")));
-    @Override
+        }
-    protected boolean statsHeaderPermissions() {
+
-        return canArcaneForge || canMasterRepair || canSuperRepair;
+        if (canRepairGold && goldLevel > 0) {
-    }
+            player.sendMessage(LocaleLoader.getString("Effects.Template", LocaleLoader.getString("Repair.Effect.10", goldLevel), LocaleLoader.getString("Repair.Effect.11")));
-
+        }
-    @Override
+
-    protected void statsDisplay() {
+        if (canRepairDiamond && diamondLevel > 0) {
-        if (canMasterRepair) {
+            player.sendMessage(LocaleLoader.getString("Effects.Template", LocaleLoader.getString("Repair.Effect.6", diamondLevel), LocaleLoader.getString("Repair.Effect.7")));
-            player.sendMessage(LocaleLoader.getString("Repair.Skills.Mastery", new Object[] { repairMasteryBonus }));
+        }
-        }
+
-
+        if (canSalvage && Repair.salvageUnlockLevel > 0) {
-        if (canSuperRepair) {
+            player.sendMessage(LocaleLoader.getString("Effects.Template", LocaleLoader.getString("Repair.Effect.16", Repair.salvageUnlockLevel), LocaleLoader.getString("Repair.Effect.17")));
-            player.sendMessage(LocaleLoader.getString("Repair.Skills.Super.Chance", new Object[] { superRepairChance }));
+        }
-        }
+
-
+        if (canArcaneForge) {
-        if (canArcaneForge) {
+            player.sendMessage(LocaleLoader.getString("Effects.Template", LocaleLoader.getString("Repair.Effect.8"), LocaleLoader.getString("Repair.Effect.9")));
-            player.sendMessage(LocaleLoader.getString("Repair.Arcane.Rank", new Object[] { arcaneForgingRank }));
+        }
-
+    }
-            if (Config.getInstance().getArcaneForgingEnchantLossEnabled()) {
+
-                player.sendMessage(LocaleLoader.getString("Repair.Arcane.Chance.Success", new Object[] { Repair.getEnchantChance(arcaneForgingRank) }));
+    @Override
-            }
+    protected boolean statsHeaderPermissions() {
-
+        return canArcaneForge || canMasterRepair || canSuperRepair;
-            if (Config.getInstance().getArcaneForgingDowngradeEnabled()) {
+    }
-                player.sendMessage(LocaleLoader.getString("Repair.Arcane.Chance.Downgrade", new Object[] { Repair.getDowngradeChance(arcaneForgingRank) }));
+
-            }
+    @Override
-        }
+    protected void statsDisplay() {
-    }
+        if (canMasterRepair) {
-}
+            player.sendMessage(LocaleLoader.getString("Repair.Skills.Mastery", repairMasteryBonus));
+        }
+
+        if (canSuperRepair) {
+            if (isLucky) {
+                player.sendMessage(LocaleLoader.getString("Repair.Skills.Super.Chance", superRepairChance) + LocaleLoader.getString("Perks.lucky.bonus", superRepairChanceLucky));
+            }
+            else {
+                player.sendMessage(LocaleLoader.getString("Repair.Skills.Super.Chance", superRepairChance));
+            }
+        }
+
+        if (canArcaneForge) {
+            player.sendMessage(LocaleLoader.getString("Repair.Arcane.Rank", arcaneForgingRank));
+
+            if (Repair.arcaneForgingEnchantLoss) {
+                player.sendMessage(LocaleLoader.getString("Repair.Arcane.Chance.Success", (arcaneBypass ? 100 : UserManager.getPlayer(player).getRepairManager().getKeepEnchantChance())));
+            }
+
+            if (Repair.arcaneForgingDowngrades) {
+                player.sendMessage(LocaleLoader.getString("Repair.Arcane.Chance.Downgrade", (arcaneBypass ? 0 : UserManager.getPlayer(player).getRepairManager().getDowngradeEnchantChance())));
+            }
+        }
+    }
+}

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

@@ -0,0 +1,172 @@
+package com.gmail.nossr50.commands.skills;
+
+import java.text.DecimalFormat;
+import java.util.Set;
+
+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.AdvancedConfig;
+import com.gmail.nossr50.datatypes.player.PlayerProfile;
+import com.gmail.nossr50.datatypes.skills.SkillType;
+import com.gmail.nossr50.locale.LocaleLoader;
+import com.gmail.nossr50.skills.child.FamilyTree;
+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.skills.PerksUtils;
+import com.gmail.nossr50.util.skills.SkillUtils;
+
+public abstract class SkillCommand implements CommandExecutor {
+    protected SkillType skill;
+    private String skillString;
+
+    protected Player player;
+    protected PlayerProfile profile;
+    protected float skillValue;
+    protected boolean isLucky;
+    protected boolean hasEndurance;
+
+    protected DecimalFormat percent = new DecimalFormat("##0.00%");
+    protected DecimalFormat decimal = new DecimalFormat("##0.00");
+
+    public SkillCommand(SkillType skill) {
+        this.skill = skill;
+        this.skillString = StringUtils.getCapitalized(skill.toString());
+    }
+
+    @Override
+    public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
+        if (CommandUtils.noConsoleUsage(sender)) {
+            return true;
+        }
+
+        player = (Player) sender;
+        profile = UserManager.getPlayer(player).getProfile();
+
+        if (profile == null) {
+            sender.sendMessage(LocaleLoader.getString("Commands.DoesNotExist"));
+            return true;
+        }
+
+        skillValue = profile.getSkillLevel(skill);
+        isLucky = Permissions.lucky(sender, skill);
+        hasEndurance = (Permissions.twelveSecondActivationBoost(sender) || Permissions.eightSecondActivationBoost(sender) || Permissions.fourSecondActivationBoost(sender));
+
+        dataCalculations();
+        permissionsCheck();
+
+        if (!skill.isChildSkill()) {
+            player.sendMessage(LocaleLoader.getString("Skills.Header", SkillUtils.getSkillName(skill)));
+            player.sendMessage(LocaleLoader.getString("Commands.XPGain", LocaleLoader.getString("Commands.XPGain." + skillString)));
+            player.sendMessage(LocaleLoader.getString("Effects.Level", profile.getSkillLevel(skill), profile.getSkillXpLevel(skill), profile.getXpToLevel(skill)));
+        }
+        else {
+            player.sendMessage(LocaleLoader.getString("Skills.Header", SkillUtils.getSkillName(skill) + " " + LocaleLoader.getString("Skills.Child")));
+            player.sendMessage(LocaleLoader.getString("Commands.XPGain", LocaleLoader.getString("Commands.XPGain.Child")));
+            player.sendMessage(LocaleLoader.getString("Effects.Child", profile.getSkillLevel(skill)));
+
+            player.sendMessage(LocaleLoader.getString("Skills.Header", LocaleLoader.getString("Skills.Parents")));
+            Set<SkillType> parents = FamilyTree.getParents(skill);
+
+            for (SkillType parent : parents) {
+                player.sendMessage(SkillUtils.getSkillName(parent) + " - " + LocaleLoader.getString("Effects.Level", profile.getSkillLevel(parent), profile.getSkillXpLevel(parent), profile.getXpToLevel(parent)));
+            }
+        }
+
+        if (effectsHeaderPermissions()) {
+            player.sendMessage(LocaleLoader.getString("Skills.Header", LocaleLoader.getString("Effects.Effects")));
+        }
+
+        effectsDisplay();
+
+        if (statsHeaderPermissions()) {
+            player.sendMessage(LocaleLoader.getString("Skills.Header", LocaleLoader.getString("Commands.Stats.Self")));
+        }
+
+        statsDisplay();
+
+        return SkillGuideCommand.grabGuidePageForSkill(skill, player, args);
+    }
+
+    protected String calculateRank(int maxLevel, int rankChangeLevel) {
+        if (skillValue >= maxLevel) {
+            return String.valueOf(maxLevel / rankChangeLevel);
+        }
+
+        return String.valueOf((int) (skillValue / rankChangeLevel));
+    }
+
+    protected String[] calculateAbilityDisplayValues(double chance) {
+        if (isLucky) {
+            double luckyChance = chance * 1.3333D;
+
+            if (luckyChance >= 100D) {
+                return new String[] { percent.format(chance / 100.0D), percent.format(1.0D) };
+            }
+
+            return new String[] { percent.format(chance / 100.0D), percent.format(luckyChance / 100.0D) };
+        }
+
+        return new String[] { percent.format(chance / 100.0D), null };
+    }
+
+    protected String[] calculateAbilityDisplayValues(int maxBonusLevel, double maxChance) {
+        double abilityChance;
+
+        if (skillValue >= maxBonusLevel) {
+            abilityChance = maxChance;
+        }
+        else {
+            abilityChance = (maxChance / maxBonusLevel) * skillValue;
+        }
+
+        if (isLucky) {
+            double luckyChance = abilityChance * 1.3333D;
+
+            if (luckyChance >= 100D) {
+                return new String[] { percent.format(abilityChance / 100.0D), percent.format(1.0D) };
+            }
+
+            return new String[] { percent.format(abilityChance / 100.0D), percent.format(luckyChance / 100.0D) };
+        }
+
+        return new String[] { percent.format(abilityChance / 100.0D), null };
+    }
+
+    protected String[] calculateLengthDisplayValues() {
+        int maxLength = skill.getAbility().getMaxTicks();
+        int length = 2 + (int) (skillValue / AdvancedConfig.getInstance().getAbilityLength());
+        int enduranceLength = PerksUtils.handleActivationPerks(player, length, maxLength);
+
+        if (maxLength != 0) {
+            if (length > maxLength) {
+                length = maxLength;
+            }
+        }
+
+        return new String[] { String.valueOf(length), String.valueOf(enduranceLength) };
+    }
+
+    protected void luckyEffectsDisplay() {
+        if (isLucky) {
+            String perkPrefix = LocaleLoader.getString("MOTD.PerksPrefix");
+            player.sendMessage(perkPrefix + LocaleLoader.getString("Effects.Template", LocaleLoader.getString("Perks.lucky.name"), LocaleLoader.getString("Perks.lucky.desc", SkillUtils.getSkillName(skill))));
+        }
+    }
+
+    protected abstract void dataCalculations();
+
+    protected abstract void permissionsCheck();
+
+    protected abstract boolean effectsHeaderPermissions();
+
+    protected abstract void effectsDisplay();
+
+    protected abstract boolean statsHeaderPermissions();
+
+    protected abstract void statsDisplay();
+}

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

@@ -0,0 +1,107 @@
+package com.gmail.nossr50.commands.skills;
+
+import java.util.ArrayList;
+
+import org.bukkit.entity.Player;
+
+import com.gmail.nossr50.datatypes.skills.SkillType;
+import com.gmail.nossr50.locale.LocaleLoader;
+import com.gmail.nossr50.util.StringUtils;
+import com.gmail.nossr50.util.skills.SkillUtils;
+
+public final class SkillGuideCommand {
+    private SkillGuideCommand() {}
+
+    public static int getTotalPageNumber(String address) {
+        String[] addressSplit = LocaleLoader.getString(address).split("\n");
+
+        if (addressSplit.length <= 8) {
+            return 1;
+        }
+
+        return (addressSplit.length / 8) + 1;
+    }
+
+    public static ArrayList<String> grabPageContents(String header, String address, int pagenum) {
+        int pageIndexStart = 0;
+
+        // Determine what string to start at
+        if (pagenum > 1) {
+            pageIndexStart = 8 * (pagenum - 1);
+        }
+
+        ArrayList<String> allStrings = new ArrayList<String>();
+        String split[] = LocaleLoader.getString(address).split("\n");
+
+        allStrings.add(LocaleLoader.getString("Guides.Header", header));
+
+        // Add targeted strings
+        while (allStrings.size() < 9) {
+            if (pageIndexStart + allStrings.size() > split.length) {
+                allStrings.add("");
+            }
+            else {
+                allStrings.add(split[pageIndexStart + allStrings.size() - 1]);
+            }
+        }
+
+        allStrings.add("Page " + pagenum + " of " + getTotalPageNumber(address));
+        return allStrings;
+    }
+
+    public static void clearChat(Player player) {
+        player.sendMessage("\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n"); // Dear god why?
+    }
+
+    public static boolean grabGuidePageForSkill(SkillType skilltype, Player player, String[] args) {
+        String skillName = skilltype.toString();
+        String capitalized = StringUtils.getCapitalized(skillName);
+        String localized = SkillUtils.getSkillName(skilltype);
+        player.sendMessage(LocaleLoader.getString("Guides.Available", localized, localized.toLowerCase()));
+
+        String address = "Guides." + capitalized;
+
+        switch (args.length) {
+            case 0:
+                // We have to specify this, otherwise we get the usage string every time we call /skillname...
+                return true;
+
+            case 1:
+                if (!args[0].equals("?")) {
+                    return false;
+                }
+
+                SkillGuideCommand.clearChat(player);
+
+                for (String target : SkillGuideCommand.grabPageContents(localized, address, 1)) {
+                    player.sendMessage(target);
+                }
+
+                return true;
+
+            case 2:
+                int totalPages = SkillGuideCommand.getTotalPageNumber(address);
+
+                if (!StringUtils.isInt(args[1])) {
+                    player.sendMessage(LocaleLoader.getString("Guides.Page.Invalid"));
+                    return true;
+                }
+
+                if (Integer.parseInt(args[1]) > totalPages) {
+                    player.sendMessage(LocaleLoader.getString("Guides.Page.OutOfRange", totalPages));
+                    return true;
+                }
+
+                SkillGuideCommand.clearChat(player);
+
+                for (String target : SkillGuideCommand.grabPageContents(localized, address, Integer.parseInt(args[1]))) {
+                    player.sendMessage(target);
+                }
+
+                return true;
+
+            default:
+                return false;
+        }
+    }
+}

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

@@ -0,0 +1,122 @@
+package com.gmail.nossr50.commands.skills;
+
+import com.gmail.nossr50.config.AdvancedConfig;
+import com.gmail.nossr50.datatypes.skills.SkillType;
+import com.gmail.nossr50.locale.LocaleLoader;
+import com.gmail.nossr50.skills.smelting.Smelting;
+import com.gmail.nossr50.util.Permissions;
+import com.gmail.nossr50.util.player.UserManager;
+
+public class SmeltingCommand extends SkillCommand {
+    private String burnTimeModifier;
+    private String secondSmeltChance;
+    private String secondSmeltChanceLucky;
+    private String fluxMiningChance;
+    private String fluxMiningChanceLucky;
+
+    private int vanillaXPModifier;
+
+    private boolean canFuelEfficiency;
+    private boolean canSecondSmelt;
+    private boolean canFluxMine;
+    private boolean canVanillaXPBoost;
+
+    public SmeltingCommand() {
+        super(SkillType.SMELTING);
+    }
+
+    @Override
+    protected void dataCalculations() {
+        // FUEL EFFICIENCY
+        burnTimeModifier = decimal.format(1 + ((skillValue / Smelting.burnModifierMaxLevel) * Smelting.burnTimeMultiplier));
+
+        // SECOND SMELT
+        String[] secondSmeltStrings = calculateAbilityDisplayValues(Smelting.secondSmeltMaxLevel, Smelting.secondSmeltMaxChance);
+        secondSmeltChance = secondSmeltStrings[0];
+        secondSmeltChanceLucky = secondSmeltStrings[1];
+
+        // FLUX MINING
+        String[] fluxMiningStrings = calculateAbilityDisplayValues(Smelting.fluxMiningChance);
+        fluxMiningChance = fluxMiningStrings[0];
+        fluxMiningChanceLucky = fluxMiningStrings[1];
+
+        // VANILLA XP BOOST
+        vanillaXPModifier = UserManager.getPlayer(player).getSmeltingManager().getVanillaXpMultiplier();
+    }
+
+    @Override
+    protected void permissionsCheck() {
+        canFuelEfficiency = Permissions.fuelEfficiency(player);
+        canSecondSmelt = Permissions.doubleDrops(player, skill);
+        canFluxMine = Permissions.fluxMining(player);
+        canVanillaXPBoost = Permissions.vanillaXpBoost(player, skill);
+    }
+
+    @Override
+    protected boolean effectsHeaderPermissions() {
+        return canFluxMine || canFuelEfficiency || canSecondSmelt || canVanillaXPBoost;
+    }
+
+    @Override
+    protected void effectsDisplay() {
+        luckyEffectsDisplay();
+
+        if (canFuelEfficiency) {
+            player.sendMessage(LocaleLoader.getString("Effects.Template", LocaleLoader.getString("Smelting.Effect.0"), LocaleLoader.getString("Smelting.Effect.1")));
+        }
+
+        if (canSecondSmelt) {
+            player.sendMessage(LocaleLoader.getString("Effects.Template", LocaleLoader.getString("Smelting.Effect.2"), LocaleLoader.getString("Smelting.Effect.3")));
+        }
+
+        if (canVanillaXPBoost) {
+            player.sendMessage(LocaleLoader.getString("Effects.Template", LocaleLoader.getString("Smelting.Effect.4"), LocaleLoader.getString("Smelting.Effect.5")));
+        }
+
+        if (canFluxMine) {
+            player.sendMessage(LocaleLoader.getString("Effects.Template", LocaleLoader.getString("Smelting.Effect.6"), LocaleLoader.getString("Smelting.Effect.7")));
+        }
+    }
+
+    @Override
+    protected boolean statsHeaderPermissions() {
+        return canFluxMine || canFuelEfficiency || canSecondSmelt || canVanillaXPBoost;
+    }
+
+    @Override
+    protected void statsDisplay() {
+        if (canFuelEfficiency) {
+            player.sendMessage(LocaleLoader.getString("Smelting.Ability.FuelEfficiency", burnTimeModifier));
+        }
+
+        if (canSecondSmelt) {
+            if (isLucky) {
+                player.sendMessage(LocaleLoader.getString("Smelting.Ability.SecondSmelt", secondSmeltChance) + LocaleLoader.getString("Perks.lucky.bonus", secondSmeltChanceLucky));
+            }
+            else {
+                player.sendMessage(LocaleLoader.getString("Smelting.Ability.SecondSmelt", secondSmeltChance));
+            }
+        }
+
+        if (canVanillaXPBoost) {
+            if (skillValue < AdvancedConfig.getInstance().getSmeltingVanillaXPBoostRank1Level()) {
+                player.sendMessage(LocaleLoader.getString("Ability.Generic.Template.Lock", LocaleLoader.getString("Smelting.Ability.Locked.0", AdvancedConfig.getInstance().getSmeltingVanillaXPBoostRank1Level())));
+            }
+            else {
+                player.sendMessage(LocaleLoader.getString("Smelting.Ability.VanillaXPBoost", vanillaXPModifier));
+            }
+        }
+
+        if (canFluxMine) {
+            if (skillValue < Smelting.fluxMiningUnlockLevel) {
+                player.sendMessage(LocaleLoader.getString("Ability.Generic.Template.Lock", LocaleLoader.getString("Smelting.Ability.Locked.1", Smelting.fluxMiningUnlockLevel)));
+            }
+            else if (isLucky) {
+                player.sendMessage(LocaleLoader.getString("Smelting.Ability.FluxMining", fluxMiningChance) + LocaleLoader.getString("Perks.lucky.bonus", fluxMiningChanceLucky));
+            }
+            else {
+                player.sendMessage(LocaleLoader.getString("Smelting.Ability.FluxMining", fluxMiningChance));
+            }
+        }
+    }
+}

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

@@ -1,91 +1,117 @@
-package com.gmail.nossr50.commands.skills;
+package com.gmail.nossr50.commands.skills;
-
+
-import com.gmail.nossr50.commands.SkillCommand;
+import com.gmail.nossr50.datatypes.skills.SkillType;
-import com.gmail.nossr50.datatypes.SkillType;
+import com.gmail.nossr50.locale.LocaleLoader;
-import com.gmail.nossr50.locale.LocaleLoader;
+import com.gmail.nossr50.skills.swords.Swords;
-
+import com.gmail.nossr50.util.Permissions;
-public class SwordsCommand extends SkillCommand {
+
-    private String counterAttackChance;
+public class SwordsCommand extends SkillCommand {
-    private String bleedLength;
+    private String counterAttackChance;
-    private String bleedChance;
+    private String counterAttackChanceLucky;
-    private String serratedStrikesLength;
+    private String bleedLength;
-
+    private String bleedChance;
-    private boolean canCounter;
+    private String bleedChanceLucky;
-    private boolean canSerratedStrike;
+    private String serratedStrikesLength;
-    private boolean canBleed;
+    private String serratedStrikesLengthEndurance;
-
+
-    public SwordsCommand() {
+    private boolean canCounter;
-        super(SkillType.SWORDS);
+    private boolean canSerratedStrike;
-    }
+    private boolean canBleed;
-
+
-    @Override
+    public SwordsCommand() {
-    protected void dataCalculations() {
+        super(SkillType.SWORDS);
-        serratedStrikesLength = String.valueOf(2 + ((int) skillValue / 50));
+    }
-
+
-        if (skillValue >= 750) {
+    @Override
-            bleedLength = "3";
+    protected void dataCalculations() {
-            bleedChance = "75.00%";
+        // SERRATED STRIKES
-            counterAttackChance = "30.00%";
+        String[] serratedStrikesStrings = calculateLengthDisplayValues();
-        }
+        serratedStrikesLength = serratedStrikesStrings[0];
-        else if (skillValue >= 600) {
+        serratedStrikesLengthEndurance = serratedStrikesStrings[1];
-            bleedLength = "2";
+
-            bleedChance = percent.format(skillValue / 1000);
+        // BLEED
-            counterAttackChance = "30.00%";
+        if (skillValue >= Swords.bleedMaxBonusLevel) {
-        }
+            bleedLength = String.valueOf(Swords.bleedMaxTicks);
-        else {
+        }
-            bleedLength = "2";
+        else {
-            bleedChance = percent.format(skillValue / 1000);
+            bleedLength = String.valueOf(Swords.bleedBaseTicks);
-            counterAttackChance = percent.format(skillValue / 2000);
+        }
-        }
+
-    }
+        String[] bleedStrings = calculateAbilityDisplayValues(Swords.bleedMaxBonusLevel, Swords.bleedMaxChance);
-
+        bleedChance = bleedStrings[0];
-    @Override
+        bleedChanceLucky = bleedStrings[1];
-    protected void permissionsCheck() {
+
-        canBleed = permInstance.swordsBleed(player);
+        // COUNTER ATTACK
-        canCounter = permInstance.counterAttack(player);
+        String[] counterAttackStrings = calculateAbilityDisplayValues(Swords.counterAttackMaxBonusLevel, Swords.counterAttackMaxChance);
-        canSerratedStrike = permInstance.serratedStrikes(player);
+        counterAttackChance = counterAttackStrings[0];
-    }
+        counterAttackChanceLucky = counterAttackStrings[1];
-
+    }
-    @Override
+
-    protected boolean effectsHeaderPermissions() {
+    @Override
-        return canBleed || canCounter || canSerratedStrike;
+    protected void permissionsCheck() {
-    }
+        canBleed = Permissions.bleed(player);
-
+        canCounter = Permissions.counterAttack(player);
-    @Override
+        canSerratedStrike = Permissions.serratedStrikes(player);
-    protected void effectsDisplay() {
+    }
-        if (canCounter) {
+
-            player.sendMessage(LocaleLoader.getString("Effects.Template", new Object[] { LocaleLoader.getString("Swords.Effect.0"), LocaleLoader.getString("Swords.Effect.1") }));
+    @Override
-        }
+    protected boolean effectsHeaderPermissions() {
-
+        return canBleed || canCounter || canSerratedStrike;
-        if (canSerratedStrike) {
+    }
-            player.sendMessage(LocaleLoader.getString("Effects.Template", new Object[] { LocaleLoader.getString("Swords.Effect.2"), LocaleLoader.getString("Swords.Effect.3") }));
+
-            player.sendMessage(LocaleLoader.getString("Effects.Template", new Object[] { LocaleLoader.getString("Swords.Effect.4"), LocaleLoader.getString("Swords.Effect.5") }));
+    @Override
-        }
+    protected void effectsDisplay() {
-
+        luckyEffectsDisplay();
-        if (canBleed) {
+
-            player.sendMessage(LocaleLoader.getString("Effects.Template", new Object[] { LocaleLoader.getString("Swords.Effect.6"), LocaleLoader.getString("Swords.Effect.7") }));
+        if (canCounter) {
-        }
+            player.sendMessage(LocaleLoader.getString("Effects.Template", LocaleLoader.getString("Swords.Effect.0"), LocaleLoader.getString("Swords.Effect.1", percent.format(1.0D / Swords.counterAttackModifier))));
-    }
+        }
-
+
-    @Override
+        if (canSerratedStrike) {
-    protected boolean statsHeaderPermissions() {
+            player.sendMessage(LocaleLoader.getString("Effects.Template", LocaleLoader.getString("Swords.Effect.2"), LocaleLoader.getString("Swords.Effect.3", percent.format(1.0D / Swords.serratedStrikesModifier))));
-        return canBleed || canCounter || canSerratedStrike;
+            player.sendMessage(LocaleLoader.getString("Effects.Template", LocaleLoader.getString("Swords.Effect.4"), LocaleLoader.getString("Swords.Effect.5", Swords.serratedStrikesBleedTicks)));
-    }
+        }
-
+
-    @Override
+        if (canBleed) {
-    protected void statsDisplay() {
+            player.sendMessage(LocaleLoader.getString("Effects.Template", LocaleLoader.getString("Swords.Effect.6"), LocaleLoader.getString("Swords.Effect.7")));
-        if (canCounter) {
+        }
-            player.sendMessage(LocaleLoader.getString("Swords.Combat.Counter.Chance", new Object[] { counterAttackChance }));
+    }
-        }
+
-
+    @Override
-        if (canBleed) {
+    protected boolean statsHeaderPermissions() {
-            player.sendMessage(LocaleLoader.getString("Swords.Combat.Bleed.Length", new Object[] { bleedLength }));
+        return canBleed || canCounter || canSerratedStrike;
-            player.sendMessage(LocaleLoader.getString("Swords.Combat.Bleed.Note"));
+    }
-            player.sendMessage(LocaleLoader.getString("Swords.Combat.Bleed.Chance", new Object[] { bleedChance }));
+
-        }
+    @Override
-
+    protected void statsDisplay() {
-        if (canSerratedStrike) {
+        if (canCounter) {
-            player.sendMessage(LocaleLoader.getString("Swords.SS.Length", new Object[] { serratedStrikesLength }));
+            if (isLucky) {
-        }
+                player.sendMessage(LocaleLoader.getString("Swords.Combat.Counter.Chance", counterAttackChance) + LocaleLoader.getString("Perks.lucky.bonus", counterAttackChanceLucky));
-    }
+            }
-}
+            else {
+                player.sendMessage(LocaleLoader.getString("Swords.Combat.Counter.Chance", counterAttackChance));
+            }
+        }
+
+        if (canBleed) {
+            player.sendMessage(LocaleLoader.getString("Swords.Combat.Bleed.Length", bleedLength));
+            player.sendMessage(LocaleLoader.getString("Swords.Combat.Bleed.Note"));
+
+            if (isLucky) {
+                player.sendMessage(LocaleLoader.getString("Swords.Combat.Bleed.Chance", bleedChance) + LocaleLoader.getString("Perks.lucky.bonus", bleedChanceLucky));
+            }
+            else {
+                player.sendMessage(LocaleLoader.getString("Swords.Combat.Bleed.Chance", bleedChance));
+            }
+        }
+
+        if (canSerratedStrike) {
+            if (hasEndurance) {
+                player.sendMessage(LocaleLoader.getString("Swords.SS.Length", serratedStrikesLength) + LocaleLoader.getString("Perks.activationtime.bonus", serratedStrikesLengthEndurance));
+            }
+            else {
+                player.sendMessage(LocaleLoader.getString("Swords.SS.Length", serratedStrikesLength));
+            }
+        }
+    }
+}

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

@@ -1,145 +1,165 @@
-package com.gmail.nossr50.commands.skills;
+package com.gmail.nossr50.commands.skills;
-
+
-import com.gmail.nossr50.commands.SkillCommand;
+import com.gmail.nossr50.config.Config;
-import com.gmail.nossr50.config.Config;
+import com.gmail.nossr50.datatypes.skills.SkillType;
-import com.gmail.nossr50.datatypes.SkillType;
+import com.gmail.nossr50.locale.LocaleLoader;
-import com.gmail.nossr50.locale.LocaleLoader;
+import com.gmail.nossr50.skills.taming.Taming;
-
+import com.gmail.nossr50.util.Permissions;
-public class TamingCommand extends SkillCommand {
+
-    private String goreChance;
+public class TamingCommand extends SkillCommand {
-
+    private String goreChance;
-    private boolean canBeastLore;
+    private String goreChanceLucky;
-    private boolean canGore;
+
-    private boolean canSharpenedClaws;
+    private boolean canBeastLore;
-    private boolean canEnvironmentallyAware;
+    private boolean canGore;
-    private boolean canThickFur;
+    private boolean canSharpenedClaws;
-    private boolean canShockProof;
+    private boolean canEnvironmentallyAware;
-    private boolean canCallWild;
+    private boolean canThickFur;
-    private boolean canFastFood;
+    private boolean canShockProof;
-
+    private boolean canCallWild;
-    public TamingCommand() {
+    private boolean canFastFood;
-        super(SkillType.TAMING);
+    private boolean canHolyHound;
-    }
+
-
+    public TamingCommand() {
-    @Override
+        super(SkillType.TAMING);
-    protected void dataCalculations() {
+    }
-        if (skillValue >= 1000) {
+
-            goreChance = "100.00%";
+    @Override
-        }
+    protected void dataCalculations() {
-        else {
+        String[] goreStrings = calculateAbilityDisplayValues(Taming.goreMaxBonusLevel, Taming.goreMaxChance);
-            goreChance = percent.format(skillValue / 1000);
+        goreChance = goreStrings[0];
-        }    }
+        goreChanceLucky = goreStrings[1];
-
+    }
-    @Override
+
-    protected void permissionsCheck() {
+    @Override
-        canBeastLore = permInstance.beastLore(player);
+    protected void permissionsCheck() {
-        canCallWild = permInstance.callOfTheWild(player);
+        canBeastLore = Permissions.beastLore(player);
-        canEnvironmentallyAware = permInstance.environmentallyAware(player);
+        canCallWild = Permissions.callOfTheWild(player);
-        canFastFood = permInstance.fastFoodService(player);
+        canEnvironmentallyAware = Permissions.environmentallyAware(player);
-        canGore = permInstance.gore(player);
+        canFastFood = Permissions.fastFoodService(player);
-        canSharpenedClaws = permInstance.sharpenedClaws(player);
+        canGore = Permissions.gore(player);
-        canShockProof = permInstance.shockProof(player);
+        canSharpenedClaws = Permissions.sharpenedClaws(player);
-        canThickFur = permInstance.thickFur(player);
+        canShockProof = Permissions.shockProof(player);
-    }
+        canThickFur = Permissions.thickFur(player);
-
+        canHolyHound = Permissions.holyHound(player);
-    @Override
+    }
-    protected boolean effectsHeaderPermissions() {
+
-        return canBeastLore || canCallWild || canEnvironmentallyAware || canFastFood || canGore || canSharpenedClaws || canShockProof || canThickFur;
+    @Override
-    }
+    protected boolean effectsHeaderPermissions() {
-
+        return canBeastLore || canCallWild || canEnvironmentallyAware || canFastFood || canGore || canSharpenedClaws || canShockProof || canThickFur || canHolyHound;
-    @Override
+    }
-    protected void effectsDisplay() {
+
-        Config configInstance = Config.getInstance();
+    @Override
-
+    protected void effectsDisplay() {
-        if (canBeastLore) {
+        luckyEffectsDisplay();
-            player.sendMessage(LocaleLoader.getString("Effects.Template", new Object[] { LocaleLoader.getString("Taming.Effect.0"), LocaleLoader.getString("Taming.Effect.1") }));
+
-        }
+        if (canBeastLore) {
-
+            player.sendMessage(LocaleLoader.getString("Effects.Template", LocaleLoader.getString("Taming.Effect.0"), LocaleLoader.getString("Taming.Effect.1")));
-        if (canGore) {
+        }
-            player.sendMessage(LocaleLoader.getString("Effects.Template", new Object[] { LocaleLoader.getString("Taming.Effect.2"), LocaleLoader.getString("Taming.Effect.3") }));
+
-        }
+        if (canGore) {
-
+            player.sendMessage(LocaleLoader.getString("Effects.Template", LocaleLoader.getString("Taming.Effect.2"), LocaleLoader.getString("Taming.Effect.3")));
-        if (canSharpenedClaws) {
+        }
-            player.sendMessage(LocaleLoader.getString("Effects.Template", new Object[] { LocaleLoader.getString("Taming.Effect.4"), LocaleLoader.getString("Taming.Effect.5") }));
+
-        }
+        if (canSharpenedClaws) {
-
+            player.sendMessage(LocaleLoader.getString("Effects.Template", LocaleLoader.getString("Taming.Effect.4"), LocaleLoader.getString("Taming.Effect.5")));
-        if (canEnvironmentallyAware) {
+        }
-            player.sendMessage(LocaleLoader.getString("Effects.Template", new Object[] { LocaleLoader.getString("Taming.Effect.6"), LocaleLoader.getString("Taming.Effect.7") }));
+
-        }
+        if (canEnvironmentallyAware) {
-
+            player.sendMessage(LocaleLoader.getString("Effects.Template", LocaleLoader.getString("Taming.Effect.6"), LocaleLoader.getString("Taming.Effect.7")));
-        if (canThickFur) {
+        }
-            player.sendMessage(LocaleLoader.getString("Effects.Template", new Object[] { LocaleLoader.getString("Taming.Effect.8"), LocaleLoader.getString("Taming.Effect.9") }));
+
-        }
+        if (canThickFur) {
-
+            player.sendMessage(LocaleLoader.getString("Effects.Template", LocaleLoader.getString("Taming.Effect.8"), LocaleLoader.getString("Taming.Effect.9")));
-        if (canShockProof) {
+        }
-            player.sendMessage(LocaleLoader.getString("Effects.Template", new Object[] { LocaleLoader.getString("Taming.Effect.10"), LocaleLoader.getString("Taming.Effect.11") }));
+
-        }
+        if (canShockProof) {
-
+            player.sendMessage(LocaleLoader.getString("Effects.Template", LocaleLoader.getString("Taming.Effect.10"), LocaleLoader.getString("Taming.Effect.11")));
-        if (canFastFood) {
+        }
-            player.sendMessage(LocaleLoader.getString("Effects.Template", new Object[] { LocaleLoader.getString("Taming.Effect.16"), LocaleLoader.getString("Taming.Effect.17") }));
+
-        }
+        if (canFastFood) {
-
+            player.sendMessage(LocaleLoader.getString("Effects.Template", LocaleLoader.getString("Taming.Effect.16"), LocaleLoader.getString("Taming.Effect.17")));
-        if (canCallWild) {
+        }
-            player.sendMessage(LocaleLoader.getString("Effects.Template", new Object[] { LocaleLoader.getString("Taming.Effect.12"), LocaleLoader.getString("Taming.Effect.13") }));
+
-            player.sendMessage(LocaleLoader.getString("Taming.Effect.14", new Object[] { configInstance.getTamingCOTWOcelotCost() }));
+        if (canHolyHound) {
-            player.sendMessage(LocaleLoader.getString("Taming.Effect.15", new Object[] { configInstance.getTamingCOTWWolfCost() }));
+            player.sendMessage(LocaleLoader.getString("Effects.Template", LocaleLoader.getString("Taming.Effect.18"), LocaleLoader.getString("Taming.Effect.19")));
-        }
+        }
-    }
+
-
+        if (canCallWild) {
-    @Override
+            player.sendMessage(LocaleLoader.getString("Effects.Template", LocaleLoader.getString("Taming.Effect.12"), LocaleLoader.getString("Taming.Effect.13")));
-    protected boolean statsHeaderPermissions() {
+            player.sendMessage(LocaleLoader.getString("Taming.Effect.14", Config.getInstance().getTamingCOTWOcelotCost()));
-        return canEnvironmentallyAware || canFastFood || canGore || canSharpenedClaws || canShockProof || canThickFur;
+            player.sendMessage(LocaleLoader.getString("Taming.Effect.15", Config.getInstance().getTamingCOTWWolfCost()));
-    }
+        }
-
+    }
-    @Override
+
-    protected void statsDisplay() {
+    @Override
-        if (canFastFood) {
+    protected boolean statsHeaderPermissions() {
-            if (skillValue < 50) {
+        return canEnvironmentallyAware || canFastFood || canGore || canSharpenedClaws || canShockProof || canThickFur || canHolyHound;
-                player.sendMessage(LocaleLoader.getString("Ability.Generic.Template.Lock", new Object[] { LocaleLoader.getString("Taming.Ability.Locked.4") }));
+    }
-            }
+
-            else {
+    @Override
-                player.sendMessage(LocaleLoader.getString("Ability.Generic.Template", new Object[] { LocaleLoader.getString("Taming.Ability.Bonus.8"), LocaleLoader.getString("Taming.Ability.Bonus.9") }));
+    protected void statsDisplay() {
-            }
+        if (canFastFood) {
-        }
+            if (skillValue < Taming.fastFoodServiceUnlockLevel) {
-
+                player.sendMessage(LocaleLoader.getString("Ability.Generic.Template.Lock", LocaleLoader.getString("Taming.Ability.Locked.4", Taming.fastFoodServiceUnlockLevel)));
-        if (canEnvironmentallyAware) {
+            }
-            if (skillValue < 100) {
+            else {
-                player.sendMessage(LocaleLoader.getString("Ability.Generic.Template.Lock", new Object[] { LocaleLoader.getString("Taming.Ability.Locked.0") }));
+                player.sendMessage(LocaleLoader.getString("Ability.Generic.Template", LocaleLoader.getString("Taming.Ability.Bonus.8"), LocaleLoader.getString("Taming.Ability.Bonus.9", percent.format(Taming.fastFoodServiceActivationChance / 100D))));
-            }
+            }
-            else {
+        }
-                player.sendMessage(LocaleLoader.getString("Ability.Generic.Template", new Object[] { LocaleLoader.getString("Taming.Ability.Bonus.0"), LocaleLoader.getString("Taming.Ability.Bonus.1") }));
+
-            }
+        if (canEnvironmentallyAware) {
-        }
+            if (skillValue < Taming.environmentallyAwareUnlockLevel) {
-
+                player.sendMessage(LocaleLoader.getString("Ability.Generic.Template.Lock", LocaleLoader.getString("Taming.Ability.Locked.0", Taming.environmentallyAwareUnlockLevel)));
-        if (canThickFur) {
+            }
-            if (skillValue < 250) {
+            else {
-                player.sendMessage(LocaleLoader.getString("Ability.Generic.Template.Lock", new Object[] { LocaleLoader.getString("Taming.Ability.Locked.1") }));
+                player.sendMessage(LocaleLoader.getString("Ability.Generic.Template", LocaleLoader.getString("Taming.Ability.Bonus.0"), LocaleLoader.getString("Taming.Ability.Bonus.1")));
-            }
+            }
-            else {
+        }
-                player.sendMessage(LocaleLoader.getString("Ability.Generic.Template", new Object[] { LocaleLoader.getString("Taming.Ability.Bonus.2"), LocaleLoader.getString("Taming.Ability.Bonus.3") }));
+
-            }
+        if (canThickFur) {
-        }
+            if (skillValue < Taming.thickFurUnlockLevel) {
-
+                player.sendMessage(LocaleLoader.getString("Ability.Generic.Template.Lock", LocaleLoader.getString("Taming.Ability.Locked.1", Taming.thickFurUnlockLevel)));
-        if (canShockProof) {
+            }
-            if (skillValue < 500) {
+            else {
-                player.sendMessage(LocaleLoader.getString("Ability.Generic.Template.Lock", new Object[] { LocaleLoader.getString("Taming.Ability.Locked.2") }));
+                player.sendMessage(LocaleLoader.getString("Ability.Generic.Template", LocaleLoader.getString("Taming.Ability.Bonus.2"), LocaleLoader.getString("Taming.Ability.Bonus.3", Taming.thickFurModifier)));
-            }
+            }
-            else {
+        }
-                player.sendMessage(LocaleLoader.getString("Ability.Generic.Template", new Object[] { LocaleLoader.getString("Taming.Ability.Bonus.4"), LocaleLoader.getString("Taming.Ability.Bonus.5") }));
+
-            }
+        if (canHolyHound) {
-        }
+            if (skillValue < Taming.holyHoundUnlockLevel) {
-
+                player.sendMessage(LocaleLoader.getString("Ability.Generic.Template.Lock", LocaleLoader.getString("Taming.Ability.Locked.5", Taming.holyHoundUnlockLevel)));
-        if (canSharpenedClaws) {
+            }
-            if (skillValue < 750) {
+            else {
-                player.sendMessage(LocaleLoader.getString("Ability.Generic.Template.Lock", new Object[] { LocaleLoader.getString("Taming.Ability.Locked.3") }));
+                player.sendMessage(LocaleLoader.getString("Ability.Generic.Template", LocaleLoader.getString("Taming.Ability.Bonus.10"), LocaleLoader.getString("Taming.Ability.Bonus.11")));
-            }
+            }
-            else {
+        }
-                player.sendMessage(LocaleLoader.getString("Ability.Generic.Template", new Object[] { LocaleLoader.getString("Taming.Ability.Bonus.6"), LocaleLoader.getString("Taming.Ability.Bonus.7") }));
+
-            }
+        if (canShockProof) {
-        }
+            if (skillValue < Taming.shockProofUnlockLevel) {
-
+                player.sendMessage(LocaleLoader.getString("Ability.Generic.Template.Lock", LocaleLoader.getString("Taming.Ability.Locked.2", Taming.shockProofUnlockLevel)));
-        if (canGore) {
+            }
-            player.sendMessage(LocaleLoader.getString("Taming.Combat.Chance.Gore", new Object[] { goreChance }));
+            else {
-        }
+                player.sendMessage(LocaleLoader.getString("Ability.Generic.Template", LocaleLoader.getString("Taming.Ability.Bonus.4"), LocaleLoader.getString("Taming.Ability.Bonus.5", Taming.shockProofModifier)));
-    }
+            }
-}
+        }
+
+        if (canSharpenedClaws) {
+            if (skillValue < Taming.sharpenedClawsUnlockLevel) {
+                player.sendMessage(LocaleLoader.getString("Ability.Generic.Template.Lock", LocaleLoader.getString("Taming.Ability.Locked.3", Taming.sharpenedClawsUnlockLevel)));
+            }
+            else {
+                player.sendMessage(LocaleLoader.getString("Ability.Generic.Template", LocaleLoader.getString("Taming.Ability.Bonus.6"), LocaleLoader.getString("Taming.Ability.Bonus.7", Taming.sharpenedClawsBonusDamage)));
+            }
+        }
+
+        if (canGore) {
+            if (isLucky) {
+                player.sendMessage(LocaleLoader.getString("Taming.Combat.Chance.Gore", goreChance) + LocaleLoader.getString("Perks.lucky.bonus", goreChanceLucky));
+            }
+            else {
+                player.sendMessage(LocaleLoader.getString("Taming.Combat.Chance.Gore", goreChance));
+            }
+        }
+    }
+}

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

@@ -1,97 +1,146 @@
-package com.gmail.nossr50.commands.skills;
+package com.gmail.nossr50.commands.skills;
-
+
-import com.gmail.nossr50.commands.SkillCommand;
+import com.gmail.nossr50.datatypes.skills.SkillType;
-import com.gmail.nossr50.datatypes.SkillType;
+import com.gmail.nossr50.locale.LocaleLoader;
-import com.gmail.nossr50.locale.LocaleLoader;
+import com.gmail.nossr50.skills.unarmed.Unarmed;
-
+import com.gmail.nossr50.util.Permissions;
-public class UnarmedCommand extends SkillCommand {
+
-    private String berserkLength;
+public class UnarmedCommand extends SkillCommand {
-    private String deflectChance;
+    private String berserkLength;
-    private String disarmChance;
+    private String berserkLengthEndurance;
-    private String ironArmBonus;
+    private String deflectChance;
-
+    private String deflectChanceLucky;
-    private boolean canBerserk;
+    private String disarmChance;
-    private boolean canDisarm;
+    private String disarmChanceLucky;
-    private boolean canBonusDamage;
+    private String ironGripChance;
-    private boolean canDeflect;
+    private String ironGripChanceLucky;
-
+    private String ironArmBonus;
-    public UnarmedCommand() {
+
-        super(SkillType.UNARMED);
+    private boolean canBerserk;
-    }
+    private boolean canDisarm;
-
+    private boolean canBonusDamage;
-    @Override
+    private boolean canDeflect;
-    protected void dataCalculations() {
+    private boolean canIronGrip;
-        berserkLength = String.valueOf(2 + ((int) skillValue / 50));
+
-
+    public UnarmedCommand() {
-        if (skillValue >= 1000) {
+        super(SkillType.UNARMED);
-            disarmChance = "33.33%";
+    }
-            deflectChance = "50.00%";
+
-            ironArmBonus = "8";
+    @Override
-        }
+    protected void dataCalculations() {
-        else if (skillValue >= 250) {
+        // BERSERK
-            disarmChance = percent.format(skillValue / 3000);
+        String[] berserkStrings = calculateLengthDisplayValues();
-            deflectChance = percent.format(skillValue / 2000);
+        berserkLength = berserkStrings[0];
-            ironArmBonus = "8";
+        berserkLengthEndurance = berserkStrings[1];
-        }
+
-        else {
+        // DISARM
-            disarmChance = percent.format(skillValue / 3000);
+        String[] disarmStrings = calculateAbilityDisplayValues(Unarmed.disarmMaxBonusLevel, Unarmed.disarmMaxChance);
-            deflectChance = percent.format(skillValue / 2000);
+        disarmChance = disarmStrings[0];
-            ironArmBonus = String.valueOf(3 + ((int) skillValue / 50));
+        disarmChanceLucky = disarmStrings[1];
-        }    }
+
-
+        // DEFLECT
-    @Override
+        String[] deflectStrings = calculateAbilityDisplayValues(Unarmed.deflectMaxBonusLevel, Unarmed.deflectMaxChance);
-    protected void permissionsCheck() {
+        deflectChance = deflectStrings[0];
-        canBerserk = permInstance.berserk(player);
+        deflectChanceLucky = deflectStrings[1];
-        canBonusDamage = permInstance.unarmedBonus(player);
+
-        canDeflect = permInstance.deflect(player);
+        // IRON ARM
-        canDisarm = permInstance.disarm(player);
+        if (skillValue >= ((Unarmed.ironArmMaxBonusDamage - 3) * Unarmed.ironArmIncreaseLevel)) {
-    }
+            ironArmBonus = String.valueOf(Unarmed.ironArmMaxBonusDamage);
-
+        }
-    @Override
+        else {
-    protected boolean effectsHeaderPermissions() {
+            ironArmBonus = String.valueOf(3 + (skillValue / Unarmed.ironArmIncreaseLevel));
-        return canBerserk || canBonusDamage || canDeflect || canDisarm;
+        }
-    }
+
-
+        // IRON GRIP
-    @Override
+        String[] ironGripStrings = calculateAbilityDisplayValues(Unarmed.ironGripMaxBonusLevel, Unarmed.ironGripMaxChance);
-    protected void effectsDisplay() {
+        ironGripChance = ironGripStrings[0];
-        if (canBerserk) {
+        ironGripChanceLucky = ironGripStrings[1];
-            player.sendMessage(LocaleLoader.getString("Effects.Template", new Object[] { LocaleLoader.getString("Unarmed.Effect.0"), LocaleLoader.getString("Unarmed.Effect.1") }));
+    }
-        }
+
-
+    @Override
-        if (canDisarm) {
+    protected void permissionsCheck() {
-            player.sendMessage(LocaleLoader.getString("Effects.Template", new Object[] { LocaleLoader.getString("Unarmed.Effect.2"), LocaleLoader.getString("Unarmed.Effect.3") }));
+        canBerserk = Permissions.berserk(player);
-        }
+        canBonusDamage = Permissions.bonusDamage(player, skill);
-
+        canDeflect = Permissions.arrowDeflect(player);
-        if (canBonusDamage) {
+        canDisarm = Permissions.disarm(player);
-            player.sendMessage(LocaleLoader.getString("Effects.Template", new Object[] { LocaleLoader.getString("Unarmed.Effect.4"), LocaleLoader.getString("Unarmed.Effect.5") }));
+        canIronGrip = Permissions.ironGrip(player);
-        }
+    }
-
+
-        if (canDeflect) {
+    @Override
-            player.sendMessage(LocaleLoader.getString("Effects.Template", new Object[] { LocaleLoader.getString("Unarmed.Effect.6"), LocaleLoader.getString("Unarmed.Effect.7") }));
+    protected boolean effectsHeaderPermissions() {
-        }
+        return canBerserk || canBonusDamage || canDeflect || canDisarm || canIronGrip;
-    }
+    }
-
+
-    @Override
+    @Override
-    protected boolean statsHeaderPermissions() {
+    protected void effectsDisplay() {
-        return canBerserk || canBonusDamage || canDeflect || canDisarm;
+        luckyEffectsDisplay();
-    }
+
-
+        if (canBerserk) {
-    @Override
+            player.sendMessage(LocaleLoader.getString("Effects.Template", LocaleLoader.getString("Unarmed.Effect.0"), LocaleLoader.getString("Unarmed.Effect.1")));
-    protected void statsDisplay() {
+        }
-        if (canBonusDamage) {
+
-            player.sendMessage(LocaleLoader.getString("Ability.Generic.Template", new Object[] { LocaleLoader.getString("Unarmed.Ability.Bonus.0"), LocaleLoader.getString("Unarmed.Ability.Bonus.1", new Object[] {ironArmBonus}) }));
+        if (canDisarm) {
-        }
+            player.sendMessage(LocaleLoader.getString("Effects.Template", LocaleLoader.getString("Unarmed.Effect.2"), LocaleLoader.getString("Unarmed.Effect.3")));
-
+        }
-        if (canDeflect) {
+
-            player.sendMessage(LocaleLoader.getString("Unarmed.Ability.Chance.ArrowDeflect", new Object[] { deflectChance }));
+        if (canBonusDamage) {
-        }
+            player.sendMessage(LocaleLoader.getString("Effects.Template", LocaleLoader.getString("Unarmed.Effect.4"), LocaleLoader.getString("Unarmed.Effect.5")));
-
+        }
-        if (canDisarm) {
+
-            player.sendMessage(LocaleLoader.getString("Unarmed.Ability.Chance.Disarm", new Object[] { disarmChance }));
+        if (canDeflect) {
-        }
+            player.sendMessage(LocaleLoader.getString("Effects.Template", LocaleLoader.getString("Unarmed.Effect.6"), LocaleLoader.getString("Unarmed.Effect.7")));
-
+        }
-        if (canBerserk) {
+
-            player.sendMessage(LocaleLoader.getString("Unarmed.Ability.Berserk.Length", new Object[] { berserkLength }));
+        if (canIronGrip) {
-        }
+            player.sendMessage(LocaleLoader.getString("Effects.Template", LocaleLoader.getString("Unarmed.Effect.8"), LocaleLoader.getString("Unarmed.Effect.9")));
-    }
+        }
-}
+    }
+
+    @Override
+    protected boolean statsHeaderPermissions() {
+        return canBerserk || canBonusDamage || canDeflect || canDisarm || canIronGrip;
+    }
+
+    @Override
+    protected void statsDisplay() {
+        if (canBonusDamage) {
+            player.sendMessage(LocaleLoader.getString("Ability.Generic.Template", LocaleLoader.getString("Unarmed.Ability.Bonus.0"), LocaleLoader.getString("Unarmed.Ability.Bonus.1", ironArmBonus)));
+        }
+
+        if (canDeflect) {
+            if (isLucky) {
+                player.sendMessage(LocaleLoader.getString("Unarmed.Ability.Chance.ArrowDeflect", deflectChance) + LocaleLoader.getString("Perks.lucky.bonus", deflectChanceLucky));
+            }
+            else {
+                player.sendMessage(LocaleLoader.getString("Unarmed.Ability.Chance.ArrowDeflect", deflectChance));
+            }
+        }
+
+        if (canDisarm) {
+            if (isLucky) {
+                player.sendMessage(LocaleLoader.getString("Unarmed.Ability.Chance.Disarm", disarmChance) + LocaleLoader.getString("Perks.lucky.bonus", disarmChanceLucky));
+            }
+            else {
+                player.sendMessage(LocaleLoader.getString("Unarmed.Ability.Chance.Disarm", disarmChance));
+            }
+        }
+
+        if (canIronGrip) {
+            if (isLucky) {
+                player.sendMessage(LocaleLoader.getString("Unarmed.Ability.Chance.IronGrip", ironGripChance) + LocaleLoader.getString("Perks.lucky.bonus", ironGripChanceLucky));
+            }
+            else {
+                player.sendMessage(LocaleLoader.getString("Unarmed.Ability.Chance.IronGrip", ironGripChance));
+            }
+        }
+
+        if (canBerserk) {
+            if (hasEndurance) {
+                player.sendMessage(LocaleLoader.getString("Unarmed.Ability.Berserk.Length", berserkLength) + LocaleLoader.getString("Perks.activationtime.bonus", berserkLengthEndurance));
+            }
+            else {
+                player.sendMessage(LocaleLoader.getString("Unarmed.Ability.Berserk.Length", berserkLength));
+            }
+        }
+    }
+}

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

@@ -1,88 +1,103 @@
-package com.gmail.nossr50.commands.skills;
+package com.gmail.nossr50.commands.skills;
-
+
-import com.gmail.nossr50.commands.SkillCommand;
+import com.gmail.nossr50.config.AdvancedConfig;
-import com.gmail.nossr50.config.Config;
+import com.gmail.nossr50.datatypes.skills.SkillType;
-import com.gmail.nossr50.datatypes.SkillType;
+import com.gmail.nossr50.locale.LocaleLoader;
-import com.gmail.nossr50.locale.LocaleLoader;
+import com.gmail.nossr50.skills.woodcutting.Woodcutting;
-
+import com.gmail.nossr50.util.Permissions;
-public class WoodcuttingCommand extends SkillCommand {
+
-    private String treeFellerLength;
+public class WoodcuttingCommand extends SkillCommand {
-    private String doubleDropChance;
+    private String treeFellerLength;
-
+    private String treeFellerLengthEndurance;
-    private boolean canTreeFell;
+    private String doubleDropChance;
-    private boolean canLeafBlow;
+    private String doubleDropChanceLucky;
-    private boolean canDoubleDrop;
+
-    private boolean doubleDropsDisabled;
+    private boolean canTreeFell;
-
+    private boolean canLeafBlow;
-    public WoodcuttingCommand() {
+    private boolean canDoubleDrop;
-        super(SkillType.WOODCUTTING);
+    private boolean doubleDropsDisabled;
-    }
+
-
+    public WoodcuttingCommand() {
-    @Override
+        super(SkillType.WOODCUTTING);
-    protected void dataCalculations() {
+    }
-        treeFellerLength = String.valueOf(2 + ((int) skillValue / 50));
+
-
+    @Override
-        if (skillValue >= 1000) {
+    protected void dataCalculations() {
-            doubleDropChance = "100.00%";
+        // TREE FELLER
-        }
+        String[] treeFellerStrings = calculateLengthDisplayValues();
-        else {
+        treeFellerLength = treeFellerStrings[0];
-            doubleDropChance = percent.format(skillValue / 1000);
+        treeFellerLengthEndurance = treeFellerStrings[1];
-        }
+
-    }
+        // DOUBLE DROPS
-
+        String[] doubleDropStrings = calculateAbilityDisplayValues(Woodcutting.doubleDropsMaxLevel, Woodcutting.doubleDropsMaxChance);
-    @Override
+        doubleDropChance = doubleDropStrings[0];
-    protected void permissionsCheck() {
+        doubleDropChanceLucky = doubleDropStrings[1];
-        Config configInstance = Config.getInstance();
+    }
-
+
-        canTreeFell = permInstance.treeFeller(player);
+    @Override
-        canDoubleDrop = permInstance.woodcuttingDoubleDrops(player);
+    protected void permissionsCheck() {
-        canLeafBlow = permInstance.leafBlower(player);
+        canTreeFell = Permissions.treeFeller(player);
-        doubleDropsDisabled = configInstance.woodcuttingDoubleDropsDisabled();
+        canDoubleDrop = Permissions.doubleDrops(player, skill);
-    }
+        canLeafBlow = Permissions.leafBlower(player);
-
+        doubleDropsDisabled = skill.getDoubleDropsDisabled();
-    @Override
+    }
-    protected boolean effectsHeaderPermissions() {
+
-        return (canDoubleDrop && !doubleDropsDisabled) || canLeafBlow || canTreeFell;
+    @Override
-    }
+    protected boolean effectsHeaderPermissions() {
-
+        return (canDoubleDrop && !doubleDropsDisabled) || canLeafBlow || canTreeFell;
-    @Override
+    }
-    protected void effectsDisplay() {
+
-        if (canTreeFell) {
+    @Override
-            player.sendMessage(LocaleLoader.getString("Effects.Template", new Object[] { LocaleLoader.getString("Woodcutting.Effect.0"), LocaleLoader.getString("Woodcutting.Effect.1") }));
+    protected void effectsDisplay() {
-        }
+        luckyEffectsDisplay();
-
+
-        if (canLeafBlow) {
+        if (canTreeFell) {
-            player.sendMessage(LocaleLoader.getString("Effects.Template", new Object[] { LocaleLoader.getString("Woodcutting.Effect.2"), LocaleLoader.getString("Woodcutting.Effect.3") }));
+            player.sendMessage(LocaleLoader.getString("Effects.Template", LocaleLoader.getString("Woodcutting.Effect.0"), LocaleLoader.getString("Woodcutting.Effect.1")));
-        }
+        }
-
+
-        if (canDoubleDrop && !doubleDropsDisabled) {
+        if (canLeafBlow) {
-            player.sendMessage(LocaleLoader.getString("Effects.Template", new Object[] { LocaleLoader.getString("Woodcutting.Effect.4"), LocaleLoader.getString("Woodcutting.Effect.5") }));
+            player.sendMessage(LocaleLoader.getString("Effects.Template", LocaleLoader.getString("Woodcutting.Effect.2"), LocaleLoader.getString("Woodcutting.Effect.3")));
-        }
+        }
-    }
+
-
+        if (canDoubleDrop && !doubleDropsDisabled) {
-    @Override
+            player.sendMessage(LocaleLoader.getString("Effects.Template", LocaleLoader.getString("Woodcutting.Effect.4"), LocaleLoader.getString("Woodcutting.Effect.5")));
-    protected boolean statsHeaderPermissions() {
+        }
-        return (canDoubleDrop && !doubleDropsDisabled) || canLeafBlow || canTreeFell;
+    }
-    }
+
-
+    @Override
-    @Override
+    protected boolean statsHeaderPermissions() {
-    protected void statsDisplay() {
+        return (canDoubleDrop && !doubleDropsDisabled) || canLeafBlow || canTreeFell;
-        //TODO: Remove? Basically duplicates the above.
+    }
-        if (canLeafBlow) {
+
-            if (skillValue < 100) {
+    @Override
-                player.sendMessage(LocaleLoader.getString("Ability.Generic.Template.Lock", new Object[] { LocaleLoader.getString("Woodcutting.Ability.Locked.0") }));
+    protected void statsDisplay() {
-            }
+        if (canLeafBlow) {
-            else {
+            int leafBlowerUnlockLevel = AdvancedConfig.getInstance().getLeafBlowUnlockLevel();
-                player.sendMessage(LocaleLoader.getString("Ability.Generic.Template", new Object[] { LocaleLoader.getString("Woodcutting.Ability.0"), LocaleLoader.getString("Woodcutting.Ability.1") }));
+
-            }
+            if (skillValue < leafBlowerUnlockLevel) {
-        }
+                player.sendMessage(LocaleLoader.getString("Ability.Generic.Template.Lock", LocaleLoader.getString("Woodcutting.Ability.Locked.0", leafBlowerUnlockLevel)));
-
+            }
-        if (canDoubleDrop && !doubleDropsDisabled) {
+            else {
-            player.sendMessage(LocaleLoader.getString("Woodcutting.Ability.Chance.DDrop", new Object[] { doubleDropChance }));
+                player.sendMessage(LocaleLoader.getString("Ability.Generic.Template", LocaleLoader.getString("Woodcutting.Ability.0"), LocaleLoader.getString("Woodcutting.Ability.1")));
-        }
+            }
-
+        }
-        if (canTreeFell) {
+
-            player.sendMessage(LocaleLoader.getString("Woodcutting.Ability.Length", new Object[] { treeFellerLength }));
+        if (canDoubleDrop && !doubleDropsDisabled) {
-        }
+            if (isLucky) {
-    }
+                player.sendMessage(LocaleLoader.getString("Woodcutting.Ability.Chance.DDrop", doubleDropChance) + LocaleLoader.getString("Perks.lucky.bonus", doubleDropChanceLucky));
-}
+            }
+            else {
+                player.sendMessage(LocaleLoader.getString("Woodcutting.Ability.Chance.DDrop", doubleDropChance));
+            }
+        }
+
+        if (canTreeFell) {
+            if (hasEndurance) {
+                player.sendMessage(LocaleLoader.getString("Woodcutting.Ability.Length", treeFellerLength) + LocaleLoader.getString("Perks.activationtime.bonus", treeFellerLengthEndurance));
+            }
+            else {
+                player.sendMessage(LocaleLoader.getString("Woodcutting.Ability.Length", treeFellerLength));
+            }
+        }
+    }
+}

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

@@ -1,62 +1,29 @@
-package com.gmail.nossr50.commands.spout;
+package com.gmail.nossr50.commands.spout;
-
+
-import org.bukkit.ChatColor;
+import org.bukkit.command.Command;
-import org.bukkit.command.Command;
+import org.bukkit.command.CommandSender;
-import org.bukkit.command.CommandExecutor;
+
-import org.bukkit.command.CommandSender;
+import com.gmail.nossr50.datatypes.spout.huds.HudType;
-import org.bukkit.entity.Player;
+import com.gmail.nossr50.locale.LocaleLoader;
-
+
-import com.gmail.nossr50.mcMMO;
+public class MchudCommand extends SpoutCommand {
-import com.gmail.nossr50.commands.CommandHelper;
+    @Override
-import com.gmail.nossr50.config.SpoutConfig;
+    protected boolean noArguments(Command command, CommandSender sender, String[] args) {
-import com.gmail.nossr50.datatypes.HudType;
+        return false;
-import com.gmail.nossr50.datatypes.SpoutHud;
+    }
-import com.gmail.nossr50.datatypes.PlayerProfile;
+
-import com.gmail.nossr50.locale.LocaleLoader;
+    @Override
-import com.gmail.nossr50.util.Users;
+    protected boolean oneArgument(Command command, CommandSender sender, String[] args) {
-
+        for (HudType hudType : HudType.values()) {
-public class MchudCommand implements CommandExecutor {
+            if (hudType.toString().equalsIgnoreCase(args[0])) {
-    @Override
+                playerProfile.setHudType(hudType);
-    public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
+                spoutHud.initializeXpBar();
-        String usage = ChatColor.RED + "Proper usage is /mchud <hud-type>"; //TODO: Locale
+                spoutHud.updateXpBar();
-        String invalid = ChatColor.RED + "That is not a valid HUD type."; //TODO: Locale
+                return true;
-
+            }
-        if (CommandHelper.noConsoleUsage(sender)) {
+        }
-            return true;
+
-        }
+        sender.sendMessage(LocaleLoader.getString("Commands.mchud.Invalid"));
-
+        return true;
-        if (!mcMMO.spoutEnabled || !SpoutConfig.getInstance().getXPBarEnabled()) {
+    }
-            sender.sendMessage(LocaleLoader.getString("Commands.Disabled"));
+}
-            return true;
-        }
-
-        Player player = (Player) sender;
-        PlayerProfile playerProfile = Users.getProfile(player);
-        SpoutHud spoutHud = playerProfile.getSpoutHud();
-
-        if (spoutHud == null) {
-            sender.sendMessage(LocaleLoader.getString("Commands.Disabled"));
-            return true;
-        }
-
-        switch (args.length) {
-        case 1:
-            for (HudType hudType : HudType.values()) {
-                if (hudType.toString().equalsIgnoreCase(args[0])) {
-                    playerProfile.setHudType(hudType);
-                    spoutHud.initializeXpBar();
-                    spoutHud.updateXpBar();
-
-                    return true;
-                }
-            }
-
-            player.sendMessage(invalid);
-            return true;
-
-        default:
-            player.sendMessage(usage);
-            return true;
-        }
-    }
-}

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

@@ -0,0 +1,54 @@
+package com.gmail.nossr50.commands.spout;
+
+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.spout.SpoutConfig;
+import com.gmail.nossr50.datatypes.player.PlayerProfile;
+import com.gmail.nossr50.datatypes.spout.huds.McMMOHud;
+import com.gmail.nossr50.locale.LocaleLoader;
+import com.gmail.nossr50.util.commands.CommandUtils;
+import com.gmail.nossr50.util.player.UserManager;
+
+public abstract class SpoutCommand implements CommandExecutor {
+    protected PlayerProfile playerProfile;
+    protected McMMOHud spoutHud;
+
+    @Override
+    public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
+        if (CommandUtils.noConsoleUsage(sender)) {
+            return true;
+        }
+
+        if (!mcMMO.spoutEnabled || !SpoutConfig.getInstance().getXPBarEnabled()) {
+            sender.sendMessage(LocaleLoader.getString("Commands.Disabled"));
+            return true;
+        }
+
+        playerProfile = UserManager.getPlayer((Player) sender).getProfile();
+        spoutHud = playerProfile.getSpoutHud();
+
+        if (spoutHud == null) {
+            sender.sendMessage(LocaleLoader.getString("Commands.Disabled"));
+            return true;
+        }
+
+        switch (args.length) {
+            case 0:
+                return noArguments(command, sender, args);
+
+            case 1:
+                return oneArgument(command, sender, args);
+
+            default:
+                return false;
+        }
+    }
+
+    protected abstract boolean noArguments(Command command, CommandSender sender, String[] args);
+
+    protected abstract boolean oneArgument(Command command, CommandSender sender, String[] args);
+}

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

@@ -1,90 +1,69 @@
-package com.gmail.nossr50.commands.spout;
+package com.gmail.nossr50.commands.spout;
-
+
-import org.bukkit.ChatColor;
+import org.bukkit.command.Command;
-import org.bukkit.command.Command;
+import org.bukkit.command.CommandSender;
-import org.bukkit.command.CommandExecutor;
+
-import org.bukkit.command.CommandSender;
+import com.gmail.nossr50.datatypes.skills.SkillType;
-import org.bukkit.entity.Player;
+import com.gmail.nossr50.locale.LocaleLoader;
-
+import com.gmail.nossr50.util.Permissions;
-import com.gmail.nossr50.mcMMO;
+import com.gmail.nossr50.util.skills.SkillUtils;
-import com.gmail.nossr50.commands.CommandHelper;
+
-import com.gmail.nossr50.config.Config;
+public class XplockCommand extends SpoutCommand {
-import com.gmail.nossr50.config.SpoutConfig;
+    @Override
-import com.gmail.nossr50.datatypes.PlayerProfile;
+    protected boolean noArguments(Command command, CommandSender sender, String[] args) {
-import com.gmail.nossr50.datatypes.SkillType;
+        if (spoutHud.getXpBarLocked()) {
-import com.gmail.nossr50.datatypes.SpoutHud;
+            unlockXpBar(sender);
-import com.gmail.nossr50.locale.LocaleLoader;
+            return true;
-import com.gmail.nossr50.util.Misc;
+        }
-import com.gmail.nossr50.util.Permissions;
+
-import com.gmail.nossr50.util.Skills;
+        lockXpBar(sender, spoutHud.getLastGained());
-import com.gmail.nossr50.util.Users;
+        return true;
-
+    }
-public class XplockCommand implements CommandExecutor {
+
-    @Override
+    @Override
-    public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
+    protected boolean oneArgument(Command command, CommandSender sender, String[] args) {
-        String usage = ChatColor.RED + "Proper usage is /xplock [skill]";
+        if (args[0].equalsIgnoreCase("on")) {
-
+            lockXpBar(sender, spoutHud.getLastGained());
-        if (CommandHelper.noConsoleUsage(sender)) {
+            return true;
-            return true;
+        }
-        }
+
-
+        if (args[0].equalsIgnoreCase("off")) {
-        if (!mcMMO.spoutEnabled || !SpoutConfig.getInstance().getXPBarEnabled() || !Config.getInstance().getCommandXPLockEnabled()) {
+            unlockXpBar(sender);
-            sender.sendMessage(LocaleLoader.getString("Commands.Disabled"));
+            return true;
-            return true;
+        }
-        }
+
-
+        if (!SkillUtils.isSkill(args[0])) {
-        Player player = (Player) sender;
+            sender.sendMessage(LocaleLoader.getString("Commands.Skill.Invalid"));
-        PlayerProfile playerProfile = Users.getProfile(player);
+            return true;
-        SpoutHud spoutHud = playerProfile.getSpoutHud();
+        }
-
+
-        if (spoutHud == null) {
+        SkillType skill = SkillType.getSkill(args[0]);
-            sender.sendMessage(LocaleLoader.getString("Commands.Disabled"));
+
-            return true;
+        if (skill.isChildSkill()) {
-        }
+            sender.sendMessage("Child skills are not yet supported by this command."); // TODO: Localize this
-
+            return true;
-        switch (args.length) {
+        }
-        case 0:
+
-            if (spoutHud.getXpBarLocked()) {
+        if (!Permissions.xplock(sender, skill)) {
-                spoutHud.toggleXpBarLocked();
+            sender.sendMessage(command.getPermissionMessage());
-                player.sendMessage(LocaleLoader.getString("Commands.xplock.unlocked"));
+            return true;
-                return true;
+        }
-            }
+
-
+        lockXpBar(sender, skill);
-            SkillType lastGained = spoutHud.getLastGained();
+        return true;
-
+    }
-            if (lastGained != null) {
+
-                spoutHud.toggleXpBarLocked();
+    private void lockXpBar(CommandSender sender, SkillType skill) {
-                spoutHud.setSkillLock(lastGained);
+        if (skill != null) {
-                player.sendMessage(LocaleLoader.getString("Commands.xplock.locked", new Object[] { Misc.getCapitalized(lastGained.toString()) }));
+            spoutHud.setXpBarLocked(true);
-            }
+            spoutHud.setSkillLock(skill);
-            else {
+            spoutHud.updateXpBar();
-                player.sendMessage(usage);
+            sender.sendMessage(LocaleLoader.getString("Commands.xplock.locked", SkillUtils.getSkillName(skill)));
-            }
+        }
-
+    }
-            return true;
+
-
+    private void unlockXpBar(CommandSender sender) {
-        case 1:
+        spoutHud.setXpBarLocked(false);
-            if (Skills.isSkill(args[0])) {
+        sender.sendMessage(LocaleLoader.getString("Commands.xplock.unlocked"));
-                if (Permissions.getInstance().permission(player, "mcmmo.skills." + args[0].toLowerCase())) {
+    }
-                    spoutHud.setXpBarLocked(true);
+}
-                    spoutHud.setSkillLock(Skills.getSkillType(args[0]));
-                    spoutHud.updateXpBar();
-
-                    player.sendMessage(LocaleLoader.getString("Commands.xplock.locked", new Object[] { Misc.getCapitalized(args[0]) }));
-                }
-                else {
-                    player.sendMessage(LocaleLoader.getString("mcMMO.NoPermission"));
-                }
-            }
-            else {
-                player.sendMessage(LocaleLoader.getString("Commands.Skill.Invalid"));
-            }
-
-            return true;
-
-        default:
-            player.sendMessage(usage);
-            return true;
-        }
-    }
-}

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

@@ -0,0 +1,281 @@
+package com.gmail.nossr50.config;
+
+public class AdvancedConfig extends AutoUpdateConfigLoader {
+    private static AdvancedConfig instance;
+
+    private AdvancedConfig() {
+        super("advanced.yml");
+    }
+
+    public static AdvancedConfig getInstance() {
+        if (instance == null) {
+            instance = new AdvancedConfig();
+        }
+
+        return instance;
+    }
+
+    @Override
+    protected void loadKeys() {}
+
+    /* GENERAL */
+    public int getAbilityLength() { return config.getInt("Skills.General.Ability_IncreaseLevel", 50); }
+    public int getEnchantBuff() { return config.getInt("Skills.General.Ability_EnchantBuff", 5); }
+
+    /* ACROBATICS */
+    public double getDodgeChanceMax() { return config.getDouble("Skills.Acrobatics.Dodge_ChanceMax", 20.0D); }
+    public int getDodgeMaxBonusLevel() { return config.getInt("Skills.Acrobatics.Dodge_MaxBonusLevel", 800); }
+    public int getDodgeDamageModifier() { return config.getInt("Skills.Acrobatics.Dodge_DamageModifer", 2); }
+
+    public double getRollChanceMax() { return config.getDouble("Skills.Acrobatics.Roll_ChanceMax", 100.0D); }
+    public int getRollMaxBonusLevel() { return config.getInt("Skills.Acrobatics.Roll_MaxBonusLevel", 1000); }
+    public int getRollDamageThreshold() { return config.getInt("Skills.Acrobatics.Roll_DamageThreshold", 7); }
+
+    public double getGracefulRollChanceMax() { return config.getDouble("Skills.Acrobatics.GracefulRoll_ChanceMax", 100.0D); }
+    public int getGracefulRollMaxBonusLevel() { return config.getInt("Skills.Acrobatics.GracefulRoll_MaxBonusLevel", 500); }
+    public int getGracefulRollDamageThreshold() { return config.getInt("Skills.Acrobatics.GracefulRoll_DamageThreshold", 14); }
+    public int getGracefulRollSuccessModifer() { return config.getInt("Skills.Acrobatics.GracefulRoll_SuccessModifier", 2); }
+
+    public int getDodgeXPModifier() { return config.getInt("Skills.Acrobatics.Dodge_XP_Modifier", 120); }
+    public int getRollXPModifier() { return config.getInt("Skills.Acrobatics.Roll_XP_Modifier", 80); }
+    public int getFallXPModifier() { return config.getInt("Skills.Acrobatics.Fall_XP_Modifier", 120); }
+
+    /* ARCHERY */
+    public int getSkillShotIncreaseLevel() { return config.getInt("Skills.Archery.SkillShot_IncreaseLevel", 50); }
+    public double getSkillShotIncreasePercentage() { return config.getDouble("Skills.Archery.SkillShot_IncreasePercentage", 0.1D); }
+    public double getSkillShotBonusMax() { return config.getDouble("Skills.Archery.SkillShot_MaxBonus", 2.0D); }
+
+    public double getDazeBonusMax() { return config.getDouble("Skills.Archery.Daze_MaxChance", 50.0D); }
+    public int getDazeMaxBonusLevel() { return config.getInt("Skills.Archery.Daze_MaxBonusLevel", 1000); }
+    public int getDazeModifier() { return config.getInt("Skills.Archery.Daze_BonusDamage", 4); }
+
+    public double getRetrieveChanceMax() { return config.getDouble("Skills.Archery.Retrieve_MaxBonus", 100.0D); }
+    public int getRetrieveMaxBonusLevel() { return config.getInt("Skills.Archery.Retrieve_MaxBonusLevel", 1000); }
+
+    /* AXES */
+    public int getBonusDamageAxesBonusMax() { return config.getInt("Skills.Axes.DamageIncrease_MaxBonus", 4); }
+    public int getBonusDamageAxesMaxBonusLevel() { return config.getInt("Skills.Axes.DamageIncrease_MaxBonusLevel", 200); }
+
+    public double getAxesCriticalChance() { return config.getDouble("Skills.Axes.AxesCritical_MaxChance", 37.50D); }
+    public int getAxesCriticalMaxBonusLevel() { return config.getInt("Skills.Axes.AxesCritical_MaxBonusLevel", 750); }
+    public double getAxesCriticalPVPModifier() { return config.getDouble("Skills.Axes.AxesCritical_PVP_Modifier", 1.5D); }
+    public double getAxesCriticalPVEModifier() { return config.getDouble("Skills.Axes.AxesCritical_PVE_Modifier", 2.0D); }
+
+    public double getGreaterImpactChance() { return config.getDouble("Skills.Axes.GreaterImpact_Chance", 25.0D); }
+    public double getGreaterImpactModifier() { return config.getDouble("Skills.Axes.GreaterImpact_KnockbackModifier", 1.5); }
+    public int getGreaterImpactBonusDamage() { return config.getInt("Skills.Axes.GreaterImpact_BonusDamage", 2); }
+
+    public int getArmorImpactIncreaseLevel() { return config.getInt("Skills.Axes.ArmorImpact_IncreaseLevel", 50); }
+    public double getImpactChance() { return config.getDouble("Skills.Axes.ArmorImpact_Chance", 25.0D); }
+    public double getArmorImpactMaxDurabilityDamage() { return config.getDouble("Skills.Axes.ArmorImpact_MaxPercentageDurabilityDamage", 20.0D); }
+
+    public int getSkullSplitterModifier() { return config.getInt("Skills.Axes.SkullSplitter_DamagerModifier", 2); }
+
+    /* EXCAVATION */
+    //Nothing to configure, everything is already configurable in config.yml
+
+    /* FISHING */
+    public int getFishingTierLevelsTier1() { return config.getInt("Skills.Fishing.Tier_Levels.Tier1", 0); }
+    public int getFishingTierLevelsTier2() { return config.getInt("Skills.Fishing.Tier_Levels.Tier2", 200); }
+    public int getFishingTierLevelsTier3() { return config.getInt("Skills.Fishing.Tier_Levels.Tier3", 400); }
+    public int getFishingTierLevelsTier4() { return config.getInt("Skills.Fishing.Tier_Levels.Tier4", 600); }
+    public int getFishingTierLevelsTier5() { return config.getInt("Skills.Fishing.Tier_Levels.Tier5", 800); }
+
+    public int getFishingMagicMultiplier() { return config.getInt("Skills.Fishing.MagicHunter_Multiplier", 5); }
+
+    public int getFishermanDietRankChange() { return config.getInt("Skills.Fishing.Fisherman_Diet_RankChange", 200); }
+
+    /* Shake */
+    public int getShakeUnlockLevel() { return config.getInt("Skills.Fishing.Shake_UnlockLevel", 150); }
+    public int getShakeChanceRank1() { return config.getInt("Skills.Fishing.Shake_Chance.Rank_1", 25); }
+    public int getShakeChanceRank2() { return config.getInt("Skills.Fishing.Shake_Chance.Rank_2", 40); }
+    public int getShakeChanceRank3() { return config.getInt("Skills.Fishing.Shake_Chance.Rank_3", 55); }
+    public int getShakeChanceRank4() { return config.getInt("Skills.Fishing.Shake_Chance.Rank_4", 60); }
+    public int getShakeChanceRank5() { return config.getInt("Skills.Fishing.Shake_Chance.Rank_5", 75); }
+
+    /* Vanilla XP Boost */
+    public int getFishingVanillaXPModifierRank1() { return config.getInt("Skills.Fishing.VanillaXPBoost.Rank_1", 1); }
+    public int getFishingVanillaXPModifierRank2() { return config.getInt("Skills.Fishing.VanillaXPBoost.Rank_2", 2); }
+    public int getFishingVanillaXPModifierRank3() { return config.getInt("Skills.Fishing.VanillaXPBoost.Rank_3", 3); }
+    public int getFishingVanillaXPModifierRank4() { return config.getInt("Skills.Fishing.VanillaXPBoost.Rank_4", 4); }
+    public int getFishingVanillaXPModifierRank5() { return config.getInt("Skills.Fishing.VanillaXPBoost.Rank_5", 5); }
+
+    /* HERBALISM */
+    public int getFarmerDietRankChange() { return config.getInt("Skills.Herbalism.Farmer_Diet_RankChange", 200); }
+
+    public int getGreenThumbStageChange() { return config.getInt("Skills.Herbalism.GreenThumb_StageChange", 200); }
+    public double getGreenThumbChanceMax() { return config.getDouble("Skills.Herbalism.GreenThumb_ChanceMax", 100.0D); }
+    public int getGreenThumbMaxLevel() { return config.getInt("Skills.Herbalism.GreenThumb_MaxBonusLevel", 1500); }
+
+    public double getHerbalismDoubleDropsChanceMax() { return config.getDouble("Skills.Herbalism.DoubleDrops_ChanceMax", 100.0D); }
+    public int getHerbalismDoubleDropsMaxLevel() { return config.getInt("Skills.Herbalism.DoubleDrops_MaxBonusLevel", 1000); }
+
+    public double getHylianLuckChanceMax() { return config.getDouble("Skills.Herbalism.HylianLuck_ChanceMax", 10.0D); }
+    public int getHylianLuckMaxLevel() { return config.getInt("Skills.Herbalism.HylianLuck_MaxBonusLevel", 1000); }
+
+    public double getShroomThumbChanceMax() { return config.getDouble("Skills.Herbalism.ShroomThumb_ChanceMax", 50.0D); }
+    public int getShroomThumbMaxLevel() { return config.getInt("Skills.Herbalism.ShroomThumb_MaxBonusLevel", 1500); }
+
+    /* MINING */
+    public double getMiningDoubleDropChance() { return config.getDouble("Skills.Mining.DoubleDrops_ChanceMax", 100.0D); }
+    public int getMiningDoubleDropMaxLevel() { return config.getInt("Skills.Mining.DoubleDrops_MaxBonusLevel", 1000); }
+
+    public int getBlastMiningRank1() { return config.getInt("Skills.Mining.BlastMining_Rank1", 125); }
+    public int getBlastMiningRank2() { return config.getInt("Skills.Mining.BlastMining_Rank2", 250); }
+    public int getBlastMiningRank3() { return config.getInt("Skills.Mining.BlastMining_Rank3", 375); }
+    public int getBlastMiningRank4() { return config.getInt("Skills.Mining.BlastMining_Rank4", 500); }
+    public int getBlastMiningRank5() { return config.getInt("Skills.Mining.BlastMining_Rank5", 625); }
+    public int getBlastMiningRank6() { return config.getInt("Skills.Mining.BlastMining_Rank6", 750); }
+    public int getBlastMiningRank7() { return config.getInt("Skills.Mining.BlastMining_Rank7", 875); }
+    public int getBlastMiningRank8() { return config.getInt("Skills.Mining.BlastMining_Rank8", 1000); }
+
+    public double getBlastDamageDecreaseRank1() { return config.getDouble("Skills.Mining.BlastDamageDecrease_Rank1", 0.0D); }
+    public double getBlastDamageDecreaseRank2() { return config.getDouble("Skills.Mining.BlastDamageDecrease_Rank2", 0.0D); }
+    public double getBlastDamageDecreaseRank3() { return config.getDouble("Skills.Mining.BlastDamageDecrease_Rank3", 0.0D); }
+    public double getBlastDamageDecreaseRank4() { return config.getDouble("Skills.Mining.BlastDamageDecrease_Rank4", 25.0D); }
+    public double getBlastDamageDecreaseRank5() { return config.getDouble("Skills.Mining.BlastDamageDecrease_Rank5", 25.0D); }
+    public double getBlastDamageDecreaseRank6() { return config.getDouble("Skills.Mining.BlastDamageDecrease_Rank6", 50.0D); }
+    public double getBlastDamageDecreaseRank7() { return config.getDouble("Skills.Mining.BlastDamageDecrease_Rank7", 50.0D); }
+    public double getBlastDamageDecreaseRank8() { return config.getDouble("Skills.Mining.BlastDamageDecrease_Rank8", 100.0D); }
+
+    public double getOreBonusRank1() { return config.getDouble("Skills.Mining.OreBonus_Rank1", 35.0D); }
+    public double getOreBonusRank2() { return config.getDouble("Skills.Mining.OreBonus_Rank2", 40.0D); }
+    public double getOreBonusRank3() { return config.getDouble("Skills.Mining.OreBonus_Rank3", 45.0D); }
+    public double getOreBonusRank4() { return config.getDouble("Skills.Mining.OreBonus_Rank4", 50.0D); }
+    public double getOreBonusRank5() { return config.getDouble("Skills.Mining.OreBonus_Rank5", 55.0D); }
+    public double getOreBonusRank6() { return config.getDouble("Skills.Mining.OreBonus_Rank6", 60.0D); }
+    public double getOreBonusRank7() { return config.getDouble("Skills.Mining.OreBonus_Rank7", 65.0D); }
+    public double getOreBonusRank8() { return config.getDouble("Skills.Mining.OreBonus_Rank8", 70.0D); }
+
+    public double getDebrisReductionRank1() { return config.getDouble("Skills.Mining.DebrisReduction_Rank1", 10.0D); }
+    public double getDebrisReductionRank2() { return config.getDouble("Skills.Mining.DebrisReduction_Rank2", 20.0D); }
+    public double getDebrisReductionRank3() { return config.getDouble("Skills.Mining.DebrisReduction_Rank3", 30.0D); }
+    public double getDebrisReductionRank4() { return config.getDouble("Skills.Mining.DebrisReduction_Rank4", 30.0D); }
+    public double getDebrisReductionRank5() { return config.getDouble("Skills.Mining.DebrisReduction_Rank5", 30.0D); }
+    public double getDebrisReductionRank6() { return config.getDouble("Skills.Mining.DebrisReduction_Rank6", 30.0D); }
+    public double getDebrisReductionRank7() { return config.getDouble("Skills.Mining.DebrisReduction_Rank7", 30.0D); }
+    public double getDebrisReductionRank8() { return config.getDouble("Skills.Mining.DebrisReduction_Rank8", 30.0D); }
+
+    public int getDropMultiplierRank1() { return config.getInt("Skills.Mining.DropMultiplier_Rank1", 1); }
+    public int getDropMultiplierRank2() { return config.getInt("Skills.Mining.DropMultiplier_Rank2", 1); }
+    public int getDropMultiplierRank3() { return config.getInt("Skills.Mining.DropMultiplier_Rank3", 1); }
+    public int getDropMultiplierRank4() { return config.getInt("Skills.Mining.DropMultiplier_Rank4", 1); }
+    public int getDropMultiplierRank5() { return config.getInt("Skills.Mining.DropMultiplier_Rank5", 2); }
+    public int getDropMultiplierRank6() { return config.getInt("Skills.Mining.DropMultiplier_Rank6", 2); }
+    public int getDropMultiplierRank7() { return config.getInt("Skills.Mining.DropMultiplier_Rank7", 3); }
+    public int getDropMultiplierRank8() { return config.getInt("Skills.Mining.DropMultiplier_Rank8", 3); }
+
+    public double getBlastRadiusModifierRank1() { return config.getDouble("Skills.Mining.BlastRadiusModifier_Rank1", 1.0); }
+    public double getBlastRadiusModifierRank2() { return config.getDouble("Skills.Mining.BlastRadiusModifier_Rank2", 1.0); }
+    public double getBlastRadiusModifierRank3() { return config.getDouble("Skills.Mining.BlastRadiusModifier_Rank3", 2.0); }
+    public double getBlastRadiusModifierRank4() { return config.getDouble("Skills.Mining.BlastRadiusModifier_Rank4", 2.0); }
+    public double getBlastRadiusModifierRank5() { return config.getDouble("Skills.Mining.BlastRadiusModifier_Rank5", 3.0); }
+    public double getBlastRadiusModifierRank6() { return config.getDouble("Skills.Mining.BlastRadiusModifier_Rank6", 3.0); }
+    public double getBlastRadiusModifierRank7() { return config.getDouble("Skills.Mining.BlastRadiusModifier_Rank7", 4.0); }
+    public double getBlastRadiusModifierRank8() { return config.getDouble("Skills.Mining.BlastRadiusModifier_Rank8", 4.0); }
+
+    /* REPAIR */
+    public double getRepairMasteryMaxBonus() { return config.getDouble("Skills.Repair.RepairMastery_MaxBonusPercentage", 200.0D); }
+    public int getRepairMasteryMaxLevel() { return config.getInt("Skills.Repair.RepairMastery_MaxBonusLevel", 1000); }
+    public double getSuperRepairChanceMax() { return config.getDouble("Skills.Repair.SuperRepair_ChanceMax", 100.0D); }
+    public int getSuperRepairMaxLevel() { return config.getInt("Skills.Repair.SuperRepair_MaxBonusLevel", 1000); }
+    public int getSalvageUnlockLevel() { return config.getInt("Skills.Repair.Salvage_UnlockLevel", 600); }
+
+    /* Arcane Forging */
+    public boolean getArcaneForgingDowngradeEnabled() { return config.getBoolean("Skills.Repair.Arcane_Forging.Downgrades.Enabled", true); }
+    public int getArcaneForgingDowngradeChanceRank1() { return config.getInt("Skills.Repair.Arcane_Forging.Downgrades.Chance.Rank_1", 75); }
+    public int getArcaneForgingDowngradeChanceRank2() { return config.getInt("Skills.Repair.Arcane_Forging.Downgrades.Chance.Rank_2", 50); }
+    public int getArcaneForgingDowngradeChanceRank3() { return config.getInt("Skills.Repair.Arcane_Forging.Downgrades.Chance.Rank_3", 25); }
+    public int getArcaneForgingDowngradeChanceRank4() { return config.getInt("Skills.Repair.Arcane_Forging.Downgrades.Chance.Rank_4", 15); }
+    public boolean getArcaneForgingEnchantLossEnabled() { return config.getBoolean("Skills.Repair.Arcane_Forging.May_Lose_Enchants", true); }
+    public int getArcaneForgingKeepEnchantsChanceRank1() { return config.getInt("Skills.Repair.Arcane_Forging.Keep_Enchants.Chance.Rank_1", 10); }
+    public int getArcaneForgingKeepEnchantsChanceRank2() { return config.getInt("Skills.Repair.Arcane_Forging.Keep_Enchants.Chance.Rank_2", 20); }
+    public int getArcaneForgingKeepEnchantsChanceRank3() { return config.getInt("Skills.Repair.Arcane_Forging.Keep_Enchants.Chance.Rank_3", 30); }
+    public int getArcaneForgingKeepEnchantsChanceRank4() { return config.getInt("Skills.Repair.Arcane_Forging.Keep_Enchants.Chance.Rank_4", 40); }
+    public int getArcaneForgingRankLevels1() { return config.getInt("Skills.Repair.Arcane_Forging.Rank_Levels.Rank_1", 100); }
+    public int getArcaneForgingRankLevels2() { return config.getInt("Skills.Repair.Arcane_Forging.Rank_Levels.Rank_2", 250); }
+    public int getArcaneForgingRankLevels3() { return config.getInt("Skills.Repair.Arcane_Forging.Rank_Levels.Rank_3", 500); }
+    public int getArcaneForgingRankLevels4() { return config.getInt("Skills.Repair.Arcane_Forging.Rank_Levels.Rank_4", 750); }
+
+    /* SMELTING */
+    public int getBurnModifierMaxLevel() { return config.getInt("Skills.Smelting.FuelEfficiency_MaxBonusLevel", 1000); }
+    public double getBurnTimeMultiplier() { return config.getDouble("Skills.Smelting.FuelEfficiency_Multiplier", 3.0D); }
+
+    public int getSecondSmeltMaxLevel() { return config.getInt("Skills.Smelting.SecondSmelt_MaxBonusLevel", 1000); }
+    public double getSecondSmeltMaxChance() { return config.getDouble("Skills.Smelting.SecondSmelt_MaxBonusChance", 100.0D); }
+
+    public int getFluxMiningUnlockLevel() { return config.getInt("Skills.Smelting.FluxMining_UnlockLevel", 250); }
+    public double getFluxMiningChance() { return config.getDouble("Skills.Smelting.FluxMining_Chance", 33.0D); }
+
+    public int getSmeltingVanillaXPBoostRank1Level() { return config.getInt("Skills.Smelting.VanillaXPBoost_Rank1Level", 100); }
+    public int getSmeltingVanillaXPBoostRank2Level() { return config.getInt("Skills.Smelting.VanillaXPBoost_Rank2Level", 300); }
+    public int getSmeltingVanillaXPBoostRank3Level() { return config.getInt("Skills.Smelting.VanillaXPBoost_Rank3Level", 500); }
+    public int getSmeltingVanillaXPBoostRank4Level() { return config.getInt("Skills.Smelting.VanillaXPBoost_Rank4Level", 700); }
+    public int getSmeltingVanillaXPBoostRank5Level() { return config.getInt("Skills.Smelting.VanillaXPBoost_Rank5Level", 900); }
+
+    public int getSmeltingVanillaXPBoostRank1Multiplier() { return config.getInt("Skills.Smelting.VanillaXPBoost_Rank1Multiplier", 2); }
+    public int getSmeltingVanillaXPBoostRank2Multiplier() { return config.getInt("Skills.Smelting.VanillaXPBoost_Rank2Multiplier", 3); }
+    public int getSmeltingVanillaXPBoostRank3Multiplier() { return config.getInt("Skills.Smelting.VanillaXPBoost_Rank3Multiplier", 4); }
+    public int getSmeltingVanillaXPBoostRank4Multiplier() { return config.getInt("Skills.Smelting.VanillaXPBoost_Rank4Multiplier", 5); }
+    public int getSmeltingVanillaXPBoostRank5Multiplier() { return config.getInt("Skills.Smelting.VanillaXPBoost_Rank5Multiplier", 6); }
+
+    /* SWORDS */
+    public double getBleedChanceMax() { return config.getDouble("Skills.Swords.Bleed_ChanceMax", 75.0D); }
+    public int getBleedMaxBonusLevel() { return config.getInt("Skills.Swords.Bleed_MaxBonusLevel", 750); }
+    public int getBleedMaxTicks() { return config.getInt("Skills.Swords.Bleed_MaxTicks", 3); }
+    public int getBleedBaseTicks() { return config.getInt("Skills.Swords.Bleed_BaseTicks", 2); }
+
+    public double getCounterChanceMax() { return config.getDouble("Skills.Swords.Counter_ChanceMax", 30.0D); }
+    public int getCounterMaxBonusLevel() { return config.getInt("Skills.Swords.Counter_MaxBonusLevel", 600); }
+    public int getCounterModifier() { return config.getInt("Skills.Swords.Counter_DamageModifier", 2); }
+
+    public int getSerratedStrikesModifier() { return config.getInt("Skills.Swords.SerratedStrikes_DamageModifier", 4); }
+    public int getSerratedStrikesTicks() { return config.getInt("Skills.Swords.SerratedStrikes_BleedTicks", 5); }
+
+    /* TAMING */
+    public double getGoreChanceMax() { return config.getInt("Skills.Taming.Gore_ChanceMax", 100); }
+    public int getGoreMaxBonusLevel() { return config.getInt("Skills.Taming.Gore_MaxBonusLevel", 1000); }
+    public int getGoreBleedTicks() { return config.getInt("Skills.Taming.Gore_BleedTicks", 2); }
+    public int getGoreModifier() { return config.getInt("Skills.Taming.Gore_Modifier", 2); }
+
+    public int getFastFoodUnlock() { return config.getInt("Skills.Taming.FastFood_UnlockLevel", 50); }
+    public double getFastFoodChance() { return config.getInt("Skills.Taming.FastFood_Chance", 50); }
+
+    public int getEnviromentallyAwareUnlock() { return config.getInt("Skills.Taming.EnvironmentallyAware_UnlockLevel", 100); }
+
+    public int getThickFurUnlock() { return config.getInt("Skills.Taming.ThickFur_UnlockLevel", 250); }
+    public int getThickFurModifier() { return config.getInt("Skills.Taming.ThickFur_Modifier", 2); }
+
+    public int getHolyHoundUnlock() {return config.getInt("Skills.Taming.HolyHound_UnlockLevel", 375); }
+
+    public int getShockProofUnlock() { return config.getInt("Skills.Taming.ShockProof_UnlockLevel", 500); }
+    public int getShockProofModifier() { return config.getInt("Skills.Taming.ShockProof_Modifier", 6); }
+
+    public int getSharpenedClawsUnlock() { return config.getInt("Skills.Taming.SharpenedClaws_UnlockLevel", 750); }
+    public int getSharpenedClawsBonus() { return config.getInt("Skills.Taming.SharpenedClaws_Bonus", 2); }
+
+    /* UNARMED */
+    public double getDisarmChanceMax() { return config.getDouble("Skills.Unarmed.Disarm_ChanceMax", 33.0D); }
+    public int getDisarmMaxBonusLevel() { return config.getInt("Skills.Unarmed.Disarm_MaxBonusLevel", 1000); }
+
+    public double getDeflectChanceMax() { return config.getDouble("Skills.Unarmed.Deflect_ChanceMax", 50.0D); }
+    public int getDeflectMaxBonusLevel() { return config.getInt("Skills.Unarmed.Deflect_MaxBonusLevel", 1000); }
+
+    public double getIronGripChanceMax() { return config.getDouble("Skills.Unarmed.IronGrip_ChanceMax", 100.0D); }
+    public int getIronGripMaxBonusLevel() { return config.getInt("Skills.Unarmed.IronGrip_MaxBonusLevel", 1000); }
+
+    public int getIronArmMaxBonus() { return config.getInt("Skills.Unarmed.IronArm_BonusMax", 8); }
+    public int getIronArmIncreaseLevel() { return config.getInt("Skills.Unarmed.IronArm_IncreaseLevel", 50); }
+
+    /* WOODCUTTING */
+    public int getLeafBlowUnlockLevel() { return config.getInt("Skills.Woodcutting.LeafBlower_UnlockLevel", 100); }
+
+    public double getWoodcuttingDoubleDropChance() { return config.getDouble("Skills.Woodcutting.DoubleDrops_ChanceMax", 100.0D); }
+    public int getWoodcuttingDoubleDropMaxLevel() { return config.getInt("Skills.Woodcutting.DoubleDrops_MaxBonusLevel", 1000); }
+
+    /* SPOUT STUFF*/
+    public int getSpoutNotificationTier1() { return config.getInt("Spout.Notifications.Tier1", 200); }
+    public int getSpoutNotificationTier2() { return config.getInt("Spout.Notifications.Tier2", 400); }
+    public int getSpoutNotificationTier3() { return config.getInt("Spout.Notifications.Tier3", 600); }
+    public int getSpoutNotificationTier4() { return config.getInt("Spout.Notifications.Tier4", 800); }
+}

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

@@ -0,0 +1,128 @@
+package com.gmail.nossr50.config;
+
+import java.io.BufferedReader;
+import java.io.BufferedWriter;
+import java.io.File;
+import java.io.FileWriter;
+import java.io.InputStreamReader;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Set;
+
+import org.bukkit.configuration.file.FileConfiguration;
+import org.bukkit.configuration.file.YamlConfiguration;
+
+import com.gmail.nossr50.metrics.MetricsManager;
+
+public abstract class AutoUpdateConfigLoader extends ConfigLoader {
+    public AutoUpdateConfigLoader(String relativePath, String fileName) {
+        super(relativePath, fileName);
+    }
+
+    public AutoUpdateConfigLoader(String fileName) {
+        super(fileName);
+    }
+
+    @Override
+    protected void loadFile() {
+        super.loadFile();
+        FileConfiguration internalConfig = YamlConfiguration.loadConfiguration(plugin.getResource(fileName));
+
+        Set<String> configKeys = config.getKeys(true);
+        Set<String> internalConfigKeys = internalConfig.getKeys(true);
+
+        boolean needSave = false;
+
+        Set<String> oldKeys = new HashSet<String>(configKeys);
+        oldKeys.removeAll(internalConfigKeys);
+
+        Set<String> newKeys = new HashSet<String>(internalConfigKeys);
+        newKeys.removeAll(configKeys);
+
+        // Don't need a re-save if we have old keys sticking around?
+        // Would be less saving, but less... correct?
+        if (!newKeys.isEmpty() || !oldKeys.isEmpty()) {
+            needSave = true;
+        }
+
+        for (String key : oldKeys) {
+            plugin.debug("Removing unused key: " + key);
+            config.set(key, null);
+        }
+
+        for (String key : newKeys) {
+            plugin.debug("Adding new key: " + key + " = " + internalConfig.get(key));
+            config.set(key, internalConfig.get(key));
+        }
+
+        if (needSave) {
+            // Get Bukkit's version of an acceptable config with new keys, and no old keys
+            String output = config.saveToString();
+
+            // Convert to the superior 4 space indentation
+            output = output.replace("  ", "    ");
+
+            // Rip out Bukkit's attempt to save comments at the top of the file
+            while (output.indexOf('#') != -1) {
+                output = output.substring(output.indexOf('\n', output.indexOf('#')) + 1);
+            }
+
+            // Read the internal config to get comments, then put them in the new one
+            try {
+                // Read internal
+                BufferedReader reader = new BufferedReader(new InputStreamReader(plugin.getResource(fileName)));
+                HashMap<String, String> comments = new HashMap<String, String>();
+                String temp = "";
+
+                String line;
+                while ((line = reader.readLine()) != null) {
+                    if (line.contains("#")) {
+                        temp += line + "\n";
+                    }
+                    else if (line.contains(":")) {
+                        line = line.substring(0, line.indexOf(":") + 1);
+                        if (!temp.isEmpty()) {
+                            comments.put(line, temp);
+                            temp = "";
+                        }
+                    }
+                }
+
+                // Dump to the new one
+                for (String key : comments.keySet()) {
+                    if (output.indexOf(key) != -1) {
+                        output = output.substring(0, output.indexOf(key)) + comments.get(key) + output.substring(output.indexOf(key));
+                    }
+                }
+            }
+            catch (Exception e) {
+                e.printStackTrace();
+            }
+
+            // Save it
+            try {
+                String saveName = fileName;
+                // At this stage we cannot guarantee that Config has been loaded, so we do the check directly here
+                if (!plugin.getConfig().getBoolean("General.Config_Update_Overwrite", true)) {
+                    saveName += ".new";
+                }
+
+                BufferedWriter writer = new BufferedWriter(new FileWriter(new File(plugin.getDataFolder(), saveName)));
+                writer.write(output);
+                writer.flush();
+                writer.close();
+            }
+            catch (Exception e) {
+                e.printStackTrace();
+            }
+        }
+        else {
+            for (String key : configKeys) {
+                if (!config.isConfigurationSection(key) && !config.get(key).equals(internalConfig.get(key))) {
+                    MetricsManager.customConfig();
+                    break;
+                }
+            }
+        }
+    }
+}

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

@@ -1,18 +1,20 @@
 package com.gmail.nossr50.config;
 
-import java.util.Iterator;
 import java.util.Set;
 
+import org.bukkit.Material;
 import org.bukkit.configuration.ConfigurationSection;
+import org.bukkit.entity.EntityType;
 
-public class Config extends ConfigLoader {
+import com.gmail.nossr50.datatypes.skills.AbilityType;
+import com.gmail.nossr50.datatypes.skills.SkillType;
+import com.gmail.nossr50.util.StringUtils;
+
+public class Config extends AutoUpdateConfigLoader {
     private static Config instance;
-    public double xpGainMultiplier = 1;
 
     private Config() {
         super("config.yml");
-        xpGainMultiplier = getExperienceGainsGlobalMultiplier();
-        loadKeys();
     }
 
     public static Config getInstance() {
@@ -33,68 +35,102 @@ public class Config extends ConfigLoader {
     /* General Settings */
     public String getLocale() { return config.getString("General.Locale", "en_us"); }
     public boolean getMOTDEnabled() { return config.getBoolean("General.MOTD_Enabled", true); }
+    public boolean getDonateMessageEnabled() { return config.getBoolean("Commands.mcmmo.Donate_Message", true); }
     public int getSaveInterval() { return config.getInt("General.Save_Interval", 10); }
     public boolean getStatsTrackingEnabled() { return config.getBoolean("General.Stats_Tracking", true); }
+    public boolean getUpdateCheckEnabled() { return config.getBoolean("General.Update_Check", true); }
+    public boolean getPreferBeta() { return config.getBoolean("General.Prefer_Beta", false); }
     public boolean getEventCallbackEnabled() { return config.getBoolean("General.Event_Callback", true); }
+    public boolean getBackupsEnabled() { return config.getBoolean("General.Generate_Backups", true); }
+    public boolean getVerboseLoggingEnabled() { return config.getBoolean("General.Verbose_Logging", false); }
+    public boolean getConfigOverwriteEnabled() { return config.getBoolean("General.Config_Update_Overwrite", true); }
+
+    public boolean getPartyDisplayNames() { return config.getBoolean("Commands.p.Use_Display_Names", true); }
+    public boolean getAdminDisplayNames() { return config.getBoolean("Commands.a.Use_Display_Names", true); }
+
+    /* Database Purging */
+    public int getPurgeInterval() { return config.getInt("Database_Purging.Purge_Interval", -1); }
+    public int getOldUsersCutoff() { return config.getInt("Database_Purging.Old_User_Cutoff", 6); }
 
     /* mySQL */
     public boolean getUseMySQL() { return config.getBoolean("MySQL.Enabled", false); }
     public String getMySQLTablePrefix() { return config.getString("MySQL.Database.TablePrefix", "mcmmo_"); }
-    public String getMySQLDatabaseName() { return config.getString("MySQL.Database.Name", "DatabaseName"); }
+    public String getMySQLDatabaseName() { return getStringIncludingInts(config, "MySQL.Database.Name"); }
-    public String getMySQLUserName() { return config.getString("MySQL.Database.User_Name", "UserName"); } //Really should be labeled under MySQL.User_Name instead...
+    public String getMySQLUserName() { return getStringIncludingInts(config, "MySQL.Database.User_Name"); }
     public int getMySQLServerPort() { return config.getInt("MySQL.Server.Port", 3306); }
     public String getMySQLServerName() { return config.getString("MySQL.Server.Address", "localhost"); }
+    public int getQueueNumber() { return config.getInt("MySQL.ConcurrentQueues", 2); }
 
     public String getMySQLUserPassword() {
-        if (config.getString("MySQL.Database.User_Password", null) != null) {
+        if (getStringIncludingInts(config, "MySQL.Database.User_Password") != null) {
-            return config.getString("MySQL.Database.User_Password", null);
+            return getStringIncludingInts(config, "MySQL.Database.User_Password");
         }
-        else {
+
-            return "";
+        return "";
+    }
+
+    private static String getStringIncludingInts(ConfigurationSection cfg, String key) {
+        String str = cfg.getString(key);
+
+        if (str == null) {
+            str = String.valueOf(cfg.getInt(key));
         }
+
+        if (str == "0") {
+            str = "No value set for '" + key + "'";
+        }
+        return str;
     }
 
     /* Hardcore Mode */
     public boolean getHardcoreEnabled() { return config.getBoolean("Hardcore.Enabled", false); }
-    public double getHardcoreDeathStatPenaltyPercentage() { return config.getDouble("Hardcore.Death_Stat_Loss_Penalty_Percentage", 75); }
+    public void setHardcoreEnabled(boolean enabled) { config.set("Hardcore.Enabled", enabled); }
-    public double getHardcoreVampirismStatLeechPercentage() { return config.getDouble("Hardcore.Vampirism_Stat_Leech_Percentage", 5); }
+
+    public double getHardcoreDeathStatPenaltyPercentage() { return config.getDouble("Hardcore.Death_Stat_Loss_Penalty_Percentage", 75.0); }
+    public void setHardcoreDeathStatPenaltyPercentage(double value) { config.set("Hardcore.Death_Stat_Loss_Penalty_Percentage", value); }
+
+    public double getHardcoreVampirismStatLeechPercentage() { return config.getDouble("Hardcore.Vampirism_Stat_Leech_Percentage", 5.0); }
+    public void setHardcoreVampirismStatLeechPercentage(double value) { config.set("Hardcore.Vampirism_Stat_Leech_Percentage", value); }
+
     public boolean getHardcoreVampirismEnabled() { return config.getBoolean("Hardcore.Vampirism", false); }
+    public void setHardcoreVampirismEnabled(boolean enabled) { config.set("Hardcore.Vampirism", enabled); }
 
     /* SMP Mods */
     public boolean getToolModsEnabled() { return config.getBoolean("Mods.Tool_Mods_Enabled", false); }
     public boolean getArmorModsEnabled() { return config.getBoolean("Mods.Tool_Mods_Enabled", false); }
     public boolean getBlockModsEnabled() { return config.getBoolean("Mods.Block_Mods_Enabled", false); }
-
+    public boolean getEntityModsEnabled() { return config.getBoolean("Mods.Entity_Mods_Enabled", false); }
-    /* Commands */
-    public boolean getCommandXPLockEnabled() { return config.getBoolean("Commands.xplock.Enabled", true); }
-    public boolean getCommandXPRateEnabled() { return config.getBoolean("Commands.xprate.Enabled", true); }
-    public boolean getCommandMCTopEnabled() { return config.getBoolean("Commands.mctop.Enabled", true); }
-    public boolean getCommandAddXPEnabled() { return config.getBoolean("Commands.addxp.Enabled", true); }
-    public boolean getCommandAddLevelsEnabled() { return config.getBoolean("Commands.addlevels.Enabled", true); }
-    public boolean getCommandMCAbilityEnabled() { return config.getBoolean("Commands.mcability.Enabled", true); }
-    public boolean getCommandMCRefreshEnabled() { return config.getBoolean("Commands.mcrefresh.Enabled", true); }
-    public boolean getCommandmcMMOEnabled() { return config.getBoolean("Commands.mcmmo.Enabled", true); }
-    public boolean getCommandMCCEnabled() { return config.getBoolean("Commands.mcc.Enabled", true); }
-    public boolean getCommandMCGodEnabled() { return config.getBoolean("Commands.mcgod.Enabled", true); }
-    public boolean getCommandMCStatsEnabled() { return config.getBoolean("Commands.mcstats.Enabled", true); }
-    public boolean getCommandSkillResetEnabled() { return config.getBoolean("Commands.skillreset.Enabled", true); }
-    public boolean getCommandMmoeditEnabled() { return config.getBoolean("Commands.mmoedit.Enabled", true); }
-    public boolean getCommandMCRemoveEnabled() { return config.getBoolean("Commands.mcremove.Enable", true); }
-    public boolean getCommandPTPEnabled() { return config.getBoolean("Commands.ptp.Enabled", true); }
-    public boolean getCommandPartyEnabled() { return config.getBoolean("Commands.party.Enabled", true); }
-    public boolean getCommandInspectEnabled() { return config.getBoolean("Commands.inspect.Enabled", true); }
-    public boolean getCommandInviteEnabled() { return config.getBoolean("Commands.invite.Enabled", true); }
-    public boolean getCommandAcceptEnabled() { return config.getBoolean("Commands.accept.Enabled", true); }
-    public boolean getCommandAdminChatAEnabled() { return config.getBoolean("Commands.a.Enabled", true); }
-    public boolean getCommandPartyChatPEnabled() { return config.getBoolean("Commands.p.Enabled", true); }
-
-    public int getPTPCommandCooldown() { return config.getInt("Commands.ptp.Cooldown", 30); }
-    public boolean getDonateMessageEnabled() { return config.getBoolean("Commands.mcmmo.Donate_Message", true); }
 
     /* Items */
-    public int getChimaeraCost() { return config.getInt("Items.Chimaera_Wing.Feather_Cost", 10); }
+    public int getChimaeraUseCost() { return config.getInt("Items.Chimaera_Wing.Use_Cost", 1); }
+    public int getChimaeraRecipeCost() { return config.getInt("Items.Chimaera_Wing.Recipe_Cost", 5); }
     public int getChimaeraItemId() { return config.getInt("Items.Chimaera_Wing.Item_ID", 288); }
     public boolean getChimaeraEnabled() { return config.getBoolean("Items.Chimaera_Wing.Enabled", true); }
+    public boolean getChimaeraPreventUseUnderground() { return config.getBoolean("Items.Chimaera_Wing.Prevent_Use_Underground", true); }
+    public int getChimaeraCooldown() { return config.getInt("Items.Chimaera_Wing.Cooldown", 240); }
+
+    /* Particles */
+    public boolean getAbilityActivationEffectEnabled() { return config.getBoolean("Particles.Ability_Activation", true); }
+    public boolean getAbilityDeactivationEffectEnabled() { return config.getBoolean("Particles.Ability_Deactivation", true); }
+    public boolean getDodgeEffectEnabled() { return config.getBoolean("Particles.Dodge", true); }
+    public boolean getBleedEffectEnabled() { return config.getBoolean("Particles.Bleed", true); }
+    public boolean getGreaterImpactEffectEnabled() { return config.getBoolean("Particles.Greater_Impact", true); }
+
+    /* PARTY SETTINGS */
+    public int getAutoPartyKickInterval() { return config.getInt("Party.AutoKick_Interval", 12); }
+    public int getAutoPartyKickTime() { return config.getInt("Party.Old_Party_Member_Cutoff", 7); }
+    public boolean getExpShareEnabled() { return config.getBoolean("Party.Sharing.ExpShare_enabled", true); }
+    public double getPartyShareBonusBase() { return config.getDouble("Party.Sharing.ExpShare_bonus_base", 1.1); }
+    public double getPartyShareBonusIncrease() { return config.getDouble("Party.Sharing.ExpShare_bonus_increase", 0.05); }
+    public double getPartyShareBonusCap() { return config.getDouble("Party.Sharing.ExpShare_bonus_cap", 1.5); }
+    public boolean getItemShareEnabled() { return config.getBoolean("Party.Sharing.ItemShare_enabled", true); }
+    public double getPartyShareRange() { return config.getDouble("Party.Sharing.Range", 75.0); }
+
+    /* Party Teleport Settings */
+    public int getPTPCommandCooldown() { return config.getInt("Commands.ptp.Cooldown", 30); }
+    public int getPTPCommandTimeout() { return config.getInt("Commands.ptp.Request_Timeout", 300); }
+    public boolean getPTPCommandConfirmRequired() { return config.getBoolean("Commands.ptp.Confirm_Required", true); }
+    public boolean getPTPCommandWorldPermissions() { return config.getBoolean("Commands.ptp.World_Based_Permissions", false); }
 
     /*
      * ABILITY SETTINGS
@@ -105,30 +141,13 @@ public class Config extends ConfigLoader {
     public boolean getAbilitiesEnabled() { return config.getBoolean("Abilities.Enabled", true); }
     public boolean getAbilitiesOnlyActivateWhenSneaking() { return config.getBoolean("Abilities.Activation.Only_Activate_When_Sneaking", false); }
 
+    public int getCooldown(AbilityType ability) { return config.getInt("Abilities.Cooldowns." + ability.toString()); }
+    public int getMaxTicks(AbilityType ability) { return config.getInt("Abilities.Max_Seconds." + ability.toString()); }
+
     /* Durability Settings */
     public boolean getAbilitiesDamageTools() { return config.getBoolean("Abilities.Tools.Durability_Loss_Enabled", true); }
     public int getAbilityToolDamage() { return config.getInt("Abilities.Tools.Durability_Loss", 2); }
 
-    /* Cooldowns */
-    public int getAbilityCooldownGreenTerra() { return config.getInt("Abilities.Cooldowns.Green_Terra", 240); }
-    public int getAbilityCooldownSuperBreaker() { return config.getInt("Abilities.Cooldowns.Super_Breaker", 240); }
-    public int getAbilityCooldownGigaDrillBreaker() { return config.getInt("Abilities.Cooldowns.Giga_Drill_Breaker", 240); }
-    public int getAbilityCooldownTreeFeller() { return config.getInt("Abilities.Cooldowns.Tree_Feller", 240); }
-    public int getAbilityCooldownBerserk() { return config.getInt("Abilities.Cooldowns.Berserk", 240); }
-    public int getAbilityCooldownSerratedStrikes() { return config.getInt("Abilities.Cooldowns.Serrated_Strikes", 240); }
-    public int getAbilityCooldownSkullSplitter() { return config.getInt("Abilities.Cooldowns.Skull_Splitter", 240); }
-    public int getAbilityCooldownBlastMining() { return config.getInt("Abilities.Cooldowns.Blast_Mining", 60); }
-
-    /* Max ticks */
-    public int getAbilityMaxTicksGreenTerra() { return config.getInt("Abilities.Max_Seconds.Green_Terra", 0); }
-    public int getAbilityMaxTicksSuperBreaker() { return config.getInt("Abilities.Max_Seconds.Super_Breaker", 0); }
-    public int getAbilityMaxTicksGigaDrillBreaker() { return config.getInt("Abilities.Max_Seconds.Giga_Drill_Breaker", 0); }
-    public int getAbilityMaxTicksTreeFeller() { return config.getInt("Abilities.Max_Seconds.Tree_Feller", 0); }
-    public int getAbilityMaxTicksBerserk() { return config.getInt("Abilities.Max_Seconds.Berserk", 0); }
-    public int getAbilityMaxTicksSerratedStrikes() { return config.getInt("Abilities.Max_Seconds.Serrated_Strikes", 0); }
-    public int getAbilityMaxTicksSkullSplitter() { return config.getInt("Abilities.Max_Seconds.Skull_Splitter", 0); }
-    public int getAbilityMaxTicksBlastMining() { return config.getInt("Abilities.Max_Seconds.Blast_Mining", 0); }
-
     /* Thresholds */
     public int getTreeFellerThreshold() { return config.getInt("Abilities.Limits.Tree_Feller_Threshold", 500); }
 
@@ -136,140 +155,44 @@ public class Config extends ConfigLoader {
      * SKILL SETTINGS
      */
 
-    /* Tool Requirements */
+    public int getXp(SkillType skill, Material material) { return config.getInt("Experience." + StringUtils.getCapitalized(skill.toString()) + "." + StringUtils.getPrettyItemString(material).replace(" ", "_")); }
-    public boolean getMiningRequiresTool() { return config.getBoolean("Skills.Mining.Requires_Pickaxe", true); }
+    public boolean getDoubleDropsEnabled(SkillType skill, Material material) { return config.getBoolean("Double_Drops." + StringUtils.getCapitalized(skill.toString()) + "." + StringUtils.getPrettyItemString(material).replace(" ", "_")); }
-    public boolean getExcavationRequiresTool() { return config.getBoolean("Skills.Excavation.Requires_Shovel", true); }
-    public boolean getWoodcuttingRequiresTool() { return config.getBoolean("Skills.Woodcutting.Requires_Axe", true); }
 
-    /* Excavation */
+    public boolean getDoubleDropsDisabled(SkillType skill) {
-    public int getExcavationBaseXP() { return config.getInt("Experience.Excavation.Base", 40); }
+        String skillName = StringUtils.getCapitalized(skill.toString());
+        ConfigurationSection section = config.getConfigurationSection("Double_Drops." + skillName);
+        Set<String> keys = section.getKeys(false);
+        boolean disabled = true;
+
+        for (String key : keys) {
+            if (config.getBoolean("Double_Drops." + skillName + "." + key)) {
+                disabled = false;
+                break;
+            }
+        }
+
+        return disabled;
+    }
+
+    /* Acrobatics */
+    public boolean getDodgeLightningDisabled() { return config.getBoolean("Skills.Acrobatics.Prevent_Dodge_Lightning", false); }
 
     /* Fishing */
     public int getFishingBaseXP() { return config.getInt("Experience.Fishing.Base", 800); }
-    public boolean getFishingDropsEnabled() { return config.getBoolean("Fishing.Drops_Enabled", true); }
+    public boolean getFishingDropsEnabled() { return config.getBoolean("Skills.Fishing.Drops_Enabled", true); }
-    public int getFishingTierLevelsTier1() { return config.getInt("Fishing.Tier_Levels.Tier1", 0); }
-    public int getFishingTierLevelsTier2() { return config.getInt("Fishing.Tier_Levels.Tier2", 200); }
-    public int getFishingTierLevelsTier3() { return config.getInt("Fishing.Tier_Levels.Tier3", 400); }
-    public int getFishingTierLevelsTier4() { return config.getInt("Fishing.Tier_Levels.Tier4", 600); }
-    public int getFishingTierLevelsTier5() { return config.getInt("Fishing.Tier_Levels.Tier5", 800); }
-    
-    /* Shake */
-    public int getShakeChanceRank1() { return config.getInt("Shake.Chance.Rank_1", 25); }
-    public int getShakeChanceRank2() { return config.getInt("Shake.Chance.Rank_2", 40); }
-    public int getShakeChanceRank3() { return config.getInt("Shake.Chance.Rank_3", 55); }
-    public int getShakeChanceRank4() { return config.getInt("Shake.Chance.Rank_4", 60); }
-    public int getShakeChanceRank5() { return config.getInt("Shake.Chance.Rank_5", 75); }
-
-    /* Herbalism */
-    public int getHerbalismXPSugarCane() { return config.getInt("Experience.Herbalism.Sugar_Cane", 30); }
-    public int getHerbalismXPWheat() { return config.getInt("Experience.Herbalism.Wheat", 50); }
-    public int getHerbalismXPCactus() { return config.getInt("Experience.Herbalism.Cactus", 30); }
-    public int getHerbalismXPPumpkin() { return config.getInt("Experience.Herbalism.Pumpkin", 20); }
-    public int getHerbalismXPFlowers() { return config.getInt("Experience.Herbalism.Flowers", 100); }
-    public int getHerbalismXPMushrooms() { return config.getInt("Experience.Herbalism.Mushrooms", 150); }
-    public int getHerbalismXPMelon() { return config.getInt("Experience.Herbalism.Melon", 20); }
-    public int getHerbalismXPNetherWart() { return config.getInt("Experience.Herbalism.Nether_Wart", 50); }
-    public int getHerbalismXPLilyPads() { return config.getInt("Experience.Herbalism.Lily_Pads", 100); }
-    public int getHerbalismXPVines() { return config.getInt("Experience.Herbalism.Vines", 10); }
-    public int getHerbalismXPCocoa() { return config.getInt("Experience.Herbalism.Cocoa", 30); }
-    public int getHerbalismXPCarrot() { return config.getInt("Experience.Herbalism.Carrot", 50); }
-    public int getHerbalismXPPotato() { return config.getInt("Experience.Herbalism.Potato", 50); }
-
-    public boolean getHerbalismGreenThumbCobbleToMossy() { return config.getBoolean("Skills.Herbalism.Green_Thumb.Cobble_To_Mossy", true); }
-    public boolean getHerbalismGreenThumbCobbleWallToMossyWall() { return config.getBoolean("Skills.Herbalism.Green_Thumb.CobbleWall_To_MossyWall", true); }
-    public boolean getHerbalismGreenThumbSmoothbrickToMossy() { return config.getBoolean("Skills.Herbalism.Green_Thumb.SmoothBrick_To_MossyBrick", true); }
-    public boolean getHerbalismGreenThumbDirtToGrass() { return config.getBoolean("Skills.Herbalism.Green_Thumb.Dirt_To_Grass", true); }
-
-    public boolean getBrownMushroomsDoubleDropsEnabled() { return config.getBoolean("Double_Drops.Herbalism.Brown_Mushrooms", true); }
-    public boolean getCactiDoubleDropsEnabled() { return config.getBoolean("Double_Drops.Herbalism.Cacti", true); }
-    public boolean getWheatDoubleDropsEnabled() { return config.getBoolean("Double_Drops.Herbalism.Wheat", true); }
-    public boolean getMelonsDoubleDropsEnabled() { return config.getBoolean("Double_Drops.Herbalism.Melons", true); }
-    public boolean getNetherWartsDoubleDropsEnabled() { return config.getBoolean("Double_Drops.Herbalism.Nether_Warts", true); }
-    public boolean getPumpkinsDoubleDropsEnabled() { return config.getBoolean("Double_Drops.Herbalism.Pumpkins", true); }
-    public boolean getRedMushroomsDoubleDropsEnabled() { return config.getBoolean("Double_Drops.Herbalism.Red_Mushrooms", true); }
-    public boolean getRedRosesDoubleDropsEnabled() { return config.getBoolean("Double_Drops.Herbalism.Red_Roses", true); }
-    public boolean getSugarCaneDoubleDropsEnabled() { return config.getBoolean("Double_Drops.Herbalism.Sugar_Cane", true); }
-    public boolean getVinesDoubleDropsEnabled() { return config.getBoolean("Double_Drops.Herbalism.Vines", true); }
-    public boolean getWaterLiliesDoubleDropsEnabled() { return config.getBoolean("Double_Drops.Herbalism.Water_Lilies", true); }
-    public boolean getYellowFlowersDoubleDropsEnabled() { return config.getBoolean("Double_Drops.Herbalism.Yellow_Flowers", true); }
-    public boolean getCocoaDoubleDropsEnabled() { return config.getBoolean("Double_Drops.Herbalism.Cocoa", true); }
-    public boolean getCarrotDoubleDropsEnabled() { return config.getBoolean("Double_Drops.Herbalism.Carrot", true); }
-    public boolean getPotatoDoubleDropsEnabled() { return config.getBoolean("Double_Drops.Herbalism.Potato", true); }
-
-    public boolean herbalismDoubleDropsDisabled() {
-        ConfigurationSection section = config.getConfigurationSection("Double_Drops.Herbalism");
-        Set<String> keys = section.getKeys(false);
-        Iterator<String> iterator = keys.iterator();
-
-        boolean disabled = true;
-
-        while (iterator.hasNext()) {
-            String key = iterator.next();
-
-            if (config.getBoolean("Double_Drops.Herbalism." + key)) {
-                disabled = false;
-                break;
-            }
-        }
-
-        return disabled;
-    }
 
     /* Mining */
-    public int getMiningXPGoldOre() { return config.getInt("Experience.Mining.Gold", 250); }
-    public int getMiningXPDiamondOre() { return config.getInt("Experience.Mining.Diamond", 750); }
-    public int getMiningXPIronOre() { return config.getInt("Experience.Mining.Iron", 250); }
-    public int getMiningXPRedstoneOre() { return config.getInt("Experience.Mining.Redstone", 150); }
-    public int getMiningXPLapisOre() { return config.getInt("Experience.Mining.Lapis", 400); }
-    public int getMiningXPObsidian() { return config.getInt("Experience.Mining.Obsidian", 150); }
-    public int getMiningXPNetherrack() { return config.getInt("Experience.Mining.Netherrack", 30); }
-    public int getMiningXPGlowstone() { return config.getInt("Experience.Mining.Glowstone", 30); }
-    public int getMiningXPCoalOre() { return config.getInt("Experience.Mining.Coal", 100); }
-    public int getMiningXPStone() { return config.getInt("Experience.Mining.Stone", 30); }
-    public int getMiningXPSandstone() { return config.getInt("Experience.Mining.Sandstone", 30); }
-    public int getMiningXPEndStone() { return config.getInt("Experience.Mining.End_Stone", 150); }
-    public int getMiningXPMossyStone() { return config.getInt("Experience.Mining.Moss_Stone", 30); }
-    public int getMiningXPEmeraldOre() { return config.getInt("Experience.Mining.Emerald", 1000); }
-
-    public boolean getCoalDoubleDropsEnabled() { return config.getBoolean("Double_Drops.Mining.Coal", true); }
-    public boolean getDiamondDoubleDropsEnabled() { return config.getBoolean("Double_Drops.Mining.Diamond", true); }
-    public boolean getEndStoneDoubleDropsEnabled() { return config.getBoolean("Double_Drops.Mining.End_Stone", true); }
-    public boolean getGlowstoneDoubleDropsEnabled() { return config.getBoolean("Double_Drops.Mining.Glowstone", true); }
-    public boolean getGoldDoubleDropsEnabled() { return config.getBoolean("Double_Drops.Mining.Gold", true); }
-    public boolean getIronDoubleDropsEnabled() { return config.getBoolean("Double_Drops.Mining.Iron", true); }
-    public boolean getLapisDoubleDropsEnabled() { return config.getBoolean("Double_Drops.Mining.Lapis", true); }
-    public boolean getMossyCobblestoneDoubleDropsEnabled() { return config.getBoolean("Double_Drops.Mining.Moss_Stone", true); }
-    public boolean getNetherrackDoubleDropsEnabled() { return config.getBoolean("Double_Drops.Mining.Netherrack", true); }
-    public boolean getObsidianDoubleDropsEnabled() { return config.getBoolean("Double_Drops.Mining.Obsidian", true); }
-    public boolean getRedstoneDoubleDropsEnabled() { return config.getBoolean("Double_Drops.Mining.Redstone", true); }
-    public boolean getSandstoneDoubleDropsEnabled() { return config.getBoolean("Double_Drops.Mining.Sandstone", true); }
-    public boolean getStoneDoubleDropsEnabled() { return config.getBoolean("Double_Drops.Mining.Stone", true); }
-    public boolean getEmeraldDoubleDropsEnabled() { return config.getBoolean("Double_Drops.Mining.Emerald", true); }
-
-    public boolean miningDoubleDropsDisabled() {
-        ConfigurationSection section = config.getConfigurationSection("Double_Drops.Mining");
-        Set<String> keys = section.getKeys(false);
-        Iterator<String> iterator = keys.iterator();
-
-        boolean disabled = true;
-
-        while (iterator.hasNext()) {
-            String key = iterator.next();
-
-            if (config.getBoolean("Double_Drops.Mining." + key)) {
-                disabled = false;
-                break;
-            }
-        }
-
-        return disabled;
-    }
-
     public int getDetonatorItemID() { return config.getInt("Skills.Mining.Detonator_ID", 259); }
 
     /* Repair */
     public boolean getRepairAnvilMessagesEnabled() { return config.getBoolean("Skills.Repair.Anvil_Messages", true); }
     public int getRepairAnvilId() { return config.getInt("Skills.Repair.Anvil_ID", 42); }
+    public int getSalvageAnvilId() { return config.getInt("Skills.Repair.Salvage_Anvil_ID", 41); }
+    public boolean getSalvageTools() { return config.getBoolean("Skills.Repair.Salvage_tools", true); }
+    public boolean getSalvageArmor() { return config.getBoolean("Skills.Repair.Salvage_armor", true); }
+
+    /* Unarmed */
+    public boolean getUnarmedBlockCrackerSmoothbrickToCracked() { return config.getBoolean("Skills.Unarmed.Block_Cracker.SmoothBrick_To_CrackedBrick", true); }
 
     /* Taming */
     public int getTamingXPWolf() { return config.getInt("Experience.Taming.Animal_Taming.Wolf", 250); }
@@ -282,79 +205,32 @@ public class Config extends ConfigLoader {
     public int getWoodcuttingXPBirch() { return config.getInt("Experience.Woodcutting.Birch", 90); }
     public int getWoodcuttingXPSpruce() { return config.getInt("Experience.Woodcutting.Spruce", 80); }
     public int getWoodcuttingXPJungle() { return config.getInt("Experience.Woodcutting.Jungle", 100); }
+    public int getWoodcuttingXPHugeBrownMushroom() { return config.getInt("Experience.Woodcutting.Huge_Mushroom_Brown", 70); }
+    public int getWoodcuttingXPHugeRedMushroom() { return config.getInt("Experience.Woodcutting.Huge_Mushroom_Red", 70); }
 
     public boolean getOakDoubleDropsEnabled() { return config.getBoolean("Double_Drops.Woodcutting.Oak", true); }
     public boolean getBirchDoubleDropsEnabled() { return config.getBoolean("Double_Drops.Woodcutting.Birch", true); }
     public boolean getSpruceDoubleDropsEnabled() { return config.getBoolean("Double_Drops.Woodcutting.Spruce", true); }
     public boolean getJungleDoubleDropsEnabled() { return config.getBoolean("Double_Drops.Woodcutting.Jungle", true); }
 
-    public boolean woodcuttingDoubleDropsDisabled() {
-        ConfigurationSection section = config.getConfigurationSection("Double_Drops.Woodcutting");
-        Set<String> keys = section.getKeys(false);
-        Iterator<String> iterator = keys.iterator();
-
-        boolean disabled = true;
-
-        while (iterator.hasNext()) {
-            String key = iterator.next();
-
-            if (config.getBoolean("Double_Drops.Woodcutting." + key)) {
-                disabled = false;
-                break;
-            }
-        }
-
-        return disabled;
-    }
-
     /* AFK Leveling */
     public boolean getAcrobaticsAFKDisabled() { return config.getBoolean("Skills.Acrobatics.Prevent_AFK_Leveling", true); }
     public boolean getHerbalismAFKDisabled() { return config.getBoolean("Skills.Herbalism.Prevent_AFK_Leveling", true); }
 
-    /* Arcane Forging */
-    public boolean getArcaneForgingDowngradeEnabled() { return config.getBoolean("Arcane_Forging.Downgrades.Enabled", true); }
-    public int getArcaneForgingDowngradeChanceRank1() { return config.getInt("Arcane_Forging.Downgrades.Chance.Rank_1", 75); }
-    public int getArcaneForgingDowngradeChanceRank2() { return config.getInt("Arcane_Forging.Downgrades.Chance.Rank_2", 50); }
-    public int getArcaneForgingDowngradeChanceRank3() { return config.getInt("Arcane_Forging.Downgrades.Chance.Rank_3", 25); }
-    public int getArcaneForgingDowngradeChanceRank4() { return config.getInt("Arcane_Forging.Downgrades.Chance.Rank_4", 15); }
-    public boolean getArcaneForgingEnchantLossEnabled() { return config.getBoolean("Arcane_Forging.May_Lose_Enchants", true); }
-    public int getArcaneForgingKeepEnchantsChanceRank1() { return config.getInt("Arcane_Forging.Keep_Enchants.Chance.Rank_1", 10); }
-    public int getArcaneForgingKeepEnchantsChanceRank2() { return config.getInt("Arcane_Forging.Keep_Enchants.Chance.Rank_2", 20); }
-    public int getArcaneForgingKeepEnchantsChanceRank3() { return config.getInt("Arcane_Forging.Keep_Enchants.Chance.Rank_3", 30); }
-    public int getArcaneForgingKeepEnchantsChanceRank4() { return config.getInt("Arcane_Forging.Keep_Enchants.Chance.Rank_4", 40); }
-    public int getArcaneForgingRankLevels1() { return config.getInt("Arcane_Forging.Rank_Levels.Rank_1", 100); }
-    public int getArcaneForgingRankLevels2() { return config.getInt("Arcane_Forging.Rank_Levels.Rank_2", 250); }
-    public int getArcaneForgingRankLevels3() { return config.getInt("Arcane_Forging.Rank_Levels.Rank_3", 500); }
-    public int getArcaneForgingRankLevels4() { return config.getInt("Arcane_Forging.Rank_Levels.Rank_4", 750); }
-
     /* Level Caps */
-    public int getLevelCapAcrobatics() { return config.getInt("Skills.Acrobatics.Level_Cap", 0); }
+    public int getPowerLevelCap() {
-    public int getLevelCapArchery() { return config.getInt("Skills.Archery.Level_Cap", 0); }
+        int cap = config.getInt("General.Power_Level_Cap", 0);
-    public int getLevelCapAxes() { return config.getInt("Skills.Axes.Level_Cap", 0); }
+        return (cap <= 0) ? Integer.MAX_VALUE : cap;
-    public int getLevelCapExcavation() { return config.getInt("Skills.Excavation.Level_Cap", 0); }
+    }
-    public int getLevelCapFishing() { return config.getInt("Skills.Fishing.Level_Cap", 0); }
+
-    public int getLevelCapHerbalism() { return config.getInt("Skills.Herbalism.Level_Cap", 0); }
+    public int getLevelCap(SkillType skill) {
-    public int getLevelCapMining() { return config.getInt("Skills.Mining.Level_Cap", 0); }
+        int cap = config.getInt("Skills." + StringUtils.getCapitalized(skill.toString()) + ".Level_Cap");
-    public int getLevelCapRepair() { return config.getInt("Skills.Repair.Level_Cap", 0); }
+        return (cap <= 0) ? Integer.MAX_VALUE : cap;
-    public int getLevelCapSwords() { return config.getInt("Skills.Swords.Level_Cap", 0); }
+    }
-    public int getLevelCapTaming() { return config.getInt("Skills.Taming.Level_Cap", 0); }
-    public int getLevelCapUnarmed() { return config.getInt("Skills.Unarmed.Level_Cap", 0); }
-    public int getLevelCapWoodcutting() { return config.getInt("Skills.Woodcutting.Level_Cap", 0); }
-    public int getPowerLevelCap() { return config.getInt("General.Power_Level_Cap", 0); }
 
     /* PVP & PVE Settings */
-    public boolean getAcrobaticsPVP() { return config.getBoolean("Skills.Acrobatics.Enabled_For_PVP", true); }
+    public boolean getPVPEnabled(SkillType skill) { return config.getBoolean("Skills." + StringUtils.getCapitalized(skill.toString()) + ".Enabled_For_PVP", true); }
-    public boolean getAcrobaticsPVE() { return config.getBoolean("Skills.Acrobatics.Enabled_For_PVE", true); }
+    public boolean getPVEEnabled(SkillType skill) { return config.getBoolean("Skills." + StringUtils.getCapitalized(skill.toString()) + ".Enabled_For_PVE", true); }
-    public boolean getArcheryPVP() { return config.getBoolean("Skills.Archery.Enabled_For_PVP", true); }
-    public boolean getArcheryPVE() { return config.getBoolean("Skills.Archery.Enabled_For_PVE", true); }
-    public boolean getAxesPVP() { return config.getBoolean("Skills.Axes.Enabled_For_PVP", true); }
-    public boolean getAxesPVE() { return config.getBoolean("Skills.Axes.Enabled_For_PVE", true); }
-    public boolean getSwordsPVP() { return config.getBoolean("Skills.Swords.Enabled_For_PVP", true); }
-    public boolean getSwordsPVE() { return config.getBoolean("Skills.Swords.Enabled_For_PVE", true); }
-    public boolean getTamingPVP() { return config.getBoolean("Skills.Taming.Enabled_For_PVP", true); }
-    public boolean getTamingPVE() { return config.getBoolean("Skills.Taming.Enabled_For_PVE", true); }
-    public boolean getUnarmedPVP() { return config.getBoolean("Skills.Unarmed.Enabled_For_PVP", true); }
-    public boolean getUnarmedPVE() { return config.getBoolean("Skills.Unarmed.Enabled_For_PVE", true); }
 
     /*
      * XP SETTINGS
@@ -363,38 +239,19 @@ public class Config extends ConfigLoader {
     /* General Settings */
     public boolean getExperienceGainsMobspawnersEnabled() { return config.getBoolean("Experience.Gains.Mobspawners.Enabled", false); }
     public boolean getExperienceGainsPlayerVersusPlayerEnabled() { return config.getBoolean("Experience.PVP.Rewards", true); }
+
     public double getExperienceGainsGlobalMultiplier() { return config.getDouble("Experience.Gains.Multiplier.Global", 1.0); }
+    public void setExperienceGainsGlobalMultiplier(double value) { config.set("Experience.Gains.Multiplier.Global", value); }
 
     /* Combat XP Multipliers */
     public double getPlayerVersusPlayerXP() { return config.getDouble("Experience.Gains.Multiplier.PVP", 1.0); }
+    public double getCombatXP(EntityType entity) { return config.getDouble("Experience.Combat.Multiplier." + StringUtils.getPrettyEntityTypeString(entity).replace(" ", "_")); }
+
     public double getAnimalsXP() { return config.getDouble("Experience.Combat.Multiplier.Animals", 1.0); }
-    public double getCreeperXP() { return config.getDouble("Experience.Combat.Multiplier.Creeper", 4.0); }
+    public double getWitherSkeletonXP() { return config.getDouble("Experience.Combat.Multiplier.Wither_Skeleton", 4.0); }
-    public double getSkeletonXP() { return config.getDouble("Experience.Combat.Multiplier.Skeleton", 2.0); }
+
-    public double getSpiderXP() { return config.getDouble("Experience.Combat.Multiplier.Spider", 3.0); }
-    public double getGhastXP() { return config.getDouble("Experience.Combat.Multiplier.Ghast", 3.0); }
-    public double getSlimeXP() { return config.getDouble("Experience.Combat.Multiplier.Slime", 2.0); }
-    public double getZombieXP() { return config.getDouble("Experience.Combat.Multiplier.Zombie", 2.0); }
-    public double getPigZombieXP() { return config.getDouble("Experience.Combat.Multiplier.Pig_Zombie", 3.0); }
-    public double getEndermanXP() { return config.getDouble("Experience.Combat.Multiplier.Enderman", 2.0); }
-    public double getCaveSpiderXP() { return config.getDouble("Experience.Combat.Multiplier.Cave_Spider", 3.0); }
-    public double getSilverfishXP() { return config.getDouble("Experience.Combat.Multiplier.Silverfish", 3.0); }
-    public double getBlazeXP() { return config.getDouble("Experience.Combat.Multiplier.Blaze", 3.0); }
-    public double getMagmaCubeXP() { return config.getDouble("Experience.Combat.Multiplier.Magma_Cube", 2.0); }
-    public double getEnderDragonXP() { return config.getDouble("Experience.Combat.Multiplier.Ender_Dragon", 8.0); }
-    public double getIronGolemXP() { return config.getDouble("Experience.Combat.Multiplier.Iron_Golem", 2.0); }
 
     /* XP Formula Multiplier */
     public int getFormulaMultiplierCurve() { return config.getInt("Experience.Formula.Curve_Modifier", 20); }
-    public double getFormulaMultiplierTaming() { return config.getDouble("Experience.Formula.Multiplier.Taming", 1.0); }
+    public double getForumulaMultiplier(SkillType skill) { return config.getDouble("Experience.Formula.Multiplier." + StringUtils.getCapitalized(skill.toString())); }
-    public double getFormulaMultiplierMining() { return config.getDouble("Experience.Formula.Multiplier.Mining", 1.0); }
-    public double getFormulaMultiplierRepair() { return config.getDouble("Experience.Formula.Multiplier.Repair", 1.0); }
-    public double getFormulaMultiplierWoodcutting() { return config.getDouble("Experience.Formula.Multiplier.Woodcutting", 1.0); }
-    public double getFormulaMultiplierUnarmed() { return config.getDouble("Experience.Formula.Multiplier.Unarmed", 1.0); }
-    public double getFormulaMultiplierHerbalism() { return config.getDouble("Experience.Formula.Multiplier.Herbalism", 1.0); }
-    public double getFormulaMultiplierExcavation() { return config.getDouble("Experience.Formula.Multiplier.Excavation", 1.0); }
-    public double getFormulaMultiplierArchery() { return config.getDouble("Experience.Formula.Multiplier.Archery", 1.0); }
-    public double getFormulaMultiplierSwords() { return config.getDouble("Experience.Formula.Multiplier.Swords", 1.0); }
-    public double getFormulaMultiplierAxes() { return config.getDouble("Experience.Formula.Multiplier.Axes", 1.0); }
-    public double getFormulaMultiplierAcrobatics() { return config.getDouble("Experience.Formula.Multiplier.Acrobatics", 1.0); }
-    public double getFormulaMultiplierFishing() { return config.getDouble("Experience.Formula.Multiplier.Fishing", 1.0); }
 }

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

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

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

@@ -10,6 +10,7 @@ public class HiddenConfig {
     private static YamlConfiguration config;
     private static boolean chunkletsEnabled;
     private static int conversionRate;
+    private static boolean useEnchantmentBuffs;
 
     public HiddenConfig(String fileName) {
         HiddenConfig.fileName = fileName;
@@ -29,6 +30,7 @@ public class HiddenConfig {
             config = YamlConfiguration.loadConfiguration(mcMMO.p.getResource(fileName));
             chunkletsEnabled = config.getBoolean("Options.Chunklets", true);
             conversionRate = config.getInt("Options.ConversionRate", 1);
+            useEnchantmentBuffs = config.getBoolean("Options.EnchantmentBuffs", true);
         }
     }
 
@@ -39,4 +41,8 @@ public class HiddenConfig {
     public int getConversionRate() {
         return conversionRate;
     }
+
+    public boolean useEnchantmentBuffs() {
+        return useEnchantmentBuffs;
+    }
 }

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

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