NuclearW loves his spacing, also pinging him.

worlds.

Fixes #815

.gitattributes

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

.gitignore

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

README.creole

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

README.md

@@ -0,0 +1,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.

extras/repair.chain.yml

@@ -0,0 +1,73 @@
+#
+# Any file named repair.*.yml in the mcmmmo folder will be loaded as a repair config
+# All repair configs have a main section titled "Repairables"
+# Afterwards, all sub-items are considered a Repairable to be loaded
+# The bare minimum of a Repairable is that it have an ItemId, a RepairMaterialId, and a MaximumDurability
+#
+# ItemId: This is the id of the item to be repairable.
+## This is required to be set.
+#
+# ItemType: This is the type of item to be repaired, this is only important to permissions.
+## Valid values are ARMOR, TOOL, and OTHER.
+## This defaults to OTHER.
+#
+# MaterialType: This is the type of the material of the item to be repaired, this is only important for permissions.
+## Valid values are STRING, LEATHER, WOOD, STONE, IRON, GOLD, DIAMOND, and OTHER
+## This defaults to OTHER.
+#
+# RepairMaterialId: This is the id of the item used to repair this repairable.
+## This is required to be set.
+#
+# RepairMaterialMetadata: This is the metadata of the item used to repair this repairable.
+## A value of -1 means to ignore all metadata when repairing.
+## This defaults to -1
+#
+# MaximumDurability: This is the maximum durability of the item.
+## This is required to be set.
+#
+# MinimumLevel: This is the minimum repair level needed to repair this item.
+## Valid values are > 0
+## This defaults to 0
+#
+# MinimumQuantity: This is the minimum number of items needed to repair this item ignoring all other repair bonuses.
+## This is typically the number of the repair material needed to create a new item, for example for a sword it is 2, for an axe it is 3
+## This defaults to 2
+#
+# XpMultiplier: This is the amount to multiply the xp bonus by.
+## This defaults to 1
+#
+#
+# The following is an example of a repair.*.yml config which adds the ability to repair Chainmail armor using fire.
+#
+#
+###
+Repairables:
+    ChainHelmet:
+        ItemId: 302
+        ItemType: ARMOR
+        RepairMaterialId: 51
+        MaximumDurability: 165
+        MinimumQuantity: 5
+        XpMultiplier: 2
+    ChainChest:
+        ItemId: 303
+        ItemType: ARMOR
+        RepairMaterialId: 51
+        MaximumDurability: 240
+        MinimumQuantity: 8
+        XpMultiplier: 2
+    ChainLegs:
+        ItemId: 304
+        ItemType: ARMOR
+        RepairMaterialId: 51
+        MaximumDurability: 225
+        MinimumQuantity: 7
+        XpMultiplier: 2
+    ChainBoots:
+        ItemId: 305
+        ItemType: ARMOR
+        RepairMaterialId: 51
+        RepairMaterialMetadata: -1
+        MaximumDurability: 195
+        MinimumQuantity: 4
+        XpMultiplier: 2

pom.xml

@@ -1,125 +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">
-    <modelVersion>4.0.0</modelVersion>
-    <groupId>com.gmail.nossr50.mcMMO</groupId>
-    <artifactId>mcMMO</artifactId>
-    <version>1.2.11</version>
-    <name>mcMMO</name>
-    <url>https://github.com/TheYeti/mcMMO</url>
-    <issueManagement>
-        <system>GitHub</system>
-        <url>https://github.com/TheYeti/mcMMO/issues</url>
-    </issueManagement>
-    <build>
-        <finalName>mcMMO</finalName>
-        <sourceDirectory>${basedir}/src/main/java</sourceDirectory>
-        <resources>
-            <resource>
-                <targetPath>.</targetPath>
-                <filtering>true</filtering>
-                <directory>${basedir}/src/main/resources/</directory>
-                <includes>
-                    <include>*.yml</include>
-                </includes>
-            </resource>
-            <resource>
-                <targetPath>resources</targetPath>
-                <filtering>false</filtering>
-                <directory>${basedir}/src/main/resources/xpbar/</directory>
-                <includes>
-                    <include>xpbar*.png</include>
-                </includes>
-            </resource>
-            <resource>
-                <targetPath>resources</targetPath>
-                <filtering>false</filtering>
-                <directory>${basedir}/src/main/resources/healthbar/</directory>
-                <includes>
-                    <include>health*.png</include>
-                </includes>
-            </resource>
-            <resource>
-                <targetPath>resources</targetPath>
-                <filtering>false</filtering>
-                <directory>${basedir}/src/main/resources/skillicon/</directory>
-                <includes>
-                    <include>*.png</include>
-                </includes>
-            </resource>
-            <resource>
-                <targetPath>resources</targetPath>
-                <filtering>false</filtering>
-                <directory>${basedir}/src/main/resources/sound/</directory>
-                <includes>
-                    <include>*.wav</include>
-                </includes>
-            </resource>
-            <resource>
-            	<targetPath>com/gmail/nossr50/locale</targetPath>
-            	<filtering>true</filtering>
-            	<directory>${basedir}/src/main/resources/locale/</directory>
-            	<includes>
-            		<include>locale*.properties</include>
-            	</includes>
-            </resource>
-        </resources>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-compiler-plugin</artifactId>
-                <version>2.3.2</version>
-                <configuration>
-                    <source>1.6</source>
-                    <target>1.6</target>
-                    <excludes>
-                    </excludes>
-                </configuration>
-            </plugin>
-            <plugin>
-                <artifactId>maven-assembly-plugin</artifactId>
-                <configuration>
-                    <descriptors>
-                        <descriptor>src/main/assembly/package.xml</descriptor>
-                    </descriptors>
-                </configuration>
-                <executions>
-                    <execution>
-                        <id>build</id>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>single</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
-        </plugins>
-    </build>
-    <repositories>
-        <repository>
-            <id>bukkit-repo</id>
-            <url>http://repo.bukkit.org/content/groups/public/</url>
-        </repository>
-        <repository>
-        	<id>spout-repo</id>
-        	<url>http://nexus.getspout.org/content/groups/public/</url>
-        </repository>
-    </repositories>
-    <dependencies>
-        <dependency>
-            <groupId>org.bukkit</groupId>
-            <artifactId>bukkit</artifactId>
-            <version>1.1-R4-SNAPSHOT</version>
-            <type>jar</type>
-            <scope>compile</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.getspout</groupId>
-            <artifactId>spoutpluginapi</artifactId>
-            <version>dev-SNAPSHOT</version>
-            <type>jar</type>
-            <scope>compile</scope>
-        </dependency>
-    </dependencies>
-    <properties>
-        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    </properties>
-</project>
+<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>
+    <groupId>com.gmail.nossr50.mcMMO</groupId>
+    <artifactId>mcMMO</artifactId>
+    <version>1.4.03-dev1</version>
+    <name>mcMMO</name>
+    <url>https://github.com/mcMMO-Dev/mcMMO</url>
+    <issueManagement>
+        <url>https://github.com/mcMMO-Dev/mcMMO/issues</url>
+        <system>GitHub</system>
+    </issueManagement>
+    <build>
+        <finalName>mcMMO</finalName>
+        <sourceDirectory>${basedir}/src/main/java</sourceDirectory>
+        <resources>
+            <resource>
+                <targetPath>.</targetPath>
+                <filtering>true</filtering>
+                <directory>${basedir}/src/main/resources/</directory>
+                <includes>
+                    <include>*.yml</include>
+                    <include>.jenkins</include>
+                </includes>
+            </resource>
+            <resource>
+                <targetPath>resources</targetPath>
+                <filtering>false</filtering>
+                <directory>${basedir}/src/main/resources/xpbar/</directory>
+                <includes>
+                    <include>xpbar*.png</include>
+                </includes>
+            </resource>
+            <resource>
+                <targetPath>resources</targetPath>
+                <filtering>false</filtering>
+                <directory>${basedir}/src/main/resources/healthbar/</directory>
+                <includes>
+                    <include>health*.png</include>
+                </includes>
+            </resource>
+            <resource>
+                <targetPath>resources</targetPath>
+                <filtering>false</filtering>
+                <directory>${basedir}/src/main/resources/skillicon/</directory>
+                <includes>
+                    <include>*.png</include>
+                </includes>
+            </resource>
+            <resource>
+                <targetPath>resources</targetPath>
+                <filtering>false</filtering>
+                <directory>${basedir}/src/main/resources/sound/</directory>
+                <includes>
+                    <include>*.wav</include>
+                </includes>
+            </resource>
+            <resource>
+                <targetPath>com/gmail/nossr50/locale</targetPath>
+                <filtering>true</filtering>
+                <directory>${basedir}/src/main/resources/locale/</directory>
+                <includes>
+                    <include>locale*.properties</include>
+                </includes>
+            </resource>
+        </resources>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <version>2.3.2</version>
+                <configuration>
+                    <source>1.6</source>
+                    <target>1.6</target>
+                    <excludes>
+                    </excludes>
+                </configuration>
+            </plugin>
+            <plugin>
+                <artifactId>maven-assembly-plugin</artifactId>
+                <configuration>
+                    <descriptors>
+                        <descriptor>src/main/assembly/package.xml</descriptor>
+                    </descriptors>
+                </configuration>
+                <executions>
+                    <execution>
+                        <id>build</id>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>single</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-shade-plugin</artifactId>
+                <version>1.5</version>
+                <configuration>
+                    <artifactSet>
+                        <includes>
+                            <include>com.turt2live.metrics:MetricsExtension</include>
+                        </includes>
+                    </artifactSet>
+                    <relocations>
+                        <relocation>
+                            <pattern>com.turt2live.metrics</pattern>
+                            <shadedPattern>com.gmail.nossr50.metrics.mcstats</shadedPattern>
+                        </relocation>
+                    </relocations>
+                </configuration>
+                <executions>
+                    <execution>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>shade</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+        <extensions>
+            <extension>
+                <groupId>org.apache.maven.wagon</groupId>
+                <artifactId>wagon-file</artifactId>
+                <version>2.2</version>
+            </extension>
+        </extensions>
+    </build>
+    <repositories>
+        <repository>
+            <id>bukkit-repo</id>
+            <url>http://repo.bukkit.org/content/groups/public/</url>
+        </repository>
+        <repository>
+            <id>spout-repo</id>
+            <url>http://nexus.spout.org/content/groups/public/</url>
+        </repository>
+        <repository>
+            <id>Plugin MetricsExtension</id>
+            <url>http://repo.turt2live.com</url>
+        </repository>
+    </repositories>
+    <dependencies>
+        <dependency>
+            <groupId>org.bukkit</groupId>
+            <artifactId>bukkit</artifactId>
+            <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">
-	<id>bin</id>
-	<includeBaseDirectory>false</includeBaseDirectory>
-	<formats>
-		<format>zip</format>
-	</formats>
-	<files>
-		<file>
-			<source>${project.build.directory}/${artifactId}.jar</source>
-			<outputDirectory>/</outputDirectory>
-			<destName>mcMMO.jar</destName>
-		</file>
-	</files>
+<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>
+	<includeBaseDirectory>false</includeBaseDirectory>
+	<formats>
+		<format>zip</format>
+	</formats>
+	<files>
+		<file>
+			<source>${project.build.directory}/${artifactId}.jar</source>
+			<outputDirectory>/</outputDirectory>
+			<destName>mcMMO.jar</destName>
+		</file>
+	</files>
 </assembly>

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

@@ -1,463 +0,0 @@
-/*
-	This file is part of mcMMO.
-
-    mcMMO is free software: you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    mcMMO is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with mcMMO.  If not, see <http://www.gnu.org/licenses/>.
-*/
-package com.gmail.nossr50;
-
-import org.bukkit.Bukkit;
-import org.bukkit.World;
-import org.bukkit.entity.*;
-import org.bukkit.event.entity.EntityDamageByEntityEvent;
-import org.bukkit.event.entity.EntityDamageEvent;
-import org.bukkit.event.entity.EntityDamageEvent.DamageCause;
-import org.bukkit.plugin.Plugin;
-
-import com.gmail.nossr50.config.LoadProperties;
-import com.gmail.nossr50.datatypes.PlayerProfile;
-import com.gmail.nossr50.datatypes.SkillType;
-import com.gmail.nossr50.locale.mcLocale;
-import com.gmail.nossr50.party.Party;
-import com.gmail.nossr50.skills.Acrobatics;
-import com.gmail.nossr50.skills.Archery;
-import com.gmail.nossr50.skills.Axes;
-import com.gmail.nossr50.skills.Skills;
-import com.gmail.nossr50.skills.Swords;
-import com.gmail.nossr50.skills.Taming;
-import com.gmail.nossr50.skills.Unarmed;
-
-public class Combat 
-{
-	public static void combatChecks(EntityDamageEvent event, mcMMO pluginx)
-	{
-		if(event.isCancelled() || event.getDamage() == 0)
-			return;
-		
-		if(event instanceof EntityDamageByEntityEvent)
-		{	
-			/*
-			 * OFFENSIVE CHECKS FOR PLAYERS VERSUS ENTITIES
-			 */
-			if(((EntityDamageByEntityEvent) event).getDamager() instanceof Player)
-			{
-				//Declare Things
-				EntityDamageByEntityEvent eventb = (EntityDamageByEntityEvent) event;
-				Player attacker = (Player)((EntityDamageByEntityEvent) event).getDamager();
-				PlayerProfile PPa = Users.getProfile(attacker);
-				
-				//Damage modifiers
-				if(mcPermissions.getInstance().unarmed(attacker) && attacker.getItemInHand().getTypeId() == 0) //Unarmed
-					Unarmed.unarmedBonus(attacker, eventb);
-				if(m.isAxes(attacker.getItemInHand()) && mcPermissions.getInstance().axes(attacker) && Users.getProfile(attacker).getSkillLevel(SkillType.AXES) >= 500)
-				{
-					int damage = event.getDamage()+4;
-				    event.setDamage(damage);
-				}
-				
-				//If there are any abilities to activate
-		    	combatAbilityChecks(attacker, PPa, pluginx);
-		    	
-		    	//Check for offensive procs
-		    	if(!(((EntityDamageByEntityEvent) event).getDamager() instanceof Arrow))
-		    	{
-			    	if(mcPermissions.getInstance().axes(attacker))
-			    		Axes.axeCriticalCheck(attacker, eventb, pluginx); //Axe Critical Checks
-			    	
-			    	if(!pluginx.misc.bleedTracker.contains((LivingEntity) event.getEntity())) //Swords Bleed
-			   			Swords.bleedCheck(attacker, (LivingEntity)event.getEntity(), pluginx);
-			    	
-				   	if(event.getEntity() instanceof Player && mcPermissions.getInstance().unarmed(attacker))
-				   	{
-				   		Player defender = (Player)event.getEntity();
-				   		Unarmed.disarmProcCheck(attacker, defender);
-				    }
-			    	
-			    	//Modify the event damage if Attacker is Berserk
-			    	if(PPa.getBerserkMode())
-			    		event.setDamage(event.getDamage() + (event.getDamage() / 2));
-		       	
-			   		//Handle Ability Interactions
-			   		if(PPa.getSkullSplitterMode() && m.isAxes(attacker.getItemInHand()))
-		       			Axes.applyAoeDamage(attacker, eventb, pluginx);
-		      		if(PPa.getSerratedStrikesMode() && m.isSwords(attacker.getItemInHand()))
-		       			Swords.applySerratedStrikes(attacker, eventb, pluginx);
-		      		
-		      		//Experience
-		      		if(event.getEntity() instanceof Player)
-		      		{
-		      			Player defender = (Player)event.getEntity();
-		      			PlayerProfile PPd = Users.getProfile(defender);
-			    		if(attacker != null && defender != null && LoadProperties.pvpxp)
-			    		{
-			    			if(System.currentTimeMillis() >= (PPd.getRespawnATS()*1000) + 5000 
-			    					&& ((PPd.getLastLogin()+5)*1000) < System.currentTimeMillis()
-			    					&& defender.getHealth() >= 1)
-			    			{
-			    				//Prevent a ridiculous amount of XP being granted by capping it at the remaining health of the mob
-				      			int hpLeft = defender.getHealth(), xpinc = 0;
-				      			
-				      			if(hpLeft < event.getDamage())
-				      			{
-				      			    if(hpLeft > 0)
-				      			        xpinc = hpLeft;
-				      			    else
-				      			        xpinc = 0;
-				      			} else
-				      				xpinc = event.getDamage();
-				      			
-			    				int xp = (int) (xpinc * 2 * LoadProperties.pvpxprewardmodifier);
-			    				
-				    			if(m.isAxes(attacker.getItemInHand()) && mcPermissions.getInstance().axes(attacker))
-				    				PPa.addXP(SkillType.AXES, xp*10, attacker);
-				    			if(m.isSwords(attacker.getItemInHand()) && mcPermissions.getInstance().swords(attacker))
-				    				PPa.addXP(SkillType.SWORDS, xp*10, attacker);
-				    			if(attacker.getItemInHand().getTypeId() == 0 && mcPermissions.getInstance().unarmed(attacker))
-				    				PPa.addXP(SkillType.UNARMED, xp*10, attacker);
-			    			}
-			    		}
-		      		}
-		      		
-		      		if(!pluginx.misc.mobSpawnerList.contains(event.getEntity()))
-		      		{
-		      			int xp = getXp(event.getEntity(), event);
-
-						if(m.isSwords(attacker.getItemInHand()) && mcPermissions.getInstance().swords(attacker))
-							PPa.addXP(SkillType.SWORDS, xp*10, attacker);
-						else if(m.isAxes(attacker.getItemInHand()) && mcPermissions.getInstance().axes(attacker))
-							PPa.addXP(SkillType.AXES, xp*10, attacker);
-						else if(attacker.getItemInHand().getTypeId() == 0 && mcPermissions.getInstance().unarmed(attacker))
-							PPa.addXP(SkillType.UNARMED, xp*10, attacker);
-		      		}
-		      		Skills.XpCheckAll(attacker);
-		      		
-		      		if(event.getEntity() instanceof Wolf)
-		      		{
-		      			Wolf theWolf = (Wolf)event.getEntity();
-		      			
-		      			if(attacker.getItemInHand().getTypeId() == 352 && mcPermissions.getInstance().taming(attacker))
-		      			{
-		      				event.setCancelled(true);
-		      				if(theWolf.isTamed())
-		      				{
-		      				attacker.sendMessage(mcLocale.getString("Combat.BeastLore")+" "+
-		      						mcLocale.getString("Combat.BeastLoreOwner", new Object[] {Taming.getOwnerName(theWolf)})+" "+
-		      						mcLocale.getString("Combat.BeastLoreHealthWolfTamed", new Object[] {theWolf.getHealth()}));
-		      				} 
-		      				else
-		      				{
-		      					attacker.sendMessage(mcLocale.getString("Combat.BeastLore")+" "+
-		      							mcLocale.getString("Combat.BeastLoreHealthWolf", new Object[] {theWolf.getHealth()}));
-		      				}
-		      			}
-		      		}
-				}
-			}
-		}
-		
-		/*
-		 * OFFENSIVE CHECKS FOR WOLVES VERSUS ENTITIES
-		 */
-		if(event instanceof EntityDamageByEntityEvent && ((EntityDamageByEntityEvent) event).getDamager() instanceof Wolf)
-		{
-			EntityDamageByEntityEvent eventb = (EntityDamageByEntityEvent) event;
-			Wolf theWolf = (Wolf) eventb.getDamager();
-			if(theWolf.isTamed() && Taming.ownerOnline(theWolf, pluginx))
-			{
-				if(Taming.getOwner(theWolf, pluginx) == null)
-					return;
-				Player master = Taming.getOwner(theWolf, pluginx);
-				PlayerProfile PPo = Users.getProfile(master);
-				
-				if(mcPermissions.getInstance().taming(master))
-				{
-					//Sharpened Claws
-					if(PPo.getSkillLevel(SkillType.TAMING) >= 750)
-					{
-						event.setDamage(event.getDamage() + 2);
-					}
-					
-					//Gore
-					if(Math.random() * 1000 <= PPo.getSkillLevel(SkillType.TAMING))
-					{
-						event.setDamage(event.getDamage() * 2);
-						
-						if(event.getEntity() instanceof Player)
-						{
-							Player target = (Player)event.getEntity();
-							target.sendMessage(mcLocale.getString("Combat.StruckByGore")); //$NON-NLS-1$
-							Users.getProfile(target).setBleedTicks(2);
-						}
-						else
-							pluginx.misc.addToBleedQue((LivingEntity) event.getEntity());
-						
-						master.sendMessage(mcLocale.getString("Combat.Gore")); //$NON-NLS-1$
-					}
-					if(!event.getEntity().isDead() && !pluginx.misc.mobSpawnerList.contains(event.getEntity()))
-					{
-						int xp = getXp(event.getEntity(), event);
-						Users.getProfile(master).addXP(SkillType.TAMING, xp*10, master);
-						
-						if(event.getEntity() instanceof Player)
-						{
-							xp = (event.getDamage() * 2);
-							Users.getProfile(master).addXP(SkillType.TAMING, (int)((xp*10)*1.5), master);
-						}
-						Skills.XpCheckSkill(SkillType.TAMING, master);
-					}
-				}
-			}
-		}
-		//Another offensive check for Archery
-		if(event instanceof EntityDamageByEntityEvent && event.getCause() == DamageCause.PROJECTILE && ((EntityDamageByEntityEvent) event).getDamager() instanceof Arrow)
-			archeryCheck((EntityDamageByEntityEvent)event, pluginx);
-			
-		/*
-		 * DEFENSIVE CHECKS
-		 */
-		if(event instanceof EntityDamageByEntityEvent && event.getEntity() instanceof Player)
-		{
-			Swords.counterAttackChecks((EntityDamageByEntityEvent)event);
-			Acrobatics.dodgeChecks((EntityDamageByEntityEvent)event);
-		}
-		/*
-		 * DEFENSIVE CHECKS FOR WOLVES
-		 */
-		
-		if(event.getEntity() instanceof Wolf)
-		{
-			Wolf theWolf = (Wolf) event.getEntity();
-			
-			if(theWolf.isTamed() && Taming.ownerOnline(theWolf, pluginx))
-			{
-				if(Taming.getOwner(theWolf, pluginx) == null)
-					return;
-				
-				Player master = Taming.getOwner(theWolf, pluginx);
-				PlayerProfile PPo = Users.getProfile(master);
-				if(mcPermissions.getInstance().taming(master))
-				{				
-					//Shock-Proof
-					if((event.getCause() == DamageCause.ENTITY_EXPLOSION || event.getCause() == DamageCause.BLOCK_EXPLOSION) && PPo.getSkillLevel(SkillType.TAMING) >= 500)
-					{
-						event.setDamage(2);
-					}
-					
-					//Thick Fur
-					if(PPo.getSkillLevel(SkillType.TAMING) >= 250)
-						event.setDamage(event.getDamage() / 2);
-				}
-			}
-		}
-	}
-	
-	public static void combatAbilityChecks(Player attacker, PlayerProfile PPa, Plugin pluginx)
-	{
-		//Check to see if any abilities need to be activated
-		if(PPa.getAxePreparationMode())
-			Axes.skullSplitterCheck(attacker);
-		if(PPa.getSwordsPreparationMode())
-			Swords.serratedStrikesActivationCheck(attacker);
-		if(PPa.getFistsPreparationMode())
-			Unarmed.berserkActivationCheck(attacker);
-	}
-	public static void archeryCheck(EntityDamageByEntityEvent event, mcMMO pluginx)
-	{
-		Arrow arrow = (Arrow)event.getDamager();
-    	Entity y = arrow.getShooter();
-    	Entity x = event.getEntity();
-    	if(x instanceof Player)
-    	{
-    		Player defender = (Player)x;
-    		PlayerProfile PPd = Users.getProfile(defender);
-    		if(PPd == null)
-    			Users.addUser(defender);
-    		if(mcPermissions.getInstance().unarmed(defender) && defender.getItemInHand().getTypeId() == 0)
-    		{
-	    		if(defender != null && PPd.getSkillLevel(SkillType.UNARMED) >= 1000)
-	    		{
-	    			if(Math.random() * 1000 <= 500)
-	    			{
-	    				event.setCancelled(true);
-	    				defender.sendMessage(mcLocale.getString("Combat.ArrowDeflect")); //$NON-NLS-1$
-	    				return;
-	    			}
-	    		} else if(defender != null && Math.random() * 1000 <= (PPd.getSkillLevel(SkillType.UNARMED) / 2))
-	    		{
-	    			event.setCancelled(true);
-	    			defender.sendMessage(mcLocale.getString("Combat.ArrowDeflect")); //$NON-NLS-1$
-	    			return;
-	    		}
-    		}
-    	}
-    	/*
-    	 * If attacker is player
-    	 */
-    	if(y instanceof Player)
-    	{
-    		Player attacker = (Player)y;
-    		PlayerProfile PPa = Users.getProfile(attacker);
-    		if(mcPermissions.getInstance().archery(attacker))
-    		{
-    			Archery.trackArrows(pluginx, x, event, attacker);
-    			
-    			/*
-    			 * IGNITION
-    			 */
-    			Archery.ignitionCheck(x, event, attacker);
-    		/*
-    		 * Defender is Monster
-    		 */
-    		if(!pluginx.misc.mobSpawnerList.contains(x))
-    		{
-    			int xp = getXp(event.getEntity(), event);
-				PPa.addXP(SkillType.ARCHERY, xp*10, attacker);
-    		}
-    		/*
-    		 * Attacker is Player
-    		 */
-    		if(x instanceof Player){
-    			Player defender = (Player)x;
-    			PlayerProfile PPd = Users.getProfile(defender);
-    			/*
-    			 * Stuff for the daze proc
-    			 */
-    	    		if(PPa.inParty() && PPd.inParty())
-    	    		{
-    					if(Party.getInstance().inSameParty(defender, attacker))
-    					{
-    						event.setCancelled(true);
-    						return;
-    					}
-    	    		}
-    	    		/*
-    	    		 * PVP XP
-    	    		 */
-    	    		if(LoadProperties.pvpxp && !Party.getInstance().inSameParty(attacker, defender) 
-    	    				&& ((PPd.getLastLogin()+5)*1000) < System.currentTimeMillis() && !attacker.getName().equals(defender.getName()))
-    	    		{
-    	    			int xp = (int) ((event.getDamage() * 2) * 10);
-    	    			PPa.addXP(SkillType.ARCHERY, xp, attacker);
-    	    		}
-    				/*
-    				 * DAZE PROC
-    				 */
-    	    		Archery.dazeCheck(defender, attacker);
-    			}
-    		}
-    		Skills.XpCheckSkill(SkillType.ARCHERY, attacker);
-    	}
-    }
-	
-    /**
-     * Attempt to damage target for value dmg with reason CUSTOM
-     * 
-     * @param target LivingEntity which to attempt to damage
-     * @param dmg Amount of damage to attempt to do
-     */
-    public static void dealDamage(LivingEntity target, int dmg){
-    	dealDamage(target, dmg, EntityDamageEvent.DamageCause.CUSTOM);
-    }
-    
-    /**
-     * Attempt to damage target for value dmg with reason cause
-     * 
-     * @param target LivingEntity which to attempt to damage
-     * @param dmg Amount of damage to attempt to do
-     * @param cause DamageCause to pass to damage event
-     */
-    public static void dealDamage(LivingEntity target, int dmg, DamageCause cause) {
-    	EntityDamageEvent ede = new EntityDamageEvent(target, cause, dmg);
-    	Bukkit.getPluginManager().callEvent(ede);
-    	if(ede.isCancelled()) return;
-    	
-    	target.damage(ede.getDamage());
-    }
-    
-    /**
-     * Attempt to damage target for value dmg with reason ENTITY_ATTACK with damager attacker
-     * 
-     * @param target LivingEntity which to attempt to damage
-     * @param dmg Amount of damage to attempt to do
-     * @param attacker Player to pass to event as damager
-     */
-    public static void dealDamage(LivingEntity target, int dmg, Player attacker) {
-    	EntityDamageEvent ede = new EntityDamageByEntityEvent(attacker, target, EntityDamageEvent.DamageCause.ENTITY_ATTACK, dmg);
-    	Bukkit.getPluginManager().callEvent(ede);
-    	if(ede.isCancelled()) return;
-    	
-    	target.damage(ede.getDamage());
-    }
-    
-    public static boolean pvpAllowed(EntityDamageByEntityEvent event, World world)
-    {
-    	if(!event.getEntity().getWorld().getPVP())
-    		return false;
-    	//If it made it this far, pvp is enabled
-    	return true;
-    }
-    public static int getXp(Entity entity, EntityDamageEvent event)
-    {
-    	int xp = 0;
-    	if(entity instanceof LivingEntity)
-    	{
-    		LivingEntity le = (LivingEntity)entity;
-	    	//Prevent a ridiculous amount of XP being granted by capping it at the remaining health of the entity
-			int hpLeft = le.getHealth(), xpinc = 0;
-				
-			if(hpLeft < event.getDamage())
-            {
-			    if(hpLeft > 0)
-			        xpinc = hpLeft;
-                else
-                    xpinc = 0;
-            } 
-			else
-			    xpinc = event.getDamage();
-			
-	    	if(entity instanceof Animals)
-	    	{
-		    	xp = (int) (xpinc * 1);
-	    	} else
-	    	{
-	    		if(entity instanceof Enderman)
-					xp = (xpinc * 2);
-		    	else if(entity instanceof Creeper)
-					xp = (xpinc * 4);
-		    	else if(entity instanceof Silverfish)
-					xp = (xpinc * 3);
-		    	else if(entity instanceof CaveSpider)
-					xp = (xpinc * 3);
-		    	else if(entity instanceof Spider)
-					xp = (xpinc * 3);
-		    	else if(entity instanceof Skeleton)
-					xp = (xpinc * 2);
-		    	else if(entity instanceof Zombie)
-					xp = (xpinc * 2);
-		    	else if(entity instanceof PigZombie)
-					xp = (xpinc * 3);
-		    	else if(entity instanceof Slime)
-					xp = (xpinc * 2);
-		    	else if(entity instanceof Ghast)
-					xp = (xpinc * 3);
-		    	else if(entity instanceof Blaze)
-		    		xp = (xpinc * 3);
-		    	else if(entity instanceof EnderDragon)
-		    		xp = (xpinc * 8);
-		    	else if(entity instanceof MagmaCube)
-					xp = (xpinc * 2);
-	    	}
-    	}
-    	return xp;
-    }
-}

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

@@ -1,211 +0,0 @@
-/*
-	This file is part of mcMMO.
-
-    mcMMO is free software: you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    mcMMO is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with mcMMO.  If not, see <http://www.gnu.org/licenses/>.
-*/
-package com.gmail.nossr50;
-
-import java.sql.Connection;
-import java.sql.DriverManager;
-import java.sql.ResultSet;
-import java.sql.SQLException;
-import java.util.HashMap;
-import java.util.ArrayList;
-import java.sql.PreparedStatement;
-
-import com.gmail.nossr50.config.LoadProperties;
-
-public class Database {
-
-	private mcMMO plugin;
-	private String connectionString;
-
-	public Database(mcMMO instance) {
-		this.plugin = instance;
-		this.connectionString = "jdbc:mysql://" + LoadProperties.MySQLserverName + ":" + LoadProperties.MySQLport + "/" + LoadProperties.MySQLdbName + "?user=" + LoadProperties.MySQLuserName + "&password=" + LoadProperties.MySQLdbPass;
-		// Load the driver instance
-		try {
-			Class.forName("com.mysql.jdbc.Driver");
-			DriverManager.getConnection(connectionString);
-		} catch (ClassNotFoundException e) {
-			plugin.getServer().getLogger().warning(e.getLocalizedMessage());
-		} catch (SQLException e) {
-			plugin.getServer().getLogger().warning(e.getLocalizedMessage());
-			System.out.println("SQLException: " + e.getMessage());
-			System.out.println("SQLState: " + e.getSQLState());
-			System.out.println("VendorError: " + e.getErrorCode());
-		}
-	}
-	//Create the DB structure
-	public void createStructure() {
-		Write("CREATE TABLE IF NOT EXISTS `" + LoadProperties.MySQLtablePrefix + "huds` (`user_id` int(10) unsigned NOT NULL,"
-				+ "`hudtype` varchar(50) NOT NULL DEFAULT '',"
-				+ "PRIMARY KEY (`user_id`)) ENGINE=MyISAM DEFAULT CHARSET=latin1;");
-		Write("CREATE TABLE IF NOT EXISTS `" + LoadProperties.MySQLtablePrefix + "users` (`id` int(10) unsigned NOT NULL AUTO_INCREMENT,"
-				+ "`user` varchar(40) NOT NULL,"
-				+ "`lastlogin` int(32) unsigned NOT NULL,"
-				+ "`party` varchar(100) NOT NULL DEFAULT '',"
-				+ "PRIMARY KEY (`id`),"
-				+ "UNIQUE KEY `user` (`user`)) ENGINE=MyISAM  DEFAULT CHARSET=latin1 AUTO_INCREMENT=1;");
-		Write("CREATE TABLE IF NOT EXISTS `" + LoadProperties.MySQLtablePrefix + "cooldowns` (`user_id` int(10) unsigned NOT NULL,"
-				+ "`taming` int(32) unsigned NOT NULL DEFAULT '0',"
-				+ "`mining` int(32) unsigned NOT NULL DEFAULT '0',"
-				+ "`woodcutting` int(32) unsigned NOT NULL DEFAULT '0',"
-				+ "`repair` int(32) unsigned NOT NULL DEFAULT '0',"
-				+ "`unarmed` int(32) unsigned NOT NULL DEFAULT '0',"
-				+ "`herbalism` int(32) unsigned NOT NULL DEFAULT '0',"
-				+ "`excavation` int(32) unsigned NOT NULL DEFAULT '0',"
-				+ "`archery` int(32) unsigned NOT NULL DEFAULT '0',"
-				+ "`swords` int(32) unsigned NOT NULL DEFAULT '0',"
-				+ "`axes` int(32) unsigned NOT NULL DEFAULT '0',"
-				+ "`acrobatics` int(32) unsigned NOT NULL DEFAULT '0',"
-				+ "PRIMARY KEY (`user_id`)) ENGINE=MyISAM DEFAULT CHARSET=latin1;");
-		Write("CREATE TABLE IF NOT EXISTS `" + LoadProperties.MySQLtablePrefix + "skills` (`user_id` int(10) unsigned NOT NULL,"
-				+ "`taming` int(10) unsigned NOT NULL DEFAULT '0',"
-				+ "`mining` int(10) unsigned NOT NULL DEFAULT '0',"
-				+ "`woodcutting` int(10) unsigned NOT NULL DEFAULT '0',"
-				+ "`repair` int(10) unsigned NOT NULL DEFAULT '0',"
-				+ "`unarmed` int(10) unsigned NOT NULL DEFAULT '0',"
-				+ "`herbalism` int(10) unsigned NOT NULL DEFAULT '0',"
-				+ "`excavation` int(10) unsigned NOT NULL DEFAULT '0',"
-				+ "`archery` int(10) unsigned NOT NULL DEFAULT '0',"
-				+ "`swords` int(10) unsigned NOT NULL DEFAULT '0',"
-				+ "`axes` int(10) unsigned NOT NULL DEFAULT '0',"
-				+ "`acrobatics` int(10) unsigned NOT NULL DEFAULT '0',"
-				+ "PRIMARY KEY (`user_id`)) ENGINE=MyISAM DEFAULT CHARSET=latin1;");
-		Write("CREATE TABLE IF NOT EXISTS `" + LoadProperties.MySQLtablePrefix + "experience` (`user_id` int(10) unsigned NOT NULL,"
-				+ "`taming` int(10) unsigned NOT NULL DEFAULT '0',"
-				+ "`mining` int(10) unsigned NOT NULL DEFAULT '0',"
-				+ "`woodcutting` int(10) unsigned NOT NULL DEFAULT '0',"
-				+ "`repair` int(10) unsigned NOT NULL DEFAULT '0',"
-				+ "`unarmed` int(10) unsigned NOT NULL DEFAULT '0',"
-				+ "`herbalism` int(10) unsigned NOT NULL DEFAULT '0',"
-				+ "`excavation` int(10) unsigned NOT NULL DEFAULT '0',"
-				+ "`archery` int(10) unsigned NOT NULL DEFAULT '0',"
-				+ "`swords` int(10) unsigned NOT NULL DEFAULT '0',"
-				+ "`axes` int(10) unsigned NOT NULL DEFAULT '0',"
-				+ "`acrobatics` int(10) unsigned NOT NULL DEFAULT '0',"
-				+ "PRIMARY KEY (`user_id`)) ENGINE=MyISAM DEFAULT CHARSET=latin1;");
-		Write("CREATE TABLE IF NOT EXISTS `" + LoadProperties.MySQLtablePrefix + "spawn` (`user_id` int(10) NOT NULL,"
-				+ "`x` int(64) NOT NULL DEFAULT '0',"
-				+ "`y` int(64) NOT NULL DEFAULT '0',"
-				+ "`z` int(64) NOT NULL DEFAULT '0',"
-				+ "`world` varchar(50) NOT NULL DEFAULT '',"
-				+ "PRIMARY KEY (`user_id`)) ENGINE=MyISAM DEFAULT CHARSET=latin1;");
-		
-		Write("DROP TABLE IF EXISTS `"+LoadProperties.MySQLtablePrefix+"skills2`");
-		Write("DROP TABLE IF EXISTS `"+LoadProperties.MySQLtablePrefix+"experience2`");
-		
-		checkDatabaseStructure();
-	}
-
-	public void checkDatabaseStructure()
-	{
-		String sql = "SELECT * FROM  `mcmmo_experience` ORDER BY  `"+LoadProperties.MySQLtablePrefix+"experience`.`fishing` ASC LIMIT 0 , 30";
-		
-		ResultSet rs = null;
-		HashMap<Integer, ArrayList<String>> Rows = new HashMap<Integer, ArrayList<String>>();
-		try {
-			Connection conn = DriverManager.getConnection(connectionString);
-			PreparedStatement stmt = conn.prepareStatement(sql);
-			if (stmt.executeQuery() != null) {
-				stmt.executeQuery();
-				rs = stmt.getResultSet();
-				while (rs.next()) {
-					ArrayList<String> Col = new ArrayList<String>();
-					for (int i = 1; i <= rs.getMetaData().getColumnCount(); i++) {
-						Col.add(rs.getString(i));
-					}
-					Rows.put(rs.getRow(), Col);
-				}
-			}
-			conn.close();
-		} catch (SQLException ex) {
-			System.out.println("Updating mcMMO MySQL tables...");
-			Write("ALTER TABLE `"+LoadProperties.MySQLtablePrefix + "skills` ADD `fishing` int(10) NOT NULL DEFAULT '0' ;");
-			Write("ALTER TABLE `"+LoadProperties.MySQLtablePrefix + "experience` ADD `fishing` int(10) NOT NULL DEFAULT '0' ;");
-		}
-	}
-	
-	// write query
-	public boolean Write(String sql) {
-		try {
-			Connection conn = DriverManager.getConnection(connectionString);
-			PreparedStatement stmt = conn.prepareStatement(sql);
-			stmt.executeUpdate();
-			conn.close();
-			return true;
-		} catch (SQLException ex) {
-			System.out.println("SQLException: " + ex.getMessage());
-			System.out.println("SQLState: " + ex.getSQLState());
-			System.out.println("VendorError: " + ex.getErrorCode());
-			return false;
-		}
-	}
-
-	// Get Int
-	// only return first row / first field
-	public Integer GetInt(String sql) {
-		ResultSet rs = null;
-		Integer result = 0;
-		try {
-			Connection conn = DriverManager.getConnection(connectionString);
-			PreparedStatement stmt = conn.prepareStatement(sql);
-			stmt = conn.prepareStatement(sql);
-			if (stmt.executeQuery() != null) {
-				stmt.executeQuery();
-				rs = stmt.getResultSet();
-				if (rs.next()) {
-					result = rs.getInt(1);
-				} else {
-					result = 0;
-				}
-			}
-			conn.close();
-		} catch (SQLException ex) {
-			System.out.println("SQLException: " + ex.getMessage());
-			System.out.println("SQLState: " + ex.getSQLState());
-			System.out.println("VendorError: " + ex.getErrorCode());
-		}
-
-		return result;
-	}
-
-	// read query
-	public HashMap<Integer, ArrayList<String>> Read(String sql) {
-		ResultSet rs = null;
-		HashMap<Integer, ArrayList<String>> Rows = new HashMap<Integer, ArrayList<String>>();
-		try {
-			Connection conn = DriverManager.getConnection(connectionString);
-			PreparedStatement stmt = conn.prepareStatement(sql);
-			if (stmt.executeQuery() != null) {
-				stmt.executeQuery();
-				rs = stmt.getResultSet();
-				while (rs.next()) {
-					ArrayList<String> Col = new ArrayList<String>();
-					for (int i = 1; i <= rs.getMetaData().getColumnCount(); i++) {
-						Col.add(rs.getString(i));
-					}
-					Rows.put(rs.getRow(), Col);
-				}
-			}
-			conn.close();
-		} catch (SQLException ex) {
-			System.out.println("SQLException: " + ex.getMessage());
-			System.out.println("SQLState: " + ex.getSQLState());
-			System.out.println("VendorError: " + ex.getErrorCode());
-		}
-		return Rows;
-	}
-}

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

@@ -1,104 +0,0 @@
-/*
-	This file is part of mcMMO.
-
-    mcMMO is free software: you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    mcMMO is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with mcMMO.  If not, see <http://www.gnu.org/licenses/>.
-*/
-package com.gmail.nossr50;
-
-import org.bukkit.Location;
-import org.bukkit.Material;
-import org.bukkit.block.Block;
-import org.bukkit.entity.Player;
-import org.bukkit.inventory.ItemStack;
-import org.bukkit.plugin.Plugin;
-import com.gmail.nossr50.config.*;
-import com.gmail.nossr50.locale.mcLocale;
-import com.gmail.nossr50.skills.*;
-
-import com.gmail.nossr50.datatypes.PlayerProfile;
-
-public class Item {
-	
-	public static void itemchecks(Player player, Plugin plugin)
-	{
-		ItemStack inhand = player.getItemInHand();
-		if(LoadProperties.chimaeraWingEnable && inhand.getTypeId() == LoadProperties.chimaeraId)
-		{
-			chimaerawing(player, plugin);
-		}
-	}
-	
-	@SuppressWarnings("deprecation")
-	public static void chimaerawing(Player player, Plugin plugin)
-	{
-		PlayerProfile PP = Users.getProfile(player);
-		ItemStack is = player.getItemInHand();
-		Block block = player.getLocation().getBlock();
-		if(mcPermissions.getInstance().chimaeraWing(player) && is.getTypeId() == LoadProperties.chimaeraId)
-		{
-    		if(Skills.cooldownOver(player, PP.getRecentlyHurt(), 60) && is.getAmount() >= LoadProperties.feathersConsumedByChimaeraWing)
-    		{
-    			Block derp = player.getLocation().getBlock();
-    			int y = derp.getY();
-    			ItemStack[] inventory = player.getInventory().getContents();
-    	    	for(ItemStack x : inventory){
-    	    		if(x != null && x.getTypeId() == LoadProperties.chimaeraId){
-    	    			if(x.getAmount() >= LoadProperties.feathersConsumedByChimaeraWing + 1)
-    	    			{
-    	    				x.setAmount(x.getAmount() - LoadProperties.feathersConsumedByChimaeraWing);
-    	    				player.getInventory().setContents(inventory);
-        	    			player.updateInventory();
-        	    			break;
-    	    			} else {
-    	    				x.setAmount(0);
-    	    				x.setTypeId(0);
-    	    				player.getInventory().setContents(inventory);
-        	    			player.updateInventory();
-        	    			break;
-    	    			}
-    	    		}
-    	    	}
-    			while(y < 127)
-    			{
-    				y++;
-    				if(player != null)
-    				{
-    					if(player.getLocation().getWorld().getBlockAt(block.getX(), y, block.getZ()).getType() != Material.AIR)
-    					{
-	    					player.sendMessage(mcLocale.getString("Item.ChimaeraWingFail")); //$NON-NLS-1$
-	    					player.teleport(player.getLocation().getWorld().getBlockAt(block.getX(), (y - 1), block.getZ()).getLocation());
-	    					return;
-    					}
-    				}
-    			}
-    			if(PP.getMySpawn(player) != null)
-    			{
-    				Location mySpawn = PP.getMySpawn(player);
-    				if(mySpawn != null){
-	    				player.teleport(mySpawn); //Do it twice to prevent weird stuff
-	    				player.teleport(mySpawn);
-    				}
-    			} else {
-    				player.teleport(player.getWorld().getSpawnLocation());
-    			}
-    			player.sendMessage(mcLocale.getString("Item.ChimaeraWingPass")); //$NON-NLS-1$
-    		} else if (!Skills.cooldownOver(player, PP.getRecentlyHurt(), 60) && is.getAmount() >= 10) 
-    		{
-    			player.sendMessage(mcLocale.getString("Item.InjuredWait", new Object[] {Skills.calculateTimeLeft(player, PP.getRecentlyHurt(), 60)})); //$NON-NLS-1$
-    		} else if (is.getTypeId() == LoadProperties.chimaeraId && is.getAmount() <= 9){
-    			player.sendMessage(mcLocale.getString("Item.NeedFeathers")); //$NON-NLS-1$
-    		}
-    	}
-	}
-}

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

@@ -1,279 +0,0 @@
-/*
-	This file is part of mcMMO.
-
-    mcMMO is free software: you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    mcMMO is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with mcMMO.  If not, see <http://www.gnu.org/licenses/>.
-*/
-package com.gmail.nossr50;
-
-import java.io.BufferedReader;
-import java.io.File;
-import java.io.FileReader;
-import java.io.FileWriter;
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.logging.Level;
-import java.util.logging.Logger;
-
-import com.gmail.nossr50.config.LoadProperties;
-import com.gmail.nossr50.datatypes.PlayerStat;
-import com.gmail.nossr50.datatypes.SkillType;
-import com.gmail.nossr50.datatypes.Tree;
-
-public class Leaderboard 
-{
-	static String location = "plugins/mcMMO/FlatFileStuff/mcmmo.users"; //$NON-NLS-1$
-	protected static final Logger log = Logger.getLogger("Minecraft"); //$NON-NLS-1$
-	
-	/*
-	 * Read from the file
-	 */
-	public static void makeLeaderboards()
-	{
-		//Make Trees
-		Tree Mining = new Tree();
-		Tree WoodCutting = new Tree();
-		Tree Herbalism = new Tree();
-		Tree Excavation = new Tree();
-		Tree Acrobatics = new Tree();
-		Tree Repair = new Tree();
-		Tree Swords = new Tree();
-		Tree Axes = new Tree();
-		Tree Archery = new Tree();
-		Tree Unarmed = new Tree();
-		Tree Taming = new Tree();
-		Tree Fishing = new Tree();
-		Tree Enchanting = new Tree();
-		Tree Alchemy = new Tree();
-		Tree PowerLevel = new Tree();
-		
-		//Add Data To Trees
-		try {
-        	//Open the user file
-        	FileReader file = new FileReader(location);
-        	BufferedReader in = new BufferedReader(file);
-        	String line = ""; //$NON-NLS-1$
-        	ArrayList<String> players = new ArrayList<String>();
-        	while((line = in.readLine()) != null)
-        	{
-        		String[] character = line.split(":"); //$NON-NLS-1$
-        		String p = character[0];
-        		
-        		//Prevent the same player from being added multiple times
-        		if(players.contains(p))
-        			continue;
-        		else
-        			players.add(p);
-
-    			int Plvl = 0;
-    			
-    			if(character.length > 1 && m.isInt(character[1]))
-    			{
-    				Mining.add(p, Integer.valueOf(character[1]));
-    				Plvl += Integer.valueOf(character[1]);
-    			}
-    			if(character.length > 5 && m.isInt(character[5])){
-    				WoodCutting.add(p, Integer.valueOf(character[5]));
-    				Plvl += Integer.valueOf(character[5]);
-    			}
-    			if(character.length > 7 && m.isInt(character[7])){
-    				Repair.add(p, Integer.valueOf(character[7]));
-    				Plvl += Integer.valueOf(character[7]);
-    			}
-    			if(character.length > 8 && m.isInt(character[8])){
-    				Unarmed.add(p, Integer.valueOf(character[8]));
-    				Plvl += Integer.valueOf(character[8]);
-    			}
-    			if(character.length > 9 && m.isInt(character[9])){
-    				Herbalism.add(p, Integer.valueOf(character[9]));
-    				Plvl += Integer.valueOf(character[9]);
-    			}
-    			if(character.length > 10 && m.isInt(character[10])){
-    				Excavation.add(p, Integer.valueOf(character[10]));
-    				Plvl += Integer.valueOf(character[10]);
-    			}
-    			if(character.length > 11 && m.isInt(character[11])){
-    				Archery.add(p, Integer.valueOf(character[11]));
-    				Plvl += Integer.valueOf(character[11]);
-    			}
-    			if(character.length > 12 && m.isInt(character[12])){
-    				Swords.add(p, Integer.valueOf(character[12]));
-    				Plvl += Integer.valueOf(character[12]);
-    			}
-    			if(character.length > 13 && m.isInt(character[13])){
-    				Axes.add(p, Integer.valueOf(character[13]));
-    				Plvl += Integer.valueOf(character[13]);
-    			}
-    			if(character.length > 14 && m.isInt(character[14])){
-    				Acrobatics.add(p, Integer.valueOf(character[14]));
-    				Plvl += Integer.valueOf(character[14]);
-    			}
-    			if(character.length > 24 && m.isInt(character[24])){
-    				Taming.add(p, Integer.valueOf(character[24]));
-    				Plvl += Integer.valueOf(character[24]);
-    			}
-    			if(character.length > 34 && m.isInt(character[34]))
-    			{
-    				Fishing.add(p, Integer.valueOf(character[34]));
-    				Plvl += Integer.valueOf(character[34]);
-    			}
-    			
-    			PowerLevel.add(p, Plvl);
-        	}
-        	in.close();
-        } catch (Exception e) {
-            log.log(Level.SEVERE, "Exception while reading " //$NON-NLS-1$
-            		+ location + " (Are you sure you formatted it correctly?)", e); //$NON-NLS-1$
-        }
-        //Write the leader board files
-        leaderWrite(Mining.inOrder(), SkillType.MINING); //$NON-NLS-1$
-        leaderWrite(WoodCutting.inOrder(), SkillType.WOODCUTTING); //$NON-NLS-1$
-        leaderWrite(Repair.inOrder(), SkillType.REPAIR); //$NON-NLS-1$
-        leaderWrite(Unarmed.inOrder(), SkillType.UNARMED); //$NON-NLS-1$
-        leaderWrite(Herbalism.inOrder(), SkillType.HERBALISM); //$NON-NLS-1$
-        leaderWrite(Excavation.inOrder(), SkillType.EXCAVATION); //$NON-NLS-1$
-        leaderWrite(Archery.inOrder(), SkillType.ARCHERY); //$NON-NLS-1$
-        leaderWrite(Swords.inOrder(), SkillType.SWORDS); //$NON-NLS-1$
-        leaderWrite(Axes.inOrder(), SkillType.AXES); //$NON-NLS-1$
-        leaderWrite(Acrobatics.inOrder(), SkillType.ACROBATICS); //$NON-NLS-1$
-        leaderWrite(Taming.inOrder(), SkillType.TAMING); //$NON-NLS-1$
-        leaderWrite(Fishing.inOrder(), SkillType.FISHING); //$NON-NLS-1$
-        leaderWrite(Alchemy.inOrder(), SkillType.ALCHEMY); //$NON-NLS-1$
-        leaderWrite(Enchanting.inOrder(), SkillType.ENCHANTING); //$NON-NLS-1$
-        leaderWrite(PowerLevel.inOrder(), SkillType.ALL); //$NON-NLS-1$
-	}
-	public static void leaderWrite(PlayerStat[] ps, SkillType skillType)
-	{
-		String theLocation = "plugins/mcMMO/FlatFileStuff/Leaderboards/" + skillType + ".mcmmo"; //$NON-NLS-1$ //$NON-NLS-2$
-		//CHECK IF THE FILE EXISTS
-		File theDir = new File(theLocation);
-		if(!theDir.exists())
-		{
-			//properties = new PropertiesFile(location);
-			FileWriter writer = null;
-			try {
-				writer = new FileWriter(theLocation);
-			} catch (Exception e) {
-				log.log(Level.SEVERE, "Exception while creating " + theLocation, e); //$NON-NLS-1$
-			} finally {
-				try {
-					if (writer != null) {
-						writer.close();
-					}
-				} catch (IOException e) {
-					log.log(Level.SEVERE, "Exception while closing writer for " + theLocation, e); //$NON-NLS-1$
-				}
-			}
-		} else {
-			try {
-	        	FileReader file = new FileReader(theLocation);
-	
-	    		//HERP
-	            BufferedReader in = new BufferedReader(file);
-	            StringBuilder writer = new StringBuilder();
-	            
-	        	for(PlayerStat p : ps)
-	        	{
-	        		if(p.name.equals("$mcMMO_DummyInfo")) //$NON-NLS-1$
-	        			continue;
-	        		if(p.statVal == 0)
-	        			continue;
-	        		writer.append(p.name + ":" + p.statVal); //$NON-NLS-1$
-	        		writer.append("\r\n");  //$NON-NLS-1$
-	        	}
-	        	
-	        	in.close();
-	        	//Write the new file
-	            FileWriter out = new FileWriter(theLocation);
-	            out.write(writer.toString());
-	            out.close();
-	        } catch (Exception e) {
-	                log.log(Level.SEVERE, "Exception while writing to " + theLocation + " (Are you sure you formatted it correctly?)", e); //$NON-NLS-1$ //$NON-NLS-2$
-	        }
-		}
-		//Create/open the file
-		//Loop through backward writing each player
-		//Close the file
-	}
-	
-	public static String[] retrieveInfo(String skillName, int pagenumber)
-	{
-		String theLocation = "plugins/mcMMO/FlatFileStuff/Leaderboards/" + skillName + ".mcmmo"; //$NON-NLS-1$ //$NON-NLS-2$
-		try {
-        	FileReader file = new FileReader(theLocation);
-        	BufferedReader in = new BufferedReader(file);
-        	
-        	int destination = (pagenumber - 1) * 10; //How many lines to skip through
-        	int x = 0; //how many lines we've gone through
-        	int y = 0; //going through the lines
-        	String line = ""; //$NON-NLS-1$
-        	String[] info = new String[10]; //what to return
-        	while((line = in.readLine()) != null && y < 10)
-        	{
-        		x++;
-        		if(x >= destination && y < 10){
-        			info[y] = line.toString();
-        			y++;
-        		}
-        	}
-        	in.close();
-        	return info;
-        } catch (Exception e) {
-            log.log(Level.SEVERE, "Exception while reading " //$NON-NLS-1$
-            		+ theLocation + " (Are you sure you formatted it correctly?)", e); //$NON-NLS-1$
-        }
-        return null; //Shouldn't get here
-	}
-	public static void updateLeaderboard(PlayerStat ps, SkillType skillType)
-	{
-		if(LoadProperties.useMySQL)
-			return;
-		String theLocation = "plugins/mcMMO/FlatFileStuff/Leaderboards/" + skillType + ".mcmmo"; //$NON-NLS-1$ //$NON-NLS-2$
-		try {
-        	//Open the file
-        	FileReader file = new FileReader(theLocation);
-            BufferedReader in = new BufferedReader(file);
-            StringBuilder writer = new StringBuilder();
-        	String line = ""; //$NON-NLS-1$
-        	Boolean inserted = false;
-        	//While not at the end of the file
-        	while((line = in.readLine()) != null)
-        	{
-        		//Insert the player into the line before it finds a smaller one
-        		if(Integer.valueOf(line.split(":")[1]) < ps.statVal && !inserted) //$NON-NLS-1$
-        		{
-        			writer.append(ps.name + ":" + ps.statVal).append("\r\n"); //$NON-NLS-1$ //$NON-NLS-2$
-        			inserted = true;
-        		}
-        		//Write anything that isn't the player already in the file so we remove the duplicate
-        		if(!line.split(":")[0].equalsIgnoreCase(ps.name)) //$NON-NLS-1$
-        		{
-                    writer.append(line).append("\r\n"); //$NON-NLS-1$
-        		}
-        	}
-        	
-        	if(!inserted)
-        	{
-    			writer.append(ps.name + ":" + ps.statVal).append("\r\n"); //$NON-NLS-1$ //$NON-NLS-2$
-        	}
-        	
-        	in.close();
-        	//Write the new file
-            FileWriter out = new FileWriter(theLocation);
-            out.write(writer.toString());
-            out.close();
-        } catch (Exception e) {
-                log.log(Level.SEVERE, "Exception while writing to " + theLocation + " (Are you sure you formatted it correctly?)", e); //$NON-NLS-1$ //$NON-NLS-2$
-        }
-	}
-}

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

@@ -1,112 +0,0 @@
-/*
-	This file is part of mcMMO.
-
-    mcMMO is free software: you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    mcMMO is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with mcMMO.  If not, see <http://www.gnu.org/licenses/>.
-*/
-package com.gmail.nossr50;
-
-import java.io.*;
-import java.util.Properties;
-import java.util.logging.Logger;
-import java.util.HashMap;
-
-import org.bukkit.entity.*;
-import com.gmail.nossr50.datatypes.PlayerProfile;
-
-
-public class Users {
-    private static volatile Users instance;
-    protected static final Logger log = Logger.getLogger("Minecraft");
-    String location = "plugins/mcMMO/FlatFileStuff/mcmmo.users";
-    String directory = "plugins/mcMMO/FlatFileStuff/";
-    String directoryb = "plugins/mcMMO/FlatFileStuff/Leaderboards/";
-    
-    //public static ArrayList<PlayerProfile> players;
-    public static HashMap<Player, PlayerProfile> players = new HashMap<Player, PlayerProfile>();
-    private Properties properties = new Properties();
-    
-    //To load
-    public void load() throws IOException {
-        properties.load(new FileInputStream(location));
-    }
-    //To save
-    public void save() 
-    {
-        try 
-        {
-	        properties.store(new FileOutputStream(location), null);
-	        }catch(IOException ex) {
-	        }
-    }
-    
-    public void loadUsers()
-    {
-    	new File(directory).mkdir();
-    	new File(directoryb).mkdir();
-        File theDir = new File(location);
-		if(!theDir.exists())
-		{
-			try {
-				FileWriter writer = new FileWriter(theDir);
-				writer.close();
-			} catch (IOException e) {
-				// TODO Auto-generated catch block
-				e.printStackTrace();
-			}
-		}
-    }
-
-	
-    public static void addUser(Player player)
-    {
-    	players.put(player, new PlayerProfile(player));
-    }
-    public static void clearUsers()
-    {
-    	players.clear();
-    }
-    public static HashMap<Player, PlayerProfile> getProfiles(){
-    	return players;
-    }
-    
-    public static void removeUser(Player player)
-    {    	
-    	PlayerProfile PP = Users.getProfile(player);
-    	
-    	if(PP != null)
-    	{
-	    	PP.save();
-	    	if(players.containsKey(player))
-	    		players.remove(player);
-    	}
-    }
-
-    public static PlayerProfile getProfile(Player player){
-    	if(players.get(player) != null)
-    		return players.get(player);
-    	else
-    	{
-    		players.put(player, new PlayerProfile(player));
-    		return players.get(player);
-    	}
-    }
-    
-    public static Users getInstance() {
-		if (instance == null) {
-			instance = new Users();
-		}
-		return instance;
-	}
-
-}

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

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

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

@@ -0,0 +1,139 @@
+package com.gmail.nossr50.api;
+
+import org.bukkit.entity.Player;
+import org.bukkit.plugin.Plugin;
+
+import com.gmail.nossr50.chat.ChatManager;
+import com.gmail.nossr50.party.PartyManager;
+import com.gmail.nossr50.util.player.UserManager;
+
+public final class ChatAPI {
+    private ChatAPI() {}
+
+    /**
+     * Send a message to all members of a party
+     * </br>
+     * This function is designed for API usage.
+     *
+     * @param plugin The plugin sending the message
+     * @param sender The name of the sender
+     * @param displayName The display name of the sender
+     * @param party The name of the party to send to
+     * @param message The message to send
+     */
+    public static void sendPartyChat(Plugin plugin, String sender, String displayName, String party, String message) {
+        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) {
+        sendPartyChat(null, party, sender, sender, 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
+     * @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) {
+        sendAdminChat(null, sender, sender, message);
+    }
+
+    /**
+     * Check if a player is currently talking in party chat.
+     *
+     * @param player The player to check
+     * @return true if the player is using party chat, false otherwise
+     */
+    public static boolean isUsingPartyChat(Player player) {
+        return UserManager.getPlayer(player).getPartyChatMode();
+    }
+
+    /**
+     * Check if a player is currently talking in party chat.
+     *
+     * @param playerName The name of the player to check
+     * @return true if the player is using party chat, false otherwise
+     */
+    public static boolean isUsingPartyChat(String playerName) {
+        return UserManager.getPlayer(playerName).getPartyChatMode();
+    }
+
+    /**
+     * Check if a player is currently talking in admin chat.
+     *
+     * @param player The player to check
+     * @return true if the player is using admin chat, false otherwise
+     */
+    public static boolean isUsingAdminChat(Player player) {
+        return UserManager.getPlayer(player).getAdminChatMode();
+    }
+
+    /**
+     * Check if a player is currently talking in admin chat.
+     *
+     * @param playerName The name of the player to check
+     * @return true if the player is using admin chat, false otherwise
+     */
+    public static boolean isUsingAdminChat(String playerName) {
+        return UserManager.getPlayer(playerName).getAdminChatMode();
+    }
+}

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

@@ -0,0 +1,358 @@
+package com.gmail.nossr50.api;
+
+import org.bukkit.entity.Player;
+
+import com.gmail.nossr50.config.Config;
+import com.gmail.nossr50.datatypes.skills.SkillType;
+import com.gmail.nossr50.util.player.UserManager;
+import com.gmail.nossr50.util.skills.SkillUtils;
+
+public final class ExperienceAPI {
+    private ExperienceAPI() {}
+
+    /**
+     * Adds raw XP to the player.
+     * </br>
+     * This function is designed for API usage.
+     *
+     * @param player The player to add XP to
+     * @param skillType The skill to add XP to
+     * @param XP The amount of XP to add
+     * @deprecated Use {@link #addRawXP(Player, String, int)} instead
+     */
+    @Deprecated
+    public static void addRawXP(Player player, SkillType skillType, int XP) {
+        UserManager.getPlayer(player).applyXpGain(skillType, XP);
+    }
+
+    /**
+     * Adds raw XP to the player.
+     * </br>
+     * This function is designed for API usage.
+     *
+     * @param player The player to add XP to
+     * @param skillType The skill to add XP to
+     * @param XP The amount of XP to add
+     */
+    public static void addRawXP(Player player, String skillType, int XP) {
+        UserManager.getPlayer(player).applyXpGain(SkillType.getSkill(skillType), XP);
+    }
+
+    /**
+     * Adds XP to the player, calculates for XP Rate only.
+     * </br>
+     * This function is designed for API usage.
+     *
+     * @param player The player to add XP to
+     * @param skillType The skill to add XP to
+     * @param XP The amount of XP to add
+     * @deprecated Use {@link #addMultipliedXP(Player, String, int)} instead
+     */
+    @Deprecated
+    public static void addMultipliedXP(Player player, SkillType skillType, int XP) {
+        UserManager.getPlayer(player).applyXpGain(skillType, (int) (XP * Config.getInstance().getExperienceGainsGlobalMultiplier()));
+    }
+
+    /**
+     * Adds XP to the player, calculates for XP Rate only.
+     * </br>
+     * This function is designed for API usage.
+     *
+     * @param player The player to add XP to
+     * @param skillType The skill to add XP to
+     * @param XP The amount of XP to add
+     */
+    public static void addMultipliedXP(Player player, String skillType, int XP) {
+        UserManager.getPlayer(player).applyXpGain(SkillType.getSkill(skillType), (int) (XP * Config.getInstance().getExperienceGainsGlobalMultiplier()));
+    }
+
+    /**
+     * Adds XP to the player, calculates for XP Rate, skill modifiers and perks. May be shared with the party.
+     * </br>
+     * This function is designed for API usage.
+     *
+     * @param player The player to add XP to
+     * @param skillType The skill to add XP to
+     * @param XP The amount of XP to add
+     * @deprecated Use {@link #addXP(Player, String, int)} instead
+     */
+    @Deprecated
+    public static void addXP(Player player, SkillType skillType, int XP) {
+        UserManager.getPlayer(player).beginXpGain(skillType, XP);
+    }
+
+    /**
+     * Adds XP to the player, calculates for XP Rate, skill modifiers and perks. May be shared with the party.
+     * </br>
+     * This function is designed for API usage.
+     *
+     * @param player The player to add XP to
+     * @param skillType The skill to add XP to
+     * @param XP The amount of XP to add
+     */
+    public static void addXP(Player player, String skillType, int XP) {
+        UserManager.getPlayer(player).beginXpGain(SkillType.getSkill(skillType), XP);
+    }
+
+    /**
+     * Get the amount of XP a player has in a specific skill.
+     * </br>
+     * This function is designed for API usage.
+     *
+     * @param player The player to get XP for
+     * @param skillType The skill to get XP for
+     * @return the amount of XP in a given skill
+     * @deprecated Use {@link #getXP(Player, String)} instead
+     */
+    @Deprecated
+    public static int getXP(Player player, SkillType skillType) {
+        return UserManager.getPlayer(player).getProfile().getSkillXpLevel(skillType);
+    }
+
+    /**
+     * Get the amount of XP a player has in a specific skill.
+     * </br>
+     * This function is designed for API usage.
+     *
+     * @param player The player to get XP for
+     * @param skillType The skill to get XP for
+     * @return the amount of XP in a given skill
+     */
+    public static int getXP(Player player, String skillType) {
+        return UserManager.getPlayer(player).getProfile().getSkillXpLevel(SkillType.getSkill(skillType));
+    }
+
+    /**
+     * Get the amount of XP left before leveling up.
+     * </br>
+     * This function is designed for API usage.
+     *
+     * @param player The player to get the XP amount for
+     * @param skillType The skill to get the XP amount for
+     * @return the amount of XP left before leveling up a specifc skill
+     * @deprecated Use {@link #getXPToNextLevel(Player, String)} instead
+     */
+    @Deprecated
+    public static int getXPToNextLevel(Player player, SkillType skillType) {
+        return UserManager.getPlayer(player).getProfile().getXpToLevel(skillType);
+    }
+
+    /**
+     * Get the amount of XP left before leveling up.
+     * </br>
+     * This function is designed for API usage.
+     *
+     * @param player The player to get the XP amount for
+     * @param skillType The skill to get the XP amount for
+     * @return the amount of XP left before leveling up a specifc skill
+     */
+    public static int getXPToNextLevel(Player player, String skillType) {
+        return UserManager.getPlayer(player).getProfile().getXpToLevel(SkillType.getSkill(skillType));
+    }
+
+    /**
+     * 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
+     * @param notify Unused argument
+     * @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);
+
+        if (notify) {
+            checkXP(player, skillType);
+        }
+    }
+
+    /**
+     * Add levels to a skill.
+     * </br>
+     * This function is designed for API usage.
+     *
+     * @param player The player to add levels to
+     * @param skillType Type of skill to add levels to
+     * @param levels Number of levels to add
+     * @deprecated Use {@link #addLevel(Player, String, int)} instead
+     */
+    @Deprecated
+    public static void addLevel(Player player, SkillType skillType, int levels) {
+        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

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

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

src/main/java/com/gmail/nossr50/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/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/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/AddxpCommand.java

@@ -1,89 +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.Users;
-import com.gmail.nossr50.m;
-import com.gmail.nossr50.mcMMO;
-import com.gmail.nossr50.mcPermissions;
-import com.gmail.nossr50.config.LoadProperties;
-import com.gmail.nossr50.locale.mcLocale;
-import com.gmail.nossr50.skills.Skills;
-
-public class AddxpCommand implements CommandExecutor {
-	private final mcMMO plugin;
-
-	public AddxpCommand(mcMMO instance) {
-		this.plugin = instance;
-	}
-
-	@Override
-	public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
-		Player player = null;
-        if (sender instanceof Player) {
-            player = (Player) sender;
-        }
-        
-        if (player != null && !mcPermissions.getInstance().mmoedit(player)) {
-			sender.sendMessage("This command requires permissions.");
-			return true;
-		}
-
-		if (!LoadProperties.addxpEnable) {
-			sender.sendMessage("This command is not enabled.");
-			return true;
-		}
-
-		if (!(sender instanceof Player)) {
-			if (args.length < 2) {
-				// No console aliasing yet
-				// System.out.println("Usage is /"+LoadProperties.addxp+" playername skillname xp");
-				System.out.println("Usage is /addxp playername skillname xp");
-				return true;
-			} else if (args.length == 3) {
-				if ((plugin.getServer().getPlayer(args[0]) != null) && m.isInt(args[2]) && Skills.isSkill(args[1])) {
-					int newvalue = Integer.valueOf(args[2]);
-					Users.getProfile(plugin.getServer().getPlayer(args[0])).addXP(Skills.getSkillType(args[1]), newvalue, plugin.getServer().getPlayer(args[0]));
-					plugin.getServer().getPlayer(args[0]).sendMessage(ChatColor.GREEN + "Experience granted!");
-					System.out.println(args[1] + " has been modified for " + plugin.getServer().getPlayer(args[0]).getName() + ".");
-					Skills.XpCheckAll(plugin.getServer().getPlayer(args[0]));
-				}
-			} else {
-				// No console aliasing yet
-				// System.out.println("Usage is /"+LoadProperties.addxp+" playername skillname xp");
-				System.out.println("Usage is /addxp playername skillname xp");
-			}
-			return true;
-		}
-
-		if (!mcPermissions.getInstance().mmoedit(player)) {
-			player.sendMessage(ChatColor.YELLOW + "[mcMMO] " + ChatColor.DARK_RED + mcLocale.getString("mcPlayerListener.NoPermission"));
-			return true;
-		}
-		if (args.length < 2) {
-			player.sendMessage(ChatColor.RED + "Usage is /addxp playername skillname xp");
-			return true;
-		}
-		if (args.length == 3) {
-			if ((plugin.getServer().getPlayer(args[0]) != null) && m.isInt(args[2]) && Skills.isSkill(args[1])) {
-				int newvalue = Integer.valueOf(args[2]);
-				Users.getProfile(plugin.getServer().getPlayer(args[0])).addXP(Skills.getSkillType(args[1]), newvalue, plugin.getServer().getPlayer(args[0]));
-				plugin.getServer().getPlayer(args[0]).sendMessage(ChatColor.GREEN + "Experience granted!");
-				player.sendMessage(ChatColor.RED + args[1] + " has been modified.");
-				Skills.XpCheckAll(plugin.getServer().getPlayer(args[0]));
-			}
-		} else if (args.length == 2 && m.isInt(args[1]) && Skills.isSkill(args[0])) {
-			int newvalue = Integer.valueOf(args[1]);
-			Users.getProfile(player).addXP(Skills.getSkillType(args[0]), newvalue, player);
-			player.sendMessage(ChatColor.RED + args[0] + " has been modified.");
-		} else {
-			player.sendMessage(ChatColor.RED + "Usage is /addxp playername skillname xp");
-		}
-
-		return true;
-	}
-}

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

@@ -1,46 +0,0 @@
-package com.gmail.nossr50.commands.general;
-
-import org.bukkit.Bukkit;
-import org.bukkit.ChatColor;
-import org.bukkit.command.Command;
-import org.bukkit.command.CommandExecutor;
-import org.bukkit.command.CommandSender;
-import org.bukkit.entity.Player;
-
-import com.gmail.nossr50.Users;
-import com.gmail.nossr50.mcPermissions;
-import com.gmail.nossr50.config.LoadProperties;
-import com.gmail.nossr50.datatypes.PlayerProfile;
-import com.gmail.nossr50.locale.mcLocale;
-
-public class ClearmyspawnCommand implements CommandExecutor {
-	@Override
-	public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
-		if (!LoadProperties.clearmyspawnEnable || !LoadProperties.enableMySpawn) {
-			sender.sendMessage("This command is not enabled.");
-			return true;
-		}
-
-		if (!(sender instanceof Player)) {
-			sender.sendMessage("This command does not support console useage.");
-			return true;
-		}
-
-		Player player = (Player) sender;
-		PlayerProfile PP = Users.getProfile(player);
-
-		if (!mcPermissions.getInstance().mySpawn(player)) {
-			player.sendMessage(ChatColor.YELLOW + "[mcMMO] " + ChatColor.DARK_RED + mcLocale.getString("mcPlayerListener.NoPermission"));
-			return true;
-		}
-
-		double x = Bukkit.getServer().getWorlds().get(0).getSpawnLocation().getX();
-		double y = Bukkit.getServer().getWorlds().get(0).getSpawnLocation().getY();
-		double z = Bukkit.getServer().getWorlds().get(0).getSpawnLocation().getZ();
-		String worldname = Bukkit.getServer().getWorlds().get(0).getName();
-		PP.setMySpawn(x, y, z, worldname);
-		player.sendMessage(mcLocale.getString("mcPlayerListener.MyspawnCleared"));
-
-		return true;
-	}
-}

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

@@ -1,87 +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.Users;
-import com.gmail.nossr50.m;
-import com.gmail.nossr50.mcMMO;
-import com.gmail.nossr50.mcPermissions;
-import com.gmail.nossr50.config.LoadProperties;
-import com.gmail.nossr50.datatypes.PlayerProfile;
-import com.gmail.nossr50.locale.mcLocale;
-import com.gmail.nossr50.skills.Skills;
-
-public class MmoeditCommand implements CommandExecutor {
-	private final mcMMO plugin;
-
-	public MmoeditCommand(mcMMO instance) {
-		this.plugin = instance;
-	}
-
-	@Override
-	public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
-		Player player = null;
-        if (sender instanceof Player) {
-            player = (Player) sender;
-        }
-		
-        if (player != null && !mcPermissions.getInstance().mmoedit(player)) {
-			sender.sendMessage("This command requires permissions.");
-			return true;
-		}
-
-		if (!LoadProperties.mmoeditEnable) {
-			sender.sendMessage("This command is not enabled.");
-			return true;
-		}
-
-		if (!(sender instanceof Player)) {
-			if (args.length < 2) {
-				System.out.println("Usage is /mmoedit playername skillname newvalue");
-				return true;
-			} else if (args.length == 3) {
-				if ((plugin.getServer().getPlayer(args[0]) != null) && m.isInt(args[2]) && Skills.isSkill(args[1])) {
-					int newvalue = Integer.valueOf(args[2]);
-					Users.getProfile(plugin.getServer().getPlayer(args[0])).modifyskill(Skills.getSkillType(args[1]), newvalue);
-					System.out.println(args[1] + " has been modified for " + plugin.getServer().getPlayer(args[0]).getName() + ".");
-				}
-			} else {
-				System.out.println("Usage is /mmoedit playername skillname newvalue");
-			}
-
-			return true;
-		}
-
-		PlayerProfile PP = Users.getProfile(player);
-
-		if (!mcPermissions.getInstance().mmoedit(player)) {
-			player.sendMessage(ChatColor.YELLOW + "[mcMMO] " + ChatColor.DARK_RED + mcLocale.getString("mcPlayerListener.NoPermission"));
-			return true;
-		}
-		if (args.length < 2) {
-			player.sendMessage(ChatColor.RED + "Usage is /mmoedit playername skillname newvalue");
-			return true;
-		}
-		if (args.length == 3) {
-			if ((plugin.getServer().getPlayer(args[0]) != null) && m.isInt(args[2]) && Skills.isSkill(args[1])) {
-				int newvalue = Integer.valueOf(args[2]);
-				Users.getProfile(plugin.getServer().getPlayer(args[0])).modifyskill(Skills.getSkillType(args[1]), newvalue);
-				player.sendMessage(ChatColor.RED + args[1] + " has been modified.");
-			}
-		} else if (args.length == 2) {
-			if (m.isInt(args[1]) && Skills.isSkill(args[0])) {
-				int newvalue = Integer.valueOf(args[1]);
-				PP.modifyskill(Skills.getSkillType(args[0]), newvalue);
-				player.sendMessage(ChatColor.RED + args[0] + " has been modified.");
-			}
-		} else {
-			player.sendMessage(ChatColor.RED + "Usage is /mmoedit playername skillname newvalue");
-		}
-
-		return true;
-	}
-}

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

@@ -1,39 +0,0 @@
-package com.gmail.nossr50.commands.general;
-
-import org.bukkit.Bukkit;
-import org.bukkit.ChatColor;
-import org.bukkit.command.Command;
-import org.bukkit.command.CommandExecutor;
-import org.bukkit.command.CommandSender;
-import org.bukkit.entity.Player;
-
-import com.gmail.nossr50.Users;
-import com.gmail.nossr50.m;
-import com.gmail.nossr50.mcPermissions;
-import com.gmail.nossr50.locale.mcLocale;
-
-public class MmoupdateCommand implements CommandExecutor {
-	@Override
-	public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
-		if (!(sender instanceof Player)) {
-			sender.sendMessage("This command does not support console useage.");
-			return true;
-		}
-
-		Player player = (Player) sender;
-
-		if (!mcPermissions.getInstance().admin(player)) {
-			player.sendMessage(ChatColor.YELLOW + "[mcMMO] " + ChatColor.DARK_RED + mcLocale.getString("mcPlayerListener.NoPermission"));
-			return true;
-		}
-		player.sendMessage(ChatColor.GRAY + "Starting conversion...");
-		Users.clearUsers();
-		m.convertToMySQL();
-		for (Player x : Bukkit.getServer().getOnlinePlayers()) {
-			Users.addUser(x);
-		}
-		player.sendMessage(ChatColor.GREEN + "Conversion finished!");
-
-		return true;
-	}
-}

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

@@ -1,58 +0,0 @@
-package com.gmail.nossr50.commands.general;
-
-import org.bukkit.ChatColor;
-import org.bukkit.Location;
-import org.bukkit.command.Command;
-import org.bukkit.command.CommandExecutor;
-import org.bukkit.command.CommandSender;
-import org.bukkit.entity.Player;
-
-import com.gmail.nossr50.Users;
-import com.gmail.nossr50.mcPermissions;
-import com.gmail.nossr50.config.LoadProperties;
-import com.gmail.nossr50.datatypes.PlayerProfile;
-import com.gmail.nossr50.locale.mcLocale;
-
-public class MyspawnCommand implements CommandExecutor {
-	@Override
-	public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
-		if (!LoadProperties.myspawnEnable || !LoadProperties.enableMySpawn) {
-			sender.sendMessage("This command is not enabled.");
-			return true;
-		}
-
-		if (!(sender instanceof Player)) {
-			sender.sendMessage("This command does not support console useage.");
-			return true;
-		}
-
-		Player player = (Player) sender;
-		PlayerProfile PP = Users.getProfile(player);
-
-		if (!mcPermissions.getInstance().mySpawn(player)) {
-			player.sendMessage(ChatColor.YELLOW + "[mcMMO] " + ChatColor.DARK_RED + mcLocale.getString("mcPlayerListener.NoPermission"));
-			return true;
-		}
-		if (System.currentTimeMillis() < (PP.getMySpawnATS() * 1000) + 3600000) {
-			long x = (((PP.getMySpawnATS() * 1000) + 3600000) - System.currentTimeMillis());
-			int y = (int) (x / 60000);
-			int z = (int) ((x / 1000) - (y * 60));
-			player.sendMessage(mcLocale.getString("mcPlayerListener.MyspawnTimeNotice", new Object[] { y, z }));
-			return true;
-		}
-		PP.setMySpawnATS(System.currentTimeMillis());
-		if (PP.getMySpawn(player) != null) {
-			Location mySpawn = PP.getMySpawn(player);
-
-			if (mySpawn != null) {
-				// It's done twice because it acts oddly when you are in another world
-				player.teleport(mySpawn);
-				player.teleport(mySpawn);
-			}
-		} else {
-			player.sendMessage(mcLocale.getString("mcPlayerListener.MyspawnNotExist"));
-		}
-
-		return true;
-	}
-}

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

@@ -1,105 +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.Users;
-import com.gmail.nossr50.m;
-import com.gmail.nossr50.mcMMO;
-import com.gmail.nossr50.mcPermissions;
-import com.gmail.nossr50.config.LoadProperties;
-import com.gmail.nossr50.datatypes.PlayerProfile;
-import com.gmail.nossr50.datatypes.SkillType;
-import com.gmail.nossr50.locale.mcLocale;
-import com.gmail.nossr50.skills.Skills;
-
-public class StatsCommand implements CommandExecutor {
-	private final mcMMO plugin;
-
-	public StatsCommand(mcMMO instance) {
-		this.plugin = instance;
-	}
-
-	@Override
-	public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
-		if (!LoadProperties.statsEnable) {
-			sender.sendMessage("This command is not enabled.");
-			return true;
-		}
-
-		Player player = null;
-        if (sender instanceof Player) {
-            player = (Player) sender;
-        }
-
-		if (!(sender instanceof Player)) {
-			if(args.length != 1) {
-				sender.sendMessage("Usage: stats <username>");
-				return true;
-			} else {
-				Player temp = plugin.getServer().getPlayer(args[0]);
-				if(temp == null) {
-					sender.sendMessage("Could not find player: " + args[0]);
-					return true;
-				} else {
-					player = temp;
-				}
-			}
-		}
-
-		PlayerProfile PP = Users.getProfile(player);
-
-		player.sendMessage(mcLocale.getString("mcPlayerListener.YourStats"));
-
-		player.sendMessage(mcLocale.getString("mcPlayerListener.NoSkillNote"));
-
-		ChatColor header = ChatColor.GOLD;
-
-		if (Skills.hasGatheringSkills(player)) {
-			player.sendMessage(header + "-=GATHERING SKILLS=-");
-			if (mcPermissions.getInstance().excavation(player))
-				player.sendMessage(Skills.getSkillStats(mcLocale.getString("mcPlayerListener.ExcavationSkill"), PP.getSkillLevel(SkillType.EXCAVATION), PP.getSkillXpLevel(SkillType.EXCAVATION), PP.getXpToLevel(SkillType.EXCAVATION)));
-			if (mcPermissions.getInstance().fishing(player))
-				player.sendMessage(Skills.getSkillStats(mcLocale.getString("mcPlayerListener.FishingSkill"), PP.getSkillLevel(SkillType.FISHING), PP.getSkillXpLevel(SkillType.FISHING), PP.getXpToLevel(SkillType.FISHING)));
-			if (mcPermissions.getInstance().herbalism(player))
-				player.sendMessage(Skills.getSkillStats(mcLocale.getString("mcPlayerListener.HerbalismSkill"), PP.getSkillLevel(SkillType.HERBALISM), PP.getSkillXpLevel(SkillType.HERBALISM), PP.getXpToLevel(SkillType.HERBALISM)));
-			if (mcPermissions.getInstance().mining(player))
-				player.sendMessage(Skills.getSkillStats(mcLocale.getString("mcPlayerListener.MiningSkill"), PP.getSkillLevel(SkillType.MINING), PP.getSkillXpLevel(SkillType.MINING), PP.getXpToLevel(SkillType.MINING)));
-			if (mcPermissions.getInstance().woodcutting(player))
-				player.sendMessage(Skills.getSkillStats(mcLocale.getString("mcPlayerListener.WoodcuttingSkill"), PP.getSkillLevel(SkillType.WOODCUTTING), PP.getSkillXpLevel(SkillType.WOODCUTTING), PP.getXpToLevel(SkillType.WOODCUTTING)));
-		}
-		if (Skills.hasCombatSkills(player)) {
-			player.sendMessage(header + "-=COMBAT SKILLS=-");
-			if (mcPermissions.getInstance().axes(player))
-				player.sendMessage(Skills.getSkillStats(mcLocale.getString("mcPlayerListener.AxesSkill"), PP.getSkillLevel(SkillType.AXES), PP.getSkillXpLevel(SkillType.AXES), PP.getXpToLevel(SkillType.AXES)));
-			if (mcPermissions.getInstance().archery(player))
-				player.sendMessage(Skills.getSkillStats(mcLocale.getString("mcPlayerListener.ArcherySkill"), PP.getSkillLevel(SkillType.ARCHERY), PP.getSkillXpLevel(SkillType.ARCHERY), PP.getXpToLevel(SkillType.ARCHERY)));
-			// if(mcPermissions.getInstance().sorcery(player))
-			// player.sendMessage(Skills.getSkillStats(mcLocale.getString("mcPlayerListener.SorcerySkill"), PP.getSkill("sorcery"), PP.getSkill("sorceryXP"), PP.getXpToLevel("excavation")));
-			if (mcPermissions.getInstance().swords(player))
-				player.sendMessage(Skills.getSkillStats(mcLocale.getString("mcPlayerListener.SwordsSkill"), PP.getSkillLevel(SkillType.SWORDS), PP.getSkillXpLevel(SkillType.SWORDS), PP.getXpToLevel(SkillType.SWORDS)));
-			if (mcPermissions.getInstance().taming(player))
-				player.sendMessage(Skills.getSkillStats(mcLocale.getString("mcPlayerListener.TamingSkill"), PP.getSkillLevel(SkillType.TAMING), PP.getSkillXpLevel(SkillType.TAMING), PP.getXpToLevel(SkillType.TAMING)));
-			if (mcPermissions.getInstance().unarmed(player))
-				player.sendMessage(Skills.getSkillStats(mcLocale.getString("mcPlayerListener.UnarmedSkill"), PP.getSkillLevel(SkillType.UNARMED), PP.getSkillXpLevel(SkillType.UNARMED), PP.getXpToLevel(SkillType.UNARMED)));
-		}
-
-		if (Skills.hasMiscSkills(player)) {
-			player.sendMessage(header + "-=MISC SKILLS=-");
-			if (mcPermissions.getInstance().acrobatics(player))
-				player.sendMessage(Skills.getSkillStats(mcLocale.getString("mcPlayerListener.AcrobaticsSkill"), PP.getSkillLevel(SkillType.ACROBATICS), PP.getSkillXpLevel(SkillType.ACROBATICS), PP.getXpToLevel(SkillType.ACROBATICS)));
-			// if(mcPermissions.getInstance().alchemy(player))
-			// player.sendMessage(Skills.getSkillStats(mcLocale.getString("mcPlayerListener.AlchemySkill"), PP.getSkillLevel(SkillType.ALCHEMY), PP.getSkillXpLevel(SkillType.ALCHEMY), PP.getXpToLevel(SkillType.ALCHEMY)));
-			// if(mcPermissions.getInstance().enchanting(player))
-			// player.sendMessage(Skills.getSkillStats(mcLocale.getString("mcPlayerListener.EnchantingSkill"), PP.getSkillLevel(SkillType.ENCHANTING), PP.getSkillXpLevel(SkillType.ENCHANTING), PP.getXpToLevel(SkillType.ENCHANTING)));
-			if (mcPermissions.getInstance().repair(player))
-				player.sendMessage(Skills.getSkillStats(mcLocale.getString("mcPlayerListener.RepairSkill"), PP.getSkillLevel(SkillType.REPAIR), PP.getSkillXpLevel(SkillType.REPAIR), PP.getXpToLevel(SkillType.REPAIR)));
-		}
-		player.sendMessage(mcLocale.getString("mcPlayerListener.PowerLevel") + ChatColor.GREEN + (m.getPowerLevel(player)));
-
-		return true;
-	}
-}

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

@@ -1,106 +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.Users;
-import com.gmail.nossr50.m;
-import com.gmail.nossr50.mcMMO;
-import com.gmail.nossr50.mcPermissions;
-import com.gmail.nossr50.config.LoadProperties;
-import com.gmail.nossr50.datatypes.PlayerProfile;
-import com.gmail.nossr50.datatypes.SkillType;
-import com.gmail.nossr50.locale.mcLocale;
-import com.gmail.nossr50.skills.Skills;
-
-public class WhoisCommand implements CommandExecutor {
-	private final mcMMO plugin;
-
-	public WhoisCommand(mcMMO instance) {
-		this.plugin = instance;
-	}
-
-	@Override
-	public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
-		if (!LoadProperties.whoisEnable) {
-			sender.sendMessage("This command is not enabled.");
-			return true;
-		}
-
-		Player player = null;
-        if (sender instanceof Player) {
-            player = (Player) sender;
-        }
-
-		if (player != null  && !mcPermissions.getInstance().whois(player)) {
-			player.sendMessage(ChatColor.YELLOW + "[mcMMO] " + ChatColor.DARK_RED + mcLocale.getString("mcPlayerListener.NoPermission"));
-			return true;
-		}
-
-		if (!(sender instanceof Player)) {
-			sender.sendMessage("This command does not support console useage.");
-			return true;
-		}
-		
-		if (args.length < 1) {
-			player.sendMessage(ChatColor.RED + "Proper usage is /whois <playername>");
-			return true;
-		}
-		// if split[1] is a player
-		if (plugin.getServer().getPlayer(args[0]) != null) {
-			Player target = plugin.getServer().getPlayer(args[0]);
-			PlayerProfile PPt = Users.getProfile(target);
-
-			player.sendMessage(ChatColor.GREEN + "~~WHOIS RESULTS~~");
-			player.sendMessage(target.getName());
-			if (PPt.inParty())
-				player.sendMessage("Party: " + PPt.getParty());
-			player.sendMessage("Health: " + target.getHealth() + ChatColor.GRAY + " (20 is full health)");
-			player.sendMessage("OP: " + target.isOp());
-			player.sendMessage(ChatColor.GREEN + "mcMMO Stats for " + ChatColor.YELLOW + target.getName());
-
-			player.sendMessage(ChatColor.GOLD + "-=GATHERING SKILLS=-");
-			if (mcPermissions.getInstance().excavation(target))
-				player.sendMessage(Skills.getSkillStats(mcLocale.getString("mcPlayerListener.ExcavationSkill"), PPt.getSkillLevel(SkillType.EXCAVATION), PPt.getSkillXpLevel(SkillType.EXCAVATION), PPt.getXpToLevel(SkillType.EXCAVATION)));
-			if (mcPermissions.getInstance().fishing(target))
-				player.sendMessage(Skills.getSkillStats(mcLocale.getString("mcPlayerListener.FishingSkill"), PPt.getSkillLevel(SkillType.FISHING), PPt.getSkillXpLevel(SkillType.FISHING), PPt.getXpToLevel(SkillType.FISHING)));
-			if (mcPermissions.getInstance().herbalism(target))
-				player.sendMessage(Skills.getSkillStats(mcLocale.getString("mcPlayerListener.HerbalismSkill"), PPt.getSkillLevel(SkillType.HERBALISM), PPt.getSkillXpLevel(SkillType.HERBALISM), PPt.getXpToLevel(SkillType.HERBALISM)));
-			if (mcPermissions.getInstance().mining(target))
-				player.sendMessage(Skills.getSkillStats(mcLocale.getString("mcPlayerListener.MiningSkill"), PPt.getSkillLevel(SkillType.MINING), PPt.getSkillXpLevel(SkillType.MINING), PPt.getXpToLevel(SkillType.MINING)));
-			if (mcPermissions.getInstance().woodcutting(target))
-				player.sendMessage(Skills.getSkillStats(mcLocale.getString("mcPlayerListener.WoodcuttingSkill"), PPt.getSkillLevel(SkillType.WOODCUTTING), PPt.getSkillXpLevel(SkillType.WOODCUTTING), PPt.getXpToLevel(SkillType.WOODCUTTING)));
-
-			player.sendMessage(ChatColor.GOLD + "-=COMBAT SKILLS=-");
-			if (mcPermissions.getInstance().axes(target))
-				player.sendMessage(Skills.getSkillStats(mcLocale.getString("mcPlayerListener.AxesSkill"), PPt.getSkillLevel(SkillType.AXES), PPt.getSkillXpLevel(SkillType.AXES), PPt.getXpToLevel(SkillType.AXES)));
-			if (mcPermissions.getInstance().archery(player))
-				player.sendMessage(Skills.getSkillStats(mcLocale.getString("mcPlayerListener.ArcherySkill"), PPt.getSkillLevel(SkillType.ARCHERY), PPt.getSkillXpLevel(SkillType.ARCHERY), PPt.getXpToLevel(SkillType.ARCHERY)));
-			// if(mcPermissions.getInstance().sorcery(target))
-			// player.sendMessage(Skills.getSkillStats(mcLocale.getString("mcPlayerListener.SorcerySkill"), PPt.getSkill("sorcery"), PPt.getSkill("sorceryXP"), PPt.getXpToLevel("excavation")));
-			if (mcPermissions.getInstance().swords(target))
-				player.sendMessage(Skills.getSkillStats(mcLocale.getString("mcPlayerListener.SwordsSkill"), PPt.getSkillLevel(SkillType.SWORDS), PPt.getSkillXpLevel(SkillType.SWORDS), PPt.getXpToLevel(SkillType.SWORDS)));
-			if (mcPermissions.getInstance().taming(target))
-				player.sendMessage(Skills.getSkillStats(mcLocale.getString("mcPlayerListener.TamingSkill"), PPt.getSkillLevel(SkillType.TAMING), PPt.getSkillXpLevel(SkillType.TAMING), PPt.getXpToLevel(SkillType.TAMING)));
-			if (mcPermissions.getInstance().unarmed(target))
-				player.sendMessage(Skills.getSkillStats(mcLocale.getString("mcPlayerListener.UnarmedSkill"), PPt.getSkillLevel(SkillType.UNARMED), PPt.getSkillXpLevel(SkillType.UNARMED), PPt.getXpToLevel(SkillType.UNARMED)));
-
-			player.sendMessage(ChatColor.GOLD + "-=MISC SKILLS=-");
-			if (mcPermissions.getInstance().acrobatics(target))
-				player.sendMessage(Skills.getSkillStats(mcLocale.getString("mcPlayerListener.AcrobaticsSkill"), PPt.getSkillLevel(SkillType.ACROBATICS), PPt.getSkillXpLevel(SkillType.ACROBATICS), PPt.getXpToLevel(SkillType.ACROBATICS)));
-			// if(mcPermissions.getInstance().alchemy(target))
-			// player.sendMessage(Skills.getSkillStats(mcLocale.getString("mcPlayerListener.AlchemySkill"), PPt.getSkillLevel(SkillType.ALCHEMY), PPt.getSkillXpLevel(SkillType.ALCHEMY), PPt.getXpToLevel(SkillType.ALCHEMY)));
-			// if(mcPermissions.getInstance().enchanting(target))
-			// player.sendMessage(Skills.getSkillStats(mcLocale.getString("mcPlayerListener.EnchantingSkill"), PPt.getSkillLevel(SkillType.ENCHANTING), PPt.getSkillXpLevel(SkillType.ENCHANTING), PPt.getXpToLevel(SkillType.ENCHANTING)));
-			if (mcPermissions.getInstance().repair(target))
-				player.sendMessage(Skills.getSkillStats(mcLocale.getString("mcPlayerListener.RepairSkill"), PPt.getSkillLevel(SkillType.REPAIR), PPt.getSkillXpLevel(SkillType.REPAIR), PPt.getXpToLevel(SkillType.REPAIR)));
-
-			player.sendMessage(mcLocale.getString("mcPlayerListener.PowerLevel") + ChatColor.GREEN + (m.getPowerLevel(target)));
-		}
-
-		return true;
-	}
-}

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

@@ -1,128 +0,0 @@
-package com.gmail.nossr50.commands.general;
-
-import org.bukkit.Bukkit;
-import org.bukkit.ChatColor;
-import org.bukkit.command.Command;
-import org.bukkit.command.CommandExecutor;
-import org.bukkit.command.CommandSender;
-import org.bukkit.entity.Player;
-
-import com.gmail.nossr50.m;
-import com.gmail.nossr50.mcPermissions;
-import com.gmail.nossr50.config.LoadProperties;
-import com.gmail.nossr50.locale.mcLocale;
-
-public class XprateCommand implements CommandExecutor {
-	private static int oldrate = LoadProperties.xpGainMultiplier;
-	
-	public static boolean xpevent = false;
-	
-	@Override
-	public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
-		if (!LoadProperties.xprateEnable) {
-			sender.sendMessage("This command is not enabled.");
-			return true;
-		}
-
-		if (!(sender instanceof Player)) {
-			if(args.length <= 0)
-			{
-				System.out.println(mcLocale.getString("Commands.xprate.proper", new Object[] {"xprate"}));
-				System.out.println(mcLocale.getString("Commands.xprate.proper2", new Object[] {"xprate"}));
-			}
-			
-			if(args.length == 1 && args[0].equalsIgnoreCase("reset"))
-			{
-				if(xpevent)
-				{
-					for(Player x : Bukkit.getServer().getOnlinePlayers())
-						x.sendMessage(mcLocale.getString("Commands.xprate.over"));
-					xpevent = !xpevent;
-					LoadProperties.xpGainMultiplier = oldrate;
-				} else
-				{
-					LoadProperties.xpGainMultiplier = oldrate;
-				}
-			}
-			
-			if(args.length >= 1 && m.isInt(args[0]))
-			{
-				oldrate = LoadProperties.xpGainMultiplier;
-				
-				if(args.length >= 2 && (args[1].equalsIgnoreCase("true") || args[1].equalsIgnoreCase("false")))
-				{
-					if(args[1].equalsIgnoreCase("true"))
-						xpevent = true;
-					else
-						xpevent = false;
-				} else
-				{
-					System.out.println(mcLocale.getString("Commands.xprate.proper3"));
-					return true;
-				}
-				LoadProperties.xpGainMultiplier = m.getInt(args[0]);
-				if(xpevent = true)
-					for(Player x : Bukkit.getServer().getOnlinePlayers())
-					{
-						x.sendMessage(ChatColor.GOLD+"XP EVENT FOR mcMMO HAS STARTED!");
-						x.sendMessage(ChatColor.GOLD+"mcMMO XP RATE IS NOW "+LoadProperties.xpGainMultiplier+"x!!");
-					}
-				
-				System.out.println("The XP RATE was modified to "+LoadProperties.xpGainMultiplier);
-			}
-			
-			return true;
-		}
-		
-		Player player = (Player) sender;
-		
-		if(!mcPermissions.getInstance().admin(player))
-		{
-			player.sendMessage(ChatColor.YELLOW+"[mcMMO] "+ChatColor.DARK_RED +mcLocale.getString("mcPlayerListener.NoPermission"));  
-			return true;
-		}
-		if(args.length <= 0)
-		{
-			player.sendMessage(mcLocale.getString("Commands.xprate.proper", new Object[] {"xprate"}));
-			player.sendMessage(mcLocale.getString("Commands.xprate.proper2", new Object[] {"xprate"}));
-		}
-		if(args.length == 1 && args[0].equalsIgnoreCase("reset"))
-		{
-			if(xpevent)
-			{
-				for(Player x : Bukkit.getServer().getOnlinePlayers())
-					x.sendMessage(mcLocale.getString("Commands.xprate.over"));
-				xpevent = !xpevent;
-				LoadProperties.xpGainMultiplier = oldrate;
-			} else
-			{
-				LoadProperties.xpGainMultiplier = oldrate;
-			}
-		}
-		if(args.length >= 1 && m.isInt(args[0]))
-		{
-			oldrate = LoadProperties.xpGainMultiplier;
-			
-			if(args.length >= 2 && (args[1].equalsIgnoreCase("true") || args[1].equalsIgnoreCase("false")))
-			{
-				if(args[1].equalsIgnoreCase("true"))
-					xpevent = true;
-				else
-					xpevent = false;
-			} else
-			{
-				player.sendMessage(mcLocale.getString("Commands.xprate.proper3"));
-				return true;
-			}
-			LoadProperties.xpGainMultiplier = m.getInt(args[0]);
-			if(xpevent = true)
-				for(Player x : Bukkit.getServer().getOnlinePlayers())
-				{
-					x.sendMessage(mcLocale.getString("Commands.xprate.started"));
-					x.sendMessage(mcLocale.getString("Commands.xprate.started2", new Object[] {LoadProperties.xpGainMultiplier}));
-				}
-		}
-		
-		return true;
-	}
-}

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,48 +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.Users;
-import com.gmail.nossr50.config.LoadProperties;
-import com.gmail.nossr50.datatypes.PlayerProfile;
-import com.gmail.nossr50.locale.mcLocale;
-
-public class McabilityCommand implements CommandExecutor {
-	@Override
-	public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
-        Player player = null;
-        if (sender instanceof Player) {
-            player = (Player) sender;
-        }
-
-		if (player != null && player.hasPermission("mcmmo.commands.ability")) {
-			sender.sendMessage("This command requires permissions.");
-			return true;
-		}
-
-		if (!LoadProperties.mcabilityEnable) {
-			sender.sendMessage("This command is not enabled.");
-			return true;
-		}
-
-		if (!(sender instanceof Player)) {
-			sender.sendMessage("This command does not support console useage.");
-			return true;
-		}
-
-		PlayerProfile PP = Users.getProfile(player);
-
-		if (PP.getAbilityUse()) {
-			player.sendMessage(mcLocale.getString("mcPlayerListener.AbilitiesOff"));
-			PP.toggleAbilityUse();
-		} else {
-			player.sendMessage(mcLocale.getString("mcPlayerListener.AbilitiesOn"));
-			PP.toggleAbilityUse();
-		}
-
-		return true;
-	}
-}

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

@@ -1,73 +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.mcPermissions;
-import com.gmail.nossr50.config.LoadProperties;
-import com.gmail.nossr50.locale.mcLocale;
-
-public class MccCommand implements CommandExecutor {
-	@Override
-	public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
-		if (!LoadProperties.mccEnable) {
-			sender.sendMessage("This command is not enabled.");
-			return true;
-		}
-
-		if (!(sender instanceof Player)) {
-			sender.sendMessage("This command does not support console useage.");
-			return true;
-		}
-
-		Player player = (Player) sender;
-
-		player.sendMessage(ChatColor.RED + "---[]" + ChatColor.YELLOW + "mcMMO Commands" + ChatColor.RED + "[]---");
-
-		if (mcPermissions.getInstance().party(player)) {
-			player.sendMessage(mcLocale.getString("m.mccPartyCommands"));
-			player.sendMessage("/party " + mcLocale.getString("m.mccParty"));
-			player.sendMessage("/party q " + mcLocale.getString("m.mccPartyQ"));
-
-			if (mcPermissions.getInstance().partyChat(player))
-				player.sendMessage("/p " + mcLocale.getString("m.mccPartyToggle"));
-
-			player.sendMessage("/invite " + mcLocale.getString("m.mccPartyInvite"));
-			player.sendMessage("/invite " + mcLocale.getString("m.mccPartyAccept"));
-
-			if (mcPermissions.getInstance().partyTeleport(player))
-				player.sendMessage("/ptp " + mcLocale.getString("m.mccPartyTeleport"));
-		}
-		player.sendMessage(mcLocale.getString("m.mccOtherCommands"));
-		player.sendMessage("/stats " + ChatColor.RED + " " + mcLocale.getString("m.mccStats"));
-		player.sendMessage("/mctop <skillname> <page> " + ChatColor.RED + mcLocale.getString("m.mccLeaderboards"));
-
-		if (mcPermissions.getInstance().mySpawn(player)) {
-			player.sendMessage("/myspawn " + ChatColor.RED + mcLocale.getString("m.mccMySpawn"));
-			player.sendMessage("/clearmyspawn " + ChatColor.RED + mcLocale.getString("m.mccClearMySpawn"));
-		}
-
-		if (mcPermissions.getInstance().mcAbility(player))
-			player.sendMessage("/mcability" + ChatColor.RED + " " + mcLocale.getString("m.mccToggleAbility"));
-
-		if (mcPermissions.getInstance().adminChat(player))
-			player.sendMessage("/a " + ChatColor.RED + mcLocale.getString("m.mccAdminToggle"));
-
-		if (mcPermissions.getInstance().whois(player))
-			player.sendMessage("/whois " + mcLocale.getString("m.mccWhois"));
-
-		if (mcPermissions.getInstance().mmoedit(player))
-			player.sendMessage("/mmoedit" + mcLocale.getString("m.mccMmoedit"));
-
-		if (mcPermissions.getInstance().mcgod(player))
-			player.sendMessage("/mcgod" + ChatColor.RED + " " + mcLocale.getString("m.mccMcGod"));
-
-		player.sendMessage(mcLocale.getString("m.mccSkillInfo"));
-		player.sendMessage("/mcmmo " + mcLocale.getString("m.mccModDescription"));
-
-		return true;
-	}
-}

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

@@ -1,48 +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.Users;
-import com.gmail.nossr50.mcPermissions;
-import com.gmail.nossr50.config.LoadProperties;
-import com.gmail.nossr50.datatypes.PlayerProfile;
-import com.gmail.nossr50.locale.mcLocale;
-
-public class McgodCommand implements CommandExecutor {
-	@Override
-	public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
-		if (!LoadProperties.mcgodEnable) {
-			sender.sendMessage("This command is not enabled.");
-			return true;
-		}
-
-		if (!(sender instanceof Player)) {
-			sender.sendMessage("This command does not support console useage.");
-			return true;
-		}
-
-		Player player = (Player) sender;
-		PlayerProfile PP = Users.getProfile(player);
-
-		if (!mcPermissions.getInstance().mcgod(player)) {
-			player.sendMessage(ChatColor.YELLOW + "[mcMMO] " + ChatColor.DARK_RED + mcLocale.getString("mcPlayerListener.NoPermission"));
-			return true;
-		}
-
-        if (mcPermissions.getInstance().mcgod(player)) {
-			if (PP.getGodMode()) {
-				player.sendMessage(mcLocale.getString("mcPlayerListener.GodModeDisabled"));
-				PP.toggleGodMode();
-			} else {
-				player.sendMessage(mcLocale.getString("mcPlayerListener.GodModeEnabled"));
-				PP.toggleGodMode();
-			}
-		}
-
-		return true;
-	}
-}

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

@@ -1,48 +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 org.getspout.spoutapi.player.SpoutPlayer;
-
-import com.gmail.nossr50.config.LoadProperties;
-import com.gmail.nossr50.locale.mcLocale;
-
-public class McmmoCommand implements CommandExecutor {
-
-	@Override
-	public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
-		if (!LoadProperties.mcmmoEnable) {
-			sender.sendMessage("This command is not enabled.");
-			return true;
-		}
-
-		if (!(sender instanceof Player)) {
-			sender.sendMessage("This command does not support console useage.");
-			return true;
-		}
-
-		Player player = (Player) sender;
-
-		player.sendMessage(ChatColor.RED + "-----[]" + ChatColor.GREEN + "mcMMO" + ChatColor.RED + "[]-----");
-		String description = mcLocale.getString("mcMMO.Description", new Object[] { "mcc" });
-		String[] mcSplit = description.split(",");
-
-		for (String x : mcSplit) {
-			player.sendMessage(x);
-		}
-
-		if (LoadProperties.spoutEnabled && player instanceof SpoutPlayer) {
-			SpoutPlayer sPlayer = (SpoutPlayer) player;
-			if (LoadProperties.donateMessage)
-				sPlayer.sendMessage(ChatColor.GREEN + "[mcMMO] Donate! Paypal theno1yeti@gmail.com");
-		} else {
-			if (LoadProperties.donateMessage)
-				player.sendMessage(ChatColor.GREEN + "If you like my work you can donate via Paypal: theno1yeti@gmail.com");
-		}
-
-		return true;
-	}
-}

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

@@ -1,72 +0,0 @@
-package com.gmail.nossr50.commands.mc;
-
-import org.bukkit.ChatColor;
-import org.bukkit.command.Command;
-import org.bukkit.command.CommandExecutor;
-import org.bukkit.command.CommandSender;
-import org.bukkit.entity.Player;
-
-import com.gmail.nossr50.Users;
-import com.gmail.nossr50.mcMMO;
-import com.gmail.nossr50.mcPermissions;
-import com.gmail.nossr50.config.LoadProperties;
-import com.gmail.nossr50.datatypes.PlayerProfile;
-import com.gmail.nossr50.locale.mcLocale;
-
-public class McrefreshCommand implements CommandExecutor {
-	private final mcMMO plugin;
-
-	public McrefreshCommand(mcMMO instance) {
-		this.plugin = instance;
-	}
-
-	@Override
-	public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
-		if (!LoadProperties.mcrefreshEnable) {
-			sender.sendMessage("This command is not enabled.");
-			return true;
-		}
-
-		if (!(sender instanceof Player)) {
-			sender.sendMessage("This command does not support console useage.");
-			return true;
-		}
-
-		Player player = (Player) sender;
-		PlayerProfile PP = Users.getProfile(player);
-
-		if (!mcPermissions.getInstance().mcrefresh(player)) {
-			player.sendMessage(ChatColor.YELLOW + "[mcMMO] " + ChatColor.DARK_RED + mcLocale.getString("mcPlayerListener.NoPermission"));
-			return true;
-		}
-		if (args.length >= 1 && (plugin.getServer().getPlayer(args[0]) != null)) {
-			player.sendMessage("You have refreshed " + args[0] + "'s cooldowns!");
-			player = plugin.getServer().getPlayer(args[0]);
-		}
-
-		/*
-		 * PREP MODES
-		 */
-		PP = Users.getProfile(player);
-		PP.setRecentlyHurt((long) 0);
-		PP.setHoePreparationMode(false);
-		PP.setAxePreparationMode(false);
-		PP.setFistsPreparationMode(false);
-		PP.setSwordsPreparationMode(false);
-		PP.setPickaxePreparationMode(false);
-
-
-		//RESET COOLDOWNS
-		PP.resetCooldowns();
-		PP.setGreenTerraMode(false);
-		PP.setGigaDrillBreakerMode(false);
-		PP.setSerratedStrikesMode(false);
-		PP.setSuperBreakerMode(false);
-		PP.setTreeFellerMode(false);
-		PP.setBerserkMode(false);
-
-		player.sendMessage(mcLocale.getString("mcPlayerListener.AbilitiesRefreshed"));
-
-		return true;
-	}
-}

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

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

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

@@ -1,94 +0,0 @@
-package com.gmail.nossr50.commands.party;
-
-import java.util.logging.Level;
-import java.util.logging.Logger;
-
-import org.bukkit.Bukkit;
-import org.bukkit.ChatColor;
-import org.bukkit.command.Command;
-import org.bukkit.command.CommandExecutor;
-import org.bukkit.command.CommandSender;
-import org.bukkit.entity.Player;
-
-import com.gmail.nossr50.Users;
-import com.gmail.nossr50.mcPermissions;
-import com.gmail.nossr50.config.LoadProperties;
-import com.gmail.nossr50.datatypes.PlayerProfile;
-import com.gmail.nossr50.locale.mcLocale;
-
-public class ACommand implements CommandExecutor {
-	private Logger log;
-
-	public ACommand() {
-		this.log = Logger.getLogger("Minecraft");
-	}
-
-	@Override
-	public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
-
-		// Console message?
-		if (!(sender instanceof Player) && args.length >= 1) {
-			String aMessage = args[0];
-			for (int i = 1; i <= args.length - 1; i++) {
-				aMessage = aMessage + " " + args[i];
-			}
-
-			String aPrefix = ChatColor.AQUA + "{" + ChatColor.WHITE + "*Console*" + ChatColor.AQUA + "} ";
-
-			log.log(Level.INFO, "[A]<*Console*> " + aMessage);
-
-			for (Player herp : Bukkit.getServer().getOnlinePlayers()) {
-				if (mcPermissions.getInstance().adminChat(herp) || herp.isOp())
-					herp.sendMessage(aPrefix + aMessage);
-			}
-			return true;
-		}
-
-		Player player = null;
-        if (sender instanceof Player) {
-            player = (Player) sender;
-        }
-
-		if (player != null && !mcPermissions.getInstance().adminChat(player) && !player.isOp()) {
-			player.sendMessage(ChatColor.YELLOW + "[mcMMO] " + ChatColor.DARK_RED + mcLocale.getString("mcPlayerListener.NoPermission"));
-			return true;
-		}
-
-		// Not a toggle, a message
-
-		if (args.length >= 1) {
-			String aMessage = args[0];
-			for (int i = 1; i <= args.length - 1; i++) {
-				aMessage = aMessage + " " + args[i];
-			}
-
-			String name = (LoadProperties.aDisplayNames) ? player.getDisplayName() : player.getName();
-			String aPrefix = ChatColor.AQUA + "{" + ChatColor.WHITE + name + ChatColor.AQUA + "} ";
-			log.log(Level.INFO, "[A]<" + name + "> " + aMessage);
-			for (Player herp : Bukkit.getServer().getOnlinePlayers()) {
-				if (mcPermissions.getInstance().adminChat(herp) || herp.isOp())
-					herp.sendMessage(aPrefix + aMessage);
-			}
-			return true;
-		}
-
-		if(player != null)
-		{
-			PlayerProfile PP = Users.getProfile(player);
-			
-			if (PP.getPartyChatMode())
-				PP.togglePartyChat();
-	
-			PP.toggleAdminChat();
-	
-			if (PP.getAdminChatMode()) {
-				player.sendMessage(mcLocale.getString("mcPlayerListener.AdminChatOn"));
-				// player.sendMessage(ChatColor.AQUA + "Admin chat toggled " + ChatColor.GREEN + "On");
-			} else {
-				player.sendMessage(mcLocale.getString("mcPlayerListener.AdminChatOff"));
-				// player.sendMessage(ChatColor.AQUA + "Admin chat toggled " + ChatColor.RED + "Off");
-			}
-		}
-		return true;
-	}
-}

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

@@ -1,52 +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.Users;
-import com.gmail.nossr50.mcPermissions;
-import com.gmail.nossr50.config.LoadProperties;
-import com.gmail.nossr50.datatypes.PlayerProfile;
-import com.gmail.nossr50.locale.mcLocale;
-import com.gmail.nossr50.party.Party;
-
-public class AcceptCommand implements CommandExecutor {
-	@Override
-	public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
-		if (!LoadProperties.acceptEnable) {
-			sender.sendMessage("This command is not enabled.");
-			return true;
-		}
-
-		if (!(sender instanceof Player)) {
-			sender.sendMessage("This command does not support console useage.");
-			return true;
-		}
-
-		Player player = (Player) sender;
-		PlayerProfile PP = Users.getProfile(player);
-
-		if (!mcPermissions.getInstance().party(player)) {
-			player.sendMessage(ChatColor.YELLOW + "[mcMMO] " + ChatColor.DARK_RED + mcLocale.getString("mcPlayerListener.NoPermission"));
-			return true;
-		}
-
-		if (PP.hasPartyInvite()) {
-			Party Pinstance = Party.getInstance();
-
-			if (PP.inParty()) {
-				Pinstance.removeFromParty(player, PP);
-			}
-			PP.acceptInvite();
-			Pinstance.addToParty(player, PP, PP.getParty(), true);
-
-		} else {
-			player.sendMessage(mcLocale.getString("mcPlayerListener.NoInvites"));
-		}
-
-		return true;
-	}
-}

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

@@ -1,73 +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.Users;
-import com.gmail.nossr50.mcMMO;
-import com.gmail.nossr50.mcPermissions;
-import com.gmail.nossr50.config.LoadProperties;
-import com.gmail.nossr50.datatypes.PlayerProfile;
-import com.gmail.nossr50.locale.mcLocale;
-import com.gmail.nossr50.party.Party;
-
-public class InviteCommand implements CommandExecutor {
-	private final mcMMO plugin;
-
-	public InviteCommand(mcMMO instance) {
-		this.plugin = instance;
-	}
-
-	@Override
-	public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
-		if (!LoadProperties.inviteEnable) {
-			sender.sendMessage("This command is not enabled.");
-			return true;
-		}
-
-		if (!(sender instanceof Player)) {
-			sender.sendMessage("This command does not support console useage.");
-			return true;
-		}
-
-		Player player = (Player) sender;
-		PlayerProfile PP = Users.getProfile(player);
-
-		if (!mcPermissions.getInstance().party(player)) {
-			player.sendMessage(ChatColor.YELLOW + "[mcMMO] " + ChatColor.DARK_RED + mcLocale.getString("mcPlayerListener.NoPermission"));
-			return true;
-		}
-
-		Party Pinstance = Party.getInstance();
-
-		if (!PP.inParty()) {
-			player.sendMessage(mcLocale.getString("mcPlayerListener.NotInParty"));
-			return true;
-		}
-		if (args.length < 1) {
-			player.sendMessage(ChatColor.RED + "Usage is /invite <playername>");
-			return true;
-		}
-		if (PP.inParty() && args.length >= 1 && (plugin.getServer().getPlayer(args[0]) != null)) {
-			if (Pinstance.canInvite(player, PP)) {
-				Player target = plugin.getServer().getPlayer(args[0]);
-				PlayerProfile PPt = Users.getProfile(target);
-				PPt.modifyInvite(PP.getParty());
-
-				player.sendMessage(mcLocale.getString("mcPlayerListener.InviteSuccess"));
-				// target.sendMessage(ChatColor.RED+"ALERT: "+ChatColor.GREEN+"You have received a party invite for "+PPt.getInvite()+" from "+player.getName());
-				target.sendMessage(mcLocale.getString("mcPlayerListener.ReceivedInvite1", new Object[] { PPt.getInvite(), player.getName() }));
-				// target.sendMessage(ChatColor.YELLOW+"Type "+ChatColor.GREEN+LoadProperties.accept+ChatColor.YELLOW+" to accept the invite");
-				target.sendMessage(mcLocale.getString("mcPlayerListener.ReceivedInvite2", new Object[] { "/accept" }));
-			} else {
-				player.sendMessage(mcLocale.getString("Party.Locked"));
-				return true;
-			}
-		}
-
-		return true;
-	}
-}

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

@@ -1,102 +0,0 @@
-package com.gmail.nossr50.commands.party;
-
-import java.util.logging.Level;
-import java.util.logging.Logger;
-
-import org.bukkit.Bukkit;
-import org.bukkit.ChatColor;
-import org.bukkit.command.Command;
-import org.bukkit.command.CommandExecutor;
-import org.bukkit.command.CommandSender;
-import org.bukkit.entity.Player;
-
-import com.gmail.nossr50.Users;
-import com.gmail.nossr50.mcPermissions;
-import com.gmail.nossr50.config.LoadProperties;
-import com.gmail.nossr50.datatypes.PlayerProfile;
-import com.gmail.nossr50.locale.mcLocale;
-import com.gmail.nossr50.party.Party;
-
-public class PCommand implements CommandExecutor {
-	private Logger log;
-
-	public PCommand() {
-		this.log = Logger.getLogger("Minecraft");
-	}
-
-	@Override
-	public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
-		if (!LoadProperties.partyEnable) {
-			sender.sendMessage("This command is not enabled.");
-			return true;
-		}
-
-		// Console message?
-		if (!(sender instanceof Player)) {
-			if (args.length < 2)
-				return true;
-			String pMessage = args[1];
-			for (int i = 2; i <= args.length - 1; i++) {
-				pMessage = pMessage + " " + args[i];
-			}
-
-			String pPrefix = ChatColor.GREEN + "(" + ChatColor.WHITE + "*Console*" + ChatColor.GREEN + ") ";
-
-			log.log(Level.INFO, "[P](" + args[0] + ")" + "<*Console*> " + pMessage);
-
-			for (Player herp : Bukkit.getServer().getOnlinePlayers()) {
-				if (Users.getProfile(herp).inParty()) {
-					if (Users.getProfile(herp).getParty().equalsIgnoreCase(args[0])) {
-						herp.sendMessage(pPrefix + pMessage);
-					}
-				}
-			}
-			return true;
-		}
-
-		Player player = (Player) sender;
-		PlayerProfile PP = Users.getProfile(player);
-
-		if (!mcPermissions.getInstance().party(player)) {
-			player.sendMessage(ChatColor.YELLOW + "[mcMMO] " + ChatColor.DARK_RED + mcLocale.getString("mcPlayerListener.NoPermission"));
-			return true;
-		}
-
-		// Not a toggle, a message
-
-		if (args.length >= 1) {
-			String pMessage = args[0];
-			for (int i = 1; i <= args.length - 1; i++) {
-				pMessage = pMessage + " " + args[i];
-			}
-
-			String name = (LoadProperties.pDisplayNames) ? player.getDisplayName() : player.getName();
-			String pPrefix = ChatColor.GREEN + "(" + ChatColor.WHITE + name + ChatColor.GREEN + ") ";
-			log.log(Level.INFO, "[P](" + PP.getParty() + ")" + "<" + name + "> " + pMessage);
-
-			for (Player herp : Bukkit.getServer().getOnlinePlayers()) {
-				if (Users.getProfile(herp).inParty()) {
-					if (Party.getInstance().inSameParty(herp, player))
-						herp.sendMessage(pPrefix + pMessage);
-				}
-			}
-
-			return true;
-		}
-
-		if (PP.getAdminChatMode())
-			PP.toggleAdminChat();
-
-		PP.togglePartyChat();
-
-		if (PP.getPartyChatMode()) {
-			// player.sendMessage(ChatColor.GREEN + "Party Chat Toggled On");
-			player.sendMessage(mcLocale.getString("mcPlayerListener.PartyChatOn"));
-		} else {
-			// player.sendMessage(ChatColor.GREEN + "Party Chat Toggled " + ChatColor.RED + "Off");
-			player.sendMessage(mcLocale.getString("mcPlayerListener.PartyChatOff"));
-		}
-
-		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,192 +1,154 @@
-package com.gmail.nossr50.commands.party;
-
-import org.bukkit.Bukkit;
-import org.bukkit.ChatColor;
-import org.bukkit.command.Command;
-import org.bukkit.command.CommandExecutor;
-import org.bukkit.command.CommandSender;
-import org.bukkit.entity.Player;
-
-import com.gmail.nossr50.Users;
-import com.gmail.nossr50.mcPermissions;
-import com.gmail.nossr50.config.LoadProperties;
-import com.gmail.nossr50.datatypes.PlayerProfile;
-import com.gmail.nossr50.locale.mcLocale;
-import com.gmail.nossr50.party.Party;
-
-public class PartyCommand implements CommandExecutor {
-	@Override
-	public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
-		if (!LoadProperties.partyEnable) {
-			sender.sendMessage("This command is not enabled.");
-			return true;
-		}
-
-		if (!(sender instanceof Player)) {
-			sender.sendMessage("This command does not support console useage.");
-			return true;
-		}
-
-		Player player = (Player) sender;
-		PlayerProfile PP = Users.getProfile(player);
-
-		if (!mcPermissions.getInstance().party(player)) {
-			player.sendMessage(ChatColor.YELLOW + "[mcMMO] " + ChatColor.DARK_RED + mcLocale.getString("mcPlayerListener.NoPermission"));
-			return true;
-		}
-
-		Party Pinstance = Party.getInstance();
-
-		if (PP.inParty() && (!Pinstance.isParty(PP.getParty()) || !Pinstance.isInParty(player, PP))) {
-			Pinstance.addToParty(player, PP, PP.getParty(), false);
-		}
-
-		if (args.length == 0 && !PP.inParty()) {
-			player.sendMessage(mcLocale.getString("Party.Help1", new Object[] { "/party "}));
-			player.sendMessage(mcLocale.getString("Party.Help2", new Object[] { "/party "}));
-			player.sendMessage(mcLocale.getString("Party.Help3", new Object[] { "/party " }));
-			return true;
-		} else if (args.length == 0 && PP.inParty()) {
-			String tempList = "";
-			int x = 0;
-			for (Player p : Bukkit.getServer().getOnlinePlayers()) {
-				if (PP.getParty().equals(Users.getProfile(p).getParty())) {
-					if (p != null && x + 1 >= Pinstance.partyCount(player, Bukkit.getServer().getOnlinePlayers())) {
-						if (Pinstance.isPartyLeader(p.getName(), PP.getParty())) {
-							tempList += ChatColor.GOLD + p.getName();
-							x++;
-						} else {
-							tempList += ChatColor.WHITE + p.getName();
-							x++;
-						}
-					}
-					if (p != null && x < Pinstance.partyCount(player, Bukkit.getServer().getOnlinePlayers())) {
-						if (Pinstance.isPartyLeader(p.getName(), PP.getParty())) {
-							tempList += ChatColor.GOLD + p.getName() + ", ";
-							x++;
-						} else {
-							tempList += ChatColor.WHITE + p.getName() + ", ";
-							x++;
-						}
-					}
-				}
-			}
-			player.sendMessage(mcLocale.getString("mcPlayerListener.YouAreInParty", new Object[] { PP.getParty() }));
-			player.sendMessage(mcLocale.getString("mcPlayerListener.PartyMembers") + " (" + tempList + ChatColor.GREEN + ")");
-			return true;
-		} else if (args.length == 1) {
-			if (args[0].equals("q") && PP.inParty()) {
-				Pinstance.removeFromParty(player, PP);
-
-				player.sendMessage(mcLocale.getString("mcPlayerListener.LeftParty"));
-				return true;
-			} else if (args[0].equalsIgnoreCase("?")) {
-				player.sendMessage(mcLocale.getString("Party.Help4", new Object[] { "/party " }));
-				player.sendMessage(mcLocale.getString("Party.Help2", new Object[] { "/party " }));
-				player.sendMessage(mcLocale.getString("Party.Help5", new Object[] { "/party " }));
-				player.sendMessage(mcLocale.getString("Party.Help6", new Object[] { "/party " }));
-				player.sendMessage(mcLocale.getString("Party.Help7", new Object[] { "/party " }));
-				player.sendMessage(mcLocale.getString("Party.Help8", new Object[] { "/party " }));
-				player.sendMessage(mcLocale.getString("Party.Help9", new Object[] { "/party " }));
-			} else if (args[0].equalsIgnoreCase("lock")) {
-				if (PP.inParty()) {
-					if (Pinstance.isPartyLeader(player.getName(), PP.getParty())) {
-						Pinstance.lockParty(PP.getParty());
-						player.sendMessage(mcLocale.getString("Party.Locked"));
-					} else {
-						player.sendMessage(mcLocale.getString("Party.NotOwner"));
-					}
-				} else {
-					player.sendMessage(mcLocale.getString("Party.InvalidName"));
-				}
-			} else if (args[0].equalsIgnoreCase("unlock")) {
-				if (PP.inParty()) {
-					if (Pinstance.isPartyLeader(player.getName(), PP.getParty())) {
-						Pinstance.unlockParty(PP.getParty());
-						player.sendMessage(mcLocale.getString("Party.Unlocked"));
-					} else {
-						player.sendMessage(mcLocale.getString("Party.NotOwner"));
-					}
-				} else {
-					player.sendMessage(mcLocale.getString("Party.InvalidName"));
-				}
-				// Party debugging command.
-				// } else if (args[0].equalsIgnoreCase("dump")) {
-				// Pinstance.dump(player);
-			} else {
-				if (PP.inParty()) {
-					Pinstance.removeFromParty(player, PP);
-				}
-				Pinstance.addToParty(player, PP, args[0], false);
-				return true;
-			}
-		} else if (args.length == 2 && PP.inParty()) {
-			if (args[0].equalsIgnoreCase("password")) {
-				if (Pinstance.isPartyLeader(player.getName(), PP.getParty())) {
-					if (Pinstance.isPartyLocked(PP.getParty())) {
-						Pinstance.setPartyPassword(PP.getParty(), args[1]);
-						player.sendMessage(mcLocale.getString("Party.PasswordSet", new Object[] { args[1] }));
-					} else {
-						player.sendMessage(mcLocale.getString("Party.IsntLocked"));
-					}
-				} else {
-					player.sendMessage(mcLocale.getString("Party.NotOwner"));
-				}
-			} else if (args[0].equalsIgnoreCase("kick")) {
-				if (Pinstance.isPartyLeader(player.getName(), PP.getParty())) {
-					if (Pinstance.isPartyLocked(PP.getParty())) {
-						Player tPlayer = null;
-						if (Bukkit.getServer().getPlayer(args[1]) != null)
-							tPlayer = Bukkit.getServer().getPlayer(args[1]);
-						if (tPlayer == null) {
-							player.sendMessage(mcLocale.getString("Party.CouldNotKick", new Object[] { args[1] }));
-						}
-						if (!Pinstance.inSameParty(player, tPlayer)) {
-							player.sendMessage(mcLocale.getString("Party.NotInYourParty", new Object[] { tPlayer.getName() }));
-						} else {
-							// Not an admin
-							if (!mcPermissions.getInstance().admin(player)) {
-								// Can't kick an admin
-								if (mcPermissions.getInstance().admin(tPlayer)) {
-									player.sendMessage(mcLocale.getString("Party.CouldNotKick", new Object[] { tPlayer.getName() }));
-								}
-							}
-							PlayerProfile tPP = Users.getProfile(tPlayer);
-
-							Pinstance.removeFromParty(tPlayer, tPP);
-
-							tPlayer.sendMessage(mcLocale.getString("mcPlayerListener.LeftParty"));
-						}
-					} else {
-						player.sendMessage(mcLocale.getString("Party.IsntLocked"));
-					}
-				} else {
-					player.sendMessage(mcLocale.getString("Party.NotOwner"));
-				}
-			} else if (args[0].equalsIgnoreCase("owner")) {
-				if (Pinstance.isPartyLeader(player.getName(), PP.getParty())) {
-					Player tPlayer = null;
-					if (Bukkit.getServer().getPlayer(args[1]) != null)
-						tPlayer = Bukkit.getServer().getPlayer(args[1]);
-					if (tPlayer == null) {
-						player.sendMessage(mcLocale.getString("Party.CouldNotSetOwner", new Object[] { args[1] }));
-					}
-					if (!Pinstance.inSameParty(player, tPlayer)) {
-						player.sendMessage(mcLocale.getString("Party.CouldNotSetOwner", new Object[] { tPlayer.getName() }));
-					} else {
-						Pinstance.setPartyLeader(PP.getParty(), tPlayer.getName());
-					}
-				} else {
-					player.sendMessage(mcLocale.getString("Party.NotOwner"));
-				}
-			} else {
-				Pinstance.removeFromParty(player, PP);
-				Pinstance.addToParty(player, PP, args[0], false, args[1]);
-			}
-		} else if (args.length == 2 && !PP.inParty()) {
-			Pinstance.addToParty(player, PP, args[0], false, args[1]);
-		}
-
-		return true;
-	}
-}
+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.commands.chat.PartyChatCommand;
+import com.gmail.nossr50.datatypes.player.McMMOPlayer;
+import com.gmail.nossr50.locale.LocaleLoader;
+import com.gmail.nossr50.util.Permissions;
+import com.gmail.nossr50.util.commands.CommandUtils;
+import com.gmail.nossr50.util.player.UserManager;
+
+public class PartyCommand implements CommandExecutor {
+    private McMMOPlayer mcMMOPlayer;
+    private Player player;
+
+    private CommandExecutor partyJoinCommand           = new PartyJoinCommand();
+    private CommandExecutor partyAcceptCommand         = new PartyAcceptCommand();
+    private CommandExecutor partyCreateCommand         = new PartyCreateCommand();
+    private CommandExecutor partyQuitCommand           = new PartyQuitCommand();
+    private CommandExecutor partyExpShareCommand       = new PartyExpShareCommand();
+    private CommandExecutor partyItemShareCommand      = new PartyItemShareCommand();
+    private CommandExecutor partyInviteCommand         = new PartyInviteCommand();
+    private CommandExecutor partyKickCommand           = new PartyKickCommand();
+    private CommandExecutor partyDisbandCommand        = new PartyDisbandCommand();
+    private CommandExecutor partyChangeOwnerCommand    = new PartyChangeOwnerCommand();
+    private CommandExecutor partyLockCommand           = new PartyLockCommand();
+    private CommandExecutor partyChangePasswordCommand = new PartyChangePasswordCommand();
+    private CommandExecutor partyRenameCommand         = new PartyRenameCommand();
+    private CommandExecutor partyInfoCommand           = new PartyInfoCommand();
+    private CommandExecutor partyHelpCommand           = new PartyHelpCommand();
+    private CommandExecutor partyTeleportCommand       = new PtpCommand();
+    private CommandExecutor partyChatCommand           = new PartyChatCommand();
+
+    @Override
+    public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
+        if (CommandUtils.noConsoleUsage(sender)) {
+            return true;
+        }
+
+        if (!Permissions.party(sender)) {
+            sender.sendMessage(command.getPermissionMessage());
+            return true;
+        }
+
+        player = (Player) sender;
+        mcMMOPlayer = UserManager.getPlayer(player);
+
+        if (args.length < 1) {
+            if (!mcMMOPlayer.inParty()) {
+                sender.sendMessage(LocaleLoader.getString("Commands.Party.None"));
+                return printUsage();
+            }
+
+            return partyInfoCommand.onCommand(sender, command, label, args);
+        }
+
+        PartySubcommandType subcommand = PartySubcommandType.getSubcommand(args[0]);
+
+        if (subcommand == null) {
+            return printUsage();
+        }
+
+        // Can't use this for lock/unlock since they're handled by the same command
+        if (subcommand != PartySubcommandType.LOCK && subcommand != PartySubcommandType.UNLOCK && !Permissions.partySubcommand(sender, subcommand)) {
+            sender.sendMessage(command.getPermissionMessage());
+            return true;
+        }
+
+        switch (subcommand) {
+            case JOIN:
+                return partyJoinCommand.onCommand(sender, command, label, args);
+            case ACCEPT:
+                return partyAcceptCommand.onCommand(sender, command, label, args);
+            case CREATE:
+                return partyCreateCommand.onCommand(sender, command, label, args);
+            case HELP:
+                return partyHelpCommand.onCommand(sender, command, label, args);
+            default:
+                break;
+        }
+
+        // Party member commands
+        if (!mcMMOPlayer.inParty()) {
+            sender.sendMessage(LocaleLoader.getString("Commands.Party.None"));
+            return printUsage();
+        }
+
+        switch (subcommand) {
+            case INFO:
+                return partyInfoCommand.onCommand(sender, command, label, args);
+            case QUIT:
+                return partyQuitCommand.onCommand(sender, command, label, args);
+            case INVITE:
+                return partyInviteCommand.onCommand(sender, command, label, args);
+            case TELEPORT:
+                return partyTeleportCommand.onCommand(sender, command, label, extractArgs(args));
+            case CHAT:
+                return partyChatCommand.onCommand(sender, command, label, extractArgs(args));
+            default:
+                break;
+        }
+
+        // Party leader commands
+        if (!mcMMOPlayer.getParty().getLeader().equalsIgnoreCase(player.getName())) {
+            sender.sendMessage(LocaleLoader.getString("Party.NotOwner"));
+            return true;
+        }
+
+        switch (subcommand) {
+            case EXPSHARE:
+                return partyExpShareCommand.onCommand(sender, command, label, args);
+            case ITEMSHARE:
+                return partyItemShareCommand.onCommand(sender, command, label, args);
+            case KICK:
+                return partyKickCommand.onCommand(sender, command, label, args);
+            case DISBAND:
+                return partyDisbandCommand.onCommand(sender, command, label, args);
+            case OWNER:
+                return partyChangeOwnerCommand.onCommand(sender, command, label, args);
+            case LOCK:
+                // Fallthrough
+            case UNLOCK:
+                return partyLockCommand.onCommand(sender, command, label, args);
+            case PASSWORD:
+                return partyChangePasswordCommand.onCommand(sender, command, label, args);
+            case RENAME:
+                return partyRenameCommand.onCommand(sender, command, label, args);
+            default:
+                break;
+        }
+
+        return true;
+    }
+
+    private boolean printUsage() {
+        player.sendMessage(LocaleLoader.getString("Party.Help.0", "/party join"));
+        player.sendMessage(LocaleLoader.getString("Party.Help.1", "/party create"));
+        player.sendMessage(LocaleLoader.getString("Party.Help.2", "/party ?"));
+        return true;
+    }
+
+    private String[] extractArgs(String[] args) {
+        String[] newArgs = new String[args.length - 1];
+
+        for (int i = 1; i < args.length; i++) {
+            newArgs[i - 1] = args[i];
+        }
+
+        return newArgs;
+    }
+}

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,62 +1,218 @@
-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.Users;
-import com.gmail.nossr50.mcMMO;
-import com.gmail.nossr50.mcPermissions;
-import com.gmail.nossr50.config.LoadProperties;
-import com.gmail.nossr50.datatypes.PlayerProfile;
-import com.gmail.nossr50.locale.mcLocale;
-
-public class PtpCommand implements CommandExecutor {
-	private final mcMMO plugin;
-
-	public PtpCommand(mcMMO instance) {
-		this.plugin = instance;
-	}
-
-	@Override
-	public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
-		if (!LoadProperties.ptpEnable) {
-			sender.sendMessage("This command is not enabled.");
-			return true;
-		}
-
-		if (!(sender instanceof Player)) {
-			sender.sendMessage("This command does not support console useage.");
-			return true;
-		}
-
-		Player player = (Player) sender;
-		PlayerProfile PP = Users.getProfile(player);
-
-		if (!mcPermissions.getInstance().partyTeleport(player)) {
-			player.sendMessage(ChatColor.YELLOW + "[mcMMO] " + ChatColor.DARK_RED + mcLocale.getString("mcPlayerListener.NoPermission"));
-			return true;
-		}
-		if (args.length < 1) {
-			player.sendMessage(ChatColor.RED + "Usage is /ptp <playername>");
-			return true;
-		}
-		if (plugin.getServer().getPlayer(args[0]) == null) {
-			player.sendMessage("That is not a valid player");
-		}
-
-		if (plugin.getServer().getPlayer(args[0]) != null) {
-			Player target = plugin.getServer().getPlayer(args[0]);
-			PlayerProfile PPt = Users.getProfile(target);
-			if (PP.getParty().equals(PPt.getParty())) {
-				player.teleport(target);
-				player.sendMessage(ChatColor.GREEN + "You have teleported to " + target.getName());
-				target.sendMessage(ChatColor.GREEN + player.getName() + " has teleported to you.");
-			}
-		}
-
-		return true;
-	}
-}
+package com.gmail.nossr50.commands.party;
+
+import org.bukkit.World;
+import org.bukkit.command.Command;
+import org.bukkit.command.CommandExecutor;
+import org.bukkit.command.CommandSender;
+import org.bukkit.entity.Player;
+
+import com.gmail.nossr50.mcMMO;
+import com.gmail.nossr50.config.Config;
+import com.gmail.nossr50.datatypes.player.McMMOPlayer;
+import com.gmail.nossr50.events.party.McMMOPartyTeleportEvent;
+import com.gmail.nossr50.locale.LocaleLoader;
+import com.gmail.nossr50.party.PartyManager;
+import com.gmail.nossr50.util.Misc;
+import com.gmail.nossr50.util.Permissions;
+import com.gmail.nossr50.util.commands.CommandUtils;
+import com.gmail.nossr50.util.player.UserManager;
+
+public class PtpCommand implements CommandExecutor {
+    private Player player;
+    private McMMOPlayer mcMMOPlayer;
+
+    private Player target;
+    private McMMOPlayer mcMMOTarget;
+
+    @Override
+    public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
+        if (CommandUtils.noConsoleUsage(sender)) {
+            return true;
+        }
+
+        switch (args.length) {
+            case 1:
+                player = (Player) sender;
+                mcMMOPlayer = UserManager.getPlayer(player);
+
+                if (args[0].equalsIgnoreCase("toggle")) {
+                    if (!Permissions.partyTeleportToggle(sender)) {
+                        sender.sendMessage(command.getPermissionMessage());
+                        return true;
+                    }
+
+                    return togglePartyTeleportation();
+                }
+
+                if (args[0].equalsIgnoreCase("acceptany") || args[0].equalsIgnoreCase("acceptall")) {
+                    if (!Permissions.partyTeleportAcceptAll(sender)) {
+                        sender.sendMessage(command.getPermissionMessage());
+                        return true;
+                    }
+
+                    return acceptAnyTeleportRequest();
+                }
+
+                int ptpCooldown = Config.getInstance().getPTPCommandCooldown();
+                long recentlyHurt = UserManager.getPlayer(player).getRecentlyHurt();
+
+                if ((recentlyHurt * Misc.TIME_CONVERSION_FACTOR + ptpCooldown * Misc.TIME_CONVERSION_FACTOR) > System.currentTimeMillis()) {
+                    player.sendMessage(LocaleLoader.getString("Party.Teleport.Hurt", ptpCooldown));
+                    return true;
+                }
+
+                if (args[0].equalsIgnoreCase("accept")) {
+                    if (!Permissions.partyTeleportAccept(sender)) {
+                        sender.sendMessage(command.getPermissionMessage());
+                        return true;
+                    }
+
+                    return acceptTeleportRequest();
+                }
+
+                return sendTeleportRequest(args[0]);
+
+            default:
+                return false;
+        }
+    }
+
+    private boolean sendTeleportRequest(String targetName) {
+        if (!canTeleport(targetName)) {
+            return true;
+        }
+
+        if (!mcMMOTarget.getPtpConfirmRequired()) {
+            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,138 @@
+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");
+        }
+
+        if (!mcMMO.queueManager.queue(new McRankAsync(playerName, sender))) {
+            // This will only run if for some reason it is unable to add to the queue
+            sender.sendMessage(ChatColor.RED + "Unable to add to queue.");
+        }
+
+        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))) {
+            // This will only run if for some reason it is unable to add to the queue
+            sender.sendMessage(ChatColor.RED + "Unable to add to queue.");
+        }
+
+        sender.sendMessage(ChatColor.YELLOW + "Calculating mcMMO rankings...");
+    }
+}

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

@@ -1,52 +1,105 @@
-package com.gmail.nossr50.commands.skills;
-
-import org.bukkit.command.Command;
-import org.bukkit.command.CommandExecutor;
-import org.bukkit.command.CommandSender;
-import org.bukkit.entity.Player;
-
-import com.gmail.nossr50.Users;
-import com.gmail.nossr50.mcPermissions;
-import com.gmail.nossr50.datatypes.PlayerProfile;
-import com.gmail.nossr50.datatypes.SkillType;
-import com.gmail.nossr50.locale.mcLocale;
-
-public class AcrobaticsCommand implements CommandExecutor {
-	@Override
-	public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
-		if (!(sender instanceof Player)) {
-			sender.sendMessage("This command does not support console useage.");
-			return true;
-		}
-
-		Player player = (Player) sender;
-		PlayerProfile PP = Users.getProfile(player);
-
-		String dodgepercentage;
-		float skillvalue = (float) PP.getSkillLevel(SkillType.ACROBATICS);
-		String percentage = String.valueOf((skillvalue / 1000) * 100);
-		String gracepercentage = String.valueOf(((skillvalue / 1000) * 100) * 2);
-
-		if (PP.getSkillLevel(SkillType.ACROBATICS) <= 800)
-			dodgepercentage = String.valueOf((skillvalue / 4000 * 100));
-		else
-			dodgepercentage = "20";
-
-		player.sendMessage(mcLocale.getString("m.SkillHeader", new Object[] { mcLocale.getString("m.SkillAcrobatics") }));
-		player.sendMessage(mcLocale.getString("m.XPGain", new Object[] { mcLocale.getString("m.XPGainAcrobatics") }));
-
-		if (mcPermissions.getInstance().acrobatics(player))
-			player.sendMessage(mcLocale.getString("m.LVL", new Object[] { PP.getSkillLevel(SkillType.ACROBATICS), PP.getSkillXpLevel(SkillType.ACROBATICS), PP.getXpToLevel(SkillType.ACROBATICS) }));
-
-		player.sendMessage(mcLocale.getString("m.SkillHeader", new Object[] { mcLocale.getString("m.Effects") }));
-		player.sendMessage(mcLocale.getString("m.EffectsTemplate", new Object[] { mcLocale.getString("m.EffectsAcrobatics1_0"), mcLocale.getString("m.EffectsAcrobatics1_1") }));
-		player.sendMessage(mcLocale.getString("m.EffectsTemplate", new Object[] { mcLocale.getString("m.EffectsAcrobatics2_0"), mcLocale.getString("m.EffectsAcrobatics2_1") }));
-		player.sendMessage(mcLocale.getString("m.EffectsTemplate", new Object[] { mcLocale.getString("m.EffectsAcrobatics3_0"), mcLocale.getString("m.EffectsAcrobatics3_1") }));
-		player.sendMessage(mcLocale.getString("m.SkillHeader", new Object[] { mcLocale.getString("m.YourStats") }));
-		player.sendMessage(mcLocale.getString("m.AcrobaticsRollChance", new Object[] { percentage }));
-		player.sendMessage(mcLocale.getString("m.AcrobaticsGracefulRollChance", new Object[] { gracepercentage }));
-		player.sendMessage(mcLocale.getString("m.AcrobaticsDodgeChance", new Object[] { dodgepercentage }));
-
-		return true;
-	}
-}
+package com.gmail.nossr50.commands.skills;
+
+import com.gmail.nossr50.datatypes.skills.SkillType;
+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;
+    private String dodgeChanceLucky;
+    private String rollChance;
+    private String rollChanceLucky;
+    private String gracefulRollChance;
+    private String gracefulRollChanceLucky;
+
+    private boolean canDodge;
+    private boolean canRoll;
+    private boolean canGracefulRoll;
+
+    public AcrobaticsCommand() {
+        super(SkillType.ACROBATICS);
+    }
+
+    @Override
+    protected void dataCalculations() {
+        // DODGE
+        String[] dodgeStrings = calculateAbilityDisplayValues(Acrobatics.dodgeMaxBonusLevel, Acrobatics.dodgeMaxChance);
+        dodgeChance = dodgeStrings[0];
+        dodgeChanceLucky = dodgeStrings[1];
+
+        // ROLL
+        String[] rollStrings = calculateAbilityDisplayValues(Acrobatics.rollMaxBonusLevel, Acrobatics.rollMaxChance);
+        rollChance = rollStrings[0];
+        rollChanceLucky = rollStrings[1];
+
+        // GRACEFUL ROLL
+        String[] gracefulRollStrings = calculateAbilityDisplayValues(Acrobatics.gracefulRollMaxBonusLevel, Acrobatics.gracefulRollMaxChance);
+        gracefulRollChance = gracefulRollStrings[0];
+        gracefulRollChanceLucky = gracefulRollStrings[1];
+    }
+
+    @Override
+    protected void permissionsCheck() {
+        canDodge = Permissions.dodge(player);
+        canRoll = Permissions.roll(player);
+        canGracefulRoll = Permissions.gracefulRoll(player);
+    }
+
+    @Override
+    protected boolean effectsHeaderPermissions() {
+        return canDodge || canGracefulRoll || canRoll;
+    }
+
+    @Override
+    protected void effectsDisplay() {
+        luckyEffectsDisplay();
+
+        if (canRoll) {
+            player.sendMessage(LocaleLoader.getString("Effects.Template", LocaleLoader.getString("Acrobatics.Effect.0"), LocaleLoader.getString("Acrobatics.Effect.1")));
+        }
+
+        if (canGracefulRoll) {
+            player.sendMessage(LocaleLoader.getString("Effects.Template", LocaleLoader.getString("Acrobatics.Effect.2"), LocaleLoader.getString("Acrobatics.Effect.3")));
+        }
+
+        if (canDodge) {
+            player.sendMessage(LocaleLoader.getString("Effects.Template", LocaleLoader.getString("Acrobatics.Effect.4"), LocaleLoader.getString("Acrobatics.Effect.5")));
+        }
+    }
+
+    @Override
+    protected boolean statsHeaderPermissions() {
+        return canDodge || canGracefulRoll || canRoll;
+    }
+
+    @Override
+    protected void statsDisplay() {
+        if (canRoll) {
+            if (isLucky) {
+                player.sendMessage(LocaleLoader.getString("Acrobatics.Roll.Chance", new Object[] { rollChance }) + LocaleLoader.getString("Perks.lucky.bonus", new Object[] { rollChanceLucky }));
+            }
+            else {
+                player.sendMessage(LocaleLoader.getString("Acrobatics.Roll.Chance", new Object[] { rollChance }));
+            }
+        }
+
+        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,63 +1,104 @@
-package com.gmail.nossr50.commands.skills;
-
-import org.bukkit.command.Command;
-import org.bukkit.command.CommandExecutor;
-import org.bukkit.command.CommandSender;
-import org.bukkit.entity.Player;
-
-import com.gmail.nossr50.Users;
-import com.gmail.nossr50.mcPermissions;
-import com.gmail.nossr50.datatypes.PlayerProfile;
-import com.gmail.nossr50.datatypes.SkillType;
-import com.gmail.nossr50.locale.mcLocale;
-
-public class ArcheryCommand implements CommandExecutor {
-	@Override
-	public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
-		if (!(sender instanceof Player)) {
-			sender.sendMessage("This command does not support console useage.");
-			return true;
-		}
-
-		Player player = (Player) sender;
-		PlayerProfile PP = Users.getProfile(player);
-
-		float skillvalue = (float) PP.getSkillLevel(SkillType.ARCHERY);
-		String percentage = String.valueOf((skillvalue / 1000) * 100);
-
-		int ignition = 20;
-		if (PP.getSkillLevel(SkillType.ARCHERY) >= 200)
-			ignition += 20;
-		if (PP.getSkillLevel(SkillType.ARCHERY) >= 400)
-			ignition += 20;
-		if (PP.getSkillLevel(SkillType.ARCHERY) >= 600)
-			ignition += 20;
-		if (PP.getSkillLevel(SkillType.ARCHERY) >= 800)
-			ignition += 20;
-		if (PP.getSkillLevel(SkillType.ARCHERY) >= 1000)
-			ignition += 20;
-
-		String percentagedaze;
-		if (PP.getSkillLevel(SkillType.ARCHERY) < 1000)
-			percentagedaze = String.valueOf((skillvalue / 2000) * 100);
-		else
-			percentagedaze = "50";
-
-		player.sendMessage(mcLocale.getString("m.SkillHeader", new Object[] { mcLocale.getString("m.SkillArchery") }));
-		player.sendMessage(mcLocale.getString("m.XPGain", new Object[] { mcLocale.getString("m.XPGainArchery") }));
-
-		if (mcPermissions.getInstance().archery(player))
-			player.sendMessage(mcLocale.getString("m.LVL", new Object[] { PP.getSkillLevel(SkillType.ARCHERY), PP.getSkillXpLevel(SkillType.ARCHERY), PP.getXpToLevel(SkillType.ARCHERY) }));
-
-		player.sendMessage(mcLocale.getString("m.SkillHeader", new Object[] { mcLocale.getString("m.Effects") }));
-		player.sendMessage(mcLocale.getString("m.EffectsTemplate", new Object[] { mcLocale.getString("m.EffectsArchery1_0"), mcLocale.getString("m.EffectsArchery1_1") }));
-		player.sendMessage(mcLocale.getString("m.EffectsTemplate", new Object[] { mcLocale.getString("m.EffectsArchery2_0"), mcLocale.getString("m.EffectsArchery2_1") }));
-		player.sendMessage(mcLocale.getString("m.EffectsTemplate", new Object[] { mcLocale.getString("m.EffectsArchery4_0"), mcLocale.getString("m.EffectsArchery4_1") }));
-		player.sendMessage(mcLocale.getString("m.SkillHeader", new Object[] { mcLocale.getString("m.YourStats") }));
-		player.sendMessage(mcLocale.getString("m.ArcheryDazeChance", new Object[] { percentagedaze }));
-		player.sendMessage(mcLocale.getString("m.ArcheryRetrieveChance", new Object[] { percentage }));
-		player.sendMessage(mcLocale.getString("m.ArcheryIgnitionLength", new Object[] { (ignition / 20) }));
-
-		return true;
-	}
-}
+package com.gmail.nossr50.commands.skills;
+
+import com.gmail.nossr50.datatypes.skills.SkillType;
+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;
+    private String dazeChance;
+    private String dazeChanceLucky;
+    private String retrieveChance;
+    private String retrieveChanceLucky;
+
+    private boolean canSkillShot;
+    private boolean canDaze;
+    private boolean canRetrieve;
+
+    public ArcheryCommand() {
+        super(SkillType.ARCHERY);
+    }
+
+    @Override
+    protected void dataCalculations() {
+        // SKILL SHOT
+        double bonus = (skillValue / Archery.skillShotIncreaseLevel) * Archery.skillShotIncreasePercentage;
+
+        if (bonus > Archery.skillShotMaxBonusPercentage) {
+            skillShotBonus = percent.format(Archery.skillShotMaxBonusPercentage);
+        }
+        else {
+            skillShotBonus = percent.format(bonus);
+        }
+
+        // DAZE
+        String[] dazeStrings = calculateAbilityDisplayValues(Archery.dazeMaxBonusLevel, Archery.dazeMaxBonus);
+        dazeChance = dazeStrings[0];
+        dazeChanceLucky = dazeStrings[1];
+
+        // RETRIEVE
+        String[] retrieveStrings = calculateAbilityDisplayValues(Archery.retrieveMaxBonusLevel, Archery.retrieveMaxChance);
+        retrieveChance = retrieveStrings[0];
+        retrieveChanceLucky = retrieveStrings[1];
+    }
+
+    @Override
+    protected void permissionsCheck() {
+        canSkillShot = Permissions.bonusDamage(player, skill);
+        canDaze = Permissions.daze(player);
+        canRetrieve = Permissions.arrowRetrieval(player);
+    }
+
+    @Override
+    protected boolean effectsHeaderPermissions() {
+        return canSkillShot || canDaze || canRetrieve;
+    }
+
+    @Override
+    protected void effectsDisplay() {
+        luckyEffectsDisplay();
+
+        if (canSkillShot) {
+            player.sendMessage(LocaleLoader.getString("Effects.Template", LocaleLoader.getString("Archery.Effect.0"), LocaleLoader.getString("Archery.Effect.1")));
+        }
+
+        if (canDaze) {
+            player.sendMessage(LocaleLoader.getString("Effects.Template", LocaleLoader.getString("Archery.Effect.2"), LocaleLoader.getString("Archery.Effect.3", Archery.dazeModifier)));
+        }
+
+        if (canRetrieve) {
+            player.sendMessage(LocaleLoader.getString("Effects.Template", LocaleLoader.getString("Archery.Effect.4"), LocaleLoader.getString("Archery.Effect.5")));
+        }
+    }
+
+    @Override
+    protected boolean statsHeaderPermissions() {
+        return canSkillShot || canDaze || canRetrieve;
+    }
+
+    @Override
+    protected void statsDisplay() {
+        if (canSkillShot) {
+            player.sendMessage(LocaleLoader.getString("Archery.Combat.SkillshotBonus", skillShotBonus));
+        }
+
+        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,62 +1,128 @@
-package com.gmail.nossr50.commands.skills;
-
-import org.bukkit.command.Command;
-import org.bukkit.command.CommandExecutor;
-import org.bukkit.command.CommandSender;
-import org.bukkit.entity.Player;
-
-import com.gmail.nossr50.Users;
-import com.gmail.nossr50.mcPermissions;
-import com.gmail.nossr50.datatypes.PlayerProfile;
-import com.gmail.nossr50.datatypes.SkillType;
-import com.gmail.nossr50.locale.mcLocale;
-
-public class AxesCommand implements CommandExecutor {
-	@Override
-	public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
-		if (!(sender instanceof Player)) {
-			sender.sendMessage("This command does not support console useage.");
-			return true;
-		}
-
-		Player player = (Player) sender;
-		PlayerProfile PP = Users.getProfile(player);
-
-		String percentage;
-
-		float skillvalue = (float) PP.getSkillLevel(SkillType.AXES);
-		if (PP.getSkillLevel(SkillType.AXES) < 750)
-			percentage = String.valueOf((skillvalue / 1000) * 100);
-		else
-			percentage = "75";
-
-		int ticks = 2;
-		int x = PP.getSkillLevel(SkillType.AXES);
-		while (x >= 50) {
-			x -= 50;
-			ticks++;
-		}
-
-		player.sendMessage(mcLocale.getString("m.SkillHeader", new Object[] { mcLocale.getString("m.SkillAxes") }));
-		player.sendMessage(mcLocale.getString("m.XPGain", new Object[] { mcLocale.getString("m.XPGainAxes") }));
-
-		if (mcPermissions.getInstance().axes(player))
-			player.sendMessage(mcLocale.getString("m.LVL", new Object[] { PP.getSkillLevel(SkillType.AXES), PP.getSkillXpLevel(SkillType.AXES), PP.getXpToLevel(SkillType.AXES) }));
-
-		player.sendMessage(mcLocale.getString("m.SkillHeader", new Object[] { mcLocale.getString("m.Effects") }));
-		player.sendMessage(mcLocale.getString("m.EffectsTemplate", new Object[] { mcLocale.getString("m.EffectsAxes1_0"), mcLocale.getString("m.EffectsAxes1_1") }));
-		player.sendMessage(mcLocale.getString("m.EffectsTemplate", new Object[] { mcLocale.getString("m.EffectsAxes2_0"), mcLocale.getString("m.EffectsAxes2_1") }));
-		player.sendMessage(mcLocale.getString("m.EffectsTemplate", new Object[] { mcLocale.getString("m.EffectsAxes3_0"), mcLocale.getString("m.EffectsAxes3_1") }));
-		player.sendMessage(mcLocale.getString("m.SkillHeader", new Object[] { mcLocale.getString("m.YourStats") }));
-		player.sendMessage(mcLocale.getString("m.AxesCritChance", new Object[] { percentage }));
-
-		if (PP.getSkillLevel(SkillType.AXES) < 500)
-			player.sendMessage(mcLocale.getString("m.AbilityLockTemplate", new Object[] { mcLocale.getString("m.AbilLockAxes1") }));
-		else
-			player.sendMessage(mcLocale.getString("m.AbilityBonusTemplate", new Object[] { mcLocale.getString("m.AbilBonusAxes1_0"), mcLocale.getString("m.AbilBonusAxes1_1") }));
-
-		player.sendMessage(mcLocale.getString("m.AxesSkullLength", new Object[] { ticks }));
-
-		return true;
-	}
-}
+package com.gmail.nossr50.commands.skills;
+
+import com.gmail.nossr50.datatypes.skills.SkillType;
+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;
+    private String critChanceLucky;
+    private String bonusDamage;
+    private String impactDamage;
+    private String greaterImpactDamage;
+    private String skullSplitterLength;
+    private String skullSplitterLengthEndurance;
+
+    private boolean canSkullSplitter;
+    private boolean canCritical;
+    private boolean canBonusDamage;
+    private boolean canImpact;
+    private boolean canGreaterImpact;
+
+    public AxesCommand() {
+        super(SkillType.AXES);
+    }
+
+    @Override
+    protected void dataCalculations() {
+        // IMPACT
+        impactDamage = String.valueOf(1 + (skillValue / Axes.impactIncreaseLevel));
+        greaterImpactDamage = String.valueOf(Axes.greaterImpactBonusDamage);
+
+        // SKULL SPLITTER
+        String[] skullSplitterStrings = calculateLengthDisplayValues();
+        skullSplitterLength = skullSplitterStrings[0];
+        skullSplitterLengthEndurance = skullSplitterStrings[1];
+
+        // CRITICAL STRIKES
+        String[] criticalStrikeStrings = calculateAbilityDisplayValues(Axes.criticalHitMaxBonusLevel, Axes.criticalHitMaxChance);
+        critChance = criticalStrikeStrings[0];
+        critChanceLucky = criticalStrikeStrings[1];
+
+        // AXE MASTERY
+        if (skillValue >= Axes.bonusDamageMaxBonusLevel) {
+            bonusDamage = String.valueOf(Axes.bonusDamageMaxBonus);
+        }
+        else {
+            bonusDamage = String.valueOf(skillValue / (Axes.bonusDamageMaxBonusLevel / Axes.bonusDamageMaxBonus));
+        }
+    }
+
+    @Override
+    protected void permissionsCheck() {
+        canSkullSplitter = Permissions.skullSplitter(player);
+        canCritical = Permissions.criticalStrikes(player);
+        canBonusDamage = Permissions.bonusDamage(player, skill);
+        canImpact = Permissions.armorImpact(player);
+        canGreaterImpact = Permissions.greaterImpact(player);
+    }
+
+    @Override
+    protected boolean effectsHeaderPermissions() {
+        return canSkullSplitter || canCritical || canBonusDamage || canImpact || canGreaterImpact;
+    }
+
+    @Override
+    protected void effectsDisplay() {
+        luckyEffectsDisplay();
+
+        if (canSkullSplitter) {
+            player.sendMessage(LocaleLoader.getString("Effects.Template", LocaleLoader.getString("Axes.Effect.0"), LocaleLoader.getString("Axes.Effect.1")));
+        }
+
+        if (canCritical) {
+            player.sendMessage(LocaleLoader.getString("Effects.Template", LocaleLoader.getString("Axes.Effect.2"), LocaleLoader.getString("Axes.Effect.3")));
+        }
+
+        if (canBonusDamage) {
+            player.sendMessage(LocaleLoader.getString("Effects.Template", LocaleLoader.getString("Axes.Effect.4"), LocaleLoader.getString("Axes.Effect.5")));
+        }
+
+        if (canImpact) {
+            player.sendMessage(LocaleLoader.getString("Effects.Template", LocaleLoader.getString("Axes.Effect.6"), LocaleLoader.getString("Axes.Effect.7")));
+        }
+
+        if (canGreaterImpact) {
+            player.sendMessage(LocaleLoader.getString("Effects.Template", LocaleLoader.getString("Axes.Effect.8"), LocaleLoader.getString("Axes.Effect.9")));
+        }
+    }
+
+    @Override
+    protected boolean statsHeaderPermissions() {
+        return canSkullSplitter || canCritical || canBonusDamage || canImpact || canGreaterImpact;
+    }
+
+    @Override
+    protected void statsDisplay() {
+        if (canBonusDamage) {
+            player.sendMessage(LocaleLoader.getString("Ability.Generic.Template", LocaleLoader.getString("Axes.Ability.Bonus.0"), LocaleLoader.getString("Axes.Ability.Bonus.1", bonusDamage)));
+        }
+
+        if (canImpact) {
+            player.sendMessage(LocaleLoader.getString("Ability.Generic.Template", LocaleLoader.getString("Axes.Ability.Bonus.2"), LocaleLoader.getString("Axes.Ability.Bonus.3", impactDamage)));
+        }
+
+        if (canGreaterImpact) {
+            player.sendMessage(LocaleLoader.getString("Ability.Generic.Template", LocaleLoader.getString("Axes.Ability.Bonus.4"), LocaleLoader.getString("Axes.Ability.Bonus.5", 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,46 +1,66 @@
-package com.gmail.nossr50.commands.skills;
-
-import org.bukkit.command.Command;
-import org.bukkit.command.CommandExecutor;
-import org.bukkit.command.CommandSender;
-import org.bukkit.entity.Player;
-
-import com.gmail.nossr50.Users;
-import com.gmail.nossr50.mcPermissions;
-import com.gmail.nossr50.datatypes.PlayerProfile;
-import com.gmail.nossr50.datatypes.SkillType;
-import com.gmail.nossr50.locale.mcLocale;
-
-public class ExcavationCommand implements CommandExecutor {
-	@Override
-	public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
-		if (!(sender instanceof Player)) {
-			sender.sendMessage("This command does not support console useage.");
-			return true;
-		}
-
-		Player player = (Player) sender;
-		PlayerProfile PP = Users.getProfile(player);
-
-		int ticks = 2;
-		int x = PP.getSkillLevel(SkillType.EXCAVATION);
-		while (x >= 50) {
-			x -= 50;
-			ticks++;
-		}
-
-		player.sendMessage(mcLocale.getString("m.SkillHeader", new Object[] { mcLocale.getString("m.SkillExcavation") }));
-		player.sendMessage(mcLocale.getString("m.XPGain", new Object[] { mcLocale.getString("m.XPGainExcavation") }));
-
-		if (mcPermissions.getInstance().excavation(player))
-			player.sendMessage(mcLocale.getString("m.LVL", new Object[] { PP.getSkillLevel(SkillType.EXCAVATION), PP.getSkillXpLevel(SkillType.EXCAVATION), PP.getXpToLevel(SkillType.EXCAVATION) }));
-
-		player.sendMessage(mcLocale.getString("m.SkillHeader", new Object[] { mcLocale.getString("m.Effects") }));
-		player.sendMessage(mcLocale.getString("m.EffectsTemplate", new Object[] { mcLocale.getString("m.EffectsExcavation1_0"), mcLocale.getString("m.EffectsExcavation1_1") }));
-		player.sendMessage(mcLocale.getString("m.EffectsTemplate", new Object[] { mcLocale.getString("m.EffectsExcavation2_0"), mcLocale.getString("m.EffectsExcavation2_1") }));
-		player.sendMessage(mcLocale.getString("m.SkillHeader", new Object[] { mcLocale.getString("m.YourStats") }));
-		player.sendMessage(mcLocale.getString("m.ExcavationGreenTerraLength", new Object[] { ticks }));
-
-		return true;
-	}
-}
+package com.gmail.nossr50.commands.skills;
+
+import com.gmail.nossr50.datatypes.skills.SkillType;
+import com.gmail.nossr50.locale.LocaleLoader;
+import com.gmail.nossr50.util.Permissions;
+
+public class ExcavationCommand extends SkillCommand {
+    private String gigaDrillBreakerLength;
+    private String gigaDrillBreakerLengthEndurance;
+
+    private boolean canGigaDrill;
+    private boolean canTreasureHunt;
+
+    public ExcavationCommand() {
+        super(SkillType.EXCAVATION);
+    }
+
+    @Override
+    protected void dataCalculations() {
+        // GIGA DRILL BREAKER
+        String gigaDrillStrings[] = calculateLengthDisplayValues();
+        gigaDrillBreakerLength = gigaDrillStrings[0];
+        gigaDrillBreakerLengthEndurance = gigaDrillStrings[1];
+    }
+
+    @Override
+    protected void permissionsCheck() {
+        canGigaDrill = Permissions.gigaDrillBreaker(player);
+        canTreasureHunt = Permissions.excavationTreasureHunter(player);
+    }
+
+    @Override
+    protected boolean effectsHeaderPermissions() {
+        return canGigaDrill || canTreasureHunt;
+    }
+
+    @Override
+    protected void effectsDisplay() {
+        luckyEffectsDisplay();
+
+        if (canGigaDrill) {
+            player.sendMessage(LocaleLoader.getString("Effects.Template", LocaleLoader.getString("Excavation.Effect.0"), LocaleLoader.getString("Excavation.Effect.1")));
+        }
+
+        if (canTreasureHunt) {
+            player.sendMessage(LocaleLoader.getString("Effects.Template", LocaleLoader.getString("Excavation.Effect.2"), LocaleLoader.getString("Excavation.Effect.3")));
+        }
+    }
+
+    @Override
+    protected boolean statsHeaderPermissions() {
+        return canGigaDrill;
+    }
+
+    @Override
+    protected void statsDisplay() {
+        if (canGigaDrill) {
+            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,47 +1,125 @@
-package com.gmail.nossr50.commands.skills;
-
-import org.bukkit.command.Command;
-import org.bukkit.command.CommandExecutor;
-import org.bukkit.command.CommandSender;
-import org.bukkit.entity.Player;
-
-import com.gmail.nossr50.Users;
-import com.gmail.nossr50.mcPermissions;
-import com.gmail.nossr50.datatypes.PlayerProfile;
-import com.gmail.nossr50.datatypes.SkillType;
-import com.gmail.nossr50.locale.mcLocale;
-import com.gmail.nossr50.skills.Fishing;
-
-public class FishingCommand implements CommandExecutor {
-	@Override
-	public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
-		if (!(sender instanceof Player)) {
-			sender.sendMessage("This command does not support console useage.");
-			return true;
-		}
-
-		Player player = (Player) sender;
-		PlayerProfile PP = Users.getProfile(player);
-
-		player.sendMessage(mcLocale.getString("m.SkillHeader", new Object[] { mcLocale.getString("m.SkillFishing") }));
-		player.sendMessage(mcLocale.getString("m.XPGain", new Object[] { mcLocale.getString("m.XPGainFishing") }));
-
-		if (mcPermissions.getInstance().fishing(player))
-			player.sendMessage(mcLocale.getString("m.LVL", new Object[] { PP.getSkillLevel(SkillType.FISHING), PP.getSkillXpLevel(SkillType.FISHING), PP.getXpToLevel(SkillType.FISHING) }));
-
-		player.sendMessage(mcLocale.getString("m.SkillHeader", new Object[] { mcLocale.getString("m.Effects") }));
-		player.sendMessage(mcLocale.getString("m.EffectsTemplate", new Object[] { mcLocale.getString("m.EffectsFishing1_0"), mcLocale.getString("m.EffectsFishing1_1") }));
-		player.sendMessage(mcLocale.getString("m.EffectsTemplate", new Object[] { mcLocale.getString("m.EffectsFishing2_0"), mcLocale.getString("m.EffectsFishing2_1") }));
-		player.sendMessage(mcLocale.getString("m.EffectsTemplate", new Object[] { mcLocale.getString("m.EffectsFishing3_0"), mcLocale.getString("m.EffectsFishing3_1") }));
-		player.sendMessage(mcLocale.getString("m.SkillHeader", new Object[] { mcLocale.getString("m.YourStats") }));
-		player.sendMessage(mcLocale.getString("m.FishingRank", new Object[] { Fishing.getFishingLootTier(PP) }));
-		player.sendMessage(mcLocale.getString("m.FishingMagicInfo"));
-
-		if (PP.getSkillLevel(SkillType.FISHING) < 150)
-			player.sendMessage(mcLocale.getString("m.AbilityLockTemplate", new Object[] { mcLocale.getString("m.AbilLockFishing1") }));
-		else
-			player.sendMessage(mcLocale.getString("m.ShakeInfo", new Object[] { Fishing.getFishingLootTier(PP) }));
-
-		return true;
-	}
-}
+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.fishing.Fishing;
+import com.gmail.nossr50.util.Permissions;
+import com.gmail.nossr50.util.player.UserManager;
+
+public class FishingCommand extends SkillCommand {
+    private int lootTier;
+    private String magicChance;
+    private String magicChanceLucky;
+    private String chanceRaining = "";
+    private String shakeChance;
+    private String shakeChanceLucky;
+    private String fishermansDietRank;
+
+    private boolean canTreasureHunt;
+    private boolean canMagicHunt;
+    private boolean canShake;
+    private boolean canFishermansDiet;
+
+    public FishingCommand() {
+        super(SkillType.FISHING);
+    }
+
+    @Override
+    protected void dataCalculations() {
+        lootTier = UserManager.getPlayer(player).getFishingManager().getLootTier();
+
+        // TREASURE HUNTER
+        double enchantChance = lootTier * AdvancedConfig.getInstance().getFishingMagicMultiplier();
+
+        if (player.getWorld().hasStorm()) {
+            chanceRaining = LocaleLoader.getString("Fishing.Chance.Raining");
+            enchantChance = enchantChance * 1.1D;
+        }
+
+        String[] treasureHunterStrings = calculateAbilityDisplayValues(enchantChance);
+        magicChance = treasureHunterStrings[0];
+        magicChanceLucky = treasureHunterStrings[1];
+
+        // SHAKE
+        String[] shakeStrings = calculateAbilityDisplayValues(UserManager.getPlayer(player).getFishingManager().getShakeProbability());
+        shakeChance = shakeStrings[0];
+        shakeChanceLucky = shakeStrings[1];
+
+        // FISHERMAN'S DIET
+        fishermansDietRank = calculateRank(Fishing.fishermansDietMaxLevel, Fishing.fishermansDietRankLevel1);
+    }
+
+    @Override
+    protected void permissionsCheck() {
+        canTreasureHunt = Permissions.fishingTreasureHunter(player);
+        canMagicHunt = Permissions.magicHunter(player);
+        canShake = Permissions.shake(player);
+        canFishermansDiet = Permissions.fishermansDiet(player);
+    }
+
+    @Override
+    protected boolean effectsHeaderPermissions() {
+        return canTreasureHunt || canMagicHunt || canShake;
+    }
+
+    @Override
+    protected void effectsDisplay() {
+        luckyEffectsDisplay();
+
+        if (canTreasureHunt) {
+            player.sendMessage(LocaleLoader.getString("Effects.Template", LocaleLoader.getString("Fishing.Effect.0"), LocaleLoader.getString("Fishing.Effect.1")));
+        }
+
+        if (canMagicHunt) {
+            player.sendMessage(LocaleLoader.getString("Effects.Template", LocaleLoader.getString("Fishing.Effect.2"), LocaleLoader.getString("Fishing.Effect.3")));
+        }
+
+        if (canShake) {
+            player.sendMessage(LocaleLoader.getString("Effects.Template", LocaleLoader.getString("Fishing.Effect.4"), LocaleLoader.getString("Fishing.Effect.5")));
+        }
+
+        if (canFishermansDiet) {
+            player.sendMessage(LocaleLoader.getString("Effects.Template", LocaleLoader.getString("Fishing.Effect.6"), LocaleLoader.getString("Fishing.Effect.7")));
+        }
+    }
+
+    @Override
+    protected boolean statsHeaderPermissions() {
+        return canTreasureHunt || canMagicHunt || canShake;
+    }
+
+    @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,63 +1,180 @@
-package com.gmail.nossr50.commands.skills;
-
-import org.bukkit.command.Command;
-import org.bukkit.command.CommandExecutor;
-import org.bukkit.command.CommandSender;
-import org.bukkit.entity.Player;
-
-import com.gmail.nossr50.Users;
-import com.gmail.nossr50.mcPermissions;
-import com.gmail.nossr50.datatypes.PlayerProfile;
-import com.gmail.nossr50.datatypes.SkillType;
-import com.gmail.nossr50.locale.mcLocale;
-
-public class HerbalismCommand implements CommandExecutor {
-	@Override
-	public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
-		if (!(sender instanceof Player)) {
-			sender.sendMessage("This command does not support console useage.");
-			return true;
-		}
-
-		Player player = (Player) sender;
-		PlayerProfile PP = Users.getProfile(player);
-
-		int bonus = 0;
-		if (PP.getSkillLevel(SkillType.HERBALISM) >= 200)
-			bonus++;
-		if (PP.getSkillLevel(SkillType.HERBALISM) >= 400)
-			bonus++;
-		if (PP.getSkillLevel(SkillType.HERBALISM) >= 600)
-			bonus++;
-
-		int ticks = 2;
-		int x = PP.getSkillLevel(SkillType.HERBALISM);
-		while (x >= 50) {
-			x -= 50;
-			ticks++;
-		}
-
-		float skillvalue = (float) PP.getSkillLevel(SkillType.HERBALISM);
-
-		String percentage = String.valueOf((skillvalue / 1000) * 100);
-		String gpercentage = String.valueOf((skillvalue / 1500) * 100);
-		player.sendMessage(mcLocale.getString("m.SkillHeader", new Object[] { mcLocale.getString("m.SkillHerbalism") }));
-		player.sendMessage(mcLocale.getString("m.XPGain", new Object[] { mcLocale.getString("m.XPGainHerbalism") }));
-
-		if (mcPermissions.getInstance().herbalism(player))
-			player.sendMessage(mcLocale.getString("m.LVL", new Object[] { PP.getSkillLevel(SkillType.HERBALISM), PP.getSkillXpLevel(SkillType.HERBALISM), PP.getXpToLevel(SkillType.HERBALISM) }));
-
-		player.sendMessage(mcLocale.getString("m.SkillHeader", new Object[] { mcLocale.getString("m.Effects") }));
-		player.sendMessage(mcLocale.getString("m.EffectsTemplate", new Object[] { mcLocale.getString("m.EffectsHerbalism1_0"), mcLocale.getString("m.EffectsHerbalism1_1") }));
-		player.sendMessage(mcLocale.getString("m.EffectsTemplate", new Object[] { mcLocale.getString("m.EffectsHerbalism2_0"), mcLocale.getString("m.EffectsHerbalism2_1") }));
-		player.sendMessage(mcLocale.getString("m.EffectsTemplate", new Object[] { mcLocale.getString("m.EffectsHerbalism3_0"), mcLocale.getString("m.EffectsHerbalism3_1") }));
-		player.sendMessage(mcLocale.getString("m.EffectsTemplate", new Object[] { mcLocale.getString("m.EffectsHerbalism5_0"), mcLocale.getString("m.EffectsHerbalism5_1") }));
-		player.sendMessage(mcLocale.getString("m.SkillHeader", new Object[] { mcLocale.getString("m.YourStats") }));
-		player.sendMessage(mcLocale.getString("m.HerbalismGreenTerraLength", new Object[] { ticks }));
-		player.sendMessage(mcLocale.getString("m.HerbalismGreenThumbChance", new Object[] { gpercentage }));
-		player.sendMessage(mcLocale.getString("m.HerbalismGreenThumbStage", new Object[] { bonus }));
-		player.sendMessage(mcLocale.getString("m.HerbalismDoubleDropChance", new Object[] { percentage }));
-
-		return true;
-	}
-}
+package com.gmail.nossr50.commands.skills;
+
+import org.bukkit.Material;
+
+import com.gmail.nossr50.datatypes.skills.SkillType;
+import com.gmail.nossr50.locale.LocaleLoader;
+import com.gmail.nossr50.skills.herbalism.Herbalism;
+import com.gmail.nossr50.util.Permissions;
+
+public class HerbalismCommand extends SkillCommand {
+    private String greenTerraLength;
+    private String greenTerraLengthEndurance;
+    private String greenThumbChance;
+    private String greenThumbChanceLucky;
+    private String greenThumbStage;
+    private String farmersDietRank;
+    private String doubleDropChance;
+    private String doubleDropChanceLucky;
+    private String hylianLuckChance;
+    private String hylianLuckChanceLucky;
+    private String shroomThumbChance;
+    private String shroomThumbChanceLucky;
+
+    private boolean hasHylianLuck;
+    private boolean canGreenTerra;
+    private boolean canGreenThumbWheat;
+    private boolean canGreenThumbBlocks;
+    private boolean canFarmersDiet;
+    private boolean canDoubleDrop;
+    private boolean canShroomThumb;
+    private boolean doubleDropsDisabled;
+
+    public HerbalismCommand() {
+        super(SkillType.HERBALISM);
+    }
+
+    @Override
+    protected void dataCalculations() {
+        // GREEN TERRA
+        String[] greenTerraStrings = calculateLengthDisplayValues();
+        greenTerraLength = greenTerraStrings[0];
+        greenTerraLengthEndurance = greenTerraStrings[1];
+
+        // FARMERS DIET
+        farmersDietRank = calculateRank(Herbalism.farmersDietMaxLevel, Herbalism.farmersDietRankLevel1);
+
+        // GREEN THUMB
+        greenThumbStage = calculateRank(Herbalism.greenThumbStageMaxLevel, Herbalism.greenThumbStageChangeLevel);
+
+        String[] greenThumbStrings = calculateAbilityDisplayValues(Herbalism.greenThumbMaxLevel, Herbalism.greenThumbMaxChance);
+        greenThumbChance = greenThumbStrings[0];
+        greenThumbChanceLucky = greenThumbStrings[1];
+
+        // DOUBLE DROPS
+        String[] doubleDropStrings = calculateAbilityDisplayValues(Herbalism.doubleDropsMaxLevel, Herbalism.doubleDropsMaxChance);
+        doubleDropChance = doubleDropStrings[0];
+        doubleDropChanceLucky = doubleDropStrings[1];
+
+        // HYLIAN LUCK
+        String[] hylianLuckStrings = calculateAbilityDisplayValues(Herbalism.hylianLuckMaxLevel, Herbalism.hylianLuckMaxChance);
+        hylianLuckChance = hylianLuckStrings[0];
+        hylianLuckChanceLucky = hylianLuckStrings[1];
+
+        // SHROOM THUMB
+        String[] shroomThumbStrings = calculateAbilityDisplayValues(Herbalism.shroomThumbMaxLevel, Herbalism.shroomThumbMaxChance);
+        shroomThumbChance = shroomThumbStrings[0];
+        shroomThumbChanceLucky = shroomThumbStrings[1];
+    }
+
+    @Override
+    protected void permissionsCheck() {
+        hasHylianLuck = Permissions.hylianLuck(player);
+        canGreenTerra = Permissions.greenTerra(player);
+        canGreenThumbWheat = Permissions.greenThumbPlant(player, Material.CROPS); // TODO: This isn't really accurate - they could have perms for other crops but not wheat.
+        canGreenThumbBlocks = (Permissions.greenThumbBlock(player, Material.DIRT) || Permissions.greenThumbBlock(player, Material.COBBLESTONE) || Permissions.greenThumbBlock(player, Material.COBBLE_WALL) || Permissions.greenThumbBlock(player, Material.SMOOTH_BRICK));
+        canFarmersDiet = Permissions.farmersDiet(player);
+        canDoubleDrop = Permissions.doubleDrops(player, skill);
+        doubleDropsDisabled = skill.getDoubleDropsDisabled();
+        canShroomThumb = Permissions.shroomThumb(player);
+    }
+
+    @Override
+    protected boolean effectsHeaderPermissions() {
+        return canGreenTerra || (canDoubleDrop && !doubleDropsDisabled) || canFarmersDiet || canGreenThumbBlocks || canGreenThumbWheat || canShroomThumb;
+    }
+
+    @Override
+    protected void effectsDisplay() {
+        luckyEffectsDisplay();
+
+        if (canGreenTerra) {
+            player.sendMessage(LocaleLoader.getString("Effects.Template", 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 (canGreenThumbBlocks) {
+            player.sendMessage(LocaleLoader.getString("Effects.Template", 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 (hasHylianLuck) {
+            player.sendMessage(LocaleLoader.getString("Effects.Template", LocaleLoader.getString("Herbalism.Effect.10"), LocaleLoader.getString("Herbalism.Effect.11")));
+        }
+
+        if (canShroomThumb) {
+            player.sendMessage(LocaleLoader.getString("Effects.Template", LocaleLoader.getString("Herbalism.Effect.12"), LocaleLoader.getString("Herbalism.Effect.13")));
+        }
+
+        if (canDoubleDrop && !doubleDropsDisabled) {
+            player.sendMessage(LocaleLoader.getString("Effects.Template", LocaleLoader.getString("Herbalism.Effect.8"), LocaleLoader.getString("Herbalism.Effect.9")));
+        }
+    }
+
+    @Override
+    protected boolean statsHeaderPermissions() {
+        return canGreenTerra || (canDoubleDrop && !doubleDropsDisabled) || canFarmersDiet || canGreenThumbBlocks || canGreenThumbWheat || canShroomThumb;
+    }
+
+    @Override
+    protected void statsDisplay() {
+        if (canGreenTerra) {
+            if (hasEndurance) {
+                player.sendMessage(LocaleLoader.getString("Herbalism.Ability.GTe.Length", greenTerraLength) + LocaleLoader.getString("Perks.activationtime.bonus", greenTerraLengthEndurance));
+            }
+            else {
+                player.sendMessage(LocaleLoader.getString("Herbalism.Ability.GTe.Length", greenTerraLength));
+            }
+        }
+
+        if (canGreenThumbBlocks || canGreenThumbWheat) {
+            if (isLucky) {
+                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,48 +1,149 @@
-package com.gmail.nossr50.commands.skills;
-
-import org.bukkit.command.Command;
-import org.bukkit.command.CommandExecutor;
-import org.bukkit.command.CommandSender;
-import org.bukkit.entity.Player;
-
-import com.gmail.nossr50.Users;
-import com.gmail.nossr50.mcPermissions;
-import com.gmail.nossr50.datatypes.PlayerProfile;
-import com.gmail.nossr50.datatypes.SkillType;
-import com.gmail.nossr50.locale.mcLocale;
-
-public class MiningCommand implements CommandExecutor {
-	@Override
-	public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
-		if (!(sender instanceof Player)) {
-			sender.sendMessage("This command does not support console useage.");
-			return true;
-		}
-
-		Player player = (Player) sender;
-		PlayerProfile PP = Users.getProfile(player);
-
-		float skillvalue = (float) PP.getSkillLevel(SkillType.MINING);
-		String percentage = String.valueOf((skillvalue / 1000) * 100);
-		int ticks = 2;
-		int x = PP.getSkillLevel(SkillType.MINING);
-		while (x >= 50) {
-			x -= 50;
-			ticks++;
-		}
-		player.sendMessage(mcLocale.getString("m.SkillHeader", new Object[] { mcLocale.getString("m.SkillMining") }));
-		player.sendMessage(mcLocale.getString("m.XPGain", new Object[] { mcLocale.getString("m.XPGainMining") }));
-
-		if (mcPermissions.getInstance().mining(player))
-			player.sendMessage(mcLocale.getString("m.LVL", new Object[] { PP.getSkillLevel(SkillType.MINING), PP.getSkillXpLevel(SkillType.MINING), PP.getXpToLevel(SkillType.MINING) }));
-
-		player.sendMessage(mcLocale.getString("m.SkillHeader", new Object[] { mcLocale.getString("m.Effects") }));
-		player.sendMessage(mcLocale.getString("m.EffectsTemplate", new Object[] { mcLocale.getString("m.EffectsMining1_0"), mcLocale.getString("m.EffectsMining1_1") }));
-		player.sendMessage(mcLocale.getString("m.EffectsTemplate", new Object[] { mcLocale.getString("m.EffectsMining2_0"), mcLocale.getString("m.EffectsMining2_1") }));
-		player.sendMessage(mcLocale.getString("m.SkillHeader", new Object[] { mcLocale.getString("m.YourStats") }));
-		player.sendMessage(mcLocale.getString("m.MiningDoubleDropChance", new Object[] { percentage }));
-		player.sendMessage(mcLocale.getString("m.MiningSuperBreakerLength", new Object[] { ticks }));
-
-		return true;
-	}
-}
+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.mining.Mining;
+import com.gmail.nossr50.skills.mining.MiningManager;
+import com.gmail.nossr50.util.Permissions;
+import com.gmail.nossr50.util.player.UserManager;
+
+public class MiningCommand extends SkillCommand {
+    private String doubleDropChance;
+    private String doubleDropChanceLucky;
+    private String superBreakerLength;
+    private String superBreakerLengthEndurance;
+
+    private int blastMiningRank;
+    private int bonusTNTDrops;
+    private double blastRadiusIncrease;
+    private String oreBonus;
+    private String debrisReduction;
+    private String blastDamageDecrease;
+
+    private boolean canSuperBreaker;
+    private boolean canDoubleDrop;
+    private boolean canBlast;
+    private boolean canBiggerBombs;
+    private boolean canDemoExpert;
+    private boolean doubleDropsDisabled;
+
+    public MiningCommand() {
+        super(SkillType.MINING);
+    }
+
+    @Override
+    protected void dataCalculations() {
+        // SUPER BREAKER
+        String[] superBreakerStrings = calculateLengthDisplayValues();
+        superBreakerLength = superBreakerStrings[0];
+        superBreakerLengthEndurance = superBreakerStrings[1];
+
+        // DOUBLE DROPS
+        String[] doubleDropStrings = calculateAbilityDisplayValues(Mining.doubleDropsMaxLevel, Mining.doubleDropsMaxChance);
+        doubleDropChance = doubleDropStrings[0];
+        doubleDropChanceLucky = doubleDropStrings[1];
+
+        // BLAST MINING
+        MiningManager miningManager = UserManager.getPlayer(player).getMiningManager();
+        blastMiningRank = miningManager.getBlastMiningTier();
+        bonusTNTDrops = miningManager.getDropMultiplier();
+        oreBonus = percent.format(miningManager.getOreBonus() / 30.0D); // Base received in TNT is 30%
+        debrisReduction = percent.format(miningManager.getDebrisReduction() / 30.0D); // Base received in TNT is 30%
+        blastDamageDecrease = percent.format(miningManager.getBlastDamageModifier() / 100.0D);
+        blastRadiusIncrease = miningManager.getBlastRadiusModifier();
+    }
+
+    @Override
+    protected void permissionsCheck() {
+        canBiggerBombs = Permissions.biggerBombs(player);
+        canBlast = Permissions.remoteDetonation(player);
+        canDemoExpert = Permissions.demolitionsExpertise(player);
+        canDoubleDrop = Permissions.doubleDrops(player, skill);
+        canSuperBreaker = Permissions.superBreaker(player);
+        doubleDropsDisabled = skill.getDoubleDropsDisabled();
+    }
+
+    @Override
+    protected boolean effectsHeaderPermissions() {
+        return canBiggerBombs || canBlast || canDemoExpert || (canDoubleDrop && !doubleDropsDisabled) || canSuperBreaker;
+    }
+
+    @Override
+    protected void effectsDisplay() {
+        luckyEffectsDisplay();
+
+        if (canSuperBreaker) {
+            player.sendMessage(LocaleLoader.getString("Effects.Template", LocaleLoader.getString("Mining.Effect.0"), LocaleLoader.getString("Mining.Effect.1")));
+        }
+
+        if (canDoubleDrop && !doubleDropsDisabled) {
+            player.sendMessage(LocaleLoader.getString("Effects.Template", LocaleLoader.getString("Mining.Effect.2"), LocaleLoader.getString("Mining.Effect.3")));
+        }
+
+        if (canBlast) {
+            player.sendMessage(LocaleLoader.getString("Effects.Template", LocaleLoader.getString("Mining.Effect.4"), LocaleLoader.getString("Mining.Effect.5")));
+        }
+
+        if (canBiggerBombs) {
+            player.sendMessage(LocaleLoader.getString("Effects.Template", LocaleLoader.getString("Mining.Effect.6"), LocaleLoader.getString("Mining.Effect.7")));
+        }
+
+        if (canDemoExpert) {
+            player.sendMessage(LocaleLoader.getString("Effects.Template", LocaleLoader.getString("Mining.Effect.8"), LocaleLoader.getString("Mining.Effect.9")));
+        }
+    }
+
+    @Override
+    protected boolean statsHeaderPermissions() {
+        return canBiggerBombs || canBlast || canDemoExpert || (canDoubleDrop && !doubleDropsDisabled) || canSuperBreaker;
+    }
+
+    @Override
+    protected void statsDisplay() {
+        if (canDoubleDrop && !doubleDropsDisabled) {
+            if (isLucky) {
+                player.sendMessage(LocaleLoader.getString("Mining.Effect.DropChance", doubleDropChance) + LocaleLoader.getString("Perks.lucky.bonus", doubleDropChanceLucky));
+            }
+            else {
+                player.sendMessage(LocaleLoader.getString("Mining.Effect.DropChance", doubleDropChance));
+            }
+        }
+
+        if (canSuperBreaker) {
+            if (hasEndurance) {
+                player.sendMessage(LocaleLoader.getString("Mining.Ability.Length", superBreakerLength) + LocaleLoader.getString("Perks.activationtime.bonus", superBreakerLengthEndurance));
+            }
+            else {
+                player.sendMessage(LocaleLoader.getString("Mining.Ability.Length", superBreakerLength));
+            }
+        }
+
+        if (canBlast) {
+            if (skillValue < AdvancedConfig.getInstance().getBlastMiningRank1()) {
+                player.sendMessage(LocaleLoader.getString("Ability.Generic.Template.Lock", LocaleLoader.getString("Mining.Ability.Locked.0", AdvancedConfig.getInstance().getBlastMiningRank1())));
+            }
+            else {
+                player.sendMessage(LocaleLoader.getString("Mining.Blast.Rank", blastMiningRank, LocaleLoader.getString("Mining.Blast.Effect", oreBonus, debrisReduction, bonusTNTDrops)));
+            }
+        }
+
+        if (canBiggerBombs) {
+            if (skillValue < AdvancedConfig.getInstance().getBlastMiningRank2()) {
+                player.sendMessage(LocaleLoader.getString("Ability.Generic.Template.Lock", LocaleLoader.getString("Mining.Ability.Locked.1", AdvancedConfig.getInstance().getBlastMiningRank2())));
+            }
+            else {
+                player.sendMessage(LocaleLoader.getString("Mining.Blast.Radius.Increase", blastRadiusIncrease));
+            }
+        }
+
+        if (canDemoExpert) {
+            if (skillValue < AdvancedConfig.getInstance().getBlastMiningRank4()) {
+                player.sendMessage(LocaleLoader.getString("Ability.Generic.Template.Lock", LocaleLoader.getString("Mining.Ability.Locked.2", AdvancedConfig.getInstance().getBlastMiningRank4())));
+            }
+            else {
+                player.sendMessage(LocaleLoader.getString("Mining.Effect.Decrease", blastDamageDecrease));
+            }
+        }
+    }
+}

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

@@ -1,53 +1,166 @@
-package com.gmail.nossr50.commands.skills;
-
-import org.bukkit.command.Command;
-import org.bukkit.command.CommandExecutor;
-import org.bukkit.command.CommandSender;
-import org.bukkit.entity.Player;
-
-import com.gmail.nossr50.Users;
-import com.gmail.nossr50.mcPermissions;
-import com.gmail.nossr50.config.LoadProperties;
-import com.gmail.nossr50.datatypes.PlayerProfile;
-import com.gmail.nossr50.datatypes.SkillType;
-import com.gmail.nossr50.locale.mcLocale;
-import com.gmail.nossr50.skills.Repair;
-
-public class RepairCommand implements CommandExecutor {
-	@Override
-	public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
-		if (!(sender instanceof Player)) {
-			sender.sendMessage("This command does not support console useage.");
-			return true;
-		}
-
-		Player player = (Player) sender;
-		PlayerProfile PP = Users.getProfile(player);
-
-		float skillvalue = (float) PP.getSkillLevel(SkillType.REPAIR);
-		String percentage = String.valueOf((skillvalue / 1000) * 100);
-		String repairmastery = String.valueOf((skillvalue / 500) * 100);
-		player.sendMessage(mcLocale.getString("m.SkillHeader", new Object[] { mcLocale.getString("m.SkillRepair") }));
-		player.sendMessage(mcLocale.getString("m.XPGain", new Object[] { mcLocale.getString("m.XPGainRepair") }));
-
-		if (mcPermissions.getInstance().repair(player))
-			player.sendMessage(mcLocale.getString("m.LVL", new Object[] { PP.getSkillLevel(SkillType.REPAIR), PP.getSkillXpLevel(SkillType.REPAIR), PP.getXpToLevel(SkillType.REPAIR) }));
-
-		player.sendMessage(mcLocale.getString("m.SkillHeader", new Object[] { mcLocale.getString("m.Effects") }));
-		player.sendMessage(mcLocale.getString("m.EffectsTemplate", new Object[] { mcLocale.getString("m.EffectsRepair1_0"), mcLocale.getString("m.EffectsRepair1_1") }));
-		player.sendMessage(mcLocale.getString("m.EffectsTemplate", new Object[] { mcLocale.getString("m.EffectsRepair2_0"), mcLocale.getString("m.EffectsRepair2_1") }));
-		player.sendMessage(mcLocale.getString("m.EffectsTemplate", new Object[] { mcLocale.getString("m.EffectsRepair3_0"), mcLocale.getString("m.EffectsRepair3_1") }));
-		player.sendMessage(mcLocale.getString("m.EffectsTemplate", new Object[] { mcLocale.getString("m.EffectsRepair4_0", new Object[] { LoadProperties.repairdiamondlevel }), mcLocale.getString("m.EffectsRepair4_1") }));
-		player.sendMessage(mcLocale.getString("m.EffectsTemplate", new Object[] { mcLocale.getString("m.EffectsRepair5_0"), mcLocale.getString("m.EffectsRepair5_1") }));
-		player.sendMessage(mcLocale.getString("m.SkillHeader", new Object[] { mcLocale.getString("m.YourStats") }));
-		player.sendMessage(mcLocale.getString("m.RepairRepairMastery", new Object[] { repairmastery }));
-		player.sendMessage(mcLocale.getString("m.RepairSuperRepairChance", new Object[] { percentage }));
-		player.sendMessage(mcLocale.getString("m.ArcaneForgingRank", new Object[] { Repair.getArcaneForgingRank(PP) }));
-		player.sendMessage(mcLocale.getString("m.ArcaneEnchantKeepChance", new Object[] { Repair.getEnchantChance(Repair.getArcaneForgingRank(PP)) }));
-		player.sendMessage(mcLocale.getString("m.ArcaneEnchantDowngradeChance", new Object[] { Repair.getDowngradeChance(Repair.getArcaneForgingRank(PP)) }));
-		player.sendMessage(mcLocale.getString("m.ArcaneForgingMilestones"));
-		player.sendMessage(mcLocale.getString("m.ArcaneForgingMilestones2"));
-
-		return true;
-	}
-}
+package com.gmail.nossr50.commands.skills;
+
+import org.bukkit.Material;
+
+import com.gmail.nossr50.mcMMO;
+import com.gmail.nossr50.datatypes.skills.SkillType;
+import com.gmail.nossr50.locale.LocaleLoader;
+import com.gmail.nossr50.skills.repair.Repair;
+import com.gmail.nossr50.skills.repair.Repairable;
+import com.gmail.nossr50.util.Permissions;
+import com.gmail.nossr50.util.player.UserManager;
+
+public class RepairCommand extends SkillCommand {
+    private int arcaneForgingRank;
+    private String repairMasteryBonus;
+    private String superRepairChance;
+    private String superRepairChanceLucky;
+
+    private boolean canSuperRepair;
+    private boolean canMasterRepair;
+    private boolean canArcaneForge;
+    private boolean canSalvage;
+    private boolean canRepairStone;
+    private boolean canRepairIron;
+    private boolean canRepairGold;
+    private boolean canRepairDiamond;
+    private boolean canRepairString;
+    private boolean canRepairLeather;
+    private boolean canRepairWood;
+    private boolean arcaneBypass;
+
+    private int diamondLevel;
+    private int goldLevel;
+    private int ironLevel;
+    private int stoneLevel;
+
+    public RepairCommand() {
+        super(SkillType.REPAIR);
+    }
+
+    @Override
+    protected void dataCalculations() {
+        // We're using pickaxes here, not the best but it works
+        Repairable diamondRepairable = mcMMO.repairableManager.getRepairable(Material.DIAMOND_PICKAXE.getId());
+        Repairable goldRepairable = mcMMO.repairableManager.getRepairable(Material.GOLD_PICKAXE.getId());
+        Repairable ironRepairable = mcMMO.repairableManager.getRepairable(Material.IRON_PICKAXE.getId());
+        Repairable stoneRepairable = mcMMO.repairableManager.getRepairable(Material.STONE_PICKAXE.getId());
+
+        // 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();
+        goldLevel = (goldRepairable == null) ? 0 : goldRepairable.getMinimumLevel();
+        ironLevel = (ironRepairable == null) ? 0 : ironRepairable.getMinimumLevel();
+        stoneLevel = (stoneRepairable == null) ? 0 : stoneRepairable.getMinimumLevel();
+
+        // REPAIR MASTERY
+        if (skillValue >= Repair.repairMasteryMaxBonusLevel) {
+            repairMasteryBonus = percent.format(Repair.repairMasteryMaxBonus / 100D);
+        }
+        else {
+            repairMasteryBonus = percent.format(((Repair.repairMasteryMaxBonus / Repair.repairMasteryMaxBonusLevel) * skillValue) / 100D);
+        }
+
+        // SUPER REPAIR
+        String[] superRepairStrings = calculateAbilityDisplayValues(Repair.superRepairMaxBonusLevel, Repair.superRepairMaxChance);
+        superRepairChance = superRepairStrings[0];
+        superRepairChanceLucky = superRepairStrings[1];
+
+        // ARCANE FORGING
+        arcaneForgingRank = UserManager.getPlayer(player).getRepairManager().getArcaneForgingRank();
+    }
+
+    @Override
+    protected void permissionsCheck() {
+        canSuperRepair = Permissions.superRepair(player);
+        canMasterRepair = Permissions.repairMastery(player);
+        canArcaneForge = Permissions.arcaneForging(player);
+        canSalvage = Permissions.salvage(player);
+        canRepairDiamond = Permissions.repairDiamond(player);
+        canRepairGold = Permissions.repairGold(player);
+        canRepairIron = Permissions.repairIron(player);
+        canRepairStone = Permissions.repairStone(player);
+        canRepairString = Permissions.repairString(player);
+        canRepairLeather = Permissions.repairLeather(player);
+        canRepairWood = Permissions.repairWood(player);
+        arcaneBypass = Permissions.arcaneBypass(player);
+    }
+
+    @Override
+    protected boolean effectsHeaderPermissions() {
+        return canArcaneForge || canSalvage || canRepairDiamond || canRepairGold || canRepairIron || canMasterRepair || canRepairStone || canSuperRepair || canRepairString || canRepairWood || canRepairLeather;
+    }
+
+    @Override
+    protected void effectsDisplay() {
+        luckyEffectsDisplay();
+
+        player.sendMessage(LocaleLoader.getString("Effects.Template", LocaleLoader.getString("Repair.Effect.0"), LocaleLoader.getString("Repair.Effect.1")));
+
+        if (canMasterRepair) {
+            player.sendMessage(LocaleLoader.getString("Effects.Template", LocaleLoader.getString("Repair.Effect.2"), LocaleLoader.getString("Repair.Effect.3")));
+        }
+
+        if (canSuperRepair) {
+            player.sendMessage(LocaleLoader.getString("Effects.Template", LocaleLoader.getString("Repair.Effect.4"), LocaleLoader.getString("Repair.Effect.5")));
+        }
+
+        /* Repair Level Requirements */
+
+        if (canRepairStone && stoneLevel > 0) {
+            player.sendMessage(LocaleLoader.getString("Effects.Template", LocaleLoader.getString("Repair.Effect.14", stoneLevel), LocaleLoader.getString("Repair.Effect.15")));
+        }
+
+        if (canRepairIron && ironLevel > 0) {
+            player.sendMessage(LocaleLoader.getString("Effects.Template", LocaleLoader.getString("Repair.Effect.12", ironLevel), LocaleLoader.getString("Repair.Effect.13")));
+        }
+
+        if (canRepairGold && goldLevel > 0) {
+            player.sendMessage(LocaleLoader.getString("Effects.Template", LocaleLoader.getString("Repair.Effect.10", goldLevel), LocaleLoader.getString("Repair.Effect.11")));
+        }
+
+        if (canRepairDiamond && diamondLevel > 0) {
+            player.sendMessage(LocaleLoader.getString("Effects.Template", LocaleLoader.getString("Repair.Effect.6", diamondLevel), LocaleLoader.getString("Repair.Effect.7")));
+        }
+
+        if (canSalvage && Repair.salvageUnlockLevel > 0) {
+            player.sendMessage(LocaleLoader.getString("Effects.Template", LocaleLoader.getString("Repair.Effect.16", Repair.salvageUnlockLevel), LocaleLoader.getString("Repair.Effect.17")));
+        }
+
+        if (canArcaneForge) {
+            player.sendMessage(LocaleLoader.getString("Effects.Template", LocaleLoader.getString("Repair.Effect.8"), LocaleLoader.getString("Repair.Effect.9")));
+        }
+    }
+
+    @Override
+    protected boolean statsHeaderPermissions() {
+        return canArcaneForge || canMasterRepair || canSuperRepair;
+    }
+
+    @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,69 +1,117 @@
-package com.gmail.nossr50.commands.skills;
-
-import org.bukkit.command.Command;
-import org.bukkit.command.CommandExecutor;
-import org.bukkit.command.CommandSender;
-import org.bukkit.entity.Player;
-
-import com.gmail.nossr50.Users;
-import com.gmail.nossr50.mcPermissions;
-import com.gmail.nossr50.datatypes.PlayerProfile;
-import com.gmail.nossr50.datatypes.SkillType;
-import com.gmail.nossr50.locale.mcLocale;
-
-public class SwordsCommand implements CommandExecutor {
-	@Override
-	public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
-		if (!(sender instanceof Player)) {
-			sender.sendMessage("This command does not support console useage.");
-			return true;
-		}
-
-		Player player = (Player) sender;
-		PlayerProfile PP = Users.getProfile(player);
-
-		int bleedrank = 2;
-		String percentage, counterattackpercentage;
-
-		float skillvalue = (float) PP.getSkillLevel(SkillType.SWORDS);
-		if (PP.getSkillLevel(SkillType.SWORDS) < 750)
-			percentage = String.valueOf((skillvalue / 1000) * 100);
-		else
-			percentage = "75";
-
-		if (skillvalue >= 750)
-			bleedrank += 1;
-
-		if (PP.getSkillLevel(SkillType.SWORDS) <= 600)
-			counterattackpercentage = String.valueOf((skillvalue / 2000) * 100);
-		else
-			counterattackpercentage = "30";
-
-		int ticks = 2;
-		int x = PP.getSkillLevel(SkillType.SWORDS);
-		while (x >= 50) {
-			x -= 50;
-			ticks++;
-		}
-
-		player.sendMessage(mcLocale.getString("m.SkillHeader", new Object[] { mcLocale.getString("m.SkillSwords") }));
-		player.sendMessage(mcLocale.getString("m.XPGain", new Object[] { mcLocale.getString("m.XPGainSwords") }));
-		
-		if (mcPermissions.getInstance().swords(player))
-			player.sendMessage(mcLocale.getString("m.LVL", new Object[] { PP.getSkillLevel(SkillType.SWORDS), PP.getSkillXpLevel(SkillType.SWORDS), PP.getXpToLevel(SkillType.SWORDS) }));
-		
-		player.sendMessage(mcLocale.getString("m.SkillHeader", new Object[] { mcLocale.getString("m.Effects") }));
-		player.sendMessage(mcLocale.getString("m.EffectsTemplate", new Object[] { mcLocale.getString("m.EffectsSwords1_0"), mcLocale.getString("m.EffectsSwords1_1") }));
-		player.sendMessage(mcLocale.getString("m.EffectsTemplate", new Object[] { mcLocale.getString("m.EffectsSwords2_0"), mcLocale.getString("m.EffectsSwords2_1") }));
-		player.sendMessage(mcLocale.getString("m.EffectsTemplate", new Object[] { mcLocale.getString("m.EffectsSwords3_0"), mcLocale.getString("m.EffectsSwords3_1") }));
-		player.sendMessage(mcLocale.getString("m.EffectsTemplate", new Object[] { mcLocale.getString("m.EffectsSwords5_0"), mcLocale.getString("m.EffectsSwords5_1") }));
-		player.sendMessage(mcLocale.getString("m.SkillHeader", new Object[] { mcLocale.getString("m.YourStats") }));
-		player.sendMessage(mcLocale.getString("m.SwordsCounterAttChance", new Object[] { counterattackpercentage }));
-		player.sendMessage(mcLocale.getString("m.SwordsBleedLength", new Object[] { bleedrank }));
-		player.sendMessage(mcLocale.getString("m.SwordsTickNote"));
-		player.sendMessage(mcLocale.getString("m.SwordsBleedLength", new Object[] { percentage }));
-		player.sendMessage(mcLocale.getString("m.SwordsSSLength", new Object[] { ticks }));
-
-		return true;
-	}
-}
+package com.gmail.nossr50.commands.skills;
+
+import com.gmail.nossr50.datatypes.skills.SkillType;
+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;
+    private String counterAttackChanceLucky;
+    private String bleedLength;
+    private String bleedChance;
+    private String bleedChanceLucky;
+    private String serratedStrikesLength;
+    private String serratedStrikesLengthEndurance;
+
+    private boolean canCounter;
+    private boolean canSerratedStrike;
+    private boolean canBleed;
+
+    public SwordsCommand() {
+        super(SkillType.SWORDS);
+    }
+
+    @Override
+    protected void dataCalculations() {
+        // SERRATED STRIKES
+        String[] serratedStrikesStrings = calculateLengthDisplayValues();
+        serratedStrikesLength = serratedStrikesStrings[0];
+        serratedStrikesLengthEndurance = serratedStrikesStrings[1];
+
+        // BLEED
+        if (skillValue >= Swords.bleedMaxBonusLevel) {
+            bleedLength = String.valueOf(Swords.bleedMaxTicks);
+        }
+        else {
+            bleedLength = String.valueOf(Swords.bleedBaseTicks);
+        }
+
+        String[] bleedStrings = calculateAbilityDisplayValues(Swords.bleedMaxBonusLevel, Swords.bleedMaxChance);
+        bleedChance = bleedStrings[0];
+        bleedChanceLucky = bleedStrings[1];
+
+        // COUNTER ATTACK
+        String[] counterAttackStrings = calculateAbilityDisplayValues(Swords.counterAttackMaxBonusLevel, Swords.counterAttackMaxChance);
+        counterAttackChance = counterAttackStrings[0];
+        counterAttackChanceLucky = counterAttackStrings[1];
+    }
+
+    @Override
+    protected void permissionsCheck() {
+        canBleed = Permissions.bleed(player);
+        canCounter = Permissions.counterAttack(player);
+        canSerratedStrike = Permissions.serratedStrikes(player);
+    }
+
+    @Override
+    protected boolean effectsHeaderPermissions() {
+        return canBleed || canCounter || canSerratedStrike;
+    }
+
+    @Override
+    protected void effectsDisplay() {
+        luckyEffectsDisplay();
+
+        if (canCounter) {
+            player.sendMessage(LocaleLoader.getString("Effects.Template", LocaleLoader.getString("Swords.Effect.0"), LocaleLoader.getString("Swords.Effect.1", percent.format(1.0D / Swords.counterAttackModifier))));
+        }
+
+        if (canSerratedStrike) {
+            player.sendMessage(LocaleLoader.getString("Effects.Template", LocaleLoader.getString("Swords.Effect.2"), LocaleLoader.getString("Swords.Effect.3", percent.format(1.0D / Swords.serratedStrikesModifier))));
+            player.sendMessage(LocaleLoader.getString("Effects.Template", LocaleLoader.getString("Swords.Effect.4"), LocaleLoader.getString("Swords.Effect.5", Swords.serratedStrikesBleedTicks)));
+        }
+
+        if (canBleed) {
+            player.sendMessage(LocaleLoader.getString("Effects.Template", LocaleLoader.getString("Swords.Effect.6"), LocaleLoader.getString("Swords.Effect.7")));
+        }
+    }
+
+    @Override
+    protected boolean statsHeaderPermissions() {
+        return canBleed || canCounter || canSerratedStrike;
+    }
+
+    @Override
+    protected void statsDisplay() {
+        if (canCounter) {
+            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,70 +1,165 @@
-package com.gmail.nossr50.commands.skills;
-
-import org.bukkit.command.Command;
-import org.bukkit.command.CommandExecutor;
-import org.bukkit.command.CommandSender;
-import org.bukkit.entity.Player;
-
-import com.gmail.nossr50.Users;
-import com.gmail.nossr50.mcPermissions;
-import com.gmail.nossr50.config.LoadProperties;
-import com.gmail.nossr50.datatypes.PlayerProfile;
-import com.gmail.nossr50.datatypes.SkillType;
-import com.gmail.nossr50.locale.mcLocale;
-
-public class TamingCommand implements CommandExecutor {
-	@Override
-	public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
-		if (!(sender instanceof Player)) {
-			sender.sendMessage("This command does not support console useage.");
-			return true;
-		}
-
-		Player player = (Player) sender;
-		PlayerProfile PP = Users.getProfile(player);
-
-		float skillvalue = (float) PP.getSkillLevel(SkillType.TAMING);
-		String percentage = String.valueOf((skillvalue / 1000) * 100);
-
-		player.sendMessage(mcLocale.getString("m.SkillHeader", new Object[] { mcLocale.getString("m.SkillTaming") }));
-		player.sendMessage(mcLocale.getString("m.XPGain", new Object[] { mcLocale.getString("m.XPGainTaming") }));
-
-		if (mcPermissions.getInstance().taming(player))
-			player.sendMessage(mcLocale.getString("m.LVL", new Object[] { PP.getSkillLevel(SkillType.TAMING), PP.getSkillXpLevel(SkillType.TAMING), PP.getXpToLevel(SkillType.TAMING) }));
-
-		player.sendMessage(mcLocale.getString("m.SkillHeader", new Object[] { mcLocale.getString("m.Effects") }));
-		player.sendMessage(mcLocale.getString("m.EffectsTemplate", new Object[] { mcLocale.getString("m.EffectsTaming1_0"), mcLocale.getString("m.EffectsTaming1_1") }));
-		player.sendMessage(mcLocale.getString("m.EffectsTemplate", new Object[] { mcLocale.getString("m.EffectsTaming2_0"), mcLocale.getString("m.EffectsTaming2_1") }));
-		player.sendMessage(mcLocale.getString("m.EffectsTemplate", new Object[] { mcLocale.getString("m.EffectsTaming3_0"), mcLocale.getString("m.EffectsTaming3_1") }));
-		player.sendMessage(mcLocale.getString("m.EffectsTemplate", new Object[] { mcLocale.getString("m.EffectsTaming4_0"), mcLocale.getString("m.EffectsTaming4_1") }));
-		player.sendMessage(mcLocale.getString("m.EffectsTemplate", new Object[] { mcLocale.getString("m.EffectsTaming5_0"), mcLocale.getString("m.EffectsTaming5_1") }));
-		player.sendMessage(mcLocale.getString("m.EffectsTemplate", new Object[] { mcLocale.getString("m.EffectsTaming6_0"), mcLocale.getString("m.EffectsTaming6_1") }));
-		player.sendMessage(mcLocale.getString("m.EffectsTemplate", new Object[] { mcLocale.getString("m.EffectsTaming7_0"), mcLocale.getString("m.EffectsTaming7_1") }));
-		player.sendMessage(mcLocale.getString("m.EffectsTaming7_2", new Object[] { LoadProperties.bonesConsumedByCOTW }));
-		player.sendMessage(mcLocale.getString("m.SkillHeader", new Object[] { mcLocale.getString("m.YourStats") }));
-
-		if (PP.getSkillLevel(SkillType.TAMING) < 100)
-			player.sendMessage(mcLocale.getString("m.AbilityLockTemplate", new Object[] { mcLocale.getString("m.AbilLockTaming1") }));
-		else
-			player.sendMessage(mcLocale.getString("m.AbilityBonusTemplate", new Object[] { mcLocale.getString("m.AbilBonusTaming1_0"), mcLocale.getString("m.AbilBonusTaming1_1") }));
-
-		if (PP.getSkillLevel(SkillType.TAMING) < 250)
-			player.sendMessage(mcLocale.getString("m.AbilityLockTemplate", new Object[] { mcLocale.getString("m.AbilLockTaming2") }));
-		else
-			player.sendMessage(mcLocale.getString("m.AbilityBonusTemplate", new Object[] { mcLocale.getString("m.AbilBonusTaming2_0"), mcLocale.getString("m.AbilBonusTaming2_1") }));
-
-		if (PP.getSkillLevel(SkillType.TAMING) < 500)
-			player.sendMessage(mcLocale.getString("m.AbilityLockTemplate", new Object[] { mcLocale.getString("m.AbilLockTaming3") }));
-		else
-			player.sendMessage(mcLocale.getString("m.AbilityBonusTemplate", new Object[] { mcLocale.getString("m.AbilBonusTaming3_0"), mcLocale.getString("m.AbilBonusTaming3_1") }));
-
-		if (PP.getSkillLevel(SkillType.TAMING) < 750)
-			player.sendMessage(mcLocale.getString("m.AbilityLockTemplate", new Object[] { mcLocale.getString("m.AbilLockTaming4") }));
-		else
-			player.sendMessage(mcLocale.getString("m.AbilityBonusTemplate", new Object[] { mcLocale.getString("m.AbilBonusTaming4_0"), mcLocale.getString("m.AbilBonusTaming4_1") }));
-
-		player.sendMessage(mcLocale.getString("m.TamingGoreChance", new Object[] { percentage }));
-
-		return true;
-	}
-}
+package com.gmail.nossr50.commands.skills;
+
+import com.gmail.nossr50.config.Config;
+import com.gmail.nossr50.datatypes.skills.SkillType;
+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;
+    private String goreChanceLucky;
+
+    private boolean canBeastLore;
+    private boolean canGore;
+    private boolean canSharpenedClaws;
+    private boolean canEnvironmentallyAware;
+    private boolean canThickFur;
+    private boolean canShockProof;
+    private boolean canCallWild;
+    private boolean canFastFood;
+    private boolean canHolyHound;
+
+    public TamingCommand() {
+        super(SkillType.TAMING);
+    }
+
+    @Override
+    protected void dataCalculations() {
+        String[] goreStrings = calculateAbilityDisplayValues(Taming.goreMaxBonusLevel, Taming.goreMaxChance);
+        goreChance = goreStrings[0];
+        goreChanceLucky = goreStrings[1];
+    }
+
+    @Override
+    protected void permissionsCheck() {
+        canBeastLore = Permissions.beastLore(player);
+        canCallWild = Permissions.callOfTheWild(player);
+        canEnvironmentallyAware = Permissions.environmentallyAware(player);
+        canFastFood = Permissions.fastFoodService(player);
+        canGore = Permissions.gore(player);
+        canSharpenedClaws = Permissions.sharpenedClaws(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 || canHolyHound;
+    }
+
+    @Override
+    protected void effectsDisplay() {
+        luckyEffectsDisplay();
+
+        if (canBeastLore) {
+            player.sendMessage(LocaleLoader.getString("Effects.Template", LocaleLoader.getString("Taming.Effect.0"), LocaleLoader.getString("Taming.Effect.1")));
+        }
+
+        if (canGore) {
+            player.sendMessage(LocaleLoader.getString("Effects.Template", LocaleLoader.getString("Taming.Effect.2"), LocaleLoader.getString("Taming.Effect.3")));
+        }
+
+        if (canSharpenedClaws) {
+            player.sendMessage(LocaleLoader.getString("Effects.Template", LocaleLoader.getString("Taming.Effect.4"), LocaleLoader.getString("Taming.Effect.5")));
+        }
+
+        if (canEnvironmentallyAware) {
+            player.sendMessage(LocaleLoader.getString("Effects.Template", LocaleLoader.getString("Taming.Effect.6"), LocaleLoader.getString("Taming.Effect.7")));
+        }
+
+        if (canThickFur) {
+            player.sendMessage(LocaleLoader.getString("Effects.Template", LocaleLoader.getString("Taming.Effect.8"), LocaleLoader.getString("Taming.Effect.9")));
+        }
+
+        if (canShockProof) {
+            player.sendMessage(LocaleLoader.getString("Effects.Template", LocaleLoader.getString("Taming.Effect.10"), LocaleLoader.getString("Taming.Effect.11")));
+        }
+
+        if (canFastFood) {
+            player.sendMessage(LocaleLoader.getString("Effects.Template", LocaleLoader.getString("Taming.Effect.16"), LocaleLoader.getString("Taming.Effect.17")));
+        }
+
+        if (canHolyHound) {
+            player.sendMessage(LocaleLoader.getString("Effects.Template", LocaleLoader.getString("Taming.Effect.18"), LocaleLoader.getString("Taming.Effect.19")));
+        }
+
+        if (canCallWild) {
+            player.sendMessage(LocaleLoader.getString("Effects.Template", LocaleLoader.getString("Taming.Effect.12"), LocaleLoader.getString("Taming.Effect.13")));
+            player.sendMessage(LocaleLoader.getString("Taming.Effect.14", Config.getInstance().getTamingCOTWOcelotCost()));
+            player.sendMessage(LocaleLoader.getString("Taming.Effect.15", Config.getInstance().getTamingCOTWWolfCost()));
+        }
+    }
+
+    @Override
+    protected boolean statsHeaderPermissions() {
+        return canEnvironmentallyAware || canFastFood || canGore || canSharpenedClaws || canShockProof || canThickFur || canHolyHound;
+    }
+
+    @Override
+    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)));
+            }
+            else {
+                player.sendMessage(LocaleLoader.getString("Ability.Generic.Template", LocaleLoader.getString("Taming.Ability.Bonus.8"), LocaleLoader.getString("Taming.Ability.Bonus.9", percent.format(Taming.fastFoodServiceActivationChance / 100D))));
+            }
+        }
+
+        if (canEnvironmentallyAware) {
+            if (skillValue < Taming.environmentallyAwareUnlockLevel) {
+                player.sendMessage(LocaleLoader.getString("Ability.Generic.Template.Lock", LocaleLoader.getString("Taming.Ability.Locked.0", Taming.environmentallyAwareUnlockLevel)));
+            }
+            else {
+                player.sendMessage(LocaleLoader.getString("Ability.Generic.Template", LocaleLoader.getString("Taming.Ability.Bonus.0"), LocaleLoader.getString("Taming.Ability.Bonus.1")));
+            }
+        }
+
+        if (canThickFur) {
+            if (skillValue < Taming.thickFurUnlockLevel) {
+                player.sendMessage(LocaleLoader.getString("Ability.Generic.Template.Lock", LocaleLoader.getString("Taming.Ability.Locked.1", Taming.thickFurUnlockLevel)));
+            }
+            else {
+                player.sendMessage(LocaleLoader.getString("Ability.Generic.Template", LocaleLoader.getString("Taming.Ability.Bonus.2"), LocaleLoader.getString("Taming.Ability.Bonus.3", Taming.thickFurModifier)));
+            }
+        }
+
+        if (canHolyHound) {
+            if (skillValue < Taming.holyHoundUnlockLevel) {
+                player.sendMessage(LocaleLoader.getString("Ability.Generic.Template.Lock", LocaleLoader.getString("Taming.Ability.Locked.5", Taming.holyHoundUnlockLevel)));
+            }
+            else {
+                player.sendMessage(LocaleLoader.getString("Ability.Generic.Template", LocaleLoader.getString("Taming.Ability.Bonus.10"), LocaleLoader.getString("Taming.Ability.Bonus.11")));
+            }
+        }
+
+        if (canShockProof) {
+            if (skillValue < Taming.shockProofUnlockLevel) {
+                player.sendMessage(LocaleLoader.getString("Ability.Generic.Template.Lock", LocaleLoader.getString("Taming.Ability.Locked.2", Taming.shockProofUnlockLevel)));
+            }
+            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,74 +1,146 @@
-package com.gmail.nossr50.commands.skills;
-
-import org.bukkit.command.Command;
-import org.bukkit.command.CommandExecutor;
-import org.bukkit.command.CommandSender;
-import org.bukkit.entity.Player;
-
-import com.gmail.nossr50.Users;
-import com.gmail.nossr50.mcPermissions;
-import com.gmail.nossr50.datatypes.PlayerProfile;
-import com.gmail.nossr50.datatypes.SkillType;
-import com.gmail.nossr50.locale.mcLocale;
-
-public class UnarmedCommand implements CommandExecutor {
-	@Override
-	public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
-		if (!(sender instanceof Player)) {
-			sender.sendMessage("This command does not support console useage.");
-			return true;
-		}
-
-		Player player = (Player) sender;
-		PlayerProfile PP = Users.getProfile(player);
-
-		String percentage, arrowpercentage;
-		float skillvalue = (float) PP.getSkillLevel(SkillType.UNARMED);
-
-		if (PP.getSkillLevel(SkillType.UNARMED) < 1000)
-			percentage = String.valueOf((skillvalue / 4000) * 100);
-		else
-			percentage = "25";
-
-		if (PP.getSkillLevel(SkillType.UNARMED) < 1000)
-			arrowpercentage = String.valueOf(((skillvalue / 1000) * 100) / 2);
-		else
-			arrowpercentage = "50";
-
-		int ticks = 2;
-		int x = PP.getSkillLevel(SkillType.UNARMED);
-		while (x >= 50) {
-			x -= 50;
-			ticks++;
-		}
-
-		player.sendMessage(mcLocale.getString("m.SkillHeader", new Object[] { mcLocale.getString("m.SkillUnarmed") }));
-		player.sendMessage(mcLocale.getString("m.XPGain", new Object[] { mcLocale.getString("m.XPGainUnarmed") }));
-
-		if (mcPermissions.getInstance().unarmed(player))
-			player.sendMessage(mcLocale.getString("m.LVL", new Object[] { PP.getSkillLevel(SkillType.UNARMED), PP.getSkillXpLevel(SkillType.UNARMED), PP.getXpToLevel(SkillType.UNARMED) }));
-
-		player.sendMessage(mcLocale.getString("m.SkillHeader", new Object[] { mcLocale.getString("m.Effects") }));
-		player.sendMessage(mcLocale.getString("m.EffectsTemplate", new Object[] { mcLocale.getString("m.EffectsUnarmed1_0"), mcLocale.getString("m.EffectsUnarmed1_1") }));
-		player.sendMessage(mcLocale.getString("m.EffectsTemplate", new Object[] { mcLocale.getString("m.EffectsUnarmed2_0"), mcLocale.getString("m.EffectsUnarmed2_1") }));
-		player.sendMessage(mcLocale.getString("m.EffectsTemplate", new Object[] { mcLocale.getString("m.EffectsUnarmed3_0"), mcLocale.getString("m.EffectsUnarmed3_1") }));
-		player.sendMessage(mcLocale.getString("m.EffectsTemplate", new Object[] { mcLocale.getString("m.EffectsUnarmed4_0"), mcLocale.getString("m.EffectsUnarmed4_1") }));
-		player.sendMessage(mcLocale.getString("m.EffectsTemplate", new Object[] { mcLocale.getString("m.EffectsUnarmed5_0"), mcLocale.getString("m.EffectsUnarmed5_1") }));
-		player.sendMessage(mcLocale.getString("m.SkillHeader", new Object[] { mcLocale.getString("m.YourStats") }));
-		player.sendMessage(mcLocale.getString("m.UnarmedArrowDeflectChance", new Object[] { arrowpercentage }));
-		player.sendMessage(mcLocale.getString("m.UnarmedDisarmChance", new Object[] { percentage }));
-
-		if (PP.getSkillLevel(SkillType.UNARMED) < 250) {
-			player.sendMessage(mcLocale.getString("m.AbilityLockTemplate", new Object[] { mcLocale.getString("m.AbilLockUnarmed1") }));
-		} else if (PP.getSkillLevel(SkillType.UNARMED) >= 250 && PP.getSkillLevel(SkillType.UNARMED) < 500) {
-			player.sendMessage(mcLocale.getString("m.AbilityBonusTemplate", new Object[] { mcLocale.getString("m.AbilBonusUnarmed1_0"), mcLocale.getString("m.AbilBonusUnarmed1_1") }));
-			player.sendMessage(mcLocale.getString("m.AbilityLockTemplate", new Object[] { mcLocale.getString("m.AbilLockUnarmed2") }));
-		} else {
-			player.sendMessage(mcLocale.getString("m.AbilityBonusTemplate", new Object[] { mcLocale.getString("m.AbilBonusUnarmed2_0"), mcLocale.getString("m.AbilBonusUnarmed2_1") }));
-		}
-
-		player.sendMessage(mcLocale.getString("m.UnarmedBerserkLength", new Object[] { ticks }));
-
-		return true;
-	}
-}
+package com.gmail.nossr50.commands.skills;
+
+import com.gmail.nossr50.datatypes.skills.SkillType;
+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;
+    private String berserkLengthEndurance;
+    private String deflectChance;
+    private String deflectChanceLucky;
+    private String disarmChance;
+    private String disarmChanceLucky;
+    private String ironGripChance;
+    private String ironGripChanceLucky;
+    private String ironArmBonus;
+
+    private boolean canBerserk;
+    private boolean canDisarm;
+    private boolean canBonusDamage;
+    private boolean canDeflect;
+    private boolean canIronGrip;
+
+    public UnarmedCommand() {
+        super(SkillType.UNARMED);
+    }
+
+    @Override
+    protected void dataCalculations() {
+        // BERSERK
+        String[] berserkStrings = calculateLengthDisplayValues();
+        berserkLength = berserkStrings[0];
+        berserkLengthEndurance = berserkStrings[1];
+
+        // DISARM
+        String[] disarmStrings = calculateAbilityDisplayValues(Unarmed.disarmMaxBonusLevel, Unarmed.disarmMaxChance);
+        disarmChance = disarmStrings[0];
+        disarmChanceLucky = disarmStrings[1];
+
+        // DEFLECT
+        String[] deflectStrings = calculateAbilityDisplayValues(Unarmed.deflectMaxBonusLevel, Unarmed.deflectMaxChance);
+        deflectChance = deflectStrings[0];
+        deflectChanceLucky = deflectStrings[1];
+
+        // IRON ARM
+        if (skillValue >= ((Unarmed.ironArmMaxBonusDamage - 3) * Unarmed.ironArmIncreaseLevel)) {
+            ironArmBonus = String.valueOf(Unarmed.ironArmMaxBonusDamage);
+        }
+        else {
+            ironArmBonus = String.valueOf(3 + (skillValue / Unarmed.ironArmIncreaseLevel));
+        }
+
+        // IRON GRIP
+        String[] ironGripStrings = calculateAbilityDisplayValues(Unarmed.ironGripMaxBonusLevel, Unarmed.ironGripMaxChance);
+        ironGripChance = ironGripStrings[0];
+        ironGripChanceLucky = ironGripStrings[1];
+    }
+
+    @Override
+    protected void permissionsCheck() {
+        canBerserk = Permissions.berserk(player);
+        canBonusDamage = Permissions.bonusDamage(player, skill);
+        canDeflect = Permissions.arrowDeflect(player);
+        canDisarm = Permissions.disarm(player);
+        canIronGrip = Permissions.ironGrip(player);
+    }
+
+    @Override
+    protected boolean effectsHeaderPermissions() {
+        return canBerserk || canBonusDamage || canDeflect || canDisarm || canIronGrip;
+    }
+
+    @Override
+    protected void effectsDisplay() {
+        luckyEffectsDisplay();
+
+        if (canBerserk) {
+            player.sendMessage(LocaleLoader.getString("Effects.Template", LocaleLoader.getString("Unarmed.Effect.0"), LocaleLoader.getString("Unarmed.Effect.1")));
+        }
+
+        if (canDisarm) {
+            player.sendMessage(LocaleLoader.getString("Effects.Template", LocaleLoader.getString("Unarmed.Effect.2"), LocaleLoader.getString("Unarmed.Effect.3")));
+        }
+
+        if (canBonusDamage) {
+            player.sendMessage(LocaleLoader.getString("Effects.Template", LocaleLoader.getString("Unarmed.Effect.4"), LocaleLoader.getString("Unarmed.Effect.5")));
+        }
+
+        if (canDeflect) {
+            player.sendMessage(LocaleLoader.getString("Effects.Template", LocaleLoader.getString("Unarmed.Effect.6"), LocaleLoader.getString("Unarmed.Effect.7")));
+        }
+
+        if (canIronGrip) {
+            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,56 +1,103 @@
-package com.gmail.nossr50.commands.skills;
-
-import org.bukkit.command.Command;
-import org.bukkit.command.CommandExecutor;
-import org.bukkit.command.CommandSender;
-import org.bukkit.entity.Player;
-
-import com.gmail.nossr50.Users;
-import com.gmail.nossr50.mcPermissions;
-import com.gmail.nossr50.datatypes.PlayerProfile;
-import com.gmail.nossr50.datatypes.SkillType;
-import com.gmail.nossr50.locale.mcLocale;
-
-public class WoodcuttingCommand implements CommandExecutor {
-	@Override
-	public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
-		if (!(sender instanceof Player)) {
-			sender.sendMessage("This command does not support console useage.");
-			return true;
-		}
-
-		Player player = (Player) sender;
-		PlayerProfile PP = Users.getProfile(player);
-		
-		float skillvalue = (float) PP.getSkillLevel(SkillType.WOODCUTTING);
-		int ticks = 2;
-		int x = PP.getSkillLevel(SkillType.WOODCUTTING);
-		while (x >= 50) {
-			x -= 50;
-			ticks++;
-		}
-		String percentage = String.valueOf((skillvalue / 1000) * 100);
-		
-		player.sendMessage(mcLocale.getString("m.SkillHeader", new Object[] { mcLocale.getString("m.SkillWoodCutting") }));
-		player.sendMessage(mcLocale.getString("m.XPGain", new Object[] { mcLocale.getString("m.XPGainWoodCutting") }));
-		
-		if (mcPermissions.getInstance().woodcutting(player))
-			player.sendMessage(mcLocale.getString("m.LVL", new Object[] { PP.getSkillLevel(SkillType.WOODCUTTING), PP.getSkillXpLevel(SkillType.WOODCUTTING), PP.getXpToLevel(SkillType.WOODCUTTING) }));
-		
-		player.sendMessage(mcLocale.getString("m.SkillHeader", new Object[] { mcLocale.getString("m.Effects") }));
-		player.sendMessage(mcLocale.getString("m.EffectsTemplate", new Object[] { mcLocale.getString("m.EffectsWoodCutting1_0"), mcLocale.getString("m.EffectsWoodCutting1_1") }));
-		player.sendMessage(mcLocale.getString("m.EffectsTemplate", new Object[] { mcLocale.getString("m.EffectsWoodCutting2_0"), mcLocale.getString("m.EffectsWoodCutting2_1") }));
-		player.sendMessage(mcLocale.getString("m.EffectsTemplate", new Object[] { mcLocale.getString("m.EffectsWoodCutting3_0"), mcLocale.getString("m.EffectsWoodCutting3_1") }));
-		player.sendMessage(mcLocale.getString("m.SkillHeader", new Object[] { mcLocale.getString("m.YourStats") }));
-		
-		if (PP.getSkillLevel(SkillType.WOODCUTTING) < 100)
-			player.sendMessage(mcLocale.getString("m.AbilityLockTemplate", new Object[] { mcLocale.getString("m.AbilLockWoodCutting1") }));
-		else
-			player.sendMessage(mcLocale.getString("m.AbilityBonusTemplate", new Object[] { mcLocale.getString("m.AbilBonusWoodCutting1_0"), mcLocale.getString("m.AbilBonusWoodCutting1_1") }));
-		
-		player.sendMessage(mcLocale.getString("m.WoodCuttingDoubleDropChance", new Object[] { percentage }));
-		player.sendMessage(mcLocale.getString("m.WoodCuttingTreeFellerLength", new Object[] { ticks }));
-		
-		return true;
-	}
-}
+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.woodcutting.Woodcutting;
+import com.gmail.nossr50.util.Permissions;
+
+public class WoodcuttingCommand extends SkillCommand {
+    private String treeFellerLength;
+    private String treeFellerLengthEndurance;
+    private String doubleDropChance;
+    private String doubleDropChanceLucky;
+
+    private boolean canTreeFell;
+    private boolean canLeafBlow;
+    private boolean canDoubleDrop;
+    private boolean doubleDropsDisabled;
+
+    public WoodcuttingCommand() {
+        super(SkillType.WOODCUTTING);
+    }
+
+    @Override
+    protected void dataCalculations() {
+        // TREE FELLER
+        String[] treeFellerStrings = calculateLengthDisplayValues();
+        treeFellerLength = treeFellerStrings[0];
+        treeFellerLengthEndurance = treeFellerStrings[1];
+
+        // DOUBLE DROPS
+        String[] doubleDropStrings = calculateAbilityDisplayValues(Woodcutting.doubleDropsMaxLevel, Woodcutting.doubleDropsMaxChance);
+        doubleDropChance = doubleDropStrings[0];
+        doubleDropChanceLucky = doubleDropStrings[1];
+    }
+
+    @Override
+    protected void permissionsCheck() {
+        canTreeFell = Permissions.treeFeller(player);
+        canDoubleDrop = Permissions.doubleDrops(player, skill);
+        canLeafBlow = Permissions.leafBlower(player);
+        doubleDropsDisabled = skill.getDoubleDropsDisabled();
+    }
+
+    @Override
+    protected boolean effectsHeaderPermissions() {
+        return (canDoubleDrop && !doubleDropsDisabled) || canLeafBlow || canTreeFell;
+    }
+
+    @Override
+    protected void effectsDisplay() {
+        luckyEffectsDisplay();
+
+        if (canTreeFell) {
+            player.sendMessage(LocaleLoader.getString("Effects.Template", LocaleLoader.getString("Woodcutting.Effect.0"), LocaleLoader.getString("Woodcutting.Effect.1")));
+        }
+
+        if (canLeafBlow) {
+            player.sendMessage(LocaleLoader.getString("Effects.Template", LocaleLoader.getString("Woodcutting.Effect.2"), LocaleLoader.getString("Woodcutting.Effect.3")));
+        }
+
+        if (canDoubleDrop && !doubleDropsDisabled) {
+            player.sendMessage(LocaleLoader.getString("Effects.Template", LocaleLoader.getString("Woodcutting.Effect.4"), LocaleLoader.getString("Woodcutting.Effect.5")));
+        }
+    }
+
+    @Override
+    protected boolean statsHeaderPermissions() {
+        return (canDoubleDrop && !doubleDropsDisabled) || canLeafBlow || canTreeFell;
+    }
+
+    @Override
+    protected void statsDisplay() {
+        if (canLeafBlow) {
+            int leafBlowerUnlockLevel = AdvancedConfig.getInstance().getLeafBlowUnlockLevel();
+
+            if (skillValue < leafBlowerUnlockLevel) {
+                player.sendMessage(LocaleLoader.getString("Ability.Generic.Template.Lock", LocaleLoader.getString("Woodcutting.Ability.Locked.0", leafBlowerUnlockLevel)));
+            }
+            else {
+                player.sendMessage(LocaleLoader.getString("Ability.Generic.Template", LocaleLoader.getString("Woodcutting.Ability.0"), LocaleLoader.getString("Woodcutting.Ability.1")));
+            }
+        }
+
+        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,50 +1,29 @@
-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.Users;
-import com.gmail.nossr50.config.LoadProperties;
-import com.gmail.nossr50.datatypes.HUDType;
-import com.gmail.nossr50.datatypes.HUDmmo;
-import com.gmail.nossr50.datatypes.PlayerProfile;
-import com.gmail.nossr50.spout.SpoutStuff;
-
-public class MchudCommand implements CommandExecutor {
-	@Override
-	public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
-		if (!LoadProperties.spoutEnabled) {
-			sender.sendMessage("This command is not enabled.");
-			return true;
-		}
-
-		if (!(sender instanceof Player)) {
-			sender.sendMessage("This command does not support console useage.");
-			return true;
-		}
-
-		Player player = (Player) sender;
-		PlayerProfile PP = Users.getProfile(player);
-		
-		if(args.length >= 1)
-		{
-			for(HUDType x : HUDType.values())
-			{
-				if(x.toString().toLowerCase().equals(args[0].toLowerCase()))
-				{
-					if(SpoutStuff.playerHUDs.containsKey(player))
-					{
-						SpoutStuff.playerHUDs.get(player).resetHUD();
-						SpoutStuff.playerHUDs.remove(player);
-						PP.setHUDType(x);
-						SpoutStuff.playerHUDs.put(player, new HUDmmo(player));
-					}
-				}
-			}
-		}
-		
-		return true;
-	}
-}
+package com.gmail.nossr50.commands.spout;
+
+import org.bukkit.command.Command;
+import org.bukkit.command.CommandSender;
+
+import com.gmail.nossr50.datatypes.spout.huds.HudType;
+import com.gmail.nossr50.locale.LocaleLoader;
+
+public class MchudCommand extends SpoutCommand {
+    @Override
+    protected boolean noArguments(Command command, CommandSender sender, String[] args) {
+        return false;
+    }
+
+    @Override
+    protected boolean oneArgument(Command command, CommandSender sender, String[] args) {
+        for (HudType hudType : HudType.values()) {
+            if (hudType.toString().equalsIgnoreCase(args[0])) {
+                playerProfile.setHudType(hudType);
+                spoutHud.initializeXpBar();
+                spoutHud.updateXpBar();
+                return true;
+            }
+        }
+
+        sender.sendMessage(LocaleLoader.getString("Commands.mchud.Invalid"));
+        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,62 +1,69 @@
-package com.gmail.nossr50.commands.spout;
-
-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.Users;
-import com.gmail.nossr50.m;
-import com.gmail.nossr50.mcPermissions;
-import com.gmail.nossr50.config.LoadProperties;
-import com.gmail.nossr50.datatypes.PlayerProfile;
-import com.gmail.nossr50.locale.mcLocale;
-import com.gmail.nossr50.skills.Skills;
-import com.gmail.nossr50.spout.SpoutStuff;
-
-public class XplockCommand implements CommandExecutor {
-	@Override
-	public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
-		if (!LoadProperties.spoutEnabled || !LoadProperties.xpbar || !LoadProperties.xplockEnable) {
-			sender.sendMessage("This command is not enabled.");
-			return true;
-		}
-
-		if (!(sender instanceof Player)) {
-			sender.sendMessage("This command does not support console useage.");
-			return true;
-		}
-
-		Player player = (Player) sender;
-		PlayerProfile PP = Users.getProfile(player);
-
-		if (args.length >= 1 && Skills.isSkill(args[0]) && mcPermissions.getInstance().permission(player, "mcmmo.skills." + Skills.getSkillType(args[0]).toString().toLowerCase())) {
-			if (PP.getXpBarLocked()) {
-				PP.setSkillLock(Skills.getSkillType(args[0]));
-				player.sendMessage(mcLocale.getString("Commands.xplock.locked", new Object[] { m.getCapitalized(PP.getSkillLock().toString()) }));
-			} else {
-				PP.setSkillLock(Skills.getSkillType(args[0]));
-				PP.toggleXpBarLocked();
-				player.sendMessage(mcLocale.getString("Commands.xplock.locked", new Object[] { m.getCapitalized(PP.getSkillLock().toString()) }));
-			}
-			SpoutStuff.updateXpBar(player);
-		} else if (args.length < 1) {
-			if (PP.getXpBarLocked()) {
-				PP.toggleXpBarLocked();
-				player.sendMessage(mcLocale.getString("Commands.xplock.unlocked"));
-			} else if (PP.getLastGained() != null) {
-				PP.toggleXpBarLocked();
-				PP.setSkillLock(PP.getLastGained());
-				player.sendMessage(mcLocale.getString("Commands.xplock.locked", new Object[] { m.getCapitalized(PP.getSkillLock().toString()) }));
-			}
-		} else if (args.length >= 1 && !Skills.isSkill(args[0])) {
-			player.sendMessage("Commands.xplock.invalid");
-		} else if (args.length >= 2 && Skills.isSkill(args[0]) && !mcPermissions.getInstance().permission(player, "mcmmo.skills." + Skills.getSkillType(args[0]).toString().toLowerCase())) {
-			player.sendMessage(ChatColor.YELLOW + "[mcMMO] " + ChatColor.DARK_RED + mcLocale.getString("mcPlayerListener.NoPermission"));
-			return true;
-		}
-
-		return true;
-	}
-}
+package com.gmail.nossr50.commands.spout;
+
+import org.bukkit.command.Command;
+import org.bukkit.command.CommandSender;
+
+import com.gmail.nossr50.datatypes.skills.SkillType;
+import com.gmail.nossr50.locale.LocaleLoader;
+import com.gmail.nossr50.util.Permissions;
+import com.gmail.nossr50.util.skills.SkillUtils;
+
+public class XplockCommand extends SpoutCommand {
+    @Override
+    protected boolean noArguments(Command command, CommandSender sender, String[] args) {
+        if (spoutHud.getXpBarLocked()) {
+            unlockXpBar(sender);
+            return true;
+        }
+
+        lockXpBar(sender, spoutHud.getLastGained());
+        return true;
+    }
+
+    @Override
+    protected boolean oneArgument(Command command, CommandSender sender, String[] args) {
+        if (args[0].equalsIgnoreCase("on")) {
+            lockXpBar(sender, spoutHud.getLastGained());
+            return true;
+        }
+
+        if (args[0].equalsIgnoreCase("off")) {
+            unlockXpBar(sender);
+            return true;
+        }
+
+        if (!SkillUtils.isSkill(args[0])) {
+            sender.sendMessage(LocaleLoader.getString("Commands.Skill.Invalid"));
+            return true;
+        }
+
+        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;
+        }
+
+        if (!Permissions.xplock(sender, skill)) {
+            sender.sendMessage(command.getPermissionMessage());
+            return true;
+        }
+
+        lockXpBar(sender, skill);
+        return true;
+    }
+
+    private void lockXpBar(CommandSender sender, SkillType skill) {
+        if (skill != null) {
+            spoutHud.setXpBarLocked(true);
+            spoutHud.setSkillLock(skill);
+            spoutHud.updateXpBar();
+            sender.sendMessage(LocaleLoader.getString("Commands.xplock.locked", SkillUtils.getSkillName(skill)));
+        }
+    }
+
+    private void unlockXpBar(CommandSender sender) {
+        spoutHud.setXpBarLocked(false);
+        sender.sendMessage(LocaleLoader.getString("Commands.xplock.unlocked"));
+    }
+}

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

@@ -0,0 +1,256 @@
+package com.gmail.nossr50.config;
+
+import java.util.Set;
+
+import org.bukkit.Material;
+import org.bukkit.configuration.ConfigurationSection;
+import org.bukkit.entity.EntityType;
+
+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;
+
+    private Config() {
+        super("config.yml");
+    }
+
+    public static Config getInstance() {
+        if (instance == null) {
+            instance = new Config();
+        }
+
+        return instance;
+    }
+
+    @Override
+    protected void loadKeys() {}
+
+    /*
+     * GENERAL SETTINGS
+     */
+
+    /* 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 getStringIncludingInts(config, "MySQL.Database.Name"); }
+    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 String getMySQLUserPassword() {
+        if (getStringIncludingInts(config, "MySQL.Database.User_Password") != null) {
+            return getStringIncludingInts(config, "MySQL.Database.User_Password");
+        }
+
+        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 void setHardcoreEnabled(boolean enabled) { config.set("Hardcore.Enabled", enabled); }
+
+    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); }
+
+    /* Items */
+    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
+     */
+
+    /* General Settings */
+    public boolean getAbilityMessagesEnabled() { return config.getBoolean("Abilities.Messages", true); }
+    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); }
+
+    /* Thresholds */
+    public int getTreeFellerThreshold() { return config.getInt("Abilities.Limits.Tree_Feller_Threshold", 500); }
+
+    /*
+     * SKILL SETTINGS
+     */
+
+    public int getXp(SkillType skill, Material material) { return config.getInt("Experience." + StringUtils.getCapitalized(skill.toString()) + "." + StringUtils.getPrettyItemString(material).replace(" ", "_")); }
+    public boolean getDoubleDropsEnabled(SkillType skill, Material material) { return config.getBoolean("Double_Drops." + StringUtils.getCapitalized(skill.toString()) + "." + StringUtils.getPrettyItemString(material).replace(" ", "_")); }
+
+    public boolean getDoubleDropsDisabled(SkillType skill) {
+        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("Skills.Fishing.Drops_Enabled", true); }
+
+    /* Mining */
+    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); }
+    public int getTamingXPOcelot() { return config.getInt("Experience.Taming.Animal_Taming.Ocelot", 500); }
+    public int getTamingCOTWWolfCost() { return config.getInt("Skills.Taming.Call_Of_The_Wild.Bones_Required", 10); }
+    public int getTamingCOTWOcelotCost() { return config.getInt("Skills.Taming.Call_Of_The_Wild.Fish_Required", 10); }
+
+    /* Woodcutting */
+    public int getWoodcuttingXPOak() { return config.getInt("Experience.Woodcutting.Oak", 70); }
+    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); }
+
+    /* 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); }
+
+    /* Level Caps */
+    public int getPowerLevelCap() {
+        int cap = config.getInt("General.Power_Level_Cap", 0);
+        return (cap <= 0) ? Integer.MAX_VALUE : cap;
+    }
+
+    public int getLevelCap(SkillType skill) {
+        int cap = config.getInt("Skills." + StringUtils.getCapitalized(skill.toString()) + ".Level_Cap");
+        return (cap <= 0) ? Integer.MAX_VALUE : cap;
+    }
+
+    /* PVP & PVE Settings */
+    public boolean getPVPEnabled(SkillType skill) { return config.getBoolean("Skills." + StringUtils.getCapitalized(skill.toString()) + ".Enabled_For_PVP", true); }
+    public boolean getPVEEnabled(SkillType skill) { return config.getBoolean("Skills." + StringUtils.getCapitalized(skill.toString()) + ".Enabled_For_PVE", true); }
+
+    /*
+     * XP SETTINGS
+     */
+
+    /* 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 getWitherSkeletonXP() { return config.getDouble("Experience.Combat.Multiplier.Wither_Skeleton", 4.0); }
+
+
+    /* XP Formula Multiplier */
+    public int getFormulaMultiplierCurve() { return config.getInt("Experience.Formula.Curve_Modifier", 20); }
+    public double getForumulaMultiplier(SkillType skill) { return config.getDouble("Experience.Formula.Multiplier." + StringUtils.getCapitalized(skill.toString())); }
+}