Refactoring to match Master branch.

*Basic framework for Staves is now done.*

.gitattributes

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

.gitignore

@@ -1,42 +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
-
-# Other Libraries
-*.jar
-
-# Atlassian Stuff
-/atlassian-ide-plugin.xml
+# 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

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

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

@@ -1,73 +0,0 @@
-#
-# 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,182 +1,135 @@
-<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>
+<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.3.06-dev</version>
+    <name>mcMMO</name>
+    <url>https://github.com/mcMMO-Dev/mcMMO</url>
+    <issueManagement>
+        <url>http://issues.mcmmo.org</url>
+        <system>JIRA</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>
+                </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>
+            <snapshots>
+                <enabled>true</enabled>
+                <updatePolicy>always</updatePolicy>
+                <checksumPolicy>fail</checksumPolicy>
+            </snapshots> 
+            <id>bukkit-repo</id>
+            <url>http://repo.bukkit.org/content/groups/public/</url>
+        </repository>
+        <repository>
+            <snapshots>
+                <enabled>true</enabled>
+                <updatePolicy>always</updatePolicy>
+                <checksumPolicy>fail</checksumPolicy>
+            </snapshots> 
+        	<id>spout-repo</id>
+        	<url>http://nexus.spout.org/content/groups/public/</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>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>

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/api/AbilityAPI.java

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

@@ -1,58 +1,43 @@
 package com.gmail.nossr50.api;
 
+import org.bukkit.Bukkit;
+import org.bukkit.ChatColor;
 import org.bukkit.entity.Player;
-import org.bukkit.plugin.Plugin;
 
-import com.gmail.nossr50.chat.ChatManager;
-import com.gmail.nossr50.party.PartyManager;
-import com.gmail.nossr50.util.player.UserManager;
-
-public final class ChatAPI {
-    private ChatAPI() {}
+import com.gmail.nossr50.events.chat.McMMOAdminChatEvent;
+import com.gmail.nossr50.events.chat.McMMOPartyChatEvent;
+import com.gmail.nossr50.util.Users;
+import com.gmail.nossr50.util.mcPermissions;
 
+public class ChatAPI {
     /**
      * Send a message to all members of a party
      * </br>
      * This function is designed for API usage.
      *
-     * @param plugin The plugin sending the message
-     * @param sender The name of the sender
-     * @param displayName The display name of the sender
-     * @param party The name of the party to send to
-     * @param message The message to send
-     */
-    public static void sendPartyChat(Plugin plugin, String sender, String displayName, String party, String message) {
-        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);
+    public void sendPartyChat(String sender, String party, String message) {
+        McMMOPartyChatEvent chatEvent = new McMMOPartyChatEvent(sender, party, message);
+        Bukkit.getPluginManager().callEvent(chatEvent);
+
+        if (chatEvent.isCancelled()) {
+            return;
+        }
+
+        String pPrefix = ChatColor.GREEN + "(" + ChatColor.WHITE + chatEvent.getSender() + ChatColor.GREEN + ") ";
+
+        Bukkit.getLogger().info("[P](" + chatEvent.getParty() + ")" + "<" + chatEvent.getSender() + "> " + chatEvent.getMessage());
+
+        for (Player player : Bukkit.getServer().getOnlinePlayers()) {
+            if (Users.getProfile(player).inParty()) {
+                if (Users.getProfile(player).getParty().equalsIgnoreCase(chatEvent.getParty())) {
+                    player.sendMessage(pPrefix + chatEvent.getMessage());
+                }
+            }
+        }
     }
 
     /**
@@ -60,80 +45,24 @@ public final class ChatAPI {
      * </br>
      * This function is designed for API usage.
      *
-     * @param plugin The plugin sending the message
-     * @param sender The name of the sender
-     * @param displayName The display name of the sender
-     * @param message The message to send
-     */
-    public static void sendAdminChat(Plugin plugin, String sender, String displayName, String message) {
-        ChatManager.handleAdminChat(plugin, sender, displayName, message);
-    }
-
-    /**
-     * Send a message to administrators
-     * </br>
-     * This function is designed for API usage.
-     *
-     * @param plugin The plugin sending the message
      * @param sender The name of the sender to display in the chat
      * @param message The message to send
      */
-    public static void sendAdminChat(Plugin plugin, String sender, String message) {
-        ChatManager.handleAdminChat(plugin, sender, sender, message);
-    }
+    public void sendAdminChat(String sender, String message) {
+        McMMOAdminChatEvent chatEvent = new McMMOAdminChatEvent(sender, message);
+        Bukkit.getPluginManager().callEvent(chatEvent);
 
-    /**
-     * 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);
-    }
+        if (chatEvent.isCancelled()) {
+            return;
+        }
 
-    /**
-     * Check if a player is currently talking in party chat.
-     *
-     * @param player The player to check
-     * @return true if the player is using party chat, false otherwise
-     */
-    public static boolean isUsingPartyChat(Player player) {
-        return UserManager.getPlayer(player).getPartyChatMode();
-    }
+        String aPrefix = ChatColor.AQUA + "{" + ChatColor.WHITE + chatEvent.getSender() + ChatColor.AQUA + "} ";
 
-    /**
-     * Check if a player is currently talking in party chat.
-     *
-     * @param playerName The name of the player to check
-     * @return true if the player is using party chat, false otherwise
-     */
-    public static boolean isUsingPartyChat(String playerName) {
-        return UserManager.getPlayer(playerName).getPartyChatMode();
-    }
+        Bukkit.getLogger().info("[A]<" + chatEvent.getSender() + "> " + chatEvent.getMessage());
 
-    /**
-     * Check if a player is currently talking in admin chat.
-     *
-     * @param player The player to check
-     * @return true if the player is using admin chat, false otherwise
-     */
-    public static boolean isUsingAdminChat(Player player) {
-        return UserManager.getPlayer(player).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();
+        for (Player player : Bukkit.getServer().getOnlinePlayers()) {
+            if (mcPermissions.getInstance().adminChat(player) || player.isOp())
+                player.sendMessage(aPrefix + chatEvent.getMessage());
+        }
     }
 }

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

@@ -1,358 +1,136 @@
-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));
-    }
-}
+package com.gmail.nossr50.api;
+
+import org.bukkit.entity.Player;
+
+import com.gmail.nossr50.datatypes.SkillType;
+import com.gmail.nossr50.util.Skills;
+import com.gmail.nossr50.util.Users;
+
+public class ExperienceAPI {
+
+    /**
+     * 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
+     */
+    private void checkXP(Player player, SkillType skillType) {
+        if (skillType.equals(SkillType.ALL)) {
+            Skills.XpCheckAll(player);
+        }
+        else {
+            Skills.XpCheckSkill(skillType, player);
+        }
+    }
+
+    /**
+     * Adds XP to the player, doesn't calculate for XP Rate or other modifiers.
+     * </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 void addRawXP(Player player, SkillType skillType, int XP) {
+        Users.getProfile(player).addXPOverride(skillType, XP);
+        checkXP(player, skillType);
+    }
+
+    /**
+     * Adds XP to the player, calculates for XP Rate but not skill modifiers.
+     * </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 void addMultipliedXP(Player player, SkillType skillType, int XP) {
+        Users.getProfile(player).addXPOverrideBonus(skillType, XP);
+        checkXP(player, skillType);
+    }
+
+    /**
+     * Adds XP to the player, calculates for XP Rate and skill modifiers.
+     * </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 void addXP(Player player, SkillType skillType, int XP) {
+        Users.getProfile(player).addXP(skillType, XP);
+        checkXP(player, 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 int getXP(Player player, SkillType skillType) {
+        return Users.getProfile(player).getSkillXpLevel(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 int getXPToNextLevel(Player player, SkillType skillType) {
+        return Users.getProfile(player).getXpToLevel(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 True if this should fire a level up notification, false otherwise.
+     */
+    public void addLevel(Player player, SkillType skillType, int levels, boolean notify) {
+        Users.getProfile(player).addLevels(skillType, levels);
+
+        if (notify) {
+            checkXP(player, 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 int getLevel(Player player, SkillType skillType) {
+        return Users.getProfile(player).getSkillLevel(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 int getPowerLevel(Player player) {
+        return Users.getProfile(player).getPowerLevel();
+    }
+}

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

@@ -1,174 +1,125 @@
-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);
-    }
-}
+package com.gmail.nossr50.api;
+
+import java.io.BufferedReader;
+import java.io.FileReader;
+import java.util.ArrayList;
+
+import org.bukkit.Bukkit;
+import org.bukkit.entity.Player;
+
+import com.gmail.nossr50.party.Party;
+import com.gmail.nossr50.util.Users;
+
+public class 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 String getPartyName(Player player) {
+        return Users.getProfile(player).getParty();
+    }
+
+    /**
+     * 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 boolean inParty(Player player) {
+        return Users.getProfile(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 boolean inSameParty(Player playera, Player playerb) {
+        return Party.getInstance().inSameParty(playera, playerb);
+    }
+
+    /**
+     * Get a list of all current party names.
+     * </br>
+     * This function is designed for API usage.
+     *
+     * @return the list of parties.
+     */
+    public ArrayList<String> getParties() {
+        String location = "plugins/mcMMO/mcmmo.users";
+        ArrayList<String> parties = new ArrayList<String>();
+
+        try {
+
+            //Open the users file
+            FileReader file = new FileReader(location);
+            BufferedReader in = new BufferedReader(file);
+            String line = "";
+
+            while((line = in.readLine()) != null) {
+                String[] character = line.split(":");
+                String theparty = null;
+
+                //Party
+                if (character.length > 3) {
+                    theparty = character[3];
+                }
+
+                if (!parties.contains(theparty)) {
+                    parties.add(theparty);
+                }
+            }
+            in.close();
+        }
+        catch (Exception e) {
+            Bukkit.getLogger().severe("Exception while reading " + location + " (Are you sure you formatted it correctly?)" + e.toString());
+        }
+        return parties;
+    }
+
+    /**
+     * 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 ArrayList<Player> getPartyMembers(Player player) {
+        return Party.getInstance().getPartyMembers(player);
+    }
+
+    /**
+     * 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 void addToParty(Player player, String partyName) {
+        Party.getInstance().addToParty(player, Users.getProfile(player), partyName, false, null);
+    }
+
+    /**
+     * Remove a player from a party.
+     * </br>
+     * This function is designed for API usage.
+     *
+     * @param player The player to remove
+     */
+    public void removeFromParty(Player player) {
+        Party.getInstance().removeFromParty(player, Users.getProfile(player));
+    }
+}

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

@@ -1,42 +0,0 @@
-package com.gmail.nossr50.commands.party;
-
-import org.bukkit.command.Command;
-import org.bukkit.command.CommandExecutor;
-import org.bukkit.command.CommandSender;
-import org.bukkit.entity.Player;
-
-import com.gmail.nossr50.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

@@ -1,34 +0,0 @@
-package com.gmail.nossr50.commands.party;
-
-import org.bukkit.command.Command;
-import org.bukkit.command.CommandExecutor;
-import org.bukkit.command.CommandSender;
-import org.bukkit.entity.Player;
-
-import com.gmail.nossr50.mcMMO;
-import com.gmail.nossr50.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

@@ -1,49 +0,0 @@
-package com.gmail.nossr50.commands.party;
-
-import org.bukkit.command.Command;
-import org.bukkit.command.CommandExecutor;
-import org.bukkit.command.CommandSender;
-import org.bukkit.entity.Player;
-
-import com.gmail.nossr50.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,154 +1,269 @@
-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;
-    }
-}
+package com.gmail.nossr50.commands.party;
+
+import org.bukkit.Bukkit;
+import org.bukkit.ChatColor;
+import org.bukkit.command.Command;
+import org.bukkit.command.CommandExecutor;
+import org.bukkit.command.CommandSender;
+import org.bukkit.entity.Player;
+
+import com.gmail.nossr50.datatypes.PlayerProfile;
+import com.gmail.nossr50.events.party.McMMOPartyChangeEvent;
+import com.gmail.nossr50.events.party.McMMOPartyChangeEvent.EventReason;
+import com.gmail.nossr50.locale.mcLocale;
+import com.gmail.nossr50.party.Party;
+import com.gmail.nossr50.util.Users;
+import com.gmail.nossr50.util.mcPermissions;
+
+public class PartyCommand implements CommandExecutor {
+	@Override
+	public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
+
+		if (!(sender instanceof Player)) {
+			sender.sendMessage("This command does not support console useage."); //TODO: Needs more locale.
+			return true;
+		}
+
+		Player player = (Player) sender;
+		PlayerProfile PP = Users.getProfile(player);
+
+		if (!mcPermissions.getInstance().party(player)) {
+			player.sendMessage(ChatColor.YELLOW + "[mcMMO] " + ChatColor.DARK_RED + mcLocale.getString("mcPlayerListener.NoPermission"));
+			return true;
+		}
+
+		Party Pinstance = Party.getInstance();
+
+		if (PP.inParty() && (!Pinstance.isParty(PP.getParty()) || !Pinstance.isInParty(player, PP))) {
+			Pinstance.addToParty(player, PP, PP.getParty(), false, null);
+		}
+
+		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)) {
+						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)) {
+						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 + ")");
+			
+			//Master Apprentice Stuff
+			//Show the player all their bonuses when they type /party
+			
+			/*
+			for(Player a : Party.getInstance().getPartyMembers(player))
+			{
+			    if(Party.getInstance().isPartyLeader(a.getName(), PP.getParty()) && !a.getName().equals(player.getName()))
+			    {
+			        PlayerProfile LP = Users.getProfile(a);
+			        for(SkillType type : SkillType.values())
+			        {
+			            //Skip this one
+			            if(type == SkillType.ALL)
+			                continue;
+			            
+			            if(LP.getSkillLevel(type) > PP.getSkillLevel(type))
+			            {
+			                //Tell them what their skill bonus is for this skill
+        			        int leaderLevel = LP.getSkillLevel(type); 
+        		            int difference = leaderLevel - PP.getSkillLevel(type);
+        		            
+        		            double bonusModifier = (difference*0.75D)/100D;
+        		            double trueBonus = bonusModifier * 100;
+        		            player.sendMessage("You get "+trueBonus+"% more XP from "+type.toString());
+        		            //double percent = (trueBonus/100)*100;
+			            } else
+			            {
+			                //Tell them they have no bonus.. or not
+			            }
+			        }
+			    } else if(Party.getInstance().isPartyLeader(a.getName(), PP.getParty()) && a.getName().equals(player.getName()))
+			    {
+			        //Tell them they are providing bonuses
+			    }
+			}
+			*/
+            
+			return true;
+		} else if (args.length == 1) {
+			if (args[0].equals("q") && PP.inParty()) {
+
+                McMMOPartyChangeEvent event = new McMMOPartyChangeEvent(player, PP.getParty(), null, EventReason.LEFT_PARTY);
+                Bukkit.getPluginManager().callEvent(event);
+
+                if (event.isCancelled()) {
+                    return true;
+                }
+
+				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()) {
+				    McMMOPartyChangeEvent event = new McMMOPartyChangeEvent(player, PP.getParty(), args[0], EventReason.CHANGED_PARTIES);
+				    Bukkit.getPluginManager().callEvent(event);
+
+				    if (event.isCancelled()) {
+				        return true;
+				    }
+
+					Pinstance.removeFromParty(player, PP);
+				}
+				else {
+                    McMMOPartyChangeEvent event = new McMMOPartyChangeEvent(player, null, args[0], EventReason.JOINED_PARTY);
+                    Bukkit.getPluginManager().callEvent(event);
+
+                    if (event.isCancelled()) {
+                        return true;
+                    }
+				}
+				Pinstance.addToParty(player, PP, args[0], false, null);
+				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);
+
+			                McMMOPartyChangeEvent event = new McMMOPartyChangeEvent(player, tPP.getParty(), null, EventReason.KICKED_FROM_PARTY);
+			                Bukkit.getPluginManager().callEvent(event);
+
+			                if (event.isCancelled()) {
+			                    return true;
+			                }
+
+							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 {
+                McMMOPartyChangeEvent event = new McMMOPartyChangeEvent(player, PP.getParty(), args[0], EventReason.CHANGED_PARTIES);
+                Bukkit.getPluginManager().callEvent(event);
+
+                if (event.isCancelled()) {
+                    return true;
+                }
+				Pinstance.removeFromParty(player, PP);
+				Pinstance.addToParty(player, PP, args[0], false, args[1]);
+			}
+		} else if (args.length == 2 && !PP.inParty()) {
+            McMMOPartyChangeEvent event = new McMMOPartyChangeEvent(player, null, args[0], EventReason.JOINED_PARTY);
+            Bukkit.getPluginManager().callEvent(event);
+
+            if (event.isCancelled()) {
+                return true;
+            }
+			Pinstance.addToParty(player, PP, args[0], false, args[1]);
+		}
+
+		return true;
+	}
+}

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

@@ -1,56 +0,0 @@
-package com.gmail.nossr50.commands.party;
-
-import org.bukkit.command.Command;
-import org.bukkit.command.CommandExecutor;
-import org.bukkit.command.CommandSender;
-import org.bukkit.entity.Player;
-
-import com.gmail.nossr50.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

@@ -1,37 +0,0 @@
-package com.gmail.nossr50.commands.party;
-
-import org.bukkit.command.Command;
-import org.bukkit.command.CommandExecutor;
-import org.bukkit.command.CommandSender;
-import org.bukkit.entity.Player;
-
-import com.gmail.nossr50.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

@@ -1,55 +0,0 @@
-package com.gmail.nossr50.commands.party;
-
-import org.bukkit.command.Command;
-import org.bukkit.command.CommandExecutor;
-import org.bukkit.command.CommandSender;
-import org.bukkit.entity.Player;
-
-import com.gmail.nossr50.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

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

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

@@ -1,72 +0,0 @@
-package com.gmail.nossr50.commands.party;
-
-import org.bukkit.command.Command;
-import org.bukkit.command.CommandExecutor;
-import org.bukkit.command.CommandSender;
-import org.bukkit.entity.Player;
-
-import com.gmail.nossr50.mcMMO;
-import com.gmail.nossr50.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

@@ -1,101 +0,0 @@
-package com.gmail.nossr50.commands.party;
-
-import org.bukkit.command.Command;
-import org.bukkit.command.CommandExecutor;
-import org.bukkit.command.CommandSender;
-import org.bukkit.entity.Player;
-
-import com.gmail.nossr50.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

@@ -1,96 +0,0 @@
-package com.gmail.nossr50.commands.party;
-
-import org.bukkit.command.Command;
-import org.bukkit.command.CommandExecutor;
-import org.bukkit.command.CommandSender;
-import org.bukkit.entity.Player;
-
-import com.gmail.nossr50.mcMMO;
-import com.gmail.nossr50.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

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

@@ -1,97 +0,0 @@
-package com.gmail.nossr50.commands.party;
-
-import org.bukkit.command.Command;
-import org.bukkit.command.CommandExecutor;
-import org.bukkit.command.CommandSender;
-import org.bukkit.entity.Player;
-
-import com.gmail.nossr50.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

@@ -1,38 +0,0 @@
-package com.gmail.nossr50.commands.party;
-
-import org.bukkit.command.Command;
-import org.bukkit.command.CommandExecutor;
-import org.bukkit.command.CommandSender;
-import org.bukkit.entity.Player;
-
-import com.gmail.nossr50.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

@@ -1,58 +0,0 @@
-package com.gmail.nossr50.commands.party;
-
-import org.bukkit.command.Command;
-import org.bukkit.command.CommandExecutor;
-import org.bukkit.command.CommandSender;
-import org.bukkit.entity.Player;
-
-import com.gmail.nossr50.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

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

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

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

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

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

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

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

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

@@ -1,105 +1,61 @@
-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 }));
-            }
-        }
-    }
-}
+package com.gmail.nossr50.commands.skills;
+
+import org.bukkit.command.Command;
+import org.bukkit.command.CommandExecutor;
+import org.bukkit.command.CommandSender;
+import org.bukkit.entity.Player;
+
+import com.gmail.nossr50.commands.CommandHelper;
+import com.gmail.nossr50.datatypes.PlayerProfile;
+import com.gmail.nossr50.datatypes.SkillType;
+import com.gmail.nossr50.locale.mcLocale;
+import com.gmail.nossr50.util.Page;
+import com.gmail.nossr50.util.Users;
+import com.gmail.nossr50.util.mcPermissions;
+
+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."); //TODO: Needs more locale.
+			return true;
+		}
+
+        if (CommandHelper.noCommandPermissions(sender, "mcmmo.skills.acrobatics")) {
+            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 }));
+		
+		Page.grabGuidePageForSkill(SkillType.ACROBATICS, player, args);
+		
+		return true;
+	}
+}

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

@@ -1,104 +1,66 @@
-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));
-            }
-        }
-    }
-}
+package com.gmail.nossr50.commands.skills;
+
+import org.bukkit.command.Command;
+import org.bukkit.command.CommandExecutor;
+import org.bukkit.command.CommandSender;
+import org.bukkit.entity.Player;
+
+import com.gmail.nossr50.commands.CommandHelper;
+import com.gmail.nossr50.datatypes.PlayerProfile;
+import com.gmail.nossr50.datatypes.SkillType;
+import com.gmail.nossr50.locale.mcLocale;
+import com.gmail.nossr50.util.Page;
+import com.gmail.nossr50.util.Users;
+import com.gmail.nossr50.util.mcPermissions;
+
+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."); //TODO: Needs more locale.
+			return true;
+		}
+
+        if (CommandHelper.noCommandPermissions(sender, "mcmmo.skills.archery")) {
+            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);
+		
+		double dmgBonusPercent = ((PP.getSkillLevel(SkillType.ARCHERY) / 50) * 0.1D);
+        
+        /* Cap maximum bonus at 200% */
+        if(dmgBonusPercent > 2)
+            dmgBonusPercent = 2;
+        
+        dmgBonusPercent = dmgBonusPercent * 100; //Convert to percentage
+
+		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.ArcherySkillShot", new Object[] { dmgBonusPercent }));
+		player.sendMessage(mcLocale.getString("m.ArcheryDazeChance", new Object[] { percentagedaze }));
+		player.sendMessage(mcLocale.getString("m.ArcheryRetrieveChance", new Object[] { percentage }));
+		
+		Page.grabGuidePageForSkill(SkillType.ARCHERY, player, args);
+
+		return true;
+	}
+}

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

@@ -1,128 +1,72 @@
-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));
-            }
-        }
-    }
-}
+package com.gmail.nossr50.commands.skills;
+
+import org.bukkit.command.Command;
+import org.bukkit.command.CommandExecutor;
+import org.bukkit.command.CommandSender;
+import org.bukkit.entity.Player;
+
+import com.gmail.nossr50.commands.CommandHelper;
+import com.gmail.nossr50.datatypes.PlayerProfile;
+import com.gmail.nossr50.datatypes.SkillType;
+import com.gmail.nossr50.locale.mcLocale;
+import com.gmail.nossr50.util.Users;
+import com.gmail.nossr50.util.mcPermissions;
+
+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."); //TODO: Needs more locale.
+			return true;
+		}
+
+        if (CommandHelper.noCommandPermissions(sender, "mcmmo.skills.axes")) {
+            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 / 2000) * 100);
+		else
+			percentage = "37.5";
+		
+		int bonusDmg = Users.getProfile(player).getSkillLevel(SkillType.AXES)/50;
+		if(bonusDmg > 4)
+		    bonusDmg = 4;
+
+		int ticks = 2;
+		short durDmg = 5;
+		durDmg+=Users.getProfile(player).getSkillLevel(SkillType.AXES)/30;
+		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.EffectsTemplate", new Object[] { mcLocale.getString("m.EffectsAxes4_0"), mcLocale.getString("m.EffectsAxes4_1") }));
+        player.sendMessage(mcLocale.getString("m.EffectsTemplate", new Object[] { mcLocale.getString("m.EffectsAxes5_0"), mcLocale.getString("m.EffectsAxes5_1") }));
+		player.sendMessage(mcLocale.getString("m.SkillHeader", new Object[] { mcLocale.getString("m.YourStats") }));
+		player.sendMessage(mcLocale.getString("m.AxesCritChance", new Object[] { percentage }));
+		
+		player.sendMessage(mcLocale.getString("m.AbilityBonusTemplate", new Object[] { mcLocale.getString("m.AbilBonusAxes1_0"), mcLocale.getString("m.AbilBonusAxes1_1", new Object[] {bonusDmg}) }));
+        player.sendMessage(mcLocale.getString("m.AbilityBonusTemplate", new Object[] { mcLocale.getString("m.AbilBonusAxes2_0"), mcLocale.getString("m.AbilBonusAxes2_1", new Object[] {durDmg}) }));
+        player.sendMessage(mcLocale.getString("m.AbilityBonusTemplate", new Object[] { mcLocale.getString("m.AbilBonusAxes3_0"), mcLocale.getString("m.AbilBonusAxes3_1", new Object[] {2}) }));
+        player.sendMessage(mcLocale.getString("m.AxesSkullLength", new Object[] { ticks }));
+
+		return true;
+	}
+}

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

@@ -1,66 +1,54 @@
-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));
-            }
-        }
-    }
-}
+package com.gmail.nossr50.commands.skills;
+
+import org.bukkit.command.Command;
+import org.bukkit.command.CommandExecutor;
+import org.bukkit.command.CommandSender;
+import org.bukkit.entity.Player;
+
+import com.gmail.nossr50.commands.CommandHelper;
+import com.gmail.nossr50.datatypes.PlayerProfile;
+import com.gmail.nossr50.datatypes.SkillType;
+import com.gmail.nossr50.locale.mcLocale;
+import com.gmail.nossr50.util.Page;
+import com.gmail.nossr50.util.Users;
+import com.gmail.nossr50.util.mcPermissions;
+
+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."); //TODO: Needs more locale.
+			return true;
+		}
+
+        if (CommandHelper.noCommandPermissions(sender, "mcmmo.skills.excavation")) {
+            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("");
+		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.ExcavationGigaDrillBreakerLength", new Object[] { ticks }));
+
+		Page.grabGuidePageForSkill(SkillType.EXCAVATION, player, args);
+		
+		return true;
+	}
+}

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

@@ -1,125 +1,55 @@
-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));
-        }
-    }
-}
+package com.gmail.nossr50.commands.skills;
+
+import org.bukkit.command.Command;
+import org.bukkit.command.CommandExecutor;
+import org.bukkit.command.CommandSender;
+import org.bukkit.entity.Player;
+
+import com.gmail.nossr50.commands.CommandHelper;
+import com.gmail.nossr50.datatypes.PlayerProfile;
+import com.gmail.nossr50.datatypes.SkillType;
+import com.gmail.nossr50.locale.mcLocale;
+import com.gmail.nossr50.skills.gathering.Fishing;
+import com.gmail.nossr50.util.Page;
+import com.gmail.nossr50.util.Users;
+import com.gmail.nossr50.util.mcPermissions;
+
+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."); //TODO: Needs more locale.
+			return true;
+		}
+
+        if (CommandHelper.noCommandPermissions(sender, "mcmmo.skills.fishing")) {
+            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) }));
+		
+		Page.grabGuidePageForSkill(SkillType.FISHING, player, args);
+
+		return true;
+	}
+}

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

@@ -1,180 +1,77 @@
-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));
-            }
-        }
-    }
-}
+package com.gmail.nossr50.commands.skills;
+
+import org.bukkit.command.Command;
+import org.bukkit.command.CommandExecutor;
+import org.bukkit.command.CommandSender;
+import org.bukkit.entity.Player;
+
+import com.gmail.nossr50.commands.CommandHelper;
+import com.gmail.nossr50.datatypes.PlayerProfile;
+import com.gmail.nossr50.datatypes.SkillType;
+import com.gmail.nossr50.locale.mcLocale;
+import com.gmail.nossr50.util.Page;
+import com.gmail.nossr50.util.Users;
+import com.gmail.nossr50.util.mcPermissions;
+
+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."); //TODO: Needs more locale.
+			return true;
+		}
+
+        if (CommandHelper.noCommandPermissions(sender, "mcmmo.skills.herbalism")) {
+            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++;
+		if (PP.getSkillLevel(SkillType.HERBALISM) >= 800)
+			bonus++;
+		if (PP.getSkillLevel(SkillType.HERBALISM) >= 1000)
+			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.EffectsHerbalism4_0"), mcLocale.getString("m.EffectsHerbalism4_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.HerbalismFoodPlus", new Object[] { bonus } ));
+		player.sendMessage(mcLocale.getString("m.HerbalismDoubleDropChance", new Object[] { percentage }));
+		
+		Page.grabGuidePageForSkill(SkillType.HERBALISM, player, args);
+
+		return true;
+	}
+}

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

@@ -1,149 +1,137 @@
-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));
-            }
-        }
-    }
-}
+package com.gmail.nossr50.commands.skills;
+
+import org.bukkit.command.Command;
+import org.bukkit.command.CommandExecutor;
+import org.bukkit.command.CommandSender;
+import org.bukkit.entity.Player;
+
+import com.gmail.nossr50.commands.CommandHelper;
+import com.gmail.nossr50.datatypes.PlayerProfile;
+import com.gmail.nossr50.datatypes.SkillType;
+import com.gmail.nossr50.locale.mcLocale;
+import com.gmail.nossr50.util.Page;
+import com.gmail.nossr50.util.Users;
+import com.gmail.nossr50.util.mcPermissions;
+
+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."); //TODO: Needs more locale.
+			return true;
+		}
+
+        if (CommandHelper.noCommandPermissions(sender, "mcmmo.skills.mining")) {
+            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++;
+		}
+		
+		int rank = 0;
+		int damage = 0;
+		int radius = 0;
+		if(PP.getSkillLevel(SkillType.MINING) >= 125 && PP.getSkillLevel(SkillType.MINING) < 250)
+			rank = 1;
+		if(PP.getSkillLevel(SkillType.MINING) >= 250 && PP.getSkillLevel(SkillType.MINING) < 375){
+			rank = 2;
+			radius = 1;
+		}
+		if(PP.getSkillLevel(SkillType.MINING) >= 375 && PP.getSkillLevel(SkillType.MINING) < 500){
+			rank = 3;
+			radius = 1;
+		}
+		if(PP.getSkillLevel(SkillType.MINING) >= 500 && PP.getSkillLevel(SkillType.MINING) < 625){
+			rank = 4;
+			damage = 25;
+			radius = 2;
+		}
+		if(PP.getSkillLevel(SkillType.MINING) >= 625 && PP.getSkillLevel(SkillType.MINING) < 750){
+			rank = 5;
+			damage = 25;
+			radius = 2;
+		}
+		if(PP.getSkillLevel(SkillType.MINING) >= 750 && PP.getSkillLevel(SkillType.MINING) < 875){
+			rank = 6;
+			damage = 50;
+			radius = 3;
+		}
+		if(PP.getSkillLevel(SkillType.MINING) >= 875 && PP.getSkillLevel(SkillType.MINING) < 1000){
+			rank = 7;
+			damage = 50;
+			radius = 3;
+		}
+		if(PP.getSkillLevel(SkillType.MINING) >= 1000){
+			rank = 8;
+			damage = 100;
+			radius = 4;
+		}
+		
+		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.EffectsTemplate", new Object[] { mcLocale.getString("m.EffectsMining3_0"), mcLocale.getString("m.EffectsMining3_1") }));
+		player.sendMessage(mcLocale.getString("m.EffectsTemplate", new Object[] { mcLocale.getString("m.EffectsMining4_0"), mcLocale.getString("m.EffectsMining4_1") }));
+		player.sendMessage(mcLocale.getString("m.EffectsTemplate", new Object[] { mcLocale.getString("m.EffectsMining5_0"), mcLocale.getString("m.EffectsMining5_1") }));
+		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 }));
+		if (PP.getSkillLevel(SkillType.MINING) < 125)
+			player.sendMessage(mcLocale.getString("m.AbilityLockTemplate", new Object[] { mcLocale.getString("m.AbilLockMining1") }));
+		else{
+			switch (rank){
+			case 1:
+				player.sendMessage(mcLocale.getString("m.MiningBlastMining", new Object[] { rank, mcLocale.getString("m.BlastMining1") }));
+				break;
+			case 2:
+				player.sendMessage(mcLocale.getString("m.MiningBlastMining", new Object[] { rank, mcLocale.getString("m.BlastMining2") }));
+				break;
+			case 3:
+				player.sendMessage(mcLocale.getString("m.MiningBlastMining", new Object[] { rank, mcLocale.getString("m.BlastMining3") }));
+				break;
+			case 4:
+				player.sendMessage(mcLocale.getString("m.MiningBlastMining", new Object[] { rank, mcLocale.getString("m.BlastMining4") }));
+				break;
+			case 5:
+				player.sendMessage(mcLocale.getString("m.MiningBlastMining", new Object[] { rank, mcLocale.getString("m.BlastMining5") }));
+				break;
+			case 6:
+				player.sendMessage(mcLocale.getString("m.MiningBlastMining", new Object[] { rank, mcLocale.getString("m.BlastMining6") }));
+				break;
+			case 7:
+				player.sendMessage(mcLocale.getString("m.MiningBlastMining", new Object[] { rank, mcLocale.getString("m.BlastMining7") }));
+				break;
+			case 8:
+				player.sendMessage(mcLocale.getString("m.MiningBlastMining", new Object[] { rank, mcLocale.getString("m.BlastMining8") }));
+				break;
+			}
+		}
+		if (PP.getSkillLevel(SkillType.MINING) < 250)
+			player.sendMessage(mcLocale.getString("m.AbilityLockTemplate", new Object[] { mcLocale.getString("m.AbilLockMining2") }));
+		else
+			player.sendMessage(mcLocale.getString("m.MiningBiggerBombs", new Object[] { radius }));
+		if (PP.getSkillLevel(SkillType.MINING) < 500)
+			player.sendMessage(mcLocale.getString("m.AbilityLockTemplate", new Object[] { mcLocale.getString("m.AbilLockMining3") }));
+		else
+			player.sendMessage(mcLocale.getString("m.MiningDemolitionsExpertDamageDecrease", new Object[] { damage }));
+		
+		Page.grabGuidePageForSkill(SkillType.MINING, player, args);
+		
+		return true;
+	}
+}

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

@@ -1,166 +1,58 @@
-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())));
-            }
-        }
-    }
-}
+package com.gmail.nossr50.commands.skills;
+
+import org.bukkit.command.Command;
+import org.bukkit.command.CommandExecutor;
+import org.bukkit.command.CommandSender;
+import org.bukkit.entity.Player;
+
+import com.gmail.nossr50.commands.CommandHelper;
+import com.gmail.nossr50.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.misc.Repair;
+import com.gmail.nossr50.util.Page;
+import com.gmail.nossr50.util.Users;
+import com.gmail.nossr50.util.mcPermissions;
+
+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."); //TODO: Needs more locale.
+			return true;
+		}
+
+        if (CommandHelper.noCommandPermissions(sender, "mcmmo.skills.repair")) {
+            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.getSkillLevel(SkillType.REPAIR)) }));
+		player.sendMessage(mcLocale.getString("m.ArcaneEnchantKeepChance", new Object[] { Repair.getEnchantChance(Repair.getArcaneForgingRank(PP.getSkillLevel(SkillType.REPAIR))) }));
+		player.sendMessage(mcLocale.getString("m.ArcaneEnchantDowngradeChance", new Object[] { Repair.getDowngradeChance(Repair.getArcaneForgingRank(PP.getSkillLevel(SkillType.REPAIR))) }));
+		
+		Page.grabGuidePageForSkill(SkillType.REPAIR, player, args);
+		
+		return true;
+	}
+}

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

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

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

@@ -1,122 +0,0 @@
-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,117 +1,76 @@
-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));
-            }
-        }
-    }
-}
+package com.gmail.nossr50.commands.skills;
+
+import org.bukkit.command.Command;
+import org.bukkit.command.CommandExecutor;
+import org.bukkit.command.CommandSender;
+import org.bukkit.entity.Player;
+
+import com.gmail.nossr50.commands.CommandHelper;
+import com.gmail.nossr50.datatypes.PlayerProfile;
+import com.gmail.nossr50.datatypes.SkillType;
+import com.gmail.nossr50.locale.mcLocale;
+import com.gmail.nossr50.util.Page;
+import com.gmail.nossr50.util.Users;
+import com.gmail.nossr50.util.mcPermissions;
+
+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."); //TODO: Needs more locale.
+			return true;
+		}
+
+        if (CommandHelper.noCommandPermissions(sender, "mcmmo.skills.swords")) {
+            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.SwordsBleedChance", new Object[] { percentage }));
+		player.sendMessage(mcLocale.getString("m.SwordsSSLength", new Object[] { ticks }));
+		
+		Page.grabGuidePageForSkill(SkillType.SWORDS, player, args);
+
+		return true;
+	}
+}

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

@@ -1,165 +1,82 @@
-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));
-            }
-        }
-    }
-}
+package com.gmail.nossr50.commands.skills;
+
+import org.bukkit.command.Command;
+import org.bukkit.command.CommandExecutor;
+import org.bukkit.command.CommandSender;
+import org.bukkit.entity.Player;
+
+import com.gmail.nossr50.commands.CommandHelper;
+import com.gmail.nossr50.config.LoadProperties;
+import com.gmail.nossr50.datatypes.PlayerProfile;
+import com.gmail.nossr50.datatypes.SkillType;
+import com.gmail.nossr50.locale.mcLocale;
+import com.gmail.nossr50.util.Page;
+import com.gmail.nossr50.util.Users;
+import com.gmail.nossr50.util.mcPermissions;
+
+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."); //TODO: Needs more locale.
+			return true;
+		}
+
+        if (CommandHelper.noCommandPermissions(sender, "mcmmo.skills.taming")) {
+            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.EffectsTemplate", new Object[] { mcLocale.getString("m.EffectsTaming8_0"), mcLocale.getString("m.EffectsTaming8_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") }));
+		if (PP.getSkillLevel(SkillType.TAMING) < 50)
+            player.sendMessage(mcLocale.getString("m.AbilityLockTemplate", new Object[] { mcLocale.getString("m.AbilLockTaming5") }));
+		else
+	          player.sendMessage(mcLocale.getString("m.AbilityBonusTemplate", new Object[] { mcLocale.getString("m.AbilBonusTaming5_0"), mcLocale.getString("m.AbilBonusTaming5_1") }));
+		
+		player.sendMessage(mcLocale.getString("m.TamingGoreChance", new Object[] { percentage }));
+		
+		Page.grabGuidePageForSkill(SkillType.TAMING, player, args);
+
+		return true;
+	}
+}

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

@@ -1,146 +1,79 @@
-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));
-            }
-        }
-    }
-}
+package com.gmail.nossr50.commands.skills;
+
+import org.bukkit.command.Command;
+import org.bukkit.command.CommandExecutor;
+import org.bukkit.command.CommandSender;
+import org.bukkit.entity.Player;
+
+import com.gmail.nossr50.commands.CommandHelper;
+import com.gmail.nossr50.datatypes.PlayerProfile;
+import com.gmail.nossr50.datatypes.SkillType;
+import com.gmail.nossr50.locale.mcLocale;
+import com.gmail.nossr50.util.Page;
+import com.gmail.nossr50.util.Users;
+import com.gmail.nossr50.util.mcPermissions;
+
+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."); //TODO: Needs more locale.
+			return true;
+		}
+
+        if (CommandHelper.noCommandPermissions(sender, "mcmmo.skills.unarmed")) {
+            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 / 3000) * 100);
+		else
+			percentage = "33.3";
+
+		if (PP.getSkillLevel(SkillType.UNARMED) < 1000)
+			arrowpercentage = String.valueOf((skillvalue / 2000) * 100);
+		else
+			arrowpercentage = "50";
+
+		int ticks = 2;
+		int x = PP.getSkillLevel(SkillType.UNARMED);
+		while (x >= 50) {
+			x -= 50;
+			ticks++;
+		}
+		
+		int bonus = 3 + (PP.getSkillLevel(SkillType.UNARMED)/50);
+		
+		if(bonus > 8)
+		    bonus = 8;
+
+		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.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 }));
+
+		player.sendMessage(mcLocale.getString("m.AbilityBonusTemplate", new Object[] { mcLocale.getString("m.AbilBonusUnarmed2_0"), mcLocale.getString("m.AbilBonusUnarmed2_1", new Object[] {bonus}) }));
+
+		player.sendMessage(mcLocale.getString("m.UnarmedBerserkLength", new Object[] { ticks }));
+		
+		Page.grabGuidePageForSkill(SkillType.UNARMED, player, args);
+
+		return true;
+	}
+}

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

@@ -1,103 +1,63 @@
-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));
-            }
-        }
-    }
-}
+package com.gmail.nossr50.commands.skills;
+
+import org.bukkit.command.Command;
+import org.bukkit.command.CommandExecutor;
+import org.bukkit.command.CommandSender;
+import org.bukkit.entity.Player;
+
+import com.gmail.nossr50.commands.CommandHelper;
+import com.gmail.nossr50.datatypes.PlayerProfile;
+import com.gmail.nossr50.datatypes.SkillType;
+import com.gmail.nossr50.locale.mcLocale;
+import com.gmail.nossr50.util.Page;
+import com.gmail.nossr50.util.Users;
+import com.gmail.nossr50.util.mcPermissions;
+
+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."); //TODO: Needs more locale.
+			return true;
+		}
+
+        if (CommandHelper.noCommandPermissions(sender, "mcmmo.skills.woodcutting")) {
+            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 }));
+		
+		Page.grabGuidePageForSkill(SkillType.WOODCUTTING, player, args);
+		
+		return true;
+	}
+}

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

@@ -1,29 +1,50 @@
-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;
-    }
-}
+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.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;
+import com.gmail.nossr50.util.Users;
+
+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."); //TODO: Needs more locale.
+			return true;
+		}
+
+		if (!(sender instanceof Player)) {
+			sender.sendMessage("This command does not support console useage."); //TODO: Needs more locale.
+			return true;
+		}
+
+		Player player = (Player) sender;
+		PlayerProfile PP = Users.getProfile(player);
+		
+		if(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;
+	}
+}

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

@@ -1,54 +0,0 @@
-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,69 +1,62 @@
-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"));
-    }
-}
+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.config.LoadProperties;
+import com.gmail.nossr50.datatypes.PlayerProfile;
+import com.gmail.nossr50.locale.mcLocale;
+import com.gmail.nossr50.spout.SpoutStuff;
+import com.gmail.nossr50.util.Skills;
+import com.gmail.nossr50.util.Users;
+import com.gmail.nossr50.util.m;
+import com.gmail.nossr50.util.mcPermissions;
+
+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."); //TODO: Needs more locale.
+			return true;
+		}
+
+		if (!(sender instanceof Player)) {
+			sender.sendMessage("This command does not support console useage."); //TODO: Needs more locale.
+			return true;
+		}
+
+		Player player = (Player) sender;
+		PlayerProfile PP = Users.getProfile(player);
+
+		if (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;
+	}
+}

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

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

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

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

@@ -1,257 +0,0 @@
-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 int getQueueNumber() { return config.getInt("MySQL.ConcurrentQueues", 2); }
-
-    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())); }
-}

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

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

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

@@ -1,48 +0,0 @@
-package com.gmail.nossr50.config;
-
-import org.bukkit.configuration.file.YamlConfiguration;
-
-import com.gmail.nossr50.mcMMO;
-
-public class HiddenConfig {
-    private static HiddenConfig instance;
-    private static String fileName;
-    private static YamlConfiguration config;
-    private static boolean chunkletsEnabled;
-    private static int conversionRate;
-    private static boolean useEnchantmentBuffs;
-
-    public HiddenConfig(String fileName) {
-        HiddenConfig.fileName = fileName;
-        load();
-    }
-
-    public static HiddenConfig getInstance() {
-        if (instance == null) {
-            instance = new HiddenConfig("hidden.yml");
-        }
-
-        return instance;
-    }
-
-    public void load() {
-        if (mcMMO.p.getResource(fileName) != null) {
-            config = YamlConfiguration.loadConfiguration(mcMMO.p.getResource(fileName));
-            chunkletsEnabled = config.getBoolean("Options.Chunklets", true);
-            conversionRate = config.getInt("Options.ConversionRate", 1);
-            useEnchantmentBuffs = config.getBoolean("Options.EnchantmentBuffs", true);
-        }
-    }
-
-    public boolean getChunkletsEnabled() {
-        return chunkletsEnabled;
-    }
-
-    public int getConversionRate() {
-        return conversionRate;
-    }
-
-    public boolean useEnchantmentBuffs() {
-        return useEnchantmentBuffs;
-    }
-}

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

@@ -0,0 +1,481 @@
+package com.gmail.nossr50.config;
+
+import com.gmail.nossr50.mcMMO;
+import com.gmail.nossr50.datatypes.HUDType;
+
+public class LoadProperties extends ConfigLoader{
+
+    /*
+     * GENERAL SETTINGS
+     */
+
+    /* General Settings */
+    public static String locale;
+    public static Boolean enableMotd, statsTracking, eventCallback;
+    public static int saveInterval;
+
+    /* mySQL */
+    public static Boolean useMySQL;
+    public static String MySQLtablePrefix, MySQLuserName, MySQLserverName, MySQLdbName, MySQLdbPass;
+    public static int MySQLport;
+
+    /* Commands */
+    public static Boolean xplockEnable, xprateEnable, mccEnable, mcmmoEnable,
+                          partyEnable, inviteEnable, acceptEnable, inspectEnable,
+                          mcstatsEnable, addxpEnable, ptpEnable, mmoeditEnable,
+                          mcremoveEnable, mcgodEnable, mcabilityEnable, mctopEnable,
+                          addlevelsEnable, mcrefreshEnable, aEnable, pEnable;
+    public static int ptpCommandCooldown;
+    public static Boolean donateMessage;
+
+    /* Tool Level Requirements */
+    public static Boolean perLevelTools;
+    public static int sAxe, sHoe, sShovel, sSword, sPickaxe;
+    public static int iAxe, iHoe, iShovel, iSword, iPickaxe;
+    public static int gAxe, gHoe, gShovel, gSword, gPickaxe;
+    public static int dAxe, dHoe, dShovel, dSword, dPickaxe;
+
+    /* Items */
+    public static Boolean chimaeraWingEnable;
+    public static int chimaeraId, feathersConsumedByChimaeraWing;
+
+    /*
+     * ABILITY SETTINGS
+     */
+
+    /* General Settings */
+    public static Boolean enableOnlyActivateWhenSneaking, enableAbilityMessages, enableAbilities;
+
+    /* Durability Settings */
+    public static Boolean toolsLoseDurabilityFromAbilities;
+    public static int abilityDurabilityLoss;
+
+    /* Cooldowns */
+    public static int superBreakerCooldown, blastMiningCooldown, greenTerraCooldown,
+                      gigaDrillBreakerCooldown, treeFellerCooldown, berserkCooldown,
+                      serratedStrikeCooldown, skullSplitterCooldown;
+
+    /* Thresholds */
+    public static int treeFellerThreshold;
+
+    /*
+     * SKILL SETTINGS
+     */
+
+    /* Tool Requirements */
+    public static Boolean miningrequirespickaxe, excavationRequiresShovel, woodcuttingrequiresaxe;
+
+    /* Excavation */
+    public static int mbase;
+
+    /* Fishing */
+    public static Boolean fishingDrops;
+    public static int fishingTier1, fishingTier2, fishingTier3, fishingTier4, fishingTier5;
+    public static int mfishing;
+
+    /* Herbalism */
+    public static Boolean herbalismHungerBonus, wheatRegrowth;
+    public static int mmelon, mcactus, mmushroom, mflower, msugar, mpumpkin, mwheat, mvines, mlilypad, mnetherwart;
+    public static Boolean enableCobbleToMossy, enableSmoothToMossy, enableDirtToGrass;
+
+    /* Mining */
+    public static int msandstone, mgold, mdiamond, miron, mredstone, mlapis, mobsidian, mnetherrack, mglowstone, mcoal, mstone, mendstone, mmossstone;
+    public static int detonatorID;
+
+    /* Repair */
+    public static Boolean repairArmor, repairTools;
+    public static Boolean anvilmessages;
+    public static int rWood, rStone, rIron, rGold, rDiamond, rString, rLeather;
+    public static int anvilID;
+    public static int repairStoneLevel, repairIronLevel, repairGoldLevel, repairdiamondlevel, repairBowLevel;
+
+    /* Taming */
+    public static int mtameWolf, mtameOcelot;
+    public static int bonesConsumedByCOTW, fishConsumedByCOTW;
+
+    /* Woodcutting */
+    public static int moak, mbirch, mspruce, mjungle;
+
+    /* Arcane Forging */
+    public static Boolean mayDowngradeEnchants, mayLoseEnchants;
+    public static int arcaneRank1, arcaneRank2, arcaneRank3, arcaneRank4;
+    public static int downgradeRank1, downgradeRank2, downgradeRank3, downgradeRank4;
+    public static int keepEnchantsRank1, keepEnchantsRank2, keepEnchantsRank3, keepEnchantsRank4;
+
+    /* Level Caps */
+    public static int levelCapAcrobatics, levelCapArchery, levelCapAxes, levelCapExcavation,
+                      levelCapFishing, levelCapHerbalism, levelCapMining, levelCapRepair,
+                      levelCapSwords, levelCapTaming, levelCapUnarmed, levelCapWoodcutting,
+                      powerLevelCap;
+
+    /*
+     * XP SETTINGS
+     */
+
+    /* General Settings */
+    public static Boolean xpGainsMobSpawners, pvpxp;
+    public static int xpGainMultiplier;
+
+    /* Combat XP Multipliers */
+    public static double pvpxprewardmodifier;
+    public static double animalXP, creeperXP, skeletonXP, spiderXP, ghastXP, slimeXP,
+                         zombieXP, pigzombieXP, endermanXP, cavespiderXP, silverfishXP,
+                         blazeXP, magmacubeXP, enderdragonXP;
+
+    /* XP Formula Multiplier */
+    public static double tamingxpmodifier, miningxpmodifier, repairxpmodifier, woodcuttingxpmodifier,
+                         fishingxpmodifier, unarmedxpmodifier, herbalismxpmodifier, excavationxpmodifier,
+                         archeryxpmodifier, swordsxpmodifier, axesxpmodifier, acrobaticsxpmodifier;
+
+    /*
+     * SPOUT SETTINGS
+     */
+
+    public static boolean spoutEnabled;
+    public static boolean showPowerLevel;
+
+    /* Spout Party HUD */
+    public static Boolean showDisplayName, showFaces, partybar;
+
+    /* Spout XP Bar */
+    public static Boolean xpbar, xpicon;
+    public static int xpbar_x, xpbar_y, xpicon_x, xpicon_y;
+
+    /* Spout HUD Colors */
+    public static double xpbackground_r, xpbackground_g, xpbackground_b;
+    public static double xpborder_r, xpborder_g, xpborder_b;
+    public static double fishing_r, fishing_g, fishing_b;
+    public static double acrobatics_r, acrobatics_g, acrobatics_b;
+    public static double archery_r, archery_g, archery_b;
+    public static double axes_r, axes_g, axes_b;
+    public static double excavation_r, excavation_g, excavation_b;
+    public static double herbalism_r, herbalism_g, herbalism_b;
+    public static double mining_r, mining_g, mining_b;
+    public static double repair_r, repair_g, repair_b;
+    public static double swords_r, swords_g, swords_b;
+    public static double taming_r, taming_g, taming_b;
+    public static double unarmed_r, unarmed_g, unarmed_b;
+    public static double woodcutting_r, woodcutting_g, woodcutting_b;
+
+    /*
+     * CONFIG LOADING
+     */
+
+    public static HUDType defaulthud;
+
+    public LoadProperties(mcMMO plugin) {
+        super(plugin, "config.yml");
+        config = plugin.getConfig();
+    }
+
+    @Override
+    public void load() {
+
+        // If it doesn't exist, copy it from the .jar
+        if (!configFile.exists()) {
+            dataFolder.mkdir();
+            plugin.saveDefaultConfig();
+        }
+
+        addDefaults();
+        loadKeys();
+    }
+
+    @Override
+    protected void loadKeys() {
+        plugin.getLogger().info("Loading mcMMO config.yml File...");
+
+        // Setup default HUD
+        String temp = config.getString("Spout.HUD.Default", "STANDARD");
+        for (HUDType x : HUDType.values()) {
+            if (x.toString().equalsIgnoreCase(temp)) {
+                defaulthud = x;
+            }
+        }
+
+        enableAbilityMessages = config.getBoolean("Abilities.Messages", true);
+        enableAbilities = config.getBoolean("Abilities.Enabled", true);
+
+        donateMessage = config.getBoolean("Commands.mcmmo.Donate_Message", true);
+        xpGainsMobSpawners = config.getBoolean("Experience.Gains.Mobspawners.Enabled", false);
+
+        bonesConsumedByCOTW = config.getInt("Skills.Taming.Call_Of_The_Wild.Bones_Required", 10);
+        fishConsumedByCOTW = config.getInt("Skills.Taming.Call_Of_The_Wild.Fish_Required", 10);
+
+        xpbar = config.getBoolean("Spout.XP.Bar.Enabled", true);
+        xpicon = config.getBoolean("Spout.XP.Icon.Enabled", true);
+        xpbar_x = config.getInt("Spout.XP.Bar.X_POS", 95);
+        xpbar_y = config.getInt("Spout.XP.Bar.Y_POS", 6);
+        xpicon_x = config.getInt("Spout.XP.Icon.X_POS", 78);
+        xpicon_y = config.getInt("Spout.XP.Icon.Y_POS", 2);
+
+        showFaces = config.getBoolean("Spout.Party.HUD.Show_Faces", true);
+        showDisplayName = config.getBoolean("Spout.Party.HUD.Show_Display_Name", false);
+        partybar = config.getBoolean("Spout.Party.HUD.Enabled", true);
+
+        showPowerLevel = config.getBoolean("Spout.HUD.Show_Power_Level", true);
+
+        acrobatics_r = config.getDouble("Spout.HUD.Retro.Colors.Acrobatics.RED", 0.3);
+        acrobatics_g = config.getDouble("Spout.HUD.Retro.Colors.Acrobatics.GREEN", 0.3);
+        acrobatics_b = config.getDouble("Spout.HUD.Retro.Colors.Acrobatics.BLUE", 0.75);
+        archery_r = config.getDouble("Spout.HUD.Retro.Colors.Archery.RED", 0.3);
+        archery_g = config.getDouble("Spout.HUD.Retro.Colors.Archery.GREEN", 0.3);
+        archery_b = config.getDouble("Spout.HUD.Retro.Colors.Archery.BLUE", 0.75);
+        axes_r = config.getDouble("Spout.HUD.Retro.Colors.Axes.RED", 0.3);
+        axes_g = config.getDouble("Spout.HUD.Retro.Colors.Axes.GREEN", 0.3);
+        axes_b = config.getDouble("Spout.HUD.Retro.Colors.Axes.BLUE", 0.75);
+        excavation_r = config.getDouble("Spout.HUD.Retro.Colors.Excavation.RED", 0.3);
+        excavation_g = config.getDouble("Spout.HUD.Retro.Colors.Excavation.GREEN", 0.3);
+        excavation_b = config.getDouble("Spout.HUD.Retro.Colors.Excavation.BLUE", 0.75);
+        herbalism_r = config.getDouble("Spout.HUD.Retro.Colors.Herbalism.RED", 0.3);
+        herbalism_g = config.getDouble("Spout.HUD.Retro.Colors.Herbalism.GREEN", 0.3);
+        herbalism_b = config.getDouble("Spout.HUD.Retro.Colors.Herbalism.BLUE", 0.75);
+        mining_r = config.getDouble("Spout.HUD.Retro.Colors.Mining.RED", 0.3);
+        mining_g = config.getDouble("Spout.HUD.Retro.Colors.Mining.GREEN", 0.3);
+        mining_b = config.getDouble("Spout.HUD.Retro.Colors.Mining.BLUE", 0.75);
+        repair_r = config.getDouble("Spout.HUD.Retro.Colors.Repair.RED", 0.3);
+        repair_g = config.getDouble("Spout.HUD.Retro.Colors.Repair.GREEN", 0.3);
+        repair_b = config.getDouble("Spout.HUD.Retro.Colors.Repair.BLUE", 0.75);
+        swords_r = config.getDouble("Spout.HUD.Retro.Colors.Swords.RED", 0.3);
+        swords_g = config.getDouble("Spout.HUD.Retro.Colors.Swords.GREEN", 0.3);
+        swords_b = config.getDouble("Spout.HUD.Retro.Colors.Swords.BLUE", 0.75);
+        taming_r = config.getDouble("Spout.HUD.Retro.Colors.Taming.RED", 0.3);
+        taming_g = config.getDouble("Spout.HUD.Retro.Colors.Taming.GREEN", 0.3);
+        taming_b = config.getDouble("Spout.HUD.Retro.Colors.Taming.BLUE", 0.75);
+        unarmed_r = config.getDouble("Spout.HUD.Retro.Colors.Unarmed.RED", 0.3);
+        unarmed_g = config.getDouble("Spout.HUD.Retro.Colors.Unarmed.GREEN", 0.3);
+        unarmed_b = config.getDouble("Spout.HUD.Retro.Colors.Unarmed.BLUE", 0.75);
+        woodcutting_r = config.getDouble("Spout.HUD.Retro.Colors.Woodcutting.RED", 0.3);
+        woodcutting_g = config.getDouble("Spout.HUD.Retro.Colors.Woodcutting.GREEN", 0.3);
+        woodcutting_b = config.getDouble("Spout.HUD.Retro.Colors.Woodcutting.BLUE", 0.75);
+        fishing_r = config.getDouble("Spout.HUD.Retro.Colors.Fishing.RED", 0.3);
+        fishing_g = config.getDouble("Spout.HUD.Retro.Colors.Fishing.GREEN", 0.3);
+        fishing_b = config.getDouble("Spout.HUD.Retro.Colors.Fishing.BLUE", 0.75);
+
+        xpborder_r = config.getDouble("Spout.HUD.Retro.Colors.Border.RED", 0.0);
+        xpborder_g = config.getDouble("Spout.HUD.Retro.Colors.Border.GREEN", 0.0);
+        xpborder_b = config.getDouble("Spout.HUD.Retro.Colors.Border.BLUE", 0.0);
+        xpbackground_r = config.getDouble("Spout.HUD.Retro.Colors.Background.RED", 0.75);
+        xpbackground_g = config.getDouble("Spout.HUD.Retro.Colors.Background.GREEN", 0.75);
+        xpbackground_b = config.getDouble("Spout.HUD.Retro.Colors.Background.BLUE", 0.75);
+
+        mbase = config.getInt("Experience.Excavation.Base", 40);
+
+        msugar = config.getInt("Experience.Herbalism.Sugar_Cane", 30);
+        mwheat = config.getInt("Experience.Herbalism.Wheat", 50);
+        mcactus = config.getInt("Experience.Herbalism.Cactus", 30);
+        mpumpkin = config.getInt("Experience.Herbalism.Pumpkin", 20);
+        mflower = config.getInt("Experience.Herbalism.Flowers", 100);
+        mmushroom = config.getInt("Experience.Herbalism.Mushrooms", 150);
+        mmelon = config.getInt("Experience.Herbalism.Melon", 20);
+        mnetherwart = config.getInt("Experience.Herbalism.Nether_Wart", 50);
+        mlilypad = config.getInt("Experience.Herbalism.Lily_Pads", 100);
+        mvines = config.getInt("Experience.Herbalism.Vines", 10);
+        herbalismHungerBonus = config.getBoolean("Skills.Herbalism.Hunger_Bonus", true);
+        wheatRegrowth = config.getBoolean("Skills.Herbalism.Instant_Wheat_Regrowth", true);
+
+        moak = config.getInt("Experience.Woodcutting.Oak", 70);
+        mbirch = config.getInt("Experience.Woodcutting.Birch", 90);
+        mspruce = config.getInt("Experience.Woodcutting.Spruce", 80);
+        mjungle = config.getInt("Experience.Woodcutting.Jungle", 100);
+
+        mgold = config.getInt("Experience.Mining.Gold", 250);
+        mdiamond = config.getInt("Experience.Mining.Diamond", 750);
+        miron = config.getInt("Experience.Mining.Iron", 250);
+        mredstone = config.getInt("Experience.Mining.Redstone", 150);
+        mlapis = config.getInt("Experience.Mining.Lapis", 400);
+        mobsidian = config.getInt("Experience.Mining.Obsidian", 150);
+        mnetherrack = config.getInt("Experience.Mining.Netherrack", 30);
+        mglowstone = config.getInt("Experience.Mining.Glowstone", 30);
+        mcoal = config.getInt("Experience.Mining.Coal", 100);
+        mstone = config.getInt("Experience.Mining.Stone", 30);
+        msandstone = config.getInt("Experience.Mining.Sandstone", 30);
+        mendstone = config.getInt("Experience.Mining.End_Stone", 150);
+        mmossstone = config.getInt("Experience.Mining.Moss_Stone", 30);
+
+        mtameWolf = config.getInt("Experience.Taming.Animal_Taming.Wolf", 250);
+        mtameOcelot = config.getInt("Experience.Taming.Animal_Taming.Ocelot", 500);
+
+        mfishing = config.getInt("Experience.Fishing.Base", 800);
+
+        enableOnlyActivateWhenSneaking = config.getBoolean("Abilities.Activation.Only_Activate_When_Sneaking", false);
+
+        greenTerraCooldown = config.getInt("Abilities.Cooldowns.Green_Terra", 240);
+        superBreakerCooldown = config.getInt("Abilities.Cooldowns.Super_Breaker", 240);
+        gigaDrillBreakerCooldown = config.getInt("Abilities.Cooldowns.Giga_Drill_Breaker", 240);
+        treeFellerThreshold = config.getInt("Abilities.Limits.Tree_Feller_Threshold", 500);
+        treeFellerCooldown = config.getInt("Abilities.Cooldowns.Tree_Feller", 240);
+        berserkCooldown = config.getInt("Abilities.Cooldowns.Berserk", 240);
+        serratedStrikeCooldown = config.getInt("Abilities.Cooldowns.Serrated_Strikes", 240);
+        skullSplitterCooldown = config.getInt("Abilities.Cooldowns.Skull_Splitter", 240);
+        blastMiningCooldown = config.getInt("Abilities.Cooldowns.Blast_Mining", 60);
+
+        MySQLserverName = config.getString("MySQL.Server.Address", "localhost");
+
+        if (config.getString("MySQL.Database.User_Password", null) != null) {
+            MySQLdbPass = config.getString("MySQL.Database.User_Password", null);
+        }
+        else {
+            MySQLdbPass = "";
+        }
+
+        MySQLdbName = config.getString("MySQL.Database.Name", "DatabaseName");
+        MySQLuserName = config.getString("MySQL.Database.User_Name", "UserName");
+        MySQLtablePrefix = config.getString("MySQL.Database.TablePrefix", "mcmmo_");
+        MySQLport = config.getInt("MySQL.Server.Port", 3306);
+        useMySQL = config.getBoolean("MySQL.Enabled", false);
+
+        locale = config.getString("General.Locale", "en_us");
+        enableMotd = config.getBoolean("General.MOTD_Enabled", true);
+        saveInterval = config.getInt("General.Save_Interval", 10);
+        statsTracking = config.getBoolean("General.Stats_Tracking", true);
+        eventCallback = config.getBoolean("General.Event_Callback", true);
+        perLevelTools = config.getBoolean("General.Per_Level_Tools", false);
+        powerLevelCap = config.getInt("General.Power_Level_Cap", 0);
+
+        enableCobbleToMossy = config.getBoolean("Skills.Herbalism.Green_Thumb.Cobble_To_Mossy", true);
+        enableSmoothToMossy = config.getBoolean("Skills.Herbalism.Green_Thumb.SmoothBrick_To_MossyBrick", true);
+        enableDirtToGrass = config.getBoolean("Skills.Herbalism.Green_Thumb.Dirt_To_Grass", true);
+
+        xpGainMultiplier = config.getInt("Experience.Gains.Multiplier.Global", 1);
+        toolsLoseDurabilityFromAbilities = config.getBoolean("Abilities.Tools.Durability_Loss_Enabled", true);
+        abilityDurabilityLoss = config.getInt("Abilities.Tools.Durability_Loss", 2);
+
+        feathersConsumedByChimaeraWing = config.getInt("Items.Chimaera_Wing.Feather_Cost", 10);
+        chimaeraId = config.getInt("Items.Chimaera_Wing.Item_ID", 288);
+        chimaeraWingEnable = config.getBoolean("Items.Chimaera_Wing.Enabled", true);
+        dAxe = config.getInt("Items.Diamond.Axe", 750);
+        dHoe = config.getInt("Items.Diamond.Hoe", 750);
+        dShovel = config.getInt("Items.Diamond.Shovel", 750);
+        dSword = config.getInt("Items.Diamond.Sword", 750);
+        dPickaxe = config.getInt("Items.Diamond.Pickaxe", 750);
+        gAxe = config.getInt("Items.Gold.Axe", 500);
+        gHoe = config.getInt("Items.Gold.Hoe", 500);
+        gShovel = config.getInt("Items.Gold.Shovel", 500);
+        gSword = config.getInt("Items.Gold.Sword", 500);
+        gPickaxe = config.getInt("Items.Gold.Pickaxe", 500);
+        iAxe = config.getInt("Items.Iron.Axe", 250);
+        iHoe = config.getInt("Items.Iron.Hoe", 250);
+        iShovel = config.getInt("Items.Iron.Shovel", 250);
+        iSword = config.getInt("Items.Iron.Sword", 250);
+        iPickaxe = config.getInt("Items.Iron.Pickaxe", 250);
+        sAxe = config.getInt("Items.Stone.Axe", 0);
+        sHoe = config.getInt("Items.Stone.Hoe", 0);
+        sShovel = config.getInt("Items.Stone.Shovel", 0);
+        sSword = config.getInt("Items.Stone.Sword", 0);
+        sPickaxe = config.getInt("Items.Stone.Pickaxe", 0);
+
+        pvpxp = config.getBoolean("Experience.PVP.Rewards", true);
+        pvpxprewardmodifier = config.getDouble("Experience.Gains.Multiplier.PVP", 1.0);
+
+        miningrequirespickaxe = config.getBoolean("Skills.Mining.Requires_Pickaxe", true);
+        excavationRequiresShovel = config.getBoolean("Skills.Excavation.Requires_Shovel", true);
+        woodcuttingrequiresaxe = config.getBoolean("Skills.Woodcutting.Requires_Axe", true);
+        repairArmor = config.getBoolean("Skills.Repair.Can_Repair_Armor", true);
+        repairTools = config.getBoolean("Skills.Repair.Can_Repair_Tools", true);
+        repairdiamondlevel = config.getInt("Skills.Repair.Diamond.Level_Required", 50);
+        repairIronLevel = config.getInt("Skills.Repair.Iron.Level_Required", 0);
+        repairGoldLevel = config.getInt("Skills.Repair.Gold.Level_Required", 0);
+        repairStoneLevel = config.getInt("Skills.Repair.Stone.Level_Required", 0);
+        repairBowLevel = config.getInt("Skills.Repair.String.Level_Required", 0);
+
+        tamingxpmodifier = config.getDouble("Experience.Formula.Multiplier.Taming", 1.0);
+        miningxpmodifier = config.getDouble("Experience.Formula.Multiplier.Mining", 1.0);
+        repairxpmodifier = config.getDouble("Experience.Formula.Multiplier.Repair", 1.0);
+        woodcuttingxpmodifier = config.getDouble("Experience.Formula.Multiplier.Woodcutting", 1.0);
+        unarmedxpmodifier = config.getDouble("Experience.Formula.Multiplier.Unarmed", 1.0);
+        herbalismxpmodifier = config.getDouble("Experience.Formula.Multiplier.Herbalism", 1.0);
+        excavationxpmodifier = config.getDouble("Experience.Formula.Multiplier.Excavation", 1.0);
+        archeryxpmodifier = config.getDouble("Experience.Formula.Multiplier.Archery", 1.0);
+        swordsxpmodifier = config.getDouble("Experience.Formula.Multiplier.Swords", 1.0);
+        axesxpmodifier = config.getDouble("Experience.Formula.Multiplier.Axes", 1.0);
+        acrobaticsxpmodifier = config.getDouble("Experience.Formula.Multiplier.Acrobatics", 1.0);
+        fishingxpmodifier = config.getDouble("Experience.Forumla.Multiplier.Fishing", 1.0);
+
+        anvilmessages = config.getBoolean("Skills.Repair.Anvil_Messages", true);
+        anvilID = config.getInt("Skills.Repair.Anvil_ID", 42);
+
+        rGold = config.getInt("Skills.Repair.Gold.ID", 266);
+        rStone = config.getInt("Skills.Repair.Stone.ID", 4);
+        rWood = config.getInt("Skills.Repair.Wood.ID", 5);
+        rDiamond = config.getInt("Skills.Repair.Diamond.ID", 264);
+        rIron = config.getInt("Skills.Repair.Iron.ID", 265);
+        rString = config.getInt("Skills.Repair.String.ID", 287);
+        rLeather = config.getInt("Skills.Repair.Leather.ID", 334);
+
+        levelCapAcrobatics = config.getInt("Skills.Acrobatics.Level_Cap", 0);
+        levelCapArchery = config.getInt("Skills.Archery.Level_Cap", 0);
+        levelCapAxes = config.getInt("Skills.Axes.Level_Cap", 0);
+        levelCapExcavation = config.getInt("Skills.Excavation.Level_Cap", 0);
+        levelCapFishing = config.getInt("Skills.Fishing.Level_Cap", 0);
+        levelCapHerbalism = config.getInt("Skills.Herbalism.Level_Cap", 0);
+        levelCapMining = config.getInt("Skills.Mining.Level_Cap", 0);
+        levelCapRepair = config.getInt("Skills.Repair.Level_Cap", 0);
+        levelCapSwords = config.getInt("Skills.Swords.Level_Cap", 0);
+        levelCapTaming = config.getInt("Skills.Taming.Level_Cap", 0);
+        levelCapUnarmed = config.getInt("Skills.Unarmed.Level_Cap", 0);
+        levelCapWoodcutting = config.getInt("Skills.Woodcutting.Level_Cap", 0);
+
+        mayDowngradeEnchants = config.getBoolean("Arcane_Forging.Downgrades.Enabled", true);
+        downgradeRank1 = config.getInt("Arcane_Forging.Downgrades.Chance.Rank_1", 75);
+        downgradeRank2 = config.getInt("Arcane_Forging.Downgrades.Chance.Rank_2", 50);
+        downgradeRank3 = config.getInt("Arcane_Forging.Downgrades.Chance.Rank_3", 25);
+        downgradeRank4 = config.getInt("Arcane_Forging.Downgrades.Chance.Rank_4", 15);
+        mayLoseEnchants = config.getBoolean("Arcane_Forging.May_Lose_Enchants", true);
+        keepEnchantsRank1 = config.getInt("Arcane_Forging.Keep_Enchants.Chance.Rank_1", 10);
+        keepEnchantsRank2 = config.getInt("Arcane_Forging.Keep_Enchants.Chance.Rank_2", 20);
+        keepEnchantsRank3 = config.getInt("Arcane_Forging.Keep_Enchants.Chance.Rank_3", 30);
+        keepEnchantsRank4 = config.getInt("Arcane_Forging.Keep_Enchants.Chance.Rank_4", 40);
+        arcaneRank1 = config.getInt("Arcane_Forging.Rank_Levels.Rank_1", 100);
+        arcaneRank2 = config.getInt("Arcane_Forging.Rank_Levels.Rank_2", 250);
+        arcaneRank3 = config.getInt("Arcane_Forging.Rank_Levels.Rank_3", 500);
+        arcaneRank4 = config.getInt("Arcane_Forging.Rank_Levels.Rank_4", 750);
+
+        fishingDrops = config.getBoolean("Fishing.Drops_Enabled", true);
+        fishingTier1 = config.getInt("Fishing.Tier_Levels.Tier1", 0);
+        fishingTier2 = config.getInt("Fishing.Tier_Levels.Tier2", 200);
+        fishingTier3 = config.getInt("Fishing.Tier_Levels.Tier3", 400);
+        fishingTier4 = config.getInt("Fishing.Tier_Levels.Tier4", 600);
+        fishingTier5 = config.getInt("Fishing.Tier_Levels.Tier5", 800);
+
+        xplockEnable = config.getBoolean("Commands.xplock.Enabled", true);
+        xprateEnable = config.getBoolean("Commands.xprate.Enabled", true);
+        mctopEnable = config.getBoolean("Commands.mctop.Enabled", true);
+        addxpEnable = config.getBoolean("Commands.addxp.Enabled", true);
+        addlevelsEnable = config.getBoolean("Commands.addlevels.Enabled", true);
+        mcabilityEnable = config.getBoolean("Commands.mcability.Enabled", true);
+        mcrefreshEnable = config.getBoolean("Commands.mcrefresh.Enabled", true);
+        mcmmoEnable = config.getBoolean("Commands.mcmmo.Enabled", true);
+        mccEnable = config.getBoolean("Commands.mcc.Enabled", true);
+        mcgodEnable = config.getBoolean("Commands.mcgod.Enabled", true);
+        mcstatsEnable = config.getBoolean("Commands.mcstats.Enabled", true);
+        mmoeditEnable = config.getBoolean("Commands.mmoedit.Enabled", true);
+        mcremoveEnable = config.getBoolean("Commands.mcremove.Enable", true);
+        ptpEnable = config.getBoolean("Commands.ptp.Enabled", true);
+        partyEnable = config.getBoolean("Commands.party.Enabled", true);
+        inspectEnable = config.getBoolean("Commands.inspect.Enabled", true);
+        inviteEnable = config.getBoolean("Commands.invite.Enabled", true);
+        acceptEnable = config.getBoolean("Commands.accept.Enabled", true);
+        aEnable = config.getBoolean("Commands.a.Enabled", true);
+        pEnable = config.getBoolean("Commands.p.Enabled", true);
+
+        ptpCommandCooldown = config.getInt("Commands.ptp.Cooldown", 30);
+
+        animalXP = config.getDouble("Experience.Combat.Multiplier.Animals", 1.0);
+        creeperXP = config.getDouble("Experience.Combat.Multiplier.Creeper", 4.0);
+        skeletonXP = config.getDouble("Experience.Combat.Multiplier.Skeleton", 2.0);
+        spiderXP = config.getDouble("Experience.Combat.Multiplier.Spider", 3.0);
+        ghastXP = config.getDouble("Experience.Combat.Multiplier.Ghast", 3.0);
+        slimeXP = config.getDouble("Experience.Combat.Multiplier.Slime", 2.0);
+        zombieXP = config.getDouble("Experience.Combat.Multiplier.Zombie", 2.0);
+        pigzombieXP = config.getDouble("Experience.Combat.Multiplier.Pig_Zombie", 3.0);
+        endermanXP = config.getDouble("Experience.Combat.Multiplier.Enderman", 2.0);
+        cavespiderXP = config.getDouble("Experience.Combat.Multiplier.Cave_Spider", 3.0);
+        silverfishXP = config.getDouble("Experience.Combat.Multiplier.Silverfish", 3.0);
+        blazeXP = config.getDouble("Experience.Combat.Multiplier.Blaze", 3.0);
+        magmacubeXP = config.getDouble("Experience.Combat.Multiplier.Magma_Cube", 2.0);
+        enderdragonXP = config.getDouble("Experience.Combat.Multiplier.Ender_Dragon", 8.0);
+
+        detonatorID = config.getInt("Skills.Mining.Detonator_ID", 259);
+    }
+}

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

@@ -1,292 +1,286 @@
-package com.gmail.nossr50.config.treasure;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Map.Entry;
-import java.util.Set;
-
-import org.bukkit.Material;
-import org.bukkit.configuration.ConfigurationSection;
-import org.bukkit.inventory.ItemStack;
-import org.bukkit.material.MaterialData;
-
-import com.gmail.nossr50.config.ConfigLoader;
-import com.gmail.nossr50.datatypes.treasure.ExcavationTreasure;
-import com.gmail.nossr50.datatypes.treasure.FishingTreasure;
-import com.gmail.nossr50.datatypes.treasure.HylianTreasure;
-import com.gmail.nossr50.datatypes.treasure.Treasure;
-
-public class TreasureConfig extends ConfigLoader {
-    private static TreasureConfig instance;
-
-    public List<ExcavationTreasure> excavationFromDirt     = new ArrayList<ExcavationTreasure>();
-    public List<ExcavationTreasure> excavationFromGrass    = new ArrayList<ExcavationTreasure>();
-    public List<ExcavationTreasure> excavationFromSand     = new ArrayList<ExcavationTreasure>();
-    public List<ExcavationTreasure> excavationFromGravel   = new ArrayList<ExcavationTreasure>();
-    public List<ExcavationTreasure> excavationFromClay     = new ArrayList<ExcavationTreasure>();
-    public List<ExcavationTreasure> excavationFromMycel    = new ArrayList<ExcavationTreasure>();
-    public List<ExcavationTreasure> excavationFromSoulSand = new ArrayList<ExcavationTreasure>();
-
-    public List<HylianTreasure> hylianFromBushes  = new ArrayList<HylianTreasure>();
-    public List<HylianTreasure> hylianFromFlowers = new ArrayList<HylianTreasure>();
-    public List<HylianTreasure> hylianFromPots    = new ArrayList<HylianTreasure>();
-
-    public List<FishingTreasure> fishingRewards = new ArrayList<FishingTreasure>();
-
-    private TreasureConfig() {
-        super("treasures.yml");
-        loadKeys();
-    }
-
-    public static TreasureConfig getInstance() {
-        if (instance == null) {
-            instance = new TreasureConfig();
-        }
-
-        return instance;
-    }
-
-    @Override
-    protected void loadKeys() {
-        Map<String, Treasure> treasures = new HashMap<String, Treasure>();
-        ConfigurationSection treasureSection = config.getConfigurationSection("Treasures");
-
-        if (treasureSection == null) {
-            return;
-        }
-
-        Set<String> treasureConfigSet = treasureSection.getKeys(false);
-
-        for (String treasureName : treasureConfigSet) {
-
-            // Validate all the things!
-            List<String> reason = new ArrayList<String>();
-
-            /*
-             * ID, Amount, and Data
-             */
-
-            if (!config.contains("Treasures." + treasureName + ".ID")) {
-                reason.add("Missing ID");
-            }
-
-            if (!config.contains("Treasures." + treasureName + ".Amount")) {
-                reason.add("Missing Amount");
-            }
-
-            if (!config.contains("Treasures." + treasureName + ".Data")) {
-                reason.add("Missing Data");
-            }
-
-            int id = config.getInt("Treasures." + treasureName + ".ID");
-            int amount = config.getInt("Treasures." + treasureName + ".Amount");
-            int data = config.getInt("Treasures." + treasureName + ".Data");
-
-            if (Material.getMaterial(id) == null) {
-                reason.add("Invalid id: " + id);
-            }
-
-            if (amount < 1) {
-                reason.add("Invalid amount: " + amount);
-            }
-
-            if (data > 127 || data < -128) {
-                reason.add("Invalid data: " + data);
-            }
-
-            /*
-             * XP, Drop Chance, and Drop Level
-             */
-
-            if (!config.contains("Treasures." + treasureName + ".XP")) {
-                reason.add("Missing XP");
-            }
-
-            if (!config.contains("Treasures." + treasureName + ".Drop_Chance")) {
-                reason.add("Missing Drop_Chance");
-            }
-
-            if (!config.contains("Treasures." + treasureName + ".Drop_Level")) {
-                reason.add("Missing Drop_Level");
-            }
-
-            int xp = config.getInt("Treasures." + treasureName + ".XP");
-            Double dropChance = config.getDouble("Treasures." + treasureName + ".Drop_Chance");
-            int dropLevel = config.getInt("Treasures." + treasureName + ".Drop_Level");
-
-            if (xp < 0) {
-                reason.add("Invalid xp: " + xp);
-            }
-
-            if (dropChance < 0) {
-                reason.add("Invalid Drop_Chance: " + dropChance);
-            }
-
-            if (dropLevel < 0) {
-                reason.add("Invalid Drop_Level: " + dropLevel);
-            }
-
-            /*
-             * Drops From & Max Level
-             */
-
-            ItemStack item = (new MaterialData(id, (byte) data)).toItemStack(amount);
-
-            if (config.getBoolean("Treasures." + treasureName + ".Drops_From.Fishing", false)) {
-                if (config.getConfigurationSection("Treasures." + treasureName + ".Drops_From").getKeys(false).size() != 1) {
-                    reason.add("Fishing drops cannot also be excavation drops");
-                }
-
-                if (!config.contains("Treasures." + treasureName + ".Max_Level")) {
-                    reason.add("Missing Max_Level");
-                }
-
-                int maxLevel = config.getInt("Treasures." + treasureName + ".Max_Level");
-
-                if (noErrorsInTreasure(reason)) {
-                    FishingTreasure fTreasure = new FishingTreasure(item, xp, dropChance, dropLevel, maxLevel);
-                    treasures.put(treasureName, fTreasure);
-                }
-            }
-            else {
-                ExcavationTreasure eTreasure = new ExcavationTreasure(item, xp, dropChance, dropLevel);
-                HylianTreasure hTreasure = new HylianTreasure(item, xp, dropChance, dropLevel);
-
-                if (config.getBoolean("Treasures." + treasureName + ".Drops_From.Dirt", false)) {
-                    eTreasure.setDropsFromDirt();
-                }
-
-                if (config.getBoolean("Treasures." + treasureName + ".Drops_From.Grass", false)) {
-                    eTreasure.setDropsFromGrass();
-                }
-
-                if (config.getBoolean("Treasures." + treasureName + ".Drops_From.Sand", false)) {
-                    eTreasure.setDropsFromSand();
-                }
-
-                if (config.getBoolean("Treasures." + treasureName + ".Drops_From.Gravel", false)) {
-                    eTreasure.setDropsFromGravel();
-                }
-
-                if (config.getBoolean("Treasures." + treasureName + ".Drops_From.Clay", false)) {
-                    eTreasure.setDropsFromClay();
-                }
-
-                if (config.getBoolean("Treasures." + treasureName + ".Drops_From.Mycelium", false)) {
-                    eTreasure.setDropsFromMycel();
-                }
-
-                if (config.getBoolean("Treasures." + treasureName + ".Drops_From.Soul_Sand", false)) {
-                    eTreasure.setDropsFromSoulSand();
-                }
-
-                if (config.getBoolean("Treasures." + treasureName + ".Drops_From.Bushes", false)) {
-                    hTreasure.setDropsFromBushes();
-                }
-
-                if (config.getBoolean("Treasures." + treasureName + ".Drops_From.Flowers", false)) {
-                    hTreasure.setDropsFromFlowers();
-                }
-
-                if (config.getBoolean("Treasures." + treasureName + ".Drops_From.Pots", false)) {
-                    hTreasure.setDropsFromPots();
-                }
-
-                if (config.getBoolean("Treasures." + treasureName + ".Drops_From.Fishing", false)) {
-                    reason.add("Excavation drops cannot also be fishing drops");
-                }
-
-                if (noErrorsInTreasure(reason) && hTreasure.getDropsFrom() == (byte) 0x0) {
-                    treasures.put(treasureName, eTreasure);
-                }
-                else if (noErrorsInTreasure(reason) && eTreasure.getDropsFrom() == (byte) 0x0) {
-                    treasures.put(treasureName, hTreasure);
-                }
-            }
-        }
-
-        List<String> excavationTreasures = config.getStringList("Excavation.Treasure");
-        List<String> fishingTreasures = config.getStringList("Fishing.Treasure");
-        List<String> hylianTreasures = config.getStringList("Hylian_Luck.Treasure");
-
-        for (Entry<String, Treasure> nextEntry : treasures.entrySet()) {
-            String treasureKey = nextEntry.getKey();
-            Treasure treasure = nextEntry.getValue();
-
-            if (treasure instanceof FishingTreasure) {
-                if (fishingTreasures == null || !fishingTreasures.contains(treasureKey)) {
-                    continue;
-                }
-
-                fishingRewards.add((FishingTreasure) treasure);
-            }
-            else if (treasure instanceof HylianTreasure) {
-                if (hylianTreasures == null || !hylianTreasures.contains(treasureKey)) {
-                    continue;
-                }
-
-                HylianTreasure hTreasure = (HylianTreasure) treasure;
-
-                if (hTreasure.getDropsFromBushes()) {
-                    hylianFromBushes.add(hTreasure);
-                }
-
-                if (hTreasure.getDropsFromFlowers()) {
-                    hylianFromFlowers.add(hTreasure);
-                }
-
-                if (hTreasure.getDropsFromPots()) {
-                    hylianFromPots.add(hTreasure);
-                }
-            }
-            else if (treasure instanceof ExcavationTreasure) {
-                if (excavationTreasures == null || !excavationTreasures.contains(treasureKey)) {
-                    continue;
-                }
-
-                ExcavationTreasure eTreasure = (ExcavationTreasure) treasure;
-
-                if (eTreasure.getDropsFromDirt()) {
-                    excavationFromDirt.add(eTreasure);
-                }
-
-                if (eTreasure.getDropsFromGrass()) {
-                    excavationFromGrass.add(eTreasure);
-                }
-
-                if (eTreasure.getDropsFromSand()) {
-                    excavationFromSand.add(eTreasure);
-                }
-
-                if (eTreasure.getDropsFromGravel()) {
-                    excavationFromGravel.add(eTreasure);
-                }
-
-                if (eTreasure.getDropsFromClay()) {
-                    excavationFromClay.add(eTreasure);
-                }
-
-                if (eTreasure.getDropsFromMycel()) {
-                    excavationFromMycel.add(eTreasure);
-                }
-
-                if (eTreasure.getDropsFromSoulSand()) {
-                    excavationFromSoulSand.add(eTreasure);
-                }
-            }
-        }
-    }
-
-    private boolean noErrorsInTreasure(List<String> issues) {
-        if (issues.isEmpty()) {
-            return true;
-        }
-
-        for (String issue : issues) {
-            plugin.getLogger().warning(issue);
-        }
-        return false;
-    }
-}
+package com.gmail.nossr50.config;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+
+import org.bukkit.Bukkit;
+import org.bukkit.Material;
+import org.bukkit.configuration.ConfigurationSection;
+import org.bukkit.inventory.ItemStack;
+
+import com.gmail.nossr50.mcMMO;
+import com.gmail.nossr50.datatypes.treasure.ExcavationTreasure;
+import com.gmail.nossr50.datatypes.treasure.FishingTreasure;
+import com.gmail.nossr50.datatypes.treasure.Treasure;
+
+public class LoadTreasures extends ConfigLoader{
+
+    public static List<ExcavationTreasure> excavationFromDirt = new ArrayList<ExcavationTreasure>();
+    public static List<ExcavationTreasure> excavationFromGrass = new ArrayList<ExcavationTreasure>();
+    public static List<ExcavationTreasure> excavationFromSand = new ArrayList<ExcavationTreasure>();
+    public static List<ExcavationTreasure> excavationFromGravel = new ArrayList<ExcavationTreasure>();
+    public static List<ExcavationTreasure> excavationFromClay = new ArrayList<ExcavationTreasure>();
+    public static List<ExcavationTreasure> excavationFromMycel = new ArrayList<ExcavationTreasure>();
+    public static List<ExcavationTreasure> excavationFromSoulSand = new ArrayList<ExcavationTreasure>();
+    public static List<FishingTreasure> fishingRewardsTier1 = new ArrayList<FishingTreasure>();
+    public static List<FishingTreasure> fishingRewardsTier2 = new ArrayList<FishingTreasure>();
+    public static List<FishingTreasure> fishingRewardsTier3 = new ArrayList<FishingTreasure>();
+    public static List<FishingTreasure> fishingRewardsTier4 = new ArrayList<FishingTreasure>();
+    public static List<FishingTreasure> fishingRewardsTier5 = new ArrayList<FishingTreasure>();
+
+    public LoadTreasures(mcMMO plugin) {
+        super(plugin, "treasures.yml");
+        config = plugin.getTreasuresConfig();
+    }
+
+    @Override
+    public void load() {
+
+        // If it doesn't exist, copy it from the .jar
+        if (!configFile.exists()) {
+            dataFolder.mkdir();
+            plugin.saveTreasuresConfig();
+        }
+
+        addDefaults();
+        loadKeys();
+    }
+
+    @Override
+    protected void loadKeys() {
+        plugin.getLogger().info("Loading mcMMO treasures.yml File...");
+
+        Map<String, Treasure> treasures = new HashMap<String, Treasure>();
+        ConfigurationSection treasureSection = config.getConfigurationSection("Treasures");
+        Set<String> treasureConfigSet = treasureSection.getKeys(false);
+        Iterator<String> iterator = treasureConfigSet.iterator();
+
+        while (iterator.hasNext()) {
+            String treasureName = iterator.next();
+
+            // Validate all the things!
+            List<String> reason = new ArrayList<String>();
+
+            /*
+             * ID, Amount, and Data
+             */
+
+            if (!config.contains("Treasures." + treasureName + ".ID")) {
+                reason.add("Missing ID");
+            }
+
+            if (!config.contains("Treasures." + treasureName + ".Amount")) {
+                reason.add("Missing Amount");
+            }
+
+            if (!config.contains("Treasures." + treasureName + ".Data")) {
+                reason.add("Missing Data");
+            }
+
+            int id = config.getInt("Treasures." + treasureName + ".ID");
+            int amount = config.getInt("Treasures." + treasureName + ".Amount");
+            int data = config.getInt("Treasures." + treasureName + ".Data");
+
+            if (Material.getMaterial(id) == null) {
+                reason.add("Invlid id: " + id);
+            }
+
+            if (amount < 1) {
+                reason.add("Invalid amount: " + amount);
+            }
+
+            if (data > 127 || data < -128) {
+                reason.add("Invalid data: " + data);
+            }
+
+            /*
+             * XP, Drop Chance, and Drop Level
+             */
+
+            if (!config.contains("Treasures." + treasureName + ".XP")) {
+                reason.add("Missing XP");
+            }
+
+            if (!config.contains("Treasures." + treasureName + ".Drop_Chance")) {
+                reason.add("Missing Drop_Chance");
+            }
+
+            if (!config.contains("Treasures." + treasureName + ".Drop_Level")) {
+                reason.add("Missing Drop_Level");
+            }
+
+            int xp = config.getInt("Treasures." + treasureName + ".XP");
+            Double dropChance = config.getDouble("Treasures." + treasureName + ".Drop_Chance");
+            int dropLevel = config.getInt("Treasures." + treasureName + ".Drop_Level");
+
+            if (xp < 0) {
+                reason.add("Invalid xp: " + xp);
+            }
+
+            if (dropChance < 0) {
+                reason.add("Invalid Drop_Chance: " + dropChance);
+            }
+
+            if (dropLevel < 0) {
+                reason.add("Invalid Drop_Level: " + dropLevel);
+            }
+
+            /*
+             * Drops From & Max Level
+             */
+
+            ItemStack item = new ItemStack(id, amount, (short) 0, (byte) data);
+
+            if (config.getBoolean("Treasures." + treasureName + ".Drops_From.Fishing", false)) {
+                if (config.getConfigurationSection("Treasures." + treasureName + ".Drops_From").getKeys(false).size() != 1) {
+                    reason.add("Fishing drops cannot also be excavation drops");
+                }
+
+                if (!config.contains("Treasures." + treasureName + ".Max_Level")) {
+                    reason.add("Missing Max_Level");
+                }
+
+                int maxLevel = config.getInt("Treasures." + treasureName + ".Max_Level");
+
+                if (maxLevel < 0) {
+                    reason.add("Invalid Max_Level: " + maxLevel);
+                }
+
+                if (noErrorsInTreasure(reason)) {
+                    FishingTreasure fTreasure = new FishingTreasure(item, xp, dropChance, dropLevel, maxLevel);
+                    treasures.put(treasureName, fTreasure);
+                }
+            }
+            else {
+                ExcavationTreasure eTreasure = new ExcavationTreasure(item, xp, dropChance, dropLevel);
+
+                if (config.getBoolean("Treasures." + treasureName + ".Drops_From.Dirt", false)) {
+                    eTreasure.setDropsFromDirt();
+                }
+
+                if (config.getBoolean("Treasures." + treasureName + ".Drops_From.Grass", false)) {
+                    eTreasure.setDropsFromGrass();
+                }
+
+                if (config.getBoolean("Treasures." + treasureName + ".Drops_From.Sand", false)) {
+                    eTreasure.setDropsFromSand();
+                }
+
+                if (config.getBoolean("Treasures." + treasureName + ".Drops_From.Gravel", false)) {
+                    eTreasure.setDropsFromGravel();
+                }
+
+                if (config.getBoolean("Treasures." + treasureName + ".Drops_From.Clay", false)) {
+                    eTreasure.setDropsFromClay();
+                }
+
+                if (config.getBoolean("Treasures." + treasureName + ".Drops_From.Mycelium", false)) {
+                    eTreasure.setDropsFromMycel();
+                }
+
+                if (config.getBoolean("Treasures." + treasureName + ".Drops_From.Soul_Sand", false)) {
+                    eTreasure.setDropsFromSoulSand();
+                }
+
+                if (config.getBoolean("Treasures." + treasureName + ".Drops_From.Fishing", false)) {
+                    reason.add("Excavation drops cannot also be fishing drops");
+                }
+
+                if (noErrorsInTreasure(reason)) {
+                    treasures.put(treasureName, eTreasure);
+                }
+            }
+        }
+
+        List<String> excavationTreasures = config.getStringList("Excavation.Treasure");
+        List<String> fishingTreasures = config.getStringList("Fishing.Treasure");
+        Iterator<String> treasureIterator = treasures.keySet().iterator();
+
+        while (treasureIterator.hasNext()) {
+            String treasureKey = treasureIterator.next();
+            Treasure treasure = treasures.get(treasureKey);
+
+            if (treasure instanceof FishingTreasure) {
+                if (!fishingTreasures.contains(treasureKey)) {
+                    continue;
+                }
+
+                FishingTreasure fTreasure = (FishingTreasure) treasure;
+                int dropLevel = fTreasure.getDropLevel();
+                int maxLevel = fTreasure.getMaxLevel();
+
+                if(dropLevel <= LoadProperties.fishingTier1 && maxLevel >= LoadProperties.fishingTier1) {
+                    fishingRewardsTier1.add(fTreasure);
+                }
+
+                if(dropLevel <= LoadProperties.fishingTier2 && maxLevel >= LoadProperties.fishingTier2) {
+                    fishingRewardsTier2.add(fTreasure);
+                }
+
+                if (dropLevel <= LoadProperties.fishingTier3 && maxLevel >= LoadProperties.fishingTier3) {
+                    fishingRewardsTier3.add(fTreasure);
+                }
+
+                if (dropLevel <= LoadProperties.fishingTier4 && maxLevel >= LoadProperties.fishingTier4) {
+                    fishingRewardsTier4.add(fTreasure);
+                }
+
+                if (dropLevel <= LoadProperties.fishingTier5 && maxLevel >= LoadProperties.fishingTier5) {
+                    fishingRewardsTier5.add(fTreasure);
+                }
+
+            }
+            else if (treasure instanceof ExcavationTreasure) {
+                if (!excavationTreasures.contains(treasureKey)) {
+                    continue;
+                }
+
+                ExcavationTreasure eTreasure = (ExcavationTreasure) treasure;
+
+                if (eTreasure.getDropsFromDirt()) {
+                    excavationFromDirt.add(eTreasure);
+                }
+
+                if (eTreasure.getDropsFromGrass()) {
+                    excavationFromGrass.add(eTreasure);
+                }
+
+                if (eTreasure.getDropsFromSand()) {
+                    excavationFromSand.add(eTreasure);
+                }
+
+                if (eTreasure.getDropsFromGravel()) {
+                    excavationFromGravel.add(eTreasure);
+                }
+
+                if (eTreasure.getDropsFromClay()) {
+                    excavationFromClay.add(eTreasure);
+                }
+
+                if (eTreasure.getDropsFromMycel()) {
+                    excavationFromMycel.add(eTreasure);
+                }
+
+                if (eTreasure.getDropsFromSoulSand()) {
+                    excavationFromSoulSand.add(eTreasure);
+                }
+            }
+        }
+    }
+
+    private boolean noErrorsInTreasure(List<String> issues) {
+        if (issues.isEmpty()) {
+            return true;
+        }
+        else {
+            for (String issue : issues) {
+                Bukkit.getLogger().warning(issue);
+            }
+            return false;
+        }
+    }
+}